From d9f52b3aedda8c28e29ad360d90919bd1e4b71b5 Mon Sep 17 00:00:00 2001
From: CommunicationAnimale <communicationanimal2015@gmail.com>
Date: Sat, 19 May 2018 13:21:33 +0200
Subject: [PATCH 001/297] nixos/thinkfan: use non-deprecated keywords in config
 file.

---
 nixos/modules/services/hardware/thinkfan.nix | 53 +++++++++++++++++---
 1 file changed, 46 insertions(+), 7 deletions(-)

diff --git a/nixos/modules/services/hardware/thinkfan.nix b/nixos/modules/services/hardware/thinkfan.nix
index 5a898631e09..ef932440dd9 100644
--- a/nixos/modules/services/hardware/thinkfan.nix
+++ b/nixos/modules/services/hardware/thinkfan.nix
@@ -28,11 +28,15 @@ let
     # temperatures are read from the file.
     #
     # For example:
-    # sensor /proc/acpi/ibm/thermal (0, 0, 10)
+    # tp_thermal /proc/acpi/ibm/thermal (0, 0, 10)
     # will add a fixed value of 10 °C the 3rd value read from that file. Check out
     # http://www.thinkwiki.org/wiki/Thermal_Sensors to find out how much you may
     # want to add to certain temperatures.
     
+
+    ${cfg.fan}
+    ${cfg.sensors}
+
     #  Syntax:
     #  (LEVEL, LOW, HIGH)
     #  LEVEL is the fan level to use (0-7 with thinkpad_acpi)
@@ -41,8 +45,6 @@ let
     #  All numbers are integers.
     #
 
-    sensor ${cfg.sensor} (0, 10, 15, 2, 10, 5, 0, 3, 0, 3)
-    
     ${cfg.levels}
   '';
 
@@ -59,10 +61,42 @@ in {
         '';
       };
 
-      sensor = mkOption {
-        default = "/proc/acpi/ibm/thermal";
+      sensors = mkOption {
+        default = ''
+          tp_thermal /proc/acpi/ibm/thermal (0,0,10)
+        '';
+        description =''
+          thinkfan can read temperatures from three possible sources:
+
+            /proc/acpi/ibm/thermal
+              Which is provided by the thinkpad_acpi kernel
+              module (keyword tp_thermal)
+
+            /sys/class/hwmon/*/temp*_input
+              Which may be provided by any hwmon drivers (keyword
+              hwmon)
+
+            S.M.A.R.T. (since 0.9 and requires the USE_ATASMART compilation flag)
+              Which reads the temperature directly from the hard
+              disk using libatasmart (keyword atasmart)
+          Multiple sensors may be added, in which case they will be
+          numbered in their order of appearance.
+        '';
+      };
+
+      fan = mkOption {
+        default = "tp_fan /proc/acpi/ibm/fan";
         description =''
-          Sensor used by thinkfan
+          Specifies the fan we want to use.
+          On anything other than a Thinkpad you'll probably
+          use some PWM control file in /sys/class/hwmon.
+          Remember that fan levels range from 0 to 255 and that
+          they're just a number, not including the word "level"
+          as seen below.
+          A sysfs fan would be specified like this:
+            pwm_fan /sys/class/hwmon/hwmon2/device/pwm1
+
+          Remember you can only have one fan.
         '';
       };
 
@@ -77,7 +111,12 @@ in {
           (127,   80,     32767)
         '';
         description =''
-          Sensor used by thinkfan
+					Syntax:
+					(LEVEL, LOW, HIGH)
+					LEVEL is the fan level to use (0-7 with thinkpad_acpi)
+					LOW is the temperature at which to step down to the previous level
+					HIGH is the temperature at which to step up to the next level
+					All numbers are integers.
         '';
       };
 
-- 
GitLab


From cc5d2810357d4882b22154aad92f1581076c6b1f Mon Sep 17 00:00:00 2001
From: Philipp Gesang <phg@phi-gamma.net>
Date: Thu, 5 Jul 2018 23:49:08 +0200
Subject: [PATCH 002/297] lua-packages: define lua53Packages

Set up lua packages for the v5.3.x interpreter.

Blacklist the set of lua-packages (luabitop, luaexpat, luazip,
luasqlite3) whose compilation fails against 5.3.4. The rest are at least
building.

Signed-off-by: Philipp Gesang <phg@phi-gamma.net>
---
 pkgs/top-level/all-packages.nix | 1 +
 pkgs/top-level/lua-packages.nix | 8 ++++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f7084b0a5fd..36ca2cf6f96 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7308,6 +7308,7 @@ with pkgs;
 
   lua51Packages = recurseIntoAttrs (callPackage ./lua-packages.nix { lua = lua5_1; });
   lua52Packages = recurseIntoAttrs (callPackage ./lua-packages.nix { lua = lua5_2; });
+  lua53Packages = recurseIntoAttrs (callPackage ./lua-packages.nix { lua = lua5_3; });
   luajitPackages = recurseIntoAttrs (callPackage ./lua-packages.nix { lua = luajit; });
 
   luaPackages = lua52Packages;
diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix
index 311bb1eb63f..8f109c0fcb7 100644
--- a/pkgs/top-level/lua-packages.nix
+++ b/pkgs/top-level/lua-packages.nix
@@ -83,6 +83,8 @@ let
 
     buildFlags = stdenv.lib.optionalString stdenv.isDarwin "macosx";
 
+    disabled = isLua53;
+
     postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
       substituteInPlace Makefile --replace 10.4 10.5
     '';
@@ -220,7 +222,7 @@ let
         EXPAT_INC="-I${expat.dev}/include");
     '';
 
-    disabled = isLuaJIT;
+    disabled = isLua53 || isLuaJIT;
 
     meta = with stdenv.lib; {
       description = "SAX XML parser based on the Expat library";
@@ -500,7 +502,7 @@ let
     patches = [ ../development/lua-modules/zip.patch ];
 
     # Does not currently work under Lua 5.2 or LuaJIT.
-    disabled = isLua52 || isLuaJIT;
+    disabled = isLua52 || isLua53 || isLuaJIT;
 
     meta = with stdenv.lib; {
       description = "Lua library to read files stored inside zip files";
@@ -621,6 +623,8 @@ let
       sha256 = "05k8zs8nsdmlwja3hdhckwknf7ww5cvbp3sxhk2xd1i3ij6aa10b";
     };
 
+    disabled = isLua53;
+
     buildInputs = [ sqlite ];
 
     patches = [ ../development/lua-modules/luasql.patch ];
-- 
GitLab


From 0b30f6940682234311fd87859009f5e030bf03aa Mon Sep 17 00:00:00 2001
From: Philipp Gesang <phg@phi-gamma.net>
Date: Fri, 6 Jul 2018 00:06:48 +0200
Subject: [PATCH 003/297] lua-packages: update lpeg 0.12 -> 1.0.1

Signed-off-by: Philipp Gesang <phg@phi-gamma.net>
---
 pkgs/top-level/lua-packages.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix
index 8f109c0fcb7..9ef63bdd512 100644
--- a/pkgs/top-level/lua-packages.nix
+++ b/pkgs/top-level/lua-packages.nix
@@ -15,6 +15,7 @@
 let
   isLua51 = lua.luaversion == "5.1";
   isLua52 = lua.luaversion == "5.2";
+  isLua53 = lua.luaversion == "5.3";
   isLuaJIT = (builtins.parseDrvName lua.name).name == "luajit";
 
   platformString =
@@ -640,11 +641,11 @@ let
 
   lpeg = buildLuaPackage rec {
     name = "lpeg-${version}";
-    version = "0.12";
+    version = "1.0.1";
 
     src = fetchurl {
       url = "http://www.inf.puc-rio.br/~roberto/lpeg/${name}.tar.gz";
-      sha256 = "0xlbfw1w7l65a5qhnx5sfw327hkq1zcj8xmg4glfw6fj9ha4b9gg";
+      sha256 = "62d9f7a9ea3c1f215c77e0cadd8534c6ad9af0fb711c3f89188a8891c72f026b";
     };
 
     preBuild = ''
-- 
GitLab


From 2c21a970e9e31d553405e59915c4519e5a9710c3 Mon Sep 17 00:00:00 2001
From: Philipp Gesang <phg@phi-gamma.net>
Date: Wed, 11 Jul 2018 07:30:28 +0200
Subject: [PATCH 004/297] lua5_3: update interpreter version 5.3.4 -> 5.3.5

Update to the most recent version of the 5.3 series that was released
yesterday.

Signed-off-by: Philipp Gesang <phg@phi-gamma.net>
---
 pkgs/development/interpreters/lua-5/5.3.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/lua-5/5.3.nix b/pkgs/development/interpreters/lua-5/5.3.nix
index 5a4893db063..85a9f8093bf 100644
--- a/pkgs/development/interpreters/lua-5/5.3.nix
+++ b/pkgs/development/interpreters/lua-5/5.3.nix
@@ -5,11 +5,11 @@
 stdenv.mkDerivation rec {
   name = "lua-${version}";
   luaversion = "5.3";
-  version = "${luaversion}.4";
+  version = "${luaversion}.5";
 
   src = fetchurl {
     url = "https://www.lua.org/ftp/${name}.tar.gz";
-    sha256 = "0320a8dg3aci4hxla380dx1ifkw8gj4gbw5c4dz41g1kh98sm0gn";
+    sha256 = "0c2eed3f960446e1a3e4b9a1ca2f3ff893b6ce41942cf54d5dd59ab4b3b058ac";
   };
 
   buildInputs = [ readline ];
-- 
GitLab


From 4d1900ac6e07dcad91a99979a671cbdf94c17d5f Mon Sep 17 00:00:00 2001
From: Edmund Wu <fangkazuto@gmail.com>
Date: Thu, 12 Jul 2018 19:48:44 -0400
Subject: [PATCH 005/297] glava: adjust syntax in patchelf command

---
 pkgs/applications/misc/glava/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/glava/default.nix b/pkgs/applications/misc/glava/default.nix
index d115d1ae1d2..e0535eeca38 100644
--- a/pkgs/applications/misc/glava/default.nix
+++ b/pkgs/applications/misc/glava/default.nix
@@ -84,8 +84,9 @@ in
       mv $out/usr/bin/glava $out/bin/.glava-unwrapped
       rm -rf $out/usr
 
-      patchelf $out/bin/.glava-unwrapped \
+      patchelf \
         --set-rpath "$(patchelf --print-rpath $out/bin/.glava-unwrapped):${makeLibraryPath [ libGL ]}" \
+        $out/bin/.glava-unwrapped
 
       substitute ${wrapperScript} $out/bin/glava --subst-var out
       chmod +x $out/bin/glava
-- 
GitLab


From ff28a91663c3f8f131de54f107b6eca6456891c1 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Fri, 13 Jul 2018 00:53:09 -0700
Subject: [PATCH 006/297] nomacs: 3.10.0 -> 3.10.2

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/nomacs/versions.
---
 pkgs/applications/graphics/nomacs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/graphics/nomacs/default.nix b/pkgs/applications/graphics/nomacs/default.nix
index 1103c9ff40a..4093c151319 100644
--- a/pkgs/applications/graphics/nomacs/default.nix
+++ b/pkgs/applications/graphics/nomacs/default.nix
@@ -18,12 +18,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "3.10.0";
+  version = "3.10.2";
   src = fetchFromGitHub {
     owner = "nomacs";
     repo = "nomacs";
     rev = version;
-    sha256 = "07k921r4m6p5kicyb55zdfp58m8mlc94g2csq354d7v20m71zwrv";
+    sha256 = "0v2gsdc8caswf2b5aa023d8kil1fqf4r9mlg15180h3c92f8jzvh";
   };
 
   name = "nomacs-${version}";
-- 
GitLab


From a16b7dfb6a7fe8c9fead846751ed738e7faaadf4 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Fri, 13 Jul 2018 23:39:17 -0500
Subject: [PATCH 007/297] hpc-coveralls: patch to fix build (for Cabal 2.2)

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index c7e7cd4f4c3..dce0aa1dbac 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1100,4 +1100,10 @@ self: super: {
   unix-time = if pkgs.stdenv.hostPlatform.isMusl then dontCheck super.unix-time else super.unix-time;
   # dontCheck: printf double rounding behavior
   prettyprinter = if pkgs.stdenv.hostPlatform.isMusl then dontCheck super.prettyprinter else super.prettyprinter;
+
+  # Fix with Cabal 2.2, https://github.com/guillaume-nargeot/hpc-coveralls/pull/73
+  hpc-coveralls = appendPatch super.hpc-coveralls (pkgs.fetchpatch {
+    url = "https://github.com/guillaume-nargeot/hpc-coveralls/pull/73/commits/344217f513b7adfb9037f73026f5d928be98d07f.patch";
+    sha256 = "056rk58v9h114mjx62f41x971xn9p3nhsazcf9zrcyxh1ymrdm8j";
+  });
 }
-- 
GitLab


From 0c085fd034e420e4633ba2ac5192de726bb48547 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sat, 14 Jul 2018 08:26:26 +0000
Subject: [PATCH 008/297] ocamlPackages.astring: remove spurious dependency to
 camlp4

---
 pkgs/development/ocaml-modules/astring/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/ocaml-modules/astring/default.nix b/pkgs/development/ocaml-modules/astring/default.nix
index 97c59d8581f..827487be69b 100644
--- a/pkgs/development/ocaml-modules/astring/default.nix
+++ b/pkgs/development/ocaml-modules/astring/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, fetchurl, buildOcaml, ocaml, findlib, ocamlbuild, topkg }:
+{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg }:
 
-buildOcaml rec {
+stdenv.mkDerivation rec {
   version = "0.8.3";
-  name = "astring";
+  name = "ocaml${ocaml.version}-astring-${version}";
 
   src = fetchurl {
     url = "http://erratique.ch/software/astring/releases/astring-${version}.tbz";
-- 
GitLab


From ba612369e7f83db6b14ab93a6af9c7db3201fa1f Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sat, 14 Jul 2018 08:26:39 +0000
Subject: [PATCH 009/297] ocamlPackages.ipaddr: remove spurious dependency to
 camlp4

---
 pkgs/development/ocaml-modules/ipaddr/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/ocaml-modules/ipaddr/default.nix b/pkgs/development/ocaml-modules/ipaddr/default.nix
index 20d558e37c1..2f0aa342995 100644
--- a/pkgs/development/ocaml-modules/ipaddr/default.nix
+++ b/pkgs/development/ocaml-modules/ipaddr/default.nix
@@ -1,9 +1,9 @@
-{ stdenv, buildOcaml, fetchurl, ocamlbuild, findlib
+{ stdenv, fetchurl, ocaml, ocamlbuild, findlib
 , jbuilder, sexplib, ppx_sexp_conv
 }:
 
-buildOcaml rec {
-  name = "ipaddr";
+stdenv.mkDerivation rec {
+  name = "ocaml${ocaml.version}-ipaddr-${version}";
   version = "2.8.0";
 
   src = fetchurl {
@@ -11,7 +11,7 @@ buildOcaml rec {
     sha256 = "1amb1pbm9ybpxy6190qygpj6nmbzzs2r6vx4xh5r6v89szx9rfxw";
   };
 
-  buildInputs = [ findlib ocamlbuild jbuilder ];
+  buildInputs = [ ocaml findlib ocamlbuild jbuilder ];
   propagatedBuildInputs = [ ppx_sexp_conv sexplib ];
 
   inherit (jbuilder) installPhase;
-- 
GitLab


From 1c58618fd12182ef081f187e0b1a1136b85c4a53 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sat, 14 Jul 2018 08:26:50 +0000
Subject: [PATCH 010/297] ocamlPackages.ppx_deriving: remove spurious
 dependency to camlp4

---
 .../ocaml-modules/ppx_deriving/default.nix    | 20 ++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/ocaml-modules/ppx_deriving/default.nix b/pkgs/development/ocaml-modules/ppx_deriving/default.nix
index 3afe4149fa3..24cfbcf5b7a 100644
--- a/pkgs/development/ocaml-modules/ppx_deriving/default.nix
+++ b/pkgs/development/ocaml-modules/ppx_deriving/default.nix
@@ -1,7 +1,11 @@
-{ stdenv, buildOcaml, ocaml, fetchzip
+{ stdenv, ocaml, findlib, ocamlbuild, fetchzip
 , cppo, ppx_tools, ppx_derivers, result, ounit, ocaml-migrate-parsetree
 }:
 
+if !stdenv.lib.versionAtLeast ocaml.version "4.02"
+then throw "ppx_deriving is not available for OCaml ${ocaml.version}"
+else
+
 let param =
   if ocaml.version == "4.03.0"
   then {
@@ -14,23 +18,21 @@ let param =
     extraPropagatedBuildInputs = [ ocaml-migrate-parsetree ppx_derivers ];
 }; in
 
-buildOcaml rec {
-  name = "ppx_deriving";
+stdenv.mkDerivation rec {
+  name = "ocaml${ocaml.version}-ppx_deriving-${version}";
   inherit (param) version;
 
-  minimumSupportedOcamlVersion = "4.02";
-
   src = fetchzip {
-    url = "https://github.com/whitequark/${name}/archive/v${version}.tar.gz";
+    url = "https://github.com/ocaml-ppx/ppx_deriving/archive/v${version}.tar.gz";
     inherit (param) sha256;
   };
 
-  hasSharedObjects = true;
-
-  buildInputs = [ cppo ounit ];
+  buildInputs = [ ocaml findlib ocamlbuild cppo ounit ];
   propagatedBuildInputs = param.extraPropagatedBuildInputs ++
     [ ppx_tools result ];
 
+  createFindlibDestdir = true;
+
   installPhase = "OCAMLPATH=$OCAMLPATH:`ocamlfind printconf destdir` make install";
 
   meta = with stdenv.lib; {
-- 
GitLab


From d534882ca27789c000fd0b17088ae39d1b566cd4 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sat, 14 Jul 2018 08:27:00 +0000
Subject: [PATCH 011/297] ocamlPackages.ppx_tools: enable for OCaml 4.07

---
 pkgs/development/ocaml-modules/ppx_tools/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/ocaml-modules/ppx_tools/default.nix b/pkgs/development/ocaml-modules/ppx_tools/default.nix
index 53d7847acee..2aa74d751db 100644
--- a/pkgs/development/ocaml-modules/ppx_tools/default.nix
+++ b/pkgs/development/ocaml-modules/ppx_tools/default.nix
@@ -17,6 +17,9 @@ let param = {
   "4.06" = {
     version = "5.1+4.06.0";
     sha256 = "1ww4cspdpgjjsgiv71s0im5yjkr3544x96wsq1vpdacq7dr7zwiw"; };
+  "4.07" = {
+    version = "5.1+4.06.0";
+    sha256 = "1ww4cspdpgjjsgiv71s0im5yjkr3544x96wsq1vpdacq7dr7zwiw"; };
 }."${ocaml.meta.branch}";
 in
   stdenv.mkDerivation {
-- 
GitLab


From fdf291f92270a378f04cda6da330970c1c88e021 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sat, 14 Jul 2018 08:27:11 +0000
Subject: [PATCH 012/297] ocamlPackages.tyxml: make dependency to camlp4
 optional

---
 pkgs/development/ocaml-modules/tyxml/default.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/ocaml-modules/tyxml/default.nix b/pkgs/development/ocaml-modules/tyxml/default.nix
index a965d6ed116..b34c9279c30 100644
--- a/pkgs/development/ocaml-modules/tyxml/default.nix
+++ b/pkgs/development/ocaml-modules/tyxml/default.nix
@@ -1,4 +1,6 @@
-{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, camlp4, uutf, markup, ppx_tools_versioned, re
+{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, uutf, markup, ppx_tools_versioned, re
+, withP4 ? !stdenv.lib.versionAtLeast ocaml.version "4.07"
+, camlp4 ? null
 }:
 
 assert stdenv.lib.versionAtLeast ocaml.version "4.02";
@@ -13,13 +15,14 @@ stdenv.mkDerivation rec {
     sha256 = "1zrkrmxyj5a2cdh4b9zr9anwfk320wv3x0ynxnyxl5za2ix8sld8";
   };
 
-  buildInputs = [ ocaml findlib ocamlbuild camlp4 ppx_tools_versioned markup ];
+  buildInputs = [ ocaml findlib ocamlbuild ppx_tools_versioned markup ]
+  ++ stdenv.lib.optional withP4 camlp4;
 
   propagatedBuildInputs = [ uutf re ];
 
   createFindlibDestdir = true;
 
-  configureFlags = "--enable-syntax";
+  configureFlags = stdenv.lib.optional withP4 "--enable-syntax";
 
   meta = with stdenv.lib; {
     homepage = http://ocsigen.org/tyxml/;
-- 
GitLab


From 6d9ffeaa2ec4816bc432e7d28b5aa85165562740 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sat, 14 Jul 2018 08:27:25 +0000
Subject: [PATCH 013/297] ocamlPackages.js_of_ocaml: 3.1.0 -> 3.2.0

---
 pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix | 4 ++--
 pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix      | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix b/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix
index 6d269552f62..79801304595 100644
--- a/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix
+++ b/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix
@@ -8,13 +8,13 @@ else
 
 stdenv.mkDerivation rec {
 	name = "js_of_ocaml-compiler-${version}";
-	version = "3.1.0";
+	version = "3.2.0";
 
 	src = fetchFromGitHub {
 		owner = "ocsigen";
 		repo = "js_of_ocaml";
 		rev = version;
-		sha256 = "17a0kb39bcx2qq41cq7kjrxghm67l1yahrs47yakgb1avna0pqd9";
+		sha256 = "0dxxdxgrbg9xvvi3i627krnk6rb1ja0ypp2diwdkpnmy45wak9lv";
 	};
 
 	buildInputs = [ ocaml findlib jbuilder cmdliner cppo ];
diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix b/pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix
index 31a5c3ea17b..5ec8cca344d 100644
--- a/pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix
+++ b/pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix
@@ -1,6 +1,6 @@
 { stdenv, ocaml, findlib, jbuilder, js_of_ocaml-compiler, js_of_ocaml-ppx
 , ocaml-migrate-parsetree, ppx_tools_versioned
-, js_of_ocaml, ocaml_lwt
+, js_of_ocaml, ocaml_lwt, lwt_log
 }:
 
 stdenv.mkDerivation rec {
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
 
 	buildInputs = [ ocaml findlib jbuilder js_of_ocaml-ppx ocaml-migrate-parsetree ppx_tools_versioned ];
 
-	propagatedBuildInputs = [ js_of_ocaml ocaml_lwt ];
+	propagatedBuildInputs = [ js_of_ocaml ocaml_lwt lwt_log ];
 
 	buildPhase = "jbuilder build -p js_of_ocaml-lwt";
 }
-- 
GitLab


From 935332d648ddfd00521a84390f73b3dc895dbfdc Mon Sep 17 00:00:00 2001
From: Guanpeng Xu <herberteuler@gmail.com>
Date: Sun, 15 Jul 2018 14:18:55 +0800
Subject: [PATCH 014/297] nethack: add qt support on linux

---
 pkgs/games/nethack/default.nix  | 33 ++++++++++++++++++++++++++++-----
 pkgs/top-level/all-packages.nix |  2 ++
 2 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/pkgs/games/nethack/default.nix b/pkgs/games/nethack/default.nix
index eed38592236..67f1a1d452c 100644
--- a/pkgs/games/nethack/default.nix
+++ b/pkgs/games/nethack/default.nix
@@ -1,5 +1,5 @@
 { stdenv, lib, fetchurl, writeScript, coreutils, ncurses, gzip, flex, bison, less
-, x11Mode ? false, libXaw, libXext, mkfontdir
+, x11Mode ? false, qtMode ? false, libXaw, libXext, mkfontdir, pkgconfig, qt5
 }:
 
 let
@@ -8,6 +8,7 @@ let
     else throw "Unknown platform for NetHack: ${stdenv.system}";
   unixHint =
     if x11Mode then "linux-x11"
+    else if qtMode then "linux-qt4"
     else if stdenv.hostPlatform.isLinux  then "linux"
     else if stdenv.hostPlatform.isDarwin then "macosx10.10"
     # We probably want something different for Darwin
@@ -15,17 +16,27 @@ let
   userDir = "~/.config/nethack";
   binPath = lib.makeBinPath [ coreutils less ];
 
-in stdenv.mkDerivation {
-  name = "nethack${lib.optionalString x11Mode "-x11"}-3.6.1";
+in stdenv.mkDerivation rec {
+  version = "3.6.1";
+  name = if x11Mode then "nethack-x11-${version}"
+         else if qtMode then "nethack-qt-${version}"
+         else "nethack-${version}";
 
   src = fetchurl {
     url = "https://nethack.org/download/3.6.1/nethack-361-src.tgz";
     sha256 = "1dha0ijvxhx7c9hr0452h93x81iiqsll8bc9msdnp7xdqcfbz32b";
   };
 
-  buildInputs = [ ncurses ] ++ lib.optionals x11Mode [ libXaw libXext ];
+  buildInputs = [ ncurses ]
+                ++ lib.optionals x11Mode [ libXaw libXext ]
+                ++ lib.optionals qtMode [ gzip qt5.qtbase.bin qt5.qtmultimedia.bin ];
 
-  nativeBuildInputs = [ flex bison ] ++ lib.optionals x11Mode [ mkfontdir ];
+  nativeBuildInputs = [ flex bison ]
+                      ++ lib.optionals x11Mode [ mkfontdir ]
+                      ++ lib.optionals qtMode [
+                           pkgconfig mkfontdir qt5.qtbase.dev
+                           qt5.qtmultimedia.dev
+                         ];
 
   makeFlags = [ "PREFIX=$(out)" ];
 
@@ -35,6 +46,11 @@ in stdenv.mkDerivation {
       -e 's/^YACC *=.*/YACC = bison -y/' \
       -e 's/^LEX *=.*/LEX = flex/' \
       -i sys/unix/Makefile.utl
+    sed \
+      -e 's,^WINQT4LIB =.*,WINQT4LIB = `pkg-config Qt5Gui --libs` \\\
+            `pkg-config Qt5Widgets --libs` \\\
+            `pkg-config Qt5Multimedia --libs`,' \
+      -i sys/unix/Makefile.src
     sed \
       -e 's,/bin/gzip,${gzip}/bin/gzip,g' \
       -e 's,^WINTTYLIB=.*,WINTTYLIB=-lncurses,' \
@@ -45,6 +61,12 @@ in stdenv.mkDerivation {
       -e 's,^SHELLDIR=.*$,SHELLDIR=\$(PREFIX)/games,' \
       -i sys/unix/hints/macosx10.10
     sed -e '/define CHDIR/d' -i include/config.h
+    sed \
+      -e 's,^QTDIR *=.*,QTDIR=${qt5.qtbase.dev},' \
+      -e 's,CFLAGS.*QtGui.*,CFLAGS += `pkg-config Qt5Gui --cflags`,' \
+      -e 's,CFLAGS+=-DCOMPRESS.*,CFLAGS+=-DCOMPRESS=\\"${gzip}/bin/gzip\\" \\\
+        -DCOMPRESS_EXTENSION=\\".gz\\",' \
+      -i sys/unix/hints/linux-qt4
   '';
 
   configurePhase = ''
@@ -90,6 +112,7 @@ in stdenv.mkDerivation {
     EOF
     chmod +x $out/bin/nethack
     ${lib.optionalString x11Mode "mv $out/bin/nethack $out/bin/nethack-x11"}
+    ${lib.optionalString qtMode "mv $out/bin/nethack $out/bin/nethack-qt"}
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cf970354543..4c72a85a64e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19684,6 +19684,8 @@ with pkgs;
 
   nethack = callPackage ../games/nethack { };
 
+  nethack-qt = callPackage ../games/nethack { qtMode = true; };
+
   nethack-x11 = callPackage ../games/nethack { x11Mode = true; };
 
   neverball = callPackage ../games/neverball { };
-- 
GitLab


From aa6adfc324b44c840a488a4b0a5cd4c1c66f80c7 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Mon, 4 Jun 2018 22:29:22 -0400
Subject: [PATCH 015/297] fetchpatch: Add includes to compliment excludes, and
 require that both not be non-empty.

This commit was originally introduced as part of #41420 and then
reverted with the rest of that PR. However there was no reason to revert
his particular commit.
---
 pkgs/build-support/fetchpatch/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/build-support/fetchpatch/default.nix b/pkgs/build-support/fetchpatch/default.nix
index c185497e691..16343d626ce 100644
--- a/pkgs/build-support/fetchpatch/default.nix
+++ b/pkgs/build-support/fetchpatch/default.nix
@@ -5,7 +5,7 @@
 # stripLen acts as the -p parameter when applying a patch.
 
 { lib, fetchurl, patchutils }:
-{ stripLen ? 0, extraPrefix ? null, excludes ? [], ... }@args:
+{ stripLen ? 0, extraPrefix ? null, excludes ? [], includes ? [], ... }@args:
 
 fetchurl ({
   postFetch = ''
@@ -24,7 +24,9 @@ fetchurl ({
     ${patchutils}/bin/filterdiff \
       -p1 \
       ${builtins.toString (builtins.map (x: "-x ${x}") excludes)} \
+      ${builtins.toString (builtins.map (x: "-i ${x}") includes)} \
       "$tmpfile" > "$out"
     ${args.postFetch or ""}
   '';
-} // builtins.removeAttrs args ["stripLen" "extraPrefix" "excludes" "postFetch"])
+  meta.broken = excludes != [] && includes != [];
+} // builtins.removeAttrs args ["stripLen" "extraPrefix" "excludes" "includes" "postFetch"])
-- 
GitLab


From 1ddab0efb1729a32fdea83cf757584a7ebf1e13a Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Sun, 15 Jul 2018 09:58:47 +0200
Subject: [PATCH 016/297] fetchpatch: escape excludes and includes

Excludes and includes are implemented by passing the parameters to the
respective flags of `filterdiff`. Those were passed unescaped until now.
Since those flags expect patterns (similar to shell globs), something
like `/some/path/*` might be used to exclude or include all files in
some path. Without escaping the shell would expand the `*`, leading to
unexpected behaviour.
---
 pkgs/build-support/fetchpatch/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/build-support/fetchpatch/default.nix b/pkgs/build-support/fetchpatch/default.nix
index 16343d626ce..c8004fb8743 100644
--- a/pkgs/build-support/fetchpatch/default.nix
+++ b/pkgs/build-support/fetchpatch/default.nix
@@ -23,8 +23,8 @@ fetchurl ({
         --clean "$out" > "$tmpfile"
     ${patchutils}/bin/filterdiff \
       -p1 \
-      ${builtins.toString (builtins.map (x: "-x ${x}") excludes)} \
-      ${builtins.toString (builtins.map (x: "-i ${x}") includes)} \
+      ${builtins.toString (builtins.map (x: "-x ${lib.escapeShellArg x}") excludes)} \
+      ${builtins.toString (builtins.map (x: "-i ${lib.escapeShellArg x}") includes)} \
       "$tmpfile" > "$out"
     ${args.postFetch or ""}
   '';
-- 
GitLab


From 8f9b985e60de16883b2e67eaf2924144d647f31e Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Sun, 15 Jul 2018 13:57:37 +0200
Subject: [PATCH 017/297] fetchpatch: fail on empty patch

Since this is probably never the desired case and has led to actual
issues, see the comments at:

https://github.com/NixOS/nixpkgs/commit/af1313e91552e42a4419b396b3026319c60fc17f

This might also happen when pulling a patch from GitHub or a similar web
interface without explicitly selecting the "raw" format.
---
 pkgs/build-support/fetchpatch/default.nix | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/pkgs/build-support/fetchpatch/default.nix b/pkgs/build-support/fetchpatch/default.nix
index c8004fb8743..1e231d649b3 100644
--- a/pkgs/build-support/fetchpatch/default.nix
+++ b/pkgs/build-support/fetchpatch/default.nix
@@ -10,6 +10,10 @@
 fetchurl ({
   postFetch = ''
     tmpfile="$TMPDIR/${args.sha256}"
+    if [ ! -s "$out" ]; then
+      echo "error: Fetched patch file '$out' is empty!" 1>&2
+      exit 1
+    fi
     "${patchutils}/bin/lsdiff" "$out" \
       | sort -u | sed -e 's/[*?]/\\&/g' \
       | xargs -I{} \
@@ -21,12 +25,26 @@ fetchurl ({
            --addnewprefix=b/${extraPrefix} \
         ''} \
         --clean "$out" > "$tmpfile"
+    if [ ! -s "$tmpfile" ]; then
+      echo "error: Normalized patch '$tmpfile' is empty (while the fetched file was not)!" 1>&2
+      echo "Did you maybe fetch a HTML representation of a patch instead of a raw patch?" 1>&2
+      echo "Fetched file was:" 1>&2
+      cat "$out" 1>&2
+      exit 1
+    fi
     ${patchutils}/bin/filterdiff \
       -p1 \
       ${builtins.toString (builtins.map (x: "-x ${lib.escapeShellArg x}") excludes)} \
       ${builtins.toString (builtins.map (x: "-i ${lib.escapeShellArg x}") includes)} \
       "$tmpfile" > "$out"
     ${args.postFetch or ""}
+    if [ ! -s "$out" ]; then
+      echo "error: Filtered patch '$out$' is empty (while the original patch file was not)!" 1>&2
+      echo "Check your includes and excludes." 1>&2
+      echo "Normalizd patch file was:" 1>&2
+      cat "$tmpfile" 1>&2
+      exit 1
+    fi
   '';
   meta.broken = excludes != [] && includes != [];
 } // builtins.removeAttrs args ["stripLen" "extraPrefix" "excludes" "includes" "postFetch"])
-- 
GitLab


From de24fd75251754606cf85940d6686c229eb2a390 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sun, 15 Jul 2018 23:06:59 +0200
Subject: [PATCH 018/297] nethack: add qt plugin wrapper

---
 pkgs/games/nethack/default.nix | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/nethack/default.nix b/pkgs/games/nethack/default.nix
index 67f1a1d452c..db959177eb5 100644
--- a/pkgs/games/nethack/default.nix
+++ b/pkgs/games/nethack/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, lib, fetchurl, writeScript, coreutils, ncurses, gzip, flex, bison, less
+{ stdenv, lib, fetchurl, writeScript, coreutils, ncurses, gzip, flex, bison
+, less, makeWrapper
 , x11Mode ? false, qtMode ? false, libXaw, libXext, mkfontdir, pkgconfig, qt5
 }:
 
@@ -35,7 +36,7 @@ in stdenv.mkDerivation rec {
                       ++ lib.optionals x11Mode [ mkfontdir ]
                       ++ lib.optionals qtMode [
                            pkgconfig mkfontdir qt5.qtbase.dev
-                           qt5.qtmultimedia.dev
+                           qt5.qtmultimedia.dev makeWrapper
                          ];
 
   makeFlags = [ "PREFIX=$(out)" ];
@@ -115,6 +116,11 @@ in stdenv.mkDerivation rec {
     ${lib.optionalString qtMode "mv $out/bin/nethack $out/bin/nethack-qt"}
   '';
 
+  postFixup = lib.optionalString qtMode ''
+    wrapProgram $out/bin/nethack-qt \
+      --prefix QT_PLUGIN_PATH : "${qt5.qtbase}/${qt5.qtbase.qtPluginPrefix}"
+  '';
+
   meta = with stdenv.lib; {
     description = "Rogue-like game";
     homepage = http://nethack.org/;
-- 
GitLab


From 92c82e0933a0b3caa73226555c5c8d6d2f516538 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sun, 15 Jul 2018 23:28:14 +0200
Subject: [PATCH 019/297] nixos/thinkfan: add types & fix formatting

---
 nixos/modules/services/hardware/thinkfan.nix | 24 +++++++++-----------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/nixos/modules/services/hardware/thinkfan.nix b/nixos/modules/services/hardware/thinkfan.nix
index ef932440dd9..d17121ca1c5 100644
--- a/nixos/modules/services/hardware/thinkfan.nix
+++ b/nixos/modules/services/hardware/thinkfan.nix
@@ -32,7 +32,6 @@ let
     # will add a fixed value of 10 °C the 3rd value read from that file. Check out
     # http://www.thinkwiki.org/wiki/Thermal_Sensors to find out how much you may
     # want to add to certain temperatures.
-    
 
     ${cfg.fan}
     ${cfg.sensors}
@@ -55,6 +54,7 @@ in {
     services.thinkfan = {
 
       enable = mkOption {
+        type = types.bool;
         default = false;
         description = ''
           Whether to enable thinkfan, fan controller for IBM/Lenovo ThinkPads.
@@ -62,6 +62,7 @@ in {
       };
 
       sensors = mkOption {
+        type = types.lines;
         default = ''
           tp_thermal /proc/acpi/ibm/thermal (0,0,10)
         '';
@@ -79,28 +80,26 @@ in {
             S.M.A.R.T. (since 0.9 and requires the USE_ATASMART compilation flag)
               Which reads the temperature directly from the hard
               disk using libatasmart (keyword atasmart)
+
           Multiple sensors may be added, in which case they will be
           numbered in their order of appearance.
         '';
       };
 
       fan = mkOption {
+        type = types.str;
         default = "tp_fan /proc/acpi/ibm/fan";
         description =''
           Specifies the fan we want to use.
           On anything other than a Thinkpad you'll probably
           use some PWM control file in /sys/class/hwmon.
-          Remember that fan levels range from 0 to 255 and that
-          they're just a number, not including the word "level"
-          as seen below.
           A sysfs fan would be specified like this:
             pwm_fan /sys/class/hwmon/hwmon2/device/pwm1
-
-          Remember you can only have one fan.
         '';
       };
 
       levels = mkOption {
+        type = types.lines;
         default = ''
           (0,     0,      55)
           (1,     48,     60)
@@ -110,13 +109,12 @@ in {
           (7,     60,     85)
           (127,   80,     32767)
         '';
-        description =''
-					Syntax:
-					(LEVEL, LOW, HIGH)
-					LEVEL is the fan level to use (0-7 with thinkpad_acpi)
-					LOW is the temperature at which to step down to the previous level
-					HIGH is the temperature at which to step up to the next level
-					All numbers are integers.
+        description = ''
+          (LEVEL, LOW, HIGH)
+          LEVEL is the fan level to use (0-7 with thinkpad_acpi).
+          LOW is the temperature at which to step down to the previous level.
+          HIGH is the temperature at which to step up to the next level.
+          All numbers are integers.
         '';
       };
 
-- 
GitLab


From d3cea4860862754d74f60a4332c24b646f1446c9 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sun, 15 Jul 2018 20:52:41 -0500
Subject: [PATCH 020/297] emacsPackagesNg: 2018-07-15 update

All package sets are simultaneously updated to accommodate changes to
package-build. Due to new restrictions in package-build, all packages using
`melpaBuild` must now provide a recipe file, even those packages which are not
included in upstream MELPA.
---
 .../editors/emacs-modes/elpa-generated.nix    |   768 +-
 .../emacs-modes/filesets-plus/default.nix     |     2 +-
 .../emacs-modes/font-lock-plus/default.nix    |     2 +-
 .../editors/emacs-modes/header2/default.nix   |     2 +-
 .../editors/emacs-modes/hexrgb/default.nix    |     2 +-
 .../emacs-modes/lib-requires/default.nix      |     2 +-
 .../editors/emacs-modes/melpa-generated.nix   | 57454 +++++++++++-----
 .../emacs-modes/melpa-stable-generated.nix    | 27787 +++++---
 .../editors/emacs-modes/org-generated.nix     |    21 +-
 .../emacs-modes/thingatpt-plus/default.nix    |     2 +-
 pkgs/build-support/emacs/melpa.nix            |    85 +-
 pkgs/build-support/emacs/melpa2nix.el         |    38 +-
 pkgs/top-level/all-packages.nix               |     2 +-
 pkgs/top-level/emacs-packages.nix             |    77 +-
 14 files changed, 58047 insertions(+), 28197 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/pkgs/applications/editors/emacs-modes/elpa-generated.nix
index 958066e2106..9f1ee111c25 100644
--- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix
@@ -1,5 +1,7 @@
-{ callPackage }: {
-    ace-window = callPackage ({ avy, elpaBuild, fetchurl, lib }: elpaBuild {
+{ callPackage }:
+  {
+    ace-window = callPackage ({ avy, elpaBuild, fetchurl, lib }:
+      elpaBuild {
         pname = "ace-window";
         version = "0.9.0";
         src = fetchurl {
@@ -12,7 +14,8 @@
           license = lib.licenses.free;
         };
       }) {};
-    ack = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+    ack = callPackage ({ elpaBuild, fetchurl, lib }:
+      elpaBuild {
         pname = "ack";
         version = "1.5";
         src = fetchurl {
@@ -25,8 +28,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    ada-mode = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib, wisi }:
-    elpaBuild {
+    ada-mode = callPackage ({ cl-lib ? null
+                            , elpaBuild
+                            , emacs
+                            , fetchurl
+                            , lib
+                            , wisi }:
+      elpaBuild {
         pname = "ada-mode";
         version = "5.3.1";
         src = fetchurl {
@@ -39,7 +47,8 @@
           license = lib.licenses.free;
         };
       }) {};
-    ada-ref-man = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+    ada-ref-man = callPackage ({ elpaBuild, fetchurl, lib }:
+      elpaBuild {
         pname = "ada-ref-man";
         version = "2012.3";
         src = fetchurl {
@@ -52,7 +61,8 @@
           license = lib.licenses.free;
         };
       }) {};
-    adaptive-wrap = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+    adaptive-wrap = callPackage ({ elpaBuild, fetchurl, lib }:
+      elpaBuild {
         pname = "adaptive-wrap";
         version = "0.5.2";
         src = fetchurl {
@@ -65,7 +75,8 @@
           license = lib.licenses.free;
         };
       }) {};
-    adjust-parens = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+    adjust-parens = callPackage ({ elpaBuild, fetchurl, lib }:
+      elpaBuild {
         pname = "adjust-parens";
         version = "3.0";
         src = fetchurl {
@@ -78,8 +89,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    aggressive-indent = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
-    elpaBuild {
+    aggressive-indent = callPackage ({ cl-lib ? null
+                                     , elpaBuild
+                                     , emacs
+                                     , fetchurl
+                                     , lib }:
+      elpaBuild {
         pname = "aggressive-indent";
         version = "1.8.3";
         src = fetchurl {
@@ -93,7 +108,7 @@
         };
       }) {};
     ahungry-theme = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-    elpaBuild {
+      elpaBuild {
         pname = "ahungry-theme";
         version = "1.10.0";
         src = fetchurl {
@@ -106,7 +121,8 @@
           license = lib.licenses.free;
         };
       }) {};
-    all = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+    all = callPackage ({ elpaBuild, fetchurl, lib }:
+      elpaBuild {
         pname = "all";
         version = "1.0";
         src = fetchurl {
@@ -119,7 +135,8 @@
           license = lib.licenses.free;
         };
       }) {};
-    ampc = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+    ampc = callPackage ({ elpaBuild, fetchurl, lib }:
+      elpaBuild {
         pname = "ampc";
         version = "0.2";
         src = fetchurl {
@@ -133,12 +150,12 @@
         };
       }) {};
     arbitools = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
-    elpaBuild {
+      elpaBuild {
         pname = "arbitools";
-        version = "0.94";
+        version = "0.95";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/arbitools-0.94.el";
-          sha256 = "00iq8rr1275p48ic5mibcx657li723q8r7ax4g21w6bzwsj3gksd";
+          url = "https://elpa.gnu.org/packages/arbitools-0.95.el";
+          sha256 = "1v6i9d35xqag9a8j12n3xjircwzndjwgb84qm7rsgbns60v3ci8y";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -147,12 +164,12 @@
         };
       }) {};
     ascii-art-to-unicode = callPackage ({ elpaBuild, fetchurl, lib }:
-    elpaBuild {
+      elpaBuild {
         pname = "ascii-art-to-unicode";
-        version = "1.11";
+        version = "1.12";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/ascii-art-to-unicode-1.11.el";
-          sha256 = "1z1vjpskvhynja41cv5z6xrz3rmpdzz51avv2gzrpxxa4k6iaz8s";
+          url = "https://elpa.gnu.org/packages/ascii-art-to-unicode-1.12.el";
+          sha256 = "1w9h2lyriafxj71r79774gh822cz8mry3gdfzyj6ym6v9mvqypna";
         };
         packageRequires = [];
         meta = {
@@ -160,7 +177,8 @@
           license = lib.licenses.free;
         };
       }) {};
-    async = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+    async = callPackage ({ elpaBuild, fetchurl, lib }:
+      elpaBuild {
         pname = "async";
         version = "1.9.2";
         src = fetchurl {
@@ -173,7 +191,8 @@
           license = lib.licenses.free;
         };
       }) {};
-    auctex = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+    auctex = callPackage ({ elpaBuild, fetchurl, lib }:
+      elpaBuild {
         pname = "auctex";
         version = "12.1.1";
         src = fetchurl {
@@ -186,7 +205,8 @@
           license = lib.licenses.free;
         };
       }) {};
-    aumix-mode = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+    aumix-mode = callPackage ({ elpaBuild, fetchurl, lib }:
+      elpaBuild {
         pname = "aumix-mode";
         version = "7";
         src = fetchurl {
@@ -199,12 +219,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    auto-correct = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+    auto-correct = callPackage ({ elpaBuild, fetchurl, lib }:
+      elpaBuild {
         pname = "auto-correct";
-        version = "1.1.3";
+        version = "1.1.4";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/auto-correct-1.1.3.el";
-          sha256 = "09r58p8na1ai2v9zllb92lvsjlq2jfzwvj0ipck1py0i4xfsm7aq";
+          url = "https://elpa.gnu.org/packages/auto-correct-1.1.4.el";
+          sha256 = "1ml35l6lk4sf51sh6cal1ylsn61iddz0s01wwly199i3nim0qnw8";
         };
         packageRequires = [];
         meta = {
@@ -212,7 +233,8 @@
           license = lib.licenses.free;
         };
       }) {};
-    auto-overlays = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+    auto-overlays = callPackage ({ elpaBuild, fetchurl, lib }:
+      elpaBuild {
         pname = "auto-overlays";
         version = "0.10.9";
         src = fetchurl {
@@ -226,7 +248,7 @@
         };
       }) {};
     avy = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
-    elpaBuild {
+      elpaBuild {
         pname = "avy";
         version = "0.4.0";
         src = fetchurl {
@@ -239,7 +261,8 @@
           license = lib.licenses.free;
         };
       }) {};
-    bbdb = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild {
+    bbdb = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
         pname = "bbdb";
         version = "3.2";
         src = fetchurl {
@@ -252,7 +275,8 @@
           license = lib.licenses.free;
         };
       }) {};
-    beacon = callPackage ({ elpaBuild, fetchurl, lib, seq }: elpaBuild {
+    beacon = callPackage ({ elpaBuild, fetchurl, lib, seq }:
+      elpaBuild {
         pname = "beacon";
         version = "1.3.3";
         src = fetchurl {
@@ -266,7 +290,7 @@
         };
       }) {};
     bug-hunter = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib, seq }:
-    elpaBuild {
+      elpaBuild {
         pname = "bug-hunter";
         version = "1.3.1";
         src = fetchurl {
@@ -279,7 +303,8 @@
           license = lib.licenses.free;
         };
       }) {};
-    caps-lock = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+    caps-lock = callPackage ({ elpaBuild, fetchurl, lib }:
+      elpaBuild {
         pname = "caps-lock";
         version = "1.0";
         src = fetchurl {
@@ -292,7 +317,8 @@
           license = lib.licenses.free;
         };
       }) {};
-    captain = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+    captain = callPackage ({ elpaBuild, fetchurl, lib }:
+      elpaBuild {
         pname = "captain";
         version = "1.0.3";
         src = fetchurl {
@@ -306,7 +332,7 @@
         };
       }) {};
     chess = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
-    elpaBuild {
+      elpaBuild {
         pname = "chess";
         version = "2.0.4";
         src = fetchurl {
@@ -319,7 +345,8 @@
           license = lib.licenses.free;
         };
       }) {};
-    cl-generic = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+    cl-generic = callPackage ({ elpaBuild, fetchurl, lib }:
+      elpaBuild {
         pname = "cl-generic";
         version = "0.3";
         src = fetchurl {
@@ -332,7 +359,8 @@
           license = lib.licenses.free;
         };
       }) {};
-    cl-lib = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+    cl-lib = callPackage ({ elpaBuild, fetchurl, lib }:
+      elpaBuild {
         pname = "cl-lib";
         version = "0.6.1";
         src = fetchurl {
@@ -345,7 +373,8 @@
           license = lib.licenses.free;
         };
       }) {};
-    cl-print = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild {
+    cl-print = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
         pname = "cl-print";
         version = "1.0";
         src = fetchurl {
@@ -359,7 +388,7 @@
         };
       }) {};
     cobol-mode = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
-    elpaBuild {
+      elpaBuild {
         pname = "cobol-mode";
         version = "1.0.0";
         src = fetchurl {
@@ -372,7 +401,8 @@
           license = lib.licenses.free;
         };
       }) {};
-    coffee-mode = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+    coffee-mode = callPackage ({ elpaBuild, fetchurl, lib }:
+      elpaBuild {
         pname = "coffee-mode";
         version = "0.4.1.1";
         src = fetchurl {
@@ -385,7 +415,8 @@
           license = lib.licenses.free;
         };
       }) {};
-    compact-docstrings = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+    compact-docstrings = callPackage ({ elpaBuild, fetchurl, lib }:
+      elpaBuild {
         pname = "compact-docstrings";
         version = "0.1";
         src = fetchurl {
@@ -398,7 +429,8 @@
           license = lib.licenses.free;
         };
       }) {};
-    company = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild {
+    company = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
         pname = "company";
         version = "0.9.6";
         src = fetchurl {
@@ -412,7 +444,7 @@
         };
       }) {};
     company-ebdb = callPackage ({ company, ebdb, elpaBuild, fetchurl, lib }:
-    elpaBuild {
+      elpaBuild {
         pname = "company-ebdb";
         version = "1";
         src = fetchurl {
@@ -425,8 +457,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    company-math = callPackage ({ company, elpaBuild, fetchurl, lib, math-symbol-lists }:
-    elpaBuild {
+    company-math = callPackage ({ company
+                                , elpaBuild
+                                , fetchurl
+                                , lib
+                                , math-symbol-lists }:
+      elpaBuild {
         pname = "company-math";
         version = "1.1";
         src = fetchurl {
@@ -439,8 +475,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    company-statistics = callPackage ({ company, elpaBuild, emacs, fetchurl, lib }:
-    elpaBuild {
+    company-statistics = callPackage ({ company
+                                      , elpaBuild
+                                      , emacs
+                                      , fetchurl
+                                      , lib }:
+      elpaBuild {
         pname = "company-statistics";
         version = "0.2.3";
         src = fetchurl {
@@ -454,7 +494,7 @@
         };
       }) {};
     context-coloring = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-    elpaBuild {
+      elpaBuild {
         pname = "context-coloring";
         version = "8.1.0";
         src = fetchurl {
@@ -468,7 +508,7 @@
         };
       }) {};
     counsel-ebdb = callPackage ({ ebdb, elpaBuild, fetchurl, ivy, lib }:
-    elpaBuild {
+      elpaBuild {
         pname = "counsel-ebdb";
         version = "1";
         src = fetchurl {
@@ -481,7 +521,8 @@
           license = lib.licenses.free;
         };
       }) {};
-    crisp = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+    crisp = callPackage ({ elpaBuild, fetchurl, lib }:
+      elpaBuild {
         pname = "crisp";
         version = "1.3.4";
         src = fetchurl {
@@ -494,7 +535,8 @@
           license = lib.licenses.free;
         };
       }) {};
-    csv-mode = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+    csv-mode = callPackage ({ elpaBuild, fetchurl, lib }:
+      elpaBuild {
         pname = "csv-mode";
         version = "1.7";
         src = fetchurl {
@@ -507,7 +549,8 @@
           license = lib.licenses.free;
         };
       }) {};
-    cycle-quotes = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+    cycle-quotes = callPackage ({ elpaBuild, fetchurl, lib }:
+      elpaBuild {
         pname = "cycle-quotes";
         version = "0.1";
         src = fetchurl {
@@ -521,7 +564,7 @@
         };
       }) {};
     darkroom = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
-    elpaBuild {
+      elpaBuild {
         pname = "darkroom";
         version = "0.1";
         src = fetchurl {
@@ -534,7 +577,8 @@
           license = lib.licenses.free;
         };
       }) {};
-    dash = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+    dash = callPackage ({ elpaBuild, fetchurl, lib }:
+      elpaBuild {
         pname = "dash";
         version = "2.12.0";
         src = fetchurl {
@@ -548,7 +592,7 @@
         };
       }) {};
     dbus-codegen = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
-    elpaBuild {
+      elpaBuild {
         pname = "dbus-codegen";
         version = "0.1";
         src = fetchurl {
@@ -561,8 +605,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    debbugs = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib, soap-client }:
-    elpaBuild {
+    debbugs = callPackage ({ cl-lib ? null
+                           , elpaBuild
+                           , fetchurl
+                           , lib
+                           , soap-client }:
+      elpaBuild {
         pname = "debbugs";
         version = "0.15";
         src = fetchurl {
@@ -575,7 +623,8 @@
           license = lib.licenses.free;
         };
       }) {};
-    delight = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+    delight = callPackage ({ elpaBuild, fetchurl, lib }:
+      elpaBuild {
         pname = "delight";
         version = "1.5";
         src = fetchurl {
@@ -589,7 +638,7 @@
         };
       }) {};
     dict-tree = callPackage ({ elpaBuild, fetchurl, heap, lib, tNFA, trie }:
-    elpaBuild {
+      elpaBuild {
         pname = "dict-tree";
         version = "0.14";
         src = fetchurl {
@@ -603,7 +652,7 @@
         };
       }) {};
     diff-hl = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
-    elpaBuild {
+      elpaBuild {
         pname = "diff-hl";
         version = "1.8.4";
         src = fetchurl {
@@ -616,7 +665,8 @@
           license = lib.licenses.free;
         };
       }) {};
-    diffview = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+    diffview = callPackage ({ elpaBuild, fetchurl, lib }:
+      elpaBuild {
         pname = "diffview";
         version = "1.0";
         src = fetchurl {
@@ -630,7 +680,7 @@
         };
       }) {};
     dired-du = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
-    elpaBuild {
+      elpaBuild {
         pname = "dired-du";
         version = "0.5";
         src = fetchurl {
@@ -644,7 +694,7 @@
         };
       }) {};
     dismal = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
-    elpaBuild {
+      elpaBuild {
         pname = "dismal";
         version = "1.5";
         src = fetchurl {
@@ -657,7 +707,8 @@
           license = lib.licenses.free;
         };
       }) {};
-    djvu = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+    djvu = callPackage ({ elpaBuild, fetchurl, lib }:
+      elpaBuild {
         pname = "djvu";
         version = "0.5";
         src = fetchurl {
@@ -670,7 +721,8 @@
           license = lib.licenses.free;
         };
       }) {};
-    docbook = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+    docbook = callPackage ({ elpaBuild, fetchurl, lib }:
+      elpaBuild {
         pname = "docbook";
         version = "0.1";
         src = fetchurl {
@@ -683,7 +735,8 @@
           license = lib.licenses.free;
         };
       }) {};
-    dts-mode = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+    dts-mode = callPackage ({ elpaBuild, fetchurl, lib }:
+      elpaBuild {
         pname = "dts-mode";
         version = "0.1.0";
         src = fetchurl {
@@ -697,7 +750,7 @@
         };
       }) {};
     easy-kill = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
-    elpaBuild {
+      elpaBuild {
         pname = "easy-kill";
         version = "0.9.3";
         src = fetchurl {
@@ -711,12 +764,12 @@
         };
       }) {};
     ebdb = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib, seq }:
-    elpaBuild {
+      elpaBuild {
         pname = "ebdb";
-        version = "0.5.2";
+        version = "0.5.4";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/ebdb-0.5.2.tar";
-          sha256 = "09ff6kf74r6hg3m6lryrjr2rrczm9h702jpkap71xrj0fk4zfb5c";
+          url = "https://elpa.gnu.org/packages/ebdb-0.5.4.tar";
+          sha256 = "1dripbiwplyjalzmkr8awaimhkp9f6c2bhnm3c77027k2b87w4lf";
         };
         packageRequires = [ cl-lib emacs seq ];
         meta = {
@@ -725,7 +778,7 @@
         };
       }) {};
     ebdb-gnorb = callPackage ({ ebdb, elpaBuild, fetchurl, gnorb, lib }:
-    elpaBuild {
+      elpaBuild {
         pname = "ebdb-gnorb";
         version = "1.0.2";
         src = fetchurl {
@@ -739,7 +792,7 @@
         };
       }) {};
     ebdb-i18n-chn = callPackage ({ ebdb, elpaBuild, fetchurl, lib, pyim }:
-    elpaBuild {
+      elpaBuild {
         pname = "ebdb-i18n-chn";
         version = "1.2";
         src = fetchurl {
@@ -752,7 +805,8 @@
           license = lib.licenses.free;
         };
       }) {};
-    ediprolog = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+    ediprolog = callPackage ({ elpaBuild, fetchurl, lib }:
+      elpaBuild {
         pname = "ediprolog";
         version = "1.2";
         src = fetchurl {
@@ -765,13 +819,32 @@
           license = lib.licenses.free;
         };
       }) {};
-    el-search = callPackage ({ cl-print, elpaBuild, emacs, fetchurl, lib, stream }:
-    elpaBuild {
+    eglot = callPackage ({ elpaBuild, emacs, fetchurl, jsonrpc, lib }:
+      elpaBuild {
+        pname = "eglot";
+        version = "1.1";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/packages/eglot-1.1.tar";
+          sha256 = "01h4wh87lrd9l50y20gjjkgg760v8ixvbcb3q8jykl29989zw62y";
+        };
+        packageRequires = [ emacs jsonrpc ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/eglot.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    el-search = callPackage ({ cl-print
+                             , elpaBuild
+                             , emacs
+                             , fetchurl
+                             , lib
+                             , stream }:
+      elpaBuild {
         pname = "el-search";
-        version = "1.6.5";
+        version = "1.7.2";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/el-search-1.6.5.tar";
-          sha256 = "1iw13ifyrga2r2xz63zhjxiy541jy4p2rp3a8fgb22sjw1zi8n7w";
+          url = "https://elpa.gnu.org/packages/el-search-1.7.2.tar";
+          sha256 = "17frf7alnwvjd0dn0xd7g95nfq8nb2x9lqady0bv3ngr7c2ls5r6";
         };
         packageRequires = [ cl-print emacs stream ];
         meta = {
@@ -779,7 +852,8 @@
           license = lib.licenses.free;
         };
       }) {};
-    eldoc-eval = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+    eldoc-eval = callPackage ({ elpaBuild, fetchurl, lib }:
+      elpaBuild {
         pname = "eldoc-eval";
         version = "0.1";
         src = fetchurl {
@@ -792,7 +866,8 @@
           license = lib.licenses.free;
         };
       }) {};
-    electric-spacing = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+    electric-spacing = callPackage ({ elpaBuild, fetchurl, lib }:
+      elpaBuild {
         pname = "electric-spacing";
         version = "5.0";
         src = fetchurl {
@@ -805,7 +880,8 @@
           license = lib.licenses.free;
         };
       }) {};
-    enwc = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild {
+    enwc = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
         pname = "enwc";
         version = "2.0";
         src = fetchurl {
@@ -818,7 +894,8 @@
           license = lib.licenses.free;
         };
       }) {};
-    epoch-view = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+    epoch-view = callPackage ({ elpaBuild, fetchurl, lib }:
+      elpaBuild {
         pname = "epoch-view";
         version = "0.0.1";
         src = fetchurl {
@@ -831,8 +908,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    ergoemacs-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib, undo-tree }:
-    elpaBuild {
+    ergoemacs-mode = callPackage ({ elpaBuild
+                                  , emacs
+                                  , fetchurl
+                                  , lib
+                                  , undo-tree }:
+      elpaBuild {
         pname = "ergoemacs-mode";
         version = "5.14.7.3";
         src = fetchurl {
@@ -845,8 +926,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    excorporate = callPackage ({ elpaBuild, emacs, fetchurl, fsm, lib, soap-client, url-http-ntlm }:
-    elpaBuild {
+    excorporate = callPackage ({ elpaBuild
+                               , emacs
+                               , fetchurl
+                               , fsm
+                               , lib
+                               , soap-client
+                               , url-http-ntlm }:
+      elpaBuild {
         pname = "excorporate";
         version = "0.7.6";
         src = fetchurl {
@@ -859,7 +946,8 @@
           license = lib.licenses.free;
         };
       }) {};
-    exwm = callPackage ({ elpaBuild, fetchurl, lib, xelb }: elpaBuild {
+    exwm = callPackage ({ elpaBuild, fetchurl, lib, xelb }:
+      elpaBuild {
         pname = "exwm";
         version = "0.18";
         src = fetchurl {
@@ -873,7 +961,7 @@
         };
       }) {};
     f90-interface-browser = callPackage ({ elpaBuild, fetchurl, lib }:
-    elpaBuild {
+      elpaBuild {
         pname = "f90-interface-browser";
         version = "1.1";
         src = fetchurl {
@@ -886,8 +974,22 @@
           license = lib.licenses.free;
         };
       }) {};
+    filladapt = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
+        pname = "filladapt";
+        version = "2.12.2";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/packages/filladapt-2.12.2.el";
+          sha256 = "1cxyxfdjg1dsmn1jrl6b7xy03xr42fb6vyggh27s4dk417ils6yg";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/filladapt.html";
+          license = lib.licenses.free;
+        };
+      }) {};
     flylisp = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
-    elpaBuild {
+      elpaBuild {
         pname = "flylisp";
         version = "0.2";
         src = fetchurl {
@@ -900,8 +1002,22 @@
           license = lib.licenses.free;
         };
       }) {};
+    frame-tabs = callPackage ({ elpaBuild, fetchurl, lib }:
+      elpaBuild {
+        pname = "frame-tabs";
+        version = "1.1";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/packages/frame-tabs-1.1.el";
+          sha256 = "0fx9zc7mvyl703k7sjjcvffm2qw42ncr7r3d4fm0h45p9pi83svz";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/frame-tabs.html";
+          license = lib.licenses.free;
+        };
+      }) {};
     fsm = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
-    elpaBuild {
+      elpaBuild {
         pname = "fsm";
         version = "0.2.1";
         src = fetchurl {
@@ -915,7 +1031,7 @@
         };
       }) {};
     ggtags = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
-    elpaBuild {
+      elpaBuild {
         pname = "ggtags";
         version = "0.8.12";
         src = fetchurl {
@@ -929,12 +1045,12 @@
         };
       }) {};
     gited = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
-    elpaBuild {
+      elpaBuild {
         pname = "gited";
-        version = "0.4.3";
+        version = "0.5.3";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/gited-0.4.3.tar";
-          sha256 = "07sjrh7900v5gkjzac2hh05ygywp6k4803ikc3wj3x22yrc9l8bx";
+          url = "https://elpa.gnu.org/packages/gited-0.5.3.tar";
+          sha256 = "1bayfclczdzrmay8swszs8lliz5p4nnmjzzz2gh68rc16isjgh2z";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -943,7 +1059,7 @@
         };
       }) {};
     gle-mode = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
-    elpaBuild {
+      elpaBuild {
         pname = "gle-mode";
         version = "1.1";
         src = fetchurl {
@@ -956,7 +1072,8 @@
           license = lib.licenses.free;
         };
       }) {};
-    gnome-c-style = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+    gnome-c-style = callPackage ({ elpaBuild, fetchurl, lib }:
+      elpaBuild {
         pname = "gnome-c-style";
         version = "0.1";
         src = fetchurl {
@@ -970,12 +1087,12 @@
         };
       }) {};
     gnorb = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
-    elpaBuild {
+      elpaBuild {
         pname = "gnorb";
-        version = "1.4.2";
+        version = "1.5.5";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/gnorb-1.4.2.tar";
-          sha256 = "1892j8gdbcny6b9psxa1lwxsb1gkj9z9z00rfc62kdw8bffmx38y";
+          url = "https://elpa.gnu.org/packages/gnorb-1.5.5.tar";
+          sha256 = "02l9snarsnzwp9w284wiylbd596g0f9bmahb1nybr14vh64ygh3r";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -983,8 +1100,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    gnugo = callPackage ({ ascii-art-to-unicode, cl-lib ? null, elpaBuild, fetchurl, lib, xpm }:
-    elpaBuild {
+    gnugo = callPackage ({ ascii-art-to-unicode
+                         , cl-lib ? null
+                         , elpaBuild
+                         , fetchurl
+                         , lib
+                         , xpm }:
+      elpaBuild {
         pname = "gnugo";
         version = "3.1.0";
         src = fetchurl {
@@ -997,7 +1119,8 @@
           license = lib.licenses.free;
         };
       }) {};
-    heap = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+    heap = callPackage ({ elpaBuild, fetchurl, lib }:
+      elpaBuild {
         pname = "heap";
         version = "0.5";
         src = fetchurl {
@@ -1011,7 +1134,7 @@
         };
       }) {};
     helm-ebdb = callPackage ({ ebdb, elpaBuild, fetchurl, helm, lib }:
-    elpaBuild {
+      elpaBuild {
         pname = "helm-ebdb";
         version = "1";
         src = fetchurl {
@@ -1024,8 +1147,10 @@
           license = lib.licenses.free;
         };
       }) {};
-    highlight-escape-sequences = callPackage ({ elpaBuild, fetchurl, lib }:
-    elpaBuild {
+    highlight-escape-sequences = callPackage ({ elpaBuild
+                                              , fetchurl
+                                              , lib }:
+      elpaBuild {
         pname = "highlight-escape-sequences";
         version = "0.3";
         src = fetchurl {
@@ -1038,7 +1163,8 @@
           license = lib.licenses.free;
         };
       }) {};
-    hook-helpers = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild {
+    hook-helpers = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
         pname = "hook-helpers";
         version = "1.1.1";
         src = fetchurl {
@@ -1051,7 +1177,8 @@
           license = lib.licenses.free;
         };
       }) {};
-    html5-schema = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+    html5-schema = callPackage ({ elpaBuild, fetchurl, lib }:
+      elpaBuild {
         pname = "html5-schema";
         version = "0.1";
         src = fetchurl {
@@ -1065,7 +1192,7 @@
         };
       }) {};
     hydra = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
-    elpaBuild {
+      elpaBuild {
         pname = "hydra";
         version = "0.14.0";
         src = fetchurl {
@@ -1078,7 +1205,8 @@
           license = lib.licenses.free;
         };
       }) {};
-    hyperbole = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild {
+    hyperbole = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
         pname = "hyperbole";
         version = "7.0.2";
         src = fetchurl {
@@ -1091,7 +1219,8 @@
           license = lib.licenses.free;
         };
       }) {};
-    ioccur = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+    ioccur = callPackage ({ elpaBuild, fetchurl, lib }:
+      elpaBuild {
         pname = "ioccur";
         version = "2.4";
         src = fetchurl {
@@ -1104,7 +1233,8 @@
           license = lib.licenses.free;
         };
       }) {};
-    iterators = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild {
+    iterators = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
         pname = "iterators";
         version = "0.1.1";
         src = fetchurl {
@@ -1117,7 +1247,8 @@
           license = lib.licenses.free;
         };
       }) {};
-    ivy = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild {
+    ivy = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
         pname = "ivy";
         version = "0.10.0";
         src = fetchurl {
@@ -1130,7 +1261,8 @@
           license = lib.licenses.free;
         };
       }) {};
-    javaimp = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+    javaimp = callPackage ({ elpaBuild, fetchurl, lib }:
+      elpaBuild {
         pname = "javaimp";
         version = "0.6";
         src = fetchurl {
@@ -1144,7 +1276,7 @@
         };
       }) {};
     jgraph-mode = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
-    elpaBuild {
+      elpaBuild {
         pname = "jgraph-mode";
         version = "1.1";
         src = fetchurl {
@@ -1158,7 +1290,7 @@
         };
       }) {};
     js2-mode = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
-    elpaBuild {
+      elpaBuild {
         pname = "js2-mode";
         version = "20180301";
         src = fetchurl {
@@ -1171,7 +1303,8 @@
           license = lib.licenses.free;
         };
       }) {};
-    json-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild {
+    json-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
         pname = "json-mode";
         version = "0.1";
         src = fetchurl {
@@ -1184,7 +1317,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    jumpc = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+    jsonrpc = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
+        pname = "jsonrpc";
+        version = "1.0.0";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/packages/jsonrpc-1.0.0.el";
+          sha256 = "06lmmn7j2ilkvwibbpgnd8p6d63fjjnxd2ma8f4jw6vrz1f7lwvs";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/jsonrpc.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    jumpc = callPackage ({ elpaBuild, fetchurl, lib }:
+      elpaBuild {
         pname = "jumpc";
         version = "3.0";
         src = fetchurl {
@@ -1197,7 +1345,8 @@
           license = lib.licenses.free;
         };
       }) {};
-    kmb = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild {
+    kmb = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
         pname = "kmb";
         version = "0.1";
         src = fetchurl {
@@ -1210,7 +1359,8 @@
           license = lib.licenses.free;
         };
       }) {};
-    landmark = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+    landmark = callPackage ({ elpaBuild, fetchurl, lib }:
+      elpaBuild {
         pname = "landmark";
         version = "1.0";
         src = fetchurl {
@@ -1223,7 +1373,8 @@
           license = lib.licenses.free;
         };
       }) {};
-    let-alist = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild {
+    let-alist = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
         pname = "let-alist";
         version = "1.0.5";
         src = fetchurl {
@@ -1236,7 +1387,8 @@
           license = lib.licenses.free;
         };
       }) {};
-    lex = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+    lex = callPackage ({ elpaBuild, fetchurl, lib }:
+      elpaBuild {
         pname = "lex";
         version = "1.1";
         src = fetchurl {
@@ -1250,7 +1402,7 @@
         };
       }) {};
     lmc = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
-    elpaBuild {
+      elpaBuild {
         pname = "lmc";
         version = "1.4";
         src = fetchurl {
@@ -1264,7 +1416,7 @@
         };
       }) {};
     load-dir = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
-    elpaBuild {
+      elpaBuild {
         pname = "load-dir";
         version = "0.0.5";
         src = fetchurl {
@@ -1277,7 +1429,8 @@
           license = lib.licenses.free;
         };
       }) {};
-    load-relative = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+    load-relative = callPackage ({ elpaBuild, fetchurl, lib }:
+      elpaBuild {
         pname = "load-relative";
         version = "1.3";
         src = fetchurl {
@@ -1290,7 +1443,8 @@
           license = lib.licenses.free;
         };
       }) {};
-    loc-changes = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+    loc-changes = callPackage ({ elpaBuild, fetchurl, lib }:
+      elpaBuild {
         pname = "loc-changes";
         version = "1.2";
         src = fetchurl {
@@ -1304,7 +1458,7 @@
         };
       }) {};
     loccur = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
-    elpaBuild {
+      elpaBuild {
         pname = "loccur";
         version = "1.2.3";
         src = fetchurl {
@@ -1317,7 +1471,8 @@
           license = lib.licenses.free;
         };
       }) {};
-    markchars = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+    markchars = callPackage ({ elpaBuild, fetchurl, lib }:
+      elpaBuild {
         pname = "markchars";
         version = "0.2.0";
         src = fetchurl {
@@ -1330,7 +1485,8 @@
           license = lib.licenses.free;
         };
       }) {};
-    math-symbol-lists = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+    math-symbol-lists = callPackage ({ elpaBuild, fetchurl, lib }:
+      elpaBuild {
         pname = "math-symbol-lists";
         version = "1.1";
         src = fetchurl {
@@ -1343,7 +1499,8 @@
           license = lib.licenses.free;
         };
       }) {};
-    memory-usage = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+    memory-usage = callPackage ({ elpaBuild, fetchurl, lib }:
+      elpaBuild {
         pname = "memory-usage";
         version = "0.2";
         src = fetchurl {
@@ -1357,7 +1514,7 @@
         };
       }) {};
     metar = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
-    elpaBuild {
+      elpaBuild {
         pname = "metar";
         version = "0.3";
         src = fetchurl {
@@ -1370,7 +1527,8 @@
           license = lib.licenses.free;
         };
       }) {};
-    midi-kbd = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild {
+    midi-kbd = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
         pname = "midi-kbd";
         version = "0.2";
         src = fetchurl {
@@ -1384,7 +1542,7 @@
         };
       }) {};
     mines = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
-    elpaBuild {
+      elpaBuild {
         pname = "mines";
         version = "1.6";
         src = fetchurl {
@@ -1397,7 +1555,8 @@
           license = lib.licenses.free;
         };
       }) {};
-    minibuffer-line = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+    minibuffer-line = callPackage ({ elpaBuild, fetchurl, lib }:
+      elpaBuild {
         pname = "minibuffer-line";
         version = "0.1";
         src = fetchurl {
@@ -1410,7 +1569,8 @@
           license = lib.licenses.free;
         };
       }) {};
-    minimap = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+    minimap = callPackage ({ elpaBuild, fetchurl, lib }:
+      elpaBuild {
         pname = "minimap";
         version = "1.2";
         src = fetchurl {
@@ -1424,12 +1584,12 @@
         };
       }) {};
     mmm-mode = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
-    elpaBuild {
+      elpaBuild {
         pname = "mmm-mode";
-        version = "0.5.6";
+        version = "0.5.7";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/mmm-mode-0.5.6.tar";
-          sha256 = "1vwsi8sk1i16dvz940c6q7i75023hrw07sc4cpmcz06rj8r68gr0";
+          url = "https://elpa.gnu.org/packages/mmm-mode-0.5.7.tar";
+          sha256 = "0c4azrkgagyfm9znh7hmw93gkvddpsxlr0dwjp96winymih7mahf";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -1438,7 +1598,7 @@
         };
       }) {};
     multishell = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
-    elpaBuild {
+      elpaBuild {
         pname = "multishell";
         version = "1.1.5";
         src = fetchurl {
@@ -1451,7 +1611,8 @@
           license = lib.licenses.free;
         };
       }) {};
-    muse = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+    muse = callPackage ({ elpaBuild, fetchurl, lib }:
+      elpaBuild {
         pname = "muse";
         version = "3.20.2";
         src = fetchurl {
@@ -1464,7 +1625,8 @@
           license = lib.licenses.free;
         };
       }) {};
-    myers = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild {
+    myers = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
         pname = "myers";
         version = "0.1";
         src = fetchurl {
@@ -1477,7 +1639,8 @@
           license = lib.licenses.free;
         };
       }) {};
-    nameless = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild {
+    nameless = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
         pname = "nameless";
         version = "1.0.2";
         src = fetchurl {
@@ -1491,7 +1654,7 @@
         };
       }) {};
     names = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
-    elpaBuild {
+      elpaBuild {
         pname = "names";
         version = "20151201.0";
         src = fetchurl {
@@ -1504,13 +1667,17 @@
           license = lib.licenses.free;
         };
       }) {};
-    nhexl-mode = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
-    elpaBuild {
+    nhexl-mode = callPackage ({ cl-lib ? null
+                              , elpaBuild
+                              , emacs
+                              , fetchurl
+                              , lib }:
+      elpaBuild {
         pname = "nhexl-mode";
-        version = "0.5";
+        version = "0.9";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/nhexl-mode-0.5.el";
-          sha256 = "02z2mx39m96s7v5d8sh6hxb5p70qzbagjfa3lavfw10zjim8g9wl";
+          url = "https://elpa.gnu.org/packages/nhexl-mode-0.9.el";
+          sha256 = "1xdr0z5nlfqsyrmj3cwgfp6qlirhr46ggawr7pr2ipnp64wgnmkc";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -1518,7 +1685,8 @@
           license = lib.licenses.free;
         };
       }) {};
-    nlinum = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+    nlinum = callPackage ({ elpaBuild, fetchurl, lib }:
+      elpaBuild {
         pname = "nlinum";
         version = "1.8.1";
         src = fetchurl {
@@ -1531,7 +1699,8 @@
           license = lib.licenses.free;
         };
       }) {};
-    notes-mode = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+    notes-mode = callPackage ({ elpaBuild, fetchurl, lib }:
+      elpaBuild {
         pname = "notes-mode";
         version = "1.30";
         src = fetchurl {
@@ -1544,7 +1713,8 @@
           license = lib.licenses.free;
         };
       }) {};
-    ntlm = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+    ntlm = callPackage ({ elpaBuild, fetchurl, lib }:
+      elpaBuild {
         pname = "ntlm";
         version = "2.1.0";
         src = fetchurl {
@@ -1557,7 +1727,8 @@
           license = lib.licenses.free;
         };
       }) {};
-    num3-mode = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+    num3-mode = callPackage ({ elpaBuild, fetchurl, lib }:
+      elpaBuild {
         pname = "num3-mode";
         version = "1.3";
         src = fetchurl {
@@ -1570,7 +1741,8 @@
           license = lib.licenses.free;
         };
       }) {};
-    oauth2 = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+    oauth2 = callPackage ({ elpaBuild, fetchurl, lib }:
+      elpaBuild {
         pname = "oauth2";
         version = "0.11";
         src = fetchurl {
@@ -1583,7 +1755,8 @@
           license = lib.licenses.free;
         };
       }) {};
-    omn-mode = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+    omn-mode = callPackage ({ elpaBuild, fetchurl, lib }:
+      elpaBuild {
         pname = "omn-mode";
         version = "1.2";
         src = fetchurl {
@@ -1597,7 +1770,7 @@
         };
       }) {};
     on-screen = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
-    elpaBuild {
+      elpaBuild {
         pname = "on-screen";
         version = "1.3.2";
         src = fetchurl {
@@ -1610,12 +1783,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+    org = callPackage ({ elpaBuild, fetchurl, lib }:
+      elpaBuild {
         pname = "org";
-        version = "9.1.10";
+        version = "9.1.13";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/org-9.1.10.tar";
-          sha256 = "01vvq6m7r2ifyflvq5ga241qvl4j62smz0zr6jljk56b6nqi20lm";
+          url = "https://elpa.gnu.org/packages/org-9.1.13.tar";
+          sha256 = "1vx0n32gvrgy2bl2b4pvxf00cywxwm57gi46f2b2zlrnmd5n85pr";
         };
         packageRequires = [];
         meta = {
@@ -1623,7 +1797,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    osc = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+    orgalist = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
+        pname = "orgalist";
+        version = "1.8";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/packages/orgalist-1.8.el";
+          sha256 = "1wqwnmn08i0qkxm8b2iclvf6cydcn68h1p3h7r1kig2bdn5b8948";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/orgalist.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    osc = callPackage ({ elpaBuild, fetchurl, lib }:
+      elpaBuild {
         pname = "osc";
         version = "0.1";
         src = fetchurl {
@@ -1637,7 +1826,7 @@
         };
       }) {};
     other-frame-window = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-    elpaBuild {
+      elpaBuild {
         pname = "other-frame-window";
         version = "1.0.4";
         src = fetchurl {
@@ -1650,7 +1839,8 @@
           license = lib.licenses.free;
         };
       }) {};
-    pabbrev = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+    pabbrev = callPackage ({ elpaBuild, fetchurl, lib }:
+      elpaBuild {
         pname = "pabbrev";
         version = "4.2.1";
         src = fetchurl {
@@ -1663,7 +1853,8 @@
           license = lib.licenses.free;
         };
       }) {};
-    paced = callPackage ({ async, elpaBuild, emacs, fetchurl, lib }: elpaBuild {
+    paced = callPackage ({ async, elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
         pname = "paced";
         version = "1.1.3";
         src = fetchurl {
@@ -1677,7 +1868,7 @@
         };
       }) {};
     parsec = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
-    elpaBuild {
+      elpaBuild {
         pname = "parsec";
         version = "0.1.3";
         src = fetchurl {
@@ -1690,7 +1881,8 @@
           license = lib.licenses.free;
         };
       }) {};
-    pinentry = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+    pinentry = callPackage ({ elpaBuild, fetchurl, lib }:
+      elpaBuild {
         pname = "pinentry";
         version = "0.1";
         src = fetchurl {
@@ -1703,7 +1895,8 @@
           license = lib.licenses.free;
         };
       }) {};
-    poker = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+    poker = callPackage ({ elpaBuild, fetchurl, lib }:
+      elpaBuild {
         pname = "poker";
         version = "0.2";
         src = fetchurl {
@@ -1716,7 +1909,8 @@
           license = lib.licenses.free;
         };
       }) {};
-    posframe = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild {
+    posframe = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
         pname = "posframe";
         version = "0.3.0";
         src = fetchurl {
@@ -1729,7 +1923,8 @@
           license = lib.licenses.free;
         };
       }) {};
-    psgml = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+    psgml = callPackage ({ elpaBuild, fetchurl, lib }:
+      elpaBuild {
         pname = "psgml";
         version = "1.3.4";
         src = fetchurl {
@@ -1743,7 +1938,7 @@
         };
       }) {};
     python = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
-    elpaBuild {
+      elpaBuild {
         pname = "python";
         version = "0.26.1";
         src = fetchurl {
@@ -1756,7 +1951,8 @@
           license = lib.licenses.free;
         };
       }) {};
-    quarter-plane = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+    quarter-plane = callPackage ({ elpaBuild, fetchurl, lib }:
+      elpaBuild {
         pname = "quarter-plane";
         version = "0.1";
         src = fetchurl {
@@ -1769,7 +1965,8 @@
           license = lib.licenses.free;
         };
       }) {};
-    queue = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+    queue = callPackage ({ elpaBuild, fetchurl, lib }:
+      elpaBuild {
         pname = "queue";
         version = "0.2";
         src = fetchurl {
@@ -1782,12 +1979,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    rainbow-mode = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+    rainbow-mode = callPackage ({ elpaBuild, fetchurl, lib }:
+      elpaBuild {
         pname = "rainbow-mode";
-        version = "1.0";
+        version = "1.0.1";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/rainbow-mode-1.0.el";
-          sha256 = "1mg9dbgvg79sphpic56d11mrjwx668xffx5z5jszc9fdl5b8ygml";
+          url = "https://elpa.gnu.org/packages/rainbow-mode-1.0.1.el";
+          sha256 = "0cpga4ax635rfpj7y2vmh7ank0yw00dcy20gjg1mj74r97by8csf";
         };
         packageRequires = [];
         meta = {
@@ -1795,7 +1993,8 @@
           license = lib.licenses.free;
         };
       }) {};
-    rbit = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+    rbit = callPackage ({ elpaBuild, fetchurl, lib }:
+      elpaBuild {
         pname = "rbit";
         version = "0.1";
         src = fetchurl {
@@ -1808,7 +2007,8 @@
           license = lib.licenses.free;
         };
       }) {};
-    rcirc-color = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+    rcirc-color = callPackage ({ elpaBuild, fetchurl, lib }:
+      elpaBuild {
         pname = "rcirc-color";
         version = "0.3";
         src = fetchurl {
@@ -1821,7 +2021,8 @@
           license = lib.licenses.free;
         };
       }) {};
-    rcirc-menu = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+    rcirc-menu = callPackage ({ elpaBuild, fetchurl, lib }:
+      elpaBuild {
         pname = "rcirc-menu";
         version = "1.1";
         src = fetchurl {
@@ -1834,8 +2035,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    realgud = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib, load-relative, loc-changes, test-simple }:
-    elpaBuild {
+    realgud = callPackage ({ cl-lib ? null
+                           , elpaBuild
+                           , emacs
+                           , fetchurl
+                           , lib
+                           , load-relative
+                           , loc-changes
+                           , test-simple }:
+      elpaBuild {
         pname = "realgud";
         version = "1.4.5";
         src = fetchurl {
@@ -1854,7 +2062,8 @@
           license = lib.licenses.free;
         };
       }) {};
-    register-list = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+    register-list = callPackage ({ elpaBuild, fetchurl, lib }:
+      elpaBuild {
         pname = "register-list";
         version = "0.1";
         src = fetchurl {
@@ -1868,7 +2077,7 @@
         };
       }) {};
     rich-minority = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
-    elpaBuild {
+      elpaBuild {
         pname = "rich-minority";
         version = "1.0.1";
         src = fetchurl {
@@ -1881,7 +2090,8 @@
           license = lib.licenses.free;
         };
       }) {};
-    rnc-mode = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+    rnc-mode = callPackage ({ elpaBuild, fetchurl, lib }:
+      elpaBuild {
         pname = "rnc-mode";
         version = "0.2";
         src = fetchurl {
@@ -1894,8 +2104,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    rudel = callPackage ({ cl-generic, cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
-    elpaBuild {
+    rudel = callPackage ({ cl-generic
+                         , cl-lib ? null
+                         , elpaBuild
+                         , emacs
+                         , fetchurl
+                         , lib }:
+      elpaBuild {
         pname = "rudel";
         version = "0.3.1";
         src = fetchurl {
@@ -1908,7 +2123,8 @@
           license = lib.licenses.free;
         };
       }) {};
-    scroll-restore = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+    scroll-restore = callPackage ({ elpaBuild, fetchurl, lib }:
+      elpaBuild {
         pname = "scroll-restore";
         version = "1.0";
         src = fetchurl {
@@ -1921,7 +2137,8 @@
           license = lib.licenses.free;
         };
       }) {};
-    sed-mode = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+    sed-mode = callPackage ({ elpaBuild, fetchurl, lib }:
+      elpaBuild {
         pname = "sed-mode";
         version = "1.0";
         src = fetchurl {
@@ -1934,7 +2151,8 @@
           license = lib.licenses.free;
         };
       }) {};
-    seq = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+    seq = callPackage ({ elpaBuild, fetchurl, lib }:
+      elpaBuild {
         pname = "seq";
         version = "2.20";
         src = fetchurl {
@@ -1947,7 +2165,8 @@
           license = lib.licenses.free;
         };
       }) {};
-    shen-mode = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+    shen-mode = callPackage ({ elpaBuild, fetchurl, lib }:
+      elpaBuild {
         pname = "shen-mode";
         version = "0.1";
         src = fetchurl {
@@ -1960,7 +2179,8 @@
           license = lib.licenses.free;
         };
       }) {};
-    sisu-mode = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+    sisu-mode = callPackage ({ elpaBuild, fetchurl, lib }:
+      elpaBuild {
         pname = "sisu-mode";
         version = "7.1.8";
         src = fetchurl {
@@ -1973,7 +2193,8 @@
           license = lib.licenses.free;
         };
       }) {};
-    smart-yank = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild {
+    smart-yank = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
         pname = "smart-yank";
         version = "0.1.1";
         src = fetchurl {
@@ -1987,7 +2208,7 @@
         };
       }) {};
     sml-mode = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
-    elpaBuild {
+      elpaBuild {
         pname = "sml-mode";
         version = "6.8";
         src = fetchurl {
@@ -2001,12 +2222,12 @@
         };
       }) {};
     soap-client = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
-    elpaBuild {
+      elpaBuild {
         pname = "soap-client";
-        version = "3.1.3";
+        version = "3.1.4";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/soap-client-3.1.3.tar";
-          sha256 = "1s5m6dc7z532wchdih2ax2a791khyajjxb2xaw5rklk47yc5v3nk";
+          url = "https://elpa.gnu.org/packages/soap-client-3.1.4.tar";
+          sha256 = "0q59abh2dmp7z0bcn672n9c2cfhg1xvxv1h9m9pwn97jw0ylf4mc";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -2014,7 +2235,8 @@
           license = lib.licenses.free;
         };
       }) {};
-    sokoban = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild {
+    sokoban = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
         pname = "sokoban";
         version = "1.4.6";
         src = fetchurl {
@@ -2027,7 +2249,8 @@
           license = lib.licenses.free;
         };
       }) {};
-    sotlisp = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild {
+    sotlisp = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
         pname = "sotlisp";
         version = "1.6.2";
         src = fetchurl {
@@ -2040,7 +2263,8 @@
           license = lib.licenses.free;
         };
       }) {};
-    spinner = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+    spinner = callPackage ({ elpaBuild, fetchurl, lib }:
+      elpaBuild {
         pname = "spinner";
         version = "1.7.3";
         src = fetchurl {
@@ -2053,20 +2277,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    sql-indent = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+    sql-indent = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
+      elpaBuild {
         pname = "sql-indent";
-        version = "1.1";
+        version = "1.2";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/sql-indent-1.1.tar";
-          sha256 = "06q41msfir178f50nk8fnyc1rwgyq5iyy17pv8mq0zqbacjbp88z";
+          url = "https://elpa.gnu.org/packages/sql-indent-1.2.tar";
+          sha256 = "0rbkj46gkn1dh5avrhxzhkb01ajm9q3iqfp10lgp3f4w1m2bhab4";
         };
-        packageRequires = [];
+        packageRequires = [ cl-lib ];
         meta = {
           homepage = "https://elpa.gnu.org/packages/sql-indent.html";
           license = lib.licenses.free;
         };
       }) {};
-    stream = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild {
+    stream = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
         pname = "stream";
         version = "2.2.4";
         src = fetchurl {
@@ -2079,7 +2305,8 @@
           license = lib.licenses.free;
         };
       }) {};
-    svg = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild {
+    svg = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
         pname = "svg";
         version = "0.1";
         src = fetchurl {
@@ -2093,7 +2320,7 @@
         };
       }) {};
     svg-clock = callPackage ({ elpaBuild, emacs, fetchurl, lib, svg }:
-    elpaBuild {
+      elpaBuild {
         pname = "svg-clock";
         version = "1.0";
         src = fetchurl {
@@ -2106,7 +2333,8 @@
           license = lib.licenses.free;
         };
       }) {};
-    tNFA = callPackage ({ elpaBuild, fetchurl, lib, queue }: elpaBuild {
+    tNFA = callPackage ({ elpaBuild, fetchurl, lib, queue }:
+      elpaBuild {
         pname = "tNFA";
         version = "0.1.1";
         src = fetchurl {
@@ -2120,7 +2348,7 @@
         };
       }) {};
     temp-buffer-browse = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-    elpaBuild {
+      elpaBuild {
         pname = "temp-buffer-browse";
         version = "1.5";
         src = fetchurl {
@@ -2134,7 +2362,7 @@
         };
       }) {};
     test-simple = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
-    elpaBuild {
+      elpaBuild {
         pname = "test-simple";
         version = "1.3.0";
         src = fetchurl {
@@ -2148,7 +2376,7 @@
         };
       }) {};
     timerfunctions = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
-    elpaBuild {
+      elpaBuild {
         pname = "timerfunctions";
         version = "1.4.2";
         src = fetchurl {
@@ -2161,7 +2389,8 @@
           license = lib.licenses.free;
         };
       }) {};
-    tiny = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+    tiny = callPackage ({ elpaBuild, fetchurl, lib }:
+      elpaBuild {
         pname = "tiny";
         version = "0.2.1";
         src = fetchurl {
@@ -2174,7 +2403,8 @@
           license = lib.licenses.free;
         };
       }) {};
-    tramp-theme = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild {
+    tramp-theme = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
         pname = "tramp-theme";
         version = "0.2";
         src = fetchurl {
@@ -2187,7 +2417,8 @@
           license = lib.licenses.free;
         };
       }) {};
-    transcribe = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+    transcribe = callPackage ({ elpaBuild, fetchurl, lib }:
+      elpaBuild {
         pname = "transcribe";
         version = "1.5.2";
         src = fetchurl {
@@ -2200,7 +2431,8 @@
           license = lib.licenses.free;
         };
       }) {};
-    trie = callPackage ({ elpaBuild, fetchurl, heap, lib, tNFA }: elpaBuild {
+    trie = callPackage ({ elpaBuild, fetchurl, heap, lib, tNFA }:
+      elpaBuild {
         pname = "trie";
         version = "0.4";
         src = fetchurl {
@@ -2213,7 +2445,8 @@
           license = lib.licenses.free;
         };
       }) {};
-    undo-tree = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+    undo-tree = callPackage ({ elpaBuild, fetchurl, lib }:
+      elpaBuild {
         pname = "undo-tree";
         version = "0.6.5";
         src = fetchurl {
@@ -2226,7 +2459,8 @@
           license = lib.licenses.free;
         };
       }) {};
-    uni-confusables = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+    uni-confusables = callPackage ({ elpaBuild, fetchurl, lib }:
+      elpaBuild {
         pname = "uni-confusables";
         version = "0.1";
         src = fetchurl {
@@ -2239,8 +2473,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    url-http-ntlm = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib, ntlm ? null }:
-    elpaBuild {
+    url-http-ntlm = callPackage ({ cl-lib ? null
+                                 , elpaBuild
+                                 , fetchurl
+                                 , lib
+                                 , ntlm ? null }:
+      elpaBuild {
         pname = "url-http-ntlm";
         version = "2.0.4";
         src = fetchurl {
@@ -2253,8 +2491,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    validate = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib, seq }:
-    elpaBuild {
+    validate = callPackage ({ cl-lib ? null
+                            , elpaBuild
+                            , emacs
+                            , fetchurl
+                            , lib
+                            , seq }:
+      elpaBuild {
         pname = "validate";
         version = "1.0.4";
         src = fetchurl {
@@ -2267,7 +2510,8 @@
           license = lib.licenses.free;
         };
       }) {};
-    vdiff = callPackage ({ elpaBuild, emacs, fetchurl, hydra, lib }: elpaBuild {
+    vdiff = callPackage ({ elpaBuild, emacs, fetchurl, hydra, lib }:
+      elpaBuild {
         pname = "vdiff";
         version = "0.2.3";
         src = fetchurl {
@@ -2280,7 +2524,8 @@
           license = lib.licenses.free;
         };
       }) {};
-    vigenere = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild {
+    vigenere = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
         pname = "vigenere";
         version = "1.0";
         src = fetchurl {
@@ -2293,7 +2538,8 @@
           license = lib.licenses.free;
         };
       }) {};
-    vlf = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+    vlf = callPackage ({ elpaBuild, fetchurl, lib }:
+      elpaBuild {
         pname = "vlf";
         version = "1.7.1";
         src = fetchurl {
@@ -2306,7 +2552,8 @@
           license = lib.licenses.free;
         };
       }) {};
-    w3 = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+    w3 = callPackage ({ elpaBuild, fetchurl, lib }:
+      elpaBuild {
         pname = "w3";
         version = "4.0.49";
         src = fetchurl {
@@ -2319,7 +2566,8 @@
           license = lib.licenses.free;
         };
       }) {};
-    wcheck-mode = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+    wcheck-mode = callPackage ({ elpaBuild, fetchurl, lib }:
+      elpaBuild {
         pname = "wcheck-mode";
         version = "2016.1.30";
         src = fetchurl {
@@ -2332,7 +2580,8 @@
           license = lib.licenses.free;
         };
       }) {};
-    wconf = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild {
+    wconf = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
         pname = "wconf";
         version = "0.2.1";
         src = fetchurl {
@@ -2345,7 +2594,8 @@
           license = lib.licenses.free;
         };
       }) {};
-    web-server = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild {
+    web-server = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
         pname = "web-server";
         version = "0.1.1";
         src = fetchurl {
@@ -2359,7 +2609,7 @@
         };
       }) {};
     websocket = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
-    elpaBuild {
+      elpaBuild {
         pname = "websocket";
         version = "1.8";
         src = fetchurl {
@@ -2372,12 +2622,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    which-key = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild {
+    which-key = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
         pname = "which-key";
-        version = "3.1.0";
+        version = "3.3.0";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/which-key-3.1.0.tar";
-          sha256 = "17n09i92m7qdicybxl60j81c8fn7jcx25wds0sb7j8i364psjabq";
+          url = "https://elpa.gnu.org/packages/which-key-3.3.0.tar";
+          sha256 = "0436hvqdn2jafgfwdr0m9mwz8k2swl661xnrkypyrwg66j9wi1qz";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -2385,7 +2636,8 @@
           license = lib.licenses.free;
         };
       }) {};
-    windresize = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+    windresize = callPackage ({ elpaBuild, fetchurl, lib }:
+      elpaBuild {
         pname = "windresize";
         version = "0.1";
         src = fetchurl {
@@ -2399,7 +2651,7 @@
         };
       }) {};
     wisi = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
-    elpaBuild {
+      elpaBuild {
         pname = "wisi";
         version = "1.1.6";
         src = fetchurl {
@@ -2412,7 +2664,8 @@
           license = lib.licenses.free;
         };
       }) {};
-    wpuzzle = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+    wpuzzle = callPackage ({ elpaBuild, fetchurl, lib }:
+      elpaBuild {
         pname = "wpuzzle";
         version = "1.1";
         src = fetchurl {
@@ -2425,7 +2678,8 @@
           license = lib.licenses.free;
         };
       }) {};
-    xclip = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+    xclip = callPackage ({ elpaBuild, fetchurl, lib }:
+      elpaBuild {
         pname = "xclip";
         version = "1.4";
         src = fetchurl {
@@ -2439,7 +2693,7 @@
         };
       }) {};
     xelb = callPackage ({ cl-generic, elpaBuild, emacs, fetchurl, lib }:
-    elpaBuild {
+      elpaBuild {
         pname = "xelb";
         version = "0.14";
         src = fetchurl {
@@ -2452,7 +2706,8 @@
           license = lib.licenses.free;
         };
       }) {};
-    xpm = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+    xpm = callPackage ({ elpaBuild, fetchurl, lib }:
+      elpaBuild {
         pname = "xpm";
         version = "1.0.4";
         src = fetchurl {
@@ -2466,12 +2721,12 @@
         };
       }) {};
     yasnippet = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
-    elpaBuild {
+      elpaBuild {
         pname = "yasnippet";
-        version = "0.12.2";
+        version = "0.13.0";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/yasnippet-0.12.2.tar";
-          sha256 = "03cilldgq7fpzk9ix2a8q1ppilxp5gvyrym7krifvrg1g2rs1qv9";
+          url = "https://elpa.gnu.org/packages/yasnippet-0.13.0.tar";
+          sha256 = "1klnvyy8az3h7i7yrpbhad4ka9p9vlgf918ha1vf7i3wbcbm0s5z";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -2479,8 +2734,25 @@
           license = lib.licenses.free;
         };
       }) {};
+    yasnippet-classic-snippets = callPackage ({ elpaBuild
+                                              , fetchurl
+                                              , lib
+                                              , yasnippet }:
+      elpaBuild {
+        pname = "yasnippet-classic-snippets";
+        version = "1.0.2";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/packages/yasnippet-classic-snippets-1.0.2.tar";
+          sha256 = "1kk1sf9kgj6qp3z2d9nbswigl444sqq11pdrhx0gny2jsgi3283l";
+        };
+        packageRequires = [ yasnippet ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/yasnippet-classic-snippets.html";
+          license = lib.licenses.free;
+        };
+      }) {};
     ztree = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
-    elpaBuild {
+      elpaBuild {
         pname = "ztree";
         version = "1.0.5";
         src = fetchurl {
diff --git a/pkgs/applications/editors/emacs-modes/filesets-plus/default.nix b/pkgs/applications/editors/emacs-modes/filesets-plus/default.nix
index 9a07b557325..f09a71ec9df 100644
--- a/pkgs/applications/editors/emacs-modes/filesets-plus/default.nix
+++ b/pkgs/applications/editors/emacs-modes/filesets-plus/default.nix
@@ -10,7 +10,7 @@ melpaBuild {
     name = "filesets+.el";
   };
 
-  recipeFile = fetchurl {
+  recipe = fetchurl {
     url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/filesets-plus+";
     sha256 = "1wn99cb53ykds87lg9mrlfpalrmjj177nwskrnp9wglyqs65lk4g";
     name = "filesets-plus";
diff --git a/pkgs/applications/editors/emacs-modes/font-lock-plus/default.nix b/pkgs/applications/editors/emacs-modes/font-lock-plus/default.nix
index 733393307d3..5362451e06b 100644
--- a/pkgs/applications/editors/emacs-modes/font-lock-plus/default.nix
+++ b/pkgs/applications/editors/emacs-modes/font-lock-plus/default.nix
@@ -10,7 +10,7 @@ melpaBuild {
     name = "font-lock+.el";
   };
 
-  recipeFile = fetchurl {
+  recipe = fetchurl {
     url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/font-lock+";
     sha256 = "1wn99cb53ykds87lg9mrlfpalrmjj177nwskrnp9wglyqs65lk4g";
     name = "font-lock-plus";
diff --git a/pkgs/applications/editors/emacs-modes/header2/default.nix b/pkgs/applications/editors/emacs-modes/header2/default.nix
index fb2bfbe7711..7da40425185 100644
--- a/pkgs/applications/editors/emacs-modes/header2/default.nix
+++ b/pkgs/applications/editors/emacs-modes/header2/default.nix
@@ -10,7 +10,7 @@ melpaBuild {
     name = "header2.el";
   };
 
-  recipeFile = fetchurl {
+  recipe = fetchurl {
     url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/header2";
     sha256 = "1dg25krx3wxma2l5vb2ji7rpfp17qbrl62jyjpa52cjfsvyp6v06";
     name = "header2";
diff --git a/pkgs/applications/editors/emacs-modes/hexrgb/default.nix b/pkgs/applications/editors/emacs-modes/hexrgb/default.nix
index 2781898c0da..3144eea702d 100644
--- a/pkgs/applications/editors/emacs-modes/hexrgb/default.nix
+++ b/pkgs/applications/editors/emacs-modes/hexrgb/default.nix
@@ -10,7 +10,7 @@ melpaBuild {
     name = "hexrgb.el";
   };
 
-  recipeFile = fetchurl {
+  recipe = fetchurl {
     url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/hexrgb";
     sha256 = "0mzqslrrf7sc262syj3ja7b7rnbg80dwf2p9bzxdrzx6b8vvsx06";
     name = "hexrgb";
diff --git a/pkgs/applications/editors/emacs-modes/lib-requires/default.nix b/pkgs/applications/editors/emacs-modes/lib-requires/default.nix
index 6c5b208eda3..8e5d5ee1929 100644
--- a/pkgs/applications/editors/emacs-modes/lib-requires/default.nix
+++ b/pkgs/applications/editors/emacs-modes/lib-requires/default.nix
@@ -10,7 +10,7 @@ melpaBuild {
     name = "lib-requires.el";
   };
 
-  recipeFile = fetchurl {
+  recipe = fetchurl {
     url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/lib-requires";
     sha256 = "1g22jh56z8rnq0h80wj10gs38yig1rk9xmk3kmhmm5mm6b14iwdx";
     name = "lib-requires";
diff --git a/pkgs/applications/editors/emacs-modes/melpa-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-generated.nix
index aec089f43de..943ade3ad1f 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-generated.nix
@@ -1,18 +1,22 @@
-{ callPackage }: {
-    _0blayout = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+{ callPackage }:
+  {
+    _0blayout = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "_0blayout";
         version = "20161007.2307";
         src = fetchFromGitHub {
           owner = "etu";
           repo = "0blayout-mode";
-          rev = "873732ddb99a3ec18845a37467ee06bce4e61d87";
-          sha256 = "1ymv9lqsn5xznyhax1pizw1i6h0pr7ckxhl28pix73wvzb5fl8mn";
+          rev = "4bc6ff06abf298270abb7ef40db605e08caa9287";
+          sha256 = "1ddzifckgac4k6invpvvad1avdrly0k5n0jnmc738xxnpc3fk6h6";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6521ec44ae8b0ba2e0523517f0f3d5b94ddbe1be/recipes/0blayout";
           sha256 = "027k85h34998i8vmbg2hi4q1m4f7jfva5jm38k0g9m1db700gk92";
-          name = "_0blayout";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -20,8 +24,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    _0xc = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    _0xc = callPackage ({ emacs
+                        , fetchFromGitHub
+                        , fetchurl
+                        , lib
+                        , melpaBuild
+                        , s }:
+      melpaBuild {
         pname = "_0xc";
         version = "20170125.1953";
         src = fetchFromGitHub {
@@ -30,10 +39,10 @@
           rev = "31890af88234e4e098f1c340a5990515b934c7f7";
           sha256 = "1yp3wm0h6rkzxw950fnhw310npn56s9vl294sw8nyij85s2hw5qk";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3fbb2c86a50a8df9a3967787fc10f33beab2c933/recipes/0xc";
           sha256 = "0lxcz1x1dymsh9idhkn7jn8vphr724d6sb88a4g55x2m1rlmzg3w";
-          name = "_0xc";
+          name = "recipe";
         };
         packageRequires = [ emacs s ];
         meta = {
@@ -41,8 +50,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    _2048-game = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    _2048-game = callPackage ({ fetchhg
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "_2048-game";
         version = "20151026.1233";
         src = fetchhg {
@@ -50,10 +62,10 @@
           rev = "ea6c3bce8ac1";
           sha256 = "1p9qn9n8mfb4z62h1s94mlg0vshpzafbhsxgzvx78sqlf6bfc80l";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/2048-game";
           sha256 = "0z7x9bnyi3qlq7l0fskb61i6yr9gm7w7wplqd28wz8p1j5yw8aa0";
-          name = "_2048-game";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -61,20 +73,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    _4clojure = callPackage ({ fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild, request }:
-    melpaBuild {
+    _4clojure = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , json ? null
+                             , lib
+                             , melpaBuild
+                             , request }:
+      melpaBuild {
         pname = "_4clojure";
         version = "20131014.1507";
         src = fetchFromGitHub {
           owner = "losingkeys";
           repo = "4clojure.el";
-          rev = "3cdfd356c24cd3518397d29ae833f56a4d20b4ca";
-          sha256 = "1fybicg46fc5jjqv7g2d3dnj1x9n58m2fg9x6qxn9l8qlzk9yxkq";
+          rev = "45f1aa34b8c9688885deede4fac652bd61a4b70d";
+          sha256 = "14klf786m0i5ij70pnyvsirafbv8giby481vfxlfbffsyf51afp1";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/4clojure";
           sha256 = "09bmdxkkp676sn1sbbly44k99i47w83yznq950nkxv6x8753ifgk";
-          name = "_4clojure";
+          name = "recipe";
         };
         packageRequires = [ json request ];
         meta = {
@@ -82,20 +99,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    a = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    a = callPackage ({ emacs
+                     , fetchFromGitHub
+                     , fetchurl
+                     , lib
+                     , melpaBuild }:
+      melpaBuild {
         pname = "a";
         version = "20170720.553";
         src = fetchFromGitHub {
           owner = "plexus";
           repo = "a.el";
-          rev = "d50b953cb0a7402107cdd6275cff9d31d09835a3";
-          sha256 = "0pzkbg6vmbpvyxq8y593v6bmaflafxfkfv0qryjb0wwds1mmdmfz";
+          rev = "3af0122abac723f0d3dc21ee50eeb81afa26d361";
+          sha256 = "0grwpy4ssmn2m8aihfkxb7ifl7ql2hgicw16wzl0crpy5fndh1mp";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a226f1d81cd1ae81b91c1102fbe40aac2eddcaa8/recipes/a";
           sha256 = "1xqja47iw1c78kiv4854z47iblvvzrc1l35zjdhmhkh9hh10z886";
-          name = "a";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -103,8 +124,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    aa-edit-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, navi2ch }:
-    melpaBuild {
+    aa-edit-mode = callPackage ({ emacs
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild
+                                , navi2ch }:
+      melpaBuild {
         pname = "aa-edit-mode";
         version = "20170118.1920";
         src = fetchFromGitHub {
@@ -113,10 +139,10 @@
           rev = "1dd801225b7ad3c23ad09698f5e77f0df7012a65";
           sha256 = "17kxpyfprdyj96c4ivv8bxwyls69cgh2r3gwrgj6bwinbiszh9rr";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/20d00f782f2db87264c7fb1aac7455e44b8b24e7/recipes/aa-edit-mode";
           sha256 = "00b99ik04xx4b2a1cm1z8dl42hjnb5r32qypjyyx8924n1dhxzgn";
-          name = "aa-edit-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs navi2ch ];
         meta = {
@@ -124,8 +150,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    abc-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    abc-mode = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "abc-mode";
         version = "20171020.319";
         src = fetchFromGitHub {
@@ -134,10 +163,10 @@
           rev = "238deedeb6c90df168045552eb463cfae9e1f88f";
           sha256 = "1wkjdvsav2x9zsl25h87iyfl6r0md86i2gmxqhvf63acxqgrgb2q";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/aaee9dc5de06747374f311d86a550d3cc15beed1/recipes/abc-mode";
           sha256 = "0qf5lbszyscmagiqhc0d05vzkhdky7ini4w33z1h3j5417sscrcx";
-          name = "abc-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -145,20 +174,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    abgaben = callPackage ({ f, fetchFromGitLab, fetchurl, lib, melpaBuild, pdf-tools, s }:
-    melpaBuild {
+    abgaben = callPackage ({ f
+                           , fetchFromGitLab
+                           , fetchurl
+                           , lib
+                           , melpaBuild
+                           , pdf-tools
+                           , s }:
+      melpaBuild {
         pname = "abgaben";
         version = "20171118.2246";
         src = fetchFromGitLab {
           owner = "akoehn";
           repo = "abgaben";
-          rev = "20d14830f07d66e2a04bcad1498a4a6fbf4b4451";
-          sha256 = "0apcbfaa70kgrpjjsfbr0lg9lcfiijpx5bms4sbzc606vlnxxn0d";
+          rev = "966bfcfdd3b2e288576ffe363d676ad282902090";
+          sha256 = "0zmzn8rdn1q0dfql3awivhrxd1nrvqr6mb8gv2ynaldyidgsb487";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2b0aa60aa0edf33205e0fcb309be779ad8da08ec/recipes/abgaben";
           sha256 = "1xywghyp6aahzin1ygwzqfg9640dliycl4g02jz3gpix8hd3g8gy";
-          name = "abgaben";
+          name = "recipe";
         };
         packageRequires = [ f pdf-tools s ];
         meta = {
@@ -166,8 +201,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    abl-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    abl-mode = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "abl-mode";
         version = "20170604.1309";
         src = fetchFromGitHub {
@@ -176,10 +214,10 @@
           rev = "9aff997fe7b4caded60150a832e3704ac55e69e5";
           sha256 = "0yfk7s7n10lkf11dy1l0xi0bbsjbam5lqq8kj9hxpz2zkddbaljl";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/70a52edb381daa9c4dcc9f7e511175b38fc141be/recipes/abl-mode";
           sha256 = "0h25lc87pa8irgxflnmnmkr9dcv4kz841nfc45fcz4awrn75kkzb";
-          name = "abl-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -187,8 +225,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    abyss-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    abyss-theme = callPackage ({ emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "abyss-theme";
         version = "20170808.645";
         src = fetchFromGitHub {
@@ -197,10 +239,10 @@
           rev = "18791c6e8d9cc2b4815c9f08627a2e94fc0eeb14";
           sha256 = "07z0djv7h3yrv4iw9n633j6dxzxb4nnzijsqkmz22ik6fbwxg5mh";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f390e5153b6360a27abc74983f5fef11226634f3/recipes/abyss-theme";
           sha256 = "0ckrgfd7fjls6g510v8fqpkd0fd18lr0spg3lf5s88gky8ihdg6c";
-          name = "abyss-theme";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -208,8 +250,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    ac-alchemist = callPackage ({ alchemist, auto-complete, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ac-alchemist = callPackage ({ alchemist
+                                , auto-complete
+                                , cl-lib ? null
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "ac-alchemist";
         version = "20150907.2356";
         src = fetchFromGitHub {
@@ -218,10 +266,10 @@
           rev = "b1891c3d41aed83f61d78a609ea97be5cc2758d9";
           sha256 = "19msfx3f3px1maj41bzh139s6sv2pjk9vm3bphn7758fqhzyin0f";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ef9037aa41a8d9467838495bb235db32c19cc417/recipes/ac-alchemist";
           sha256 = "02ll3hcixgdb8zyszn78714gy1h2q0vkhpbnwap9302mr2racwl0";
-          name = "ac-alchemist";
+          name = "recipe";
         };
         packageRequires = [ alchemist auto-complete cl-lib ];
         meta = {
@@ -229,8 +277,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    ac-c-headers = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ac-c-headers = callPackage ({ auto-complete
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "ac-c-headers";
         version = "20151021.134";
         src = fetchFromGitHub {
@@ -239,10 +291,10 @@
           rev = "de13a1d35b311e6601556d8ef163de102057deea";
           sha256 = "1z6rj15p5gjv0jwnnck8789n9csf1pwxfvsz37graihgfy2khj0y";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d7736fb9ea3a59c36c0b8b824d83bb1bb0099d43/recipes/ac-c-headers";
           sha256 = "1cq5rz2w79bj185va7y13x7bciihrpsvyxwk6msmcxb4g86s9phv";
-          name = "ac-c-headers";
+          name = "recipe";
         };
         packageRequires = [ auto-complete ];
         meta = {
@@ -250,8 +302,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    ac-capf = callPackage ({ auto-complete, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ac-capf = callPackage ({ auto-complete
+                           , cl-lib ? null
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "ac-capf";
         version = "20151031.1917";
         src = fetchFromGitHub {
@@ -260,10 +317,10 @@
           rev = "17571dba0a8f98111f2ab758e9bea285b263781b";
           sha256 = "0nyq34yq4jcp3p30ygma3iz1h0q551p33792byj76pa5ps09g1da";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/929da263f57b904c50f5f17b09d4c4b480999c97/recipes/ac-capf";
           sha256 = "1drgk5iz2wp3rxzd39pj0n4cfmm5z8zqlp50jw5z7ffbbg35qxbm";
-          name = "ac-capf";
+          name = "recipe";
         };
         packageRequires = [ auto-complete cl-lib ];
         meta = {
@@ -271,20 +328,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    ac-cider = callPackage ({ auto-complete, cider, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ac-cider = callPackage ({ auto-complete
+                            , cider
+                            , cl-lib ? null
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "ac-cider";
         version = "20161006.19";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "ac-cider";
-          rev = "fa13e067dd9c8c76151c7d140a2803da1d109b84";
-          sha256 = "1pklmjldnm8bf34f5q8x983d1m72l3kf51ns9vh6z704mkhv658f";
+          rev = "d8670939bbf88079263d5ace2b8bc04cf325be36";
+          sha256 = "01g1h2j0rfih8v0yvvr5gjh3abcj2mz3jmfbis8a60ivmngab732";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e8adefaf2e284ef91baec3dbd3e10c868de69926/recipes/ac-cider";
           sha256 = "1dszpb706h34miq2bxqyq1ycbran5ax36vcniwp8vvhgcjsw5sz6";
-          name = "ac-cider";
+          name = "recipe";
         };
         packageRequires = [ auto-complete cider cl-lib ];
         meta = {
@@ -292,20 +355,28 @@
           license = lib.licenses.free;
         };
       }) {};
-    ac-clang = callPackage ({ auto-complete, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pos-tip, yasnippet }:
-    melpaBuild {
+    ac-clang = callPackage ({ auto-complete
+                            , cl-lib ? null
+                            , emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild
+                            , pos-tip
+                            , yasnippet }:
+      melpaBuild {
         pname = "ac-clang";
-        version = "20180318.1124";
+        version = "20180709.2246";
         src = fetchFromGitHub {
           owner = "yaruopooner";
           repo = "ac-clang";
-          rev = "daddbea033d3c6f934e5043cc2fff8eca3b6e5f7";
-          sha256 = "1hp3xpv0kwmilfivif2smbbgknjyk8kcgp399dghdcq71qsxz3wr";
+          rev = "3294b968eb1a8317049190940193f9da47c085ef";
+          sha256 = "160hda911vsc2zcs56560cpv7kj0966vjzwmc0md6fkz3wrj7w0n";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ffe0485048b85825f5e8ba95917d8c9dc64fe5de/recipes/ac-clang";
           sha256 = "070s06xhkzaqfc3j8c4i44rks6gn8z66lwd54j17p8d91x3qjpr4";
-          name = "ac-clang";
+          name = "recipe";
         };
         packageRequires = [ auto-complete cl-lib emacs pos-tip yasnippet ];
         meta = {
@@ -313,8 +384,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    ac-dcd = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, flycheck-dmd-dub, lib, melpaBuild }:
-    melpaBuild {
+    ac-dcd = callPackage ({ auto-complete
+                          , fetchFromGitHub
+                          , fetchurl
+                          , flycheck-dmd-dub
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "ac-dcd";
         version = "20170323.601";
         src = fetchFromGitHub {
@@ -323,10 +399,10 @@
           rev = "1614aa624252e3445b0392c8a9b7197084f3e422";
           sha256 = "02slswlcjh1rjc9hglvbizhvwp57xcnbhs8cmlcayw0yjwp6mnvb";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/64142a4b14531409f45f02a8053ed8948f48221d/recipes/ac-dcd";
           sha256 = "086jp9c6bilc361n1hscza3pbhgvqlq944z7cil2jm1kicsf8s7r";
-          name = "ac-dcd";
+          name = "recipe";
         };
         packageRequires = [ auto-complete flycheck-dmd-dub ];
         meta = {
@@ -334,20 +410,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    ac-emacs-eclim = callPackage ({ auto-complete, eclim, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ac-emacs-eclim = callPackage ({ auto-complete
+                                  , eclim
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "ac-emacs-eclim";
         version = "20170924.1339";
         src = fetchFromGitHub {
           owner = "emacs-eclim";
           repo = "emacs-eclim";
-          rev = "6396ad1cd25c0a197109343ec1cce5d5080acdff";
-          sha256 = "04ci3qb3vgqdvsdfivhwfsxrgalh61b41bsr1cafk4gv3g3rdr13";
+          rev = "322a796be1619fb2ade6de6d51111e5f3f5776d0";
+          sha256 = "05sil1pazr7rdg6hq34p5ba7rnp3rp2lfnhsjpr26fisfhkbbaic";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1e9d3075587fbd9ca188535fd945a7dc451c6d7e/recipes/ac-emacs-eclim";
           sha256 = "0bkh7x6zj5drdvm9ji4vwqdxv7limd9a1idy8lsg0lcca3rjq3s5";
-          name = "ac-emacs-eclim";
+          name = "recipe";
         };
         packageRequires = [ auto-complete eclim ];
         meta = {
@@ -355,8 +436,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    ac-emmet = callPackage ({ auto-complete, emmet-mode, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ac-emmet = callPackage ({ auto-complete
+                            , emmet-mode
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "ac-emmet";
         version = "20131015.858";
         src = fetchFromGitHub {
@@ -365,10 +451,10 @@
           rev = "88f24876ee3b759978d4614a758280b5d512d543";
           sha256 = "1lkhqmfkjga7qi4r1m7mjax3pyf9m6minsn57cbzm2z2kvkhq22g";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/39861b4f0a458c8ccf02f7a3443c54b0e74daa11/recipes/ac-emmet";
           sha256 = "09ycjllfpdgqaf5iis5bkkhal1vxvl3qkxrn2759p67s97c49f3x";
-          name = "ac-emmet";
+          name = "recipe";
         };
         packageRequires = [ auto-complete emmet-mode ];
         meta = {
@@ -376,20 +462,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    ac-emoji = callPackage ({ auto-complete, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ac-emoji = callPackage ({ auto-complete
+                            , cl-lib ? null
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "ac-emoji";
         version = "20150823.11";
         src = fetchFromGitHub {
           owner = "syohex";
           repo = "emacs-ac-emoji";
-          rev = "40a639764eb654f1b4bb705c817b66032a26ff2b";
-          sha256 = "1gk84bv6w9lg5wrygd7cfab3h46j84k1dwmhzr7jay6n02q6y499";
+          rev = "53677f754929ead403ccde64b714ebb6b8fc808e";
+          sha256 = "0cc3jpc4pihbyznyzvf6i3xwc2x78gb5m36ba9gkvxhabsljnlfg";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/15f591f9cba367b071046fef5ae01bbbd0475ce3/recipes/ac-emoji";
           sha256 = "0msh3dh89jzk6hxva34gp9d5pazchgdknxjbi72z26rss9bkp1mw";
-          name = "ac-emoji";
+          name = "recipe";
         };
         packageRequires = [ auto-complete cl-lib ];
         meta = {
@@ -397,8 +488,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    ac-etags = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ac-etags = callPackage ({ auto-complete
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "ac-etags";
         version = "20161001.807";
         src = fetchFromGitHub {
@@ -407,10 +502,10 @@
           rev = "7983e631c226fe0fa53af3b2d56bf4eca3d785ce";
           sha256 = "1vvgcy5hybrip4jn4pj9r3fahr6rc70k28w5aw951h0x7g7laipr";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fda9c7def8bc54af4ab17dc049dd94324c8f10fa/recipes/ac-etags";
           sha256 = "0ag49k9izrs4ikzac9lifvvwhcn5n89lr2vb20pngsvg1czdyhzb";
-          name = "ac-etags";
+          name = "recipe";
         };
         packageRequires = [ auto-complete ];
         meta = {
@@ -418,20 +513,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    ac-geiser = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, geiser, lib, melpaBuild }:
-    melpaBuild {
+    ac-geiser = callPackage ({ auto-complete
+                             , fetchFromGitHub
+                             , fetchurl
+                             , geiser
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "ac-geiser";
         version = "20130928.2347";
         src = fetchFromGitHub {
           owner = "xiaohanyu";
           repo = "ac-geiser";
-          rev = "502d18a8a0bd4b5fdd495a99299ba2a632c5cd9a";
-          sha256 = "0h2kakb4f5hgzf5l2kpqngalcmc4402lkg1pvs88c8z4rqp2vfvz";
+          rev = "0e2e36532336f27e3dc3b01fff55ad1a4329817d";
+          sha256 = "02ifz25rq64z0ifxs52aqdz0iz4mi6xvj88hcn3aakkmsj749vvn";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/586ef409e3ae758b459b625d4bf0108f0525a085/recipes/ac-geiser";
           sha256 = "0v558qz1mp8b1bgk8kgdk5sx5mpd353mw77n5b0pw4b2ikzpz2mx";
-          name = "ac-geiser";
+          name = "recipe";
         };
         packageRequires = [ auto-complete geiser ];
         meta = {
@@ -439,8 +539,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    ac-haskell-process = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, haskell-mode, lib, melpaBuild }:
-    melpaBuild {
+    ac-haskell-process = callPackage ({ auto-complete
+                                      , fetchFromGitHub
+                                      , fetchurl
+                                      , haskell-mode
+                                      , lib
+                                      , melpaBuild }:
+      melpaBuild {
         pname = "ac-haskell-process";
         version = "20150423.702";
         src = fetchFromGitHub {
@@ -449,10 +554,10 @@
           rev = "0362d4323511107ec70e7165cb612f3ab01b712f";
           sha256 = "0m33v9iy3y37sicfmpx7kvmn8v1a8k6cs7d0v9v5k93p4d5ila41";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/98bd259b6bfd9b49a8ae421807a4ab3821f09608/recipes/ac-haskell-process";
           sha256 = "0kv4z850kv03wiax1flnrp6sgqja25j23l719w7rkr7ck110q8rw";
-          name = "ac-haskell-process";
+          name = "recipe";
         };
         packageRequires = [ auto-complete haskell-mode ];
         meta = {
@@ -460,8 +565,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    ac-helm = callPackage ({ auto-complete, cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, popup }:
-    melpaBuild {
+    ac-helm = callPackage ({ auto-complete
+                           , cl-lib ? null
+                           , fetchFromGitHub
+                           , fetchurl
+                           , helm
+                           , lib
+                           , melpaBuild
+                           , popup }:
+      melpaBuild {
         pname = "ac-helm";
         version = "20160318.1933";
         src = fetchFromGitHub {
@@ -470,10 +582,10 @@
           rev = "baf2b1e04bcffa835084389c0fab415f26efbf32";
           sha256 = "1fyikdwn0gzng7pbmfg7zb7jphjv228776vsjc12j7g1aqz92n4l";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/50427d365c79aff84ac759d19ce177b4f7ed2751/recipes/ac-helm";
           sha256 = "16ajxlhcah5zbvywpc6l4l1arr308gjpgvdx6l1nrv2zvpckhlwq";
-          name = "ac-helm";
+          name = "recipe";
         };
         packageRequires = [ auto-complete cl-lib helm popup ];
         meta = {
@@ -481,20 +593,27 @@
           license = lib.licenses.free;
         };
       }) {};
-    ac-html = callPackage ({ auto-complete, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    ac-html = callPackage ({ auto-complete
+                           , dash
+                           , f
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild
+                           , s }:
+      melpaBuild {
         pname = "ac-html";
         version = "20151005.31";
         src = fetchFromGitHub {
           owner = "cheunghy";
           repo = "ac-html";
-          rev = "668154cba123c321d1b07c2dc8b26d14092253b8";
-          sha256 = "0lz1a8a4bqxiw20jh65r7cg7jnid3vz4h8b7dkfcrzwn0agx8frw";
+          rev = "3de94a46d8cb93e8e62a1b6bdebbde4d65dc7cc2";
+          sha256 = "1sip87j4wvlf9pfnpr0zyyhys1dd9smh6hy3zs08ihbdh98krgs5";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ce370d60b2f4dd0570b631f6ca92a221e1fe2de6/recipes/ac-html";
           sha256 = "0qf8f75b6dvy844dq8vh8d9c6k599rh1ynjcif9bwvdpf6pxwvqa";
-          name = "ac-html";
+          name = "recipe";
         };
         packageRequires = [ auto-complete dash f s ];
         meta = {
@@ -502,8 +621,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    ac-html-angular = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, web-completion-data }:
-    melpaBuild {
+    ac-html-angular = callPackage ({ fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild
+                                   , web-completion-data }:
+      melpaBuild {
         pname = "ac-html-angular";
         version = "20151224.2319";
         src = fetchFromGitHub {
@@ -512,10 +635,10 @@
           rev = "6bafe09afe03112ca4183d58461c1a6f6c2b3c67";
           sha256 = "1v3ia439h4n2i204n0sazzbwwm0l5k6j31gq58iv2rqrq2ysikny";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0805ba6674d1298d730770e8ea46b9bbd68cd1d3/recipes/ac-html-angular";
           sha256 = "05rbxf5kbr4jlskrhvfvhf82qvb55zl5cb6z1ymfh9l3h9j9xk3s";
-          name = "ac-html-angular";
+          name = "recipe";
         };
         packageRequires = [ web-completion-data ];
         meta = {
@@ -523,8 +646,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    ac-html-bootstrap = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, web-completion-data }:
-    melpaBuild {
+    ac-html-bootstrap = callPackage ({ fetchFromGitHub
+                                     , fetchurl
+                                     , lib
+                                     , melpaBuild
+                                     , web-completion-data }:
+      melpaBuild {
         pname = "ac-html-bootstrap";
         version = "20160302.901";
         src = fetchFromGitHub {
@@ -533,10 +660,10 @@
           rev = "481e6e441cd566554ce71cd8cb28c9e7ebb1c24b";
           sha256 = "0ry398awbsyswc87v275x4mdyv64kr0s647y6nagqg1h3n3jhvsq";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6cf8aed547ca2390395dcf52d6c542b6944697af/recipes/ac-html-bootstrap";
           sha256 = "0z71m6xws0k9smhsswaivpikr64mv0wh6klnmi5cwhwcqas6kdi1";
-          name = "ac-html-bootstrap";
+          name = "recipe";
         };
         packageRequires = [ web-completion-data ];
         meta = {
@@ -544,8 +671,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    ac-html-csswatcher = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, web-completion-data }:
-    melpaBuild {
+    ac-html-csswatcher = callPackage ({ fetchFromGitHub
+                                      , fetchurl
+                                      , lib
+                                      , melpaBuild
+                                      , web-completion-data }:
+      melpaBuild {
         pname = "ac-html-csswatcher";
         version = "20151208.1313";
         src = fetchFromGitHub {
@@ -554,10 +685,10 @@
           rev = "b0f3e7e1a3fe49e88b6eb6432377232fc715f221";
           sha256 = "0swbw62zh5rjjf73pvmp8brrrmk6bp061k793z4z83v7ic0cicrr";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fba8b9bf212e6fa389eae8394d0b3bbce9eb0f92/recipes/ac-html-csswatcher";
           sha256 = "0jb9dnm2lxadrxssf0rjqw8yvvskcq4hys8c21shjyj3gkvwbfqn";
-          name = "ac-html-csswatcher";
+          name = "recipe";
         };
         packageRequires = [ web-completion-data ];
         meta = {
@@ -565,20 +696,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    ac-inf-ruby = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, inf-ruby, lib, melpaBuild }:
-    melpaBuild {
+    ac-inf-ruby = callPackage ({ auto-complete
+                               , fetchFromGitHub
+                               , fetchurl
+                               , inf-ruby
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "ac-inf-ruby";
         version = "20131115.350";
         src = fetchFromGitHub {
           owner = "purcell";
           repo = "ac-inf-ruby";
-          rev = "ee53fc9c61950da9a96df3ff5ef186f9a9faf151";
-          sha256 = "13xgv1c4gr075gffq95njra7bw1fkb5yp3xdlh3qndzw4bpary1l";
+          rev = "094d86761088ab0b16ddac75cf57eeb9c2afbee2";
+          sha256 = "0cabg054mpxrxaw95pfh7bv7rwpfpjhyqg8ghgd8j2vvj95p1m2z";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1a72abe0fe1253149afb45b0d9e81b6846a926c0/recipes/ac-inf-ruby";
           sha256 = "04jclf0yxz78x1fsaf5sh1p466947nqrcx337kyhqn0nkj3hplqr";
-          name = "ac-inf-ruby";
+          name = "recipe";
         };
         packageRequires = [ auto-complete inf-ruby ];
         meta = {
@@ -586,20 +722,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    ac-ispell = callPackage ({ auto-complete, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ac-ispell = callPackage ({ auto-complete
+                             , cl-lib ? null
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "ac-ispell";
         version = "20151031.1926";
         src = fetchFromGitHub {
           owner = "syohex";
           repo = "emacs-ac-ispell";
-          rev = "22bace7387e9012002a6a444922f75f9913077b0";
-          sha256 = "1cq73bdv3lkn8v3nx6aznygqaac9s5i7pvirl8wz9ib31hsgwpbk";
+          rev = "7e054793fe77f5fa1ced59d97da9c31df9807c48";
+          sha256 = "1jidg08jz6np7jfg11qzijmsrbv1i3kdsqmmnz1xlybj1933xjvq";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b41acb7387ebef9af2906fa16298b64d6431bfb0/recipes/ac-ispell";
           sha256 = "1vsy2qjh60n5lavivpqhhcpg5pk8zz2r0wy1sb65capn841zdi67";
-          name = "ac-ispell";
+          name = "recipe";
         };
         packageRequires = [ auto-complete cl-lib ];
         meta = {
@@ -607,8 +748,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    ac-js2 = callPackage ({ fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, skewer-mode }:
-    melpaBuild {
+    ac-js2 = callPackage ({ fetchFromGitHub
+                          , fetchurl
+                          , js2-mode
+                          , lib
+                          , melpaBuild
+                          , skewer-mode }:
+      melpaBuild {
         pname = "ac-js2";
         version = "20140906.442";
         src = fetchFromGitHub {
@@ -617,10 +763,10 @@
           rev = "721c482e1d4a08f4a29a74437257d573e8f69969";
           sha256 = "0yn9333rjs2pzb1wk1japclsqagdcl28j0yjl3q5b70g5gi5vx7k";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/255588a330e4c9a03517885092d5678375aa7850/recipes/ac-js2";
           sha256 = "0gcr0xdi89nj3854v2z3nndfgazmcdzmd6wdndl0i4s7pdfl96fa";
-          name = "ac-js2";
+          name = "recipe";
         };
         packageRequires = [ js2-mode skewer-mode ];
         meta = {
@@ -628,20 +774,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    ac-math = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, lib, math-symbol-lists, melpaBuild }:
-    melpaBuild {
+    ac-math = callPackage ({ auto-complete
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , math-symbol-lists
+                           , melpaBuild }:
+      melpaBuild {
         pname = "ac-math";
         version = "20141116.1327";
         src = fetchFromGitHub {
           owner = "vspinu";
           repo = "ac-math";
-          rev = "c012a8f620a48cb18db7d78995035d65eae28f11";
-          sha256 = "0p5cdaw9v8jgnmjqpb95bxy4khwbdgg19wzg8jkr2j2p55dpfbd6";
+          rev = "89478063dead68894f0d27687b63896633048c6f";
+          sha256 = "0mzbc3ninsz970xly90zbxlxqy4b0s8yrp1mlj8jzpk5dzlc4g51";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/ac-math";
           sha256 = "02c821zabxp9qkwx252pxjmssdbmas0iwanw09r03bmiby9d4nsl";
-          name = "ac-math";
+          name = "recipe";
         };
         packageRequires = [ auto-complete math-symbol-lists ];
         meta = {
@@ -649,8 +800,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    ac-mozc = callPackage ({ auto-complete, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, mozc }:
-    melpaBuild {
+    ac-mozc = callPackage ({ auto-complete
+                           , cl-lib ? null
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild
+                           , mozc }:
+      melpaBuild {
         pname = "ac-mozc";
         version = "20150227.819";
         src = fetchFromGitHub {
@@ -659,10 +816,10 @@
           rev = "4c6c8be4701010d9362184437c0f783e0335c631";
           sha256 = "19cb8kq8gmrplkxil22ahvbyq5cng1l2vh2lrfiyqpjsap7zfjz5";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4b3f74039d397037e640cc371d24bdb60ac90bf1/recipes/ac-mozc";
           sha256 = "1v3iiid8cq50i076q98ycks9m827xzncgxqwqs2rqhab0ncy3h0f";
-          name = "ac-mozc";
+          name = "recipe";
         };
         packageRequires = [ auto-complete cl-lib mozc ];
         meta = {
@@ -670,8 +827,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    ac-octave = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ac-octave = callPackage ({ auto-complete
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "ac-octave";
         version = "20180405.2034";
         src = fetchFromGitHub {
@@ -680,10 +841,10 @@
           rev = "fe0f931f2024f43de3c4fff4b1ace672413adeae";
           sha256 = "1yj5fapbp79k88k1cxrmmf91fb0j6s4s7f2dhk2afcf7z83mqkwb";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/634bd324148d6b74e1098362e06dc512456cde31/recipes/ac-octave";
           sha256 = "1g5s4dk1rcgkjn17jfw6g201pw0vfhqcx1nhigmnizpnzy0man9z";
-          name = "ac-octave";
+          name = "recipe";
         };
         packageRequires = [ auto-complete ];
         meta = {
@@ -691,20 +852,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    ac-php = callPackage ({ ac-php-core, auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
-    melpaBuild {
+    ac-php = callPackage ({ ac-php-core
+                          , auto-complete
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild
+                          , yasnippet }:
+      melpaBuild {
         pname = "ac-php";
         version = "20171201.134";
         src = fetchFromGitHub {
           owner = "xcwen";
           repo = "ac-php";
-          rev = "24204333743b3ba26a9a8d51f56f1d3195ae4115";
-          sha256 = "0y3pzf2zvqlsqs7255ihrswaxjq0q389yiiprlwzm86xsws8fbkw";
+          rev = "f489da3ceb04ff6efd9da5c5f56d71f49966e1d4";
+          sha256 = "081v4srqzzwd8v07z013m756qrxll5fpzwf8km0686nc5gcg6q9l";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php";
           sha256 = "1wqwwgdln98snlq5msdx94b7985krvqfn264hxs1h94r85kgn1ba";
-          name = "ac-php";
+          name = "recipe";
         };
         packageRequires = [ ac-php-core auto-complete yasnippet ];
         meta = {
@@ -712,20 +879,30 @@
           license = lib.licenses.free;
         };
       }) {};
-    ac-php-core = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, php-mode, popup, s, xcscope }:
-    melpaBuild {
+    ac-php-core = callPackage ({ dash
+                               , emacs
+                               , f
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild
+                               , php-mode
+                               , popup
+                               , s
+                               , xcscope }:
+      melpaBuild {
         pname = "ac-php-core";
-        version = "20180323.503";
+        version = "20180629.144";
         src = fetchFromGitHub {
           owner = "xcwen";
           repo = "ac-php";
-          rev = "24204333743b3ba26a9a8d51f56f1d3195ae4115";
-          sha256 = "0y3pzf2zvqlsqs7255ihrswaxjq0q389yiiprlwzm86xsws8fbkw";
+          rev = "fac22638f957abf404bbee4e16d9d7b67fcd42d2";
+          sha256 = "0fsd8cfwqq2jgs2f0nk5g8ybm1mim51n4cfm5n5znvrkwp7a8z2y";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php-core";
           sha256 = "0vk3jsxb7dgk5a6pap3bdqkqwpszil0rck1c3y0wyxrlj2y1jcvn";
-          name = "ac-php-core";
+          name = "recipe";
         };
         packageRequires = [ dash emacs f php-mode popup s xcscope ];
         meta = {
@@ -733,8 +910,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    ac-racer = callPackage ({ auto-complete, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, racer }:
-    melpaBuild {
+    ac-racer = callPackage ({ auto-complete
+                            , emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild
+                            , racer }:
+      melpaBuild {
         pname = "ac-racer";
         version = "20170114.9";
         src = fetchFromGitHub {
@@ -743,10 +926,10 @@
           rev = "4408c2d652dec0432e20c05e001db8222d778c6b";
           sha256 = "01154kqzh3pjy57vxhv27nm69p85a1fwl7r95c7pzmzxgxigfz1p";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e4318daf4dbb6864ee41f41287c89010fb811641/recipes/ac-racer";
           sha256 = "1vkvh8y3ckvzvqxj4i2k6jqri94121wbfjziybli74qba8dca4yp";
-          name = "ac-racer";
+          name = "recipe";
         };
         packageRequires = [ auto-complete emacs racer ];
         meta = {
@@ -754,20 +937,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    ac-rtags = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild, rtags }:
-    melpaBuild {
+    ac-rtags = callPackage ({ auto-complete
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild
+                            , rtags }:
+      melpaBuild {
         pname = "ac-rtags";
         version = "20170522.2154";
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "4747d5b695bee40c3b0a2e3591ac8897571edd66";
-          sha256 = "1qy71bx8nki73mqslw54hq5bn1asz5qg1b2848nrsj8zb2yd85x5";
+          rev = "7e6b6f21935eedbe4678ba91c5531ac162b51a5a";
+          sha256 = "12629d1s8rplhjh17n3bmgnkpscq4gljgyl84j8qyhh40dwq1qk0";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ac-rtags";
           sha256 = "1w9v32di9135mm598c4506gxf0xr5jyz8dyd9dhga5d60q7g9641";
-          name = "ac-rtags";
+          name = "recipe";
         };
         packageRequires = [ auto-complete rtags ];
         meta = {
@@ -775,8 +963,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    ac-skk = callPackage ({ auto-complete, cl-lib ? null, ddskk, fetchFromGitHub, fetchurl, lib, melpaBuild, tinysegmenter }:
-    melpaBuild {
+    ac-skk = callPackage ({ auto-complete
+                          , cl-lib ? null
+                          , ddskk
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild
+                          , tinysegmenter }:
+      melpaBuild {
         pname = "ac-skk";
         version = "20141229.1719";
         src = fetchFromGitHub {
@@ -785,10 +980,10 @@
           rev = "d25a265930430d080329789fb253d786c01dfa24";
           sha256 = "1nvz0jfz4x99xc5ywspl8fdpyqns5zd0j7i4bwzlwplmy3qakjwm";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1d9d8268d2db4b38ca18156964483b0b067f6f5d/recipes/ac-skk";
           sha256 = "0iycyfgv8v15ygngvyx66m3w3sv8p9h6q6j1hbpzwd8azl8fzj5z";
-          name = "ac-skk";
+          name = "recipe";
         };
         packageRequires = [ auto-complete cl-lib ddskk tinysegmenter ];
         meta = {
@@ -796,20 +991,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    ac-slime = callPackage ({ auto-complete, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, slime }:
-    melpaBuild {
+    ac-slime = callPackage ({ auto-complete
+                            , cl-lib ? null
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild
+                            , slime }:
+      melpaBuild {
         pname = "ac-slime";
         version = "20171027.1400";
         src = fetchFromGitHub {
           owner = "purcell";
           repo = "ac-slime";
-          rev = "6c80cb602ddad46486288f94ad7546396c6e4b1a";
-          sha256 = "11w1z653klghi6inv9n92cigz8m3c67j3r18mdk39inc3izwplkj";
+          rev = "a91f664510d3da24b02e87e4aa59d049483a6529";
+          sha256 = "04qjj5jw7yp49nbb0p70cxlad8m4nq5mhil4k6pav74nkgjrldcl";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/ac-slime";
           sha256 = "0mk3k1lcbqa16xvsbgk28x09vzqyaidqaqpq934xdbrwhdgwgckg";
-          name = "ac-slime";
+          name = "recipe";
         };
         packageRequires = [ auto-complete cl-lib slime ];
         meta = {
@@ -817,8 +1018,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    ac-sly = callPackage ({ auto-complete, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, sly }:
-    melpaBuild {
+    ac-sly = callPackage ({ auto-complete
+                          , cl-lib ? null
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild
+                          , sly }:
+      melpaBuild {
         pname = "ac-sly";
         version = "20170728.327";
         src = fetchFromGitHub {
@@ -827,10 +1034,10 @@
           rev = "bf69c687c4ecf1994349d20c182e9b567399912e";
           sha256 = "09g6v2yp3wl566488zsb79lklqpai9dgz6xwv1y5h6zkghxvkhpy";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bb26741e841d4886c14f0a059a52805732f179b1/recipes/ac-sly";
           sha256 = "1ng81b5f8w2s9mm9s7h5kwyx8fdwndnlsbzx50slmqyaz2ad15mx";
-          name = "ac-sly";
+          name = "recipe";
         };
         packageRequires = [ auto-complete cl-lib sly ];
         meta = {
@@ -838,8 +1045,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    academic-phrases = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, s }:
-    melpaBuild {
+    academic-phrases = callPackage ({ dash
+                                    , emacs
+                                    , fetchFromGitHub
+                                    , fetchurl
+                                    , ht
+                                    , lib
+                                    , melpaBuild
+                                    , s }:
+      melpaBuild {
         pname = "academic-phrases";
         version = "20180318.438";
         src = fetchFromGitHub {
@@ -848,10 +1062,10 @@
           rev = "0823ed8c24b26c32f909b896a469833ec4d7b656";
           sha256 = "0qfzsq8jh05w4zkr0cvq3i1hdn97bq344vcqjg46sib26x3wpz6r";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fe4323043fb875c0252861800e61fdd0a51ed453/recipes/academic-phrases";
           sha256 = "18y6lff7xwg6hczwgavwp32848gnlmc30afra9x7m8wmdddps1bh";
-          name = "academic-phrases";
+          name = "recipe";
         };
         packageRequires = [ dash emacs ht s ];
         meta = {
@@ -859,8 +1073,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    ace-flyspell = callPackage ({ avy, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ace-flyspell = callPackage ({ avy
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "ace-flyspell";
         version = "20170308.2109";
         src = fetchFromGitHub {
@@ -869,10 +1087,10 @@
           rev = "538d4f8508d305262ba0228dfe7c819fb65b53c9";
           sha256 = "1yplf5klgjjzx3cb1ihqb9f9cwn898l0vhasc3cwiqz6ldyq2na8";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ace-flyspell";
           sha256 = "1zgywb90cg64nllbbk0x9ipm6znyc5yh7vkajrrnw06r5vabyp9y";
-          name = "ace-flyspell";
+          name = "recipe";
         };
         packageRequires = [ avy ];
         meta = {
@@ -880,8 +1098,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    ace-isearch = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ace-isearch = callPackage ({ emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "ace-isearch";
         version = "20170506.12";
         src = fetchFromGitHub {
@@ -890,10 +1112,10 @@
           rev = "0502f95e333c8059a678745e5a112542965661d1";
           sha256 = "1gzvhxkx7dl7wh2fkkiq9vplfhrqyxl0vzlzf617j4gggjbkpzps";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/344f0cf784a027cde196b7d766024fb415fa1968/recipes/ace-isearch";
           sha256 = "0n8qf08z9n8c2sp5ks29nxcfks5mil1jj6wq348apda8safk36hm";
-          name = "ace-isearch";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -901,8 +1123,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    ace-jump-buffer = callPackage ({ avy, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ace-jump-buffer = callPackage ({ avy
+                                   , dash
+                                   , fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "ace-jump-buffer";
         version = "20171031.850";
         src = fetchFromGitHub {
@@ -911,10 +1138,10 @@
           rev = "ae5be0415c823f7bb66833aa4af2180d4cf99cef";
           sha256 = "0zg4x5faxkp0gnjq7209hn74qkzmk8k7wbr7k8wxpssjbnmxkvd1";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/31100b5b899e942de7796bcbf6365625d1b62574/recipes/ace-jump-buffer";
           sha256 = "0hkxa0ps0v1hwmjafqbnyr6rc4s0w95igk8y3w53asl7f5sj5mpi";
-          name = "ace-jump-buffer";
+          name = "recipe";
         };
         packageRequires = [ avy dash ];
         meta = {
@@ -922,8 +1149,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    ace-jump-helm-line = callPackage ({ avy, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
-    melpaBuild {
+    ace-jump-helm-line = callPackage ({ avy
+                                      , fetchFromGitHub
+                                      , fetchurl
+                                      , helm
+                                      , lib
+                                      , melpaBuild }:
+      melpaBuild {
         pname = "ace-jump-helm-line";
         version = "20160918.1136";
         src = fetchFromGitHub {
@@ -932,10 +1164,10 @@
           rev = "1483055255df3f8ae349f7520f05b1e43ea3ed37";
           sha256 = "191a2g1if1jliikbxkpwmvlp4v1sp541j71xrlymili8ygm0idq5";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8925f3daa92ff39776b55642aa9ec0e49245c0c7/recipes/ace-jump-helm-line";
           sha256 = "04q8wh6jskvbiq6y2xsp2ir23vgz5zw09rm127sgiqrmn0jc61b9";
-          name = "ace-jump-helm-line";
+          name = "recipe";
         };
         packageRequires = [ avy helm ];
         meta = {
@@ -943,8 +1175,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    ace-jump-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ace-jump-mode = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "ace-jump-mode";
         version = "20140616.115";
         src = fetchFromGitHub {
@@ -953,10 +1188,10 @@
           rev = "8351e2df4fbbeb2a4003f2fb39f46d33803f3dac";
           sha256 = "17axrgd99glnl6ma4ls3k01ysdqmiqr581wnrbsn3s4gp53mm2x6";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/ace-jump-mode";
           sha256 = "0yk0kppjyblr5wamncrjm3ym3n8jcl0r0g0cbnwni89smvpngij6";
-          name = "ace-jump-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -964,8 +1199,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    ace-jump-zap = callPackage ({ ace-jump-mode, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ace-jump-zap = callPackage ({ ace-jump-mode
+                                , dash
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "ace-jump-zap";
         version = "20170717.1149";
         src = fetchFromGitHub {
@@ -974,10 +1214,10 @@
           rev = "52b5d4c6c73bd0fc833a0dcb4e803a5287d8cae8";
           sha256 = "1iw90mk6hdrbskxgv67xj27qd26w5dlh4s6a6xqqsj8ld56nzbvr";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3b435db3b79333a20aa27a72f33c431f0a019ba1/recipes/ace-jump-zap";
           sha256 = "07bkmly3lvlbby2m13nj3m1q0gcnwy5sas7d6ws6vr9jh0d36byb";
-          name = "ace-jump-zap";
+          name = "recipe";
         };
         packageRequires = [ ace-jump-mode dash ];
         meta = {
@@ -985,8 +1225,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    ace-link = callPackage ({ avy, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ace-link = callPackage ({ avy
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "ace-link";
         version = "20180308.100";
         src = fetchFromGitHub {
@@ -995,10 +1239,10 @@
           rev = "fae5d508ff519ba1fab21c51f46c0906fd82229f";
           sha256 = "118dp8w0z475j67gvl1dj137glbli2ykbm934vdvlz6q0k94vds7";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/68032f40c0ce4170a22db535be4bfa7099f61f85/recipes/ace-link";
           sha256 = "1jl805r2s3wa0xyhss1q28rcy6y2fngf0yfcrcd9wf8kamhpajk5";
-          name = "ace-link";
+          name = "recipe";
         };
         packageRequires = [ avy ];
         meta = {
@@ -1006,8 +1250,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    ace-mc = callPackage ({ ace-jump-mode, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, multiple-cursors }:
-    melpaBuild {
+    ace-mc = callPackage ({ ace-jump-mode
+                          , dash
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild
+                          , multiple-cursors }:
+      melpaBuild {
         pname = "ace-mc";
         version = "20160408.1737";
         src = fetchFromGitHub {
@@ -1016,10 +1266,10 @@
           rev = "b106bf6a6c78c3e026fbe9a99a34d6239adce4fd";
           sha256 = "1zgmqgh5dff914dw7i8s142znd849gv4xh86f8q8agx5r7almx14";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/62e3a5f23ce219b16081cb0bba9fc4699e11fafa/recipes/ace-mc";
           sha256 = "1kca6ha2glhv7lkamqx3sxp7dy05c7f6xxy3lr3v2bik8r50jss8";
-          name = "ace-mc";
+          name = "recipe";
         };
         packageRequires = [ ace-jump-mode dash multiple-cursors ];
         meta = {
@@ -1027,8 +1277,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    ace-pinyin = callPackage ({ avy, fetchFromGitHub, fetchurl, lib, melpaBuild, pinyinlib }:
-    melpaBuild {
+    ace-pinyin = callPackage ({ avy
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild
+                              , pinyinlib }:
+      melpaBuild {
         pname = "ace-pinyin";
         version = "20170430.2326";
         src = fetchFromGitHub {
@@ -1037,10 +1292,10 @@
           rev = "a9df88c1e6a32a4f4895acbb8c45383693c494c1";
           sha256 = "18xi669c15k0m1wb7x231ch1kzqgpi4nm54c42ajrkfq7l8kxq8w";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ace-pinyin";
           sha256 = "1b3asvzm3k66lsdkmlsgmnf8xlyic8zv294j1iahzkwm6bzqj8wd";
-          name = "ace-pinyin";
+          name = "recipe";
         };
         packageRequires = [ avy pinyinlib ];
         meta = {
@@ -1048,20 +1303,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    ace-popup-menu = callPackage ({ avy-menu, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ace-popup-menu = callPackage ({ avy-menu
+                                  , emacs
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "ace-popup-menu";
         version = "20171231.2215";
         src = fetchFromGitHub {
           owner = "mrkkrp";
           repo = "ace-popup-menu";
-          rev = "7b436a0d9e896463d00afbeb7e49a59cc6670e9c";
-          sha256 = "0ma5hq0v4kczf7mn1wkqj9pxjy47wryd697gg37l4sszl6ylcs9w";
+          rev = "7b8ad628a058d32c420f7615927a34a5d51a7ad3";
+          sha256 = "183gc5lidxahfzik9ima2vph2sdi2rd9805kfnghsmwhck275i2r";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/53742e2242101c4b3b3901f5c74e24facf62c7d6/recipes/ace-popup-menu";
           sha256 = "1cq1mpv7v98bqrpsm598krq1741b6rwih71cx3yjifpbagrv4m5s";
-          name = "ace-popup-menu";
+          name = "recipe";
         };
         packageRequires = [ avy-menu emacs ];
         meta = {
@@ -1069,20 +1329,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    ace-window = callPackage ({ avy, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ace-window = callPackage ({ avy
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "ace-window";
-        version = "20180123.1111";
+        version = "20180607.1223";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "ace-window";
-          rev = "208ea2a4e809f0c91caf3354b44a8f4a4f1cbb73";
-          sha256 = "1bkck2gbbgxhh1swzkdsyk5vp9h08dv8skc5hr4ncgxy2fq8m27g";
+          rev = "92d20e7e75dbb2ba0b879d3aedb8bed51fcee6a7";
+          sha256 = "0svk91yx9plr8027q57g2csqlvmxdp3rv5knpd0hl0hq0hk0j750";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/42fe131d3c2ea498e4df30ba539a6b91c00f5b07/recipes/ace-window";
           sha256 = "1k0x8m1phmvgdxb5aj841iai9q96a5lfq8i4b5vnlbc3w888n3xa";
-          name = "ace-window";
+          name = "recipe";
         };
         packageRequires = [ avy ];
         meta = {
@@ -1090,8 +1354,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    achievements = callPackage ({ fetchhg, fetchurl, keyfreq, lib, melpaBuild }:
-    melpaBuild {
+    achievements = callPackage ({ fetchhg
+                                , fetchurl
+                                , keyfreq
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "achievements";
         version = "20150530.1126";
         src = fetchhg {
@@ -1099,10 +1367,10 @@
           rev = "18a422131c12";
           sha256 = "0nk1zhqx0lvckjc98b36125148zgx1l2axln8gvkdwlhrd2cc6vj";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/83ec19a4ebac6b2d0fd84939b393848f82620978/recipes/achievements";
           sha256 = "1pwlibq87ph20z2pssk5hbgs6v8kdym9193jjdx2rxp0nic4k0cr";
-          name = "achievements";
+          name = "recipe";
         };
         packageRequires = [ keyfreq ];
         meta = {
@@ -1110,8 +1378,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    ack-menu = callPackage ({ fetchFromGitHub, fetchurl, lib, mag-menu, melpaBuild }:
-    melpaBuild {
+    ack-menu = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , mag-menu
+                            , melpaBuild }:
+      melpaBuild {
         pname = "ack-menu";
         version = "20150504.1322";
         src = fetchFromGitHub {
@@ -1120,10 +1392,10 @@
           rev = "f77be93a4697926ecf3195a355eb69580f695f4d";
           sha256 = "02ba4d8qkvgy52g0zcbyfvsnhr9685gq569nkwa2as30xdcq3khm";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8ff331ed45e5b7697e4862e723408602ecc98bc7/recipes/ack-menu";
           sha256 = "1d2kw04ndxji2qjcm1b65qnxpp08zx8gbia8bl6x6mnjb2isc2d9";
-          name = "ack-menu";
+          name = "recipe";
         };
         packageRequires = [ mag-menu ];
         meta = {
@@ -1131,20 +1403,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    actionscript-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    actionscript-mode = callPackage ({ fetchFromGitHub
+                                     , fetchurl
+                                     , lib
+                                     , melpaBuild }:
+      melpaBuild {
         pname = "actionscript-mode";
-        version = "20160820.1731";
+        version = "20180527.1001";
         src = fetchFromGitHub {
           owner = "austinhaas";
           repo = "actionscript-mode";
-          rev = "39287f00465559a58df1ea71a9dc5b15d4ac882a";
-          sha256 = "19qrlnbirxay70dm5w5p2iw4wrw3acj74kixs2wkifw5sq8i5cql";
+          rev = "65abd58e198458a8e46748c5962c41d80d60c4ea";
+          sha256 = "0cb8kkhh43wg63abjx6d4x55f0l3r6ziqcaz8rz1zr12jffnac8z";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2c11e74f2156f109b713380cebf83022d7159d4a/recipes/actionscript-mode";
           sha256 = "1dkiay9jmizvslji5kzab4dxm1dq0jm8ps7sjq6710g7a5aqdvwq";
-          name = "actionscript-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -1152,20 +1427,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    adafruit-wisdom = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    adafruit-wisdom = callPackage ({ emacs
+                                   , fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "adafruit-wisdom";
         version = "20180224.1652";
         src = fetchFromGitHub {
           owner = "gonewest818";
           repo = "adafruit-wisdom.el";
-          rev = "aafc01726f1b3160321d40160298a0e1b054b382";
-          sha256 = "18p55zghycsx88dn0iw610fklkhi5chzycrpjb4xzs5x1l5l2v08";
+          rev = "473b973885589a4843e80daf5c8503ea4cedf2ff";
+          sha256 = "0xzzyvnvv0951rr5l5l1vgls3cj5884nhfgqb8w5ian28jsf28bx";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/18483af52c26f719fbfde626db84a67750bf4754/recipes/adafruit-wisdom";
           sha256 = "0ckh420cirspwg2yd5q9y1az03j2l1jzd67g8dpvqjkgdp485gad";
-          name = "adafruit-wisdom";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -1173,8 +1452,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    add-hooks = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    add-hooks = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "add-hooks";
         version = "20171216.1723";
         src = fetchFromGitHub {
@@ -1183,10 +1465,10 @@
           rev = "1845137703461fc44bd77cf24014ba58f19c369d";
           sha256 = "02s9mv26ycypn4qfshrh17v1hsys2q9vffxj3g4lgq0lykplvkkm";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/901f846aef46d512dc0a1770bab7f07c0ae330cd/recipes/add-hooks";
           sha256 = "09a5b3prznibkb5igfn8x3vsjrlkh3534zycs8g25g4li87mcb6p";
-          name = "add-hooks";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -1194,20 +1476,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    add-node-modules-path = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    add-node-modules-path = callPackage ({ fetchFromGitHub
+                                         , fetchurl
+                                         , lib
+                                         , melpaBuild }:
+      melpaBuild {
         pname = "add-node-modules-path";
-        version = "20170914.1912";
+        version = "20180710.1642";
         src = fetchFromGitHub {
           owner = "codesuki";
           repo = "add-node-modules-path";
-          rev = "d9266c0e2707a3cd3ecddbbc1e378b9eb56e06c0";
-          sha256 = "1s03q9yrn64f5p1f2d941rd18m5kwa1776n9adr8rk3mq96v7cdp";
+          rev = "f31e69ccb681f882aebb806ce6e9478e3ac39708";
+          sha256 = "0p106bqmvdr8by5iv02bshm339qbrjcch2d15mrm4h3nav03v306";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/63e99d8fc0678d7b1831cae8940e9e6547780861/recipes/add-node-modules-path";
           sha256 = "0gbl875fgqr5np6r4cs8njs6fil1qmy8a5wir88x78ybdwwxsmbl";
-          name = "add-node-modules-path";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -1215,8 +1500,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    addressbook-bookmark = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    addressbook-bookmark = callPackage ({ emacs
+                                        , fetchFromGitHub
+                                        , fetchurl
+                                        , lib
+                                        , melpaBuild }:
+      melpaBuild {
         pname = "addressbook-bookmark";
         version = "20171107.2234";
         src = fetchFromGitHub {
@@ -1225,10 +1514,10 @@
           rev = "4f560af8397a46772e4b39f74f44a9ec9309a224";
           sha256 = "166iih6fzfizb1yxfhwzh9w9c3wi2xb25qjgialp5rwxlwdwy9dr";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a497aec6e27efa627068542cae5a16c01c3c6d3c/recipes/addressbook-bookmark";
           sha256 = "15p00v4ndrsbadal0ss176mks4ynj39786bmrnil29b6sqibd43r";
-          name = "addressbook-bookmark";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -1236,8 +1525,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    adoc-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, markup-faces, melpaBuild }:
-    melpaBuild {
+    adoc-mode = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , markup-faces
+                             , melpaBuild }:
+      melpaBuild {
         pname = "adoc-mode";
         version = "20160314.1430";
         src = fetchFromGitHub {
@@ -1246,10 +1539,10 @@
           rev = "745884359a1b8826ede2c4cfd2f0b5478953ac40";
           sha256 = "199da15f6p84809z33w3m35lrk9bgx8qpgnxsxgisli373mpzvd8";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/adoc-mode";
           sha256 = "0jd3zr4zpb4qqn504azl0y02cryv7n9wphv64b0fbpipr7w5hm2c";
-          name = "adoc-mode";
+          name = "recipe";
         };
         packageRequires = [ markup-faces ];
         meta = {
@@ -1257,8 +1550,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    aes = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    aes = callPackage ({ fetchFromGitHub
+                       , fetchurl
+                       , lib
+                       , melpaBuild }:
+      melpaBuild {
         pname = "aes";
         version = "20171028.2323";
         src = fetchFromGitHub {
@@ -1267,10 +1563,10 @@
           rev = "b7d5da89c3443292e4f0b1c9d254d459933cf5af";
           sha256 = "0nz1lf77qr3vm90rm02d4inw8glav722rxsiqds76m4xsjrq02m7";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/33ca3106852f82624b36c7e3f03f5c0c620f304f/recipes/aes";
           sha256 = "11vl9x3ldrv7q7rd29xk4xmlvfxs0m6iys84f6mlgf00190l5r5v";
-          name = "aes";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -1278,8 +1574,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    afternoon-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    afternoon-theme = callPackage ({ emacs
+                                   , fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "afternoon-theme";
         version = "20140104.1059";
         src = fetchFromGitHub {
@@ -1288,10 +1588,10 @@
           rev = "89b1d778a1f8b385775c122f2bd1c62f0fbf931a";
           sha256 = "19d5d6qs5nwmpf26rsb86ranb5p4236qp7p2b4i88cimcmzspylb";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/583256b7fa48501c8bfad305d76d2e16b6441539/recipes/afternoon-theme";
           sha256 = "13xgdw8px58sxpl7nyhkcdxwqdpp13i8wghvlb3l4471plw3vqgj";
-          name = "afternoon-theme";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -1299,8 +1599,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    ag = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    ag = callPackage ({ cl-lib ? null
+                      , dash
+                      , fetchFromGitHub
+                      , fetchurl
+                      , lib
+                      , melpaBuild
+                      , s }:
+      melpaBuild {
         pname = "ag";
         version = "20180225.240";
         src = fetchFromGitHub {
@@ -1309,10 +1615,10 @@
           rev = "77b4f50c5372bf219da496567b2b867261f0d354";
           sha256 = "0kwp6bb8fwv76x9r35rz4mvwica1fsappp82rjr1xlhnwwdsc120";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/67f410ac3a58a038e194bcf174bc0a8ceceafb9a/recipes/ag";
           sha256 = "1r4ai09vdckkg4h4i7dp781qqmm4kky53p4q8azp3n2c78i1vz6g";
-          name = "ag";
+          name = "recipe";
         };
         packageRequires = [ cl-lib dash s ];
         meta = {
@@ -1320,20 +1626,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    aggressive-fill-paragraph = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    aggressive-fill-paragraph = callPackage ({ dash
+                                             , fetchFromGitHub
+                                             , fetchurl
+                                             , lib
+                                             , melpaBuild }:
+      melpaBuild {
         pname = "aggressive-fill-paragraph";
         version = "20170902.705";
         src = fetchFromGitHub {
           owner = "davidshepherd7";
           repo = "aggressive-fill-paragraph-mode";
-          rev = "bcbc63d1c93cd8dc5bf2fc6eb4988fa76375c631";
-          sha256 = "042xvhfc7h571rdriixdf2s2aai8qz4w1wddbbbsq3ir0n814zp3";
+          rev = "c5185ad673c01e5103ab4a078095c3e2ce7ab039";
+          sha256 = "11dppmpdv26m9l5cnnnylihiss2a09zyyb7kqdrk3djdqvqplqb4";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/982f5936f2d83222263df2886ca0b629076366bb/recipes/aggressive-fill-paragraph";
           sha256 = "1df4bk3ks09805y67af6z1gpfln0lz773jzbbckfl0fy3yli0dja";
-          name = "aggressive-fill-paragraph";
+          name = "recipe";
         };
         packageRequires = [ dash ];
         meta = {
@@ -1341,20 +1651,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    aggressive-indent = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    aggressive-indent = callPackage ({ cl-lib ? null
+                                     , emacs
+                                     , fetchFromGitHub
+                                     , fetchurl
+                                     , lib
+                                     , melpaBuild }:
+      melpaBuild {
         pname = "aggressive-indent";
-        version = "20171012.1107";
+        version = "20180626.1721";
         src = fetchFromGitHub {
           owner = "Malabarba";
           repo = "aggressive-indent-mode";
-          rev = "1d7185d27020c3e91a7da21800716079297938ac";
-          sha256 = "0397kfy0lmgdic4jc8fqhsgpv8r4lrqcfanqbfbchfxwfswbqb8p";
+          rev = "8e70039c7190639c43794cb75eae118c2faaa0d1";
+          sha256 = "1h46krxk7wdhfvfmhdzp6c4dh2x53np41a17372k6b74hd15mgl0";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/aggressive-indent";
           sha256 = "1qi8jbr28gax35siim3hnnkiy8pa2vcrzqzc6axr98wzny46x0i2";
-          name = "aggressive-indent";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -1362,7 +1677,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    ahg = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild {
+    ahg = callPackage ({ fetchhg
+                       , fetchurl
+                       , lib
+                       , melpaBuild }:
+      melpaBuild {
         pname = "ahg";
         version = "20180125.944";
         src = fetchhg {
@@ -1370,10 +1689,10 @@
           rev = "622b519d8586";
           sha256 = "14jayh9bn8f6mjiln6h7ny404g0iy8zr7b6s6faqqhd840h519mz";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/ahg";
           sha256 = "0kw138lfzwp54fmly3jzzml11y7fhcjp3w0irmwdzr68lc206lr4";
-          name = "ahg";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -1381,8 +1700,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    ahk-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ahk-mode = callPackage ({ emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "ahk-mode";
         version = "20160320.1521";
         src = fetchFromGitHub {
@@ -1391,10 +1714,10 @@
           rev = "9cfc4840507f6cc8016fdede84ad90df53285359";
           sha256 = "07qpwa990bgs9028rqqk344c3z4hnr1jkfzcx9fi4z5k756zmw3b";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d8674b54ad5e17d1da1e499c7d8113f8acd8fd5d/recipes/ahk-mode";
           sha256 = "066l4hsb49wbyv381qgn9k4hn8gxlzi20h3qaim9grngjj5ljbni";
-          name = "ahk-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -1402,8 +1725,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    ahungry-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ahungry-theme = callPackage ({ emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "ahungry-theme";
         version = "20180130.1928";
         src = fetchFromGitHub {
@@ -1412,10 +1739,10 @@
           rev = "a038d91ec593d1f1b19ca66a0576d59bbc24c523";
           sha256 = "0f86xp7l8bv4z5dgf3pamjgqyiq3kfx9gbi9wcw0m6lbza8db15a";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/520295978fd7de3f4266dd69cc30d0b4fdf09db0/recipes/ahungry-theme";
           sha256 = "0fhim0qscpqx9siprp3ax1azxzmqkzvrjx517d9bnd68z7xxbpqy";
-          name = "ahungry-theme";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -1423,8 +1750,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    airline-themes = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, powerline }:
-    melpaBuild {
+    airline-themes = callPackage ({ fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild
+                                  , powerline }:
+      melpaBuild {
         pname = "airline-themes";
         version = "20180410.2106";
         src = fetchFromGitHub {
@@ -1433,10 +1764,10 @@
           rev = "8b528fbae0e557461315bed82883275d58df41f2";
           sha256 = "1xydgf9w0i2anpmjhy8m0zv1hql4gb37i11xfn6xzwna572z1ml9";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/addeb923176132a52807308fa5e71d41c9511802/recipes/airline-themes";
           sha256 = "0jkhb6nigyjmwqny7g59h4ssfy64vl3qnwcw46wnx5k9i73cjyih";
-          name = "airline-themes";
+          name = "recipe";
         };
         packageRequires = [ powerline ];
         meta = {
@@ -1444,20 +1775,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    airplay = callPackage ({ deferred, fetchFromGitHub, fetchurl, lib, melpaBuild, request, simple-httpd }:
-    melpaBuild {
+    airplay = callPackage ({ deferred
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild
+                           , request
+                           , simple-httpd }:
+      melpaBuild {
         pname = "airplay";
         version = "20130212.426";
         src = fetchFromGitHub {
           owner = "gongo";
           repo = "airplay-el";
-          rev = "bd690aafcae3a887946e1bba8327597932d964ad";
-          sha256 = "1lxpfswp1bjrz192px79f155dycf2kazpr7dfrcr1gyshlgxkpf7";
+          rev = "46fad71d293a3e18551cf464fe6c6208a7a32d9d";
+          sha256 = "1dlmkx17lafkxz3sfajylc5fml5rq339xn6v2qj463gg4n8sdgij";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b7f9d8229e4c91f4e3e8925b07e59d2a81cc745e/recipes/airplay";
           sha256 = "095nibgs197iplphk6csvkgsrgh1fcfyy33py860v6qmihvk538f";
-          name = "airplay";
+          name = "recipe";
         };
         packageRequires = [ deferred request simple-httpd ];
         meta = {
@@ -1465,8 +1802,44 @@
           license = lib.licenses.free;
         };
       }) {};
-    alchemist = callPackage ({ company, dash, elixir-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, s }:
-    melpaBuild {
+    alan-mode = callPackage ({ emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , flycheck
+                             , lib
+                             , melpaBuild
+                             , s }:
+      melpaBuild {
+        pname = "alan-mode";
+        version = "20180711.2148";
+        src = fetchFromGitHub {
+          owner = "M-industries";
+          repo = "AlanForEmacs";
+          rev = "02869448b4637516064900caf135aeb4f07bc5e4";
+          sha256 = "03y07041rwi7fab9slavh15xh7m4y6dbk44gd24dw5drb5kvfdiz";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/6e52314db81dad3517ab400099b032260c3e3e6f/recipes/alan-mode";
+          sha256 = "1528rh26kr9zj43djbrfb7vmq78spfay3k3ps5apc580ipx1a4hg";
+          name = "recipe";
+        };
+        packageRequires = [ emacs flycheck s ];
+        meta = {
+          homepage = "https://melpa.org/#/alan-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    alchemist = callPackage ({ company
+                             , dash
+                             , elixir-mode
+                             , emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild
+                             , pkg-info
+                             , s }:
+      melpaBuild {
         pname = "alchemist";
         version = "20180312.604";
         src = fetchFromGitHub {
@@ -1475,10 +1848,10 @@
           rev = "6f99367511ae209f8fe2c990779764bbb4ccb6ed";
           sha256 = "12f95rwxs11sqf1w9pnf6cxc2lh2jz4nqkq33p8b5yamnl8cq9kg";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6616dc61d17c5bd89bc4d226baab24a1f8e49b3e/recipes/alchemist";
           sha256 = "18jxw0zb7y34qbm4bcpfpb2656f0h9grmrbfskgp4ra4q5q3n369";
-          name = "alchemist";
+          name = "recipe";
         };
         packageRequires = [ company dash elixir-mode emacs pkg-info s ];
         meta = {
@@ -1486,20 +1859,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    alda-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    alda-mode = callPackage ({ emacs
+                             , fetchFromGitLab
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "alda-mode";
-        version = "20171103.1548";
-        src = fetchFromGitHub {
+        version = "20180607.2305";
+        src = fetchFromGitLab {
           owner = "jgkamat";
           repo = "alda-mode";
-          rev = "2582122c41cd34d034b6bbe71469f5ceb1de40c7";
-          sha256 = "11miyk48p09327ivmsk1hiw0brnx1pgjvdrfsdfhcwhbv2cafnf9";
+          rev = "ebc4232e754a3a49c937f59ebd849520b901e54c";
+          sha256 = "1rnvchb2rh7yzp2nw7qs9nh9m2r9cvhmkvh1qda3avf1ha9q20hp";
         };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/2612c494a2b6bd43ffbbaef88ce9ee6327779158/recipes/alda-mode";
-          sha256 = "0vpxiw3k0qxp6s19n93qkkyrr44rbw38ygriqdrfpp84pa09wprh";
-          name = "alda-mode";
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/848cb17d871287c401496e4483e400b44696e89d/recipes/alda-mode";
+          sha256 = "0qvaxh4392rpxikylcnn31z13wabaydj5aa4jyn499ggqdz7liw9";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -1507,20 +1884,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    alect-themes = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    alect-themes = callPackage ({ emacs
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "alect-themes";
-        version = "20180322.1408";
+        version = "20180504.1020";
         src = fetchFromGitHub {
           owner = "alezost";
           repo = "alect-themes";
-          rev = "f61eec647abd9981139c720811e1c4e2501f250c";
-          sha256 = "0hfhk2bnhml2sc1i7i4py06x9sph1g7qa50x6bffkxx92ry4wvl0";
+          rev = "4d90833a7381123a979f73fa97a013071ca7ff00";
+          sha256 = "19cb6zgg495d62wb6jn6cql5fhv8qd7rxpgxx90klp8yfizr0gmj";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/84c25a290ae4bcc4674434c83c66ae128e4c4282/recipes/alect-themes";
           sha256 = "04fq65qnxlvl5nc2q037c6yb4nf422dfw2913gv6zfh9rdmxsks8";
-          name = "alect-themes";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -1528,8 +1909,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    alert = callPackage ({ fetchFromGitHub, fetchurl, gntp, lib, log4e, melpaBuild }:
-    melpaBuild {
+    alert = callPackage ({ fetchFromGitHub
+                         , fetchurl
+                         , gntp
+                         , lib
+                         , log4e
+                         , melpaBuild }:
+      melpaBuild {
         pname = "alert";
         version = "20180403.38";
         src = fetchFromGitHub {
@@ -1538,10 +1924,10 @@
           rev = "667d9c7848c723eb392ab9bacae07966da3e3504";
           sha256 = "04nrl7kg5pprfdxjbqjyh7vw0vs22bplhhpaf30v3hw7k7nkc0ky";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/113953825ac4ff98d90a5375eb48d8b7bfa224e7/recipes/alert";
           sha256 = "0x3cvczq09jvshz435jw2fjm69457x2wxdvvbbjq46nfnybhi118";
-          name = "alert";
+          name = "recipe";
         };
         packageRequires = [ gntp log4e ];
         meta = {
@@ -1549,20 +1935,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    align-cljlet = callPackage ({ clojure-mode, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    align-cljlet = callPackage ({ clojure-mode
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "align-cljlet";
         version = "20160112.1301";
         src = fetchFromGitHub {
           owner = "gstamp";
           repo = "align-cljlet";
-          rev = "602d72a7ad52788a0265e3c6da519464a98166b8";
-          sha256 = "0l2rgs0rd4nmv4v7m10zhf2znzfvdifv1vlhpa3zbppg0fj8zph1";
+          rev = "ebcf0a912e836579a3a9d386e22c1c4bef7fba17";
+          sha256 = "1g0fp77zrnpa9dplj41my2wsin6qxpw49f7451km29mjayh2zhfj";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/align-cljlet";
           sha256 = "0pnhhv33rvlmb3823xpy9v5h6q99fa7fn38djbwry4rymi4jmlih";
-          name = "align-cljlet";
+          name = "recipe";
         };
         packageRequires = [ clojure-mode ];
         meta = {
@@ -1570,8 +1960,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    all-ext = callPackage ({ all, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    all-ext = callPackage ({ all
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "all-ext";
         version = "20170114.1805";
         src = fetchFromGitHub {
@@ -1580,10 +1974,10 @@
           rev = "9f4ef84a147cf4e0af6ef45826d6cb3558db6b88";
           sha256 = "0gdrsi9n9i1ibijkgk5kyjdjdmnsccfbpifpv679371glap9f68b";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f8e4328cae9b4759a75da0b26ea8b68821bc71af/recipes/all-ext";
           sha256 = "0vmpa5p7likg2xgck18sa0jvmvnhjs9v1fbl82sxx7qy2f3cggql";
-          name = "all-ext";
+          name = "recipe";
         };
         packageRequires = [ all ];
         meta = {
@@ -1591,8 +1985,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    all-the-icons = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, memoize }:
-    melpaBuild {
+    all-the-icons = callPackage ({ emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild
+                                 , memoize }:
+      melpaBuild {
         pname = "all-the-icons";
         version = "20180125.757";
         src = fetchFromGitHub {
@@ -1601,10 +2000,10 @@
           rev = "52d1f2d36468146c93aaf11399f581401a233306";
           sha256 = "1sdl33117lccznj38021lwcdnpi9nxmym295q6y460y4dm4lx0jn";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/604c01aa15927bd122260529ff0f4bb6a8168b7e/recipes/all-the-icons";
           sha256 = "00ba4gkfvg38l4s0gsb4asvv1hfw9yjl2786imybzy7bkg9f9x3q";
-          name = "all-the-icons";
+          name = "recipe";
         };
         packageRequires = [ emacs memoize ];
         meta = {
@@ -1612,8 +2011,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    all-the-icons-dired = callPackage ({ all-the-icons, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    all-the-icons-dired = callPackage ({ all-the-icons
+                                       , emacs
+                                       , fetchFromGitHub
+                                       , fetchurl
+                                       , lib
+                                       , melpaBuild }:
+      melpaBuild {
         pname = "all-the-icons-dired";
         version = "20170418.1431";
         src = fetchFromGitHub {
@@ -1622,10 +2026,10 @@
           rev = "980b7747d6c4a7992a1ec56afad908956db0a519";
           sha256 = "1pvbgyxfj4j205nj1r02045f1y4wgavdsk7f45hxkkhms1rj8jyy";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/all-the-icons-dired";
           sha256 = "1qj639z24ln29hv6c51g1vsa2jsy4qrlhf8c7d5w9bxcrcn2fnr9";
-          name = "all-the-icons-dired";
+          name = "recipe";
         };
         packageRequires = [ all-the-icons emacs ];
         meta = {
@@ -1633,20 +2037,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    all-the-icons-gnus = callPackage ({ all-the-icons, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    all-the-icons-gnus = callPackage ({ all-the-icons
+                                      , dash
+                                      , emacs
+                                      , fetchFromGitHub
+                                      , fetchurl
+                                      , lib
+                                      , melpaBuild }:
+      melpaBuild {
         pname = "all-the-icons-gnus";
-        version = "20180108.153";
+        version = "20180510.2354";
         src = fetchFromGitHub {
           owner = "nlamirault";
           repo = "all-the-icons-gnus";
-          rev = "61830f1da0f8ad8e9235133f5470daeb50d2de41";
-          sha256 = "19hjy14yalw736cjqbgm3dv4cly545k57ac16vj6c6jalb7wi0l5";
+          rev = "27f78996da0725943bcfb2d18038e6f7bddfa9c7";
+          sha256 = "0yi3nbhx7cdxq2192kh5ra2n0a3qg20p342prz3a0bm3w7q2ym11";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f8ed74d39d165343c81c2a21aa47e3d3895d8119/recipes/all-the-icons-gnus";
           sha256 = "0vdqhpa49p8vzbad426gl0dvniapyk73kbscvjv7mdl4bwhcr309";
-          name = "all-the-icons-gnus";
+          name = "recipe";
         };
         packageRequires = [ all-the-icons dash emacs ];
         meta = {
@@ -1654,8 +2064,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    all-the-icons-ivy = callPackage ({ all-the-icons, emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
-    melpaBuild {
+    all-the-icons-ivy = callPackage ({ all-the-icons
+                                     , emacs
+                                     , fetchFromGitHub
+                                     , fetchurl
+                                     , ivy
+                                     , lib
+                                     , melpaBuild }:
+      melpaBuild {
         pname = "all-the-icons-ivy";
         version = "20180225.630";
         src = fetchFromGitHub {
@@ -1664,10 +2080,10 @@
           rev = "52b3f4a8a4a038998943afaffb5ff25054f65af4";
           sha256 = "1xkrqv6znf1savkg17w41d9rm7wrs8n3c4ad0arrmi522qgp78fr";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9496e6bb6f03f35444fb204860bc50e5e1b36214/recipes/all-the-icons-ivy";
           sha256 = "1xv67gxd2sqj6zld4i3qcid0x5qsbd7baz55m93y1ivdqi7x7gr2";
-          name = "all-the-icons-ivy";
+          name = "recipe";
         };
         packageRequires = [ all-the-icons emacs ivy ];
         meta = {
@@ -1675,8 +2091,19 @@
           license = lib.licenses.free;
         };
       }) {};
-    amd-mode = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, js2-mode, js2-refactor, lib, makey, melpaBuild, projectile, s, seq }:
-    melpaBuild {
+    amd-mode = callPackage ({ emacs
+                            , f
+                            , fetchFromGitHub
+                            , fetchurl
+                            , js2-mode
+                            , js2-refactor
+                            , lib
+                            , makey
+                            , melpaBuild
+                            , projectile
+                            , s
+                            , seq }:
+      melpaBuild {
         pname = "amd-mode";
         version = "20180111.602";
         src = fetchFromGitHub {
@@ -1685,10 +2112,10 @@
           rev = "01fd19e0d635ccaf8e812364d8720733f2e84126";
           sha256 = "040g07k2hcwqspansjqfpng0lxzkmip26ipz26q6mvkpwm2wilv4";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e4d6e9935e4935c9de769c7bf1c1b6dd256e10da/recipes/amd-mode";
           sha256 = "17ry6vm5xlmdfs0mykdyn05cik38yswq5axdgn8hxrvvb6f58d06";
-          name = "amd-mode";
+          name = "recipe";
         };
         packageRequires = [
           emacs
@@ -1705,20 +2132,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    ample-regexps = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ample-regexps = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "ample-regexps";
         version = "20151023.300";
         src = fetchFromGitHub {
           owner = "immerrr";
           repo = "ample-regexps.el";
-          rev = "cbe91e148cac1ee8e223874dc956ed4cf607f046";
-          sha256 = "1mm4icrwx4mscp7kbbmlc34995r164dhrfczn5ybkyxjzzf76jn1";
+          rev = "884c712a82773d3af500e71d20bebe52340352c5";
+          sha256 = "18cicz11i19cpabrq6khnl9ks1khn6gw5a4ckaq4y65r40x0cr6g";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6a5c72dfb52d55b2b22c91f115b32fff14f2f61e/recipes/ample-regexps";
           sha256 = "00y07pd438v7ldkn5f1w84cpxa1mvcnzjkj6sf5l5pm97xqiz7j2";
-          name = "ample-regexps";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -1726,8 +2156,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    ample-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ample-theme = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "ample-theme";
         version = "20180207.945";
         src = fetchFromGitHub {
@@ -1736,10 +2169,10 @@
           rev = "366698400c555211c2082962a5d74f3dd79a78c8";
           sha256 = "1kzb15aqy7n2wxibmnihya7n6ajs34jxp9iin96n758nza92m59c";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d448c03202137a461ed814ce87acfac23faf676e/recipes/ample-theme";
           sha256 = "055c6jy2q761za4cl1vlqdskcd3mc1j58k8b4418q7h2lv2zc0ry";
-          name = "ample-theme";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -1747,8 +2180,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    ample-zen-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ample-zen-theme = callPackage ({ fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "ample-zen-theme";
         version = "20150119.1354";
         src = fetchFromGitHub {
@@ -1757,10 +2193,10 @@
           rev = "b277bb7abd4b6624e8d59f02474b79af50a007bd";
           sha256 = "18z9jl5d19a132k6g1dvwqfbbdh5cx66b2qxlcjsfiqxlxglc2sa";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b3b8c21f5dfbe9d4845a01548c8b7d9ddfe172a7/recipes/ample-zen-theme";
           sha256 = "0xygk80mh05qssrbfj4h6k50pg557dyj6kzc2pdlmnr5r4gnzdn3";
-          name = "ample-zen-theme";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -1768,20 +2204,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    amx = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    amx = callPackage ({ emacs
+                       , fetchFromGitHub
+                       , fetchurl
+                       , lib
+                       , melpaBuild
+                       , s }:
+      melpaBuild {
         pname = "amx";
-        version = "20180313.857";
+        version = "20180627.1555";
         src = fetchFromGitHub {
           owner = "DarwinAwardWinner";
           repo = "amx";
-          rev = "f2b030121e59b9b3c8f05218e6c673bc6d69125e";
-          sha256 = "10369f68wzpxb01bmk35yhm1z99wj0vm5d6ivdq5n6lard5afgvy";
+          rev = "09e919512692dc31df079ad2cd1a3ca3ac4f1949";
+          sha256 = "180841qv24z6kn3qry5216ija1h50ymm4kcmcxg4pc47bhzcjn1h";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c55bfad05343b2b0f3150fd2b4adb07a1768c1c0/recipes/amx";
           sha256 = "1ikhjvkca0lsb9j719yf6spg6nwc0qaydkd8aax162sis7kp9fap";
-          name = "amx";
+          name = "recipe";
         };
         packageRequires = [ emacs s ];
         meta = {
@@ -1789,20 +2230,28 @@
           license = lib.licenses.free;
         };
       }) {};
-    anaconda-mode = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pythonic, s }:
-    melpaBuild {
+    anaconda-mode = callPackage ({ dash
+                                 , emacs
+                                 , f
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild
+                                 , pythonic
+                                 , s }:
+      melpaBuild {
         pname = "anaconda-mode";
-        version = "20180209.1147";
+        version = "20180707.1010";
         src = fetchFromGitHub {
           owner = "proofit404";
           repo = "anaconda-mode";
-          rev = "384f1c5995a96c2687cea7cf18ff5710d00a39c2";
-          sha256 = "0qk1cd39pqjfm9hpgwm6xb205rgcka9jxfdkw3fcay3rmj3qyzws";
+          rev = "7d28ae061c226ca2e277ecb9d0928647d9a30154";
+          sha256 = "1sshdy8abqr5rihl7gjprczd4inznl28ipl812725ylmj0igrfw1";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e03b698fd3fe5b80bdd24ce01f7fba28e9da0da8/recipes/anaconda-mode";
           sha256 = "0gz16aam4zrm3s9ms13h4qcdflf55506kgkpyncq3bi54cvv8n1r";
-          name = "anaconda-mode";
+          name = "recipe";
         };
         packageRequires = [ dash emacs f pythonic s ];
         meta = {
@@ -1810,20 +2259,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    anaphora = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    anaphora = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "anaphora";
-        version = "20140728.1536";
+        version = "20180618.1500";
         src = fetchFromGitHub {
           owner = "rolandwalker";
           repo = "anaphora";
-          rev = "ed99ad4502e6fccde76050496984c6454676a410";
-          sha256 = "1ym43y0wqifkzpkm7ayf8cq2wz8pc2wgg9zvdyi0cn9lr9mwpbav";
+          rev = "3b2da3f759b244975852e79721c4a2dbad3905cf";
+          sha256 = "11fgiy029sqz7nvdm7dcal95lacryz9zql0x5h05z48nrrcl4bib";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8505db1945071a15ba0f2bb74b58d4a6875ca7d6/recipes/anaphora";
           sha256 = "1wb7fb3pc4gxvpjlm6gjbyx0rbhjiwd93qwc4vfw6p865ikl19y2";
-          name = "anaphora";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -1831,8 +2283,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    android-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    android-mode = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "android-mode";
         version = "20170323.115";
         src = fetchFromGitHub {
@@ -1841,10 +2296,10 @@
           rev = "f274da87429617b0b9c5889d46b36de64d982da4";
           sha256 = "17m4hp2qb54widwadv23amc1lasnbwzh2ipc6180fnajg8zcbvyw";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/77633aa340803a433570327943fbe31b396f4355/recipes/android-mode";
           sha256 = "1nqrvq411yg4b9xb5cvc7ai7lfalwc2rfhclzprvymc4vxh6k4cc";
-          name = "android-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -1852,8 +2307,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    angry-police-captain = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    angry-police-captain = callPackage ({ fetchFromGitHub
+                                        , fetchurl
+                                        , lib
+                                        , melpaBuild }:
+      melpaBuild {
         pname = "angry-police-captain";
         version = "20120829.552";
         src = fetchFromGitHub {
@@ -1862,10 +2320,10 @@
           rev = "d11931c5cb63368dcc4a48797962428cca6d3e9d";
           sha256 = "1m0c7ns7aiycg86cgglir8bkw730fslyg1n15m9ki0da4cnmm97a";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/angry-police-captain";
           sha256 = "00r3dx33h0wjxj0687ln8nbl1ff2badm3mk3r3bplfrd61z2qzld";
-          name = "angry-police-captain";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -1873,8 +2331,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    angular-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    angular-mode = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "angular-mode";
         version = "20151201.1327";
         src = fetchFromGitHub {
@@ -1883,10 +2344,10 @@
           rev = "8720cde86af0f1859ccc8580571e8d0ad1c52cff";
           sha256 = "04kg2x0lif91knmkkh05mj42xw3dkzsnysjda6ian95v57wfg377";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7b120c7f97e8d313387d2e9d9210e7fcdd10523b/recipes/angular-mode";
           sha256 = "1bwfmjldnxki0lqi3ys6r2a3nlhbwm1dibsg2dvzirq8qql02w1i";
-          name = "angular-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -1894,8 +2355,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    angular-snippets = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    angular-snippets = callPackage ({ dash
+                                    , fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild
+                                    , s }:
+      melpaBuild {
         pname = "angular-snippets";
         version = "20140513.2223";
         src = fetchFromGitHub {
@@ -1904,10 +2370,10 @@
           rev = "af5ae0a4a8603b040446c28afcf6ca01a8b4bd7b";
           sha256 = "0hdm1a323mzxjfdply8ri3addk146f21d8cmpd18r7dw3j3cdfrn";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/96a0ad5fdbc52f803846e580856fb9c58181c020/recipes/angular-snippets";
           sha256 = "057phgizn1c6njvdfigb23ljs31knq247gr0rcpqfrdaxsnnzm5c";
-          name = "angular-snippets";
+          name = "recipe";
         };
         packageRequires = [ dash s ];
         meta = {
@@ -1915,29 +2381,38 @@
           license = lib.licenses.free;
         };
       }) {};
-    anki-editor = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    anki-editor = callPackage ({ dash
+                               , emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild
+                               , request }:
+      melpaBuild {
         pname = "anki-editor";
-        version = "20180210.633";
+        version = "20180715.151";
         src = fetchFromGitHub {
           owner = "louietan";
           repo = "anki-editor";
-          rev = "a4a018d49e7c1fb01386216be6b8572b5ca33f94";
-          sha256 = "15mwbg0yrv8vs2wgn7vb2psk6qw29vivq778hxg7k9f4ak7kn7ls";
+          rev = "11dbf078957a7d291f5c767cd2936d4341c1864d";
+          sha256 = "009m854i4vvfq1772p9js1r48m9msvlmyaplfmzf7qfqkf6k79ad";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8155d649e4b129d0c72da6bb2b1aac66c8483491/recipes/anki-editor";
           sha256 = "18c5p82llq11vg1svqvbjrcnm7695nbbc6pwwl9jdjplasar585l";
-          name = "anki-editor";
+          name = "recipe";
         };
-        packageRequires = [ emacs ];
+        packageRequires = [ dash emacs request ];
         meta = {
           homepage = "https://melpa.org/#/anki-editor";
           license = lib.licenses.free;
         };
       }) {};
-    annotate = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    annotate = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "annotate";
         version = "20171110.2336";
         src = fetchFromGitHub {
@@ -1946,10 +2421,10 @@
           rev = "dedbd9e5d5286f1ca8ad73e489d408a20f06156c";
           sha256 = "12s5jc1i78x90s34ijljd75v1z6sisfrpix852gcisb9lpibbpz7";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3aae88b8e3b080501195d291012deab31aaf35f7/recipes/annotate";
           sha256 = "1ajykgara2m713blj2kfmdz12fzm8jw7klyakkyi6i3c3a9m44jy";
-          name = "annotate";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -1957,8 +2432,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    annotate-depth = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    annotate-depth = callPackage ({ fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "annotate-depth";
         version = "20160520.1340";
         src = fetchFromGitHub {
@@ -1967,10 +2445,10 @@
           rev = "fcb24fa36287250e40d195590c4ca4a8a696277b";
           sha256 = "18cav5wl3d0yq15273rqmdwvrgw96lmqiq9x5fxhf3wjb543mifl";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bb37bd77aea642ca72d74112bdd8a02eab8d1a80/recipes/annotate-depth";
           sha256 = "1j1pwnj7k6gl1p4npxsgrib0j1rzisq40pkm2wchjh86j3ybv2l4";
-          name = "annotate-depth";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -1978,8 +2456,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    annoying-arrows-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    annoying-arrows-mode = callPackage ({ cl-lib ? null
+                                        , fetchFromGitHub
+                                        , fetchurl
+                                        , lib
+                                        , melpaBuild }:
+      melpaBuild {
         pname = "annoying-arrows-mode";
         version = "20161023.2346";
         src = fetchFromGitHub {
@@ -1988,10 +2470,10 @@
           rev = "3c42e9807d7696da2da2a21b63beebf9cdb3f5dc";
           sha256 = "06gs5ln3w1xvq8f8k9225rwiipbh9cs0dzyyb7z05717rmqixcc4";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/annoying-arrows-mode";
           sha256 = "1vswlfypn6ijn0wwa3dsqkz5n3pillpmli2ha4q9snhd3a667vyh";
-          name = "annoying-arrows-mode";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -1999,20 +2481,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    ansi = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    ansi = callPackage ({ dash
+                        , fetchFromGitHub
+                        , fetchurl
+                        , lib
+                        , melpaBuild
+                        , s }:
+      melpaBuild {
         pname = "ansi";
         version = "20150703.126";
         src = fetchFromGitHub {
           owner = "rejeep";
           repo = "ansi.el";
-          rev = "12b4c5d91b3da1902838f421e5af6d40e2cd57dd";
-          sha256 = "19k71dj83kvc8mks6zhl45vsrsb61via53dqxjv9bny1ybh2av85";
+          rev = "a042c5954453bab9a74177e2b78ad17a824caebc";
+          sha256 = "1hbddxarr40ygvaw4pwaivq2l4f0brszw73w1r50lkjlggb7bl3g";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/ansi";
           sha256 = "0b5xnv6z471jm53g37njxin6l8yflsgm80y4wxahfgy8apipcq89";
-          name = "ansi";
+          name = "recipe";
         };
         packageRequires = [ dash s ];
         meta = {
@@ -2020,8 +2507,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    ansible = callPackage ({ f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    ansible = callPackage ({ f
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild
+                           , s }:
+      melpaBuild {
         pname = "ansible";
         version = "20170926.1951";
         src = fetchFromGitHub {
@@ -2030,10 +2522,10 @@
           rev = "9da54a2a426dca259ec9c2a8a60fb58e954be5bc";
           sha256 = "16z286gqy18s6bff1njkjpy0swrkfyarvb5xvik49pigd8hzh495";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8e45bf58b980ff542a5e887707a6361eb5ac0492/recipes/ansible";
           sha256 = "1xdc05fdglqfbizra6s1zl6knnvaq526dkxqnw9g7w269j8f4z8g";
-          name = "ansible";
+          name = "recipe";
         };
         packageRequires = [ f s ];
         meta = {
@@ -2041,20 +2533,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    ansible-doc = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ansible-doc = callPackage ({ emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "ansible-doc";
         version = "20160924.124";
         src = fetchFromGitHub {
           owner = "lunaryorn";
           repo = "ansible-doc.el";
-          rev = "86083a7bb2ed0468ca64e52076b06441a2f8e9e0";
-          sha256 = "0lap404ch74w99n3xip176jr42b38xhyzkfnkyqg0g3wk2cd3aq8";
+          rev = "bc8128a85a79b14f4a121105d87a5eddc33975ad";
+          sha256 = "0z3y69sfzka764wjbx31dywdq4d6bfsafv2gmmbpmxqmwfmy8sz4";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1daaaa7462f0b83c15ed9d9e7e6d0ee94434b8e9/recipes/ansible-doc";
           sha256 = "03idvnn79fr9id81aivkm7g7cmlsg0c520wcq4da8g013xvi342w";
-          name = "ansible-doc";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -2062,20 +2558,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    ansible-vault = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ansible-vault = callPackage ({ emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "ansible-vault";
         version = "20170111.1318";
         src = fetchFromGitHub {
           owner = "zellio";
           repo = "ansible-vault-mode";
-          rev = "71d1df3b1c2d1569b6c3091a9d54baf2ebc7019d";
-          sha256 = "0l5rsxbr9k5nq86v7vyv2l0inczfmcyfp95van84dk5fa1kpm3kc";
+          rev = "57cf7e6da30250587c28ebf592d7bca9a3bae1df";
+          sha256 = "1m9r3vicmljypq6mhgr86lzgi26dnnlp7g0jbl9bjdk48xfg79wb";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2bff0da29a9b883e53a3d211c5577a3e0bc263a0/recipes/ansible-vault";
           sha256 = "0pmsvpc866rgcajb2ihhb62g3rwhda7vvq2kxkvr566y609vv021";
-          name = "ansible-vault";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -2083,8 +2583,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    ant = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ant = callPackage ({ fetchFromGitHub
+                       , fetchurl
+                       , lib
+                       , melpaBuild }:
+      melpaBuild {
         pname = "ant";
         version = "20160211.743";
         src = fetchFromGitHub {
@@ -2093,10 +2596,10 @@
           rev = "510b5a3f57ee4b2855422d88d359a28922c1ab70";
           sha256 = "0jb5vl3cq5m3r23fjhcxgxl4g011zkjkkyn5mqqxx22a1sydsvab";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/ant";
           sha256 = "06028xjic14yv3rfqyc3k6jyjgm6fqfrf1mv8lvbh2sri2d5ifqa";
-          name = "ant";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -2104,20 +2607,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    anti-zenburn-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    anti-zenburn-theme = callPackage ({ fetchFromGitHub
+                                      , fetchurl
+                                      , lib
+                                      , melpaBuild }:
+      melpaBuild {
         pname = "anti-zenburn-theme";
-        version = "20180121.353";
+        version = "20180712.1138";
         src = fetchFromGitHub {
           owner = "m00natic";
           repo = "anti-zenburn-theme";
-          rev = "c80cc51bb1aaf11dd53b9d08e01d61bc9b32622f";
-          sha256 = "1c97d2jkh7iawgsbcg19gha9ffnxypbcfz0sgcsgf9vy4bvnc350";
+          rev = "dbafbaa86be67c1d409873f57a5c0bbe1e7ca158";
+          sha256 = "1h4lachmrpjiblah4rjd2cpvz6n6qh3i5cdp4wra2dk177h7kj6h";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6f6f803dc99a1b1fdb5b4e79f1c9cf72b702d091/recipes/anti-zenburn-theme";
           sha256 = "1sp9p6m2jy4m9fdn1hz25cmasy0mwwgn46qmvm92i56f5x6jlzzk";
-          name = "anti-zenburn-theme";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -2125,8 +2631,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    anx-api = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    anx-api = callPackage ({ fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "anx-api";
         version = "20140208.714";
         src = fetchFromGitHub {
@@ -2135,10 +2644,10 @@
           rev = "b2411ebc966ac32c3ffc61bc22bf183834df0fa0";
           sha256 = "0fzxzar8m9qznfxv3wr7vfj9y2110wf6mm5cj55k3sd5djdjhmf1";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2e3b329ff11818a1553c74a02475cb4110173076/recipes/anx-api";
           sha256 = "1vzg3wsqyfb9rsfxrpz8k2gazjlz2nwnf4gnn1dypsjspjnzcb8r";
-          name = "anx-api";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -2146,8 +2655,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    anybar = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    anybar = callPackage ({ fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "anybar";
         version = "20160816.721";
         src = fetchFromGitHub {
@@ -2156,10 +2668,10 @@
           rev = "7a0743e0d31bcb36ab1bb2e351f3e7139c422ac5";
           sha256 = "1s7vnp2xzffdj4pqdqn6mrirw33ms0yqlpxzz5pwj6xrbp2x5r6s";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5516e309df9ac8bf0fafb9ec9037094d82913b67/recipes/anybar";
           sha256 = "0prnr8wjhishpf2zmn4b7054vfahk10w05nzsg2p6whaxywcachm";
-          name = "anybar";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -2167,20 +2679,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    anyins = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    anyins = callPackage ({ fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "anyins";
         version = "20131229.241";
         src = fetchFromGitHub {
           owner = "antham";
           repo = "anyins";
-          rev = "83844c17ac9b5b6c7655ee556b75689e4c8ea663";
-          sha256 = "05lq0bllgn44zs85mgnfdcyjasm6j8m70jdcxksf798i0qdqnk7n";
+          rev = "cd5e3c1abd471c8a67aafc42c4c985a2796f4b9f";
+          sha256 = "0j36wrvc3kj1afigpc230d92gwszk1qrmiz38jyi9anr6an4ch3p";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a367da2cb71fc0b144f9e608dc4857624991f19c/recipes/anyins";
           sha256 = "0ncf3kn8rackcidkgda2zs60km3hx87rwr9daj7ksmbb6am09s7c";
-          name = "anyins";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -2188,20 +2703,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    anzu = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    anzu = callPackage ({ emacs
+                        , fetchFromGitHub
+                        , fetchurl
+                        , lib
+                        , melpaBuild }:
+      melpaBuild {
         pname = "anzu";
         version = "20161017.907";
         src = fetchFromGitHub {
           owner = "syohex";
           repo = "emacs-anzu";
-          rev = "e6c56ca8b23ac433f7be58b6f3f50801dd4164e4";
-          sha256 = "1y6s45k3f2x30fc9d5dv1v3cypj9wylx56khs5zxczgk5ky1ffp4";
+          rev = "799f26ee0e3ce598b36983f4dce539f47739e656";
+          sha256 = "1rpdw0vxss071kb995xyihdx21dv18d9cn666jvsy43g49fb803p";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/anzu";
           sha256 = "181hzwy9bc0zfhax26p20q9cjibrmi9ngps5fa3ja5g6scxfs9g1";
-          name = "anzu";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -2209,8 +2728,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    aozora-view = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    aozora-view = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "aozora-view";
         version = "20140310.617";
         src = fetchFromGitHub {
@@ -2219,10 +2741,10 @@
           rev = "b0390616d19e45f15f9a2f5d5688274831e721fd";
           sha256 = "0528z3axjmplg2fdbv4jxgy1p39vr4rnsm4a3ps2fanf8bwsyx3l";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c6c13f8a0dd90c1c1f39711a5de69c1e0b785601/recipes/aozora-view";
           sha256 = "0pd2574a6dkhrfr0jf5gvv34ganp6ddylyb6cfpg2d4znwbc2r2w";
-          name = "aozora-view";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -2230,8 +2752,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    apache-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    apache-mode = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "apache-mode";
         version = "20170711.913";
         src = fetchFromGitHub {
@@ -2240,10 +2765,10 @@
           rev = "0906559e0cb2997405d98ea6b2195954e3935d3b";
           sha256 = "0vfyi34qcwkz9975cq5hin1p2zyy3h05fni4f93xyrcs31zvmk22";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/eb13cb0dba1696cc51132cd1ff723fa17f892a7c/recipes/apache-mode";
           sha256 = "0wzfx3kaiwvya30ihq3vpdhy6znkzf25w5x43x457ifdn2vrh9zi";
-          name = "apache-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -2251,8 +2776,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    apel = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    apel = callPackage ({ fetchFromGitHub
+                        , fetchurl
+                        , lib
+                        , melpaBuild }:
+      melpaBuild {
         pname = "apel";
         version = "20170122.1458";
         src = fetchFromGitHub {
@@ -2261,10 +2789,10 @@
           rev = "339eb28ffae3165255a79de9b1fd362f43cd37c3";
           sha256 = "1f0zxydh2pkwbjx5bh1bzl3r5g50vqg18azvqkvv9r0nn42hkhmi";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/apel";
           sha256 = "0zrm8m66p3aqr0108s3cj6z4xqbg2hx37z1pam4c65bqlhh74s8y";
-          name = "apel";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -2272,8 +2800,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    apib-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, markdown-mode, melpaBuild }:
-    melpaBuild {
+    apib-mode = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , markdown-mode
+                             , melpaBuild }:
+      melpaBuild {
         pname = "apib-mode";
         version = "20170520.658";
         src = fetchFromGitHub {
@@ -2282,10 +2814,10 @@
           rev = "6cc7c6f21b8e415b1718bb6a07ab2182e9e9dde6";
           sha256 = "1717f78kaqkmbhfwb9kzsv5wi2zabcbwb4wh1jklhcaalvmk3z7d";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/dc2ebb04f975d8226a76260895399c937d6a1940/recipes/apib-mode";
           sha256 = "0y3n0xmyc4gkypq07v4sp0i6291qaj2m13zkg6mxp61zm669v2fb";
-          name = "apib-mode";
+          name = "recipe";
         };
         packageRequires = [ markdown-mode ];
         meta = {
@@ -2293,20 +2825,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    apiwrap = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    apiwrap = callPackage ({ emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "apiwrap";
-        version = "20180318.1515";
+        version = "20180602.1531";
         src = fetchFromGitHub {
           owner = "vermiculus";
           repo = "apiwrap.el";
-          rev = "d80ae8d80520786dd5527e53c0a9374534168d41";
-          sha256 = "0v2bnndrhvdkk5qa3rzzdl83471i00s0cxbvrsl8ijcm6xpc0m1b";
+          rev = "e4c9c57d6620a788ec8a715ff1bb50542edea3a6";
+          sha256 = "0xpb8mmssajy42r2h1m9inhv1chx19wkp5p0p63nwpk7mhjj8bis";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0197fd3657e65e3826375d9b6f19da3058366c91/recipes/apiwrap";
           sha256 = "0n50n1n5pvcgcp1gmna3ci36pnbanjdbjpgv7zyarlb80hywbiyw";
-          name = "apiwrap";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -2314,8 +2850,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    apples-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    apples-mode = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "apples-mode";
         version = "20110120.2018";
         src = fetchFromGitHub {
@@ -2324,10 +2863,10 @@
           rev = "83a9ab0d6ba82496e2f7df386909b1a55701fccb";
           sha256 = "0br0jl6xnajdx37s5cvs13srn9lldg58y9587a11s3s651xjdq0z";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5ca765a6a2f312f585624ec8b82dc9eb6b9bbc0c/recipes/apples-mode";
           sha256 = "05ssnxs9ybc26jhr69xl9jpb41bz1688minmlc9msq2nvyfnj97s";
-          name = "apples-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -2335,8 +2874,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    applescript-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    applescript-mode = callPackage ({ fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "applescript-mode";
         version = "20090320.2332";
         src = fetchFromGitHub {
@@ -2345,10 +2887,10 @@
           rev = "8f888cd80af1e0902b5609143facd3051bc94892";
           sha256 = "0d3bqx6346vmniv001jgd6wggp80kv1kqc38sdgd88862gkqnqyg";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/576e42b33a5245e1aae0f0d879fd18762342db32/recipes/applescript-mode";
           sha256 = "0rj03xw8yx79xj9ahdwfxicxna0a0lykn2n39xng5gnm4bh2n6z4";
-          name = "applescript-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -2356,8 +2898,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    aproject = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    aproject = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "aproject";
         version = "20150605.206";
         src = fetchFromGitHub {
@@ -2366,10 +2911,10 @@
           rev = "3c7d23c341862dfd77fd0a64775df12ddb44ab54";
           sha256 = "1wyz8jvdy4m0cn75mm3zvxagm2gl10q51479f91gnqv14b4rndfc";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/de10c48976352f273e8363c2f6fa60602ee86c9b/recipes/aproject";
           sha256 = "0v3gx2mff2s7knm69y253pm1yr4svy8w00pqbn1chrvymb62jhp2";
-          name = "aproject";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -2377,8 +2922,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    apropospriate-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    apropospriate-theme = callPackage ({ fetchFromGitHub
+                                       , fetchurl
+                                       , lib
+                                       , melpaBuild }:
+      melpaBuild {
         pname = "apropospriate-theme";
         version = "20180223.1526";
         src = fetchFromGitHub {
@@ -2387,10 +2935,10 @@
           rev = "019ed5cf8f1e1abfead7adceeda88938dfe928b7";
           sha256 = "0x6iw9dr3zvy2xqxadlxkjhpkfgig009x0ilipdji20hpa0qhhgm";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1da33013f15825ab656260ce7453b8127e0286f4/recipes/apropospriate-theme";
           sha256 = "10bj2bsi7b104m686z8mgvbh493liidsvivxfvfxzbndc8wyjsw9";
-          name = "apropospriate-theme";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -2398,19 +2946,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    apt-sources-list = callPackage ({ emacs, fetchgit, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    apt-sources-list = callPackage ({ emacs
+                                    , fetchgit
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "apt-sources-list";
-        version = "20180311.437";
+        version = "20180527.541";
         src = fetchgit {
           url = "https://git.korewanetadesu.com/apt-sources-list.git";
-          rev = "fd12fbacf245714be5ca20563572cb49e2f1eb45";
-          sha256 = "0kfz9gj66a9wqcdrvxg4hzndmh1j01wqfqkdrblplgni4h7907a4";
+          rev = "44112833b3fa7f4d7e43708e5996782e22bb2fa3";
+          sha256 = "0av8v9ibqws5vb2sg3bfk0g1pyraqjgwmcg2n23whmpbl5xdnh6k";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/141a22e593415302d64cf8ebd2635a1baf35eb38/recipes/apt-sources-list";
           sha256 = "1gnl6zqv6imk2qpv4lj7qyjgf1ldxib3k14gsmwqm0c1zwjsid3j";
-          name = "apt-sources-list";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -2418,8 +2970,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    arch-packer = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    arch-packer = callPackage ({ async
+                               , dash
+                               , emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild
+                               , s }:
+      melpaBuild {
         pname = "arch-packer";
         version = "20170730.621";
         src = fetchFromGitHub {
@@ -2428,10 +2987,10 @@
           rev = "940e96f7d357c6570b675a0f942181c787f1bfd7";
           sha256 = "0m80ka51m7a1797q6br41x96znvqfmpwzh3vk4mz66mdx2r4xk77";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6d1796688ed0d6957557d960ca28e450f9bcb6cf/recipes/arch-packer";
           sha256 = "04kv22vpcpjhc047yz6k6dizmwwdjk6vcm8imri76gi9ns1w5n5z";
-          name = "arch-packer";
+          name = "recipe";
         };
         packageRequires = [ async dash emacs s ];
         meta = {
@@ -2439,8 +2998,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    archive-region = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    archive-region = callPackage ({ fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "archive-region";
         version = "20140201.1542";
         src = fetchFromGitHub {
@@ -2449,10 +3011,10 @@
           rev = "0d357d4c42a6a248c457f358f81b20fd20fede2f";
           sha256 = "03pmwgvlxxlp4wh0sg5czpx1i88i43lz8lwdbfa6l28g1sv0f264";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f8e4328cae9b4759a75da0b26ea8b68821bc71af/recipes/archive-region";
           sha256 = "1aiz6a0vdc2zm2q5r80cj5xixqfhsgmr7ldj9ff40k4sf3z5xny3";
-          name = "archive-region";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -2460,20 +3022,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    archive-rpm = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    archive-rpm = callPackage ({ emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "archive-rpm";
-        version = "20171016.112";
+        version = "20180706.532";
         src = fetchFromGitHub {
           owner = "legoscia";
           repo = "archive-rpm";
-          rev = "e2fac6c018c19001f1f28e7c80721724684f8941";
-          sha256 = "1qq0z5mmbhd0ma8v8bxy53n6ynqz5qf9n3h7566dylmdncyyv7hw";
+          rev = "59f83caebbd2f92fd634f6968e6d17b50ffa3dc7";
+          sha256 = "11ssqaax4jl7r3z5agzmc74sjsfvl0m3xvp015ncqzpzysla47g3";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e5f5653e62afdc022eac30bda3d21bd2d2625d2e/recipes/archive-rpm";
           sha256 = "0s53zbn71lb008gw3f0b5w4q0pw0vgiqbffgnyib24sh03ijl7z7";
-          name = "archive-rpm";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -2481,41 +3047,51 @@
           license = lib.licenses.free;
         };
       }) {};
-    arduino-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    arduino-mode = callPackage ({ cl-lib ? null
+                                , emacs
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild
+                                , spinner }:
+      melpaBuild {
         pname = "arduino-mode";
-        version = "20180305.1916";
+        version = "20180508.1736";
         src = fetchFromGitHub {
           owner = "stardiviner";
           repo = "arduino-mode";
-          rev = "40bc53149b517ebfa448b07f0b766f24d612f716";
-          sha256 = "0rh8rmi7y1a4myf6pa51qhr9sa1arjfbrr6rzbsdlwcbzinfj83f";
+          rev = "e39cb1c02acb6676aea35f93fbd0d86badce6a38";
+          sha256 = "1sg6n4ys5lq2m7q876qi88r11c08y05ggyv9r85ahins2pbgbv95";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2db785f52c2facc55459e945ccb4d4b088506747/recipes/arduino-mode";
           sha256 = "1amqah0sx95866ikdlc7h7n9hmrwaqizc0rj0gliv15kjjggv55v";
-          name = "arduino-mode";
+          name = "recipe";
         };
-        packageRequires = [ cl-lib emacs ];
+        packageRequires = [ cl-lib emacs spinner ];
         meta = {
           homepage = "https://melpa.org/#/arduino-mode";
           license = lib.licenses.free;
         };
       }) {};
-    aria2 = callPackage ({ emacs, fetchFromGitLab, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    aria2 = callPackage ({ emacs
+                         , fetchFromGitLab
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "aria2";
         version = "20141107.1517";
         src = fetchFromGitLab {
           owner = "ukaszg";
           repo = "aria2";
-          rev = "7a944c5100812269369225af7aa9580fedab175f";
-          sha256 = "1pwnx6k7b35xhwqvzd3rl6rf5ydvbrrdmbadns8w0iyz2yafdxji";
+          rev = "3c54254e424c6c8b4eb0d8e7c4907b094c27a3f0";
+          sha256 = "1xkgz3l7idw5bk1xlffdaddf5v1q6fm3grbryl4xvssrbwgnyisf";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/89a55e7c313066ae1bc0db0af5c289814c85fcb1/recipes/aria2";
           sha256 = "1gsqdqs3q86k7q88rf7qamc0sp5ca00xn9kr1r717vf6qq6a0c3c";
-          name = "aria2";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -2523,8 +3099,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    ariadne = callPackage ({ bert, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ariadne = callPackage ({ bert
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "ariadne";
         version = "20131117.911";
         src = fetchFromGitHub {
@@ -2533,10 +3113,10 @@
           rev = "6fe401c7f996bcbc2f685e7971324c6f5e5eaf15";
           sha256 = "0vh9wfc3657sd12ybjcrxpg6f757x2ghkcl1lw01szmyy5vmj27h";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/89635cd11621b04a8575629ec1bf196fb3ea5d43/recipes/ariadne";
           sha256 = "0lfhving19wcfr40gjb2gnginiz8cncixiyyxhwx08lm84qb3a7p";
-          name = "ariadne";
+          name = "recipe";
         };
         packageRequires = [ bert ];
         meta = {
@@ -2544,8 +3124,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    arjen-grey-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    arjen-grey-theme = callPackage ({ fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "arjen-grey-theme";
         version = "20170522.1347";
         src = fetchFromGitHub {
@@ -2554,10 +3137,10 @@
           rev = "4cd0be72b65d42390e2105cfdaa408a1ead8d8d1";
           sha256 = "1n5axwn498ahb6984ir1zfl8vvwgbvq9bbrdfzydkmjljhgrp0rd";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ed9804061cfadd26c69bb1bfe63dbe22f916f723/recipes/arjen-grey-theme";
           sha256 = "18q66f7hhys2ab9ljsdp9013mp7d6v6d1lrb0d1bb035r1b4pfj7";
-          name = "arjen-grey-theme";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -2565,20 +3148,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    artbollocks-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    artbollocks-mode = callPackage ({ fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "artbollocks-mode";
         version = "20170523.2122";
         src = fetchFromGitHub {
           owner = "sachac";
           repo = "artbollocks-mode";
-          rev = "33a41ca4f8206f57e5498a526d3b0ea18d08bb93";
-          sha256 = "06a2dp6nwy8xjr01k6d2c611qr2n9m7hdkrz9fci9r4rv1ikx5xv";
+          rev = "4a907e470bf345b88c3802c1241ce2b8cf4123ee";
+          sha256 = "1l1dwhdfd5bwx92k84h5v47pv9my4p4wj0wq8hrwvwzwlv8dzn2w";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/22b237ab91ddd3c17986ea12e6a32f2ce62d3a79/recipes/artbollocks-mode";
           sha256 = "0dlnxicn6nzyiz44y92pbl4nzr9jxfb9a99wacjrwq2ahdrwhhjp";
-          name = "artbollocks-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -2586,8 +3172,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    arview = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    arview = callPackage ({ fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "arview";
         version = "20160419.1409";
         src = fetchFromGitHub {
@@ -2596,10 +3185,10 @@
           rev = "5437b4221b64b238c273a651d4792c577dba6d45";
           sha256 = "1yvirfmvf6v5khl7zhx2ddv9bbxnx1qhwfzi0gy2nmbxlykb6s2j";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/31574cd756f4f93e2c6bcad5eca33a3294cccd54/recipes/arview";
           sha256 = "0d935lj0x3rbar94l7288xrgbcp1wmz6r2l0b7i89r5piczyiy1y";
-          name = "arview";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -2607,8 +3196,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    asilea = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    asilea = callPackage ({ cl-lib ? null
+                          , emacs
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "asilea";
         version = "20150105.725";
         src = fetchFromGitHub {
@@ -2617,10 +3211,10 @@
           rev = "2aab1cc63b64ef08d12e84fd7ba5c94065f6039f";
           sha256 = "1s973vzivibaqjb8acn4ylrdasxh17jcfmmvqp4wm05nwhg75597";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/858e673c66e876d80f41d47d307c944d7bdb147d/recipes/asilea";
           sha256 = "1lb8nr6r6yy06m4pxg8w9ja4zv8k5xwhl95v2wv95y1qwhgnwg3j";
-          name = "asilea";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -2628,8 +3222,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    asn1-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    asn1-mode = callPackage ({ emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild
+                             , s }:
+      melpaBuild {
         pname = "asn1-mode";
         version = "20170728.1926";
         src = fetchFromGitHub {
@@ -2638,10 +3237,10 @@
           rev = "d5d4a8259daf708411699bcea85d322f18beb972";
           sha256 = "067khpi4ghzyifrk1vhi57n3alp67qks4k4km11hasiavi5gsjmp";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b694baceceb54810be8f8c7152b2ac0b4063f01c/recipes/asn1-mode";
           sha256 = "0iswisb08dqz7jc5ra4wcdhbmglildgyrb547dm5362xmvm9ifmy";
-          name = "asn1-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs s ];
         meta = {
@@ -2649,8 +3248,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    assess = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, m-buffer, melpaBuild }:
-    melpaBuild {
+    assess = callPackage ({ emacs
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , m-buffer
+                          , melpaBuild }:
+      melpaBuild {
         pname = "assess";
         version = "20170504.657";
         src = fetchFromGitHub {
@@ -2659,10 +3263,10 @@
           rev = "e5b0415126c6bd24bd220759ff04220d963a0195";
           sha256 = "04242jhrajd9qi9dzngv33730sqhymgr0f18hf92fgb2k5649lqk";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6f917a34506193f2674b195569dfd3c13ba62c1d/recipes/assess";
           sha256 = "0xj3f48plwxmibax00qn15ya7s0h560xzwr8nkwl5r151v1mc9rr";
-          name = "assess";
+          name = "recipe";
         };
         packageRequires = [ emacs m-buffer ];
         meta = {
@@ -2670,20 +3274,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    async = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    async = callPackage ({ fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "async";
-        version = "20180408.844";
+        version = "20180527.1030";
         src = fetchFromGitHub {
           owner = "jwiegley";
           repo = "emacs-async";
-          rev = "8bb64e398897d1cc000fc295c5157b4ad1a7bd5b";
-          sha256 = "04384akcxirvfcl5rb07hj5xaw2crsgnhbnwyh1dkmy56qak60a1";
+          rev = "6fa6a866b4b31908166e010ac60e77927bdbfc5a";
+          sha256 = "0m4nwc032xhwx3k1948zs3nz80rxnr1qsfdqmbxwm5vyx9mmqm9n";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/async";
           sha256 = "0s2qrmkqqfgi1ilzbj0rfk27f89p4dycdl1lqkbsm23j0zya53w4";
-          name = "async";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -2691,20 +3298,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    async-await = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, promise }:
-    melpaBuild {
+    async-await = callPackage ({ emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild
+                               , promise }:
+      melpaBuild {
         pname = "async-await";
         version = "20170208.350";
         src = fetchFromGitHub {
           owner = "chuntaro";
           repo = "emacs-async-await";
-          rev = "56ab90e4019ed1f81fd4ad9e8701b5cec7ffa795";
-          sha256 = "1k6wisls6dqn63r4f4brnhrjbvzqpigw2zxdl9v8g1qcw49spk5s";
+          rev = "da472e38bb7b8eaeea3f81ffd13e4006c31e9e6f";
+          sha256 = "02mqlf07bq24c4gg12zgyyg3a3dqnwygxkm70w7ziwr6hv05kzdh";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9d74ecf94e5dbb46a939d26833b7cd0efd159ca1/recipes/async-await";
           sha256 = "1534rhr4j74qbndafdj9q2wggcn8gphhjn3id8p27wyxr5sh93ms";
-          name = "async-await";
+          name = "recipe";
         };
         packageRequires = [ emacs promise ];
         meta = {
@@ -2712,8 +3324,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    at = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, queue }:
-    melpaBuild {
+    at = callPackage ({ emacs
+                      , fetchFromGitHub
+                      , fetchurl
+                      , lib
+                      , melpaBuild
+                      , queue }:
+      melpaBuild {
         pname = "at";
         version = "20140707.520";
         src = fetchFromGitHub {
@@ -2722,10 +3339,10 @@
           rev = "114dfe3761bf0c9dd89f794106c3a6a436ed06cc";
           sha256 = "0rnnvr8x1czphbinby2z2dga7ikwgd13d7zhgmp3ggamzyaz6nf1";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/@";
           sha256 = "0da0xqk8fhz8aij3zmpp4bz3plpvfq2riyy17i7ny4ralxb3g08z";
-          name = "at";
+          name = "recipe";
         };
         packageRequires = [ emacs queue ];
         meta = {
@@ -2733,8 +3350,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    atom-dark-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    atom-dark-theme = callPackage ({ fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "atom-dark-theme";
         version = "20170710.1612";
         src = fetchFromGitHub {
@@ -2743,10 +3363,10 @@
           rev = "7fb37fd953e417acbcf7dd3f36e3167bed9bc887";
           sha256 = "040xp0nqa9akjv30kgnw6l1248g2cl5yzihhfwbr8cgywqfir1lw";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d1f565871559d6ea4ca4bb2fbaebce58f2f383eb/recipes/atom-dark-theme";
           sha256 = "1ci61blm7wc83wm2iyax017ai4jljyag5j1mvw86rimmmjzr0v8f";
-          name = "atom-dark-theme";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -2754,20 +3374,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    atom-one-dark-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    atom-one-dark-theme = callPackage ({ fetchFromGitHub
+                                       , fetchurl
+                                       , lib
+                                       , melpaBuild }:
+      melpaBuild {
         pname = "atom-one-dark-theme";
-        version = "20180305.1454";
+        version = "20180607.1638";
         src = fetchFromGitHub {
           owner = "jonathanchu";
           repo = "atom-one-dark-theme";
-          rev = "7b73ab795286fe121d23026dcc94d6a0a211e4c4";
-          sha256 = "1w5j773zg6lz8vq9yqfx2w5076h53k0narcnknni8hd8z4qg6b6q";
+          rev = "d56b0db8d03fae2b47a6dbaadb5805105e394070";
+          sha256 = "0bv80pg1bnpsv6j56ydlxm9h1cnicimcbwm1nw642fnf0zxw7p8g";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3ba1c4625c9603372746a6c2edb69d65f0ef79f5/recipes/atom-one-dark-theme";
           sha256 = "0wwnkhq7vyysqiqcxc1jsn98155ri4mf4w03k7inl1f8ffpwahvw";
-          name = "atom-one-dark-theme";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -2775,20 +3398,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    atomic-chrome = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, websocket }:
-    melpaBuild {
+    atomic-chrome = callPackage ({ emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , let-alist
+                                 , lib
+                                 , melpaBuild
+                                 , websocket }:
+      melpaBuild {
         pname = "atomic-chrome";
-        version = "20180322.301";
+        version = "20180617.24";
         src = fetchFromGitHub {
           owner = "alpha22jp";
           repo = "atomic-chrome";
-          rev = "d6577d61981a8bf293928eddaa6b83d22d59bd8c";
-          sha256 = "0qi5g5js885hp0xkwib12zbz84sganb8lnrps48097zlkcxppm3p";
+          rev = "a505f638866f9e7b913784be0dc84f338e9ad449";
+          sha256 = "081465ahis2rvlklzn2vakbwn5dgr43ks4csp3arnlj11b43f3ai";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/35785773942a5510e2317ded5bdf872ffe434e8c/recipes/atomic-chrome";
           sha256 = "0dx12mjdc4vhbvrcl61a7j247mgs71vvy0qqj6czbpfawfl46am9";
-          name = "atomic-chrome";
+          name = "recipe";
         };
         packageRequires = [ emacs let-alist websocket ];
         meta = {
@@ -2796,20 +3425,28 @@
           license = lib.licenses.free;
         };
       }) {};
-    attrap = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, s }:
-    melpaBuild {
+    attrap = callPackage ({ dash
+                          , emacs
+                          , f
+                          , fetchFromGitHub
+                          , fetchurl
+                          , flycheck
+                          , lib
+                          , melpaBuild
+                          , s }:
+      melpaBuild {
         pname = "attrap";
-        version = "20180218.1243";
+        version = "20180715.1205";
         src = fetchFromGitHub {
           owner = "jyp";
           repo = "attrap";
-          rev = "0a733deccaf48350511346b2f5a51d328df4dfc8";
-          sha256 = "1ck6m30m76jad7w4mwnpv2gl0kzsjpjvmgjblc5a4gw1wsz3i2iz";
+          rev = "65f6ad55ef967ef625ca48c2d03b4ea69bf37649";
+          sha256 = "13vxa6gk4yccj5zhm927ilbpmn0dlkbdrbj3d42kphnximswpism";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b7420eca80a8c1776d68b1f121511cc265cc70dc/recipes/attrap";
           sha256 = "1gxnrlsn9xcnnx0nhjxnhrz9bdpk2kpzjhj8jhjmwws9y361fimh";
-          name = "attrap";
+          name = "recipe";
         };
         packageRequires = [ dash emacs f flycheck s ];
         meta = {
@@ -2817,20 +3454,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    auctex-latexmk = callPackage ({ auctex, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    auctex-latexmk = callPackage ({ auctex
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "auctex-latexmk";
         version = "20170618.936";
         src = fetchFromGitHub {
           owner = "tom-tan";
           repo = "auctex-latexmk";
-          rev = "4d353522650d7685acbf1d38f7dbc504f734bd84";
-          sha256 = "0qvscgffmzqk8lkcg3yk91vciim5ygk2m4crk02qn72ipkw5q13m";
+          rev = "64967712b1bbfac8069aa5940fddef938a692a1a";
+          sha256 = "0syd65b6x6lz6as5ih5pldmwgbmq0v3d9pay2n04vqrvsij6m3qy";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3f48af615c56f093dff417a5d3b705f9993c518f/recipes/auctex-latexmk";
           sha256 = "1rdlgkiwlgm06i1gjxcfciz6wgdskfhln8qhixyfxk7pnz0ax327";
-          name = "auctex-latexmk";
+          name = "recipe";
         };
         packageRequires = [ auctex ];
         meta = {
@@ -2838,8 +3479,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    auctex-lua = callPackage ({ auctex, fetchFromGitHub, fetchurl, lib, lua-mode, melpaBuild }:
-    melpaBuild {
+    auctex-lua = callPackage ({ auctex
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , lua-mode
+                              , melpaBuild }:
+      melpaBuild {
         pname = "auctex-lua";
         version = "20151121.810";
         src = fetchFromGitHub {
@@ -2848,10 +3494,10 @@
           rev = "799cd8ac10c96991bb63d9aa60528ae5d8c786b5";
           sha256 = "0lgfgvnaln5rhhwgcrzwrhbj0gz8sgaf6xxdl7njf3sa6bfgngsz";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/102c7b05f5bfff12ac2820cae58c0205ca450559/recipes/auctex-lua";
           sha256 = "0v999jvinljkvhbn205p36a6jfzppn0xvflvzr8mid1hnqlrpjhf";
-          name = "auctex-lua";
+          name = "recipe";
         };
         packageRequires = [ auctex lua-mode ];
         meta = {
@@ -2859,8 +3505,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    audio-notes-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    audio-notes-mode = callPackage ({ fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "audio-notes-mode";
         version = "20170611.1459";
         src = fetchFromGitHub {
@@ -2869,10 +3518,10 @@
           rev = "fa38350829c7e97257efc746a010471d33748a68";
           sha256 = "1srg6rg3j9ri2cyr4g78dfqq3fhpn6hf3mq4iz2jfqjayppfv38b";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/audio-notes-mode";
           sha256 = "0q88xmi7jbrx47nvbbmwggbm6i7agzpnv5y7cpdh73lg165xsz2h";
-          name = "audio-notes-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -2880,8 +3529,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    aurel = callPackage ({ bui, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    aurel = callPackage ({ bui
+                         , dash
+                         , emacs
+                         , fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "aurel";
         version = "20170114.137";
         src = fetchFromGitHub {
@@ -2890,10 +3545,10 @@
           rev = "fc7ad208f43f8525f84a18941c9b55f956df8961";
           sha256 = "0mcbw8p4wrnnr39wzkfz9kc899w0k1jb00q1926mchf202cmnz94";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d1612acd2cf1fea739739608113923ec51d307e9/recipes/aurel";
           sha256 = "13zyi55ksv426pcksbm3l9s6bmp102w7j1xbry46bc48al6i2nnl";
-          name = "aurel";
+          name = "recipe";
         };
         packageRequires = [ bui dash emacs ];
         meta = {
@@ -2901,8 +3556,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    aurora-config-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    aurora-config-mode = callPackage ({ fetchFromGitHub
+                                      , fetchurl
+                                      , lib
+                                      , melpaBuild }:
+      melpaBuild {
         pname = "aurora-config-mode";
         version = "20180216.1502";
         src = fetchFromGitHub {
@@ -2911,10 +3569,10 @@
           rev = "8273ec7937a21b469b9dbb6c11714255b890f410";
           sha256 = "1dlhf35hhjgkd9bqbpwrb825g1z6nh14mg31jg2avv55s28j0riy";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/10a44bed8edee646bf68abf7dffbe352a137a278/recipes/aurora-config-mode";
           sha256 = "1hpjwidqmjxanijsc1imc7ww9abbylmkin1p0846fbz1hz3a603c";
-          name = "aurora-config-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -2922,20 +3580,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    auth-source-pass = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    auth-source-pass = callPackage ({ emacs
+                                    , fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "auth-source-pass";
-        version = "20180326.8";
+        version = "20180529.657";
         src = fetchFromGitHub {
           owner = "DamienCassou";
           repo = "auth-password-store";
-          rev = "5690092e40c790384692d8e8da3451e6878d8c17";
-          sha256 = "1dv202z8briifd4aqn8yvn4kd6zi1cabb2p86qcjj40lzkgn6w3p";
+          rev = "303b96b2a4ced825390ac0a4f48c4151fe7a8150";
+          sha256 = "0jhr6b2xrmki0l0hlmw4nxslky9vnym4lnq2y7pf81gj1zfk1h3f";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5e268441634a6e58a00e577d6e2292fa226c11b8/recipes/auth-source-pass";
           sha256 = "0icwdwz2zy3f9ynksr81pgq482iapsbx8lpyssiklyw0xgd1k8ak";
-          name = "auth-source-pass";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -2943,8 +3605,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    auto-async-byte-compile = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    auto-async-byte-compile = callPackage ({ fetchFromGitHub
+                                           , fetchurl
+                                           , lib
+                                           , melpaBuild }:
+      melpaBuild {
         pname = "auto-async-byte-compile";
         version = "20160915.2154";
         src = fetchFromGitHub {
@@ -2953,10 +3618,10 @@
           rev = "8681e74ddb8481789c5dbb3cafabb327db4c4484";
           sha256 = "1g98gla9qdqmifsxakhkbxlljy2ln1s3wfahk9zycrwgzfjlsdf4";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f8e4328cae9b4759a75da0b26ea8b68821bc71af/recipes/auto-async-byte-compile";
           sha256 = "0ks6xsxzayiyd0jl8m36xlc5p57p21qbhgq2mmz50a2lhpxxfiyg";
-          name = "auto-async-byte-compile";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -2964,8 +3629,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    auto-auto-indent = callPackage ({ cl-lib ? null, es-lib, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    auto-auto-indent = callPackage ({ cl-lib ? null
+                                    , es-lib
+                                    , fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "auto-auto-indent";
         version = "20131106.1103";
         src = fetchFromGitHub {
@@ -2974,10 +3644,10 @@
           rev = "0139378577f936d34b20276af6f022fb457af490";
           sha256 = "1whbvqylwnxg8d8gn55kcky39rgyc49rakyxlbkplh813lk6lxb7";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2ad2ea105b895cb958ce0ab2bf2fad2b40d41b2f/recipes/auto-auto-indent";
           sha256 = "08s73pnyrmklb660jl5rshncpq31z3m9fl55v7453ch8syp7gzh7";
-          name = "auto-auto-indent";
+          name = "recipe";
         };
         packageRequires = [ cl-lib es-lib ];
         meta = {
@@ -2985,8 +3655,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    auto-compile = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, packed }:
-    melpaBuild {
+    auto-compile = callPackage ({ emacs
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild
+                                , packed }:
+      melpaBuild {
         pname = "auto-compile";
         version = "20180321.807";
         src = fetchFromGitHub {
@@ -2995,10 +3670,10 @@
           rev = "6ce4255ab9a0b010ef8414c5bd9a6d6d9eea012f";
           sha256 = "013vw4sgw6hpz7kskilndv7i7ik40asrkgicghjbygwk0lj5ran3";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/57a2fb9524df3fdfdc54c403112e12bd70888b23/recipes/auto-compile";
           sha256 = "08k9wqk4yysps8n5n50v7lpadwsnm553pv9p7m242fwbgbsgz6nf";
-          name = "auto-compile";
+          name = "recipe";
         };
         packageRequires = [ emacs packed ];
         meta = {
@@ -3006,8 +3681,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    auto-complete = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, popup }:
-    melpaBuild {
+    auto-complete = callPackage ({ cl-lib ? null
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild
+                                 , popup }:
+      melpaBuild {
         pname = "auto-complete";
         version = "20170124.1845";
         src = fetchFromGitHub {
@@ -3016,10 +3696,10 @@
           rev = "2e83566ddfa758c69afe50b8a1c62a66f47471e3";
           sha256 = "1rkqjq7wr4aavg08i8mq13w85z14xdhfmpbipj5mhwlpyrrci4bk";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/083fb071191bccd6feb3fb84569373a597440fb1/recipes/auto-complete";
           sha256 = "1c4ij5bnclg94jdzhkqvq2vxwv6wvs051mbki1ibjm5f2hlacvh3";
-          name = "auto-complete";
+          name = "recipe";
         };
         packageRequires = [ cl-lib popup ];
         meta = {
@@ -3027,8 +3707,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    auto-complete-auctex = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
-    melpaBuild {
+    auto-complete-auctex = callPackage ({ auto-complete
+                                        , fetchFromGitHub
+                                        , fetchurl
+                                        , lib
+                                        , melpaBuild
+                                        , yasnippet }:
+      melpaBuild {
         pname = "auto-complete-auctex";
         version = "20140223.958";
         src = fetchFromGitHub {
@@ -3037,10 +3722,10 @@
           rev = "855633f668bcc4b9408396742a7cb84e0c4a2f77";
           sha256 = "1wri8q5llpy1q1h4ac4kjnnkgj6fby8i9vrpr6mrb13d4gnk4gr2";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/77167fb2e84bed32ace9490c1ed4148719e4cf8e/recipes/auto-complete-auctex";
           sha256 = "00npvryds5wd3d5a13r9prlvw6vvjlag8d32x5xf9bfmmvs0fgqh";
-          name = "auto-complete-auctex";
+          name = "recipe";
         };
         packageRequires = [ auto-complete yasnippet ];
         meta = {
@@ -3048,8 +3733,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    auto-complete-c-headers = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    auto-complete-c-headers = callPackage ({ auto-complete
+                                           , fetchFromGitHub
+                                           , fetchurl
+                                           , lib
+                                           , melpaBuild }:
+      melpaBuild {
         pname = "auto-complete-c-headers";
         version = "20150911.2023";
         src = fetchFromGitHub {
@@ -3058,10 +3747,10 @@
           rev = "52fef720c6f274ad8de52bef39a343421006c511";
           sha256 = "12mzi6bwg702sp0f0wd1ag555blbpk252rr9rqs03bn8pkw89h4n";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0174b70fec45ddec9c1e9555adc82fef59054135/recipes/auto-complete-c-headers";
           sha256 = "02pkrxvzrpyjrr2fkxnl1qw06aspzv8jlp2c1piln6zcjd92l3j7";
-          name = "auto-complete-c-headers";
+          name = "recipe";
         };
         packageRequires = [ auto-complete ];
         meta = {
@@ -3069,8 +3758,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    auto-complete-chunk = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    auto-complete-chunk = callPackage ({ auto-complete
+                                       , fetchFromGitHub
+                                       , fetchurl
+                                       , lib
+                                       , melpaBuild }:
+      melpaBuild {
         pname = "auto-complete-chunk";
         version = "20140225.146";
         src = fetchFromGitHub {
@@ -3079,10 +3772,10 @@
           rev = "a9aa77ffb84a1037984a7ce4dda25074272f13fe";
           sha256 = "1zhbpxpl443ghpkl9i68jcjfcw1vnf8ky06pf5qjjmqbxlcyd9li";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/306e2528638d97c28372df55a9376750d3fde1d4/recipes/auto-complete-chunk";
           sha256 = "1937j1xm20vfcqm9ig4nvciqfkz7rpw0nsfhlg69gkmv0nqszdr3";
-          name = "auto-complete-chunk";
+          name = "recipe";
         };
         packageRequires = [ auto-complete ];
         meta = {
@@ -3090,8 +3783,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    auto-complete-clang = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    auto-complete-clang = callPackage ({ auto-complete
+                                       , fetchFromGitHub
+                                       , fetchurl
+                                       , lib
+                                       , melpaBuild }:
+      melpaBuild {
         pname = "auto-complete-clang";
         version = "20140409.52";
         src = fetchFromGitHub {
@@ -3100,10 +3797,10 @@
           rev = "a195db1d0593b4fb97efe50885e12aa6764d998c";
           sha256 = "12y6f47xbjl4gy14j2f5wlisy5vl6rhx74n27w61pjv38m0a7mi1";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/eab7d88a893fdf76c22f0aa5ac3577efd60fc9b4/recipes/auto-complete-clang";
           sha256 = "1rnmphl7ml5ryjl5ka2l58hddir8b34iz1rm905wdwh164piljva";
-          name = "auto-complete-clang";
+          name = "recipe";
         };
         packageRequires = [ auto-complete ];
         meta = {
@@ -3111,20 +3808,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    auto-complete-clang-async = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    auto-complete-clang-async = callPackage ({ fetchFromGitHub
+                                             , fetchurl
+                                             , lib
+                                             , melpaBuild }:
+      melpaBuild {
         pname = "auto-complete-clang-async";
         version = "20130526.814";
         src = fetchFromGitHub {
           owner = "Golevka";
           repo = "emacs-clang-complete-async";
-          rev = "5d9c5cabbb6b31e0ac3637631c0c8b25184aa8b4";
-          sha256 = "1sw0wxrjcjqk0w1llfj376g6axa5bnk2lq2vv66746bkz14h0s8f";
+          rev = "5eb63c8a1e4ca3af124baf0f8f801b949888f9b8";
+          sha256 = "09f8hqs9n13lkb7b352ig07b9xm1w0mbbnqfy2s5cw4cppmakf2n";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/23aa24b025216359c5e600eee2f2cd4ecc7556e3/recipes/auto-complete-clang-async";
           sha256 = "1jj0jn1v3070g7g0j5gvpybv145kki8nsjxqb8fjf9qag8ilfkjh";
-          name = "auto-complete-clang-async";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -3132,20 +3832,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    auto-complete-distel = callPackage ({ auto-complete, distel-completion-lib, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    auto-complete-distel = callPackage ({ auto-complete
+                                        , distel-completion-lib
+                                        , fetchFromGitHub
+                                        , fetchurl
+                                        , lib
+                                        , melpaBuild }:
+      melpaBuild {
         pname = "auto-complete-distel";
         version = "20160815.2300";
         src = fetchFromGitHub {
           owner = "sebastiw";
           repo = "distel-completion";
-          rev = "2ba4eea51cecfa75cf62f58180460ee9ff43131f";
-          sha256 = "1761lgplngmpn1vd8syc1h4g6q1dhngamz1j3n48z07c1ylzpkdd";
+          rev = "340c9c11939d5f220db05e55388bf3cb606fd190";
+          sha256 = "0ji1wi3s4pgkvrg2vzycmvqfc5jwmcd9zrpxhsgszr5jxp8z0bpb";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/90fff35dd9709b06802edef89d1fe6a96b7115a6/recipes/auto-complete-distel";
           sha256 = "0ca242gl8dl4rmg8qqyhgxvf46fprl2npbq2w8f6s546s9nql4jk";
-          name = "auto-complete-distel";
+          name = "recipe";
         };
         packageRequires = [ auto-complete distel-completion-lib ];
         meta = {
@@ -3153,8 +3858,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    auto-complete-exuberant-ctags = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    auto-complete-exuberant-ctags = callPackage ({ auto-complete
+                                                 , fetchFromGitHub
+                                                 , fetchurl
+                                                 , lib
+                                                 , melpaBuild }:
+      melpaBuild {
         pname = "auto-complete-exuberant-ctags";
         version = "20140320.24";
         src = fetchFromGitHub {
@@ -3163,10 +3872,10 @@
           rev = "ff6121ff8b71beb5aa606d28fd389c484ed49765";
           sha256 = "1fqgyg986fg1dzac5wa97bx82mfddqb6qrfnpr3zksmw3vgykxr0";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1cc9786ed8cea2461b592f860d8e2a0897c57068/recipes/auto-complete-exuberant-ctags";
           sha256 = "1i2s3ycc8jafkzdsz3kbvx1hh95ydi5s6rq6n0wzw1kyy3km35gd";
-          name = "auto-complete-exuberant-ctags";
+          name = "recipe";
         };
         packageRequires = [ auto-complete ];
         meta = {
@@ -3174,8 +3883,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    auto-complete-nxml = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    auto-complete-nxml = callPackage ({ auto-complete
+                                      , fetchFromGitHub
+                                      , fetchurl
+                                      , lib
+                                      , melpaBuild }:
+      melpaBuild {
         pname = "auto-complete-nxml";
         version = "20140220.2058";
         src = fetchFromGitHub {
@@ -3184,10 +3897,10 @@
           rev = "ac7b09a23e45f9bd02affb31847263de4180163a";
           sha256 = "18bf1kw85mab0zp7rn85cm1nxjxg5c1dmiv0j0mjwzsv8an4px5y";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c89dcbf03a802a4361e44174a332a312e352be36/recipes/auto-complete-nxml";
           sha256 = "0viscr5k1carn9vhflry16kgihr6fvh6h36b049pgnk6ww085k6a";
-          name = "auto-complete-nxml";
+          name = "recipe";
         };
         packageRequires = [ auto-complete ];
         meta = {
@@ -3195,20 +3908,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    auto-complete-pcmp = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, lib, log4e, melpaBuild, yaxception }:
-    melpaBuild {
+    auto-complete-pcmp = callPackage ({ auto-complete
+                                      , fetchFromGitHub
+                                      , fetchurl
+                                      , lib
+                                      , log4e
+                                      , melpaBuild
+                                      , yaxception }:
+      melpaBuild {
         pname = "auto-complete-pcmp";
         version = "20140226.2251";
         src = fetchFromGitHub {
           owner = "aki2o";
           repo = "auto-complete-pcmp";
-          rev = "2595d3dab1ef3549271ca922f212928e9d830eec";
-          sha256 = "1hf2f903hy9afahrgy2fx9smgn631drs6733188zgqi3nkyizj26";
+          rev = "dc5c0af834d327dd686d74a4171e5d9170007a6c";
+          sha256 = "0ygak7hypc27d0wvciksnmg8c5njw2skf1ml60vs63a1krkax63i";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f5c53a8aeaaab23e032a8e7cb5cad7e531a1662c/recipes/auto-complete-pcmp";
           sha256 = "1mpgkwj8jwpvxphlm6iaprwjrldmihbgg97jav0fbm1kjnm4azna";
-          name = "auto-complete-pcmp";
+          name = "recipe";
         };
         packageRequires = [ auto-complete log4e yaxception ];
         meta = {
@@ -3216,8 +3935,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    auto-complete-rst = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    auto-complete-rst = callPackage ({ auto-complete
+                                     , fetchFromGitHub
+                                     , fetchurl
+                                     , lib
+                                     , melpaBuild }:
+      melpaBuild {
         pname = "auto-complete-rst";
         version = "20140225.144";
         src = fetchFromGitHub {
@@ -3226,10 +3949,10 @@
           rev = "4803ce41a96224e6fa54e6741a5b5f40ebed7351";
           sha256 = "107svb82cgfns9kcrmy3hh56cab81782jkbz5i9959ms81xizfb8";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4c948dc47f67aa47a1607cbdacdc95241d1a658f/recipes/auto-complete-rst";
           sha256 = "0dazkpnzzr0imb2a01qq8l60jxhhlknzjx7wccnbm7d2rk3338m6";
-          name = "auto-complete-rst";
+          name = "recipe";
         };
         packageRequires = [ auto-complete ];
         meta = {
@@ -3237,8 +3960,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    auto-complete-sage = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild, sage-shell-mode }:
-    melpaBuild {
+    auto-complete-sage = callPackage ({ auto-complete
+                                      , fetchFromGitHub
+                                      , fetchurl
+                                      , lib
+                                      , melpaBuild
+                                      , sage-shell-mode }:
+      melpaBuild {
         pname = "auto-complete-sage";
         version = "20160514.51";
         src = fetchFromGitHub {
@@ -3247,10 +3975,10 @@
           rev = "51b8e3905196d266e1f8aa47881189833151b398";
           sha256 = "139in1jgxg43v7ji4i1qmxbgspr71h95lzlz0fvdk78vkxc5842b";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f1cd78dcd58d559c47873f8fcfcab089a8493dd6/recipes/auto-complete-sage";
           sha256 = "02sxbir3arvmnkvxgndlkln9y05jnlv6i8czd6a0wcxk4nj43lq1";
-          name = "auto-complete-sage";
+          name = "recipe";
         };
         packageRequires = [ auto-complete sage-shell-mode ];
         meta = {
@@ -3258,8 +3986,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    auto-dictionary = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    auto-dictionary = callPackage ({ fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "auto-dictionary";
         version = "20150410.910";
         src = fetchFromGitHub {
@@ -3268,10 +3999,10 @@
           rev = "b364e08009fe0062cf0927d8a0582fad5a12b8e7";
           sha256 = "0rfjx0x2an28821shgb4v5djza4kwn5nnrsl2cvh3px4wrvw3izp";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1711d710ac09fe407fde89ee351ccdcb78555d35/recipes/auto-dictionary";
           sha256 = "1va485a8lxvb3507kr83cr6wpssxnf8y4l42mamn9daa8sjx3q16";
-          name = "auto-dictionary";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -3279,20 +4010,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    auto-dim-other-buffers = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    auto-dim-other-buffers = callPackage ({ fetchFromGitHub
+                                          , fetchurl
+                                          , lib
+                                          , melpaBuild }:
+      melpaBuild {
         pname = "auto-dim-other-buffers";
-        version = "20170925.1208";
+        version = "20180612.1641";
         src = fetchFromGitHub {
           owner = "mina86";
           repo = "auto-dim-other-buffers.el";
-          rev = "d1ee176652d7f5a77608e54175b7e67c31d41381";
-          sha256 = "1qqb051b16z2ay1xqx2ncy2p07cs29dv6wdy1x3n3w85yw9kh0mx";
+          rev = "ec74b4803adeadf06296c84595fb6ccf4e1b4a3f";
+          sha256 = "0l08kx12k97nag8khb63rz5fl1r9gahgmjg5073h25lypl74895n";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/acc9b816796b9f142c53f90593952b43c962d2d8/recipes/auto-dim-other-buffers";
           sha256 = "0n9d23sfcmkjfqlm80vrgf856wy08ak4n4rk0z7vadq07yj46zxh";
-          name = "auto-dim-other-buffers";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -3300,8 +4034,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    auto-highlight-symbol = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    auto-highlight-symbol = callPackage ({ fetchFromGitHub
+                                         , fetchurl
+                                         , lib
+                                         , melpaBuild }:
+      melpaBuild {
         pname = "auto-highlight-symbol";
         version = "20130313.243";
         src = fetchFromGitHub {
@@ -3310,10 +4047,10 @@
           rev = "26573de912d760e04321b350897aea70958cee8b";
           sha256 = "0jfiax1qqnyznhlnqkjsr9nnv7fpjywvfhj9jq59460j0nbrgs5c";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fdf73ee62f0a4e762e3a1aa94284abea8da8ce7c/recipes/auto-highlight-symbol";
           sha256 = "02mkji4sxym07jf5ww5kgv1c18x0xdfn8cmvgns5h4gij64lnr66";
-          name = "auto-highlight-symbol";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -3321,8 +4058,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    auto-indent-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    auto-indent-mode = callPackage ({ fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "auto-indent-mode";
         version = "20171221.2106";
         src = fetchFromGitHub {
@@ -3331,10 +4071,10 @@
           rev = "28069360a7f89ad0286fd6a53db550752ec58488";
           sha256 = "14sqmv320ryfljpxbjw9xphj6bz1ccjk3ih4cm1r8aryyhxiacii";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/49af78177278e7072c70fde0eaa5bb82490ebe9d/recipes/auto-indent-mode";
           sha256 = "1nk78p8lqs8cx90asfs8iaqnwwyy8fi5bafaprm9c0nrxz299ibz";
-          name = "auto-indent-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -3342,20 +4082,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    auto-minor-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    auto-minor-mode = callPackage ({ emacs
+                                   , fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "auto-minor-mode";
-        version = "20180401.245";
+        version = "20180527.423";
         src = fetchFromGitHub {
           owner = "joewreschnig";
           repo = "auto-minor-mode";
-          rev = "c0aa31d9385ec809969288d0029c7a6db319690f";
-          sha256 = "0fzw91d1ysv82g2mfwc5f1a1zq1ih9f6i26hk9jyyqp5izx9ydfw";
+          rev = "c62f4e04c7b73835c399f0348bea0ade2720bcbb";
+          sha256 = "0vqqy6nbb884h8qhzqvjycvfqbm9pbhqxr3dlxrhfx8m6c3iasq1";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b3ab5f048034777551e344101d8415cac92362c8/recipes/auto-minor-mode";
           sha256 = "1dpdylrpw1pvlmhh229b3lqs07drx9kdhw4vcv5a48qah14dz6qa";
-          name = "auto-minor-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -3363,8 +4107,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    auto-org-md = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    auto-org-md = callPackage ({ emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "auto-org-md";
         version = "20180213.1543";
         src = fetchFromGitHub {
@@ -3373,10 +4121,10 @@
           rev = "9318338bdb7fe8bd698d88f3af89b2d6413efdd2";
           sha256 = "1dzxc1f4yvj8xww5drcpzmn3fyi8ziimh1cmy6l3i399l1zl0njj";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/39f934f86b5dc04078c204bcbd268af60857e268/recipes/auto-org-md";
           sha256 = "1yh9g8407kym6r0b8kr18qshxlrkw47ac17a9lvql0ksshfmnqvk";
-          name = "auto-org-md";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -3384,20 +4132,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    auto-package-update = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    auto-package-update = callPackage ({ dash
+                                       , emacs
+                                       , fetchFromGitHub
+                                       , fetchurl
+                                       , lib
+                                       , melpaBuild }:
+      melpaBuild {
         pname = "auto-package-update";
-        version = "20180323.1547";
+        version = "20180712.1345";
         src = fetchFromGitHub {
           owner = "rranelli";
           repo = "auto-package-update.el";
-          rev = "85c64d11ccfffd58527ef39cac390a88c5b6d979";
-          sha256 = "0pg9qw63ii4268hwzz7sj9g6rkmxr956849fpa2rwbfzfhjmns2f";
+          rev = "55870d313fbe9db40b1a2b59dbc420ba66a9297e";
+          sha256 = "06hnr7id7w774adip0yffxh6c2xk27j2kch03r8y0v19mnfrvb39";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/78f549a299a06941edce13381f597f3a61e8c723/recipes/auto-package-update";
           sha256 = "0fdcniq5mrwbc7yvma4088r0frdfvc2ydfil0s003faz0nrjcp8k";
-          name = "auto-package-update";
+          name = "recipe";
         };
         packageRequires = [ dash emacs ];
         meta = {
@@ -3405,8 +4158,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    auto-pause = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    auto-pause = callPackage ({ emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "auto-pause";
         version = "20160426.516";
         src = fetchFromGitHub {
@@ -3415,10 +4172,10 @@
           rev = "a4d778de774ca3895542cb559a953e0d98657338";
           sha256 = "1pxhqwvg059pslin6z87jd8d0q44ljwvdn6y23ffrz9kfpn3m5m2";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/275d1b1bf1eb47cd9c769286c03b2b9aff9d74dd/recipes/auto-pause";
           sha256 = "0cdak2kicxylj5f161kia0bzzqad426y8cj4zf04gcl0nndijyrc";
-          name = "auto-pause";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -3426,20 +4183,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    auto-read-only = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    auto-read-only = callPackage ({ cl-lib ? null
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "auto-read-only";
         version = "20170305.2043";
         src = fetchFromGitHub {
           owner = "zonuexe";
           repo = "auto-read-only.el";
-          rev = "79654f8fc024f383ae7af05487c1345738236500";
-          sha256 = "123822s9xkzw25swn1h1szxmmajnn9rq85vasygvy5cn2l6lar3l";
+          rev = "20e26d9eb017e6ab61fbd53f2ac2511b0afe3446";
+          sha256 = "140w3gdbvyajy9rq82mc24mk7zsvhq4wc8yrrdwlzhzmqaflcz76";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/189e394eb9fac09783c75ff1b64facdd745a0454/recipes/auto-read-only";
           sha256 = "1cvh2c7pgdxgnl0fr1lymz9pf573hj6dn8cjcb64wdczkrci7yk5";
-          name = "auto-read-only";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -3447,8 +4208,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    auto-save-buffers-enhanced = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    auto-save-buffers-enhanced = callPackage ({ fetchFromGitHub
+                                              , fetchurl
+                                              , lib
+                                              , melpaBuild }:
+      melpaBuild {
         pname = "auto-save-buffers-enhanced";
         version = "20161108.2310";
         src = fetchFromGitHub {
@@ -3457,10 +4221,10 @@
           rev = "461e8c816c1b7c650be5f209078b381fe55da8c6";
           sha256 = "0ckjijjpqpbv9yrqfnl3x9hcdwwdgvm5r2vyx1a9nk4d3i0hd9i5";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d221a217e9f6a686fa2a8b120a1f0b43c4482ce6/recipes/auto-save-buffers-enhanced";
           sha256 = "123vf6nnvdhrrfjn8n8h8a11mkqmy2zm3w3yn99np0zj31x8z7bb";
-          name = "auto-save-buffers-enhanced";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -3468,8 +4232,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    auto-shell-command = callPackage ({ deferred, fetchFromGitHub, fetchurl, lib, melpaBuild, popwin }:
-    melpaBuild {
+    auto-shell-command = callPackage ({ deferred
+                                      , fetchFromGitHub
+                                      , fetchurl
+                                      , lib
+                                      , melpaBuild
+                                      , popwin }:
+      melpaBuild {
         pname = "auto-shell-command";
         version = "20160603.1938";
         src = fetchFromGitHub {
@@ -3478,10 +4247,10 @@
           rev = "454b75a07b663095334381d5bf5625c7f136f743";
           sha256 = "0ahiy5cv3a632wfiar28186l0dgibafx5jaw9nrp4h5sqkbyvmjn";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ea710bfa77fee7c2688eea8258ca9d2105d1896e/recipes/auto-shell-command";
           sha256 = "1i78fh72i8yv91rnabf0vs78r43qrjkr36hndmn5ya2xs3b1g41j";
-          name = "auto-shell-command";
+          name = "recipe";
         };
         packageRequires = [ deferred popwin ];
         meta = {
@@ -3489,20 +4258,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    auto-sudoedit = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    auto-sudoedit = callPackage ({ emacs
+                                 , f
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "auto-sudoedit";
-        version = "20171227.156";
+        version = "20180428.2343";
         src = fetchFromGitHub {
           owner = "ncaq";
           repo = "auto-sudoedit";
-          rev = "5a6f7da018fbb880c4c51032b39d7628a478989c";
-          sha256 = "190izcami97h2yzw267crs0xny494b9b58dmmb7bqslv38ayl396";
+          rev = "5a770615fe2989b3b7cb1435d0e65fa672d775d7";
+          sha256 = "0pbbw4lx1k8l5x4bycqymb5s2x2739diw8nbqk9ikxqhyjn4sv67";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7cf6bc8bb7b618d74427622b9b2812daa79a3767/recipes/auto-sudoedit";
           sha256 = "1clp52fqxsilyi62p1cabhan55lbwax6fqlhccyjbl36yrdig3fh";
-          name = "auto-sudoedit";
+          name = "recipe";
         };
         packageRequires = [ emacs f ];
         meta = {
@@ -3510,20 +4284,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    auto-virtualenv = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, pyvenv, s }:
-    melpaBuild {
+    auto-virtualenv = callPackage ({ cl-lib ? null
+                                   , fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild
+                                   , pyvenv
+                                   , s }:
+      melpaBuild {
         pname = "auto-virtualenv";
         version = "20170125.1117";
         src = fetchFromGitHub {
           owner = "marcwebbie";
           repo = "auto-virtualenv";
-          rev = "3826db66b417788e2b2eb138717255b1f52a55c3";
-          sha256 = "12691m4z0zr3prmdhmjlpcx0ajj1ddrbj9gy827xmgr0vaqbr7b2";
+          rev = "fd98a2d34cb6828e59317a50f8763ee1fd672b00";
+          sha256 = "1fsigqngd9a2zkkwzz86ynpr8gvm56329clw8zb8vq0058rdxsjk";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ccb91515d9a8195061429ed8df3471867d211f9a/recipes/auto-virtualenv";
           sha256 = "0xv51g74l5pxa3s185867dpc98m6y26xbj5wgz7f9177qchvdbhk";
-          name = "auto-virtualenv";
+          name = "recipe";
         };
         packageRequires = [ cl-lib pyvenv s ];
         meta = {
@@ -3531,8 +4311,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    auto-virtualenvwrapper = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, s, virtualenvwrapper }:
-    melpaBuild {
+    auto-virtualenvwrapper = callPackage ({ cl-lib ? null
+                                          , fetchFromGitHub
+                                          , fetchurl
+                                          , lib
+                                          , melpaBuild
+                                          , s
+                                          , virtualenvwrapper }:
+      melpaBuild {
         pname = "auto-virtualenvwrapper";
         version = "20180408.310";
         src = fetchFromGitHub {
@@ -3541,10 +4327,10 @@
           rev = "e2628408d4e67e1b1714cf7682cff9405e735c81";
           sha256 = "1cj4a6yay02gvi04lyhnfb7gws8jrappprnv36mcqlq053202wij";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/02a209ae8f9fc68feb3bb64d32d129fedef2b80b/recipes/auto-virtualenvwrapper";
           sha256 = "1v82z922d9sadwvyrl4iddsa19f5k43s6iwn8w146jcl0v42bkmd";
-          name = "auto-virtualenvwrapper";
+          name = "recipe";
         };
         packageRequires = [ cl-lib s virtualenvwrapper ];
         meta = {
@@ -3552,20 +4338,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    auto-yasnippet = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
-    melpaBuild {
+    auto-yasnippet = callPackage ({ fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild
+                                  , yasnippet }:
+      melpaBuild {
         pname = "auto-yasnippet";
-        version = "20160925.225";
+        version = "20180503.1208";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "auto-yasnippet";
-          rev = "d1ccfea87312c6dd8cf8501ab5b71b1d3d44d95b";
-          sha256 = "1i8k2qiyzd5rq0zplk4xb5nfa5mp0ibxbzwqj6c7877waq7244xk";
+          rev = "438c160b94975e9332b4ae3845e986ae6166dd47";
+          sha256 = "07i46xfphvsspd0ls5jjlch650h24h79yfvhbmizrpyrh3616smd";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d33c0aee6a5d27217bbae28fc8f448c3badc8a4b/recipes/auto-yasnippet";
           sha256 = "02281gyy07cy72a29fjsixg9byqq3izb9m1jxv98ni8pcy3bpsqa";
-          name = "auto-yasnippet";
+          name = "recipe";
         };
         packageRequires = [ yasnippet ];
         meta = {
@@ -3573,20 +4363,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    autobookmarks = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    autobookmarks = callPackage ({ cl-lib ? null
+                                 , dash
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "autobookmarks";
-        version = "20180131.535";
+        version = "20180531.1206";
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "autobookmarks";
-          rev = "93610f22500ac207f86e159d411de15082a8befb";
-          sha256 = "1ydqc2ry43sibf8xa99w2w6prxh5gmlmcinp0z67yhdcz4dh4v2v";
+          rev = "e971aa49d97da9f7ed760b37e0b674e45f1c5673";
+          sha256 = "04453h3s9g7ka028s4f97z606czq3vsvphrmba533jkl8lk3hpi8";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e40e6ebeb30b3f23ad37a695e011431a48c5a62e/recipes/autobookmarks";
           sha256 = "11zhg3y9fb5mq67fwsnjrql9mnwkp3hwib7fpllb3yyf2yywc8zp";
-          name = "autobookmarks";
+          name = "recipe";
         };
         packageRequires = [ cl-lib dash ];
         meta = {
@@ -3594,8 +4389,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    autodisass-java-bytecode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    autodisass-java-bytecode = callPackage ({ fetchFromGitHub
+                                            , fetchurl
+                                            , lib
+                                            , melpaBuild }:
+      melpaBuild {
         pname = "autodisass-java-bytecode";
         version = "20151005.912";
         src = fetchFromGitHub {
@@ -3604,10 +4402,10 @@
           rev = "3d61dbe266133c950b39e880f78d142751c7dc4c";
           sha256 = "1pf2mwnicj5x2kksxwmrzz2vfxj9y9r6rzgc1fl8028mfrmrmg8s";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a094845521d76754a29435012af5fba9f7975a8e/recipes/autodisass-java-bytecode";
           sha256 = "1k19nkbxnysm3qkpdhz4gv2x9nnrp94xl40x84q8n84s6xaan4dc";
-          name = "autodisass-java-bytecode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -3615,20 +4413,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    autodisass-llvm-bitcode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    autodisass-llvm-bitcode = callPackage ({ fetchFromGitHub
+                                           , fetchurl
+                                           , lib
+                                           , melpaBuild }:
+      melpaBuild {
         pname = "autodisass-llvm-bitcode";
         version = "20150410.1825";
         src = fetchFromGitHub {
           owner = "gbalats";
           repo = "autodisass-llvm-bitcode";
-          rev = "d2579e3a1427af2dc947c343e49eb3434078bf04";
-          sha256 = "1fq4h5fmamyh7z8nq6pigx74p5v8k3qfm64k66vwsm8bl5jdkw17";
+          rev = "14bb1bfe2be3b04d6e0c87a7a9d1e88ce15506d0";
+          sha256 = "1hyp49bidwc53cr25wwwyzcd0cbbqzxkfcpnccimphv24qfsai85";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/657e8f6bd0e44f11db8480ca42fb29d85fc3ec29/recipes/autodisass-llvm-bitcode";
           sha256 = "0bh73nzll9jp7kiqfnb5dwkipw85p3c3cyq58s0nghig02z63j01";
-          name = "autodisass-llvm-bitcode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -3636,20 +4437,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    automargin = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    automargin = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "automargin";
         version = "20131112.14";
         src = fetchFromGitHub {
           owner = "zk-phi";
           repo = "automargin";
-          rev = "4901d969ad69f5244e6300baab4ba04efed800c3";
-          sha256 = "02nnyncfh6g0xizy7wa8721ahpnwk451kngd6n0y0249f50p3962";
+          rev = "f0dce37b7ece368dd805e03b5e2af6e571038bc6";
+          sha256 = "0p95kszsllkj11dyn9vq9ycp8mlir2mzh80gj5kwmkvd10s2s3c6";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0937e63ec686cc3e183bddb029a514c64934fc81/recipes/automargin";
           sha256 = "0llqz01wmacc0f8j3h7r0j57vkmzksl9vj1h0igfxzpm347mm9q8";
-          name = "automargin";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -3657,8 +4461,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    autopair = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    autopair = callPackage ({ cl-lib ? null
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "autopair";
         version = "20160304.437";
         src = fetchFromGitHub {
@@ -3667,10 +4475,10 @@
           rev = "2b6d72bccb0ebba6e7e711528872b898b0c65b0a";
           sha256 = "09p56vi5zgm2djglimwyhv4n4gyydjndzn46vg9qzzlxvvmw66i1";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/autopair";
           sha256 = "161qhk8rc1ldj9hpg0k9phka0gflz9vny7gc8rnylk90p6asmr28";
-          name = "autopair";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -3678,20 +4486,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    autotest = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    autotest = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "autotest";
-        version = "20171128.1812";
+        version = "20180323.1542";
         src = fetchFromGitHub {
           owner = "zenspider";
           repo = "elisp";
-          rev = "ee8a9c3052446876057ff853369d136aea7831f5";
-          sha256 = "15sla4n88003fclni5nhsrw3ib7bql11ks8pb7rgjyjddqrq274r";
+          rev = "24ee17ae5023362758f0762bf711d5e470dcfe73";
+          sha256 = "10al1r0fs6bpz4mfikyb9rm0zgpg56n12y0mv4kz856sdbzgllcv";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5fc2c4a590cbeccfb43003972a78f5d76ec4a9e7/recipes/autotest";
           sha256 = "0f46m5pc40i531dzfnhkcn192dcs1q20y083c1c0wg2zhjcdr5iy";
-          name = "autotest";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -3699,20 +4510,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    autotetris-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    autotetris-mode = callPackage ({ cl-lib ? null
+                                   , fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "autotetris-mode";
         version = "20141114.846";
         src = fetchFromGitHub {
           owner = "skeeto";
           repo = "autotetris-mode";
-          rev = "dd490d5ad6d84bd964ab349484f6a2d05651ede1";
-          sha256 = "162zay36mmkkpbfvp0lagv2js4cr1z75dc1z5l2505814m5sx3az";
+          rev = "7d348d33829bc89ddbd2b4d5cfe5073c3b0cbaaa";
+          sha256 = "14pjsb026mgjf6l3dggy255knr7c1vfmgb6kgafmkzvr96aglcdc";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4c5c698b7dfb179f43b9fdf4652b96e2d7f8e7c6/recipes/autotetris-mode";
           sha256 = "0k4yq4pvrs1zaf9aqxmlb6l2v4k774zbxj4zcx49w3l1h8gwxpbb";
-          name = "autotetris-mode";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -3720,8 +4535,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    autothemer = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    autothemer = callPackage ({ cl-lib ? null
+                              , dash
+                              , emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "autothemer";
         version = "20170112.1324";
         src = fetchFromGitHub {
@@ -3730,10 +4551,10 @@
           rev = "8c467f57571c154129d660dfccebd151c998f2d9";
           sha256 = "0cd2pqh6k32sjidkcd8682y4l6mx52xw4a05f38kk8nsrk28m74k";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3d7d7beed6ba10d7aa6a36328a696ba2d0d21dc2/recipes/autothemer";
           sha256 = "1lcyqfzx7qpkr3ajk0zi0mn32yvcwn06f61vhghn9c66xambsr7f";
-          name = "autothemer";
+          name = "recipe";
         };
         packageRequires = [ cl-lib dash emacs ];
         meta = {
@@ -3741,20 +4562,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    autumn-light-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    autumn-light-theme = callPackage ({ fetchFromGitHub
+                                      , fetchurl
+                                      , lib
+                                      , melpaBuild }:
+      melpaBuild {
         pname = "autumn-light-theme";
         version = "20150515.747";
         src = fetchFromGitHub {
           owner = "aalpern";
           repo = "emacs-color-theme-autumn-light";
-          rev = "1e3b2a43a3001e4a97a5ff073ba3f0d2ea3888f9";
-          sha256 = "1lip7282g41ghn64dvx2ab437s83cj9l8ps1rd8rbhqyz4bx5wb9";
+          rev = "26a52a79e7fff401af6d24c4365bb4a250c1136a";
+          sha256 = "0nc71mxp57h5dnd1vrgc9vh0lrjzq5mfm8li4b11l2gpnbv4s4wi";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/52a7598dc550c76f4e081fe1c4a6d8697bd30561/recipes/autumn-light-theme";
           sha256 = "0g3wqv1yw3jycq30mcj3w4sn9nj6i6gyd2ljzimf547ggcai536a";
-          name = "autumn-light-theme";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -3762,8 +4586,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    avandu = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    avandu = callPackage ({ fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "avandu";
         version = "20170101.1103";
         src = fetchFromGitHub {
@@ -3772,10 +4599,10 @@
           rev = "f44588d8e747fa880411cb4542cc39962252b90a";
           sha256 = "097wls9k6qrf12nn8mpszfbqsaqc81956yqxns1sjs6dmjqi0c7z";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e1344e49e6a41ce390a047cb8d48090160b37b50/recipes/avandu";
           sha256 = "174bd3vbvh0l9282bg8575nqc71zkg90bwbxbv1b7dz8qaaczhcy";
-          name = "avandu";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -3783,8 +4610,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    avk-emacs-themes = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    avk-emacs-themes = callPackage ({ fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "avk-emacs-themes";
         version = "20180406.2220";
         src = fetchFromGitHub {
@@ -3793,10 +4623,10 @@
           rev = "6abf91ecdaeb16a3a5529b0d5abef9756da1f68c";
           sha256 = "0hvg8yp7prfl1n71lkyr9l43f3zm1zsh8n2mh26rmdw2chippr4d";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ef362a76a3881c7596dcc2639df588227b3713c0/recipes/avk-emacs-themes";
           sha256 = "0yimnfm50qsq505fc67b3qnxx2aiyz5a7bw87zkjrdnar12vv144";
-          name = "avk-emacs-themes";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -3804,20 +4634,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    avy = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    avy = callPackage ({ cl-lib ? null
+                       , emacs
+                       , fetchFromGitHub
+                       , fetchurl
+                       , lib
+                       , melpaBuild }:
+      melpaBuild {
         pname = "avy";
-        version = "20180415.1259";
+        version = "20180615.801";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "avy";
-          rev = "08370cdbc35ff41646461a02d6d9758dfce30c20";
-          sha256 = "08pgyj3mab6iqbb029wixvvjfc634iln0ij6lxnvpvgy4298iw9k";
+          rev = "7c40f5e3811716b05d87a06096b190f7cf7bdc45";
+          sha256 = "06bqsg9vnjyqdmn2dpy4f17b0bs57w0gg77ahyafsawlp77fz7z9";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/77fac7a702d4086fb860514e377037acedc60412/recipes/avy";
           sha256 = "0gjq79f8jagbngp0shkcqmwhisc3hpgwfk34kq30nb929nbnlmag";
-          name = "avy";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -3825,8 +4660,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    avy-flycheck = callPackage ({ avy, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, seq }:
-    melpaBuild {
+    avy-flycheck = callPackage ({ avy
+                                , emacs
+                                , fetchFromGitHub
+                                , fetchurl
+                                , flycheck
+                                , lib
+                                , melpaBuild
+                                , seq }:
+      melpaBuild {
         pname = "avy-flycheck";
         version = "20160720.800";
         src = fetchFromGitHub {
@@ -3835,10 +4677,10 @@
           rev = "5522f3bbbed1801d9278ed696ec0cbba38352985";
           sha256 = "1nwc8xid0k6bnnpgsrrlwx71a04llkiapjsbchp9jgcf11l5mghw";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/05755bed49219072d2ec98f0be5ecba4deda7cd1/recipes/avy-flycheck";
           sha256 = "0xvgysbx8yxhypms6639kk3cn0x6y6njnhnn9lf6hxsi96wd9y96";
-          name = "avy-flycheck";
+          name = "recipe";
         };
         packageRequires = [ avy emacs flycheck seq ];
         meta = {
@@ -3846,20 +4688,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    avy-menu = callPackage ({ avy, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    avy-menu = callPackage ({ avy
+                            , emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "avy-menu";
         version = "20171231.2220";
         src = fetchFromGitHub {
           owner = "mrkkrp";
           repo = "avy-menu";
-          rev = "b133564cc438870d9b5505c8104611c8998fd0d5";
-          sha256 = "19xqs4hyd5wkh0vd3xfbfwhf8fhq5lbzrafx4fbvai24dhjn5rhb";
+          rev = "990cc94d708c923f761be083b3a57f6f844566c8";
+          sha256 = "0kjxfg8wx5c8cixazih24s0mv4crk648v9bb6pd1i6lmh266rc6g";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2f0b4cfb30c405d44803b36ebcaccef0cf87fe2d/recipes/avy-menu";
           sha256 = "1g2bsm0jpig51jwn9f9mx6z5glb0bn4s21194xam768qin0rf4iw";
-          name = "avy-menu";
+          name = "recipe";
         };
         packageRequires = [ avy emacs ];
         meta = {
@@ -3867,20 +4714,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    avy-migemo = callPackage ({ avy, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, migemo }:
-    melpaBuild {
+    avy-migemo = callPackage ({ avy
+                              , emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild
+                              , migemo }:
+      melpaBuild {
         pname = "avy-migemo";
-        version = "20180104.624";
+        version = "20180508.951";
         src = fetchFromGitHub {
           owner = "momomo5717";
           repo = "avy-migemo";
-          rev = "526494a2ae86b66a22848e5dc274480e3b4d04ca";
-          sha256 = "04fkgiixfd0xgb2m0b48ngv2fmvz2vnjajfl1b59paczz8pnw96l";
+          rev = "3e472cb4de338c312a6731f4f627b140beddf5f0";
+          sha256 = "15xk6in8hdvkf2330j03llzjjxyyawad4rdq3zp4kwh4wgg0icdk";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6a02db29eb3e4b76b4a9cdbc966df5a1bd35dec0/recipes/avy-migemo";
           sha256 = "1zvgkhma445gj1zjl8j25prw95bdpjbvfy8yr0r5liay6g2hf296";
-          name = "avy-migemo";
+          name = "recipe";
         };
         packageRequires = [ avy emacs migemo ];
         meta = {
@@ -3888,8 +4741,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    avy-zap = callPackage ({ avy, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    avy-zap = callPackage ({ avy
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "avy-zap";
         version = "20160921.1444";
         src = fetchFromGitHub {
@@ -3898,10 +4755,10 @@
           rev = "6081738668ab726099ce1c711c580d9745dfaede";
           sha256 = "0byanv32kxsd1lzvyq82xmyfx4drx5j5i10whyyq8a5hhvrpg1qy";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/10a2a57c78ac1d8ab621031caa21e8574daeb9a0/recipes/avy-zap";
           sha256 = "1zbkf21ggrmg1w0xaw40i3swgc1g4fz0j8p0r9djm9j120d94zkx";
-          name = "avy-zap";
+          name = "recipe";
         };
         packageRequires = [ avy ];
         meta = {
@@ -3909,8 +4766,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    aws-ec2 = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, tblui }:
-    melpaBuild {
+    aws-ec2 = callPackage ({ dash
+                           , emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild
+                           , tblui }:
+      melpaBuild {
         pname = "aws-ec2";
         version = "20161007.1214";
         src = fetchFromGitHub {
@@ -3919,10 +4782,10 @@
           rev = "5601d4f268fc34b86a02ca90cde7d3771619a368";
           sha256 = "15idbbxsghzn737s9jppnx820nnm1srcl1418458hwfy3wqhq38g";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/90ac00160cbf692baa1f3953122ac828356944e0/recipes/aws-ec2";
           sha256 = "040c69g8rhpcmrdjjg4avdmqarxx3dfzylmz62yxhfpn02qh48xd";
-          name = "aws-ec2";
+          name = "recipe";
         };
         packageRequires = [ dash emacs tblui ];
         meta = {
@@ -3930,8 +4793,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    aws-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
-    melpaBuild {
+    aws-snippets = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild
+                                , yasnippet }:
+      melpaBuild {
         pname = "aws-snippets";
         version = "20180410.845";
         src = fetchFromGitHub {
@@ -3940,10 +4807,10 @@
           rev = "a2ebae582a8c8a5f5f16dbc42ecd2ded9d70fca8";
           sha256 = "08mbi5g321n4ir7a7ggxmh7qpl8pr06pg4rcsk8pklylvkf89k2w";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/485aa401a6a14cd4a916474d9a7df12cdf45d591/recipes/aws-snippets";
           sha256 = "1p2il4ig3nafsapa87hgghw6ri9d5qqi0hl8zjyypa06rcnag9g9";
-          name = "aws-snippets";
+          name = "recipe";
         };
         packageRequires = [ yasnippet ];
         meta = {
@@ -3951,8 +4818,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    axiom-environment = callPackage ({ emacs, fetchgit, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    axiom-environment = callPackage ({ emacs
+                                     , fetchgit
+                                     , fetchurl
+                                     , lib
+                                     , melpaBuild }:
+      melpaBuild {
         pname = "axiom-environment";
         version = "20180401.1257";
         src = fetchgit {
@@ -3960,10 +4831,10 @@
           rev = "6842fb7f85df839acde395093647e2f91cf62fdd";
           sha256 = "1ag5isg0bvarf86978zd2zq1mbs3ysy29ywvgapls6115ws5k9k8";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8b4c6b03c5ff78ce327dcf66b175e266bbc53dbf/recipes/axiom-environment";
           sha256 = "1hzfxdwhgv0z9136k7bdjhqjrkawsjmvqch6za6p7nkpd9ikr2zb";
-          name = "axiom-environment";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -3971,8 +4842,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    babel = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    babel = callPackage ({ fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "babel";
         version = "20161122.2340";
         src = fetchFromGitHub {
@@ -3981,10 +4855,10 @@
           rev = "d4212e25fcbd22b8e38be13936f937a2963d34a9";
           sha256 = "0lxiavjs2fbwlqbmkl2hssjzv8a8baa8vvqqfnprhnipngkkgdaf";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b0d748fa06b3cbe336cb01a7e3ed7b0421d885cc/recipes/babel";
           sha256 = "0sdpp4iym61ni32zv75n48ylj4jib8ca6n9hyqwj1b7nqg76mm1c";
-          name = "babel";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -3992,20 +4866,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    babel-repl = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    babel-repl = callPackage ({ emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "babel-repl";
         version = "20160504.1501";
         src = fetchFromGitHub {
           owner = "hung-phan";
           repo = "babel-repl";
-          rev = "e619c16e349a1ee7bd0ee0d7f3650d33bff73fc3";
-          sha256 = "1174r0gjpn5z3pnf32qlpqhmdfvskcd2vqgicvmqzjsrysj3fypn";
+          rev = "0faa2f6518a2b46236f116ca1736a314f7d9c034";
+          sha256 = "0sp0ja0346k401q5zpx3zl4pnxp4ml2jqkgk7z8i08rhdbp0c4nr";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/dfd4ac01ea16fcbc6e9343a953a2f278c5874d3d/recipes/babel-repl";
           sha256 = "0h11i8w8s4ia1x0lm5n7bnc3db4bv0a7f7hzl27qrg38m3c7dl6x";
-          name = "babel-repl";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -4013,8 +4891,17 @@
           license = lib.licenses.free;
         };
       }) {};
-    back-button = callPackage ({ fetchFromGitHub, fetchurl, lib, list-utils, melpaBuild, nav-flash, pcache, persistent-soft, smartrep, ucs-utils }:
-    melpaBuild {
+    back-button = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , list-utils
+                               , melpaBuild
+                               , nav-flash
+                               , pcache
+                               , persistent-soft
+                               , smartrep
+                               , ucs-utils }:
+      melpaBuild {
         pname = "back-button";
         version = "20150804.1304";
         src = fetchFromGitHub {
@@ -4023,10 +4910,10 @@
           rev = "98d92984a740acd1547bd7ed05cca0affdb21c3e";
           sha256 = "0rj6a8rdwa0h2ckz7h4d91hnxqcin98l4ikbfyak2whfb47z909l";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c9db386ab3910940addae6e925b2ac17e64e0f87/recipes/back-button";
           sha256 = "0vyhvm445d0rs14j5xi419akk5nd88d4hvm4251z62fmnvs50j85";
-          name = "back-button";
+          name = "recipe";
         };
         packageRequires = [
           list-utils
@@ -4041,8 +4928,36 @@
           license = lib.licenses.free;
         };
       }) {};
-    backup-each-save = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    backlight = callPackage ({ emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
+        pname = "backlight";
+        version = "20180629.1459";
+        src = fetchFromGitHub {
+          owner = "mschuldt";
+          repo = "backlight.el";
+          rev = "096e632bf100d318754d6c961c90ebb0ef29dce5";
+          sha256 = "0w9ng4rhsawcf96mnpy71h50j4mankmvjnfknxlmwiwlmx4sp0f1";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4b33ef75760ff02983d8c4c6f98621bb441751c3/recipes/backlight";
+          sha256 = "0gzshxs9vw5wrb6pnxdaw5q4c8i0vsmc7wb0y2jyhxsr81mlxdpi";
+          name = "recipe";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/backlight";
+          license = lib.licenses.free;
+        };
+      }) {};
+    backup-each-save = callPackage ({ fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "backup-each-save";
         version = "20180226.2157";
         src = fetchFromGitHub {
@@ -4051,10 +4966,10 @@
           rev = "3c414b9d6b278911c95c5b8b71819e6af6f8a02a";
           sha256 = "13pliz2ra020hhxcidkyhfa0767n188l1w5r0vpvv6zqyc2p414i";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/caa478356d20b5b0e9a450f7b4a8b25937e583a4/recipes/backup-each-save";
           sha256 = "1l7lx3vd27qypkxa0cdm8zbd9fv08xn1bf6xj6g9c49ql95xbyiv";
-          name = "backup-each-save";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -4062,8 +4977,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    backup-walker = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    backup-walker = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "backup-walker";
         version = "20130720.816";
         src = fetchFromGitHub {
@@ -4072,10 +4990,10 @@
           rev = "934a4128c122972ac32bb9952addf279a60a94da";
           sha256 = "0z4d8x9lkad50720lgvr8f85p1ligv07865i30lgr9ck0q04w68v";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9428a70292cf6b796d7d994ad6b73d7d45970c19/recipes/backup-walker";
           sha256 = "0hfr27yiiblrd0p3zhpapbj4vijfdk7wqh406xnlwf2yvnfsqycd";
-          name = "backup-walker";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -4083,8 +5001,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    backward-forward = callPackage ({ emacs, fetchFromGitLab, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    backward-forward = callPackage ({ emacs
+                                    , fetchFromGitLab
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "backward-forward";
         version = "20161228.2150";
         src = fetchFromGitLab {
@@ -4093,10 +5015,10 @@
           rev = "58489957a62a0da25dfb5df902624d2548d800b4";
           sha256 = "14v9q58vd0iggs8x8hjh24cv58g2pbwnr6zghd2anaygbj74ij24";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cb44d7b604c50d4e07404c0dff071fbc66ea903d/recipes/backward-forward";
           sha256 = "0kpy761xdk2s21s92cw03fgw5xq9glybrhnjv2v89xrg16vdvamf";
-          name = "backward-forward";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -4104,20 +5026,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    badger-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    badger-theme = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "badger-theme";
         version = "20140716.1932";
         src = fetchFromGitHub {
           owner = "ccann";
           repo = "badger-theme";
-          rev = "493d672d5a5478976da7d5ca752008cc7837c57f";
-          sha256 = "0mrn3sl1xq19k6v4mw98zqgs11fidnarvidmxayx805k21pana6v";
+          rev = "80fb9f8ace37b2e8807da639f7da499a53ffefd4";
+          sha256 = "0g8smx6pi2wqv78mhxfgwg51mx5msqsgcc55xcz29aq0q3naw4z1";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/298e43769c6cd855526d847e8e3b237912360777/recipes/badger-theme";
           sha256 = "01h5bsqllgn6gs0wpl0y2h041007mn3ldjswkz6f3mayrgl4c6yf";
-          name = "badger-theme";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -4125,8 +5050,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    badwolf-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    badwolf-theme = callPackage ({ emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "badwolf-theme";
         version = "20161004.15";
         src = fetchFromGitHub {
@@ -4135,10 +5064,10 @@
           rev = "ea01a3d9358e968f75e3ed15dec6a2a96ce3d9a1";
           sha256 = "0a6adsxvmw3mgji17is75jrq3ifmzpch8rwqqyfgc99xzndvab7l";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/badwolf-theme";
           sha256 = "15n33l0iaq2pk70rpw7qdm8dlwcinfclpnlr3bs7vcb1dknp4g9v";
-          name = "badwolf-theme";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -4146,20 +5075,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    banner-comment = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    banner-comment = callPackage ({ emacs
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "banner-comment";
-        version = "20180403.1438";
+        version = "20180510.620";
         src = fetchFromGitHub {
           owner = "WJCFerguson";
           repo = "banner-comment";
-          rev = "9b1c9a94f8b6789c890a7e7eedd6f60ad5aa4d52";
-          sha256 = "02wsnmzbb60d4a8bsb5kywdwcfsqb6chcchs5v2d0s3sacakbmnl";
+          rev = "fedbb071d043106a30e378ee58b96e349e8068ed";
+          sha256 = "1d6yp96rv6p9f3b8ddrpzb3ng2v0vlqb1akcpd7dria6y6aai8l4";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4bb69f15cb6be38a86abf4d15450a29c9a819068/recipes/banner-comment";
           sha256 = "0i5nkfdwfr9mcir2ijdhw563azmr5p7hyl6rfy1r04fzs8j7w2pc";
-          name = "banner-comment";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -4167,8 +5100,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    bar-cursor = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    bar-cursor = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "bar-cursor";
         version = "20180226.1645";
         src = fetchFromGitHub {
@@ -4177,10 +5113,10 @@
           rev = "20cb59bedc3532a712fe7feeff3660ebd72a8107";
           sha256 = "06b0nkcp8yjixps72nrgk2zmljc9f71cdr96jdpgssydfhn4pcdf";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/932e7b128f092ec724ebf18c9c5ca84e16edc82c/recipes/bar-cursor";
           sha256 = "0f7z3mlnh3p28pmn1bnqbszcy1j68dwm8xra1wz8jgykvrdlyf2s";
-          name = "bar-cursor";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -4188,20 +5124,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    bart-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    bart-mode = callPackage ({ emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "bart-mode";
         version = "20180131.1829";
         src = fetchFromGitHub {
           owner = "mschuldt";
           repo = "bart-mode";
-          rev = "6feeb8f9badbc2ce4b60499bf7bf4acdae4cfed7";
-          sha256 = "1i1fcrwcswdqwb59154yzijccv7n0fqvm0ck3d8dqx5vczzmqixh";
+          rev = "f6b82f0df2e2b863be7b9383a22413a2fc77f9e0";
+          sha256 = "09z1fk5wbdlqps1102l9fcccz4vb0wcxbbrc4w2r2xrphwjxy6wc";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8f9cb09c07cb9fdef15de3e8dbfb6725d97dff6f/recipes/bart-mode";
           sha256 = "0wyfsf7kqfghnci9rlk9x0rkai6x7hy3vfzkgh7s2yz081p1kfam";
-          name = "bart-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -4209,20 +5149,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    base16-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    base16-theme = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "base16-theme";
-        version = "20180320.2254";
+        version = "20180524.1311";
         src = fetchFromGitHub {
           owner = "belak";
           repo = "base16-emacs";
-          rev = "69a96c1061d1d783a44f70fd811d49541762caf9";
-          sha256 = "1mg158w81vivar7lrya8qk46zghs2b7inmdckjcs8qw7w078cwav";
+          rev = "c9acfddcc0a3a3753223d4e8742de6af284154cc";
+          sha256 = "10kwilq2fn3bdh21zzw8h30kr1xalrjm7nbi003315qham2dkyh2";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/30862f6be74882cfb57fb031f7318d3fd15551e3/recipes/base16-theme";
           sha256 = "115dhr3gfvdz5wv76fwpv3b4dywiwbk69qrhkfhij8vpcfybrpzx";
-          name = "base16-theme";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -4230,20 +5173,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    bash-completion = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    bash-completion = callPackage ({ fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "bash-completion";
-        version = "20180303.1144";
+        version = "20180519.920";
         src = fetchFromGitHub {
           owner = "szermatt";
           repo = "emacs-bash-completion";
-          rev = "6aedd690006e07199b2fcd319b9b840a527650e5";
-          sha256 = "1a1wxcqzh0javjmxwi3lng5i99xiylm8lm04kv4q1lh9bli6vmv0";
+          rev = "fbdc78b8770833752ac4bda28e2c3ea764bf8e76";
+          sha256 = "1ihmj2nx8sr4cfx03xrpmiqjljri6wv5ib8rgnl8ip42nqhv2g6c";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8b528544841995045fb1f8344aaaa38946bb3915/recipes/bash-completion";
           sha256 = "0l41yj0sb87i27hw6dh35l32hg4qkka6r3bpkckjnfm0xifrd9hj";
-          name = "bash-completion";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -4251,20 +5197,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    basic-c-compile = callPackage ({ cl-lib ? null, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    basic-c-compile = callPackage ({ cl-lib ? null
+                                   , f
+                                   , fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "basic-c-compile";
         version = "20170302.312";
         src = fetchFromGitHub {
           owner = "nick96";
           repo = "basic-c-compile";
-          rev = "0129786aeee50d7bb0020d9fc2b7508875d403e8";
-          sha256 = "0q6scyva1psyam7jzygqcr1wayf70vrp237hm01q5i9cin8j4j1z";
+          rev = "335e96e19647ad7245fb68cf7e68cf86c5023d23";
+          sha256 = "1sq6mmg5361z30psn6x2ylpr8yxsbg3d47qai9px7p889p63384l";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/basic-c-compile";
           sha256 = "0g595d1vd97b5qqydpb6cr3ibgcm08cw8c154h35vz3cl4w86mwd";
-          name = "basic-c-compile";
+          name = "recipe";
         };
         packageRequires = [ cl-lib f ];
         meta = {
@@ -4272,20 +5223,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    basic-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }:
-    melpaBuild {
+    basic-mode = callPackage ({ emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild
+                              , seq }:
+      melpaBuild {
         pname = "basic-mode";
-        version = "20171204.1217";
+        version = "20180612.1152";
         src = fetchFromGitHub {
           owner = "dykstrom";
           repo = "basic-mode";
-          rev = "b7e851f844e9a5264e44936d1675133b4c3ed39c";
-          sha256 = "0q29inrdk9i4rgx3a0km62lzn796hh24365cc3kzylx74g53a3qf";
+          rev = "024505ae0a37756e3259773383852ed208120bde";
+          sha256 = "0fsy09m3mwvdxhlg4p0g95j1nsx8pp9ggslawpd4rj0rn6ffbq6d";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/71801bdc0720f150edeab6796487c753c6e7c3f5/recipes/basic-mode";
           sha256 = "1l0ylzww7jg6l804fdrklhay4is0wx1drfi9l9wn7gcdjh76mr6g";
-          name = "basic-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs seq ];
         meta = {
@@ -4293,20 +5249,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    basic-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    basic-theme = callPackage ({ emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "basic-theme";
         version = "20160817.127";
         src = fetchFromGitHub {
           owner = "fgeller";
           repo = "basic-theme.el";
-          rev = "e2a855bd39f4b78296228d4b790f9123156f7d7e";
-          sha256 = "1dfk73bkyhmhxnizbcp5zky8qyrgl7cf0dl9y6drqqc1lrcgz3jl";
+          rev = "9d0fd5f56898a5237c1de3363ad416aeab7f880e";
+          sha256 = "1bnv8kkg6yy09kxns78xlbl0vwc5dz0azvgvry2a0361f48f0315";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/451d1b67fefec5d3a346b1261d1284e8df6927a0/recipes/basic-theme";
           sha256 = "16rgff1d0s65alh328lr93zc06zmgbzgwx1rf3k3l4d10ki4cc27";
-          name = "basic-theme";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -4314,8 +5274,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    bats-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    bats-mode = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "bats-mode";
         version = "20160513.2315";
         src = fetchFromGitHub {
@@ -4324,10 +5287,10 @@
           rev = "d519f7c89f5ae17dfc33400596df4564b478315f";
           sha256 = "1ikb4rb20ng1yq95g3ydwpk37axmiw38rjzn1av9m4cs81qby4jv";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d742fb825e163beb33c3873aa48a1c411711e312/recipes/bats-mode";
           sha256 = "1l5winy30w8fs3f5cylc3a3j3mfkvchwanlgsin7q76jivn87h7w";
-          name = "bats-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -4335,8 +5298,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    bazel-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    bazel-mode = callPackage ({ emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "bazel-mode";
         version = "20180222.2253";
         src = fetchFromGitHub {
@@ -4345,10 +5312,10 @@
           rev = "b7aa14516feaed40ee4910eafa81db719de0fe56";
           sha256 = "16yjxs62h8dm63nzc04i60bnbyhm2vrpvn98ap8rad6wib2ka3vj";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3945f7eba7d5f248cace11a7946262ac2500b01a/recipes/bazel-mode";
           sha256 = "10590pbpg6mwkcwlm01nxf0ypw694h1b57frvn5rnc53al87i586";
-          name = "bazel-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -4356,20 +5323,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    bbcode-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    bbcode-mode = callPackage ({ cl-lib ? null
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "bbcode-mode";
-        version = "20180326.1410";
+        version = "20180505.227";
         src = fetchFromGitHub {
           owner = "lassik";
           repo = "bbcode-mode";
-          rev = "4a6df9eff9da9cb98d53164a585f2c69d8399e3a";
-          sha256 = "1gzx7s96fd6r9xgzp29d1w102rxkyr1mywhyvzcdslszbcrjc0r1";
+          rev = "ee30d43f9029e0919a06be0dde0ed16f201647c1";
+          sha256 = "046rdjpsm0lmkyaiv3y59hab3m8mdcj4asz5n06vb83a5xibm68s";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1ef095d23cc043f5d14a9deea788ed71d90c586c/recipes/bbcode-mode";
           sha256 = "1kfxzp0916gdphp4dkk4xbramsbqmg6mazvfqni86mra41rdq6sb";
-          name = "bbcode-mode";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -4377,18 +5348,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    bbdb = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
+    bbdb = callPackage ({ fetchgit
+                        , fetchurl
+                        , lib
+                        , melpaBuild }:
+      melpaBuild {
         pname = "bbdb";
-        version = "20180330.2018";
+        version = "20180502.2038";
         src = fetchgit {
           url = "https://git.savannah.nongnu.org/git/bbdb.git";
-          rev = "e0eff7e1ee5003f7c557a83d655a7fc0b6b45fcc";
-          sha256 = "0qalxasfckqqgngsafplrp9j1pcism17bn0h53qs8pfj9gxkng5q";
+          rev = "2da950300bb22fa713cede74b71041df315ecc2e";
+          sha256 = "1vz1c3f5wlhfq4d80fahqm3a8jsfl22bs3w4pfl25ivpg1l7m9bn";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/bbdb";
           sha256 = "0mm8n3dbi8lap3pjr97n2f675iy7sg476sm1vxygbc3j67rq1zb2";
-          name = "bbdb";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -4396,8 +5371,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    bbdb- = callPackage ({ bbdb, fetchFromGitHub, fetchurl, lib, log4e, melpaBuild, yaxception }:
-    melpaBuild {
+    bbdb- = callPackage ({ bbdb
+                         , fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , log4e
+                         , melpaBuild
+                         , yaxception }:
+      melpaBuild {
         pname = "bbdb-";
         version = "20140221.1554";
         src = fetchFromGitHub {
@@ -4406,10 +5387,10 @@
           rev = "2839e84c894de2513af41053e80a277a1b483d22";
           sha256 = "17nbnkg0zn6p89r27mk9hl6qhv6xscwdsq8iyikdw03svpr16lnp";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/01e7a8cc1dde506cb2fcfd9270f15dc61c43ec17/recipes/bbdb-";
           sha256 = "1vzbalcchay4pxl9f1sxg0zclgc095f59dlj15pj0bqq61sbl9jf";
-          name = "bbdb-";
+          name = "recipe";
         };
         packageRequires = [ bbdb log4e yaxception ];
         meta = {
@@ -4417,8 +5398,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    bbdb-csv-import = callPackage ({ bbdb, dash, fetchFromGitLab, fetchurl, lib, melpaBuild, pcsv }:
-    melpaBuild {
+    bbdb-csv-import = callPackage ({ bbdb
+                                   , dash
+                                   , fetchFromGitLab
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild
+                                   , pcsv }:
+      melpaBuild {
         pname = "bbdb-csv-import";
         version = "20180121.1649";
         src = fetchFromGitLab {
@@ -4427,10 +5414,10 @@
           rev = "dbc2e0fe9e8ae65e494011044d905ae79b3cee3e";
           sha256 = "0n52arydcsmarkpqqwxvw686cypl7iz73kzizirdjhcqmzimx9pl";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/76ac7178ee5381e08ae881f3fc6061106eeb1c1d/recipes/bbdb-csv-import";
           sha256 = "0r7pc2ypd1ydqrnvcqmsg69rm047by7k0zhm563538ra82597wnm";
-          name = "bbdb-csv-import";
+          name = "recipe";
         };
         packageRequires = [ bbdb dash pcsv ];
         meta = {
@@ -4438,8 +5425,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    bbdb-ext = callPackage ({ bbdb, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    bbdb-ext = callPackage ({ bbdb
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "bbdb-ext";
         version = "20151220.1213";
         src = fetchFromGitHub {
@@ -4448,10 +5439,10 @@
           rev = "fee97b1b3faa83edaea00fbc5ad3cbca5e791a55";
           sha256 = "1ydf89mmp3zjfqdymnrwg18wclyf7psarz9f2k82pl58h0khh71g";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b1ba0575cb6f0270bab8bf00726842b2a4d0bef3/recipes/bbdb-ext";
           sha256 = "0fnxcvzdyh0602rdfz3lz3vmvza4s0syz1vn2fgsn2lg3afqq7li";
-          name = "bbdb-ext";
+          name = "recipe";
         };
         packageRequires = [ bbdb ];
         meta = {
@@ -4459,8 +5450,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    bbdb-vcard = callPackage ({ bbdb, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    bbdb-vcard = callPackage ({ bbdb
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "bbdb-vcard";
         version = "20150713.1350";
         src = fetchFromGitHub {
@@ -4469,10 +5464,10 @@
           rev = "c3aafd4160854a38fd92afcdade32b9a13abe82c";
           sha256 = "1zlf9xhpirln72xr7v6kgndkg5wyz5ipsl4gpq9lbmp92jlgbwlj";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/dd5d9027c49beae89f78d2a30dfa4bd070dff1bd/recipes/bbdb-vcard";
           sha256 = "1kn98b7mh9a28933r4yl8qfl9p92rpix4vkp71sar9cka0m71ilj";
-          name = "bbdb-vcard";
+          name = "recipe";
         };
         packageRequires = [ bbdb ];
         meta = {
@@ -4480,8 +5475,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    bbdb2erc = callPackage ({ bbdb, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    bbdb2erc = callPackage ({ bbdb
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "bbdb2erc";
         version = "20170221.554";
         src = fetchFromGitHub {
@@ -4490,10 +5489,10 @@
           rev = "15db2bd29df0f6ee32c499fdeffb960b6a7f97a0";
           sha256 = "0jlm6qffhh84vy5wmkxmsm5i4dp87cfh7zr5kvrw72zyww986kn4";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/bbdb2erc";
           sha256 = "0k1f6mq9xd3568vg01dqqvcdbdshbdsi4ivkjyxis6dqfnqhlfdd";
-          name = "bbdb2erc";
+          name = "recipe";
         };
         packageRequires = [ bbdb ];
         meta = {
@@ -4501,8 +5500,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    bbyac = callPackage ({ browse-kill-ring, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    bbyac = callPackage ({ browse-kill-ring
+                         , cl-lib ? null
+                         , fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "bbyac";
         version = "20180206.641";
         src = fetchFromGitHub {
@@ -4511,10 +5515,10 @@
           rev = "9f0de9cad13801891ffb590dc09f51ff9a7cb225";
           sha256 = "0q0i1j8ljfd61rk6d5fys7wvdbym9pz5nhwyfvmm0ijmy19d1ppz";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/92c10c13a1bd19c8bdbca128852d1c91b76f7002/recipes/bbyac";
           sha256 = "1pb12b8xrcgyniwqc90z3kr3rq9kkzxjawwcz7xwzymq39fx0897";
-          name = "bbyac";
+          name = "recipe";
         };
         packageRequires = [ browse-kill-ring cl-lib ];
         meta = {
@@ -4522,8 +5526,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    bdo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    bdo = callPackage ({ fetchFromGitHub
+                       , fetchurl
+                       , lib
+                       , melpaBuild }:
+      melpaBuild {
         pname = "bdo";
         version = "20140126.101";
         src = fetchFromGitHub {
@@ -4532,10 +5539,10 @@
           rev = "c96cb6aa9e97fa3491185c50dee0f77a13241010";
           sha256 = "0d5b7zyl2vg621w1ll2lw3kjz5hx6lqxc0jivh0i449gckk5pzkm";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/bdo";
           sha256 = "1n2kpaps6992nxl0v1003czcbw1k4xq906an56694wkh05az505j";
-          name = "bdo";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -4543,20 +5550,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    beacon = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, seq }:
-    melpaBuild {
+    beacon = callPackage ({ fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild
+                          , seq }:
+      melpaBuild {
         pname = "beacon";
-        version = "20171017.1540";
+        version = "20180706.1025";
         src = fetchFromGitHub {
           owner = "Malabarba";
           repo = "beacon";
-          rev = "729338b02a0e331a4faf475da9f54771a3470106";
-          sha256 = "0mypzfasclq7bmw0i8hfyp8c1ycd3kdgd5h1faygzh9r0phh7ciy";
+          rev = "8dfe64496be3cb79d5b83891f95b70b1b699470b";
+          sha256 = "169asr7dz9xn22sxm38xxfafl6k9qnv4ir5k5hzvc9l2xp05w3z3";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d09cfab21be800831644218e9c8c4433087951c0/recipes/beacon";
           sha256 = "1pwxvdfzs9qjd44wvgimipi2hg4qw5sh5wlsl8h8mq2kyx09s7hq";
-          name = "beacon";
+          name = "recipe";
         };
         packageRequires = [ seq ];
         meta = {
@@ -4564,8 +5575,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    beeminder = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
-    melpaBuild {
+    beeminder = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild
+                             , org }:
+      melpaBuild {
         pname = "beeminder";
         version = "20180413.1229";
         src = fetchFromGitHub {
@@ -4574,10 +5589,10 @@
           rev = "3fcee7a7003a37171ddb59171c7f4b5dd4b34349";
           sha256 = "0phiyv4n5y052fgxngl3yy74akb378sr6manx21s360gnxzcblwd";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/beeminder";
           sha256 = "1cb8xmgsv23b464hpchm9f9i64p3fyf7aillrwk1aa2l1008kyww";
-          name = "beeminder";
+          name = "recipe";
         };
         packageRequires = [ org ];
         meta = {
@@ -4585,8 +5600,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    beginend = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    beginend = callPackage ({ emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "beginend";
         version = "20171003.548";
         src = fetchFromGitHub {
@@ -4595,10 +5614,10 @@
           rev = "2762796b54c7fd8613b02c041b2b9afeb13eb9fa";
           sha256 = "1g1mml0npypfk0vhicy4s7fa5df76xqpb80llxcfbnl2si9fzyfb";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/31c1157d4fd9e47a780bbd91075252acdc7899dd/recipes/beginend";
           sha256 = "1y81kr9q0zrsr3c3s14rm6l86y5wf1a0kia6d98112fy4fwdm7kq";
-          name = "beginend";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -4606,20 +5625,46 @@
           license = lib.licenses.free;
         };
       }) {};
-    benchmark-init = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    belarus-holidays = callPackage ({ fetchgit
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
+        pname = "belarus-holidays";
+        version = "20180615.611";
+        src = fetchgit {
+          url = "https://bitbucket.org/EugeneMakei/belarus-holidays.el";
+          rev = "410a7dcf46fdcbee762a0c0aa0c7af03230b9656";
+          sha256 = "186dka9ba9hx1xhd0lfj1x1njikixm09wd4xiqawgdczgfwyv4sq";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/6987c5fbafc602ff6b48c347b4e3e7c4471681e8/recipes/belarus-holidays";
+          sha256 = "0ls4y0bjdz37zvzp2xppsa4qdgmpwkz2l6ycjf9134brdnhm9gqy";
+          name = "recipe";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/belarus-holidays";
+          license = lib.licenses.free;
+        };
+      }) {};
+    benchmark-init = callPackage ({ fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "benchmark-init";
         version = "20150905.238";
         src = fetchFromGitHub {
           owner = "dholm";
           repo = "benchmark-init-el";
-          rev = "7a0f263282bbc86b01b662636306f22813082647";
-          sha256 = "1kyn1izm5sbqbp9whnhk9dn3yc7zy8bz5san5w3ivi3rpx15fh94";
+          rev = "8e4c32f32ec869fe521fb4d3c0a69406830b4178";
+          sha256 = "058mic9jkwiqvmp3k9sfd6gb70ysdphnb1iynlszhixbrz5w7zs2";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/54b9ae6fc10b0c56fcc7a0ad73743ffc85a3e9a0/recipes/benchmark-init";
           sha256 = "0dknch4b1j7ff1079z2fhqng7kp4903b3v7mhj15b5vzspbp3wal";
-          name = "benchmark-init";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -4627,20 +5672,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    benchstat = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    benchstat = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "benchstat";
         version = "20171013.2012";
         src = fetchFromGitHub {
           owner = "Quasilyte";
           repo = "benchstat.el";
-          rev = "a5b67cf7972ca2bbc9f5bc6a0f521ab02b76d4f0";
-          sha256 = "02v5l9qvzcr58qr973phgj1c846pqp3cj16khn4h9v3f3gb180n1";
+          rev = "fee86f521f22ef0f99564903d63e2023b591fc7f";
+          sha256 = "1rzb6ai5f5mf9kn0nnjfxjn3l3h5b9ksbkqr1bi52fagryxrfgl2";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d9180fbedf95f9b1f5810bbf4929dfee513f89e3/recipes/benchstat";
           sha256 = "0h2zi4gh23bas1zfj7j2x994lwgd3xyys96ipg1vq7z2b06572k9";
-          name = "benchstat";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -4648,8 +5696,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    bert = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    bert = callPackage ({ fetchFromGitHub
+                        , fetchurl
+                        , lib
+                        , melpaBuild }:
+      melpaBuild {
         pname = "bert";
         version = "20131117.214";
         src = fetchFromGitHub {
@@ -4658,10 +5709,10 @@
           rev = "a3eec6980a725aa4abd2019e4c00246450260490";
           sha256 = "06izbc0ksyhgh4gsjiifhj11v0gx9x5xjx9aqci5mc4kc6mg05sf";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/89635cd11621b04a8575629ec1bf196fb3ea5d43/recipes/bert";
           sha256 = "1zhz1dcy1nf84p244x6lc4ajancv5fgmqmbrm080yhb2ral1z8x7";
-          name = "bert";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -4669,8 +5720,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    better-defaults = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    better-defaults = callPackage ({ fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "better-defaults";
         version = "20170613.2104";
         src = fetchFromGitHub {
@@ -4679,10 +5733,10 @@
           rev = "12d9e6dbf24a8a3369b19650d74471b17b27f78d";
           sha256 = "1rx3p6syp6axnxbscg0l73yihgwdq7bdnkcrvfikz79yflxrsnmq";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7bb729c1ad8602a5c0c27e81c9442981a54a924a/recipes/better-defaults";
           sha256 = "13bqcmx2gagm2ykg921ik3awp8zvw5d4lb69rr6gkpjlqp7nq2cm";
-          name = "better-defaults";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -4690,20 +5744,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    better-shell = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    better-shell = callPackage ({ emacs
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "better-shell";
-        version = "20180209.1207";
+        version = "20180625.616";
         src = fetchFromGitHub {
           owner = "killdash9";
           repo = "better-shell";
-          rev = "2e9f2f3e7945c27988c50d8de43e681662d6a467";
-          sha256 = "1ccvfpfdkqb1ga7jqq0kgvifa5gqnilb4nn8ghlbxik1901xvr5z";
+          rev = "cfcd9d57f87ad68cd72bf4935fd1aaa1d9f059a9";
+          sha256 = "1z2c2w7p9clijzsfjhcghl76ycy6s0lyymxglzzk7js5np8idmdr";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/better-shell";
           sha256 = "0si8nj18i3jlhdb8m6f21rmi0lxians34vhw4xhvxw2yr9l85lj6";
-          name = "better-shell";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -4711,8 +5769,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    bf-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    bf-mode = callPackage ({ fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "bf-mode";
         version = "20130403.742";
         src = fetchFromGitHub {
@@ -4721,10 +5782,10 @@
           rev = "7cc4d09aed64d9db6be95646f5f5067de68f8895";
           sha256 = "02b2m0cq04ynjcmr4j8gpdzjv9mpf1fysn736xv724xgaymj396n";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f7fe1763891c7343c0ad0c7970b8a3c9035b4e8a/recipes/bf-mode";
           sha256 = "0b1yf9bx1ldkzry7v5qvcnl059rq62a50dvpa10i2f5v0y96n1q9";
-          name = "bf-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -4732,20 +5793,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    bfbuilder = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    bfbuilder = callPackage ({ cl-lib ? null
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "bfbuilder";
         version = "20150924.950";
         src = fetchFromGitHub {
           owner = "zk-phi";
           repo = "bfbuilder";
-          rev = "49560bdef131fa5672dab660e0c62376dbdcd906";
-          sha256 = "1y9fxs1nbf0xsn8mw45m9ghmji3h64wdbfnyr1npmf5fb27rmd17";
+          rev = "bb4c8a7be39af97ea5016099b320edd6d2b78149";
+          sha256 = "1n87db51ff3bqk3dk6rzipcl9mxr74a6wwkkpxq607wjxhxz0b9y";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3e77dd911b850846f1719b2ee943b74028d94f04/recipes/bfbuilder";
           sha256 = "16ckybqd0a8l75ascm3k4cdzp969lzq7m050aymdyjhwif6ld2r7";
-          name = "bfbuilder";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -4753,8 +5818,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    biblio = callPackage ({ biblio-core, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    biblio = callPackage ({ biblio-core
+                          , emacs
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "biblio";
         version = "20161014.1604";
         src = fetchFromGitHub {
@@ -4763,10 +5833,10 @@
           rev = "a5a68fcf677f286f205f32dc7486f6c9f66aa6af";
           sha256 = "1gxjind6r235az59dr8liv03d8994mqb8a7m28j3c12q7p70aziz";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c5fbaa8c59b0e64d13beb0e0f18b0734afa84f51/recipes/biblio";
           sha256 = "0ym7xvcfd7hh3qdpfb8zpa7w8s4lpg0vngh9d0ns3s3lnhz4mi0g";
-          name = "biblio";
+          name = "recipe";
         };
         packageRequires = [ biblio-core emacs ];
         meta = {
@@ -4774,20 +5844,27 @@
           license = lib.licenses.free;
         };
       }) {};
-    biblio-core = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, seq }:
-    melpaBuild {
+    biblio-core = callPackage ({ dash
+                               , emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , let-alist
+                               , lib
+                               , melpaBuild
+                               , seq }:
+      melpaBuild {
         pname = "biblio-core";
         version = "20160901.1115";
         src = fetchFromGitHub {
           owner = "cpitclaudel";
           repo = "biblio.el";
-          rev = "a5a68fcf677f286f205f32dc7486f6c9f66aa6af";
-          sha256 = "1gxjind6r235az59dr8liv03d8994mqb8a7m28j3c12q7p70aziz";
+          rev = "0036495a2e0d4b02b9e957e498f9437e394d6ed9";
+          sha256 = "1f0p5fgvabdpafil7s8sy82hgcfzg1skxfgj72ylv3crq36bn4vp";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f4f086d3e8fd6a95ce198e148cd3ede35dd73fb8/recipes/biblio-core";
           sha256 = "0zpfamrb2gka41h834a05hxdbw4h55777kh6rhjikjfmy765nl97";
-          name = "biblio-core";
+          name = "recipe";
         };
         packageRequires = [ dash emacs let-alist seq ];
         meta = {
@@ -4795,20 +5872,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    bibliothek = callPackage ({ a, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pdf-tools }:
-    melpaBuild {
+    bibliothek = callPackage ({ a
+                              , emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild
+                              , pdf-tools }:
+      melpaBuild {
         pname = "bibliothek";
-        version = "20180327.1422";
+        version = "20180429.1515";
         src = fetchFromGitHub {
           owner = "cadadr";
           repo = "elisp";
-          rev = "35424f7360f5110833b7a9f4f53907b9e222be85";
-          sha256 = "1xi56c8f2wcmldr76ylrcqsy0wf75pv74b0455ki84fq1fk4n08s";
+          rev = "ffe03506694c94de0444995f973a925deccc400a";
+          sha256 = "02wcvka96zdlq3myfar7dqywfil2b77bc6ydmgcphwn3as3kl08r";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8b8308e72c4437237fded29db1f60b3eba0edd26/recipes/bibliothek";
           sha256 = "011wnya65vfnn17fn1vhq0sk8c1mli81x0nb44yi6zl1hwxivb55";
-          name = "bibliothek";
+          name = "recipe";
         };
         packageRequires = [ a emacs pdf-tools ];
         meta = {
@@ -4816,20 +5899,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    bibretrieve = callPackage ({ auctex, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    bibretrieve = callPackage ({ auctex
+                               , emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "bibretrieve";
-        version = "20171125.727";
+        version = "20180617.1108";
         src = fetchFromGitHub {
           owner = "pzorin";
           repo = "bibretrieve";
-          rev = "da7b8c49e723e2327ab1d8625824389fb5324a80";
-          sha256 = "02rr46wfhv3mdmzlqznvxwms4rzq25xl1dqicbr75xwg5mjbg8si";
+          rev = "e8ccdc9b9bfec0c5c658f2e9ac3fb81a137549d7";
+          sha256 = "0l85kdnzm8lxva47sm4bbyv7xd52qxfgxippsbg2n12vqqiqf50z";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e548e0cf8babaf32f1db58099599a72cebdbb84d/recipes/bibretrieve";
           sha256 = "1mf884c6adx7rq5c2z5wrnjpb6znljy30mscxskwqiyfs8c62mii";
-          name = "bibretrieve";
+          name = "recipe";
         };
         packageRequires = [ auctex emacs ];
         meta = {
@@ -4837,8 +5925,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    bibslurp = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    bibslurp = callPackage ({ dash
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild
+                            , s }:
+      melpaBuild {
         pname = "bibslurp";
         version = "20151202.1546";
         src = fetchFromGitHub {
@@ -4847,10 +5940,10 @@
           rev = "aeba96368f2a06959e4fe945375ce2a54d34b189";
           sha256 = "077shjz9sd0k0akvxzzgjd8a626ck650xxlhp2ws4gs7rjd7a823";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/67f473e839d6325f193c641792671f43fbf83b6d/recipes/bibslurp";
           sha256 = "178nhng87bdi8s0r2bdh2gk31w9mmjkyi6ncnddk3v7p8fsh4jjp";
-          name = "bibslurp";
+          name = "recipe";
         };
         packageRequires = [ dash s ];
         meta = {
@@ -4858,8 +5951,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    bibtex-utils = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    bibtex-utils = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "bibtex-utils";
         version = "20170817.1219";
         src = fetchFromGitHub {
@@ -4868,10 +5964,10 @@
           rev = "ed5ccce46c2088a28a2f0c49caa679d2f20567f0";
           sha256 = "0cy0w4986lngzhzmfvk9r5xf0qa9bdz2ybzgv3nkwl48pjqvvi15";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5764b6a880e8143db66e9011cc1c2bf0bcd61082/recipes/bibtex-utils";
           sha256 = "13llsyyvy0xc9s51cqqc1rz13m3qdqh8jw07gwywfbixlma59z8l";
-          name = "bibtex-utils";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -4879,8 +5975,37 @@
           license = lib.licenses.free;
         };
       }) {};
-    bifocal = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    bicycle = callPackage ({ emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
+        pname = "bicycle";
+        version = "20180624.12";
+        src = fetchFromGitHub {
+          owner = "tarsius";
+          repo = "bicycle";
+          rev = "ab48f01ec8a3ebcb2f6cf36ea7f3cb8aef3da263";
+          sha256 = "13rmk3004jnnbfqvi9xh22si5dw02fswlryhkafagfzbnscc6gvb";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/ec9b4138ffaf81b556e01b85ce4b112e77909260/recipes/bicycle";
+          sha256 = "16ikqbmsjyknj3580wdnp8ffs85bq9idf9hvxm0ihgw5gy469xqj";
+          name = "recipe";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/bicycle";
+          license = lib.licenses.free;
+        };
+      }) {};
+    bifocal = callPackage ({ emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "bifocal";
         version = "20171004.1124";
         src = fetchFromGitHub {
@@ -4889,10 +6014,10 @@
           rev = "a8b222b069a6bd64531b4780905989797bad8abe";
           sha256 = "0c6vzh35lj3pg9wd4v2fy6xdmcg9kq3n5br6rp4lx257gxglzpwh";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/79e71995bd8452bad2e717884f148ec74c9735fc/recipes/bifocal";
           sha256 = "07qrxsby611l3cwsmw3d53h1n7cd1vg53j4vlc2isg56l2m4qks5";
-          name = "bifocal";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -4900,8 +6025,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    binclock = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    binclock = callPackage ({ cl-lib ? null
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "binclock";
         version = "20170802.416";
         src = fetchFromGitHub {
@@ -4910,10 +6039,10 @@
           rev = "87042230d7f3fe3e9a77fae0dbab7d8f7e7794ad";
           sha256 = "0bbcn3aif3qvmgbga7znivcbgn1n79278x7xvbha52zpj584xp8d";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/95dfa38d795172dca6a09cd02e21630747723949/recipes/binclock";
           sha256 = "1s0072kcd1xp8355j8aph94gb3a1wqmzx1hhfp9d6bzqf6cij8gk";
-          name = "binclock";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -4921,20 +6050,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    bind-chord = callPackage ({ bind-key, fetchFromGitHub, fetchurl, key-chord, lib, melpaBuild }:
-    melpaBuild {
+    bind-chord = callPackage ({ bind-key
+                              , fetchFromGitHub
+                              , fetchurl
+                              , key-chord
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "bind-chord";
         version = "20171204.1210";
         src = fetchFromGitHub {
           owner = "jwiegley";
           repo = "use-package";
-          rev = "512aa50b025018cb8574498d868814f73c02bb9b";
-          sha256 = "0ncg9vbn2hjdv846v0ij6pf1cs76i73jkb17wbf08r3km7933xmw";
+          rev = "33127b706e66fb20dfa40d94eb553dd7d6ef9197";
+          sha256 = "1iz7ibdvf3bnfkwfhakigvrdzg69qgx3z7qayq54spx3rpxf7x0b";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6240afa625290187785e4b7535ee7b0d7aad8969/recipes/bind-chord";
           sha256 = "1hyhs3iypyg5730a20axcfzrrglm4nbgdz8x1ifkaa0iy5zc9hb0";
-          name = "bind-chord";
+          name = "recipe";
         };
         packageRequires = [ bind-key key-chord ];
         meta = {
@@ -4942,20 +6076,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    bind-key = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    bind-key = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "bind-key";
-        version = "20171210.2125";
+        version = "20180512.2130";
         src = fetchFromGitHub {
           owner = "jwiegley";
           repo = "use-package";
-          rev = "512aa50b025018cb8574498d868814f73c02bb9b";
-          sha256 = "0ncg9vbn2hjdv846v0ij6pf1cs76i73jkb17wbf08r3km7933xmw";
+          rev = "c03d153e5882109e24c016d3afa6940af673ede6";
+          sha256 = "0zyl8dfg8acf99966sp8i5iky1mvn2h016viqk48s0hjv9va0wii";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d39d33af6b6c9af9fe49bda319ea05c711a1b16e/recipes/bind-key";
           sha256 = "1qw2c27016d3yfg0w10is1v72y2jvzhq07ca4h6v17yi94ahj5xm";
-          name = "bind-key";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -4963,8 +6100,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    bind-map = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    bind-map = callPackage ({ emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "bind-map";
         version = "20161207.711";
         src = fetchFromGitHub {
@@ -4973,10 +6114,10 @@
           rev = "bf4181e3a41463684adfffc6c5c305b30480e30f";
           sha256 = "0vrk17yg3jbww92p433p64ijmjf7cjg2wmzi9w418235w1xdfzz8";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f58800af5965a6e7c9314aa00e971196ea0d036e/recipes/bind-map";
           sha256 = "1jzkp010b4vs1bdhccf5igmymfxab4vxs1pccpk9n5n5a4xaa358";
-          name = "bind-map";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -4984,8 +6125,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    bing-dict = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    bing-dict = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "bing-dict";
         version = "20170604.1831";
         src = fetchFromGitHub {
@@ -4994,10 +6138,10 @@
           rev = "d4b261739e53e8ed8fa5db3d3946de82c0ab8e34";
           sha256 = "0dn6rifr0njpw3mwbyn21bw88lp0kzwwjp7ivgbbl1bxshj0ybhk";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/bing-dict";
           sha256 = "1cqjndq8xm2bwjvdj95dn377bp9r6rrkp1z4a45faj408mipahli";
-          name = "bing-dict";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -5005,8 +6149,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    birds-of-paradise-plus-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    birds-of-paradise-plus-theme = callPackage ({ fetchFromGitHub
+                                                , fetchurl
+                                                , lib
+                                                , melpaBuild }:
+      melpaBuild {
         pname = "birds-of-paradise-plus-theme";
         version = "20130419.1429";
         src = fetchFromGitHub {
@@ -5015,10 +6162,10 @@
           rev = "bb9f9d4ef7f7872a388ec4eee1253069adcadb6f";
           sha256 = "1n5icy29ks5rxrxp7v4sf0523z7wxn0fh9lx4y6jb7ppdjnff12s";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3932853232c269f158806aebe416b456c752a9bb/recipes/birds-of-paradise-plus-theme";
           sha256 = "0vdv2siy30kf1qhzrc39sygjk17lwm3ix58pcs3shwkg1y5amj3m";
-          name = "birds-of-paradise-plus-theme";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -5026,8 +6173,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    bison-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    bison-mode = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "bison-mode";
         version = "20160616.2252";
         src = fetchFromGitHub {
@@ -5036,10 +6186,10 @@
           rev = "314af3b7af7eb897fd3932616cb8600a85228cea";
           sha256 = "0ymjgwyi73vl81i7v1g2ad09lxp4mhp47r6zcijqa5hbx9l1skik";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d08592cabbc0779c67c260f9648d2273c0dd9e3e/recipes/bison-mode";
           sha256 = "097gimlzmyrsfnl76cbzyyi9dm0d2y3f9107672h56ncri35mh66";
-          name = "bison-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -5047,20 +6197,27 @@
           license = lib.licenses.free;
         };
       }) {};
-    bitbake = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, mmm-mode, s }:
-    melpaBuild {
+    bitbake = callPackage ({ dash
+                           , emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild
+                           , mmm-mode
+                           , s }:
+      melpaBuild {
         pname = "bitbake";
         version = "20180326.58";
         src = fetchFromGitHub {
           owner = "canatella";
           repo = "bitbake-el";
-          rev = "e5088c4b3dfb4feb96850fbc281b4207d23c7713";
-          sha256 = "0x765j9vks8r34kkqr9chlfy7dng71rciighk12fgiksqsl82qb0";
+          rev = "040498f9375f3b3eb67514c6497f43b77acd764f";
+          sha256 = "0jpgc4ps82qwagmh3lh49m11f8b3nbjgaw9wy43q9q1mslx14hf3";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/da099b66180ed537f8962ab4ca727d2441f9691d/recipes/bitbake";
           sha256 = "1k2n1i8g0jc78sp1icm64rlhi1q0vqar2a889nldp134a1l7bfah";
-          name = "bitbake";
+          name = "recipe";
         };
         packageRequires = [ dash emacs mmm-mode s ];
         meta = {
@@ -5068,20 +6225,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    bitbucket = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request, s }:
-    melpaBuild {
+    bitbucket = callPackage ({ emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild
+                             , request
+                             , s }:
+      melpaBuild {
         pname = "bitbucket";
         version = "20170404.2146";
         src = fetchFromGitHub {
           owner = "tjaartvdwalt";
           repo = "bitbucket.el";
-          rev = "5e663da1bd38a14c1ecf4d66a79d4321ac833bcf";
-          sha256 = "1sikayb6i1k40zdl4j9n04xcmsf74py5vmcjbvli7k8b3ar7l5l5";
+          rev = "db001a9d936e6b5c3cc5d5ec22794e234e0d162d";
+          sha256 = "0iwmhnnscj3axxzgcb9ma7n5wn3zpjiwkh1dxrlk2kcclbzlbjha";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9cf87389e6a5d868850d27e077202e1e52eaf4aa/recipes/bitbucket";
           sha256 = "1d0v6hvmxky3k2m89b7xm1igx9fmzvhdpn1bi8zln61m4zgr3yz0";
-          name = "bitbucket";
+          name = "recipe";
         };
         packageRequires = [ emacs request s ];
         meta = {
@@ -5089,20 +6252,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    bitlbee = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    bitlbee = callPackage ({ fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "bitlbee";
         version = "20151202.1600";
         src = fetchFromGitHub {
           owner = "pjones";
           repo = "bitlbee-el";
-          rev = "3a92a4119e0c007df2c7dcf1b1c3a5f23ee40e05";
-          sha256 = "0mccvpf8f87i7rqga3s4slrqz80rp3kyj071rrimhzpx8pnsrxx9";
+          rev = "f3342da46b0864ae8db4e82b553d9e617b090534";
+          sha256 = "1qbp15w4g9j9qhrgb04dwqa76i8sh1nbfd8gbpgp91sz9gackgkq";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/bitlbee";
           sha256 = "1lmbmlshr8b645qsb88rswmbbcbbawzl04xdjlygq4dnpkxc8w0f";
-          name = "bitlbee";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -5110,8 +6276,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    blackboard-bold-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    blackboard-bold-mode = callPackage ({ cl-lib ? null
+                                        , fetchFromGitHub
+                                        , fetchurl
+                                        , lib
+                                        , melpaBuild }:
+      melpaBuild {
         pname = "blackboard-bold-mode";
         version = "20160812.1906";
         src = fetchFromGitHub {
@@ -5120,10 +6290,10 @@
           rev = "5299cb064ba71baa3e331b8560bf8dd38cbbc4ed";
           sha256 = "00xbcgx4snz4sd7q7ys24rsnf5wdxjn402v8y5dgn4ayx88y1rrj";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/blackboard-bold-mode";
           sha256 = "08fmzm5lblkk503zr4d6hkp45075pwwd8zinngasrsf1r01isksj";
-          name = "blackboard-bold-mode";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -5131,8 +6301,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    blackboard-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    blackboard-theme = callPackage ({ emacs
+                                    , fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "blackboard-theme";
         version = "20161215.2256";
         src = fetchFromGitHub {
@@ -5141,10 +6315,10 @@
           rev = "d8b984f2541bb86eb4363a2b4c94631e49843d4a";
           sha256 = "1jh2960yab6rhdq7ci1slpmnr43619cza0g8bfbq759yz5b7xryh";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/eca8cbcc1282bb061f769daf86b1938d1f30f704/recipes/blackboard-theme";
           sha256 = "19cnfxrm85985ic55y5x7nwxdynjp7djyd33dhj8r7s92cs25fn7";
-          name = "blackboard-theme";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -5152,20 +6326,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    blacken = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    blacken = callPackage ({ emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "blacken";
-        version = "20180402.435";
+        version = "20180615.803";
         src = fetchFromGitHub {
           owner = "proofit404";
           repo = "blacken";
-          rev = "528527c832710aa1ceeb4c42ef85b5a37d2e213a";
-          sha256 = "1my234bsv5db99hhr66n2yhh3knvv4xwg7q05y408qbhrcf3ya5l";
+          rev = "d98199e8ab94550f5036aac2293cfb1f745003fa";
+          sha256 = "0fnrjgnc148cjs6b3qkyvpmlsmpdh3xi5xn4hxg7cpwqrx3s36d7";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/69d9802996a338be937d61678f2cadf3497f6b85/recipes/blacken";
           sha256 = "16lbs76jkhcq0vg09x1n8mrd4pgz5bdjsprr9260xr7g3dx8xacc";
-          name = "blacken";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -5173,8 +6351,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    blgrep = callPackage ({ clmemo, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    blgrep = callPackage ({ clmemo
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "blgrep";
         version = "20150401.716";
         src = fetchFromGitHub {
@@ -5183,10 +6365,10 @@
           rev = "605beda210610a5829750a987f5fcebea97af546";
           sha256 = "1pslwyaq18d1z7fay2ih3n27i6b49ss62drqqb095l1jxk42xxm0";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e78ed9dc4a7ff57524e79213973157ab364ae14d/recipes/blgrep";
           sha256 = "0w7453vh9c73hdfgr06693kwvhznn9xr1hqa65izlsx2fjhqc9gm";
-          name = "blgrep";
+          name = "recipe";
         };
         packageRequires = [ clmemo ];
         meta = {
@@ -5194,8 +6376,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    bliss-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    bliss-theme = callPackage ({ emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "bliss-theme";
         version = "20170808.607";
         src = fetchFromGitHub {
@@ -5204,10 +6390,10 @@
           rev = "c3cf6d8a666ab26909b7da158f9e94df71a5fbbf";
           sha256 = "1bpyhsjfdjfa1iw9kv7fsl30vz48qllqgjg1rsxdl3vcripcbc9z";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/641d1959bd31598fcdacd39a3d1bb077dcccfa5c/recipes/bliss-theme";
           sha256 = "1kzvi6zymfgirr41l8r2kazfz1y4xkigbp5qa1fafcdmw81anmdh";
-          name = "bliss-theme";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -5215,20 +6401,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    bln-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    bln-mode = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "bln-mode";
         version = "20170112.527";
         src = fetchFromGitHub {
           owner = "mgrachten";
           repo = "bln-mode";
-          rev = "6c20b3269e88952c19ca9ad151221c7e2e27b465";
-          sha256 = "04ggaybf1yi0ynqfr6vslx0ld5n6zs2ymmk63hr6lp2jb6dyhdhx";
+          rev = "1de92cec97a4693b8b932713e333730118db9183";
+          sha256 = "0dlcxh3acaiw3q9sa74jw4bpz7fv9lvpws68gw1qhs39f1plyzfx";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ee12ef97df241b7405feee69c1e66b3c1a67204b/recipes/bln-mode";
           sha256 = "0w4abaqx9gz04ls1hn1qz8qg9jpvi80b9jb597ddjcbnwqq9z83r";
-          name = "bln-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -5236,8 +6425,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    blockdiag-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    blockdiag-mode = callPackage ({ emacs
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "blockdiag-mode";
         version = "20160426.2224";
         src = fetchFromGitHub {
@@ -5246,10 +6439,10 @@
           rev = "f3b21ba433d60327cebd103ae4492200750e24a9";
           sha256 = "111i897dnkbx4xq62jfkqq4li4gm16lxbgkgg2gn13zv0f0lzgvy";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2a0adb94f2a435e846944a1c544e6591b131a10e/recipes/blockdiag-mode";
           sha256 = "0v48w4slzx8baxrf10jrzcpqmcv9d3z2pz0xqn8czlzm2f6id3ya";
-          name = "blockdiag-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -5257,8 +6450,16 @@
           license = lib.licenses.free;
         };
       }) {};
-    blog-admin = callPackage ({ cl-lib ? null, ctable, f, fetchFromGitHub, fetchurl, lib, melpaBuild, names, s }:
-    melpaBuild {
+    blog-admin = callPackage ({ cl-lib ? null
+                              , ctable
+                              , f
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild
+                              , names
+                              , s }:
+      melpaBuild {
         pname = "blog-admin";
         version = "20170923.709";
         src = fetchFromGitHub {
@@ -5267,10 +6468,10 @@
           rev = "b5f2e1dad7d68ec903619f7280bb0bcb7e398a1e";
           sha256 = "0fgzmmjxhl8i9yqx1bvb7hgkk9w4ylx73xy990qf1bl7fg21v636";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/blog-admin";
           sha256 = "03wnci5903c6jikkvlzc2vfma9h9qk673cc3wm756rx94jxinmyk";
-          name = "blog-admin";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ctable f names s ];
         meta = {
@@ -5278,8 +6479,16 @@
           license = lib.licenses.free;
         };
       }) {};
-    blog-minimal = callPackage ({ fetchFromGitHub, fetchurl, ht, lib, melpaBuild, mustache, org, s, simple-httpd }:
-    melpaBuild {
+    blog-minimal = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , ht
+                                , lib
+                                , melpaBuild
+                                , mustache
+                                , org
+                                , s
+                                , simple-httpd }:
+      melpaBuild {
         pname = "blog-minimal";
         version = "20170311.555";
         src = fetchFromGitHub {
@@ -5288,10 +6497,10 @@
           rev = "d679d74039ecc114b037800c8a94303265b9542a";
           sha256 = "1x14xwnv22dc99gzbn6z48dhxpy46a7lrby2p59aizpwpysi64yk";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/56217a33b0669a782621dd65d83419ae371ed60a/recipes/blog-minimal";
           sha256 = "1qj25b6n3slvmbqvzfd37v4xmy1vvz37686jdr29bw5qk4prgxff";
-          name = "blog-minimal";
+          name = "recipe";
         };
         packageRequires = [ ht mustache org s simple-httpd ];
         meta = {
@@ -5299,20 +6508,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    bm = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    bm = callPackage ({ fetchFromGitHub
+                      , fetchurl
+                      , lib
+                      , melpaBuild }:
+      melpaBuild {
         pname = "bm";
-        version = "20170815.1609";
+        version = "20180703.343";
         src = fetchFromGitHub {
           owner = "joodland";
           repo = "bm";
-          rev = "b1bc10b1e9f01c48a7eedb9b08a22d05e7baed3c";
-          sha256 = "16kfzi6chf28jyrsmz0jba3qq3mvxqambsdh09vr76ivmwbv48gh";
+          rev = "d224b6cd8341db4c2e11263c346dd44fb37fcd88";
+          sha256 = "18xwm1xj436bwa2l3dkfx6hlj19y6f0xqd3jbd06j4g3idpryqma";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/bm";
           sha256 = "07459r7m12j2nsb7qrb26bx32alylhaaq3z448n42lz02a8dc63g";
-          name = "bm";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -5320,8 +6532,16 @@
           license = lib.licenses.free;
         };
       }) {};
-    bmx-mode = callPackage ({ cl-lib ? null, company, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    bmx-mode = callPackage ({ cl-lib ? null
+                            , company
+                            , dash
+                            , emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild
+                            , s }:
+      melpaBuild {
         pname = "bmx-mode";
         version = "20180324.857";
         src = fetchFromGitHub {
@@ -5330,10 +6550,10 @@
           rev = "7450c29f5c1f5f67b02bca1c89f06cdf01855f41";
           sha256 = "0knxsmlp1agfs5sj5iz13b8igjx4gpk1lj36wzh1rdiwcxicnr49";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7f456d2b2b8f5a33bcb0f2ffd19e6e0276950f24/recipes/bmx-mode";
           sha256 = "04g8l4cw20k3yhbija9mz1l4nx3bzhzj7nb35s0xdyvwbc2mhrwb";
-          name = "bmx-mode";
+          name = "recipe";
         };
         packageRequires = [ cl-lib company dash emacs s ];
         meta = {
@@ -5341,8 +6561,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    bnfc = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    bnfc = callPackage ({ emacs
+                        , fetchFromGitHub
+                        , fetchurl
+                        , lib
+                        , melpaBuild }:
+      melpaBuild {
         pname = "bnfc";
         version = "20160605.1227";
         src = fetchFromGitHub {
@@ -5351,10 +6575,10 @@
           rev = "1b58df1dd0cb9b81900632fb2843a03b94f56fdb";
           sha256 = "0lmqrcy80nw6vmf81kh6q39x8pwhzrj6lbk31xpl8mvwnpqaykmn";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7871b6372a391ace76edea40c6f92ceb10b70bf9/recipes/bnfc";
           sha256 = "0h6qhyi7vcikg7zhv8lywdz033kp27a8z1ymq5wgs4aqs184igm6";
-          name = "bnfc";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -5362,8 +6586,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    bog = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    bog = callPackage ({ cl-lib ? null
+                       , fetchFromGitHub
+                       , fetchurl
+                       , lib
+                       , melpaBuild }:
+      melpaBuild {
         pname = "bog";
         version = "20180113.759";
         src = fetchFromGitHub {
@@ -5372,10 +6600,10 @@
           rev = "6ed4d3edbe771e586d873b826330f3ef23aa1611";
           sha256 = "0s4jwlaq3mqyzkyg3x4nh4nx7vw825jhz7ggakay7a2cfvpa4i2j";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/19fd0bf2f8e52c79120c492a6dcabdd51b465d35/recipes/bog";
           sha256 = "1ci8xxca7dclmi5v37y5k45qlmzs6a9hi6m7czgiwxii902w5pkl";
-          name = "bog";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -5383,8 +6611,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    bolt-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    bolt-mode = callPackage ({ emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "bolt-mode";
         version = "20180310.10";
         src = fetchFromGitHub {
@@ -5393,10 +6625,10 @@
           rev = "85a5a752bfbebb4aed884326c25db64c000e9934";
           sha256 = "03nxcmpm5n8jcca39ivrl7cjqz3gzsl3w6qc30hcp278qf2jq6va";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ec9e35f0e37db90d906fccd08fb25b673c88d3b8/recipes/bolt-mode";
           sha256 = "03x89k8v0m9kv1fhyys2gwympb70qlmg7gdib8wsmdxs34ys5igz";
-          name = "bolt-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -5404,8 +6636,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    bongo = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    bongo = callPackage ({ cl-lib ? null
+                         , emacs
+                         , fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "bongo";
         version = "20171118.1842";
         src = fetchFromGitHub {
@@ -5414,10 +6651,10 @@
           rev = "3d246be1e8d14865f5253567ab8fee5d4e9c470c";
           sha256 = "1zxk6x08gmir3qv07xanlsd2fb777jdbfzdksv1qh6srxbk3qfjq";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/692428769cd792dc0644641682c2793103dd00c6/recipes/bongo";
           sha256 = "07i9gw067r2igp6s2g2iakm1ybvw04q6zznna2cfdf08nax64ghv";
-          name = "bongo";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -5425,8 +6662,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    bonjourmadame = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    bonjourmadame = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "bonjourmadame";
         version = "20170919.434";
         src = fetchFromGitHub {
@@ -5435,10 +6675,10 @@
           rev = "d3df185fce78aefa689fded8e56a654f0fde4ac0";
           sha256 = "1acn63hd7s2z8viy52hmhncdic7m86rcqczxnz9aivikqy4hfnsi";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/34c4cfd7bbf5b442a9304598ba0a23ba9b8dfae4/recipes/bonjourmadame";
           sha256 = "0d36yradh37359fjk59s54hxkbh4qcc17sblj2ylcdyw7181iwfn";
-          name = "bonjourmadame";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -5446,20 +6686,28 @@
           license = lib.licenses.free;
         };
       }) {};
-    boogie-friends = callPackage ({ cl-lib ? null, company, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, yasnippet }:
-    melpaBuild {
+    boogie-friends = callPackage ({ cl-lib ? null
+                                  , company
+                                  , dash
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , flycheck
+                                  , lib
+                                  , melpaBuild
+                                  , yasnippet }:
+      melpaBuild {
         pname = "boogie-friends";
         version = "20171024.1955";
         src = fetchFromGitHub {
           owner = "boogie-org";
           repo = "boogie-friends";
-          rev = "ff9903783013f3598b6f44c99d47b25c5cdbed00";
-          sha256 = "0vc1pym7x6aafd88rrmm8yibq5y9wrx6b1pbgsfr7spcdq0hwwvg";
+          rev = "7fea709f13c6cb93e4ed672955484201ebe6c123";
+          sha256 = "1sfw59vd2ah054va5q52wf22cdrinv5m207prfzdqs9bsq1qfdac";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5bdd06b82d002677c046876642efe1dc01bc3e77/recipes/boogie-friends";
           sha256 = "0cfs7gvjxsx2027dbzh4yypz500nmk503ikiiprbww8jyvc8grk7";
-          name = "boogie-friends";
+          name = "recipe";
         };
         packageRequires = [ cl-lib company dash flycheck yasnippet ];
         meta = {
@@ -5467,20 +6715,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    bool-flip = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    bool-flip = callPackage ({ emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "bool-flip";
         version = "20161215.739";
         src = fetchFromGitHub {
           owner = "michaeljb";
           repo = "bool-flip";
-          rev = "f58a9a7b9ab875bcfbd57c8262697ae404eb4485";
-          sha256 = "06q86a6dhc7jvq25yqqq3dsmrbm67h0ayb6nhd0q5l90yrmfqfjh";
+          rev = "0f7cc9b387429239fb929896511727d4e49a795b";
+          sha256 = "1051gy7izy25jwh079231d4lh9azchbqc6nvfrkv8s9ck407a65a";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f56377a7c3f4b75206ad9ba570c35dbf752079e9/recipes/bool-flip";
           sha256 = "1xfspqxshx7m8gh6g1snkaahka9f71fnq7hx81nik4s9s8pmxj9c";
-          name = "bool-flip";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -5488,8 +6740,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    boon = callPackage ({ dash, emacs, expand-region, fetchFromGitHub, fetchurl, lib, melpaBuild, multiple-cursors }:
-    melpaBuild {
+    boon = callPackage ({ dash
+                        , emacs
+                        , expand-region
+                        , fetchFromGitHub
+                        , fetchurl
+                        , lib
+                        , melpaBuild
+                        , multiple-cursors }:
+      melpaBuild {
         pname = "boon";
         version = "20180319.526";
         src = fetchFromGitHub {
@@ -5498,10 +6757,10 @@
           rev = "b4cf42bbc531032404da88e8671c7495f0f7a5b0";
           sha256 = "163j41j29nm29w567iq662k9anivqc20yxghm8w49w7i5hsbq9dh";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/boon";
           sha256 = "0gryw7x97jd46jgrm93cjagj4p7w93cjc36i2ps9ajf0d8m4gajb";
-          name = "boon";
+          name = "recipe";
         };
         packageRequires = [ dash emacs expand-region multiple-cursors ];
         meta = {
@@ -5509,20 +6768,27 @@
           license = lib.licenses.free;
         };
       }) {};
-    borg = callPackage ({ dash, emacs, epkg, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }:
-    melpaBuild {
+    borg = callPackage ({ dash
+                        , emacs
+                        , epkg
+                        , fetchFromGitHub
+                        , fetchurl
+                        , lib
+                        , magit
+                        , melpaBuild }:
+      melpaBuild {
         pname = "borg";
-        version = "20180325.1457";
+        version = "20180702.1353";
         src = fetchFromGitHub {
           owner = "emacscollective";
           repo = "borg";
-          rev = "b03e8d19874809e813c9631d29260bac73f51e01";
-          sha256 = "15djx2c0agpmmy5ls61p0hwnv2plvb8k190xrrj925w9ypg2qp92";
+          rev = "738f749a9eeb9abecad17d38ce9a3e45c040cede";
+          sha256 = "0929d5bcqv39bq37sxgcf8z2y9zj89mjcdz632xy4qykiinhnwan";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/878ab90d444f3a1fd2c9f9068ca7b477e218f1da/recipes/borg";
           sha256 = "0gn4hf7hn190gl0kg59nr6jzjnb39c0hy9b3brrsfld9hyxga9jr";
-          name = "borg";
+          name = "recipe";
         };
         packageRequires = [ dash emacs epkg magit ];
         meta = {
@@ -5530,8 +6796,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    borland-blue-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    borland-blue-theme = callPackage ({ emacs
+                                      , fetchFromGitHub
+                                      , fetchurl
+                                      , lib
+                                      , melpaBuild }:
+      melpaBuild {
         pname = "borland-blue-theme";
         version = "20160117.521";
         src = fetchFromGitHub {
@@ -5540,10 +6810,10 @@
           rev = "db74eefebbc89d3c62575f8f50b319e87b4a3470";
           sha256 = "0yzfxxv2bw4x320268bixfc7yf97851804bz3829vbdhnr4kp6y5";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f2ff5916fd2caee778479bc2ad3ef13ee514052c/recipes/borland-blue-theme";
           sha256 = "1sc8qngm40bwdym8k1dgbahg48i73c00zxd99kqqwm9fnd6nm7qx";
-          name = "borland-blue-theme";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -5551,8 +6821,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    boron-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    boron-theme = callPackage ({ emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "boron-theme";
         version = "20170808.608";
         src = fetchFromGitHub {
@@ -5561,10 +6835,10 @@
           rev = "87ae1a765e07429fec25d2f29b004f84b52d2e0a";
           sha256 = "1kdf71af1s67vshgwkdgi7swxx942i605awhmhrhdjbkra29v4yn";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/641d1959bd31598fcdacd39a3d1bb077dcccfa5c/recipes/boron-theme";
           sha256 = "1rrqlq08jnh9ihb99ji1vvmamj742assnm4a7xqz6gp7f248nb81";
-          name = "boron-theme";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -5572,8 +6846,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    boxquote = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    boxquote = callPackage ({ cl-lib ? null
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "boxquote";
         version = "20170802.417";
         src = fetchFromGitHub {
@@ -5582,10 +6860,10 @@
           rev = "7e47e0e2853bc1215739b2e28f260e9eed93b2c5";
           sha256 = "1aqhg24gajvllbqxb0zxrnx6sddas37k2ldfinqyszd856sjhsg3";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d2148f8f17b16154bfc337df69a5ad31e25a9b05/recipes/boxquote";
           sha256 = "0s6cxb8y1y8w9vxxhj1izs8d0gzk4z2zm0cm9gkw1h7k2kyggx6s";
-          name = "boxquote";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -5593,8 +6871,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    bpe = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    bpe = callPackage ({ emacs
+                       , fetchFromGitHub
+                       , fetchurl
+                       , lib
+                       , melpaBuild }:
+      melpaBuild {
         pname = "bpe";
         version = "20141228.1405";
         src = fetchFromGitHub {
@@ -5603,10 +6885,10 @@
           rev = "7b5b25f83506e6c9f4075d3803fa32404943a189";
           sha256 = "0chmarbpqingdma54d6chbr6v6jg8lapbw56cpvcpbl04fz980r0";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1a99263c2672d4c2433835cf948101130126e14b/recipes/bpe";
           sha256 = "08zfqcgs7i2ram2qpy8vrzksx5722aahr66vdi4d9bcxm03s19fm";
-          name = "bpe";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -5614,8 +6896,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    bpr = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    bpr = callPackage ({ emacs
+                       , fetchFromGitHub
+                       , fetchurl
+                       , lib
+                       , melpaBuild }:
+      melpaBuild {
         pname = "bpr";
         version = "20180220.1044";
         src = fetchFromGitHub {
@@ -5624,10 +6910,10 @@
           rev = "af84a83dea09d86e77d87ac30604f2c5b4bf4117";
           sha256 = "1r2prq9j6fmzzkl1f3r9drn6lna2wzd9qv127x7z5g6n8pgb6ipx";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/05eed39bae37cc8359d2cc678052cbbcc946e379/recipes/bpr";
           sha256 = "0rjxn40n4s4xdq51bq0w3455g9pli2pvcf1gnbr96zawbngrw6x2";
-          name = "bpr";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -5635,8 +6921,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    bracketed-paste = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    bracketed-paste = callPackage ({ emacs
+                                   , fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "bracketed-paste";
         version = "20160407.1648";
         src = fetchFromGitHub {
@@ -5645,10 +6935,10 @@
           rev = "843ce3bbb63d560face889e13a57a2f7543957d5";
           sha256 = "1l6j2zs12psc15cfhqq6hm1bg012jr49zd2i36cmappbsiax1l8m";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6446db573d97ceb21cd39ce05fb39627113bbd74/recipes/bracketed-paste";
           sha256 = "1v7zwi29as0218vy6ch21iqqcxfhyh373m3dbcdzm2pb8bpcg58j";
-          name = "bracketed-paste";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -5656,8 +6946,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    brainfuck-mode = callPackage ({ fetchFromGitHub, fetchurl, langdoc, lib, melpaBuild }:
-    melpaBuild {
+    brainfuck-mode = callPackage ({ fetchFromGitHub
+                                  , fetchurl
+                                  , langdoc
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "brainfuck-mode";
         version = "20150113.42";
         src = fetchFromGitHub {
@@ -5666,10 +6960,10 @@
           rev = "36e69552bb3b97a4f888d362c59845651bd0d492";
           sha256 = "1nzgjgzidyrplfs4jl8nikd5wwvb4rmrnm51qxmw9y2if0hpq0jd";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/279ae8faabbfa2f894999e1534a964606722a150/recipes/brainfuck-mode";
           sha256 = "08jzx329mrr3c2pifs3hb4i79dsw606b0iviagaaja8s808m40cd";
-          name = "brainfuck-mode";
+          name = "recipe";
         };
         packageRequires = [ langdoc ];
         meta = {
@@ -5677,8 +6971,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    broadcast = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    broadcast = callPackage ({ emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "broadcast";
         version = "20151204.1812";
         src = fetchFromGitHub {
@@ -5687,10 +6985,10 @@
           rev = "f6f9cd2e0e3f8c31d6b8e7446c27eb0e50b25f16";
           sha256 = "0w6b9rxdciy1365kgf6fh3vgrjr8xd5ar6xcn0g4h56f2zg9hdmj";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6ed51896112e702a8b853059884aad50d37738c2/recipes/broadcast";
           sha256 = "1h2c3mb49q3vlpalrsrx8q3rmy1zg0y45ayvzbvzdkfgs8idgbib";
-          name = "broadcast";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -5698,20 +6996,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    browse-at-remote = callPackage ({ cl-lib ? null, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    browse-at-remote = callPackage ({ cl-lib ? null
+                                    , f
+                                    , fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild
+                                    , s }:
+      melpaBuild {
         pname = "browse-at-remote";
-        version = "20180227.52";
+        version = "20180621.2331";
         src = fetchFromGitHub {
           owner = "rmuslimov";
           repo = "browse-at-remote";
-          rev = "47bab994640f086939c30cc6416e770ad067e950";
-          sha256 = "0vhia7xmszcb3lxrb8wh93a3knjfzj48h8nhj4fh8zj1pjz6args";
+          rev = "0a06018e3500f36917284d552917702de3c5fae5";
+          sha256 = "1vci2azq00n2vx1kf0adhzddqj607l5341ym4p6ndk6xhdhqhkbs";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/browse-at-remote";
           sha256 = "0s088ba047azba60rlfn3jbqr321vnm953i7dqw2gj9xml90kbm4";
-          name = "browse-at-remote";
+          name = "recipe";
         };
         packageRequires = [ cl-lib f s ];
         meta = {
@@ -5719,8 +7023,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    browse-kill-ring = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    browse-kill-ring = callPackage ({ fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "browse-kill-ring";
         version = "20171219.1108";
         src = fetchFromGitHub {
@@ -5729,10 +7036,10 @@
           rev = "8debc43e41d7e51532698331c6f283905890b904";
           sha256 = "18yg35raks0kbzg5wjay6liingdcv4glyzl9n14sgr9vzc7h96f9";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/294dc32a672e6b6b0ebfc46cdf0ff9ceacf73e89/recipes/browse-kill-ring";
           sha256 = "1d97ap0vrg5ymp96z7y6si98fspxzy02jh1i4clvw5lggjfibhq4";
-          name = "browse-kill-ring";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -5740,20 +7047,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    browse-url-dwim = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, string-utils }:
-    melpaBuild {
+    browse-url-dwim = callPackage ({ fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild
+                                   , string-utils }:
+      melpaBuild {
         pname = "browse-url-dwim";
         version = "20140731.1222";
         src = fetchFromGitHub {
           owner = "rolandwalker";
           repo = "browse-url-dwim";
-          rev = "3d611dbb167c286109ac53995ad68286d87aafb9";
-          sha256 = "1rcihwdxrzhgcz573rh1yp3770ihkwqjqvd39yhic1d3sgwxz2hy";
+          rev = "11f1c53126619c7ef1bb5f5d6914ce0b3cce0e30";
+          sha256 = "08qz9l0gb7fvknzkp67srhldzkk8cylnbn0qwkflxgcs6ndfk95y";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a082c2dc0458e3007a947923f5b97e88217199e8/recipes/browse-url-dwim";
           sha256 = "13bv2ka5pp9k4kwrxfqfawwxzsqlakvpi9a32gxgx7qfi0dcb1rf";
-          name = "browse-url-dwim";
+          name = "recipe";
         };
         packageRequires = [ string-utils ];
         meta = {
@@ -5761,8 +7072,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    bshell = callPackage ({ buffer-manage, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    bshell = callPackage ({ buffer-manage
+                          , emacs
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "bshell";
         version = "20170903.1137";
         src = fetchFromGitHub {
@@ -5771,10 +7087,10 @@
           rev = "884a8b906617d305e9d5d2c3750618d2f86f9aed";
           sha256 = "16qh71yhpxs5cxjmkiqiia8xrxa0ym2n32znp4yc7xiv2xfw2ss4";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cf0ed51304f752af3e1f56caf2856d1521d782a4/recipes/bshell";
           sha256 = "1ds8xvh74i6wqswjp8i30knr74l4gbalkb2jil8qjb9wp9l1gw9z";
-          name = "bshell";
+          name = "recipe";
         };
         packageRequires = [ buffer-manage emacs ];
         meta = {
@@ -5782,8 +7098,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    btc-ticker = callPackage ({ fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild, request }:
-    melpaBuild {
+    btc-ticker = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , json ? null
+                              , lib
+                              , melpaBuild
+                              , request }:
+      melpaBuild {
         pname = "btc-ticker";
         version = "20151113.659";
         src = fetchFromGitHub {
@@ -5792,10 +7113,10 @@
           rev = "845235b545f070d0812cd1654cbaa4997565824f";
           sha256 = "022j0gw5qkxjz8f70vqjxysifv2mz6cigf9n5z03zmpvwwvxmx2z";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f78796a8835ec44f4d13c99559fd4d113c6f4f29/recipes/btc-ticker";
           sha256 = "1vfnx114bvnly1k3fmcpkqq4m9558wqr5c9k9yj8f046dgfh8dp1";
-          name = "btc-ticker";
+          name = "recipe";
         };
         packageRequires = [ json request ];
         meta = {
@@ -5803,8 +7124,17 @@
           license = lib.licenses.free;
         };
       }) {};
-    bts = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, log4e, melpaBuild, pos-tip, s, widget-mvc, yaxception }:
-    melpaBuild {
+    bts = callPackage ({ dash
+                       , fetchFromGitHub
+                       , fetchurl
+                       , lib
+                       , log4e
+                       , melpaBuild
+                       , pos-tip
+                       , s
+                       , widget-mvc
+                       , yaxception }:
+      melpaBuild {
         pname = "bts";
         version = "20151109.533";
         src = fetchFromGitHub {
@@ -5813,10 +7143,10 @@
           rev = "df42d58a36447697f93b56e69f5e700b2baef1f9";
           sha256 = "1qgasaqhqm0birjmb6k6isd2f5pn58hva8db8qfhva9g5kg1f38w";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0d2f9c2f465b06c97cd03c5644155cd6c7fade24/recipes/bts";
           sha256 = "1i1lbjracrgdxr52agxhxxgkra4w291dmz85s195lcx38rva7ib3";
-          name = "bts";
+          name = "recipe";
         };
         packageRequires = [ dash log4e pos-tip s widget-mvc yaxception ];
         meta = {
@@ -5824,8 +7154,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    bts-github = callPackage ({ bts, fetchFromGitHub, fetchurl, gh, lib, melpaBuild }:
-    melpaBuild {
+    bts-github = callPackage ({ bts
+                              , fetchFromGitHub
+                              , fetchurl
+                              , gh
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "bts-github";
         version = "20170401.549";
         src = fetchFromGitHub {
@@ -5834,10 +7169,10 @@
           rev = "ef2cf9202dc2128e5efdb613bfde9276a8cd95ad";
           sha256 = "173i9n4c8mg93gpc7ljxh3nhm4lq2c04yhrvjz6fwwwqvmnkha5f";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6f3e87699181877e50d75a89e2ee76e403fc9317/recipes/bts-github";
           sha256 = "03lz12bbkjqbs82alc97k6s1pmk721qip3h9cifq8a5ww5cbq9ln";
-          name = "bts-github";
+          name = "recipe";
         };
         packageRequires = [ bts gh ];
         meta = {
@@ -5845,8 +7180,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    bubbleberry-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    bubbleberry-theme = callPackage ({ emacs
+                                     , fetchFromGitHub
+                                     , fetchurl
+                                     , lib
+                                     , melpaBuild }:
+      melpaBuild {
         pname = "bubbleberry-theme";
         version = "20141017.244";
         src = fetchFromGitHub {
@@ -5855,10 +7194,10 @@
           rev = "22e9adf4586414024e4592972022ec297321b320";
           sha256 = "1aha8rzilv4k300rr4l9qjfygydfwllkbw17lhm8jz0kh9w6bd28";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e359b4463b10ac713c2d024c43a1682fca2959af/recipes/bubbleberry-theme";
           sha256 = "056pcr9ynsl34wqa2pw6sh4bdl5kpp1r0pl1vvw15p4866l9bdz3";
-          name = "bubbleberry-theme";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -5866,8 +7205,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    buckwalter = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    buckwalter = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "buckwalter";
         version = "20180107.843";
         src = fetchFromGitHub {
@@ -5876,10 +7218,10 @@
           rev = "2aa5451c3682c268adebc6b1191a796466732f53";
           sha256 = "0g270jyf2fd3x8p0jcd86j751spfphgsmwjxl61rk1x1kiql4icd";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7dd38487731cc978e104afa39f8954cfc33ba27f/recipes/buckwalter";
           sha256 = "08pnmfy910n5l00kmkn4533x48m3scsxzyra0nl6iry2n39y2kr1";
-          name = "buckwalter";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -5887,8 +7229,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    buffer-buttons = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    buffer-buttons = callPackage ({ fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "buffer-buttons";
         version = "20150106.639";
         src = fetchFromGitHub {
@@ -5897,10 +7242,10 @@
           rev = "2feb8494fa7863b98256bc85da670d74a3a8a975";
           sha256 = "1p5a29bpjqr1gs6sb6rr7y0j06nlva23wxkwfskap25zvjpgwbvq";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d518e81c8342a93455108e769c8b42747982c924/recipes/buffer-buttons";
           sha256 = "1p0ydbrff9197sann3s0d7hpav7r9g461w4llncafmy31w7m1dn6";
-          name = "buffer-buttons";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -5908,8 +7253,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    buffer-flip = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    buffer-flip = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "buffer-flip";
         version = "20180307.1451";
         src = fetchFromGitHub {
@@ -5918,10 +7266,10 @@
           rev = "e093360e05164c78255866c1ac8f966aa38ba514";
           sha256 = "1s35llycdhhclf9kl1q9l7zzzfqrnnvbiqv5csfw0mngfj0lz77f";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3924870cac1392a7eaeeda34b92614c26c674d63/recipes/buffer-flip";
           sha256 = "0ka9ynj528yp1p31hbhm89627v6dpwspybly806n92vxavxrn098";
-          name = "buffer-flip";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -5929,20 +7277,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    buffer-manage = callPackage ({ choice-program, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    buffer-manage = callPackage ({ choice-program
+                                 , dash
+                                 , emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "buffer-manage";
-        version = "20170916.957";
+        version = "20180528.913";
         src = fetchFromGitHub {
           owner = "plandes";
           repo = "buffer-manage";
-          rev = "4a0d526ca45264971796efe67c6e41d8aa659e4c";
-          sha256 = "15p089qfz8ra6f2lhny492hiricgs39w7w5iak2zlqm6k88cl1j8";
+          rev = "8bbe342a4dafcfdaf305baea98bd4208036ab89a";
+          sha256 = "027d71ppkcq60lkzgal8wv4xpjs4hzgih5ry9q2d4g0dr7wkjp3j";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/28f8f376df810e6ebebba9fb2c93eabbe3526cc9/recipes/buffer-manage";
           sha256 = "0fwri332faybv2apjh8zajqpryi0g4kk3and8djibpvci40l42jb";
-          name = "buffer-manage";
+          name = "recipe";
         };
         packageRequires = [ choice-program dash emacs ];
         meta = {
@@ -5950,8 +7304,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    buffer-move = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    buffer-move = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "buffer-move";
         version = "20160615.1103";
         src = fetchFromGitHub {
@@ -5960,10 +7317,10 @@
           rev = "cb517ecf8409b5fdcda472d7190c6021f0c49751";
           sha256 = "0gxy58v8nyv6pmzfn8552m8a14f5lzcbkndp5xpzq4g9qvmifmj6";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e30e053eab078a8bef73e42b90299231ea0997ee/recipes/buffer-move";
           sha256 = "0wysywff2bggrha7lpl83c8x6ln7zgdj9gsqmjva6gramqb260fg";
-          name = "buffer-move";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -5971,8 +7328,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    buffer-sets = callPackage ({ cl-lib ? null, fetchgit, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    buffer-sets = callPackage ({ cl-lib ? null
+                               , fetchgit
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "buffer-sets";
         version = "20170717.2040";
         src = fetchgit {
@@ -5980,10 +7341,10 @@
           rev = "4a4ccb0d6916c3e9fba737bb7b48e8aac921954e";
           sha256 = "1rg6iwswi82w8938pavwhvvr2z3ismb42asam2fkad47h2sgn0gz";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/61d07bbe7201fc991c7ab7ee6299a89d63ddb5e5/recipes/buffer-sets";
           sha256 = "1xj9fn2x4kbx8kp999wvz1j68znp7j81zl6rnbaipbx7hjpqrsin";
-          name = "buffer-sets";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -5991,20 +7352,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    buffer-utils = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    buffer-utils = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "buffer-utils";
         version = "20140512.700";
         src = fetchFromGitHub {
           owner = "rolandwalker";
           repo = "buffer-utils";
-          rev = "685b13457e3a2085b7584e41365d2aa0779a1b6f";
-          sha256 = "1mnf0dgr6g58k0jyia7985jsinrla04vm5sjl2iajwphbhadjk8p";
+          rev = "32e1f23817b9c6caedb53e5359baad29e99eaa2b";
+          sha256 = "0fajk0qjm1cq1a7ps2fa584g23bjlbccxv7s0x6n5yqpgn1f79ax";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a082c2dc0458e3007a947923f5b97e88217199e8/recipes/buffer-utils";
           sha256 = "0cfipdn4fc4fvz513mwiaihvbdi05mza3z5z1379wlljw6r539z2";
-          name = "buffer-utils";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -6012,8 +7376,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    buffer-watcher = callPackage ({ cl-lib ? null, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    buffer-watcher = callPackage ({ cl-lib ? null
+                                  , f
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "buffer-watcher";
         version = "20170913.139";
         src = fetchFromGitHub {
@@ -6022,10 +7391,10 @@
           rev = "b32c67c8a5d724257d759f4c903d0dedc32246ef";
           sha256 = "0mygs48mk2z8cw1csz2wfyn7kln9662d16hwpmbxs5x8k71aq8jx";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c8681776d467951d14d8247e6939bd9a6f2a80ec/recipes/buffer-watcher";
           sha256 = "0v096021xk7k821bxb5zddw6sljqa6fs8f7s8j0w3pv6lmhra1ln";
-          name = "buffer-watcher";
+          name = "recipe";
         };
         packageRequires = [ cl-lib f ];
         meta = {
@@ -6033,20 +7402,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    bufshow = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    bufshow = callPackage ({ emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "bufshow";
         version = "20130726.1138";
         src = fetchFromGitHub {
           owner = "pjones";
           repo = "bufshow";
-          rev = "d60a554e7239e6f7520d9c3436d5ecdbc9cf6957";
-          sha256 = "1rh848adjqdl42rw8yf1fqbr143m0pnbrlznx0d97v4vszvbby2s";
+          rev = "42d7fb74c3f914e127d5447c63d209bf19f5d517";
+          sha256 = "1gmk0p9rkhkpzg38rf642w2qancj5gb43dhqnhh3asgmij7f6nk3";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/543a734795eed11aa47a8e1348d14e362b341af0/recipes/bufshow";
           sha256 = "027cd0jzb8yxm66q1bhyi75f2m9f2pq3aswgav1d18na3ybwg65h";
-          name = "bufshow";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -6054,8 +7427,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    bug-reference-github = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    bug-reference-github = callPackage ({ fetchFromGitHub
+                                        , fetchurl
+                                        , lib
+                                        , melpaBuild }:
+      melpaBuild {
         pname = "bug-reference-github";
         version = "20180128.514";
         src = fetchFromGitHub {
@@ -6064,10 +7440,10 @@
           rev = "f570a0532bfb44f095b42cf68ab1f69799101137";
           sha256 = "09rbxgrk7jp9xajya6nccj0ak7fc48wyxq4sfmjmy3q1qfszdsc3";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5dfce86371692dddef78a6c1d772138b487b82cb/recipes/bug-reference-github";
           sha256 = "18yzxwanbrxsab6ba75z1196x0m6dapdhbvy6df5b5x5viz99cf6";
-          name = "bug-reference-github";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -6075,8 +7451,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    bui = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    bui = callPackage ({ dash
+                       , emacs
+                       , fetchFromGitHub
+                       , fetchurl
+                       , lib
+                       , melpaBuild }:
+      melpaBuild {
         pname = "bui";
         version = "20171215.930";
         src = fetchFromGitHub {
@@ -6085,10 +7466,10 @@
           rev = "af1a237b4d1ed31780dd37bcbef51fc8ca9b0603";
           sha256 = "1ccw90a68dahcrkr94xi9apnxjmvzjvd33w78bsr2jyfd82ggsw1";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/38b7c9345de75a707b4a73e8bb8e2f213e4fd739/recipes/bui";
           sha256 = "0a4g55k02hi3cwvk4d35lk2x5kc4fabskl2025i83hx0rqw4w3f1";
-          name = "bui";
+          name = "recipe";
         };
         packageRequires = [ dash emacs ];
         meta = {
@@ -6096,20 +7477,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    build-helper = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }:
-    melpaBuild {
+    build-helper = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild
+                                , projectile }:
+      melpaBuild {
         pname = "build-helper";
         version = "20161009.1055";
         src = fetchFromGitHub {
           owner = "afonso360";
           repo = "build-helper";
-          rev = "7a6fe71125a26ed1c492dab77cc688a7fe1d68ac";
-          sha256 = "0pipdzjf7arli6b88fp21as5d4v8ylsy19hixywhfgb7917qsrkv";
+          rev = "d1962858734253eca791721ccf62d1c4a10719f5";
+          sha256 = "07bhagf206p8q0nmz3sy2frd3zzi96snm3bm0rp6mffai0p58vps";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/af56cde18ae0efb0ae91c818e6804c55cdb3b8c2/recipes/build-helper";
           sha256 = "1asgpf2k4i7p88ask1i6ra4krhsxr6j2d2qv0gfxlsa5p330mmgh";
-          name = "build-helper";
+          name = "recipe";
         };
         packageRequires = [ projectile ];
         meta = {
@@ -6117,8 +7502,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    build-status = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    build-status = callPackage ({ cl-lib ? null
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "build-status";
         version = "20171111.1147";
         src = fetchFromGitHub {
@@ -6127,10 +7516,10 @@
           rev = "ef44185d9dd748ea578d68398f3f729a8adb45b5";
           sha256 = "00zcmmdccgzb5cp1nd9kjpiqs3zd9rh0z7aj9kmwsffaq339g55n";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/23bbe012f313cf0cf4c45a66eb0bee9361ced564/recipes/build-status";
           sha256 = "0ckyf0asll50gifx1v0qqzpimjms8i1rgw9bnqiyj861qn5hch92";
-          name = "build-status";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -6138,8 +7527,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    bundler = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, inf-ruby, lib, melpaBuild }:
-    melpaBuild {
+    bundler = callPackage ({ cl-lib ? null
+                           , fetchFromGitHub
+                           , fetchurl
+                           , inf-ruby
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "bundler";
         version = "20160815.215";
         src = fetchFromGitHub {
@@ -6148,10 +7542,10 @@
           rev = "f981f67c33b42243e57a78c358dffff70022b56b";
           sha256 = "1hfcvlkwa3hh70qan3q5mvld1hqqbnmbwqycvlqi6qr8dcdfl3cx";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ade7d0f0f0e553b48634e60ecaf7b91d0776d5f0/recipes/bundler";
           sha256 = "0i5ybc6i8ackxpaa75kwrg44zdq3jkvy48c42vaaafpddjwjnsy4";
-          name = "bundler";
+          name = "recipe";
         };
         packageRequires = [ cl-lib inf-ruby ];
         meta = {
@@ -6159,20 +7553,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    bury-successful-compilation = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    bury-successful-compilation = callPackage ({ fetchFromGitHub
+                                               , fetchurl
+                                               , lib
+                                               , melpaBuild }:
+      melpaBuild {
         pname = "bury-successful-compilation";
         version = "20150328.1728";
         src = fetchFromGitHub {
           owner = "EricCrosson";
           repo = "bury-successful-compilation";
-          rev = "52da2c07419beceab9b4d426d76adb3dcf2548d1";
-          sha256 = "1qdkx14rwabrfm9kzp4w9gvk9h4qg8f5b3qdwlyn863d2y7q468g";
+          rev = "7b16dc71b43914928cc16da674e69d7af975238a";
+          sha256 = "08ny1iycsgpal99g180w9yvk6ql8qn2kkc9xk9lmfv5p1wqm3l4w";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f66e2e23c7a1fa0ce6fa8a0e814242b7c46c299c/recipes/bury-successful-compilation";
           sha256 = "1gkq4r1573m6m57fp7x69k7kcpqchpcqfcz3792v0wxr22zhkwr3";
-          name = "bury-successful-compilation";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -6180,8 +7577,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    buster-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    buster-mode = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "buster-mode";
         version = "20140928.513";
         src = fetchFromGitHub {
@@ -6190,10 +7590,10 @@
           rev = "de6958ef8369400922618b8d1e99abfa91b97ac5";
           sha256 = "1viq7cb41r8klr8i38c5zjrhdnww31gh4j51xdgy4v2lc3z321zi";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/buster-mode";
           sha256 = "0nylkxy9qlj1h5v0pja4g315xcj5qzvkys4dsnzbh3xq4xzyj6xj";
-          name = "buster-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -6201,8 +7601,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    buster-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
-    melpaBuild {
+    buster-snippets = callPackage ({ fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild
+                                   , yasnippet }:
+      melpaBuild {
         pname = "buster-snippets";
         version = "20151125.210";
         src = fetchFromGitHub {
@@ -6211,10 +7615,10 @@
           rev = "bb8769dae132659858e74d52f3f4e8790399423a";
           sha256 = "11djqlw4qf3qs2rwiz7dn5q2zw5i8sykwdf4hg4awsgv8g0bbxn6";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/67dabf33096113e68fe282309246094711751e1f/recipes/buster-snippets";
           sha256 = "0k36c2k7wwix10rgmjxipc77fkn9jahjyvl191af6w41wla47x4x";
-          name = "buster-snippets";
+          name = "recipe";
         };
         packageRequires = [ yasnippet ];
         meta = {
@@ -6222,8 +7626,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    busybee-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    busybee-theme = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "busybee-theme";
         version = "20170719.228";
         src = fetchFromGitHub {
@@ -6232,10 +7639,10 @@
           rev = "66b2315b030582d0ebee605cf455d386d8c30fcd";
           sha256 = "1cvj5m45f5ky3w86khh6crvdqrdjxg2z6b34jlm32qpgmn0s5g45";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/36e2089b998d98575aa6dd3cc79fb7f6847f7aa3/recipes/busybee-theme";
           sha256 = "0w0z5x2fbnalv404av3mapfkqbfgyk81a1mzvngll8x0pirbyi10";
-          name = "busybee-theme";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -6243,8 +7650,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    butler = callPackage ({ deferred, emacs, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }:
-    melpaBuild {
+    butler = callPackage ({ deferred
+                          , emacs
+                          , fetchFromGitHub
+                          , fetchurl
+                          , json ? null
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "butler";
         version = "20150811.1708";
         src = fetchFromGitHub {
@@ -6253,10 +7666,10 @@
           rev = "8ceb35737107572455cca9a61ff46b3ff78f1016";
           sha256 = "0pp604r2gzzdpfajw920607pklwflk842difdyl4hy9w87fgc0jg";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c86e3f5083e59568afac69eed9aa8c1a0bd76e2e/recipes/butler";
           sha256 = "1jv74l9jy55qpwf5np9nlj6a1wqsm3xirm7wm89d1h2mbsfcr0mq";
-          name = "butler";
+          name = "recipe";
         };
         packageRequires = [ deferred emacs json ];
         meta = {
@@ -6264,20 +7677,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    buttercup = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    buttercup = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "buttercup";
-        version = "20180223.937";
+        version = "20180629.523";
         src = fetchFromGitHub {
           owner = "jorgenschaefer";
           repo = "emacs-buttercup";
-          rev = "4106adc5051965a3d066dfb5594e3d3ba0303b3f";
-          sha256 = "01pvga1b54p7l9fjj388hdvjkmmp2gf5la7l74xjaxfk7v5rrifv";
+          rev = "39d625ce53bb1e1b9b03d9c9c70aa81e94fcc66a";
+          sha256 = "1y97af0kl0yiirnajn44jcz865acndjwkr3zhpf65lm0bbaxfp2a";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d4b187cb5b3cc5b546bfa6b94b6792e6363242d1/recipes/buttercup";
           sha256 = "1grrrdk5pl9l1jvnwzl8g0102gipvxb5qn6k2nmv28jpl57v8dkb";
-          name = "buttercup";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -6285,8 +7701,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    button-lock = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    button-lock = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "button-lock";
         version = "20150223.554";
         src = fetchFromGitHub {
@@ -6295,10 +7714,10 @@
           rev = "f9082feb329432fcf2ac49a95e64bed9fda24d58";
           sha256 = "06qjvybf65ffrcnhhbqs333lg51fawaxnva3jvdg7zbrsv4m9acl";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/83459421dd2eb3d60ec668c3d5bb38d99ee64aff/recipes/button-lock";
           sha256 = "1arrdmb3nm570hgs18y9sz3z9v0wlkr3vwa2zgfnc15lmf0y34mp";
-          name = "button-lock";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -6306,8 +7725,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    c-c-combo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    c-c-combo = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "c-c-combo";
         version = "20151223.1855";
         src = fetchFromGitHub {
@@ -6316,10 +7738,10 @@
           rev = "a261a833499a7fdc29610863b3aafc74818770ba";
           sha256 = "040mcq2cwzbrf96f9mghb4314cd8xwp7ki2ix9fxpmbwiy323ld5";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/da105eab0e7a5a3a1fc562973d99cbbbe9019b5f/recipes/c-c-combo";
           sha256 = "09rvh6n2hqls7qki5dc34s2hmcmlvdsbgzcxgglhcmrhwx5w4vxn";
-          name = "c-c-combo";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -6327,8 +7749,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    c-eldoc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    c-eldoc = callPackage ({ fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "c-eldoc";
         version = "20170917.1502";
         src = fetchFromGitHub {
@@ -6337,10 +7762,10 @@
           rev = "79d09769362228058246f5e6fa183d121f7fb322";
           sha256 = "1398lfd18zn2xym36p71yavgggqbb15xz9m7gah4w4k2bk15aczk";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/c-eldoc";
           sha256 = "13grkww14w39y2x6mrbfa9nzljsnl5l7il8dnj6sjdyv0hz9x8vm";
-          name = "c-eldoc";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -6348,8 +7773,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    c0-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    c0-mode = callPackage ({ fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "c0-mode";
         version = "20151110.1052";
         src = fetchFromGitHub {
@@ -6358,10 +7786,10 @@
           rev = "c214093c36864d6208fcb9e6a72413ed17ed5d60";
           sha256 = "10k90r4ckkkdjn9pqcbfyp6ynvrd5k0ngqcn5d0v1qvkn6jifxjx";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/268115452d9c22a6f2627cec1eb122b47e85b88c/recipes/c0-mode";
           sha256 = "0s3h4b3lpz4jsk222yyfdxh780dvykhaqgyv6r3ambz95vrmmpl4";
-          name = "c0-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -6369,8 +7797,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    cabledolphin = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }:
-    melpaBuild {
+    cabledolphin = callPackage ({ emacs
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild
+                                , seq }:
+      melpaBuild {
         pname = "cabledolphin";
         version = "20160204.138";
         src = fetchFromGitHub {
@@ -6379,10 +7812,10 @@
           rev = "fffc192cafa61558e924323d6da8166fe5f2a6f9";
           sha256 = "1h395hvia7r76zlgr10qdr9q2159qyrs89znhkp2czikwm8kjiqk";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0c8bd2715aec4793abc37d6899adabd568955a08/recipes/cabledolphin";
           sha256 = "04slrx0vkcm66q59158limn0cpxn18ghlqyx7z8nrn7frrc03z03";
-          name = "cabledolphin";
+          name = "recipe";
         };
         packageRequires = [ emacs seq ];
         meta = {
@@ -6390,8 +7823,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    cache = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    cache = callPackage ({ fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "cache";
         version = "20111019.1600";
         src = fetchFromGitHub {
@@ -6400,10 +7836,10 @@
           rev = "7499586b6c8224df9f5c5bc4dec96b008258d580";
           sha256 = "1hp6dk84vvgkmj5lzghvqlpq3axwzgx9c7gly2yx6497fgf9jlby";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/cache";
           sha256 = "15pj7f4n0lk8qqsfafdj19iy0hz4xpfcf2fnby7ziq2dldyqrax9";
-          name = "cache";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -6411,8 +7847,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    cacoo = callPackage ({ concurrent, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    cacoo = callPackage ({ concurrent
+                         , fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "cacoo";
         version = "20120319.1659";
         src = fetchFromGitHub {
@@ -6421,10 +7861,10 @@
           rev = "c9fa04fbe97639b24698709530361c2bb5f3273c";
           sha256 = "07kzhyqr8ycjvkknijqhsfr26zd5jc8wxm9sl8bp6pzn4jbs1dmx";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2bd55f5c29876c2483001cd9deaca68cab5054b9/recipes/cacoo";
           sha256 = "0kri4vi6dpsf0zk24psm16f3aa27cq5b54ga7zygmr02csq24a6z";
-          name = "cacoo";
+          name = "recipe";
         };
         packageRequires = [ concurrent ];
         meta = {
@@ -6432,20 +7872,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    cake-inflector = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    cake-inflector = callPackage ({ fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild
+                                  , s }:
+      melpaBuild {
         pname = "cake-inflector";
         version = "20140415.158";
         src = fetchFromGitHub {
           owner = "k1LoW";
           repo = "emacs-cake-inflector";
-          rev = "a1d338ec4840b1b1bc14f7f9298c07e2c1d2d8fc";
-          sha256 = "0m8ss9aky24f5i6b8fyy8mhv9ygj158crjyddnj9xx73vsjf96bs";
+          rev = "d9c6298fbca53efeb6f0f37140395659d9a6d7cc";
+          sha256 = "09p04bssiqyp74947ivsl09x93bd6ik48ycgimafmx8aycnrjfla";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/77c46238b632047160d6dfac9b257f57b0c4283b/recipes/cake-inflector";
           sha256 = "04mrqcm1igb638skaq2b3nr5yzxnck2vwhln61rnh7lkfxq7wbwf";
-          name = "cake-inflector";
+          name = "recipe";
         };
         packageRequires = [ s ];
         meta = {
@@ -6453,8 +7897,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    cakecrumbs = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    cakecrumbs = callPackage ({ emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "cakecrumbs";
         version = "20180222.1845";
         src = fetchFromGitHub {
@@ -6463,10 +7911,10 @@
           rev = "76cfbfacfaa9d2128fc9218338a0ba2bb47349ab";
           sha256 = "18ni6krymzm1af2vmw2n82s0ifny6pn1p0qifn3646xx4p210a4z";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c970907affeb4a21fa1b7c350edf171dbdcd8de5/recipes/cakecrumbs";
           sha256 = "1s5j8w0y47qpdq4f34l7hmdhxp560wg1lgzqz6p3p3lg1l89sv47";
-          name = "cakecrumbs";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -6474,8 +7922,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    cal-china-x = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    cal-china-x = callPackage ({ cl-lib ? null
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "cal-china-x";
         version = "20180211.1101";
         src = fetchFromGitHub {
@@ -6484,10 +7936,10 @@
           rev = "e9b309065829af3a9a0c526509bd64d9228fdced";
           sha256 = "0wipcsr0dry2r9sw7lcz5hw16b5gpax7qr2nbdlcwj3j9axqipyg";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c1098d34012fa72f8c8c30d5f0f495fdbe1d3d65/recipes/cal-china-x";
           sha256 = "06mh2p14m2axci8vy1hr7jpy53jj215z0djyn8h7zpr0k62ajhka";
-          name = "cal-china-x";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -6495,8 +7947,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    calendar-norway = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    calendar-norway = callPackage ({ fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "calendar-norway";
         version = "20160827.1316";
         src = fetchFromGitHub {
@@ -6505,10 +7960,10 @@
           rev = "8501b2ee515e995f345365391b03f44c812cabdf";
           sha256 = "0lch835rq2rqyh0vyi75dhyl7hm6bv27f2z753wggh0jyg6qxi7a";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c5d01230027d5cec9da2545a9ce9270a611f6567/recipes/calendar-norway";
           sha256 = "1i23ks0bnq62bvn3szvqf0ikcam4s92yvr998mkjxhdhc94zd19c";
-          name = "calendar-norway";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -6516,8 +7971,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    calfw = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    calfw = callPackage ({ fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "calfw";
         version = "20180117.1645";
         src = fetchFromGitHub {
@@ -6526,10 +7984,10 @@
           rev = "03abce97620a4a7f7ec5f911e669da9031ab9088";
           sha256 = "0wiggihw9ackjdssqgp2cqccd3sil13n3pfn33d3r320fmxfjbch";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cc64274abdc7c8fb904b43d2d036aac98e738131/recipes/calfw";
           sha256 = "0am1nafc16zax8082gjlz0pi85lryjhrx0v80nzgr23iybj5mfx4";
-          name = "calfw";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -6537,20 +7995,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    calfw-cal = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    calfw-cal = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "calfw-cal";
         version = "20170320.506";
         src = fetchFromGitHub {
           owner = "kiwanami";
           repo = "emacs-calfw";
-          rev = "03abce97620a4a7f7ec5f911e669da9031ab9088";
-          sha256 = "0wiggihw9ackjdssqgp2cqccd3sil13n3pfn33d3r320fmxfjbch";
+          rev = "136dce009a26e7d8a8064af422c2cf8170e852c5";
+          sha256 = "1hiip8hfl7myimgba7ggs1ki1pk3ag7nyfa8j2zzm87n93g5xia4";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cc64274abdc7c8fb904b43d2d036aac98e738131/recipes/calfw-cal";
           sha256 = "1wylkd7jl1ifq56jj04l5b9wfrjkhwncxzrjgnbgg1cl2klf6v4m";
-          name = "calfw-cal";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -6558,8 +8019,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    calfw-gcal = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    calfw-gcal = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "calfw-gcal";
         version = "20120111.200";
         src = fetchFromGitHub {
@@ -6568,10 +8032,10 @@
           rev = "14aab20687d6cc9e6c5ddb9e11984c4e14c3d870";
           sha256 = "14n5rci4bkbl7037xvkd69gfxnjlgvd2j1xzciqcgz92f06ir3xi";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/calfw-gcal";
           sha256 = "0pzjs8kvf9vxdzziq7zd59vniq21k4a6yygpv4fz2by3s3bvnrid";
-          name = "calfw-gcal";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -6579,20 +8043,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    calfw-howm = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    calfw-howm = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "calfw-howm";
         version = "20170703.1704";
         src = fetchFromGitHub {
           owner = "kiwanami";
           repo = "emacs-calfw";
-          rev = "03abce97620a4a7f7ec5f911e669da9031ab9088";
-          sha256 = "0wiggihw9ackjdssqgp2cqccd3sil13n3pfn33d3r320fmxfjbch";
+          rev = "bcfc0c546c3c58e1f635a9a29efdf56c9421a3ce";
+          sha256 = "0n7kn0g7mxylp28w5llrz22w12qjvypa1g82660qr2d9ga9mb0v9";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cc64274abdc7c8fb904b43d2d036aac98e738131/recipes/calfw-howm";
           sha256 = "08cv16cq211sy2v1i0gk7d81f0gyywv0i9szmamnrbjif3rrv2m0";
-          name = "calfw-howm";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -6600,20 +8067,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    calfw-ical = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    calfw-ical = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "calfw-ical";
         version = "20150703.119";
         src = fetchFromGitHub {
           owner = "kiwanami";
           repo = "emacs-calfw";
-          rev = "03abce97620a4a7f7ec5f911e669da9031ab9088";
-          sha256 = "0wiggihw9ackjdssqgp2cqccd3sil13n3pfn33d3r320fmxfjbch";
+          rev = "a67fa1023b3fddc1d1f38114c1d207376c8e6289";
+          sha256 = "0g8s3pgivqk1vqdgkndznkl48c4m5yiahkjxyqyv2781hdb4f6xa";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cc64274abdc7c8fb904b43d2d036aac98e738131/recipes/calfw-ical";
           sha256 = "1bh9ahwp9b5knjxph79kl19fgs48x3w7dga299l0xvbxq2jhs95q";
-          name = "calfw-ical";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -6621,20 +8091,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    calfw-org = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    calfw-org = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "calfw-org";
         version = "20160302.1858";
         src = fetchFromGitHub {
           owner = "kiwanami";
           repo = "emacs-calfw";
-          rev = "03abce97620a4a7f7ec5f911e669da9031ab9088";
-          sha256 = "0wiggihw9ackjdssqgp2cqccd3sil13n3pfn33d3r320fmxfjbch";
+          rev = "e03ae470788778e7714b73520014eadc03a88abd";
+          sha256 = "0rhasr818qijd2pcgifi0j3q4fkbiw2ck1nivajk7m810p53bxbj";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cc64274abdc7c8fb904b43d2d036aac98e738131/recipes/calfw-org";
           sha256 = "1cfpjh08djz3k067w3580yb15p1csks3gzch9c4cbrbcjvg8inh5";
-          name = "calfw-org";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -6642,20 +8115,28 @@
           license = lib.licenses.free;
         };
       }) {};
-    call-graph = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, hierarchy, ivy, lib, melpaBuild, tree-mode }:
-    melpaBuild {
+    call-graph = callPackage ({ cl-lib ? null
+                              , emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , hierarchy
+                              , ivy
+                              , lib
+                              , melpaBuild
+                              , tree-mode }:
+      melpaBuild {
         pname = "call-graph";
-        version = "20180403.2002";
+        version = "20180509.635";
         src = fetchFromGitHub {
           owner = "beacoder";
           repo = "call-graph";
-          rev = "31bfac00f33b8494fcf6c18a210dd7ed4b81a21d";
-          sha256 = "00ajq1xkm9hmk92vrnvmgkrs65jlx1rl1hxghf9id4gx09yy011s";
+          rev = "1ba83f20e56cfe77f6165df4ffde1d152647ec3b";
+          sha256 = "0qs3wg6ls4s400hdcimwf9lj9mz6g39sk3nqxvp4fk01jjzcas39";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a6acf099e2510c82b4b03e2f35051afc3d28af45/recipes/call-graph";
           sha256 = "0cklr79gqqrb94jq8aq65wqriamay78vv9sd3jrvp86ixl3ig5xc";
-          name = "call-graph";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs hierarchy ivy tree-mode ];
         meta = {
@@ -6663,20 +8144,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    calmer-forest-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    calmer-forest-theme = callPackage ({ fetchFromGitHub
+                                       , fetchurl
+                                       , lib
+                                       , melpaBuild }:
+      melpaBuild {
         pname = "calmer-forest-theme";
         version = "20130925.2210";
         src = fetchFromGitHub {
           owner = "caldwell";
           repo = "calmer-forest-theme";
-          rev = "87ba7bae389084d13fe3bc34e0c923017eda6ba0";
-          sha256 = "0n6y4z3qg04qnlsrjysf8ldxl2f2bk7n8crijydwabyy672qxd9h";
+          rev = "31a0bed8e5db1e314557175a719a10804ac089f4";
+          sha256 = "1rqd46ngnjln6vvcx7vsmwsjn4r3wfdpip6gqjqbsznav2g74bra";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/edb51491e575ef64a705cd0b972de07993f185cf/recipes/calmer-forest-theme";
           sha256 = "0riz5n8fzvxdnzgg650xqc2zwc4xvhwjlrrzls5h0pl5adaxz96p";
-          name = "calmer-forest-theme";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -6684,20 +8168,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    camcorder = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, names }:
-    melpaBuild {
+    camcorder = callPackage ({ cl-lib ? null
+                             , emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild
+                             , names }:
+      melpaBuild {
         pname = "camcorder";
         version = "20160404.2134";
         src = fetchFromGitHub {
           owner = "Malabarba";
           repo = "camcorder.el";
-          rev = "b13d939990e6709492efefc0945798adc1c0fcb9";
-          sha256 = "0y8hw463w77rvf7cn5bqjnfww8h8kfkn37wi1kfjfq8hyirw4zrb";
+          rev = "c96b3392c99b9f83c968bffa330ec4356c41518e";
+          sha256 = "0am8asrzjs3iwak9c86fxb4zwgx5smbb9ywp0zn4y7j37blygswj";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/camcorder";
           sha256 = "1kbnpz3kn8ycpy8nlp8bsnnd1k1h7m02h7w5f7raw97sk4cnpvbi";
-          name = "camcorder";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs names ];
         meta = {
@@ -6705,20 +8195,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    caml = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    caml = callPackage ({ fetchFromGitHub
+                        , fetchurl
+                        , lib
+                        , melpaBuild }:
+      melpaBuild {
         pname = "caml";
         version = "20171209.1232";
         src = fetchFromGitHub {
           owner = "ocaml";
           repo = "ocaml";
-          rev = "fe9a5215948b3636161262b275eca8b98ff1967b";
-          sha256 = "1nkqrbx86j2mj0jsap12jfihpw5lnrsxy711qn4g8n3abng4lnza";
+          rev = "ca71bda2ac7e5143f58fa9a1693f97e709a91332";
+          sha256 = "1ksx2ym5s68m87rnjjkdwhp5ci6cfw0yhmjjmq1r4a0d0r77x4lr";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d5a3263cdcc229b11a3e96edbf632d56f32c47aa/recipes/caml";
           sha256 = "1ixs0626nsg1ilqdwj5rd8kicjy7mprswwy0kprppmpmc8y7xf7c";
-          name = "caml";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -6726,20 +8219,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    capture = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    capture = callPackage ({ fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "capture";
         version = "20130828.944";
         src = fetchFromGitHub {
           owner = "pashinin";
           repo = "capture.el";
-          rev = "1bb26060311da76767f70096218313fc93b0c806";
-          sha256 = "08cp45snhyir5w8gyp6xws1q7c54pz06q099l0m3zmwn9277g68z";
+          rev = "9140c207b48b3520a2f06674b3e1bee2fc92b80c";
+          sha256 = "1fqqiari3r2dib65gc1jayhj5rca249g1ll9lxdcc7mfifjc4pqk";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bdfe43be6c5f77845e82745534a1b1a9eb190466/recipes/capture";
           sha256 = "1hxrvyq8my5886q7wj5w3mhyja7d6cf19gyclap492ci7kmrkdk2";
-          name = "capture";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -6747,29 +8243,65 @@
           license = lib.licenses.free;
         };
       }) {};
-    cargo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, rust-mode }:
-    melpaBuild {
+    carbon-now-sh = callPackage ({ dash
+                                 , emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
+        pname = "carbon-now-sh";
+        version = "20180331.1035";
+        src = fetchFromGitHub {
+          owner = "veelenga";
+          repo = "carbon-now-sh.el";
+          rev = "b5f1e5487301b230078f3ab8032e19969d738aea";
+          sha256 = "1x987rvbz56ppjys7xbkzkn53cdjzxay3nkvr9w555kc24qsg2qf";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/b79bb8af3c149b2d131813c5308141e0e06adccf/recipes/carbon-now-sh";
+          sha256 = "1casq1b71rlwanayixs6rrn96jn1w7bzkq77lg0ini5hrfd3w18p";
+          name = "recipe";
+        };
+        packageRequires = [ dash emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/carbon-now-sh";
+          license = lib.licenses.free;
+        };
+      }) {};
+    cargo = callPackage ({ emacs
+                         , fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , markdown-mode
+                         , melpaBuild
+                         , rust-mode }:
+      melpaBuild {
         pname = "cargo";
-        version = "20171218.855";
+        version = "20180521.408";
         src = fetchFromGitHub {
           owner = "kwrooijen";
           repo = "cargo.el";
-          rev = "ba652e464ccdd0860fbc5d932c2ae86c9a31a200";
-          sha256 = "1wyk40c61hlkmx3v82hn89chvrx7fyyyc1j2wlhizi7x5cv3c497";
+          rev = "10093586bdac7252e65e11851f26da8ba4720608";
+          sha256 = "03imznfy9ry2n83hj3qgw8m0030w66z6789raxywv394274pxm4c";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e997b356b009b3d2ab467fe49b79d728a8cfe24b/recipes/cargo";
           sha256 = "06zq657cxfk5l4867qqsvhskcqc9wswyl030wj27a43idj8n41jx";
-          name = "cargo";
+          name = "recipe";
         };
-        packageRequires = [ emacs rust-mode ];
+        packageRequires = [ emacs markdown-mode rust-mode ];
         meta = {
           homepage = "https://melpa.org/#/cargo";
           license = lib.licenses.free;
         };
       }) {};
-    caroline-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    caroline-theme = callPackage ({ emacs
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "caroline-theme";
         version = "20160317.2220";
         src = fetchFromGitHub {
@@ -6778,10 +8310,10 @@
           rev = "222fd483db304509f9e422dc82883d808e023ceb";
           sha256 = "055w1spba0q9rqqg4rjds0iakr9d8xg66959xahxq8268mq5446n";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/caroline-theme";
           sha256 = "178nxcz73lmvnjcr6x6as25d8m5knc21jpr66b4rg0rmlmhchkal";
-          name = "caroline-theme";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -6789,20 +8321,27 @@
           license = lib.licenses.free;
         };
       }) {};
-    caseformat = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    caseformat = callPackage ({ cl-lib ? null
+                              , dash
+                              , emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild
+                              , s }:
+      melpaBuild {
         pname = "caseformat";
         version = "20160115.815";
         src = fetchFromGitHub {
           owner = "HKey";
           repo = "caseformat";
-          rev = "92a31f6a7cae0b4e2af106cd6f2b0abe6c2d8921";
-          sha256 = "1cp9i69npvyn72fqv0w8q1hlkcawkhbah4jblc341ycxwxb48mkl";
+          rev = "e4961889309408b3425da9b69c16ddfadd17a674";
+          sha256 = "08bypv8dijzv05hml4lzzy0ynhsgkma9bspw8sq3zgz5q92gnvrk";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ba158fbeebcda6b6122b18c97ab8042b1c0a0bc0/recipes/caseformat";
           sha256 = "1qwyr74jbx4jpfcw8sccg47q1vdg094rr06m111gsz2yaj9m0gfk";
-          name = "caseformat";
+          name = "recipe";
         };
         packageRequires = [ cl-lib dash emacs s ];
         meta = {
@@ -6810,20 +8349,30 @@
           license = lib.licenses.free;
         };
       }) {};
-    cask = callPackage ({ cl-lib ? null, dash, epl, f, fetchFromGitHub, fetchurl, lib, melpaBuild, package-build, s, shut-up }:
-    melpaBuild {
+    cask = callPackage ({ cl-lib ? null
+                        , dash
+                        , epl
+                        , f
+                        , fetchFromGitHub
+                        , fetchurl
+                        , lib
+                        , melpaBuild
+                        , package-build
+                        , s
+                        , shut-up }:
+      melpaBuild {
         pname = "cask";
-        version = "20180119.1906";
+        version = "20180626.1249";
         src = fetchFromGitHub {
           owner = "cask";
           repo = "cask";
-          rev = "3cbb32d25ea5691e64bd150188643808846b3688";
-          sha256 = "1jxqy8sb2asyck6wp68lbczffpf6b3bg87r965nhxac7kgqhvq4d";
+          rev = "d731e96f40c34a0fd85db04977c9756d60bd221f";
+          sha256 = "045qixxkrvz48giwc83aykld78gmbckndy32prh8dl6ch7digh23";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b86c666ee9b0620390a250dddd42b17cbec2409f/recipes/cask";
           sha256 = "11nr6my3vlb1xiyai7qwii3nszda2mnkhkjlbh3d0699h0yw7dk5";
-          name = "cask";
+          name = "recipe";
         };
         packageRequires = [ cl-lib dash epl f package-build s shut-up ];
         meta = {
@@ -6831,20 +8380,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    cask-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    cask-mode = callPackage ({ emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "cask-mode";
         version = "20160410.749";
         src = fetchFromGitHub {
           owner = "Wilfred";
           repo = "cask-mode";
-          rev = "7c6719d3bb4fe552958634bd5a11abc56681f3a7";
-          sha256 = "0gywc2mzdzq3ny0jjffa3151vi7zb9i8ddy5d63x4yhicf5sxlh1";
+          rev = "c97755267b7215f02df7b0c16b4210c04aee6566";
+          sha256 = "162vvyycvv9pd93hsb8blbjqf22d40xinm5340b3vnsqgg33l4jl";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2d8bc1afaf69b4f29ba1bb0243c25574bc1197cc/recipes/cask-mode";
           sha256 = "0fs9zyihipr3klnh3w22h43qz0wnxplm62x4kx7pm1chq9bc9kz6";
-          name = "cask-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -6852,8 +8405,19 @@
           license = lib.licenses.free;
         };
       }) {};
-    cask-package-toolset = callPackage ({ ansi, cl-lib ? null, commander, dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s, shut-up }:
-    melpaBuild {
+    cask-package-toolset = callPackage ({ ansi
+                                        , cl-lib ? null
+                                        , commander
+                                        , dash
+                                        , emacs
+                                        , f
+                                        , fetchFromGitHub
+                                        , fetchurl
+                                        , lib
+                                        , melpaBuild
+                                        , s
+                                        , shut-up }:
+      melpaBuild {
         pname = "cask-package-toolset";
         version = "20170921.1556";
         src = fetchFromGitHub {
@@ -6862,10 +8426,10 @@
           rev = "2c74cd827e88c7f8360581a841e45f0b794510e7";
           sha256 = "1hk5q6p1j7cqg5srr3v21xfyy7aas4hfj1a66h21c2xvfjra3hxw";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ed71e45389626e700b93b29d5e2659b6706274d8/recipes/cask-package-toolset";
           sha256 = "13ix093c0a58rjqj7zfp3914xj3hvj276gb2d8zhvrx9vvs1345g";
-          name = "cask-package-toolset";
+          name = "recipe";
         };
         packageRequires = [ ansi cl-lib commander dash emacs f s shut-up ];
         meta = {
@@ -6873,20 +8437,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    caskxy = callPackage ({ fetchFromGitHub, fetchurl, lib, log4e, melpaBuild, yaxception }:
-    melpaBuild {
+    caskxy = callPackage ({ fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , log4e
+                          , melpaBuild
+                          , yaxception }:
+      melpaBuild {
         pname = "caskxy";
         version = "20140513.839";
         src = fetchFromGitHub {
           owner = "aki2o";
           repo = "caskxy";
-          rev = "dc18dcab7ed526070ab76de071c9c5272e6ac40e";
-          sha256 = "15sq5vrkhb7c5j6ny6wy4bkyl5pggch4l7zw46an29rzni3pffr3";
+          rev = "279f3ab79bd77fe69cb3148a79896b9bf118a9b3";
+          sha256 = "1j1lw5zifp7q1ykm6si0nzxfp7n3z2lzla2njkkxmc2s6m7w4x1a";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1d61aea505e4913879f68081497e85542e9fd786/recipes/caskxy";
           sha256 = "0x4s3c8m75zxsvqpgfc5xwll0489zzdnngmnq048z9gkgcd7pd2s";
-          name = "caskxy";
+          name = "recipe";
         };
         packageRequires = [ log4e yaxception ];
         meta = {
@@ -6894,19 +8463,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    catmacs = callPackage ({ emacs, fetchgit, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    catmacs = callPackage ({ emacs
+                           , fetchgit
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "catmacs";
         version = "20170826.457";
         src = fetchgit {
           url = "https://bitbucket.org/pymaximus/catmacs";
-          rev = "65d3e0563abe6ff9577202cf2278074d4130fbdd";
-          sha256 = "0954qck9j417c17niy28ccrhmsbjyh95z4dbqc5j4mib06j37587";
+          rev = "6ea9ee195661fe95355413856476c45dcc8e24e8";
+          sha256 = "057fqmpzhpslhcyvz4s7lp2v448fy7xicfk9kaw3fjhlrnkhi603";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e62e45ea234a574ed602f27c3c6bc240bcd4fa43/recipes/catmacs";
           sha256 = "0ym1szmq9ib75yiyy5jw647fcs7gg0d5dkskqc293pg81qf3im50";
-          name = "catmacs";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -6914,8 +8487,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    cbm = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    cbm = callPackage ({ cl-lib ? null
+                       , fetchFromGitHub
+                       , fetchurl
+                       , lib
+                       , melpaBuild }:
+      melpaBuild {
         pname = "cbm";
         version = "20171116.440";
         src = fetchFromGitHub {
@@ -6924,10 +8501,10 @@
           rev = "5b41c936ba9f6d170309a85ffebc9939c1050b31";
           sha256 = "091ln3d0jhdgahbwfdm1042b19886n3kwipw5gk8d0jnq5vwrkws";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f28dbc97dc23cdb0b4c74f8805775c787635871e/recipes/cbm";
           sha256 = "02ch0gdw610c8dfxxjxs7ijsc9lzbhklj7hqgwfwksnyc36zcjmn";
-          name = "cbm";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -6935,20 +8512,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    ccc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ccc = callPackage ({ fetchFromGitHub
+                       , fetchurl
+                       , lib
+                       , melpaBuild }:
+      melpaBuild {
         pname = "ccc";
         version = "20151205.543";
         src = fetchFromGitHub {
           owner = "skk-dev";
           repo = "ddskk";
-          rev = "16d156562aef72f02ced58087335ed72d520d878";
-          sha256 = "0rz49i2yqs1yalqqnwgk2zvsga6qav4hc2dhf8p2kfkzrcbpzgxx";
+          rev = "e18c04d63712a5b40853bee3ca3f1bde8ba5bdba";
+          sha256 = "17grxms81xb00bhg8j2yzc3j74njakgv4r80w0vj8fp1357j12xd";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7375cab750a67ede1a021b6a4371b678a7b991b0/recipes/ccc";
           sha256 = "0fckhmz4svcg059v4acbn13yf3ijs09fxmq1axc1b9bm3xxig2cq";
-          name = "ccc";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -6956,8 +8536,38 @@
           license = lib.licenses.free;
         };
       }) {};
-    cd-compile = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ccls = callPackage ({ dash
+                        , emacs
+                        , fetchFromGitHub
+                        , fetchurl
+                        , lib
+                        , lsp-mode
+                        , melpaBuild }:
+      melpaBuild {
+        pname = "ccls";
+        version = "20180708.2207";
+        src = fetchFromGitHub {
+          owner = "MaskRay";
+          repo = "emacs-ccls";
+          rev = "4c8f377f7aa957a33a0097dc212e765246f799db";
+          sha256 = "09gll0c1jy0ljv2jb7qmpgyh0n4jdm4xhj10lcny0xx32nyfa86y";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/be27a4022d58860917a659fce2b7d7791fbea4e2/recipes/ccls";
+          sha256 = "0kiv0n6pdpa75wjcimpwccwbjbhga4gjnphjrkpj4qz5qv42rbnm";
+          name = "recipe";
+        };
+        packageRequires = [ dash emacs lsp-mode ];
+        meta = {
+          homepage = "https://melpa.org/#/ccls";
+          license = lib.licenses.free;
+        };
+      }) {};
+    cd-compile = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "cd-compile";
         version = "20141108.1157";
         src = fetchFromGitHub {
@@ -6966,10 +8576,10 @@
           rev = "10284ccae86afda4a37b09ba90acd1e2efedec9f";
           sha256 = "1a93cim1w96aaj81clhjv25r7v9bwqm9a818mn8lk4aj1bmhgc4c";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bca4c9e8b071497ac50a85741bf46be6eaae2135/recipes/cd-compile";
           sha256 = "1a24rv1jbb883vwhjkw6qxv3h3qy039iqkhkx3jkq1ydidr9f0hv";
-          name = "cd-compile";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -6977,20 +8587,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    cdb = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    cdb = callPackage ({ fetchFromGitHub
+                       , fetchurl
+                       , lib
+                       , melpaBuild }:
+      melpaBuild {
         pname = "cdb";
         version = "20151205.543";
         src = fetchFromGitHub {
           owner = "skk-dev";
           repo = "ddskk";
-          rev = "16d156562aef72f02ced58087335ed72d520d878";
-          sha256 = "0rz49i2yqs1yalqqnwgk2zvsga6qav4hc2dhf8p2kfkzrcbpzgxx";
+          rev = "e18c04d63712a5b40853bee3ca3f1bde8ba5bdba";
+          sha256 = "17grxms81xb00bhg8j2yzc3j74njakgv4r80w0vj8fp1357j12xd";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b48fe069ecd95ea0f9768ecad969e0838344e45d/recipes/cdb";
           sha256 = "1gx34062h25gqsl3j1fjlklha19snvmfaw068q6bv6x9r92niqnf";
-          name = "cdb";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -6998,20 +8611,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    cdlatex = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    cdlatex = callPackage ({ fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "cdlatex";
         version = "20140707.426";
         src = fetchFromGitHub {
           owner = "cdominik";
           repo = "cdlatex";
-          rev = "ff534912b93fc2c7a6b191b1c8d6d699a46bbb01";
-          sha256 = "1pvlq98qll44g1ag8w5rkbppk1b8l8inkwn5qzrlsjr8pngyhljz";
+          rev = "1d491c2dddb05cdace1ae0e1f56a36009b065d85";
+          sha256 = "1jj9vmhc4s3ych08bjm1c2xwi81z1p20rj7bvxrgvb5aga2ghi9d";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/cdlatex";
           sha256 = "021gj0jw93r8gk0cacw1ldfibpwr6fpkcrnign7b4nqqnb3135k9";
-          name = "cdlatex";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -7019,8 +8635,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    cdnjs = callPackage ({ dash, deferred, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }:
-    melpaBuild {
+    cdnjs = callPackage ({ dash
+                         , deferred
+                         , f
+                         , fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild
+                         , pkg-info }:
+      melpaBuild {
         pname = "cdnjs";
         version = "20161031.822";
         src = fetchFromGitHub {
@@ -7029,10 +8652,10 @@
           rev = "ce19880d3ec3d81e6c665d0b1dfea99cc7a3f908";
           sha256 = "02j45ngddx7n5gvy42r8y3s22bmxlnvg2pqjfh0li8m599fnd11h";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/66e4ce4e2c7e4aaac9dc0ce476c4759b000ff5d6/recipes/cdnjs";
           sha256 = "1clm86n643z1prxrlxlg59jg43l9wwm34x5d88bj6yvix8g6wkb7";
-          name = "cdnjs";
+          name = "recipe";
         };
         packageRequires = [ dash deferred f pkg-info ];
         meta = {
@@ -7040,8 +8663,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    cedit = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    cedit = callPackage ({ fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "cedit";
         version = "20141231.814";
         src = fetchFromGitHub {
@@ -7050,10 +8676,10 @@
           rev = "0878d851b6307c162bfbddd2bb02789e5e27bc2c";
           sha256 = "1f8gdj3p54q3410c66716y3l7i7nnkmq6hqz0dg1a1sc6jwdij3v";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0de4796054f0c616849904bacf05c74c7d2cdcf6/recipes/cedit";
           sha256 = "169sy7a1bgczwfxkkzjiggb7vdjxhrx7i3a39g6zv9f1zs6byk6m";
-          name = "cedit";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -7061,20 +8687,27 @@
           license = lib.licenses.free;
         };
       }) {};
-    celery = callPackage ({ dash-functional, deferred, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    celery = callPackage ({ dash-functional
+                          , deferred
+                          , emacs
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild
+                          , s }:
+      melpaBuild {
         pname = "celery";
         version = "20170225.124";
         src = fetchFromGitHub {
           owner = "ardumont";
           repo = "emacs-celery";
-          rev = "51197d74f5eaa8ae09144af7663a2f4277f07d16";
-          sha256 = "1845qz0ih30z1jgm1zi11q4gvw9gy6w3vyj2mc1aiv5r170qj8as";
+          rev = "b3378dd81e5a717432123fb13d70201da5dc841a";
+          sha256 = "0xm9dhcw7p60rckq9i4aqpv050n2244yi8w5rvqlqb2i4pnkb0fh";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4b896b2b89d990a7ce2f4bf4ce0aee0d126f3e55/recipes/celery";
           sha256 = "0m3hmvp6xz2m7z1kbb0ii0j3c95zi19652gfixq5a5x23kz8y59h";
-          name = "celery";
+          name = "recipe";
         };
         packageRequires = [ dash-functional deferred emacs s ];
         meta = {
@@ -7082,20 +8715,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    celestial-mode-line = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    celestial-mode-line = callPackage ({ emacs
+                                       , fetchFromGitHub
+                                       , fetchurl
+                                       , lib
+                                       , melpaBuild }:
+      melpaBuild {
         pname = "celestial-mode-line";
-        version = "20171210.1045";
+        version = "20180518.122";
         src = fetchFromGitHub {
           owner = "ecraven";
           repo = "celestial-mode-line";
-          rev = "018b5eb215be58fbae971d9013599966eaa569dc";
-          sha256 = "0d92k706qhv1bz11wvnkb5iaanxf2wraxwgzkx8kijpxl771zdqj";
+          rev = "3f5794aca99b977f1592cf1ab4516ae7922196a1";
+          sha256 = "01kdpfjnfnjll40n1zdp641gw8pk2vnv93a59lyx1mw1f30yvfr6";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cdb1d057f76166ba32d5028f18eec7d09857f990/recipes/celestial-mode-line";
           sha256 = "1s6vn71mxfvvafjs25j12z1gnmxnkvnw716zy5ifx1bs8s5960kq";
-          name = "celestial-mode-line";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -7103,20 +8740,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    centered-cursor-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    centered-cursor-mode = callPackage ({ fetchFromGitHub
+                                        , fetchurl
+                                        , lib
+                                        , melpaBuild }:
+      melpaBuild {
         pname = "centered-cursor-mode";
         version = "20180112.755";
         src = fetchFromGitHub {
           owner = "andre-r";
           repo = "centered-cursor-mode.el";
-          rev = "00fb47d227f9e211ec1c58161a501a1550c3a60d";
-          sha256 = "0yd78k28dp139a889q5nh8fdbc59jl227anasg5695bz8bkzavd1";
+          rev = "319636448ffb7dba5fade3b2599ed9c1fd3bf8c8";
+          sha256 = "1fib5db8rjyjrr86nw1jvf30pz2zva0v21khyz7fkh2nkf8b3a7i";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9a7a28caba49a20413dec3c3d0cc9c36b859834d/recipes/centered-cursor-mode";
           sha256 = "1yy50p3xprkqiak3vfly5s5kpbbdmxmw6fhgz13fw97553hr3w5x";
-          name = "centered-cursor-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -7124,20 +8764,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    centered-window = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    centered-window = callPackage ({ emacs
+                                   , fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "centered-window";
         version = "20171127.149";
         src = fetchFromGitHub {
           owner = "anler";
           repo = "centered-window-mode";
-          rev = "24f7c5be9def20879f46659082d497e67b55d7af";
-          sha256 = "0387x0z2l0yvbhkvh3rf3h2ddk7bvwgkpvpngwhhsjbc4hh4k3hz";
+          rev = "1234a364c9fa3a54087884ced2a7357b93fbb5d7";
+          sha256 = "1z3zi6zy1z68g4sfiv21l998n04hbbqp660khind6ap8yjjn8ik8";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/58bfd795d4d620f0c83384fb03008e129c71dc09/recipes/centered-window";
           sha256 = "0w6na4ld79bpmkiv6glbrphc32v6g2rcrpi28259i94jhgy1kxqk";
-          name = "centered-window";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -7145,8 +8789,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    centimacro = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    centimacro = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "centimacro";
         version = "20140306.627";
         src = fetchFromGitHub {
@@ -7155,10 +8802,10 @@
           rev = "1b97a9b558ed9c49d5da1bfbf29b2506575c2742";
           sha256 = "0zqrpaq9c3lm12jxnvysh8f3m3193k22zaj0ycscdqd1jpq4wcgh";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/de048d6e5d11a42d92de1938fd74fd37146a5a89/recipes/centimacro";
           sha256 = "1qbyfi6s4hdp5sv394w3sib8g2kx06i06q8gh6hdv5pis5kq9fx6";
-          name = "centimacro";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -7166,20 +8813,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    cerbere = callPackage ({ f, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, s }:
-    melpaBuild {
+    cerbere = callPackage ({ f
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild
+                           , pkg-info
+                           , s }:
+      melpaBuild {
         pname = "cerbere";
         version = "20140418.715";
         src = fetchFromGitHub {
           owner = "nlamirault";
           repo = "cerbere";
-          rev = "dd2105c372b469954e665a5aa0c3766b4922ce6a";
-          sha256 = "0i8939rycyq7baa043ksdv90mg3ik2amgkjf6iv4cx9r6c1xkzwx";
+          rev = "ef573b05f4c2a067b8234003aaa4b2a76fffea5c";
+          sha256 = "17jg5d5afh9zpnjx8wkys8bjllxq99j0yhz8j3fvkskisvhkz1im";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4145e270a2113f30f8bb4d0f6c335f1c76f77b1c/recipes/cerbere";
           sha256 = "1g3svmh5dlh5mvyag3hmiy90dfkk6f7ppd9qpwckxqyll9vl7r06";
-          name = "cerbere";
+          name = "recipe";
         };
         packageRequires = [ f pkg-info s ];
         meta = {
@@ -7187,20 +8840,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    ceylon-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ceylon-mode = callPackage ({ emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "ceylon-mode";
-        version = "20170806.919";
+        version = "20180606.624";
         src = fetchFromGitHub {
           owner = "lucaswerkmeister";
           repo = "ceylon-mode";
-          rev = "1267447a38648502627005bfad0a3aef3572ef7d";
-          sha256 = "1qj0dxfwh4yn9q01j22nq3ssg8l0s9v437l685gfly3ac5fp83ry";
+          rev = "948515672bc596dc118e8e3ede3ede5ec6a3c95a";
+          sha256 = "1a9f9h5kywfy8c2kmaxc9vf5zcykbhghpi3ra2l3z5hm0knq54ay";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/09cd1a2ccf33b209a470780a66d54e1b1d597a86/recipes/ceylon-mode";
           sha256 = "0dgqmmb8qmvzn557h0fw1mx4y0p96870l8f8glizkk3fifg7wgq4";
-          name = "ceylon-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -7208,20 +8865,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    cfengine-code-style = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    cfengine-code-style = callPackage ({ fetchFromGitHub
+                                       , fetchurl
+                                       , lib
+                                       , melpaBuild }:
+      melpaBuild {
         pname = "cfengine-code-style";
         version = "20171115.1308";
         src = fetchFromGitHub {
           owner = "cfengine";
           repo = "core";
-          rev = "bb460ccf2348873b7a84e99930feb038d0f9a95b";
-          sha256 = "1wgf2lpcpplxdabz0xbzq9j5va5zhxl22ns63d4jj7v86a77cg2y";
+          rev = "10e43677e99a29d8072bb120e7cd7b9d03b1218f";
+          sha256 = "0mncl7wb2vi620snk4z01k0wdbvvd5b2nw9nlnfr9a4hkn3fg44r";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c737839aeda583e61257ad40157e24df7f918b0f/recipes/cfengine-code-style";
           sha256 = "1ny8xvdnz740qmw9m81xnwd0gh0a516arpvl3nfimglaai5bfc9a";
-          name = "cfengine-code-style";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -7229,8 +8889,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    cff = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    cff = callPackage ({ cl-lib ? null
+                       , emacs
+                       , fetchFromGitHub
+                       , fetchurl
+                       , lib
+                       , melpaBuild }:
+      melpaBuild {
         pname = "cff";
         version = "20160118.1218";
         src = fetchFromGitHub {
@@ -7239,10 +8904,10 @@
           rev = "b6ab2a28e64ef06f281ec74cfe3114e450644dfa";
           sha256 = "019vqjmq6hb2f5lddqy0ya5q0fd47xix29cashlchz0r034rc32r";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c4e056132be11481aa26e89d5af1cd03925f92d1/recipes/cff";
           sha256 = "04b2ck1jkhsrka6dbyn6rpsmmc2bn13kpyhzibd781hj73d93jgc";
-          name = "cff";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -7250,8 +8915,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    cfml-mode = callPackage ({ cftag-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, mmm-mode }:
-    melpaBuild {
+    cfml-mode = callPackage ({ cftag-mode
+                             , emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild
+                             , mmm-mode }:
+      melpaBuild {
         pname = "cfml-mode";
         version = "20170903.1949";
         src = fetchFromGitHub {
@@ -7260,10 +8931,10 @@
           rev = "86e77dcbb583191a3e755bdc29534f33d82bfc56";
           sha256 = "0b0261ap0jiys9d0x31xg7x36kpq06fni2c0cjhi58wpcykq3s1p";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0d28507e1109195004a371fa201d914b995c2b4e/recipes/cfml-mode";
           sha256 = "0q88lxhkzzab4jjihk0livdpn6lsmd8l2s4brcbl8402m285sylp";
-          name = "cfml-mode";
+          name = "recipe";
         };
         packageRequires = [ cftag-mode emacs mmm-mode ];
         meta = {
@@ -7271,20 +8942,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    cframe = callPackage ({ buffer-manage, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    cframe = callPackage ({ buffer-manage
+                          , dash
+                          , emacs
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "cframe";
         version = "20170917.1509";
         src = fetchFromGitHub {
           owner = "plandes";
           repo = "cframe";
-          rev = "bb99672502046e87c8f029ce98c637f762a4fc54";
-          sha256 = "088px3wlvr4km913y7hajrjqnxnv6n325rk6353bkbah2d75vxq4";
+          rev = "61844d948e4464625f7023de62aeb27ca742b36f";
+          sha256 = "1v413kvygfkdiqi9zg6ypihf2vcks0vs80qshg0ynm5zy27f984y";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6e39555b2538cc8a955766c5533871396e8fe712/recipes/cframe";
           sha256 = "0pngdaflk1pk2xmwbij4b520b3mlacnjab4r3jby0phah44ziv4l";
-          name = "cframe";
+          name = "recipe";
         };
         packageRequires = [ buffer-manage dash emacs ];
         meta = {
@@ -7292,20 +8969,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    cftag-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    cftag-mode = callPackage ({ emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "cftag-mode";
         version = "20170811.2240";
         src = fetchFromGitHub {
           owner = "am2605";
           repo = "cfml-mode";
-          rev = "86e77dcbb583191a3e755bdc29534f33d82bfc56";
-          sha256 = "0b0261ap0jiys9d0x31xg7x36kpq06fni2c0cjhi58wpcykq3s1p";
+          rev = "395c5a9422f7bda619fd67875a8a2173aaf9c807";
+          sha256 = "1q0hy0baf8vcnnbanpl3za4q5ykxm33fyq2n863jp9v6b6wbc71d";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0914d33ebf58847fa3906b1f0d53e97ac335b334/recipes/cftag-mode";
           sha256 = "0qnq8h5nwhw464ax8qpbsvflpaar44zw0mh2y7kc358v27n3qy6c";
-          name = "cftag-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -7313,8 +8994,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    cg = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    cg = callPackage ({ fetchFromGitHub
+                      , fetchurl
+                      , lib
+                      , melpaBuild }:
+      melpaBuild {
         pname = "cg";
         version = "20171123.301";
         src = fetchFromGitHub {
@@ -7323,10 +9007,10 @@
           rev = "e19f3bf60b9c8dbcff053b008fa3ace17fc073fe";
           sha256 = "13j7x6ngjga2idixw02llmykzsrihsxnfdj5jkx5sdkvrmqymmfz";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/30de78c9cf83de30093a5647976eeaf552d4b2cb/recipes/cg";
           sha256 = "0yl2w48953vym4gxcxvjfaq3jgsv5jlya9vq3iwlfxqpapd3r3k9";
-          name = "cg";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -7334,20 +9018,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    challenger-deep-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    challenger-deep-theme = callPackage ({ emacs
+                                         , fetchFromGitHub
+                                         , fetchurl
+                                         , lib
+                                         , melpaBuild }:
+      melpaBuild {
         pname = "challenger-deep-theme";
-        version = "20180223.644";
+        version = "20180525.918";
         src = fetchFromGitHub {
           owner = "MaxSt";
           repo = "challenger-deep";
-          rev = "8194c3ade7ba73f6ddfea7dec55f77b5b6fdbcab";
-          sha256 = "0rsx9gqkxxkk597liyghw0sjrvmfid4j1kbmz5ff8irm259g7psy";
+          rev = "62d05f01c3dc4653f46527448b3b2058daba86c0";
+          sha256 = "019n14m1nfiw2xshsmkiszmj7qc5dyd949xj3bfcxrj6a2prsgqw";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7942f539d025c1e2b059d49e1984716cbbc90a67/recipes/challenger-deep-theme";
           sha256 = "1apjc32wy7h7fadxckdbfa6wzd360c7v6dig9gikjbsxm8xgdg60";
-          name = "challenger-deep-theme";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -7355,8 +9043,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    change-inner = callPackage ({ expand-region, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    change-inner = callPackage ({ expand-region
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "change-inner";
         version = "20150707.844";
         src = fetchFromGitHub {
@@ -7365,10 +9057,10 @@
           rev = "52c543a4b9808c0d15b565fcdf646c9779de33e8";
           sha256 = "1m9sq93bwajbld3lnlzkjbsby5zlm9sxjzqynryyvsb9zr1d0a9z";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/change-inner";
           sha256 = "09y076vhhvp21jsvw9f5z4yk6cnmmjavg7600flxg5g27ydgix57";
-          name = "change-inner";
+          name = "recipe";
         };
         packageRequires = [ expand-region ];
         meta = {
@@ -7376,20 +9068,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    chapel-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    chapel-mode = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "chapel-mode";
         version = "20160504.108";
         src = fetchFromGitHub {
           owner = "russel";
           repo = "Emacs-Chapel-Mode";
-          rev = "6e095edd7639f5f0a81e14d6412410b49466697e";
-          sha256 = "0r3yja2ak3z62lav2s8vimmjyi4rd5s82fbs8r6p2k0shm6lj7hz";
+          rev = "816a1a54ff5ffdd20b6a4d249ace774740a3924c";
+          sha256 = "0kp18xlc1005hbkfhng03y4xgaicqf6b5vwgnwbbw9s5qzirmhix";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ff32db72ad55a7191b5105192480e17535c7edde/recipes/chapel-mode";
           sha256 = "0hmnsv8xf85fc4jqkaqz5j3sf56hgib4jp530vvyc2dl2sps6vzz";
-          name = "chapel-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -7397,20 +9092,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    char-menu = callPackage ({ avy-menu, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    char-menu = callPackage ({ avy-menu
+                             , emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "char-menu";
         version = "20171231.2218";
         src = fetchFromGitHub {
           owner = "mrkkrp";
           repo = "char-menu";
-          rev = "82f0422179737bcb9f93481aebaf1071d54fc859";
-          sha256 = "1r5nymx7yj4l4wjhsx6gxvh9rqx322x5n54cqg71mssxiwccpdv3";
+          rev = "3235f8e3c88848ce10d25f84a5da39061fd35c0d";
+          sha256 = "05pjfj6g4gdbdj4z63283j5qzkvhvrzsx1jhbc5iih0nsffwapc3";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f6676747e853045b3b19e7fc9524c793c6a08303/recipes/char-menu";
           sha256 = "11jkwghrmmvpv7piznkpa0wilwjdsps9rix3950pfabhlllw268l";
-          name = "char-menu";
+          name = "recipe";
         };
         packageRequires = [ avy-menu emacs ];
         meta = {
@@ -7418,20 +9118,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    charmap = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    charmap = callPackage ({ fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "charmap";
         version = "20160309.146";
         src = fetchFromGitHub {
           owner = "lateau";
           repo = "charmap";
-          rev = "bd4b3e466d7a9433cf35167e3a68ec74fe631bb2";
-          sha256 = "0vqsfk83lg3gvcv62jsgxxwz7icpkpswgg30hmcq0qfg0dfwwcl9";
+          rev = "e0477f08c56c93c420e01452bba64b0da732f309";
+          sha256 = "05k19q7iihvhi0gflmkpsg5q3ydkdlvf0xh7kjk4lx9yvi0am7m2";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/11c549fca81c4276054f614d86d17fa7af4ab32e/recipes/charmap";
           sha256 = "1j7762d2i17ysn9ys8j7wfv989avmax8iylml2hc26mwbpyfpm84";
-          name = "charmap";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -7439,8 +9142,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    chatwork = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    chatwork = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "chatwork";
         version = "20170510.2142";
         src = fetchFromGitHub {
@@ -7449,10 +9155,10 @@
           rev = "fea231d479f06bf40dbfcf45de143eecc9ed744c";
           sha256 = "163xr18lm4awfgh4lcp7pr04jirpvlk8w1g4445zbxbpjfvv268z";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/77ae72e62b8771e890525c063522e7091ca8f674/recipes/chatwork";
           sha256 = "0p71swcpfqbx2zmp5nh57f0m30cn68g3019005wa5x4fg7dx746p";
-          name = "chatwork";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -7460,8 +9166,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    cheat-sh = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    cheat-sh = callPackage ({ emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "cheat-sh";
         version = "20170802.418";
         src = fetchFromGitHub {
@@ -7470,10 +9180,10 @@
           rev = "e90445124f3f145a047779e42d070a3c5e150f70";
           sha256 = "06avap8w833syhz7pdpsm73nbsgbwzmpagd7f3khzaf6r6c90jmn";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ebac62fb3828d81e30145b9948d60e781e20eda2/recipes/cheat-sh";
           sha256 = "0f6wqyh3c3ap0l6khikqlw8sqqi6fsl468gn157faza4x63j9z80";
-          name = "cheat-sh";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -7481,8 +9191,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    cheatsheet = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    cheatsheet = callPackage ({ cl-lib ? null
+                              , emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "cheatsheet";
         version = "20170126.1350";
         src = fetchFromGitHub {
@@ -7491,10 +9206,10 @@
           rev = "e4f8e0110167ea16a17a74517d1f10cb7ff805b8";
           sha256 = "1vy2qmx9872hfrfcycpsmy0si481rwv4q4gwiy8f2w04zb92szbn";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0d2cd657fcadb2dd3fd12864fe94a3465f8c9bd7/recipes/cheatsheet";
           sha256 = "11z3svlzvmhdy0pkxbx9qz9bnq056cgkbfyw9z34aq1yxazi2cpq";
-          name = "cheatsheet";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -7502,20 +9217,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    checkbox = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    checkbox = callPackage ({ cl-lib ? null
+                            , emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "checkbox";
         version = "20141116.1658";
         src = fetchFromGitHub {
           owner = "camdez";
           repo = "checkbox.el";
-          rev = "335afa4404adf72973195a580458927004664d98";
-          sha256 = "0660ix17ksxy5a5v8yqy7adr9d4bs6p1mnkc6lpyw96k4pn62h45";
+          rev = "2afc2011fa35ccfa0ce9ef46cb1896911fa340d1";
+          sha256 = "09ypxhfad3v1pz0xhw4xgxvfj7ad2kb3ff9zy1mnw7fzsa7gw6nj";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/81c4a9d10238836865716f5ea45f8e0e625a87c6/recipes/checkbox";
           sha256 = "17gw6w1m6bs3sfx8nqa8nzdq26m8w85a0fca5qw3bmd18bcmknqa";
-          name = "checkbox";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -7523,8 +9243,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    chee = callPackage ({ dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    chee = callPackage ({ dash
+                        , f
+                        , fetchFromGitHub
+                        , fetchurl
+                        , lib
+                        , melpaBuild
+                        , s }:
+      melpaBuild {
         pname = "chee";
         version = "20171123.1433";
         src = fetchFromGitHub {
@@ -7533,10 +9259,10 @@
           rev = "669ff9ee429f24c3c2d03b83d9cb9aec5f86bb8b";
           sha256 = "1k64mjzqmjirsld40dvmpq4llpb7ggx80r1hvsjqazc4mr16pbri";
         };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/9f4a3775720924e5a292819511a8ea42efe1a7dc/recipes/chee";
-          sha256 = "1njldlp9bnwq7izmdlz5a97kfgxxnycv43djrvx4b01j4v2yz4zv";
-          name = "chee";
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/25b445a1dea5e8f1042bed6b5372471c25129fd8/recipes/chee";
+          sha256 = "1sw84qaca2cwgrw332wfqjp3kg3axgi9n6wx5a6h2n3liq5yr1wj";
+          name = "recipe";
         };
         packageRequires = [ dash f s ];
         meta = {
@@ -7544,8 +9270,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    cheerilee = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, xelb }:
-    melpaBuild {
+    cheerilee = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild
+                             , xelb }:
+      melpaBuild {
         pname = "cheerilee";
         version = "20160313.1135";
         src = fetchFromGitHub {
@@ -7554,10 +9284,10 @@
           rev = "41bd81b5b0bb657241ceda5be6af5e07254d7376";
           sha256 = "1jdlp5cnsiza55vx4kxacqgk7yqg9fvd9swhwdxkczadb2d5l9p1";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/da435df8d78b7c8d4834e00e35c69248a7043c0a/recipes/cheerilee";
           sha256 = "15igjlnq35cg9nslyqa63i1inqipx3y8g7zg4r26m69k25simqrv";
-          name = "cheerilee";
+          name = "recipe";
         };
         packageRequires = [ xelb ];
         meta = {
@@ -7565,20 +9295,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    chef-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    chef-mode = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "chef-mode";
-        version = "20111121.700";
+        version = "20180628.753";
         src = fetchFromGitHub {
           owner = "mpasternacki";
           repo = "chef-mode";
-          rev = "c333dd3f9229c4f35fe8c4495b21049ba730cc42";
-          sha256 = "1mnskri5r1lyzzcag60x7amn00613jyl7by7hd4sqm2a7zd4r5aa";
+          rev = "048d691cb63981ae235763d4a6ced4af5c729924";
+          sha256 = "1niin51xwkd8q3wbwcgb0gyk3sw1829qj2p2zv7fm8ljy1jicn2d";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4044056af824d552a2852ef1f2e7166899f56d8c/recipes/chef-mode";
           sha256 = "1pz82s82d4z3vkm8mpmwdxb9pd11kq09g23mg461lzqxjjw734rr";
-          name = "chef-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -7586,20 +9319,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    cherry-blossom-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    cherry-blossom-theme = callPackage ({ emacs
+                                        , fetchFromGitHub
+                                        , fetchurl
+                                        , lib
+                                        , melpaBuild }:
+      melpaBuild {
         pname = "cherry-blossom-theme";
         version = "20150621.2042";
         src = fetchFromGitHub {
           owner = "inlinestyle";
           repo = "emacs-cherry-blossom-theme";
-          rev = "eea7653e00f35973857ee23b27bc2fae5e753e50";
-          sha256 = "0m97xr6lddy2jdmd4bl4kbp2568p4n110yfa9k7fqc20ihq8jkyd";
+          rev = "e5ea23694c0f20ab670c0aa87214c27f2232d922";
+          sha256 = "0gmbsiyh075gmv3cq9675wf6mpls5wlwgcavha31cdbsdb9frsk1";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/401ae22f11f7ee808eb696a4c1f869cd824702c0/recipes/cherry-blossom-theme";
           sha256 = "1i3kafj3m7iij5mr0vhg45zdnkl9pg9ndrq0b0i3k3mw7d5siq7w";
-          name = "cherry-blossom-theme";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -7607,8 +9344,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    chicken-scheme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    chicken-scheme = callPackage ({ fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "chicken-scheme";
         version = "20141116.1139";
         src = fetchFromGitHub {
@@ -7617,10 +9357,10 @@
           rev = "19b0b08b5592063e852cae094b394c7d1f923639";
           sha256 = "0j61lvr99viaharg4553whcppp7lxhimkk5lps0izz9mnd8y2wm5";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/03f4992471185bf41720ff6fc725fd5fa1291a41/recipes/chicken-scheme";
           sha256 = "0ns49p7nsifpi7wrzr02ljrr0p6hxanrg54zaixakvjkxwcgfabr";
-          name = "chicken-scheme";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -7628,8 +9368,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    chinese-conv = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    chinese-conv = callPackage ({ cl-lib ? null
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "chinese-conv";
         version = "20170807.1428";
         src = fetchFromGitHub {
@@ -7638,10 +9382,10 @@
           rev = "b56815bbb163d642e97fa73093b5a7e87cc32574";
           sha256 = "1bc3yn8y60y6a4vpqv39arn1pkcpl4s4n0sz9446f6m1lcal4c3r";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a798158829f8fd84dd3e5e3ec5987d98ff54e641/recipes/chinese-conv";
           sha256 = "1lqpq7pg0nqqqj29f8is6c724vl75wscmm1v08j480pfks3l8cnr";
-          name = "chinese-conv";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -7649,20 +9393,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    chinese-number = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    chinese-number = callPackage ({ fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "chinese-number";
         version = "20161007.2209";
         src = fetchFromGitHub {
           owner = "zhcosin";
           repo = "chinese-number";
-          rev = "7311c2a0c5eea5f016a90d733dfe75144c302fb2";
-          sha256 = "01i7nycjnx4cpfgwakj14jv9dwybjl5jnslcxic9pr1n77mz53wk";
+          rev = "1d0c440181848dfcd1d1e618b2650fb0562a32ac";
+          sha256 = "1zm0wjhqsb11szvxs2rnq63396cbi6ffynpbn07p6gk5agxzfy0j";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/chinese-number";
           sha256 = "01ia2l5vrg8fhaxcvk8pv9qfm08xs0fbyc9j57nbdk9wxnd9i45s";
-          name = "chinese-number";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -7670,8 +9417,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    chinese-wbim = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    chinese-wbim = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "chinese-wbim";
         version = "20150623.2050";
         src = fetchFromGitHub {
@@ -7680,10 +9430,10 @@
           rev = "57ff61ff3895d77335709d24b40cefc4d10b0095";
           sha256 = "0cx1g6drkr8gyqqdxjf7j4wprxcbq30gam2racgnvdicgij0apwg";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3b6b1d100ddf29d6936569d61bf4be19a24d002d/recipes/chinese-wbim";
           sha256 = "1pax3kpmvg170mpvfrjbpj9czq0xykmfbany2f7vbn96jb5xfmsb";
-          name = "chinese-wbim";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -7691,8 +9441,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    chinese-word-at-point = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    chinese-word-at-point = callPackage ({ cl-lib ? null
+                                         , fetchFromGitHub
+                                         , fetchurl
+                                         , lib
+                                         , melpaBuild }:
+      melpaBuild {
         pname = "chinese-word-at-point";
         version = "20170811.241";
         src = fetchFromGitHub {
@@ -7701,10 +9455,10 @@
           rev = "8223d7439e005555b86995a005b225ae042f0538";
           sha256 = "13gva1ld4f9wwb2m4fpk6bd9342qvvmaf5i1r3x3h84czmk0nq1r";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c9b7785eca577218feade982c979694389f37ec3/recipes/chinese-word-at-point";
           sha256 = "0pjs4ckncv84qrdj0pyibrbiy86f1gmjla9n2cgh10xbc7j9y0c4";
-          name = "chinese-word-at-point";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -7712,8 +9466,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    chinese-yasdcv = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, pyim }:
-    melpaBuild {
+    chinese-yasdcv = callPackage ({ cl-lib ? null
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild
+                                  , pyim }:
+      melpaBuild {
         pname = "chinese-yasdcv";
         version = "20171014.1844";
         src = fetchFromGitHub {
@@ -7722,10 +9481,10 @@
           rev = "5ab830daf1273d5a5cddcb94b56a9737f12d996f";
           sha256 = "1mv1n6m73aamxj18i851ww53q7p4ydiqgaapxyvjbm6sx8ddz9ak";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b6d727c30d2ec0f885a927a16a442fe220a740d5/recipes/chinese-yasdcv";
           sha256 = "1y2qywldf8b8b0km1lcf74p0w6rd8gr86qcj7ikwhhbvd19dfglm";
-          name = "chinese-yasdcv";
+          name = "recipe";
         };
         packageRequires = [ cl-lib pyim ];
         meta = {
@@ -7733,8 +9492,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    choice-program = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    choice-program = callPackage ({ cl-lib ? null
+                                  , emacs
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "choice-program";
         version = "20171004.931";
         src = fetchFromGitHub {
@@ -7743,10 +9507,10 @@
           rev = "27607ec1fe241c58fbc1f861454a8e2ec1fd7b15";
           sha256 = "0q8krgsydrc2xc29y60qljifdvxfmxnvbncxsh64xhrzsnrgwmq5";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6e39555b2538cc8a955766c5533871396e8fe712/recipes/choice-program";
           sha256 = "0a21yd3b8sb15vms9mclaa7xnnk0as08p6q38mwdwjp9sgcfyh1b";
-          name = "choice-program";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -7754,8 +9518,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    chronos = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    chronos = callPackage ({ fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "chronos";
         version = "20150602.829";
         src = fetchFromGitHub {
@@ -7764,10 +9531,10 @@
           rev = "b360d9dae57aa553cf2a14ffa0756a51ad71de09";
           sha256 = "1mqdz3rvx0jm80fgzw3s3lqn448kqrlrifdwcg36cqq4qmkpalq4";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/53648c5699fc03e50774270f9560c727e2c22873/recipes/chronos";
           sha256 = "1fwpll0mk6pc37qagbq3b3z32d2qwz993nxp9pjw4qbmlnq6sy9d";
-          name = "chronos";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -7775,8 +9542,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    chruby = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    chruby = callPackage ({ cl-lib ? null
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "chruby";
         version = "20180114.852";
         src = fetchFromGitHub {
@@ -7785,10 +9556,10 @@
           rev = "42bc6d521f832eca8e2ba210f30d03ad5529788f";
           sha256 = "06pvjw40qk017py9km26vjrh90acycnkr5r04nxf664qqkjlg2mc";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1989a3c6fa4cd7aaf6b0b202f197eb7db51936b9/recipes/chruby";
           sha256 = "0pk6vdvmifiq52n452lbrkklxa69c40bfyzra9qhrghxr2q5v3mk";
-          name = "chruby";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -7796,8 +9567,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    chyla-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    chyla-theme = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "chyla-theme";
         version = "20180302.858";
         src = fetchFromGitHub {
@@ -7806,10 +9580,10 @@
           rev = "ae5e7ecace2ab474151eb0ac5ef07fba2dc32f8a";
           sha256 = "1gqzwwr3fnhd9iqn7zmqpxgxvmrhq7g849ndjwizksk0bfj3b596";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5c55eebf8df165360ce1e5d18e484c90f296fe52/recipes/chyla-theme";
           sha256 = "1mgr6483bjjwk8bi6kijyw61s52nq6g2svhy5n1jnffi3gaw7hl5";
-          name = "chyla-theme";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -7817,29 +9591,52 @@
           license = lib.licenses.free;
         };
       }) {};
-    cider = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, queue, seq, spinner }:
-    melpaBuild {
+    cider = callPackage ({ clojure-mode
+                         , emacs
+                         , fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild
+                         , pkg-info
+                         , queue
+                         , seq
+                         , sesman
+                         , spinner }:
+      melpaBuild {
         pname = "cider";
-        version = "20180413.51";
+        version = "20180714.811";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "cider";
-          rev = "a01115242ba839465e16892383133c21c350d5bd";
-          sha256 = "1b0p7dnrcgnjma4yk6fc3v21sxaz772wrc780sd5faa833z8wg16";
+          rev = "34046a9549c4a83d47466263166367ec4a2d7007";
+          sha256 = "0z73ngbk8l7ypkhnr0nxl4bbkw80rcfanxckxnpsdcxk1469cldx";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/55a937aed818dbe41530037da315f705205f189b/recipes/cider";
           sha256 = "1a6hb728a3ir18c2dn9zfd3jn79fi5xjn5gqr7ljy6qb063xd4qx";
-          name = "cider";
+          name = "recipe";
         };
-        packageRequires = [ clojure-mode emacs pkg-info queue seq spinner ];
+        packageRequires = [
+          clojure-mode
+          emacs
+          pkg-info
+          queue
+          seq
+          sesman
+          spinner
+        ];
         meta = {
           homepage = "https://melpa.org/#/cider";
           license = lib.licenses.free;
         };
       }) {};
-    cider-decompile = callPackage ({ cider, fetchFromGitHub, fetchurl, javap-mode, lib, melpaBuild }:
-    melpaBuild {
+    cider-decompile = callPackage ({ cider
+                                   , fetchFromGitHub
+                                   , fetchurl
+                                   , javap-mode
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "cider-decompile";
         version = "20151121.2137";
         src = fetchFromGitHub {
@@ -7848,10 +9645,10 @@
           rev = "5d87035f3c3c14025e8f01c0c53d0ce2c8f56651";
           sha256 = "1w4y65s3m2irga4iqfqqkcmvl6ss24zmaxqzbfib8jmi84r4lpac";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0b7f7f23bb15922ce7a7dad1ae23093db72aa10c/recipes/cider-decompile";
           sha256 = "0jhsm31zcfwkbpsdh1lvmjm1fv2m7y849930sjvf5nxv3ffhx3b4";
-          name = "cider-decompile";
+          name = "recipe";
         };
         packageRequires = [ cider javap-mode ];
         meta = {
@@ -7859,20 +9656,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    cider-eval-sexp-fu = callPackage ({ emacs, eval-sexp-fu, fetchFromGitHub, fetchurl, highlight, lib, melpaBuild }:
-    melpaBuild {
+    cider-eval-sexp-fu = callPackage ({ emacs
+                                      , eval-sexp-fu
+                                      , fetchFromGitHub
+                                      , fetchurl
+                                      , highlight
+                                      , lib
+                                      , melpaBuild }:
+      melpaBuild {
         pname = "cider-eval-sexp-fu";
         version = "20160907.100";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "cider-eval-sexp-fu";
-          rev = "5687e7b33e17f2be40b036dac82da4a5bc6705fb";
-          sha256 = "0wyx51vggs76wj1gawwv1za6sa5gv1pj60vmc1ymzaw153ryhdq8";
+          rev = "06fefc17ea8a87997d1f18b25e78d874b10299ad";
+          sha256 = "1lhf5g5gi31pv2c80fsnw62zfikj3prbs6xwaikbywp48dzhx02y";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/947f4d106d70f95ca8aac124ab0d90b2975208df/recipes/cider-eval-sexp-fu";
           sha256 = "1n4sgv042qd9560pllabysx0c5snly6i22bk126y8f8rn0zj58iq";
-          name = "cider-eval-sexp-fu";
+          name = "recipe";
         };
         packageRequires = [ emacs eval-sexp-fu highlight ];
         meta = {
@@ -7880,8 +9683,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    cider-hydra = callPackage ({ cider, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild }:
-    melpaBuild {
+    cider-hydra = callPackage ({ cider
+                               , fetchFromGitHub
+                               , fetchurl
+                               , hydra
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "cider-hydra";
         version = "20161018.2254";
         src = fetchFromGitHub {
@@ -7890,10 +9698,10 @@
           rev = "6bb341143fe16f12be2262b2bcd003a246962676";
           sha256 = "094641g6rzm4y6k8ph1bbkfiwpp37wk1q9mcylbah01qlqd9c9qm";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/51d5e6471f88337c478ee5c189f037aaec937f56/recipes/cider-hydra";
           sha256 = "1qjgfrj3ck70vkyc9c00mif0jq5hc2yan2hql31qzbpqzg3pi2r7";
-          name = "cider-hydra";
+          name = "recipe";
         };
         packageRequires = [ cider hydra ];
         meta = {
@@ -7901,8 +9709,16 @@
           license = lib.licenses.free;
         };
       }) {};
-    cider-spy = callPackage ({ cider, cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, noflet }:
-    melpaBuild {
+    cider-spy = callPackage ({ cider
+                             , cl-lib ? null
+                             , dash
+                             , emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild
+                             , noflet }:
+      melpaBuild {
         pname = "cider-spy";
         version = "20160313.740";
         src = fetchFromGitHub {
@@ -7911,10 +9727,10 @@
           rev = "0224608d240e9900e588b6df049c2a87c24fc936";
           sha256 = "1x96f5wc916dcwb75a34b6x1mas20gdgy34c7rg59n91ydn1mfaf";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/cider-spy";
           sha256 = "086yxz90mgc5si9k4j15nkc51k0lfk1dx1kq3r3swhyw3cwn7vh3";
-          name = "cider-spy";
+          name = "recipe";
         };
         packageRequires = [ cider cl-lib dash emacs noflet ];
         meta = {
@@ -7922,8 +9738,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    ciel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ciel = callPackage ({ emacs
+                        , fetchFromGitHub
+                        , fetchurl
+                        , lib
+                        , melpaBuild }:
+      melpaBuild {
         pname = "ciel";
         version = "20170330.526";
         src = fetchFromGitHub {
@@ -7932,10 +9752,10 @@
           rev = "8c73f78d60ef52d3c395a9629963a63439b8a83e";
           sha256 = "1jaxqri8l7y1lqj830h5alxn37skjpb56j6ax8qf9926n8qz3arm";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9c70c007a557ea9fb9eb4d3f8b7adbe4dac39c8a/recipes/ciel";
           sha256 = "0rz7z3shhsvky91b581nn3hw760nlsc94fl35flm1973kvm9lvdp";
-          name = "ciel";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -7943,20 +9763,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    cil-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    cil-mode = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "cil-mode";
         version = "20160622.730";
         src = fetchFromGitHub {
           owner = "ForNeVeR";
           repo = "cil-mode";
-          rev = "a78a88ca9a66a82f069329a96e34b67478ae2d9b";
+          rev = "8023b45ec60961bf4c3a3d8a564727c463ed09d1";
           sha256 = "06p6hz6jrnvnlbxdr1pjgf5wh4n34kf6al4589qg1s88r2lf86bl";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ccbf4a7c9df3c85207c7160ee68ecc4ba4f3801a/recipes/cil-mode";
           sha256 = "1h18r086bqspyn5n252yzw8x2zgyaqzdd8pbcf5gqlh1w8kapq4y";
-          name = "cil-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -7964,8 +9787,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    cinspect = callPackage ({ cl-lib ? null, deferred, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, python-environment }:
-    melpaBuild {
+    cinspect = callPackage ({ cl-lib ? null
+                            , deferred
+                            , emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild
+                            , python-environment }:
+      melpaBuild {
         pname = "cinspect";
         version = "20150715.1933";
         src = fetchFromGitHub {
@@ -7974,10 +9804,10 @@
           rev = "4e199a90f89b335cccda1518aa0963e0a1d4fbab";
           sha256 = "190n4kdcqdwglhnawnj9mqjarmcaqylxipc07whmrii0jv279kjw";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1e5b5bdbfeb59ed8e98e50d0cc773d78c72d1699/recipes/cinspect";
           sha256 = "0djh61mrfgcm3767ll1l5apw6646j4fdcaripksrmvn5aqfn8rjj";
-          name = "cinspect";
+          name = "recipe";
         };
         packageRequires = [ cl-lib deferred emacs python-environment ];
         meta = {
@@ -7985,20 +9815,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    circadian = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    circadian = callPackage ({ emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "circadian";
-        version = "20180307.954";
+        version = "20180708.643";
         src = fetchFromGitHub {
           owner = "GuidoSchmidt";
           repo = "circadian.el";
-          rev = "26ffd83a5931bb3fb04f01cb780715a05c8dd33e";
-          sha256 = "0z8jkbycvia8ha1yv9v8zrcpqn0jqlb5myqx3qcvykn9yysmv2lq";
+          rev = "9894361dcd6ffb6d4629b4cbbabda2153699eb8e";
+          sha256 = "0wpsykmai3idz0bgfl07hwl9nr4x9sgprvqgw8jln4dz2wf5gdic";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3440905a20bc91bb2637a87c04ff8410379f150d/recipes/circadian";
           sha256 = "13797y1w1636bibisz5i5p2xp0smd3apnhc1nx8ijm75smx679id";
-          name = "circadian";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -8006,20 +9840,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    circe = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    circe = callPackage ({ cl-lib ? null
+                         , fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "circe";
-        version = "20180223.929";
+        version = "20180525.531";
         src = fetchFromGitHub {
           owner = "jorgenschaefer";
           repo = "circe";
-          rev = "9aaad726ea0b0cce4d911eec92ab8fd2a6455fe6";
-          sha256 = "1nyw9phrh1qpc7j6b8fkald18y3rldydb666r6ppphggly6lh4vd";
+          rev = "fedfa7eb8516a53fa70b6a1f4fce4b5ab66ea91f";
+          sha256 = "10gi14kwxd81blddpvqh95lgmpbfgp0m955naxix3bs3r6a75n4s";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a2b295656d53fddc76cacc86b239e5648e49e3a4/recipes/circe";
           sha256 = "1f54d8490gfx0r0cdvgmcjdxqpni43msy0k2mgqd1qz88a4b5l07";
-          name = "circe";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -8027,8 +9865,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    circe-notifications = callPackage ({ alert, circe, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    circe-notifications = callPackage ({ alert
+                                       , circe
+                                       , emacs
+                                       , fetchFromGitHub
+                                       , fetchurl
+                                       , lib
+                                       , melpaBuild }:
+      melpaBuild {
         pname = "circe-notifications";
         version = "20180102.1518";
         src = fetchFromGitHub {
@@ -8037,10 +9881,10 @@
           rev = "291149ac12877bbd062da993479d3533a26862b0";
           sha256 = "18mva5nn919c86sgk6kdh437vdnlh9bk7fg10xqcpics1yv3viaw";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/76c0408423c4e0728789de7b356b2971d6c446c7/recipes/circe-notifications";
           sha256 = "06y525x5yc0xgbw0cf16mc72ca9bv8j8z4gpgznbad2qp7psf53c";
-          name = "circe-notifications";
+          name = "recipe";
         };
         packageRequires = [ alert circe emacs ];
         meta = {
@@ -8048,29 +9892,42 @@
           license = lib.licenses.free;
         };
       }) {};
-    citeproc = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, queue, s, string-inflection }:
-    melpaBuild {
+    citeproc = callPackage ({ dash
+                            , emacs
+                            , f
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild
+                            , org
+                            , queue
+                            , s
+                            , string-inflection }:
+      melpaBuild {
         pname = "citeproc";
-        version = "20180325.2358";
+        version = "20180429.57";
         src = fetchFromGitHub {
           owner = "andras-simonyi";
           repo = "citeproc-el";
-          rev = "b15e3cadbcbbe777b809a32859e341e2ef212c13";
-          sha256 = "1axl3b31ylp8y2vsf853j8d8wb1wsizwi605qfxj5aj8xafbgbb5";
+          rev = "44f147d228d2d652cdd404d31e987e14519c3eef";
+          sha256 = "01cr362zgswplv0582hrw4y0wz5xgknd2a74ylffax38ws4lydd1";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/20aa56e9a4809cee1082224b1b4e65921a48bda1/recipes/citeproc";
           sha256 = "1qphg2bg7vvjzgvnsscbyf40llxxh4aa2s2ffk8vsbfd4p8208cq";
-          name = "citeproc";
+          name = "recipe";
         };
-        packageRequires = [ dash emacs f queue s string-inflection ];
+        packageRequires = [ dash emacs f org queue s string-inflection ];
         meta = {
           homepage = "https://melpa.org/#/citeproc";
           license = lib.licenses.free;
         };
       }) {};
-    cl-format = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    cl-format = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "cl-format";
         version = "20160412.1745";
         src = fetchFromGitHub {
@@ -8079,10 +9936,10 @@
           rev = "4380cb8009c47cc6d9098b383082b93b1aefa460";
           sha256 = "108s96viral3s62a77jfgvjam08hdk97frfmxjg3xpp2ifccjs7h";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/cl-format";
           sha256 = "09jwy0fgaz2f04dvcdns6w859s6izvrkp8ib4lws3x8kx8z918fy";
-          name = "cl-format";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -8090,8 +9947,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    cl-lib-highlight = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    cl-lib-highlight = callPackage ({ cl-lib ? null
+                                    , fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "cl-lib-highlight";
         version = "20140127.1312";
         src = fetchFromGitHub {
@@ -8100,10 +9961,10 @@
           rev = "fd1b308e6e989791d1df14438efa6b77d20f7c7e";
           sha256 = "1mc8kayw8fmvpl0z09v6i68s2lharlwpzff0cvcsfn0an2imj2d0";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/696c79669478b0d1c9769cc6f0fe581ee056cf32/recipes/cl-lib-highlight";
           sha256 = "13qdrvpxq928p27b1xdcbsscyhqk042rwfa17037gp9h02fd42j8";
-          name = "cl-lib-highlight";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -8111,20 +9972,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    clang-format = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    clang-format = callPackage ({ cl-lib ? null
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "clang-format";
-        version = "20171202.1318";
+        version = "20180406.814";
         src = fetchFromGitHub {
           owner = "emacsorphanage";
           repo = "clang-format";
-          rev = "e2facf890156ad57a122ed5e79e5a40cc03c8cae";
-          sha256 = "09pq0zf5im6kkjwyzdz3np3b4dd5va3as1syygvjnl5dlh6gkjcs";
+          rev = "d11600d94e9aaeb807b4ab7b4ae8069d8bd5f075";
+          sha256 = "0zlw1qdchzpr93wqmkn7590w0frmhvd82jjfl1dngwa8j14pf97k";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/30de78c9cf83de30093a5647976eeaf552d4b2cb/recipes/clang-format";
           sha256 = "1w2w8hhyxp73s1ziyd0n7f1yi0x46v93630xxpjnf9bgr1psfk5f";
-          name = "clang-format";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -8132,8 +9997,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    clean-aindent-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    clean-aindent-mode = callPackage ({ fetchFromGitHub
+                                      , fetchurl
+                                      , lib
+                                      , melpaBuild }:
+      melpaBuild {
         pname = "clean-aindent-mode";
         version = "20171017.1343";
         src = fetchFromGitHub {
@@ -8142,10 +10010,10 @@
           rev = "a97bcae8f43a9ff64e95473e4ef0d8bafe829211";
           sha256 = "07dgx09j6nn5dl9vpqfcs5yqm79kza3h3r1lb7r09wpkmrg0c2cr";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ee9dac7c10e652f026643620418dfea9237a0d23/recipes/clean-aindent-mode";
           sha256 = "1whzbs2gg2ar24kw29ffv94dgvrlfy2v4zdn0g7ksjjmmdr8ahh4";
-          name = "clean-aindent-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -8153,8 +10021,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    clean-buffers = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    clean-buffers = callPackage ({ cl-lib ? null
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "clean-buffers";
         version = "20160529.1559";
         src = fetchFromGitHub {
@@ -8163,10 +10035,10 @@
           rev = "1be6c54e3095761b6b64bf749faae3dfce94e72a";
           sha256 = "1h7kmj53fqwfzam3ywz3yn4abl2n94v0lxnyv7x4qzwi2ggizc3l";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fcabd17d7de9af443198ac9c2996bfbd94324de/recipes/clean-buffers";
           sha256 = "025sxrqxm24yg1wpfncrjw1nm91h0h7jy2xd5g20xqlinqqvdihj";
-          name = "clean-buffers";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -8174,8 +10046,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    clear-text = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    clear-text = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "clear-text";
         version = "20160406.1343";
         src = fetchFromGitHub {
@@ -8184,10 +10059,10 @@
           rev = "b50669b6077d6948f72cb3c649281d206e0c2f2b";
           sha256 = "0y5z2pfhzpv67w2lnw1q06mflww90sfcilj89kqx2jhhrnrnn2ka";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d2ae86a3001587ba753fcd0ca5137cb65d38910d/recipes/clear-text";
           sha256 = "1cx2lbcbhd024pq9njan7xrlvj3k4c3wdsvgbz5qyna0k06ix8dv";
-          name = "clear-text";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -8195,8 +10070,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    clevercss = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    clevercss = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "clevercss";
         version = "20131228.1755";
         src = fetchFromGitHub {
@@ -8205,10 +10083,10 @@
           rev = "b8a3c0dd674367c62b1a1ffec84d88fe0c0219bc";
           sha256 = "19q6zbnl9fg4cwgi56d7p4qp6y3g0fdyihinpakby49xv2n2k8dx";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ec88232feb9d0a04278d5f615bb0ee0833ecb8ca/recipes/clevercss";
           sha256 = "189f2l4za1j9ds0bhxrzyp7da9p6svh5dx2vnzf4vql7qhjk3gf0";
-          name = "clevercss";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -8216,20 +10094,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    click-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    click-mode = callPackage ({ emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "click-mode";
-        version = "20170105.20";
+        version = "20180610.1744";
         src = fetchFromGitHub {
           owner = "bmalehorn";
           repo = "click-mode";
-          rev = "3c31e65b0b8476a15a3e2394fa05477ce42ea790";
-          sha256 = "0117qn81gbjnx48wl53riqz65yxr8h691fa8j7bgrz32xnjpxz77";
+          rev = "b94ea8cce89cf0e753b2ab915202d49ffc470fb6";
+          sha256 = "0bz0wp40khha96k74g9vgnzm7xzsrh0wh4vks205pjhaxabhb5vh";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1859bb26e3efd66394d7d9f4d2296cbeeaf5ba4d/recipes/click-mode";
           sha256 = "1p5dz4a74w5zxdlw17h5z9dglapia4p29880liw3bif2c7dzkg0r";
-          name = "click-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -8237,8 +10119,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    cliphist = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
-    melpaBuild {
+    cliphist = callPackage ({ emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , ivy
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "cliphist";
         version = "20171112.2138";
         src = fetchFromGitHub {
@@ -8247,10 +10134,10 @@
           rev = "e454254f8bd9dbaea28e95c786d7297a2d4e920a";
           sha256 = "1lxsy78kmrrb82y7nlaaaq2qsly7f3wa8jw1bagjax4rwvld0vim";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/82d86dae4ad8efc8ef342883c164c56e43079171/recipes/cliphist";
           sha256 = "0mg6pznijba3kvp3r57pi54v6mgih2vfwj2kg6qmcy1abrc0xq29";
-          name = "cliphist";
+          name = "recipe";
         };
         packageRequires = [ emacs ivy ];
         meta = {
@@ -8258,8 +10145,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    clipmon = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    clipmon = callPackage ({ fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "clipmon";
         version = "20180129.254";
         src = fetchFromGitHub {
@@ -8268,10 +10158,10 @@
           rev = "95dc56c7ed84a654ec90f4740eb6df1050de8cf1";
           sha256 = "0mfb4k0i71y49hn0xk5a1mv4zaj249qcan0y0nzvgf7mmvr32n9w";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4dc92d73705ebb61ff8218f3483dd2da51ce8d32/recipes/clipmon";
           sha256 = "1gvy1722px4fh88jyb8xx7k1dgyjgq7zjadr5fghdir42l0byw7i";
-          name = "clipmon";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -8279,8 +10169,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    clippy = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, pos-tip }:
-    melpaBuild {
+    clippy = callPackage ({ fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild
+                          , pos-tip }:
+      melpaBuild {
         pname = "clippy";
         version = "20161028.1254";
         src = fetchFromGitHub {
@@ -8289,10 +10183,10 @@
           rev = "ad4b5dba4cede6d4b21533186303d3d3e9a2510f";
           sha256 = "0rnqwzbr5hdap276ana0iz3lk2ih8kkj1m9cydavqqdrwzk4ldrm";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e3743596c4b6387351684b1bf00f17275b8e59e8/recipes/clippy";
           sha256 = "0nqmc8f2qrsp25vzc66xw6b232n7fyw6g06mwn2cdpm3d2pgb7rg";
-          name = "clippy";
+          name = "recipe";
         };
         packageRequires = [ pos-tip ];
         meta = {
@@ -8300,8 +10194,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    clips-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    clips-mode = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "clips-mode";
         version = "20170909.123";
         src = fetchFromGitHub {
@@ -8310,10 +10207,10 @@
           rev = "dd38e2822640a38f7d8bfec4f69d8dd24be27074";
           sha256 = "1q2jz72wi8d2pdrjic9kwqixp5sczjkkx8rf67rgaz37ysjpcbf6";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d28484bf5e9ad72778ad63f73deeea1eb1263236/recipes/clips-mode";
           sha256 = "083wrhjn04rg8vr6j0ziffdbdhbfn63wzl4q7yzpkf8qckh6mxhf";
-          name = "clips-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -8321,20 +10218,34 @@
           license = lib.licenses.free;
         };
       }) {};
-    clj-refactor = callPackage ({ cider, clojure-mode, edn, emacs, fetchFromGitHub, fetchurl, hydra, inflections, lib, melpaBuild, multiple-cursors, paredit, s, seq, yasnippet }:
-    melpaBuild {
+    clj-refactor = callPackage ({ cider
+                                , clojure-mode
+                                , edn
+                                , emacs
+                                , fetchFromGitHub
+                                , fetchurl
+                                , hydra
+                                , inflections
+                                , lib
+                                , melpaBuild
+                                , multiple-cursors
+                                , paredit
+                                , s
+                                , seq
+                                , yasnippet }:
+      melpaBuild {
         pname = "clj-refactor";
-        version = "20180411.43";
+        version = "20180708.57";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "clj-refactor.el";
-          rev = "adffc6a4c61a9555744634598b47631760e91488";
-          sha256 = "19bi7pnsyqaahwsy6gr55k8kgjfimrjn3lriyzjh7jkhfsmm77bn";
+          rev = "443f0860d1d1c209cf4baae998f55df0616a819f";
+          sha256 = "1qykm5z0iiv7vsmkgpd4mvxs0ml42z132bxg7ap8an9mvxixrvhj";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3a2db268e55d10f7d1d5a5f02d35b2c27b12b78e/recipes/clj-refactor";
           sha256 = "1qvds6dylazvrzz1ji2z2ldw72pa2nxqacb9d04gasmkqc32ipvz";
-          name = "clj-refactor";
+          name = "recipe";
         };
         packageRequires = [
           cider
@@ -8354,8 +10265,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    cljr-helm = callPackage ({ cl-lib ? null, clj-refactor, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }:
-    melpaBuild {
+    cljr-helm = callPackage ({ cl-lib ? null
+                             , clj-refactor
+                             , fetchFromGitHub
+                             , fetchurl
+                             , helm-core
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "cljr-helm";
         version = "20160913.128";
         src = fetchFromGitHub {
@@ -8364,10 +10281,10 @@
           rev = "f2fc7b698a56e4a44d5dfbc6a55d77a93c0fa9a4";
           sha256 = "0jy6hkz8sr1bplymwxnjg4q408cw2dgfrv70chlw3y5ddc4cingj";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d99b67e295ef59916211bf22b57b4d093e3d53ab/recipes/cljr-helm";
           sha256 = "108a1xgnc6qy088vs41j3npwk25a5vny0xx4r3yh76jsmpdpcgnc";
-          name = "cljr-helm";
+          name = "recipe";
         };
         packageRequires = [ cl-lib clj-refactor helm-core ];
         meta = {
@@ -8375,8 +10292,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    cljsbuild-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    cljsbuild-mode = callPackage ({ fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "cljsbuild-mode";
         version = "20160402.1000";
         src = fetchFromGitHub {
@@ -8385,10 +10305,10 @@
           rev = "fa2315660cb3ce944b5e16c679dcf5afd6a97f4c";
           sha256 = "0flnfivz6w3pkham3g08m3xzy3jg1rzvxfa00vkr7ll8iyv4ypqc";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d801a2e0ba5ae7c65b5d312fbf41261278a8b1ba/recipes/cljsbuild-mode";
           sha256 = "0qvb990dgq4v75lwnd661wxszbdbhlgxpsyv4zaj6h10gp1vi214";
-          name = "cljsbuild-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -8396,8 +10316,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    clmemo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    clmemo = callPackage ({ fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "clmemo";
         version = "20160326.923";
         src = fetchFromGitHub {
@@ -8406,10 +10329,10 @@
           rev = "846a81b984d71edf8278a4d9f9b886e44d5b8365";
           sha256 = "152qf7i5bf7xvr35gyawl8abkh7v5dsz957zxslrbbnc8bb1k6bz";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e98b438990dc0dbda264fb4bf7a3237a2661baab/recipes/clmemo";
           sha256 = "03qa79ip0gqinj1kk898lcvixk98hf6gknz0yc2fnqcrm642k2vs";
-          name = "clmemo";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -8417,8 +10340,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    cloc = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    cloc = callPackage ({ cl-lib ? null
+                        , fetchFromGitHub
+                        , fetchurl
+                        , lib
+                        , melpaBuild }:
+      melpaBuild {
         pname = "cloc";
         version = "20170728.1124";
         src = fetchFromGitHub {
@@ -8427,10 +10354,10 @@
           rev = "f30f0472e465cc8d433d2473e9d3b8dfe2c94491";
           sha256 = "0g8hklc0914dsi3ks7g251w58ixa78qsh87dx914cc8sahpc0ws2";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0dd7a641efd13aa0bd7509d8a5b0a28e3a0493c8/recipes/cloc";
           sha256 = "1ny5wixa9x4fq5jvhs01jmyvwkfvwwi9aamrcqsl42s9sx6ygz7a";
-          name = "cloc";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -8438,20 +10365,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    clocker = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }:
-    melpaBuild {
+    clocker = callPackage ({ dash
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild
+                           , projectile }:
+      melpaBuild {
         pname = "clocker";
         version = "20160125.1505";
         src = fetchFromGitHub {
           owner = "roman";
           repo = "clocker.el";
-          rev = "4a4831ed4e42e18976edd16b844cb16cb78f3c17";
-          sha256 = "0hz6a7gj0zfsdaifkhwf965c96rkjc3kivvqlf50zllsw0ysbnn0";
+          rev = "07338bc4b850d262eb263ac306ae3366cac6e078";
+          sha256 = "0f6qav92lyp36irdlamcxhzfd4p1i4iq18d5cmr7fgfwi894ikcg";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/dadd3f5abad2e1f7863c4d654ff065f641395f64/recipes/clocker";
           sha256 = "0cckrk40k1labiqjh7ghzpx5zi136xz70j3ipp117x52qf24k10k";
-          name = "clocker";
+          name = "recipe";
         };
         packageRequires = [ dash projectile ];
         meta = {
@@ -8459,20 +10391,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    clojars = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, request-deferred }:
-    melpaBuild {
+    clojars = callPackage ({ fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild
+                           , request-deferred }:
+      melpaBuild {
         pname = "clojars";
         version = "20161109.1448";
         src = fetchFromGitHub {
           owner = "joshuamiller";
           repo = "clojars.el";
-          rev = "8f4ca8a283d4e9acaab912bb7217ffb5800b01a7";
-          sha256 = "1j7ib7iyv4l8f3cgzyqz7jpwwa1bml343imqj5ynr7jzasv7pz52";
+          rev = "d9a3ecb61f055e1c3497e424193d867bc3125da1";
+          sha256 = "1h1yff0b2n9rwpqwhba23jpqbdpnivx0bhs7b48gl66wpsg7307l";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7f766319c3e18a41017684ea503b0382e96ab31b/recipes/clojars";
           sha256 = "1skvd29347hwapgdqznbzwfcp2nf077qkdzknxc8ylmqa32yf5w1";
-          name = "clojars";
+          name = "recipe";
         };
         packageRequires = [ request-deferred ];
         meta = {
@@ -8480,8 +10416,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    clojure-cheatsheet = callPackage ({ cider, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
-    melpaBuild {
+    clojure-cheatsheet = callPackage ({ cider
+                                      , fetchFromGitHub
+                                      , fetchurl
+                                      , helm
+                                      , lib
+                                      , melpaBuild }:
+      melpaBuild {
         pname = "clojure-cheatsheet";
         version = "20180201.4";
         src = fetchFromGitHub {
@@ -8490,10 +10431,10 @@
           rev = "85c382317a56bbdfac03ae95999c28fc0cde65d7";
           sha256 = "0w9l6nz583qyldz44jqdh4414rgm6n2fzbaj5hsr5j1bkdizq7xl";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0569da79bd8145df334965c5d4364a50b6b548fa/recipes/clojure-cheatsheet";
           sha256 = "05sw3bkdcadslpsk64ds0ciavmdgqk7fr5q3z505vvafmszfnaqv";
-          name = "clojure-cheatsheet";
+          name = "recipe";
         };
         packageRequires = [ cider helm ];
         meta = {
@@ -8501,20 +10442,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    clojure-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    clojure-mode = callPackage ({ emacs
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "clojure-mode";
-        version = "20180329.2109";
+        version = "20180709.648";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "clojure-mode";
-          rev = "58e909365c89a4e31b5f6c790f261be788cac409";
-          sha256 = "066w6mb37ihv92a5l7gwcld7divbylj29n619q02lazqfwbssfwr";
+          rev = "e9da8797e577651b96875228e3804ef11b3c9ff0";
+          sha256 = "0dpvmyanhbm164ma3ryhsqchi66vjwpyv97qq92zrd8arv8njnbh";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5e3cd2e6ee52692dc7b2a04245137130a9f521c7/recipes/clojure-mode";
           sha256 = "11n0rjhs1mmlzdqy711g432an5ybdka5xj0ipsk8dx6xcyab70np";
-          name = "clojure-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -8522,20 +10467,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    clojure-mode-extra-font-locking = callPackage ({ clojure-mode, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    clojure-mode-extra-font-locking = callPackage ({ clojure-mode
+                                                   , fetchFromGitHub
+                                                   , fetchurl
+                                                   , lib
+                                                   , melpaBuild }:
+      melpaBuild {
         pname = "clojure-mode-extra-font-locking";
         version = "20180114.911";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "clojure-mode";
-          rev = "58e909365c89a4e31b5f6c790f261be788cac409";
-          sha256 = "066w6mb37ihv92a5l7gwcld7divbylj29n619q02lazqfwbssfwr";
+          rev = "9bbc8d59b3b4dfe3f0564f0d06832a309b4e4e4e";
+          sha256 = "0brwcxlz337bd1y1vjlix2aq6qjzqqrl0g9hag5lmpkimnbbnbv1";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5e3cd2e6ee52692dc7b2a04245137130a9f521c7/recipes/clojure-mode-extra-font-locking";
           sha256 = "00nff9mkj61i76dj21x87vhz0bbkzgvkx1ypkxcv6yf3pfhq7r8n";
-          name = "clojure-mode-extra-font-locking";
+          name = "recipe";
         };
         packageRequires = [ clojure-mode ];
         meta = {
@@ -8543,20 +10492,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    clojure-quick-repls = callPackage ({ cider, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    clojure-quick-repls = callPackage ({ cider
+                                       , dash
+                                       , fetchFromGitHub
+                                       , fetchurl
+                                       , lib
+                                       , melpaBuild }:
+      melpaBuild {
         pname = "clojure-quick-repls";
         version = "20150814.36";
         src = fetchFromGitHub {
           owner = "symfrog";
           repo = "clojure-quick-repls";
-          rev = "730311dd3ac4e0aceb0204f818b422017873467f";
-          sha256 = "1qxhgqldvzzbpr3cxkj3a1zhpjck04pcqli9nnnb75hawi7vi8si";
+          rev = "8fe4e44939e8a01a4cdf60c0001d9a6abf8a73c3";
+          sha256 = "1wqml4psqqkzp8afccli4y2agbm8sz1fykycl3553cb2cidxgjga";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e618430057eb3ac235ab4a44767524919c870036/recipes/clojure-quick-repls";
           sha256 = "10glzyd4y3918pwp048pc1y7y7fa34fkqckn1nbys841dbssmay0";
-          name = "clojure-quick-repls";
+          name = "recipe";
         };
         packageRequires = [ cider dash ];
         meta = {
@@ -8564,8 +10518,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    clojure-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
-    melpaBuild {
+    clojure-snippets = callPackage ({ fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild
+                                    , yasnippet }:
+      melpaBuild {
         pname = "clojure-snippets";
         version = "20180314.608";
         src = fetchFromGitHub {
@@ -8574,10 +10532,10 @@
           rev = "6068dca90467a0f4ebc2cd39338a173d6f5ddc04";
           sha256 = "0vvadcydpsz4b17dlm1jd4fbddzfqibh3mlzv3k4gvp67vv10cqy";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4898fc6746b30b0d0453b3b56d02479bfb0f70b9/recipes/clojure-snippets";
           sha256 = "15622mdd6b3fpwp22d32p78yap08pyscs2vc83sv1xz4338i0lij";
-          name = "clojure-snippets";
+          name = "recipe";
         };
         packageRequires = [ yasnippet ];
         meta = {
@@ -8585,20 +10543,27 @@
           license = lib.licenses.free;
         };
       }) {};
-    clomacs = callPackage ({ cider, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, simple-httpd }:
-    melpaBuild {
+    clomacs = callPackage ({ cider
+                           , emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild
+                           , s
+                           , simple-httpd }:
+      melpaBuild {
         pname = "clomacs";
-        version = "20180211.421";
+        version = "20180713.340";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "clomacs";
-          rev = "2fa47d068f4955424e810cbe94d861a103efc259";
-          sha256 = "0m57hvq8s6cigv7ajmim71320bj06a2wk9v82pbvxpjqyyijpkym";
+          rev = "047fc3c282c0edb198982987fc816c89313e367c";
+          sha256 = "1prkp96r5an9w23sc06png1gik35431sqvhmbl5xv2bx2xkwxpkq";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/345f9797e87e3f5f957c167a5e3d33d1e31b50a3/recipes/clomacs";
           sha256 = "1vfjzrzp58ap75i0dh5bwnlkb8qbpfmrd3fg9n6aaibvvd2m3hyh";
-          name = "clomacs";
+          name = "recipe";
         };
         packageRequires = [ cider emacs s simple-httpd ];
         meta = {
@@ -8606,20 +10571,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    closql = callPackage ({ emacs, emacsql-sqlite, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    closql = callPackage ({ emacs
+                          , emacsql-sqlite
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "closql";
-        version = "20180318.1222";
+        version = "20180627.1931";
         src = fetchFromGitHub {
           owner = "emacscollective";
           repo = "closql";
-          rev = "bfd5a5e4d32bc00e439c86f42859964d4fa91dc3";
-          sha256 = "1ivdlabnkm5dsdjpi68mgvvif5bg8pc2igjyr2jrkwl7jnz51dz8";
+          rev = "faed079570c2e70b0e4988177e35b7990afa4752";
+          sha256 = "0ni2akjb1n5w6vz3b210c3bya9mbyyxiygn8hna707qnszd0li8r";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2df16abf56e53d4a1cc267a78797419520ff8a1c/recipes/closql";
           sha256 = "13ybna20w2d1b3n0y5p1ybhkw0j0zh5nd43p1yvf8h1haj983l87";
-          name = "closql";
+          name = "recipe";
         };
         packageRequires = [ emacs emacsql-sqlite ];
         meta = {
@@ -8627,8 +10597,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    closure-lint-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    closure-lint-mode = callPackage ({ fetchFromGitHub
+                                     , fetchurl
+                                     , lib
+                                     , melpaBuild }:
+      melpaBuild {
         pname = "closure-lint-mode";
         version = "20101118.1324";
         src = fetchFromGitHub {
@@ -8637,10 +10610,10 @@
           rev = "bc3d2fd5c35580bf1b8af43b12484c95a343b4b5";
           sha256 = "0v0wdq0b5jz4x0d7dl3ilgf3aqp2hk375db366ij6gxwd0b9i3na";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/closure-lint-mode";
           sha256 = "11kxgvfwngdjryrrihlpn0509axwv4zwkxzs4h1pw5vi7sv1n6xd";
-          name = "closure-lint-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -8648,8 +10621,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    cloud-to-butt-erc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    cloud-to-butt-erc = callPackage ({ fetchFromGitHub
+                                     , fetchurl
+                                     , lib
+                                     , melpaBuild }:
+      melpaBuild {
         pname = "cloud-to-butt-erc";
         version = "20130627.1608";
         src = fetchFromGitHub {
@@ -8658,10 +10634,10 @@
           rev = "6710c03d1bc91736435cbfe845924940cae34e5c";
           sha256 = "07kvnb6p35swkyj92c4wymsqq4r2885wdpqhv7nhicvi6n658kpf";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b12354152cce6e9a281dc26018c763b6f93e3cee/recipes/cloud-to-butt-erc";
           sha256 = "061mmw39dq8sqzi2589lf7svy15n2iyiwbfiram48r2yhma5dd0f";
-          name = "cloud-to-butt-erc";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -8669,8 +10645,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    clues-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    clues-theme = callPackage ({ emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "clues-theme";
         version = "20161213.327";
         src = fetchFromGitHub {
@@ -8679,10 +10659,10 @@
           rev = "abd61f2b7f3e98de58ca26e6d1230e70c6406cc7";
           sha256 = "118k5bnlk9sc2n04saaxjncmc1a4m1wlf2y7xyklpffkazbd0m72";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6f26b8281f9bd05e3c8f2ef21838275711e622c9/recipes/clues-theme";
           sha256 = "0b0gypmxx8qjd8hgxf4kbvci1nwacsxl7rm5s1bcnk9cwc6k2jpr";
-          name = "clues-theme";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -8690,8 +10670,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    cm-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    cm-mode = callPackage ({ cl-lib ? null
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "cm-mode";
         version = "20170203.1307";
         src = fetchFromGitHub {
@@ -8700,10 +10684,10 @@
           rev = "276d49c859822265070ae5dfbb403fd7d8d06436";
           sha256 = "0mqbjw9wiaq735v307hd7g0g6i3a4k7h71bi4g9rr2jbgiljmql4";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/42dda804ec0c7338c39c57eec6ba479609a38555/recipes/cm-mode";
           sha256 = "1rgfpxbnp8wiq9j8aywm2n07rxzkhqljigwynrkyvrnsgxlq2a9x";
-          name = "cm-mode";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -8711,8 +10695,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    cmake-font-lock = callPackage ({ cmake-mode, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    cmake-font-lock = callPackage ({ cmake-mode
+                                   , fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "cmake-font-lock";
         version = "20170117.1225";
         src = fetchFromGitHub {
@@ -8721,10 +10709,10 @@
           rev = "8be491b4b13338078e524e2fe6213c93e18a101e";
           sha256 = "0h96c670gki6csqfrhlnjxkpzx0m92l6pcsdhx93l3qbh23imcmm";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/383a7f191c10916ad40284fba94f967765ffeb7e/recipes/cmake-font-lock";
           sha256 = "0ws4kd94m8fh55d7whsf3rj9qrxjp1wsgxh0valsjxyp2ck9zrz0";
-          name = "cmake-font-lock";
+          name = "recipe";
         };
         packageRequires = [ cmake-mode ];
         meta = {
@@ -8732,20 +10720,28 @@
           license = lib.licenses.free;
         };
       }) {};
-    cmake-ide = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, levenshtein, lib, melpaBuild, s, seq }:
-    melpaBuild {
+    cmake-ide = callPackage ({ cl-lib ? null
+                             , emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , levenshtein
+                             , lib
+                             , melpaBuild
+                             , s
+                             , seq }:
+      melpaBuild {
         pname = "cmake-ide";
-        version = "20180413.329";
+        version = "20180713.813";
         src = fetchFromGitHub {
           owner = "atilaneves";
           repo = "cmake-ide";
-          rev = "3d4da16226e8d4e53613feeebb5e21e6a7defed5";
-          sha256 = "1d0nxqhx6ssld92wlv8c40m655zpf622a0ns4v78397nfm135khq";
+          rev = "0fa6258692908c4c461d46827db0be6cf0a5d5b1";
+          sha256 = "0jnhxz6f04f4ckxljhn0sraw3z6w2w8yjfksx2wdggwi1qhvn3vh";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/17e8a8a5205d222950dc8e9245549a48894b864a/recipes/cmake-ide";
           sha256 = "0xvy7l80zw67jgvk1rkhwzjvsqjqckmd8zj6s67rgbm56z6ypmcg";
-          name = "cmake-ide";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs levenshtein s seq ];
         meta = {
@@ -8753,20 +10749,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    cmake-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    cmake-mode = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "cmake-mode";
-        version = "20180104.1137";
+        version = "20180709.726";
         src = fetchFromGitHub {
           owner = "Kitware";
           repo = "CMake";
-          rev = "ccd17a557cbf8ada18207a72eea78d2adcc9d752";
-          sha256 = "1i85zb5j3ckn5b9xybczf6k42vpwsyq3xyzzarq3w775iyjlnkfj";
+          rev = "8d478c0003cc9bb4836038fc1a27d3bbd40348d2";
+          sha256 = "0i4rs8m7qf9milc9csy38r7m0j5xqy2q75fqmyxd4xpfmkf4a2v7";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode";
           sha256 = "0zbn8syb5lw5xp1qcy3qcl75zfiyik30xvqyl38gdqddm9h7qmz7";
-          name = "cmake-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -8774,8 +10773,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    cmake-project = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    cmake-project = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "cmake-project";
         version = "20171121.315";
         src = fetchFromGitHub {
@@ -8784,10 +10786,10 @@
           rev = "d3f408f226eff3f77f7e00dd519f4efc78fd292d";
           sha256 = "1r8a3arpkkn91k619z4b6ywnq15glc4n1ji33l0q2m59f5sfk8mp";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0857c4db1027981ea73bc32bcaa15e5df53edea3/recipes/cmake-project";
           sha256 = "13n6j9ljvzjzkknbm9zkhxljcn12avl39gxqq95hah44dr11rns3";
-          name = "cmake-project";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -8795,8 +10797,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    cmd-to-echo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, shell-split-string }:
-    melpaBuild {
+    cmd-to-echo = callPackage ({ emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild
+                               , s
+                               , shell-split-string }:
+      melpaBuild {
         pname = "cmd-to-echo";
         version = "20161203.1333";
         src = fetchFromGitHub {
@@ -8805,10 +10813,10 @@
           rev = "e0e874fc0e1ad6d291e39ed76023445297ad438a";
           sha256 = "0wi097yk9p1xcfmps1g58xvvlv60akwky4y0pxdz6pa31w9jd1q8";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/cmd-to-echo";
           sha256 = "1b4mw1ips4695ixgw2hyinq9ry3bx4d1842kr7k6155a1v34s4zh";
-          name = "cmd-to-echo";
+          name = "recipe";
         };
         packageRequires = [ emacs s shell-split-string ];
         meta = {
@@ -8816,8 +10824,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    cmm-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    cmm-mode = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "cmm-mode";
         version = "20150224.2346";
         src = fetchFromGitHub {
@@ -8826,10 +10837,10 @@
           rev = "c3ad514dff3eb30434f6b20d953276d4c00de1ee";
           sha256 = "0xdcw329d2gssx86iajwrgpr7yv69b9nflmzjgb4jvg4pskj4pgx";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/07579854200302cf69e120648f4983961e628f7d/recipes/cmm-mode";
           sha256 = "184b8x19cnvx8z4dr9alv62wchzc7vr7crzz8jiyqw9d544zs50h";
-          name = "cmm-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -8837,8 +10848,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    cnfonts = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    cnfonts = callPackage ({ emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "cnfonts";
         version = "20171205.111";
         src = fetchFromGitHub {
@@ -8847,10 +10862,10 @@
           rev = "4583e30d5058773606b830072df38a038d40203a";
           sha256 = "04vc3p4320h3ncxm8s21ijv524w5m0j5gx1f5pyw91k3avvz9hbx";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0d5787ffeeee68ffa41f3e777071815084e0ed7a/recipes/cnfonts";
           sha256 = "1pryn08fkdrdj7w302205nj1qhfbk1jzqxx6717crrxakkdqmn9w";
-          name = "cnfonts";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -8858,8 +10873,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    cobalt = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    cobalt = callPackage ({ emacs
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "cobalt";
         version = "20180304.355";
         src = fetchFromGitHub {
@@ -8868,10 +10887,10 @@
           rev = "634ace275697e188746ca22a30ff94380ec756be";
           sha256 = "1mrydmzldgabkkdpmlwfrfb6iddj4by7scc14k9bak5y6hj6ix7l";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b2435d98e7564d333c8224b67ac6ad9c95debda1/recipes/cobalt";
           sha256 = "0r3fx1xx24x4qapbj2p8krc67rjmrjm88y89baf1x2swk7xdza92";
-          name = "cobalt";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -8879,8 +10898,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    cobra-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    cobra-mode = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "cobra-mode";
         version = "20140116.1316";
         src = fetchFromGitHub {
@@ -8889,10 +10911,10 @@
           rev = "acd6e53f6286af5176471d01f25257e5ddb6dd01";
           sha256 = "1sx8grp3j7zcma3nb7zj6kijkdqx166vw1qgmm29hvx48bys6vlp";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e986942c391f50fb633097f2f31969a8aeecb99e/recipes/cobra-mode";
           sha256 = "11jscpbclxlq2xqy2nsfa4y575bp8h0kpkp8cfjqb05lm5ybcp89";
-          name = "cobra-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -8900,20 +10922,49 @@
           license = lib.licenses.free;
         };
       }) {};
-    code-library = callPackage ({ fetchFromGitHub, fetchurl, gist, lib, melpaBuild }:
-    melpaBuild {
+    code-archive = callPackage ({ emacs
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
+        pname = "code-archive";
+        version = "20180705.1913";
+        src = fetchFromGitHub {
+          owner = "mschuldt";
+          repo = "code-archive";
+          rev = "735ba47be3db59d9af784f2a47f8585caa55a6fd";
+          sha256 = "1q022cw22xzn2ragx113ir04z37ff8y66fgc7hzcs32xs3l03g6z";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/a8d0832eff966874d90e1d5ac1043c03e96b1c25/recipes/code-archive";
+          sha256 = "0rj7cvwzhgam25jxjw5aqx9cxa86008gx2mwcyjlbnjrkhcbi97a";
+          name = "recipe";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/code-archive";
+          license = lib.licenses.free;
+        };
+      }) {};
+    code-library = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , gist
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "code-library";
         version = "20160426.518";
         src = fetchFromGitHub {
           owner = "lujun9972";
           repo = "code-library";
-          rev = "32d59c5c845d6dbdda18f9bd1c03a58d55417fc5";
-          sha256 = "1n00bb39jgx02zdgla85zx0a338xir0zh0af6xca14kg5bx07vsv";
+          rev = "3c79338eae5c892bfb4e4882298422d9fd65d2d7";
+          sha256 = "0gc56pdyzcnv3q1a82c79i8w58q9r6ccfix9s1s6msjxzxkznap5";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/197bdc508c4fd9712125553a108ca6c9fedcaefc/recipes/code-library";
           sha256 = "0gi8lz2q0vis4nyziykq15jp3m3vykfwycbk6amhf1ybkn9k3ywj";
-          name = "code-library";
+          name = "recipe";
         };
         packageRequires = [ gist ];
         meta = {
@@ -8921,20 +10972,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    codebug = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    codebug = callPackage ({ fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "codebug";
         version = "20140929.1437";
         src = fetchFromGitHub {
           owner = "shano";
           repo = "emacs-codebug";
-          rev = "ac0e4331ba94ccb5203fa492570e1ca6b90c3d52";
-          sha256 = "11v671c4338bsizbmm7ypp4x9s5hiwyddsg2ig6h157gfv2597pp";
+          rev = "d95e5182fa1465406964873d9db1fdac77206f5b";
+          sha256 = "1a3ifz9bv4ai9hiyvx0x3f9ygnrv6aqgpa6hxidhxdgg4ph5i4di";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/35cd654bd7b390518eb5ddca8842bdfcc9e9e6f1/recipes/codebug";
           sha256 = "1cb2wvawp3wqslhgbmbw9xwcqgwfscqg0jfgqzi3nr42mjp9zgqj";
-          name = "codebug";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -8942,20 +10996,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    codesearch = callPackage ({ elog, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    codesearch = callPackage ({ elog
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "codesearch";
-        version = "20171122.431";
+        version = "20180508.822";
         src = fetchFromGitHub {
           owner = "abingham";
           repo = "emacs-codesearch";
-          rev = "4e6a2382c26d1218a4a007d31de2bab8ef9d2e7c";
-          sha256 = "030zbx1glr6m7sxy89c833iw1v3bgjkcg835c38hlazra1vq783p";
+          rev = "e40efc62e9333db0593bd81b5c78d08b19bfb193";
+          sha256 = "04xivg6f19mlpsv77jwasg4ii9vlv8amblm03siwhx53ib9wlcyc";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0da1c6971ac2d3e9ee67731d00a9e8ca2d169826/recipes/codesearch";
           sha256 = "1zm7fqwiknk07c8aks1silnkxifkfbdzvbzg77wrap48k8mnw03l";
-          name = "codesearch";
+          name = "recipe";
         };
         packageRequires = [ elog ];
         meta = {
@@ -8963,8 +11021,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    codic = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    codic = callPackage ({ cl-lib ? null
+                         , emacs
+                         , fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "codic";
         version = "20150926.427";
         src = fetchFromGitHub {
@@ -8973,10 +11036,10 @@
           rev = "52bbb6997ef4ab9fb7fea43bbfff7f04671aa557";
           sha256 = "14jcxrs3b02pbppvdsabr7c74i3c6d1lmd6l1p9dj8gv413pghsz";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/acc9b816796b9f142c53f90593952b43c962d2d8/recipes/codic";
           sha256 = "0fq2qfqhkd6injgl66vcpd61j67shl9xj260aj6cgb2nriq0jxgn";
-          name = "codic";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -8984,8 +11047,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    coffee-fof = callPackage ({ coffee-mode, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    coffee-fof = callPackage ({ coffee-mode
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "coffee-fof";
         version = "20131012.530";
         src = fetchFromGitHub {
@@ -8994,10 +11061,10 @@
           rev = "211529594bc074721c6cbc4edb73a63cc05f89ac";
           sha256 = "010v886ak0rbbhqwxwj6m0mkgh19s232igy7wwbv07l2pdqszf3p";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9024e5a71c992509a1dea5f673a31b806d5e175e/recipes/coffee-fof";
           sha256 = "02cqza46qp8y69jd33cg4nmcgvrpwz23vyxqnmzwwvlmnbky96yc";
-          name = "coffee-fof";
+          name = "recipe";
         };
         packageRequires = [ coffee-mode ];
         meta = {
@@ -9005,20 +11072,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    coffee-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    coffee-mode = callPackage ({ emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "coffee-mode";
         version = "20170324.240";
         src = fetchFromGitHub {
           owner = "defunkt";
           repo = "coffee-mode";
-          rev = "86ab8aae8662e8eff54d3013010b9c693b16eac5";
-          sha256 = "0hf06wp6cpsm7fivwkph6xvc2r39xww8q3aibp4nprlrwcmmv2al";
+          rev = "a4d07f123e42e8c8e356e825e922bc83929fc3cb";
+          sha256 = "0w3b3mwv5rlp305j7321izki9lrbnc8ks0v7r9m1ih26b8zci1gv";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/coffee-mode";
           sha256 = "1px50hs0x30psa5ljndpcc22c0qwcaxslpjf28cfgxinawnp74g1";
-          name = "coffee-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -9026,20 +11097,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    coin-ticker = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }:
-    melpaBuild {
+    coin-ticker = callPackage ({ emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild
+                               , request }:
+      melpaBuild {
         pname = "coin-ticker";
         version = "20170611.27";
         src = fetchFromGitHub {
           owner = "eklitzke";
           repo = "coin-ticker-mode";
-          rev = "9efab90fe4e6f29464af14e0d8fd1e20c0147b80";
-          sha256 = "0xnrh6v4s2s3fgvw0v9fl48dlk4r2p6axp7xf41gzb1ai81yczhv";
+          rev = "45108e239e1d129c0cc1ff37f2870cf73087780b";
+          sha256 = "1xqp9p19az4ajbaj734vn0fn6z3hbq44m4clj5xvd0rddai9c57n";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fd783998658b69159e39d9440da7a0dd04135e49/recipes/coin-ticker";
           sha256 = "0v4zyswhghknlsal9xfsgwf8ckjwrjkjrg8w7p6yjqrxmfsbw93b";
-          name = "coin-ticker";
+          name = "recipe";
         };
         packageRequires = [ emacs request ];
         meta = {
@@ -9047,8 +11123,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    colemak-evil = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    colemak-evil = callPackage ({ evil
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "colemak-evil";
         version = "20171015.1607";
         src = fetchFromGitHub {
@@ -9057,10 +11137,10 @@
           rev = "192c779281ae1fbf2405dcdb55b3c5b2a1d0b3d1";
           sha256 = "1clnvr7n6mx5b8pq1c6zchq7n1g8ip8hwgzc61ywrmiyv0v8rnc6";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0f0750a3f9537782ee61d6e56c51ce7b86def12e/recipes/colemak-evil";
           sha256 = "1bfzs5px1k6g3cnwjdaq2m78bbnfy3lxhjzkcch7zdv3nyacwl5z";
-          name = "colemak-evil";
+          name = "recipe";
         };
         packageRequires = [ evil ];
         meta = {
@@ -9068,8 +11148,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    colonoscopy-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    colonoscopy-theme = callPackage ({ emacs
+                                     , fetchFromGitHub
+                                     , fetchurl
+                                     , lib
+                                     , melpaBuild }:
+      melpaBuild {
         pname = "colonoscopy-theme";
         version = "20170808.609";
         src = fetchFromGitHub {
@@ -9078,10 +11162,10 @@
           rev = "64bbb322b13dae91ce9f1e3581f836f94f800ead";
           sha256 = "1r0is6zjkzikm565fvmj0gx8ms5ig9l5xihnka4fig7jy6ak33z5";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/641d1959bd31598fcdacd39a3d1bb077dcccfa5c/recipes/colonoscopy-theme";
           sha256 = "0x9bfr4j0sp41jkgnyjlaxnnjjrc102x6sznn6cgcmqk5qhswl4q";
-          name = "colonoscopy-theme";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -9089,20 +11173,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    color-identifiers-mode = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    color-identifiers-mode = callPackage ({ dash
+                                          , emacs
+                                          , fetchFromGitHub
+                                          , fetchurl
+                                          , lib
+                                          , melpaBuild }:
+      melpaBuild {
         pname = "color-identifiers-mode";
-        version = "20180308.1739";
+        version = "20180504.926";
         src = fetchFromGitHub {
           owner = "ankurdave";
           repo = "color-identifiers-mode";
-          rev = "2407ddea7873f55216d9512ca2fb5eef268d5eba";
-          sha256 = "0zah7w0dhgzwlgspvlb3gzsg6d2dqpxnmqm1kjjjdh3y0qimmy0g";
+          rev = "60ae3ab0fdffe0efae7e08950d7b2a96f4ea49e2";
+          sha256 = "0f2ji7ip1cm25fbna6yib37fjc4f1pafh9zld6a61ajgy1b3wjda";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5c735755e414fdf169aca5ec6f742533d21472e0/recipes/color-identifiers-mode";
           sha256 = "1hxp8lzn7kfckn5ngxic6qiz3nbynilqlxhlq9k1n1llfg216gfq";
-          name = "color-identifiers-mode";
+          name = "recipe";
         };
         packageRequires = [ dash emacs ];
         meta = {
@@ -9110,8 +11199,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    color-moccur = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    color-moccur = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "color-moccur";
         version = "20141222.1635";
         src = fetchFromGitHub {
@@ -9120,10 +11212,10 @@
           rev = "4f1c59ffd1ccc2ab1a171cd6b721e8cb9e002fb7";
           sha256 = "1p1f30qz4nd5a8ym2iwrgp6vhws0dls2qlc0apblj9nj3b0ziv0x";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/19105272fd8def5c7b22bfe5eeed5212e6ccae9c/recipes/color-moccur";
           sha256 = "17b9walfc5c9qfdvl9pcwb2gjikc3wxk1d3v878ckypmxd38vciq";
-          name = "color-moccur";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -9131,20 +11223,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    color-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    color-theme = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "color-theme";
-        version = "20070910.1007";
+        version = "20080305.34";
         src = fetchFromGitHub {
           owner = "emacsorphanage";
           repo = "color-theme";
-          rev = "eeb07560b30aaf7934dfd21f5c2518a479905cd9";
-          sha256 = "17bidzq9kiz250gal1fn9mg8gf8l749nz69z0awpc4x2222wxxiz";
+          rev = "f6bbc9eb7a136dd5f6e094cf1e9072b78a05e2de";
+          sha256 = "1jlwz8wyilrry13pihmpa9v7zn4l4r6hrxr8qf3l7yinbhzs70p1";
         };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/30de78c9cf83de30093a5647976eeaf552d4b2cb/recipes/color-theme";
-          sha256 = "1c1n0m4hhj2sxi08vjvayypf9g5i2hyng53ry950yfdqgzq7nk8i";
-          name = "color-theme";
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/be81fe3d1594473cb857d6d8d1345b60e512b802/recipes/color-theme";
+          sha256 = "1j5gdx452fzk20cdcy09spp1vbzxdqq573j3yamnw7gkppbc6298";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -9152,8 +11247,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    color-theme-approximate = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    color-theme-approximate = callPackage ({ fetchFromGitHub
+                                           , fetchurl
+                                           , lib
+                                           , melpaBuild }:
+      melpaBuild {
         pname = "color-theme-approximate";
         version = "20140227.2036";
         src = fetchFromGitHub {
@@ -9162,10 +11260,10 @@
           rev = "f54301ca39bc5d2ffb000f233f8114184a3e7d71";
           sha256 = "1b0ymwszqsjcihcbfp7s4fjam983ixh3yb7sdc0rmqlyric1zwxq";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f10631b740eea56e7209d7e84f0da8613274ef1d/recipes/color-theme-approximate";
           sha256 = "1wdnia9q42x7vky3ks555iic5s50g4mx7ss5ppaljvgxvbxyxqh1";
-          name = "color-theme-approximate";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -9173,20 +11271,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    color-theme-buffer-local = callPackage ({ color-theme, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    color-theme-buffer-local = callPackage ({ color-theme
+                                            , fetchFromGitHub
+                                            , fetchurl
+                                            , lib
+                                            , melpaBuild }:
+      melpaBuild {
         pname = "color-theme-buffer-local";
         version = "20170125.2201";
         src = fetchFromGitHub {
           owner = "vic";
           repo = "color-theme-buffer-local";
-          rev = "e606dec66f16a06140b9aad625a4fd52bca4f936";
-          sha256 = "0c04fy3hc8wc0aabilqx9mcipmd41rmshqjxc3z8m1w0bm4288g1";
+          rev = "faf7415c99e132094f1f09c6b6974ec118a18d87";
+          sha256 = "1zk5clvkrq2grmm1bws2l5vbv1ycp41978bb902c563aws2rb8c0";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e43060d80b3345ef4e8df9f5a9d66af8a44a9c41/recipes/color-theme-buffer-local";
           sha256 = "1448rffyzn5k5mr31hwd28wlj7if7rp5sjlqcsvbxd2mnbgkgjz0";
-          name = "color-theme-buffer-local";
+          name = "recipe";
         };
         packageRequires = [ color-theme ];
         meta = {
@@ -9194,8 +11296,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    color-theme-modern = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    color-theme-modern = callPackage ({ emacs
+                                      , fetchFromGitHub
+                                      , fetchurl
+                                      , lib
+                                      , melpaBuild }:
+      melpaBuild {
         pname = "color-theme-modern";
         version = "20161219.344";
         src = fetchFromGitHub {
@@ -9204,10 +11310,10 @@
           rev = "42a79266f1d7b473e9328e67a455e505e6c3eff5";
           sha256 = "0mw5rnzzc4yfcflg59viy81ziws680r44xr05qg032b5x02l8ar9";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2db82e101916d8709b711034da5ca6e4072e1077/recipes/color-theme-modern";
           sha256 = "0f662ham430fgxpqw96zcl1whcm28cv710g6wvg4fma60sblaxcm";
-          name = "color-theme-modern";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -9215,20 +11321,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    color-theme-sanityinc-solarized = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    color-theme-sanityinc-solarized = callPackage ({ fetchFromGitHub
+                                                   , fetchurl
+                                                   , lib
+                                                   , melpaBuild }:
+      melpaBuild {
         pname = "color-theme-sanityinc-solarized";
         version = "20160429.1903";
         src = fetchFromGitHub {
           owner = "purcell";
           repo = "color-theme-sanityinc-solarized";
-          rev = "6dd1d67a8e88a7bd586572cabe519b99a90fc3ee";
-          sha256 = "08bxyrpx7shgzgnmklshgdfa457imdmn5rv4j3pyp8pfwf0zg9h5";
+          rev = "6d1cf921881a0db6286ad6904aff2d17b2a335b3";
+          sha256 = "0cw1al8dan7vglkm33wkznvmyma903ckd95l1ns6qmf1d55lnpig";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/color-theme-sanityinc-solarized";
           sha256 = "0xg79hgb893f1nqx6q4q6hp4w6rvgp1aah1v2r3scg2jk057qxkf";
-          name = "color-theme-sanityinc-solarized";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -9236,20 +11345,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    color-theme-sanityinc-tomorrow = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    color-theme-sanityinc-tomorrow = callPackage ({ fetchFromGitHub
+                                                  , fetchurl
+                                                  , lib
+                                                  , melpaBuild }:
+      melpaBuild {
         pname = "color-theme-sanityinc-tomorrow";
-        version = "20180302.1412";
+        version = "20180713.212";
         src = fetchFromGitHub {
           owner = "purcell";
           repo = "color-theme-sanityinc-tomorrow";
-          rev = "6be4fea186f2865d6d027eade7d4a15d35e9a88b";
-          sha256 = "1lil6n0fd3d8wajdr8qzgw5np1v3nzympsjrn3dk7zwwdf8b1zk4";
+          rev = "0360984a8a170df8a1dc0870cf547c0e3c4b5b71";
+          sha256 = "0ff8jmzp02lmqp8pb0pa0wbqq3p59ypd3ljzwk1nbmzjw0xx8z6d";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/color-theme-sanityinc-tomorrow";
           sha256 = "1k8iwjc7iidq5sxybs47rnswa6c5dwqfdzfw7w0by2h1id2z6nqd";
-          name = "color-theme-sanityinc-tomorrow";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -9257,8 +11369,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    color-theme-solarized = callPackage ({ color-theme, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    color-theme-solarized = callPackage ({ color-theme
+                                         , fetchFromGitHub
+                                         , fetchurl
+                                         , lib
+                                         , melpaBuild }:
+      melpaBuild {
         pname = "color-theme-solarized";
         version = "20171024.825";
         src = fetchFromGitHub {
@@ -9267,10 +11383,10 @@
           rev = "f3ca8902ea056fb8e46cb09f09c96294e31cd4ee";
           sha256 = "16d7adqi07lzzr0qipl1fbag9l8kiyr3xrqxi528pimcisbg85d3";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/17096b452740bf6b7afa38e62df8e623494aa6b2/recipes/color-theme-solarized";
           sha256 = "011rzq38ffmq7f2nzwrq96wwz67p82p1f0p5nib4nwqa47xlx7kf";
-          name = "color-theme-solarized";
+          name = "recipe";
         };
         packageRequires = [ color-theme ];
         meta = {
@@ -9278,8 +11394,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    color-theme-x = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    color-theme-x = callPackage ({ cl-lib ? null
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "color-theme-x";
         version = "20180226.1646";
         src = fetchFromGitHub {
@@ -9288,10 +11408,10 @@
           rev = "6c2264aa6c5d9a72caeae67ebaa4472090e70350";
           sha256 = "1fyz8bampcqzpbyg0l1g0nvv2m5n8000xy5yl05217dlxb448nnd";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/321900baf4149f8b58b075b9fb27716cf708f2a2/recipes/color-theme-x";
           sha256 = "0nb2hqmmj1rhqjcbv5m8r9g2bf993lp45ka9rrxqp0pkmyd9fvs2";
-          name = "color-theme-x";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -9299,20 +11419,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    colormaps = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    colormaps = callPackage ({ emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "colormaps";
         version = "20171008.1524";
         src = fetchFromGitHub {
           owner = "lepisma";
           repo = "colormaps.el";
-          rev = "19fbb64a6288d505b9cf45c9b5a3eed0bfb135e2";
-          sha256 = "0kbhy8bpxqdr1kjczz2vm7chfpjprx2frpbh1gh9i1gwwx5k4myp";
+          rev = "3a88961ba66b09a49ea5aa92b2b8776b2c92d68c";
+          sha256 = "083hks2zzalizdsgabiwc1kd114r748v5i3w3kfk8pv37i2gay35";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f4c795d9e323b08bc8354a6933a061644705a2ec/recipes/colormaps";
           sha256 = "16plhgpfz1wb58p6h8wxjhplhgv0mbj3f2xj34p6vydh44l8w8q2";
-          name = "colormaps";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -9320,8 +11444,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    column-enforce-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    column-enforce-mode = callPackage ({ fetchFromGitHub
+                                       , fetchurl
+                                       , lib
+                                       , melpaBuild }:
+      melpaBuild {
         pname = "column-enforce-mode";
         version = "20171030.1200";
         src = fetchFromGitHub {
@@ -9330,10 +11457,10 @@
           rev = "2341a2b6a33d4b8b74c35062ec9cfe1bffd61944";
           sha256 = "0rcxb7daxxrp5f1i5cbv25viwawbbsn4ij1mnlclp5wz7ilcy2rs";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/91bebef8e97665a5d076c557d559367911a25ea2/recipes/column-enforce-mode";
           sha256 = "1qh7kwr65spbbnzvq744gkksx50x04zs0nwn5ly60swc05d05lcg";
-          name = "column-enforce-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -9341,20 +11468,50 @@
           license = lib.licenses.free;
         };
       }) {};
-    comint-intercept = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    com-css-sort = callPackage ({ emacs
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild
+                                , s }:
+      melpaBuild {
+        pname = "com-css-sort";
+        version = "20180607.1808";
+        src = fetchFromGitHub {
+          owner = "jcs090218";
+          repo = "com-css-sort";
+          rev = "1564c035039a053936d186b4db7a71b34db99200";
+          sha256 = "15caqg1sdd5kc81ipi9x2crqfhm6sdgwgvvk0gxx8dsr93rg22zy";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/5189ae21fc97f6b96024a3279a26e43ddc23ae29/recipes/com-css-sort";
+          sha256 = "0hga2m735lvyj1wzybgp6wh1yv98xnandvavvg7g7mscvf2sl89f";
+          name = "recipe";
+        };
+        packageRequires = [ emacs s ];
+        meta = {
+          homepage = "https://melpa.org/#/com-css-sort";
+          license = lib.licenses.free;
+        };
+      }) {};
+    comint-intercept = callPackage ({ emacs
+                                    , fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "comint-intercept";
         version = "20170317.528";
         src = fetchFromGitHub {
           owner = "hying-caritas";
           repo = "comint-intercept";
-          rev = "a329abf01fa8e0c6b02b46b29bcb421a21120dc5";
-          sha256 = "0qswlafav415fh1dwqjsjmqlbnsjdl9gl3nzzya76ql5f0gb7svb";
+          rev = "84c41e60e1ea3e9d5da1eb99e9926a52b6658d6d";
+          sha256 = "0jyi698abpjdaxb9l9ndq599w77svp7vgd3b708kn461gmqmkxv7";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7d38188ec2d6e16714de9bb24ebd1ea89c7df3da/recipes/comint-intercept";
           sha256 = "1m2fn02n7aphlqmiaxgwp8jqg60sq4001cnkdxn5wb3w1hxy5qvq";
-          name = "comint-intercept";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -9362,8 +11519,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    command-log-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    command-log-mode = callPackage ({ fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "command-log-mode";
         version = "20160412.2147";
         src = fetchFromGitHub {
@@ -9372,10 +11532,10 @@
           rev = "af600e6b4129c8115f464af576505ea8e789db27";
           sha256 = "06hll2frlx4sg9fj13a7ipq9y24isbjkjm6034xswhak40m7g1ii";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8426ca3c543178018f7feae6f0076af67a898483/recipes/command-log-mode";
           sha256 = "11jq6055bvpwvrm0b8cgab25wa2mcyylpz4j56h1nqj7cnhb6ppj";
-          name = "command-log-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -9383,8 +11543,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    command-queue = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    command-queue = callPackage ({ emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "command-queue";
         version = "20160328.1025";
         src = fetchFromGitHub {
@@ -9393,10 +11557,10 @@
           rev = "f327c6f852592229a755ec6de0c62c6aeafd6659";
           sha256 = "0216hzdl4h1jssw5g2y95z4yx7abqsaxpk1s78r35w5cnx7kplrc";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8fd6a70036e88039c850d280fbac782d04790a5f/recipes/command-queue";
           sha256 = "1jaywdg8vcf1v6ayy1zd5mjs0x3s96845ig9ssb08397lfqasx1k";
-          name = "command-queue";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -9404,20 +11568,27 @@
           license = lib.licenses.free;
         };
       }) {};
-    commander = callPackage ({ cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    commander = callPackage ({ cl-lib ? null
+                             , dash
+                             , f
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild
+                             , s }:
+      melpaBuild {
         pname = "commander";
         version = "20140120.1052";
         src = fetchFromGitHub {
           owner = "rejeep";
           repo = "commander.el";
-          rev = "c93985dc318fe89e5a29abc21d19fb41e2fd14d2";
-          sha256 = "0mlabiraagqwl17payils5589fr2mivvkzrfic6ndsipryab6rfc";
+          rev = "2c8a57b9c619e29ccbe2d5a85921b9c689e95bf9";
+          sha256 = "1j6hhyzww7wfwk6bllbb5mk4hw4qs8hsgfbfdifsam9c6i4spm45";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8b308e05dd85856addbc04a9438f5026803cebd7/recipes/commander";
           sha256 = "17y0hg6a90hflgwn24ww23qmvc1alzivpipca8zvpf0nih4fl393";
-          name = "commander";
+          name = "recipe";
         };
         packageRequires = [ cl-lib dash f s ];
         meta = {
@@ -9425,8 +11596,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    comment-dwim-2 = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    comment-dwim-2 = callPackage ({ fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "comment-dwim-2";
         version = "20170809.1354";
         src = fetchFromGitHub {
@@ -9435,10 +11609,10 @@
           rev = "8da8aba4cab4a0a1eef3aea2de219227526876e4";
           sha256 = "1bvgdm52bp39gdcqxb02bnxssmih887jgr82m3c09yfwkpnr2qry";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4ac6ac97875117013515a36c9a4452fbd6c0d74c/recipes/comment-dwim-2";
           sha256 = "1w9w2a72ygsj5w47vjqcljajmmbz0mi8dhz5gjnpwxjwsr6fn6lj";
-          name = "comment-dwim-2";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -9446,20 +11620,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    comment-tags = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    comment-tags = callPackage ({ emacs
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "comment-tags";
         version = "20170910.1035";
         src = fetchFromGitHub {
           owner = "vincekd";
           repo = "comment-tags";
-          rev = "7d914097f0a03484af71e621db533737fc692f58";
-          sha256 = "0s86a7078arck9z4gzkp2hnxyklprl0zh5hsw7nkyyscjydly80i";
+          rev = "7ae64a8d7aca098f360e03e9a3e780e27715c6e3";
+          sha256 = "16bdc1kv2a15mn8ms170ahb4apz5csbwnxy227pg46kwfmxxqs2m";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6ac71f4ffc19bce4f571001f9270d5be855dfc3c/recipes/comment-tags";
           sha256 = "13slv150zch0b7zpxa2dbqjzpqh0iy559m6rc0zs0dwdagzryp3i";
-          name = "comment-tags";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -9467,8 +11645,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    commenter = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }:
-    melpaBuild {
+    commenter = callPackage ({ emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , let-alist
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "commenter";
         version = "20160219.827";
         src = fetchFromGitHub {
@@ -9477,10 +11660,10 @@
           rev = "6d1885419434ba779270c6fda0e30d390bb074bd";
           sha256 = "1jwd3whag39qhzhbsfivzdlcr6vj37dv5ychkhmilw8v6dfdnpdb";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/437afab17b22c0c559617afa06923b5bc73a3ae8/recipes/commenter";
           sha256 = "01bm8jbj6xw23nls4fps6zwjkgvcsjhmn3l3ncqd764kwhxdx8q3";
-          name = "commenter";
+          name = "recipe";
         };
         packageRequires = [ emacs let-alist ];
         meta = {
@@ -9488,8 +11671,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    commify = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    commify = callPackage ({ fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild
+                           , s }:
+      melpaBuild {
         pname = "commify";
         version = "20161106.1534";
         src = fetchFromGitHub {
@@ -9498,10 +11685,10 @@
           rev = "78732c2fa6c1a10288b7436d7c561ec9ebdd41be";
           sha256 = "1kb3cbjp69niq8ravh273dma0mnkf1v2ja372ahxfsq1janrkkm6";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fec4b048e1dc78a07acce7d2e6527b9f417d06d5/recipes/commify";
           sha256 = "1jc6iqa4hna3277hx13scfcqzkr43yv6gndbxv7qf4ydi01ysd0m";
-          name = "commify";
+          name = "recipe";
         };
         packageRequires = [ s ];
         meta = {
@@ -9509,8 +11696,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    common-lisp-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
-    melpaBuild {
+    common-lisp-snippets = callPackage ({ fetchFromGitHub
+                                        , fetchurl
+                                        , lib
+                                        , melpaBuild
+                                        , yasnippet }:
+      melpaBuild {
         pname = "common-lisp-snippets";
         version = "20180226.723";
         src = fetchFromGitHub {
@@ -9519,10 +11710,10 @@
           rev = "1ddf808311ba4d9e8444a1cb50bd5ee75e4111f6";
           sha256 = "0zalsvs47hv33dmbs94srpb8q354sr52sxbad182p69dn1khlwyp";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/48d0166ccd3dcdd3df4719349778c6c5ab6872ca/recipes/common-lisp-snippets";
           sha256 = "0ig8cz00cbfx0jckqk1xhsvm18ivl2mjvcn65s941nblsywfvxjl";
-          name = "common-lisp-snippets";
+          name = "recipe";
         };
         packageRequires = [ yasnippet ];
         meta = {
@@ -9530,20 +11721,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    company = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    company = callPackage ({ emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "company";
-        version = "20180415.2135";
+        version = "20180704.701";
         src = fetchFromGitHub {
           owner = "company-mode";
           repo = "company-mode";
-          rev = "46680da66a3ba70c7b2371832f8b8d9734dec554";
-          sha256 = "03q76dvjka0xw91gzin848virwpm9dv71y3y2p3m168y7chk4g7s";
+          rev = "1f836b6b16d313bddef2cccebf49f42d36c58e28";
+          sha256 = "1r3x8shwhc24c8vkrcach99lfhpy180713f89frzn2cbmwyklyh4";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/96e7b4184497d0d0db532947f2801398b72432e4/recipes/company";
           sha256 = "0v4x038ly970lkzb0n8fbqssfqwx1p46xldr7nss32jiqvavr4m4";
-          name = "company";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -9551,20 +11746,28 @@
           license = lib.licenses.free;
         };
       }) {};
-    company-anaconda = callPackage ({ anaconda-mode, cl-lib ? null, company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    company-anaconda = callPackage ({ anaconda-mode
+                                    , cl-lib ? null
+                                    , company
+                                    , dash
+                                    , fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild
+                                    , s }:
+      melpaBuild {
         pname = "company-anaconda";
-        version = "20171222.342";
+        version = "20180610.2321";
         src = fetchFromGitHub {
           owner = "proofit404";
           repo = "company-anaconda";
-          rev = "4519b1c9888b0d9665f0805e08362280a4945081";
-          sha256 = "1vsh9m1q6jc4c9xy9xri1764n8fkpz8mz6np6gcmn86jfw5dk0fk";
+          rev = "ef6cbe26af1ee526a38139ed21cec8569c1b989d";
+          sha256 = "1dk1gzd59abh123xqb7r8h5flf4f29mljh48qzkx0r7ppqdzqgnz";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0eb23a75c8b57b4af1737c0508f03e66430e6076/recipes/company-anaconda";
           sha256 = "1s7y47ghy7q35qpfqavh4p9wr91i6r579mdbpvv6h5by856yn4gl";
-          name = "company-anaconda";
+          name = "recipe";
         };
         packageRequires = [ anaconda-mode cl-lib company dash s ];
         meta = {
@@ -9572,20 +11775,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    company-ansible = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    company-ansible = callPackage ({ company
+                                   , emacs
+                                   , fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "company-ansible";
-        version = "20180401.640";
+        version = "20180701.1113";
         src = fetchFromGitHub {
           owner = "krzysztof-magosa";
           repo = "company-ansible";
-          rev = "42753d43333c6e4ad83797f0234149b76b463369";
-          sha256 = "1g93vnizl42k52ar47g7yn2csjyzsqvwb6siwbpfvjgbsr5d5d01";
+          rev = "c6dc714e3a15f89671ae5e8fe668858b20ef63e8";
+          sha256 = "01nly13i2bs77lrvkm26i96vrrigbxpb9cakski9fv3xrvfxq9bv";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7b44cd4bd9f9a7c942ca3f3bd88b2ce61ffff130/recipes/company-ansible";
           sha256 = "084l9dr2hvm00952y4m3jhchzxjhcd61sfn5ywj9b9a1d4sr110d";
-          name = "company-ansible";
+          name = "recipe";
         };
         packageRequires = [ company emacs ];
         meta = {
@@ -9593,20 +11801,30 @@
           license = lib.licenses.free;
         };
       }) {};
-    company-arduino = callPackage ({ arduino-mode, cl-lib ? null, company, company-c-headers, company-irony, emacs, fetchFromGitHub, fetchurl, irony, lib, melpaBuild }:
-    melpaBuild {
+    company-arduino = callPackage ({ arduino-mode
+                                   , cl-lib ? null
+                                   , company
+                                   , company-c-headers
+                                   , company-irony
+                                   , emacs
+                                   , fetchFromGitHub
+                                   , fetchurl
+                                   , irony
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "company-arduino";
         version = "20160306.939";
         src = fetchFromGitHub {
           owner = "yuutayamada";
           repo = "company-arduino";
-          rev = "d7e369702b8eee63e6dfdeba645ce28b6dc66fb1";
-          sha256 = "06v7y7gxlxrxdaqy8c93niy1di80r738cq7rkghnhqi174pwl1wv";
+          rev = "5958b917cc5cc729dc64d74d947da5ee91c48980";
+          sha256 = "08766m35s0r2fyv32y0h3sns9d5jykbgg24d2z8czklnc8hay7jc";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/45350f816c4f5249792d29f97ef91f8c0685b983/recipes/company-arduino";
           sha256 = "1bch447lllikip1xd90kdgssgc67sl04a70fxqkqlrc1bs6gkkws";
-          name = "company-arduino";
+          name = "recipe";
         };
         packageRequires = [
           arduino-mode
@@ -9622,8 +11840,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    company-auctex = callPackage ({ auctex, company, fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
-    melpaBuild {
+    company-auctex = callPackage ({ auctex
+                                  , company
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild
+                                  , yasnippet }:
+      melpaBuild {
         pname = "company-auctex";
         version = "20180330.1118";
         src = fetchFromGitHub {
@@ -9632,10 +11856,10 @@
           rev = "f24de90a14c46fc3b924875c658b319c7f209aff";
           sha256 = "0izi2p8whif6nlbippjw0zxkd0zilmgj2n0arx6k0zi7k4vbfsb7";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/189e1a60894db0787a4468b120fbab84be1b5d59/recipes/company-auctex";
           sha256 = "1jia80sqmm83kzjcf1h1d9iz2k4k9albzvfka5hx6hpa4h8nm5q4";
-          name = "company-auctex";
+          name = "recipe";
         };
         packageRequires = [ auctex company yasnippet ];
         meta = {
@@ -9643,19 +11867,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    company-axiom = callPackage ({ axiom-environment, company, emacs, fetchgit, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    company-axiom = callPackage ({ axiom-environment
+                                 , company
+                                 , emacs
+                                 , fetchgit
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "company-axiom";
         version = "20171024.1310";
         src = fetchgit {
           url = "https://bitbucket.org/pdo/axiom-environment";
-          rev = "6842fb7f85df839acde395093647e2f91cf62fdd";
-          sha256 = "1ag5isg0bvarf86978zd2zq1mbs3ysy29ywvgapls6115ws5k9k8";
+          rev = "11ae39b2fcb344932b3f4b6a9fb6341880e3b8fa";
+          sha256 = "1mygz9cd79w56sk3szh0mkgnng7mgr5jqqfd32yfjc3spvs6yzlh";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8b4c6b03c5ff78ce327dcf66b175e266bbc53dbf/recipes/company-axiom";
           sha256 = "061n8zn11r5a9m96sqnw8kx252n1m401cmcyqla8n9valjbnvsag";
-          name = "company-axiom";
+          name = "recipe";
         };
         packageRequires = [ axiom-environment company emacs ];
         meta = {
@@ -9663,8 +11893,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    company-bibtex = callPackage ({ cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib }:
-    melpaBuild {
+    company-bibtex = callPackage ({ cl-lib ? null
+                                  , company
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild
+                                  , parsebib }:
+      melpaBuild {
         pname = "company-bibtex";
         version = "20171104.2344";
         src = fetchFromGitHub {
@@ -9673,10 +11909,10 @@
           rev = "225c6f5c0c070c94c8cdbbd452ea548cd94d76f4";
           sha256 = "0bv2jcmyirdxm158w2766l3q7kh7h71l9milwc9fl8qfz7wb5l80";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/company-bibtex";
           sha256 = "1b96p5qyxl6jlq0kz0dbma5pwvgqcy4x4gmpknjqrjabafbq1ynn";
-          name = "company-bibtex";
+          name = "recipe";
         };
         packageRequires = [ cl-lib company parsebib ];
         meta = {
@@ -9684,20 +11920,27 @@
           license = lib.licenses.free;
         };
       }) {};
-    company-box = callPackage ({ company, dash, dash-functional, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    company-box = callPackage ({ company
+                               , dash
+                               , dash-functional
+                               , emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "company-box";
-        version = "20180413.1651";
+        version = "20180607.845";
         src = fetchFromGitHub {
           owner = "sebastiencs";
           repo = "company-box";
-          rev = "a27b632c1bb92de3415cea08c7885f3dc9ce30eb";
-          sha256 = "1p71yalry5linxdb5xiyig8wlb9nw0c5nmlkdxc1l0gyhr8lrzci";
+          rev = "6e047e6fd7226a1b8292a74985db82bbccc679c7";
+          sha256 = "0m6rzwg08jcr9kibzxf18rsxjb13igscjyf5zkx1cx7y16zv1i6b";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a54879f4dd4dcb6867680567731547d604ad02bb/recipes/company-box";
           sha256 = "0v39gja3jp8b2xfn9da93xsh8mihizwbg0gqp2yyczaxjm8ga23i";
-          name = "company-box";
+          name = "recipe";
         };
         packageRequires = [ company dash dash-functional emacs ];
         meta = {
@@ -9705,8 +11948,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    company-c-headers = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    company-c-headers = callPackage ({ company
+                                     , emacs
+                                     , fetchFromGitHub
+                                     , fetchurl
+                                     , lib
+                                     , melpaBuild }:
+      melpaBuild {
         pname = "company-c-headers";
         version = "20170531.1330";
         src = fetchFromGitHub {
@@ -9715,10 +11963,10 @@
           rev = "e959d43bebf0a524f7378669983a39ee1379cc21";
           sha256 = "18fi1jp3scz5rrf877qd1ciwx29bzndb85ifnx4ki0jvznvfas8n";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d97b5c53967e0ff767b3654c52622f4b5ddf1985/recipes/company-c-headers";
           sha256 = "1715vnjr5cjiq8gjcd3idnpnijg5cg3sw3f8gr5x2ixcrip1hx3a";
-          name = "company-c-headers";
+          name = "recipe";
         };
         packageRequires = [ company emacs ];
         meta = {
@@ -9726,8 +11974,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    company-cabal = callPackage ({ cl-lib ? null, company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    company-cabal = callPackage ({ cl-lib ? null
+                                 , company
+                                 , emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "company-cabal";
         version = "20170917.617";
         src = fetchFromGitHub {
@@ -9736,10 +11990,10 @@
           rev = "62112a7259e24bd6c08885629a185afe512b7d3d";
           sha256 = "1gf45xwjzdm8i4q6c6khk4dbg1mmp2r0awz2sjr4dcr2dbd1n7mg";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ee888b1ba57b6af3a3330607898810cd248862db/recipes/company-cabal";
           sha256 = "0pbjidj88c9qri6xw8023yqwnczad5ig224cbsz6vsmdla2nlxra";
-          name = "company-cabal";
+          name = "recipe";
         };
         packageRequires = [ cl-lib company emacs ];
         meta = {
@@ -9747,29 +12001,42 @@
           license = lib.licenses.free;
         };
       }) {};
-    company-childframe = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, posframe }:
-    melpaBuild {
+    company-childframe = callPackage ({ company-posframe
+                                      , emacs
+                                      , fetchFromGitHub
+                                      , fetchurl
+                                      , lib
+                                      , melpaBuild }:
+      melpaBuild {
         pname = "company-childframe";
-        version = "20180205.2236";
+        version = "20180704.2246";
         src = fetchFromGitHub {
           owner = "tumashu";
           repo = "company-childframe";
-          rev = "fb799c3c8f8099a0ec7d21beb3b90136704c741e";
-          sha256 = "121qqb797vfpfxxkk0gvh5x4p03lb6aarjfydl88ah6rw5087dij";
+          rev = "562eaa1e3a0c39dd36f10cda37a3724384fde1df";
+          sha256 = "0g40i3qwh0wnspwd4a5p08ndfjj21zmqv155c7ngp7bxnhvkn6vh";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4fda072eb1e3f4feb9ad9834104f748f5b749a0d/recipes/company-childframe";
           sha256 = "1l8bd9fnw49apvwjgrlfywascbczavpaxns2ydymmb6ksj00rvzy";
-          name = "company-childframe";
+          name = "recipe";
         };
-        packageRequires = [ company emacs posframe ];
+        packageRequires = [ company-posframe emacs ];
         meta = {
           homepage = "https://melpa.org/#/company-childframe";
           license = lib.licenses.free;
         };
       }) {};
-    company-coq = callPackage ({ cl-lib ? null, company, company-math, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
-    melpaBuild {
+    company-coq = callPackage ({ cl-lib ? null
+                               , company
+                               , company-math
+                               , dash
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild
+                               , yasnippet }:
+      melpaBuild {
         pname = "company-coq";
         version = "20180307.510";
         src = fetchFromGitHub {
@@ -9778,10 +12045,10 @@
           rev = "c2bd34f79472c27ee6f819820558c8b26f774748";
           sha256 = "1dvd7w93gly70x7j7dsn2n90w7n76k2bp96p4zlzxad94kvdj2a8";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7f89e3097c654774981953ef125679fec0b5b7c9/recipes/company-coq";
           sha256 = "1iagm07ckf60kg4i8m4n0gfmv0brqc4dcn7lkcz229r3f4kyqksa";
-          name = "company-coq";
+          name = "recipe";
         };
         packageRequires = [ cl-lib company company-math dash yasnippet ];
         meta = {
@@ -9789,8 +12056,17 @@
           license = lib.licenses.free;
         };
       }) {};
-    company-dcd = callPackage ({ cl-lib ? null, company, fetchFromGitHub, fetchurl, flycheck-dmd-dub, ivy, lib, melpaBuild, popwin, yasnippet }:
-    melpaBuild {
+    company-dcd = callPackage ({ cl-lib ? null
+                               , company
+                               , fetchFromGitHub
+                               , fetchurl
+                               , flycheck-dmd-dub
+                               , ivy
+                               , lib
+                               , melpaBuild
+                               , popwin
+                               , yasnippet }:
+      melpaBuild {
         pname = "company-dcd";
         version = "20170516.210";
         src = fetchFromGitHub {
@@ -9799,10 +12075,10 @@
           rev = "4832188a9e42287539a69c372fe1643166a6a7aa";
           sha256 = "07caaff8chabrgl4hqanq13p5qhzqx5fcg2synl8856d7v1456vc";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ad5be8c53911271fba03a88da7e9d518c6508ffe/recipes/company-dcd";
           sha256 = "03849k4jzs23iglk9ghcq6283c9asffcq4dznypcjax7y4x113vd";
-          name = "company-dcd";
+          name = "recipe";
         };
         packageRequires = [
           cl-lib
@@ -9817,8 +12093,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    company-dict = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, parent-mode }:
-    melpaBuild {
+    company-dict = callPackage ({ company
+                                , emacs
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild
+                                , parent-mode }:
+      melpaBuild {
         pname = "company-dict";
         version = "20180216.156";
         src = fetchFromGitHub {
@@ -9827,10 +12109,10 @@
           rev = "7ab6331d8095e9b93c726da754102fd708c0002e";
           sha256 = "18lfqankivzdijsklyi49a1v6nqixbmk4d1m6syqd63qj849aixa";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/212c077def5b4933c6001056132181e1a5850a7c/recipes/company-dict";
           sha256 = "1377b40f1j4rmw7lnhy1zsm6r234ds5zsn02v1ajm3bzrpkkmin0";
-          name = "company-dict";
+          name = "recipe";
         };
         packageRequires = [ company emacs parent-mode ];
         meta = {
@@ -9838,8 +12120,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    company-distel = callPackage ({ distel-completion-lib, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    company-distel = callPackage ({ distel-completion-lib
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "company-distel";
         version = "20161002.2339";
         src = fetchFromGitHub {
@@ -9848,10 +12134,10 @@
           rev = "2ba4eea51cecfa75cf62f58180460ee9ff43131f";
           sha256 = "1761lgplngmpn1vd8syc1h4g6q1dhngamz1j3n48z07c1ylzpkdd";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/90fff35dd9709b06802edef89d1fe6a96b7115a6/recipes/company-distel";
           sha256 = "1jklxwkm2dvpcasmy9vl48dxq3q9s4dlk159ica39z0kqpkpzmgw";
-          name = "company-distel";
+          name = "recipe";
         };
         packageRequires = [ distel-completion-lib ];
         meta = {
@@ -9859,20 +12145,27 @@
           license = lib.licenses.free;
         };
       }) {};
-    company-edbi = callPackage ({ cl-lib ? null, company, edbi, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    company-edbi = callPackage ({ cl-lib ? null
+                                , company
+                                , edbi
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild
+                                , s }:
+      melpaBuild {
         pname = "company-edbi";
         version = "20160221.1123";
         src = fetchFromGitHub {
           owner = "proofit404";
           repo = "company-edbi";
-          rev = "ffaeff75d0457285d16d11db772881542a6026ad";
-          sha256 = "16v4wzb9sp9ryfhgl3rk108pqvam2v6rh6hl6008083g557nmhq1";
+          rev = "08dc69ccfbcf10ca83f7075e9b735c6885cd7e11";
+          sha256 = "0n2hvrfbybsp57w6m9mm7ywjq30fwwx9bzc2rllfr06d2ms7naai";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5d881ff0927d5bd7f8192f58927ceabb9bad4beb/recipes/company-edbi";
           sha256 = "067ff1xdyqy4qzgk5pmqf4kksfjk1glkrslcj3rk4zmhcalwrfrm";
-          name = "company-edbi";
+          name = "recipe";
         };
         packageRequires = [ cl-lib company edbi s ];
         meta = {
@@ -9880,20 +12173,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    company-emacs-eclim = callPackage ({ cl-lib ? null, company, eclim, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    company-emacs-eclim = callPackage ({ cl-lib ? null
+                                       , company
+                                       , eclim
+                                       , fetchFromGitHub
+                                       , fetchurl
+                                       , lib
+                                       , melpaBuild }:
+      melpaBuild {
         pname = "company-emacs-eclim";
         version = "20170104.743";
         src = fetchFromGitHub {
           owner = "emacs-eclim";
           repo = "emacs-eclim";
-          rev = "6396ad1cd25c0a197109343ec1cce5d5080acdff";
-          sha256 = "04ci3qb3vgqdvsdfivhwfsxrgalh61b41bsr1cafk4gv3g3rdr13";
+          rev = "94508ebd071ff1052d68a20f7f1bf1038439fe43";
+          sha256 = "0l72zw93wv8ncn98d6ybnykhi3a60bc0kyx6z699wfhnnhhxhl0p";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1e9d3075587fbd9ca188535fd945a7dc451c6d7e/recipes/company-emacs-eclim";
           sha256 = "1l56hcy0y3cr38z1pjf0ilsdqdzvj3zwd40markm6si2xhdr8xig";
-          name = "company-emacs-eclim";
+          name = "recipe";
         };
         packageRequires = [ cl-lib company eclim ];
         meta = {
@@ -9901,8 +12200,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    company-emoji = callPackage ({ cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    company-emoji = callPackage ({ cl-lib ? null
+                                 , company
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "company-emoji";
         version = "20161230.1937";
         src = fetchFromGitHub {
@@ -9911,10 +12215,10 @@
           rev = "8dc88ffe0773ef44321f245d39430c14a1bc2b82";
           sha256 = "1y8l9wnc13g79znyw2qsbm33da2bhkj270ppikkg9h4x2qpmxilq";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5733dccdffe97911a30352fbcda2900c33d79810/recipes/company-emoji";
           sha256 = "1mflqqw9gnfcqjb6g8ivdfl7s4mdyjg7j0457hamgyvgvpxsh8x3";
-          name = "company-emoji";
+          name = "recipe";
         };
         packageRequires = [ cl-lib company ];
         meta = {
@@ -9922,8 +12226,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    company-erlang = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, ivy-erlang-complete, lib, melpaBuild }:
-    melpaBuild {
+    company-erlang = callPackage ({ company
+                                  , emacs
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , ivy-erlang-complete
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "company-erlang";
         version = "20170122.2138";
         src = fetchFromGitHub {
@@ -9932,10 +12242,10 @@
           rev = "bc0524a16f17b66c7397690e4ca0e004f09ea6c5";
           sha256 = "04wm3i65fpzln7sdcny88hfjfm0n7wy44ffsr3697x4l95d0bnyh";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ca96ed0b5d6f8aea4de56ddeaa003b9c81d96219/recipes/company-erlang";
           sha256 = "0qlc89c05523kjzsb7j3yfi022la47kgixl74ggkafhn60scwdm7";
-          name = "company-erlang";
+          name = "recipe";
         };
         packageRequires = [ company emacs ivy-erlang-complete ];
         meta = {
@@ -9943,8 +12253,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    company-flow = callPackage ({ company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    company-flow = callPackage ({ company
+                                , dash
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "company-flow";
         version = "20180225.1359";
         src = fetchFromGitHub {
@@ -9953,10 +12268,10 @@
           rev = "76ef585c70d2a3206c2eadf24ba61e59124c3a16";
           sha256 = "0zs9cblnbkxa0dxw4lyllmybqizxcdx96gv8jlhx20nrjpi78piw";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/63d346c14af1c5c138d14591a4d6dbc44d9bc429/recipes/company-flow";
           sha256 = "07brjfgiwv4dxjf0sca84allcy3qlp4jrkz7ki1qc5wmb5sd209l";
-          name = "company-flow";
+          name = "recipe";
         };
         packageRequires = [ company dash ];
         meta = {
@@ -9964,20 +12279,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    company-flx = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flx, lib, melpaBuild }:
-    melpaBuild {
+    company-flx = callPackage ({ company
+                               , emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , flx
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "company-flx";
         version = "20180102.2118";
         src = fetchFromGitHub {
           owner = "PythonNut";
           repo = "company-flx";
-          rev = "16ca0d2f84e8e768bf2db8c5cfe421230a00bded";
-          sha256 = "09zaaqi8587n1fv5pxnrdmdll319s8f66xkc41p51gcs2p7qa5w1";
+          rev = "05efcafb488f587bb6e60923078d97227462eb68";
+          sha256 = "12cg8amyk1pg1d2n8fb0mmls14jzwx08hq6s6g7wyd9s7y96hkhb";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f27d718ee67f8c91b208a35adbbcdac67bbb89ce/recipes/company-flx";
           sha256 = "1r4jcfzrhdpclblfrmi4qbl8dnhc2d7d4c1425xnslg7bhwd2vxn";
-          name = "company-flx";
+          name = "recipe";
         };
         packageRequires = [ company emacs flx ];
         meta = {
@@ -9985,8 +12306,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    company-ghc = callPackage ({ cl-lib ? null, company, emacs, fetchFromGitHub, fetchurl, ghc, lib, melpaBuild }:
-    melpaBuild {
+    company-ghc = callPackage ({ cl-lib ? null
+                               , company
+                               , emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , ghc
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "company-ghc";
         version = "20170918.133";
         src = fetchFromGitHub {
@@ -9995,10 +12323,10 @@
           rev = "dab111cb5067c545ccdc6b2d0ba70c1c4bbce060";
           sha256 = "0ygw3dhlz247qzmcsbnkkdry2w2ni60j1rbyqprnzp8sd5yk97r1";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/28f6a983444f796c81df7e5ee94d74c480b21298/recipes/company-ghc";
           sha256 = "07adykza4dqs64bk8vjmgryr54khxmcy28hms5z8i1qpsk9vmvnn";
-          name = "company-ghc";
+          name = "recipe";
         };
         packageRequires = [ cl-lib company emacs ghc ];
         meta = {
@@ -10006,8 +12334,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    company-ghci = callPackage ({ company, fetchFromGitHub, fetchurl, haskell-mode, lib, melpaBuild }:
-    melpaBuild {
+    company-ghci = callPackage ({ company
+                                , fetchFromGitHub
+                                , fetchurl
+                                , haskell-mode
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "company-ghci";
         version = "20160310.1800";
         src = fetchFromGitHub {
@@ -10016,10 +12349,10 @@
           rev = "c2d74a41166e76de2e78c87f582ba3a1179b2aa6";
           sha256 = "02gq083lpbszy8pf7s5j61bjlm0hacv4md4g17n0q6448rix9yny";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/company-ghci";
           sha256 = "0q71qil4sndg72s2g5yg17w3n102wlba37y9jbx0l7hisa5l11gi";
-          name = "company-ghci";
+          name = "recipe";
         };
         packageRequires = [ company haskell-mode ];
         meta = {
@@ -10027,8 +12360,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    company-glsl = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, glsl-mode, lib, melpaBuild }:
-    melpaBuild {
+    company-glsl = callPackage ({ company
+                                , emacs
+                                , fetchFromGitHub
+                                , fetchurl
+                                , glsl-mode
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "company-glsl";
         version = "20171015.1049";
         src = fetchFromGitHub {
@@ -10037,10 +12376,10 @@
           rev = "a262c12c3bcd0807718c4edcaf2b054e30ef0e26";
           sha256 = "0338bym8ifvkgpbc4vyzf3nmlp6rc8lihyxcbym5m08612ln78mk";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/abab3b5a9762639812e2aabf9d288ed367dcdc22/recipes/company-glsl";
           sha256 = "0lzy3xln5780yjwhhcz6vnc2j0k0rc7jfvqc8bv0xfabikgadmkn";
-          name = "company-glsl";
+          name = "recipe";
         };
         packageRequires = [ company emacs glsl-mode ];
         meta = {
@@ -10048,20 +12387,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    company-go = callPackage ({ company, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }:
-    melpaBuild {
+    company-go = callPackage ({ company
+                              , fetchFromGitHub
+                              , fetchurl
+                              , go-mode
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "company-go";
         version = "20170825.943";
         src = fetchFromGitHub {
           owner = "nsf";
           repo = "gocode";
-          rev = "d7aee89652f1bd8ca319c64d6dee1bc1dfd9b6ef";
-          sha256 = "1mbz80y0qa6vyvjs33hxsrq5vc2mza5rjhi6rvbxzy2a3lrx4cig";
+          rev = "84b76ec55b44739143088371a34ef30a4719dfe4";
+          sha256 = "0ig9jsx9gv3cya11r0w07xpby9rzlh3iz02mir0z7ffnf8qawmrc";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/company-go";
           sha256 = "1ncy5wlg3ywr17zrxb1d1bap4gdvwr35w9a8b0crz5h3l3y4cp29";
-          name = "company-go";
+          name = "recipe";
         };
         packageRequires = [ company go-mode ];
         meta = {
@@ -10069,20 +12413,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    company-inf-ruby = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, inf-ruby, lib, melpaBuild }:
-    melpaBuild {
+    company-inf-ruby = callPackage ({ company
+                                    , emacs
+                                    , fetchFromGitHub
+                                    , fetchurl
+                                    , inf-ruby
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "company-inf-ruby";
         version = "20140805.1354";
         src = fetchFromGitHub {
           owner = "company-mode";
           repo = "company-inf-ruby";
-          rev = "fe3e4863bc971fbb81edad447efad5795ead1b17";
-          sha256 = "0fnv4rvvs9rqzrs86g23jcrpg0rcgk25299hm6jm08ia0kjjby1m";
+          rev = "9c2eab3bb82e8838c54013026e6ffb51cccbd37e";
+          sha256 = "0sns1j74mbwkamiyfcq0jp6flzqknm0vbhr6vvg5nsw5b9lfir0a";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ec0f597ceed00c68faa030ff0bc5676c513919f1/recipes/company-inf-ruby";
           sha256 = "0cb1w0sxgb5jf0p2a5s2i4d511lsjjhyaqkqlwjz8nk4w14n0zxm";
-          name = "company-inf-ruby";
+          name = "recipe";
         };
         packageRequires = [ company emacs inf-ruby ];
         meta = {
@@ -10090,8 +12440,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    company-irony = callPackage ({ cl-lib ? null, company, emacs, fetchFromGitHub, fetchurl, irony, lib, melpaBuild }:
-    melpaBuild {
+    company-irony = callPackage ({ cl-lib ? null
+                                 , company
+                                 , emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , irony
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "company-irony";
         version = "20170905.1346";
         src = fetchFromGitHub {
@@ -10100,10 +12457,10 @@
           rev = "52aca45bcd0f2cb0648fcafa2bbb4f8ad4b2fee7";
           sha256 = "1qgyam2vyjw90kpxns5cd6bq3qiqjhzpwrlvmi18vyb69qcgqd8a";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d2b6a8d57b192325dcd30fddc9ff8dd1516ad680/recipes/company-irony";
           sha256 = "15adamk1b9y1i6k06i5ahf1wn70cgwlhgk0x6fk8pl5izg05z1km";
-          name = "company-irony";
+          name = "recipe";
         };
         packageRequires = [ cl-lib company emacs irony ];
         meta = {
@@ -10111,20 +12468,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    company-irony-c-headers = callPackage ({ cl-lib ? null, company, fetchFromGitHub, fetchurl, irony, lib, melpaBuild }:
-    melpaBuild {
+    company-irony-c-headers = callPackage ({ cl-lib ? null
+                                           , company
+                                           , fetchFromGitHub
+                                           , fetchurl
+                                           , irony
+                                           , lib
+                                           , melpaBuild }:
+      melpaBuild {
         pname = "company-irony-c-headers";
         version = "20151018.209";
         src = fetchFromGitHub {
           owner = "hotpxl";
           repo = "company-irony-c-headers";
-          rev = "72c386aeb079fb261d9ec02e39211272f76bbd97";
-          sha256 = "1f462v8xq2hdsr4ks4i79icpfz6fjpb4q7khnx6si55agxj3rvaq";
+          rev = "ba304fe7eebdff90bbc7dea063b45b82638427fa";
+          sha256 = "1x2dfjmy86icyv2g1y5bjlr87w8rixqdcndkwm1sba6ha277wp9i";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9f9f62d8ef438a9ba4872bd7731768eddc5905de/recipes/company-irony-c-headers";
           sha256 = "0kiag5ggmc2f5c3gd8nn40x16i686jpdrfrflgrz2aih8p3g6af8";
-          name = "company-irony-c-headers";
+          name = "recipe";
         };
         packageRequires = [ cl-lib company irony ];
         meta = {
@@ -10132,20 +12495,27 @@
           license = lib.licenses.free;
         };
       }) {};
-    company-jedi = callPackage ({ cl-lib ? null, company, emacs, fetchFromGitHub, fetchurl, jedi-core, lib, melpaBuild }:
-    melpaBuild {
+    company-jedi = callPackage ({ cl-lib ? null
+                                , company
+                                , emacs
+                                , fetchFromGitHub
+                                , fetchurl
+                                , jedi-core
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "company-jedi";
         version = "20151216.1921";
         src = fetchFromGitHub {
           owner = "syohex";
           repo = "emacs-company-jedi";
-          rev = "2f54e791e10f5dc0ff164bfe97f1878359fab6f6";
-          sha256 = "0bpqswcc6a65wms0pdk9rsad9jiigmx2l1jaqr8bz4va945qdlhg";
+          rev = "ad49407451c7f28fe137f9c8f3a7fc89e8693a1b";
+          sha256 = "1ihqapp4dv92794rsgyq0rmhwika60cmradqd4bn9b72ss6plxs1";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bded1840a39fbf1e014c01276eb2f9c5a4fc218f/recipes/company-jedi";
           sha256 = "1krrgrjq967c3j02y0i345yx6w4crisnj1k3bhih6j849fvy3fvj";
-          name = "company-jedi";
+          name = "recipe";
         };
         packageRequires = [ cl-lib company emacs jedi-core ];
         meta = {
@@ -10153,20 +12523,30 @@
           license = lib.licenses.free;
         };
       }) {};
-    company-lean = callPackage ({ company, dash, dash-functional, emacs, f, fetchFromGitHub, fetchurl, lean-mode, lib, melpaBuild, s }:
-    melpaBuild {
+    company-lean = callPackage ({ company
+                                , dash
+                                , dash-functional
+                                , emacs
+                                , f
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lean-mode
+                                , lib
+                                , melpaBuild
+                                , s }:
+      melpaBuild {
         pname = "company-lean";
         version = "20171102.754";
         src = fetchFromGitHub {
           owner = "leanprover";
           repo = "lean-mode";
-          rev = "ae90bd280588c96d540892d0f42247db5a126f51";
-          sha256 = "06d5f577rv82g72m719w8z9w7m63amxjsdppcyvg2i6icymlhnqa";
+          rev = "c0af876c967fc969d67c467bc6767210d19c5d87";
+          sha256 = "04qzck156wb2bvrb8adbn7rx2v0bsjcirlbx4ajajjsqy858ayn9";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/42f4d6438c8aeb94ebc1782f2f5e2abd17f0ffde/recipes/company-lean";
           sha256 = "1hqkn7w5dyznf7i3r3132q8x31r74q188jsm5kdrjqgbwak2p91a";
-          name = "company-lean";
+          name = "recipe";
         };
         packageRequires = [ company dash dash-functional emacs f lean-mode s ];
         meta = {
@@ -10174,20 +12554,28 @@
           license = lib.licenses.free;
         };
       }) {};
-    company-lsp = callPackage ({ company, dash, emacs, fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild, s }:
-    melpaBuild {
+    company-lsp = callPackage ({ company
+                               , dash
+                               , emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , lsp-mode
+                               , melpaBuild
+                               , s }:
+      melpaBuild {
         pname = "company-lsp";
-        version = "20180216.2325";
+        version = "20180617.1033";
         src = fetchFromGitHub {
           owner = "tigersoldier";
           repo = "company-lsp";
-          rev = "4512d062c38922d8b8cf402ca6043c246e915694";
-          sha256 = "0q95lgw02qy5dn3vpdhspmvjhnfzmmn2asajaf15q5lkjbsvxfrk";
+          rev = "1cb1990dcd1feabf87a726a0b2a15c6f79eb5525";
+          sha256 = "09mg2yvvl5mmwbav1d5k5flk2jcz6a684r6bv8vspfs32wpz0kwg";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5125f53307c1af3d9ccf2bae3c25e7d23dfe1932/recipes/company-lsp";
           sha256 = "09nbi6vxw8l26gfgsc1k3bx4m8i1px1b0jxaywszky5bv4fdy03l";
-          name = "company-lsp";
+          name = "recipe";
         };
         packageRequires = [ company dash emacs lsp-mode s ];
         meta = {
@@ -10195,8 +12583,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    company-lua = callPackage ({ company, f, fetchFromGitHub, fetchurl, lib, lua-mode, melpaBuild, s }:
-    melpaBuild {
+    company-lua = callPackage ({ company
+                               , f
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , lua-mode
+                               , melpaBuild
+                               , s }:
+      melpaBuild {
         pname = "company-lua";
         version = "20171108.1506";
         src = fetchFromGitHub {
@@ -10205,10 +12600,10 @@
           rev = "29f6819de4d691e5fd0b62893a9f4fbc1c6fcb52";
           sha256 = "0ny2dcc7c585p7v3j6q0rpkbj1qmf2ismy8a5020jpr585xvz0hh";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c8191ab2aaa72041be46091e363d216cf1b73fde/recipes/company-lua";
           sha256 = "13sm7ya2ndqxwdjarhxbmg7fvr3413c7p3n6yf1i4rabbliqsf2c";
-          name = "company-lua";
+          name = "recipe";
         };
         packageRequires = [ company f lua-mode s ];
         meta = {
@@ -10216,8 +12611,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    company-math = callPackage ({ company, fetchFromGitHub, fetchurl, lib, math-symbol-lists, melpaBuild }:
-    melpaBuild {
+    company-math = callPackage ({ company
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , math-symbol-lists
+                                , melpaBuild }:
+      melpaBuild {
         pname = "company-math";
         version = "20171016.814";
         src = fetchFromGitHub {
@@ -10226,10 +12626,10 @@
           rev = "3481f03ebb6a613ff85b71ca8edd2d5842c49012";
           sha256 = "0nbnqgl2jly1n5nx20hr2i84r2shxjb3axv2p597b5kw2bdbsva5";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fadff01600d57f5b9ea9c0c47ed109e058114998/recipes/company-math";
           sha256 = "0chig8k8l65bnd0a6734fiy0ikl20k9v2wlndh3ckz5a8h963g87";
-          name = "company-math";
+          name = "recipe";
         };
         packageRequires = [ company math-symbol-lists ];
         meta = {
@@ -10237,20 +12637,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    company-nand2tetris = callPackage ({ cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild, nand2tetris }:
-    melpaBuild {
+    company-nand2tetris = callPackage ({ cl-lib ? null
+                                       , company
+                                       , fetchFromGitHub
+                                       , fetchurl
+                                       , lib
+                                       , melpaBuild
+                                       , nand2tetris }:
+      melpaBuild {
         pname = "company-nand2tetris";
         version = "20171201.1013";
         src = fetchFromGitHub {
           owner = "CestDiego";
           repo = "nand2tetris.el";
-          rev = "33acee34d24b1c6a87db833b7d23449cf858f64f";
-          sha256 = "0sfa674g1qm280s0pc3n6qiiphj5i9ibknckx5capkrkxb5cwpkw";
+          rev = "fe37ee41367ceff6f7d7a472a5f80cf1285e1e01";
+          sha256 = "0g1gwayas7claa9cn3mv8dnlz46n78014qxb2ix25428dnsrridy";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/90421372b3f60b59762279ac805c61a984606d11/recipes/company-nand2tetris";
           sha256 = "1g2i33jjh7kbpzk835kbnqicf0w4cq5rqv934bqzz5kavj9cg886";
-          name = "company-nand2tetris";
+          name = "recipe";
         };
         packageRequires = [ cl-lib company nand2tetris ];
         meta = {
@@ -10258,20 +12664,50 @@
           license = lib.licenses.free;
         };
       }) {};
-    company-ngram = callPackage ({ cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    company-nginx = callPackage ({ emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
+        pname = "company-nginx";
+        version = "20180603.1702";
+        src = fetchFromGitHub {
+          owner = "stardiviner";
+          repo = "company-nginx";
+          rev = "3074a5d322562f36867ef67bffeb25f1c0d8aca9";
+          sha256 = "04nq6cihb5kymi3rjfx53337fx4g042cw1jxiv016sq88z24lznx";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fb8843cddfa9133ea9e2790e8a1d8051cd4dabea/recipes/company-nginx";
+          sha256 = "15pxz0v3zpshwri0v15yh995k7ih9h46y81n4xywlyyh34wys3sj";
+          name = "recipe";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/company-nginx";
+          license = lib.licenses.free;
+        };
+      }) {};
+    company-ngram = callPackage ({ cl-lib ? null
+                                 , company
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "company-ngram";
         version = "20170129.1113";
         src = fetchFromGitHub {
           owner = "kshramt";
           repo = "company-ngram";
-          rev = "09a68b802e64799e95f205b438d469bbd78cd2e6";
-          sha256 = "0qg1ws7xi418lbnx130xqkwgpsl0p218gqxwy0fpwky01iahwcw9";
+          rev = "d15182df3eac72b29772802759b77c9eafef5066";
+          sha256 = "05108s2a3c857n9j3c34hdni3fyq149pva4m3f51lis4wqrm4zv7";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/937e6a23782450525c4a90392c414173481e101b/recipes/company-ngram";
           sha256 = "1y9k9s8c248m91xld4f5l75j4swml333rpwq590bsx7mrsq131xx";
-          name = "company-ngram";
+          name = "recipe";
         };
         packageRequires = [ cl-lib company ];
         meta = {
@@ -10279,20 +12715,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    company-nixos-options = callPackage ({ cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild, nixos-options }:
-    melpaBuild {
+    company-nixos-options = callPackage ({ cl-lib ? null
+                                         , company
+                                         , fetchFromGitHub
+                                         , fetchurl
+                                         , lib
+                                         , melpaBuild
+                                         , nixos-options }:
+      melpaBuild {
         pname = "company-nixos-options";
         version = "20160215.57";
         src = fetchFromGitHub {
           owner = "travisbhartwell";
           repo = "nix-emacs";
-          rev = "7007363e773a419203a69798fb0e0731b2eb0f73";
-          sha256 = "00hv8fhyahkdh1vfy1qkahqvsik6d81c7mqh4gjiqxrmb2l1vbcb";
+          rev = "a4e1d9ea9f2e773170caa3afbe54ecdf73d04ec8";
+          sha256 = "1zcm74691bsay0l9vk2ffxgamrz8zyfmwkb9y915qylfwb48gyr2";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6846c7d86e70a9dd8300b89b61435aa7e146be96/recipes/company-nixos-options";
           sha256 = "1yrqqdadmf7qfxpqp8wwb325zjnwwjmn2hhnl7i3j0ckg6hqyqf0";
-          name = "company-nixos-options";
+          name = "recipe";
         };
         packageRequires = [ cl-lib company nixos-options ];
         meta = {
@@ -10300,20 +12742,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    company-php = callPackage ({ ac-php-core, cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    company-php = callPackage ({ ac-php-core
+                               , cl-lib ? null
+                               , company
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "company-php";
-        version = "20171226.1924";
+        version = "20180510.1500";
         src = fetchFromGitHub {
           owner = "xcwen";
           repo = "ac-php";
-          rev = "24204333743b3ba26a9a8d51f56f1d3195ae4115";
-          sha256 = "0y3pzf2zvqlsqs7255ihrswaxjq0q389yiiprlwzm86xsws8fbkw";
+          rev = "e452a20a9f94113260b9cba9af7fb44cc8c647ef";
+          sha256 = "08gvn4gq2j349rz24ask6nzqnvw15p9c8r2lby4n6n0zc6iaxzm5";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/company-php";
           sha256 = "1gnhklfkg17vxfx7fw65lr4nr07jx71y84mhs9zszwcr9p840hh5";
-          name = "company-php";
+          name = "recipe";
         };
         packageRequires = [ ac-php-core cl-lib company ];
         meta = {
@@ -10321,8 +12769,16 @@
           license = lib.licenses.free;
         };
       }) {};
-    company-plsense = callPackage ({ cl-lib ? null, company, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    company-plsense = callPackage ({ cl-lib ? null
+                                   , company
+                                   , dash
+                                   , emacs
+                                   , fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild
+                                   , s }:
+      melpaBuild {
         pname = "company-plsense";
         version = "20180117.1658";
         src = fetchFromGitHub {
@@ -10331,10 +12787,10 @@
           rev = "b48e3181e08ec597269621d621aa06636f02d883";
           sha256 = "14rawd5xfgnkhdpp43mz4a5mf480949ny5hr5w6v5djmsibqxw5s";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9cf9d671d81e07c704676c557a9f0d686067ce5c/recipes/company-plsense";
           sha256 = "0k8k2vpkknd4nyxzwdj7698lgm5d85byxd49x7w5nrxmh2h1w3c7";
-          name = "company-plsense";
+          name = "recipe";
         };
         packageRequires = [ cl-lib company dash emacs s ];
         meta = {
@@ -10342,20 +12798,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    company-pollen = callPackage ({ company, fetchFromGitHub, fetchurl, lib, melpaBuild, pollen-mode }:
-    melpaBuild {
+    company-pollen = callPackage ({ company
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild
+                                  , pollen-mode }:
+      melpaBuild {
         pname = "company-pollen";
         version = "20160812.810";
         src = fetchFromGitHub {
           owner = "lijunsong";
           repo = "pollen-mode";
-          rev = "df4eab5b490cb478a092e6bab6b07f9e2f9c6fad";
-          sha256 = "0x8bnf0n109ard5zdmma04w0wv5jb1r7qh5smsa1kjvws98gnp57";
+          rev = "9779f7f13b1e0cfb58af01af5d8ee9e783bb8a43";
+          sha256 = "1i49js8y09d6bd5jp4fkl7z7gldaw2bfg5m2f504av73gqzqkxf8";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/97bda0616abe3bb632fc4231e5317d9472dfd14f/recipes/company-pollen";
           sha256 = "1pz5d8j7scrv2ci9mxvyikwsk8badkrbp8dznnb5qq1ycqv24bl1";
-          name = "company-pollen";
+          name = "recipe";
         };
         packageRequires = [ company pollen-mode ];
         meta = {
@@ -10363,8 +12824,67 @@
           license = lib.licenses.free;
         };
       }) {};
-    company-qml = callPackage ({ company, fetchFromGitHub, fetchurl, lib, melpaBuild, qml-mode }:
-    melpaBuild {
+    company-posframe = callPackage ({ company
+                                    , emacs
+                                    , fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild
+                                    , posframe }:
+      melpaBuild {
+        pname = "company-posframe";
+        version = "20180610.1010";
+        src = fetchFromGitHub {
+          owner = "tumashu";
+          repo = "company-posframe";
+          rev = "47861f501891d3c67958353c25f4dce13b386c3d";
+          sha256 = "03fs5w72wfnk0mr31q5kczlpk0rbim850pj6wzr0f6zn8j0p2lci";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/68c1203ae710e5f7af3f0e5e2877aba6deaf1ac8/recipes/company-posframe";
+          sha256 = "1pd68m3hcn6wggw8a026x5kxn73f3zs278vs96q6cb5gbxyyhirs";
+          name = "recipe";
+        };
+        packageRequires = [ company emacs posframe ];
+        meta = {
+          homepage = "https://melpa.org/#/company-posframe";
+          license = lib.licenses.free;
+        };
+      }) {};
+    company-prescient = callPackage ({ company
+                                     , emacs
+                                     , fetchFromGitHub
+                                     , fetchurl
+                                     , lib
+                                     , melpaBuild
+                                     , prescient }:
+      melpaBuild {
+        pname = "company-prescient";
+        version = "20180626.1050";
+        src = fetchFromGitHub {
+          owner = "raxod502";
+          repo = "prescient.el";
+          rev = "515959a2523b43608c9d06dcf8adde8911ce42b9";
+          sha256 = "1k8xk154sql3b2b7hpyxslcgl88aaxq5ak2sr760jsq2qk7878bw";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/b92c34e493bbefab1d7747b0855d1ab2f984cb7c/recipes/company-prescient";
+          sha256 = "0cp918ihbjqxfgqnifknl5hphmvq5bl42dhp5ylvijsfa8kvbsb9";
+          name = "recipe";
+        };
+        packageRequires = [ company emacs prescient ];
+        meta = {
+          homepage = "https://melpa.org/#/company-prescient";
+          license = lib.licenses.free;
+        };
+      }) {};
+    company-qml = callPackage ({ company
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild
+                               , qml-mode }:
+      melpaBuild {
         pname = "company-qml";
         version = "20170428.1008";
         src = fetchFromGitHub {
@@ -10373,10 +12893,10 @@
           rev = "4af4f32a7ad86d86bb9293fb0b675aec513b5736";
           sha256 = "09d733r07gr4cxp7npyhi93xchvirxh1v00fr487v4a0mdaahpxf";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5b53477eaba4ef62f8317c9454e15ac015442fed/recipes/company-qml";
           sha256 = "0sva7i93dam8mc2z3cp785vmgcg7cphrpkwyvqyqhq8w51qg8mxx";
-          name = "company-qml";
+          name = "recipe";
         };
         packageRequires = [ company qml-mode ];
         meta = {
@@ -10384,20 +12904,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    company-quickhelp = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pos-tip }:
-    melpaBuild {
+    company-quickhelp = callPackage ({ company
+                                     , emacs
+                                     , fetchFromGitHub
+                                     , fetchurl
+                                     , lib
+                                     , melpaBuild
+                                     , pos-tip }:
+      melpaBuild {
         pname = "company-quickhelp";
-        version = "20180323.1200";
+        version = "20180525.303";
         src = fetchFromGitHub {
           owner = "expez";
           repo = "company-quickhelp";
-          rev = "1580b107ebecb98cf5c21a5b7185d4bfe761047d";
-          sha256 = "0d237si89c4r325zirqvivq5k9b59hyahnfjlgc3fy9cnr07xqg3";
+          rev = "479676cade80a9f03802ca3d956591820ed5c537";
+          sha256 = "0hbqpnaf4hnin3nmdzmfj3v22kk9a97b6zssqs96ns36d9h52xcp";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/022cc4fee54bb0194822947c70058145e2980b94/recipes/company-quickhelp";
           sha256 = "042bwv0wd4hksbm528zb7pbllzk83p8qjq5f8z46p84c8mmxfp9g";
-          name = "company-quickhelp";
+          name = "recipe";
         };
         packageRequires = [ company emacs pos-tip ];
         meta = {
@@ -10405,8 +12931,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    company-racer = callPackage ({ cl-lib ? null, company, deferred, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    company-racer = callPackage ({ cl-lib ? null
+                                 , company
+                                 , deferred
+                                 , emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "company-racer";
         version = "20171204.1910";
         src = fetchFromGitHub {
@@ -10415,10 +12948,10 @@
           rev = "a00381c9d416f375f783fcb6ae8d40669ce1f567";
           sha256 = "13m3yzn4xbyl13z7h1cl6vqjbzikjycy7wydpy4a44yhr466zjr5";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c4671a674dbc1620a41e0ff99508892a25eec2ad/recipes/company-racer";
           sha256 = "0zc8dzvsjz5qsrwhv7x9f7djzvb9awacc3pgjirsv8f8sp7p3am4";
-          name = "company-racer";
+          name = "recipe";
         };
         packageRequires = [ cl-lib company deferred emacs ];
         meta = {
@@ -10426,20 +12959,55 @@
           license = lib.licenses.free;
         };
       }) {};
-    company-restclient = callPackage ({ cl-lib ? null, company, emacs, fetchFromGitHub, fetchurl, know-your-http-well, lib, melpaBuild, restclient }:
-    melpaBuild {
+    company-reftex = callPackage ({ company
+                                  , emacs
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild
+                                  , s }:
+      melpaBuild {
+        pname = "company-reftex";
+        version = "20180713.141";
+        src = fetchFromGitHub {
+          owner = "TheBB";
+          repo = "company-reftex";
+          rev = "d96ce340851499452c8d4d64bee80a3d7f9e9275";
+          sha256 = "1bh9h6frp6yibw1qyca1f2s375s5pn27ry2n4j036c5r4kx4wpx6";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/84c938612d46d45b5bb05ee35178eaa2284023e0/recipes/company-reftex";
+          sha256 = "0xfl8cfpd2bdk91aj0nygp5gm808pnbi7zjdp4z6l21dsrawhbxz";
+          name = "recipe";
+        };
+        packageRequires = [ company emacs s ];
+        meta = {
+          homepage = "https://melpa.org/#/company-reftex";
+          license = lib.licenses.free;
+        };
+      }) {};
+    company-restclient = callPackage ({ cl-lib ? null
+                                      , company
+                                      , emacs
+                                      , fetchFromGitHub
+                                      , fetchurl
+                                      , know-your-http-well
+                                      , lib
+                                      , melpaBuild
+                                      , restclient }:
+      melpaBuild {
         pname = "company-restclient";
         version = "20151202.401";
         src = fetchFromGitHub {
           owner = "iquiw";
           repo = "company-restclient";
-          rev = "ef67ba2f613ce3d61b70011c9d0a303a754ffc5b";
-          sha256 = "0af1h6n1rgyni686hrrakmmbgymjg8dc1i9g2jc27dxkxz0nk454";
+          rev = "12f05ab964ca811b5b8dcbe4f19e2eeba119cbe1";
+          sha256 = "0bra9rsxng3zbxk0q1sny3rabf2iwzz00snr65xswayjddigp33k";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dd063bc3789772fdcc6a8555817588962e60825/recipes/company-restclient";
           sha256 = "1md0n4k4wmbh9rmbwqh3kg2fj0c34rzqfd56jsq8lcdg14k0kdcb";
-          name = "company-restclient";
+          name = "recipe";
         };
         packageRequires = [
           cl-lib
@@ -10453,20 +13021,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    company-rtags = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, rtags }:
-    melpaBuild {
+    company-rtags = callPackage ({ company
+                                 , emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild
+                                 , rtags }:
+      melpaBuild {
         pname = "company-rtags";
         version = "20170924.2244";
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "4747d5b695bee40c3b0a2e3591ac8897571edd66";
-          sha256 = "1qy71bx8nki73mqslw54hq5bn1asz5qg1b2848nrsj8zb2yd85x5";
+          rev = "e4060b551575be378344c0cc1aedf11446b4f264";
+          sha256 = "01xc5r2am0xck7q6jal3zyrqbzpx68fzqi9af7zb1klyw2s5v807";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/company-rtags";
           sha256 = "0dicxbp3xn02pflrpfndj7hs494prvz64llsk1xpc2z23kfarp6f";
-          name = "company-rtags";
+          name = "recipe";
         };
         packageRequires = [ company emacs rtags ];
         meta = {
@@ -10474,20 +13048,27 @@
           license = lib.licenses.free;
         };
       }) {};
-    company-shell = callPackage ({ cl-lib ? null, company, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    company-shell = callPackage ({ cl-lib ? null
+                                 , company
+                                 , dash
+                                 , emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "company-shell";
         version = "20170517.2241";
         src = fetchFromGitHub {
           owner = "Alexander-Miller";
           repo = "company-shell";
-          rev = "6ae625f80d90e0779c79de38e8f83a336c1d00fa";
-          sha256 = "0da9y7x1xvaahsslcmgji6hr3cbn779i504cfrmsabbr3wmkn3fy";
+          rev = "acdbf8cba6ad9831d81a77bab7bbfd50f19edd86";
+          sha256 = "1dk927da7g4a39sva9bda978bx6hpiz5kf341fj8sb7xhryvh5r2";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bbaa05d158f3806b9f79a2c826763166dbee56ca/recipes/company-shell";
           sha256 = "0my9jghf3s4idkgrpki8mj1lm5ichfvznb09lfwf07fjhg0q1apz";
-          name = "company-shell";
+          name = "recipe";
         };
         packageRequires = [ cl-lib company dash emacs ];
         meta = {
@@ -10495,20 +13076,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    company-solidity = callPackage ({ cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild, solidity-mode }:
-    melpaBuild {
+    company-solidity = callPackage ({ cl-lib ? null
+                                    , company
+                                    , fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild
+                                    , solidity-mode }:
+      melpaBuild {
         pname = "company-solidity";
         version = "20180407.1344";
         src = fetchFromGitHub {
           owner = "ssmolkin1";
           repo = "company-solidity";
-          rev = "32bfe4c8fe282c30ebf4f5cf1f9285f151c8e6d4";
-          sha256 = "0qgvxpij5zwwvdqzi2yf2f52vgmky4xwz9v4smrkcx29k88ivlg5";
+          rev = "8ea7b96c7a17f4a11ca47021067350bc3c6606c5";
+          sha256 = "1gz43k7jckk520nvx124i4ap8bi61ah70wj3d40cbq77a3z8lmkw";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ef246601ff6d92d6dfcd809f637e50d9838da0b8/recipes/company-solidity";
           sha256 = "076z5jqh486k2lkh9rgbhs71bws4fba68pjybr9yyf0sdc5m7kc6";
-          name = "company-solidity";
+          name = "recipe";
         };
         packageRequires = [ cl-lib company solidity-mode ];
         meta = {
@@ -10516,20 +13103,28 @@
           license = lib.licenses.free;
         };
       }) {};
-    company-sourcekit = callPackage ({ company, dash, dash-functional, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, sourcekit }:
-    melpaBuild {
+    company-sourcekit = callPackage ({ company
+                                     , dash
+                                     , dash-functional
+                                     , emacs
+                                     , fetchFromGitHub
+                                     , fetchurl
+                                     , lib
+                                     , melpaBuild
+                                     , sourcekit }:
+      melpaBuild {
         pname = "company-sourcekit";
         version = "20170126.353";
         src = fetchFromGitHub {
           owner = "nathankot";
           repo = "company-sourcekit";
-          rev = "abf9bc5a0102eb666d3aa6d6bf22f6efcc852781";
-          sha256 = "1g8a4fgy2c5nqk8gysbnzn5jvfw6ynmfhc6j3hkrbswgf9188v5n";
+          rev = "8ba62ac25bf533b7f148f333bcb5c1db799f749b";
+          sha256 = "01dh0wdaydiai4v13r8g05rpiwqr5qqi34wif8vbk2mrr25wc7i9";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/45969cd5cd936ea61fbef4722843b0b0092d7b72/recipes/company-sourcekit";
           sha256 = "0hr5j1ginf43h4qf3fvsh3z53z0c7w5a9lhrvdwmlzj396qhqmzs";
-          name = "company-sourcekit";
+          name = "recipe";
         };
         packageRequires = [ company dash dash-functional emacs sourcekit ];
         meta = {
@@ -10537,8 +13132,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    company-statistics = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    company-statistics = callPackage ({ company
+                                      , emacs
+                                      , fetchFromGitHub
+                                      , fetchurl
+                                      , lib
+                                      , melpaBuild }:
+      melpaBuild {
         pname = "company-statistics";
         version = "20170210.1133";
         src = fetchFromGitHub {
@@ -10547,10 +13147,10 @@
           rev = "e62157d43b2c874d2edbd547c3bdfb05d0a7ae5c";
           sha256 = "12mwviz1mwx4ywks2lkmybbgh1wny67wkzlq5y3ml8gvyc288n3i";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/89d05b43f31ec157ce8e7bfba4b7c9119bda6dd2/recipes/company-statistics";
           sha256 = "1fl4ldj17m3xhi6xbw3bp9c2jir34xv3jh9daiw8g912fv2l5dcj";
-          name = "company-statistics";
+          name = "recipe";
         };
         packageRequires = [ company emacs ];
         meta = {
@@ -10558,20 +13158,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    company-suggest = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    company-suggest = callPackage ({ company
+                                   , emacs
+                                   , fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "company-suggest";
-        version = "20180325.931";
+        version = "20180527.931";
         src = fetchFromGitHub {
           owner = "juergenhoetzel";
           repo = "company-suggest";
-          rev = "e1679bd2cff0396bda0eba7dc48469332bd54251";
-          sha256 = "00cy1lhnlwz99zmxhk7403qq4wi8abk483syw5z1xvhdx1fxgq04";
+          rev = "81fe56fae3a3d2d3cd1be09d7eb96422a4ad6f09";
+          sha256 = "0ys9m11l8csyv2p0f7b13b9l5wqn73y5m4c29rj4xf2yy5b9p8sr";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9579e3366db055364829e20d3ce228bf17060b0a/recipes/company-suggest";
           sha256 = "1w5fp4mydc4av14sjb8di6jjvzfqwnasnxpf9720pk0rsj05i972";
-          name = "company-suggest";
+          name = "recipe";
         };
         packageRequires = [ company emacs ];
         meta = {
@@ -10579,20 +13184,29 @@
           license = lib.licenses.free;
         };
       }) {};
-    company-tern = callPackage ({ cl-lib ? null, company, dash, dash-functional, fetchFromGitHub, fetchurl, lib, melpaBuild, s, tern }:
-    melpaBuild {
+    company-tern = callPackage ({ cl-lib ? null
+                                , company
+                                , dash
+                                , dash-functional
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild
+                                , s
+                                , tern }:
+      melpaBuild {
         pname = "company-tern";
         version = "20161004.1147";
         src = fetchFromGitHub {
           owner = "proofit404";
           repo = "company-tern";
-          rev = "10ac058b065ae73c1f30e9fb7d969dd1a79387be";
-          sha256 = "1pjyiy95axv92yxzks4ac871vcqxjnp7n2116nkdrdzzpmlb1x9h";
+          rev = "b20b3e490bf277c8480712210e3c92ea489859ef";
+          sha256 = "1l4b54rqwsb32r8zwwrag7s35zc3kpviafdrqkq8r1nyshg2yccm";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/acc9b816796b9f142c53f90593952b43c962d2d8/recipes/company-tern";
           sha256 = "17pw4jx3f1hymj6sc0ri18jz9ngggj4a41kxx14fnmmm8adqn6wh";
-          name = "company-tern";
+          name = "recipe";
         };
         packageRequires = [ cl-lib company dash dash-functional s tern ];
         meta = {
@@ -10600,20 +13214,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    company-terraform = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, terraform-mode }:
-    melpaBuild {
+    company-terraform = callPackage ({ company
+                                     , emacs
+                                     , fetchFromGitHub
+                                     , fetchurl
+                                     , lib
+                                     , melpaBuild
+                                     , terraform-mode }:
+      melpaBuild {
         pname = "company-terraform";
-        version = "20180131.1503";
+        version = "20180703.533";
         src = fetchFromGitHub {
           owner = "rafalcieslak";
           repo = "emacs-company-terraform";
-          rev = "74dad245567e06e758e1112c0d75f3eccf48e32c";
-          sha256 = "0y4giv3i947258j5pv6wpzk95zry8sn8ra66m1237lk0k9zhpfdf";
+          rev = "9c1146bfe23d4c461f4a59577faf4e46fcca7fe9";
+          sha256 = "10b23azzgy51zrrmyi29mgy74f2zkrqrqvlk0r2iz9f7fydk8dpp";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1d9732da975dcf59d3b311b19e20abbb29c33656/recipes/company-terraform";
           sha256 = "198ppqn6f7y9bg582z5s4cl9gg1q9ibsr7mmn68b50zvma7ankzh";
-          name = "company-terraform";
+          name = "recipe";
         };
         packageRequires = [ company emacs terraform-mode ];
         meta = {
@@ -10621,20 +13241,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    company-try-hard = callPackage ({ company, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    company-try-hard = callPackage ({ company
+                                    , dash
+                                    , emacs
+                                    , fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "company-try-hard";
         version = "20150902.1506";
         src = fetchFromGitHub {
           owner = "Wilfred";
           repo = "company-try-hard";
-          rev = "70b94cfc40c576af404e743133979048e1bd2610";
-          sha256 = "1isnk2i64kppsr23nr6qm5kwxxwcp4xazjwvm2chyzl4vbvp03p2";
+          rev = "0401e8afa6bd4d3e9d2cf18e58955b83aef93005";
+          sha256 = "18hy60fm3b3dmp29cmzbs6grlihkwifjbzv30gprwj5f6x7m8knf";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d65c26aee15a27cbf27fa81110b607bf38099079/recipes/company-try-hard";
           sha256 = "1rwn521dc8kxh43vcd3rf0h8jc53d4gmid3szj2msi0da1sk0mmj";
-          name = "company-try-hard";
+          name = "recipe";
         };
         packageRequires = [ company dash emacs ];
         meta = {
@@ -10642,8 +13268,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    company-web = callPackage ({ cl-lib ? null, company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, web-completion-data }:
-    melpaBuild {
+    company-web = callPackage ({ cl-lib ? null
+                               , company
+                               , dash
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild
+                               , web-completion-data }:
+      melpaBuild {
         pname = "company-web";
         version = "20180402.455";
         src = fetchFromGitHub {
@@ -10652,10 +13285,10 @@
           rev = "f0cc9187c9c34f72ad71f5649a69c74f996bae9a";
           sha256 = "1xcwwcy2866vzaqgn7hrl7j8k48mk74i4shm40v7ybacws47s9nr";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/company-web";
           sha256 = "1q2am684l4d038a3ymyy6gg2ds9lq5mcfc4in8dmvap5grdhia4b";
-          name = "company-web";
+          name = "recipe";
         };
         packageRequires = [ cl-lib company dash web-completion-data ];
         meta = {
@@ -10663,20 +13296,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    company-ycm = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, ycm }:
-    melpaBuild {
+    company-ycm = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild
+                               , ycm }:
+      melpaBuild {
         pname = "company-ycm";
         version = "20140904.1117";
         src = fetchFromGitHub {
           owner = "neuromage";
           repo = "ycm.el";
-          rev = "4da8a14abcd0f4fa3235042ade2e12b5068c0601";
-          sha256 = "0znchya89zzk30mwl4qfm0q9sfa5m3jspapb892ydj0mck5n4nyj";
+          rev = "b2cb611503cf8d256fa19fc76362d7d5d9449d01";
+          sha256 = "1xmmk5pg59w8cc1s9v3c65l8m388yl25ngjd0vibi22lm1k5ri8j";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/44e168f757cb51249db2deb9f781eff99cf6fb7c/recipes/company-ycm";
           sha256 = "1q4d63c7nr3g7q0smd55pp636vqa9lf1pkwjn9iq265369npvina";
-          name = "company-ycm";
+          name = "recipe";
         };
         packageRequires = [ ycm ];
         meta = {
@@ -10684,20 +13321,30 @@
           license = lib.licenses.free;
         };
       }) {};
-    company-ycmd = callPackage ({ company, dash, deferred, f, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, s, ycmd }:
-    melpaBuild {
+    company-ycmd = callPackage ({ company
+                                , dash
+                                , deferred
+                                , f
+                                , fetchFromGitHub
+                                , fetchurl
+                                , let-alist
+                                , lib
+                                , melpaBuild
+                                , s
+                                , ycmd }:
+      melpaBuild {
         pname = "company-ycmd";
-        version = "20171010.2258";
+        version = "20180520.353";
         src = fetchFromGitHub {
           owner = "abingham";
           repo = "emacs-ycmd";
-          rev = "a35a2ddd911da6d3a926bdef2614a2898055a5e2";
-          sha256 = "1nig77gqi74k01309r3nfy45ylhi5mj7ajxlhib6i58zlib8ycbl";
+          rev = "966594701c1eef1f6d4dad0c71c6d43a029977d7";
+          sha256 = "05b8l82l3p15r072zhmmwpcnxyyyrhzka5gc3vkzz2sa7wa7sp7j";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/company-ycmd";
           sha256 = "1dycbp2q8grvv94mwp9n8s7xpz2zjs05l3lf471j3nlbk6xfsn5d";
-          name = "company-ycmd";
+          name = "recipe";
         };
         packageRequires = [ company dash deferred f let-alist s ycmd ];
         meta = {
@@ -10705,8 +13352,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    composable = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    composable = callPackage ({ emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "composable";
         version = "20170723.2347";
         src = fetchFromGitHub {
@@ -10715,10 +13366,10 @@
           rev = "ac981974f89607393cc61314aaa19672d45b0650";
           sha256 = "0xg46r6ibga27cdycbysm80n2ayi8vmxcff1b6bqjjrsc0wbdnac";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1fc0f076198e4be46a33a26eea9f2d273dda12b8/recipes/composable";
           sha256 = "1fs4pczjn9sv12sladf6zbkz0cmzxr0jaqkiwryydal1l5nqqxcy";
-          name = "composable";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -10726,8 +13377,17 @@
           license = lib.licenses.free;
         };
       }) {};
-    composer = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, php-runtime, request, s, seq }:
-    melpaBuild {
+    composer = callPackage ({ emacs
+                            , f
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild
+                            , php-runtime
+                            , request
+                            , s
+                            , seq }:
+      melpaBuild {
         pname = "composer";
         version = "20180415.743";
         src = fetchFromGitHub {
@@ -10736,10 +13396,10 @@
           rev = "1d43edd8079e84df5e1b46c65e6783cb3ff9debd";
           sha256 = "0k6345mc2ppckbbmji4wkynlfgy00kr945ah8j2b62hqgm73h575";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/eb13cb0dba1696cc51132cd1ff723fa17f892a7c/recipes/composer";
           sha256 = "01w9cywhfngkrl9az8kfpzm12nc0zwmax01pyxlbi2l2icmvp5s1";
-          name = "composer";
+          name = "recipe";
         };
         packageRequires = [ emacs f php-runtime request s seq ];
         meta = {
@@ -10747,20 +13407,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    concurrent = callPackage ({ deferred, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    concurrent = callPackage ({ deferred
+                              , emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "concurrent";
         version = "20161228.1930";
         src = fetchFromGitHub {
           owner = "kiwanami";
           repo = "emacs-deferred";
-          rev = "2239671d94b38d92e9b28d4e12fd79814cfb9c16";
-          sha256 = "0vz59lm7pfz0gbsgrb44y555js85wbdjn0zm6p8wfqjiqf63ds3i";
+          rev = "9668749635472a63e7a9282e2124325405199b79";
+          sha256 = "1ch5br9alvwcpijl9g8w5ypjrah29alpfpk4hjw23rwzyq5p4izq";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8bc29a8d518ce7a584277089bd4654f52ac0f358/recipes/concurrent";
           sha256 = "09wjw69bqrr3424h0mpb2kr5ixh96syjjsqrcyd7z2lsas5ldpnf";
-          name = "concurrent";
+          name = "recipe";
         };
         packageRequires = [ deferred emacs ];
         meta = {
@@ -10768,8 +13433,16 @@
           license = lib.licenses.free;
         };
       }) {};
-    conda = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pythonic, s }:
-    melpaBuild {
+    conda = callPackage ({ dash
+                         , emacs
+                         , f
+                         , fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild
+                         , pythonic
+                         , s }:
+      melpaBuild {
         pname = "conda";
         version = "20171122.716";
         src = fetchFromGitHub {
@@ -10778,10 +13451,10 @@
           rev = "0bba56d80bb959a20838a024b174d1cf1e2cfd07";
           sha256 = "0gr3z9s4qzvkmh7wziw5x77w9vch1riqjv5g1kl995yv7v5lxmnp";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fcf762e34837975f5440a1d81a7f09699778123e/recipes/conda";
           sha256 = "1hi292h6ccl7vkvyxcwwcdxw8q2brv3hy0mnlikzj2qy5pbnfg4y";
-          name = "conda";
+          name = "recipe";
         };
         packageRequires = [ dash emacs f pythonic s ];
         meta = {
@@ -10789,8 +13462,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    config-general-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    config-general-mode = callPackage ({ fetchFromGitHub
+                                       , fetchurl
+                                       , lib
+                                       , melpaBuild }:
+      melpaBuild {
         pname = "config-general-mode";
         version = "20171024.1140";
         src = fetchFromGitHub {
@@ -10799,10 +13475,10 @@
           rev = "b4a8e6ba0bb027a77e4a0f701409f3e57bb2e4c0";
           sha256 = "115sk0h6i1bfnxw1v11719926cvnq7gyisjcysvkam40hp3d5fx5";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6c06831528e4bbc44aae1cc5cd6bec60150ae087/recipes/config-general-mode";
           sha256 = "1408xyzmb5aj1yrlgkymwy5x6rb1a9ynkx2m6hgj38qj6dz44cyy";
-          name = "config-general-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -10810,8 +13486,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    config-parser = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    config-parser = callPackage ({ emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "config-parser";
         version = "20160426.519";
         src = fetchFromGitHub {
@@ -10820,10 +13500,10 @@
           rev = "85d559e7889d8f5b98b8794b79426ae25ec3caa5";
           sha256 = "09vq7hcsw4027whn3xrnfz9hkgkakva619hyz0zfgpvppqah9n1p";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8fc040eebe72b278e3bd69212b207446cf4a5f06/recipes/config-parser";
           sha256 = "0wncg1v4wccb9j16rcmwz8fcmrscj7knfisq0r4qqx3skrmpccah";
-          name = "config-parser";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -10831,20 +13511,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    confluence = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, xml-rpc }:
-    melpaBuild {
+    confluence = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild
+                              , xml-rpc }:
+      melpaBuild {
         pname = "confluence";
         version = "20151020.1828";
         src = fetchFromGitHub {
           owner = "emacsorphanage";
           repo = "confluence";
-          rev = "4518d270a07760644c4204985c83d234ece4738b";
-          sha256 = "1lrq23cxlp2vkyv7g56r06bp7chhw10kii3ymkydf24y4pyn1zpg";
+          rev = "442d6e14b51f8322fb7f0fe30682d2429f48ed73";
+          sha256 = "18859zi60s2y79add998vxh084znbdxxq31m12flg7makxlamyh7";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/30de78c9cf83de30093a5647976eeaf552d4b2cb/recipes/confluence";
           sha256 = "0xa2g168mm31kh5h7smhx35cjsk1js88nzs19yakjljf56b1khlf";
-          name = "confluence";
+          name = "recipe";
         };
         packageRequires = [ xml-rpc ];
         meta = {
@@ -10852,8 +13536,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    conkeror-minor-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    conkeror-minor-mode = callPackage ({ fetchFromGitHub
+                                       , fetchurl
+                                       , lib
+                                       , melpaBuild }:
+      melpaBuild {
         pname = "conkeror-minor-mode";
         version = "20150114.804";
         src = fetchFromGitHub {
@@ -10862,10 +13549,10 @@
           rev = "476e81c27b056e21c192391fe674a2bf875466b0";
           sha256 = "0sz3qx1bn0lwjhka2l6wfl4b5486ji9dklgjs7fdlkg3dgpp1ahx";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/conkeror-minor-mode";
           sha256 = "1ch108f20k7xbf79azsp31hh4wmw7iycsxddcszgxkbm7pj11933";
-          name = "conkeror-minor-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -10873,8 +13560,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    conllu-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, parsec }:
-    melpaBuild {
+    conllu-mode = callPackage ({ cl-lib ? null
+                               , emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild
+                               , parsec }:
+      melpaBuild {
         pname = "conllu-mode";
         version = "20180304.637";
         src = fetchFromGitHub {
@@ -10883,10 +13576,10 @@
           rev = "5c1f4de04d5cba9ff4fc3246c507f74f50a2aa6c";
           sha256 = "0zr8pglciqc1af06qsvqjks823wbb7s33g3qvhajxlfcz10iyd98";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/444f943baddfeafe29708d6d68aeeeedbb7aa7bd/recipes/conllu-mode";
           sha256 = "1wffvvs8d0xcnz6mcm9rbr8imyj4npyc148yh0gzfzlgjm0fiz1v";
-          name = "conllu-mode";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs parsec ];
         meta = {
@@ -10894,20 +13587,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    connection = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    connection = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "connection";
         version = "20140717.2029";
         src = fetchFromGitHub {
           owner = "myrkr";
           repo = "dictionary-el";
-          rev = "a23b8f4a422d0de69a006ed010eff5795319db98";
-          sha256 = "0gz03hji6mcrzvxd74qim63g159sc8ggb6hq3x42x5l01g980fbm";
+          rev = "a5619fb275520d699eaae214e41ebcfde23c17f3";
+          sha256 = "176w46j3m343vlkjn9jyaaz3ikzdzxffrvhalgc76ydw9wyivbf8";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5b08ed7b90e3283e177eff57cb02b12a093dc258/recipes/connection";
           sha256 = "1y68d2kay8p5vapailxhrc5dl7b8k8nkvp7pa54md3fsivwp1d0q";
-          name = "connection";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -10915,20 +13611,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    contextual = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    contextual = callPackage ({ cl-lib ? null
+                              , dash
+                              , emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "contextual";
         version = "20160131.1037";
         src = fetchFromGitHub {
           owner = "lshift-de";
           repo = "contextual";
-          rev = "9e009614fb72ef14964d7107abd44de5aed21659";
-          sha256 = "0ykc3lzdypf543dgm7jpi70z08kz9hwhn2gvp06ylb22id8b3fai";
+          rev = "8134a2d8034c624f4fdbbb0b3893de12f4257909";
+          sha256 = "0s4b7dkndhnh8q3plvg2whjx8zd7ffz4hnbn3xh86xd3k7sch7av";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/44e5b799e411b8e2d89c8e9aeb4720126ac908b7/recipes/contextual";
           sha256 = "0vribs0fa1xf5kwkmvzjwhiawni0p3v56c5l4dkz8d7wn2g6wfdx";
-          name = "contextual";
+          name = "recipe";
         };
         packageRequires = [ cl-lib dash emacs ];
         meta = {
@@ -10936,8 +13638,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    contextual-menubar = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    contextual-menubar = callPackage ({ fetchFromGitHub
+                                      , fetchurl
+                                      , lib
+                                      , melpaBuild }:
+      melpaBuild {
         pname = "contextual-menubar";
         version = "20180204.2309";
         src = fetchFromGitHub {
@@ -10946,10 +13651,10 @@
           rev = "f76f55232ac07df76ef9a334a0c527dfab97c40b";
           sha256 = "0zks4w99nbhz1xvr67isgg6yjghpzbh5s5wd839zi0ly30x4riqf";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cba21d98f3abbf1f45d1fdd9164d4660b7d3e368/recipes/contextual-menubar";
           sha256 = "0r9bsnvf45h7gsdfhsz7h02nskjvflfa2yjarjv9fcl7aipz8rr6";
-          name = "contextual-menubar";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -10957,20 +13662,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    contrast-color = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    contrast-color = callPackage ({ cl-lib ? null
+                                  , emacs
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "contrast-color";
         version = "20160903.1107";
         src = fetchFromGitHub {
           owner = "yuutayamada";
           repo = "contrast-color-el";
-          rev = "c5fb77a211ebbef3185ada37bea7420534c33f94";
-          sha256 = "06grlp93n50d7c5z43fia0d6r1hmfpnqa062fzrz8gypy5kqxi1f";
+          rev = "6ff1b807e09ef6a775e4ab1032bb2ea3fc442d9e";
+          sha256 = "1qvx00yrkl0zf2bnb46gw18nrhg3gwlc0az622bh5brckpn9dasv";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7a13602e10a5fa889d0e094eff5b74a39023a477/recipes/contrast-color";
           sha256 = "0pa88mfla7g7wpia0q1lkv2dncw63ivvh83hf73f75a22rvl8jcx";
-          name = "contrast-color";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -10978,20 +13688,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    control-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    control-mode = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "control-mode";
         version = "20160624.1010";
         src = fetchFromGitHub {
           owner = "stephendavidmarsh";
           repo = "control-mode";
-          rev = "72d6179b60adc438aada74083b2bf4264b575de3";
-          sha256 = "0pqdh9bx2j9kla57sn349m90azk02wajapmazdm26cjdc2npw7jh";
+          rev = "6bf487144119b03f9cc54168f70e3d7d8d84e22b";
+          sha256 = "0y6a0fcz6ic5ai5jibyd740mclzx88x3l6wp2vs8rw6qs15cr7xf";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/acc9b816796b9f142c53f90593952b43c962d2d8/recipes/control-mode";
           sha256 = "1biq4p2w8rqcbvr09gxbchjqlaixjf1fzv7xv8lpv81dlhi7dgz6";
-          name = "control-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -10999,8 +13712,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    copy-as-format = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    copy-as-format = callPackage ({ cl-lib ? null
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "copy-as-format";
         version = "20171215.1616";
         src = fetchFromGitHub {
@@ -11009,10 +13726,10 @@
           rev = "971957166fe64d914ec4be209b4f80efeeabbb19";
           sha256 = "0ynzy2sb75w24d2kwjpkb3vl98yyz0sbcj6nd31y2r2n2kkdna24";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/42fe8a2113d1c15701abe7a7e0a68e939c3d789b/recipes/copy-as-format";
           sha256 = "1yij5mqm0dg6326yms0a2w8gs42kdxq0ih8dhkpdar54r0bk3m8k";
-          name = "copy-as-format";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -11020,20 +13737,27 @@
           license = lib.licenses.free;
         };
       }) {};
-    copy-file-on-save = callPackage ({ cl-lib ? null, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    copy-file-on-save = callPackage ({ cl-lib ? null
+                                     , emacs
+                                     , f
+                                     , fetchFromGitHub
+                                     , fetchurl
+                                     , lib
+                                     , melpaBuild
+                                     , s }:
+      melpaBuild {
         pname = "copy-file-on-save";
-        version = "20180217.914";
+        version = "20180604.719";
         src = fetchFromGitHub {
           owner = "emacs-php";
           repo = "emacs-auto-deployment";
-          rev = "1ad10401711a3bf0a0894eeed357b402238be113";
-          sha256 = "1ydpsh5j9j168crn30lpzv73rw2z80prp0hn2rybgrhvqfs3rbx6";
+          rev = "5af6d5fcc35ddf9050eada96fd5f334bf0661b62";
+          sha256 = "1q9liby1dmwwmg2jz13gx2ld47bpcqb9c7vx4qgky75wb5c2q1xz";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/eb13cb0dba1696cc51132cd1ff723fa17f892a7c/recipes/copy-file-on-save";
           sha256 = "1mcwgkhd241aijnmzrrqqn9f7hiq5k1w4fj83v50aixrcs049gc3";
-          name = "copy-file-on-save";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs f s ];
         meta = {
@@ -11041,8 +13765,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    copyit = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    copyit = callPackage ({ cl-lib ? null
+                          , emacs
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild
+                          , s }:
+      melpaBuild {
         pname = "copyit";
         version = "20161126.429";
         src = fetchFromGitHub {
@@ -11051,10 +13781,10 @@
           rev = "f50d033b129d467fb517a351adf3f16cabd82a62";
           sha256 = "1s1ddwxgvig7skibicm9j8jii651n1v5ivfj4j6d1kkc79lpq69n";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/69bd50fd1f3865d48cec9fe2680d260d746248e5/recipes/copyit";
           sha256 = "1m28irqixzl44c683dxvc5x6l3qcqlpy6jzk6629paqkdi5mx1c0";
-          name = "copyit";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs s ];
         meta = {
@@ -11062,20 +13792,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    copyit-pandoc = callPackage ({ copyit, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pandoc }:
-    melpaBuild {
+    copyit-pandoc = callPackage ({ copyit
+                                 , emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild
+                                 , pandoc }:
+      melpaBuild {
         pname = "copyit-pandoc";
         version = "20160624.1328";
         src = fetchFromGitHub {
           owner = "zonuexe";
           repo = "emacs-copyit";
-          rev = "f50d033b129d467fb517a351adf3f16cabd82a62";
-          sha256 = "1s1ddwxgvig7skibicm9j8jii651n1v5ivfj4j6d1kkc79lpq69n";
+          rev = "c973d3650208a033aaf845989d023f9c6e572ddd";
+          sha256 = "1fwndjbzwhl4dzrw5jxbq66yggxkl81ga3cnnl7rm3s63pkb6l3w";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/69bd50fd1f3865d48cec9fe2680d260d746248e5/recipes/copyit-pandoc";
           sha256 = "03v448gh6glq126r95w4y6s2p08jgjhkc6zgsplx0v9d5f2mwaqk";
-          name = "copyit-pandoc";
+          name = "recipe";
         };
         packageRequires = [ copyit emacs pandoc ];
         meta = {
@@ -11083,8 +13819,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    coq-commenter = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    coq-commenter = callPackage ({ cl-lib ? null
+                                 , dash
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild
+                                 , s }:
+      melpaBuild {
         pname = "coq-commenter";
         version = "20170822.1609";
         src = fetchFromGitHub {
@@ -11093,10 +13835,10 @@
           rev = "7fe9a2cc0ebdb0b1e54a24eb7971d757fb588ac3";
           sha256 = "1rq0j6ds9snv21k2lzyja96qxxz8nrai5aj1k1si9zshld28mapx";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c97d3f653057eab35c612109792884334be556fe/recipes/coq-commenter";
           sha256 = "19726z8yvgwjikbl95smdl60k58a5yf7cjbinnb7251d8mhd8562";
-          name = "coq-commenter";
+          name = "recipe";
         };
         packageRequires = [ cl-lib dash s ];
         meta = {
@@ -11104,20 +13846,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    corral = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    corral = callPackage ({ fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "corral";
         version = "20160502.1";
         src = fetchFromGitHub {
           owner = "nivekuil";
           repo = "corral";
-          rev = "e7ab6aa118e46b93d4933d1364bc273f57cd6911";
-          sha256 = "00055gzv032xxzqm1hffipljy8fzgsm58cbv8dzajh035jvdgpv7";
+          rev = "8813288de240956641b37deafaaa4811548246df";
+          sha256 = "06l2imhxm6dijkqlhk9s0vsa5a0ghybpy7qk7wpkgv0dlm3k3w7n";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7b0d7e326f0401de0488b77d39af7bd7b8e8fdd4/recipes/corral";
           sha256 = "1drccqk4qzkgvkgkzlrrfd1dcgj8ziqriijrjihrzjgjsbpzv6da";
-          name = "corral";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -11125,8 +13870,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    cosmo = callPackage ({ emacs, fetchFromGitLab, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    cosmo = callPackage ({ emacs
+                         , fetchFromGitLab
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "cosmo";
         version = "20170922.44";
         src = fetchFromGitLab {
@@ -11135,10 +13884,10 @@
           rev = "dd83b09a49a2843606b28279b674b2207040b36b";
           sha256 = "0phcg81g3dy67s1hfymvj0lkcpwygwql8iixf940nv31qllgzvd7";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3ab914dfefcddf6ecd65261bc11bd3eb12929c79/recipes/cosmo";
           sha256 = "1pk34d0kv1jm2fq72qa5lj0y39x1yf2nbkjjg8jcj8ari28h9vfk";
-          name = "cosmo";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -11146,20 +13895,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    counsel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }:
-    melpaBuild {
+    counsel = callPackage ({ emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild
+                           , swiper }:
+      melpaBuild {
         pname = "counsel";
-        version = "20180415.905";
+        version = "20180713.946";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "1181d0f7acb9e77a15fa7e62cb1027979185c853";
-          sha256 = "0vsl346axdlkcv96cxlciw7bmvxwl2ficjgw9nxrsvhsjsy7md02";
+          rev = "93d51d6188956da2592c1458b68d7cef48d967ae";
+          sha256 = "024kj37xa4s49z8klcmn3a30zy3yzk5n9j9damzqmzd4d8klawi6";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06c50f32b8d603db0d70e77907e36862cd66b811/recipes/counsel";
           sha256 = "0y8cb2q4mqvzan5n8ws5pjpm7bkjcghg5q19mzc3gqrq9vrvyzi6";
-          name = "counsel";
+          name = "recipe";
         };
         packageRequires = [ emacs swiper ];
         meta = {
@@ -11167,8 +13921,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    counsel-bbdb = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
-    melpaBuild {
+    counsel-bbdb = callPackage ({ emacs
+                                , fetchFromGitHub
+                                , fetchurl
+                                , ivy
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "counsel-bbdb";
         version = "20171129.1737";
         src = fetchFromGitHub {
@@ -11177,10 +13936,10 @@
           rev = "c86f4b9ef99c9db0b2c4196a300d61300dc2d0c1";
           sha256 = "1dchyg8cs7n0zbj6mr2z840yi06b2wja65k04idlcs6ngy1vc3sr";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0ed9bcdb1f25a6dd743c1dac2bb6cda73a5a5dc2/recipes/counsel-bbdb";
           sha256 = "14d9mk44skpmyj0zkqwz97j80r630j7s5hfrrhlsafdpl5aafjxp";
-          name = "counsel-bbdb";
+          name = "recipe";
         };
         packageRequires = [ emacs ivy ];
         meta = {
@@ -11188,8 +13947,42 @@
           license = lib.licenses.free;
         };
       }) {};
-    counsel-css = callPackage ({ cl-lib ? null, counsel, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    counsel-codesearch = callPackage ({ codesearch
+                                      , counsel
+                                      , emacs
+                                      , fetchFromGitHub
+                                      , fetchurl
+                                      , ivy
+                                      , lib
+                                      , melpaBuild }:
+      melpaBuild {
+        pname = "counsel-codesearch";
+        version = "20180713.304";
+        src = fetchFromGitHub {
+          owner = "abingham";
+          repo = "emacs-counsel-codesearch";
+          rev = "cb9f3df541e84b4b13905c3ad3658cad2f34b0cf";
+          sha256 = "1invag9nnbsxajli6xph9fgdihs9j3hwkw2s8w297808if5gxnr3";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/d3404c3cdfa6654ad80378ab258f0df68a6beeb9/recipes/counsel-codesearch";
+          sha256 = "0y547cfxjq59zvi36av0rd1wdydf8d96ma438ja0x726f53nxd3g";
+          name = "recipe";
+        };
+        packageRequires = [ codesearch counsel emacs ivy ];
+        meta = {
+          homepage = "https://melpa.org/#/counsel-codesearch";
+          license = lib.licenses.free;
+        };
+      }) {};
+    counsel-css = callPackage ({ cl-lib ? null
+                               , counsel
+                               , emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "counsel-css";
         version = "20180302.236";
         src = fetchFromGitHub {
@@ -11198,10 +13991,10 @@
           rev = "0536af00236cdce1ed08b40dd46c917e8b4b8869";
           sha256 = "04qm5dqxnl4s0axbrin7a7dpj3h8rx096q01bwzfs10qsdx3l7c0";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/519a05a9f0e43f3e1dfac75759346476bfc40772/recipes/counsel-css";
           sha256 = "1sckfq8kv68q1anqmslrvhcf83m7b5r0clny6q33b9x0qypkv9xp";
-          name = "counsel-css";
+          name = "recipe";
         };
         packageRequires = [ cl-lib counsel emacs ];
         meta = {
@@ -11209,8 +14002,16 @@
           license = lib.licenses.free;
         };
       }) {};
-    counsel-dash = callPackage ({ counsel, dash, dash-functional, emacs, fetchFromGitHub, fetchurl, helm-dash, lib, melpaBuild }:
-    melpaBuild {
+    counsel-dash = callPackage ({ counsel
+                                , dash
+                                , dash-functional
+                                , emacs
+                                , fetchFromGitHub
+                                , fetchurl
+                                , helm-dash
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "counsel-dash";
         version = "20160729.829";
         src = fetchFromGitHub {
@@ -11219,10 +14020,10 @@
           rev = "07fa74a94ff4da5b6c8c4810f5e143e701b480d2";
           sha256 = "17h2m9zsadq270mkq12kmdzmpbfjiwjbg8n1rg2apqnm1ndgcwf8";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0f8af4d854f972bfed3d2122b4c089f72d8b5f2a/recipes/counsel-dash";
           sha256 = "0pzh8ww1p2jb859gdjr5ypya3rwhiyg3c79xhx8filxrqxgjv5fk";
-          name = "counsel-dash";
+          name = "recipe";
         };
         packageRequires = [ counsel dash dash-functional emacs helm-dash ];
         meta = {
@@ -11230,20 +14031,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    counsel-etags = callPackage ({ counsel, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    counsel-etags = callPackage ({ counsel
+                                 , emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "counsel-etags";
-        version = "20180324.2005";
+        version = "20180605.613";
         src = fetchFromGitHub {
           owner = "redguardtoo";
           repo = "counsel-etags";
-          rev = "267c071724fcc665359f2f4472392507facaab2c";
-          sha256 = "0039l9pdndl0y06xjvxpgcc71kqpwhny2lhy5a68p6n1ndi958z9";
+          rev = "9437ce4e4adb7140df6af0a4528069b9e54de44b";
+          sha256 = "14q7w6pz3pslwr4s1f2b8wiq6k1jvp09mwml9x2j5ljw7j3145pi";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/87528349a3ab305bfe98f30c5404913272817a38/recipes/counsel-etags";
           sha256 = "1h3dlczm1m21d4h41vz9ngg5fi02g6f95qalfxdnsvz0d4w4yxk0";
-          name = "counsel-etags";
+          name = "recipe";
         };
         packageRequires = [ counsel emacs ];
         meta = {
@@ -11251,8 +14057,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    counsel-gtags = callPackage ({ counsel, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    counsel-gtags = callPackage ({ counsel
+                                 , emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "counsel-gtags";
         version = "20170326.559";
         src = fetchFromGitHub {
@@ -11261,10 +14072,10 @@
           rev = "220ebb48419ee6891ecbf9ea8fe130b494b17ee2";
           sha256 = "12ml45gwfh0lyvmf24pvryylrjx5g60yqpbjfcak7zvy7x5wmc1s";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c7ccc35632219dbec5fdad7401545e7c071b910c/recipes/counsel-gtags";
           sha256 = "12qyb1lnzyd2rr4ankpqi30h0bj66ap5qw87y4605k0j44vhnsax";
-          name = "counsel-gtags";
+          name = "recipe";
         };
         packageRequires = [ counsel emacs ];
         meta = {
@@ -11272,20 +14083,27 @@
           license = lib.licenses.free;
         };
       }) {};
-    counsel-notmuch = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild, notmuch, s }:
-    melpaBuild {
+    counsel-notmuch = callPackage ({ emacs
+                                   , fetchFromGitHub
+                                   , fetchurl
+                                   , ivy
+                                   , lib
+                                   , melpaBuild
+                                   , notmuch
+                                   , s }:
+      melpaBuild {
         pname = "counsel-notmuch";
-        version = "20171223.145";
+        version = "20180713.1740";
         src = fetchFromGitHub {
           owner = "fuxialexander";
           repo = "counsel-notmuch";
-          rev = "ac1aaead81c6860d7b8324cc1c00bcd52de5e9ca";
-          sha256 = "19frcrz6bx7d7v1hkg0xv7zmbk2sydlsdzn1s96cqzjk1illchkz";
+          rev = "f4c864eca400abe0bb7420bcee80f2f8259ca0ff";
+          sha256 = "0f5w4m5qripca5agbgil0qvd4h9ypi63kpz90n744v60r3lddcjl";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/54fe0be4e8e8b90cd2dc3cc8b9c573694c8f773b/recipes/counsel-notmuch";
           sha256 = "1n4jp9fa5fbv55am0w1b832ncdih8gi6xflwabpwqqj4k5mj94p1";
-          name = "counsel-notmuch";
+          name = "recipe";
         };
         packageRequires = [ emacs ivy notmuch s ];
         meta = {
@@ -11293,20 +14111,78 @@
           license = lib.licenses.free;
         };
       }) {};
-    counsel-osx-app = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
-    melpaBuild {
+    counsel-org-capture-string = callPackage ({ emacs
+                                              , fetchFromGitHub
+                                              , fetchurl
+                                              , ivy
+                                              , lib
+                                              , melpaBuild }:
+      melpaBuild {
+        pname = "counsel-org-capture-string";
+        version = "20180707.217";
+        src = fetchFromGitHub {
+          owner = "akirak";
+          repo = "counsel-org-capture-string";
+          rev = "14144773a23fd42ddee3522ffae44260c55ab9d5";
+          sha256 = "0zknmcxhf97kflxm5bv9gjl9n390jjrbdz13600afs4kvzdad4z1";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/380d58ac9487f2fb1d4a791008fa60fb7165e7e3/recipes/counsel-org-capture-string";
+          sha256 = "1jqp4qscv8shx1kfnrm6642a83ba3rpzm7v9hz46j3aw6f3psw9g";
+          name = "recipe";
+        };
+        packageRequires = [ emacs ivy ];
+        meta = {
+          homepage = "https://melpa.org/#/counsel-org-capture-string";
+          license = lib.licenses.free;
+        };
+      }) {};
+    counsel-org-clock = callPackage ({ dash
+                                     , emacs
+                                     , fetchFromGitHub
+                                     , fetchurl
+                                     , ivy
+                                     , lib
+                                     , melpaBuild }:
+      melpaBuild {
+        pname = "counsel-org-clock";
+        version = "20180623.617";
+        src = fetchFromGitHub {
+          owner = "akirak";
+          repo = "counsel-org-clock";
+          rev = "7b172847f19571fa8f4092899bff75fab0821b07";
+          sha256 = "08ci1pb0w1aalhhsg8v0b37xapy72svfkzclk54f3813vxd2naxs";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/d21e10ba82b4ae0f8101031be16bc5f7e80ba5d5/recipes/counsel-org-clock";
+          sha256 = "16pai05qqaw31ghdy1h164qy56mqsdsf2925i0qhlhysslkki8gh";
+          name = "recipe";
+        };
+        packageRequires = [ dash emacs ivy ];
+        meta = {
+          homepage = "https://melpa.org/#/counsel-org-clock";
+          license = lib.licenses.free;
+        };
+      }) {};
+    counsel-osx-app = callPackage ({ emacs
+                                   , fetchFromGitHub
+                                   , fetchurl
+                                   , ivy
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "counsel-osx-app";
         version = "20160821.109";
         src = fetchFromGitHub {
           owner = "d12frosted";
           repo = "counsel-osx-app";
-          rev = "b1c54cbc033c4939966910d85ce035503079e108";
-          sha256 = "0p3j60hjai3v8yny9zlzbxppy0pl9s3yf4x6z5rac6n86xx0iix8";
+          rev = "5cc93ec684f837dc31ce20e7625407f2c0445691";
+          sha256 = "03gnxk2midiczq5w1k69ddhnlhml1pnwr9yjaw3b30dgv6r29dpw";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/926d0ab3d62d7114d6997944521b66ab969f6830/recipes/counsel-osx-app";
           sha256 = "0zc74szalyazbvi0lh3zy08kb8kzlwcwnc8d1sj5n23ymvvs5nn3";
-          name = "counsel-osx-app";
+          name = "recipe";
         };
         packageRequires = [ emacs ivy ];
         meta = {
@@ -11314,20 +14190,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    counsel-projectile = callPackage ({ counsel, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }:
-    melpaBuild {
+    counsel-projectile = callPackage ({ counsel
+                                      , fetchFromGitHub
+                                      , fetchurl
+                                      , lib
+                                      , melpaBuild
+                                      , projectile }:
+      melpaBuild {
         pname = "counsel-projectile";
-        version = "20180316.1608";
+        version = "20180713.228";
         src = fetchFromGitHub {
           owner = "ericdanan";
           repo = "counsel-projectile";
-          rev = "d428d08015f83fe91c058abf7f1fa95657e90483";
-          sha256 = "177w7v9hxx7p5l25hap4n4x8axzvp019a4xhkla8r1i821bxbqjw";
+          rev = "162f99881a9dce7d83668effb197c5e08fa12d5d";
+          sha256 = "1xb0rrsm47ip6ghgwbm33s67fq2lprkkj9assrzflc5ahdf71znx";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/389f16f886a385b02f466540f042a16eea8ba792/recipes/counsel-projectile";
           sha256 = "1gshphxaa902kq878rnizn3k1zycakwqkciz92z3xxb3bdyy0hnl";
-          name = "counsel-projectile";
+          name = "recipe";
         };
         packageRequires = [ counsel projectile ];
         meta = {
@@ -11335,20 +14216,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    counsel-pydoc = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
-    melpaBuild {
+    counsel-pydoc = callPackage ({ emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , ivy
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "counsel-pydoc";
         version = "20171018.1342";
         src = fetchFromGitHub {
           owner = "co-dh";
           repo = "pydoc_utils";
-          rev = "1d8ff8ca3b9d69453cde423b1887fbb490a95c9e";
-          sha256 = "06kf93y8wb9nwvs70xi4lkd5x4g6sl8f83diy2wl7ha657dwx3m8";
+          rev = "08a4a1020da3d06604156303024c8a5e31ec36e4";
+          sha256 = "0658pm99vnm50xq2c79mdbywrgmbs0wwl90hnc493652bznrsgmc";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/110939c12b4e042a486e97be4c2a2426c5978ca6/recipes/counsel-pydoc";
           sha256 = "1a3vwh4jf5y03z95bd4blk75n6wjd24l6yw6vpr3991bi4qrxclz";
-          name = "counsel-pydoc";
+          name = "recipe";
         };
         packageRequires = [ emacs ivy ];
         meta = {
@@ -11356,8 +14242,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    counsel-spotify = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
-    melpaBuild {
+    counsel-spotify = callPackage ({ emacs
+                                   , fetchFromGitHub
+                                   , fetchurl
+                                   , ivy
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "counsel-spotify";
         version = "20180319.2022";
         src = fetchFromGitHub {
@@ -11366,10 +14257,10 @@
           rev = "9033e207dccdfea7fe590d2e102d50fcd2bd22e3";
           sha256 = "00mjcp3x558gh7f8yrj8y4ivq3pvml7y46rms8xah5zxavg6q52b";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b386462518a5ebb6454f4d01582df98395239bcc/recipes/counsel-spotify";
           sha256 = "1xs4km5vjhn6dnlmrscz7airip07n1ppybp8mr17hinb8scfpv47";
-          name = "counsel-spotify";
+          name = "recipe";
         };
         packageRequires = [ emacs ivy ];
         meta = {
@@ -11377,8 +14268,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    counsel-tramp = callPackage ({ counsel, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    counsel-tramp = callPackage ({ counsel
+                                 , emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "counsel-tramp";
         version = "20180311.2327";
         src = fetchFromGitHub {
@@ -11387,10 +14283,10 @@
           rev = "3f5ae75a6bde00bffeb2877b4ed4bd45610c0dfa";
           sha256 = "06dhhjrgpikzpdl1hck0ckjbx8yzx8jbymb3ajfxglgvrvid4l1k";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e1822b735b6bd533f658bd64ddccda29e19e9a5e/recipes/counsel-tramp";
           sha256 = "1ga57v6whnpigciw54k3hs0idq4cbl35qrysarik72f46by859v5";
-          name = "counsel-tramp";
+          name = "recipe";
         };
         packageRequires = [ counsel emacs ];
         meta = {
@@ -11398,20 +14294,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    counsel-world-clock = callPackage ({ fetchFromGitHub, fetchurl, ivy, lib, melpaBuild, s }:
-    melpaBuild {
+    counsel-world-clock = callPackage ({ fetchFromGitHub
+                                       , fetchurl
+                                       , ivy
+                                       , lib
+                                       , melpaBuild
+                                       , s }:
+      melpaBuild {
         pname = "counsel-world-clock";
         version = "20171201.2337";
         src = fetchFromGitHub {
           owner = "kchenphy";
           repo = "counsel-world-clock";
-          rev = "04153fbb21e51b1cfd042bdfc6ed1e8355a1edd7";
-          sha256 = "1gmsqhc6dsq823jbg9g19x7bsz5n7ssnqjzhsd8pnnm561g60dcm";
+          rev = "9834461002e1ea0c1669705e7a2b99dec969bb30";
+          sha256 = "1gkbcq7fkh08cwmbf1q99s2m5hcja73vl8bfdx2iif74f81p89jf";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7d9da8c45e7d06647f9591d80e83f851a7f3af85/recipes/counsel-world-clock";
           sha256 = "151vm7g7g0jwjlp0wrwlxrjnh9qsckc10whkfgaz9czzvvmsf4cv";
-          name = "counsel-world-clock";
+          name = "recipe";
         };
         packageRequires = [ ivy s ];
         meta = {
@@ -11419,20 +14320,27 @@
           license = lib.licenses.free;
         };
       }) {};
-    cov = callPackage ({ elquery, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    cov = callPackage ({ elquery
+                       , emacs
+                       , f
+                       , fetchFromGitHub
+                       , fetchurl
+                       , lib
+                       , melpaBuild
+                       , s }:
+      melpaBuild {
         pname = "cov";
         version = "20180415.1331";
         src = fetchFromGitHub {
           owner = "AdamNiederer";
           repo = "cov";
-          rev = "e6731ddf16be343a24449cf7dca92f382c8a831b";
-          sha256 = "09p61ni7vkwl679ysl9aibw0b7qi5v9vpgvg08vj00fp5a82rzsq";
+          rev = "2371d01e6b2928eb6cee6b7bfa8d50f96c47e750";
+          sha256 = "1z1092xyn2zlmggp7dkr7cynmvrr4hjdsq2pgnri5lizp3bjyd4x";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d0f35ce436ac157955d6f92de96e14bef9ad69e3/recipes/cov";
           sha256 = "02wk8ikanl5lcwqb9wqc8xx5vwzhn2hpqpxdchg5mdi7fifa1rni";
-          name = "cov";
+          name = "recipe";
         };
         packageRequires = [ elquery emacs f s ];
         meta = {
@@ -11440,8 +14348,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    coverage = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, ov }:
-    melpaBuild {
+    coverage = callPackage ({ cl-lib ? null
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild
+                            , ov }:
+      melpaBuild {
         pname = "coverage";
         version = "20180226.2057";
         src = fetchFromGitHub {
@@ -11450,10 +14363,10 @@
           rev = "c73d984168955ca0f47f44b0464aa45282df42b6";
           sha256 = "1kn61j91x4r4kc498y2jas5il4pc4qzhkj8392g2qiq5m3lbv4vl";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cd70e138534551dd12ba4d165ba56fbd1e033241/recipes/coverage";
           sha256 = "0ja7wsx2sj0h01sk1l3c0aidbs1ld4gj3kiwq6brs7r018sz45pm";
-          name = "coverage";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ov ];
         meta = {
@@ -11461,20 +14374,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    coverlay = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    coverlay = callPackage ({ cl-lib ? null
+                            , emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "coverlay";
-        version = "20160507.955";
+        version = "20180518.1555";
         src = fetchFromGitHub {
           owner = "twada";
           repo = "coverlay.el";
-          rev = "11068e2e4ed971b757ac0294528d4beb91124e58";
-          sha256 = "1q6cx6kq68xxqcx7zd9l4szy038i5ifjb82fxs3sn5fv00q0j9vd";
+          rev = "8205a845d58755dd7640b2e2b5991bf842998935";
+          sha256 = "1mppan4ml4dblwxdgr8pli7nj864frc7n7c6h47q4vfb4flg29n0";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/coverlay";
           sha256 = "1n0fblacwps94mhbdwpi22frhqp3pxg4323ghb79rvszb7in9i8j";
-          name = "coverlay";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -11482,8 +14400,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    cp5022x = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    cp5022x = callPackage ({ fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "cp5022x";
         version = "20120323.1635";
         src = fetchFromGitHub {
@@ -11492,10 +14413,10 @@
           rev = "ea7327dd75e54539576916f592ae1be98179ae35";
           sha256 = "1z67x4a0aricd9q6i2w33k74alddl6w0rijjhzyxwml7ibhbvphz";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/761fcb0ff07d9746d68e9946c8b46e50c67cd1d8/recipes/cp5022x";
           sha256 = "0v1jhkix01l299m67jag43rnps68m19zy83vvdglxa8dj3naz5dl";
-          name = "cp5022x";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -11503,20 +14424,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    cpanfile-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    cpanfile-mode = callPackage ({ emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "cpanfile-mode";
         version = "20161001.10";
         src = fetchFromGitHub {
           owner = "zakame";
           repo = "cpanfile-mode";
-          rev = "eda675703525198df1f76ddf250bffa40217ec5d";
-          sha256 = "07xivp1i9f884gs17lhp5jm0zk916c7gwazxnkm6m8rl3z2mcq0l";
+          rev = "b09908b4342b3aa97940159dbe91ac074ec98e0b";
+          sha256 = "12nbfgvhd8gxakq787i1v3h2kcn1r76f9lhqx44gjwqy3yx201i5";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/673e828a076ad806cdb69102a9d55f80ace45670/recipes/cpanfile-mode";
           sha256 = "1sflykfrhx9sn5dqlaa4s7w34nczh4xqwcig5rmlpwj9yl2mk2dm";
-          name = "cpanfile-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -11524,8 +14449,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    cpputils-cmake = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    cpputils-cmake = callPackage ({ fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "cpputils-cmake";
         version = "20170819.259";
         src = fetchFromGitHub {
@@ -11534,10 +14462,10 @@
           rev = "4fa37dd075c716f98b67b96f3b6e022730df1c1b";
           sha256 = "194vayk2hvqm2nv1rr3myiadrfvk8fpch1qlbic9bzbgfrl74i41";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9b84a159e97f7161d0705da5dd5e8c34ae5cb848/recipes/cpputils-cmake";
           sha256 = "0fswmmmrjv897n51nidmn8gs8yp00595g35vwjafsq6rzfg58j60";
-          name = "cpputils-cmake";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -11545,8 +14473,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    cql-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    cql-mode = callPackage ({ emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "cql-mode";
         version = "20160720.2039";
         src = fetchFromGitHub {
@@ -11555,10 +14487,10 @@
           rev = "2529ade55c125a89d8215f096a74733a90611c5d";
           sha256 = "1ikmz037bv7h0bjrr8qia5g127a0vd223y04ndbyd950gqc1lx4h";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1084dd0ec0f2e8fe6fa8e97b322833c14e8e59d1/recipes/cql-mode";
           sha256 = "0wdal8w0i73xjak2g0wazs54z957f4lj4n8qdmzpcylzpl1lqd88";
-          name = "cql-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -11566,20 +14498,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    cquery = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild }:
-    melpaBuild {
+    cquery = callPackage ({ dash
+                          , emacs
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , lsp-mode
+                          , melpaBuild }:
+      melpaBuild {
         pname = "cquery";
-        version = "20180413.938";
+        version = "20180619.1953";
         src = fetchFromGitHub {
           owner = "cquery-project";
           repo = "emacs-cquery";
-          rev = "7f48de485c5f4ca0d55b93307763889ce2d7c5c4";
-          sha256 = "1cb41f0can8mslg80v1np5wvq9c0vl0px5mgy0zyzhajf9zqszgn";
+          rev = "fd881d5db6bc555b22993e8d3e517d30a56ea763";
+          sha256 = "0n8962x68jcdff1wmq30fs5rbfgx9br2d10ylv3hfrg40abd0sad";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3cd3bffff0d2564c39735f844f9a02a660272caa/recipes/cquery";
           sha256 = "01mw6aqiazpzcn6h5h5xcnra8a04yg1ibvpfajx70m5iw9f5w6l6";
-          name = "cquery";
+          name = "recipe";
         };
         packageRequires = [ dash emacs lsp-mode ];
         meta = {
@@ -11587,8 +14525,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    crappy-jsp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    crappy-jsp-mode = callPackage ({ fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "crappy-jsp-mode";
         version = "20140311.231";
         src = fetchFromGitHub {
@@ -11597,10 +14538,10 @@
           rev = "6c45ab92b452411cc0fab9bcee2f456276b4fc40";
           sha256 = "12g6l6xlbs9h24q5lk8yjgk91xqd7r3v7r6czy10r09cmfjmkxbb";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/crappy-jsp-mode";
           sha256 = "17m404kdz9avihz52xd7hn5qx06a6k74gmn0gbhly4gl84w3zc6y";
-          name = "crappy-jsp-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -11608,8 +14549,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    creamsody-theme = callPackage ({ autothemer, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    creamsody-theme = callPackage ({ autothemer
+                                   , fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "creamsody-theme";
         version = "20170222.258";
         src = fetchFromGitHub {
@@ -11618,10 +14563,10 @@
           rev = "32fa3f4e461da92700523b1b20e7b28974c19a26";
           sha256 = "01q1l8ajw6lpp1bb4yp8r70d86hcl4hy0mz7x1hzqsvb7flhppp0";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/488f95b9e425726d641120130d894babcc3b3e85/recipes/creamsody-theme";
           sha256 = "0l3mq43bszxrz0bxmxb76drp4c8721cw8akgk3l5a800wqbfp2l7";
-          name = "creamsody-theme";
+          name = "recipe";
         };
         packageRequires = [ autothemer ];
         meta = {
@@ -11629,20 +14574,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    creds = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    creds = callPackage ({ dash
+                         , fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild
+                         , s }:
+      melpaBuild {
         pname = "creds";
         version = "20140510.1006";
         src = fetchFromGitHub {
           owner = "ardumont";
           repo = "emacs-creds";
-          rev = "b059397a7d59481f05fbb1bb9c8d3c2c69226482";
-          sha256 = "0l4bvk3m355b25d7pdnhczn3fckbq0rg2l4r0a0d94004ksvylqa";
+          rev = "00ebefd10005c170b790a01380cb6a98f798ce5c";
+          sha256 = "169ai0xkh3988racnhaapxw0v1pbxvcaq470x1qacdzdpka4a7bs";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/81b032049ccc3837e8693f010b39716912f76bba/recipes/creds";
           sha256 = "0n11xxaf93bbc9ih25wj09zzw4sj32wb99qig4zcy8bpkl5y3llk";
-          name = "creds";
+          name = "recipe";
         };
         packageRequires = [ dash s ];
         meta = {
@@ -11650,8 +14600,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    creole = callPackage ({ fetchFromGitHub, fetchurl, kv, lib, melpaBuild, noflet }:
-    melpaBuild {
+    creole = callPackage ({ fetchFromGitHub
+                          , fetchurl
+                          , kv
+                          , lib
+                          , melpaBuild
+                          , noflet }:
+      melpaBuild {
         pname = "creole";
         version = "20140924.800";
         src = fetchFromGitHub {
@@ -11660,10 +14615,10 @@
           rev = "7d5cffe93857f6c75ca09ac79c0e47b8d4410e53";
           sha256 = "18c4jfjnhb7asdhwj41g06cp9rz5xd7bbx2s1xvk6gahay27rlrv";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/creole";
           sha256 = "1q1c6f953g39xal1p7rj8dlcx2crk5cz1q07zp8bgp5jx4nd2z9n";
-          name = "creole";
+          name = "recipe";
         };
         packageRequires = [ kv noflet ];
         meta = {
@@ -11671,8 +14626,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    creole-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    creole-mode = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "creole-mode";
         version = "20130721.1750";
         src = fetchFromGitHub {
@@ -11681,10 +14639,10 @@
           rev = "b5e79b2ec5f19fb5aacf689b5febc3e0b61515c4";
           sha256 = "0japww5x89vd1ahjm2bc3biz6wxv94vvqq5fyyzkqsblgk5bys0h";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f04f93ab9482dbabfdbe3f0c8186c62a9a80c8b3/recipes/creole-mode";
           sha256 = "1lj9a0bgn7lmc2wyjzzvmpaz1f1spj02l51ki2wydjbfhxq61k0s";
-          name = "creole-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -11692,8 +14650,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    cricbuzz = callPackage ({ dash, enlive, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    cricbuzz = callPackage ({ dash
+                            , enlive
+                            , f
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild
+                            , s }:
+      melpaBuild {
         pname = "cricbuzz";
         version = "20171227.1607";
         src = fetchFromGitHub {
@@ -11702,10 +14667,10 @@
           rev = "557f75f10525e7a4d50e83010b9ed07fbf9df889";
           sha256 = "18lc56l5vcbrw2agpgjcap5q0l1mi64khgkk00x7r9wm1zilf9wp";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/cricbuzz";
           sha256 = "18nmr7rpbylqgfx5q3ps38wx9q1ndj06msgyjyc8lqpipbsz0pip";
-          name = "cricbuzz";
+          name = "recipe";
         };
         packageRequires = [ dash enlive f s ];
         meta = {
@@ -11713,8 +14678,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    crm-custom = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    crm-custom = callPackage ({ cl-lib ? null
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "crm-custom";
         version = "20160116.1606";
         src = fetchFromGitHub {
@@ -11723,10 +14692,10 @@
           rev = "f1aaccf64306a5f99d9bf7ba815d7ea41c15518d";
           sha256 = "1kl6blr4dlz40gfc845071nhfms4fm59284ja2177bhghy3wmw6r";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5e0752ba601a8d518d3c7fb54fd008602e7dc19f/recipes/crm-custom";
           sha256 = "14w15skxr44p9ilhpswlgdbqfw8jghxi69l37yk4m449m7g9694c";
-          name = "crm-custom";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -11734,20 +14703,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    crux = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, seq }:
-    melpaBuild {
+    crux = callPackage ({ fetchFromGitHub
+                        , fetchurl
+                        , lib
+                        , melpaBuild
+                        , seq }:
+      melpaBuild {
         pname = "crux";
-        version = "20180113.251";
+        version = "20180611.2355";
         src = fetchFromGitHub {
           owner = "bbatsov";
           repo = "crux";
-          rev = "3e07035660f953cb08847362378267f5859bbe69";
-          sha256 = "07l49l5fb7sv2ncvakr7nq616vw6nwrpl9czvqi46dnwvcdpjaxl";
+          rev = "c79985f69b7cd96edb505199bd751f71ce6d4e58";
+          sha256 = "0k58k3vzcxcgjaz230m18piq3gfw8w0h1g3n4jpp447indzwn4rr";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/575e3442a925500a5806e0b900208c1e6bfd11ae/recipes/crux";
           sha256 = "10lim1sngqbdqqwyq6ksqjjqpkm97aj1jk550sgwj28338lnw73c";
-          name = "crux";
+          name = "recipe";
         };
         packageRequires = [ seq ];
         meta = {
@@ -11755,8 +14728,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    cryptol-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    cryptol-mode = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "cryptol-mode";
         version = "20180321.1108";
         src = fetchFromGitHub {
@@ -11765,10 +14741,10 @@
           rev = "91f8ad617e5db2fad57a7be1da211f22f3b51550";
           sha256 = "12jd2wc5icnkbvxjam7kgr8bdjavxjsy79vwi0hi3gzwiirx4ifg";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/de12333bb429d84b2c214ac7ebb0219f67838f4f/recipes/cryptol-mode";
           sha256 = "08iq69gqmps8cckybhj9065b8a2a49p0rpzgx883qxnypsmjfmf2";
-          name = "cryptol-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -11776,20 +14752,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    cryptsy-public-api = callPackage ({ fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }:
-    melpaBuild {
+    cryptsy-public-api = callPackage ({ fetchFromGitHub
+                                      , fetchurl
+                                      , json ? null
+                                      , lib
+                                      , melpaBuild }:
+      melpaBuild {
         pname = "cryptsy-public-api";
         version = "20141008.528";
         src = fetchFromGitHub {
           owner = "Sodaware";
           repo = "cryptsy-public-api.el";
-          rev = "795c204452f880c0087663e7c35faf26ea34af4d";
-          sha256 = "19lfgxay02ngi815cw5mcdksymgfm2mnjs974idr7788kmwqmfij";
+          rev = "c65abdbb2fac49913c27b5183e3fad1092f78b3d";
+          sha256 = "1hiip5q2vg729kzidj0jmq4idvqxhbkwvncfj9qnn51rmr23n17z";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/cryptsy-public-api";
           sha256 = "1331nrx57136k09a7p6imv0k9g6w8ibpwn5xmv33dxc22hsmc41j";
-          name = "cryptsy-public-api";
+          name = "recipe";
         };
         packageRequires = [ json ];
         meta = {
@@ -11797,20 +14777,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    crystal-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    crystal-mode = callPackage ({ emacs
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "crystal-mode";
-        version = "20180306.1821";
+        version = "20180606.755";
         src = fetchFromGitHub {
           owner = "crystal-lang-tools";
           repo = "emacs-crystal-mode";
-          rev = "490f213c17e67ac28e7de19a0cfa62652d44b5de";
-          sha256 = "0isz91ikwc5175y9a984j8j9nmli0qf2j0shljk576ywlybiy00a";
+          rev = "7af6afdf8b90b13b419b58bbe9e096eb20527e5c";
+          sha256 = "1v6h8i9avgqirg7mcac33vycjyslmvg760dk3mf1sv76xx78v5vz";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d4b9b47d7deecf0cf24a42b26d50021cb1219a69/recipes/crystal-mode";
           sha256 = "1fgpz7zab6nc6kvjzjsbvrbg8shf4by0f20cvjvyky8kym72q0hk";
-          name = "crystal-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -11818,20 +14802,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    csgo-conf-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    csgo-conf-mode = callPackage ({ fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "csgo-conf-mode";
         version = "20161209.819";
         src = fetchFromGitHub {
           owner = "wynro";
           repo = "emacs-csgo-conf-mode";
-          rev = "57e7224f87a3ccc76b5564cc95fa0ff43bb6807c";
-          sha256 = "14wzh3rlq7xb8djncbjkfiq9hl5frp7gp42sz2ic7aky4qajbcdv";
+          rev = "df45ca833eb68c394dd03acce5733a33c3b06bf8";
+          sha256 = "0bq9dr1zq1lkdy80jqvxpb0igdnz9jqjh7pif3190mh7m46zyr7y";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2298e3f840da549707ec3270c8303f4f63a674dc/recipes/csgo-conf-mode";
           sha256 = "0djx6jraqlh9da2jqagj72vjnc8n3px2jp23jdy9rk40z10m5sbr";
-          name = "csgo-conf-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -11839,20 +14826,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    csharp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    csharp-mode = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "csharp-mode";
-        version = "20180315.203";
+        version = "20180708.652";
         src = fetchFromGitHub {
           owner = "josteink";
           repo = "csharp-mode";
-          rev = "79e0a606f60a2620631623285dbbbd8591cbd2f8";
-          sha256 = "1h36ns0kcz8p7nafczdyz1bvbz8fp3ci72c7ikyl703kkyqpk0px";
+          rev = "5e47b7764b3f4c97c260a902e8072d444dbd0f1b";
+          sha256 = "1dnhpxcinrwc7dmwgzbg4lnly05h38f00zrfsjincvii6d8rjiw0";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/736716bbcfd9c9fb1d10ce290cb4f66fe1c68f44/recipes/csharp-mode";
           sha256 = "17j84qrprq492dsn103dji8mvh29mbdlqlpsszbgfdgnpvfr1rv0";
-          name = "csharp-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -11860,20 +14850,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    csound-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, multi, shut-up }:
-    melpaBuild {
+    csound-mode = callPackage ({ emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild
+                               , multi
+                               , shut-up }:
+      melpaBuild {
         pname = "csound-mode";
-        version = "20180119.1726";
+        version = "20180505.1225";
         src = fetchFromGitHub {
           owner = "hlolli";
           repo = "csound-mode";
-          rev = "4fc4e77263d31604c86be799163d96cdad57c610";
-          sha256 = "167s332b9pbbxv24kyhrx543954a86bffxngjhp0cl0slmd81g2m";
+          rev = "5137de36e49b41ec428f35d9bfa08b5cc82e066c";
+          sha256 = "0v4yv4v6l0m1rkj3cb35f6hqhvbwh48ii6vb9xnc99r984jrs4f4";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c940d29de11e43b4abf2901c466c94d426a21818/recipes/csound-mode";
           sha256 = "047a78nhkn6qycsz8w9a0r1xyz5wyf4rds3z5yx9sn5wkv54w95d";
-          name = "csound-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs multi shut-up ];
         meta = {
@@ -11881,8 +14877,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    css-autoprefixer = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    css-autoprefixer = callPackage ({ emacs
+                                    , fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "css-autoprefixer";
         version = "20180311.900";
         src = fetchFromGitHub {
@@ -11891,10 +14891,10 @@
           rev = "386a5defc8543a3b87820f1761c075c7d1d93b38";
           sha256 = "0ymba9bhzfi7kkrha4d4sn0hrc3sid4b5k8lhakwwdwafhym0jjb";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/122e3813a5b8a57303345e9cd855f4d85eced6f0/recipes/css-autoprefixer";
           sha256 = "0q40k8jvs4nc57kcljsx5qzylz9ms0kbr3dic3mr3bj0w062b1qg";
-          name = "css-autoprefixer";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -11902,8 +14902,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    css-comb = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    css-comb = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "css-comb";
         version = "20160415.2259";
         src = fetchFromGitHub {
@@ -11912,10 +14915,10 @@
           rev = "6fa45e5af8a8bd3af6c1154cde3540e32c4206ee";
           sha256 = "0nvl6y90p9crk12j7aw0cqdjhli7xbrx3hqckxsnvrnxy4zax7nk";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0afc24de7f847feaa128168d0fd8b2110242cca6/recipes/css-comb";
           sha256 = "1axwrvbc3xl1ixhh72bii3hhbi9d96y6i1my1rpvwqyd6f7wb2cf";
-          name = "css-comb";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -11923,8 +14926,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    css-eldoc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    css-eldoc = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "css-eldoc";
         version = "20150124.1923";
         src = fetchFromGitHub {
@@ -11933,10 +14939,10 @@
           rev = "c558ac4c470742c98a37290e6b409db28183df30";
           sha256 = "1mgc6bd0dzrp1dq1yj8m2qxjnpysd8ppdk2yp96d3zd07zllw4rx";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/css-eldoc";
           sha256 = "0k0yzpqwfh5rg8sbv60simdslag514768i0naimm8vyrvv87fzny";
-          name = "css-eldoc";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -11944,8 +14950,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    cssh = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    cssh = callPackage ({ fetchFromGitHub
+                        , fetchurl
+                        , lib
+                        , melpaBuild }:
+      melpaBuild {
         pname = "cssh";
         version = "20150810.1009";
         src = fetchFromGitHub {
@@ -11954,10 +14963,10 @@
           rev = "2fe2754235225a59b63f08b130cfd4352e2e1c3f";
           sha256 = "1xf2hy077frfz8qf91c0l0qppcjxzr4bsbb622bx6fidqkpa3a1a";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/da3fcf6252f83d80de8a3ec564244e6cd22391eb/recipes/cssh";
           sha256 = "10yvvyzqr06jvijmzis9clb1slzp2mn80yclis8wvrmg4p8djljk";
-          name = "cssh";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -11965,8 +14974,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    csv = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    csv = callPackage ({ fetchFromGitLab
+                       , fetchurl
+                       , lib
+                       , melpaBuild }:
+      melpaBuild {
         pname = "csv";
         version = "20161113.710";
         src = fetchFromGitLab {
@@ -11975,10 +14987,10 @@
           rev = "aa1dfa1263565d5fac3879c21d8ddf5f8915e411";
           sha256 = "1vmazjrfcsa9aa9aw8bq5sazdhqvhxyj837dyw5lmh8gk7z0xdaa";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/233f9de5f65fd8374f2c1912503c30905aa6691d/recipes/csv";
           sha256 = "1rvi5p27lsb284zqgv4cdqkbqc9r92axmvg7sv52rm7qcj8njwqd";
-          name = "csv";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -11986,8 +14998,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    ctable = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ctable = callPackage ({ fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "ctable";
         version = "20171005.1711";
         src = fetchFromGitHub {
@@ -11996,10 +15011,10 @@
           rev = "b8830d1ca95abb100a81bc32011bd17d5ecba000";
           sha256 = "0pg303pnqscrsbx9579hc815angszsgf9vpd2z2f8p4f4ka6a00h";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8bc29a8d518ce7a584277089bd4654f52ac0f358/recipes/ctable";
           sha256 = "040qmlgfvjc1f908n52m5ll2fizbrhjzbd0kgrsw37bvm3029rx1";
-          name = "ctable";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -12007,8 +15022,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    ctags-update = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ctags-update = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "ctags-update";
         version = "20170728.58";
         src = fetchFromGitHub {
@@ -12017,10 +15035,10 @@
           rev = "783bf91eba1cd27cbb739067a24e15e5e04564e6";
           sha256 = "1navj3cm5gmp0h8wyk281i1gjry1kj0i73wlz1fjwkqm6awxfz4w";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e5d0c347ff8cf6e0ade80853775fd6b84f387fa5/recipes/ctags-update";
           sha256 = "07548jjpx4var2817y47i6br8iicjlj66n1b33h0av6r1h514nci";
-          name = "ctags-update";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -12028,8 +15046,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    ctl-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ctl-mode = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "ctl-mode";
         version = "20151202.206";
         src = fetchFromGitHub {
@@ -12038,10 +15059,10 @@
           rev = "1a13051db21b999c7682a015b33a03096ff9d891";
           sha256 = "1d89gxyzv0z0nk7v1aa4qa0xfms2g2dsrr07cw0d99xsnyxfky31";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/38d2279fd05bb48f0d0e2276c605cd92892d0196/recipes/ctl-mode";
           sha256 = "0fydq779b0y6hmh8srfdimr5rl9mk3sj08rbvlljxv3kqv5ajczj";
-          name = "ctl-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -12049,8 +15070,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    ctxmenu = callPackage ({ fetchFromGitHub, fetchurl, lib, log4e, melpaBuild, popup, yaxception }:
-    melpaBuild {
+    ctxmenu = callPackage ({ fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , log4e
+                           , melpaBuild
+                           , popup
+                           , yaxception }:
+      melpaBuild {
         pname = "ctxmenu";
         version = "20140303.1342";
         src = fetchFromGitHub {
@@ -12059,10 +15086,10 @@
           rev = "5c2376859562b98c07c985d2b483658e4c0e888e";
           sha256 = "1jlr2miwqsg06hk2clvsrw9fa98m2n76qfq8qv5svrb8dpil04wb";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6fc4f51bb6ce8fa9e37c0aeb51696b1980aece0c/recipes/ctxmenu";
           sha256 = "03g9px858mg19wapqszwav3599slljdyam8bvn1ri85fpa5ydvdp";
-          name = "ctxmenu";
+          name = "recipe";
         };
         packageRequires = [ log4e popup yaxception ];
         meta = {
@@ -12070,20 +15097,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    cubicaltt = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    cubicaltt = callPackage ({ cl-lib ? null
+                             , emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "cubicaltt";
         version = "20171108.602";
         src = fetchFromGitHub {
           owner = "mortberg";
           repo = "cubicaltt";
-          rev = "bf8253f482917e390fe8b44ceaf308405afeefc6";
-          sha256 = "1ff4gq1bjm0j1wi58lsv5fazkjcq4ay01n4k55nhd34pgk0rbnv0";
+          rev = "a867f3d66172020e30dd0614bd7b50f90b6fddd7";
+          sha256 = "1d53i4dscssfmcdspjf692jhsvjfzxb8d6wvs7a4m8f6z31ygkvl";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1be42b49c206fc4f0df6fb50fed80b3d9b76710b/recipes/cubicaltt";
           sha256 = "1wgy6965cnw201wx4a2pn71sa40mh2712y0d0470klr156krj0n9";
-          name = "cubicaltt";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -12091,20 +15123,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    cubicle-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    cubicle-mode = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "cubicle-mode";
         version = "20171009.1257";
         src = fetchFromGitHub {
           owner = "cubicle-model-checker";
           repo = "cubicle";
-          rev = "c2fba597da83b9ddc1195f1c8710d5330db24735";
-          sha256 = "0gprqhm38y5dcpkmhy1i6rv7pa5l8271b71284p1g90p2iyvm89g";
+          rev = "9d108b900e0123236b4991c2d06b5061f34feee8";
+          sha256 = "1n3x6m19swkq07zah4hh0ni6gx864bq1w0km06nq33x8189zczrr";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/81c29c912b83cbb536d30ba04130b39c0e5e5969/recipes/cubicle-mode";
           sha256 = "0xcmd0s6dfryl1ihfaqq0pfqc906yzzwk3d3nv8g6b6w78pv1lzv";
-          name = "cubicle-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -12112,8 +15147,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    cucumber-goto-step = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, pcre2el }:
-    melpaBuild {
+    cucumber-goto-step = callPackage ({ fetchFromGitHub
+                                      , fetchurl
+                                      , lib
+                                      , melpaBuild
+                                      , pcre2el }:
+      melpaBuild {
         pname = "cucumber-goto-step";
         version = "20131209.2119";
         src = fetchFromGitHub {
@@ -12122,10 +15161,10 @@
           rev = "f2713ffb26ebe1b757d1f2ea80e900b55e5895aa";
           sha256 = "184plai32sn0indvi1dma6ykz907zgnrdyxdw6f5mghwca96g5kx";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d78d7abccfd9bcebf6888032639923327ad25309/recipes/cucumber-goto-step";
           sha256 = "1ydsd455dvaw6a180b6570bfgg0kxn01sn6cb57smqj835am6gx8";
-          name = "cucumber-goto-step";
+          name = "recipe";
         };
         packageRequires = [ pcre2el ];
         meta = {
@@ -12133,8 +15172,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    cuda-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    cuda-mode = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "cuda-mode";
         version = "20151213.1921";
         src = fetchFromGitHub {
@@ -12143,10 +15185,10 @@
           rev = "9ae9eacfdba3559b5456342d0d03296290df8ff5";
           sha256 = "1ms0z5zplcbdwwdbgsjsbm32i57z9i2i8j9y3wm0pwzyz4zr36zy";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d21cf17a4a9ae391e2e9cf9be3399095fa23ef55/recipes/cuda-mode";
           sha256 = "0ip4vax93x72bjrh6prik6ddmrvszpsmgm0fxfz772rp24smc300";
-          name = "cuda-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -12154,8 +15196,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    cursor-test = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    cursor-test = callPackage ({ emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "cursor-test";
         version = "20131207.932";
         src = fetchFromGitHub {
@@ -12164,10 +15210,10 @@
           rev = "e09956e048b88fd2ee8dd90b5678baed8b04d31b";
           sha256 = "0wmnhizv4jfcl1w9za4ydxf6xwxgm5vwmn1zi5vn70zmv4d6r49l";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6439f7561cfab4f6f3beb132d2a65e94b3deba9e/recipes/cursor-test";
           sha256 = "1c1d5xq4alamlwyqxjx557aykz5dw87acp0lyglsrzzkdynbwlb1";
-          name = "cursor-test";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -12175,20 +15221,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    cwl-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, yaml-mode }:
-    melpaBuild {
+    cwl-mode = callPackage ({ emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild
+                            , yaml-mode }:
+      melpaBuild {
         pname = "cwl-mode";
         version = "20171205.145";
         src = fetchFromGitHub {
           owner = "tom-tan";
           repo = "cwl-mode";
-          rev = "bdeb9c0734126f940db80bfb8b1dc735dab671c7";
-          sha256 = "0x9rvyhgy7ijq2r9pin94jz7nisrw6z91jch7d27lkhrmyb1rwk3";
+          rev = "2fa8c8db68a8665ed555126975edd8749bcfc009";
+          sha256 = "0zgnnvf8k5zcigykcf6slgcjmwb1l0jdfaqm19r34wp3md8wf0v1";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2309764cd56d9631dd97981a78b50b9fe793a280/recipes/cwl-mode";
           sha256 = "0x8akxxmphpgsc2m78h6b0fs6vvcfvmi1q2jrz8hwlmai8f7zi9j";
-          name = "cwl-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs yaml-mode ];
         meta = {
@@ -12196,20 +15247,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    cyberpunk-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    cyberpunk-theme = callPackage ({ fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "cyberpunk-theme";
-        version = "20170724.924";
+        version = "20180608.2209";
         src = fetchFromGitHub {
           owner = "n3mo";
           repo = "cyberpunk-theme.el";
-          rev = "88eff8a42d6ed8ba7782ae003ec9597aed4fd019";
-          sha256 = "0pzdm5nbhykssc633injz6jw422ksy632fhz0szd03a6kfx49iby";
+          rev = "f8967e46b8bdb3eaf7b72474f2d70997dc1152e9";
+          sha256 = "0vrkb07vh5b1azih86s0j917frdp5g6qg1pipddcr6lacgb7n0zl";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4c632d1e501d48dab54432ab111ce589aa229125/recipes/cyberpunk-theme";
           sha256 = "0l2bwb5afkkhrbh99v2gns1vil9s5911hbnlq5w35nmg1wvbmbc9";
-          name = "cyberpunk-theme";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -12217,8 +15271,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    cycbuf = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    cycbuf = callPackage ({ fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "cycbuf";
         version = "20131203.1237";
         src = fetchFromGitHub {
@@ -12227,10 +15284,10 @@
           rev = "1079b41c3eb27d65b66d4399959bb6253f84858e";
           sha256 = "1d5i8sm1xrsp4v4myidfyb40hm3wp7hgva7dizg9gbb7prmn1p5w";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/39f1919271df023898e60f5e7635928dc905083f/recipes/cycbuf";
           sha256 = "0gyj48h5wgjawqq3j4hgk5a8d23nffmhd1q53kg7b9vfsda51hbw";
-          name = "cycbuf";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -12238,8 +15295,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    cycle-resize = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    cycle-resize = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "cycle-resize";
         version = "20160521.857";
         src = fetchFromGitHub {
@@ -12248,10 +15308,10 @@
           rev = "7d255d6fe85f12c967a0f7fcfcf18633be194c88";
           sha256 = "1bmdjr99g50dzr4y1jxixfjhqmhrzblmpiyjhh5l5gqmdhammm4k";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8806af6662c8250c7533f643fe1c277ff0466651/recipes/cycle-resize";
           sha256 = "0vp57plwqx4nf3pbv5g4frjriq8niiia9xc3bv6c3gzd4a0zm7xi";
-          name = "cycle-resize";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -12259,20 +15319,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    cycle-themes = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    cycle-themes = callPackage ({ cl-lib ? null
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "cycle-themes";
         version = "20150402.2009";
         src = fetchFromGitHub {
           owner = "toroidal-code";
           repo = "cycle-themes.el";
-          rev = "6e125d11fdbc6b78fc9f219eb2609a5e29815898";
-          sha256 = "125s6vwbb9zpx6h3vrxnn7nr8pb45vhxd70ba2r3f87dlxah93am";
+          rev = "2660c3178be7b28c2cb5dde2dd70a4bd51dae3a2";
+          sha256 = "0wc9wssridy49vshwj7xgrcfmalrv1r9wlr8nvs9d8m3ds39dzh6";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f24c358fd616a86f6594001deddee4d62dbb0bc6/recipes/cycle-themes";
           sha256 = "1whp9q26sgyf59wygbrvdf9gc94bn4dmhr2f2qivpajx550fjfbc";
-          name = "cycle-themes";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -12280,20 +15344,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    cyphejor = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    cyphejor = callPackage ({ emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "cyphejor";
         version = "20171231.2218";
         src = fetchFromGitHub {
           owner = "mrkkrp";
           repo = "cyphejor";
-          rev = "df449180d28691c9bdbef7bcb25aee75b2af50ca";
-          sha256 = "1bni88xdm69m4pq79wq2wb3n50c955amimvlbc63xs1ik3ih52q0";
+          rev = "d2faf26420ac16c4056f6eda067b845d33e102cd";
+          sha256 = "0vg0n8xcqiv28i3xmnxzji77dbnyxrld4ncdzpa3hpc1j92s9a09";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ad7cacfa39d8f85e26372ef21898663aebb68e43/recipes/cyphejor";
           sha256 = "18l5km4xm5j3vv19k3fxs8i3rg4qnhrvx7b62vmyfcqmpiasrh6g";
-          name = "cyphejor";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -12301,8 +15369,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    cypher-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    cypher-mode = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "cypher-mode";
         version = "20151110.342";
         src = fetchFromGitHub {
@@ -12311,10 +15382,10 @@
           rev = "ce8543d7877c736c574a17b49874c9dcdc7a06d6";
           sha256 = "0vbcq807jpjssabmyjcdkpp6nnx1288is2c6x79dkrviw2xxw3qf";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ef558e7425adfe87202475babfbc1a679dc4cde5/recipes/cypher-mode";
           sha256 = "174rfbm7yzkznkfjmh9bdnm5fgqv9bjwm85h39317pv1g8c3mgv0";
-          name = "cypher-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -12322,20 +15393,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    cython-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    cython-mode = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "cython-mode";
         version = "20180213.854";
         src = fetchFromGitHub {
           owner = "cython";
           repo = "cython";
-          rev = "29961acc1c64710127a5191af6c039cb1fa22203";
-          sha256 = "00qwi8frmhas5qgs9i8hx067d60zpycnw3pbd4xgn9nis8fjjnw6";
+          rev = "9f3f99fd6378ffb17976d74356fd3ba7e22f85b3";
+          sha256 = "164ksml3i5gmcwripjsn5byfvnnjf86wrkkd9saw481ym6imii3c";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/be9bfabe3f79153cb859efc7c3051db244a63879/recipes/cython-mode";
           sha256 = "0asai1f1pncrfxx296fn6ky09hj1qam5j0dpxxkzhy0a34xz0k2i";
-          name = "cython-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -12343,20 +15417,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    czech-holidays = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    czech-holidays = callPackage ({ fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "czech-holidays";
         version = "20160113.952";
         src = fetchFromGitHub {
           owner = "hydandata";
           repo = "czech-holidays";
-          rev = "d136fa09a152b3cd80db6d55c7b4ddfe07b90fbf";
-          sha256 = "1ck1a61m0kjynqwzbw9hnc7y2a6gd6l1430wm7mw3qqsq959qwm6";
+          rev = "d19828122cf3322bcf50601cefa4ac385d2d8f82";
+          sha256 = "1ykcsfh5pj6b7ywdfggs8iqzfax0fyjnmr0ba76xwsj0vdrk3072";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7224fd77b3d8a37fac2fe0cf832e3487513afd8c/recipes/czech-holidays";
           sha256 = "10c0zscbn7pr9xqdqksy4kh0cxjg9bhw8p4qzlk18fd4c8rhqn84";
-          name = "czech-holidays";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -12364,20 +15441,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    d-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    d-mode = callPackage ({ emacs
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "d-mode";
-        version = "20180409.1043";
+        version = "20180502.710";
         src = fetchFromGitHub {
           owner = "Emacs-D-Mode-Maintainers";
           repo = "Emacs-D-Mode";
-          rev = "09745ba713e08a02fd81c01824aefa6731992a6f";
-          sha256 = "0l1rpdfjhwbhzrs1z54s57j4zahx62mym9rdld0rb41ph3k4l49q";
+          rev = "026fceb78e13d67778d72d90ba83f337d0144707";
+          sha256 = "0yxmhdfxp6zplfpq52krx86n5sfa60rc1fjcd09g5f1621m31y70";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3c13e9ccc358743de660b1f0e89d6bb709c42bff/recipes/d-mode";
           sha256 = "060k9ndjx0n5vlpzfxlv5zxnizx72d7y9vk7gz7gdvpm6w2ha0a2";
-          name = "d-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -12385,8 +15466,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    dactyl-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    dactyl-mode = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "dactyl-mode";
         version = "20140906.1025";
         src = fetchFromGitHub {
@@ -12395,10 +15479,10 @@
           rev = "cc55fe6b987271d9647492b8df4c812d884f661f";
           sha256 = "0fp40cyamchc9qq5vbpxgq3yp6vs8p3ncg46mjzr54psy3fc86dm";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/72d503380511d2d6580b9522b6e0bd2d800bdebe/recipes/dactyl-mode";
           sha256 = "0ppcabddcpwshfd04x42nbrbkagbyi1bg4vslysnlxn4kaxjs7pm";
-          name = "dactyl-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -12406,8 +15490,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    dad-joke = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    dad-joke = callPackage ({ emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "dad-joke";
         version = "20170927.2358";
         src = fetchFromGitHub {
@@ -12416,10 +15504,10 @@
           rev = "bee47e7b746b403228fa7d7361cb095de19ac9ba";
           sha256 = "14snnnjs28jg6k8x6g90m3dbcx10306ipcd256d3l6czk9p17vpd";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/484d571b2737f7c613816333afdde6460c64e635/recipes/dad-joke";
           sha256 = "1cg8iaq79w5zx1s3dirdl7ymcp162mmsy5c4vly90v20yrijblad";
-          name = "dad-joke";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -12427,20 +15515,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    daemons = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    daemons = callPackage ({ emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "daemons";
-        version = "20180408.301";
+        version = "20180610.810";
         src = fetchFromGitHub {
           owner = "cbowdon";
           repo = "daemons.el";
-          rev = "9e6868e2559ea7d70fbad8c419798124f406cc40";
-          sha256 = "00ijgm22ck76gw0x79krl05yy0m8a502yfakazfy5xhpn1zi6ab7";
+          rev = "dcf42cb3178d7245d6d49de346d5e2b44e5b7498";
+          sha256 = "00bkzfaw3bqykcks610vk9wlpa2z360xn32bpsrycacwfv29j7g4";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1f780485e72ae2885f698fdab0156855f70831f1/recipes/daemons";
           sha256 = "14givkrw9p0m261hawahzi0n8jarapb63kv1s62faq57mqnq23jr";
-          name = "daemons";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -12448,8 +15540,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    dakrone-light-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    dakrone-light-theme = callPackage ({ fetchFromGitHub
+                                       , fetchurl
+                                       , lib
+                                       , melpaBuild }:
+      melpaBuild {
         pname = "dakrone-light-theme";
         version = "20170808.1440";
         src = fetchFromGitHub {
@@ -12458,10 +15553,10 @@
           rev = "06f198dc8b4ca7421990b30a23d89c8e0b8c5de4";
           sha256 = "01vqlsv44h2ah79c8jqv8vkqvgmhqx2w3qbq07l7fx3zkpgjfmpy";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f3a88022a5f68d2fe01e08c2e99cfe380e3697b7/recipes/dakrone-light-theme";
           sha256 = "1njlpvfa4ar14zn51fdmby55vjgfkpskizg5rif2f3zn6y4np2xw";
-          name = "dakrone-light-theme";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -12469,8 +15564,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    dakrone-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    dakrone-theme = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "dakrone-theme";
         version = "20170801.1233";
         src = fetchFromGitHub {
@@ -12479,10 +15577,10 @@
           rev = "232ad1be5f3572dcbdf528f1655109aa355a6937";
           sha256 = "0p51zni42hv090vv6mk9v0v88achmgxlsmlr40y8y6ng57w51r4s";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/dcc07077b47d7c710c7f2d4919d791ed16ed5b26/recipes/dakrone-theme";
           sha256 = "0ma4rfmgwd6k24jzn6pgk46b88jfix7mz0ib7c7r90h5vmpiq814";
-          name = "dakrone-theme";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -12490,20 +15588,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    danneskjold-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    danneskjold-theme = callPackage ({ fetchFromGitHub
+                                     , fetchurl
+                                     , lib
+                                     , melpaBuild }:
+      melpaBuild {
         pname = "danneskjold-theme";
-        version = "20180327.254";
+        version = "20180708.724";
         src = fetchFromGitHub {
           owner = "rails-to-cosmos";
           repo = "danneskjold-theme";
-          rev = "ae26f45800d9e2ad5d76d50bf1902edc1e36d0f7";
-          sha256 = "1b8mp4xhcswhzk2r5w0s84kkiil1wzl2s32nfbiphpqg7f0863dj";
+          rev = "abc8c7fbe7ab071b8260e3355051304bb36adbd7";
+          sha256 = "1zd6z66hfdb992r85mvjlaqfavyw5g4g6vak38zj8ycbjdj28p59";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/557244a3b60c7cd3ca964ff843aa1e9d5a1e32ec/recipes/danneskjold-theme";
           sha256 = "0cwab7qp293g92n9mjjz2vpg1pz2q3d40hfszf29rci89wsf3yxl";
-          name = "danneskjold-theme";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -12511,20 +15612,30 @@
           license = lib.licenses.free;
         };
       }) {};
-    dante = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lcr, lib, melpaBuild, s }:
-    melpaBuild {
+    dante = callPackage ({ dash
+                         , emacs
+                         , f
+                         , fetchFromGitHub
+                         , fetchurl
+                         , flycheck
+                         , haskell-mode
+                         , lcr
+                         , lib
+                         , melpaBuild
+                         , s }:
+      melpaBuild {
         pname = "dante";
-        version = "20180414.1306";
+        version = "20180515.1312";
         src = fetchFromGitHub {
           owner = "jyp";
           repo = "dante";
-          rev = "18a2c4a833f9ece01ccfb5910455fc2f0b0de986";
-          sha256 = "09a8gwnh2281kjc1rk6ba5clk020hmz11pz36iy99y1bya043794";
+          rev = "0fd72ef60fe01aafbd11720cf3df2e7015847ff4";
+          sha256 = "1faxalr54vzxiqbf8vr2nmxkpypyv5w67bjnlvqnyy9hzr5i3qwj";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5afa8226077cbda4b76f52734cf8e0b745ab88e8/recipes/dante";
           sha256 = "1j0qwjshh2227k63vd06bvrsccymqssx26yfzams1xf7bp6y0krs";
-          name = "dante";
+          name = "recipe";
         };
         packageRequires = [ dash emacs f flycheck haskell-mode lcr s ];
         meta = {
@@ -12532,20 +15643,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    darcsum = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    darcsum = callPackage ({ fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "darcsum";
         version = "20140315.2110";
         src = fetchFromGitHub {
           owner = "emacsorphanage";
           repo = "darcsum";
-          rev = "00c252b51cb24c25fb74f529960ebd631514a4c1";
-          sha256 = "1vbfdmc56ma2ycxhza681ninhdxgvxm9j5xb9374xiqmb6g0vykq";
+          rev = "5bb38e444cc12940c6933a43792a89accdc2ad0e";
+          sha256 = "11h2i0wn118anb9n3kab2hsv78zpiw4d95jal7c9xzhv6xxrz4g0";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/30de78c9cf83de30093a5647976eeaf552d4b2cb/recipes/darcsum";
           sha256 = "0p3hwmwjjqwgkjws5b7gkad4yxh0gs2hr03ar18y43yahwgihvnv";
-          name = "darcsum";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -12553,8 +15667,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    darcula-theme = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    darcula-theme = callPackage ({ fetchFromGitLab
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "darcula-theme";
         version = "20171227.1045";
         src = fetchFromGitLab {
@@ -12563,10 +15680,10 @@
           rev = "d9b82b58ded9014985be6658f4ab17e26ed9e93e";
           sha256 = "1y8rsc63nl4n43pvn283f1vcpqyjnv6xl60fwyscwrqaz19bsnl1";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/23c8f10205187babb17e3abc3dc40eb1938e6640/recipes/darcula-theme";
           sha256 = "1n9mpkdyf5jpxc5azfs38ccp9p0b5ii87sz4c7z4khs94y0gxqh3";
-          name = "darcula-theme";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -12574,8 +15691,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    dark-krystal-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    dark-krystal-theme = callPackage ({ emacs
+                                      , fetchFromGitHub
+                                      , fetchurl
+                                      , lib
+                                      , melpaBuild }:
+      melpaBuild {
         pname = "dark-krystal-theme";
         version = "20170808.600";
         src = fetchFromGitHub {
@@ -12584,10 +15705,10 @@
           rev = "79084b99665dc9ffb0ec62cc092349a5ecebebbc";
           sha256 = "1d3cdsaba71qxdqrbj1jrlq8a0iw3h50l5grcdjvxixdnf5nsa4c";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/641d1959bd31598fcdacd39a3d1bb077dcccfa5c/recipes/dark-krystal-theme";
           sha256 = "056aql35502sgvdpbgphpqdxzbjf4ay01rra6pm11c1dya8avv0j";
-          name = "dark-krystal-theme";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -12595,20 +15716,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    dark-mint-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    dark-mint-theme = callPackage ({ fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "dark-mint-theme";
         version = "20160301.2242";
         src = fetchFromGitHub {
           owner = "shaunvxc";
           repo = "dark-mint-theme";
-          rev = "95c30a26de31549cd341184ba9ab2be8fdc67eba";
-          sha256 = "052k8mqxx8lkadxyz6rwa7l741rwbd1blk2ggpsj2s1g6p9l68a1";
+          rev = "c8ad39b7115baf889b54c3e9bffe32daeab93c29";
+          sha256 = "1bz7n9ijk69kqc1sv74prm2d74gd4xj0vzkbgbwdsin1llkg00zv";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/de74e734ae75df051475e60e79d4f5ad5bc128ae/recipes/dark-mint-theme";
           sha256 = "0rljpwycarbn8rnac9vz7n23j69wmx35gn5dx77v0f0ws8ni4k9m";
-          name = "dark-mint-theme";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -12616,20 +15740,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    dark-souls = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    dark-souls = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "dark-souls";
         version = "20140314.428";
         src = fetchFromGitHub {
           owner = "tomjakubowski";
           repo = "dark-souls.el";
-          rev = "94122b1215423e58dcf18584a2bd022029d54d4b";
-          sha256 = "1w0y2j0j9n107dbk7ksr9bipshjfs9dk08qbs9m6h5aqh4hmwa4r";
+          rev = "2c9437265b52f966b2fb13a410a12f3b1e167cb7";
+          sha256 = "0d4zjbkzjcvlc1jaszicbln0dvwacbj6k1fb1bn34vgbabhckdys";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/535577ce57bd772aca9f66e27485b0f58a7d35c5/recipes/dark-souls";
           sha256 = "1ilsn657mpl7v8vkbzqf3gp0gmvy0dgynfsn8w4cb49qaiy337xc";
-          name = "dark-souls";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -12637,20 +15764,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    darkburn-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    darkburn-theme = callPackage ({ fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "darkburn-theme";
         version = "20170423.952";
         src = fetchFromGitHub {
           owner = "gorauskas";
           repo = "darkburn-theme";
-          rev = "0af794ff7fac19778ac8a7efb92455c6f6c2158f";
-          sha256 = "0nv917r8pbj6mfncjl8d7hq4763c69q491d4iwnff1n3wzlcp42s";
+          rev = "b59053533246330e9107721da7977a0af312c915";
+          sha256 = "1ffmip31dnv3zzh1h9cpchl6lya49zn2j13acx6rj9r01ndlbrar";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a04dd517e02bc4b4a62d956aa901a727354202b0/recipes/darkburn-theme";
           sha256 = "18hwdnwmkf640vcyx8d66i424wwazbzjq3k0w0xjmwsn2mpyhm9w";
-          name = "darkburn-theme";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -12658,8 +15788,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    darkmine-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    darkmine-theme = callPackage ({ fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "darkmine-theme";
         version = "20160405.2324";
         src = fetchFromGitHub {
@@ -12668,10 +15801,10 @@
           rev = "7f7e82ca03bcad52911fa41fb3e204e32d6ee63e";
           sha256 = "0d2g4iyp8gyfrcc1gkvl40p1shlw1sadswzhry0m1lgbyxiiklrz";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e527d1335f5fd2aba5b00255a7d69adbc20585ff/recipes/darkmine-theme";
           sha256 = "06vzldyqlmfd11g8dqrqh5x244ikfa20qwpsmbgsiry3041k8iw5";
-          name = "darkmine-theme";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -12679,20 +15812,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    darkokai-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    darkokai-theme = callPackage ({ fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "darkokai-theme";
-        version = "20170728.339";
+        version = "20180513.1857";
         src = fetchFromGitHub {
           owner = "sjrmanning";
           repo = "darkokai";
-          rev = "d881d51acf0a7f806ae68d48305e30941a741a0e";
-          sha256 = "008kn8gllhzlv49br0bs3469insjpcgr3r7iijz1frgy6wrpmdjp";
+          rev = "bd5efef1edd42664bb731abd398d5d71a5d2d145";
+          sha256 = "05k892zkdfzz05bypf4qdjm49n5gmf7swml2w80zc88dall3hmk9";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/81387a5a70f7c42fbae16b52db765136795a37e1/recipes/darkokai-theme";
           sha256 = "0jw71xl4ihkyq4m0w8c35x5hr8ic07wcabmvpwmvspnj8hkfccwf";
-          name = "darkokai-theme";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -12700,20 +15836,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    darktooth-theme = callPackage ({ autothemer, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    darktooth-theme = callPackage ({ autothemer
+                                   , fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "darktooth-theme";
-        version = "20171206.639";
+        version = "20180612.1814";
         src = fetchFromGitHub {
           owner = "emacsfodder";
           repo = "emacs-theme-darktooth";
-          rev = "dc90fc7d526d7e65256e050e3b373908a27b6c45";
-          sha256 = "0rpg7mn8h47hqcm24avcy8r7v8k8by1wjk5xk9j24bbv77aswj9k";
+          rev = "98f909497710ff948c996c810ca1bddf1f8b91d8";
+          sha256 = "0420hx95rriyyfjn0kpy39g63j0jn7x5zqyb3l6kwj5g3nrjlz26";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b7f62ac1566ced7332e83253f79078dc30cb7889/recipes/darktooth-theme";
           sha256 = "1vss0mg1vz4wvsal1r0ya8lid2c18ig11ip5v9nc80b5slbixzvs";
-          name = "darktooth-theme";
+          name = "recipe";
         };
         packageRequires = [ autothemer ];
         meta = {
@@ -12721,20 +15861,28 @@
           license = lib.licenses.free;
         };
       }) {};
-    dart-mode = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, s }:
-    melpaBuild {
+    dart-mode = callPackage ({ cl-lib ? null
+                             , dash
+                             , emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , flycheck
+                             , lib
+                             , melpaBuild
+                             , s }:
+      melpaBuild {
         pname = "dart-mode";
-        version = "20180219.1614";
+        version = "20180604.835";
         src = fetchFromGitHub {
           owner = "nex3";
           repo = "dart-mode";
-          rev = "4feac341db7d2b80841fedcf1798dee9070d68bf";
-          sha256 = "031f9lkxyhirasj7m0rj67gk8rh3ry640qcppw2p88k937kc6765";
+          rev = "d4da484bce718fd9d9d442d9e4346c0d5c1e06cf";
+          sha256 = "11b4v37qcx6riq1yr6wg8m34a4skx16n3j51llrqsv5a1a0ajbwq";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dart-mode";
           sha256 = "00zvgxfxgk5jair796l6appyq5hc7hs2s2wglv1j4l7g50b05cla";
-          name = "dart-mode";
+          name = "recipe";
         };
         packageRequires = [ cl-lib dash emacs flycheck s ];
         meta = {
@@ -12742,8 +15890,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    dash = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    dash = callPackage ({ fetchFromGitHub
+                        , fetchurl
+                        , lib
+                        , melpaBuild }:
+      melpaBuild {
         pname = "dash";
         version = "20180413.30";
         src = fetchFromGitHub {
@@ -12752,10 +15903,10 @@
           rev = "a74f4cfcdc8d0642a9f602ad494f0354f27dacc9";
           sha256 = "1kzijmjxjxgr7p8clphzvmm47vczckbs8mza9an77c25bn627ywl";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/57eed8767c3e98614259c408dc0b5c54d3473883/recipes/dash";
           sha256 = "0azm47900bk2frpjsgy108fr3p1jk4h9kmp4b5j5pibgsm26azgz";
-          name = "dash";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -12763,20 +15914,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    dash-at-point = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    dash-at-point = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "dash-at-point";
-        version = "20140626.35";
+        version = "20180710.656";
         src = fetchFromGitHub {
           owner = "stanaka";
           repo = "dash-at-point";
-          rev = "ed872b4fcbe02ef1a5bac0337afe19a7a747f34c";
-          sha256 = "0zd50sr51mmvndjb9qfc3sn502nhc939rhd454jbkmlrzqsxvphj";
+          rev = "4d795a23a8428c421d5107f1b005c9d8e0d1816c";
+          sha256 = "09rxyr22qxc9pdrkg0c4smifh2r797ggz5hg74q8j8jybvixsbls";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0b2b0c544a76802df5ff3b1bf68a0418a653ea98/recipes/dash-at-point";
           sha256 = "0x4nq42nbh2qgbg111lgbknc7w7m7lxd14mp9s8dcrpwsaxz960m";
-          name = "dash-at-point";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -12784,20 +15938,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    dash-functional = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    dash-functional = callPackage ({ dash
+                                   , emacs
+                                   , fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "dash-functional";
         version = "20180107.818";
         src = fetchFromGitHub {
           owner = "magnars";
           repo = "dash.el";
-          rev = "a74f4cfcdc8d0642a9f602ad494f0354f27dacc9";
-          sha256 = "1kzijmjxjxgr7p8clphzvmm47vczckbs8mza9an77c25bn627ywl";
+          rev = "528e5a51f1af668e3075f2beccd2b39785ccb2ba";
+          sha256 = "0c65wkyzqsi0jignbhl0j9hh0711069x0l54sqbfb72viy0sppck";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/57eed8767c3e98614259c408dc0b5c54d3473883/recipes/dash-functional";
           sha256 = "0hx36hs12mf4nmskaaqrqpcgwrfjdqj6qcxn6bwb0s5m2jf9hs8p";
-          name = "dash-functional";
+          name = "recipe";
         };
         packageRequires = [ dash emacs ];
         meta = {
@@ -12805,20 +15964,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    dashboard = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, page-break-lines }:
-    melpaBuild {
+    dashboard = callPackage ({ emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild
+                             , page-break-lines }:
+      melpaBuild {
         pname = "dashboard";
-        version = "20180328.807";
+        version = "20180704.2325";
         src = fetchFromGitHub {
           owner = "rakanalh";
           repo = "emacs-dashboard";
-          rev = "5be3f45b0f5e84aa7db3988827c5cf0a8134176d";
-          sha256 = "10ac6d2b97jpqrkfd3rnxj1n6a0lzh1n2dxmmz5i2yy5pjfabc5q";
+          rev = "41d959b752a294a18122817fb3ec2a2a9cf22856";
+          sha256 = "0xcqaf39szm3wqga1lkr4rsh48sv7qxldznfy8vxxa57xama80l3";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e9a79341ccaa82a8c065e71c02fe6aee22007c66/recipes/dashboard";
           sha256 = "08pdpjfrg8v80gljy146cwpz624dshhbz8843zl1zszwp2p00kqy";
-          name = "dashboard";
+          name = "recipe";
         };
         packageRequires = [ emacs page-break-lines ];
         meta = {
@@ -12826,20 +15990,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    date-at-point = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    date-at-point = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "date-at-point";
         version = "20150308.543";
         src = fetchFromGitHub {
           owner = "alezost";
           repo = "date-at-point.el";
-          rev = "38df823d05df08ec0748a4185113fae5f99090e9";
-          sha256 = "024jx6q0dik4w2wb8nrk1q73asvjgrsl5mslns0ci3zsya343rch";
+          rev = "258c0268cc4357640c2af78774ba9667beff28ee";
+          sha256 = "0cry52p29lr4lcwvpl96gam85m7d9jkskwmysb71mk6cg57zyjx5";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a6dbeddd236f312fac1d5542dfd2edf81df8fad2/recipes/date-at-point";
           sha256 = "0r26df6px6q5jlxj29nhl3qbp6kzy9hs5vd72kpiirgn4wlmagp0";
-          name = "date-at-point";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -12847,20 +16014,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    date-field = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, log4e, melpaBuild, yaxception }:
-    melpaBuild {
+    date-field = callPackage ({ dash
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , log4e
+                              , melpaBuild
+                              , yaxception }:
+      melpaBuild {
         pname = "date-field";
         version = "20141128.1705";
         src = fetchFromGitHub {
           owner = "aki2o";
           repo = "emacs-date-field";
-          rev = "11c9170d1f7b343233f7716d4c0a62be024c1654";
-          sha256 = "1lmwnj2fnvijj9qp4rjggl7c4x91vnpb47rqaam6m2wmr5wbrx3w";
+          rev = "3b0af9c49293fc4346078ed2e13a6ebf41bbe54e";
+          sha256 = "1skvkbbqvwbw58ahdbf2m1z7s0kfi5v7c0lavc9ifrs91pqpqx9z";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fe790729a67d2210cbccefce43805daa20db647d/recipes/date-field";
           sha256 = "0fmw13sa4ajs1xkrkdpcjpbp0jl9d81cgvwh93myg8yjjn7wbmvk";
-          name = "date-field";
+          name = "recipe";
         };
         packageRequires = [ dash log4e yaxception ];
         meta = {
@@ -12868,8 +16041,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    datetime = callPackage ({ emacs, extmap, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    datetime = callPackage ({ emacs
+                            , extmap
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "datetime";
         version = "20180325.1004";
         src = fetchFromGitHub {
@@ -12878,10 +16056,10 @@
           rev = "d8674ac11f9ebb702e5bbac10a4a6e5542958ef5";
           sha256 = "19d4wximzwdcs0i2r48k6m60wwxcx5f89jw75k4hr0wvx0352a82";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/91ef4352603cc69930ab3d63f0a90eee63f5f328/recipes/datetime";
           sha256 = "0c000fnqg936dhjw5qij4lydzllw1x1jgnyy960zh6r61pk062xj";
-          name = "datetime";
+          name = "recipe";
         };
         packageRequires = [ emacs extmap ];
         meta = {
@@ -12889,8 +16067,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    datetime-format = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    datetime-format = callPackage ({ fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "datetime-format";
         version = "20160612.1015";
         src = fetchFromGitHub {
@@ -12899,10 +16080,10 @@
           rev = "e6427538b547cbe02e1bd6ed4b765c73620bdae8";
           sha256 = "1573z8wq5m8qzbzmnsz2fmbwrj9c0ava0jjfchzmwm2b3jyvqh5r";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/eb13cb0dba1696cc51132cd1ff723fa17f892a7c/recipes/datetime-format";
           sha256 = "19qccjz2lzh01glgkixya7bxd6pvyjqgmw8bmqlwag6cb68bwsyv";
-          name = "datetime-format";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -12910,8 +16091,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    datomic-snippets = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s, yasnippet }:
-    melpaBuild {
+    datomic-snippets = callPackage ({ dash
+                                    , fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild
+                                    , s
+                                    , yasnippet }:
+      melpaBuild {
         pname = "datomic-snippets";
         version = "20180116.752";
         src = fetchFromGitHub {
@@ -12920,10 +16107,10 @@
           rev = "731fbd31b814ef1521bd7eb1558eeab6a4c2e01b";
           sha256 = "0sbrvd3z32wrpnmarwf9ya0b2c99pg82mxhvjw4b7hggxx65lqsj";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4da8ec133ec5e1204966c1b12c9bc0ca1b50d643/recipes/datomic-snippets";
           sha256 = "0lax0pj4k9c9n0gmrvil240pc9p25535q3n5m8nb2ar4sli8dn8r";
-          name = "datomic-snippets";
+          name = "recipe";
         };
         packageRequires = [ dash s yasnippet ];
         meta = {
@@ -12931,8 +16118,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    dayone = callPackage ({ fetchFromGitHub, fetchurl, ht, lib, melpaBuild, mustache, uuid }:
-    melpaBuild {
+    dayone = callPackage ({ fetchFromGitHub
+                          , fetchurl
+                          , ht
+                          , lib
+                          , melpaBuild
+                          , mustache
+                          , uuid }:
+      melpaBuild {
         pname = "dayone";
         version = "20160105.440";
         src = fetchFromGitHub {
@@ -12941,10 +16134,10 @@
           rev = "ab628274f0806451f23bce16f62a6a11cbf91a2b";
           sha256 = "1j0mk8vyr6sniliq0ix77jldx8vzl73nd5yhh82klzgyymal58ms";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a7c34ae046b75994cf04d16642bf28d4645d1821/recipes/dayone";
           sha256 = "0hi09dj00h6g5r84jxglwkgbijhfxknx4mq5gcl5jzjis5affk8l";
-          name = "dayone";
+          name = "recipe";
         };
         packageRequires = [ ht mustache uuid ];
         meta = {
@@ -12952,8 +16145,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    db = callPackage ({ fetchFromGitHub, fetchurl, kv, lib, melpaBuild }:
-    melpaBuild {
+    db = callPackage ({ fetchFromGitHub
+                      , fetchurl
+                      , kv
+                      , lib
+                      , melpaBuild }:
+      melpaBuild {
         pname = "db";
         version = "20140421.1411";
         src = fetchFromGitHub {
@@ -12962,10 +16159,10 @@
           rev = "b3a423fb8e72f9013009cbe033d654df2ce31438";
           sha256 = "0syv4kr319d34yqi4q61b8jh5yy22wvd148x1m3pc511znh2ry5k";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/79ac40439b65c217e1caaa7175d26556b6a6c889/recipes/db";
           sha256 = "05jhga9n6gh1bmj8gda14sb703gn7jgjlvy55mlr5kdb2z3rqw1n";
-          name = "db";
+          name = "recipe";
         };
         packageRequires = [ kv ];
         meta = {
@@ -12973,8 +16170,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    db-pg = callPackage ({ db, fetchFromGitHub, fetchurl, lib, melpaBuild, pg }:
-    melpaBuild {
+    db-pg = callPackage ({ db
+                         , fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild
+                         , pg }:
+      melpaBuild {
         pname = "db-pg";
         version = "20130131.1102";
         src = fetchFromGitHub {
@@ -12983,10 +16185,10 @@
           rev = "7d5ab86b74b05fe003b3b434d4835f37f3f3eded";
           sha256 = "15r0qwjkl33p8kh2k5kxz9wnbkv1k470b1h0i6svvljkx9ynk68a";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c4eb90ea7b8ed5c529c74c3faeaf3eac3955eb31/recipes/db-pg";
           sha256 = "06nfibw01ijv7nr0m142y80jbbpg9kk1dh19s5wq7i6fqf7g08xg";
-          name = "db-pg";
+          name = "recipe";
         };
         packageRequires = [ db pg ];
         meta = {
@@ -12994,20 +16196,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    ddskk = callPackage ({ ccc, cdb, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ddskk = callPackage ({ ccc
+                         , cdb
+                         , fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "ddskk";
-        version = "20170709.839";
+        version = "20180706.2232";
         src = fetchFromGitHub {
           owner = "skk-dev";
           repo = "ddskk";
-          rev = "16d156562aef72f02ced58087335ed72d520d878";
-          sha256 = "0rz49i2yqs1yalqqnwgk2zvsga6qav4hc2dhf8p2kfkzrcbpzgxx";
+          rev = "cb727af4ca4e119be6e9509f14bfd61d9c6b758a";
+          sha256 = "0qpgj1zvx2y8rmba4pqiypqi6dalg5lalhfafcvhsnnz1553fp7n";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6eccccb79881eaa04af3ed6395cd2ab981d9c894/recipes/ddskk";
           sha256 = "01pb00p126q7swsl12yjrhghln2wgaj65jhjr0k7dkk64x4psyc9";
-          name = "ddskk";
+          name = "recipe";
         };
         packageRequires = [ ccc cdb ];
         meta = {
@@ -13015,20 +16222,53 @@
           license = lib.licenses.free;
         };
       }) {};
-    debpaste = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, xml-rpc }:
-    melpaBuild {
+    deadgrep = callPackage ({ dash
+                            , emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild
+                            , projectile
+                            , s
+                            , spinner }:
+      melpaBuild {
+        pname = "deadgrep";
+        version = "20180714.1716";
+        src = fetchFromGitHub {
+          owner = "Wilfred";
+          repo = "deadgrep";
+          rev = "0b00536799b6ee6d64676a0eed670bf771d4e746";
+          sha256 = "0fdflr7spkcrgn6pssajhh7dbpwbhxqqx22lv38a45zzbpxrirp0";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/93389fae7233b83ea904e17bdaf83f8247cda3d8/recipes/deadgrep";
+          sha256 = "01m5ds7lic9g11a5iwzw86k6xcv56wbbzjm1343ckbbi255h9i09";
+          name = "recipe";
+        };
+        packageRequires = [ dash emacs projectile s spinner ];
+        meta = {
+          homepage = "https://melpa.org/#/deadgrep";
+          license = lib.licenses.free;
+        };
+      }) {};
+    debpaste = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild
+                            , xml-rpc }:
+      melpaBuild {
         pname = "debpaste";
         version = "20160113.1547";
         src = fetchFromGitHub {
           owner = "alezost";
           repo = "debpaste.el";
-          rev = "6f2a400665062468ebd03a2ce1de2a73d9084958";
-          sha256 = "1wi70r56pd5z0x4dp4m58p9asq03j74kdm4fi9vai83vsl2z9amq";
+          rev = "038f0ff7824f4e3dd455e2232eeca70fa8abcec5";
+          sha256 = "1darxggvyv100cfb7imyzvgif8a09pnky62pf3bl2612hhvaijfb";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/debpaste";
           sha256 = "0h3hx3vgdhchmndabmzprddq3bxd80jnv4xvma9v6k1v07bl721v";
-          name = "debpaste";
+          name = "recipe";
         };
         packageRequires = [ xml-rpc ];
         meta = {
@@ -13036,8 +16276,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    debug-print = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    debug-print = callPackage ({ emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "debug-print";
         version = "20140125.1619";
         src = fetchFromGitHub {
@@ -13046,10 +16290,10 @@
           rev = "d817fd9ea2d3f8d2c1ace4d8af155684f3a99dc5";
           sha256 = "1n99nrp42slmyp5228d1nz174bysjn122jgs8fn1x0qxywg7jyxp";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/aaaaa43f6ce7db654b651969797978164143b269/recipes/debug-print";
           sha256 = "01dsqq2qdsbxny6j9dhvg770493awxjhk1m85c14ysgh6sl199rm";
-          name = "debug-print";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -13057,8 +16301,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    decide = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    decide = callPackage ({ fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "decide";
         version = "20180316.1101";
         src = fetchFromGitHub {
@@ -13067,10 +16314,10 @@
           rev = "257f0e39ac60ca375942950b44eeaee04cb9d961";
           sha256 = "0hiv3wlqidj1qd8z5jy800spzrpbca2vgq4zg1lkzvbcmhqvcqqm";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6adcd300e2ac2c718989cf855fd7b3eef654df00/recipes/decide";
           sha256 = "1gjkays48lhrifi9jwja5n2dpxjbl7f9rmka1nsqg9vf7s59vhhc";
-          name = "decide";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -13078,20 +16325,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    decl = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    decl = callPackage ({ cl-lib ? null
+                        , dash
+                        , emacs
+                        , fetchFromGitHub
+                        , fetchurl
+                        , lib
+                        , melpaBuild }:
+      melpaBuild {
         pname = "decl";
         version = "20171212.658";
         src = fetchFromGitHub {
           owner = "preetpalS";
           repo = "decl.el";
-          rev = "ff7f8a4f1225cbdf141c86172104e67a4cf58c86";
-          sha256 = "1ns1ni6aalr541df3a0ylqy0gj68fcsxdfvm4m1ga5532kxnswnj";
+          rev = "f16b96e322c646d6018dfbd3c3ba8b2b75fcb9e1";
+          sha256 = "07zg8grnqxg27fpksy8b94ry25ljrkag4ffq15d78k8nqmqmf3b8";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8c2ecd46180643a0c493e05ec86fe50bc1e55146/recipes/decl";
           sha256 = "0wdhmp226wmrjvjgpbz8ihvhxxv3rrxh97sdqm3mgsav3n071n6k";
-          name = "decl";
+          name = "recipe";
         };
         packageRequires = [ cl-lib dash emacs ];
         meta = {
@@ -13099,8 +16352,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    dedicated = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    dedicated = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "dedicated";
         version = "20090428.1231";
         src = fetchFromGitHub {
@@ -13109,10 +16365,10 @@
           rev = "8275fb672f9cc4ba6682ebda0ef91db827e32992";
           sha256 = "0pba9s0h37sxyqh733vi6k5raa4cs7aradipf3826inw36jcw414";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5f2a50f62475639af011c99c6cc38928b74b3b0a/recipes/dedicated";
           sha256 = "1ka8n02r3nd2ksbid23g2qd6707c7xsjx7lbbdi6pcmwam5mglw9";
-          name = "dedicated";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -13120,8 +16376,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    dedukti-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    dedukti-mode = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "dedukti-mode";
         version = "20171103.512";
         src = fetchFromGitHub {
@@ -13130,10 +16389,10 @@
           rev = "d7c3505a1046187de3c3aeb144455078d514594e";
           sha256 = "1842wikq24c8rg0ac84vb1qby9ng1nssxswyyni4kq85lng5lcrp";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/767a685fbe8ae86177e90a17dac3815d41d74df4/recipes/dedukti-mode";
           sha256 = "17adfmrhfks5f45ddr6ygjq870ac50vfzc5872ycv414zg0w4sa9";
-          name = "dedukti-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -13141,20 +16400,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    default-text-scale = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    default-text-scale = callPackage ({ fetchFromGitHub
+                                      , fetchurl
+                                      , lib
+                                      , melpaBuild }:
+      melpaBuild {
         pname = "default-text-scale";
-        version = "20170826.2215";
+        version = "20180520.2349";
         src = fetchFromGitHub {
           owner = "purcell";
           repo = "default-text-scale";
-          rev = "968e985e219235f3e744d6d967e592acbaf6e0a8";
-          sha256 = "0zds01c3q5yny6ab1fxfkzzgn1kgl3q23lxxap905f4qd70v922h";
+          rev = "512d701df5e2079cad33329184fd7683c3b0b0af";
+          sha256 = "1zwrjlaxsxx7snyvyklhrchkbqg14lhr9xk7rhhik8fp4dy4f5yj";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/db5e0b70e2d9c80aa41ae2c397f822789c2d3cc2/recipes/default-text-scale";
           sha256 = "18r90ic38fnlsbg4gi3r962vban398x2bf3rqhrc6z4jk4aiv3mi";
-          name = "default-text-scale";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -13162,8 +16424,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    deferred = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    deferred = callPackage ({ emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "deferred";
         version = "20170901.630";
         src = fetchFromGitHub {
@@ -13172,10 +16438,10 @@
           rev = "2239671d94b38d92e9b28d4e12fd79814cfb9c16";
           sha256 = "0vz59lm7pfz0gbsgrb44y555js85wbdjn0zm6p8wfqjiqf63ds3i";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/deferred";
           sha256 = "1i8jfapzmw86iqwhnnlqmcj6zh4hyhizdcwjxcnxdj6kvxmwyysm";
-          name = "deferred";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -13183,20 +16449,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    define-word = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    define-word = callPackage ({ emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "define-word";
-        version = "20180327.1935";
+        version = "20180706.1329";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "define-word";
-          rev = "f0da313420a3b27f761fcafd01ccd9e32b71bd0d";
-          sha256 = "0xvsv2wzkgys99vx1x2by9isagihi97bwbxmrwhfrz47pphdmj5r";
+          rev = "637cd29837d4bd5567e17a11a479fd2edfb0e2c1";
+          sha256 = "1gni89sgs7bnl0h42jyqcph9mhgingybwcmf29j8zm440zii5f9p";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e318b30d8b2b89981f4b89d78e5a46e77d3de412/recipes/define-word";
           sha256 = "035fdfwnxw0mir1dyvrimygx2gafcgnvlcsmwmry1rsfh39n5b9a";
-          name = "define-word";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -13204,8 +16474,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    defproject = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    defproject = callPackage ({ emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "defproject";
         version = "20151201.1419";
         src = fetchFromGitHub {
@@ -13214,10 +16488,10 @@
           rev = "674d48a5e34cb4bba76faa38ee901322ec649086";
           sha256 = "07jzr571q02l0lg5d40rnmzg16hmybi1nkjgslmvlx46z3c4xvyr";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/86465b351e668d6c19a6fc8e1b1a4aa7904cd139/recipes/defproject";
           sha256 = "1gld2fkssrjh4smpp54017549d6aw3n1zisp5s4kkb6cmszwj5gm";
-          name = "defproject";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -13225,20 +16499,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    deft = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    deft = callPackage ({ fetchFromGitHub
+                        , fetchurl
+                        , lib
+                        , melpaBuild }:
+      melpaBuild {
         pname = "deft";
-        version = "20180112.1155";
+        version = "20180619.857";
         src = fetchFromGitHub {
           owner = "jrblevin";
           repo = "deft";
-          rev = "c4b30d780bfa732ff52d85f0311e4a045f44a7b4";
-          sha256 = "0z7cilgiz6krvl5h2z72hkch43qxmypb0k6p5vxn5lx1p6v0mrf2";
+          rev = "24ac778ab8c8247f7677dd20dd301f6eba85bd8d";
+          sha256 = "1m26wplsjgvv2s4mcb47haqjni49xmpjy52rddkmh6p7frhayxi2";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1e2a0e4698d4e71ec28656594f6a83504a823490/recipes/deft";
           sha256 = "0f6z9hsigbwdsmg0abk1ddl9j19d0rpj4gzkl0d5arcpqbla26hp";
-          name = "deft";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -13246,8 +16523,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    delim-kill = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    delim-kill = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "delim-kill";
         version = "20100516.2320";
         src = fetchFromGitHub {
@@ -13256,10 +16536,10 @@
           rev = "1dbe47344f2d2cbc8c54beedf0cf0bf10fd203c1";
           sha256 = "06a20sd8nc273azrgha40l1fbqvv9qmxsmkjiqbf6dcf1blkwjyf";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/delim-kill";
           sha256 = "1pplc456771hi52ap1p87y7pabxlvm6raszcxjvnxff3xzw56pig";
-          name = "delim-kill";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -13267,20 +16547,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    demangle-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    demangle-mode = callPackage ({ cl-lib ? null
+                                 , emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "demangle-mode";
-        version = "20170923.1501";
+        version = "20180515.1945";
         src = fetchFromGitHub {
           owner = "liblit";
           repo = "demangle-mode";
-          rev = "79231b05f97da147d66120f947656f856a3a64fb";
-          sha256 = "0whr18qwi5bmz39n8x836sjgky20qhw59qha59c11dvly1qs5nnq";
+          rev = "374c84a0b190f0f0ea76b956035003228077d1e0";
+          sha256 = "02z2mjillglyv65ijdlc62hbjddp3xv185xg7s93xz7ymg04c394";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6ced9f4ffb051a8474d3f72695156416cf2dd8be/recipes/demangle-mode";
           sha256 = "0ky0bb6rc99vrdli4lhs656qjndnla9b7inc2ji9l4n1zki5qxzk";
-          name = "demangle-mode";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -13288,8 +16573,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    demo-it = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    demo-it = callPackage ({ fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "demo-it";
         version = "20180403.2032";
         src = fetchFromGitHub {
@@ -13298,10 +16586,10 @@
           rev = "4f74e6f1bb6519587303e20fe59470853b1a0352";
           sha256 = "15j4f7jjjhrcjycxwzqnwqhm3fyvjnisd41k5lw13dnhbmp1gzx6";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1dec5877db00c29d81d76be0ee2504399bad9cc4/recipes/demo-it";
           sha256 = "063v115xy9mcga4qv16v538k12rn9maz92khzwa35wx56bwz4gg7";
-          name = "demo-it";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -13309,8 +16597,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    describe-number = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yabin }:
-    melpaBuild {
+    describe-number = callPackage ({ fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild
+                                   , yabin }:
+      melpaBuild {
         pname = "describe-number";
         version = "20151031.1755";
         src = fetchFromGitHub {
@@ -13319,10 +16611,10 @@
           rev = "40618345a37831804b29589849a785ef5aa5ac24";
           sha256 = "13fasbhdjwc4jh3cy25gm5sbbg56hq8la271098qpx6dhqm2wycq";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d5ed9063f7e9f540bc90c1df4e3604d4af9bcfe5/recipes/describe-number";
           sha256 = "0gvriailni2ppz69g0bwnb1ik1ghjkj341k45vllz30j0frp9iji";
-          name = "describe-number";
+          name = "recipe";
         };
         packageRequires = [ yabin ];
         meta = {
@@ -13330,20 +16622,51 @@
           license = lib.licenses.free;
         };
       }) {};
-    desktop-plus = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    desktop-environment = callPackage ({ emacs
+                                       , fetchFromGitHub
+                                       , fetchurl
+                                       , lib
+                                       , melpaBuild }:
+      melpaBuild {
+        pname = "desktop-environment";
+        version = "20180423.153";
+        src = fetchFromGitHub {
+          owner = "DamienCassou";
+          repo = "desktop-environment";
+          rev = "62fbceded526b8e35c90803bcf80e33ebfe8473a";
+          sha256 = "1j2kvdj3k9amj93w8cbh49rbf3vhnkbisw67hjhif62ajc19ip4k";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/dfe988e0dd4a1272ecf7b2fe758ef0c81e2acad2/recipes/desktop-environment";
+          sha256 = "0iai1awpkv4n8k263854mx95c8yh2vvif6z91mgn6hck8774v9zp";
+          name = "recipe";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/desktop-environment";
+          license = lib.licenses.free;
+        };
+      }) {};
+    desktop-plus = callPackage ({ dash
+                                , emacs
+                                , f
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "desktop-plus";
         version = "20170107.1332";
         src = fetchFromGitHub {
           owner = "ffevotte";
           repo = "desktop-plus";
-          rev = "88055cee526a000056201898499cebbd35e3ea76";
-          sha256 = "1nkljslx8cwmm4z18mhnwrc1lmd6lxdyhk8bwhzms7g1p6yi99d8";
+          rev = "d26f369bda96860eef18365cdb5c79f39a2c765c";
+          sha256 = "19z44rm2071hq3664gngywhr7k4wcbdzbixmwjl2x0sp0bdzg2v6";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0b009b42c73490d56d4613dcf5a57447fb4ccab4/recipes/desktop+";
           sha256 = "0w7i6k4814hwb19l7ly9yq59674xiw57ylrwxq7yprwx52sgs2r8";
-          name = "desktop-plus";
+          name = "recipe";
         };
         packageRequires = [ dash emacs f ];
         meta = {
@@ -13351,8 +16674,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    desktop-registry = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    desktop-registry = callPackage ({ fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "desktop-registry";
         version = "20140119.1343";
         src = fetchFromGitHub {
@@ -13361,10 +16687,10 @@
           rev = "244c2e7f9f0a1050aa8a47ad0b38f4e4584682dd";
           sha256 = "11qvhbz7149vqh61fgqqn4inw0ic6ib9lz2xgr9m54pdw9a901mp";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0fda2b54a0ff0b6fc3bd6d20cfcbbf63cae5380f/recipes/desktop-registry";
           sha256 = "1sfj0w6hlrx37js63fn1v5xc9ngmahv07g42z68717md6w3c8g0v";
-          name = "desktop-registry";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -13372,8 +16698,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    devdocs = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    devdocs = callPackage ({ fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "devdocs";
         version = "20170731.150";
         src = fetchFromGitHub {
@@ -13382,10 +16711,10 @@
           rev = "a2d51e824f0cc48a9dd611cc740bc8b86143e611";
           sha256 = "0nzh7pgvj4cs5d29lrrmbas29xdslgqzsqjmpapzqzbnrgprnbx8";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a54ff5faeefabf484ef175433cfc2b8317993f74/recipes/devdocs";
           sha256 = "04a1yspk3dwx0lzyg03lrbvig4g6sqmavzwicshdyr7q1bny7ikn";
-          name = "devdocs";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -13393,8 +16722,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    dfmt = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    dfmt = callPackage ({ fetchFromGitHub
+                        , fetchurl
+                        , lib
+                        , melpaBuild }:
+      melpaBuild {
         pname = "dfmt";
         version = "20170728.323";
         src = fetchFromGitHub {
@@ -13403,10 +16735,10 @@
           rev = "21b9094e907b7ac53f5ecb4ff4539613a9d12434";
           sha256 = "11r1i8nlz98z49fqb447abg1pv6838q54ly19wyg82k52875ms7m";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a343a752d25185b30b10805c4012f3b21a03651e/recipes/dfmt";
           sha256 = "06g9yimw6q4wl2prspr8vjyv2pxk8bb0451wplpp70h5ajfwy3dz";
-          name = "dfmt";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -13414,20 +16746,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    dhall-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    dhall-mode = callPackage ({ emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "dhall-mode";
-        version = "20180409.1255";
+        version = "20180715.213";
         src = fetchFromGitHub {
           owner = "psibi";
           repo = "dhall-mode";
-          rev = "7c9bbb7c1f8ca7f700b45c26a64ca8e0143543ae";
-          sha256 = "12swhpsl86pi21smvggqszn1wl71wrw15x7nybcmfgjb4d403716";
+          rev = "5aa24b844ee0371024b7b65d1682984d3c1d82bf";
+          sha256 = "0ql595j63n6r7381sw8hvkcy2dsly3fxw8qb5g0w2g2f7902905x";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c7ab435077b2f47d75ddc0ff10c64ee2b46044e2/recipes/dhall-mode";
           sha256 = "1zkspjwllcw9k4nlnif6jdwzl08ki39vmx90apw029n87xhvx7mp";
-          name = "dhall-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -13435,8 +16771,38 @@
           license = lib.licenses.free;
         };
       }) {};
-    dic-lookup-w3m = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, stem, w3m }:
-    melpaBuild {
+    diary-manager = callPackage ({ emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
+        pname = "diary-manager";
+        version = "20180626.1058";
+        src = fetchFromGitHub {
+          owner = "raxod502";
+          repo = "diary-manager";
+          rev = "01851f42aee0526995ea88c3d42b7fe12e1cb7fd";
+          sha256 = "1q1zrqawrr844lzjc5l480im6rjdyagir0dr805vgyv31fhp1vmw";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/a014f4d862a2480f7edb1266f79ce0801cca13c2/recipes/diary-manager";
+          sha256 = "1sk0pvadx4jmv93dj796ysn3jh2wvywayd7dd20v22kdvnlii73d";
+          name = "recipe";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/diary-manager";
+          license = lib.licenses.free;
+        };
+      }) {};
+    dic-lookup-w3m = callPackage ({ fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild
+                                  , stem
+                                  , w3m }:
+      melpaBuild {
         pname = "dic-lookup-w3m";
         version = "20170803.354";
         src = fetchFromGitHub {
@@ -13445,10 +16811,10 @@
           rev = "79aca5eb9c78e67cb85a386060d48113caad5ec3";
           sha256 = "18l2s37bnnzbgw22mivgw5isxck2y0n3nk7735r4ir5y5wqx88mr";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/30de78c9cf83de30093a5647976eeaf552d4b2cb/recipes/dic-lookup-w3m";
           sha256 = "1kwbmzzf8sj4bn5kicmlp2hzv8ydcikwmdy7s40ggkgf1mk9zvqr";
-          name = "dic-lookup-w3m";
+          name = "recipe";
         };
         packageRequires = [ stem w3m ];
         meta = {
@@ -13456,20 +16822,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    dictcc = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
-    melpaBuild {
+    dictcc = callPackage ({ cl-lib ? null
+                          , emacs
+                          , fetchFromGitHub
+                          , fetchurl
+                          , ivy
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "dictcc";
         version = "20171213.1334";
         src = fetchFromGitHub {
           owner = "cqql";
           repo = "dictcc.el";
-          rev = "7b988413f7719820cd846827525142a23f401e50";
-          sha256 = "0fiv0qgpqwp6ccakr1wh713pm2ylyvl2i54557fym80zgi9iff96";
+          rev = "a77cf1fadadcbde762466970b503c8a8916b35b2";
+          sha256 = "0aaah14nc8ajqhbjmwp7257k2n8ay6g87spb734kxfs8irzg52fa";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5e867df96915a0c4f22fdccd4e2096878895bda6/recipes/dictcc";
           sha256 = "0x1y742hb3dm7xmh5810dlqki38kybw68rmg9adcchm2rn86jqlm";
-          name = "dictcc";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ivy ];
         meta = {
@@ -13477,8 +16849,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    dictionary = callPackage ({ connection, fetchFromGitHub, fetchurl, lib, link, melpaBuild }:
-    melpaBuild {
+    dictionary = callPackage ({ connection
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , link
+                              , melpaBuild }:
+      melpaBuild {
         pname = "dictionary";
         version = "20140717.2029";
         src = fetchFromGitHub {
@@ -13487,10 +16864,10 @@
           rev = "a23b8f4a422d0de69a006ed010eff5795319db98";
           sha256 = "0gz03hji6mcrzvxd74qim63g159sc8ggb6hq3x42x5l01g980fbm";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5b08ed7b90e3283e177eff57cb02b12a093dc258/recipes/dictionary";
           sha256 = "0zr9sm5rmr0frxdr0za72wiffip9391fn9dm5y5x0aj1z4c1n28w";
-          name = "dictionary";
+          name = "recipe";
         };
         packageRequires = [ connection link ];
         meta = {
@@ -13498,8 +16875,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    diff-hl = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    diff-hl = callPackage ({ cl-lib ? null
+                           , emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "diff-hl";
         version = "20180201.355";
         src = fetchFromGitHub {
@@ -13508,10 +16890,10 @@
           rev = "190622d3fa2c3237529ec073a8fa00aee06023a1";
           sha256 = "0jh270anr2ralixgwsc3wn48jnw3qwz6m18lg0sgwgzyajh0fpb9";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/diff-hl";
           sha256 = "135jgjfaiq6kj72ji5k22v4pqc8gjjmcv80r5rkjbjigzlvcvvj2";
-          name = "diff-hl";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -13519,8 +16901,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    difflib = callPackage ({ cl-generic, emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, s }:
-    melpaBuild {
+    difflib = callPackage ({ cl-generic
+                           , emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , ht
+                           , lib
+                           , melpaBuild
+                           , s }:
+      melpaBuild {
         pname = "difflib";
         version = "20171227.718";
         src = fetchFromGitHub {
@@ -13529,10 +16918,10 @@
           rev = "b08850251812d71e62fd6956081299590acdf37b";
           sha256 = "03k5iy610f1m2nmkdk69p49fcfqfyxmy3h6fqvqsr2v1hix8i54a";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/df1924ddff6fd1b5fa32481d3b3d6fbe89a127d3/recipes/difflib";
           sha256 = "07bm5hib3ihrrx0lhfsl6km9gfckl73qd4cb37h93zw0hc9xwhy6";
-          name = "difflib";
+          name = "recipe";
         };
         packageRequires = [ cl-generic emacs ht s ];
         meta = {
@@ -13540,20 +16929,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    diffscuss-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    diffscuss-mode = callPackage ({ fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "diffscuss-mode";
         version = "20141014.1657";
         src = fetchFromGitHub {
           owner = "hut8labs";
           repo = "diffscuss";
-          rev = "e0aacd8b3d9f886f27222c1397f0655e849e0af7";
-          sha256 = "14ccak3cmv36pd085188lypal9gd3flyikcrxn0wi6hn60w2dgvr";
+          rev = "bbc6dbed4b97d1eb9ae5dae021ed1e066129bd98";
+          sha256 = "0ppsgfzmdg0r418n2x0qxwhyqs7hjj8fgazc4xzgs8fsg4j3h7mr";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/17f89560f98f11810205ba58841cd5566766b436/recipes/diffscuss-mode";
           sha256 = "06jd7wh4yzryz0yjwa4a0xddz7srl5mif8ff1wvcpxsb66m2zbvh";
-          name = "diffscuss-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -13561,8 +16953,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    diffview = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    diffview = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "diffview";
         version = "20150928.2211";
         src = fetchFromGitHub {
@@ -13571,10 +16966,10 @@
           rev = "031b70913e755c5e55222680f80185032a7d1728";
           sha256 = "0diw887x4q7kbgdvxbbnxdw51z33kqwxw3v9m45fczxbywyi4cxf";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0ea5dd4c9c114618ac20f565c878f509ce8d9872/recipes/diffview";
           sha256 = "0vlzmykvxjwjww313brl1nr13kz41jypsk0s3l8q3rbsnkpfic5k";
-          name = "diffview";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -13582,8 +16977,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    digistar-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    digistar-mode = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "digistar-mode";
         version = "20160218.1155";
         src = fetchFromGitHub {
@@ -13592,10 +16990,10 @@
           rev = "15288b1e1a04b79b5ab7097fdd26d48b2ff41076";
           sha256 = "0qxdfv1p0140fqcxh677hhxwpx1fihvwhvh76pysn4q4pcfr6ldr";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/851fa17152b664df99b80a654e5c055bb5227181/recipes/digistar-mode";
           sha256 = "0khzxlrm09h31i1nqz6rnzhrdssb3kppc4klpxza612l306fih0s";
-          name = "digistar-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -13603,8 +17001,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    digit-groups = callPackage ({ dash, fetchhg, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    digit-groups = callPackage ({ dash
+                                , fetchhg
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "digit-groups";
         version = "20160816.1926";
         src = fetchhg {
@@ -13612,10 +17014,10 @@
           rev = "ee1d6de37260";
           sha256 = "0rkajjlw820gfx1kclkcvdq7milhiid2yzvn9hd275ydskrhhwlp";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/eea9d435c7c1889b16549a0ef3f66483b2de3605/recipes/digit-groups";
           sha256 = "1wy1hf15qi9v0wz2rykpf40v3g2n4mha6h207m0zn8l8rb79hwjq";
-          name = "digit-groups";
+          name = "recipe";
         };
         packageRequires = [ dash ];
         meta = {
@@ -13623,20 +17025,77 @@
           license = lib.licenses.free;
         };
       }) {};
-    dim = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    digitalocean = callPackage ({ emacs
+                                , fetchFromGitLab
+                                , fetchurl
+                                , lib
+                                , melpaBuild
+                                , request }:
+      melpaBuild {
+        pname = "digitalocean";
+        version = "20180603.225";
+        src = fetchFromGitLab {
+          owner = "olymk2";
+          repo = "emacs-digitalocean";
+          rev = "1cac663c4bcb7f8325783954df6c0caf3dc20f6e";
+          sha256 = "0iinc4c3bpqqwp077437hl4z1ja7fwc1qq2ldbi7xbz4cn819f2l";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/bc81950b42e4fdc9e6710ba1b859f0fba98be3fa/recipes/digitalocean";
+          sha256 = "086v4wrzkjgjks6lfp2hn97pcbplxmc7y7bbiriw4gixgqds6yx9";
+          name = "recipe";
+        };
+        packageRequires = [ emacs request ];
+        meta = {
+          homepage = "https://melpa.org/#/digitalocean";
+          license = lib.licenses.free;
+        };
+      }) {};
+    digitalocean-helm = callPackage ({ digitalocean
+                                     , emacs
+                                     , fetchFromGitLab
+                                     , fetchurl
+                                     , helm
+                                     , lib
+                                     , melpaBuild }:
+      melpaBuild {
+        pname = "digitalocean-helm";
+        version = "20180610.46";
+        src = fetchFromGitLab {
+          owner = "olymk2";
+          repo = "emacs-digitalocean-helm";
+          rev = "b125c9882eded7d73ec109d152b26625f333440b";
+          sha256 = "072v1800gjv566fqjxp8dvzkilwhbvl7lc5fqc0mr4xw8lpldkx9";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/bc81950b42e4fdc9e6710ba1b859f0fba98be3fa/recipes/digitalocean-helm";
+          sha256 = "0q1ir6i9x1ql5c8vg1bff9px2jpwb0rxfiavk9fj3mqbjdifrz0w";
+          name = "recipe";
+        };
+        packageRequires = [ digitalocean emacs helm ];
+        meta = {
+          homepage = "https://melpa.org/#/digitalocean-helm";
+          license = lib.licenses.free;
+        };
+      }) {};
+    dim = callPackage ({ emacs
+                       , fetchFromGitHub
+                       , fetchurl
+                       , lib
+                       , melpaBuild }:
+      melpaBuild {
         pname = "dim";
         version = "20160818.249";
         src = fetchFromGitHub {
           owner = "alezost";
           repo = "dim.el";
-          rev = "79b81724b951fedffdd3113f473c18990af837a9";
-          sha256 = "1fclhpcrsi09z2np7q3dq3hhb3pqxsvv1l2dqis27afxnb1zshr3";
+          rev = "110624657fec0c8a7b3589108230e6a635302ae0";
+          sha256 = "1qiqkppfpgyqm1z31i956gj96670kjxs7m33knmhngqk7i5yc94i";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3a740ab40cab3a1890f56df808f41a2d541aa77c/recipes/dim";
           sha256 = "0gsyily47g3g55qmhp1wzfz319l1pkgjz4lbigafjzlzqxyclz52";
-          name = "dim";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -13644,20 +17103,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    dim-autoload = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    dim-autoload = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "dim-autoload";
         version = "20180318.1327";
         src = fetchFromGitHub {
           owner = "tarsius";
           repo = "dim-autoload";
-          rev = "788320fe089fafbdf1cb09d2ab4d29d64a804e21";
-          sha256 = "0iyhjww7p274x418n1iw1xj2fkmn5k9icav0jyzbwmy83a2nmr52";
+          rev = "2ff7ded0c9f8bb582fb9018bea47ead44d048cf8";
+          sha256 = "0lbfgfx3015b1kspqrsnlpvzl7i06yxafj1i2lpcy7ay4fv5rp54";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/66b1a81dfd09a2859ae996d5d8e3d704857a340f/recipes/dim-autoload";
           sha256 = "0lhzzjrgfvbqnzwhjywrk3skdb7x10xdq7d21q6kdk3h5r0np9f9";
-          name = "dim-autoload";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -13665,20 +17127,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    diminish = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    diminish = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "diminish";
         version = "20170419.1036";
         src = fetchFromGitHub {
           owner = "myrjola";
           repo = "diminish.el";
-          rev = "565a983a39d2e2cffab5df13b34f3b6116723208";
-          sha256 = "173lzj9l7a4wcfvdq6akvfyyyriy5c30b4vhhv51hs051dmn02d0";
+          rev = "d5c61a14e1a5590a65f83c099a5bd42fcadff24d";
+          sha256 = "0c0p4b3nfnczmkjx64qz2w9dk0b7srfnhrnd902qn9z55k4n0wg8";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1bfb4acb381cada46458cf60eae9b88d007294d5/recipes/diminish";
           sha256 = "1h6a31jllypk47akjflz89xk6h47na96pim17d6g4rpqcafc2k43";
-          name = "diminish";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -13686,20 +17151,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    dimmer = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    dimmer = callPackage ({ emacs
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "dimmer";
         version = "20180217.2011";
         src = fetchFromGitHub {
           owner = "gonewest818";
           repo = "dimmer.el";
-          rev = "d033fdda154e688e45cca35902dbff9915351b98";
-          sha256 = "1d457029zyabfjhzrgayibdmxfmia5yr7rqn50kc16k3aavw32f7";
+          rev = "a418acf718697b5b1824856c9872aa7f4075b96d";
+          sha256 = "1rqga5mc2yapxsnk16fcpaj8vjxb6w6mbjxm59vv9l5ddkfagfsf";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8ae80e9202d69ed3214325dd15c4b2f114263954/recipes/dimmer";
           sha256 = "0w8n5svckk1jp8856pg2gkws9798prqjjkdqf8ili2hjcqnd1a3r";
-          name = "dimmer";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -13707,20 +17176,29 @@
           license = lib.licenses.free;
         };
       }) {};
-    dionysos = callPackage ({ alert, cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, libmpdee, melpaBuild, pkg-info, s }:
-    melpaBuild {
+    dionysos = callPackage ({ alert
+                            , cl-lib ? null
+                            , dash
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , libmpdee
+                            , melpaBuild
+                            , pkg-info
+                            , s }:
+      melpaBuild {
         pname = "dionysos";
         version = "20160810.356";
         src = fetchFromGitHub {
           owner = "nlamirault";
           repo = "dionysos";
-          rev = "0aac21caadabc5a7f09e18a9dcb02f3dec26588b";
-          sha256 = "1g6p9cr3p85i7ay3jmvn7f8c5k8d49fcynb3ymns7rgsf3ypvpyc";
+          rev = "98bc789d20e41020d6e62d63d3c78f8032fa4bf2";
+          sha256 = "1hma72dyn3w6cwd3vrgg4hdlrxgwqs55cjyxb05vs9csz7r42208";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/890445eca3c555acd2639a6f509c8e83b687f2bd/recipes/dionysos";
           sha256 = "1wjgj74dnlwd79gc3l7ymbx75jka8rw9smzbb10dsfppw3rrzfmz";
-          name = "dionysos";
+          name = "recipe";
         };
         packageRequires = [ alert cl-lib dash libmpdee pkg-info s ];
         meta = {
@@ -13728,8 +17206,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    dircmp = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    dircmp = callPackage ({ fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "dircmp";
         version = "20141204.956";
         src = fetchFromGitHub {
@@ -13738,10 +17219,10 @@
           rev = "558ee0b601c2de9d247612085aafe2926f56a09f";
           sha256 = "0mcsfsybpsxhzkd2m9bzc0np49azm6qf5x4x9h9lbxc8vfgh4z8s";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b146db5977003cb48bc37317f3df19b8a8c7fc30/recipes/dircmp";
           sha256 = "0cnj7b0s8vc83sh9sai1cldw54krk5qbz1qmlvvd1whryf2pc95c";
-          name = "dircmp";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -13749,8 +17230,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    dired-atool = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    dired-atool = callPackage ({ emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "dired-atool";
         version = "20180302.2340";
         src = fetchFromGitHub {
@@ -13759,10 +17244,10 @@
           rev = "b92e0106827d34fa686e189c7e9a537a3a947a8b";
           sha256 = "1i40zd7y1jf9skr3wi2zqv4awrgff244p1h89r707aq67v1j19yk";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dired-atool";
           sha256 = "0qljx6fmz1hal9r2smjyc957wcvcpg16vp5mv65ip6d26k5qsj0w";
-          name = "dired-atool";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -13770,20 +17255,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    dired-avfs = callPackage ({ dash, dired-hacks-utils, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    dired-avfs = callPackage ({ dash
+                              , dired-hacks-utils
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "dired-avfs";
         version = "20161012.404";
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "dired-hacks";
-          rev = "89af4f12ce4a0692c9c9824eacf56875ca86cb36";
-          sha256 = "0nyc17b029ksa6aai5890g6ainncixgig9cnjjp7khcifmrrpw9s";
+          rev = "bef0c7eb03474defa02bbba5c15401a766c8ff7c";
+          sha256 = "1l7kay58ix9gmn06nws04f642svy0s1zplh86m7ihq4b6jb04hxj";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-avfs";
           sha256 = "1q42pvrpmd525887iicd3m5gw4w2a78xb72v7fjfl30ay1kir4bm";
-          name = "dired-avfs";
+          name = "recipe";
         };
         packageRequires = [ dash dired-hacks-utils ];
         meta = {
@@ -13791,20 +17281,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    dired-collapse = callPackage ({ dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    dired-collapse = callPackage ({ dash
+                                  , f
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "dired-collapse";
-        version = "20171107.47";
+        version = "20180530.727";
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "dired-hacks";
-          rev = "89af4f12ce4a0692c9c9824eacf56875ca86cb36";
-          sha256 = "0nyc17b029ksa6aai5890g6ainncixgig9cnjjp7khcifmrrpw9s";
+          rev = "71a1cf4d791e640df1f05b5589f79e45c460da64";
+          sha256 = "18l563jp9brflmsf7s5i6yklrs2nzcs93xm6h1w2wswzdssdna2b";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6aab23df1451682ff18d9ad02c35cb7ec612bc38/recipes/dired-collapse";
           sha256 = "1k8h5cl8r68rnr1a3jnbc0ydflzm5mad7v7f1q60wks5hv61dsd1";
-          name = "dired-collapse";
+          name = "recipe";
         };
         packageRequires = [ dash f ];
         meta = {
@@ -13812,8 +17307,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    dired-dups = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    dired-dups = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "dired-dups";
         version = "20130527.1425";
         src = fetchFromGitHub {
@@ -13822,10 +17320,10 @@
           rev = "694ad128c822c59348ced16c4a0c1356d43da47a";
           sha256 = "1lcmpzwj43gix2q56bh2gw3gfqh8vl5j3mqr8s7v3k0aw816j0ni";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6d01ad74959e17b5708ba9fa6a4958d4cda4e232/recipes/dired-dups";
           sha256 = "05s02gw8b339yvsr7vvka1r2140y7mbjzs8px4kn4acgb5y7rk71";
-          name = "dired-dups";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -13833,8 +17331,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    dired-efap = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    dired-efap = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "dired-efap";
         version = "20140122.856";
         src = fetchFromGitHub {
@@ -13843,10 +17344,10 @@
           rev = "624757b2e54d9a13e2183118d6c113e37684b90c";
           sha256 = "0jj9da880b4zwxba140fldai1x9p2sxc6hdf3wz6lnbvz1pyn1mv";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5669ca2adc48f3349eb59276850e6174e37f9de7/recipes/dired-efap";
           sha256 = "01j5v6584qi8ia7zmk03kx3i3kmm6hn6ycfgqlh5va6lp2h9sr00";
-          name = "dired-efap";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -13854,20 +17355,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    dired-explorer = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    dired-explorer = callPackage ({ cl-lib ? null
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "dired-explorer";
-        version = "20170614.1956";
+        version = "20180606.1921";
         src = fetchFromGitHub {
           owner = "jidaikobo-shibata";
           repo = "dired-explorer";
-          rev = "b02b08d73821512853c6a14113c794dded1df75a";
-          sha256 = "1kc2j9iw4rsxkbssn6idfi1avxshn23aiv006a0yx8bhgwclnbq4";
+          rev = "3ade0a31b5340271d05e9bf443f2504960f6c6dd";
+          sha256 = "0lbm326na005k3pa11rqq5nbhvm55dydi2a7fzs3bzlqwbx7d6fq";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/acd40e02185847dfdcd70b3cacea703133e4356d/recipes/dired-explorer";
           sha256 = "12mymmcl663ci543vqzg8jai8kgfbb3gw5wsbcm4ln3j8d5fgzd9";
-          name = "dired-explorer";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -13875,8 +17380,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    dired-fdclone = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    dired-fdclone = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "dired-fdclone";
         version = "20180402.2308";
         src = fetchFromGitHub {
@@ -13885,10 +17393,10 @@
           rev = "903d7a736d240ef7352989a4e5d0ff9129c2ee3c";
           sha256 = "0vkdsm29g1cvvv1j8xgjwr94x20zx8k2wvmncrpakcwq6d47cfxw";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8a0ddc10b11772d72a473e8d24ab4641bf4239a4/recipes/dired-fdclone";
           sha256 = "11aikq2q3m9h4zpgl24f8npvpwd98jgh8ygjwy2x5q8as8i89vf9";
-          name = "dired-fdclone";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -13896,8 +17404,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    dired-filetype-face = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    dired-filetype-face = callPackage ({ fetchFromGitHub
+                                       , fetchurl
+                                       , lib
+                                       , melpaBuild }:
+      melpaBuild {
         pname = "dired-filetype-face";
         version = "20160822.655";
         src = fetchFromGitHub {
@@ -13906,10 +17417,10 @@
           rev = "72b3c88e8b82b3f8681d940757f7b2992bd80793";
           sha256 = "1sp6fr3qha5zas65q06b61bgqx0nfiarcgpydqv0drkn6dpaps8b";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4e6c8015af3d5f013272308a97e089a4e3ca847d/recipes/dired-filetype-face";
           sha256 = "1g9wzkkqmlkxlxwx43446q9mlam035zwq0wzpf7m6394rw2xlwx6";
-          name = "dired-filetype-face";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -13917,20 +17428,27 @@
           license = lib.licenses.free;
         };
       }) {};
-    dired-filter = callPackage ({ cl-lib ? null, dash, dired-hacks-utils, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    dired-filter = callPackage ({ cl-lib ? null
+                                , dash
+                                , dired-hacks-utils
+                                , f
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "dired-filter";
         version = "20171010.204";
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "dired-hacks";
-          rev = "89af4f12ce4a0692c9c9824eacf56875ca86cb36";
-          sha256 = "0nyc17b029ksa6aai5890g6ainncixgig9cnjjp7khcifmrrpw9s";
+          rev = "64b3dbb0e8f631d1e11becd0458406404894550b";
+          sha256 = "1nxn1517pf2i17bi0h5m5p2x8cvv30zgg6i6h8cjm4bwl1nx1ymc";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-filter";
           sha256 = "1mw94210i57wrqfyif6rh689xbwbpv1qp6bgc0j7z6g4xypvd52p";
-          name = "dired-filter";
+          name = "recipe";
         };
         packageRequires = [ cl-lib dash dired-hacks-utils f ];
         meta = {
@@ -13938,20 +17456,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    dired-hacks-utils = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    dired-hacks-utils = callPackage ({ dash
+                                     , fetchFromGitHub
+                                     , fetchurl
+                                     , lib
+                                     , melpaBuild }:
+      melpaBuild {
         pname = "dired-hacks-utils";
         version = "20160527.1436";
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "dired-hacks";
-          rev = "89af4f12ce4a0692c9c9824eacf56875ca86cb36";
-          sha256 = "0nyc17b029ksa6aai5890g6ainncixgig9cnjjp7khcifmrrpw9s";
+          rev = "9bb7100d80b96bdfa2154c2b2f509d5b9f6cd7cd";
+          sha256 = "1pxvfrkxr4x0vbp313lhbwhrqhsv8kj3b8sbx89sym8f8fdn33js";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-hacks-utils";
           sha256 = "1vgl0wqf7gc2nbiqjn0rkrdlnxfm3wrgspx5b3cixv2n8rqx8kyi";
-          name = "dired-hacks-utils";
+          name = "recipe";
         };
         packageRequires = [ dash ];
         meta = {
@@ -13959,8 +17481,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    dired-hide-dotfiles = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    dired-hide-dotfiles = callPackage ({ emacs
+                                       , fetchFromGitHub
+                                       , fetchurl
+                                       , lib
+                                       , melpaBuild }:
+      melpaBuild {
         pname = "dired-hide-dotfiles";
         version = "20170314.1339";
         src = fetchFromGitHub {
@@ -13969,10 +17495,10 @@
           rev = "b715f643ec805b3b8aca334595e6589320f04a49";
           sha256 = "1n6l25lrhp1x8nhc54kqal96wq96kkfyvz5yzvlw1qd3yk4s567i";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ba64a50f85fdb0ad54149dfed4051b4c1a719cbb/recipes/dired-hide-dotfiles";
           sha256 = "0yy131cvj9a9sz02ari7pzwf22r5y7acyg757h3jvih317v6jyp0";
-          name = "dired-hide-dotfiles";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -13980,8 +17506,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    dired-icon = callPackage ({ emacs, fetchFromGitLab, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    dired-icon = callPackage ({ emacs
+                              , fetchFromGitLab
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "dired-icon";
         version = "20170222.2126";
         src = fetchFromGitLab {
@@ -13990,10 +17520,10 @@
           rev = "f60e10757a5011235b519231ad35974ff25963ed";
           sha256 = "0r9qmr2l5kjwh1frp0k87nyaf13f7f9fjjf9yf9z92djqapfm9dd";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8a96249947cba52cd75515b3dc83b0842fedf624/recipes/dired-icon";
           sha256 = "0nyiqcywc1p8kw3psisl4zxwmf2g0x82kanka85zxxdz15s509j1";
-          name = "dired-icon";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -14001,8 +17531,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    dired-imenu = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    dired-imenu = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "dired-imenu";
         version = "20140109.810";
         src = fetchFromGitHub {
@@ -14011,10 +17544,10 @@
           rev = "610e21fe0988c85931d34894d3eee2442c79ab0a";
           sha256 = "088h9yn6wndq4pq6f7q4iz17f9f4ci29z9nh595idljp3vwr7qid";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e346de86b7f7fd5dad548f0936cde54ac11e3f79/recipes/dired-imenu";
           sha256 = "09yix4fkr03jq6j2rmvyg6gkmcnraw49a8m9649r3m525qdnhxs1";
-          name = "dired-imenu";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -14022,8 +17555,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    dired-k = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    dired-k = callPackage ({ emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "dired-k";
         version = "20170313.803";
         src = fetchFromGitHub {
@@ -14032,10 +17569,10 @@
           rev = "c50e8f73358060a448bff66db2d330b52bbeffc1";
           sha256 = "14yvsv7cvfviszii0bj0qf094rmnwzssinrqrkpxg4jil2n4bb9d";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7f8a828b2fbfa11c4b74192d9d0cfa0ad34b3da7/recipes/dired-k";
           sha256 = "0lghdmy9qcjykscfxvfrz8cpp87qc0vfd03vw8nfpvwcs2sd28i8";
-          name = "dired-k";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -14043,20 +17580,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    dired-launch = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    dired-launch = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "dired-launch";
-        version = "20171004.1027";
+        version = "20180607.1141";
         src = fetchFromGitHub {
           owner = "thomp";
           repo = "dired-launch";
-          rev = "f71826804221bafc4f9f2f75a800400a72c24b8b";
-          sha256 = "1cyg1bbn2jj101wz2jjzk832mfk5yhnc4a9m817lnalf73j0nkrs";
+          rev = "ad45940f76ef2f6c3bb55e998829b311de191dae";
+          sha256 = "057nqlvqnq30gxfidmynp33040bgdq4gbwk0qdm294c5ap2af5yj";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/31c9a4945d65aa6afc371c447a572284d38d4d71/recipes/dired-launch";
           sha256 = "0vhf0iai60mp8sp7snishz6nrw0bcriq4cx64f41lk1adjb2mqaw";
-          name = "dired-launch";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -14064,20 +17604,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    dired-narrow = callPackage ({ dash, dired-hacks-utils, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    dired-narrow = callPackage ({ dash
+                                , dired-hacks-utils
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "dired-narrow";
         version = "20170309.329";
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "dired-hacks";
-          rev = "89af4f12ce4a0692c9c9824eacf56875ca86cb36";
-          sha256 = "0nyc17b029ksa6aai5890g6ainncixgig9cnjjp7khcifmrrpw9s";
+          rev = "342d75f1240ebe17959ec25a5b050b40156e10cb";
+          sha256 = "18s8jax1k1p1x3r2rl398r1cxy0i2ss9vv23bgv3dna4hvwv65jc";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8994330f90a925df17ae425ccdc87865df8e19cd/recipes/dired-narrow";
           sha256 = "1rgqiscbizalh78jwc53zbj599dd13a6vzdgf75vzllc1w7jsg6d";
-          name = "dired-narrow";
+          name = "recipe";
         };
         packageRequires = [ dash dired-hacks-utils ];
         meta = {
@@ -14085,20 +17630,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    dired-open = callPackage ({ dash, dired-hacks-utils, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    dired-open = callPackage ({ dash
+                              , dired-hacks-utils
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "dired-open";
         version = "20160205.1213";
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "dired-hacks";
-          rev = "89af4f12ce4a0692c9c9824eacf56875ca86cb36";
-          sha256 = "0nyc17b029ksa6aai5890g6ainncixgig9cnjjp7khcifmrrpw9s";
+          rev = "49bb19a92a4256057f151da9ad6d0a91d46dacc0";
+          sha256 = "0hdpn2q55qqvqffb70c8z72ah516l1d3gbzibrr5d0i31xggx4g3";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-open";
           sha256 = "0a4ksz2jkva4gvhprywjc1fzrbf95xdk8gn25nv1h1c1ckhr91qx";
-          name = "dired-open";
+          name = "recipe";
         };
         packageRequires = [ dash dired-hacks-utils ];
         meta = {
@@ -14106,8 +17656,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    dired-quick-sort = callPackage ({ fetchFromGitLab, fetchurl, hydra, lib, melpaBuild }:
-    melpaBuild {
+    dired-quick-sort = callPackage ({ fetchFromGitLab
+                                    , fetchurl
+                                    , hydra
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "dired-quick-sort";
         version = "20161208.1312";
         src = fetchFromGitLab {
@@ -14116,10 +17670,10 @@
           rev = "1845f978d313f750a5b70b832457ed803c4ffbdb";
           sha256 = "014frvpszixn8cx7rdx704glmjbslv3py3kw0pb0xqf50k4scynf";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4d278178128deb03a7b1d2e586dc38da2c7af857/recipes/dired-quick-sort";
           sha256 = "01vrk3wqq2zmcblyp9abi2lvrzr2a5ca8r8gjjnr5223037ppl3l";
-          name = "dired-quick-sort";
+          name = "recipe";
         };
         packageRequires = [ hydra ];
         meta = {
@@ -14127,20 +17681,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    dired-rainbow = callPackage ({ dash, dired-hacks-utils, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    dired-rainbow = callPackage ({ dash
+                                 , dired-hacks-utils
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "dired-rainbow";
         version = "20171202.1448";
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "dired-hacks";
-          rev = "89af4f12ce4a0692c9c9824eacf56875ca86cb36";
-          sha256 = "0nyc17b029ksa6aai5890g6ainncixgig9cnjjp7khcifmrrpw9s";
+          rev = "edea7534b36297211fe1c0e493220a5cc1bdec93";
+          sha256 = "1g05r0krgyyj91digvd07vn6qi9m8yigj6w97bg8zgcsrxhlmc07";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-rainbow";
           sha256 = "1b9yh8p2x1dg7dyqhjhnqqiiymyl6bwsam65j0lpvbdx8r4iw882";
-          name = "dired-rainbow";
+          name = "recipe";
         };
         packageRequires = [ dash dired-hacks-utils ];
         meta = {
@@ -14148,8 +17707,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    dired-ranger = callPackage ({ dash, dired-hacks-utils, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    dired-ranger = callPackage ({ dash
+                                , dired-hacks-utils
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "dired-ranger";
         version = "20180401.1506";
         src = fetchFromGitHub {
@@ -14158,10 +17722,10 @@
           rev = "89af4f12ce4a0692c9c9824eacf56875ca86cb36";
           sha256 = "0nyc17b029ksa6aai5890g6ainncixgig9cnjjp7khcifmrrpw9s";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c03f6f8c779c8784f52adb20b266404cb537113a/recipes/dired-ranger";
           sha256 = "19lbbzqflqda5b0alqfzdhpbgqssghqb4n4viq8x4l1fac8mby6h";
-          name = "dired-ranger";
+          name = "recipe";
         };
         packageRequires = [ dash dired-hacks-utils ];
         meta = {
@@ -14169,20 +17733,77 @@
           license = lib.licenses.free;
         };
       }) {};
-    dired-sidebar = callPackage ({ dired-subtree, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    dired-recent = callPackage ({ emacs
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
+        pname = "dired-recent";
+        version = "20180527.1259";
+        src = fetchFromGitHub {
+          owner = "vifon";
+          repo = "dired-recent.el";
+          rev = "22104c87593f24ec513dfdf97fc4c8c91defec33";
+          sha256 = "0ddpsfq1frzx9nkiakkrxm8x6xg8f5fpvqlln8ksys7x2cmzk092";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/d717543b63f9eb1ed6b8f78de84da717d3b8e4bc/recipes/dired-recent";
+          sha256 = "1hspi9bazbij9h05qaljgn5035p409w28mzvmrl4j6isx306s61l";
+          name = "recipe";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/dired-recent";
+          license = lib.licenses.free;
+        };
+      }) {};
+    dired-rsync = callPackage ({ dash
+                               , emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild
+                               , s }:
+      melpaBuild {
+        pname = "dired-rsync";
+        version = "20180625.1448";
+        src = fetchFromGitHub {
+          owner = "stsquad";
+          repo = "dired-rsync";
+          rev = "1eb7488f36528166992fe50a89dbbfa6d8a0e58b";
+          sha256 = "0dc30xx9k2l1x2mj8mzkzx7ppv5nzpsyp3wxrhbbjwhnv5micc5q";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/ce9f41ad832cef527dde97f829a8b8339e6ac48b/recipes/dired-rsync";
+          sha256 = "0lykj7nfpaspwn90macvr7iir4jlrx88i0s9spii7iic2fnm51ql";
+          name = "recipe";
+        };
+        packageRequires = [ dash emacs s ];
+        meta = {
+          homepage = "https://melpa.org/#/dired-rsync";
+          license = lib.licenses.free;
+        };
+      }) {};
+    dired-sidebar = callPackage ({ dired-subtree
+                                 , emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "dired-sidebar";
-        version = "20180312.1715";
+        version = "20180709.2204";
         src = fetchFromGitHub {
           owner = "jojojames";
           repo = "dired-sidebar";
-          rev = "df9d46615930ad3709303babd45bc12b96d0945c";
-          sha256 = "0yj0jlm695v1kzdlvi0lqa0phafvgn1y9bwbin5cikygvn2wjjxw";
+          rev = "e40075bbb43c4012b49fea2b40dbef1d3be3d82e";
+          sha256 = "0jz57p47np4wn01y7ggsavgg9nnl1rnmqcl0y32w2c8xk22rhjlp";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/30e15c8361b01195f198197e704828fbcac0e8d6/recipes/dired-sidebar";
           sha256 = "19a4gsx9wmpc94jd992c7dj5mxfnnij2nc6qnb2lhk8ad69h1lmc";
-          name = "dired-sidebar";
+          name = "recipe";
         };
         packageRequires = [ dired-subtree emacs ];
         meta = {
@@ -14190,8 +17811,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    dired-single = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    dired-single = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "dired-single";
         version = "20170804.544";
         src = fetchFromGitHub {
@@ -14200,10 +17824,10 @@
           rev = "0dcc645de6397bf12c33229de67a503e4490c618";
           sha256 = "16073xjfx7cvv9g8dlyxwa4ca6x35vwarqq43mrl05nxcq0rfzv3";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/41669decbb7ad5c4dbe152a863f16d87e7bba493/recipes/dired-single";
           sha256 = "13h8dsn7bkz8ji2rrb7vyrqb2znxarpiynqi65mfli7dn5k086vf";
-          name = "dired-single";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -14211,20 +17835,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    dired-subtree = callPackage ({ dash, dired-hacks-utils, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    dired-subtree = callPackage ({ dash
+                                 , dired-hacks-utils
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "dired-subtree";
         version = "20170910.1521";
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "dired-hacks";
-          rev = "89af4f12ce4a0692c9c9824eacf56875ca86cb36";
-          sha256 = "0nyc17b029ksa6aai5890g6ainncixgig9cnjjp7khcifmrrpw9s";
+          rev = "3e7d46f898eba8611eafbfecf5333cc2325f89f5";
+          sha256 = "1z2jc221cbgmy0rqb4ns5pq6fmfl7li3p9xhy6if2v8r82m5yn4q";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d6a947ac9476f10b95a3c153ec784d2a8330dd4c/recipes/dired-subtree";
           sha256 = "1vqcnkh3g6dwi2hwfkb534q0j19pkqzqk3yb7ah8ck4z4ln4ppfk";
-          name = "dired-subtree";
+          name = "recipe";
         };
         packageRequires = [ dash dired-hacks-utils ];
         meta = {
@@ -14232,8 +17861,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    dired-toggle = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    dired-toggle = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "dired-toggle";
         version = "20140907.1349";
         src = fetchFromGitHub {
@@ -14242,10 +17874,10 @@
           rev = "84efb9ec9c327e4da53cdb7cda5b51dcd0ede0e5";
           sha256 = "1yx20h16hc1b04knsqhrxni0j8qgwnq7i5b0dlggq3dakcvqfxma";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/17ae4c5ff42e0c48e53d93c88853f649f59034e6/recipes/dired-toggle";
           sha256 = "18v571kp440n5g1d7pj86rr8dgbbm324f9vblkdbdvn13c5dczf5";
-          name = "dired-toggle";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -14253,8 +17885,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    dired-toggle-sudo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    dired-toggle-sudo = callPackage ({ fetchFromGitHub
+                                     , fetchurl
+                                     , lib
+                                     , melpaBuild }:
+      melpaBuild {
         pname = "dired-toggle-sudo";
         version = "20151109.206";
         src = fetchFromGitHub {
@@ -14263,10 +17898,10 @@
           rev = "02449dbda4e168f99fe5352c9628df5d39e11483";
           sha256 = "0ajj8d6k5in2hclcrqckinfh80ylddplva0ryfbkzsjkfq167cv2";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5cdee2d52c0c53566fdd77a5d42edf365764acff/recipes/dired-toggle-sudo";
           sha256 = "0fy05af9aq9791ij4j9pscdk5j44pbg0kmhpqli41qiazjw7v2va";
-          name = "dired-toggle-sudo";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -14274,8 +17909,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    diredfl = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    diredfl = callPackage ({ emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "diredfl";
         version = "20180210.1814";
         src = fetchFromGitHub {
@@ -14284,10 +17923,10 @@
           rev = "9b2a89951cee8bdf5c0cb67f9c3ad6ac73abf9cb";
           sha256 = "0x4qhxysmcwllkbia6xkfmlpddxhfxxvawywp57zs8c00193nn1z";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3da86e18d423198766455929da1dcb3a9a3be381/recipes/diredfl";
           sha256 = "0cybq15yq07x2mnrnwapy020d598yymcy8y9wwf1m7f59p3h9hvn";
-          name = "diredfl";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -14295,20 +17934,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    diredful = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    diredful = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "diredful";
         version = "20160529.1317";
         src = fetchFromGitHub {
           owner = "thamer";
           repo = "diredful";
-          rev = "c08e163d9d6c62f7b07e94d54c96c2e364e67e0e";
-          sha256 = "1h2hnm8r3anfbk5x7d2dnv38bdllsbwaam6ivpbgzn12r23wrsr2";
+          rev = "b17b3087e0084a5571a9ac4d47ccfc36d96b109e";
+          sha256 = "1d8n8wj5k82a1sfg93kn3ajci804mpp9j206x5f185zd48wb25z8";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/76f3d178e7c3982b53c7ee0096c839397534d732/recipes/diredful";
           sha256 = "0y8x6q1yfsk0srxsh4g5nbsms1g9pk9d103jx7cfdac79mcigw7x";
-          name = "diredful";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -14316,20 +17958,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    direnv = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, with-editor }:
-    melpaBuild {
+    direnv = callPackage ({ dash
+                          , emacs
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild
+                          , with-editor }:
+      melpaBuild {
         pname = "direnv";
-        version = "20180410.203";
+        version = "20180513.123";
         src = fetchFromGitHub {
           owner = "wbolster";
           repo = "emacs-direnv";
-          rev = "bb0de5e8f662c3f522b931c6e2c2340e4ed682af";
-          sha256 = "1mk35k0iiyxk5s8ymcx94fhyz188i8r51r73vnndm868g86yslzp";
+          rev = "6cf079fe8171bdf4bebefe02e8353d7f13847ebd";
+          sha256 = "0vw9s70h5zjz5k225mzm893sv5pdb4lz5x7fc4r98iva0wipldgn";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5419809ee62b920463e359c8e1314cd0763657c1/recipes/direnv";
           sha256 = "0zzmi5m6fh42kyf8dyjrjyrl03pkbipnh4mnssrhp83ljczxkyhd";
-          name = "direnv";
+          name = "recipe";
         };
         packageRequires = [ dash emacs with-editor ];
         meta = {
@@ -14337,8 +17985,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    direx = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    direx = callPackage ({ fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "direx";
         version = "20170422.627";
         src = fetchFromGitHub {
@@ -14347,10 +17998,10 @@
           rev = "a79bfdb5980cf6ed7bfb3b41ddc471a7b6c0ede4";
           sha256 = "0fl9hdnrq54awx43635p6pmc8bqyppa02gs1d76nifi0q4g9v4m7";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a4b0903466d63b1c87abc002b0e064e36a8cddd3/recipes/direx";
           sha256 = "1x3rnrhhyrrvgry9n7kc0734la1zp4gc4bpy50f2qpfd452jwqdm";
-          name = "direx";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -14358,8 +18009,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    direx-grep = callPackage ({ direx, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    direx-grep = callPackage ({ direx
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "direx-grep";
         version = "20140515.806";
         src = fetchFromGitHub {
@@ -14368,10 +18023,10 @@
           rev = "1109a512a80b2673a70b18b8568514049017faad";
           sha256 = "0swdh0qynpijsv6a2d308i42hfa0jwqsnmf4sm8vrhaf3vv25f5h";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6a88a29090a0d6c636f4aeb5214433db66367d9e/recipes/direx-grep";
           sha256 = "0y2wrzq06prm55akwgaqjg56znknyvbayav13asirqzg258skvm2";
-          name = "direx-grep";
+          name = "recipe";
         };
         packageRequires = [ direx ];
         meta = {
@@ -14379,8 +18034,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    dirtree = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, tree-mode, windata }:
-    melpaBuild {
+    dirtree = callPackage ({ fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild
+                           , tree-mode
+                           , windata }:
+      melpaBuild {
         pname = "dirtree";
         version = "20140129.32";
         src = fetchFromGitHub {
@@ -14389,10 +18049,10 @@
           rev = "ba55f1e716e386fdd37cb8e7f48616e405dc7251";
           sha256 = "0abs3r4zzfnf4igiakrv3bpyxz7qlnw26l57rynsk7c3w3s5ya29";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ae489be43b1aee93614e40f492ebdf0b98a3fbc1/recipes/dirtree";
           sha256 = "1fm003rix3sdfx8fq3ab5s8b2q65gbkjsn1j3fg5qmhv56p7lrs9";
-          name = "dirtree";
+          name = "recipe";
         };
         packageRequires = [ tree-mode windata ];
         meta = {
@@ -14400,20 +18060,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    dirtree-prosjekt = callPackage ({ dirtree, fetchFromGitHub, fetchurl, lib, melpaBuild, prosjekt }:
-    melpaBuild {
+    dirtree-prosjekt = callPackage ({ dirtree
+                                    , fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild
+                                    , prosjekt }:
+      melpaBuild {
         pname = "dirtree-prosjekt";
         version = "20140129.104";
         src = fetchFromGitHub {
           owner = "abingham";
           repo = "prosjekt";
-          rev = "a864a8be5842223043702395f311e3350c28e9db";
-          sha256 = "1m8zvrv5aws7b0dffk8y6b5mncdk2c4k90mx69jys10fs0gc5hb3";
+          rev = "03e06910589ba5cd736868793eb436b3233c6a26";
+          sha256 = "06fw9730djlv86jj8nhd1ll9mi4z53qwn6yqpqxciqqlz64pvzid";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6d359ec827573dd8c871c4f23df5d1737f1830e7/recipes/dirtree-prosjekt";
           sha256 = "0pyb6c0gvc16z5rc5h0kpl8021hz2hzv86cmjsd20gbhz7imrqwk";
-          name = "dirtree-prosjekt";
+          name = "recipe";
         };
         packageRequires = [ dirtree prosjekt ];
         meta = {
@@ -14421,8 +18086,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    disable-mouse = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    disable-mouse = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "disable-mouse";
         version = "20171226.1715";
         src = fetchFromGitHub {
@@ -14431,10 +18099,10 @@
           rev = "541363bd6353b8b05375552bab884a6315ea545c";
           sha256 = "1grs3cz2zdw49frvxy4vc1z3ld804kk5g2ad6ln5grprcd188bz9";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/dbbc396373212fdf731e135cde391f27708ff015/recipes/disable-mouse";
           sha256 = "0c0ps39s6wg3grspvgck0cwxnas73nfaahfa87l0mmgsrsvas5m7";
-          name = "disable-mouse";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -14442,8 +18110,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    disaster = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    disaster = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "disaster";
         version = "20171016.1452";
         src = fetchFromGitHub {
@@ -14452,10 +18123,10 @@
           rev = "10a785facc60d89d78e0d5177985ab1af1741bb4";
           sha256 = "0iz43jdkh5qdllqdchliys84gn9bpj6688rpc4jnycp64141m6cx";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a4654b3646b96f967e2c75440e664a417cd0f517/recipes/disaster";
           sha256 = "1ad8q81n0s13cwmm216wqx3s92195pda1amc4wxvpb3lq7dbd3yn";
-          name = "disaster";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -14463,8 +18134,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    discourse = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, request, s }:
-    melpaBuild {
+    discourse = callPackage ({ cl-lib ? null
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild
+                             , request
+                             , s }:
+      melpaBuild {
         pname = "discourse";
         version = "20160911.119";
         src = fetchFromGitHub {
@@ -14473,10 +18150,10 @@
           rev = "a86c7e608851e186fe12e892a573994f08c8e65e";
           sha256 = "1p4crd7v94hmqzqh8bc7jx1pfhallmj4kn36f8l22z4r2mkyycxc";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f5e64fc3fa3fc7d0ac14e7e5d324ee1ca77ea4c3/recipes/discourse";
           sha256 = "0j11pyly7qni3gqgywd9bkzfm1dfvhbfjc7pls9n9s26nbqdzcw9";
-          name = "discourse";
+          name = "recipe";
         };
         packageRequires = [ cl-lib request s ];
         meta = {
@@ -14484,20 +18161,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    discover = callPackage ({ fetchFromGitHub, fetchurl, lib, makey, melpaBuild }:
-    melpaBuild {
+    discover = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , makey
+                            , melpaBuild }:
+      melpaBuild {
         pname = "discover";
         version = "20140103.1339";
         src = fetchFromGitHub {
           owner = "mickeynp";
           repo = "discover.el";
-          rev = "7b0044bbb3b3bd5d811fdfb0f5ac6ec8de1239df";
-          sha256 = "0f7h2rhh37lrs6xclj182li6s1fawv5m8w3hgy6qgm06dam45lka";
+          rev = "bbfda2b4e429985a8fa7971d264c942767cfa816";
+          sha256 = "0qxw30zrlcxhxb0alrgyiclrk44dysal8xsbz2mvgrb6jli8wg18";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/688e32e98758aa6fd31218e98608bd54a76c3e83/recipes/discover";
           sha256 = "1hf57p90jn1zzhjl63zv9ascbgkcbr0p0zmd3fvzpjsw84235dga";
-          name = "discover";
+          name = "recipe";
         };
         packageRequires = [ makey ];
         meta = {
@@ -14505,8 +18186,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    discover-clj-refactor = callPackage ({ clj-refactor, discover, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    discover-clj-refactor = callPackage ({ clj-refactor
+                                         , discover
+                                         , fetchFromGitHub
+                                         , fetchurl
+                                         , lib
+                                         , melpaBuild }:
+      melpaBuild {
         pname = "discover-clj-refactor";
         version = "20150328.759";
         src = fetchFromGitHub {
@@ -14515,10 +18201,10 @@
           rev = "3fbd5c1162739e606d7cf5d4f5d7426547d99647";
           sha256 = "0l2g58f55p8zmzv2q2hf163ggm9p0wk8hg93wlkyldrgyb94dgf4";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3311371cadf00b00bfbece4e4b2f96c226f0e27d/recipes/discover-clj-refactor";
           sha256 = "08bz60fxcgzab77690mmv0f7wdxcpygmasazcss427k37z9ysm7r";
-          name = "discover-clj-refactor";
+          name = "recipe";
         };
         packageRequires = [ clj-refactor discover ];
         meta = {
@@ -14526,8 +18212,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    discover-js2-refactor = callPackage ({ discover, fetchFromGitHub, fetchurl, js2-refactor, lib, melpaBuild }:
-    melpaBuild {
+    discover-js2-refactor = callPackage ({ discover
+                                         , fetchFromGitHub
+                                         , fetchurl
+                                         , js2-refactor
+                                         , lib
+                                         , melpaBuild }:
+      melpaBuild {
         pname = "discover-js2-refactor";
         version = "20140129.752";
         src = fetchFromGitHub {
@@ -14536,10 +18227,10 @@
           rev = "3812abf61f39f3e73a9f3daefa6fed4f21a429ba";
           sha256 = "1vnbn4asz3lifscvy4shzisl6r0gkgq0qsa3kpgif3853wcd2rvn";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b84129a8a90f8f66a513c11c299e0acb5f3fbd3a/recipes/discover-js2-refactor";
           sha256 = "139zq66cpcn4dnidf22h7x88p812ywrrz4c3c62w3915b75f71ki";
-          name = "discover-js2-refactor";
+          name = "recipe";
         };
         packageRequires = [ discover js2-refactor ];
         meta = {
@@ -14547,20 +18238,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    discover-my-major = callPackage ({ fetchFromGitHub, fetchurl, lib, makey, melpaBuild }:
-    melpaBuild {
+    discover-my-major = callPackage ({ fetchgit
+                                     , fetchurl
+                                     , lib
+                                     , makey
+                                     , melpaBuild }:
+      melpaBuild {
         pname = "discover-my-major";
-        version = "20170113.2306";
-        src = fetchFromGitHub {
-          owner = "steckerhalter";
-          repo = "discover-my-major";
-          rev = "ac83b24b5130eb0944f820736012df0924cce528";
-          sha256 = "1hkz2sg8wnjqmsqm0di1h9cf9hb1j6qbw30hda3w8z3m0apzr5fr";
+        version = "20180605.2211";
+        src = fetchgit {
+          url = "https://framagit.org/steckerhalter/discover-my-major.git";
+          rev = "66081546eac360c83a9c3270db92a2164288b0d0";
+          sha256 = "1v95s15m37785ggs649q5a83jai0bnar1w1hkiaafwbmpzhd7hr7";
         };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/274185fa94a3442c56593f3c8b99bdc6b9bd4994/recipes/discover-my-major";
-          sha256 = "0ch2y4grdjp7pvw2kxqnqdl7jd3q609n3pm3r0gn6k0xmcw85fgg";
-          name = "discover-my-major";
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/f0a8eb0eefe88b4ea683a4743c0f8393506e014b/recipes/discover-my-major";
+          sha256 = "1b10bwhls5bx83hzhqq1ylc2civ3bsivd6db46f3s5hpgvr4q17n";
+          name = "recipe";
         };
         packageRequires = [ makey ];
         meta = {
@@ -14568,8 +18262,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    disk = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    disk = callPackage ({ fetchFromGitHub
+                        , fetchurl
+                        , lib
+                        , melpaBuild }:
+      melpaBuild {
         pname = "disk";
         version = "20171115.2331";
         src = fetchFromGitHub {
@@ -14578,10 +18275,10 @@
           rev = "283e54e3be7d08f959076240b2ab324e25632137";
           sha256 = "15fkfl9kjlpsg9p5g0xhm384ipvrzclwxvqk8vz1zixq0wam2ajm";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e6e75695594ce17b618ad8786c8a04e283f68b11/recipes/disk";
           sha256 = "1jzkqgjw8xl0jc6ssl5bsdjp2dxw88nss6szvjv7frrhsncaq28h";
-          name = "disk";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -14589,8 +18286,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    dispass = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    dispass = callPackage ({ dash
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "dispass";
         version = "20140202.731";
         src = fetchFromGitHub {
@@ -14599,10 +18300,10 @@
           rev = "b6e8f89040ebaaf0e7609b04bc27a8979f0ae861";
           sha256 = "075gj81rnhrvv061wnldixpfmlsyfbnvacnk107z6f9v3m2m3vl1";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dispass";
           sha256 = "09c9v41rh63hjpdh377rbfvpial33r41dn5bss3632fi34az5l9n";
-          name = "dispass";
+          name = "recipe";
         };
         packageRequires = [ dash ];
         meta = {
@@ -14610,8 +18311,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    display-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    display-theme = callPackage ({ emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "display-theme";
         version = "20140115.756";
         src = fetchFromGitHub {
@@ -14620,10 +18325,10 @@
           rev = "b180b3be7a74ae4799a14e7e4bc2fe10e3ff7a15";
           sha256 = "0r560bpgw5p2pfcgkgcrlpp1bprv1f23dl4y5fjk06dg93fgaysa";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4dd76f49f1c10656ea0004a654d73666e1d188db/recipes/display-theme";
           sha256 = "07nqscmfa6iykll1m6gyiqca1g5ncx3rx468iyf2ahygpvqvnbxa";
-          name = "display-theme";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -14631,20 +18336,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    distel-completion-lib = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    distel-completion-lib = callPackage ({ fetchFromGitHub
+                                         , fetchurl
+                                         , lib
+                                         , melpaBuild }:
+      melpaBuild {
         pname = "distel-completion-lib";
         version = "20160816.406";
         src = fetchFromGitHub {
           owner = "sebastiw";
           repo = "distel-completion";
-          rev = "2ba4eea51cecfa75cf62f58180460ee9ff43131f";
-          sha256 = "1761lgplngmpn1vd8syc1h4g6q1dhngamz1j3n48z07c1ylzpkdd";
+          rev = "994c61dda2e3256b41fa2e53821c484b5ffd13e6";
+          sha256 = "00nifdhwy89zmi50hln5p5albdx7ypm4mbdfjzhk4870crx4zjr2";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/90fff35dd9709b06802edef89d1fe6a96b7115a6/recipes/distel-completion-lib";
           sha256 = "0b06z3k30b4x5zpzk0jgcs7kcaix64xx81iskm1kys57r3gskzpa";
-          name = "distel-completion-lib";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -14652,8 +18360,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    distinguished-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    distinguished-theme = callPackage ({ fetchFromGitHub
+                                       , fetchurl
+                                       , lib
+                                       , melpaBuild }:
+      melpaBuild {
         pname = "distinguished-theme";
         version = "20151216.1215";
         src = fetchFromGitHub {
@@ -14662,10 +18373,10 @@
           rev = "9b1d25ac59465a5016d187ea84b7614c95a29b3b";
           sha256 = "03d8zb2is7n2y2z0k6j37cijjc3ndgasxsm9gqyq7drlq9bqwzsm";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8d969e91bbba522a31d6ae7a81c7783034c15b9b/recipes/distinguished-theme";
           sha256 = "0h03aqgijrmisbgqga42zlb5yz4x3jn9jgr29rq8canyhayr3rk4";
-          name = "distinguished-theme";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -14673,8 +18384,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    ditz-mode = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ditz-mode = callPackage ({ fetchhg
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "ditz-mode";
         version = "20150729.240";
         src = fetchhg {
@@ -14682,10 +18396,10 @@
           rev = "beac4c1f3b7e";
           sha256 = "1cbsy4lchl41zmyxfq828cjpl3h2dwvn8xf1qgf2lbscdb6cwbwb";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/02e2a2a25f42929626d7237511136ba6826dad33/recipes/ditz-mode";
           sha256 = "0shzm9l31n4ffjs1d26ykxsycd478lhlpl8xcwzbjryywg4gf5nd";
-          name = "ditz-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -14693,8 +18407,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    dix = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    dix = callPackage ({ cl-lib ? null
+                       , fetchFromGitHub
+                       , fetchurl
+                       , lib
+                       , melpaBuild }:
+      melpaBuild {
         pname = "dix";
         version = "20170224.615";
         src = fetchFromGitHub {
@@ -14703,10 +18421,10 @@
           rev = "bcc7fd7aef5d25171978c386c620e09d0ba8d2f8";
           sha256 = "12ny1a89xhjcnz03s1bw96y14kqb2w6cpf2rk8lv6kri7dasfq4n";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/149eeba213b82aa0bcda1073aaf1aa02c2593f91/recipes/dix";
           sha256 = "0c5fmknpy6kwlz7nx0csbbia1maz0szj7yha1p7wq28s3a5426xq";
-          name = "dix";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -14714,20 +18432,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    dix-evil = callPackage ({ dix, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    dix-evil = callPackage ({ dix
+                            , evil
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "dix-evil";
         version = "20170105.623";
         src = fetchFromGitHub {
           owner = "unhammer";
           repo = "dix";
-          rev = "bcc7fd7aef5d25171978c386c620e09d0ba8d2f8";
-          sha256 = "12ny1a89xhjcnz03s1bw96y14kqb2w6cpf2rk8lv6kri7dasfq4n";
+          rev = "1cfef0d3376a18c78dd1dfc1ac9ac3ad0e8c4475";
+          sha256 = "0p2cvr7mjpag86wacxm6s39y7p118gh2ccqw02jzabwxlfasfbw3";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d9dcceb57231bf2082154cab394064a59d84d3a5/recipes/dix-evil";
           sha256 = "1jscaksnl5qmpqgkjkv6sx56llz0w4p5h7j73c4a1hld94gwklh3";
-          name = "dix-evil";
+          name = "recipe";
         };
         packageRequires = [ dix evil ];
         meta = {
@@ -14735,8 +18458,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    dizzee = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    dizzee = callPackage ({ fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "dizzee";
         version = "20171201.116";
         src = fetchFromGitHub {
@@ -14745,10 +18471,10 @@
           rev = "e3cf1c2ea5d0fc00747524b6f3c5b905d0a8c8e1";
           sha256 = "1i32msin8ra963w7af6612d038gxb25m1gj97kbjymjq1r8zbdrv";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dizzee";
           sha256 = "14y10k8s65cyn86m1z77817436m89l0xpwd1wr4d7qp3x2mmn215";
-          name = "dizzee";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -14756,20 +18482,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    django-manage = callPackage ({ fetchFromGitHub, fetchurl, hydra, lib, melpaBuild }:
-    melpaBuild {
+    django-manage = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , hydra
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "django-manage";
         version = "20160818.1912";
         src = fetchFromGitHub {
           owner = "gopar";
           repo = "django-manage";
-          rev = "876fb2cb627d465adfdc905841279784bcdd7ee8";
-          sha256 = "0yi38aif1n0s9yp87wimdbnq7vr7k5gbshfprj9ansibrjxnb6xk";
+          rev = "e72b1cf2fdbb5c624d19169176e60467b4918fe2";
+          sha256 = "0lyi64dfd2njlnf9dzb8i88rrw930jiq99xfn8zmh87y6qy1j79i";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/66f88d30a1ab9b7f9281a2b5939c7ab2711b966a/recipes/django-manage";
           sha256 = "0j95g7fps28xhlrikkg61xgpbpf52xb56swmns2qdib6x1xzd6rh";
-          name = "django-manage";
+          name = "recipe";
         };
         packageRequires = [ hydra ];
         meta = {
@@ -14777,8 +18507,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    django-mode = callPackage ({ fetchFromGitHub, fetchurl, helm-make, lib, melpaBuild, projectile, s }:
-    melpaBuild {
+    django-mode = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , helm-make
+                               , lib
+                               , melpaBuild
+                               , projectile
+                               , s }:
+      melpaBuild {
         pname = "django-mode";
         version = "20170522.14";
         src = fetchFromGitHub {
@@ -14787,10 +18523,10 @@
           rev = "a71b8dd984e7f724b8321246e5c353a4ae5c986e";
           sha256 = "0xf33ri5phy2mrb1dwvqb8waba33gj9bwmf6jhl6n0ksm43x0z40";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bdc46811612ff96cb1e09552b9f095d68528dcb3/recipes/django-mode";
           sha256 = "1rdkzqvicjpfh9k66m31ky6jshx9fqw7pza7add36bk6xg8lbara";
-          name = "django-mode";
+          name = "recipe";
         };
         packageRequires = [ helm-make projectile s ];
         meta = {
@@ -14798,20 +18534,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    django-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
-    melpaBuild {
+    django-snippets = callPackage ({ fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild
+                                   , yasnippet }:
+      melpaBuild {
         pname = "django-snippets";
         version = "20131229.811";
         src = fetchFromGitHub {
           owner = "myfreeweb";
           repo = "django-mode";
-          rev = "a71b8dd984e7f724b8321246e5c353a4ae5c986e";
-          sha256 = "0xf33ri5phy2mrb1dwvqb8waba33gj9bwmf6jhl6n0ksm43x0z40";
+          rev = "f1e6fea8878bebc9bc0b761376a14cd5c9feda0f";
+          sha256 = "16rh2yhpfv0c3arwkcnjz0r2mw3yx7ayys6wkzwgaxvx6nxpa7y1";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bdc46811612ff96cb1e09552b9f095d68528dcb3/recipes/django-snippets";
           sha256 = "1qs9fw104kidbr5zbxc1q71yy033nq3wxh98vvzk4z4fppnd29sw";
-          name = "django-snippets";
+          name = "recipe";
         };
         packageRequires = [ yasnippet ];
         meta = {
@@ -14819,8 +18559,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    django-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    django-theme = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "django-theme";
         version = "20131022.202";
         src = fetchFromGitHub {
@@ -14829,10 +18572,10 @@
           rev = "86c8142b3eb1addd94a43aa6f1d98dab06401af0";
           sha256 = "1azf4p6salga7269l0kf13bqlxf9idp0ys8mm20qpyjpj79p5g9w";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4ede3b4fb214b915a8230e7f220ffe71c73ad7c4/recipes/django-theme";
           sha256 = "1rydl857zfpbvd7aziz6h7n3rrh584z2cbfxlss3wgfclzmbyhgf";
-          name = "django-theme";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -14840,20 +18583,28 @@
           license = lib.licenses.free;
         };
       }) {};
-    djangonaut = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, magit-popup, melpaBuild, pythonic, s }:
-    melpaBuild {
+    djangonaut = callPackage ({ emacs
+                              , f
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , magit-popup
+                              , melpaBuild
+                              , pythonic
+                              , s }:
+      melpaBuild {
         pname = "djangonaut";
-        version = "20180403.302";
+        version = "20180710.1445";
         src = fetchFromGitHub {
           owner = "proofit404";
           repo = "djangonaut";
-          rev = "501ecb3cd927975a19ed8beeacb326e01715b78c";
-          sha256 = "1h47skyx9yfcgvj5k53h3c40am191dwjw5hyq9jgmc3fkg2dr95j";
+          rev = "61a1ace3562c7352fd1665ceccc6b39be23daa80";
+          sha256 = "02g3iij6hhhzws612l9hbvd8zlf6ggifgl8ckxaysxd80z2jc2rs";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0c1281f59add99abf57bc858d6e0f9b2ae5b3c5c/recipes/djangonaut";
           sha256 = "0038zqazzhxz82q8l1phxc3aiiwmzksz9c15by9v0apzwpmdkj38";
-          name = "djangonaut";
+          name = "recipe";
         };
         packageRequires = [ emacs f magit-popup pythonic s ];
         meta = {
@@ -14861,8 +18612,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    dkdo = callPackage ({ dkmisc, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    dkdo = callPackage ({ dkmisc
+                        , emacs
+                        , fetchFromGitHub
+                        , fetchurl
+                        , lib
+                        , melpaBuild }:
+      melpaBuild {
         pname = "dkdo";
         version = "20131110.319";
         src = fetchFromGitHub {
@@ -14871,10 +18627,10 @@
           rev = "fd6bb105e8331fafb6385c5238c988c4c5bbe2da";
           sha256 = "1nbvdnw9g3zbbb0n2sn2kxfzs5wichhl9qid3qjp8dsiq1wpv459";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2d4f75f6f6349b81ddbaaf35fb5d7ddeb4cde622/recipes/dkdo";
           sha256 = "0p7ybgldjs046jrkkbpli1iicfmblpxfz9lql8m8sz7lpjn7h300";
-          name = "dkdo";
+          name = "recipe";
         };
         packageRequires = [ dkmisc emacs ];
         meta = {
@@ -14882,8 +18638,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    dkl = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    dkl = callPackage ({ fetchFromGitHub
+                       , fetchurl
+                       , lib
+                       , melpaBuild }:
+      melpaBuild {
         pname = "dkl";
         version = "20161004.1707";
         src = fetchFromGitHub {
@@ -14892,10 +18651,10 @@
           rev = "6b4584f86037bda3383960c678d51f340229fb91";
           sha256 = "1xpidgj5xk0g4ajpglhbhi02s5il8qqcvh2ccf4ac9daa1r34kxp";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e8bd9cf21473f676aa54e142b6f0bf0427f40d29/recipes/dkl";
           sha256 = "0bcv4ld8bfj2sk3sh4j1m9qqybw3l0a6b3d12qwy8lc3b8197lr0";
-          name = "dkl";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -14903,20 +18662,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    dklrt = callPackage ({ dkmisc, emacs, fetchFromGitHub, fetchurl, ledger-mode, lib, melpaBuild }:
-    melpaBuild {
+    dklrt = callPackage ({ dkmisc
+                         , emacs
+                         , fetchFromGitHub
+                         , fetchurl
+                         , ledger-mode
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "dklrt";
         version = "20131110.541";
         src = fetchFromGitHub {
           owner = "davidkeegan";
           repo = "dklrt";
-          rev = "5d6c99f8018335256ab934b4c1049708ae2d48ba";
+          rev = "4eceed270015b41d24a62a8b71bd239224a63063";
           sha256 = "063nnln5m42qf190vr2z0ibacyn7n0xkxm3v5vaa4gxdvdwzhshs";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/71f980fdb2180df2429c898e1507dd3b989a5a2c/recipes/dklrt";
           sha256 = "11ss5x9sxgxp1wx2r1m0vsp5z5qm8m4ww20ybr6bqjw0a1gax561";
-          name = "dklrt";
+          name = "recipe";
         };
         packageRequires = [ dkmisc emacs ledger-mode ];
         meta = {
@@ -14924,8 +18689,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    dkmisc = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    dkmisc = callPackage ({ emacs
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "dkmisc";
         version = "20131110.315";
         src = fetchFromGitHub {
@@ -14934,10 +18703,10 @@
           rev = "fe3d49c6f8322b6f89466361acd97585bdfe0608";
           sha256 = "1nz71g8pb19aqjcb4s94hhn6j30cc04q05kmwvcbxpjb11qqrv49";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/71f980fdb2180df2429c898e1507dd3b989a5a2c/recipes/dkmisc";
           sha256 = "0nnbl272hldcmhyj47r463yvj7b06rjdkpkl5xk0gw9ikyja7w0z";
-          name = "dkmisc";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -14945,8 +18714,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    dmenu = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    dmenu = callPackage ({ cl-lib ? null
+                         , fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "dmenu";
         version = "20180118.445";
         src = fetchFromGitHub {
@@ -14955,10 +18728,10 @@
           rev = "6e492cd4ee4fb39ecda92776707fc270f54d25e7";
           sha256 = "085ap58qfwr7gvrx68dy72z4ph1mvwka5i7ydx58m1a3bb9rshnw";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/98bcdd71a160b9c04f83cc5b939031c9e7b5eb59/recipes/dmenu";
           sha256 = "1w1pgaj2yasfhsd1ibvrwy11ykq8v17h913g298h3ycsvqv8gic0";
-          name = "dmenu";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -14966,8 +18739,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    dna-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    dna-mode = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "dna-mode";
         version = "20170804.114";
         src = fetchFromGitHub {
@@ -14976,10 +18752,10 @@
           rev = "471d374de22c33eaddd8e41dd8ae29753fab2f6a";
           sha256 = "05zsaypyavyn7gs0jk63chkxkm2rl4nbrqgv6zxrbqcar7gv86am";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dna-mode";
           sha256 = "06vprwv1v4jzqzi2nj9hbhnypnvqxmixls8yf91hzwlk3fdkdywf";
-          name = "dna-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -14987,8 +18763,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    docbook-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
-    melpaBuild {
+    docbook-snippets = callPackage ({ fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild
+                                    , yasnippet }:
+      melpaBuild {
         pname = "docbook-snippets";
         version = "20150714.925";
         src = fetchFromGitHub {
@@ -14997,10 +18777,10 @@
           rev = "b06297fdec039a541aaa6312cb328a11062cfab4";
           sha256 = "1nbm3wzd12rsrhnwlcc6b72b1ala328mfpcp5bwlfcdshw6mfcrq";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/07b832b72773ab41f9cbdefabd30dc1aa29d04c5/recipes/docbook-snippets";
           sha256 = "1ipqfylgiw9iyjc1nckbay890clfkhda81nr00cq06sjmm71iniq";
-          name = "docbook-snippets";
+          name = "recipe";
         };
         packageRequires = [ yasnippet ];
         meta = {
@@ -15008,20 +18788,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    docean = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }:
-    melpaBuild {
+    docean = callPackage ({ cl-lib ? null
+                          , emacs
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild
+                          , request }:
+      melpaBuild {
         pname = "docean";
-        version = "20150927.1118";
+        version = "20180605.1044";
         src = fetchFromGitHub {
           owner = "emacs-pe";
           repo = "docean.el";
-          rev = "dcc296782b08531b768d3cf851cc7959ec486bf1";
-          sha256 = "055kr0qknjgnjs7dn6gdmahrdbs8piwldbz7vg1hgq3b046x8lky";
+          rev = "bbe2298fd21f7876fc2d5c52a69b931ff59df979";
+          sha256 = "1fzs6k76nyz2xjvydks6v6d2ib7qqj181s7c8r57w9ylr2zqfacj";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d4827fa337d7d25f2aaf67aca3081fbdaeacbcbf/recipes/docean";
           sha256 = "1mqmn2i9axnv5vnkg9gwfdjpzr6gxx4ia9mcdpm200ix297dg7x9";
-          name = "docean";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs request ];
         meta = {
@@ -15029,20 +18815,30 @@
           license = lib.licenses.free;
         };
       }) {};
-    docker = callPackage ({ dash, docker-tramp, emacs, fetchFromGitHub, fetchurl, json-mode, lib, magit-popup, melpaBuild, s, tablist }:
-    melpaBuild {
+    docker = callPackage ({ dash
+                          , docker-tramp
+                          , emacs
+                          , fetchFromGitHub
+                          , fetchurl
+                          , json-mode
+                          , lib
+                          , magit-popup
+                          , melpaBuild
+                          , s
+                          , tablist }:
+      melpaBuild {
         pname = "docker";
-        version = "20180416.911";
+        version = "20180710.743";
         src = fetchFromGitHub {
           owner = "Silex";
           repo = "docker.el";
-          rev = "6df5799e358cfd8714bf9aff8368865a5bcf9691";
-          sha256 = "091p9wvrnhz42azg9g9ybc08s4gf1fxwjzxc3ar530wc56kdmd7p";
+          rev = "7aee62326f8304fc5e3fc9de84bd56afe3572ed9";
+          sha256 = "1lrgi7hp5a3j6c39jv3vn7x1ak66p5r1ijifwkrj95r1x0dxj3f2";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6c74bf8a41c17bc733636f9e7c05f3858d17936b/recipes/docker";
           sha256 = "10x05vli7lg1w3fdbkrl34y4mwbhp2c7nqdwnbdy53i81jisw2lk";
-          name = "docker";
+          name = "recipe";
         };
         packageRequires = [
           dash
@@ -15058,8 +18854,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    docker-api = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, request, s }:
-    melpaBuild {
+    docker-api = callPackage ({ dash
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild
+                              , request
+                              , s }:
+      melpaBuild {
         pname = "docker-api";
         version = "20160525.20";
         src = fetchFromGitHub {
@@ -15068,10 +18870,10 @@
           rev = "206144346b7fa4165223349cfeb64a75d47ddd1b";
           sha256 = "0phmpranrgdi2gi89nxr1ii9xbr7h2ccpx1mkpnfxnjlzkdzq2fb";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3924914124370fc028a7b1ecdc154a53e73037a7/recipes/docker-api";
           sha256 = "1giqiapm4hf4dhfm3x69qqpir3jg7qz3parhbx88xxqrd1z18my0";
-          name = "docker-api";
+          name = "recipe";
         };
         packageRequires = [ dash request s ];
         meta = {
@@ -15079,8 +18881,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    docker-compose-mode = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, yaml-mode }:
-    melpaBuild {
+    docker-compose-mode = callPackage ({ dash
+                                       , emacs
+                                       , fetchFromGitHub
+                                       , fetchurl
+                                       , lib
+                                       , melpaBuild
+                                       , yaml-mode }:
+      melpaBuild {
         pname = "docker-compose-mode";
         version = "20180324.1052";
         src = fetchFromGitHub {
@@ -15089,10 +18897,10 @@
           rev = "c9f131d2c90d652435d407fd36c40feebfed1dad";
           sha256 = "0d5d46i6hplmy7q2ihbvcrnk9jrwa2mswgbf8yca3m4k44wgk6la";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/37dd4c1fc11d22598c6faf03ccc860503a68b950/recipes/docker-compose-mode";
           sha256 = "1hldddl86h0i1ysxklkr1kyz44lzic1zr68x3vb0mha4n5d6bl5g";
-          name = "docker-compose-mode";
+          name = "recipe";
         };
         packageRequires = [ dash emacs yaml-mode ];
         meta = {
@@ -15100,8 +18908,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    docker-tramp = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    docker-tramp = callPackage ({ cl-lib ? null
+                                , emacs
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "docker-tramp";
         version = "20170206.1925";
         src = fetchFromGitHub {
@@ -15110,10 +18923,10 @@
           rev = "8e2b671eff7a81af43b76d9dfcf94ddaa8333a23";
           sha256 = "1lgjvrss25d4hwgygr1amsbkh1l4kgpsdjpxxpyfgil1542haan1";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6c74bf8a41c17bc733636f9e7c05f3858d17936b/recipes/docker-tramp";
           sha256 = "19kky80qm68n2izpjfyiy4gjywav7ljcmp101kmziklpqdldgh1w";
-          name = "docker-tramp";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -15121,20 +18934,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    dockerfile-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    dockerfile-mode = callPackage ({ emacs
+                                   , fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild
+                                   , s }:
+      melpaBuild {
         pname = "dockerfile-mode";
-        version = "20180410.936";
+        version = "20180628.959";
         src = fetchFromGitHub {
           owner = "spotify";
           repo = "dockerfile-mode";
-          rev = "818e6946fcf2d58438ab78ea06761a372cc5435a";
-          sha256 = "0mqb09jcqi74hbn7869gng85sac38mc1hylzcwh7d5qlsyl9dg08";
+          rev = "64733f64ea9be1e5e534e590846869b75c62ed1f";
+          sha256 = "00fk4qq3yhqia6y7pixx3qfmfxp61hdffkx6hmz6gbd6i1ibkmw4";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1406f5a24115d29e3b140c360a51b977a369e4f9/recipes/dockerfile-mode";
           sha256 = "1dxvzn35a9qd3x8pjvrvb2g71yf84404g6vz81y0p353rf2zknpa";
-          name = "dockerfile-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs s ];
         meta = {
@@ -15142,8 +18960,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    dokuwiki = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, xml-rpc }:
-    melpaBuild {
+    dokuwiki = callPackage ({ emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild
+                            , xml-rpc }:
+      melpaBuild {
         pname = "dokuwiki";
         version = "20180101.1659";
         src = fetchFromGitHub {
@@ -15152,10 +18975,10 @@
           rev = "594c4d4904dcc2796bbbd2c0845d9e7c09ccf6f7";
           sha256 = "0vqx8npw0i02dhw2yb7s4z7njw60r3xyncw4z8l6fj99pp6pfh15";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dokuwiki";
           sha256 = "0wfzzxx3n75zgxk06rlq7053hla84k79mk911by4jwk6km5adk55";
-          name = "dokuwiki";
+          name = "recipe";
         };
         packageRequires = [ emacs xml-rpc ];
         meta = {
@@ -15163,8 +18986,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    dokuwiki-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    dokuwiki-mode = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "dokuwiki-mode";
         version = "20170223.501";
         src = fetchFromGitHub {
@@ -15173,10 +18999,10 @@
           rev = "e4e116f6fcc373e3f5937c1a7daa5c2c9c6d3fa1";
           sha256 = "0bmcm7lvzm8sg2l1j7bg02jasxb8g81q9ilycblmsl1ckbfwq0yp";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/dokuwiki-mode";
           sha256 = "1jc3sn61mipkhgr91wp74s673jk2w5991p54jlw05qqpf5gmxd7v";
-          name = "dokuwiki-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -15184,8 +19010,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    dollaro = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    dollaro = callPackage ({ fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild
+                           , s }:
+      melpaBuild {
         pname = "dollaro";
         version = "20151123.502";
         src = fetchFromGitHub {
@@ -15194,10 +19024,10 @@
           rev = "500127f0172ac7a1eec627e026b59136580a74ac";
           sha256 = "1xyqsnymgdd8ic3az2lgwv7s7vld6d4pcycb234bxm4in9fixgdj";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b8195000cffa1913060266b17801eb7c1e472a83/recipes/dollaro";
           sha256 = "06kaqzb0nh8sndhk7p5n4acn5nc27dyxw3ldgcbp81wj6ipii26h";
-          name = "dollaro";
+          name = "recipe";
         };
         packageRequires = [ s ];
         meta = {
@@ -15205,8 +19035,36 @@
           license = lib.licenses.free;
         };
       }) {};
-    doom = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    doneburn-theme = callPackage ({ fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
+        pname = "doneburn-theme";
+        version = "20180502.1004";
+        src = fetchFromGitHub {
+          owner = "manuel-uberti";
+          repo = "doneburn-theme";
+          rev = "e27a599166ed5f1993e6eabdb223a0f374516e89";
+          sha256 = "0ni6v7n6wfax5f3ndyx2rhizcr067adkiqgcvwl5smdykiw7gbsp";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/7fc483d5f487f462567bba22d611f90fc8a1a709/recipes/doneburn-theme";
+          sha256 = "0j8fyb6wcjrfhfjp06w0bzp5vrcvydhjwkzg4c4s4j54xaw6laxx";
+          name = "recipe";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/doneburn-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    doom = callPackage ({ cl-lib ? null
+                        , fetchFromGitHub
+                        , fetchurl
+                        , lib
+                        , melpaBuild }:
+      melpaBuild {
         pname = "doom";
         version = "20180301.1508";
         src = fetchFromGitHub {
@@ -15215,10 +19073,10 @@
           rev = "e59040aefc92dd9b3134eb623624307fb9e4327b";
           sha256 = "14lwq30m0s7pkwkbn6vm5gdlkww7sszc6pdhxyinkhj67b0bxpin";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0960deb3b1d106ad2ffa95a44f34cb9efc026f01/recipes/doom";
           sha256 = "1ji2fdiw5b13n76nv2wvkz6v155b0qgh1rxwmv3m5nnrbmklfjh5";
-          name = "doom";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -15226,20 +19084,63 @@
           license = lib.licenses.free;
         };
       }) {};
-    doom-themes = callPackage ({ all-the-icons, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    doom-modeline = callPackage ({ all-the-icons
+                                 , dash
+                                 , eldoc-eval
+                                 , emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild
+                                 , projectile
+                                 , shrink-path }:
+      melpaBuild {
+        pname = "doom-modeline";
+        version = "20180712.2015";
+        src = fetchFromGitHub {
+          owner = "seagle0128";
+          repo = "doom-modeline";
+          rev = "8af6cb74f6f94ec863076966fd3b2d85ce386b02";
+          sha256 = "1b9k30n63milm7xzdh6ya5z4h2gz0dqm0ndfpmy9kx3992mbljqw";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/f4f610757f85fb01bd9b1dd212ddbea8f34f3ecd/recipes/doom-modeline";
+          sha256 = "0pscrhhgk4wpz1f2r94ficgan4f9blbhqzvav1wjahwp7fn5m29j";
+          name = "recipe";
+        };
+        packageRequires = [
+          all-the-icons
+          dash
+          eldoc-eval
+          emacs
+          projectile
+          shrink-path
+        ];
+        meta = {
+          homepage = "https://melpa.org/#/doom-modeline";
+          license = lib.licenses.free;
+        };
+      }) {};
+    doom-themes = callPackage ({ all-the-icons
+                               , cl-lib ? null
+                               , emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "doom-themes";
-        version = "20180328.1556";
+        version = "20180711.1157";
         src = fetchFromGitHub {
           owner = "hlissner";
           repo = "emacs-doom-themes";
-          rev = "179c0836a12a37957569f904024b6e65597fb4b6";
-          sha256 = "01jhds2si4bdm05vjdb9azd8ix75p9xi80qqrhcmp3asml50ha39";
+          rev = "67428c4c8c29a8c62aab2b8011ac82ff8e753dec";
+          sha256 = "0s7r2h6wajfd40ayzsml2ka74dbplg86gip7ra0x9b495g779qxd";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c5084bc2c3fe378af6ff39d65e40649c6359b7b5/recipes/doom-themes";
           sha256 = "0plqhis9ki3ck1pbv4hiqk4x428fps8qsfx72mamdayyx2nncdrs";
-          name = "doom-themes";
+          name = "recipe";
         };
         packageRequires = [ all-the-icons cl-lib emacs ];
         meta = {
@@ -15247,8 +19148,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    dot-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    dot-mode = callPackage ({ emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "dot-mode";
         version = "20180312.1600";
         src = fetchFromGitHub {
@@ -15257,10 +19162,10 @@
           rev = "6ca22b73bcdae2363ee9641b822a60685df16a3e";
           sha256 = "10lmwra48ihxqxyl54m3yn1zy0q5w6cxqd2n5pbs4lva1yck0z4w";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dot-mode";
           sha256 = "039ylmbvw0wb3i2w4qn3dhckz7y3swbid4hwjcxljy4szc709p6k";
-          name = "dot-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -15268,8 +19173,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    dotenv-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    dotenv-mode = callPackage ({ emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "dotenv-mode";
         version = "20180207.1114";
         src = fetchFromGitHub {
@@ -15278,10 +19187,10 @@
           rev = "f4c52bcd5313379b9f2460db7f7a33119dfa96ea";
           sha256 = "1fplkhxnsgdrg10iqsmw162zny2idz4vvv35spsb9j0hsk8imclc";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9fc022c54b90933e70dcedb6a85167c2d9d7ba79/recipes/dotenv-mode";
           sha256 = "1lwfzfri6vywcjkc9wassrz0rdrg0kvljxsm6b4smlnphp6pdbbs";
-          name = "dotenv-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -15289,20 +19198,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    dotnet = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    dotnet = callPackage ({ fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "dotnet";
         version = "20170827.838";
         src = fetchFromGitHub {
           owner = "julienXX";
           repo = "dotnet.el";
-          rev = "e22fd23bf2bfab980d4802b10c4d872b800f90d4";
-          sha256 = "1qq0gkdr0h4b9h6l14wfk3zmw62sa2i5in23bvs6jp6y6hmffr2m";
+          rev = "fc1c98025f4f9394ce9b70f9bdafd18d897f27f2";
+          sha256 = "1pb45rpr2anqgxrdnp3sz3adx8gvpwvdms47gh75ran4sn191l19";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6ef473594ec57a747ad7d9d57d7287bcacf4b446/recipes/dotnet";
           sha256 = "06k1ikwg9bis9kk4r41bm0a0d8a31wscqyr6n99d7836p1h4jfki";
-          name = "dotnet";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -15310,8 +19222,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    download-region = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    download-region = callPackage ({ cl-lib ? null
+                                   , fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "download-region";
         version = "20180123.1733";
         src = fetchFromGitHub {
@@ -15320,10 +19236,10 @@
           rev = "bbba3ecd80818d5d940d41fe89a6e2ec5dd2c53c";
           sha256 = "1cwlbdmdils5rzhjpc3fqjmd3dhalk6i7bxskpahbrr9xxfq0iw4";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7801d9fac121f213609a802fe9d88bdc5364d1f3/recipes/download-region";
           sha256 = "1mrl2x6j708nchyh9y5avbf2cq10kpnhfj553l6akarvl5n5pvkl";
-          name = "download-region";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -15331,8 +19247,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    downplay-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    downplay-mode = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "downplay-mode";
         version = "20151125.1209";
         src = fetchFromGitHub {
@@ -15341,10 +19260,10 @@
           rev = "4a2c3addc73c8ca3816345c3c11c08af265baedb";
           sha256 = "0s7swvfd7h8r0n3cjmkps6ary9vwg61jylfm4qrkp3idsz6is548";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/50d67ea3c4d92b4093373d5e4ff07b7d5a3dc537/recipes/downplay-mode";
           sha256 = "1v6nga101ljzza8qj3lkmkzzl0vvzj4lsh1m69698s8prnczxr9b";
-          name = "downplay-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -15352,20 +19271,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    dpaste = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    dpaste = callPackage ({ fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "dpaste";
         version = "20160303.1312";
         src = fetchFromGitHub {
           owner = "gregnewman";
           repo = "dpaste.el";
-          rev = "5ebabb466a6ae70882549855b6b2194fc32189f8";
-          sha256 = "03n3k6a40lw9m1ycf62g6vll4gr2kr2509vjp1dkfq722xwrw7zk";
+          rev = "e7a1a18de77f752eb0dbb4b878925f2265538d0b";
+          sha256 = "1493fan64lfq2gb9cgr7ja9xfd8jgqfbx9k84iaplavnpmqr5348";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dpaste";
           sha256 = "0wrfy9w0yf5m15vmhg4l880v92cy557g332xniqs77ab0sga4vgc";
-          name = "dpaste";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -15373,20 +19295,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    dpaste_de = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, web }:
-    melpaBuild {
+    dpaste_de = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild
+                             , web }:
+      melpaBuild {
         pname = "dpaste_de";
         version = "20131015.525";
         src = fetchFromGitHub {
           owner = "theju";
           repo = "dpaste_de.el";
-          rev = "f0c39e8864299f735642f7d9fa490689398ce39d";
-          sha256 = "1avpg0cgzk8d6g1q0ryx41lkcdgkm0mkzr5xr32xm28dzrfmgd4z";
+          rev = "ab041443884a7a4bfdc81b055688821e8efc9b02";
+          sha256 = "0aplwchr6r1nk2hfpqw2qxyp57zzkqydyzpc0mwz88halnkskblz";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dpaste_de";
           sha256 = "0022dd8l7jsyl0lv9x6iz882ln71js8brqcbiqz001zv45yrgvy0";
-          name = "dpaste_de";
+          name = "recipe";
         };
         packageRequires = [ web ];
         meta = {
@@ -15394,8 +19320,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    dr-racket-like-unicode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    dr-racket-like-unicode = callPackage ({ emacs
+                                          , fetchFromGitHub
+                                          , fetchurl
+                                          , lib
+                                          , melpaBuild }:
+      melpaBuild {
         pname = "dr-racket-like-unicode";
         version = "20161021.511";
         src = fetchFromGitHub {
@@ -15404,10 +19334,10 @@
           rev = "4953f1c8a68472e157a0dcd0a7e35a4ec2577133";
           sha256 = "1i7k7d2gnzd2izplhdmjbkcxvkwnc3y3y0hrcp2rq60bjpkcl1gv";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6e612ede00c4b44ace741d2b6baabc61571af15c/recipes/dr-racket-like-unicode";
           sha256 = "0cqcbn4hmv99d8z03xc0rqw4yh5by6g09y33h75dhl9nh95rybgf";
-          name = "dr-racket-like-unicode";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -15415,20 +19345,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    dracula-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    dracula-theme = callPackage ({ emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "dracula-theme";
-        version = "20180416.652";
+        version = "20180710.624";
         src = fetchFromGitHub {
           owner = "dracula";
           repo = "emacs";
-          rev = "74094e6fd5d0f15b92d82c73b3b3d9f13949d5dd";
-          sha256 = "0apimfivs0g4m9qy1m3c8id6ycr2lwxdpd00crxbka284g440nzj";
+          rev = "a1c9888b7876ace60a536d27fb290e788bffc9cb";
+          sha256 = "1bi257gp4rskwbvr1hkgz16r0pw4xqvaxgixzv4abb35vsc9gncx";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d63cb8906726f106e65f7d9895b49a38ffebf8d5/recipes/dracula-theme";
           sha256 = "1px162v7h7136rasafq875yzw0h8n6wvzbyh73c3w093kd30bmh8";
-          name = "dracula-theme";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -15436,20 +19370,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    draft-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    draft-mode = callPackage ({ fetchFromGitLab
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "draft-mode";
         version = "20140609.756";
-        src = fetchFromGitHub {
+        src = fetchFromGitLab {
           owner = "gaudecker";
           repo = "draft-mode";
-          rev = "4779fb32daf53746459da2def7e08004492d4f18";
-          sha256 = "0z3w58zplm5ks195zfsaq8kwbc944p3kbzs702jgz02wcrm4c28y";
+          rev = "f059c04b044f62aec764c7698adddad301bfe89c";
+          sha256 = "01dspkv7g4xmmqgz6f1p190h5p4f4vrw8r9dikrjch02bb76wqir";
         };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/d5ee50f467025fb8b9a3b4577fc471a2b2ee191a/recipes/draft-mode";
-          sha256 = "1wg9cx39f4dhrykb4zx4fh0x5cfrh5aicwwfh1h3yzpc4zlr7xfh";
-          name = "draft-mode";
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/cbfefacda071c0f5ee698a4c345a2d6fea6a0d24/recipes/draft-mode";
+          sha256 = "19lq1a3rj6fck3xq2vcz8fk30hpx25kyfz6c7hmq36kx4lv0mjpa";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -15457,20 +19394,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    drag-stuff = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    drag-stuff = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "drag-stuff";
         version = "20161107.2349";
         src = fetchFromGitHub {
           owner = "rejeep";
           repo = "drag-stuff.el";
-          rev = "6d06d846cd37c052d79acd0f372c13006aa7e7c8";
-          sha256 = "1fsj88n1j50cxjzx62khzxrajsvf33si8iwgbaz6z7z8pwh91qcd";
+          rev = "d49fe376d24f0f8ac5ade67b6d7fccc2487c81db";
+          sha256 = "1jrr59iazih3imkl9ja1lbni9v3xv6b8gmqs015g2mxhlql35jka";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/drag-stuff";
           sha256 = "1q67q20gfhixzkmddhzp6fd8z2qfpsmyyvymmaffjcscnjaz21w4";
-          name = "drag-stuff";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -15478,20 +19418,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    drawille = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    drawille = callPackage ({ cl-lib ? null
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "drawille";
         version = "20160418.1138";
         src = fetchFromGitHub {
           owner = "sshbio";
           repo = "drawille";
-          rev = "d914845725719d8293e2f0dea3c9c7e0a1e0e62a";
-          sha256 = "1ynjxfvx8b6rq6d4gm1sl96rmlk5pi8j5s1rd1y0p8x2lwqcfv77";
+          rev = "d582b455c01432bc80933650c52a1f586bd1b5ad";
+          sha256 = "1z3akh0ywzihr0ghk6f8x9z38mwqy3zg29p0q69h4i6yzhxpdmxa";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e0920232421bf177f2ab8595fab7e203f40b1a34/recipes/drawille";
           sha256 = "01rl21hbj3hwy072yr27jl6iql331v131d3mr9zifg9v6f3jqbil";
-          name = "drawille";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -15499,8 +19443,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    drill-instructor-AZIK-force = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, popup }:
-    melpaBuild {
+    drill-instructor-AZIK-force = callPackage ({ fetchFromGitHub
+                                               , fetchurl
+                                               , lib
+                                               , melpaBuild
+                                               , popup }:
+      melpaBuild {
         pname = "drill-instructor-AZIK-force";
         version = "20151122.2114";
         src = fetchFromGitHub {
@@ -15509,10 +19457,10 @@
           rev = "008cea202dc31d7d6fb1e7d8e6334d516403b7a5";
           sha256 = "0lzq0mkhhj3s5yrcbs576qxkd8h0m2ikc4iplk97ddpzh4nz4127";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fb5ee8a113b98e8df8368c5e17c6d762decf8f5b/recipes/drill-instructor-AZIK-force";
           sha256 = "1bb698r11m58csd2rm17fmiw691p25npphzqgjiiqbn4vx35ja7f";
-          name = "drill-instructor-AZIK-force";
+          name = "recipe";
         };
         packageRequires = [ popup ];
         meta = {
@@ -15520,8 +19468,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    drone = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    drone = callPackage ({ fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "drone";
         version = "20161106.118";
         src = fetchFromGitHub {
@@ -15530,10 +19481,10 @@
           rev = "1d4ee037ad3208847a4235426edf0c4a3e7b1899";
           sha256 = "1dwxgzf32cvfi7b6zw3qzamj82zs2c0ap6i1w0jqqgzmkz20dqvf";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3b62e697798627b07000ac72c19ecd1d89c22229/recipes/drone";
           sha256 = "0wjbmgic715i4nxk90nasfamk04lskl8dll9y5klk32w1lsj546q";
-          name = "drone";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -15541,8 +19492,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    dropbox = callPackage ({ fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild, oauth }:
-    melpaBuild {
+    dropbox = callPackage ({ fetchFromGitHub
+                           , fetchurl
+                           , json ? null
+                           , lib
+                           , melpaBuild
+                           , oauth }:
+      melpaBuild {
         pname = "dropbox";
         version = "20170502.1722";
         src = fetchFromGitHub {
@@ -15551,10 +19507,10 @@
           rev = "d85bbf6caa4203d6088ea29f5c057c1e9bcacd85";
           sha256 = "15fg46pb64sz17sz3bqcpvg0nlsy4fs7ppzdq7q1686q3ihczk31";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dropbox";
           sha256 = "1dqjsn7wkjjvbwq3kgdd7bvwrirappwnhcwkj2ai19dpx6jd8wym";
-          name = "dropbox";
+          name = "recipe";
         };
         packageRequires = [ json oauth ];
         meta = {
@@ -15562,8 +19518,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    drupal-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, php-mode }:
-    melpaBuild {
+    drupal-mode = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild
+                               , php-mode }:
+      melpaBuild {
         pname = "drupal-mode";
         version = "20171120.1509";
         src = fetchFromGitHub {
@@ -15572,10 +19532,10 @@
           rev = "47fda0a38a5b197f4606137d9c3b7d44aaeaa886";
           sha256 = "1rg46prsymxc9lyhk7cbr53089p970mmmybiir2qsyx2s4m6mnfl";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/13e16af340868048eb1f51f9865dfc707e57abe8/recipes/drupal-mode";
           sha256 = "14jvk4phq3wcff3yvhygix0c9cpbphh0dvm961i93jpsx7g9awgn";
-          name = "drupal-mode";
+          name = "recipe";
         };
         packageRequires = [ php-mode ];
         meta = {
@@ -15583,8 +19543,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    drupal-spell = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    drupal-spell = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "drupal-spell";
         version = "20130520.955";
         src = fetchFromGitHub {
@@ -15593,10 +19556,10 @@
           rev = "a69f5e3b62c4c0da74ce26c1d00d5b8f7395e4ae";
           sha256 = "156cscpavrp695lp8pgjg5jnq3b8n9c2h8qg8w89dd4vfkc3iikd";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bb859d9755bde3fd852bc7d08f2fab2429ba31b3/recipes/drupal-spell";
           sha256 = "117rr2bfnc99g3qsr127grxwaqp54cxjaj3nl2nr6z78nja0fij3";
-          name = "drupal-spell";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -15604,20 +19567,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    dsvn = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    dsvn = callPackage ({ fetchFromGitHub
+                        , fetchurl
+                        , lib
+                        , melpaBuild }:
+      melpaBuild {
         pname = "dsvn";
         version = "20130120.1257";
         src = fetchFromGitHub {
           owner = "emacsorphanage";
           repo = "dsvn";
-          rev = "17bce692e9bd5a43373d5cb1d66da50e1acb903b";
-          sha256 = "1bv4ivv9j5r0ax4vay1kmwv753y44qj6qprr38yh7ky0fpsml34c";
+          rev = "b01e3601ac26735efa3f1fedc81e9a4f6e173635";
+          sha256 = "1rfl10zqksvrry3l4g4h9gp3banmfas1n3qn9lsw8nbm259w1sf4";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/30de78c9cf83de30093a5647976eeaf552d4b2cb/recipes/dsvn";
           sha256 = "1kgc0b8as7w1h9dsknv2h7dzr6jcrs0j0p376050pshgzcm79nm6";
-          name = "dsvn";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -15625,20 +19591,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    dtrace-script-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    dtrace-script-mode = callPackage ({ fetchFromGitHub
+                                      , fetchurl
+                                      , lib
+                                      , melpaBuild }:
+      melpaBuild {
         pname = "dtrace-script-mode";
         version = "20150213.2223";
         src = fetchFromGitHub {
           owner = "dotemacs";
           repo = "dtrace-script-mode";
-          rev = "801af1ef16075d31a19830ebb8404bbf3a322f10";
-          sha256 = "1blfx3r2xd3idbfjrx44ma3x1d83xp67il2s2bmdwa8qz92z99lf";
+          rev = "a92f76c65b9fb64d448e503b4ea7ff06085be8ee";
+          sha256 = "0maj816qrrawdpj72hd33qcgl4wrn9cbqz26l4zfb124z1m35yqv";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dtrace-script-mode";
           sha256 = "00ar2qahgqpf4an6v9lbzgj73ylbavvigsm8kqdq94ghm4awxi4z";
-          name = "dtrace-script-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -15646,20 +19615,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    dtrt-indent = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    dtrt-indent = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "dtrt-indent";
-        version = "20180319.648";
+        version = "20180628.1438";
         src = fetchFromGitHub {
           owner = "jscheid";
           repo = "dtrt-indent";
-          rev = "0ac070c9576e4ebab12cd6800ac2ac3abcecc2c1";
-          sha256 = "0dambn5l0wvbhccvhh5hbz9hw66y4mp1la3wj85dl9kgr7hq1ry7";
+          rev = "084dac7ab36a89d2a7d6cb8f443b1eccbfd189e2";
+          sha256 = "1afb7la1nfymhi9pzf00r3hf8w6h7scv22vps8jbijg27kvssk9k";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/61bcbcfa6c0f38a1d87f5b6913b8be6c50ef2994/recipes/dtrt-indent";
           sha256 = "1npn2jngy1wq0jpwmg1hkn8lx6ncbqsi587jl38lyp2xwchshfk5";
-          name = "dtrt-indent";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -15667,8 +19639,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    dts-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    dts-mode = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "dts-mode";
         version = "20161103.523";
         src = fetchFromGitHub {
@@ -15677,10 +19652,10 @@
           rev = "9ee0854446dcc6c53d2b8d2941051768dba50344";
           sha256 = "1k8lljdbc90nd29xrhdrsscxavzdq532wq2mg7ljc94krj7538b1";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/864a7ec64c46a0357710bc80ad4880dd35b2fda1/recipes/dts-mode";
           sha256 = "1k8cbiayajbzwkm0s0kyin0qpq9yhymidz0srs4hbvsnb6hvp234";
-          name = "dts-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -15688,20 +19663,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    ducpel = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ducpel = callPackage ({ cl-lib ? null
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "ducpel";
         version = "20140702.454";
         src = fetchFromGitHub {
           owner = "alezost";
           repo = "ducpel";
-          rev = "b53b935ab95c02b82ccf38f63c89e39e99477a55";
-          sha256 = "07cgwkfi69xjjxx9hs5rdblsil1h3bpbx9k7hwyv1dg3ivihm04s";
+          rev = "2f2ce2df269d99261c808a5c4ebc00d6d2cddabc";
+          sha256 = "19a8q9nakjzyzv7aryndifjr9c8jls9a2v7ilfjj8kscwxpjqlzb";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2d64adac965e1dac0f29dab9a587cd6ce9c3bb3a/recipes/ducpel";
           sha256 = "1cqrkgg7n9bhjswnpl7yc6w6yjs4gfbliaqsimmf9z43wk2ml4pc";
-          name = "ducpel";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -15709,8 +19688,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    dumb-diff = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    dumb-diff = callPackage ({ emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "dumb-diff";
         version = "20171211.1322";
         src = fetchFromGitHub {
@@ -15719,10 +19702,10 @@
           rev = "1a2331d283049b71a07c1b06b1e0627a950d55f4";
           sha256 = "05gmpp4s9y2ql27vb5vpqn3xh35qjfxgq9gzyvg86df43qfl8wvl";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cf7fa0b4235247d82569ed078f92774f10afa45c/recipes/dumb-diff";
           sha256 = "1h1dvxbj85kgi04lxh0bpx81f6sl1fd56lhjmq1cw9biwqw0sm0c";
-          name = "dumb-diff";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -15730,20 +19713,28 @@
           license = lib.licenses.free;
         };
       }) {};
-    dumb-jump = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s }:
-    melpaBuild {
+    dumb-jump = callPackage ({ dash
+                             , emacs
+                             , f
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild
+                             , popup
+                             , s }:
+      melpaBuild {
         pname = "dumb-jump";
-        version = "20180323.1942";
+        version = "20180615.2114";
         src = fetchFromGitHub {
           owner = "jacktasia";
           repo = "dumb-jump";
-          rev = "9e4090ac9108da9a794194b831dc6226998c623b";
-          sha256 = "1hablgysv2a2jlwnp7hgxglraznbc992ikd3myxfspqr3f6rzm9q";
+          rev = "cad3c4040be06703a9b40aa36ba38f1dc0927a66";
+          sha256 = "175nwn616xqhwayn78acf6ivkxdh3z1vfb0ihslidq1s3xsg5ypk";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dumb-jump";
           sha256 = "1j90n8gydsp2v07rysz1k5vf6hspybcl27214sib1iz3hbimid1w";
-          name = "dumb-jump";
+          name = "recipe";
         };
         packageRequires = [ dash emacs f popup s ];
         meta = {
@@ -15751,8 +19742,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    dummyparens = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    dummyparens = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "dummyparens";
         version = "20141009.324";
         src = fetchFromGitHub {
@@ -15761,10 +19755,10 @@
           rev = "9798ef1d0eaa24e4fe66f8aa6022a8c62714cc89";
           sha256 = "0g72nnz0j6dvllyxyrw20z1vg6p7sy46yy0fq017pa77sgqm0xzh";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e1f6199a9afece4d6eb581dc8e513601d55a5833/recipes/dummyparens";
           sha256 = "1yah8kpqkk9ygm73iy51fzwc8q5nw0xlwqir2qld1fc5y1lkb7dk";
-          name = "dummyparens";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -15772,8 +19766,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    duplicate-thing = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    duplicate-thing = callPackage ({ fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "duplicate-thing";
         version = "20120515.948";
         src = fetchFromGitHub {
@@ -15782,10 +19779,10 @@
           rev = "f6ed0232fd0653621afe450d53775a32a9d0e328";
           sha256 = "1qaiwm8mf4656gc1pdj8ivgy4abkjsypr52pvf4nrdkkln9qzfli";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/be28db1bfbd663af5b5c24bad50372fddd341982/recipes/duplicate-thing";
           sha256 = "1jx2b6h23dj561xhizzbpxp3av69ic8zdw4kkf0py1jm3gnrmlm4";
-          name = "duplicate-thing";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -15793,8 +19790,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    dut-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    dut-mode = callPackage ({ emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "dut-mode";
         version = "20170729.1411";
         src = fetchFromGitHub {
@@ -15803,10 +19804,10 @@
           rev = "9235c7acaa6690942e9de8b7acd1e4be0c859dc1";
           sha256 = "0fpqsm6y23anyx57gp4c6whzxrn8x03cp76iwx27c4gkq6ph1z8n";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ecf49ceab8b25591fab2ed6574cba0e6634d1539/recipes/dut-mode";
           sha256 = "0hlr5qvqcqdh2k1nyq621z6vq2yiflj4jy0pgg6lbiy3j6819mai";
-          name = "dut-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -15814,19 +19815,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    dyalog-mode = callPackage ({ cl-lib ? null, emacs, fetchhg, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    dyalog-mode = callPackage ({ cl-lib ? null
+                               , emacs
+                               , fetchhg
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "dyalog-mode";
-        version = "20171211.722";
+        version = "20180605.1413";
         src = fetchhg {
           url = "https://bitbucket.com/harsman/dyalog-mode";
-          rev = "87db00b912be";
-          sha256 = "0jg289fj4q83dwj7i0w5zq8bwqxzwzzmyhvdrk6cfw3q6rlwk5fp";
+          rev = "b2322f244c76";
+          sha256 = "0vgi6cw14fp8iihzmnk7jifdlbqhhcgnh26r30mnvsbycmbnvf0r";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/dyalog-mode";
           sha256 = "1y17nd2xd8b3mhaybws8dr7yanzwqij9gzfywisy65ckflm9kfyq";
-          name = "dyalog-mode";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -15834,8 +19840,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    dylan-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    dylan-mode = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "dylan-mode";
         version = "20160405.1514";
         src = fetchFromGitHub {
@@ -15844,10 +19853,10 @@
           rev = "7e8ba16bf125f0066d3e1caeefaba94a6d32ac72";
           sha256 = "0fxdv594k6p4kv6nc598rw51sy4x10dvbyhzn3gni2linb3v1c5h";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/94481ba3ebba6a99f11efab5a33e8bc6ea2d857a/recipes/dylan-mode";
           sha256 = "0kimvz8vmcvgxi0wvf7dqv6plj31xlksmvgip8h3bhyy7slxj3yy";
-          name = "dylan-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -15855,20 +19864,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    dynamic-fonts = callPackage ({ fetchFromGitHub, fetchurl, font-utils, lib, melpaBuild, pcache, persistent-soft }:
-    melpaBuild {
+    dynamic-fonts = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , font-utils
+                                 , lib
+                                 , melpaBuild
+                                 , pcache
+                                 , persistent-soft }:
+      melpaBuild {
         pname = "dynamic-fonts";
         version = "20140731.526";
         src = fetchFromGitHub {
           owner = "rolandwalker";
           repo = "dynamic-fonts";
-          rev = "ab0c65accbdb59acaed5b263327e22ec019b3e82";
-          sha256 = "150dj1g49q9x9zx9wkymq30l5gc8c4mhsq91fm6q0yj6ip7hlfxh";
+          rev = "004ee6014dc7dbff8f14d26015c91d9229f6eac0";
+          sha256 = "04rz0nqnkv6cjvm1yb83r4nxgnpkzcxxhyxkqwdjhka2c5dbisr4";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c9db386ab3910940addae6e925b2ac17e64e0f87/recipes/dynamic-fonts";
           sha256 = "0a210ca41maa755lv1n7hhpxp0f7lfxrxbi0x34icbkfkmijhl6q";
-          name = "dynamic-fonts";
+          name = "recipe";
         };
         packageRequires = [ font-utils pcache persistent-soft ];
         meta = {
@@ -15876,8 +19891,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    dynamic-ruler = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    dynamic-ruler = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "dynamic-ruler";
         version = "20160602.108";
         src = fetchFromGitHub {
@@ -15886,10 +19904,10 @@
           rev = "c9c0de6fe5721f06b50e01d9b4684b519c71b367";
           sha256 = "09skp2d5likqjlrsfis3biqw59sjkgid5249fld9ahqm5f1wq296";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/926c43867120db429807ff5aaacc8af65a1738c8/recipes/dynamic-ruler";
           sha256 = "13jc3xbsyc3apkdfy0iafmsfvgqs0zfa5w8jxp7zj4dhb7pxpnmc";
-          name = "dynamic-ruler";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -15897,8 +19915,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    dynamic-spaces = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    dynamic-spaces = callPackage ({ fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "dynamic-spaces";
         version = "20171027.1151";
         src = fetchFromGitHub {
@@ -15907,10 +19928,10 @@
           rev = "97ae8480c257ba573ca3d06dbf602f9b23c41d38";
           sha256 = "0qs7gqjl6ilwwmd21663345az6766j7h1pv7wvd2kyh24yfs1xkj";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e0b59ce66132cbe2b1f41b665dcb30bdd04bc48b/recipes/dynamic-spaces";
           sha256 = "0l4hwqivzv51j7h5sgd91dxb5slylmrfrvf7r6w0k04bhld6ry0c";
-          name = "dynamic-spaces";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -15918,8 +19939,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    e2ansi = callPackage ({ face-explorer, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    e2ansi = callPackage ({ face-explorer
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "e2ansi";
         version = "20180403.1215";
         src = fetchFromGitHub {
@@ -15928,10 +19953,10 @@
           rev = "f886e687d50ff58063a92d40623f2400fa913af0";
           sha256 = "0wg16hdmhbhll0ffp2hrqmr12ddai2s6gql52q6pz9k3lw6v0d5m";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5e655a3fdfae80ea120cdb2ce84dd4fd36f9a71e/recipes/e2ansi";
           sha256 = "0ns1sldipx5kyqpi0bw79kdmhi1ry5glwxfzfx8r01hbbkf0cc94";
-          name = "e2ansi";
+          name = "recipe";
         };
         packageRequires = [ face-explorer ];
         meta = {
@@ -15939,8 +19964,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    e2wm = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, window-layout }:
-    melpaBuild {
+    e2wm = callPackage ({ fetchFromGitHub
+                        , fetchurl
+                        , lib
+                        , melpaBuild
+                        , window-layout }:
+      melpaBuild {
         pname = "e2wm";
         version = "20170214.1636";
         src = fetchFromGitHub {
@@ -15949,10 +19978,10 @@
           rev = "4353d3394c77a49f8f0291c239858c8c5e877549";
           sha256 = "12midsrx07pdrsr1qbl2rpi7xyhxqx08bkz7n7gf8vsmqkpfp56s";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8da85815c39f58552a968ae68ee07c08c53b0f61/recipes/e2wm";
           sha256 = "0dp360jr3fgxqywkp7g88cp02g37kw2hdsc0f70hjak9n3sy03la";
-          name = "e2wm";
+          name = "recipe";
         };
         packageRequires = [ window-layout ];
         meta = {
@@ -15960,8 +19989,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    e2wm-R = callPackage ({ e2wm, ess, fetchFromGitHub, fetchurl, inlineR, lib, melpaBuild }:
-    melpaBuild {
+    e2wm-R = callPackage ({ e2wm
+                          , ess
+                          , fetchFromGitHub
+                          , fetchurl
+                          , inlineR
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "e2wm-R";
         version = "20151230.126";
         src = fetchFromGitHub {
@@ -15970,10 +20005,10 @@
           rev = "4350601ee1a96bf89777b3f09f1b79b88e2e6e4d";
           sha256 = "1g77gf24abwcvf7z52vs762s6jp978pnvza8zmzwkwfvp1mkx233";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9a3ba9843bdf275815b149e4c4b0a947bbc5e614/recipes/e2wm-R";
           sha256 = "09v4fz178lch4d6m801ipclfxm2qrap5601aysnzyvc2apvyr3sh";
-          name = "e2wm-R";
+          name = "recipe";
         };
         packageRequires = [ e2wm ess inlineR ];
         meta = {
@@ -15981,8 +20016,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    e2wm-bookmark = callPackage ({ e2wm, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    e2wm-bookmark = callPackage ({ e2wm
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "e2wm-bookmark";
         version = "20151122.2121";
         src = fetchFromGitHub {
@@ -15991,10 +20030,10 @@
           rev = "bad816b6d8049984d69bcd277b7d325fb84d55eb";
           sha256 = "121vd44f42bxqvdjswmjlghf1jalbs974b6cip2i049k1n08xgh0";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/45488849da42ac775e532f30f588bfabb7af3cae/recipes/e2wm-bookmark";
           sha256 = "1myaqxzrgff5gxcn3zn1bsmyf5122ql1mwr05wamd450lq8nmbw5";
-          name = "e2wm-bookmark";
+          name = "recipe";
         };
         packageRequires = [ e2wm ];
         meta = {
@@ -16002,8 +20041,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    e2wm-direx = callPackage ({ direx, e2wm, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    e2wm-direx = callPackage ({ direx
+                              , e2wm
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "e2wm-direx";
         version = "20170509.601";
         src = fetchFromGitHub {
@@ -16012,10 +20056,10 @@
           rev = "b47f19d15436cc28233a812a1150689f61d11046";
           sha256 = "0lihc02b0792kk61vcmhi0jwb7c4w2hi19g6a0q1598b3rci82nf";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8320cf626050cf455c97ef22e7a8ccfb253e3243/recipes/e2wm-direx";
           sha256 = "0nv8aciq0swxi9ahwc2pvk9c7i3rmlp7vrzqcan58ml0i3nm17wg";
-          name = "e2wm-direx";
+          name = "recipe";
         };
         packageRequires = [ direx e2wm ];
         meta = {
@@ -16023,20 +20067,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    e2wm-pkgex4pl = callPackage ({ e2wm, fetchFromGitHub, fetchurl, lib, melpaBuild, plsense-direx }:
-    melpaBuild {
+    e2wm-pkgex4pl = callPackage ({ e2wm
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild
+                                 , plsense-direx }:
+      melpaBuild {
         pname = "e2wm-pkgex4pl";
         version = "20140525.347";
         src = fetchFromGitHub {
           owner = "aki2o";
           repo = "e2wm-pkgex4pl";
-          rev = "7ea994450727190c4f3cb46cb429ba41b692ecc0";
-          sha256 = "1vrlfzy1wynm7x4m7pl8vim7ykqd6qkcilwz7sjc1lbckz11ig0d";
+          rev = "b72561b75e98961f05544a2159d83592c964ba1e";
+          sha256 = "1cx6kdxhq9ybwwvc1vpwcfy08yf1h4xacgimm36kp9xayvxsmq2j";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8f84b421cb1673d2a9fe820cee11dc4a6e72adad/recipes/e2wm-pkgex4pl";
           sha256 = "0hgdbqfw3015fr929m36kfiqqzsid6afs3222iqq0apg7gfj7jil";
-          name = "e2wm-pkgex4pl";
+          name = "recipe";
         };
         packageRequires = [ e2wm plsense-direx ];
         meta = {
@@ -16044,8 +20093,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    e2wm-svg-clock = callPackage ({ e2wm, fetchFromGitHub, fetchurl, lib, melpaBuild, svg-clock }:
-    melpaBuild {
+    e2wm-svg-clock = callPackage ({ e2wm
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild
+                                  , svg-clock }:
+      melpaBuild {
         pname = "e2wm-svg-clock";
         version = "20150106.506";
         src = fetchFromGitHub {
@@ -16054,10 +20108,10 @@
           rev = "d425925e3afffcbe2ff74edc80b714e4319d4c94";
           sha256 = "0h1fnlpvy2mqfxjv64znghmiadh9qimj9q9a60cxhyc0bq0prz6f";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/784f5598910ecf208a68fa97448e148a8ebefa32/recipes/e2wm-svg-clock";
           sha256 = "0q02lksrbn43s8d9rzpglqybalglpi6qi9lix0cllag6i7fzcbms";
-          name = "e2wm-svg-clock";
+          name = "recipe";
         };
         packageRequires = [ e2wm svg-clock ];
         meta = {
@@ -16065,20 +20119,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    e2wm-sww = callPackage ({ e2wm, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    e2wm-sww = callPackage ({ e2wm
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "e2wm-sww";
         version = "20140524.158";
         src = fetchFromGitHub {
           owner = "aki2o";
           repo = "e2wm-sww";
-          rev = "1063f9854bd34db5ac771cd1036cecc89834729d";
-          sha256 = "0mz43mwcgyc1c9p9b7nflnjxdxjm2nxbhl0scj6llzphikicr35g";
+          rev = "db454ac3eddd53a62f2725f6e2d5ac455caf200c";
+          sha256 = "1a8z94z0wp9r4kh44bn2m74k866jwq7zvjihxmmzr0rfb85q2d99";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cc873e8271e9f372e08da5d0e4b77c8ba0e3a8cb/recipes/e2wm-sww";
           sha256 = "0x45j62cjivf9v7jp1b41yya3f9akp92md6cbv0v7bwz98g2vsk8";
-          name = "e2wm-sww";
+          name = "recipe";
         };
         packageRequires = [ e2wm ];
         meta = {
@@ -16086,8 +20144,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    e2wm-term = callPackage ({ e2wm, fetchFromGitHub, fetchurl, lib, log4e, melpaBuild, yaxception }:
-    melpaBuild {
+    e2wm-term = callPackage ({ e2wm
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , log4e
+                             , melpaBuild
+                             , yaxception }:
+      melpaBuild {
         pname = "e2wm-term";
         version = "20141009.608";
         src = fetchFromGitHub {
@@ -16096,10 +20160,10 @@
           rev = "65b5ac88043d5c4048920a048f3599904ca55981";
           sha256 = "0qv3kh6q3q7vgfsd8x25x8agi3fp96dkpjnxdidkwk6k8h9n0jzw";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c9a800f5af893cb670cedb47e4a723c407be8429/recipes/e2wm-term";
           sha256 = "0wrq06yap80a96l9l0hs7x7rng7sx6vi1hz778kknb6il4f2f45g";
-          name = "e2wm-term";
+          name = "recipe";
         };
         packageRequires = [ e2wm log4e yaxception ];
         meta = {
@@ -16107,20 +20171,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    eacl = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
-    melpaBuild {
+    eacl = callPackage ({ emacs
+                        , fetchFromGitHub
+                        , fetchurl
+                        , ivy
+                        , lib
+                        , melpaBuild }:
+      melpaBuild {
         pname = "eacl";
-        version = "20180308.1656";
+        version = "20180607.658";
         src = fetchFromGitHub {
           owner = "redguardtoo";
           repo = "eacl";
-          rev = "80113a9f6cc246cef67e3e20ec052788c38ab116";
-          sha256 = "1pwppn0m288d6j9b7cdshgc3rxv0nfs94klc1fpsyfxqx0a6f23z";
+          rev = "ccf1401b1acff67fe445c95e8be7b09e8c3ae5d8";
+          sha256 = "0v02asdmhj5la9nqck2230s04gf518cjs7wa4lykf8j46bc13vac";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8223bec7eed97f0bad300af9caa4c8207322d39a/recipes/eacl";
           sha256 = "16afsf3diz498jb63q85lm5ifvm487clfl838qzagl1l4aywhlwr";
-          name = "eacl";
+          name = "recipe";
         };
         packageRequires = [ emacs ivy ];
         meta = {
@@ -16128,8 +20197,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    easy-after-load = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    easy-after-load = callPackage ({ fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "easy-after-load";
         version = "20170817.531";
         src = fetchFromGitHub {
@@ -16138,10 +20210,10 @@
           rev = "29e20145da49ac9ea40463c552130777408040de";
           sha256 = "00xgd39qc760lmxpbggzn98aks5nad08b5ry54pkszjlmh37yqj7";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/384ffc463cc6edb4806f8da68bd251e662718e65/recipes/easy-after-load";
           sha256 = "1mn4hpx82nifphzx71yw3rbixbgis8bhvl3iyxcgcd88n5hqwvys";
-          name = "easy-after-load";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -16149,20 +20221,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    easy-escape = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    easy-escape = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "easy-escape";
         version = "20161209.744";
         src = fetchFromGitHub {
           owner = "cpitclaudel";
           repo = "easy-escape";
-          rev = "63fa5fcf9a53b7d3c1e872081e65afad5a722ba8";
-          sha256 = "11v5pzpyrzada07laa3jh6c1hafwrpx1pxvp7r1azqy9fpi3slnz";
+          rev = "8623aa9d715fe7677ea24d7164ea6e4ecdb3e65b";
+          sha256 = "12shxdr03l39vj3grsncym1mv2vn39k58vvhbwc1q591adqhwalz";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c39e3b867fa3143e9dc7c2fefa57b5755f70b433/recipes/easy-escape";
           sha256 = "1zspb79x6s151wwiian45j1nh0xps8y8yd98byyn5lbwbj2pp2gk";
-          name = "easy-escape";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -16170,20 +20245,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    easy-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, popup }:
-    melpaBuild {
+    easy-hugo = callPackage ({ emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild
+                             , popup }:
+      melpaBuild {
         pname = "easy-hugo";
-        version = "20180416.749";
+        version = "20180531.221";
         src = fetchFromGitHub {
           owner = "masasam";
           repo = "emacs-easy-hugo";
-          rev = "b01585991ca1885e9cf10dc41481116feb091c89";
-          sha256 = "1nac2al4hi4lcarj325957jgkkfgfkgpw6mzmbcqzqvy02r2v7g4";
+          rev = "3b0516c87d33a75dd777f6336fdf53be0374abcb";
+          sha256 = "1qf7wk0vx1p0y77cnzihq4zrmz1dffwabsxgf0mz770nskys6y82";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/easy-hugo";
           sha256 = "1m7iw6njxxsk82agyqay277iql578b3wz6z9wjs8ls30ps8s2b8g";
-          name = "easy-hugo";
+          name = "recipe";
         };
         packageRequires = [ emacs popup ];
         meta = {
@@ -16191,20 +20271,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    easy-jekyll = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    easy-jekyll = callPackage ({ emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "easy-jekyll";
-        version = "20180416.811";
+        version = "20180513.1107";
         src = fetchFromGitHub {
           owner = "masasam";
           repo = "emacs-easy-jekyll";
-          rev = "670c289d7dabc9e991ba78cdde17fb659f23eb50";
-          sha256 = "1myqhny6v5xdz55xi1ayfash5r3ihkyy2cykwhjkrpp339695bxf";
+          rev = "84c19d0380617ce2e40a2b42ce9bedf65e52779d";
+          sha256 = "1vbb60vb98nqbwrxl6p3gcvjpnjlscp0hp4k53rcgjd75w9vbnsj";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c3f281145bad12c27bdbef32ccc07b6a5f13b577/recipes/easy-jekyll";
           sha256 = "16jj70fr23z5qsaijv4d4xfiiypny2cama8rsaci9fk9haq19lxv";
-          name = "easy-jekyll";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -16212,20 +20296,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    easy-kill = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    easy-kill = callPackage ({ cl-lib ? null
+                             , emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "easy-kill";
         version = "20151030.2229";
         src = fetchFromGitHub {
           owner = "leoliu";
           repo = "easy-kill";
-          rev = "e2b667f651a3531164d24ea4cbcd8c34fba0e17f";
-          sha256 = "0i2plbvaalapx3svryn5lrc68m0qj1xm0z577xxzq7i9z91nanq7";
+          rev = "af565684a71b24be1f602fda5b986d841fc33b3a";
+          sha256 = "1l4wl9wyjgcvl44iziicz9kzhvdw8pz1hzgd41bbmwj7jrfb3fqv";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7d0a74c2a7d8859e9311bc8d71f5e6cf5a8063b6/recipes/easy-kill";
           sha256 = "10jcv7a4vcnaj3wkabip2xwzcwlmvdlqkl409a9lnzfasxcpf32i";
-          name = "easy-kill";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -16233,8 +20322,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    easy-kill-extras = callPackage ({ easy-kill, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    easy-kill-extras = callPackage ({ easy-kill
+                                    , fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "easy-kill-extras";
         version = "20161028.504";
         src = fetchFromGitHub {
@@ -16243,10 +20336,10 @@
           rev = "e60a74d7121eff7c263098aea2901cc05a5f6acd";
           sha256 = "1rabkb2pkafnfx68df1zjwbj8bl7361n35lvzrvldc3v85bfam48";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7b55d93f78fefde47a2bd4ebbfd93c028fab1f40/recipes/easy-kill-extras";
           sha256 = "0xzlzv57nvrc142saydwfib51fyqcdzjccc1hj6xvgcdbwadlnjy";
-          name = "easy-kill-extras";
+          name = "recipe";
         };
         packageRequires = [ easy-kill ];
         meta = {
@@ -16254,8 +20347,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    easy-repeat = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    easy-repeat = callPackage ({ emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "easy-repeat";
         version = "20150516.148";
         src = fetchFromGitHub {
@@ -16264,10 +20361,10 @@
           rev = "060f0e6801c82c40c06961dc0528a00e18947a8c";
           sha256 = "18bm5ns1qrxq0rrz9sylshr62wkymh1m6b7ch2y74f8rcwdwjgnq";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f1f5e0d19043f6a24ab4069c9c850e96cbe61a8f/recipes/easy-repeat";
           sha256 = "1vx57gpw0nbxh976s18va4ali1nqxqffhaxv1c5rhf4pwlk2fa06";
-          name = "easy-repeat";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -16275,20 +20372,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    ebal = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ebal = callPackage ({ emacs
+                        , f
+                        , fetchFromGitHub
+                        , fetchurl
+                        , lib
+                        , melpaBuild }:
+      melpaBuild {
         pname = "ebal";
         version = "20171231.2216";
         src = fetchFromGitHub {
           owner = "mrkkrp";
           repo = "ebal";
-          rev = "1740118125ae7aa6ba82d36e1fe0e69065a6fcaa";
-          sha256 = "1i5r8m34zf7ya1kzgm8hsx707phq5smf2x6y2a1ykbnfkk39gmbf";
+          rev = "3a7a9a66efed30416e2013da80fed2f79b91def1";
+          sha256 = "0vxxswbx8l9jcv81akw1bd7ra4k51gjmv79z11fhbzf17n7y910a";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/629aa451162a0085488caad4052a56366b7ce392/recipes/ebal";
           sha256 = "1kqnlp5n1aig1qbqdq9q50wgqkzd1l6h9wi1gv43cif8qa1kxhwg";
-          name = "ebal";
+          name = "recipe";
         };
         packageRequires = [ emacs f ];
         meta = {
@@ -16296,20 +20398,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    ebf = callPackage ({ cl-lib ? null, dash, dash-functional, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ebf = callPackage ({ cl-lib ? null
+                       , dash
+                       , dash-functional
+                       , fetchFromGitHub
+                       , fetchurl
+                       , lib
+                       , melpaBuild }:
+      melpaBuild {
         pname = "ebf";
         version = "20160211.958";
         src = fetchFromGitHub {
           owner = "rexim";
           repo = "ebf";
-          rev = "4cd9c26354d8be6571354b2954d21fba882e78a2";
-          sha256 = "1pgn6fcg5cnbpk93hc2vw95sna07x0s1v2i6lq9bmij2msvar611";
+          rev = "b52dd2fa8c6a4a7acf4d93c16f54fbd9fbe087df";
+          sha256 = "1yyx6z251bgvcfi3jzdq4cnmyd8vmz3gffbzii5bdga4ms288j5d";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/22e2f6383f2a7a01778c0524af19a68af57796ae/recipes/ebf";
           sha256 = "072w1hczzb4z0dadvqy8px9zfnfd2z0w8nwa7q2qm5njg30rrqpb";
-          name = "ebf";
+          name = "recipe";
         };
         packageRequires = [ cl-lib dash dash-functional ];
         meta = {
@@ -16317,20 +20425,27 @@
           license = lib.licenses.free;
         };
       }) {};
-    ebib = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib, seq }:
-    melpaBuild {
+    ebib = callPackage ({ dash
+                        , emacs
+                        , fetchFromGitHub
+                        , fetchurl
+                        , lib
+                        , melpaBuild
+                        , parsebib
+                        , seq }:
+      melpaBuild {
         pname = "ebib";
-        version = "20180416.350";
+        version = "20180428.1401";
         src = fetchFromGitHub {
           owner = "joostkremers";
           repo = "ebib";
-          rev = "22709d2b5e973b321dc8412f9a26acb156a076e1";
-          sha256 = "1xh7gmshn1ra027pqbvc06qxjs49ijby0kiz37qdqz7rvq2xgl6n";
+          rev = "212dea4a52f04eaa1d13a895fffea04f5884f12b";
+          sha256 = "150dggfk79pk11qlzfl2sk1xaibdy0sbh6n94r7i2w235p2yg8p5";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/ebib";
           sha256 = "1kdqf5nk9l6mr3698nqngrkw5dicgf7d24krir5wrcfbrsqrfmid";
-          name = "ebib";
+          name = "recipe";
         };
         packageRequires = [ dash emacs parsebib seq ];
         meta = {
@@ -16338,8 +20453,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    ecb = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ecb = callPackage ({ fetchFromGitHub
+                       , fetchurl
+                       , lib
+                       , melpaBuild }:
+      melpaBuild {
         pname = "ecb";
         version = "20170728.1221";
         src = fetchFromGitHub {
@@ -16348,10 +20466,10 @@
           rev = "1330a44cf3c171781083b0b926ab7622f64e6e81";
           sha256 = "0nx1blkvnzrxd2l7ckdihm9fvq5vkcghf6qccagkjzk4zbdalz30";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4db5183f35bedbc459843ad9f442f9cb6608c5fc/recipes/ecb";
           sha256 = "0z61p9zgv7gcx04m4jv16a3mn9kjvnw0rdd65kpvbmzkgls0nk8d";
-          name = "ecb";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -16359,20 +20477,29 @@
           license = lib.licenses.free;
         };
       }) {};
-    eclim = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild, popup, s, yasnippet }:
-    melpaBuild {
+    eclim = callPackage ({ cl-lib ? null
+                         , dash
+                         , fetchFromGitHub
+                         , fetchurl
+                         , json ? null
+                         , lib
+                         , melpaBuild
+                         , popup
+                         , s
+                         , yasnippet }:
+      melpaBuild {
         pname = "eclim";
         version = "20171113.1754";
         src = fetchFromGitHub {
           owner = "emacs-eclim";
           repo = "emacs-eclim";
-          rev = "6396ad1cd25c0a197109343ec1cce5d5080acdff";
-          sha256 = "04ci3qb3vgqdvsdfivhwfsxrgalh61b41bsr1cafk4gv3g3rdr13";
+          rev = "4f27d04c30a026f24c0ff18c3a7d36e3fb5b57a5";
+          sha256 = "1krrm123vzv6hw54kbkbh1xj6j090rdm4r2fcqp76b3hg8j8cpn1";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1e9d3075587fbd9ca188535fd945a7dc451c6d7e/recipes/eclim";
           sha256 = "1n60ci6kjmzy2khr3gs7s8gf21j1f9zjaj5a1yy2dyygsarbxw7b";
-          name = "eclim";
+          name = "recipe";
         };
         packageRequires = [ cl-lib dash json popup s yasnippet ];
         meta = {
@@ -16380,8 +20507,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    eclipse-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    eclipse-theme = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "eclipse-theme";
         version = "20160430.322";
         src = fetchFromGitHub {
@@ -16390,10 +20520,10 @@
           rev = "dc54d9312d97210823b922038076e2b1b132eff2";
           sha256 = "03yyagd37l9kgdnkqrkvrcgp5njyl4an0af7cfmcdnpyjghczf4d";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/81fcf3536ead18a91400f6936b3f789b4b594b9c/recipes/eclipse-theme";
           sha256 = "0mww0jysxqky1zkkhvhj7fn20w970n2w6501rdm5jwqfb58ivxfx";
-          name = "eclipse-theme";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -16401,8 +20531,17 @@
           license = lib.licenses.free;
         };
       }) {};
-    ecukes = callPackage ({ ansi, commander, dash, espuds, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    ecukes = callPackage ({ ansi
+                          , commander
+                          , dash
+                          , espuds
+                          , f
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild
+                          , s }:
+      melpaBuild {
         pname = "ecukes";
         version = "20171216.408";
         src = fetchFromGitHub {
@@ -16411,10 +20550,10 @@
           rev = "3a77ba9f1064c2bca47b401974c009e65727c46e";
           sha256 = "1isscwz4h3nx62lwfrj899lp2yc27zk1ndgr441d848495ccmshn";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/14cf66e6929db2a0f377612e786aaed9eb12b799/recipes/ecukes";
           sha256 = "0ava8hrc7r1mzv6xgbrb84qak5xrf6fj8g9qr4i4g0cr7843nrw0";
-          name = "ecukes";
+          name = "recipe";
         };
         packageRequires = [ ansi commander dash espuds f s ];
         meta = {
@@ -16422,8 +20561,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    edbi = callPackage ({ concurrent, ctable, epc, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    edbi = callPackage ({ concurrent
+                        , ctable
+                        , epc
+                        , fetchFromGitHub
+                        , fetchurl
+                        , lib
+                        , melpaBuild }:
+      melpaBuild {
         pname = "edbi";
         version = "20160224.1741";
         src = fetchFromGitHub {
@@ -16432,10 +20577,10 @@
           rev = "6f50aaf4bde75255221f2292c7a4ad3fa9d918c0";
           sha256 = "0x0igyvdcm4863n7zndvcv6wgzwgn7324cbfjja6xd7r0k936zdy";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/238a11afa52d2c01d69eb16ffd7d07ccd6dff403/recipes/edbi";
           sha256 = "0qq0j16n8lyvkqqlcsrq1m7r7f0in6b92d74mpx5c6siv6z2vxlr";
-          name = "edbi";
+          name = "recipe";
         };
         packageRequires = [ concurrent ctable epc ];
         meta = {
@@ -16443,20 +20588,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    edbi-database-url = callPackage ({ edbi, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    edbi-database-url = callPackage ({ edbi
+                                     , emacs
+                                     , fetchFromGitHub
+                                     , fetchurl
+                                     , lib
+                                     , melpaBuild }:
+      melpaBuild {
         pname = "edbi-database-url";
         version = "20160221.1123";
         src = fetchFromGitHub {
           owner = "proofit404";
           repo = "edbi-database-url";
-          rev = "d56c580268cd93651998c4c6b1c5558e6b6ca90f";
-          sha256 = "1nkfl8jngkdz8h951jig39af1wh5vrc5lqk58l2i4lc2znprj9lx";
+          rev = "a6e4be7547ee8e0bb43a11ff173d6271b21b5012";
+          sha256 = "0f59s0a7zpa3dny1k7x6zrymrnzba184smq8v1vvz8hkc0ym1j1v";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e25bf3d65ef2fb09eb0802cfd3e3faee86a5cfdb/recipes/edbi-database-url";
           sha256 = "018rxijmy0lvisy281d501ra9lnh5xi0wmvz5avbjpb0fi4q1zdn";
-          name = "edbi-database-url";
+          name = "recipe";
         };
         packageRequires = [ edbi emacs ];
         meta = {
@@ -16464,29 +20614,39 @@
           license = lib.licenses.free;
         };
       }) {};
-    edbi-django = callPackage ({ edbi, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    edbi-django = callPackage ({ edbi
+                               , emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild
+                               , pythonic }:
+      melpaBuild {
         pname = "edbi-django";
-        version = "20160221.1123";
+        version = "20180627.300";
         src = fetchFromGitHub {
           owner = "proofit404";
           repo = "edbi-django";
-          rev = "61c70d3a727ff28c1c7d1eb61af1efba7a268b8f";
-          sha256 = "0kp2g0vb7pag57n20blqfri01cnkaxa0h6adbg2bfw7vcbn3h1gd";
+          rev = "5fe3fe82c8691af91dfc24ad3dc591ca228ec875";
+          sha256 = "1ssznmfgr0g497j1syikzj8yndnjby7225fskkd5x2z3krjgs4id";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/345cafbf5358f8179bcbcb895cace75f289c02f1/recipes/edbi-django";
           sha256 = "1s59hab35hwnspyklxbhi0js0sgdn0rc7y33dqjk0psjcikqymg1";
-          name = "edbi-django";
+          name = "recipe";
         };
-        packageRequires = [ edbi emacs f ];
+        packageRequires = [ edbi emacs pythonic ];
         meta = {
           homepage = "https://melpa.org/#/edbi-django";
           license = lib.licenses.free;
         };
       }) {};
-    edbi-minor-mode = callPackage ({ edbi, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    edbi-minor-mode = callPackage ({ edbi
+                                   , fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "edbi-minor-mode";
         version = "20160706.747";
         src = fetchFromGitHub {
@@ -16495,10 +20655,10 @@
           rev = "566a2141a6eb9d9d5d7e1bd7c251d1c5e8f0d2ec";
           sha256 = "1g6mlmrwl8p5ffj9q298vymd9xi2kpp7mhbmz4by4f6a3g831c88";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5fb878b60c7ecbb1e3a47aef1d9765061c510644/recipes/edbi-minor-mode";
           sha256 = "0p7vdf9cp6i7mhjxj82670pfflf1kacalmakb7ssgigs1nsf3spi";
-          name = "edbi-minor-mode";
+          name = "recipe";
         };
         packageRequires = [ edbi ];
         meta = {
@@ -16506,8 +20666,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    edbi-sqlite = callPackage ({ edbi, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    edbi-sqlite = callPackage ({ edbi
+                               , emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "edbi-sqlite";
         version = "20160221.1123";
         src = fetchFromGitHub {
@@ -16516,10 +20681,10 @@
           rev = "52cb9ca1af7691b592f2cfd2f007847e7a4ccd5f";
           sha256 = "1vll81386fx90lq5sy4rlxcik6mvw7zx5cc51f0yaca9bkcckp51";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/acc9b816796b9f142c53f90593952b43c962d2d8/recipes/edbi-sqlite";
           sha256 = "1w53ypz3pdqaml3vq9j3f1w443n8s9hb2ys090kxvjqnb8x8v44y";
-          name = "edbi-sqlite";
+          name = "recipe";
         };
         packageRequires = [ edbi emacs ];
         meta = {
@@ -16527,20 +20692,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    ede-compdb = callPackage ({ cl-lib ? null, ede ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, semantic ? null }:
-    melpaBuild {
+    ede-compdb = callPackage ({ cl-lib ? null
+                              , ede ? null
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild
+                              , semantic ? null }:
+      melpaBuild {
         pname = "ede-compdb";
         version = "20150920.1333";
         src = fetchFromGitHub {
           owner = "randomphrase";
           repo = "ede-compdb";
-          rev = "d6d8466cd62876fc90adeff5875a1a584fd846cd";
-          sha256 = "1cfjw9b1lm29s5cbh0qqmkchbq2382s71w4rpb0gyf603s0yg13m";
+          rev = "23c91082270fcef24ea791b848f1604e36888ff0";
+          sha256 = "03xphcdw4b6z8i3dgrmq0l8m5nfpsjn0jv0y1rlabrbvxw1gpcqq";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3b70138b7d82aec2d60f4a7c0cd21e734a1fc52a/recipes/ede-compdb";
           sha256 = "1ypi7rxbgg2qck1b571hcw5m4ipllb48g6sindpdf180kbfbfpn7";
-          name = "ede-compdb";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ede semantic ];
         meta = {
@@ -16548,8 +20719,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    ede-php-autoload = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ede-php-autoload = callPackage ({ fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "ede-php-autoload";
         version = "20170428.933";
         src = fetchFromGitHub {
@@ -16558,10 +20732,10 @@
           rev = "65e502602dbc623257a820245d41f94cf2e1f07d";
           sha256 = "1569g3rnklxnnknrs9nmyjk9axrdhpr9pcz2ma925sb388jyrf5r";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8ee9f7fd9cbc3397cd9af34b08b75c3d9d8bc551/recipes/ede-php-autoload";
           sha256 = "0b7qbighncipgfaksvggpyldc5h0wxbjbiyaghglvycc4p1sfjd0";
-          name = "ede-php-autoload";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -16569,20 +20743,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    ede-php-autoload-composer-installers = callPackage ({ ede-php-autoload, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    ede-php-autoload-composer-installers = callPackage ({ ede-php-autoload
+                                                        , f
+                                                        , fetchFromGitHub
+                                                        , fetchurl
+                                                        , lib
+                                                        , melpaBuild
+                                                        , s }:
+      melpaBuild {
         pname = "ede-php-autoload-composer-installers";
         version = "20170221.1226";
         src = fetchFromGitHub {
           owner = "xendk";
           repo = "ede-php-autoload-composer-installers";
-          rev = "7840439802c7d11ee086bbf465657f3da12f9f66";
-          sha256 = "1dkq0py1sybmpy59h3szafa59g5g3jp8l9az22l15qgmkpbqydh4";
+          rev = "3e2fde975a06757b363e235c67e6341ebe668f60";
+          sha256 = "11sjq86nm7yqxi0y5n37c2c3w0p6mc28n85j40qj8nd7b2nb9s3j";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6e0e9058593b32b8d9fd7873d4698b4dd516930f/recipes/ede-php-autoload-composer-installers";
           sha256 = "0s7dv81niz4h8kj0648x2nbmz47hqxchfs2rjmjpy2lcbifvj268";
-          name = "ede-php-autoload-composer-installers";
+          name = "recipe";
         };
         packageRequires = [ ede-php-autoload f s ];
         meta = {
@@ -16590,8 +20770,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    ede-php-autoload-drupal = callPackage ({ ede-php-autoload, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    ede-php-autoload-drupal = callPackage ({ ede-php-autoload
+                                           , f
+                                           , fetchFromGitHub
+                                           , fetchurl
+                                           , lib
+                                           , melpaBuild
+                                           , s }:
+      melpaBuild {
         pname = "ede-php-autoload-drupal";
         version = "20170316.1458";
         src = fetchFromGitHub {
@@ -16600,10 +20786,10 @@
           rev = "54a04241d94fabc4f4d16ae4dc8ba4f0c6e3b435";
           sha256 = "1ckfja95zk4f7fgvycia7nxhxjgz4byrz30ic63f6kcq4dx78scs";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/532fec4788350cc11893c32e3895f06510a39d35/recipes/ede-php-autoload-drupal";
           sha256 = "139sr7jy5hb8h5zmw5mw01r0dy7yvbbyaxzj62m1a589n8w6a964";
-          name = "ede-php-autoload-drupal";
+          name = "recipe";
         };
         packageRequires = [ ede-php-autoload f s ];
         meta = {
@@ -16611,8 +20797,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    edebug-x = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    edebug-x = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "edebug-x";
         version = "20130615.2325";
         src = fetchFromGitHub {
@@ -16621,10 +20810,10 @@
           rev = "a2c2c42553d3bcbd5ac11898554865acbed1bc46";
           sha256 = "1zgiifi1k2d9g8sarfpjzamk8g1yx4ilgn60mqhy2pznp30b5qb2";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/204e40cd450f4223598be1f385f08ec82b44f70c/recipes/edebug-x";
           sha256 = "0mzrip6y346mix4ny1xj8rkji1w531ix24k3cczmlmm4hm7l29ql";
-          name = "edebug-x";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -16632,8 +20821,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    edit-at-point = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    edit-at-point = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "edit-at-point";
         version = "20150716.624";
         src = fetchFromGitHub {
@@ -16642,10 +20834,10 @@
           rev = "3b800c11685102e1eab62ec71c5fc1589ebb81a7";
           sha256 = "0crwdgng377sy1zbq7kqkz24v697mlzgdsvkdp1m8r7ympikkj6w";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a63b22f357b2d08b12fb86c27261ab4d687c5f7f/recipes/edit-at-point";
           sha256 = "1mijasr4ww6vcjfyk7jdv4mh7w2rrspqbbmqayiy2918qg2x01df";
-          name = "edit-at-point";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -16653,8 +20845,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    edit-color-stamp = callPackage ({ cl-lib ? null, es-lib, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    edit-color-stamp = callPackage ({ cl-lib ? null
+                                    , es-lib
+                                    , fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "edit-color-stamp";
         version = "20130529.1033";
         src = fetchFromGitHub {
@@ -16663,10 +20860,10 @@
           rev = "32dc1ca5bcf3dcf83fad5e39b55dc5b77becb3d3";
           sha256 = "0vk954f44m2bq7qb122pzlb8fibrisx47ihvn3h96m8nmx0fv32r";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2ad2ea105b895cb958ce0ab2bf2fad2b40d41b2f/recipes/edit-color-stamp";
           sha256 = "1f8v8w3w7vb8jv29w06mplah8yfcs5qfjz2w4irv0rg7dwzy3zk8";
-          name = "edit-color-stamp";
+          name = "recipe";
         };
         packageRequires = [ cl-lib es-lib ];
         meta = {
@@ -16674,20 +20871,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    edit-indirect = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    edit-indirect = callPackage ({ emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "edit-indirect";
-        version = "20170928.430";
+        version = "20180422.1107";
         src = fetchFromGitHub {
           owner = "Fanael";
           repo = "edit-indirect";
-          rev = "032ac0ec690d4999d564fd882588c7a197efe8dd";
-          sha256 = "0by1x53pji39fjrj5bd446kz831nv0vdgw2jqasbym4pc1p2947r";
+          rev = "de645d8144e8a08f039a9c88185121ec81d957ef";
+          sha256 = "0xg6p3ccch9k920xhhpyhn5mkgc0sfyxsn8l1wsc6vbbp5h7wlad";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/acc9b816796b9f142c53f90593952b43c962d2d8/recipes/edit-indirect";
           sha256 = "0q5jjmrvx5kaajllmhaxihsab2kr1vmcsfqrhxdhw3x3nf41s439";
-          name = "edit-indirect";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -16695,8 +20896,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    edit-indirect-region-latex = callPackage ({ edit-indirect, emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild }:
-    melpaBuild {
+    edit-indirect-region-latex = callPackage ({ edit-indirect
+                                              , emacs
+                                              , fetchFromGitHub
+                                              , fetchurl
+                                              , ht
+                                              , lib
+                                              , melpaBuild }:
+      melpaBuild {
         pname = "edit-indirect-region-latex";
         version = "20161128.2245";
         src = fetchFromGitHub {
@@ -16705,10 +20912,10 @@
           rev = "05043f2c0c9838947d3ca4b51b695deb7c47612e";
           sha256 = "0dgac0nk9x4sz4lisxb5badrzpcjqjwgi79hhl1y6mafzm0ncqs2";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/edit-indirect-region-latex";
           sha256 = "0ys0fpfk259g14wvg0nnkc3wk1dbjjd2n4a636jblgq63w6g3h79";
-          name = "edit-indirect-region-latex";
+          name = "recipe";
         };
         packageRequires = [ edit-indirect emacs ht ];
         meta = {
@@ -16716,8 +20923,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    edit-list = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    edit-list = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "edit-list";
         version = "20100930.743";
         src = fetchFromGitHub {
@@ -16726,10 +20936,10 @@
           rev = "f460d3f9e208a4e606fe6ded307f1b011916ca71";
           sha256 = "0981hy1n50yizc3k06vbxqrpfml817a67kab1hkgkw5v6ymm1hc9";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6c8aa348ce5289a8b1238f186affac1d544af755/recipes/edit-list";
           sha256 = "0mi12jfgx06i0yr8k5nk80xryqszjv0xykdnri505862rb90xakv";
-          name = "edit-list";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -16737,20 +20947,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    edit-server = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    edit-server = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "edit-server";
         version = "20180120.752";
         src = fetchFromGitHub {
           owner = "stsquad";
           repo = "emacs_chrome";
-          rev = "e1f86b4ff0b8b872a121287bde4875a7c3c4f8e2";
-          sha256 = "0vxahv098bh3bk8iphj7nvvajf31mc5yr9l1fzs127qvy2x62b0v";
+          rev = "de3b6483362637beeb185192bc92f23e75a15b82";
+          sha256 = "06w0v2a3f2mjbhj206fdmpnisqj612swxrzg2zznk8hrgsimbnhl";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d98d69008b5ca8b92fa7a6045b9d1af86f269386/recipes/edit-server";
           sha256 = "0ffxcgmnz0f2c1i3vfwm8vlm6jyd7ibf4kq5z8c6n50zkwfdmns0";
-          name = "edit-server";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -16758,8 +20971,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    edit-server-htmlize = callPackage ({ edit-server, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    edit-server-htmlize = callPackage ({ edit-server
+                                       , fetchFromGitHub
+                                       , fetchurl
+                                       , lib
+                                       , melpaBuild }:
+      melpaBuild {
         pname = "edit-server-htmlize";
         version = "20130329.1548";
         src = fetchFromGitHub {
@@ -16768,10 +20985,10 @@
           rev = "e7f8dadfabe869c77ca241cd6fbd4c52bd908392";
           sha256 = "174xq45xc632zrb916aw7q4bch96pbi6zgy3dk77qla3ky9cfpl3";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/219b037401a81ce70bd2106dabffa16d8b0c7cef/recipes/edit-server-htmlize";
           sha256 = "007lv3698a88wxan7kplz2117azxxpzzgshin9c1aabg059hszlj";
-          name = "edit-server-htmlize";
+          name = "recipe";
         };
         packageRequires = [ edit-server ];
         meta = {
@@ -16779,20 +20996,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    editorconfig = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    editorconfig = callPackage ({ cl-lib ? null
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "editorconfig";
-        version = "20180408.2210";
+        version = "20180708.228";
         src = fetchFromGitHub {
           owner = "editorconfig";
           repo = "editorconfig-emacs";
-          rev = "35e94de8223c407901548989cf4c9547ba692ffa";
-          sha256 = "16d8njpvcsc845mbjyzjskkdgbvcy7m4lvy87sl14fznb12fims6";
+          rev = "cc5a99005d6f3834cbc7acf78a517044c5dcdad6";
+          sha256 = "05pkligzkvd7imn93mxcdsrmdsjarx5309hg0cyrxra76rngx2yv";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/50d4f2ed288ef38153a7eab44c036e4f075b51d0/recipes/editorconfig";
           sha256 = "0zv96m07ml8i3k7zm7sdci4hn611n3ypna7zppfkwbdyr7d5k2gc";
-          name = "editorconfig";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -16800,8 +21021,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    editorconfig-charset-extras = callPackage ({ editorconfig, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    editorconfig-charset-extras = callPackage ({ editorconfig
+                                               , fetchFromGitHub
+                                               , fetchurl
+                                               , lib
+                                               , melpaBuild }:
+      melpaBuild {
         pname = "editorconfig-charset-extras";
         version = "20180222.2057";
         src = fetchFromGitHub {
@@ -16810,10 +21035,10 @@
           rev = "ddf60923c6f4841cb593b2ea04c9c710a01d262f";
           sha256 = "1v5a6s4x7cm6i0bxaqdpsg8vqj479lp5h45glx4ipk0icdq8cvd9";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/62f27dad806fa135209289933f2131ee4ce8f8bf/recipes/editorconfig-charset-extras";
           sha256 = "15p9qpdwradcnjr0nf0ibhy94yi73l18xz7zxf6khmdirsirpwgh";
-          name = "editorconfig-charset-extras";
+          name = "recipe";
         };
         packageRequires = [ editorconfig ];
         meta = {
@@ -16821,20 +21046,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    editorconfig-custom-majormode = callPackage ({ editorconfig, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    editorconfig-custom-majormode = callPackage ({ editorconfig
+                                                 , fetchFromGitHub
+                                                 , fetchurl
+                                                 , lib
+                                                 , melpaBuild }:
+      melpaBuild {
         pname = "editorconfig-custom-majormode";
-        version = "20170509.141";
+        version = "20180507.1942";
         src = fetchFromGitHub {
           owner = "10sr";
           repo = "editorconfig-custom-majormode-el";
-          rev = "b5350d20b2730a0f029c9e1d651e50cf9a809fa9";
-          sha256 = "1xk3c0g0a6g2p7wg26aphl6cdz45iql0s4w1qa8np2hly10a4cxy";
+          rev = "ae613f0a56364afbbab19d4377c108406d5cfc7c";
+          sha256 = "0sm3xdysnqzc6nc2n7rcnr478l7qdy7bv8rhq500240aprzv63y4";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fcd47bf4630442ad1a941ad432cef64c7746aa71/recipes/editorconfig-custom-majormode";
           sha256 = "0ykvjg3gwxky6w5cm0y5s63q9820b7d25fy9plw8sarxwy2a5lxy";
-          name = "editorconfig-custom-majormode";
+          name = "recipe";
         };
         packageRequires = [ editorconfig ];
         meta = {
@@ -16842,20 +21071,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    editorconfig-domain-specific = callPackage ({ cl-lib ? null, editorconfig, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    editorconfig-domain-specific = callPackage ({ cl-lib ? null
+                                                , editorconfig
+                                                , fetchFromGitHub
+                                                , fetchurl
+                                                , lib
+                                                , melpaBuild }:
+      melpaBuild {
         pname = "editorconfig-domain-specific";
-        version = "20160705.802";
+        version = "20180505.224";
         src = fetchFromGitHub {
           owner = "lassik";
           repo = "editorconfig-emacs-domain-specific";
-          rev = "0142ddff7b3293c82b0a83ad2c3edd6ee1a84ddd";
-          sha256 = "08pjm719jxanqzrs2blhaqhm4wvzqyg9y56mkgwdlpdg722gn175";
+          rev = "e9824160fb2e466afa755240ee3ab7cc5657fb04";
+          sha256 = "0gkwhvywfpnay7rxb2bmsnywcd89qw710bsp53sk5fvilgfwfpkj";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/831a7dd7ef853ca44709eabfd48ee97113705319/recipes/editorconfig-domain-specific";
           sha256 = "1rkan6q7z0qfq28zg114iik71nghd7fbs4g8qppzhgr3pwbpn73q";
-          name = "editorconfig-domain-specific";
+          name = "recipe";
         };
         packageRequires = [ cl-lib editorconfig ];
         meta = {
@@ -16863,8 +21097,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    edn = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, peg }:
-    melpaBuild {
+    edn = callPackage ({ cl-lib ? null
+                       , emacs
+                       , fetchFromGitHub
+                       , fetchurl
+                       , lib
+                       , melpaBuild
+                       , peg }:
+      melpaBuild {
         pname = "edn";
         version = "20160215.419";
         src = fetchFromGitHub {
@@ -16873,10 +21113,10 @@
           rev = "be9e32d1b49e35247b263b0243df7cfdc8d413ab";
           sha256 = "1xp2hjhn52k6l1g6ypva6dsklpawni7gvjafbz6404f9dyxflh7l";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/305dd770d9db86d5ee602e6bd571b7c4f6c4ddbe/recipes/edn";
           sha256 = "00cy8axhy2p3zalzl8k2083l5a7s3aswb9qfk9wsmf678m8pqwqg";
-          name = "edn";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs peg ];
         meta = {
@@ -16884,8 +21124,18 @@
           license = lib.licenses.free;
         };
       }) {};
-    edts = callPackage ({ auto-complete, auto-highlight-symbol, dash, erlang, f, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s }:
-    melpaBuild {
+    edts = callPackage ({ auto-complete
+                        , auto-highlight-symbol
+                        , dash
+                        , erlang
+                        , f
+                        , fetchFromGitHub
+                        , fetchurl
+                        , lib
+                        , melpaBuild
+                        , popup
+                        , s }:
+      melpaBuild {
         pname = "edts";
         version = "20171030.9";
         src = fetchFromGitHub {
@@ -16894,10 +21144,10 @@
           rev = "6ef4bdf571235ee1b078db321402270cabff7fda";
           sha256 = "1nzf8wdv0hs4kp69cy3blwxh18c2bkxr4d4y6ggdp0vmwv41j3zi";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/782db7fba2713bfa17d9305ae15b0a9e1985445b/recipes/edts";
           sha256 = "0f0rbd0mqqwn743qmr1g5mmi1sbmlcglclww8jxvbvb61jq8vspr";
-          name = "edts";
+          name = "recipe";
         };
         packageRequires = [
           auto-complete
@@ -16913,20 +21163,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    efire = callPackage ({ circe, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    efire = callPackage ({ circe
+                         , fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "efire";
         version = "20151009.1331";
         src = fetchFromGitHub {
           owner = "capitaomorte";
           repo = "efire";
-          rev = "91a644662afb352475efad0b377713656f131e5c";
-          sha256 = "1c2iyv392ap35nss4j901h33d3lx9lmq5v43flf2rid1766pam6v";
+          rev = "d38dd6dd7974b7cb11bff6fd84846fd01163211a";
+          sha256 = "15sc4648lkxsgv2frcfb878z86a7vynixsp1x5i5rg66bd9gzhfy";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/39dc592e92f0377a354d1b17f42172409a836484/recipes/efire";
           sha256 = "1c8vdc58i0k7vvanwhckfc31226d3rb5xq77lh9ydgnd4i97gq2w";
-          name = "efire";
+          name = "recipe";
         };
         packageRequires = [ circe ];
         meta = {
@@ -16934,8 +21188,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    eg = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    eg = callPackage ({ cl-lib ? null
+                      , emacs
+                      , fetchFromGitHub
+                      , fetchurl
+                      , lib
+                      , melpaBuild }:
+      melpaBuild {
         pname = "eg";
         version = "20170830.115";
         src = fetchFromGitHub {
@@ -16944,10 +21203,10 @@
           rev = "1c7f1613d2aaae728ef540305f6ba030616f86bd";
           sha256 = "1g2ha6q9k6dmi63i2p4aypwf5mha699wr7yy5dsck39mqk15hx0f";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3d2b6b92b2a71486f260571885bf149ad6afc551/recipes/eg";
           sha256 = "1ic6qzk0zmay3vvbb8jg35irqkc0k68dmgbq4j9isiawy449zvp7";
-          name = "eg";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -16955,20 +21214,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    egg = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    egg = callPackage ({ fetchFromGitHub
+                       , fetchurl
+                       , lib
+                       , melpaBuild }:
+      melpaBuild {
         pname = "egg";
-        version = "20160330.2047";
+        version = "20180713.218";
         src = fetchFromGitHub {
           owner = "byplayer";
           repo = "egg";
-          rev = "cadc5c7fd21142d7ea41732200ab52eac0b96d3f";
-          sha256 = "1qrblglkafwzfds8x5wp4yrn1gq8iz823iilxcp9mwycbw57ajw8";
+          rev = "5bf9879eec067e25a60f2363137c9e69f7b5cc68";
+          sha256 = "0k7j76hqgnlci944vz1gbyifqd4fh6agmpmf5a883vimw5fpm2q9";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a1c97870c2641d73685f07a12f010530cc186544/recipes/egg";
           sha256 = "144g1fvs2cmn3px0a98nvxl5cz70kx30v936k5ppyi8gvbj0md5i";
-          name = "egg";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -16976,20 +21238,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    egison-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    egison-mode = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "egison-mode";
         version = "20160603.103";
         src = fetchFromGitHub {
           owner = "egisatoshi";
           repo = "egison3";
-          rev = "2f8f744bd0a8d1c307922c6636f1c337d45a55bc";
-          sha256 = "1ds0fxi12z3cls0wavyq5anw2jfhmc2a6mx3g4mnxfr39sjr4q2r";
+          rev = "0f8289294b1a8de029f89643438e8384e7ee789f";
+          sha256 = "1rkxz4gj11z1jpd3g71m6sbzb5j4ggm6sixk3r18wb8wv91v4fgs";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f543dd136e2af6c36b12073ea75b3c4d4bc79769/recipes/egison-mode";
           sha256 = "0x11fhv8kkx34h831k2q70y5qfz7wnfia4ka5mbmps7mpr68zcwi";
-          name = "egison-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -16997,8 +21262,44 @@
           license = lib.licenses.free;
         };
       }) {};
-    ego = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, ht, htmlize, lib, melpaBuild, mustache, org, simple-httpd }:
-    melpaBuild {
+    eglot = callPackage ({ emacs
+                         , fetchFromGitHub
+                         , fetchurl
+                         , jsonrpc
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
+        pname = "eglot";
+        version = "20180711.1630";
+        src = fetchFromGitHub {
+          owner = "joaotavora";
+          repo = "eglot";
+          rev = "a57d5d8301d5fadc468e14fedc434d7504e24e24";
+          sha256 = "0xjdpxdv70i0h4rhvfhdkaf2hd40dmxp6prxm0irjzyns4cwxync";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/6c644530eca56f93d94fac2c9d7663c35c2b8c01/recipes/eglot";
+          sha256 = "17w39hcgv4p49g841qaicjdx7xac72yxvsc83jf1rrakg713pj7y";
+          name = "recipe";
+        };
+        packageRequires = [ emacs jsonrpc ];
+        meta = {
+          homepage = "https://melpa.org/#/eglot";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ego = callPackage ({ dash
+                       , emacs
+                       , fetchFromGitHub
+                       , fetchurl
+                       , ht
+                       , htmlize
+                       , lib
+                       , melpaBuild
+                       , mustache
+                       , org
+                       , simple-httpd }:
+      melpaBuild {
         pname = "ego";
         version = "20180228.1704";
         src = fetchFromGitHub {
@@ -17007,10 +21308,10 @@
           rev = "719809679c1a60887735db41abae53b61f08ef59";
           sha256 = "10f179kl53la4dyikzl1xysccx4gk04skzwaw3w1pgr8f5fjppxc";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ego";
           sha256 = "09k33ggc6n7wgykaawbmh6hyrl9dqp0azaq9zcjhjbc88nszj7fj";
-          name = "ego";
+          name = "recipe";
         };
         packageRequires = [ dash emacs ht htmlize mustache org simple-httpd ];
         meta = {
@@ -17018,18 +21319,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    eide = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
+    eide = callPackage ({ fetchgit
+                        , fetchurl
+                        , lib
+                        , melpaBuild }:
+      melpaBuild {
         pname = "eide";
-        version = "20180330.1330";
+        version = "20180626.1259";
         src = fetchgit {
-          url = "https://git.tuxfamily.org/eide/emacs-ide.git";
-          rev = "4023c7b19ed75e0e2a58af7b737aff23589ab6f9";
-          sha256 = "0j3gdsnk64xnk028rrc3ngyzjrzsyafpdg1kxnf1p10jrig6pwyy";
+          url = "https://framagit.org/eide/eide.git";
+          rev = "6bd4c3b67a532527b3514c72bf2d7371172b8a93";
+          sha256 = "1jrbvzf7mk8jpdm3i9vipq9wsgny3ni896s12n68d9chby5cj65n";
         };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/34b70a5616e27ff9904a2803c86e049acfe9b26d/recipes/eide";
-          sha256 = "168f4mz10byq1kdcfd029gkb3j6jk6lc4kdr4g204823x073f0ni";
-          name = "eide";
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/a42244392719c620b47bc43a7a8501dab4b6f74e/recipes/eide";
+          sha256 = "1962shxcfn3v1ljann7182ca6ciy5xfbcd6l9l8rc8gikp55qv8m";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -17037,8 +21342,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    eimp = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    eimp = callPackage ({ fetchFromGitHub
+                        , fetchurl
+                        , lib
+                        , melpaBuild }:
+      melpaBuild {
         pname = "eimp";
         version = "20120826.1339";
         src = fetchFromGitHub {
@@ -17047,10 +21355,10 @@
           rev = "2e7536fe6d8f7faf1bad7a8ae37faba0162c3b4f";
           sha256 = "154d57yafxbcf39r89n5j43c86rp2fki3lw3gwy7ww2g6qkclcra";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0fda2b54a0ff0b6fc3bd6d20cfcbbf63cae5380f/recipes/eimp";
           sha256 = "00g77bg49m38cjfbh17ccnmksz05qx7yvgl6i4i4hysbr2d8pgxd";
-          name = "eimp";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -17058,20 +21366,32 @@
           license = lib.licenses.free;
         };
       }) {};
-    ein = callPackage ({ auto-complete, cl-generic, dash, deferred, fetchFromGitHub, fetchurl, lib, melpaBuild, request, request-deferred, s, skewer-mode, websocket }:
-    melpaBuild {
+    ein = callPackage ({ auto-complete
+                       , cl-generic
+                       , dash
+                       , deferred
+                       , fetchFromGitHub
+                       , fetchurl
+                       , lib
+                       , melpaBuild
+                       , request
+                       , request-deferred
+                       , s
+                       , skewer-mode
+                       , websocket }:
+      melpaBuild {
         pname = "ein";
-        version = "20180414.1838";
+        version = "20180626.1257";
         src = fetchFromGitHub {
           owner = "millejoh";
           repo = "emacs-ipython-notebook";
-          rev = "ed4ae8006ca58c39c5e09925fb51c0f3529cb199";
-          sha256 = "0clww9329ysipdby8d3qwkx7pmrls075j0kpsqw3h8mm9hb48wgj";
+          rev = "cfd9c641c0c517738f33b7ead6de34d755ba24b1";
+          sha256 = "03csx3pbgbch2s5kkckczcxd5gqghapgvhz71jihxqxsal1r6mzn";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/215e163755fe391ce1f049622e7b9bf9a8aea95a/recipes/ein";
           sha256 = "14blq1cbrp00rq0ilk7z9qppqfj0r4n3jidw3abcpchvh5ln086r";
-          name = "ein";
+          name = "recipe";
         };
         packageRequires = [
           auto-complete
@@ -17089,20 +21409,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    ein-mumamo = callPackage ({ ein, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ein-mumamo = callPackage ({ ein
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "ein-mumamo";
         version = "20150301.1628";
         src = fetchFromGitHub {
           owner = "millejoh";
           repo = "ein-mumamo";
-          rev = "028fefec499598add1a87b92ed991891f38f0c7b";
-          sha256 = "1w0b3giy9ca35pp2ni4afnqas64a2vriilab7jiw9anp3ryh6570";
+          rev = "57eb0876ab3fba52c1007ce5793d5319cae629c7";
+          sha256 = "1426d8lrkx5kml6m1b3pv4117z34v96d8iq24m1q5w6ar72mspxg";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bd8fcf7f6332f94dc37697f9412c8043da8d4f76/recipes/ein-mumamo";
           sha256 = "029sk90xz9fhv2s56f5hp0aks1d6ybz517009vv4892bbzkpjv1w";
-          name = "ein-mumamo";
+          name = "recipe";
         };
         packageRequires = [ ein ];
         meta = {
@@ -17110,8 +21434,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    eink-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    eink-theme = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "eink-theme";
         version = "20170717.807";
         src = fetchFromGitHub {
@@ -17120,10 +21447,10 @@
           rev = "4c990bb3428f725735fa1f733ef4c5ad61f632b0";
           sha256 = "0jxs36qdsx58ni5185qyi1c7gchyla3dpv4v9drj1n072ls82ld4";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a1349c3f93ab60983f77c28f97048fa258b612a6/recipes/eink-theme";
           sha256 = "0z437cpf1b8bqyi7bv0w0dnc52q4f5g17530lwdcxjkr38s9b1zn";
-          name = "eink-theme";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -17131,20 +21458,29 @@
           license = lib.licenses.free;
         };
       }) {};
-    ejc-sql = callPackage ({ auto-complete, clomacs, dash, direx, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, spinner }:
-    melpaBuild {
+    ejc-sql = callPackage ({ auto-complete
+                           , clomacs
+                           , dash
+                           , direx
+                           , emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild
+                           , spinner }:
+      melpaBuild {
         pname = "ejc-sql";
-        version = "20180328.623";
+        version = "20180701.1105";
         src = fetchFromGitHub {
           owner = "kostafey";
           repo = "ejc-sql";
-          rev = "dac78aa9fd1979a0c6caccbe3698cad5f0e32d9f";
-          sha256 = "099lkldwxnw7ghpj42z07i1bv7jz8438xq7mv4vz6s2d6qwc07lq";
+          rev = "f957bb5e1e9e1aab0c7f1770f5e8144b9c26c93f";
+          sha256 = "09556l03wvszx9dpndcp3rz72r0yfg1s79b84zmrbliwyq740xbz";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8f2cd74717269ef7f10362077a91546723a72104/recipes/ejc-sql";
           sha256 = "0v9mmwc2gm58nky81q7fibj93zi7zbxq1jzjw55dg6cb6qb87vnx";
-          name = "ejc-sql";
+          name = "recipe";
         };
         packageRequires = [ auto-complete clomacs dash direx emacs spinner ];
         meta = {
@@ -17152,8 +21488,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    el-autoyas = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    el-autoyas = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "el-autoyas";
         version = "20120918.617";
         src = fetchFromGitHub {
@@ -17162,10 +21501,10 @@
           rev = "bde0251ecb504f585dfa27c205c8e312655310cc";
           sha256 = "0dbp2zz993cm7mrd58c4iflbzqwg50wzgn2cpwfivk14w1mznh4n";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cc4845343dbb8f8294394f6850788e4f1fe6b99b/recipes/el-autoyas";
           sha256 = "0hh5j79f3z82nmb3kqry8k8lgc1qswk6ni3g9jg60pasc3wkbh6c";
-          name = "el-autoyas";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -17173,20 +21512,48 @@
           license = lib.licenses.free;
         };
       }) {};
-    el-get = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    el-fly-indent-mode = callPackage ({ emacs
+                                      , fetchFromGitHub
+                                      , fetchurl
+                                      , lib
+                                      , melpaBuild }:
+      melpaBuild {
+        pname = "el-fly-indent-mode";
+        version = "20180421.1943";
+        src = fetchFromGitHub {
+          owner = "jiahaowork";
+          repo = "el-fly-indent-mode.el";
+          rev = "1dd4b907ff4d9581c18b4e38e8719e83ba0dace1";
+          sha256 = "15l74s3jissjs7jpdmrgy8ys50b0ir27nm0d25lbs4yxhsmvzq2b";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/237311b98eec4b577409f55e16d8e640936d41a2/recipes/el-fly-indent-mode";
+          sha256 = "00iqiawbzijm515lswbkzxf1m6ys242xrg6lzf8k40g2ygyd1q1r";
+          name = "recipe";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/el-fly-indent-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    el-get = callPackage ({ fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "el-get";
-        version = "20180126.1603";
+        version = "20180610.1821";
         src = fetchFromGitHub {
           owner = "dimitri";
           repo = "el-get";
-          rev = "e065feaa545087dd49f690a838237fe6239b00f6";
-          sha256 = "18hd7x3rk335r8ps1mpg1lpymywaswpg3w2s3m36khd56m3vd4yf";
+          rev = "8e96907b8b2a95485b8e1e5a450510513ed9e524";
+          sha256 = "0xzkgzhdr1dda95wx6i8ygb9wylxjm2j7n53mldz2gigswl6lsja";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1c61197a2b616d6d3c6b652248cb166196846b44/recipes/el-get";
           sha256 = "1438v2sw5n67q404c93y2py226v469nagqwp4w9l6yyy40h4myhz";
-          name = "el-get";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -17194,20 +21561,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    el-init = callPackage ({ anaphora, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    el-init = callPackage ({ anaphora
+                           , cl-lib ? null
+                           , emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "el-init";
         version = "20150728.220";
         src = fetchFromGitHub {
           owner = "HKey";
           repo = "el-init";
-          rev = "6b45551b8ed473c8a0c897b743b0378a3501556c";
-          sha256 = "0qk5jk0n7ga2cxqnm69rsy5cjjn5b4l4yqgaafvmmrrp70p8drmi";
+          rev = "25fd21d820bca1cf576b8f70c8d5a3bc76792597";
+          sha256 = "1mzla7ijmq1mgzr6bf16mjdycbf8ylsf4zdk4j6fh5kw5n4k6c5n";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f0c18cc62ffaaf839284ed7b261cc6f375fab813/recipes/el-init";
           sha256 = "121n6z8p9kzi7axp4i2kyi621gw20635w4j81i1bryblaqrv5kl5";
-          name = "el-init";
+          name = "recipe";
         };
         packageRequires = [ anaphora cl-lib emacs ];
         meta = {
@@ -17215,20 +21588,29 @@
           license = lib.licenses.free;
         };
       }) {};
-    el-init-viewer = callPackage ({ anaphora, cl-lib ? null, ctable, dash, el-init, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    el-init-viewer = callPackage ({ anaphora
+                                  , cl-lib ? null
+                                  , ctable
+                                  , dash
+                                  , el-init
+                                  , emacs
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "el-init-viewer";
         version = "20150303.28";
         src = fetchFromGitHub {
           owner = "HKey";
           repo = "el-init-viewer";
-          rev = "dbcb4418fe342dfd7da805f2d7caf1def68db7f9";
-          sha256 = "0flf0pa3xwrdhfkshyr6nqrm957sgx9jkganbasqavbq1dvlw6lj";
+          rev = "c40417db7808c8b8c9b2f196a69de5da7eee84a2";
+          sha256 = "1dc2dr2s6agchg116189zdw96dwvik9d6dcw06jr5mh2gp4apvpa";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f90e6be757783352c4a7732177ff2e2c0a066247/recipes/el-init-viewer";
           sha256 = "0kkmsml9xf2n8nlrcicfg2l78s3dlhd6ssx0s62v77v4wdpl297m";
-          name = "el-init-viewer";
+          name = "recipe";
         };
         packageRequires = [ anaphora cl-lib ctable dash el-init emacs ];
         meta = {
@@ -17236,20 +21618,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    el-mock = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    el-mock = callPackage ({ fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "el-mock";
         version = "20170824.1254";
         src = fetchFromGitHub {
           owner = "rejeep";
           repo = "el-mock.el";
-          rev = "5df1d3a956544f1d3ad0bcd81daf47fff33ab8cc";
-          sha256 = "06ldnrpqvbdxfzr8v7pj9xacgvkp36xjlhvjkpxldmqj1l5v8a6w";
+          rev = "e65ec012a724d0f2518e6601279a07e34716cc45";
+          sha256 = "0iyjcihpd79rz2pzasc5c166py34n1fp66jgbm1dxspsid3cznn7";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b1989beb927657c0ff7e79fe448f62ac58c11be7/recipes/el-mock";
           sha256 = "07m7w7n202nijnxidy0j0r4nbcvlnbkm9b0n8qb2bwi3d4cfp77l";
-          name = "el-mock";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -17257,20 +21642,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    el-patch = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    el-patch = callPackage ({ emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "el-patch";
-        version = "20171016.1743";
+        version = "20180712.1302";
         src = fetchFromGitHub {
           owner = "raxod502";
           repo = "el-patch";
-          rev = "a5999539e42fb41d2b31f09022b9efe27ae76684";
-          sha256 = "0qbf851ab8h0zjqr9kvnlwcg6magsldlr835vks576g9cz62zp49";
+          rev = "9f4b71f78ed2bc0661f9bccac53672aa1093e9ec";
+          sha256 = "1j5wcqpwkj70z697qlmrjnzj667ndbvwcp3wfyd2c66rzdbafs65";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2f4f57e0edbae35597aa4a7744d22d2f971d5de5/recipes/el-patch";
           sha256 = "1imijmsni8c8fxjrzprnanf94c1pma3h5w9p75c4y99l8l3xmj7g";
-          name = "el-patch";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -17278,8 +21667,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    el-pocket = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, web }:
-    melpaBuild {
+    el-pocket = callPackage ({ emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild
+                             , web }:
+      melpaBuild {
         pname = "el-pocket";
         version = "20170922.549";
         src = fetchFromGitHub {
@@ -17288,10 +21682,10 @@
           rev = "a80abfb67efe68ada1d7d0a73aecee57e763baaa";
           sha256 = "0q4nsgqpjmmxml5pcb6im1askk6q7c3ykzv6fgf1w8jgkvdifa6f";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ef362a76a3881c7596dcc2639df588227b3713c0/recipes/el-pocket";
           sha256 = "0fgylpfixsx5l1nrgz6n1c2ayf52p60f9q290hmkn36siyx5hixw";
-          name = "el-pocket";
+          name = "recipe";
         };
         packageRequires = [ emacs web ];
         meta = {
@@ -17299,8 +21693,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    el-spec = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    el-spec = callPackage ({ fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "el-spec";
         version = "20121018.4";
         src = fetchFromGitHub {
@@ -17309,10 +21706,10 @@
           rev = "1dbc465401d4aea5560318c4f13ff30920a0718d";
           sha256 = "1lsq7980pwcwlg7z37hrig8ddm9nyvaqrlczv1w0vy631vc5z2az";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/407e344bf4e4b3885ebb7df02ebb37feee5e2515/recipes/el-spec";
           sha256 = "017syizs8qw5phwvpzzffzdnj6rh9q4n7s51qjvj8qfb3088igkh";
-          name = "el-spec";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -17320,20 +21717,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    el-spice = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    el-spice = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "el-spice";
         version = "20180128.921";
         src = fetchFromGitHub {
           owner = "vedang";
           repo = "el-spice";
-          rev = "4e0852ebf5d8e9cbb3eaaa6ae9c53d126b53f58c";
-          sha256 = "08mkn4qfxax3fgppw79117phm05hihifwj4pgll9ivrilbf75lb8";
+          rev = "972dace20ec61cd27b9322432d0c7a688c6f061a";
+          sha256 = "1wrb46y4s4v0lwwyriz2qn1j1l804jyb4dmadf462jxln85rml70";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4666eee9f6837d6d9dba77e04aa4c8c4a93b47b5/recipes/el-spice";
           sha256 = "0i0l3y9w1q9pf5zhvmsq4h427imix67jgcfwq21b6j82dzg5l4hg";
-          name = "el-spice";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -17341,8 +21741,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    el-sprunge = callPackage ({ emacs, fetchFromGitHub, fetchurl, htmlize, lib, melpaBuild, web-server }:
-    melpaBuild {
+    el-sprunge = callPackage ({ emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , htmlize
+                              , lib
+                              , melpaBuild
+                              , web-server }:
+      melpaBuild {
         pname = "el-sprunge";
         version = "20140106.1739";
         src = fetchFromGitHub {
@@ -17351,10 +21757,10 @@
           rev = "37855ec60aeb4d565c49a4d711edc7341e9a22cb";
           sha256 = "04k1fz0ypmfzgwamncp2vz0lq54bq6y7c8k9nm39csp2564vmbbc";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/547209532faf45b35b55350783ccee532ce2bcbb/recipes/el-sprunge";
           sha256 = "0rb1cr7zrfl1s5prxy3xwdqgnm8ddw33pcvk049km2qbccb08v6a";
-          name = "el-sprunge";
+          name = "recipe";
         };
         packageRequires = [ emacs htmlize web-server ];
         meta = {
@@ -17362,8 +21768,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    el-spy = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    el-spy = callPackage ({ fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "el-spy";
         version = "20131226.1208";
         src = fetchFromGitHub {
@@ -17372,10 +21781,10 @@
           rev = "b1dead9d1877660856ada22d906ac4e54695aec7";
           sha256 = "016l3inzb7dby0w58najj2pvymwk6gllsxvqj2fkz3599i36p1pn";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7a90318a38c35e648152ec5fb2dd86c432af9553/recipes/el-spy";
           sha256 = "1bgv4mgsnkmjdyay7lhkqdszvnwpjy4dxxw11kq45w866ba8645n";
-          name = "el-spy";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -17383,20 +21792,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    el-x = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    el-x = callPackage ({ fetchFromGitHub
+                        , fetchurl
+                        , lib
+                        , melpaBuild }:
+      melpaBuild {
         pname = "el-x";
         version = "20140111.1401";
         src = fetchFromGitHub {
           owner = "sigma";
           repo = "el-x";
-          rev = "e7c333d4fc31a90f4dca951efe21129164b42605";
-          sha256 = "00wp2swrmalcifx9fsvhz9pgbf6ixvn8dpz1lq6k6pj9h24pq7wh";
+          rev = "b0b69b182f7a81a550ccf9b3a14d8d91560b4f70";
+          sha256 = "1dky0vydwh7l786w7gci4x17kkf6dg8gijmqzl4y0ij9zm9kfxzz";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0346f6349cf39a0414cd055b06d8ed193f4972d4/recipes/el-x";
           sha256 = "1721d9mljlcbdwb5b9934q7a48y30x6706pp4bjvgys0r64dml5g";
-          name = "el-x";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -17404,8 +21816,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    el2markdown = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    el2markdown = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "el2markdown";
         version = "20170630.1158";
         src = fetchFromGitHub {
@@ -17414,10 +21829,10 @@
           rev = "368d99313683cd943c99feaffca356be60bdb636";
           sha256 = "1h0cr8qcvj9r3acb6bf5nyglvi5gdglwflkfl5jbzp0nm1p9iqcg";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/el2markdown";
           sha256 = "1bpfddcvg9wgc5g14clj6wyiw8rsh45rgibvlmyan2m0gmwvmqx6";
-          name = "el2markdown";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -17425,8 +21840,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    el2org = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    el2org = callPackage ({ emacs
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "el2org";
         version = "20180311.855";
         src = fetchFromGitHub {
@@ -17435,10 +21854,10 @@
           rev = "81f1c97db8911f5bdf92c729630ab509de4ec73f";
           sha256 = "152y6a6qjch2w84axghzcqiswhx1cq5bq1r1gjfffh41wsddqb53";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/el2org";
           sha256 = "02kyvzpjws2mrp414i4zm4fmrnzgkaax6bnrlyhp17a8aqaggbnh";
-          name = "el2org";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -17446,20 +21865,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    elbank = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }:
-    melpaBuild {
+    elbank = callPackage ({ emacs
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild
+                          , seq }:
+      melpaBuild {
         pname = "elbank";
-        version = "20180316.627";
+        version = "20180316.643";
         src = fetchFromGitHub {
           owner = "NicolasPetton";
           repo = "Elbank";
-          rev = "28143b3076f2ac64a9db84a53e9af0ad43fe4322";
-          sha256 = "0gdhdq3g34m1jqpq4m12pbf70sl5jrmj8wbakj36vh540p12f0ph";
+          rev = "6dbd21e31fdf7cf62491f6d24b8198d4f91a031b";
+          sha256 = "1krqvwh6a4cqbqawmydq16ardnn6ddf7wm5605794j145dd2268v";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/05d252ee84adae2adc88fd325540f76b6cdaf010/recipes/elbank";
           sha256 = "1ry84aiajyrnrspf7w4yjm0rmdam8ijrz0s7291yr8c70hslc997";
-          name = "elbank";
+          name = "recipe";
         };
         packageRequires = [ emacs seq ];
         meta = {
@@ -17467,20 +21891,29 @@
           license = lib.licenses.free;
         };
       }) {};
-    elcontext = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, ht, hydra, lib, melpaBuild, osx-location, uuidgen }:
-    melpaBuild {
+    elcontext = callPackage ({ emacs
+                             , f
+                             , fetchFromGitHub
+                             , fetchurl
+                             , ht
+                             , hydra
+                             , lib
+                             , melpaBuild
+                             , osx-location
+                             , uuidgen }:
+      melpaBuild {
         pname = "elcontext";
-        version = "20180225.2211";
+        version = "20180526.604";
         src = fetchFromGitHub {
           owner = "rollacaster";
           repo = "elcontext";
-          rev = "d34e68f0580cc3d3eda8c85fc446c71094fc52fc";
-          sha256 = "05z0xfy9s0iqzvy63bnfhdpqc04yikwairb8b00k9xkspd3sdfdl";
+          rev = "f434ffc655e6349a4dd52285ff68a9194bcfc949";
+          sha256 = "0gbbnx969asq73ypc5lp4qpi4iwwfzm1mmxb1fdifl2lf18p8qwv";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/12bcb0bfc89c1f235e4ac5d7e308e41905725dc6/recipes/elcontext";
           sha256 = "1firdsrag7r02qb3kjxc3j8l9psvh117z3qwycazhxdz82z0isw7";
-          name = "elcontext";
+          name = "recipe";
         };
         packageRequires = [ emacs f ht hydra osx-location uuidgen ];
         meta = {
@@ -17488,8 +21921,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    elcord = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    elcord = callPackage ({ emacs
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "elcord";
         version = "20180411.1207";
         src = fetchFromGitHub {
@@ -17498,10 +21935,10 @@
           rev = "0cef4ca13b00d79507292d5591be8ffb7df5a9ca";
           sha256 = "1571r8iwrf4dagjr2pv7dgs1i0f20nq6jdkxm2dlwvkblcnlx3fm";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cf2c52366a8f60b68a33a40ea92cc96e7f0933d2/recipes/elcord";
           sha256 = "0a1f99mahaixx6j3lylc7w2zlq8f614m6xhd0x927afv3a6n50l6";
-          name = "elcord";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -17509,20 +21946,50 @@
           license = lib.licenses.free;
         };
       }) {};
-    eldoc-eval = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    elcouch = callPackage ({ emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , json-mode
+                           , lib
+                           , libelcouch
+                           , melpaBuild }:
+      melpaBuild {
+        pname = "elcouch";
+        version = "20180529.57";
+        src = fetchFromGitHub {
+          owner = "DamienCassou";
+          repo = "elcouch";
+          rev = "608fe254a7ee69c43c69b905ef708189dc3e3192";
+          sha256 = "0bn8xh3i962l8jzv33mmrd22fbig19bjw89hz9by5xa35q1nnvf5";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/b5d9a35dd5a272a592d248993ea7e5dda8fdf0ab/recipes/elcouch";
+          sha256 = "1dp7chvnz6gadqgyqbvdxpva3hm3sx60izsa690mp2rifjyxgqf1";
+          name = "recipe";
+        };
+        packageRequires = [ emacs json-mode libelcouch ];
+        meta = {
+          homepage = "https://melpa.org/#/elcouch";
+          license = lib.licenses.free;
+        };
+      }) {};
+    eldoc-eval = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "eldoc-eval";
-        version = "20150512.506";
+        version = "20180607.457";
         src = fetchFromGitHub {
           owner = "thierryvolpiatto";
           repo = "eldoc-eval";
-          rev = "e87b89f89a2aed0bb3b31c014fc1b72f00413866";
-          sha256 = "0vppa9xihn8777rphiw1aqp96xn16vgjwff1dwvp8z861silp8ar";
+          rev = "f59a1ae7ecfa97ef659c7adb93e0673419acc485";
+          sha256 = "1anpshps44zx4qrkddbxd24q63fm5y93zbwmsb1l2cwbykf5s5iz";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/63ba2004d3db4c5a71676dca82ad880328cf6073/recipes/eldoc-eval";
           sha256 = "0z4scgi2xgrgd47aqqmyv1ww8alh43s0qny5qmh3f1nnppz3nd7c";
-          name = "eldoc-eval";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -17530,20 +21997,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    eldoc-overlay = callPackage ({ emacs, fetchFromGitHub, fetchurl, inline-docs, lib, melpaBuild, quick-peek }:
-    melpaBuild {
+    eldoc-overlay = callPackage ({ emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , inline-docs
+                                 , lib
+                                 , melpaBuild
+                                 , quick-peek }:
+      melpaBuild {
         pname = "eldoc-overlay";
         version = "20171219.140";
         src = fetchFromGitHub {
           owner = "stardiviner";
           repo = "eldoc-overlay";
-          rev = "a391396f4cdf30a2f27a4c426b58b44ab3d0f0d0";
-          sha256 = "1g1sp6ws4y28536jkf5crbkmnrl7jcbh5s3ysyys6xn8gvz0vm17";
+          rev = "b13a5641f694cda92740ccdb1ee2c475507eb206";
+          sha256 = "0zn68h4mcdd3j8jfrpaa5d8f0irdwly5wj6v6pm54xc8x14wc141";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f865b248002d6d3ba9653c2221072a4aa54cd740/recipes/eldoc-overlay";
           sha256 = "0nn6i89xbw8vkd5ybsnc1zpnf3ra4s8pf01jdj2i59ayjs64s28x";
-          name = "eldoc-overlay";
+          name = "recipe";
         };
         packageRequires = [ emacs inline-docs quick-peek ];
         meta = {
@@ -17551,20 +22024,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    electric-case = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    electric-case = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "electric-case";
         version = "20150417.412";
         src = fetchFromGitHub {
           owner = "zk-phi";
           repo = "electric-case";
-          rev = "bac64e772107e3dc721a9819f63b9ebdc28a81f7";
-          sha256 = "0s4y1319sr4xc0k6h2zhzzxsx2kc3pc2m6saah18y4kip0hjyhr8";
+          rev = "984b6a4c6c4cdcefeecb59e941f5f184cc1dedff";
+          sha256 = "11rlj132xfrdp9wq0mx0dnza4k5s6ysgqs6nzjvwcw1w7a6jmwa3";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/electric-case";
           sha256 = "1ch108ljzg5xkk4pkfpfxm8v2yzqk79q3h2zhzzqhsydq7r07bdn";
-          name = "electric-case";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -17572,20 +22048,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    electric-operator = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, names }:
-    melpaBuild {
+    electric-operator = callPackage ({ dash
+                                     , emacs
+                                     , fetchFromGitHub
+                                     , fetchurl
+                                     , lib
+                                     , melpaBuild
+                                     , names }:
+      melpaBuild {
         pname = "electric-operator";
-        version = "20180322.506";
+        version = "20180627.1012";
         src = fetchFromGitHub {
           owner = "davidshepherd7";
           repo = "electric-operator";
-          rev = "d47149a8027907b67dfe4787a53b247be34ad4cb";
-          sha256 = "0ipzhmv105621lhwjm7dvc12ap38hcg62z8z805czn6yinw6wydg";
+          rev = "35db75d5c2dbed1eeab4e4126ccb84714136a307";
+          sha256 = "18f043wpp8y18c4q86b0r4njl5biy2jgnnvja5vvprf6karbx5z5";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/906cdf8647524bb76f644373cf8b65397d9053a5/recipes/electric-operator";
           sha256 = "043bkpvvk42lmkll5jnz4q8i0m44y4wdxvkz6hiqhqcp1rv03nw2";
-          name = "electric-operator";
+          name = "recipe";
         };
         packageRequires = [ dash emacs names ];
         meta = {
@@ -17593,8 +22075,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    electric-spacing = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    electric-spacing = callPackage ({ fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "electric-spacing";
         version = "20161209.1157";
         src = fetchFromGitHub {
@@ -17603,10 +22088,10 @@
           rev = "9d0f8a213133f2619a4e9dfbba3b00d4348c07b0";
           sha256 = "1wzf8q2k2iwnm9b5kj16bwif7g0qc7ll3cjs20gbmcnq5xmhwx9f";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a78c0044f8b7a0df1af1aba407be4d7865c98c59/recipes/electric-spacing";
           sha256 = "0fcsz9wmibqp6ci0pa5r4gzlrsyj5klajxpgfksa0nfj3dc94cvg";
-          name = "electric-spacing";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -17614,8 +22099,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    elein = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    elein = callPackage ({ fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "elein";
         version = "20120120.316";
         src = fetchFromGitHub {
@@ -17624,10 +22112,10 @@
           rev = "d4c0c0491dbb7c90e953d7a16172107c37103605";
           sha256 = "1ijrhm9vrzh5wl1rr9ayl11dwm05bh1i43fnbz3ga58l6whgkfpw";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/elein";
           sha256 = "01y5yrmm3biyrfgnl3qjfpn1xvjk2nabwjr8cls53ds697qpz5x2";
-          name = "elein";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -17635,8 +22123,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    elf-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    elf-mode = callPackage ({ emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "elf-mode";
         version = "20161009.48";
         src = fetchFromGitHub {
@@ -17645,10 +22137,10 @@
           rev = "cd280d683cd3341d8bb31af6db7e3b74a133e6ab";
           sha256 = "0cbvjbk2893ag1iy8ggixpirfiyhssm7fii96hb9jqdz874cdl0k";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/368d1ff91f310e5ffe68f872ab0a91584a41a66e/recipes/elf-mode";
           sha256 = "0xwpaqg4mc0a0d8a4dxbd1sqzvi01gfhwr75f7i3sjzx0fj8vcwd";
-          name = "elf-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -17656,20 +22148,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    elfeed = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    elfeed = callPackage ({ emacs
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "elfeed";
-        version = "20180222.746";
+        version = "20180713.529";
         src = fetchFromGitHub {
           owner = "skeeto";
           repo = "elfeed";
-          rev = "8668227f93a46fdd8d5d8746d428dd2da061e253";
-          sha256 = "0v2ymm9bwwhdp4ar0da9d9g8qyw8nj47jjlqcr0d3f8sljn9d35s";
+          rev = "a6fc231e47f1071cd4d1363926868761f7f0bcd8";
+          sha256 = "0vlyrvzwj9rxhvnl6lawck8n2slrvhb96bxaf5pv37jqidrcsvyh";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/407ae027fcec444622c2a822074b95996df9e6af/recipes/elfeed";
           sha256 = "1psga7fcjk2b8xjg10fndp9l0ib72l5ggf43gxp62i4lxixzv8f9";
-          name = "elfeed";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -17677,8 +22173,17 @@
           license = lib.licenses.free;
         };
       }) {};
-    elfeed-goodies = callPackage ({ ace-jump-mode, cl-lib ? null, elfeed, fetchFromGitHub, fetchurl, lib, melpaBuild, noflet, popwin, powerline }:
-    melpaBuild {
+    elfeed-goodies = callPackage ({ ace-jump-mode
+                                  , cl-lib ? null
+                                  , elfeed
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild
+                                  , noflet
+                                  , popwin
+                                  , powerline }:
+      melpaBuild {
         pname = "elfeed-goodies";
         version = "20171126.2251";
         src = fetchFromGitHub {
@@ -17687,10 +22192,10 @@
           rev = "fc0c3e72f9fcd7bbf5237f6f2323bc666e8240b4";
           sha256 = "16qkh3cp764hayj4n003sm1q673bq7b3rzf1mii5f3xp6n8i84b7";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e6ebb8d23961fd9bfe101f7917caa3b405493f31/recipes/elfeed-goodies";
           sha256 = "0zpk6nx757hasgzcww90fzkcdn078my33p7yax7xslvi4msm37bi";
-          name = "elfeed-goodies";
+          name = "recipe";
         };
         packageRequires = [
           ace-jump-mode
@@ -17705,8 +22210,16 @@
           license = lib.licenses.free;
         };
       }) {};
-    elfeed-org = callPackage ({ cl-lib ? null, dash, elfeed, fetchFromGitHub, fetchurl, lib, melpaBuild, org, s }:
-    melpaBuild {
+    elfeed-org = callPackage ({ cl-lib ? null
+                              , dash
+                              , elfeed
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild
+                              , org
+                              , s }:
+      melpaBuild {
         pname = "elfeed-org";
         version = "20180129.507";
         src = fetchFromGitHub {
@@ -17715,10 +22228,10 @@
           rev = "b9d09a554127244d4807a3d2d90e062df63b2fd5";
           sha256 = "0szij299pfxbgqfps8njnxa2w862zzn40crsbc1ppww267dbp60j";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/elfeed-org";
           sha256 = "0rnxr2q2ib6xrdx41ams1z2ivw5zhcsmqdylyvbw62h20rlmlgm8";
-          name = "elfeed-org";
+          name = "recipe";
         };
         packageRequires = [ cl-lib dash elfeed org s ];
         meta = {
@@ -17726,8 +22239,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    elfeed-protocol = callPackage ({ cl-lib ? null, elfeed, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    elfeed-protocol = callPackage ({ cl-lib ? null
+                                   , elfeed
+                                   , emacs
+                                   , fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "elfeed-protocol";
         version = "20180409.813";
         src = fetchFromGitHub {
@@ -17736,10 +22255,10 @@
           rev = "611a1f57373e3692abf5122652ea7f6f96d3f6ec";
           sha256 = "0z9xij39p6m2855ksk40qaf830d04smhl3ag9gjb4fhzvw671k76";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3f1eef8add7cd2cfefe6fad6d8e69d65696e9677/recipes/elfeed-protocol";
           sha256 = "1gd2ny764qsnnqf3j7rbdqhh7hqd5c0fzwxx6wacd0dpbq4w56qi";
-          name = "elfeed-protocol";
+          name = "recipe";
         };
         packageRequires = [ cl-lib elfeed emacs ];
         meta = {
@@ -17747,20 +22266,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    elfeed-web = callPackage ({ elfeed, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, simple-httpd }:
-    melpaBuild {
+    elfeed-web = callPackage ({ elfeed
+                              , emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild
+                              , simple-httpd }:
+      melpaBuild {
         pname = "elfeed-web";
-        version = "20180121.1036";
+        version = "20180513.524";
         src = fetchFromGitHub {
           owner = "skeeto";
           repo = "elfeed";
-          rev = "8668227f93a46fdd8d5d8746d428dd2da061e253";
-          sha256 = "0v2ymm9bwwhdp4ar0da9d9g8qyw8nj47jjlqcr0d3f8sljn9d35s";
+          rev = "7e0abfee1470ae6323b559a7a9f843dd0076d622";
+          sha256 = "01x4ww63lvn04c7f3ab5vx2s20xqisvv8213qwswz7vr9nxja5yi";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/62459d16ee44d5fcf170c0ebc981ca2c7d4672f2/recipes/elfeed-web";
           sha256 = "14ydwvjjc6wbhkj4g4xdh0c3nh4asqsz8ln7my5vjib881vmaq1n";
-          name = "elfeed-web";
+          name = "recipe";
         };
         packageRequires = [ elfeed emacs simple-httpd ];
         meta = {
@@ -17768,20 +22293,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    elgrep = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    elgrep = callPackage ({ emacs
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "elgrep";
         version = "20180302.527";
         src = fetchFromGitHub {
           owner = "TobiasZawada";
           repo = "elgrep";
-          rev = "5e982024250e75fe02aee358a542ae3ed2a472d5";
-          sha256 = "0bkiay3mmk00lay2cv91qmas346ffhb2nlrg6xw083s5vk45fbbv";
+          rev = "01aece62e7910c50cd199ebbe70511776043f499";
+          sha256 = "0hlf3i2w1jmjj66ynxf7gvvq86yy3px24ww13hz849ai0lx5nazk";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0d9ab623b2d634936a79ff6f4b98b31825d44b6d/recipes/elgrep";
           sha256 = "0b8dma52zv57sh1jbrabfy6k5lzixs7f541s8dsqyrg0fzlq460j";
-          name = "elgrep";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -17789,8 +22318,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    elhome = callPackage ({ fetchFromGitHub, fetchurl, initsplit, lib, melpaBuild }:
-    melpaBuild {
+    elhome = callPackage ({ fetchFromGitHub
+                          , fetchurl
+                          , initsplit
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "elhome";
         version = "20161025.1342";
         src = fetchFromGitHub {
@@ -17799,10 +22332,10 @@
           rev = "e789e806469af3e9705f72298683c21f6c3a516d";
           sha256 = "1q9glli1czbfp62aalblaak55j8rj2nl8bm8nifnnb8jrzj1qrn0";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/527cc08a3424f87fe2e99119b931530840ad07ba/recipes/elhome";
           sha256 = "1k7936wxgslr29511dz9az38i9vi35rcxk68gzv35v9lpj89lalh";
-          name = "elhome";
+          name = "recipe";
         };
         packageRequires = [ initsplit ];
         meta = {
@@ -17810,8 +22343,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    elisp-def = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    elisp-def = callPackage ({ dash
+                             , emacs
+                             , f
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild
+                             , s }:
+      melpaBuild {
         pname = "elisp-def";
         version = "20180410.224";
         src = fetchFromGitHub {
@@ -17820,10 +22360,10 @@
           rev = "ff0730b8110f776862b29bf0b66e396fab2aaafb";
           sha256 = "1zdbb1mgmb8hkzsmp6l4mv61831bw8ybfsfcwalnvrw5fvfwpaik";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1f027b844efdc5946d2ad80d7052a8f3b96aac3d/recipes/elisp-def";
           sha256 = "1y29nsgjv9nb03g0jc5hb1a8k23r54ivdlv9h0a384cig8i91hsz";
-          name = "elisp-def";
+          name = "recipe";
         };
         packageRequires = [ dash emacs f s ];
         meta = {
@@ -17831,20 +22371,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    elisp-depend = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    elisp-depend = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "elisp-depend";
         version = "20161230.750";
         src = fetchFromGitHub {
           owner = "emacsorphanage";
           repo = "elisp-depend";
-          rev = "e4b201ac7dcee4489d58800c299fd04aaa61d07a";
-          sha256 = "0i1wpz6hr934x3lcr0y9x82dm7c1j477j14jqccn8q7d4cb1lfaj";
+          rev = "005fdef289fff4bd636a1deef8de6b2737e5d073";
+          sha256 = "1j39b6a6qhmxpknnxx8yn3sz39ldyvf4lmvi94c4cw7pq7dmmpma";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7ea159f0cc8c6e4b8483401a6e6687ab4ed73b7f/recipes/elisp-depend";
           sha256 = "0zpafwnm52g6v867f1ghfb492nnmm66imcwlhm5v9hhgwy3z17jm";
-          name = "elisp-depend";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -17852,20 +22395,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    elisp-docstring-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    elisp-docstring-mode = callPackage ({ fetchFromGitHub
+                                        , fetchurl
+                                        , lib
+                                        , melpaBuild }:
+      melpaBuild {
         pname = "elisp-docstring-mode";
         version = "20170304.815";
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "elisp-docstring-mode";
-          rev = "f512e509dd690f65133e55563ebbfd2dede5034f";
-          sha256 = "0al8m75p359h4n82rf0dsl22qfdg9cwwywn5pn7x6gb96c7qrqaa";
+          rev = "b135d95b158048927f12184e5cfb8fe01fc44713";
+          sha256 = "0jyyvrgnplbsg82miawq4fjzb9ds2wyhpqlllyg0s7q49lwsb2fi";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/elisp-docstring-mode";
           sha256 = "0mdh3ikn6zfd3fbmifvivqih2fsijvlzalljdvm32crs9cy6fa96";
-          name = "elisp-docstring-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -17873,20 +22419,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    elisp-format = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    elisp-format = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "elisp-format";
         version = "20160508.252";
         src = fetchFromGitHub {
           owner = "Yuki-Inoue";
           repo = "elisp-format";
-          rev = "03cc293eb2f78ec58fc1d84279af06816a04b979";
-          sha256 = "17l2xsixx3p93dmx9jsg0a3xqdg19nwp1di2pymlg41pw0kdf3x3";
+          rev = "9fe516d39b349070537099a01fe34e47fbded2c8";
+          sha256 = "0dmx5c2lrp8a0836zv4sv1p5h7dnmyyzm45lj3h9rqr1c8l1h7jm";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ff353f4228529c51577f7104cdf52c677be8a500/recipes/elisp-format";
           sha256 = "1l0596y4yjn3jdyy6pgws1pgz6i12fxfy27566lmxklbxp8sxgy8";
-          name = "elisp-format";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -17894,8 +22443,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    elisp-lint = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    elisp-lint = callPackage ({ emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "elisp-lint";
         version = "20180224.1242";
         src = fetchFromGitHub {
@@ -17904,10 +22457,10 @@
           rev = "04b0d36ec0e4dc1bb54c2bf4c2d16b2af8cf6a39";
           sha256 = "04hxpfgvkh4ivaxqbhnp3j68i1kqzg1v19bssnvcagll2mm4r3xg";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/61595c78ac7f15eef47bf28636ad796f74741509/recipes/elisp-lint";
           sha256 = "13cxcn0qp63f2nkv37c3w47dby9cqm4l1f8xilgpczdaxd86kd63";
-          name = "elisp-lint";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -17915,20 +22468,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    elisp-refs = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, loop, melpaBuild, s }:
-    melpaBuild {
+    elisp-refs = callPackage ({ dash
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , loop
+                              , melpaBuild
+                              , s }:
+      melpaBuild {
         pname = "elisp-refs";
-        version = "20180331.1206";
+        version = "20180519.1621";
         src = fetchFromGitHub {
           owner = "Wilfred";
           repo = "refs.el";
-          rev = "788f6f65d5171b1887b3ff9e4cad900e8046b2b1";
-          sha256 = "0c7hcbjqynw6k5idpmfxn6xbr192ahhk8a2g72npap97flpw6cdq";
+          rev = "bfcaf044da815982cb8f0d35ad4d03e4926f5353";
+          sha256 = "0znls9anqnkm61s5xqqwwa0waqav30g8pf1h7qy4f82s5plpc1br";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/60891099e241ebd32d39bdcfe4953529a5a3263e/recipes/elisp-refs";
           sha256 = "16h7dccmzvmap3knnwhjq79wm82xm3whria70vq5msl2y252f6cx";
-          name = "elisp-refs";
+          name = "recipe";
         };
         packageRequires = [ dash loop s ];
         meta = {
@@ -17936,20 +22495,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    elisp-sandbox = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    elisp-sandbox = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "elisp-sandbox";
         version = "20131116.1042";
         src = fetchFromGitHub {
           owner = "joelmccracken";
           repo = "elisp-sandbox";
-          rev = "d894d68934ef09c42f72ac4e1173a0bedc23f139";
-          sha256 = "0r70axda1piwxznksygby9vid49q4lzjwcrhx7gl5midjs961531";
+          rev = "ddd669266ca36d7e4ebba73eb1ab42523787e042";
+          sha256 = "1pwx0cksgf9qyd6nl1540jmp3p0adgz2sk38r5s8gbli3x109hy3";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4b0e7c52ff8034a1c0d1e5d7bc0c58f166986b28/recipes/elisp-sandbox";
           sha256 = "1bazm1cf9ghh9b7jzqqgyfcalnrfg7vmxqbn4fiy2c76gbzlr2bp";
-          name = "elisp-sandbox";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -17957,20 +22519,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    elisp-slime-nav = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    elisp-slime-nav = callPackage ({ cl-lib ? null
+                                   , fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "elisp-slime-nav";
         version = "20160128.1109";
         src = fetchFromGitHub {
           owner = "purcell";
           repo = "elisp-slime-nav";
-          rev = "34938422929800839e2f935aca890cd4a229ca99";
-          sha256 = "00v8iqlf6pk8a0656s14jd0gv5msqy6q2af15q21f2nl4j0gl9qj";
+          rev = "0e96d9f1f0d334f09414b509d44d5c000b51f432";
+          sha256 = "11vyy0bvzbs1h1kggikrvhd658j7c730w0pdp6qkm60rigvfi1ih";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/elisp-slime-nav";
           sha256 = "009zgp68i4naprpjr8lcp06lh3i5ickn0nh0lgvrqs0niprnzh8c";
-          name = "elisp-slime-nav";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -17978,20 +22544,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    elixir-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }:
-    melpaBuild {
+    elixir-mode = callPackage ({ emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild
+                               , pkg-info }:
+      melpaBuild {
         pname = "elixir-mode";
-        version = "20170918.2231";
+        version = "20180711.545";
         src = fetchFromGitHub {
           owner = "elixir-lang";
           repo = "emacs-elixir";
-          rev = "e928aaf118e399fca2df47c91712b9a469eb1764";
-          sha256 = "0x0ip0mh7zn6lmzj3p3v3jlc9x1j0afrq5rfgi22zk40zkyh26zn";
+          rev = "90323cd7669eb472ee1f97b9d070056ebe225d15";
+          sha256 = "06kq92r9nmw95l6isc87w0yb9jmd11bm09j3hwww4sn2bv5z2686";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6374ced0de38d83bf99147f702f30706615480ed/recipes/elixir-mode";
           sha256 = "1dba3jfg210i2rw8qy866396xn2xjgmbcyl006d6fibpr3j4lxaf";
-          name = "elixir-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs pkg-info ];
         meta = {
@@ -17999,8 +22570,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    elixir-yasnippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
-    melpaBuild {
+    elixir-yasnippets = callPackage ({ fetchFromGitHub
+                                     , fetchurl
+                                     , lib
+                                     , melpaBuild
+                                     , yasnippet }:
+      melpaBuild {
         pname = "elixir-yasnippets";
         version = "20150417.539";
         src = fetchFromGitHub {
@@ -18009,10 +22584,10 @@
           rev = "980ca7626c14ef0573bec0035ec7942796062783";
           sha256 = "1sdq4372i19wdxpdp3347a1rf5zf5w6sa0da6lr511m7ri0lj6hd";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6c37a13d56e9a0a4e7e2c11349ed87610a0f6b2c/recipes/elixir-yasnippets";
           sha256 = "0vmkcd88wfafv31lyw0983p4qjj387qf258q7py1ij47fcmfp579";
-          name = "elixir-yasnippets";
+          name = "recipe";
         };
         packageRequires = [ yasnippet ];
         meta = {
@@ -18020,8 +22595,17 @@
           license = lib.licenses.free;
         };
       }) {};
-    elm-mode = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, s, seq }:
-    melpaBuild {
+    elm-mode = callPackage ({ dash
+                            , emacs
+                            , f
+                            , fetchFromGitHub
+                            , fetchurl
+                            , let-alist
+                            , lib
+                            , melpaBuild
+                            , s
+                            , seq }:
+      melpaBuild {
         pname = "elm-mode";
         version = "20180114.9";
         src = fetchFromGitHub {
@@ -18030,10 +22614,10 @@
           rev = "09c6e62e14a2c9afaad03a867c7a268b6bc68ab0";
           sha256 = "0vc0m5rg9py01w07pifg3fp2z9cna6y21k2xmfns7p6i5c5fjj2g";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5d1a4d786b137f61ed3a1dd4ec236d0db120e571/recipes/elm-mode";
           sha256 = "1gw9szkyr1spcx7qijddhxlm36h0hmfd53b4yzp1336yx44mlnd1";
-          name = "elm-mode";
+          name = "recipe";
         };
         packageRequires = [ dash emacs f let-alist s seq ];
         meta = {
@@ -18041,8 +22625,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    elm-yasnippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
-    melpaBuild {
+    elm-yasnippets = callPackage ({ fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild
+                                  , yasnippet }:
+      melpaBuild {
         pname = "elm-yasnippets";
         version = "20160331.2224";
         src = fetchFromGitHub {
@@ -18051,10 +22639,10 @@
           rev = "45a11a0cef0c36633fb3477d3dc4167e82779ba4";
           sha256 = "1zb5yra6znkr7yaq6wqlmlr054wkv9cy1dih8h4j2gp2wnfwg968";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/340664dd1c57b539de191dd6faa9eb8ed9ae6914/recipes/elm-yasnippets";
           sha256 = "0nnr0sxkxviw2i7b5s8jgvsv7lgqxqvirmvmband84q9gxlz24zb";
-          name = "elm-yasnippets";
+          name = "recipe";
         };
         packageRequires = [ yasnippet ];
         meta = {
@@ -18062,20 +22650,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    elmacro = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    elmacro = callPackage ({ dash
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild
+                           , s }:
+      melpaBuild {
         pname = "elmacro";
-        version = "20170312.356";
+        version = "20180628.711";
         src = fetchFromGitHub {
           owner = "Silex";
           repo = "elmacro";
-          rev = "97c8ca4041e5082df243ad6371a091759c30d0f7";
-          sha256 = "0kqnnp7kfdgizs18zhsaxci210bgpr73w39dhb2y09yj40ja3yx4";
+          rev = "89b9b0feabafd01fee48111d67131c4c9b5fed9a";
+          sha256 = "06wkzafh6vbcjf0m3sl253mgcq32p8cdv7vsfmyx51baa36938ha";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/566cc5bc0f71c5a4191ad93b917dc268f6e1a2da/recipes/elmacro";
           sha256 = "0644rgwawivrq1shsjx1x2p53z7jgr6bxqgn2smzql8pp6azy7xz";
-          name = "elmacro";
+          name = "recipe";
         };
         packageRequires = [ dash s ];
         meta = {
@@ -18083,8 +22676,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    elmine = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    elmine = callPackage ({ fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild
+                          , s }:
+      melpaBuild {
         pname = "elmine";
         version = "20170511.20";
         src = fetchFromGitHub {
@@ -18093,10 +22690,10 @@
           rev = "432d2f2f7cb5b533f25b993d1001abcadcebe8ed";
           sha256 = "02lsxj9zkcaiqlzy986n1f65cfyd8pkrdljgplsbd9p0w8ys0s94";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/elmine";
           sha256 = "1xkx1wwrzd2dl13z8n4qh3gl202j0i9crab5b3788z8mq0g4v4bn";
-          name = "elmine";
+          name = "recipe";
         };
         packageRequires = [ s ];
         meta = {
@@ -18104,8 +22701,19 @@
           license = lib.licenses.free;
         };
       }) {};
-    elnode = callPackage ({ creole, dash, db, fakir, fetchFromGitHub, fetchurl, kv, lib, melpaBuild, noflet, s, web }:
-    melpaBuild {
+    elnode = callPackage ({ creole
+                          , dash
+                          , db
+                          , fakir
+                          , fetchFromGitHub
+                          , fetchurl
+                          , kv
+                          , lib
+                          , melpaBuild
+                          , noflet
+                          , s
+                          , web }:
+      melpaBuild {
         pname = "elnode";
         version = "20140203.1506";
         src = fetchFromGitHub {
@@ -18114,10 +22722,10 @@
           rev = "3f2bf225853e40a2a10386ee5ae0bd6ba5d44ce9";
           sha256 = "0p3cj5vgka388i4dk9r7bx8pv8mywnfij9ahgqak5jlsddflh8hw";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c9a76a6498c2a0b0d471d3df7ae3d510d027f08c/recipes/elnode";
           sha256 = "0piy5gy9a7c8s10b99fmdyh6glhvjvdyrz0x2bv30h7wplx5szi6";
-          name = "elnode";
+          name = "recipe";
         };
         packageRequires = [ creole dash db fakir kv noflet s web ];
         meta = {
@@ -18125,8 +22733,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    elog = callPackage ({ eieio ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    elog = callPackage ({ eieio ? null
+                        , fetchFromGitHub
+                        , fetchurl
+                        , lib
+                        , melpaBuild }:
+      melpaBuild {
         pname = "elog";
         version = "20160724.1555";
         src = fetchFromGitHub {
@@ -18135,10 +22747,10 @@
           rev = "a67237d9813c7591614d95e2ef31cc5e5ed3f31b";
           sha256 = "0alg5nbmq56zsc032pvah92h5fw155fbfjc275k9vbh915hs6y0w";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4f3d560bf56b1b4e7540dc5ae16258895c106f1f/recipes/elog";
           sha256 = "0hixsi60nf0khm9xmya3saf95ahn1gydp0l5wxawsc491qwg4vqd";
-          name = "elog";
+          name = "recipe";
         };
         packageRequires = [ eieio ];
         meta = {
@@ -18146,20 +22758,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    elogcat = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    elogcat = callPackage ({ dash
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild
+                           , s }:
+      melpaBuild {
         pname = "elogcat";
         version = "20151120.1641";
         src = fetchFromGitHub {
           owner = "youngker";
           repo = "elogcat.el";
-          rev = "4f311b7a07565b0d060334bc68edb36f2bff703f";
-          sha256 = "1jcr8bxffvnfs0ym6zkgs79hd6a0m81r4x4jr3v5l9zwxw04sy15";
+          rev = "cafe9bd5c0d6561d72066c70a55c246453693efd";
+          sha256 = "117vb19z006hjs0717r5l90h4rv6rciw3cijlgg006f4qqj3g9s5";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4855c75dc22a7089cf9e4fa80dbe0ccd2830fe83/recipes/elogcat";
           sha256 = "0sqdqlpg4firswr742nrb6b8sz3bpijf6pbxvandq3ddpm0rx9ia";
-          name = "elogcat";
+          name = "recipe";
         };
         packageRequires = [ dash s ];
         meta = {
@@ -18167,20 +22784,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    eloud = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    eloud = callPackage ({ emacs
+                         , fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "eloud";
         version = "20160731.857";
         src = fetchFromGitHub {
           owner = "smythp";
           repo = "eloud";
-          rev = "82c97918585bd2a749251ae87d7732ca9d856c16";
-          sha256 = "19wfn3zfi7avgnrki805acin8qd4f1jvmddgjk22j6m78l607lxn";
+          rev = "c1d8274ca207cd270f8ad7f62993bd6df304d561";
+          sha256 = "0ng3d82518i0d8dp8719ssinb1g7km18lcs38hzprgqy9ycqc1qb";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f1e80fba9bc541594129756f5c668f3192919bc8/recipes/eloud";
           sha256 = "1h8wd5mfi1cn9bzrckgc5mdrr5jkqsx92ay008p650wvjl689rn2";
-          name = "eloud";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -18188,20 +22809,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    elpa-audit = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    elpa-audit = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "elpa-audit";
         version = "20141023.631";
         src = fetchFromGitHub {
           owner = "purcell";
           repo = "elpa-audit";
-          rev = "727da50e626977351aff2675b6540a36818bbbe6";
-          sha256 = "0wlhdzsrlj266jfvp925zrgzg2mxfba93klgky0hc8zialmmb50b";
+          rev = "1ca4e6073f8c4cbb41688b69d3b3feaa1a392efc";
+          sha256 = "1dadf24x6v1vk57bp6w0g2dysigy5cqjzwldc8dn129f4pfrhipy";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/elpa-audit";
           sha256 = "18a8n22g53d8fxzr3snb2px28gvxbkx44grrx8lywaprz1f1lwdi";
-          name = "elpa-audit";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -18209,8 +22833,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    elpa-clone = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    elpa-clone = callPackage ({ cl-lib ? null
+                              , emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "elpa-clone";
         version = "20170502.514";
         src = fetchFromGitHub {
@@ -18219,10 +22848,10 @@
           rev = "92f4c9d3570ad002575a90d0cc4a522c203a1110";
           sha256 = "0m5w5wgyslvakcqpr3d198sy3561w2h002gflw0jp47v17hba1r7";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/11861edd9c7f9deebd44fd1f8ef648e7a04caf2b/recipes/elpa-clone";
           sha256 = "172gpmpwf75y41n3v05l47w34x83vy63bqk97fd8a6b4dkj91lqa";
-          name = "elpa-clone";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -18230,8 +22859,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    elpa-mirror = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    elpa-mirror = callPackage ({ emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "elpa-mirror";
         version = "20180228.1636";
         src = fetchFromGitHub {
@@ -18240,31 +22873,41 @@
           rev = "6ca78e3fb69ef582da1a01f1d193e07ae8223142";
           sha256 = "0s0c5qqg1cl63kig7kc4fx9rz4kgchxc3w3ywgh5csmgwlkpg0id";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d64ce7042c45f29fb394be25ce415912182bac8b/recipes/elpa-mirror";
           sha256 = "1jnviav2ybr13cgllg26kfjrwrl25adggnqiiwyjwgbbzxfycah8";
-          name = "elpa-mirror";
+          name = "recipe";
         };
-        packageRequires = [];
+        packageRequires = [ emacs ];
         meta = {
           homepage = "https://melpa.org/#/elpa-mirror";
           license = lib.licenses.free;
         };
       }) {};
-    elpy = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, find-file-in-project, highlight-indentation, lib, melpaBuild, pyvenv, s, yasnippet }:
-    melpaBuild {
+    elpy = callPackage ({ company
+                        , emacs
+                        , fetchFromGitHub
+                        , fetchurl
+                        , find-file-in-project
+                        , highlight-indentation
+                        , lib
+                        , melpaBuild
+                        , pyvenv
+                        , s
+                        , yasnippet }:
+      melpaBuild {
         pname = "elpy";
-        version = "20180415.1232";
+        version = "20180707.1413";
         src = fetchFromGitHub {
           owner = "jorgenschaefer";
           repo = "elpy";
-          rev = "911d1c58df1c0ff9ce8057d07b13c06759f2e0e4";
-          sha256 = "0cyk2467gcxz0vf63p0db9y6rij9hb7251lv6s054mzy3kbcn7zm";
+          rev = "01d07876e27faf7042d10872e4c60ae35a4faf4e";
+          sha256 = "076jvrwp8xycsc589p97s2p1jx7728wsl58ivyp1s90k606aq9i4";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1d8fcd8745bb15402c9f3b6f4573ea151415237a/recipes/elpy";
           sha256 = "1ri3dwnkw005plj1g5grmmq9np41sqk4s2v18pwsvr18ysnq6nnr";
-          name = "elpy";
+          name = "recipe";
         };
         packageRequires = [
           company
@@ -18280,8 +22923,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    elpygen = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
-    melpaBuild {
+    elpygen = callPackage ({ emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild
+                           , yasnippet }:
+      melpaBuild {
         pname = "elpygen";
         version = "20171225.936";
         src = fetchFromGitHub {
@@ -18290,10 +22938,10 @@
           rev = "21929c997a05968f9eefe52b85a76ceaab3b0d81";
           sha256 = "093ck4dkdvbgafb1bmkmszg1ba81ns5kjbk2iq2b5p9dvfcjjr3k";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e670bd79a85c4e2a9ca3355feb8aaefa709f49cb/recipes/elpygen";
           sha256 = "01fak1dz9mna3p4c2r0scb0j10qk3lvpq270jy6rvzlcbwri4akl";
-          name = "elpygen";
+          name = "recipe";
         };
         packageRequires = [ emacs yasnippet ];
         meta = {
@@ -18301,20 +22949,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    elquery = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    elquery = callPackage ({ dash
+                           , emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild
+                           , s }:
+      melpaBuild {
         pname = "elquery";
-        version = "20170624.1635";
+        version = "20180513.1912";
         src = fetchFromGitHub {
           owner = "AdamNiederer";
           repo = "elquery";
-          rev = "a5f7f3545330280991dd6334f4ce4f72aaa44145";
-          sha256 = "0yf29d1akj1ays5rqcmgmvyfm4gx7j6yibd12x72wpf5mygv1fxi";
+          rev = "7b2e40dcae09de9074fae1a7893b82b41987106b";
+          sha256 = "1sfwsccpaipa5j10114jya8327nbllywgvzhxsqml0fwpg1ifyyq";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/121f7d2091b83143402b44542db12e8f78275103/recipes/elquery";
           sha256 = "19yik9w4kcj7i9d3bwwdszznwcrh75hxd0540iqk5by861z5f3zr";
-          name = "elquery";
+          name = "recipe";
         };
         packageRequires = [ dash emacs s ];
         meta = {
@@ -18322,8 +22976,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    elscreen = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    elscreen = callPackage ({ emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "elscreen";
         version = "20180320.1902";
         src = fetchFromGitHub {
@@ -18332,10 +22990,10 @@
           rev = "02164afab2c5fbff6e4aa7c59e0daedc6c504772";
           sha256 = "1jzp7w2c9xl8x8kdxcchgp8s3ygvj70pi2vwwg1qilkya7yv61p0";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e6140694c1dea0a573586d23d1f63d46c9b22936/recipes/elscreen";
           sha256 = "1mlqbw14ilk6d3ba38kfw50pnlhb9f6sm5hy9dw58gp59siark5s";
-          name = "elscreen";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -18343,8 +23001,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    elscreen-buffer-group = callPackage ({ cl-lib ? null, elscreen, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    elscreen-buffer-group = callPackage ({ cl-lib ? null
+                                         , elscreen
+                                         , emacs
+                                         , fetchFromGitHub
+                                         , fetchurl
+                                         , lib
+                                         , melpaBuild }:
+      melpaBuild {
         pname = "elscreen-buffer-group";
         version = "20170808.1825";
         src = fetchFromGitHub {
@@ -18353,10 +23017,10 @@
           rev = "a3cd4d7eae3cca87bede4b39a46d3c0641f8cd06";
           sha256 = "0flja2j5xqhxc0qrclnxcpyzvn7gyjynfpa3mp1hb250c313igy5";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9c6fedb7b6ef58089da4b35ad115f699b4b24ff2/recipes/elscreen-buffer-group";
           sha256 = "1clmhpk9zp6hsgz6a4jpmbrr9fr6k8b324s0x61n5yi4yzgdmc0v";
-          name = "elscreen-buffer-group";
+          name = "recipe";
         };
         packageRequires = [ cl-lib elscreen emacs ];
         meta = {
@@ -18364,8 +23028,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    elscreen-fr = callPackage ({ elscreen, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }:
-    melpaBuild {
+    elscreen-fr = callPackage ({ elscreen
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild
+                               , seq }:
+      melpaBuild {
         pname = "elscreen-fr";
         version = "20160920.253";
         src = fetchFromGitHub {
@@ -18374,10 +23043,10 @@
           rev = "b9c11f80d277086d5d5bf88623e15fc7adbbbe3c";
           sha256 = "1dz8jqd2agh06hya59vbybrmgyhyz2rk6c9panrm49w37v0bwksb";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/18730986df5eb9816eec7ad479abe1e338d3c66f/recipes/elscreen-fr";
           sha256 = "1kmga1zz9mb3hxd2sxja2vz45pix5a52yl0g9z4vmak32x9rgqrm";
-          name = "elscreen-fr";
+          name = "recipe";
         };
         packageRequires = [ elscreen seq ];
         meta = {
@@ -18385,20 +23054,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    elscreen-mew = callPackage ({ elscreen, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    elscreen-mew = callPackage ({ elscreen
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "elscreen-mew";
         version = "20160504.1135";
         src = fetchFromGitHub {
           owner = "masutaka";
           repo = "elscreen-mew";
-          rev = "c90a23441d836da14a1cb12788432308ba58e2b6";
-          sha256 = "167kgbnh5q3pqirv0f7wpjn7yc76k8mz9qx45i7d4scmx8952d2g";
+          rev = "89871fad690ae161dc076e16ef481b1965612077";
+          sha256 = "14hwl5jzmm43qa4jbpsyswbz4hk1l2iwqh3ank6502bz58877k6c";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/47404ea3cfb591b780ca7e31095951a708b0a6b7/recipes/elscreen-mew";
           sha256 = "06g4wcfjs036nn64ac0zsvr08cfmak2hyj83y7a0r35yxr1853w4";
-          name = "elscreen-mew";
+          name = "recipe";
         };
         packageRequires = [ elscreen ];
         meta = {
@@ -18406,8 +23079,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    elscreen-multi-term = callPackage ({ elscreen, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, multi-term }:
-    melpaBuild {
+    elscreen-multi-term = callPackage ({ elscreen
+                                       , emacs
+                                       , fetchFromGitHub
+                                       , fetchurl
+                                       , lib
+                                       , melpaBuild
+                                       , multi-term }:
+      melpaBuild {
         pname = "elscreen-multi-term";
         version = "20151021.1933";
         src = fetchFromGitHub {
@@ -18416,10 +23095,10 @@
           rev = "7b6048a0dd80f69460a62bbc6f1af8856141a5ea";
           sha256 = "1cninrbgxzg0gykkpjx0i8pk2yc7sgr2kliqd35lgcxz2q4jlr51";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7a24477cf83df7da931fa33c622ef720839529d2/recipes/elscreen-multi-term";
           sha256 = "1zwrzblkag1d18xz450b7khsdssvsxyl1x6a682vy0dkn1y5qh1n";
-          name = "elscreen-multi-term";
+          name = "recipe";
         };
         packageRequires = [ elscreen emacs multi-term ];
         meta = {
@@ -18427,8 +23106,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    elscreen-separate-buffer-list = callPackage ({ elscreen, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    elscreen-separate-buffer-list = callPackage ({ elscreen
+                                                 , emacs
+                                                 , fetchFromGitHub
+                                                 , fetchurl
+                                                 , lib
+                                                 , melpaBuild }:
+      melpaBuild {
         pname = "elscreen-separate-buffer-list";
         version = "20161106.1958";
         src = fetchFromGitHub {
@@ -18437,10 +23121,10 @@
           rev = "7652d827aa1b8c1b04303c5b4b0bda5e8f85565e";
           sha256 = "1cpmpms3r9lywmxgciz4xq7vjw2c1mxmpd89shssqck16563zwxf";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9f5e5c8e2cd45a25e47c74bef59b9114aa7685eb/recipes/elscreen-separate-buffer-list";
           sha256 = "1d8kc137cd8i3wglir1rlvk7w8mrdhd3xvcihi2f2f2g5nh2n5jk";
-          name = "elscreen-separate-buffer-list";
+          name = "recipe";
         };
         packageRequires = [ elscreen emacs ];
         meta = {
@@ -18448,8 +23132,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    elvish-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    elvish-mode = callPackage ({ emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "elvish-mode";
         version = "20170913.1939";
         src = fetchFromGitHub {
@@ -18458,10 +23146,10 @@
           rev = "9cf31b453ac79b011b84e83ca11c964c4e647649";
           sha256 = "0ryg9c8pjw98a9l4hyjqwan7kcv492vzy0xxcrcfm69zn8vnw9k0";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0fc724072702a565af471f9ae523a1e6e48e3f04/recipes/elvish-mode";
           sha256 = "1f5pyadmbh2ldd51srvlhbjq2849f1f0s8qmpjnsz9bc986yga34";
-          name = "elvish-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -18469,8 +23157,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    elwm = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    elwm = callPackage ({ dash
+                        , fetchFromGitHub
+                        , fetchurl
+                        , lib
+                        , melpaBuild }:
+      melpaBuild {
         pname = "elwm";
         version = "20150817.307";
         src = fetchFromGitHub {
@@ -18479,10 +23171,10 @@
           rev = "c33b183f006ad476c3a44dab316f580f8b369930";
           sha256 = "1k7npf93xbmrsq607x8zlgrpzqvplgia3ixz5w1lr1jlv1m2m8x2";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0eb45a6141b797243973695be4c0582c9ad6965d/recipes/elwm";
           sha256 = "0rf663ih3lfg4n4pj4dpp133967zha5m1wr46riaxpha7xr59al9";
-          name = "elwm";
+          name = "recipe";
         };
         packageRequires = [ dash ];
         meta = {
@@ -18490,20 +23182,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    elx = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    elx = callPackage ({ emacs
+                       , fetchFromGitHub
+                       , fetchurl
+                       , lib
+                       , melpaBuild }:
+      melpaBuild {
         pname = "elx";
-        version = "20180324.936";
+        version = "20180614.1957";
         src = fetchFromGitHub {
           owner = "emacscollective";
           repo = "elx";
-          rev = "cf1000f5d214363fe545a4ce849166194b8fb2c8";
-          sha256 = "0k62qcmhav7pshrn1f55sar6lz37l26aqaqlkkd20h60fhbqp9aj";
+          rev = "10a21c35915e249d5487aa3ced70fcfb749a9d0c";
+          sha256 = "1jl2lp4gas89vx1xjx5gzh56fhx16mvfqwqs84cpxdbwb2qzch21";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/57a2fb9524df3fdfdc54c403112e12bd70888b23/recipes/elx";
           sha256 = "008nwa2gn3d2ayr8023pxyvph52gh9m56f77h41hp8hcw6hbdwrz";
-          name = "elx";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -18511,20 +23207,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    emacs-setup = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    emacs-setup = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "emacs-setup";
         version = "20120727.726";
         src = fetchFromGitHub {
           owner = "echosa";
           repo = "emacs-setup";
-          rev = "c783ec13e3b39093fffb6f6d64dccdce8ce4d375";
-          sha256 = "1crpjcxwanbrd1yd4lbb5lmqwvx1mczya7ff2qr3phk497czpsqm";
+          rev = "cc36ad5318c6c0e65d1b9ff8dff5ea2437675de2";
+          sha256 = "15l3ab11vcmzqibkd6h5zqw5a83k8dmgcp4n26px29c0gv6bkpy8";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/abb7101b2d48af56af09d1dc85c540300dba7b3c/recipes/emacs-setup";
           sha256 = "1x4rh8vx6fsb2d6dz2g9j6jamin1vmpppwy3yzbl1dnf7w4hx4kh";
-          name = "emacs-setup";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -18532,20 +23231,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    emacsagist = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    emacsagist = callPackage ({ cl-lib ? null
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "emacsagist";
         version = "20140331.1130";
         src = fetchFromGitHub {
           owner = "echosa";
           repo = "emacsagist";
-          rev = "aba342ba59c254a88017f25e9fb7a8cd6f2fda83";
-          sha256 = "0ciqxyahlzaxq854jm25zbrbmrhcaj5csdhxa0az9crwha8wkmw2";
+          rev = "539b9c4c0652d793391135ba1fc2e503dbb7deba";
+          sha256 = "0n5cpmbyf8mhq03ikhzbycjwkxv3fmjwq1a9zvv3z9ik8yxnbw99";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/07612d46faebb28e1eeb8ddae2ac20e2dc0175f6/recipes/emacsagist";
           sha256 = "1cyz7nf0zxa21979jf5kdmkgwiyd17vsmpcmrw1af37ly27l8l64";
-          name = "emacsagist";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -18553,8 +23256,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    emacsc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    emacsc = callPackage ({ fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "emacsc";
         version = "20161028.1006";
         src = fetchFromGitHub {
@@ -18563,10 +23269,10 @@
           rev = "421e0c567358769e32f670ae8e949d99abae0c28";
           sha256 = "0zmb1qdbdlrycari1r1g65c9px357wz4f2gvmcacg83504mmf3d8";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/acc9b816796b9f142c53f90593952b43c962d2d8/recipes/emacsc";
           sha256 = "1fbf9al3yds0il18jz6hbpj1fsjlpb1kgp450gb6r09lc46x77mk";
-          name = "emacsc";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -18574,8 +23280,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    emacsist-view = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    emacsist-view = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "emacsist-view";
         version = "20160426.523";
         src = fetchFromGitHub {
@@ -18584,10 +23293,10 @@
           rev = "f67761259ed779a9bc95c9a4e0474522990c5c6b";
           sha256 = "1vhs9725fyl2j65lk014qz76iv4hsvyim06361h4lai634hp7ck6";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d2157e14d68fa2875c6d5c40c20a39b9a2431c10/recipes/emacsist-view";
           sha256 = "0lf280ppi3zksqvx81y8mm9479j26kd5wywfghhwk36kz410hk99";
-          name = "emacsist-view";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -18595,20 +23304,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    emacsql = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    emacsql = callPackage ({ emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "emacsql";
-        version = "20180205.1835";
+        version = "20180712.1052";
         src = fetchFromGitHub {
           owner = "skeeto";
           repo = "emacsql";
-          rev = "75ac0448a5965c82c616c862cab180c241110fd2";
-          sha256 = "0aplbc2c6rdkhzwg5b19xjrgijpdkhimaa4kah7mqqxdj7q1zfxh";
+          rev = "6f1e375a2ebb558138b73d2a63f2077da1028f92";
+          sha256 = "046c9jr4azfz5cfpdlp160da3z9lcff12ldlvnzraxx8bzfbxqi5";
         };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/9cc47c05fb0d282531c9560252090586e9f6196e/recipes/emacsql";
-          sha256 = "1x4rn8dmgz871dhz878i2mqci576zccf9i2xmq2ishxgqm0hp8ax";
-          name = "emacsql";
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/9c3b6175b5c64f03b0b9dfdc10f393081d681309/recipes/emacsql";
+          sha256 = "0c2d0kymzr53wh87fq1wy2x5ahfsymz0cw8qbrqx0k613l3mpr38";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -18616,20 +23329,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    emacsql-mysql = callPackage ({ emacs, emacsql, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    emacsql-mysql = callPackage ({ emacs
+                                 , emacsql
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "emacsql-mysql";
         version = "20171218.1827";
         src = fetchFromGitHub {
           owner = "skeeto";
           repo = "emacsql";
-          rev = "75ac0448a5965c82c616c862cab180c241110fd2";
-          sha256 = "0aplbc2c6rdkhzwg5b19xjrgijpdkhimaa4kah7mqqxdj7q1zfxh";
+          rev = "ea613c5191dcaa2583d3f7d5737b31bb88a07ed5";
+          sha256 = "1i733wjvpd6lhdnwr8w2k0c8s7v7r9ivsmxxgdndlhdnkm17ca5j";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9cc47c05fb0d282531c9560252090586e9f6196e/recipes/emacsql-mysql";
           sha256 = "1c20zhpdzfqjds6kcjhiq1m5ch53fsx6n1xk30i35kkg1wxaaqzy";
-          name = "emacsql-mysql";
+          name = "recipe";
         };
         packageRequires = [ emacs emacsql ];
         meta = {
@@ -18637,20 +23355,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    emacsql-psql = callPackage ({ emacs, emacsql, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    emacsql-psql = callPackage ({ emacs
+                                , emacsql
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "emacsql-psql";
         version = "20171218.1827";
         src = fetchFromGitHub {
           owner = "skeeto";
           repo = "emacsql";
-          rev = "75ac0448a5965c82c616c862cab180c241110fd2";
-          sha256 = "0aplbc2c6rdkhzwg5b19xjrgijpdkhimaa4kah7mqqxdj7q1zfxh";
+          rev = "ea613c5191dcaa2583d3f7d5737b31bb88a07ed5";
+          sha256 = "1i733wjvpd6lhdnwr8w2k0c8s7v7r9ivsmxxgdndlhdnkm17ca5j";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9cc47c05fb0d282531c9560252090586e9f6196e/recipes/emacsql-psql";
           sha256 = "1aa1g9jyjmz6w0lmi2cf67926ad3xvs0qsg7lrccnllr9k0flly3";
-          name = "emacsql-psql";
+          name = "recipe";
         };
         packageRequires = [ emacs emacsql ];
         meta = {
@@ -18658,20 +23381,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    emacsql-sqlite = callPackage ({ emacs, emacsql, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    emacsql-sqlite = callPackage ({ emacs
+                                  , emacsql
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "emacsql-sqlite";
         version = "20180128.1252";
         src = fetchFromGitHub {
           owner = "skeeto";
           repo = "emacsql";
-          rev = "75ac0448a5965c82c616c862cab180c241110fd2";
-          sha256 = "0aplbc2c6rdkhzwg5b19xjrgijpdkhimaa4kah7mqqxdj7q1zfxh";
+          rev = "62d39157370219a1680265fa593f90ccd51457da";
+          sha256 = "0ghl3g8n8wlw8rnmgbivlrm99wcwn93bv8flyalzs0z9j7p7fdq9";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3cfa28c7314fa57fa9a3aaaadf9ef83f8ae541a9/recipes/emacsql-sqlite";
           sha256 = "1y81nabzzb9f7b8azb9giy23ckywcbrrg4b88gw5qyjizbb3h70x";
-          name = "emacsql-sqlite";
+          name = "recipe";
         };
         packageRequires = [ emacs emacsql ];
         meta = {
@@ -18679,20 +23407,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    emacsshot = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    emacsshot = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "emacsshot";
         version = "20161018.743";
         src = fetchFromGitHub {
           owner = "marcowahl";
           repo = "emacsshot";
-          rev = "11ace77ab718292d05b82d93178380aff591468b";
-          sha256 = "108zbpg51x2pljvizmdvlxsqyibbp8rinf7747asf6b7ahkxj97w";
+          rev = "752244330ff829d8dbea7fcf7065f5d4708038a6";
+          sha256 = "15y0vv8vm30yp3mn0x7lqq3vd7wb2qny424jx5f4m74hy2xi3svr";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/efdd85accc6053f92efcbfdb7ddc37b23a07a3b0/recipes/emacsshot";
           sha256 = "08xqx017yfizdj8wz7nbh9i7qpar6398sri78abzf78inv828s9j";
-          name = "emacsshot";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -18700,8 +23431,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    emamux = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    emamux = callPackage ({ emacs
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "emamux";
         version = "20170226.1937";
         src = fetchFromGitHub {
@@ -18710,10 +23445,10 @@
           rev = "39f57786b2cdd3844888df42d71c7bd251f07158";
           sha256 = "184669qynz1m93s9nv5pdc8m4bnvqa56wz472nsq4xhixz44jjsv";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6de1ed3dfccb9f7e7b8586e8334af472a4988840/recipes/emamux";
           sha256 = "1pg0gzi8rn0yafssrsiqdyj5dbfy984srq1r4dpp8p3bi3n0fkfz";
-          name = "emamux";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -18721,20 +23456,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    emamux-ruby-test = callPackage ({ emamux, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }:
-    melpaBuild {
+    emamux-ruby-test = callPackage ({ emamux
+                                    , fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild
+                                    , projectile }:
+      melpaBuild {
         pname = "emamux-ruby-test";
         version = "20130812.939";
         src = fetchFromGitHub {
           owner = "syohex";
           repo = "emamux-ruby-test";
-          rev = "23b73c650573b340351a919da3da416acfc2ac84";
-          sha256 = "1idsvilsvlxh72waalhl8vrsmh0vfvz56qcv56fc2c0pb1i90icn";
+          rev = "785bfd44d097a46bb2ebe1e62ac7595fd4dc9ab5";
+          sha256 = "1gcjki5rcc4gmcq6gcpdvahn4j6f39583jgq8g7ykylfqk2qhrjh";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f11759710881bdf5a77bd309acb03a6699cc7fd6/recipes/emamux-ruby-test";
           sha256 = "1l1hp2dggjlc287qkfyj21w9lri4agh91g5x707qqq8nicdlv3xm";
-          name = "emamux-ruby-test";
+          name = "recipe";
         };
         packageRequires = [ emamux projectile ];
         meta = {
@@ -18742,20 +23482,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    emaps = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    emaps = callPackage ({ fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "emaps";
-        version = "20160910.521";
+        version = "20180712.1216";
         src = fetchFromGitHub {
           owner = "GuiltyDolphin";
           repo = "emaps";
-          rev = "728eb6eeae46194f32a01bafa349ece520bc7a10";
-          sha256 = "1asl6wkibfcxmf1kwnppbh8qpa454ssyxrqfh2d5dna3gxaa2cqm";
+          rev = "823b8f72e6459c9f1a5dd62451ee4005ef71d955";
+          sha256 = "1g9637j8f65q3l6k4aw5p847m891irh74kg3pa2p9w0ppsa6n3jm";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4faeda02aabc0b6c5003cdf5d1fdfca0fd71b0d7/recipes/emaps";
           sha256 = "151rh6lyqi0ps2w022shzjj67nkg6y4m1nfj90qyc7jgl64qb9qw";
-          name = "emaps";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -18763,8 +23506,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    ember-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ember-mode = callPackage ({ cl-lib ? null
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "ember-mode";
         version = "20171208.559";
         src = fetchFromGitHub {
@@ -18773,10 +23520,10 @@
           rev = "755256782478cb724edd8f111225d7c8d342f90c";
           sha256 = "02x12b26l9qyq9cmg56ys222qxbc8zldw40scq3mfhfqqk4b43g7";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9ac1eef4ad87b1b6b6d8e63d340ba03dc013425b/recipes/ember-mode";
           sha256 = "0fwd34cim29dg802ibsfd120px9sj54d4wzp3ggmjjzwkl9ky7dx";
-          name = "ember-mode";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -18784,8 +23531,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    ember-yasnippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
-    melpaBuild {
+    ember-yasnippets = callPackage ({ fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild
+                                    , yasnippet }:
+      melpaBuild {
         pname = "ember-yasnippets";
         version = "20160526.958";
         src = fetchFromGitHub {
@@ -18794,10 +23545,10 @@
           rev = "3b5bd01569646237bf1b540d097e12f9118b67f4";
           sha256 = "0g7hp1aq0zznbhd234dpbblnagn34fxdasc5v4lfhm5ykw5xyb5x";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6c37a13d56e9a0a4e7e2c11349ed87610a0f6b2c/recipes/ember-yasnippets";
           sha256 = "1jwkzcqcpy7ykdjhsqmg8ds6qyl4jglyjbgg7v301x068dsxkja6";
-          name = "ember-yasnippets";
+          name = "recipe";
         };
         packageRequires = [ yasnippet ];
         meta = {
@@ -18805,8 +23556,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    embrace = callPackage ({ cl-lib ? null, expand-region, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    embrace = callPackage ({ cl-lib ? null
+                           , expand-region
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "embrace";
         version = "20171031.1133";
         src = fetchFromGitHub {
@@ -18815,10 +23571,10 @@
           rev = "dd5da196e5bcc5e6d87e1937eca0c21da4334ef2";
           sha256 = "1m0qyipkp5ydgcav8d0m58fbj1gilipbj7g8mg40iajr8wfqcjdc";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e8f07e3b5ba4ec4b0b79fba5a2cca5a3986218b6/recipes/embrace";
           sha256 = "1w9zp9n91703d6jd4adl2xk574wsr7fm2a9v32b1i9bi3hr0hdjc";
-          name = "embrace";
+          name = "recipe";
         };
         packageRequires = [ cl-lib expand-region ];
         meta = {
@@ -18826,8 +23582,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    emlib = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    emlib = callPackage ({ cl-lib ? null
+                         , dash
+                         , fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "emlib";
         version = "20161126.723";
         src = fetchFromGitHub {
@@ -18836,10 +23597,10 @@
           rev = "dea2af00f551ea580c641d86dd69219f7d4f3685";
           sha256 = "0p52pkq3wvnhg0l7cribhc39zl1cjjxgw9qzpmwd0jw1g1lslwbm";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/46b3738975c8082d9eb6da9fe733edb353aa7069/recipes/emlib";
           sha256 = "02l135v3pqpf6ngfq11h4rc843iwh3dgi4rr3gcc63pjl4ws2w2c";
-          name = "emlib";
+          name = "recipe";
         };
         packageRequires = [ cl-lib dash ];
         meta = {
@@ -18847,20 +23608,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    emmet-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    emmet-mode = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "emmet-mode";
-        version = "20161113.2158";
+        version = "20180612.2041";
         src = fetchFromGitHub {
           owner = "smihica";
           repo = "emmet-mode";
-          rev = "5af39aaef59125fd80901f275c23c89493f9d133";
-          sha256 = "1csfd8ixz9gk0hkakcs5qv4f3qxg605blav3a463ipw2a8alyava";
+          rev = "1acb821e0142136344ccf40c1e5fb664d7db2e70";
+          sha256 = "1p25h191bm0h5b3w5apg7wks51k7pb7h4dlww4jbl9ri4d33fzcl";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/emmet-mode";
           sha256 = "0wjv4hqddjvbdrmsxzav5rpwnm2n6lr86jzkrnav8f2kyzypdsnr";
-          name = "emmet-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -18868,19 +23632,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    emms = callPackage ({ cl-lib ? null, fetchgit, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    emms = callPackage ({ cl-lib ? null
+                        , fetchgit
+                        , fetchurl
+                        , lib
+                        , melpaBuild }:
+      melpaBuild {
         pname = "emms";
-        version = "20180412.639";
+        version = "20180708.1823";
         src = fetchgit {
           url = "https://git.savannah.gnu.org/git/emms.git";
-          rev = "9b7b50a89bc4f9df7f9edd6e939508288f0ffa9b";
-          sha256 = "0v271gk6q77zs0gdp9asbqd8alrn6ifxzzjkqb3hd4xdafv35sf3";
+          rev = "9b702f38e3486d67cb67194e98ea72dda25be1af";
+          sha256 = "13l0didxiagcv8rr9ifdjk92qpcghyqkqshpcr76ix4dm3mbaymk";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/emms";
           sha256 = "1xpry8h96gvjnc0v8x0vk5dnmlq1r7m3ljpampdwv9pfwl95fh94";
-          name = "emms";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -18888,8 +23656,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    emms-bilibili = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    emms-bilibili = callPackage ({ cl-lib ? null
+                                 , emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "emms-bilibili";
         version = "20180102.2018";
         src = fetchFromGitHub {
@@ -18898,10 +23671,10 @@
           rev = "294bca3dfc42fe3a55fb326ab39bc0fcfc8c5090";
           sha256 = "0q8z3q1agwgb3d0kpvac7a98p3q4ljjnv404cf9kihjjfxvh4vm5";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/533f96d1e68eda20b2d2e7f8eb3e7fa118904970/recipes/emms-bilibili";
           sha256 = "1mx3fn2x526np8awjn0ydsqh59b4aznf3sig410fbr6wk6pa6y47";
-          name = "emms-bilibili";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -18909,8 +23682,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    emms-info-mediainfo = callPackage ({ emms, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    emms-info-mediainfo = callPackage ({ emms
+                                       , fetchFromGitHub
+                                       , fetchurl
+                                       , lib
+                                       , melpaBuild }:
+      melpaBuild {
         pname = "emms-info-mediainfo";
         version = "20131223.500";
         src = fetchFromGitHub {
@@ -18919,10 +23696,10 @@
           rev = "bce16eae9eacd38719fea62a9755225a888da59d";
           sha256 = "07qbbs2i05bqndr4dxb84z50wav8ffbc56f6saw6pdx6n0sw6n6n";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d08c28c6ff4caf14f0bf4b0f40f16660dac2d5d9/recipes/emms-info-mediainfo";
           sha256 = "17x8vvfhx739hcj9j1nh6j4r6zqnwa5zq9zpi9b6lxc8979k3m4w";
-          name = "emms-info-mediainfo";
+          name = "recipe";
         };
         packageRequires = [ emms ];
         meta = {
@@ -18930,8 +23707,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    emms-mark-ext = callPackage ({ emms, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    emms-mark-ext = callPackage ({ emms
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "emms-mark-ext";
         version = "20130528.2027";
         src = fetchFromGitHub {
@@ -18940,10 +23721,10 @@
           rev = "ec68129e3e9e469e5bf160c6a1b7030e322f3541";
           sha256 = "03a7sn8pl0pnr05rmrrbw4hjyi8vpjqbvkvh0fqnij913a6qc64l";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/36b7292160d3dab1a684d09c848a6b0f68b31add/recipes/emms-mark-ext";
           sha256 = "13h6hy8y0as0xfc1cg8balw63as81fzar32q9h4zhnndl3hc1081";
-          name = "emms-mark-ext";
+          name = "recipe";
         };
         packageRequires = [ emms ];
         meta = {
@@ -18951,8 +23732,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    emms-mode-line-cycle = callPackage ({ emacs, emms, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    emms-mode-line-cycle = callPackage ({ emacs
+                                        , emms
+                                        , fetchFromGitHub
+                                        , fetchurl
+                                        , lib
+                                        , melpaBuild }:
+      melpaBuild {
         pname = "emms-mode-line-cycle";
         version = "20160221.320";
         src = fetchFromGitHub {
@@ -18961,10 +23747,10 @@
           rev = "2c2f395e484a1d345050ddd61ff5fab71a92a6bc";
           sha256 = "0q80f0plch6k4lhs8c9qm3mfycfbp3kn5sjrk9zxgxwnn901y9mp";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/dab676acd774616a32a0373f30647f3cb4522afc/recipes/emms-mode-line-cycle";
           sha256 = "1jdmfh1i9v84iy7bj2dbc3s2wfzkrby3pabd99gnqzd9gn1cn8ca";
-          name = "emms-mode-line-cycle";
+          name = "recipe";
         };
         packageRequires = [ emacs emms ];
         meta = {
@@ -18972,20 +23758,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    emms-player-mpv = callPackage ({ emms, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    emms-player-mpv = callPackage ({ emms
+                                   , fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "emms-player-mpv";
-        version = "20180415.1958";
+        version = "20180503.1427";
         src = fetchFromGitHub {
           owner = "dochang";
           repo = "emms-player-mpv";
-          rev = "c7efefd0b41fa910436a91eb3bca4db3a85ad940";
-          sha256 = "0h40nhrzndzhdq3ra8bzqg3gczbmjf010n0nan6dril427qvxdjw";
+          rev = "9c9ffc6f00a737a6db6377681a88e5292ebcf86b";
+          sha256 = "17kvkx63q30p5r2lsv6pqdm2zi8my3yn3js7j3c2qlygd9sf80pz";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9679cb8d4b3b9dce1e0bff16647ea3f3e02c4189/recipes/emms-player-mpv";
           sha256 = "175rmqx3bgys4chw8ylyf9rk07sg0llwbs9ivrv2d3ayhcz1lg9y";
-          name = "emms-player-mpv";
+          name = "recipe";
         };
         packageRequires = [ emms ];
         meta = {
@@ -18993,8 +23783,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    emms-player-mpv-jp-radios = callPackage ({ cl-lib ? null, emacs, emms, emms-player-simple-mpv, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    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 = "20180325.417";
         src = fetchFromGitHub {
@@ -19003,10 +23800,10 @@
           rev = "f6b37f5878c741124d5fca43c5b80af873541edd";
           sha256 = "1sxzh1bhdwln7kcn07agayyhmgyrbmmhgc3f85336xybc6ljpqs8";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/09ba6da5057061f055d4a3212d167f9666618d4f/recipes/emms-player-mpv-jp-radios";
           sha256 = "0gdap5cv08pz370fl92v9lyvgkbbyjhp9wsc4kyjm4f4pwx9fybv";
-          name = "emms-player-mpv-jp-radios";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs emms emms-player-simple-mpv ];
         meta = {
@@ -19014,8 +23811,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    emms-player-simple-mpv = callPackage ({ cl-lib ? null, emacs, emms, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    emms-player-simple-mpv = callPackage ({ cl-lib ? null
+                                          , emacs
+                                          , emms
+                                          , fetchFromGitHub
+                                          , fetchurl
+                                          , lib
+                                          , melpaBuild }:
+      melpaBuild {
         pname = "emms-player-simple-mpv";
         version = "20180316.849";
         src = fetchFromGitHub {
@@ -19024,10 +23827,10 @@
           rev = "101d120ccdee1c2c213fd2f0423c858b21649c00";
           sha256 = "1i6rxkm0ra0jbkkwgkwxg3vk5xfl794h1gkgnlpscynz0v94b6ll";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/emms-player-simple-mpv";
           sha256 = "1lv1rhd5vya068mnnaysfh56raar79hf2g413ysrk3yhyajk6316";
-          name = "emms-player-simple-mpv";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs emms ];
         meta = {
@@ -19035,8 +23838,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    emms-soundcloud = callPackage ({ emms, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }:
-    melpaBuild {
+    emms-soundcloud = callPackage ({ emms
+                                   , fetchFromGitHub
+                                   , fetchurl
+                                   , json ? null
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "emms-soundcloud";
         version = "20131221.345";
         src = fetchFromGitHub {
@@ -19045,10 +23853,10 @@
           rev = "87e5cbf9609d1f26c24dc834fdeb78b33d453c2b";
           sha256 = "0nx5bb5fjmaa1nhkbfnhd1aydqrq390x4rl1vfh11ilnf52wzzld";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/19e423525255371cf479842885eca07e801f6d00/recipes/emms-soundcloud";
           sha256 = "0nf1f719m4pvxn0mf4qyx8mzwhrhv6kchnrpiy9clx520y8x3dqi";
-          name = "emms-soundcloud";
+          name = "recipe";
         };
         packageRequires = [ emms json ];
         meta = {
@@ -19056,8 +23864,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    emms-state = callPackage ({ emms, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    emms-state = callPackage ({ emms
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "emms-state";
         version = "20160504.105";
         src = fetchFromGitHub {
@@ -19066,10 +23878,10 @@
           rev = "77930300222333b71eafd495cc1fee3a3585eb23";
           sha256 = "1kipxa9ax8zi9qqk19mknpg7nnlzgr734kh9bnklydipwnsy00pi";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8f2798e22c6ccbadf73e65d8a8d901e47f55cb83/recipes/emms-state";
           sha256 = "080y02hxxqfn0a0dhq5vm0r020v2q3h1612a2zkq5fxi8ssvhp9i";
-          name = "emms-state";
+          name = "recipe";
         };
         packageRequires = [ emms ];
         meta = {
@@ -19077,8 +23889,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    emoji-cheat-sheet-plus = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
-    melpaBuild {
+    emoji-cheat-sheet-plus = callPackage ({ emacs
+                                          , fetchFromGitHub
+                                          , fetchurl
+                                          , helm
+                                          , lib
+                                          , melpaBuild }:
+      melpaBuild {
         pname = "emoji-cheat-sheet-plus";
         version = "20150617.631";
         src = fetchFromGitHub {
@@ -19087,10 +23904,10 @@
           rev = "96a003127d646a2683d81ca906a17eace0a6413e";
           sha256 = "1rk7am0xvpnv98yi7a62wlyh576md4n2ddj7nm201bjd4wdl2yxk";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ffbfae9577673ef8d50b55624f94288e315deba4/recipes/emoji-cheat-sheet-plus";
           sha256 = "1ciwlbw0ihm0p5gnnl3safcj7dxwiy53bkj8cmw3i334al0gjnnv";
-          name = "emoji-cheat-sheet-plus";
+          name = "recipe";
         };
         packageRequires = [ emacs helm ];
         meta = {
@@ -19098,8 +23915,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    emoji-display = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    emoji-display = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "emoji-display";
         version = "20140117.213";
         src = fetchFromGitHub {
@@ -19108,10 +23928,10 @@
           rev = "bb4217f6400151a9cfa6d4524b8427f01feb5193";
           sha256 = "0sh4q4sb4j58ryvvmlsx7scry9inzgv2ssa87vbyzpxq0435l229";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2c34abbda5acbd52f4e79ce9f87f9ae0fa1e48d5/recipes/emoji-display";
           sha256 = "04cf18z26d64l0sv8qkbxjixi2wbw23awd5fznvg1cs8ixss01j9";
-          name = "emoji-display";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -19119,20 +23939,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    emoji-fontset = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    emoji-fontset = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "emoji-fontset";
         version = "20160726.1224";
         src = fetchFromGitHub {
           owner = "zonuexe";
           repo = "emoji-fontset.el";
-          rev = "10be897fa5165fd40fd35a89e38c759e008fa775";
-          sha256 = "1aanl5dd2m8jlyq27ymhc6l9i00cpi30wwhpaf67dlvk9gk89f64";
+          rev = "e460c9a08e48ec4103e38a7a04acae20880149a9";
+          sha256 = "0xdlqsrwdf0smi5z9rjj46nwrrfpl0gzanf0jmdg8zzn62l6ldck";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/60df435eb82fcc9a8a02a0a271bb6a2d5a161bc4/recipes/emoji-fontset";
           sha256 = "19affsvlm1rzrzdh1k6xsv79icdkzx4izxivrd2ia6y2wcg9wc5d";
-          name = "emoji-fontset";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -19140,20 +23963,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    emoji-recall = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    emoji-recall = callPackage ({ emacs
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "emoji-recall";
         version = "20160723.1508";
         src = fetchFromGitHub {
           owner = "lujun9972";
           repo = "emoji-recall.el";
-          rev = "d9122f8fb1467309260109a1985cd14f18fdf631";
-          sha256 = "13ajzafm9wmddch8ipjjkv2p13fmyd0ghdr479lll5c7xff2051x";
+          rev = "1c12d18e5592eaa2138dd3034012dced277e6d99";
+          sha256 = "0h65sapfa18z7xiyzsdizys204mvkzgmb3fbq75y1ddcrg9q0ikf";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8f03b34d3e8e5edf9888c71b6e4bd2e1a5aec016/recipes/emoji-recall";
           sha256 = "06cahk2h6q3vlw2p4jmjrpzycxpm884p31yhbp77lagkqhs2fzbk";
-          name = "emoji-recall";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -19161,20 +23988,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    emojify = callPackage ({ emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, seq }:
-    melpaBuild {
+    emojify = callPackage ({ emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , ht
+                           , lib
+                           , melpaBuild
+                           , seq }:
+      melpaBuild {
         pname = "emojify";
-        version = "20180320.1933";
+        version = "20180611.838";
         src = fetchFromGitHub {
           owner = "iqbalansari";
           repo = "emacs-emojify";
-          rev = "a86afc14e20ec7287c2b37f5b64318c209c9bbd3";
-          sha256 = "08z699ycyidm2c1yi0zhrg6nhhdf3gqx3yi6h9z4n61ns0irg8r5";
+          rev = "38ae28d95b58e9fb86a3495a2dda3e5de254c4fc";
+          sha256 = "1dk4kx5hvhcrmbhyx0ri9i934i8m3mcs76hk5h8qnbhdknmsh3rz";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/488d2751b5fd3bf00f5a6f0545530f44563b86d7/recipes/emojify";
           sha256 = "1sgd32qm43hwby75a9q2pz1yfzj988i35d8p9f18zvbxypy7b2yp";
-          name = "emojify";
+          name = "recipe";
         };
         packageRequires = [ emacs ht seq ];
         meta = {
@@ -19182,8 +24015,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    emojify-logos = callPackage ({ emojify, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    emojify-logos = callPackage ({ emojify
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "emojify-logos";
         version = "20171125.214";
         src = fetchFromGitHub {
@@ -19192,10 +24029,10 @@
           rev = "96c74383a7c69e839ba41de3507154ca4ad564a1";
           sha256 = "1z2rhs2kvafcfqqvq78yb5zp0pnn9s0mhng0rymfghi704cdifm6";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/114d5596a7b36f47c150c413c6ecc74de36ca239/recipes/emojify-logos";
           sha256 = "0kgci1svi80xnz44bvh19si8bcjllrkm9rbd8761h77iylkqs3q5";
-          name = "emojify-logos";
+          name = "recipe";
         };
         packageRequires = [ emojify ];
         meta = {
@@ -19203,8 +24040,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    empos = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    empos = callPackage ({ fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "empos";
         version = "20151011.1216";
         src = fetchFromGitHub {
@@ -19213,10 +24053,10 @@
           rev = "7b99ad30e56937adb7e6349777e5a2045597d564";
           sha256 = "0bm0cxnv7g2dzfvfhkyy16kzn6shvy9gzypiqyjj42ng54xmhs0n";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/461f7849e7be986994dd1e7cf109b66e8c37c719/recipes/empos";
           sha256 = "0wbrszl9rq4is0ymxq9lxpqzlfg93gljh6almjy0hp3cs7pkzyl4";
-          name = "empos";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -19224,20 +24064,34 @@
           license = lib.licenses.free;
         };
       }) {};
-    emr = callPackage ({ cl-lib ? null, clang-format, dash, emacs, fetchFromGitHub, fetchurl, iedit, lib, list-utils, melpaBuild, paredit, popup, projectile, redshank, s }:
-    melpaBuild {
+    emr = callPackage ({ cl-lib ? null
+                       , clang-format
+                       , dash
+                       , emacs
+                       , fetchFromGitHub
+                       , fetchurl
+                       , iedit
+                       , lib
+                       , list-utils
+                       , melpaBuild
+                       , paredit
+                       , popup
+                       , projectile
+                       , redshank
+                       , s }:
+      melpaBuild {
         pname = "emr";
-        version = "20170811.1057";
+        version = "20180708.1011";
         src = fetchFromGitHub {
           owner = "chrisbarrett";
           repo = "emacs-refactor";
-          rev = "d7009b30be810af6bb33c7d99a9b320e2aaeb698";
-          sha256 = "1hx5bv1banrnsb9wrnn57b4wj981qpvnx66px7h304yr95x8bls4";
+          rev = "8e556aa5a932dcf21dff985c528cff41a99ba332";
+          sha256 = "18m9ypdarwisksh7pyxgvp3shv2ikvqjijdgjgm0l4jz3vrflpqw";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2cd2ebec5bd6465bffed284130e1d534f52169a9/recipes/emr";
           sha256 = "05vpfxg6lviclnms2zyrza8dc87m60mimlwd11ihvsbngi9gcw8x";
-          name = "emr";
+          name = "recipe";
         };
         packageRequires = [
           cl-lib
@@ -19257,20 +24111,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    enclose = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    enclose = callPackage ({ fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "enclose";
         version = "20121008.914";
         src = fetchFromGitHub {
           owner = "rejeep";
           repo = "enclose.el";
-          rev = "2747653e84af39017f503064bc66ed1812a77259";
-          sha256 = "0dz5xm05d7irh1j8iy08jk521p19cjai1kw68z2nngnyf1az7cim";
+          rev = "2fff3d4fcc1089f87647042d7164ba04282766ae";
+          sha256 = "1x0z3fr8qd1r6wdh7gjbx5fmd7yfmh8mjnp25zkzvgxvdg4gj91l";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/enclose";
           sha256 = "1bkrv3cwhbiydgfjhmyjr96cvsgr9zi8n0ir1akgamccm2ln73d6";
-          name = "enclose";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -19278,20 +24135,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    encourage-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    encourage-mode = callPackage ({ emacs
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "encourage-mode";
         version = "20151128.105";
         src = fetchFromGitHub {
           owner = "halbtuerke";
           repo = "encourage-mode.el";
-          rev = "99edacf2d94d168d3da0609860dc7253db7c9815";
-          sha256 = "0k5ns40s5nskn0zialwq96qll1v5k50lfa5xh8hxbpcamsfym6h8";
+          rev = "ca411e6bfd3d0edffe95852127bd995730b942e3";
+          sha256 = "0fvfzm9a25cajxbvvia1dpmiq2nn7qimwsqwcirpwzq9zsn4j7f4";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1e90146c03a3f85313e3d338c48547ccfb73f605/recipes/encourage-mode";
           sha256 = "0fwn6w7s61c08z0d8z3awclqrhszia9is30gm2kx4hwr9dhhwh63";
-          name = "encourage-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -19299,8 +24160,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    engine-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    engine-mode = callPackage ({ cl-lib ? null
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "engine-mode";
         version = "20180401.946";
         src = fetchFromGitHub {
@@ -19309,10 +24174,10 @@
           rev = "fd5a235b2c93b95143d676e6b654e388d7cdd956";
           sha256 = "0lynwd7s1mjppynh8424qk30jzcr384wvr21bqy6ylsxs19kqg0w";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ea1b5dfb6628cf17e77369f25341835aad425f54/recipes/engine-mode";
           sha256 = "1gg7i93163m7k7lr3pnal1svymnhzwrfpfcdc0798d7ybv26gg8c";
-          name = "engine-mode";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -19320,8 +24185,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    enh-ruby-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    enh-ruby-mode = callPackage ({ emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "enh-ruby-mode";
         version = "20180403.1251";
         src = fetchFromGitHub {
@@ -19330,10 +24199,10 @@
           rev = "fd50e71913e4dc714f71020701ab398a18b524b6";
           sha256 = "0al8bbhfjxqh40hkpiaziz5vsfy2m5saj7wcvs6xivz1ph5ass0b";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cd1ac1ce69b77b11f34c4175611a852e7ec0806c/recipes/enh-ruby-mode";
           sha256 = "0r486yajjf7vsaz92ypxpfmz2nsvw9giffpxb9szj7fcry3nfdns";
-          name = "enh-ruby-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -19341,8 +24210,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    enlive = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    enlive = callPackage ({ fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "enlive";
         version = "20170725.717";
         src = fetchFromGitHub {
@@ -19351,10 +24223,10 @@
           rev = "604a8ca272b6889f114e2b5a13adb5b1dc4bae86";
           sha256 = "1iwfb5hxhnp4rl3rh5yayik0xl2lg82klxkvqf29536pk8ip710m";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/388fa2580e687d9608b11cdc069841831b414b29/recipes/enlive";
           sha256 = "1dyayk37zik12qfh8zbjmhsch64yqsx3acrlm7hcnavx465hmhnz";
-          name = "enlive";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -19362,20 +24234,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    eno = callPackage ({ dash, edit-at-point, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    eno = callPackage ({ dash
+                       , edit-at-point
+                       , fetchFromGitHub
+                       , fetchurl
+                       , lib
+                       , melpaBuild }:
+      melpaBuild {
         pname = "eno";
         version = "20160110.234";
         src = fetchFromGitHub {
           owner = "enoson";
           repo = "eno.el";
-          rev = "40075bb1ed9e62f42c5799f3d3721734742ed417";
-          sha256 = "1qimqrvk0myqfi2l3viigkx1ld90qpjgi1gs6xhw2g51r8x4i3in";
+          rev = "c07674329f66d6b4ea6c3a3944f801ab77ccb7e6";
+          sha256 = "0var9h1nslww3zlqbl9mvrkz7c9i2g8ka22mwqc1iv92ka3w0czv";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a63b22f357b2d08b12fb86c27261ab4d687c5f7f/recipes/eno";
           sha256 = "1pcbvka3g32j1a2j7slw4jm80qpsk3ldziy5n4l02xpnqw6iwy6q";
-          name = "eno";
+          name = "recipe";
         };
         packageRequires = [ dash edit-at-point ];
         meta = {
@@ -19383,8 +24260,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    enotify = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    enotify = callPackage ({ fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "enotify";
         version = "20130407.648";
         src = fetchFromGitHub {
@@ -19393,10 +24273,10 @@
           rev = "7fd2f48ef4ff32c8f013c634ea2dd6b1d1409f80";
           sha256 = "0v5p97dvzrk3j59yjc6iny71j3fdw9bb8737wnnzm098ff42dfmd";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f10631b740eea56e7209d7e84f0da8613274ef1d/recipes/enotify";
           sha256 = "0mii6m6zw9y8njgzi79rcf1n251iw7qz3yqjjij3c19rk3zpm5qi";
-          name = "enotify";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -19404,20 +24284,30 @@
           license = lib.licenses.free;
         };
       }) {};
-    ensime = callPackage ({ company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s, sbt-mode, scala-mode, yasnippet }:
-    melpaBuild {
+    ensime = callPackage ({ company
+                          , dash
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild
+                          , popup
+                          , s
+                          , sbt-mode
+                          , scala-mode
+                          , yasnippet }:
+      melpaBuild {
         pname = "ensime";
-        version = "20180320.230";
+        version = "20180615.630";
         src = fetchFromGitHub {
           owner = "ensime";
           repo = "ensime-emacs";
-          rev = "4ee365c35a34a41c31c262d4360132037461a60a";
-          sha256 = "0919ifs4xm7s7axpjrlb6ymv5xy647pbfczw03z0xwm5gx7fmra3";
+          rev = "34eb11dac3ec9d1c554c2e55bf056ece6983add7";
+          sha256 = "0hgbxd538xjzna97843014xkbpgs20nz7xpb6smls7rdxp5a1fpd";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/502faab70af713f50dd8952be4f7a5131075e78e/recipes/ensime";
           sha256 = "1d8y72l7bh93x9zdj3d3qjhrrzr804rgi6kjifyrin772dffjwby";
-          name = "ensime";
+          name = "recipe";
         };
         packageRequires = [
           company
@@ -19433,8 +24323,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    envdir = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    envdir = callPackage ({ dash
+                          , emacs
+                          , f
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "envdir";
         version = "20160221.1123";
         src = fetchFromGitHub {
@@ -19443,10 +24339,10 @@
           rev = "f29346c55ccf11d8c75628edc6d430ed63c36917";
           sha256 = "1jyhr9gv3d0rxv5iks2g9x6xbxqv1bvf1fnih96h4pgsfxz8wrp6";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/79c1497f709f6d23e4886359e09ab0456ed61777/recipes/envdir";
           sha256 = "085bfm4w7flrv8jvzdnzbdg3j5n29xfzbs1wlrr29mg9dja6s8g8";
-          name = "envdir";
+          name = "recipe";
         };
         packageRequires = [ dash emacs f ];
         meta = {
@@ -19454,8 +24350,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    eopengrok = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, magit, melpaBuild, s }:
-    melpaBuild {
+    eopengrok = callPackage ({ cl-lib ? null
+                             , dash
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , magit
+                             , melpaBuild
+                             , s }:
+      melpaBuild {
         pname = "eopengrok";
         version = "20160903.2359";
         src = fetchFromGitHub {
@@ -19464,10 +24367,10 @@
           rev = "78f734328aaf19c52720415c037708ece1944c4c";
           sha256 = "1c5kzq3h7gr0459z364dyq5m8vq0ydclw5wphqj9fyg28mxjj6ns";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2b87ea158a6fdbc6b4e40fd7c0f6814d135f8545/recipes/eopengrok";
           sha256 = "0756x78113286hwk1i1m5s8xq04gh7zxb4fkmw58lg2ssff8q6av";
-          name = "eopengrok";
+          name = "recipe";
         };
         packageRequires = [ cl-lib dash magit s ];
         meta = {
@@ -19475,20 +24378,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    epc = callPackage ({ concurrent, ctable, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    epc = callPackage ({ concurrent
+                       , ctable
+                       , fetchFromGitHub
+                       , fetchurl
+                       , lib
+                       , melpaBuild }:
+      melpaBuild {
         pname = "epc";
         version = "20140609.2234";
         src = fetchFromGitHub {
           owner = "kiwanami";
           repo = "emacs-epc";
-          rev = "e1bfa5ca163273859336e3cc89b4b6460f7f8cda";
-          sha256 = "15nkrjgi64f829isfd6xrhl4zw8jirr8pkas7nisrbk1av868hx0";
+          rev = "94cd36a3bec752263ac9b1b3a9dd2def329d2af7";
+          sha256 = "0aa3d3k62rq649w57f8gb4jh0gj9h2mv5m66ikp0c35mrk3cpk1m";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8bc29a8d518ce7a584277089bd4654f52ac0f358/recipes/epc";
           sha256 = "1l9rcx07pa4b9z5654gyw6b64c95lcigzg15amphwr56v2g3rbzx";
-          name = "epc";
+          name = "recipe";
         };
         packageRequires = [ concurrent ctable ];
         meta = {
@@ -19496,8 +24404,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    epic = callPackage ({ fetchFromGitHub, fetchurl, htmlize, lib, melpaBuild }:
-    melpaBuild {
+    epic = callPackage ({ fetchFromGitHub
+                        , fetchurl
+                        , htmlize
+                        , lib
+                        , melpaBuild }:
+      melpaBuild {
         pname = "epic";
         version = "20170209.1623";
         src = fetchFromGitHub {
@@ -19506,10 +24418,10 @@
           rev = "a41826c330eb0ea061d58a08cc861b0c4ac8ec4e";
           sha256 = "0mvg52f2y3725hlzqcn2mh8jihnbg68wlqmq951sa3qfma7m40pp";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7c7162791d560846fe386746c00a9fe88c8007bb/recipes/epic";
           sha256 = "0gfl8if83jbs0icz6gcjkwxvcz5v744k1kvqnbx3ga481kds9rqf";
-          name = "epic";
+          name = "recipe";
         };
         packageRequires = [ htmlize ];
         meta = {
@@ -19517,20 +24429,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    epkg = callPackage ({ closql, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    epkg = callPackage ({ closql
+                        , dash
+                        , emacs
+                        , fetchFromGitHub
+                        , fetchurl
+                        , lib
+                        , melpaBuild }:
+      melpaBuild {
         pname = "epkg";
-        version = "20180318.1221";
+        version = "20180627.1353";
         src = fetchFromGitHub {
           owner = "emacscollective";
           repo = "epkg";
-          rev = "432312b9583ed7b88ad9644fd1bf2183765a892e";
-          sha256 = "0d882kahn7a0vri7a9r15lvmfx1zn2hsga6jfcc6jv0hqbswlb2k";
+          rev = "b3dac5d4596d304f17a283c5cfe9dc77989fa96a";
+          sha256 = "17qdywa8qw6n8a3r4s1cbjbmh2a4vjnxp6fqhiglbbfc1xqw2p1n";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2df16abf56e53d4a1cc267a78797419520ff8a1c/recipes/epkg";
           sha256 = "0vvkjjaffvwvsvld3c6hwd18icmp2lc7f9yqvclifpadi98dhpww";
-          name = "epkg";
+          name = "recipe";
         };
         packageRequires = [ closql dash emacs ];
         meta = {
@@ -19538,8 +24456,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    epl = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    epl = callPackage ({ cl-lib ? null
+                       , fetchFromGitHub
+                       , fetchurl
+                       , lib
+                       , melpaBuild }:
+      melpaBuild {
         pname = "epl";
         version = "20180205.1249";
         src = fetchFromGitHub {
@@ -19548,10 +24470,10 @@
           rev = "78ab7a85c08222cd15582a298a364774e3282ce6";
           sha256 = "0ksilx9gzdazngxfni5i632jpb1nprcxplsbhgqirs2xdl53q8v8";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9c6cf24e86d8865bd2e4b405466118de1894851f/recipes/epl";
           sha256 = "0zr3r2hn9jaxscrl83hyixznb8l5dzfr6fsac76aa8x12xgsc5hn";
-          name = "epl";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -19559,8 +24481,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    epm = callPackage ({ emacs, epl, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    epm = callPackage ({ emacs
+                       , epl
+                       , fetchFromGitHub
+                       , fetchurl
+                       , lib
+                       , melpaBuild }:
+      melpaBuild {
         pname = "epm";
         version = "20161027.34";
         src = fetchFromGitHub {
@@ -19569,10 +24496,10 @@
           rev = "ab3d194fc4d11520d6b9bce4746d7242f3f1606a";
           sha256 = "0a2197dyc4rgssqwi2bgd6cg1g23pirjpvyq9b77n1nl8jghp0sw";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e12e8ae2e8e8aff7cbd75a951dd328cb9ccf58b0/recipes/epm";
           sha256 = "0k94qhzxjzw5d0c53jnyx1xfciwr9qib845awyjaybzzs34s8r08";
-          name = "epm";
+          name = "recipe";
         };
         packageRequires = [ emacs epl ];
         meta = {
@@ -19580,20 +24507,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    epresent = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
-    melpaBuild {
+    epresent = callPackage ({ cl-lib ? null
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild
+                            , org }:
+      melpaBuild {
         pname = "epresent";
         version = "20160410.1901";
         src = fetchFromGitHub {
           owner = "dakrone";
           repo = "epresent";
-          rev = "6c8abedcf46ff08091fa2bba52eb905c6290057d";
-          sha256 = "1qa1nq63kax767gs53s75ihspirvh69l4xdm89mj57qvrbpz36z5";
+          rev = "bc3443879bb0111dcde2abd2f9c578e2cd438186";
+          sha256 = "1ws4hjvbwn1nf18qsbq0cl6q0rdk8fy4brrb1mcqfiag9arqmd6b";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/150487558ecda0520c637ffed1ffe2fbf2dc5811/recipes/epresent";
           sha256 = "176d1nwsafi6fb0dnv35bfskp0xczyzf2939gi4bz69zh0161jg8";
-          name = "epresent";
+          name = "recipe";
         };
         packageRequires = [ cl-lib org ];
         meta = {
@@ -19601,20 +24533,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    eprime-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    eprime-mode = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "eprime-mode";
         version = "20140513.1116";
         src = fetchFromGitHub {
           owner = "AndrewHynes";
           repo = "eprime-mode";
-          rev = "17a481af26496be91c07139a9bfc05cfe722506f";
-          sha256 = "1wwg46xdb488wxvglwvsy08vznrnmdmmbcvm9vb60dy3gqjmz7cw";
+          rev = "a680adedff897a22142d4628af4244a2a3dfca41";
+          sha256 = "0a481cr6y70kvxbsdwscv3srmvyvgk43chdzqljhhj4fgk0zsccn";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/37b4f3dce033fa18d23202ca4c36bc85754d547d/recipes/eprime-mode";
           sha256 = "0vswjcs24f3mdyw6ai7p21ab8pdn327lr2d6css0a5nrg539cn2g";
-          name = "eprime-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -19622,8 +24557,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    eproject = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
-    melpaBuild {
+    eproject = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , helm
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "eproject";
         version = "20180312.942";
         src = fetchFromGitHub {
@@ -19632,10 +24571,10 @@
           rev = "068218d2cf2138cb2e8fc29b57e773a0097a7e8b";
           sha256 = "110b8gn47m5kafmvxr8q9zzrj0pdn6ikw9xsx4z1rc58i02jy307";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d7e82668617a9b599f8994c720f3f123ba1e008a/recipes/eproject";
           sha256 = "0kpg4r57khbyinc73v9kj32b9m3b4nb5014r5fkl5mzzpzmd85b4";
-          name = "eproject";
+          name = "recipe";
         };
         packageRequires = [ helm ];
         meta = {
@@ -19643,8 +24582,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    erc-colorize = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    erc-colorize = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "erc-colorize";
         version = "20170107.539";
         src = fetchFromGitHub {
@@ -19653,10 +24595,10 @@
           rev = "d026a016dcb9d63d9ac66d30627a92a8f1681bbd";
           sha256 = "1zzmsrlknrpw26kizd4dm1g604y9nkgh85xal9la70k94qcgv138";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e69214e89ec0e00b36609fce3efe22b5c1add1f9/recipes/erc-colorize";
           sha256 = "1m941q7ql3yb71s71783nvz822bwhn1krmin18fvh0fbsbbnck2a";
-          name = "erc-colorize";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -19664,8 +24606,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    erc-crypt = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    erc-crypt = callPackage ({ cl-lib ? null
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "erc-crypt";
         version = "20161228.739";
         src = fetchFromGitHub {
@@ -19674,10 +24620,10 @@
           rev = "731f9264a5bf08a8fc0b5ce69e72058c86f873a5";
           sha256 = "13jpq5ws5dm8fyjrskk4icxwz8k5wgh396cc8f8wxrjna4wb843w";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a1a71b46c0370d2ed25aa3f39983048a04576ad5/recipes/erc-crypt";
           sha256 = "1mzzqcxjnll4d9r9n5z80zfb3ywkd8jx6b49g02vwf1iak9h7hv3";
-          name = "erc-crypt";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -19685,8 +24631,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    erc-hipchatify = callPackage ({ alert, emacs, fetchhg, fetchurl, lib, melpaBuild, request, s }:
-    melpaBuild {
+    erc-hipchatify = callPackage ({ alert
+                                  , emacs
+                                  , fetchhg
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild
+                                  , request
+                                  , s }:
+      melpaBuild {
         pname = "erc-hipchatify";
         version = "20170314.937";
         src = fetchhg {
@@ -19694,10 +24647,10 @@
           rev = "a53227513692";
           sha256 = "0av0y65hz7fbiiqzmk5mmw6jv7fivhcd1w3s2xn5y5jpgps56mrc";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b60e01e7064ce486fdac3d1b39fd4a1296b0dac5/recipes/erc-hipchatify";
           sha256 = "1a4gl05i757vvap0rzrfwms7mhw80sa84gvbwafrvj3x11rja24x";
-          name = "erc-hipchatify";
+          name = "recipe";
         };
         packageRequires = [ alert emacs request s ];
         meta = {
@@ -19705,8 +24658,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    erc-hl-nicks = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    erc-hl-nicks = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "erc-hl-nicks";
         version = "20180415.1246";
         src = fetchFromGitHub {
@@ -19715,10 +24671,10 @@
           rev = "756c4438a8245ccd3e389bf6c9850ee8453783ec";
           sha256 = "0c82rxpl5v7bbxirf1ksg06xv5xcddh8nkrpj7i6nvfarwdfnk4f";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/erc-hl-nicks";
           sha256 = "03hxsknf31vrja2amfa317ig4c34i5jpdq35zczrp00ap0s31nbq";
-          name = "erc-hl-nicks";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -19726,20 +24682,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    erc-image = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    erc-image = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "erc-image";
-        version = "20180407.1545";
+        version = "20180522.724";
         src = fetchFromGitHub {
           owner = "kidd";
           repo = "erc-image.el";
-          rev = "4ad26a06c8faf106172a0f8e472c677adca60542";
-          sha256 = "0280pijlnm071c2lh9z55w1xzgphfjq4zbl29r7igscy7q5dc60z";
+          rev = "82fb3871f02e24b1e880770b9a3d187aab43d0f0";
+          sha256 = "1q8mkf612fb4fjp8h4kbr107wn083iqfdgv8f80pcmil8y33dw9i";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/erc-image";
           sha256 = "1k5llh2jg2wxy9v03qrhwqa6g7apkqiqa47jm24z0ydqinm6zl83";
-          name = "erc-image";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -19747,20 +24706,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    erc-scrolltoplace = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, switch-buffer-functions }:
-    melpaBuild {
+    erc-scrolltoplace = callPackage ({ emacs
+                                     , fetchFromGitLab
+                                     , fetchurl
+                                     , lib
+                                     , melpaBuild
+                                     , switch-buffer-functions }:
+      melpaBuild {
         pname = "erc-scrolltoplace";
-        version = "20171104.1346";
-        src = fetchFromGitHub {
+        version = "20180607.2306";
+        src = fetchFromGitLab {
           owner = "jgkamat";
           repo = "erc-scrolltoplace";
-          rev = "7539654e4a72edcc5bba07a101961e5bf0a9d449";
-          sha256 = "11zpqwh1mlfifbgnvhc63bvnhg340jgxssm3m43hr1sxsyb52lh6";
+          rev = "feb0fbf1fd4bdf220ae2d31ea7c066d8e62089f9";
+          sha256 = "1wb3xm45g77daw2ncs8a8w0m8d2hi591jmzwy5xli1zgrr5mm8h3";
         };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/e8ba300957fc00f5e53cf63dfa1e37a27b0d6d60/recipes/erc-scrolltoplace";
-          sha256 = "1cr5nxdk854zcb1w0xvmi4mg45lxv011gap4i96nvdpd4qxmcxph";
-          name = "erc-scrolltoplace";
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/848cb17d871287c401496e4483e400b44696e89d/recipes/erc-scrolltoplace";
+          sha256 = "0632i1p26z3f633iinkqka0x2dd55x02xidk9qr66jh0dzfs6q3i";
+          name = "recipe";
         };
         packageRequires = [ emacs switch-buffer-functions ];
         meta = {
@@ -19768,8 +24732,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    erc-social-graph = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    erc-social-graph = callPackage ({ fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "erc-social-graph";
         version = "20150508.504";
         src = fetchFromGitHub {
@@ -19778,10 +24745,10 @@
           rev = "e6ef3416a1c5064054bf054d9f0c1c7bf54a9cd0";
           sha256 = "0k3gp4c74g5awk7v9lzb6py3dvf59nggh6dw7530cswxb6kg2psa";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9f347636c417aaf91728e56fd32313854fde3684/recipes/erc-social-graph";
           sha256 = "07arn3k89cqxab5x5lczv8bpgrbirmlw9p6c37fgrl3df6f46h4h";
-          name = "erc-social-graph";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -19789,20 +24756,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    erc-status-sidebar = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }:
-    melpaBuild {
+    erc-status-sidebar = callPackage ({ emacs
+                                      , fetchFromGitHub
+                                      , fetchurl
+                                      , lib
+                                      , melpaBuild
+                                      , seq }:
+      melpaBuild {
         pname = "erc-status-sidebar";
         version = "20171223.1324";
         src = fetchFromGitHub {
           owner = "drewbarbs";
           repo = "erc-status-sidebar";
-          rev = "9e972f4e31287362020daa81dc7af26999ea6c5b";
-          sha256 = "0g7m5r5f01i73k05wny0xycrjcyhzwc314a5lb8h09kglwnmisgv";
+          rev = "48ed93ca8e225b4a212d89ffc01803355f66ee0a";
+          sha256 = "1pxs48rsmna177qvglyk32hy3rdfydg0spr4rzkf1gvn169ispss";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/29631de8ec4140a8e35cc500902b58115faa3955/recipes/erc-status-sidebar";
           sha256 = "04qh70ih74vbavq7ccwj1ixpd8s3g8rck9bxv6zhm1yv34bslw5d";
-          name = "erc-status-sidebar";
+          name = "recipe";
         };
         packageRequires = [ emacs seq ];
         meta = {
@@ -19810,8 +24782,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    erc-terminal-notifier = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    erc-terminal-notifier = callPackage ({ fetchFromGitHub
+                                         , fetchurl
+                                         , lib
+                                         , melpaBuild }:
+      melpaBuild {
         pname = "erc-terminal-notifier";
         version = "20140115.224";
         src = fetchFromGitHub {
@@ -19820,10 +24795,10 @@
           rev = "a3dacb935845e4a20031212bbd82b2170f68d2a8";
           sha256 = "0cfqbqskh260zfq1lx1s8jz2351w2ij9m73rqim16fy7zr0s0670";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f2ba978b1ba63fac3b7f1e9776ddc3b054455ac4/recipes/erc-terminal-notifier";
           sha256 = "0vrxkg62qr3ki8n9mdn02sdni5fkj79fpkn0drx0a4kqp0nrrj7c";
-          name = "erc-terminal-notifier";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -19831,8 +24806,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    erc-track-score = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    erc-track-score = callPackage ({ fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "erc-track-score";
         version = "20130328.515";
         src = fetchFromGitHub {
@@ -19841,10 +24819,10 @@
           rev = "5b27531ea6b1a4c4b703b270dfa9128cb5bfdaa3";
           sha256 = "0n107d77z04ahypa7hn2165kkb6490v4vkzdm5zwm4lfhvlmp0x2";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/671afe0ff3889ae8c4b2d7b8617a3a25c16f3f0f/recipes/erc-track-score";
           sha256 = "19wjwah2n8ri6gyrsbzxnrvxwr5cj48sxrar1226n9miqvgj5whx";
-          name = "erc-track-score";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -19852,8 +24830,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    erc-tweet = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    erc-tweet = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "erc-tweet";
         version = "20150920.558";
         src = fetchFromGitHub {
@@ -19862,10 +24843,10 @@
           rev = "91fed61e139fa788d66a7358f0d50acc896414b8";
           sha256 = "118q4zj9dh5xnimcsi229j5pflhcd8qz0p212kc4p9dmyrx2iw0n";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/erc-tweet";
           sha256 = "0nmh3r8s69hfmkz0jycn7w2icb5gnw2qbf8xjd52kigkdb2s646c";
-          name = "erc-tweet";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -19873,8 +24854,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    erc-twitch = callPackage ({ erc ? null, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }:
-    melpaBuild {
+    erc-twitch = callPackage ({ erc ? null
+                              , fetchFromGitHub
+                              , fetchurl
+                              , json ? null
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "erc-twitch";
         version = "20170426.2306";
         src = fetchFromGitHub {
@@ -19883,10 +24869,10 @@
           rev = "53c6af0cb72e56d897d30a40e7e5066668d6b5ec";
           sha256 = "0qirx38czv8m7sgj3rm1zncmyd8z6k4xhd8ixwxl7nigfpqvvv4c";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/46f8640b24bade45cc729eeb370adf959f99526f/recipes/erc-twitch";
           sha256 = "08vlwcxrzc2ndm52112z1r0qnz6jlmjhiwq2j3j59fbw82ys61ia";
-          name = "erc-twitch";
+          name = "recipe";
         };
         packageRequires = [ erc json ];
         meta = {
@@ -19894,8 +24880,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    erc-view-log = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    erc-view-log = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "erc-view-log";
         version = "20140227.1239";
         src = fetchFromGitHub {
@@ -19904,10 +24893,10 @@
           rev = "c5a25f0cbca84ed2e4f72068c02b66bd0ea3b266";
           sha256 = "0bzi2sh2fhrz49j5y53h6jgf41av6rx78smb3bbk6m74is8vim2y";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0c0176d8e26014f7b62d14ac3adffa21a84b5741/recipes/erc-view-log";
           sha256 = "1k6fawblz0d7kz1y7sa3q43s7ci28jsmzkp9vnl1nf55p9xvv4cf";
-          name = "erc-view-log";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -19915,8 +24904,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    erc-youtube = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    erc-youtube = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "erc-youtube";
         version = "20150603.1436";
         src = fetchFromGitHub {
@@ -19925,10 +24917,10 @@
           rev = "97054ba8475b442e2aa81e5a291f668b7f28697f";
           sha256 = "0kh4amx3l3a14qaiyvjyak1jbybs6n49mdvzjrd1i2vd1y74zj5w";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a80ee9617a30a8ad1d457a0b0c7f35e6ec1c0bb2/recipes/erc-youtube";
           sha256 = "12ylxkskkgfv5x7vlkib963ichb3rlmdzkf4zh8a39cgl8wsmacx";
-          name = "erc-youtube";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -19936,8 +24928,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    erc-yt = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    erc-yt = callPackage ({ dash
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "erc-yt";
         version = "20150426.549";
         src = fetchFromGitHub {
@@ -19946,10 +24942,10 @@
           rev = "43e7d49325b17a3217a6ffb4a9daf75c5ff4e6f8";
           sha256 = "1dlw34kaslyvnsrahf4rm76r2b7qqqn589i4mmhr23prl8xbz9z9";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ece0a6185a36d52971c35a35f5aa76ddafec3ced/recipes/erc-yt";
           sha256 = "0yrwvahv4l2s1aavy6y6mjlrw8l11i00a249825ab5yaxrkzz7xc";
-          name = "erc-yt";
+          name = "recipe";
         };
         packageRequires = [ dash ];
         meta = {
@@ -19957,20 +24953,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    ercn = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ercn = callPackage ({ fetchFromGitHub
+                        , fetchurl
+                        , lib
+                        , melpaBuild }:
+      melpaBuild {
         pname = "ercn";
         version = "20150523.803";
         src = fetchFromGitHub {
           owner = "leathekd";
           repo = "ercn";
-          rev = "79a4df5609046ae2e2e3375998287be6dda80615";
-          sha256 = "0xw3d9fz4kmn1myrsy44ki4bgg0aclv41wldl6r9nhvkrnri41cv";
+          rev = "8f2493fb40753b9c3699322c205f4dcf0a5bd67b";
+          sha256 = "1hzzfh6fxx03cyb039jbhwdfd0zybfrlaqmcyf14f6dq4d3gvl92";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a12f264653d79224adeb5d0ae76518dc408ff1e9/recipes/ercn";
           sha256 = "0yvis02bypw6v1zv7i326y8s6j0id558n0bdri52hr5pw85imnlp";
-          name = "ercn";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -19978,8 +24977,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    ereader = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, xml-plus }:
-    melpaBuild {
+    ereader = callPackage ({ dash
+                           , emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild
+                           , s
+                           , xml-plus }:
+      melpaBuild {
         pname = "ereader";
         version = "20170809.2201";
         src = fetchFromGitHub {
@@ -19988,10 +24994,10 @@
           rev = "f3bbd3f13195f8fba3e3c880aab0e4c60430dcf3";
           sha256 = "18yqqqxsivnq2m8mxz7ifp0bfmn3q9m11w3abryxg2snh4vb5sy6";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ereader";
           sha256 = "1ai27lyb9xcmjjcnppzzhb6ilsvq9d9g9z7h79lp7axq761vind4";
-          name = "ereader";
+          name = "recipe";
         };
         packageRequires = [ dash emacs s xml-plus ];
         meta = {
@@ -19999,8 +25005,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    eredis = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    eredis = callPackage ({ fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "eredis";
         version = "20180221.1313";
         src = fetchFromGitHub {
@@ -20009,10 +25018,10 @@
           rev = "8a96034805fe0664132ce2e12deb9936503af2d4";
           sha256 = "1w4z98vr7iy6yxdk3lha7flk48ckxl2baaq8kx7abkirzfl8j4hh";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/63f06713d06911f836fe2a4bf199b0794ac89cf0/recipes/eredis";
           sha256 = "087lln2izn5bv7bprmbaciivf17vv4pz2cjl91hy2f0sww6nsiw8";
-          name = "eredis";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -20020,8 +25029,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    erefactor = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    erefactor = callPackage ({ cl-lib ? null
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "erefactor";
         version = "20160121.159";
         src = fetchFromGitHub {
@@ -20030,10 +25043,10 @@
           rev = "bf68085e5635eb94fd85709f8e1355c1f5534745";
           sha256 = "1v8x6qmhywfxs7crzv7hfl5n4zq5y3ar40l873946l4wyk0wclng";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/18063e16a6f556b1871e1a5b74e353a85a794e63/recipes/erefactor";
           sha256 = "0ma9sbrq4n8y5w7vvbhhgmw25aiykbq5yhxzm0knj32bgpviprw7";
-          name = "erefactor";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -20041,20 +25054,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    ergoemacs-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, undo-tree }:
-    melpaBuild {
+    ergoemacs-mode = callPackage ({ cl-lib ? null
+                                  , emacs
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild
+                                  , undo-tree }:
+      melpaBuild {
         pname = "ergoemacs-mode";
-        version = "20171030.738";
+        version = "20180709.645";
         src = fetchFromGitHub {
           owner = "ergoemacs";
           repo = "ergoemacs-mode";
-          rev = "3ce23bba3cb50562693860f87f3528c471d603ba";
-          sha256 = "1s3b9bridl78hh1mxmdk9nqlmqhibbaxk0a1cixmsf23s06w8w6l";
+          rev = "a5d46653fd3a521276630c81bf75d3e8d224e5cb";
+          sha256 = "10y79z7xakjl4x95mvf8jjqxxsgkmz0k7czl0vwhk6j8c910v871";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/02920517987c7fc698de9952cbb09dfd41517c40/recipes/ergoemacs-mode";
           sha256 = "0h99m0n3q41lw5fm33pc1405lrxyc8rzghnc6c7j4a6gr1d82s62";
-          name = "ergoemacs-mode";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs undo-tree ];
         meta = {
@@ -20062,8 +25081,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    ergoemacs-status = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, mode-icons, powerline }:
-    melpaBuild {
+    ergoemacs-status = callPackage ({ fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild
+                                    , mode-icons
+                                    , powerline }:
+      melpaBuild {
         pname = "ergoemacs-status";
         version = "20160317.2238";
         src = fetchFromGitHub {
@@ -20072,10 +25096,10 @@
           rev = "d952cc2361adf6eb4d6af60950ad4ab699c81320";
           sha256 = "06pdwrhflpi5rkigqnr5h3jzv3dm1p9nydpvql9w33ixm6qhjj71";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f4af9606cfe09cdd294fae6b4b1f477f7861fdb7/recipes/ergoemacs-status";
           sha256 = "065pw31s8dmqpag7zj40iv6dbl0qln7c65gcyp7pz9agg9rp6vbb";
-          name = "ergoemacs-status";
+          name = "recipe";
         };
         packageRequires = [ mode-icons powerline ];
         meta = {
@@ -20083,20 +25107,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    erlang = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    erlang = callPackage ({ emacs
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "erlang";
-        version = "20180323.612";
+        version = "20180618.557";
         src = fetchFromGitHub {
           owner = "erlang";
           repo = "otp";
-          rev = "40dc6b9fed7d51a204e0d69b7bba7e8cb6496ae5";
-          sha256 = "1ndzx4alfwc437d4j0bifgc0pignxs0nvwp4i2fdrpljcf0x0nxa";
+          rev = "9d5af99762b3795c763fb62c1516247bd3f8e12f";
+          sha256 = "0anlp0qj2blgdjzdw8rxmpz659yzbdl3r69b6slm1c1aa77ayc17";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang";
           sha256 = "1cs768xxbyrr78ln50k4yknmpbcc1iplws3k07r0gx5f3ca73iaq";
-          name = "erlang";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -20104,8 +25132,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    eros = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    eros = callPackage ({ emacs
+                        , fetchFromGitHub
+                        , fetchurl
+                        , lib
+                        , melpaBuild }:
+      melpaBuild {
         pname = "eros";
         version = "20180414.2318";
         src = fetchFromGitHub {
@@ -20114,10 +25146,10 @@
           rev = "dd8910279226259e100dab798b073a52f9b4233a";
           sha256 = "08chj3a0lw4ygi2sv7wj0i6ihfbi8jhylr8p92inif8b88r6wg3k";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/eros";
           sha256 = "0l79bn72x5m2lzglrwwngz3hax9pf8wv7ci86y5pkwaa8frxycww";
-          name = "eros";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -20125,8 +25157,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    ert-async = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ert-async = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "ert-async";
         version = "20151011.659";
         src = fetchFromGitHub {
@@ -20135,10 +25170,10 @@
           rev = "f64a7ed5b0d2900c9a3d8cc33294bf8a79bc8526";
           sha256 = "0hn9i405nfhjd1h9vnwj43nxbbz00khrwkjq0acfyxjaz1shfac9";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2ec669e3fc73b0b499b84cec87d0f8621274732e/recipes/ert-async";
           sha256 = "004798ckri5j72j0xvzkyciss1iz4lw9gya2749hkjxlamg14cn5";
-          name = "ert-async";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -20146,8 +25181,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    ert-expectations = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ert-expectations = callPackage ({ fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "ert-expectations";
         version = "20121009.34";
         src = fetchFromGitHub {
@@ -20156,10 +25194,10 @@
           rev = "aed70e002c4305b66aed7f6d0d48e9addd2dc1e6";
           sha256 = "0qgi3rj49k0hz4azg7ghcj6385p5s9gakqjhrjnhih7dxvihcgxi";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/84f836338818946a6bb31d35d6ae959571128ed5/recipes/ert-expectations";
           sha256 = "07mp0azb6wsa1z4s6q8jyh7dpzils0wh2bamfmxzy4gjqjwv8ncn";
-          name = "ert-expectations";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -20167,19 +25205,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    ert-junit = callPackage ({ ert ? null, fetchgit, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ert-junit = callPackage ({ ert ? null
+                             , fetchgit
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "ert-junit";
-        version = "20180407.1243";
+        version = "20180511.1548";
         src = fetchgit {
           url = "https://bitbucket.org/olanilsson/ert-junit";
-          rev = "8d7d703332e3a41bfc59de44fa8832435ff1633b";
-          sha256 = "1mbbv18pviirf220wjzfjlig8i3jwcl1bpv5awzvyzg2lm3h1nbc";
+          rev = "cd1f63627d4e6635086322f34be09ba535e26b97";
+          sha256 = "0a2ddvpm8yparl3zq05mp239k5dgplcmc9s61ak9d5qn65l8mwyr";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/27c627eacab54896a1363dbabc56250a65343dd8/recipes/ert-junit";
           sha256 = "0bv22mhh1ahbjwi6s1csxkh11dmy0srabkddjd33l4havykxlg6g";
-          name = "ert-junit";
+          name = "recipe";
         };
         packageRequires = [ ert ];
         meta = {
@@ -20187,20 +25229,27 @@
           license = lib.licenses.free;
         };
       }) {};
-    ert-modeline = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile, s }:
-    melpaBuild {
+    ert-modeline = callPackage ({ dash
+                                , emacs
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild
+                                , projectile
+                                , s }:
+      melpaBuild {
         pname = "ert-modeline";
         version = "20140115.215";
         src = fetchFromGitHub {
           owner = "chrisbarrett";
           repo = "ert-modeline";
-          rev = "e7be2b81191afb437b70368a819770f8f750e4af";
-          sha256 = "08yfq3qzscxvzyxvyvdqpkrm787278yhkdd9prbvrgjj80p8n7vq";
+          rev = "7c6340834387f749519616f9601821cb73fd657b";
+          sha256 = "08gk47fwd4hvl6gby3nyg3f9wq2l6phkkmq6yl04ff1qbjmvnx0p";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3b3a301889d6eea2470017519b080519efbe1bec/recipes/ert-modeline";
           sha256 = "06pc50q9ggin20cbfafxd53x35ac3kh85dap0nbws7514f473m7b";
-          name = "ert-modeline";
+          name = "recipe";
         };
         packageRequires = [ dash emacs projectile s ];
         meta = {
@@ -20208,8 +25257,17 @@
           license = lib.licenses.free;
         };
       }) {};
-    ert-runner = callPackage ({ ansi, commander, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s, shut-up }:
-    melpaBuild {
+    ert-runner = callPackage ({ ansi
+                              , commander
+                              , dash
+                              , f
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild
+                              , s
+                              , shut-up }:
+      melpaBuild {
         pname = "ert-runner";
         version = "20180215.857";
         src = fetchFromGitHub {
@@ -20218,10 +25276,10 @@
           rev = "0de42343a9de834320397d169c81725b2827e41f";
           sha256 = "0jc7n6mdv1kka47wmjjhgfw46l16mqlj5kkkyw16gd9g8dwcf6sr";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0a1acc68f296e80b6ed99a1783e9f67be54ffac9/recipes/ert-runner";
           sha256 = "0fnb8rmjr5lvc3dq0fnyxhws8ync1lj5xp8ycs63z4ax6gmdqr48";
-          name = "ert-runner";
+          name = "recipe";
         };
         packageRequires = [ ansi commander dash f s shut-up ];
         meta = {
@@ -20229,8 +25287,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    es-lib = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    es-lib = callPackage ({ cl-lib ? null
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "es-lib";
         version = "20141111.1030";
         src = fetchFromGitHub {
@@ -20239,10 +25301,10 @@
           rev = "753b27363e39c10edc9e4e452bdbbbe4d190df4a";
           sha256 = "0jq4yp80wiphlpsc0429rg8n50g8l4lf78q0l3nywz2p93smjy9b";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f10631b740eea56e7209d7e84f0da8613274ef1d/recipes/es-lib";
           sha256 = "0mwvgf5385qsp91zsdw75ipif1h90xy277xdmrpwixsxd7abbn0n";
-          name = "es-lib";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -20250,8 +25312,16 @@
           license = lib.licenses.free;
         };
       }) {};
-    es-mode = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, request, s, spark }:
-    melpaBuild {
+    es-mode = callPackage ({ cl-lib ? null
+                           , dash
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild
+                           , request
+                           , s
+                           , spark }:
+      melpaBuild {
         pname = "es-mode";
         version = "20180212.1425";
         src = fetchFromGitHub {
@@ -20260,10 +25330,10 @@
           rev = "c5ad728ce3fc2c513108e0ada2cd0c08ab94f870";
           sha256 = "0drmxxqgml36fymn4gqxbjimh8dgmm4yr68hsmsd0iz1lxglgda1";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9912193f73c4beae03b295822bf41cb2298756e2/recipes/es-mode";
           sha256 = "0zp84k5idqkrvc9qci49ains0b86kpk97lk1jcwyj75s4xsfyp1y";
-          name = "es-mode";
+          name = "recipe";
         };
         packageRequires = [ cl-lib dash request s spark ];
         meta = {
@@ -20271,20 +25341,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    es-windows = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    es-windows = callPackage ({ cl-lib ? null
+                              , emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "es-windows";
         version = "20140211.104";
         src = fetchFromGitHub {
           owner = "sabof";
           repo = "es-windows";
-          rev = "239e30408cb1adb4bc8bd63e2df34711fa910b4f";
-          sha256 = "14rsifcx2kwdmwq9zh41fkb848l0f4igp5v9pk3x4jd2yw9gay7m";
+          rev = "7ebe6c6e0831373847d7adbedeaa2e506b54b2af";
+          sha256 = "0cjchwrhk7bw87bg10zgcwkga50rvs0jn5v2jf6bbsxbcqx2nfc9";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/944d4cd54e040d2a58e1778cb282727deee83f92/recipes/es-windows";
           sha256 = "112ngkan0hv3y7m71479f46x5gwdmf0vhbqrzs5kcjwlacqlrahx";
-          name = "es-windows";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -20292,8 +25367,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    esa = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    esa = callPackage ({ cl-lib ? null
+                       , fetchFromGitHub
+                       , fetchurl
+                       , lib
+                       , melpaBuild }:
+      melpaBuild {
         pname = "esa";
         version = "20180403.825";
         src = fetchFromGitHub {
@@ -20302,10 +25381,10 @@
           rev = "417e0ac55abe9b17e0b7165d0df26bc018aff42e";
           sha256 = "0hib8q9fslvw02i1y19z78fv6yy88q09lhfdfmbdyn6yal21855q";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/esa";
           sha256 = "0y4mbq0z6vp0faxq6dq5hhxnsbi685amxqbvpxkxahl1nckp76lb";
-          name = "esa";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -20313,20 +25392,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    esh-autosuggest = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    esh-autosuggest = callPackage ({ company
+                                   , emacs
+                                   , fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "esh-autosuggest";
         version = "20171223.1855";
         src = fetchFromGitHub {
           owner = "dieggsy";
           repo = "esh-autosuggest";
-          rev = "2fd996c1a29b21e60854a3c90d7d4fc3d5b0aded";
-          sha256 = "1vkbyhkvvj5h63ybxg795m61c4157jm2v01y9m98jm4pxysmls7m";
+          rev = "aa921f8975b0f95d1cb0044e6ad7f17529261610";
+          sha256 = "19qhpvw5y7hvkqy8jdyrnm4m90jdxxdiaabcrjiwxmkzq3wgnx8q";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/dc3776068d6928fc1661a27cccaeb8fb85577099/recipes/esh-autosuggest";
           sha256 = "1rcng1dhy4yw95qg909ck33svpdxhv9v5k7226d29gp4y54dwyrx";
-          name = "esh-autosuggest";
+          name = "recipe";
         };
         packageRequires = [ company emacs ];
         meta = {
@@ -20334,20 +25418,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    esh-buf-stack = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    esh-buf-stack = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "esh-buf-stack";
         version = "20140107.218";
         src = fetchFromGitHub {
           owner = "tom-tan";
           repo = "esh-buf-stack";
-          rev = "ce0ea5aadca3150eaa9d2e6ec20296add4e99176";
-          sha256 = "1k8k9hl9m4vjqdw3x9wg04cy2lb9x64mq0mm0i3i6w59zrsnkn4q";
+          rev = "ea5da9ce8566ffe2e013f0e588701cb0825258b6";
+          sha256 = "1fllnc9awj24781h527n7b83i232i54ad5a9pczqvdr5s4kn4vfs";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/61e8f75aa0d5446c61aadc7ac22371e44a3761b8/recipes/esh-buf-stack";
           sha256 = "0zmwlsm98m9vbjk9mldfj2nf6cip7mlvb71j33ddix76yqggp4qg";
-          name = "esh-buf-stack";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -20355,8 +25442,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    esh-help = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    esh-help = callPackage ({ dash
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "esh-help";
         version = "20170829.2111";
         src = fetchFromGitHub {
@@ -20365,10 +25456,10 @@
           rev = "8a8a9d4d9852f8bd96da3b94e95ff57097ac8ec6";
           sha256 = "02fybhmqm2qmy5qdig7xvwxazqi499pw32kh5mrsbdr14srg9fhs";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ab94c66d1ed7cfdbc437ee239984ba70408fd28a/recipes/esh-help";
           sha256 = "1k925wmn8jy9rxxsxxawasxq6r4yzwl116digdx314gd3i04sh3w";
-          name = "esh-help";
+          name = "recipe";
         };
         packageRequires = [ dash ];
         meta = {
@@ -20376,8 +25467,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    eshell-autojump = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    eshell-autojump = callPackage ({ fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "eshell-autojump";
         version = "20150927.24";
         src = fetchFromGitHub {
@@ -20386,10 +25480,10 @@
           rev = "c6a8b81a16576df9875e721fbbfe6690d04e7e43";
           sha256 = "13crzgkx1lham1nfsg6hj2zg875majvnig0v4ydg691zk1qi4hc2";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/68bd1a8ec9d17eff2d23e15b3686f7c0b8723126/recipes/eshell-autojump";
           sha256 = "09l2680hknmdbwr4cncv1v4b0adik0c3sm5i9m3qbwyyxm8m41i5";
-          name = "eshell-autojump";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -20397,8 +25491,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    eshell-bookmark = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    eshell-bookmark = callPackage ({ emacs
+                                   , fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "eshell-bookmark";
         version = "20170922.814";
         src = fetchFromGitHub {
@@ -20407,10 +25505,10 @@
           rev = "deda4b848b2fb979dbe73ead2cb866610e3596ed";
           sha256 = "14dmsnixf9vqdhsixw693sml0fn80zcf0b37z049fb40cmppqxdw";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e7bf4702a907727990fcc676980f2b219e22ab0c/recipes/eshell-bookmark";
           sha256 = "1bybxlq1h5chrjxqjb23kq8dmgw2xrjwkrnvpbphblqzpdy5ck0s";
-          name = "eshell-bookmark";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -20418,8 +25516,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    eshell-did-you-mean = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    eshell-did-you-mean = callPackage ({ cl-lib ? null
+                                       , emacs
+                                       , fetchFromGitHub
+                                       , fetchurl
+                                       , lib
+                                       , melpaBuild }:
+      melpaBuild {
         pname = "eshell-did-you-mean";
         version = "20150915.1252";
         src = fetchFromGitHub {
@@ -20428,10 +25531,10 @@
           rev = "7cb6ef8e2274d0a50a9e114d412307a6543533d5";
           sha256 = "0v0wshck5n4hspcv1zk1g2nm6xiigcjp16lx0dc8wzkl6ymljvbg";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a7649eca21a21ddbbc7131f29cbbd91a00a84060/recipes/eshell-did-you-mean";
           sha256 = "1z1wpn3sj1gi5nn0a71wg0i3av0dijnk79dc32zh3qlh500kz8mz";
-          name = "eshell-did-you-mean";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -20439,8 +25542,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    eshell-fixed-prompt = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    eshell-fixed-prompt = callPackage ({ emacs
+                                       , fetchFromGitHub
+                                       , fetchurl
+                                       , lib
+                                       , melpaBuild
+                                       , s }:
+      melpaBuild {
         pname = "eshell-fixed-prompt";
         version = "20170804.635";
         src = fetchFromGitHub {
@@ -20449,10 +25557,10 @@
           rev = "4351b214de6d4e8e45279930448e2f93b491848e";
           sha256 = "1zx3zn28m5dnvsnkpqd26szv9yzplnb6wyp9vfjfs3hnasrizbxc";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/eshell-fixed-prompt";
           sha256 = "0mhrfxf19p4qqnlnnfc0z70324c7qiiv63riaz4cn5jj1ps3v0iy";
-          name = "eshell-fixed-prompt";
+          name = "recipe";
         };
         packageRequires = [ emacs s ];
         meta = {
@@ -20460,8 +25568,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    eshell-fringe-status = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    eshell-fringe-status = callPackage ({ fetchFromGitHub
+                                        , fetchurl
+                                        , lib
+                                        , melpaBuild }:
+      melpaBuild {
         pname = "eshell-fringe-status";
         version = "20170117.1516";
         src = fetchFromGitHub {
@@ -20470,10 +25581,10 @@
           rev = "adc6997c68e39c0d52a2af1b2fd5cf2057783797";
           sha256 = "1cwn4cvjjd4l5kk7s6cxzafjmdv3s7k78i73fvscmsnpwx9p2wj0";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9efd9fefab5d449b9f70d9f548aadfea52d66bc0/recipes/eshell-fringe-status";
           sha256 = "1vavidnijxzhr4v39q4bxi645vsfcj6vp0wnlhznpxagshr950lg";
-          name = "eshell-fringe-status";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -20481,8 +25592,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    eshell-git-prompt = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    eshell-git-prompt = callPackage ({ cl-lib ? null
+                                     , dash
+                                     , emacs
+                                     , fetchFromGitHub
+                                     , fetchurl
+                                     , lib
+                                     , melpaBuild }:
+      melpaBuild {
         pname = "eshell-git-prompt";
         version = "20170909.752";
         src = fetchFromGitHub {
@@ -20491,10 +25608,10 @@
           rev = "b6bb2d7bd4e393b4170b29891cfefb72ae020aab";
           sha256 = "02i00an9wa8ns66xq900la68m7pd4hwv95g83cvf22bypivx7p2y";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5272280b19579c302ba41b53c77e42bc5e8ccbda/recipes/eshell-git-prompt";
           sha256 = "0a8pyppqvnavvb8rwsjxagb76hra9zhs5gwa0ylyznmql83f8w8s";
-          name = "eshell-git-prompt";
+          name = "recipe";
         };
         packageRequires = [ cl-lib dash emacs ];
         meta = {
@@ -20502,8 +25619,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    eshell-prompt-extras = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    eshell-prompt-extras = callPackage ({ fetchFromGitHub
+                                        , fetchurl
+                                        , lib
+                                        , melpaBuild }:
+      melpaBuild {
         pname = "eshell-prompt-extras";
         version = "20180109.2234";
         src = fetchFromGitHub {
@@ -20512,10 +25632,10 @@
           rev = "1d8825dcc005b488c6366d0b3015fc6686194eea";
           sha256 = "1nqzd24wwvyzf3bn7m7vd4xqmj4p8z51h8cnli07yja17cr5gwx6";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/eshell-prompt-extras";
           sha256 = "0kh4lvjkayjdz5lqvdqmdcblxizxk9kwmigjwa68kx8z6ngmfwa5";
-          name = "eshell-prompt-extras";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -20523,20 +25643,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    eshell-up = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    eshell-up = callPackage ({ emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "eshell-up";
         version = "20170425.1037";
         src = fetchFromGitHub {
           owner = "peterwvj";
           repo = "eshell-up";
-          rev = "9c100bae5c3020e8d9307e4332d3b64e7dc28519";
-          sha256 = "00zdbcncjabgj5mp47l1chymx5na18v2g4kj730dgmj3rnl3iz2q";
+          rev = "b00e447ad7941ab31bcbb6bc0205fd492e887e7d";
+          sha256 = "1802887ad7y6m40azfvzz6aapdzkp655jpiryimqd11kwbsinmvv";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/eshell-up";
           sha256 = "1jyaaw950isissjjgqflfn2bllgdfcyphpbi7il06mv9p0dzpwvy";
-          name = "eshell-up";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -20544,8 +25668,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    eshell-z = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    eshell-z = callPackage ({ cl-lib ? null
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "eshell-z";
         version = "20170116.2038";
         src = fetchFromGitHub {
@@ -20554,10 +25682,10 @@
           rev = "c9334cbc1552234df3437f35d98e32f4d18446b8";
           sha256 = "1zja4hb2lj4m5w4j9mpc7xyqgg2ivpslllffjsg8x1w8xsxpj8fh";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8079cecaa59ad2ef22812960838123effc46a9b3/recipes/eshell-z";
           sha256 = "14ixazj0nscyqsdv7brqnfr0q8llir1pwb91yhl9jdqypmadpm6d";
-          name = "eshell-z";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -20565,20 +25693,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    eslint-fix = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    eslint-fix = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "eslint-fix";
-        version = "20160819.36";
+        version = "20180514.0";
         src = fetchFromGitHub {
           owner = "codesuki";
           repo = "eslint-fix";
-          rev = "be90d1e78b1dfd43b6b3b1c06868539e2ac27d3a";
-          sha256 = "1l7pm0ywjby0giilyn6qsz1zh54sgmvmii7y9jhrva13c5kgg9an";
+          rev = "f81f3b47a47460611fbdbdae1d23275ec78f2f8d";
+          sha256 = "0k3asz3mdz4nm8lq37x9rgx4wb8hsfyr0hlfyhzwdb10x57jfzns";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/eslint-fix";
           sha256 = "0ry271jlv95nhdqx6qxmvkpa10lpwkg1q6asnliviwplq2mxw2da";
-          name = "eslint-fix";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -20586,20 +25717,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    eslintd-fix = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    eslintd-fix = callPackage ({ dash
+                               , emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "eslintd-fix";
-        version = "20180407.911";
+        version = "20180429.755";
         src = fetchFromGitHub {
           owner = "aaronjensen";
           repo = "eslintd-fix";
-          rev = "97e8aa9b106e3e4b3a44c775ca972bdd2feda9ec";
-          sha256 = "1g6bv58m1052x2f5ffs17ryyqv0ay8vii5bwqs7dyfhlpppsn6c8";
+          rev = "90e451af4daa190d6c0e29fb714b0501a7cce89a";
+          sha256 = "01jysgdd4im4kf4afzwd4mm8x9vlpibb1w4yi2jvc0hglqddnr2g";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c72d2b3ee9b8066d51d09e165e58e9846ca879cc/recipes/eslintd-fix";
           sha256 = "0lv4xpp9bm1yyn9mj7hpgw1v46yyxr0nlwggbav78jbg4v7ai04v";
-          name = "eslintd-fix";
+          name = "recipe";
         };
         packageRequires = [ dash emacs ];
         meta = {
@@ -20607,8 +25743,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    espresso-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    espresso-theme = callPackage ({ fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "espresso-theme";
         version = "20170716.813";
         src = fetchFromGitHub {
@@ -20617,10 +25756,10 @@
           rev = "e79c5c14732b7e34aab75dbcc968839536536c59";
           sha256 = "0jdyxyc6mk0vh35wgic8ikvs9cid7b5ffqx94pkg1kpridm2wrzc";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/27c929ec2eac0459c7018019702599e09ac908fd/recipes/espresso-theme";
           sha256 = "1bsff8fnq5z0f6cwg6wprz8qi3ivsqxpxx6v6fxfammn74qqyvb5";
-          name = "espresso-theme";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -20628,20 +25767,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    espuds = callPackage ({ dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    espuds = callPackage ({ dash
+                          , f
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild
+                          , s }:
+      melpaBuild {
         pname = "espuds";
         version = "20160905.600";
         src = fetchFromGitHub {
           owner = "ecukes";
           repo = "espuds";
-          rev = "78fc53feaf77a98d63894cd410faee2a18107b00";
-          sha256 = "04479z1397vaz48bxx3f1xdvxnq1p01gg1y5f3hcbswjl8j3ahmr";
+          rev = "ef854367d469c6eff459d24a544addd21a4fbd23";
+          sha256 = "024msmnwlnsgqa523s3phxj1g77pyw917gz1fhz56062576nv22q";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/14cf66e6929db2a0f377612e786aaed9eb12b799/recipes/espuds";
           sha256 = "16yzw9l64ahf5v92jzb7vyb4zqxxplq6qh0y9rkfmvm59s4nhk6c";
-          name = "espuds";
+          name = "recipe";
         };
         packageRequires = [ dash f s ];
         meta = {
@@ -20649,20 +25794,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    esqlite = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, pcsv }:
-    melpaBuild {
+    esqlite = callPackage ({ fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild
+                           , pcsv }:
+      melpaBuild {
         pname = "esqlite";
         version = "20151206.406";
         src = fetchFromGitHub {
           owner = "mhayashi1120";
           repo = "Emacs-esqlite";
-          rev = "bc4047e09b8f6c34802db86095cd465935670dce";
-          sha256 = "05f8n24yvzm3zjvc1523ib44wv76ms5sn6mv8s1wrjsl190av0rn";
+          rev = "fae9826cbc255b0f0686a801288f1441bda5f631";
+          sha256 = "0ag444hfrpdrf3lnaz7l2plj392xgh7a2080421z3g0alc74m8h3";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bbec16cd1682ac15a81304f351f9c4e6b3b70fa9/recipes/esqlite";
           sha256 = "1dny5qjzl9gaj90ihzbhliwk0n0x7jz333hzf6gaw7wsjmx91wlh";
-          name = "esqlite";
+          name = "recipe";
         };
         packageRequires = [ pcsv ];
         meta = {
@@ -20670,20 +25819,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    esqlite-helm = callPackage ({ esqlite, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
-    melpaBuild {
+    esqlite-helm = callPackage ({ esqlite
+                                , fetchFromGitHub
+                                , fetchurl
+                                , helm
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "esqlite-helm";
         version = "20151116.50";
         src = fetchFromGitHub {
           owner = "mhayashi1120";
           repo = "Emacs-esqlite";
-          rev = "bc4047e09b8f6c34802db86095cd465935670dce";
-          sha256 = "05f8n24yvzm3zjvc1523ib44wv76ms5sn6mv8s1wrjsl190av0rn";
+          rev = "84d5b16198f30949c544affba751ee0d58a000d9";
+          sha256 = "0z92205ryab1j2pih89pj82cdgdsz0ddp7wwia8ivxvjpd3jp751";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bbec16cd1682ac15a81304f351f9c4e6b3b70fa9/recipes/esqlite-helm";
           sha256 = "00y2nwyx13xlny40afczr31lvbpnw1cgmj5wc3iycyznizg5kvhq";
-          name = "esqlite-helm";
+          name = "recipe";
         };
         packageRequires = [ esqlite helm ];
         meta = {
@@ -20691,29 +25845,38 @@
           license = lib.licenses.free;
         };
       }) {};
-    ess = callPackage ({ fetchFromGitHub, fetchurl, julia-mode, lib, melpaBuild }:
-    melpaBuild {
+    ess = callPackage ({ fetchFromGitHub
+                       , fetchurl
+                       , lib
+                       , melpaBuild }:
+      melpaBuild {
         pname = "ess";
-        version = "20180416.631";
+        version = "20180713.1416";
         src = fetchFromGitHub {
           owner = "emacs-ess";
           repo = "ESS";
-          rev = "27b55440d15ff532da86dfae6d030e76d1e6d518";
-          sha256 = "1sjnky11lhmiqcqrmdfi8xaf40jlm43kzbnviq031apwfxrvifi5";
+          rev = "a7458e17cc768b0f30f76d0c9d7f78948bb48d0a";
+          sha256 = "1bj8xdwg8l8xnrx7gc9viddm19lhf45zxshbcb3mchb6mq9b2vff";
         };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/12997b9e2407d782b3d2fcd2843f7c8b22442c0a/recipes/ess";
-          sha256 = "02kz4fjxr0vrj5mg13cq758nzykizq4dmsijraxv46snvh337v5i";
-          name = "ess";
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/156a6fa9e6ee16174d215c1dcd524aff847b3bf0/recipes/ess";
+          sha256 = "1psqrw9k7d2ha8zid2mkc6bgcyalrm3n53c00g3cgckkbahl7r6n";
+          name = "recipe";
         };
-        packageRequires = [ julia-mode ];
+        packageRequires = [];
         meta = {
           homepage = "https://melpa.org/#/ess";
           license = lib.licenses.free;
         };
       }) {};
-    ess-R-data-view = callPackage ({ ctable, ess, fetchFromGitHub, fetchurl, lib, melpaBuild, popup }:
-    melpaBuild {
+    ess-R-data-view = callPackage ({ ctable
+                                   , ess
+                                   , fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild
+                                   , popup }:
+      melpaBuild {
         pname = "ess-R-data-view";
         version = "20130509.458";
         src = fetchFromGitHub {
@@ -20722,10 +25885,10 @@
           rev = "d6e98d3ae1e2a2ea39a56eebcdb73e99d29562e9";
           sha256 = "1ya2ay52gkrd31pmw45ban8kkxgnzhhwkzkypwdhjfccq3ys835x";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/492c90bd0ee97c0b895efa0c5e647b2becc6db11/recipes/ess-R-data-view";
           sha256 = "0r2fzwayf3yb7fqk6f31x4xfqiiczwik8qw4rrvkqx2h3s1kz7i0";
-          name = "ess-R-data-view";
+          name = "recipe";
         };
         packageRequires = [ ctable ess popup ];
         meta = {
@@ -20733,8 +25896,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    ess-smart-equals = callPackage ({ emacs, ess, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ess-smart-equals = callPackage ({ emacs
+                                    , ess
+                                    , fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "ess-smart-equals";
         version = "20150201.2201";
         src = fetchFromGitHub {
@@ -20743,10 +25911,10 @@
           rev = "e0f5f18f01ed252fde50d051adf1fa6254a254c9";
           sha256 = "0ici253mllqyzcbhxrazfj2kl50brr8qid99fk9nlyfgh516ms1x";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4403cf87e05311d7fe0360f35f9634b9fdfc6f81/recipes/ess-smart-equals";
           sha256 = "0mfmxmsqr2byj56psx4h08cjc2j3aac3xqr04yd47k2mlivnyrxp";
-          name = "ess-smart-equals";
+          name = "recipe";
         };
         packageRequires = [ emacs ess ];
         meta = {
@@ -20754,8 +25922,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    ess-smart-underscore = callPackage ({ ess, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ess-smart-underscore = callPackage ({ ess
+                                        , fetchFromGitHub
+                                        , fetchurl
+                                        , lib
+                                        , melpaBuild }:
+      melpaBuild {
         pname = "ess-smart-underscore";
         version = "20170222.1715";
         src = fetchFromGitHub {
@@ -20764,10 +25936,10 @@
           rev = "02e8a03553f34fe7184afff97f20e560d6f8d617";
           sha256 = "0kk9n66xjm08cj6zdqxfn332fb4c2is4pdxgqamypdwsdjhcz57l";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b4d6166f5c80cf37c79256402fa633ad2274d065/recipes/ess-smart-underscore";
           sha256 = "01pki1xa8zpgvldcbjwg6vmslj7ddf44hsx976xipc95vrdk15r2";
-          name = "ess-smart-underscore";
+          name = "recipe";
         };
         packageRequires = [ ess ];
         meta = {
@@ -20775,20 +25947,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    ess-view = callPackage ({ ess, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    ess-view = callPackage ({ ess
+                            , f
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild
+                            , s }:
+      melpaBuild {
         pname = "ess-view";
-        version = "20160309.1315";
+        version = "20180525.1503";
         src = fetchFromGitHub {
           owner = "GioBo";
           repo = "ess-view";
-          rev = "5ae35d37ac625b16640401d19f9a51b340da9420";
-          sha256 = "1fdg8a4nsyjhwqsslawfvij77g3fp9klpas7m8vwjsjpc85iwh3x";
+          rev = "dab08b405dbda5aff71022c5cf021ea18b2bde0f";
+          sha256 = "1qi7gp5aj64b7sddvcms1c1x5h7j7dcd0rw6h4liw0d0gjkq82br";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/96960a8799138187b748a47ac007dc25d739fe10/recipes/ess-view";
           sha256 = "1zx5sbxmbs6ya349ic7yvnx56v3km2cb27p8kan5ygisnwwq2wc4";
-          name = "ess-view";
+          name = "recipe";
         };
         packageRequires = [ ess f s ];
         meta = {
@@ -20796,20 +25974,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    esup = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    esup = callPackage ({ cl-lib ? null
+                        , emacs
+                        , fetchFromGitHub
+                        , fetchurl
+                        , lib
+                        , melpaBuild }:
+      melpaBuild {
         pname = "esup";
-        version = "20180325.2152";
+        version = "20180506.1639";
         src = fetchFromGitHub {
           owner = "jschaf";
           repo = "esup";
-          rev = "fb061cf49bea47ba80090775d93388dc9b1b495e";
-          sha256 = "1ygn927d71dxh07si38ii48l4myg42vb7xl09nbbz9c0df4m8q0a";
+          rev = "1182c490a7ddc275318c9eb25b8d5bbdf9b78d2b";
+          sha256 = "1nkglqr42r2s0vqkj092j131a0ykjrj6qiawgw6id60yn0grhpqb";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b9d2948a42da5d4864404d2d11a924a4f235fc3b/recipes/esup";
           sha256 = "0cv3zc2zzm38ki3kxq58g9sp4gsk3dffa398wky6z83a3zc02zs0";
-          name = "esup";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -20817,8 +26000,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    esxml = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    esxml = callPackage ({ fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "esxml";
         version = "20171129.7";
         src = fetchFromGitHub {
@@ -20827,10 +26013,10 @@
           rev = "5548ceba17deae0c3c6d0092672edc4de3c75ce3";
           sha256 = "00vv8a75wdklygdyr4km9mc2ismxak69c45jmcny41xl44rp9x8m";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/db6556fe1b2403d1bcdade263986fd0faf0d9087/recipes/esxml";
           sha256 = "1375gryii984l33gc8f8yhl3vncjmw1w9k6xpvjgmnpx2fwr1vbq";
-          name = "esxml";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -20838,8 +26024,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    etable = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, interval-list, lib, melpaBuild }:
-    melpaBuild {
+    etable = callPackage ({ dash
+                          , emacs
+                          , fetchFromGitHub
+                          , fetchurl
+                          , interval-list
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "etable";
         version = "20161028.1309";
         src = fetchFromGitHub {
@@ -20848,10 +26040,10 @@
           rev = "d502141f0c69bf95256ba5cb9cd15350c7e942d2";
           sha256 = "0k0g58qzkkzall715k0864v3b7p5jnfwxqgmkj087x34frcf388k";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/afee0fed80f4fa444116b12653c034d760f5f1fb/recipes/etable";
           sha256 = "0m4h24mmhp680wfhb90im228mrcyxapzyi4kla8xdmss83gc0c32";
-          name = "etable";
+          name = "recipe";
         };
         packageRequires = [ dash emacs interval-list ];
         meta = {
@@ -20859,20 +26051,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    eterm-256color = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, xterm-color }:
-    melpaBuild {
+    eterm-256color = callPackage ({ emacs
+                                  , f
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild
+                                  , xterm-color }:
+      melpaBuild {
         pname = "eterm-256color";
-        version = "20180308.1615";
+        version = "20180520.523";
         src = fetchFromGitHub {
           owner = "dieggsy";
           repo = "eterm-256color";
-          rev = "dab96af559deb443c4c9c00e23389926e1607192";
-          sha256 = "0ysxblc90kjcz84siprnyxwh94scflivqbxylzkvjm7hbx93rsh1";
+          rev = "ef99d3a12ddce4aa06069c19e66e826f4cfc91e4";
+          sha256 = "1q1m125qwga8397qx5ln326aw3x8vi2y8w065w0zccxrq7n21ds4";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e556383f7e18c0215111aa720d4653465e91eff6/recipes/eterm-256color";
           sha256 = "1mxc2hqjcj67jq5k4621a7f089qahcqw7f0dzqpaxn7if11w333b";
-          name = "eterm-256color";
+          name = "recipe";
         };
         packageRequires = [ emacs f xterm-color ];
         meta = {
@@ -20880,20 +26078,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    ethan-wspace = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ethan-wspace = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "ethan-wspace";
         version = "20170507.1330";
         src = fetchFromGitHub {
           owner = "glasserc";
           repo = "ethan-wspace";
-          rev = "e055ee6730c0b03525d32e67511ef6c51e4c29e4";
-          sha256 = "0ik3y60xd3ap1pg5dr5ab6bq4qh8gblpgz1iiprmv7acr3ckzc41";
+          rev = "14ae43130e019034367cd2b6e2bf9a067955dd33";
+          sha256 = "19i8y8ys58mvzmz0ijcdv9nnrs3b85zbgl087d68734vhp73iy78";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9454f3a58e3416fa60d8411b0db19c408935408f/recipes/ethan-wspace";
           sha256 = "0k4kqkf5c6ysyhh1vpi9v4220yxm5ir3ippq2gmvvhnk77pg6hws";
-          name = "ethan-wspace";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -20901,8 +26102,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    euslisp-mode = callPackage ({ emacs, exec-path-from-shell, fetchFromGitHub, fetchurl, helm-ag, lib, melpaBuild, s }:
-    melpaBuild {
+    euslisp-mode = callPackage ({ emacs
+                                , exec-path-from-shell
+                                , fetchFromGitHub
+                                , fetchurl
+                                , helm-ag
+                                , lib
+                                , melpaBuild
+                                , s }:
+      melpaBuild {
         pname = "euslisp-mode";
         version = "20170830.1229";
         src = fetchFromGitHub {
@@ -20911,10 +26119,10 @@
           rev = "db62a2d148482317794727982576494596365a55";
           sha256 = "187ij4s7mzppgmh0ifny70mw8w31nq86rhsrmnflz26iywnkp8x2";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b04fffe5e52f26e92930a112a64531228f94e340/recipes/euslisp-mode";
           sha256 = "0v92lry9ynkvsvx060njaw1j5lj9sb1i3srs2hfqqwyqni5ldkri";
-          name = "euslisp-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs exec-path-from-shell helm-ag s ];
         meta = {
@@ -20922,8 +26130,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    eval-expr = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    eval-expr = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "eval-expr";
         version = "20120618.2347";
         src = fetchFromGitHub {
@@ -20932,10 +26143,10 @@
           rev = "a0e69e83de41df8dbccefc1962ab4f02206a3328";
           sha256 = "08zw3qrhqmnv2wxmbf74svk2cx5by4831kyw6rx13imkc4x8kngx";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f56c5312cc8ffc1a8b31fc342e8e2b8827eff846/recipes/eval-expr";
           sha256 = "0zkphbx7ph4p7qkfxqyr6p8420j9qkvx5wghd1sza6y0kb456872";
-          name = "eval-expr";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -20943,8 +26154,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    eval-in-repl = callPackage ({ ace-window, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, paredit }:
-    melpaBuild {
+    eval-in-repl = callPackage ({ ace-window
+                                , dash
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild
+                                , paredit }:
+      melpaBuild {
         pname = "eval-in-repl";
         version = "20171122.543";
         src = fetchFromGitHub {
@@ -20953,10 +26170,10 @@
           rev = "fea05a5b81d74ac53cb2a83aa83a73d9526bcc42";
           sha256 = "0xm1ggdaihy1cyg4b3b9x1n93bp4qiv30p1mfzmmqm6w89z1agf0";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0bee5fb7a7874dd20babd1de7f216c5bda3e0115/recipes/eval-in-repl";
           sha256 = "10h5vy9wdiqf9dgk1d1bsvp93y8sfcxghzg8zbhhn7m5cqg2wh63";
-          name = "eval-in-repl";
+          name = "recipe";
         };
         packageRequires = [ ace-window dash paredit ];
         meta = {
@@ -20964,29 +26181,38 @@
           license = lib.licenses.free;
         };
       }) {};
-    eval-sexp-fu = callPackage ({ fetchFromGitHub, fetchurl, highlight, lib, melpaBuild }:
-    melpaBuild {
+    eval-sexp-fu = callPackage ({ cl-lib ? null
+                                , fetchFromGitHub
+                                , fetchurl
+                                , highlight
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "eval-sexp-fu";
-        version = "20131230.1351";
+        version = "20180509.1903";
         src = fetchFromGitHub {
           owner = "hchbaw";
           repo = "eval-sexp-fu.el";
-          rev = "6cffd33155d10c3e58b39cbb170f42e910fd8595";
-          sha256 = "1syqakdyg3ydnq9gvkjf2rw9rz3kyhzp7avhy6dvyy65pv2ndyc2";
+          rev = "1cfd0f3e167d63080692fad97ffe0091b024ad73";
+          sha256 = "0l20ja8s0881jlrlmba496iyizfa0j5bvc2x39rshn8qqyka2dq2";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4b1a896521cac1f54f7571ad5837ff215d01044d/recipes/eval-sexp-fu";
           sha256 = "17cazf81z4cszflnfp66zyq2cclw5sp9539pxskdf267cf7r0ycs";
-          name = "eval-sexp-fu";
+          name = "recipe";
         };
-        packageRequires = [ highlight ];
+        packageRequires = [ cl-lib highlight ];
         meta = {
           homepage = "https://melpa.org/#/eval-sexp-fu";
           license = lib.licenses.free;
         };
       }) {};
-    evalator = callPackage ({ fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }:
-    melpaBuild {
+    evalator = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , helm-core
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "evalator";
         version = "20160212.1728";
         src = fetchFromGitHub {
@@ -20995,10 +26221,10 @@
           rev = "f30da4da48c0b3f3cfa1fc1c7cfdb53ffe79df36";
           sha256 = "1llxxdprs8yw2hqj4dhrkrrzmkl25h7p4rcaa2cw544fmg3kvlz1";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/544a503d72c0a501f9ca854cd11181a7783294a3/recipes/evalator";
           sha256 = "0k6alxwg89gc4v5m2bxmzmj7l6kywhbh4036xgz19q28xnlbr9xk";
-          name = "evalator";
+          name = "recipe";
         };
         packageRequires = [ helm-core ];
         meta = {
@@ -21006,8 +26232,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    evalator-clojure = callPackage ({ cider, evalator, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    evalator-clojure = callPackage ({ cider
+                                    , evalator
+                                    , fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "evalator-clojure";
         version = "20160208.1348";
         src = fetchFromGitHub {
@@ -21016,10 +26247,10 @@
           rev = "caa4e0a137bdfada86593128a654e16aa617ad50";
           sha256 = "1q5s1ffmfh5dby92853xm8kjhgjfd5vbvcg1xbf8lswc1i41k7n7";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5f57089f3e5c8342092128d44451b338af8a769f/recipes/evalator-clojure";
           sha256 = "10mxlgirnsq3z7l1izrf2v1l1yr4sbdjsaszz7llqv6l80y4bji3";
-          name = "evalator-clojure";
+          name = "recipe";
         };
         packageRequires = [ cider evalator ];
         meta = {
@@ -21027,8 +26258,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    eve-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, markdown-mode, melpaBuild, polymode }:
-    melpaBuild {
+    eve-mode = callPackage ({ emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , markdown-mode
+                            , melpaBuild
+                            , polymode }:
+      melpaBuild {
         pname = "eve-mode";
         version = "20170822.1531";
         src = fetchFromGitHub {
@@ -21037,10 +26274,10 @@
           rev = "a4661114d9c18725691b76321d72167ca5a9070a";
           sha256 = "19s6cid42q0lm2w94a7f6sxvmy3zpjdj5r5dbwcxxp5n3qfs7nip";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e0f197adfe64ef88d90d24dfd6532bf52a5bce0d/recipes/eve-mode";
           sha256 = "1ch50bm452g8k1xnqcbpmpwkmg8amzv7bq0hphk3y0kiqkwd1gdh";
-          name = "eve-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs markdown-mode polymode ];
         meta = {
@@ -21048,20 +26285,27 @@
           license = lib.licenses.free;
         };
       }) {};
-    evil = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, goto-chg, lib, melpaBuild, undo-tree }:
-    melpaBuild {
+    evil = callPackage ({ cl-lib ? null
+                        , emacs
+                        , fetchFromGitHub
+                        , fetchurl
+                        , goto-chg
+                        , lib
+                        , melpaBuild
+                        , undo-tree }:
+      melpaBuild {
         pname = "evil";
-        version = "20180408.1423";
+        version = "20180517.1300";
         src = fetchFromGitHub {
           owner = "emacs-evil";
           repo = "evil";
-          rev = "49ebf2dce325bc7fe0941dc4112226c291ff9670";
-          sha256 = "0vjbyh77d4z9ahk0w8fmb4fdd98hq19ijy11b1y4n029yl1yrwvr";
+          rev = "230b87212c81aaa68ef5547a6b998d9c365fe139";
+          sha256 = "0c9zy3bpck10gcrv79kd3h7i4ygd5bgbgy773n0lg7a2r5kwn1gx";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/440482c0edac8ee8bd4fe22f6bc5c1607f34c7ad/recipes/evil";
           sha256 = "1d36r6mi5nvrwnk4a9338wmhr72fcbrwj0r8gmvivpjdngjy4k39";
-          name = "evil";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs goto-chg undo-tree ];
         meta = {
@@ -21069,20 +26313,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    evil-anzu = callPackage ({ anzu, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    evil-anzu = callPackage ({ anzu
+                             , evil
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "evil-anzu";
         version = "20170123.2318";
         src = fetchFromGitHub {
           owner = "syohex";
           repo = "emacs-evil-anzu";
-          rev = "9bca6ca14d865e7e005bc02a28a09b4ae74facc9";
-          sha256 = "1y0jiglcazxnvggs5ljys2iizljsihlgr46svbbwgf45ibdrw392";
+          rev = "565f79ae66fc329ab9e1bf5a89fa0727981ed5cc";
+          sha256 = "01gc7bj51w7952aqpb9zw9gqvjy8b8nfmhfpiah2r96gk9b0yn6j";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06b0609b56016d938b28d56d9eeb6305116b38af/recipes/evil-anzu";
           sha256 = "19cmc61l370mm4h2m6jw5pdcsvj4wcv9zpa8z7k1fjg57mwmmn70";
-          name = "evil-anzu";
+          name = "recipe";
         };
         packageRequires = [ anzu evil ];
         meta = {
@@ -21090,20 +26339,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    evil-args = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    evil-args = callPackage ({ evil
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "evil-args";
         version = "20140329.1429";
         src = fetchFromGitHub {
           owner = "wcsmith";
           repo = "evil-args";
-          rev = "2a88b4d19953a11227cc1e91973b92149116f44c";
-          sha256 = "1nh7wa4ynr7ln42x32znzqsmh7ijzy5ymd7rszf49l8677alvazq";
+          rev = "b554f83a31dd47cac9799725f379675f54ed0a6a";
+          sha256 = "08743swy936v8fhbaplrr0wpwlp7vplvy2iwkh56p7gb5gqmlfli";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0976c82a22f1a8701b9da0b8ba4753ed48191376/recipes/evil-args";
           sha256 = "1bwdvf1i3jc77bw2as1wr1djm8z3a7wms60694xkyqh0m909hs2w";
-          name = "evil-args";
+          name = "recipe";
         };
         packageRequires = [ evil ];
         meta = {
@@ -21111,8 +26364,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    evil-avy = callPackage ({ avy, cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    evil-avy = callPackage ({ avy
+                            , cl-lib ? null
+                            , emacs
+                            , evil
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "evil-avy";
         version = "20150908.48";
         src = fetchFromGitHub {
@@ -21121,10 +26381,10 @@
           rev = "2dd955cc3ecaa7ddeb67b295298abdc6d16dd3a5";
           sha256 = "1q6znbnshk45mdglx519qlbfhb7g47qsm245i93ka4djsjy55j9l";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f86bccc9f2190cfa5487cf8e9c9b7938774533ed/recipes/evil-avy";
           sha256 = "1hc96dd78yxgr8cs9sk9y1i5h1qnyk110vlb3wnlxv1hwn92qvrd";
-          name = "evil-avy";
+          name = "recipe";
         };
         packageRequires = [ avy cl-lib emacs evil ];
         meta = {
@@ -21132,20 +26392,28 @@
           license = lib.licenses.free;
         };
       }) {};
-    evil-cleverparens = callPackage ({ dash, emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild, paredit, smartparens }:
-    melpaBuild {
+    evil-cleverparens = callPackage ({ dash
+                                     , emacs
+                                     , evil
+                                     , fetchFromGitHub
+                                     , fetchurl
+                                     , lib
+                                     , melpaBuild
+                                     , paredit
+                                     , smartparens }:
+      melpaBuild {
         pname = "evil-cleverparens";
         version = "20170717.2113";
         src = fetchFromGitHub {
           owner = "luxbock";
           repo = "evil-cleverparens";
-          rev = "8c45879d49bfa6d4e414b6c1df700a4a51cbb869";
-          sha256 = "0lhnybpnk4n2yhlcnj9zxn0vi5hpjfaqfhvyfy7ckzz74g8v7iyw";
+          rev = "9bce7cc5e2ab80adeafb0f1a579eb27bdb7a8d2f";
+          sha256 = "1wplh9lk0cplkpik088lk5am5b8ks0rs8bp3b6wn0bn1r0l3jcxg";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e3b3637d6527b16ea0d606fd87b01004be446b09/recipes/evil-cleverparens";
           sha256 = "10zkyaxy52ixh26hzm9v1y0gakcn5sdwz4ny8v1vcmjqjphnk799";
-          name = "evil-cleverparens";
+          name = "recipe";
         };
         packageRequires = [ dash emacs evil paredit smartparens ];
         meta = {
@@ -21153,8 +26421,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    evil-colemak-basics = callPackage ({ emacs, evil, evil-snipe, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    evil-colemak-basics = callPackage ({ emacs
+                                       , evil
+                                       , evil-snipe
+                                       , fetchFromGitHub
+                                       , fetchurl
+                                       , lib
+                                       , melpaBuild }:
+      melpaBuild {
         pname = "evil-colemak-basics";
         version = "20170425.509";
         src = fetchFromGitHub {
@@ -21163,10 +26437,10 @@
           rev = "7844079b47f47bb1dc24c885b0ac2e67524fa960";
           sha256 = "0phspmd31pcxana2lp6mqywmghhdpj6ydsrl1bjn4b1gcp1fqsy2";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/945417d19faf492fb678aee3ba692d14e7518d85/recipes/evil-colemak-basics";
           sha256 = "1sbbli0hdmpc23f3g5n95svqfdg3rlvf71plyvpv1a6va9jhi83k";
-          name = "evil-colemak-basics";
+          name = "recipe";
         };
         packageRequires = [ emacs evil evil-snipe ];
         meta = {
@@ -21174,8 +26448,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    evil-colemak-minimal = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    evil-colemak-minimal = callPackage ({ emacs
+                                        , evil
+                                        , fetchFromGitHub
+                                        , fetchurl
+                                        , lib
+                                        , melpaBuild }:
+      melpaBuild {
         pname = "evil-colemak-minimal";
         version = "20171006.617";
         src = fetchFromGitHub {
@@ -21184,10 +26463,10 @@
           rev = "6d98b6da60f414524a0d718f76024c26dce742b3";
           sha256 = "0pd05jq4qkw5xx7xqzxzx62fsm77vjz0ry9ayaqgqw5831rbp553";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/828c744062069027f19fe5f2f233179f9149dc16/recipes/evil-colemak-minimal";
           sha256 = "0qi5k17b9k227zz9binbrd22cwmlqxkay98by9yxcbyhl4hjhdyy";
-          name = "evil-colemak-minimal";
+          name = "recipe";
         };
         packageRequires = [ emacs evil ];
         meta = {
@@ -21195,20 +26474,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    evil-collection = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    evil-collection = callPackage ({ cl-lib ? null
+                                   , emacs
+                                   , evil
+                                   , fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "evil-collection";
-        version = "20180416.146";
+        version = "20180715.836";
         src = fetchFromGitHub {
           owner = "emacs-evil";
           repo = "evil-collection";
-          rev = "aca031a7f313d4380a1dbaa2158a9908a2ce9415";
-          sha256 = "1mzgi8bdd767g6xfkznpm5v8gjx8wp99drlxggi0vgp1rm3zslsz";
+          rev = "0deb319515267371a43b605957817fb033f1cbf3";
+          sha256 = "178iq1kks1j0g9q11q68fynhg2y36ya1w6mc5xlzm97vkcrh5cr0";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a9b93a8e3750e4e7767498e418f46d553d814604/recipes/evil-collection";
           sha256 = "1fggdlssb8sai00vbrxph8cama3r0f7w8qhmiajj4cy2il7jgmhy";
-          name = "evil-collection";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs evil ];
         meta = {
@@ -21216,8 +26501,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    evil-commentary = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    evil-commentary = callPackage ({ evil
+                                   , fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "evil-commentary";
         version = "20170413.751";
         src = fetchFromGitHub {
@@ -21226,10 +26515,10 @@
           rev = "395f91014b69844b81660c155f42eb9b1b3d199d";
           sha256 = "0zjs9zyqfygnpxapvf0ymmiid40i06cxbhjzd81zw33nafgkf6r4";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fe5b05152c919d49ddd920b1bd5ffc351141fa0d/recipes/evil-commentary";
           sha256 = "151iiimmkpn58pl9zn40qssfahbrqy83axyl9dcd6kx2ywv5gcxz";
-          name = "evil-commentary";
+          name = "recipe";
         };
         packageRequires = [ evil ];
         meta = {
@@ -21237,20 +26526,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    evil-dvorak = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    evil-dvorak = callPackage ({ evil
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "evil-dvorak";
         version = "20160416.1141";
         src = fetchFromGitHub {
           owner = "jbranso";
           repo = "evil-dvorak";
-          rev = "824f7c56980d72a0ff04c662223540cd66f13754";
-          sha256 = "15rnxhqc56g4ydr8drvcgzvjp8blxsarm86dqc36rym7g5gnxr20";
+          rev = "e7b80077d6f332452049eb3d7ea51f6c8fbf5947";
+          sha256 = "1z8wl0ih3b8bahbglp5n1xjws583hkryl034b2a3p11ljq3g2ggl";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/69abca9985339c59ee0e2334cabf3c99e1ba1349/recipes/evil-dvorak";
           sha256 = "1iq9wzcb625vs942khja39db1js8r46vrdiqcm47yfji98g39gsn";
-          name = "evil-dvorak";
+          name = "recipe";
         };
         packageRequires = [ evil ];
         meta = {
@@ -21258,8 +26551,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    evil-easymotion = callPackage ({ avy, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    evil-easymotion = callPackage ({ avy
+                                   , cl-lib ? null
+                                   , emacs
+                                   , fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "evil-easymotion";
         version = "20180113.2254";
         src = fetchFromGitHub {
@@ -21268,10 +26567,10 @@
           rev = "79c13ed3bce018ac09d358e642e5bd7025e93603";
           sha256 = "0496dnbciq8gbivihas1y58gwd4nbfz767rr98zpwgkz8l2jvy73";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e67955ead0b9d69acab40d66d4e0b821229d635c/recipes/evil-easymotion";
           sha256 = "0zixgdhc228y6yqr044cbyls0pihzacqsgvybhhar916p4h8izgv";
-          name = "evil-easymotion";
+          name = "recipe";
         };
         packageRequires = [ avy cl-lib emacs ];
         meta = {
@@ -21279,8 +26578,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    evil-ediff = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    evil-ediff = callPackage ({ evil
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "evil-ediff";
         version = "20170724.1223";
         src = fetchFromGitHub {
@@ -21289,10 +26592,10 @@
           rev = "67b0e69f65c196eff5b39dacb7a9ec05bb919c74";
           sha256 = "0f8g07fyzyc8pdwizyj62v0dy65ap885asph83529y0j8wnni8ps";
         };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/50315ec837d2951bf5b2bb75809a35dd7ffc8fe8/recipes/evil-ediff";
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/b3eff8cd4bedff3e2111d96743d94be5053826f1/recipes/evil-ediff";
           sha256 = "0yglhxm670996hd7305q38y5f47y87n75hh0q7qlm2vra2m2wa5s";
-          name = "evil-ediff";
+          name = "recipe";
         };
         packageRequires = [ evil ];
         meta = {
@@ -21300,20 +26603,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    evil-embrace = callPackage ({ emacs, embrace, evil-surround, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    evil-embrace = callPackage ({ emacs
+                                , embrace
+                                , evil-surround
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "evil-embrace";
         version = "20160519.1129";
         src = fetchFromGitHub {
           owner = "cute-jumper";
           repo = "evil-embrace.el";
-          rev = "4379adea032b25e359d01a36301b4a5afdd0d1b7";
-          sha256 = "0rj1ippc6yi560xalhd91r7a00lk3d0jk13w464myznkpnasfw3a";
+          rev = "8b2083c514af143f6d2f5d1cb4272c5bfb7437a3";
+          sha256 = "1cplq9s3fw8nadcipjrix46jfcjbgg3xhz6d226wcqgmg90aclfn";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d4886f068766514deab5673b4366d6bdd311e3b6/recipes/evil-embrace";
           sha256 = "10cfkksh3llyfk26x36b7ri0x6a6hrcv275pxk7ckhs1pyhb14y7";
-          name = "evil-embrace";
+          name = "recipe";
         };
         packageRequires = [ emacs embrace evil-surround ];
         meta = {
@@ -21321,20 +26630,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    evil-escape = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    evil-escape = callPackage ({ cl-lib ? null
+                               , emacs
+                               , evil
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "evil-escape";
-        version = "20170913.618";
+        version = "20180623.2019";
         src = fetchFromGitHub {
           owner = "syl20bnr";
           repo = "evil-escape";
-          rev = "25920fb2f4ef48998eecea433c04096f8d124cfe";
-          sha256 = "1nbk0mlfrg8hbw119dpp2a1k2irgz811kcsrwmxv256gkx4pwmfk";
+          rev = "73b30bfd912f40657b1306ee5849d215f0f9ffbd";
+          sha256 = "0mqz7l1a4rxdj7g3fda17118f7y0vph4ica447ciad5vz3zx9i2z";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/evil-escape";
           sha256 = "0jiwsgcqw8m6z4z82gx0m0r0vbvkcxc0czhn4mqjwkhhglwzgi8l";
-          name = "evil-escape";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs evil ];
         meta = {
@@ -21342,8 +26657,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    evil-exchange = callPackage ({ cl-lib ? null, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    evil-exchange = callPackage ({ cl-lib ? null
+                                 , evil
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "evil-exchange";
         version = "20170510.1959";
         src = fetchFromGitHub {
@@ -21352,10 +26672,10 @@
           rev = "47691537815150715e64e6f6ec79be7746c96120";
           sha256 = "0bjpn4yqig17ddym6wqq5fm1b294q74hzcbj9a6gs97fqiwf88xa";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9b06397c032d24a8da4074ad97cdb30d0c468e20/recipes/evil-exchange";
           sha256 = "1mvw7w23yfbfmhzj6wimslbryb0gppryw24ac0wh4fzl9rdcma4r";
-          name = "evil-exchange";
+          name = "recipe";
         };
         packageRequires = [ cl-lib evil ];
         meta = {
@@ -21363,8 +26683,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    evil-expat = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    evil-expat = callPackage ({ emacs
+                              , evil
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "evil-expat";
         version = "20180302.657";
         src = fetchFromGitHub {
@@ -21373,10 +26698,10 @@
           rev = "523edb0d1fd6ad17b777c1893cbe1f4857469a4d";
           sha256 = "10irfd546pz0sz0ckfms1md37ni44p7i12imii5ck13hga7grv7i";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f08f6396e66479eb9510727968c5bb01ac239476/recipes/evil-expat";
           sha256 = "03niji6wymhlfkvdg90gasccs4683djxcj925c8k0vdgmfr8sx32";
-          name = "evil-expat";
+          name = "recipe";
         };
         packageRequires = [ emacs evil ];
         meta = {
@@ -21384,8 +26709,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    evil-extra-operator = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    evil-extra-operator = callPackage ({ evil
+                                       , fetchFromGitHub
+                                       , fetchurl
+                                       , lib
+                                       , melpaBuild }:
+      melpaBuild {
         pname = "evil-extra-operator";
         version = "20161212.2003";
         src = fetchFromGitHub {
@@ -21394,10 +26723,10 @@
           rev = "e16a9b36f9901254da9af8a73871061616410fc3";
           sha256 = "116srvfck3b244shxm9cmw3yvpprjgr840fvcv6jwwpfaphafxw4";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fc0b157c3adf8a2899c4dd2ce98e8a81e4f403a3/recipes/evil-extra-operator";
           sha256 = "066apin0yrjx7zr007p2h9p2nq58lz7qikzjzg0spqkb8vy7vkc5";
-          name = "evil-extra-operator";
+          name = "recipe";
         };
         packageRequires = [ evil ];
         meta = {
@@ -21405,8 +26734,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    evil-find-char-pinyin = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild, pinyinlib }:
-    melpaBuild {
+    evil-find-char-pinyin = callPackage ({ evil
+                                         , fetchFromGitHub
+                                         , fetchurl
+                                         , lib
+                                         , melpaBuild
+                                         , pinyinlib }:
+      melpaBuild {
         pname = "evil-find-char-pinyin";
         version = "20160514.1341";
         src = fetchFromGitHub {
@@ -21415,10 +26749,10 @@
           rev = "04e277946d658f1a73c68dcbbadea9c21097a31c";
           sha256 = "1bsy2bynzxr1ibyidv2r21xnfnxbzr0xh5m3h05s5igbmajxr12d";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8755d2fca519f23f11c5cbb53443a2ad4340220e/recipes/evil-find-char-pinyin";
           sha256 = "0n52ijdf5hy7mn0rab4493zs2nrf7r1qkmvf0algqaj7bfjscs79";
-          name = "evil-find-char-pinyin";
+          name = "recipe";
         };
         packageRequires = [ evil pinyinlib ];
         meta = {
@@ -21426,8 +26760,41 @@
           license = lib.licenses.free;
         };
       }) {};
-    evil-god-state = callPackage ({ evil, fetchFromGitHub, fetchurl, god-mode, lib, melpaBuild }:
-    melpaBuild {
+    evil-fringe-mark = callPackage ({ emacs
+                                    , evil
+                                    , fetchFromGitHub
+                                    , fetchurl
+                                    , fringe-helper
+                                    , goto-chg
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
+        pname = "evil-fringe-mark";
+        version = "20180619.1534";
+        src = fetchFromGitHub {
+          owner = "Andrew-William-Smith";
+          repo = "evil-fringe-mark";
+          rev = "fdb147d5ec8fbe087c73604374b3d491f143f2b2";
+          sha256 = "1cfsh0f4mfpm6pifxgk2v0h975hldvwdbx95zgw045w9sw325q5b";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/70dcc07c389d5454de64fb08cd666d489d6d5483/recipes/evil-fringe-mark";
+          sha256 = "1ahlbp31ll24vzah4bv1xx58gn8y8fsjb0n9a135zwb3fjla9drb";
+          name = "recipe";
+        };
+        packageRequires = [ emacs evil fringe-helper goto-chg ];
+        meta = {
+          homepage = "https://melpa.org/#/evil-fringe-mark";
+          license = lib.licenses.free;
+        };
+      }) {};
+    evil-god-state = callPackage ({ evil
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , god-mode
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "evil-god-state";
         version = "20141116.1855";
         src = fetchFromGitHub {
@@ -21436,10 +26803,10 @@
           rev = "3d44197dc0a1fb40e7b7ff8717f8a8c339ce1d40";
           sha256 = "1cv24qnxxf6n1grf4n5969v8y9xll5zb9mbfdnq9iavdvhnndk2h";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/46b8586e9a821efb67539155f783a32867084bfa/recipes/evil-god-state";
           sha256 = "1g547d58zf11qw0zz3fk5kmrzmfx1rhawyh5d2h8bll8hwygnrxf";
-          name = "evil-god-state";
+          name = "recipe";
         };
         packageRequires = [ evil god-mode ];
         meta = {
@@ -21447,20 +26814,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    evil-goggles = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    evil-goggles = callPackage ({ emacs
+                                , evil
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "evil-goggles";
-        version = "20180414.2306";
+        version = "20180702.353";
         src = fetchFromGitHub {
           owner = "edkolev";
           repo = "evil-goggles";
-          rev = "bc318ad4b7711837c21405d49a0ce4097f3a70a9";
-          sha256 = "0vy6skhp6skr3hvkc0dzfn1dridwzybjm9mg2h90srvg76c8966p";
+          rev = "ea5ab4012af0eb451e2c0d996455c58f1554f7c1";
+          sha256 = "18f96n8kkj1lza9za46dwjrsm4ni2s1gqbgdjjiqmkl06kj04fi8";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/811b1261705b4c525e165fa9ee23ae191727a623/recipes/evil-goggles";
           sha256 = "151xvawyhcjp98skaif08wbxqaw602f51zgwm604hp25a111qmnq";
-          name = "evil-goggles";
+          name = "recipe";
         };
         packageRequires = [ emacs evil ];
         meta = {
@@ -21468,20 +26840,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    evil-iedit-state = callPackage ({ evil, fetchFromGitHub, fetchurl, iedit, lib, melpaBuild }:
-    melpaBuild {
+    evil-iedit-state = callPackage ({ evil
+                                    , fetchFromGitHub
+                                    , fetchurl
+                                    , iedit
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "evil-iedit-state";
-        version = "20160905.1908";
+        version = "20180606.2258";
         src = fetchFromGitHub {
           owner = "syl20bnr";
           repo = "evil-iedit-state";
-          rev = "02ce7ea1414aa0f139b52f1b3350c2b7af74d0ba";
-          sha256 = "0lf7ldd9i8r5f1x9jjd6mb7dr04xn87sd3sr6rqrwz925q0v0sib";
+          rev = "f75cff4ecbd5beaa9ca64a6c157c4105f078daec";
+          sha256 = "0f6m5wi1q6ac9mkvalm62rlnlkjz1c315a4sa93p6iw9x12llkgw";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b0b6b7d09c023cfe34da65fa1eb8f3fdbe7b1290/recipes/evil-iedit-state";
           sha256 = "1dihyh7vqcp7kvfic613k7v33czr93hz04d635awrsyzgy8savhl";
-          name = "evil-iedit-state";
+          name = "recipe";
         };
         packageRequires = [ evil iedit ];
         meta = {
@@ -21489,20 +26866,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    evil-indent-plus = callPackage ({ cl-lib ? null, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    evil-indent-plus = callPackage ({ cl-lib ? null
+                                    , evil
+                                    , fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "evil-indent-plus";
         version = "20151109.1106";
         src = fetchFromGitHub {
           owner = "TheBB";
           repo = "evil-indent-plus";
-          rev = "0c7501e6efed661242c3a20e0a6c79a6455c2c40";
-          sha256 = "1g6r1ydscwjvmhh1zg4q3nap4avk8lb9msdqrh7dff6pla0r2qs6";
+          rev = "33a8bcac5f90ddee054e64d60c2b68c98c269ffc";
+          sha256 = "0v94kn99z6v4aigjgk3l6b6x22bv9fighisbm23b0861kwcns98f";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/992ea3d372fa3569ad9f838aa2818eaee8b8033a/recipes/evil-indent-plus";
           sha256 = "15vnvch0qsaram22d44k617bqhr9rrf8qc86sf20yvdyy3gi5j12";
-          name = "evil-indent-plus";
+          name = "recipe";
         };
         packageRequires = [ cl-lib evil ];
         meta = {
@@ -21510,8 +26892,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    evil-indent-textobject = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    evil-indent-textobject = callPackage ({ evil
+                                          , fetchFromGitHub
+                                          , fetchurl
+                                          , lib
+                                          , melpaBuild }:
+      melpaBuild {
         pname = "evil-indent-textobject";
         version = "20130831.1519";
         src = fetchFromGitHub {
@@ -21520,10 +26906,10 @@
           rev = "70a1154a531b7cfdbb9a31d6922482791e20a3a7";
           sha256 = "0nghisnc49ivh56mddfdlcbqv3y2vqzjvkpgwv3zp80ga6ghvdmz";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/63cfc9c2962780dd5d27da670d5540a0441e7ca2/recipes/evil-indent-textobject";
           sha256 = "172a3krid5lrx1w9xcifkhjnvlxg1nbz4w102d99d0grr9465r09";
-          name = "evil-indent-textobject";
+          name = "recipe";
         };
         packageRequires = [ evil ];
         meta = {
@@ -21531,8 +26917,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    evil-leader = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    evil-leader = callPackage ({ evil
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "evil-leader";
         version = "20140606.543";
         src = fetchFromGitHub {
@@ -21541,10 +26931,10 @@
           rev = "39f7014bcf8b36463e0c7512c638bda4bac6c2cf";
           sha256 = "10xrlimsxk09z9cw6rxdz8qvvn1i0vhc1gdicwxri0j10p0hacl3";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/evil-leader";
           sha256 = "154s2nb170hzksmc87wnzlwg3ic3w3ravgsfvwkyfi2q285vmra6";
-          name = "evil-leader";
+          name = "recipe";
         };
         packageRequires = [ evil ];
         meta = {
@@ -21552,20 +26942,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    evil-ledger = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    evil-ledger = callPackage ({ emacs
+                               , evil
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "evil-ledger";
         version = "20170905.519";
         src = fetchFromGitHub {
           owner = "atheriel";
           repo = "evil-ledger";
-          rev = "a282fae7921d2648a32c3207413d927d1adda8b8";
-          sha256 = "0b8801mpq55x9r0sgm548wb1qn74wk3dydswrxi8bp6ga49k7rhv";
+          rev = "17f3c4284fc4f8d9da4e1d805fbe712e0e02b8d4";
+          sha256 = "1vjiyi1kv62w7mbvp149zncvk7p4js75m897b69gh05g68j4ckk2";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/500e99a1b92f0a0c144f843cd7645872034d9fbb/recipes/evil-ledger";
           sha256 = "13idy2kbzhckzfwrjnzjrf8h2881w3v8pmhlcj26xcyf4ch0dq9r";
-          name = "evil-ledger";
+          name = "recipe";
         };
         packageRequires = [ emacs evil ];
         meta = {
@@ -21573,8 +26968,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    evil-lion = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    evil-lion = callPackage ({ emacs
+                             , evil
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "evil-lion";
         version = "20170810.2314";
         src = fetchFromGitHub {
@@ -21583,10 +26983,10 @@
           rev = "aaa3874ad54c31b4322ac5bbc63e331498b11d61";
           sha256 = "1aq3ip93sxk05gfgh2zw6zckmkir0viqaqz674fcmsd2rc2051zn";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8a7a0691775afec6d2c7be3d6739b55bd1d2053d/recipes/evil-lion";
           sha256 = "1rwmpc5ifblb41c1yhhv26ayff4nk9iza7w0wb5ganny2r82fg2v";
-          name = "evil-lion";
+          name = "recipe";
         };
         packageRequires = [ emacs evil ];
         meta = {
@@ -21594,8 +26994,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    evil-lisp-state = callPackage ({ bind-map, evil, fetchFromGitHub, fetchurl, lib, melpaBuild, smartparens }:
-    melpaBuild {
+    evil-lisp-state = callPackage ({ bind-map
+                                   , evil
+                                   , fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild
+                                   , smartparens }:
+      melpaBuild {
         pname = "evil-lisp-state";
         version = "20160403.1948";
         src = fetchFromGitHub {
@@ -21604,10 +27010,10 @@
           rev = "3c65fecd9917a41eaf6460f22187e2323821f3ce";
           sha256 = "1n6r8xs670r5qp4b5f72nr9g8nlqcrx1v7yqqlbkgv8gns8n5xgh";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/evil-lisp-state";
           sha256 = "16h6zi0kkq2zlrwqiz6avnw2ady3h9gmxyinvk5gbkskxf12d1pz";
-          name = "evil-lisp-state";
+          name = "recipe";
         };
         packageRequires = [ bind-map evil smartparens ];
         meta = {
@@ -21615,8 +27021,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    evil-lispy = callPackage ({ evil, fetchFromGitHub, fetchurl, hydra, lib, lispy, melpaBuild }:
-    melpaBuild {
+    evil-lispy = callPackage ({ evil
+                              , fetchFromGitHub
+                              , fetchurl
+                              , hydra
+                              , lib
+                              , lispy
+                              , melpaBuild }:
+      melpaBuild {
         pname = "evil-lispy";
         version = "20170304.259";
         src = fetchFromGitHub {
@@ -21625,10 +27037,10 @@
           rev = "040a7ee130c2403a1d6dac591b94b202bb48e186";
           sha256 = "008jar578yxa70nd69z4ldmknfmm1jar3wx71n3y2gnyghr759k1";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/377d43f3717b8e17c3adce886aaf3e579383ec64/recipes/evil-lispy";
           sha256 = "17z830b0x6lhmqkk07hfbrg63c7q7mpn4zz1ppjd1smv4mcqzyld";
-          name = "evil-lispy";
+          name = "recipe";
         };
         packageRequires = [ evil hydra lispy ];
         meta = {
@@ -21636,20 +27048,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    evil-magit = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }:
-    melpaBuild {
+    evil-magit = callPackage ({ evil
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , magit
+                              , melpaBuild }:
+      melpaBuild {
         pname = "evil-magit";
-        version = "20180410.804";
+        version = "20180702.853";
         src = fetchFromGitHub {
           owner = "emacs-evil";
           repo = "evil-magit";
-          rev = "9bd91561e7d0bfe3198d0860bae1785a543f2eee";
-          sha256 = "1jhna9lyic4c28kcdhbqid6gyv9gawznf2ga470vnfnyghd4f757";
+          rev = "9f32c4e190e3d67f193485f12199275ff1a047f0";
+          sha256 = "0lmsc02fb9s43gs7svqq57bsznqxxzjv6s79lz2hc0rhacxb5pp9";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/50315ec837d2951bf5b2bb75809a35dd7ffc8fe8/recipes/evil-magit";
           sha256 = "02ncki7qrl22804576h76xl4d5lvvk32lzn9gvxn63hb19r0s980";
-          name = "evil-magit";
+          name = "recipe";
         };
         packageRequires = [ evil magit ];
         meta = {
@@ -21657,8 +27074,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    evil-mark-replace = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    evil-mark-replace = callPackage ({ evil
+                                     , fetchFromGitHub
+                                     , fetchurl
+                                     , lib
+                                     , melpaBuild }:
+      melpaBuild {
         pname = "evil-mark-replace";
         version = "20150424.18";
         src = fetchFromGitHub {
@@ -21667,10 +27088,10 @@
           rev = "56cf191724a3e82239ca47a17b071c20aedb0617";
           sha256 = "01hccc49xxb6lnzr0lwkkwndbk4sv0jyyz3khbcxsgkpzjiydihv";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/089accfa2646fc4f265cb8e9b9a05dcf5aa4c4f6/recipes/evil-mark-replace";
           sha256 = "03cq43vlv1b53w4kw7mjvk026i8rzhhryfb27ddn6ipgc6xh68a0";
-          name = "evil-mark-replace";
+          name = "recipe";
         };
         packageRequires = [ evil ];
         meta = {
@@ -21678,20 +27099,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    evil-matchit = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    evil-matchit = callPackage ({ evil
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "evil-matchit";
-        version = "20180328.2351";
+        version = "20180526.557";
         src = fetchFromGitHub {
           owner = "redguardtoo";
           repo = "evil-matchit";
-          rev = "51d8b268e597693aa9d02f2dda66840562998621";
-          sha256 = "1b1iymyb2f8913xgzr13pslqcvhwyyl3370kjs43acpbgnhn2zzj";
+          rev = "1c428e192b5c8698f8550d8862593bdca5ef9bfc";
+          sha256 = "1xip22vlzlki769hza3wssr41m5pl47ay7721fc4y5qv9yr9pjfa";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/aeab4a998bffbc784e8fb23927d348540baf9951/recipes/evil-matchit";
           sha256 = "01z69n20qs4gngd28ry4kn825cax5km9hn96i87yrvq7nfa64swq";
-          name = "evil-matchit";
+          name = "recipe";
         };
         packageRequires = [ evil ];
         meta = {
@@ -21699,20 +27124,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    evil-mc = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    evil-mc = callPackage ({ cl-lib ? null
+                           , emacs
+                           , evil
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "evil-mc";
-        version = "20170716.1806";
+        version = "20180603.2033";
         src = fetchFromGitHub {
           owner = "gabesoft";
           repo = "evil-mc";
-          rev = "8127c3161a6d990635684a020f708b7914445593";
-          sha256 = "10cy5shnd9dl9xkcl7gx4ksbbn2cqjww9ihw7ifawnwpa77bcf43";
+          rev = "779e7d35bf38b482c0fccacfbffd877e5f455457";
+          sha256 = "0p0jc3vlf5q8b76adxznpsfp1clhm171ddwq63vsg6b5iwk0fpdz";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/96770d778a03ab012fb82a3a0122983db6f9b0c4/recipes/evil-mc";
           sha256 = "0cq4xg6svb5gz4ra607wy768as2igla4h1xcrfnxldknk476fqqs";
-          name = "evil-mc";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs evil ];
         meta = {
@@ -21720,8 +27151,16 @@
           license = lib.licenses.free;
         };
       }) {};
-    evil-mc-extras = callPackage ({ cl-lib ? null, emacs, evil, evil-mc, evil-numbers, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    evil-mc-extras = callPackage ({ cl-lib ? null
+                                  , emacs
+                                  , evil
+                                  , evil-mc
+                                  , evil-numbers
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "evil-mc-extras";
         version = "20170202.849";
         src = fetchFromGitHub {
@@ -21730,10 +27169,10 @@
           rev = "ba3252ae129c3b79aeb70ec3d276cbda32b00421";
           sha256 = "0a7mn1z0db4xi8wclqp41hcbzh017q6pndxr9mrfxb67sqs601id";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cd7c9aa0f4c17e7f27836e75a0b83c44a68ad744/recipes/evil-mc-extras";
           sha256 = "1px4akqaddqgfd03932d03d3rrvjr5lv5nc94xc448kqcbfn7yjk";
-          name = "evil-mc-extras";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs evil evil-mc evil-numbers ];
         meta = {
@@ -21741,29 +27180,41 @@
           license = lib.licenses.free;
         };
       }) {};
-    evil-mu4e = callPackage ({ dash, emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    evil-mu4e = callPackage ({ emacs
+                             , evil
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "evil-mu4e";
-        version = "20171127.1214";
+        version = "20180613.339";
         src = fetchFromGitHub {
           owner = "JorisE";
           repo = "evil-mu4e";
-          rev = "234f8a7b24e3b21b6d849d209c006a258ae056ce";
-          sha256 = "0gl8gfdnq61lx6qjyswgxhbg5m3p26cps0pix3rssqb64v7lrxci";
+          rev = "f4b387ccbd2c49f3bbb5401e93bfcc050ca128ef";
+          sha256 = "1fiqx5q0jwh92dxj54wglw91a9pxyb58s8253pb7as9y1iwvyyhq";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/332f3f9c6dc106e58345abbc2d8fd99056d518c0/recipes/evil-mu4e";
           sha256 = "1ks4vnga7dkz27a7gza5hakzbcsiqgkq1ysc0lcx7g82ihpmrrcq";
-          name = "evil-mu4e";
+          name = "recipe";
         };
-        packageRequires = [ dash emacs evil ];
+        packageRequires = [ emacs evil ];
         meta = {
           homepage = "https://melpa.org/#/evil-mu4e";
           license = lib.licenses.free;
         };
       }) {};
-    evil-multiedit = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, iedit, lib, melpaBuild }:
-    melpaBuild {
+    evil-multiedit = callPackage ({ cl-lib ? null
+                                  , emacs
+                                  , evil
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , iedit
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "evil-multiedit";
         version = "20180209.1819";
         src = fetchFromGitHub {
@@ -21772,10 +27223,10 @@
           rev = "ea3d9177b74ab0bc65e55df9cc0a0b42e4ef815d";
           sha256 = "17zm35r474z8ras4xy7124pcb972d385pbdv4jxyj5vq042vq07w";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/997f5a6999d1add57fae33ba8eb3e3bc60d7bb56/recipes/evil-multiedit";
           sha256 = "0p02q9skqw2zhx7sfadqgs7vn518s72856962dam0xw4sqasplfp";
-          name = "evil-multiedit";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs evil iedit ];
         meta = {
@@ -21783,8 +27234,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    evil-nerd-commenter = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    evil-nerd-commenter = callPackage ({ emacs
+                                       , fetchFromGitHub
+                                       , fetchurl
+                                       , lib
+                                       , melpaBuild }:
+      melpaBuild {
         pname = "evil-nerd-commenter";
         version = "20180411.640";
         src = fetchFromGitHub {
@@ -21793,10 +27248,10 @@
           rev = "34d411715ead5829d6d8969511047feb703b067e";
           sha256 = "0ax846dy2hbrbvkj7nzfkcl5i1x9rga8bvg0ln55ivhq0iiy1lkv";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a3e1ff69e7cc95a5b5d628524ad836833f4ee736/recipes/evil-nerd-commenter";
           sha256 = "1pa5gh065hqn5mhs47qvjllwdwwafl0clk555mb6w7svq58r6i8d";
-          name = "evil-nerd-commenter";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -21804,20 +27259,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    evil-numbers = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    evil-numbers = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "evil-numbers";
         version = "20140606.551";
         src = fetchFromGitHub {
           owner = "cofi";
           repo = "evil-numbers";
-          rev = "6ea1c8c3a9b37bed63d48f1128e9a4910e68187e";
-          sha256 = "1aq95hj8x13py0pwsnc6wvd8cc5yv5qin8ym9js42y5966vwj4np";
+          rev = "8834eb2e8bd93561a706363946701d0d90546a9f";
+          sha256 = "13jg2xbh4p02x1nj77b6csb93hh56c1nv8kslcq2hjj3caipk4m8";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/evil-numbers";
           sha256 = "1lpmkklwjdf7ayhv99g9zh3l9hzrwm0hr0ijvbc7yz3n398zn1b2";
-          name = "evil-numbers";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -21825,8 +27283,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    evil-opener = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild, opener }:
-    melpaBuild {
+    evil-opener = callPackage ({ evil
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild
+                               , opener }:
+      melpaBuild {
         pname = "evil-opener";
         version = "20161207.1010";
         src = fetchFromGitHub {
@@ -21835,10 +27298,10 @@
           rev = "c384f67278046fdcd220275fdd212ab85672cbeb";
           sha256 = "0gci909a2rbx5i8dyzyrcddwdic7nvpk6y6djvn521yaag4sq87h";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/evil-opener";
           sha256 = "0cld853pyzlaa306rpypw2wm4953i6y06irlk96bql9aa1zx977g";
-          name = "evil-opener";
+          name = "recipe";
         };
         packageRequires = [ evil opener ];
         meta = {
@@ -21846,8 +27309,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    evil-org = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    evil-org = callPackage ({ emacs
+                            , evil
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "evil-org";
         version = "20180323.1606";
         src = fetchFromGitHub {
@@ -21856,10 +27324,10 @@
           rev = "b6d652a9163d3430a9e0933a554bdbee5244bbf6";
           sha256 = "176hrw7y7nczffbyhsa167b8rvfacsmcafm2gpkrdjqlrikbmrhl";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1768558ed0a0249421437b66fe45018dd768e637/recipes/evil-org";
           sha256 = "18glpsnpxap4dvnvkl59h9pnwlp20libsfbbkmvrbzsvbdyspg6z";
-          name = "evil-org";
+          name = "recipe";
         };
         packageRequires = [ emacs evil ];
         meta = {
@@ -21867,8 +27335,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    evil-paredit = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild, paredit }:
-    melpaBuild {
+    evil-paredit = callPackage ({ evil
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild
+                                , paredit }:
+      melpaBuild {
         pname = "evil-paredit";
         version = "20150413.1348";
         src = fetchFromGitHub {
@@ -21877,10 +27350,10 @@
           rev = "e058fbdcf9dbf7ad6cc77f0172d7517ef233d55f";
           sha256 = "0b08y4spapl4g2292j3l4cr84gjlvm3rpma3gqld4yb1sxd7v78p";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/88db86e1351410bcff6f3ed80681946afcec9959/recipes/evil-paredit";
           sha256 = "0xvxxa3gjgsrv10a61y0591bn3gj8v1ff2wck8s0svwfl076gyfy";
-          name = "evil-paredit";
+          name = "recipe";
         };
         packageRequires = [ evil paredit ];
         meta = {
@@ -21888,8 +27361,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    evil-quickscope = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    evil-quickscope = callPackage ({ evil
+                                   , fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "evil-quickscope";
         version = "20160202.1124";
         src = fetchFromGitHub {
@@ -21898,10 +27375,10 @@
           rev = "37a20e4c56c6058abf186ad4013c155e695e876f";
           sha256 = "1ja9ggj70wf0nmma4xnc1zdzg2crq9h1cv3cj7cgwjmllflgkfq7";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ec118caf243c74d243f533c9e12f7de0d6c43bc4/recipes/evil-quickscope";
           sha256 = "0xym1mh4p68i00l1lshywf5fdg1vw3szxp3fk9fwfcg04z6vd489";
-          name = "evil-quickscope";
+          name = "recipe";
         };
         packageRequires = [ evil ];
         meta = {
@@ -21909,20 +27386,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    evil-rails = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile-rails }:
-    melpaBuild {
+    evil-rails = callPackage ({ evil
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild
+                              , projectile-rails }:
+      melpaBuild {
         pname = "evil-rails";
         version = "20160621.1558";
         src = fetchFromGitHub {
           owner = "antono";
           repo = "evil-rails";
-          rev = "c8669783d8a40719b2604c58a4c06c248cab272f";
-          sha256 = "0a4msvyzp29dx666qylwim9nq4z9j5rlmp7vcdhzbmqbbp5zs0bc";
+          rev = "8cbf97719fdef17e98c593966d4753962e350bac";
+          sha256 = "18m73hr0nqrf60vnrhbd4jjrfz8g6flzkdjixd8rzpxpmfx8vsv9";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ff526fe800b0535067431f1ae78c4a4b5594b23d/recipes/evil-rails";
           sha256 = "0ah0nvzl30z19566kacyrsznsdm3cpij8n3bw3dfng7263rh60gj";
-          name = "evil-rails";
+          name = "recipe";
         };
         packageRequires = [ evil projectile-rails ];
         meta = {
@@ -21930,8 +27412,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    evil-replace-with-char = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    evil-replace-with-char = callPackage ({ emacs
+                                          , evil
+                                          , fetchFromGitHub
+                                          , fetchurl
+                                          , lib
+                                          , melpaBuild }:
+      melpaBuild {
         pname = "evil-replace-with-char";
         version = "20180324.1506";
         src = fetchFromGitHub {
@@ -21940,10 +27427,10 @@
           rev = "ed4a12d5bff11163eb03ad2826c52fd30f51a8d3";
           sha256 = "1nhnwl39wsi7akzcjqszxxw2b6j9i5y4qabcd8p387zajjpgscwk";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0ac1b487e0fe193cc46c8b489686972ed6db3973/recipes/evil-replace-with-char";
           sha256 = "0lgazw53j44rc72czwqxs6yaz67l9i1v52wbi7l9w958fnjra84r";
-          name = "evil-replace-with-char";
+          name = "recipe";
         };
         packageRequires = [ emacs evil ];
         meta = {
@@ -21951,8 +27438,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    evil-replace-with-register = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    evil-replace-with-register = callPackage ({ evil
+                                              , fetchFromGitHub
+                                              , fetchurl
+                                              , lib
+                                              , melpaBuild }:
+      melpaBuild {
         pname = "evil-replace-with-register";
         version = "20170713.225";
         src = fetchFromGitHub {
@@ -21961,10 +27452,10 @@
           rev = "91cc7bf21a94703c441cc9212214075b226b7f67";
           sha256 = "14rpn76qrf287s3y2agmddcxi27r226i53ixjvd694ss039g0r11";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b1bd98aebefc13da5a129d1d3f1c8878e4a70654/recipes/evil-replace-with-register";
           sha256 = "0qyym6vwjs0aqf2p28rh96v30pgxg060pxyij0vrfj469wzmlrj9";
-          name = "evil-replace-with-register";
+          name = "recipe";
         };
         packageRequires = [ evil ];
         meta = {
@@ -21972,20 +27463,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    evil-rsi = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    evil-rsi = callPackage ({ evil
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "evil-rsi";
         version = "20160221.1304";
         src = fetchFromGitHub {
           owner = "linktohack";
           repo = "evil-rsi";
-          rev = "65ae60866be494e4622fe383e23975e04d2a42a3";
-          sha256 = "0cc2yxck5brnicllcadb4m5zlzczvdy6v38q34hj8bri1kxfzslz";
+          rev = "236bf6ed1e2285698db808463e5f2f69f5f5e7c0";
+          sha256 = "1xz629qv1ss1fap397k48piawcwl8lrybraq5449bw1vvn1a4d9f";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/24f438b47e8ede0ef84261424c122d2ac28b90cb/recipes/evil-rsi";
           sha256 = "0mc39n72420n36kwyf9zpw1pgyih0aigfnmkbywb0yxgj7myc345";
-          name = "evil-rsi";
+          name = "recipe";
         };
         packageRequires = [ evil ];
         meta = {
@@ -21993,20 +27488,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    evil-search-highlight-persist = callPackage ({ fetchFromGitHub, fetchurl, highlight, lib, melpaBuild }:
-    melpaBuild {
+    evil-search-highlight-persist = callPackage ({ fetchFromGitHub
+                                                 , fetchurl
+                                                 , highlight
+                                                 , lib
+                                                 , melpaBuild }:
+      melpaBuild {
         pname = "evil-search-highlight-persist";
         version = "20170522.2034";
         src = fetchFromGitHub {
           owner = "naclander";
           repo = "evil-search-highlight-persist";
-          rev = "979d2dec58d3b9c5ca5fdf4bb802a0209913794e";
-          sha256 = "0ak8r7cgz5xnjyfg3w9mwxhvaw8ny3hy0i2bqn3vf5dps649iy7i";
+          rev = "6e04a8c075f5fd62526d222447048faab8bfa187";
+          sha256 = "1ni1bila3kjqrjcn1sm6g6h2cmf1chrh4d8nj4qfjvkb12fkw6j6";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f2e91974ddb219c88229782b70ade7e14f20c0b5/recipes/evil-search-highlight-persist";
           sha256 = "08l8ymrp9vkpwprq9gp4562yvcnd4hfc3z7n4n5lz7h6ffv3zym3";
-          name = "evil-search-highlight-persist";
+          name = "recipe";
         };
         packageRequires = [ highlight ];
         meta = {
@@ -22014,8 +27513,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    evil-smartparens = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild, smartparens }:
-    melpaBuild {
+    evil-smartparens = callPackage ({ emacs
+                                    , evil
+                                    , fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild
+                                    , smartparens }:
+      melpaBuild {
         pname = "evil-smartparens";
         version = "20171210.713";
         src = fetchFromGitHub {
@@ -22024,10 +27529,10 @@
           rev = "026d4a3cfce415a4dfae1457f871b385386e61d3";
           sha256 = "05habba44zls2d20kgzshrq2psagay16cnvcnkqgrbhvj1rxfmrk";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/850898fbfc8e0aeb779e8feae56476d989110e79/recipes/evil-smartparens";
           sha256 = "1viwrd6gfqmwhlil80pk68dikn3cjf9ddsy0z781z3qfx0j35qza";
-          name = "evil-smartparens";
+          name = "recipe";
         };
         packageRequires = [ emacs evil smartparens ];
         meta = {
@@ -22035,20 +27540,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    evil-snipe = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    evil-snipe = callPackage ({ cl-lib ? null
+                              , emacs
+                              , evil
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "evil-snipe";
-        version = "20180317.233";
+        version = "20180503.141";
         src = fetchFromGitHub {
           owner = "hlissner";
           repo = "evil-snipe";
-          rev = "37ca9749bf5604040e745d65143cb0667f052542";
-          sha256 = "172zqf7qmdhyhlj48nxyxpn0cnqb9v045536sf6gfvcrv81wps0c";
+          rev = "8120c2398cb5ca9a81369f7201b3db19cd71e965";
+          sha256 = "0i6hjzidccxdy3dq7rrngfqlrrwb6yyc635fark3dnn90cpadwci";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6748f3febbe2f098761e967b4dc67791186d0aa7/recipes/evil-snipe";
           sha256 = "0gcmpjw3iw7rjk86b2k6clfigp48vakfjd1a9n8qramhnc85rgkn";
-          name = "evil-snipe";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs evil ];
         meta = {
@@ -22056,8 +27567,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    evil-space = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    evil-space = callPackage ({ evil
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "evil-space";
         version = "20151208.428";
         src = fetchFromGitHub {
@@ -22066,10 +27581,10 @@
           rev = "a9c07284d308425deee134c9d88a2d538dd229e6";
           sha256 = "1x4nphjq8lvg8qsm1pj04mk9n59xc6jlxiv5s3bih1nl4xkssrxy";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4e5a4b9427038f90898ac0e237e71ba7152501f5/recipes/evil-space";
           sha256 = "1asvh873r1xgffvz3nr653yn8h5ifaphnafp6wf1b1mja6as7f23";
-          name = "evil-space";
+          name = "recipe";
         };
         packageRequires = [ evil ];
         meta = {
@@ -22077,20 +27592,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    evil-string-inflection = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild, string-inflection }:
-    melpaBuild {
+    evil-string-inflection = callPackage ({ emacs
+                                          , evil
+                                          , fetchFromGitHub
+                                          , fetchurl
+                                          , lib
+                                          , melpaBuild
+                                          , string-inflection }:
+      melpaBuild {
         pname = "evil-string-inflection";
         version = "20180313.1055";
         src = fetchFromGitHub {
           owner = "ninrod";
           repo = "evil-string-inflection";
-          rev = "00b62fb82de36e9c7b44bd644c7e11ae88f35f62";
-          sha256 = "0f24722vl3sqri389hi6qj7hhfalqpjvyq4ain5hhr0gsx2dznw4";
+          rev = "5512db7e0e5fd28c881cc278add50ffae1f121f0";
+          sha256 = "1114yacpb0a0lp7kz0lb1mb7s1adhk370i3kj78a911i72c9szi1";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0720a0f5b775fcee8d1cfa0defe80048e2dd0972/recipes/evil-string-inflection";
           sha256 = "0w9x49c0gmv4waspa9fvbhf2adm19cixkwx7a7la9v4qy7da6akh";
-          name = "evil-string-inflection";
+          name = "recipe";
         };
         packageRequires = [ emacs evil string-inflection ];
         meta = {
@@ -22098,20 +27619,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    evil-surround = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    evil-surround = callPackage ({ evil
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "evil-surround";
         version = "20180102.601";
         src = fetchFromGitHub {
           owner = "emacs-evil";
           repo = "evil-surround";
-          rev = "2af81ab3ac64e4b0515a157a672d8cb89f0172b9";
-          sha256 = "00bcz353cc82wpk5cai5ni99z2la4gwm0k1fvanysx1amg8vxvfy";
+          rev = "5a20c9757eff64e1567d313eb254126aef2bf3b2";
+          sha256 = "094vz707iyjknmhmhdlzc8sv8x86yxgx863c23nm6fjn5n5h7jmz";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2c9dc47a4c837c44429a74fd998fe468c00639f2/recipes/evil-surround";
           sha256 = "0aphv5zinb0lzdx22qbzcr7fn6jbpkdczar7py3df6mzxw5wvcm1";
-          name = "evil-surround";
+          name = "recipe";
         };
         packageRequires = [ evil ];
         meta = {
@@ -22119,8 +27644,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    evil-swap-keys = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    evil-swap-keys = callPackage ({ emacs
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "evil-swap-keys";
         version = "20170726.1120";
         src = fetchFromGitHub {
@@ -22129,10 +27658,10 @@
           rev = "56bc201e265a6bd482a7c41a7c81d2238341ef3a";
           sha256 = "0n0hl0plaghz9rjssabxwfzm46kr6564hpfh6hn8lzla4rf1q5zs";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2abff8e3d54ac13c4fe90692a56437844accca25/recipes/evil-swap-keys";
           sha256 = "12cx95mjm4ymggidvf41gh3a364z32h655jmhk417v0ga9jk9fv6";
-          name = "evil-swap-keys";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -22140,8 +27669,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    evil-tabs = callPackage ({ elscreen, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    evil-tabs = callPackage ({ elscreen
+                             , evil
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "evil-tabs";
         version = "20160217.720";
         src = fetchFromGitHub {
@@ -22150,10 +27684,10 @@
           rev = "53d3314a810017b6056ab6796aef671f5ea1c063";
           sha256 = "1qklx0j3fz3mp87v64yqbyyq5csfymbjfwvy2s4nk634wbnrra93";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/61eea3ae1c89163736b806aa8ca4f44d17daaba3/recipes/evil-tabs";
           sha256 = "0qgvpv5hcai8wmkv2fp6i2vdy7qp4gwidwpzz8j6vl9519x73s62";
-          name = "evil-tabs";
+          name = "recipe";
         };
         packageRequires = [ elscreen evil ];
         meta = {
@@ -22161,8 +27695,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    evil-terminal-cursor-changer = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    evil-terminal-cursor-changer = callPackage ({ evil
+                                                , fetchFromGitHub
+                                                , fetchurl
+                                                , lib
+                                                , melpaBuild }:
+      melpaBuild {
         pname = "evil-terminal-cursor-changer";
         version = "20170401.142";
         src = fetchFromGitHub {
@@ -22171,10 +27709,10 @@
           rev = "b49ca4393d2f3cc6014174950059b36a5cb22949";
           sha256 = "1zra2h0x20whshbc4sfyj6w73jv6ak435mr9n6r6s7brqqqgpa36";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/evil-terminal-cursor-changer";
           sha256 = "16p9a1dybbqr8r717c5ssfd3p5392bqxxzqs4n0xc7v7g8v1m0cd";
-          name = "evil-terminal-cursor-changer";
+          name = "recipe";
         };
         packageRequires = [ evil ];
         meta = {
@@ -22182,20 +27720,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    evil-test-helpers = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    evil-test-helpers = callPackage ({ evil
+                                     , fetchFromGitHub
+                                     , fetchurl
+                                     , lib
+                                     , melpaBuild }:
+      melpaBuild {
         pname = "evil-test-helpers";
         version = "20180109.1040";
         src = fetchFromGitHub {
           owner = "emacs-evil";
           repo = "evil";
-          rev = "49ebf2dce325bc7fe0941dc4112226c291ff9670";
-          sha256 = "0vjbyh77d4z9ahk0w8fmb4fdd98hq19ijy11b1y4n029yl1yrwvr";
+          rev = "49d6167d6bb97454afe1d06a5324483682de8ab6";
+          sha256 = "0l3hmmkys3fw5yxs4kmjx5nrbjh9w19d0bfkryhbxhc5xszydvzz";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/87da8c50f9167ad9c3844b23becb6904f809611d/recipes/evil-test-helpers";
           sha256 = "0l4skyznzgr76z518q22lf90ymlsfcs02w8vqkg8az1nfl3ch7fs";
-          name = "evil-test-helpers";
+          name = "recipe";
         };
         packageRequires = [ evil ];
         meta = {
@@ -22203,20 +27745,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    evil-text-object-python = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    evil-text-object-python = callPackage ({ emacs
+                                           , evil
+                                           , fetchFromGitHub
+                                           , fetchurl
+                                           , lib
+                                           , melpaBuild }:
+      melpaBuild {
         pname = "evil-text-object-python";
         version = "20160815.141";
         src = fetchFromGitHub {
           owner = "wbolster";
           repo = "evil-text-object-python";
-          rev = "3b3fb01e7ad7eeeeae1143695547fe75148cc44f";
-          sha256 = "1alin2rmx1xa1w3b1nb76bplmg10il55jxxm6jj7qs6z1izzllci";
+          rev = "7aae5558be25b4a33abdede8a91da1cc7d08f1bc";
+          sha256 = "0qfqfqbq3jijnmg0rp6agz9skcv2drnpyn481c7f455z46xi87kl";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0d0893b07bc4a057561a1c1a85b7520c50f31e12/recipes/evil-text-object-python";
           sha256 = "0jdzs1yn8nrxq890427yjrxdvnzj8jy7bs3jj4w4c0fik26ngqhm";
-          name = "evil-text-object-python";
+          name = "recipe";
         };
         packageRequires = [ emacs evil ];
         meta = {
@@ -22224,8 +27771,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    evil-textobj-anyblock = callPackage ({ cl-lib ? null, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    evil-textobj-anyblock = callPackage ({ cl-lib ? null
+                                         , evil
+                                         , fetchFromGitHub
+                                         , fetchurl
+                                         , lib
+                                         , melpaBuild }:
+      melpaBuild {
         pname = "evil-textobj-anyblock";
         version = "20170905.1207";
         src = fetchFromGitHub {
@@ -22234,10 +27786,10 @@
           rev = "ff00980f0634f95bf2ad9956b615a155ea8743be";
           sha256 = "0wn5lp7kh3ip1bmqi12c9ivpjj0x602h8d7ag39qw36smv4jqvnb";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/36b734960313d4cb484cebaac0f112781436631c/recipes/evil-textobj-anyblock";
           sha256 = "03vk30s2wkcszcjxmh5ww39rihnag9cp678wdzq4bnqy0c6rnjwa";
-          name = "evil-textobj-anyblock";
+          name = "recipe";
         };
         packageRequires = [ cl-lib evil ];
         meta = {
@@ -22245,8 +27797,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    evil-textobj-column = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild, names }:
-    melpaBuild {
+    evil-textobj-column = callPackage ({ emacs
+                                       , evil
+                                       , fetchFromGitHub
+                                       , fetchurl
+                                       , lib
+                                       , melpaBuild
+                                       , names }:
+      melpaBuild {
         pname = "evil-textobj-column";
         version = "20170905.1205";
         src = fetchFromGitHub {
@@ -22255,10 +27813,10 @@
           rev = "835d7036d0bc9a6e44fc9b7c54ccf2a7c01428cd";
           sha256 = "0g9d62sgcpzvhbrdk4hf3phphfss74mjz6xv4wd9895rzjsziwkf";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/de7d6dc0d9c42a89be2959d015efa30960df2de7/recipes/evil-textobj-column";
           sha256 = "13q3nawx05rn3k6kzq1889vxjznr454cib96pc9lmrq7h65lym2h";
-          name = "evil-textobj-column";
+          name = "recipe";
         };
         packageRequires = [ emacs evil names ];
         meta = {
@@ -22266,20 +27824,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    evil-tutor = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    evil-tutor = callPackage ({ evil
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "evil-tutor";
         version = "20150102.2250";
         src = fetchFromGitHub {
           owner = "syl20bnr";
           repo = "evil-tutor";
-          rev = "4e124cd3911dc0d1b6817ad2c9e59b4753638f28";
-          sha256 = "00yfq8aflxvp2nnz7smgq0c5wlb7cips5irj8qs6193ixlkpffvx";
+          rev = "79b47a9f444ddaa289c66e8995ee116941429c24";
+          sha256 = "11hiaxiqc2f522y7rgfr6bjnmx4nrssq1q9g96w4rsb10627qvsf";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4b7bfffdc34e181893b8cf4d1cc091f6c3f91126/recipes/evil-tutor";
           sha256 = "1hvc2w5ykrgh62n4sxqqqcdk5sd7nmh6xzv4mir5vf9y2dgqcvsn";
-          name = "evil-tutor";
+          name = "recipe";
         };
         packageRequires = [ evil ];
         meta = {
@@ -22287,20 +27849,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    evil-tutor-ja = callPackage ({ evil, evil-tutor, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    evil-tutor-ja = callPackage ({ evil
+                                 , evil-tutor
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "evil-tutor-ja";
         version = "20160916.1832";
         src = fetchFromGitHub {
           owner = "kenjimyzk";
           repo = "evil-tutor-ja";
-          rev = "99af7d82e02ce3bcdfaff47c5c80b57327a7ea8d";
-          sha256 = "1cms98cy4p5dxwfc1zhgdaln8vr2nxzcj0d31imyabb4mwliabfw";
+          rev = "06b9ad853a15ce6f2c53c2cf379b9ff358369f2d";
+          sha256 = "1cazqdiri2b61fxnkhgksqxp0gb41wzcq8275n779rindkwaf2zk";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2c98605fd21b38aaa200c6a0ec4c18f8575b0d7a/recipes/evil-tutor-ja";
           sha256 = "1yd8aij9q1jdmb387f1zjiq5mf68jvbgbyp5b49hmag4hw5h7vm2";
-          name = "evil-tutor-ja";
+          name = "recipe";
         };
         packageRequires = [ evil evil-tutor ];
         meta = {
@@ -22308,20 +27875,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    evil-vimish-fold = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild, vimish-fold }:
-    melpaBuild {
+    evil-vimish-fold = callPackage ({ emacs
+                                    , evil
+                                    , fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild
+                                    , vimish-fold }:
+      melpaBuild {
         pname = "evil-vimish-fold";
         version = "20171030.451";
         src = fetchFromGitHub {
           owner = "alexmurray";
           repo = "evil-vimish-fold";
-          rev = "c617fecb91303f8c63f85a6101a503fdc88aae84";
-          sha256 = "05zm0gngdamfs5cqnjq4lh7253hdj0lggdgfphl56ynblhf8qf36";
+          rev = "4db872d12274fdddf7c6e9d01cf68cbad9cfcf15";
+          sha256 = "05phnswbk2r7hdwawzkw6anhkfss9ig8sy469s4vsrqf7cky4gmn";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fcd51e24f88ebbbd3fddfc7c6f3b667d5104cf2b/recipes/evil-vimish-fold";
           sha256 = "01wp4h97hjyzbpd7iighjj26m79499wp5pn8m4pa7v59f6r3sdk6";
-          name = "evil-vimish-fold";
+          name = "recipe";
         };
         packageRequires = [ emacs evil vimish-fold ];
         meta = {
@@ -22329,8 +27902,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    evil-visual-mark-mode = callPackage ({ dash, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    evil-visual-mark-mode = callPackage ({ dash
+                                         , evil
+                                         , fetchFromGitHub
+                                         , fetchurl
+                                         , lib
+                                         , melpaBuild }:
+      melpaBuild {
         pname = "evil-visual-mark-mode";
         version = "20150202.1000";
         src = fetchFromGitHub {
@@ -22339,10 +27917,10 @@
           rev = "094ee37599492885ff3144918fcdd9b74dadaaa0";
           sha256 = "07cmql8zsqz1qchq2mp3qybbay499dk1yglisig6jfddcmrbbggz";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/293cdd3387f26e4c8f21582d75a194963ac9cff7/recipes/evil-visual-mark-mode";
           sha256 = "1qgr2dfhfz6imnlznicl7lplajd1s8wny7mlxs1bkms3xjcjfi48";
-          name = "evil-visual-mark-mode";
+          name = "recipe";
         };
         packageRequires = [ dash evil ];
         meta = {
@@ -22350,8 +27928,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    evil-visual-replace = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    evil-visual-replace = callPackage ({ evil
+                                       , fetchFromGitHub
+                                       , fetchurl
+                                       , lib
+                                       , melpaBuild }:
+      melpaBuild {
         pname = "evil-visual-replace";
         version = "20171015.2313";
         src = fetchFromGitHub {
@@ -22360,10 +27942,10 @@
           rev = "163fc827a1ffc106475da470c37fb26f4cc9b008";
           sha256 = "1gfyrq7xfzmzh3x8k5f08n027dlbwi0pkkxf9c39fkxp4jngibsz";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/evil-visual-replace";
           sha256 = "1dq3bd9aqpk3jq1c9yzlpjyw6mi8l428l111vrmfg156k1w22v01";
-          name = "evil-visual-replace";
+          name = "recipe";
         };
         packageRequires = [ evil ];
         meta = {
@@ -22371,8 +27953,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    evil-visualstar = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    evil-visualstar = callPackage ({ evil
+                                   , fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "evil-visualstar";
         version = "20160222.1648";
         src = fetchFromGitHub {
@@ -22381,10 +27967,10 @@
           rev = "06c053d8f7381f91c53311b1234872ca96ced752";
           sha256 = "0mkbzw12fav945icibc2293m5haxqr3hzkyli2cf4ssk6yvn0x4c";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/578d33f3f8e68ef1b3ca3fb8af9b9ff77b649bd3/recipes/evil-visualstar";
           sha256 = "135l9hjfbpn0a6p53picnpydi9qs5vrk2rfn64gxa5ag2apcyycy";
-          name = "evil-visualstar";
+          name = "recipe";
         };
         packageRequires = [ evil ];
         meta = {
@@ -22392,8 +27978,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    evm = callPackage ({ dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    evm = callPackage ({ dash
+                       , f
+                       , fetchFromGitHub
+                       , fetchurl
+                       , lib
+                       , melpaBuild }:
+      melpaBuild {
         pname = "evm";
         version = "20141007.456";
         src = fetchFromGitHub {
@@ -22402,10 +27993,10 @@
           rev = "d0623b2355436a5fd9f7238b419782080c79196b";
           sha256 = "0739v0m9vj70a55z0canslyqgafzys815i7a0r6bxj2f9iwq6rhb";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bbcead697f745d197459f90ee05b172e35af2411/recipes/evm";
           sha256 = "19l6cs5schbnph0pwhhj66gkxsswd4bmjpy79l9kxzpjf107wc03";
-          name = "evm";
+          name = "recipe";
         };
         packageRequires = [ dash f ];
         meta = {
@@ -22413,8 +28004,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    ewmctrl = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ewmctrl = callPackage ({ fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "ewmctrl";
         version = "20170921.1917";
         src = fetchFromGitHub {
@@ -22423,10 +28017,10 @@
           rev = "3d0217c4d6cdb5c308b6cb4293574f470d4faacf";
           sha256 = "0ilwvx0qryv3v6xf0gxqwnfm6pf96gxap8h9g3f6z6lk9ff4n1wi";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b2a7679f0961b171bf23080e628ae80f50c446e4/recipes/ewmctrl";
           sha256 = "1w60pb7szai1kh06jd3qvgpzq3z1ci4a77ysnpqjfk326s6zv7hl";
-          name = "ewmctrl";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -22434,8 +28028,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    eww-lnum = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    eww-lnum = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "eww-lnum";
         version = "20150102.712";
         src = fetchFromGitHub {
@@ -22444,10 +28041,10 @@
           rev = "4b0ecec769919ecb05ca4fb15ec51911ba589929";
           sha256 = "1i6zf17rwa390c33cbspz81dz86vwlphyhjjsia4gp205nfk3s20";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/eww-lnum";
           sha256 = "1hhc6q8zlj335v27j4dq6ms7frqpivfabs9w3vkaly5kjr60fw7c";
-          name = "eww-lnum";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -22455,20 +28052,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    exato = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    exato = callPackage ({ emacs
+                         , evil
+                         , fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "exato";
         version = "20180305.242";
         src = fetchFromGitHub {
           owner = "ninrod";
           repo = "exato";
-          rev = "88266fa7fcfbef704032f671b94f756f2f98bd4f";
-          sha256 = "0nmm7pvs81429a4zpal6aidfd1n58yavv3skscrav5r0wnlbz773";
+          rev = "39c08f56483243c28a39886a7218039a138e5f63";
+          sha256 = "1q0jjaw5k9bql7bk5idin724vbcgx0iwn2dm4mg1c51cczqsd2rg";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/939efbcb9b40a2df5ef14e653fb242a8e37c72f9/recipes/exato";
           sha256 = "1h2dd3yhv1n0sznznw8ncx98g53hgi1rg1zkd0nmldih2rd5qisn";
-          name = "exato";
+          name = "recipe";
         };
         packageRequires = [ emacs evil ];
         meta = {
@@ -22476,20 +28078,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    exec-path-from-shell = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    exec-path-from-shell = callPackage ({ fetchFromGitHub
+                                        , fetchurl
+                                        , lib
+                                        , melpaBuild }:
+      melpaBuild {
         pname = "exec-path-from-shell";
         version = "20180323.1904";
         src = fetchFromGitHub {
           owner = "purcell";
           repo = "exec-path-from-shell";
-          rev = "54ea2f9c3c81d18b96e4d33c4c547e02eee420dc";
-          sha256 = "193d9wf8x1cl1q5bzpdm9508a37m6nwlsjzn2mxbiqkb8p9psj73";
+          rev = "4d0af1274797ce61f5d8c209339d5b9cdc49aca6";
+          sha256 = "1h45vxyw0pa99fldnvca96rz1w1hl7mrgx5m51rknxascfvk6fqx";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/exec-path-from-shell";
           sha256 = "014bfcs7znds4if1njyq4s5zrfnr6b3wj6722b4l5r58gh9mlrr5";
-          name = "exec-path-from-shell";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -22497,8 +28102,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    exiftool = callPackage ({ emacs, fetchgit, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    exiftool = callPackage ({ emacs
+                            , fetchgit
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "exiftool";
         version = "20170822.1432";
         src = fetchgit {
@@ -22506,10 +28115,10 @@
           rev = "3a07dbcb975577734d4abf6d68e1ab83a01951bb";
           sha256 = "10prrwvmc891vkzzgqmz0xd85xgi52ni83ydf0bvhfmcg0wmm0cc";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4835a76909d020781021e747fbc341111a94dbfa/recipes/exiftool";
           sha256 = "1zvcps64yvz8lsjhi1j0808983fv2s7kx67yjr8ps454mcl8bpab";
-          name = "exiftool";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -22517,8 +28126,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    exotica-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    exotica-theme = callPackage ({ emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "exotica-theme";
         version = "20180212.1529";
         src = fetchFromGitHub {
@@ -22527,10 +28140,10 @@
           rev = "ff3ef4f6fa38c93b99becad977c7810c990a4d2f";
           sha256 = "1kp6q55g3dcya4y79x877vqwxa4z2rkkvhs49pkwr3wljf4af2pd";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9182f92dd62e2f1775a76699a6c8f9c3e71e9030/recipes/exotica-theme";
           sha256 = "1fzf1zpllkddkq02hvabbi2bh6rnanlyinb6fjwsyh39wvzhsfhs";
-          name = "exotica-theme";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -22538,8 +28151,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    expand-line = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    expand-line = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "expand-line";
         version = "20151005.1907";
         src = fetchFromGitHub {
@@ -22548,10 +28164,10 @@
           rev = "75a5d0241f35dd0748ab8ecb4ff16891535be372";
           sha256 = "0wz4h5hrr5ci0w8pynd2nr1b2zl5hl4pa8gc16mcabik5927rf7z";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1c3fa6b17a8c6b08b0d77bdff0f91b7af34f4279/recipes/expand-line";
           sha256 = "07nfgp6jlrb9wxqy835j79i4g88714zndidkda84z16qn2y901a9";
-          name = "expand-line";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -22559,20 +28175,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    expand-region = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    expand-region = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "expand-region";
-        version = "20171217.2125";
+        version = "20180625.939";
         src = fetchFromGitHub {
           owner = "magnars";
           repo = "expand-region.el";
-          rev = "f99b7630efcdb47c9c6182489c55fba3bcaee521";
-          sha256 = "0sdk9qqxd8dkjf554p7ch2w8pd8a7c4q64c5yd8gphc8fmzc32rn";
+          rev = "54e1b94fa8b65f066f731101a744287e956ae75f";
+          sha256 = "113d804gmvxmg3f32w7m4dc14xpl47aw25255nyr0w5bxm7vmnah";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/expand-region";
           sha256 = "1c7f1nqsqdc75h22fxxnyg0m4yxj6l23sirk3c71fqj14paxqnwg";
-          name = "expand-region";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -22580,20 +28199,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    express = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, string-utils }:
-    melpaBuild {
+    express = callPackage ({ fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild
+                           , string-utils }:
+      melpaBuild {
         pname = "express";
         version = "20140508.1341";
         src = fetchFromGitHub {
           owner = "rolandwalker";
           repo = "express";
-          rev = "93dae7377eace4a5413ba99aecb6f26f90798725";
-          sha256 = "0ah8zayipwp760909llb9whcdvmbsdgkg0x5y4qlcicm1r9kwcc7";
+          rev = "6c301e8a4b6b58a5fe59ba607865238e38cee8fd";
+          sha256 = "1nhqaxagg3p26grjzg8089bmwpx2a3bbq1abw40wbqivybl6mgd5";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9a97f5f81af13c49f5bea31455d7da0bf2c12e4f/recipes/express";
           sha256 = "0lhisy4ds96bwpc7k8w9ws1zi1qh0d36nhxsp36bqzfi09ig0nb9";
-          name = "express";
+          name = "recipe";
         };
         packageRequires = [ string-utils ];
         meta = {
@@ -22601,8 +28224,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    exsqlaim-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    exsqlaim-mode = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild
+                                 , s }:
+      melpaBuild {
         pname = "exsqlaim-mode";
         version = "20170607.303";
         src = fetchFromGitHub {
@@ -22611,10 +28238,10 @@
           rev = "a2e0a62ec8b87193d8eaa695774bfd689324b06c";
           sha256 = "1gj1q2h1ja30jizkjql12cxlppj07ykr4wxqca9msy043zdhqnkk";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7f660d7629bc27144c99ebcba45f1b06b14c5745/recipes/exsqlaim-mode";
           sha256 = "0ssn48wcn3x066nsl8y78y57ndasqv5x6ifxbifdxl3f5vjhyvg7";
-          name = "exsqlaim-mode";
+          name = "recipe";
         };
         packageRequires = [ s ];
         meta = {
@@ -22622,8 +28249,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    extempore-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    extempore-mode = callPackage ({ emacs
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "extempore-mode";
         version = "20180104.2221";
         src = fetchFromGitHub {
@@ -22632,10 +28263,10 @@
           rev = "ae5f40d4b0883a4519e460cd7720e5fcc3a68fa5";
           sha256 = "1f888h7xv6zz6kq38ak1vpwjrjr2sqgwpfxwb9x0ldf3kkx4wf1w";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7bd3e57171f5283604e9375613a7a94416ee99a7/recipes/extempore-mode";
           sha256 = "1z8nzpcj27s74kxfjz7wyr3848jpd6mbyjkssd06ri5p694j9php";
-          name = "extempore-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -22643,8 +28274,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    extend-dnd = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    extend-dnd = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "extend-dnd";
         version = "20151122.1050";
         src = fetchFromGitHub {
@@ -22653,10 +28287,10 @@
           rev = "80c966c93b82c9bb5c6225a432557c39144fc602";
           sha256 = "15dwl1rb3186k328a83dz9xmslc0px60ah16fifvmr3migis9hwz";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f2d866ca12cb997b7fad878808c0966f3413b73d/recipes/extend-dnd";
           sha256 = "0rknpvp8yw051pg3blvmjpp3c9a82jw7f10mq67ggbz98w227417";
-          name = "extend-dnd";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -22664,8 +28298,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    extmap = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    extmap = callPackage ({ emacs
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "extmap";
         version = "20180205.1047";
         src = fetchFromGitHub {
@@ -22674,10 +28312,10 @@
           rev = "3860b69fb19c962425d4e271ee0a24547b67d323";
           sha256 = "1vjwinb7m9l2bw324v4m1g4mc9yqjs84bfjci93m0a1ih8n4zdbr";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/91ef4352603cc69930ab3d63f0a90eee63f5f328/recipes/extmap";
           sha256 = "0c12gfd3480y4fc22ik02n7h85k6s70i5jv5i872h0yi68cgd01j";
-          name = "extmap";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -22685,8 +28323,38 @@
           license = lib.licenses.free;
         };
       }) {};
-    exwm-surf = callPackage ({ emacs, exwm, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    exwm-edit = callPackage ({ emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
+        pname = "exwm-edit";
+        version = "20180629.137";
+        src = fetchFromGitHub {
+          owner = "agzam";
+          repo = "exwm-edit";
+          rev = "6ea0a64e47d06204d826e146c3c3082dec5c4007";
+          sha256 = "0sz2q4nj5inh42f37jfkc5z7fdw1lgsyz2fh5ljgjcvrd9xlb24l";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/f247915e02e59ebd6a2a219e55870e034d41c938/recipes/exwm-edit";
+          sha256 = "0bydkznywma0x293m105amppx4qx1iyjpqdfq6np73176xfy6kc5";
+          name = "recipe";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/exwm-edit";
+          license = lib.licenses.free;
+        };
+      }) {};
+    exwm-surf = callPackage ({ emacs
+                             , exwm
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "exwm-surf";
         version = "20171204.340";
         src = fetchFromGitHub {
@@ -22695,10 +28363,10 @@
           rev = "6c17e2c1597fe4b7b454a1dac23b9127ac951e94";
           sha256 = "0rb921fq3pyzv0w1s6n0zx4j7cvv68mb50hfa8nqnppz5ii1k0lb";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4fc27fae2b58c7af87dadba9217cc05f8ab4890c/recipes/exwm-surf";
           sha256 = "066qbn1w63irh9b03qs0fv77x71cind22kdj6wygaznrpgwr0kny";
-          name = "exwm-surf";
+          name = "recipe";
         };
         packageRequires = [ emacs exwm ];
         meta = {
@@ -22706,8 +28374,18 @@
           license = lib.licenses.free;
         };
       }) {};
-    exwm-x = callPackage ({ bind-key, cl-lib ? null, counsel, exwm, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild, swiper, switch-window }:
-    melpaBuild {
+    exwm-x = callPackage ({ bind-key
+                          , cl-lib ? null
+                          , counsel
+                          , exwm
+                          , fetchFromGitHub
+                          , fetchurl
+                          , ivy
+                          , lib
+                          , melpaBuild
+                          , swiper
+                          , switch-window }:
+      melpaBuild {
         pname = "exwm-x";
         version = "20180227.257";
         src = fetchFromGitHub {
@@ -22716,10 +28394,10 @@
           rev = "4f7946db67d6599baba6b3961e8f543a68707742";
           sha256 = "00lcn5106xig2y9gyir1f1gzyp2i05rwq1lbbbah8aipkdi3z9xl";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a0e6e23bcffdcd1e17c70599c563609050e5de40/recipes/exwm-x";
           sha256 = "1d9q57vz63sk3h1g5gvp9xnmqkpa73wppmiy2bv8mxk11whl6xa3";
-          name = "exwm-x";
+          name = "recipe";
         };
         packageRequires = [
           bind-key
@@ -22735,20 +28413,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    eyebrowse = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    eyebrowse = callPackage ({ dash
+                             , emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "eyebrowse";
-        version = "20171216.944";
+        version = "20180514.1219";
         src = fetchFromGitHub {
           owner = "wasamasa";
           repo = "eyebrowse";
-          rev = "ad94b5bed74a74769775e937e167d301f4ea70e3";
-          sha256 = "1f1b70fyq9j19i41rsishrdkslwnx0af7gzwirhs25sgkpsqz2hr";
+          rev = "ec7e11022032348ee23a3586a1306871f9d28b25";
+          sha256 = "16mks2dr4k6bjr1xds9j2jwm7zwad4z67wa0qg9n50gyiyn4pl4g";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/90d052bfc0b94cf177e33b2ffc01a45d254fc1b1/recipes/eyebrowse";
           sha256 = "09fkzm8z8nkr4s9fbmfcjc80h50051f48v6n14l76xicglr5p861";
-          name = "eyebrowse";
+          name = "recipe";
         };
         packageRequires = [ dash emacs ];
         meta = {
@@ -22756,20 +28439,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    eyuml = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, request, s }:
-    melpaBuild {
+    eyuml = callPackage ({ fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild
+                         , request
+                         , s }:
+      melpaBuild {
         pname = "eyuml";
         version = "20141028.1527";
         src = fetchFromGitHub {
           owner = "antham";
           repo = "eyuml";
-          rev = "eb29c37316e44a14741f16e894fbcfcb7537dc80";
-          sha256 = "19n2dzr3m56g76igh57cvvhqwpbcicwr7r6r4i3l8vsjch99kp6m";
+          rev = "2f259c201c6cc63ee608f75cd85c1ae27f9d2532";
+          sha256 = "1rgzydxv7c455vj1jm44vvs6xc4qgivqqb0g6zh5x4wdcpgdi2g9";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b09a8d723e357da67441e65047759ccfa9cb7ef6/recipes/eyuml";
           sha256 = "0ada2gcl8bw9nn0fz8g9lbqy8a8w1554q03fzd7lv8qla33ri3wx";
-          name = "eyuml";
+          name = "recipe";
         };
         packageRequires = [ request s ];
         meta = {
@@ -22777,8 +28465,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    ez-query-replace = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    ez-query-replace = callPackage ({ dash
+                                    , fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild
+                                    , s }:
+      melpaBuild {
         pname = "ez-query-replace";
         version = "20170814.621";
         src = fetchFromGitHub {
@@ -22787,10 +28480,10 @@
           rev = "f5dbd2d3e5e62e6b7e7cc1a98fc4d0cd411e5afa";
           sha256 = "14mikpxrsmjwdpya45cf47v2gjwxmql10xjk907x27iqqxmfif74";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c40808c7687ace84e4c59bf8c25332c94b6fdd76/recipes/ez-query-replace";
           sha256 = "1h9ijr1qagwp9vvikh7ajby0dqgfypjgc45s7d93zb9jrg2n5cgx";
-          name = "ez-query-replace";
+          name = "recipe";
         };
         packageRequires = [ dash s ];
         meta = {
@@ -22798,8 +28491,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    eziam-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    eziam-theme = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "eziam-theme";
         version = "20180414.329";
         src = fetchFromGitHub {
@@ -22808,10 +28504,10 @@
           rev = "96595833110cd64c391e0ccd5230782a8f0a4e08";
           sha256 = "0nvwgxlrbfhchb7z2qnw1lj66xpzn2b6yb6mhx0k31xdfr173wch";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4e0411583bd4fdbe425eb07de98851136fa1eeb0/recipes/eziam-theme";
           sha256 = "0iz3r4r54ai8y4qhnix291ra7qfmk8dbr06f52pgmz3gzin1cqpb";
-          name = "eziam-theme";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -22819,8 +28515,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    f = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    f = callPackage ({ dash
+                     , fetchFromGitHub
+                     , fetchurl
+                     , lib
+                     , melpaBuild
+                     , s }:
+      melpaBuild {
         pname = "f";
         version = "20180106.122";
         src = fetchFromGitHub {
@@ -22829,10 +28530,10 @@
           rev = "de6d4d40ddc844eee643e92d47b9d6a63fbebb48";
           sha256 = "1a47xk3yp1rp17fqg7ldl3d3fb888h0fz3sysqfdz1bfdgs8a9bk";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/f";
           sha256 = "18qax8i24gpccif4xcxccclpwl00plxjf3zbq9dry37b1r4mj57s";
-          name = "f";
+          name = "recipe";
         };
         packageRequires = [ dash s ];
         meta = {
@@ -22840,8 +28541,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    f3 = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
-    melpaBuild {
+    f3 = callPackage ({ cl-lib ? null
+                      , emacs
+                      , fetchFromGitHub
+                      , fetchurl
+                      , helm
+                      , lib
+                      , melpaBuild }:
+      melpaBuild {
         pname = "f3";
         version = "20180130.358";
         src = fetchFromGitHub {
@@ -22850,10 +28557,10 @@
           rev = "000009ce4adf7a57eae80512f29c4ec2a1391ce5";
           sha256 = "0q3ylw0i1bg7pzsv4gj72jcfjjfh57vsb3fnfnhhh5i5vladiqsf";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5b40de62a82d6895a37ff795d56f7d0f783461e6/recipes/f3";
           sha256 = "099wibgp9k6sgglaqigic5ay6qg7aqijnis5crwjl7b81ddqp610";
-          name = "f3";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs helm ];
         meta = {
@@ -22861,8 +28568,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    fabric = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    fabric = callPackage ({ fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "fabric";
         version = "20171115.2256";
         src = fetchFromGitHub {
@@ -22871,10 +28581,10 @@
           rev = "df79be341d0b34ed23850f9894136092fa5fea8c";
           sha256 = "1mnz81k1jz2sa3zj68ihzgq66l9fcxvzb67ad62p8bvi2aksxx7z";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/83939d2a4d5874244a4916eee9ae6b327af18b5d/recipes/fabric";
           sha256 = "1mkblsakdhvi10b67bv3j0jsf7hr8lf9sibmprvx8smqsih7l88m";
-          name = "fabric";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -22882,8 +28592,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    face-explorer = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    face-explorer = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "face-explorer";
         version = "20170710.1201";
         src = fetchFromGitHub {
@@ -22892,10 +28605,10 @@
           rev = "13bd4553bc4b09215a04d0267be1cb4ed834775c";
           sha256 = "1zbm92imfbh1sm7j64vc1ig5yq6rdd8izkh80mci5k6nf1p3byk7";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2370fdf6421dc518337e04bd2453a5f74e2df2b2/recipes/face-explorer";
           sha256 = "1jfidkkizgwhkkrgvrmq5vrx5ir4zjw4zzc2alw9gkjn1ddq22q7";
-          name = "face-explorer";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -22903,8 +28616,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    faceup = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    faceup = callPackage ({ fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "faceup";
         version = "20170925.1246";
         src = fetchFromGitHub {
@@ -22913,10 +28629,10 @@
           rev = "6c92dad56a133e14e7b27831e1bcf9b3a71ff154";
           sha256 = "1yzmy7flrhrh0i10bdszx8idx6r8h6czm4vm4q0z6fp5fw94zwrx";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a10bf2928b93c3908e89ca8ad9649bb468ebca05/recipes/faceup";
           sha256 = "0l41xp38iji55dv20lk7r187ywcz8s1g2jmwbjwkspzmcf763xvx";
-          name = "faceup";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -22924,20 +28640,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    factlog = callPackage ({ deferred, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    factlog = callPackage ({ deferred
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "factlog";
         version = "20130209.1740";
         src = fetchFromGitHub {
           owner = "tkf";
           repo = "factlog";
-          rev = "6503d77ea882c995b051d22e72db336fb28770fc";
-          sha256 = "19zm9my7fl1r3q48axjv2f8x9hcjk6qah4y4r92b90bzfmcdc30y";
+          rev = "38f78132ae311faffba98ed5dd18d661af68678e";
+          sha256 = "06ycj1c8jadkmfknsvk99s6jq3w29psl5z4m9159i6zlzaqm03qm";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9075a42edee1ac7de0812d2eefcba5681859eb6e/recipes/factlog";
           sha256 = "163482vfpa52b5ya5xps4qnclbaql1x0q54gqdwwmm04as8qbfz7";
-          name = "factlog";
+          name = "recipe";
         };
         packageRequires = [ deferred ];
         meta = {
@@ -22945,20 +28665,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    faff-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    faff-theme = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "faff-theme";
-        version = "20180322.1005";
+        version = "20180702.1023";
         src = fetchFromGitHub {
           owner = "WJCFerguson";
           repo = "emacs-faff-theme";
-          rev = "d123161586397fb74a928bb1b22e2b507f1beed5";
-          sha256 = "136gq45c0w0c3i0fzk3js67z8p7r9k81d31s48flpsb982bf7nfz";
+          rev = "596c8cfbf1a7fbc3b93643359f8d0f4c612d69be";
+          sha256 = "03jrlk5n9jd3mw6k36qblzl89yj6q8ir9krvilb3da170pr6b4pa";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0b35c169fe56a5612ff5a4242140f617fdcae14f/recipes/faff-theme";
           sha256 = "1dmwbkp94zsddy0brs3mkdjr09n69maw2mrdfhriqcdk56qpwp4g";
-          name = "faff-theme";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -22966,8 +28689,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    fakespace = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    fakespace = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "fakespace";
         version = "20120817.1706";
         src = fetchFromGitHub {
@@ -22976,10 +28702,10 @@
           rev = "d1bd1f4b14b2690d7a67f9a52622ec51ed84813a";
           sha256 = "11fm0h9rily5731s137mgv8rdbfqi99s6f36bgr0arwbq3f2j3fs";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/778dbe1fd1d2ecebb499ad66bc950e586f231c52/recipes/fakespace";
           sha256 = "09dsmrqax4wfcw8fd5jf07bjxm5dizpc2qvjkqwg74j2n352wv27";
-          name = "fakespace";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -22987,8 +28713,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    fakir = callPackage ({ dash, fetchFromGitHub, fetchurl, kv, lib, melpaBuild, noflet }:
-    melpaBuild {
+    fakir = callPackage ({ dash
+                         , fetchFromGitHub
+                         , fetchurl
+                         , kv
+                         , lib
+                         , melpaBuild
+                         , noflet }:
+      melpaBuild {
         pname = "fakir";
         version = "20140729.952";
         src = fetchFromGitHub {
@@ -22997,10 +28729,10 @@
           rev = "1fca406ad7de80fece6319ff75d4230b648534b0";
           sha256 = "1w5apzbzr1jd983b0rzsy9ldb0z0zcq6mpyb5r8czl5wd4vvj69h";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d0a8abd5fd77a14b957f53b5bc8474403cc1e18f/recipes/fakir";
           sha256 = "07bicglgpm6qkcsxwj6rswhx4hgh27rfg8s1cki7g8qcvk2f7b25";
-          name = "fakir";
+          name = "recipe";
         };
         packageRequires = [ dash kv noflet ];
         meta = {
@@ -23008,20 +28740,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    fancy-battery = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    fancy-battery = callPackage ({ emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "fancy-battery";
         version = "20150101.404";
         src = fetchFromGitHub {
           owner = "lunaryorn";
           repo = "fancy-battery.el";
-          rev = "9b88ae77a01aa3edc529840338bcb2db7f445822";
-          sha256 = "1k6prddw277iszh9hq145yqidwiiy9iqz656rpmqwn5hmr1vakhk";
+          rev = "bcc2d7960ba207b5b4db96fe40f7d72670fdbb68";
+          sha256 = "0m7rjzl9js2gjfcaqp2n5pn5ykpqnv8qfv35l5m5kpfigsi9cbb0";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/eae3af4145c534992d1c1ee5bb6420651c7c5d82/recipes/fancy-battery";
           sha256 = "03rkfdkrzyal9abdiv8c73w10sm974hxf3xg5015hibfi6kzg8ii";
-          name = "fancy-battery";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -23029,8 +28765,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    fancy-narrow = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    fancy-narrow = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "fancy-narrow";
         version = "20171030.1716";
         src = fetchFromGitHub {
@@ -23039,10 +28778,10 @@
           rev = "9f4a587f6a5a387271fb665e13f59d41fd42504c";
           sha256 = "0dl0fc3i8g193adpkr4fb2k151lw9r6gd8p27q9xgmm9brf9jf17";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/fancy-narrow";
           sha256 = "15i86jz6rdpva1az7gqp1wbm8kispcfc8h6v9fqsbag9sbzvgcyv";
-          name = "fancy-narrow";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -23050,8 +28789,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    farmhouse-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    farmhouse-theme = callPackage ({ fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "farmhouse-theme";
         version = "20160713.1544";
         src = fetchFromGitHub {
@@ -23060,10 +28802,10 @@
           rev = "7ddc1ff13b4a3d5466bd0d33ecb86100352e83a7";
           sha256 = "09k6agh205kr2lif354m38l3967b0jajm14rgpl7l1vlajh8wzfd";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3b0d427db8ab66d2fe323366b0837595b3b59afa/recipes/farmhouse-theme";
           sha256 = "0hbqdrw6x25b331qhbg3yaaa45c2b896wknsjm0a1kg142klq229";
-          name = "farmhouse-theme";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -23071,20 +28813,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    fasd = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    fasd = callPackage ({ fetchgit
+                        , fetchurl
+                        , lib
+                        , melpaBuild }:
+      melpaBuild {
         pname = "fasd";
-        version = "20180203.745";
-        src = fetchFromGitHub {
-          owner = "steckerhalter";
-          repo = "emacs-fasd";
-          rev = "f6393895bddbe9a1c77d4f6963a7e7ec6ff18bc4";
-          sha256 = "1bjb20p2sp1avjmr57b3zf15w01fi7h4dd46zahhap1lrk9sxgx9";
+        version = "20180605.2205";
+        src = fetchgit {
+          url = "https://framagit.org/steckerhalter/emacs-fasd.git";
+          rev = "020c6a4b5fd1498a84ae142d2e32c7ff678fb029";
+          sha256 = "142zq0zz38j3akgc1gipqhgs05krlkig1i97pgzmi4jcqdgm3lx9";
         };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/8f0fefb25f03677080c9adeeb48046d6ea163053/recipes/fasd";
-          sha256 = "0i49z50bpi7fx0dm5jywlndnq9hb0dm5a906k4017w8y7sfpfl6c";
-          name = "fasd";
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/f0a8eb0eefe88b4ea683a4743c0f8393506e014b/recipes/fasd";
+          sha256 = "0ssb1bbw3cwd4zdy08a0fymwjwgdnx0kil5x3x1b7k8kan942436";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -23092,8 +28836,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    fastdef = callPackage ({ fetchFromGitHub, fetchurl, ivy, lib, melpaBuild, w3m }:
-    melpaBuild {
+    fastdef = callPackage ({ fetchFromGitHub
+                           , fetchurl
+                           , ivy
+                           , lib
+                           , melpaBuild
+                           , w3m }:
+      melpaBuild {
         pname = "fastdef";
         version = "20160713.629";
         src = fetchFromGitHub {
@@ -23102,10 +28851,10 @@
           rev = "0696f41dc150d35ce31fe8d2ea74f4173818bb55";
           sha256 = "1p5vmbx7zdzxnyjzcp2vxscd3dwf7xk82wk9dfiv99svwqv2ki3w";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f6effb2fbccc71e8a44c53138e3c21f10dc55fbc/recipes/fastdef";
           sha256 = "1cf4slxhcp2z7h9k3l31h06nnqsyb4smwnj55ivil2lm0fa0vlzj";
-          name = "fastdef";
+          name = "recipe";
         };
         packageRequires = [ ivy w3m ];
         meta = {
@@ -23113,8 +28862,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    fastnav = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    fastnav = callPackage ({ fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "fastnav";
         version = "20120211.657";
         src = fetchFromGitHub {
@@ -23123,10 +28875,10 @@
           rev = "1019ba2b61d1a070204099b23da347278a61bc89";
           sha256 = "0y95lrdqd9i2kbb266s1wdiim4m8vrn3br19d8s55ib6xlywf8cx";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d2a7dce6617bf4ed250dba150e6787bf48891c64/recipes/fastnav";
           sha256 = "08hg256w8k9f5nzgpyl1jykbf28vmvv09kkhzs0s2zhwbl2158a5";
-          name = "fastnav";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -23134,8 +28886,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    faust-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    faust-mode = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "faust-mode";
         version = "20180205.126";
         src = fetchFromGitHub {
@@ -23144,10 +28899,10 @@
           rev = "7c31b22bdbfd2f8c16ec117d2975d56dd61ac15c";
           sha256 = "0a3p69ay88da13cz2cqx00r3qs2swnn7vkcvchcqyrdybfjs7y4z";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b362e7daeabd07c726ad9770d7d4941dfffd5b19/recipes/faust-mode";
           sha256 = "0l8cbf5i6lv6i5vyqp6ngfmrm2y6z2070b8m10w4376kbbnr266z";
-          name = "faust-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -23155,8 +28910,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    faustine = callPackage ({ emacs, faust-mode, fetchgit, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    faustine = callPackage ({ emacs
+                            , faust-mode
+                            , fetchgit
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "faustine";
         version = "20171122.402";
         src = fetchgit {
@@ -23164,10 +28924,10 @@
           rev = "07a38963111518f86123802f9d477be0d4689a3f";
           sha256 = "0dj35hwkm5v8758c4ssl873vkvplba5apjsh7l23nsmnzdji99zg";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8b4c6b03c5ff78ce327dcf66b175e266bbc53dbf/recipes/faustine";
           sha256 = "1blmz993xrwkyr7snj7rm07s07imgpdlfqi6wxkm4ns6iwa2q60s";
-          name = "faustine";
+          name = "recipe";
         };
         packageRequires = [ emacs faust-mode ];
         meta = {
@@ -23175,8 +28935,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    fcitx = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    fcitx = callPackage ({ fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "fcitx";
         version = "20170913.1900";
         src = fetchFromGitHub {
@@ -23185,10 +28948,10 @@
           rev = "095332fbeb994c908c533fe2ad068c0728211c3d";
           sha256 = "01sm50rqajylah2hx6n5ig0xmrrhxbamzs4bg97qzxzr4nlnjcaz";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e8c40f09d9397b3ca32a7ed37203f490497dc984/recipes/fcitx";
           sha256 = "0a8wd588c26p3czfp5hn2n46f2vwyg5v301sv0y07b55b1i3ynmx";
-          name = "fcitx";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -23196,8 +28959,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    fcopy = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    fcopy = callPackage ({ fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "fcopy";
         version = "20150304.603";
         src = fetchFromGitHub {
@@ -23206,10 +28972,10 @@
           rev = "e355f6ec889d8ecbdb096019c2dc660b1cec4941";
           sha256 = "0c56j8ip2fyma9yvwaanz89jyzgi9k11xwwkflzlzc4smnvgfibr";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f9afd35b7c7075bef9ed878b7122ff9783fdd9fd/recipes/fcopy";
           sha256 = "13337ymf8vlbk8c4jpj6paqi06xdmk39yf72s40kmfrbvgmi8qy1";
-          name = "fcopy";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -23217,8 +28983,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    feature-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    feature-mode = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "feature-mode";
         version = "20170907.748";
         src = fetchFromGitHub {
@@ -23227,10 +28996,10 @@
           rev = "722b352c4f0b800a9356dd369c79612782b3b847";
           sha256 = "0myaddivhvl8x3n2z2vjc6mc2jn1jja67mzwx1jp9gb9p958irk0";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0a70991695f9ff305f12cfa45e0a597f4a782ba3/recipes/feature-mode";
           sha256 = "0ryinmpqb3c91qcna6gbijcmqv3skxdc947dlr5s1w623z9nxgqg";
-          name = "feature-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -23238,20 +29007,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    feebleline = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    feebleline = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "feebleline";
-        version = "20180322.1401";
+        version = "20180604.515";
         src = fetchFromGitHub {
           owner = "tautologyclub";
           repo = "feebleline";
-          rev = "56cd8fe336b619840991dc66d9cca973ddd8500c";
-          sha256 = "0p8d31942c3xlymjm2r9qppr07c8vg0842f87lzqh84sc3z7r5ql";
+          rev = "9ece1c02a60ed0209cda661bcb864a7e624e8aca";
+          sha256 = "0fiq16bm28c9z62fdpr7n2fpnqbcmb278b72wi3gl386w34j6xl1";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/782295d8c530878bd0e20cde7e7f7f8f640953dd/recipes/feebleline";
           sha256 = "0c604ahhv9c89r3hj7091zhhfpbykh4c23sn6ymqw4pp0dq4pgkj";
-          name = "feebleline";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -23259,8 +29031,35 @@
           license = lib.licenses.free;
         };
       }) {};
-    fetch = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    fennel-mode = callPackage ({ fetchFromGitLab
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
+        pname = "fennel-mode";
+        version = "20180509.1852";
+        src = fetchFromGitLab {
+          owner = "technomancy";
+          repo = "fennel-mode";
+          rev = "21e184b2a862290db9dcf839f0e4a2df480a642e";
+          sha256 = "0l3770w47skbr95775mrwpmw6apmbjk18i6c1zcz05pc46rcr15s";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/cda0732050a17b2dc70b80afd6fc6bb9cf8bb60f/recipes/fennel-mode";
+          sha256 = "0lg69rjvbg7zl4jxc88m12r4rgv2mg2xdyz591mdmgvxwr2hfrv9";
+          name = "recipe";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/fennel-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    fetch = callPackage ({ fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "fetch";
         version = "20131130.2330";
         src = fetchFromGitHub {
@@ -23269,10 +29068,10 @@
           rev = "3f2793afcbbc32f320e572453166f9354ecc6d06";
           sha256 = "0pjw9fb3n08yd38680ifdn2wlnw2k6q97lzhqb2259mywsycyqy8";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7e808952551936dd8eaf0158d6ca929d10712dc5/recipes/fetch";
           sha256 = "1jqc6pspgcrdzm7ij46r1q6vpjq7il5dy2xyxwn2c1ky5a80paby";
-          name = "fetch";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -23280,20 +29079,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    fic-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    fic-mode = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "fic-mode";
-        version = "20160209.1011";
+        version = "20180603.1335";
         src = fetchFromGitHub {
           owner = "lewang";
           repo = "fic-mode";
-          rev = "8182f5be875fdefc5bd7142ab45adea89ac20705";
-          sha256 = "06xd5rvn037g1kjdw7aa1n71i1mpnp4qz3a7wcmzbls0amhhnx1m";
+          rev = "a05fc36ed54ba0c6dc22ac216a6a72cf191ca13d";
+          sha256 = "074dfwdir2dx5cpbjk1ac8d3hkjkrylivy7agir5mnmzjm3bs9gw";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0fda2b54a0ff0b6fc3bd6d20cfcbbf63cae5380f/recipes/fic-mode";
           sha256 = "0yy1zw0b0s93qkzyq0n17gzn33ma5h56mh40ysz6adwsi68af84c";
-          name = "fic-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -23301,8 +29103,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    fifo-class = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    fifo-class = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "fifo-class";
         version = "20160424.2258";
         src = fetchFromGitHub {
@@ -23311,10 +29116,10 @@
           rev = "8fe4cf690727f4ac7b67f29c55f845df023c3f21";
           sha256 = "0dkng4zkd5xdyvqy67bnfp4z6w8byx66bssq1zl7bhga45vihfjg";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1b4fa87f7d5592bc264805760d191df2a3539cf1/recipes/fifo-class";
           sha256 = "0yyjrvdjiq5166vrys13c3dqy5807a3x99597iw5v6mcxg37jg3h";
-          name = "fifo-class";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -23322,7 +29127,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    figlet = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild {
+    figlet = callPackage ({ fetchhg
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "figlet";
         version = "20160218.1437";
         src = fetchhg {
@@ -23330,10 +29139,10 @@
           rev = "70ca269d706e";
           sha256 = "1c18b1h154sdxkksqwk8snyk8n43bwzgavi75l8mnz8dnl1ciaxs";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/figlet";
           sha256 = "1m7hw56awdbvgzdnjysb3wqkhkjqy68jxsxh9f7fx266wjqhp6yj";
-          name = "figlet";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -23341,8 +29150,38 @@
           license = lib.licenses.free;
         };
       }) {};
-    fill-column-indicator = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    filelock = callPackage ({ cl-lib ? null
+                            , emacs
+                            , f
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
+        pname = "filelock";
+        version = "20180524.1515";
+        src = fetchFromGitHub {
+          owner = "DarwinAwardWinner";
+          repo = "emacs-filelock";
+          rev = "17a5ca6e0dee14d2e7d92c84be91143bca9d9663";
+          sha256 = "1smiad56626bc7q6vgj5gc710hnx814d4xlpxdlfzqlmj08y9dyk";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/bda76dfbf37eaa17bebb4b8c34006704862db433/recipes/filelock";
+          sha256 = "13ra697y0fhkjwsaqqlphcyfqkaiix5z59qw4q6rgix4k8ypj8db";
+          name = "recipe";
+        };
+        packageRequires = [ cl-lib emacs f ];
+        meta = {
+          homepage = "https://melpa.org/#/filelock";
+          license = lib.licenses.free;
+        };
+      }) {};
+    fill-column-indicator = callPackage ({ fetchFromGitHub
+                                         , fetchurl
+                                         , lib
+                                         , melpaBuild }:
+      melpaBuild {
         pname = "fill-column-indicator";
         version = "20171209.1124";
         src = fetchFromGitHub {
@@ -23351,10 +29190,10 @@
           rev = "d2536b1c48f78679e15a2b50cd5d8c0ffde4b155";
           sha256 = "0f8h32n8mnrwijz3lrslbx521f0fkhn24cwd16r8hcjk976l5kbp";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4ea0c00a7784621fcca0391a9c8ea85e9dd43852/recipes/fill-column-indicator";
           sha256 = "0w8cmijv7ihij9yyncz6lixb6awzzl7n9qpjj2bks1d5rx46blma";
-          name = "fill-column-indicator";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -23362,20 +29201,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    fill-function-arguments = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    fill-function-arguments = callPackage ({ emacs
+                                           , fetchFromGitHub
+                                           , fetchurl
+                                           , lib
+                                           , melpaBuild }:
+      melpaBuild {
         pname = "fill-function-arguments";
-        version = "20180331.1023";
+        version = "20180427.1002";
         src = fetchFromGitHub {
           owner = "davidshepherd7";
           repo = "fill-function-arguments";
-          rev = "50ea2e4ec943993f54ef72a5deccd62dad5bb7a4";
-          sha256 = "0s6kw87p1w3xwk354lbj5br07x0l63x3dcgfcxcvmy7k820f0iq6";
+          rev = "fcfb2a671adaf04110586aee0c499b1f0056a8e6";
+          sha256 = "07d1pi9scqcpqd9s2rifpkh5iyfmisd8rzddbrg99aj1wicg4j33";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b78eab67517b19516e5d265018afcbff0acfa9ec/recipes/fill-function-arguments";
           sha256 = "1gigzzz2csl3a55jmjx391a5k3ymixnwpblsn0pfgkkk4p3674q0";
-          name = "fill-function-arguments";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -23383,8 +29226,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    fillcode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    fillcode = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "fillcode";
         version = "20171029.925";
         src = fetchFromGitHub {
@@ -23393,10 +29239,10 @@
           rev = "d0a9e20f5fcc24a786d09ea19bfb9237681ba823";
           sha256 = "1mf2gfcjaqbw523vkfbzs2nl1y9bn9gbgmbvn2phbyj78gzq18za";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/85eb403503aa83799a6072bfe21bf66c8177ca73/recipes/fillcode";
           sha256 = "0bfsw55vjhx88jpy6npnzfwinvggivbvkk7fa3iwzq19005fkag2";
-          name = "fillcode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -23404,20 +29250,27 @@
           license = lib.licenses.free;
         };
       }) {};
-    finalize = callPackage ({ cl-generic, cl-lib ? null, eieio ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    finalize = callPackage ({ cl-generic
+                            , cl-lib ? null
+                            , eieio ? null
+                            , emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "finalize";
         version = "20170418.1245";
         src = fetchFromGitHub {
           owner = "skeeto";
           repo = "elisp-finalize";
-          rev = "846731531e7d1d80451787992e07bfe7dedbe9ff";
-          sha256 = "0kqsqmfvnh0slx0hmrsw66rh62sgzyhzck7ii9zylkq72wj60fgl";
+          rev = "0f7d47c4d50f1c76fc3b43bfc2d4886dd3e8ca27";
+          sha256 = "1gvlm4i62af5jscwz0jccc8ra0grprxpg2rlq91d5nn8dn5lpy79";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1b55869b5183644de02687d2e56f9b68854ccda3/recipes/finalize";
           sha256 = "1n0w4kdzc4hv4pprv13lr88gh46slpxdvsc162nqm5mrqp9giqqq";
-          name = "finalize";
+          name = "recipe";
         };
         packageRequires = [ cl-generic cl-lib eieio emacs ];
         meta = {
@@ -23425,8 +29278,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    find-by-pinyin-dired = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, pinyinlib }:
-    melpaBuild {
+    find-by-pinyin-dired = callPackage ({ fetchFromGitHub
+                                        , fetchurl
+                                        , lib
+                                        , melpaBuild
+                                        , pinyinlib }:
+      melpaBuild {
         pname = "find-by-pinyin-dired";
         version = "20180209.1818";
         src = fetchFromGitHub {
@@ -23435,10 +29292,10 @@
           rev = "3b4781148dddc84a701ad76c0934ed991ecd59d5";
           sha256 = "03fw1si115padxss6zb9fr0dsyq1bxlhxikgh4i5swp4jd4331k5";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0aa68b4603bf4071d7d12b40de0138ecab1989d7/recipes/find-by-pinyin-dired";
           sha256 = "150hvih3mdd1dqffgdcv3nn4qhy86s4lhjkfq0cfzgngfwif8qqq";
-          name = "find-by-pinyin-dired";
+          name = "recipe";
         };
         packageRequires = [ pinyinlib ];
         meta = {
@@ -23446,20 +29303,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    find-file-in-project = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
-    melpaBuild {
+    find-file-in-project = callPackage ({ emacs
+                                        , fetchFromGitHub
+                                        , fetchurl
+                                        , ivy
+                                        , lib
+                                        , melpaBuild }:
+      melpaBuild {
         pname = "find-file-in-project";
-        version = "20180405.713";
+        version = "20180705.1832";
         src = fetchFromGitHub {
           owner = "technomancy";
           repo = "find-file-in-project";
-          rev = "5691beb79f78c6a0ef1a18460df9fd1571ec3361";
-          sha256 = "0mvli1r7ml596y6v9qsip76j78f58q6jnwb18j8c7rngsrg08rc4";
+          rev = "1c54325cb60bde7496dad4e19f4c2a857999df58";
+          sha256 = "1pxqqpj6cdwbhca6vaj98d86f1l0vl09zp054wf0sv759l25ac0l";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/find-file-in-project";
           sha256 = "0aznnv82xhnilc9j4cdmcgh6ksv7bhjjm3pa76hynnyrfn7kq7wy";
-          name = "find-file-in-project";
+          name = "recipe";
         };
         packageRequires = [ emacs ivy ];
         meta = {
@@ -23467,20 +29329,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    find-file-in-repository = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    find-file-in-repository = callPackage ({ fetchFromGitHub
+                                           , fetchurl
+                                           , lib
+                                           , melpaBuild }:
+      melpaBuild {
         pname = "find-file-in-repository";
         version = "20151113.519";
         src = fetchFromGitHub {
           owner = "hoffstaetter";
           repo = "find-file-in-repository";
-          rev = "8a8c84a6dbe7a2bba4564c3b58c92d157abfa3f8";
+          rev = "898fd7ea2727772ba09383a2ece7f3f7f1e77e29";
           sha256 = "090m5647dpc8r8fwi3mszvc8kp0420ma5sv0lmqr2fpxyn9ybkjh";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/58705ac6201b73851ce4ce9ebeb0e65463765961/recipes/find-file-in-repository";
           sha256 = "0q1ym06w2yn3nzpj018dj6h68f7rmkxczyl061mirjp8z9c6a9q6";
-          name = "find-file-in-repository";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -23488,8 +29353,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    find-temp-file = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    find-temp-file = callPackage ({ fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "find-temp-file";
         version = "20170107.539";
         src = fetchFromGitHub {
@@ -23498,10 +29366,10 @@
           rev = "513005d19d72d71f34481ee00158dd57bd93206f";
           sha256 = "129jnn16vxmp6r9gx8k4rvv6spag5q0if52b5fhsybicnsl35mrz";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c01efd0cb3e3bab4661a358c084b645dc7e31736/recipes/find-temp-file";
           sha256 = "0c98zm94958rb9kdvqr3pad744nh63y3vy3lshfm0lsg85k9j62p";
-          name = "find-temp-file";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -23509,20 +29377,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    find-things-fast = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    find-things-fast = callPackage ({ fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "find-things-fast";
         version = "20150519.1526";
         src = fetchFromGitHub {
           owner = "eglaysher";
           repo = "find-things-fast";
-          rev = "efc7c189019ed65430e2f9e910e8e0a5ca9d2d03";
-          sha256 = "1r6cs7p43pi6n2inbrv9q924m679izxwxqgyr4sjjj3lg6an4cnx";
+          rev = "281dcb5a2e2db1013246dcac5111808352a8ea95";
+          sha256 = "0h523dgjicmn4rpbk82ryq3mq5vfl5b50wvn0p2mh74g35mc0zwl";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3b63336dd150e791f3139d675af735b60054eb2b/recipes/find-things-fast";
           sha256 = "1fs3wf61lzm1hxh5sx8pr74g7g9np3npdwg7xmk81b5f2jx2vy6m";
-          name = "find-things-fast";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -23530,8 +29401,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    findr = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    findr = callPackage ({ fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "findr";
         version = "20130127.1232";
         src = fetchFromGitHub {
@@ -23540,10 +29414,10 @@
           rev = "1ddbc0464bb05dcda392b62666ad17239a2152d3";
           sha256 = "0wx4hd4agrfvk0igyash658cbf7v3bv01rlspllsvzr59fl3faqq";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ae489be43b1aee93614e40f492ebdf0b98a3fbc1/recipes/findr";
           sha256 = "0pw72bdpmc0ymlgjmwwrslhynij5a5b9sc3rx6vyprpv1ad4ac2c";
-          name = "findr";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -23551,20 +29425,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    fingers = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    fingers = callPackage ({ fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "fingers";
         version = "20160817.129";
         src = fetchFromGitHub {
           owner = "fgeller";
           repo = "fingers.el";
-          rev = "fed0f742afb1d72eaef29d8da394467550a030fa";
-          sha256 = "1mx05zfdrkwb50l7f0iycsqw23b1gxzacfnssclb42xdjxxmyhdj";
+          rev = "7de351448a6f5ea7aa7a25db6c90d5138f87eb16";
+          sha256 = "1hwlnvry3pl3h2kz0d03d9225gn2dk4x3nhalk8854fr2jflrpqy";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f2afd4983d1a5820daafb31e96d54b214a79849f/recipes/fingers";
           sha256 = "1r8fy6q6isjxz9mvaa8in4imdghzla3gg1l93dfm1v2rlr7bhzbg";
-          name = "fingers";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -23572,8 +29449,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    fiplr = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, grizzl, lib, melpaBuild }:
-    melpaBuild {
+    fiplr = callPackage ({ cl-lib ? null
+                         , fetchFromGitHub
+                         , fetchurl
+                         , grizzl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "fiplr";
         version = "20140723.2345";
         src = fetchFromGitHub {
@@ -23582,10 +29464,10 @@
           rev = "bb6b90ba3c558988c195048c4c40140b2ee17530";
           sha256 = "14yy7kr2iv549xaf5gkav48lk2hzmvipwbs0rzljzw60il6k05hk";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/fiplr";
           sha256 = "1a4w0yqdkz477lfyin4lb9k9qkfpx4350kfxmrqx6dj3aadkikca";
-          name = "fiplr";
+          name = "recipe";
         };
         packageRequires = [ cl-lib grizzl ];
         meta = {
@@ -23593,8 +29475,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    firecode-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    firecode-theme = callPackage ({ emacs
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "firecode-theme";
         version = "20170808.611";
         src = fetchFromGitHub {
@@ -23603,10 +29489,10 @@
           rev = "8b7b03ecdd41e70dab145b98906017e1392eaef4";
           sha256 = "1vrpnv7555mbsksflgdkg7hc65fjcyzvzv2261y043rlh2qrn0sy";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/641d1959bd31598fcdacd39a3d1bb077dcccfa5c/recipes/firecode-theme";
           sha256 = "10lxd93lkrvz8884dv4sh6fzzg355j7ab4p5dpvwry79rhs7f739";
-          name = "firecode-theme";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -23614,20 +29500,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    firefox-controller = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, moz, popwin }:
-    melpaBuild {
+    firefox-controller = callPackage ({ cl-lib ? null
+                                      , fetchFromGitHub
+                                      , fetchurl
+                                      , lib
+                                      , melpaBuild
+                                      , moz
+                                      , popwin }:
+      melpaBuild {
         pname = "firefox-controller";
         version = "20160320.1147";
         src = fetchFromGitHub {
           owner = "cute-jumper";
           repo = "emacs-firefox-controller";
-          rev = "a8af8cbf70afaf6b89a26d6ac69af8e92afc181f";
-          sha256 = "0icgl88pwizwzkdqsxbwhnc6pdyqsfd7wgjnkvg3206i7hcqwpsp";
+          rev = "5b1bedec83206f41672b1b65bba859f235bff48b";
+          sha256 = "04afwxgydrn23bv93zqf9bd2cp02i9dcfqbi809arkmh8723qf6k";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/70a69c20f8dcf73c878f2172dcc9f1796fdc0408/recipes/firefox-controller";
           sha256 = "03y96b3l75w9al8ylijnlb8pcfkwddyfnh8xwig1b6k08zxfgal6";
-          name = "firefox-controller";
+          name = "recipe";
         };
         packageRequires = [ cl-lib moz popwin ];
         meta = {
@@ -23635,20 +29527,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    fireplace = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    fireplace = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "fireplace";
         version = "20160811.519";
         src = fetchFromGitHub {
           owner = "johanvts";
           repo = "emacs-fireplace";
-          rev = "23a444f749bcb2b804593e3b2cb9c73cc59231fb";
-          sha256 = "1ijsa9k0cqy8w0ix2axw2j5996xab77x5s5vd5850jx0my6m7wyi";
+          rev = "2b966ed65b714c613f79e9144d004dfa3b28f1ed";
+          sha256 = "1f5053bbvjdmm64zv6r2qkswkpwvx0s3qz4bwm9zya583a6g0nv8";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4c1ac52c1cfe7ccf46092c2d299ebbffdc1b7609/recipes/fireplace";
           sha256 = "1apcypznq23fc7xgy4xy1c5hvfvjx1xhyq3aaq1lf59v99zchciw";
-          name = "fireplace";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -23656,8 +29551,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    firestarter = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    firestarter = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "firestarter";
         version = "20161219.523";
         src = fetchFromGitHub {
@@ -23666,10 +29564,10 @@
           rev = "4d6b106f325ac1802eabce3c8a7cd0a4c7a32864";
           sha256 = "13daz15v0sshl7lxcg1xcbpl64gklgh50pzk0qxmn5ygw7nlifn0";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5b046eb3b63220b937e1b70f633cb5424dc782a1/recipes/firestarter";
           sha256 = "1cpx664hyrdnpb1jps1x6lm7idwlfjblkfygj48cjz9pzd6ld5mp";
-          name = "firestarter";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -23677,8 +29575,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    firrtl-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    firrtl-mode = callPackage ({ emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "firrtl-mode";
         version = "20180221.1555";
         src = fetchFromGitHub {
@@ -23687,10 +29589,10 @@
           rev = "1ac00d526018945389bcb2292dbdd8395381774a";
           sha256 = "02xznsiij39lhjr261vl7yz4k4i76vshh5kwa7ax95zpj2zbs0v6";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8bbf9ab9db03410c35b8b73a23bf8062b10f0815/recipes/firrtl-mode";
           sha256 = "11n3wjr9sinqafjs88bznb5rppnignwkn4m4ppixi6xr31v3i4ws";
-          name = "firrtl-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -23698,20 +29600,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    fish-completion = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    fish-completion = callPackage ({ fetchFromGitLab
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "fish-completion";
-        version = "20180329.2137";
-        src = fetchFromGitHub {
+        version = "20180616.1223";
+        src = fetchFromGitLab {
           owner = "Ambrevar";
           repo = "emacs-fish-completion";
-          rev = "3e3ed1f19fa778b7c35ad88e033dce5a6b1fc153";
-          sha256 = "1zi5cgzwy1wkvc8352s3l24p4i4fh87f9pyir6jji3hy424pm6w4";
+          rev = "bac15fda1392a891070574dfe5d2d50b10831e8b";
+          sha256 = "029s1ha8pc4df0xng5c0xwv2rlcl423mgh1ffgnbh0fx7ybr5n4v";
         };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/832bae268cd08d7ebfd4b7a8d0570af8549cdbd6/recipes/fish-completion";
-          sha256 = "1lq613b0zb4shlzx5s3br4d16295czx3bfymqcnriyspsfjvakar";
-          name = "fish-completion";
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/6d17ca0213ba5ef9dce92002e281e6f08c3492be/recipes/fish-completion";
+          sha256 = "1y7vwh7w0shnrnp8x1m1sa0p7kdyz5mg1mfs263gm38in2biym9i";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -23719,8 +29624,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    fish-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    fish-mode = callPackage ({ emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "fish-mode";
         version = "20180306.818";
         src = fetchFromGitHub {
@@ -23729,10 +29638,10 @@
           rev = "bac709ac1235751952d6022dddc6307d9135d096";
           sha256 = "0a74ghmjjrxfdhk4mvq6lar4w6l6lc4iilabs99smqr2fn5rsslq";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/efac97c0f54a3300251020c4626056526c18b441/recipes/fish-mode";
           sha256 = "0l6k06bs0qdhj3h8vf5fv8c3rbhiqfwszrpb0v2cgnb6xhwzmq14";
-          name = "fish-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -23740,20 +29649,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    fix-input = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    fix-input = callPackage ({ emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "fix-input";
         version = "20171231.2220";
         src = fetchFromGitHub {
           owner = "mrkkrp";
           repo = "fix-input";
-          rev = "37bc0734a2e71d66245ee3960879577e5ef906bb";
-          sha256 = "04k4wqsdbwxbq5a4dxvr3mqqsa5y3c0238llh2wig1r763ligm3j";
+          rev = "e053fcc641f1f835f2fdb71143e095c1889b8233";
+          sha256 = "1w8vv2ijmsch02xsc1r97r6s3jz0dkd8kwz5wgiizq5ghx7x6x6j";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7d31f907997d1d07ec794a4f09824f43818f035c/recipes/fix-input";
           sha256 = "03xpr7rlv0xq1d9126j1fk0c2j7ssf366n0yc8yzm9vq32n9pp4p";
-          name = "fix-input";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -23761,20 +29674,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    fix-muscle-memory = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    fix-muscle-memory = callPackage ({ fetchFromGitHub
+                                     , fetchurl
+                                     , lib
+                                     , melpaBuild }:
+      melpaBuild {
         pname = "fix-muscle-memory";
         version = "20160822.2139";
         src = fetchFromGitHub {
           owner = "jonnay";
           repo = "fix-muscle-memory";
-          rev = "a123e04f8a1d2982cbf930efb909cad9522ac884";
-          sha256 = "0mm6dl7017x5l43jf89w4nn5hcyi4fm160d2rcqx5w6dwb6f0v27";
+          rev = "df687aea23c6eac4b751f993893c2fd56e5a8a3b";
+          sha256 = "02nl4vz6fnbjc7w1lk1y9z0qw5bsxr407ww0b2wqw6h8spmcpcrc";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c6b0501714a6d82657b88d11e3f79d75eea17d8e/recipes/fix-muscle-memory";
           sha256 = "0qhasnjw0bj5hzw27r8vj6shhwc3zxcp3wmxijh1rpdw4773f7n8";
-          name = "fix-muscle-memory";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -23782,20 +29698,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    fix-word = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    fix-word = callPackage ({ cl-lib ? null
+                            , emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "fix-word";
         version = "20171231.2215";
         src = fetchFromGitHub {
           owner = "mrkkrp";
           repo = "fix-word";
-          rev = "8e66b6a7b599c6c5098490e83ef4e69acf307603";
-          sha256 = "1p8hz66fyzivvwwya0br3v7dx0fqna9jw9291zgshvhxbin867fp";
+          rev = "3e3339f5d44dd8be100cec1c88bcaefd328a2bde";
+          sha256 = "0hd5bhq57qgabs881xfrz1v1n8sp1nv2hrfs386dx7g5b3ancr0i";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/22636390e8a15c09293a1506a901286dd72e565f/recipes/fix-word";
           sha256 = "0a8w09cx8p5pkkd4533nd199axkhdhs2a7blp7syfn40bkscx6xc";
-          name = "fix-word";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -23803,8 +29724,17 @@
           license = lib.licenses.free;
         };
       }) {};
-    fixmee = callPackage ({ back-button, button-lock, fetchFromGitHub, fetchurl, lib, melpaBuild, nav-flash, smartrep, string-utils, tabulated-list ? null }:
-    melpaBuild {
+    fixmee = callPackage ({ back-button
+                          , button-lock
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild
+                          , nav-flash
+                          , smartrep
+                          , string-utils
+                          , tabulated-list ? null }:
+      melpaBuild {
         pname = "fixmee";
         version = "20150223.555";
         src = fetchFromGitHub {
@@ -23813,10 +29743,10 @@
           rev = "1b8b3460f1e3c3c1784b2a63fb9f4fb3bb4dc084";
           sha256 = "1x4k8890pzdcizzl0p6v96ylrx5xid9ykgrmggx0b3y0gx0vhwic";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f5d06db82e237e6c6babd92a1fd2b58c29662e4f/recipes/fixmee";
           sha256 = "0wnp6h8f547fsi1lkk4ajny7g21dnr76qfhxl82n0l5h1ps4w8mp";
-          name = "fixmee";
+          name = "recipe";
         };
         packageRequires = [
           back-button
@@ -23831,20 +29761,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    flame = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    flame = callPackage ({ emacs
+                         , fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "flame";
         version = "20180303.1216";
         src = fetchFromGitHub {
           owner = "mschuldt";
           repo = "flame";
-          rev = "a749b2a77b87e505572d0f1f5d59fac76348bb73";
-          sha256 = "1l9jbzavyi75li64jqfs000s1m8iw9xvsv8mg0bw1div6bc7vq7s";
+          rev = "2cfb860a483197e92a4c20d7b9b055d586e76fe0";
+          sha256 = "1h6mm2zjv03y2d6dv4gq7iaz6r2glgcljzgmi6m4jp6flvyqh09g";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b7a14c14368de722855286c088020a5657f7cf8b/recipes/flame";
           sha256 = "1br9c48anscq9vbssr0gq8f5kbq755hjaglbljwwh9nd5riycv5v";
-          name = "flame";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -23852,20 +29786,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    flappymacs = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    flappymacs = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "flappymacs";
         version = "20171023.304";
         src = fetchFromGitHub {
           owner = "taksatou";
           repo = "flappymacs";
-          rev = "27f3e21acb22f786606481e3f4e5dc1edbaaaed4";
-          sha256 = "0zcwsbz93p1l2jb1fs6m4s5y9klcr5qg5nw10qg30j9l2bc1hda8";
+          rev = "fac0011983251d5c44f4ed1eacac03f5de3caac4";
+          sha256 = "191sdqaljxryslvwjgr38fhgxi0gg7v74m1rqxx3m740wr4qnx7s";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a63b22f357b2d08b12fb86c27261ab4d687c5f7f/recipes/flappymacs";
           sha256 = "1rp4r5ldhm8nrj26y1vm5d5fj3kl7v45cj1naxczrqbcgkd0r404";
-          name = "flappymacs";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -23873,8 +29810,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    flash-region = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    flash-region = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "flash-region";
         version = "20130923.1117";
         src = fetchFromGitHub {
@@ -23883,10 +29823,10 @@
           rev = "261b3597b23cdd40e5c14262a5687bcc6c1d0901";
           sha256 = "0z77lm6jv2w5z551pwarcx6xg9kx8fgms9dlskngfvnzbqkldj1f";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bf26329a30ec6e39b052e5815d3f113c05e72f84/recipes/flash-region";
           sha256 = "1rgg7j34ka0nj1yjl688asim07bbz4aavh67kly6dzzwndr0nw8c";
-          name = "flash-region";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -23894,8 +29834,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    flatland-black-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    flatland-black-theme = callPackage ({ emacs
+                                        , fetchFromGitHub
+                                        , fetchurl
+                                        , lib
+                                        , melpaBuild }:
+      melpaBuild {
         pname = "flatland-black-theme";
         version = "20170808.612";
         src = fetchFromGitHub {
@@ -23904,10 +29848,10 @@
           rev = "348c5d5fe615e6ea13cadc17f046e506e789ce07";
           sha256 = "1g5jqxdk35ahx8qk4vi7whhcpi1qp7rbbjgiih974fs59cg5iki0";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/641d1959bd31598fcdacd39a3d1bb077dcccfa5c/recipes/flatland-black-theme";
           sha256 = "0cl2qbry56nb4prbsczffx8h35x91pgicw5pld0ndw3pxid9h2da";
-          name = "flatland-black-theme";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -23915,8 +29859,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    flatland-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    flatland-theme = callPackage ({ fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "flatland-theme";
         version = "20171113.721";
         src = fetchFromGitHub {
@@ -23925,10 +29872,10 @@
           rev = "a98a6f19ad4dff0fa3fad1ea487b7d0ef634a19a";
           sha256 = "02gbzxd1v003aaj5rn3vr00n4390bhdx2jhpa7nb430fg3s1ppdy";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0a081fd0c5598fdf5bc0ab92f4d009f32132a29e/recipes/flatland-theme";
           sha256 = "14drqwcp9nv269aqm34d426a7gx1a7kr9ygnqa2c8ia1fsizybl3";
-          name = "flatland-theme";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -23936,8 +29883,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    flatui-dark-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    flatui-dark-theme = callPackage ({ emacs
+                                     , fetchFromGitHub
+                                     , fetchurl
+                                     , lib
+                                     , melpaBuild }:
+      melpaBuild {
         pname = "flatui-dark-theme";
         version = "20170513.722";
         src = fetchFromGitHub {
@@ -23946,10 +29897,10 @@
           rev = "5b959a9f743f891e4660b1b432086417947872ea";
           sha256 = "0nz4ql7qf49cwsgjb7dg0jhipr5d472r4fddy6fhr1h17s1cd9qy";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5f9dc5abeb37422c63cac74f9a006d54c4a7c5a5/recipes/flatui-dark-theme";
           sha256 = "1mswmkhi43fm0cmdgf0ywpy9lmapy0syl65kqh68sa3jqbznhm6y";
-          name = "flatui-dark-theme";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -23957,8 +29908,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    flatui-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    flatui-theme = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "flatui-theme";
         version = "20160618.1827";
         src = fetchFromGitHub {
@@ -23967,10 +29921,10 @@
           rev = "9c15db5526c15c8dba55023f5698372b19c2a780";
           sha256 = "0ybgpnbq3b0ml3lzgkispn667acpjww7z6cr7hgwg3j1zrqpwi75";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/96dc9a8b1f6e5cdd46fc94fc2979f2a1787f4d21/recipes/flatui-theme";
           sha256 = "0s88xihw44ks4b07wcb9swr52f3l1ls0jn629mxvfkv4a6hn7rmz";
-          name = "flatui-theme";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -23978,20 +29932,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    flex-autopair = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    flex-autopair = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "flex-autopair";
         version = "20120809.518";
         src = fetchFromGitHub {
           owner = "uk-ar";
           repo = "flex-autopair";
-          rev = "4bb757f2556a4a51828e2fed8fb81e31e83052cb";
-          sha256 = "187ah7yhmr3ckw23bf4fivx8v79yj0zmilrkjj7k6l198w8wmvql";
+          rev = "55d128749cc070551a1624a4508d1c4f6d76f7cf";
+          sha256 = "0g9chcqjn2930vrn8af4hwibs4giprgsig9dqprz4c6hya03hlf0";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/flex-autopair";
           sha256 = "0w3l236psqxl7wqdi2aisz8wcv279kw6gdja72viiscrbcm78xh0";
-          name = "flex-autopair";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -23999,20 +29956,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    flex-compile = callPackage ({ buffer-manage, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    flex-compile = callPackage ({ buffer-manage
+                                , dash
+                                , emacs
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "flex-compile";
-        version = "20171213.1019";
+        version = "20180528.853";
         src = fetchFromGitHub {
           owner = "plandes";
           repo = "flex-compile";
-          rev = "1952f6deee9d95196906f46fea2b24882cc614b6";
-          sha256 = "0wx0857f25k2rr5y6mikhi0czgvf6r1667fy8hjgl6gk0fyi960f";
+          rev = "0b6259944e78f0bc6ee4407d97e3d09db8fd400e";
+          sha256 = "1qzzrxq80fl14slirmgidmpazj1gmh9b12jkz72flsbdiy7whpal";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/259caeebc317e81ab9d532a371ea85656c2b1619/recipes/flex-compile";
           sha256 = "1hlh4k7qgln87xajnjjhf1yyg6bgdwd0iczhlfw8gdwfj5xpjd38";
-          name = "flex-compile";
+          name = "recipe";
         };
         packageRequires = [ buffer-manage dash emacs ];
         meta = {
@@ -24020,8 +29983,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    flex-isearch = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    flex-isearch = callPackage ({ fetchhg
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "flex-isearch";
         version = "20170308.1210";
         src = fetchhg {
@@ -24029,10 +29995,10 @@
           rev = "8b934ea6f1e4";
           sha256 = "0xbwrzkfv4i91qxs80p0pfjlvj5pyigvidby8m5lammm8idwx9dh";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/flex-isearch";
           sha256 = "1msgrimi2a0xm5h23p78jflh00bl5bx44xpc3sc9pspznjv1d0k3";
-          name = "flex-isearch";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -24040,8 +30006,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    flim = callPackage ({ apel, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    flim = callPackage ({ apel
+                        , fetchFromGitHub
+                        , fetchurl
+                        , lib
+                        , melpaBuild }:
+      melpaBuild {
         pname = "flim";
         version = "20180328.1624";
         src = fetchFromGitHub {
@@ -24050,10 +30020,10 @@
           rev = "faaa2b1f2bb8fcf835ddfb8981654e4d3b2bdbc6";
           sha256 = "0hr4qi5vhq3ravgky95k2n7hin97jln7fmkgbx45fcyiz8jbpz2z";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/94faf56ff9bf94f51ef5253e4c4244faec5eecfd/recipes/flim";
           sha256 = "1gkaq549svflx8qyqrk0ccb52b7wp17wmd5jgzkw1109bpc4k6jc";
-          name = "flim";
+          name = "recipe";
         };
         packageRequires = [ apel ];
         meta = {
@@ -24061,8 +30031,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    flimenu = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    flimenu = callPackage ({ dash
+                           , emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "flimenu";
         version = "20170417.1847";
         src = fetchFromGitHub {
@@ -24071,10 +30046,10 @@
           rev = "9351201d89b05cbdaec312a6ebd7fd10c38d6112";
           sha256 = "1qb08j66a9mvybqhc2vyywwn16w3kkjb06k50rfqf6sbcmndz8va";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0ffc67a266de3d58553b27325b7fc6937df425be/recipes/flimenu";
           sha256 = "1xr28kprkq9xwy2f7b3wnjr25a8avm2lfcyi8853jygkm2vmnsx1";
-          name = "flimenu";
+          name = "recipe";
         };
         packageRequires = [ dash emacs ];
         meta = {
@@ -24082,8 +30057,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    fliptext = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    fliptext = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "fliptext";
         version = "20171124.1256";
         src = fetchFromGitHub {
@@ -24092,10 +30070,10 @@
           rev = "fd821f645ffebae6ae3894afa7ba7fc06f91afc6";
           sha256 = "1jf63kp1myxihv6r13cddxgr8cchxcnnmylj5dx50y42595ia4yh";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e36776cbed8eab151f69d0edd5217a7bba7c2451/recipes/fliptext";
           sha256 = "1wbrvqrvrpk2lx7b6y30rrshr7a25b2191bnx4v8lm3cv16gv8p7";
-          name = "fliptext";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -24103,8 +30081,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    floobits = callPackage ({ fetchFromGitHub, fetchurl, highlight, json ? null, lib, melpaBuild }:
-    melpaBuild {
+    floobits = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , highlight
+                            , json ? null
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "floobits";
         version = "20170802.1500";
         src = fetchFromGitHub {
@@ -24113,10 +30096,10 @@
           rev = "ed5586d1bf94f36354091648e824ccb6fcaf807f";
           sha256 = "08m9snmkhdjmvw1pqww9l39xqas9f6yxksjxvfjjfnad8ak80x9b";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/95c859e8440049579630b4c2bcc31e7eaa13b1f1/recipes/floobits";
           sha256 = "1jpk0q4mkf9ag1rqyai993nz5ngzfvxq9n9avmaaq59gkk9cjraf";
-          name = "floobits";
+          name = "recipe";
         };
         packageRequires = [ highlight json ];
         meta = {
@@ -24124,8 +30107,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    flow-minor-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    flow-minor-mode = callPackage ({ emacs
+                                   , fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "flow-minor-mode";
         version = "20180315.1124";
         src = fetchFromGitHub {
@@ -24134,10 +30121,10 @@
           rev = "6c782a3fe3f810484009d87813b88804beafafac";
           sha256 = "1awf44fyjwzlxjavk31lha8iknm8nxr2r6z07sxhzyy23ff127mh";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/66504f789069922ea56f268f4da90fac52b601ff/recipes/flow-minor-mode";
           sha256 = "190dv225sb37jawzrasd7qkbznrmkrdnb90l44il63vrlmjv3r1s";
-          name = "flow-minor-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -24145,20 +30132,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    flower = callPackage ({ clomacs, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    flower = callPackage ({ clomacs
+                          , emacs
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "flower";
-        version = "20180316.1052";
+        version = "20180618.1222";
         src = fetchFromGitHub {
           owner = "PositiveTechnologies";
           repo = "flower";
-          rev = "98c53b03da698833058b9ad6b6eb8be46cfd00f6";
-          sha256 = "08wq66gvqy14mcpm8x14xz3hvw4h7rcd5ivynma91d4358qrmqap";
+          rev = "4d05448dc0118078ec320f564d87acaa740ae47c";
+          sha256 = "02p74f5hfhrhv5l7b9cwfbczsgkpqajlmr66qmkdljgc8ksr86n2";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c8a731715d360aea9af2b898242fd4eee5419d14/recipes/flower";
           sha256 = "1cb9ppgspdrg4yrrlq4sfajpa6s7xiwvdf9b3947rmmxizgqgynd";
-          name = "flower";
+          name = "recipe";
         };
         packageRequires = [ clomacs emacs ];
         meta = {
@@ -24166,8 +30158,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    fluxus-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, osc }:
-    melpaBuild {
+    fluxus-mode = callPackage ({ emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild
+                               , osc }:
+      melpaBuild {
         pname = "fluxus-mode";
         version = "20170210.1141";
         src = fetchFromGitHub {
@@ -24176,10 +30173,10 @@
           rev = "3661d4dfdaf249138e7f215f15f291c9391ede8d";
           sha256 = "1dp974qs80agx9qcq5k5awdsr8p8smv8cdwkjz2d8xfd5wq2vhh9";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a3396e0da67153ad051b8551bf34630d32f974f4/recipes/fluxus-mode";
           sha256 = "1xn2aw9gxwkmr1miam63lrdx6n0qxsgph3rlaqy9cbs0vkb254an";
-          name = "fluxus-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs osc ];
         meta = {
@@ -24187,20 +30184,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    flx = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    flx = callPackage ({ cl-lib ? null
+                       , fetchFromGitHub
+                       , fetchurl
+                       , lib
+                       , melpaBuild }:
+      melpaBuild {
         pname = "flx";
         version = "20151030.1112";
         src = fetchFromGitHub {
           owner = "lewang";
           repo = "flx";
-          rev = "46040d0b096a0340d91235561f27a959a61d0fef";
-          sha256 = "0zysqnxa6kgnyfgknsin7pk25a8dy8208qw2yzan93cabplgqszy";
+          rev = "7fce6a4cdb65ac1b52e2b409ba548767581ce34c";
+          sha256 = "0sjybrcnb2sl33swy3q664vqrparajcl0m455gciiih2j87hwadc";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/63bdf3ae2f861e333a8f9c5997f5cc52869d3b3a/recipes/flx";
           sha256 = "04plfhrnw7jx2jaxhbhw4ypydfcb8v0x2m5hyacvrli1mca2iyf9";
-          name = "flx";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -24208,20 +30209,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    flx-ido = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, flx, lib, melpaBuild }:
-    melpaBuild {
+    flx-ido = callPackage ({ cl-lib ? null
+                           , fetchFromGitHub
+                           , fetchurl
+                           , flx
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "flx-ido";
         version = "20180117.719";
         src = fetchFromGitHub {
           owner = "lewang";
           repo = "flx";
-          rev = "46040d0b096a0340d91235561f27a959a61d0fef";
-          sha256 = "0zysqnxa6kgnyfgknsin7pk25a8dy8208qw2yzan93cabplgqszy";
+          rev = "9c5cb5de0202b4eaac9359c84ca7ce9cbd7ee835";
+          sha256 = "0i7pj4l0ilihvkgal8d71idy5jr9zwanzxch350pg4myr6j1hnad";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/63bdf3ae2f861e333a8f9c5997f5cc52869d3b3a/recipes/flx-ido";
           sha256 = "00wcwbvfjbcx8kyap7rl1b6nsgqdwjzlpv6al2cdpdd19rm1vgdc";
-          name = "flx-ido";
+          name = "recipe";
         };
         packageRequires = [ cl-lib flx ];
         meta = {
@@ -24229,8 +30235,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    flx-isearch = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, flx, lib, melpaBuild }:
-    melpaBuild {
+    flx-isearch = callPackage ({ cl-lib ? null
+                               , emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , flx
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "flx-isearch";
         version = "20180102.2114";
         src = fetchFromGitHub {
@@ -24239,10 +30251,10 @@
           rev = "f132fd6367e369885ab3a865fbfe20eee989bc0b";
           sha256 = "1dcvfl4fyhgw0rhfhixzlzjfr99fisa83f7lmlwzz2zs96myhhkz";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2cd1438cc0821b8ae1d01e2a3bc8f07ca8a79134/recipes/flx-isearch";
           sha256 = "14cshv5xb57ch5g3m3hfhawnnabdnbacp4kx40d0pw6jxw677gqd";
-          name = "flx-isearch";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs flx ];
         meta = {
@@ -24250,20 +30262,28 @@
           license = lib.licenses.free;
         };
       }) {};
-    flycheck = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pkg-info, seq }:
-    melpaBuild {
+    flycheck = callPackage ({ dash
+                            , emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , let-alist
+                            , lib
+                            , melpaBuild
+                            , pkg-info
+                            , seq }:
+      melpaBuild {
         pname = "flycheck";
-        version = "20180415.1527";
+        version = "20180614.1235";
         src = fetchFromGitHub {
           owner = "flycheck";
           repo = "flycheck";
-          rev = "1eecec814debc6994b1aa8b6760cbfbbdf71e219";
-          sha256 = "1in3sanhyd0cmivq7c5xxqpb5frzq77zp7rdyyki9pczpf9yv58a";
+          rev = "0995b0bb3f518c7350f1428860c0fc7eeaee3c46";
+          sha256 = "03qbgvvlk4icp5zf243m0araxw5ylkqs37h72z028vlk9n370c6s";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/649f9c3576e81409ae396606798035173cc6669f/recipes/flycheck";
           sha256 = "045k214dq8bmrai13da6gwdz97a2i998gggxqswqs4g52l1h6hvr";
-          name = "flycheck";
+          name = "recipe";
         };
         packageRequires = [ dash emacs let-alist pkg-info seq ];
         meta = {
@@ -24271,8 +30291,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    flycheck-apertium = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
-    melpaBuild {
+    flycheck-apertium = callPackage ({ fetchFromGitHub
+                                     , fetchurl
+                                     , flycheck
+                                     , lib
+                                     , melpaBuild }:
+      melpaBuild {
         pname = "flycheck-apertium";
         version = "20160406.618";
         src = fetchFromGitHub {
@@ -24281,10 +30305,10 @@
           rev = "71cf49d5aaee962b995583384bfa045a1d4c3db7";
           sha256 = "14idjjz6fhmq806mmncmqnr9bvcjks6spin8z6jb0gqcg1dbhm06";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7f6cec0d312f0e86e17829e6fd8f87acabc0174f/recipes/flycheck-apertium";
           sha256 = "1cc15sljqs6gvb3wiw7n1wkd714qkvfpw6l1kg4lfx9r4jalcvw7";
-          name = "flycheck-apertium";
+          name = "recipe";
         };
         packageRequires = [ flycheck ];
         meta = {
@@ -24292,8 +30316,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    flycheck-ats2 = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
-    melpaBuild {
+    flycheck-ats2 = callPackage ({ emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , flycheck
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "flycheck-ats2";
         version = "20170225.836";
         src = fetchFromGitHub {
@@ -24302,10 +30331,10 @@
           rev = "9f77add8408462af35bdddf87e37a661880255e3";
           sha256 = "1fv3r49i8dgszaq5rs8dwnwcj6rgx922ww01ikrq3b4c9y17srpz";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2d3605bdc402e6b13f53910eafb7f1428a5f749f/recipes/flycheck-ats2";
           sha256 = "0xm7zzz6hs5qnqkmv7hwxpvp3jjca57agx71sj0m12v0h53gbzhr";
-          name = "flycheck-ats2";
+          name = "recipe";
         };
         packageRequires = [ emacs flycheck ];
         meta = {
@@ -24313,20 +30342,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    flycheck-bashate = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
-    melpaBuild {
+    flycheck-bashate = callPackage ({ emacs
+                                    , fetchFromGitHub
+                                    , fetchurl
+                                    , flycheck
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "flycheck-bashate";
         version = "20160629.2140";
         src = fetchFromGitHub {
           owner = "alexmurray";
           repo = "flycheck-bashate";
-          rev = "77fa03dbc578c34fe71ca44926bac2aff8f2b021";
-          sha256 = "1jcay4gncpr0fap6qlm6k4r5b94s18zj8j56w462hvxydaxxiql6";
+          rev = "d9780b73ee698d6bc001e617b187845cafa3292a";
+          sha256 = "1qhvrkhpjs214mc5f6gygwf5hx5gb2jcs46a4b34mqq29rn0j9kc";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/54fd062e4ad012d846260c96801d3415756ce981/recipes/flycheck-bashate";
           sha256 = "1c8hf4893zb74g61afr02wqhmdaswxr3nwsnzzwmb8nrrygvfa8j";
-          name = "flycheck-bashate";
+          name = "recipe";
         };
         packageRequires = [ emacs flycheck ];
         meta = {
@@ -24334,8 +30368,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    flycheck-cask = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
-    melpaBuild {
+    flycheck-cask = callPackage ({ dash
+                                 , emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , flycheck
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "flycheck-cask";
         version = "20160928.226";
         src = fetchFromGitHub {
@@ -24344,10 +30384,10 @@
           rev = "c3a51147eddeb7347de81f6a498fc96538bac499";
           sha256 = "1jw8n6df2hpnjrsqzdd70j0ya3yjzkcy5gm6zx9acqfx88zlgb9m";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/flycheck-cask";
           sha256 = "0d2m7mg91k1nazysayryxagql1vi975n7iv0snknhbw4wisqp82f";
-          name = "flycheck-cask";
+          name = "recipe";
         };
         packageRequires = [ dash emacs flycheck ];
         meta = {
@@ -24355,20 +30395,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    flycheck-checkbashisms = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
-    melpaBuild {
+    flycheck-checkbashisms = callPackage ({ emacs
+                                          , fetchFromGitHub
+                                          , fetchurl
+                                          , flycheck
+                                          , lib
+                                          , melpaBuild }:
+      melpaBuild {
         pname = "flycheck-checkbashisms";
         version = "20160224.906";
         src = fetchFromGitHub {
           owner = "Gnouc";
           repo = "flycheck-checkbashisms";
-          rev = "0794ad763d7cd81286283f6400bc89a81e8e07d4";
-          sha256 = "06jkvi17960wghphar9c1nixanb0197v8q5nm96mgz0gxn923400";
+          rev = "39362240b8e38e6ddc1da2e2c2229e3fecdf6057";
+          sha256 = "1s2zq97d7ryif6rlbvriz36dh23wmwi67v4q6krl77dfzcs705b3";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f5678ea5aef4dc8a517d6d9381a64f182645d344/recipes/flycheck-checkbashisms";
           sha256 = "1rq0ymlr1dl39v0sfyjmdv4pq3q9116cz9wvgpvfgalq8759q5sz";
-          name = "flycheck-checkbashisms";
+          name = "recipe";
         };
         packageRequires = [ emacs flycheck ];
         meta = {
@@ -24376,8 +30421,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    flycheck-checkpatch = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
-    melpaBuild {
+    flycheck-checkpatch = callPackage ({ emacs
+                                       , fetchFromGitHub
+                                       , fetchurl
+                                       , flycheck
+                                       , lib
+                                       , melpaBuild }:
+      melpaBuild {
         pname = "flycheck-checkpatch";
         version = "20170217.225";
         src = fetchFromGitHub {
@@ -24386,10 +30436,10 @@
           rev = "6461fc7b0d493eb9863814055f8bce5fa35739de";
           sha256 = "1651xmw01n5h7x81y3cvsamdmb67jcf385ax52dkp8miyq1a090r";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/193aaae5640434559cd479df1463ee44eab14d86/recipes/flycheck-checkpatch";
           sha256 = "1apjn26n663rjddv5iagfs65fdf22049ykmzggybbnprvnmasf55";
-          name = "flycheck-checkpatch";
+          name = "recipe";
         };
         packageRequires = [ emacs flycheck ];
         meta = {
@@ -24397,8 +30447,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    flycheck-clang-analyzer = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
-    melpaBuild {
+    flycheck-clang-analyzer = callPackage ({ emacs
+                                           , fetchFromGitHub
+                                           , fetchurl
+                                           , flycheck
+                                           , lib
+                                           , melpaBuild }:
+      melpaBuild {
         pname = "flycheck-clang-analyzer";
         version = "20180225.2039";
         src = fetchFromGitHub {
@@ -24407,10 +30462,10 @@
           rev = "adc9e7663bafcc9b740c09b691898413627e74ab";
           sha256 = "10c45myq9vgsssp5v3vnip4klj9dxk8dh42zap44f9lw99ascx2r";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8de7b717a1b0caf30f8f29d3e764b4756b93aeff/recipes/flycheck-clang-analyzer";
           sha256 = "0wby4vilvcmmncr6l6abh3v4wznx9m0zbk30vllj8bq98awfcy3a";
-          name = "flycheck-clang-analyzer";
+          name = "recipe";
         };
         packageRequires = [ emacs flycheck ];
         meta = {
@@ -24418,8 +30473,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    flycheck-clang-tidy = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
-    melpaBuild {
+    flycheck-clang-tidy = callPackage ({ fetchFromGitHub
+                                       , fetchurl
+                                       , flycheck
+                                       , lib
+                                       , melpaBuild }:
+      melpaBuild {
         pname = "flycheck-clang-tidy";
         version = "20171024.108";
         src = fetchFromGitHub {
@@ -24428,10 +30487,10 @@
           rev = "b8ebd49693f67e08e420ba847cc88f6721ef9e3e";
           sha256 = "0fnn1baw64f7x1zjb95adryr3mfynbblwppcd6ywh7pk0sq18b80";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a289ac549a7735a12eec85521c32f915b9194b85/recipes/flycheck-clang-tidy";
           sha256 = "0lhf5byydmd380y7qx5x34r0sq7gzrj286pcaxhl388p6j58cb4p";
-          name = "flycheck-clang-tidy";
+          name = "recipe";
         };
         packageRequires = [ flycheck ];
         meta = {
@@ -24439,8 +30498,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    flycheck-clangcheck = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, seq }:
-    melpaBuild {
+    flycheck-clangcheck = callPackage ({ cl-lib ? null
+                                       , fetchFromGitHub
+                                       , fetchurl
+                                       , flycheck
+                                       , lib
+                                       , melpaBuild
+                                       , seq }:
+      melpaBuild {
         pname = "flycheck-clangcheck";
         version = "20150712.10";
         src = fetchFromGitHub {
@@ -24449,10 +30514,10 @@
           rev = "24a9424c484420073a24443a829fd5779752362b";
           sha256 = "1ckzs32wzqpnw89rrw3l7i4gbyn25wagbadsc4mcrixml5nf0mck";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b42dd133e4fd5579dd1c6cdcbf733571bc890899/recipes/flycheck-clangcheck";
           sha256 = "1316cj3ynl80j39ha0371ss7cqw5hcr3m8944pdacdzbmp2sak2m";
-          name = "flycheck-clangcheck";
+          name = "recipe";
         };
         packageRequires = [ cl-lib flycheck seq ];
         meta = {
@@ -24460,20 +30525,27 @@
           license = lib.licenses.free;
         };
       }) {};
-    flycheck-clojure = callPackage ({ cider, emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild }:
-    melpaBuild {
+    flycheck-clojure = callPackage ({ cider
+                                    , emacs
+                                    , fetchFromGitHub
+                                    , fetchurl
+                                    , flycheck
+                                    , let-alist
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "flycheck-clojure";
         version = "20170221.1354";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "squiggly-clojure";
-          rev = "0fe57ab9c0d6262a3c0dbc9c28a9ca98390a6016";
-          sha256 = "1495d09vr8dlf9q6127fa46ghhgyw5bmzx22wdzzrfvc70m041a1";
+          rev = "c690f780b07cf9412b5b58e981b0caff2cef0e44";
+          sha256 = "136pmcp6zkarp5fasmw5532klik948hrbls5bbq5iqddb82si7x3";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c9c642a234f93ed4cf5edcf27a552a8916984946/recipes/flycheck-clojure";
           sha256 = "1b20gcs6fvq9pm4nl2qwsf34sg6wxngdql921q2pyh5n1xsxhm28";
-          name = "flycheck-clojure";
+          name = "recipe";
         };
         packageRequires = [ cider emacs flycheck let-alist ];
         meta = {
@@ -24481,8 +30553,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    flycheck-color-mode-line = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
-    melpaBuild {
+    flycheck-color-mode-line = callPackage ({ dash
+                                            , emacs
+                                            , fetchFromGitHub
+                                            , fetchurl
+                                            , flycheck
+                                            , lib
+                                            , melpaBuild }:
+      melpaBuild {
         pname = "flycheck-color-mode-line";
         version = "20171121.2307";
         src = fetchFromGitHub {
@@ -24491,10 +30569,10 @@
           rev = "cc474804d4e8088a627485faaf4217a5781aec7d";
           sha256 = "0lk8p0wb7g9lvxjv9rl59hd9f0m0ksw9rgspis8qshpz8pj5785f";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/02b5b60b74581ff0d1815155223e0c6e94a851a1/recipes/flycheck-color-mode-line";
           sha256 = "0hw19nsh5h2l8qbp7brqmml2fhs8a0x850vlvq3qfd7z248gvhrq";
-          name = "flycheck-color-mode-line";
+          name = "recipe";
         };
         packageRequires = [ dash emacs flycheck ];
         meta = {
@@ -24502,8 +30580,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    flycheck-coverity = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
-    melpaBuild {
+    flycheck-coverity = callPackage ({ dash
+                                     , emacs
+                                     , fetchFromGitHub
+                                     , fetchurl
+                                     , flycheck
+                                     , lib
+                                     , melpaBuild }:
+      melpaBuild {
         pname = "flycheck-coverity";
         version = "20170703.1759";
         src = fetchFromGitHub {
@@ -24512,10 +30596,10 @@
           rev = "cb211e3dd50413a5042eb20175be518214591c9d";
           sha256 = "17c5lppa5axw6wga3k8zqmn5f2syadlqbavrqgsi8k8nlcckxy1x";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/55e8df91adbcf8b059096e02aba2781424250381/recipes/flycheck-coverity";
           sha256 = "1knd1sqgjkgb5zs8hgsi6lyvkqmrcrdjgx81f26nhg40qv5m2p5l";
-          name = "flycheck-coverity";
+          name = "recipe";
         };
         packageRequires = [ dash emacs flycheck ];
         meta = {
@@ -24523,8 +30607,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    flycheck-credo = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
-    melpaBuild {
+    flycheck-credo = callPackage ({ fetchFromGitHub
+                                  , fetchurl
+                                  , flycheck
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "flycheck-credo";
         version = "20170526.845";
         src = fetchFromGitHub {
@@ -24533,10 +30621,10 @@
           rev = "e88f11ead53805c361ec7706e44c3dfee1daa19f";
           sha256 = "04i7fbqpkjpsfa8vjpkdhg1sj5isczxwncdp4vr9x3vll3svblm7";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/88dfffe034135cc46d661f8173e8b14e0fb7f240/recipes/flycheck-credo";
           sha256 = "0xmnbib7lx6v10pd3pkr69c4jb4sn3nmjk16qzvscwjgf2dypyax";
-          name = "flycheck-credo";
+          name = "recipe";
         };
         packageRequires = [ flycheck ];
         meta = {
@@ -24544,20 +30632,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    flycheck-crystal = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
-    melpaBuild {
+    flycheck-crystal = callPackage ({ fetchFromGitHub
+                                    , fetchurl
+                                    , flycheck
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "flycheck-crystal";
-        version = "20180306.1821";
+        version = "20180626.1942";
         src = fetchFromGitHub {
           owner = "crystal-lang-tools";
           repo = "emacs-crystal-mode";
-          rev = "490f213c17e67ac28e7de19a0cfa62652d44b5de";
-          sha256 = "0isz91ikwc5175y9a984j8j9nmli0qf2j0shljk576ywlybiy00a";
+          rev = "ae87526d13be07e6817809ac9795657db0092c9d";
+          sha256 = "1skgas1bh05vbncwwcahlr06g05nyn3cjwvfziq501r9b450s7qk";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c718f809af30226611358f9aaed7519e52923fd3/recipes/flycheck-crystal";
           sha256 = "04avxav2rayprm09xkphs1ni10j1kk10j7m77afcac0gnma5rwyn";
-          name = "flycheck-crystal";
+          name = "recipe";
         };
         packageRequires = [ flycheck ];
         meta = {
@@ -24565,8 +30657,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    flycheck-css-colorguard = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
-    melpaBuild {
+    flycheck-css-colorguard = callPackage ({ emacs
+                                           , fetchFromGitHub
+                                           , fetchurl
+                                           , flycheck
+                                           , lib
+                                           , melpaBuild }:
+      melpaBuild {
         pname = "flycheck-css-colorguard";
         version = "20161031.422";
         src = fetchFromGitHub {
@@ -24575,10 +30672,10 @@
           rev = "ae94fa0396acd99f9ec36d9572459df793f37fe8";
           sha256 = "1vy5yjf98b7dk9lniz3rgk33agg8f1x8488lvm28ljdq3jfdgcfw";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/flycheck-css-colorguard";
           sha256 = "16qgn12jdps61mlbvhji5l8qrqigv382wyiv79rj2bwvdzbl653f";
-          name = "flycheck-css-colorguard";
+          name = "recipe";
         };
         packageRequires = [ emacs flycheck ];
         meta = {
@@ -24586,20 +30683,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    flycheck-cstyle = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
-    melpaBuild {
+    flycheck-cstyle = callPackage ({ emacs
+                                   , fetchFromGitHub
+                                   , fetchurl
+                                   , flycheck
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "flycheck-cstyle";
         version = "20160905.1641";
         src = fetchFromGitHub {
           owner = "alexmurray";
           repo = "flycheck-cstyle";
-          rev = "207285140a353d08cf1fc450cacab158bc98ba82";
-          sha256 = "19wwv4r3nh79bdfcqp55qmknl0gwicy7dcaz28hm3sswbjpfv3rw";
+          rev = "002699f83253ea8e1a509a9ab6d0fce1a1650f73";
+          sha256 = "1qwimdnvwbg365hnwgrrq9h5h1spikma3va5z47rhxbdb21hvyvs";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5970f4f0967dc3a10dc9554a8f5f06b703872878/recipes/flycheck-cstyle";
           sha256 = "0p3lzpcgwk4nkq1w0iq40njz8ll2h3vi9z5fbvv1ar4r80fqd909";
-          name = "flycheck-cstyle";
+          name = "recipe";
         };
         packageRequires = [ emacs flycheck ];
         meta = {
@@ -24607,8 +30709,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    flycheck-cython = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
-    melpaBuild {
+    flycheck-cython = callPackage ({ fetchFromGitHub
+                                   , fetchurl
+                                   , flycheck
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "flycheck-cython";
         version = "20170724.258";
         src = fetchFromGitHub {
@@ -24617,10 +30723,10 @@
           rev = "ecc4454d35ab5317ab66a04406f36f0c1dbc0b76";
           sha256 = "1v17skw0wn7a7nkc1vrs0bbzihnjw0dwvyyd0lydsihzxl5z2r5g";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2d963eb1b8f8f863b37a96803b00d395e9d85e94/recipes/flycheck-cython";
           sha256 = "1mbrwhpbs8in11mp79cnl4bd3m33qdgrvnbvi1mqvrsvz1ay28g4";
-          name = "flycheck-cython";
+          name = "recipe";
         };
         packageRequires = [ flycheck ];
         meta = {
@@ -24628,8 +30734,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    flycheck-d-unittest = callPackage ({ dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
-    melpaBuild {
+    flycheck-d-unittest = callPackage ({ dash
+                                       , fetchFromGitHub
+                                       , fetchurl
+                                       , flycheck
+                                       , lib
+                                       , melpaBuild }:
+      melpaBuild {
         pname = "flycheck-d-unittest";
         version = "20160521.2117";
         src = fetchFromGitHub {
@@ -24638,10 +30749,10 @@
           rev = "3e614f23cb4a5566fd7988dbcaaf254af81c7718";
           sha256 = "0lrxyrvdkj88qh78jmamrnji770vjsr6h01agl7hvd4n2xvlxcym";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b86c666ee9b0620390a250dddd42b17cbec2409f/recipes/flycheck-d-unittest";
           sha256 = "0n4m4f0zqcx966582af1nqff5sla7jcr0wrmgzzxnn97yjrlnzk2";
-          name = "flycheck-d-unittest";
+          name = "recipe";
         };
         packageRequires = [ dash flycheck ];
         meta = {
@@ -24649,8 +30760,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    flycheck-dedukti = callPackage ({ dedukti-mode, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
-    melpaBuild {
+    flycheck-dedukti = callPackage ({ dedukti-mode
+                                    , fetchFromGitHub
+                                    , fetchurl
+                                    , flycheck
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "flycheck-dedukti";
         version = "20171103.512";
         src = fetchFromGitHub {
@@ -24659,10 +30775,10 @@
           rev = "3dbff5646355f39d57a3ec514f560a6b0082a1cd";
           sha256 = "1ffpxnwl3wx244n44mbw81g00nhnykd0lnid29f4aw1av7w6nw8l";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/732832e88a65a8866fa3872ff5f29eb8a26438f2/recipes/flycheck-dedukti";
           sha256 = "00nc18w4nsi6vicpbqqpr4xcdh48g95vnay3kirb2xp5hc2rw3x8";
-          name = "flycheck-dedukti";
+          name = "recipe";
         };
         packageRequires = [ dedukti-mode flycheck ];
         meta = {
@@ -24670,20 +30786,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    flycheck-demjsonlint = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
-    melpaBuild {
+    flycheck-demjsonlint = callPackage ({ fetchFromGitHub
+                                        , fetchurl
+                                        , flycheck
+                                        , lib
+                                        , melpaBuild }:
+      melpaBuild {
         pname = "flycheck-demjsonlint";
         version = "20161114.2318";
         src = fetchFromGitHub {
           owner = "z4139jq";
           repo = "flycheck-demjsonlint";
-          rev = "a3dfe1df8ecdea76c076c0849901427567356228";
-          sha256 = "0zra3rl0kn70kn30wx1lqh9218k06mq3j8jadax61nnynw7bzsa5";
+          rev = "1c433150fdf628dda4c9fad938bf7c79610b4460";
+          sha256 = "0kmvwmaxw64xjgchq8szk9mhbi6xp2jhv7qpgqndf4svia4pqws6";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b66df1afde83607408fb1b30e1260f22015bf448/recipes/flycheck-demjsonlint";
           sha256 = "0prwgi6v48ng89vvizb901iq4ysmrlh0g2b3797p1a6z2mps0k57";
-          name = "flycheck-demjsonlint";
+          name = "recipe";
         };
         packageRequires = [ flycheck ];
         meta = {
@@ -24691,8 +30811,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    flycheck-dialyxir = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
-    melpaBuild {
+    flycheck-dialyxir = callPackage ({ fetchFromGitHub
+                                     , fetchurl
+                                     , flycheck
+                                     , lib
+                                     , melpaBuild }:
+      melpaBuild {
         pname = "flycheck-dialyxir";
         version = "20170515.825";
         src = fetchFromGitHub {
@@ -24701,10 +30825,10 @@
           rev = "adfb73374cb2bee75724822972f405f2ec371199";
           sha256 = "1kzvq99f052mdj4ml1m6nvxhv0kqqblmpdgnwcm89krf0qfl4gjg";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fa49551b8f726c235e03ea377bb09a8be37b9f32/recipes/flycheck-dialyxir";
           sha256 = "0pacxidpgwp7wij17c5r0fm5w3nga3lp4mcim365k3y5r4ralc0c";
-          name = "flycheck-dialyxir";
+          name = "recipe";
         };
         packageRequires = [ flycheck ];
         meta = {
@@ -24712,8 +30836,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    flycheck-dialyzer = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
-    melpaBuild {
+    flycheck-dialyzer = callPackage ({ fetchFromGitHub
+                                     , fetchurl
+                                     , flycheck
+                                     , lib
+                                     , melpaBuild }:
+      melpaBuild {
         pname = "flycheck-dialyzer";
         version = "20160326.730";
         src = fetchFromGitHub {
@@ -24722,10 +30850,10 @@
           rev = "a5df0db95ac69f397b5f85d325a6d88cf8974f64";
           sha256 = "1i5wm2r6rck6864a60mm6kv31vgvqnq49hi9apvhyywfn6sycwkf";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bc84fb9fabfac4c008fe0eecb0b59933bfbf95c6/recipes/flycheck-dialyzer";
           sha256 = "0bn81yzijmnfg5xcnvcvxvqxz995iaafhgbfckgcal974s229kd2";
-          name = "flycheck-dialyzer";
+          name = "recipe";
         };
         packageRequires = [ flycheck ];
         meta = {
@@ -24733,20 +30861,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    flycheck-dmd-dub = callPackage ({ f, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
-    melpaBuild {
+    flycheck-dmd-dub = callPackage ({ f
+                                    , fetchFromGitHub
+                                    , fetchurl
+                                    , flycheck
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "flycheck-dmd-dub";
-        version = "20180321.1546";
+        version = "20180625.935";
         src = fetchFromGitHub {
           owner = "atilaneves";
           repo = "flycheck-dmd-dub";
-          rev = "995132ced9c0e4464a36c4435ae8248c23fc0511";
-          sha256 = "0k0dlbpz3vys373cng2gqlpbzlzbls9dl613rxvnba8d8ndz7ri4";
+          rev = "148ea4ba3e4c46c8edc616f947f796e98bcad0de";
+          sha256 = "0r33rp34ss7mx32x28p67n5sgnmyr6cmpwpprmlq2s72xpmyx4md";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a812594901c1099283bdf51fbea1aa077cfc588d/recipes/flycheck-dmd-dub";
           sha256 = "0pg3sf7h6xqv65yqclhlb7fx1mp2w0m3qk4vji6m438kxy6fhzqm";
-          name = "flycheck-dmd-dub";
+          name = "recipe";
         };
         packageRequires = [ f flycheck ];
         meta = {
@@ -24754,20 +30887,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    flycheck-dogma = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
-    melpaBuild {
+    flycheck-dogma = callPackage ({ fetchFromGitHub
+                                  , fetchurl
+                                  , flycheck
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "flycheck-dogma";
         version = "20170124.2321";
         src = fetchFromGitHub {
           owner = "aaronjensen";
           repo = "flycheck-dogma";
-          rev = "eea1844a81e87e2488b05e703a93272d0fc3bc74";
-          sha256 = "0wmp4q1jzb6giwrv8ajgqriy155mcc7jnj5sycpfk3hw6q74js66";
+          rev = "7e14207a7da67dc5524a8949cb37a3d11de1db6e";
+          sha256 = "1f3wn48am7920s6pm7ds1npfbj1w2pb8k790rl79rvc398g1pyyr";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1dd7601c55206fd0b9b59f98e861c52b9d640278/recipes/flycheck-dogma";
           sha256 = "0mpmmz0ssdd3a4fnqzy5kf9r3ddcs9kcl0chhilkw5k8480j3dcy";
-          name = "flycheck-dogma";
+          name = "recipe";
         };
         packageRequires = [ flycheck ];
         meta = {
@@ -24775,20 +30912,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    flycheck-dtrace = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
-    melpaBuild {
+    flycheck-dtrace = callPackage ({ emacs
+                                   , fetchFromGitHub
+                                   , fetchurl
+                                   , flycheck
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "flycheck-dtrace";
         version = "20180126.1135";
         src = fetchFromGitHub {
           owner = "juergenhoetzel";
           repo = "flycheck-dtrace";
-          rev = "a328c38aea855c0fd02f901c141c100c24b27d7f";
-          sha256 = "1cl50ckvjjgx9m7p7fpijk61mw737qigbh9glm5b3slmgkyfq2mq";
+          rev = "c418a96cf1dc3bafc17b9bcd23d5097dcf334c92";
+          sha256 = "00f7p895nfy9qr1hbcz7h8h8514rcv6ikrxl1pm4nvd045jicfyb";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cdcdd10fbcd58a5c67e4d07632212e7dedf42dbe/recipes/flycheck-dtrace";
           sha256 = "14sg7zkq9f5zbcfn8app8m9mdc8cnwcxh7h4glsz32yaqc1dj7h8";
-          name = "flycheck-dtrace";
+          name = "recipe";
         };
         packageRequires = [ emacs flycheck ];
         meta = {
@@ -24796,8 +30938,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    flycheck-elixir = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
-    melpaBuild {
+    flycheck-elixir = callPackage ({ fetchFromGitHub
+                                   , fetchurl
+                                   , flycheck
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "flycheck-elixir";
         version = "20171122.507";
         src = fetchFromGitHub {
@@ -24806,10 +30952,10 @@
           rev = "1f19a739cdb93851c6b01b1e188e215d035cd4a1";
           sha256 = "01820hm6231z3zaq97jmmvdrpnyp38cb0m6xms5ihq2r1fqx8z2c";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/da2ab73ab1426f71ea2b2bea2b418941856b3454/recipes/flycheck-elixir";
           sha256 = "0f78fai6q15smh9rvsliv8r0hh3kpwn1lz37yvqkkbx9vl7rlwld";
-          name = "flycheck-elixir";
+          name = "recipe";
         };
         packageRequires = [ flycheck ];
         meta = {
@@ -24817,8 +30963,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    flycheck-elm = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
-    melpaBuild {
+    flycheck-elm = callPackage ({ emacs
+                                , fetchFromGitHub
+                                , fetchurl
+                                , flycheck
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "flycheck-elm";
         version = "20160717.257";
         src = fetchFromGitHub {
@@ -24827,10 +30978,10 @@
           rev = "b401873ebd2176190a0a6fb4d61c2cca97d3b9fb";
           sha256 = "18apypk32dyg8zwvrcsza2j10z4zbpff04cz3xzhjskmkzw6210i";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/78bdcdaa660beda29acecb51761b95d8664d28ac/recipes/flycheck-elm";
           sha256 = "06dpv19wgbw48gbf701c77vw1dkpddx8056wpim3zbvwwfwk8ra4";
-          name = "flycheck-elm";
+          name = "recipe";
         };
         packageRequires = [ emacs flycheck ];
         meta = {
@@ -24838,8 +30989,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    flycheck-flawfinder = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
-    melpaBuild {
+    flycheck-flawfinder = callPackage ({ emacs
+                                       , fetchFromGitHub
+                                       , fetchurl
+                                       , flycheck
+                                       , lib
+                                       , melpaBuild }:
+      melpaBuild {
         pname = "flycheck-flawfinder";
         version = "20170115.1927";
         src = fetchFromGitHub {
@@ -24848,10 +31004,10 @@
           rev = "7d964d38023b088adf3ffc2fddeead81f4491a45";
           sha256 = "0y023brz8adwa6gdaaixk6dnrq4kj2i5h56rj54cxrjkagyklfxl";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e67a84d1a8c890ea56bd842549d70d9841d1e7a7/recipes/flycheck-flawfinder";
           sha256 = "1nabj00f5p1klzh6509ywnazxx2m017isdjdzzixg94g5mp0kv5i";
-          name = "flycheck-flawfinder";
+          name = "recipe";
         };
         packageRequires = [ emacs flycheck ];
         meta = {
@@ -24859,8 +31015,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    flycheck-flow = callPackage ({ fetchFromGitHub, fetchurl, flycheck, json ? null, lib, melpaBuild }:
-    melpaBuild {
+    flycheck-flow = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , flycheck
+                                 , json ? null
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "flycheck-flow";
         version = "20180216.1156";
         src = fetchFromGitHub {
@@ -24869,10 +31030,10 @@
           rev = "8173accf0e389f7ba0936d399da84839a7f887af";
           sha256 = "14g3mi8i4iy5f3fd3f7yx8ha18zi0kxqgn3sxkvdnk9rp1cdfnk1";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4d18fb21d8ef9b33aa84bc26f5918e636c5771e5/recipes/flycheck-flow";
           sha256 = "0p4vvk09vjgk98dwzr2qzldvij3v6af56pradssi6sm3shbqhkk3";
-          name = "flycheck-flow";
+          name = "recipe";
         };
         packageRequires = [ flycheck json ];
         meta = {
@@ -24880,8 +31041,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    flycheck-ghcmod = callPackage ({ dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
-    melpaBuild {
+    flycheck-ghcmod = callPackage ({ dash
+                                   , fetchFromGitHub
+                                   , fetchurl
+                                   , flycheck
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "flycheck-ghcmod";
         version = "20150113.2232";
         src = fetchFromGitHub {
@@ -24890,10 +31056,10 @@
           rev = "6bb7b7d879f05bbae54e99eb04806c877adf3ccc";
           sha256 = "0q1m1f3vhw1wy0pa3njy55z28psznbw2xwmwk2v1p5c86n74ns8d";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b6ed620e038f361c41115430a1fc119a04cf4f20/recipes/flycheck-ghcmod";
           sha256 = "0mqxg622lqnkb52a0wff7h8b0k6mm1k7fhkfi95fi5sahclja0rp";
-          name = "flycheck-ghcmod";
+          name = "recipe";
         };
         packageRequires = [ dash flycheck ];
         meta = {
@@ -24901,20 +31067,51 @@
           license = lib.licenses.free;
         };
       }) {};
-    flycheck-gometalinter = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
-    melpaBuild {
+    flycheck-golangci-lint = callPackage ({ emacs
+                                          , fetchFromGitHub
+                                          , fetchurl
+                                          , flycheck
+                                          , lib
+                                          , melpaBuild }:
+      melpaBuild {
+        pname = "flycheck-golangci-lint";
+        version = "20180711.117";
+        src = fetchFromGitHub {
+          owner = "weijiangan";
+          repo = "flycheck-golangci-lint";
+          rev = "b4b51aa6fe5335c0f46f2f83c7dc32e4141ff9f1";
+          sha256 = "0kxzziq4d4x1li1cimjckxk5n1429017k39jbfxm4p1bzq1xd6q3";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fffbecd6cb43866fc9f37ba2d2c998ef6186c6d5/recipes/flycheck-golangci-lint";
+          sha256 = "1vg80q4axbzb147fglli2w19n70bc934hb3hfl1r4shhpbfjlcgj";
+          name = "recipe";
+        };
+        packageRequires = [ emacs flycheck ];
+        meta = {
+          homepage = "https://melpa.org/#/flycheck-golangci-lint";
+          license = lib.licenses.free;
+        };
+      }) {};
+    flycheck-gometalinter = callPackage ({ emacs
+                                         , fetchFromGitHub
+                                         , fetchurl
+                                         , flycheck
+                                         , lib
+                                         , melpaBuild }:
+      melpaBuild {
         pname = "flycheck-gometalinter";
-        version = "20170321.732";
+        version = "20180424.241";
         src = fetchFromGitHub {
           owner = "favadi";
           repo = "flycheck-gometalinter";
-          rev = "c90ea1aba80ddfdf603c9ba731be302400fd6ba2";
-          sha256 = "0xw2wbch3y5nm90j9c53n3710xm161w724cknv8dwq27ickgp49b";
+          rev = "422f6e4b77b27fd7370f0c88437ac5072c9d3413";
+          sha256 = "16117njpia9046snp1y2yapqmnzgbsan5dvaw3ih5pqmnqjjqdkd";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8bfe9f2d030c04fb292297eb9226072bfea2ac64/recipes/flycheck-gometalinter";
           sha256 = "1bnvj5kwgbh0dv989rsjcvmcij1ahwcz0vpr6a8f2p6wwvksw1h2";
-          name = "flycheck-gometalinter";
+          name = "recipe";
         };
         packageRequires = [ emacs flycheck ];
         meta = {
@@ -24922,8 +31119,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    flycheck-gradle = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
-    melpaBuild {
+    flycheck-gradle = callPackage ({ emacs
+                                   , fetchFromGitHub
+                                   , fetchurl
+                                   , flycheck
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "flycheck-gradle";
         version = "20180403.33";
         src = fetchFromGitHub {
@@ -24932,10 +31134,10 @@
           rev = "a14b45183e50993e8b28a4c57ad5db82b789faef";
           sha256 = "1n3i0fh0rvy29gykqamxayfbbv5jy3h6l375pw4ckydcqlp0dgxk";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/382d9afd2bbb0c137719c308a67d185b86d84331/recipes/flycheck-gradle";
           sha256 = "0zd92lx0mqjqwzclvvhfwwahq80qspyv9k7qcxjc0bl3avjk6a47";
-          name = "flycheck-gradle";
+          name = "recipe";
         };
         packageRequires = [ emacs flycheck ];
         meta = {
@@ -24943,20 +31145,29 @@
           license = lib.licenses.free;
         };
       }) {};
-    flycheck-haskell = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, haskell-mode, let-alist, lib, melpaBuild, seq }:
-    melpaBuild {
+    flycheck-haskell = callPackage ({ dash
+                                    , emacs
+                                    , fetchFromGitHub
+                                    , fetchurl
+                                    , flycheck
+                                    , haskell-mode
+                                    , let-alist
+                                    , lib
+                                    , melpaBuild
+                                    , seq }:
+      melpaBuild {
         pname = "flycheck-haskell";
-        version = "20180321.1340";
+        version = "20180611.1442";
         src = fetchFromGitHub {
           owner = "flycheck";
           repo = "flycheck-haskell";
-          rev = "ef91cfd2766724adf6dd48f7d1dfaeed46dde570";
-          sha256 = "0qv2kzplqpnhgalqibb7ligsbxanv07wjjb5cshlsn2l0dimq4w7";
+          rev = "32877c2912d435c30c0202680611d127862a372c";
+          sha256 = "1glqpgk27fabhs8g6h6g0mlaxbvg2vb2z99rr27nk938f0mv65za";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6ca601613788ae830655e148a222625035195f55/recipes/flycheck-haskell";
           sha256 = "12lgirz3j6n5ns2ikq4n41z0d33qp1lb5lfz1q11qvpbpn9d0jn7";
-          name = "flycheck-haskell";
+          name = "recipe";
         };
         packageRequires = [ dash emacs flycheck haskell-mode let-alist seq ];
         meta = {
@@ -24964,20 +31175,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    flycheck-hdevtools = callPackage ({ dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
-    melpaBuild {
+    flycheck-hdevtools = callPackage ({ dash
+                                      , fetchFromGitHub
+                                      , fetchurl
+                                      , flycheck
+                                      , lib
+                                      , melpaBuild }:
+      melpaBuild {
         pname = "flycheck-hdevtools";
         version = "20160926.2";
         src = fetchFromGitHub {
           owner = "flycheck";
           repo = "flycheck-hdevtools";
-          rev = "eab1fc184854341a56154623a131cab6ff0ce18c";
-          sha256 = "0prmrix9a95zr39ybajp7fha03wknxyhrf1kfxsms1brxsc8bqim";
+          rev = "53829f0c57800615718cfce27ffa16d8ba286cee";
+          sha256 = "1isx9v5xx35pglmhyhpmpg7axw0krmnl0n2qiikf499z7dd35wyn";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9e210eb2405cc85dd1d03e9119d2249178950398/recipes/flycheck-hdevtools";
           sha256 = "0ahvai1q4x59ryiyccvqvjisgqbaiahx4gk8ssaxhblhj0sqga93";
-          name = "flycheck-hdevtools";
+          name = "recipe";
         };
         packageRequires = [ dash flycheck ];
         meta = {
@@ -24985,41 +31201,52 @@
           license = lib.licenses.free;
         };
       }) {};
-    flycheck-inline = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, flycheck, inline-docs, lib, melpaBuild }:
-    melpaBuild {
+    flycheck-inline = callPackage ({ emacs
+                                   , fetchFromGitHub
+                                   , fetchurl
+                                   , flycheck
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "flycheck-inline";
-        version = "20170728.2328";
+        version = "20180529.614";
         src = fetchFromGitHub {
-          owner = "stardiviner";
+          owner = "flycheck";
           repo = "flycheck-inline";
-          rev = "624957ec04164f03656bf2d0a5ccd6d2b013f545";
-          sha256 = "1qrwci7d5g3c3s2z888hydsa22hhiwlarq3im8w2crlzx5lhnbz8";
+          rev = "816d37bd7f7034502a7569515df1898a3bcd155c";
+          sha256 = "12lsf5f6866jgj5s40gcsg377gzvwni8bla6bx4l5jjn36lf1nvi";
         };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/6ad3925576719f34682f65867fd5bbbc97818870/recipes/flycheck-inline";
-          sha256 = "1yas4csz0xv0h61nzlywrp9z665gcmwr8vjrkm2psh04rfqhx3wg";
-          name = "flycheck-inline";
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/a9ecc3a4696d2b3b0f0b8b1ca6e5285380ac046a/recipes/flycheck-inline";
+          sha256 = "14ph2f5aj2mpyxbbq4v0rk5zdz7773lf2m83m30h3r1cbh5jmddj";
+          name = "recipe";
         };
-        packageRequires = [ cl-lib emacs flycheck inline-docs ];
+        packageRequires = [ emacs flycheck ];
         meta = {
           homepage = "https://melpa.org/#/flycheck-inline";
           license = lib.licenses.free;
         };
       }) {};
-    flycheck-irony = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, irony, lib, melpaBuild }:
-    melpaBuild {
+    flycheck-irony = callPackage ({ emacs
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , flycheck
+                                  , irony
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "flycheck-irony";
-        version = "20160317.1536";
+        version = "20180604.1452";
         src = fetchFromGitHub {
           owner = "Sarcasm";
           repo = "flycheck-irony";
-          rev = "34940ae5ab8f4c721d9c1118ebfc3496d7e67a84";
-          sha256 = "0qa5a8wzvzxwqql92ibc9s43k8sj3vwn7skz9hfr8av0skkhx996";
+          rev = "42dbecd4a865cabeb301193bb4d660e26ae3befe";
+          sha256 = "00ggn7v1nj2zb7rvwmjrhybd1vcp07n74krdy28z9xwh7w59wyq7";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1e367afce9a792c168ef1e7e20cc5903f7b570d8/recipes/flycheck-irony";
           sha256 = "0qk814m5s7mjba659llml0gy1g3045w8l1g73w2pnm1pbpqdfn3z";
-          name = "flycheck-irony";
+          name = "recipe";
         };
         packageRequires = [ emacs flycheck irony ];
         meta = {
@@ -25027,8 +31254,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    flycheck-jest = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
-    melpaBuild {
+    flycheck-jest = callPackage ({ emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , flycheck
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "flycheck-jest";
         version = "20180410.2028";
         src = fetchFromGitHub {
@@ -25037,10 +31269,10 @@
           rev = "08f27c5ed97c83c445f99fab58f0b6c826f14449";
           sha256 = "1ipr1yyk5vf2i8q7923r18a216sgf759x5f6j5776jcjkhp98c98";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/31e2ac9de5f28ee9d847097cdeb60afa99476a51/recipes/flycheck-jest";
           sha256 = "19dg8v0xzni7x6zn472n4ach1c1jv4syzarfi8ba8r6n26vz9ss4";
-          name = "flycheck-jest";
+          name = "recipe";
         };
         packageRequires = [ emacs flycheck ];
         meta = {
@@ -25048,20 +31280,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    flycheck-joker = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
-    melpaBuild {
+    flycheck-joker = callPackage ({ fetchFromGitHub
+                                  , fetchurl
+                                  , flycheck
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "flycheck-joker";
-        version = "20171003.2222";
+        version = "20180712.2102";
         src = fetchFromGitHub {
           owner = "candid82";
           repo = "flycheck-joker";
-          rev = "c34c3922a2e8bc918f250602e0ddf655cdcad456";
-          sha256 = "0fp7h0pmxk02x1kisqvnb9wkjjn9bl91capmnllrb7qmb24w6pd5";
+          rev = "0d8d5683a273093ca12841bf93d10dae97ccbc5d";
+          sha256 = "0r9w0ky1522yz1jdi8fd36lpdjm30vxq41x77vswikqxvscri3dq";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/599bf33a5d4a4a590b355001e532cab4e1ee9ef6/recipes/flycheck-joker";
           sha256 = "0war80zdljpjhfihqrind8471ic7l4z7j74zmrysybxvnd5nr7l3";
-          name = "flycheck-joker";
+          name = "recipe";
         };
         packageRequires = [ flycheck ];
         meta = {
@@ -25069,8 +31305,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    flycheck-julia = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
-    melpaBuild {
+    flycheck-julia = callPackage ({ emacs
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , flycheck
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "flycheck-julia";
         version = "20170729.1441";
         src = fetchFromGitHub {
@@ -25079,10 +31320,10 @@
           rev = "213b60a5a9a1cb7887260e1d159b5bb27167cbb6";
           sha256 = "0wk8mc8j67dmc3mxzrhypgxmyywwrjh5q5llj4m2mgf0j7yp2576";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4e964e3c6f737d0102b4fd7440fa9d434e6382bf/recipes/flycheck-julia";
           sha256 = "0340bv0lifs8pajk7gh7rngdjg62vaggn5biyysng642dlg5fwqs";
-          name = "flycheck-julia";
+          name = "recipe";
         };
         packageRequires = [ emacs flycheck ];
         meta = {
@@ -25090,20 +31331,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    flycheck-kotlin = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
-    melpaBuild {
+    flycheck-kotlin = callPackage ({ fetchFromGitHub
+                                   , fetchurl
+                                   , flycheck
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "flycheck-kotlin";
         version = "20170122.337";
         src = fetchFromGitHub {
           owner = "whirm";
           repo = "flycheck-kotlin";
-          rev = "cbb9fbf70dbe8efcc3971b3606ee95c97469b1fe";
-          sha256 = "0bxjx7xcpscv6vv4yxll8hh43aabv2dnrvkymb47jm3yvjr9cs1c";
+          rev = "44dfae49a7355232492e17c150b7f80a84835c45";
+          sha256 = "1495yxk308d1j3hw8gfdrsg8xs1imzgwfnwadrz9hx36rjd2dhj5";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f158727cc8892aadba0a613dd08e65e2fc791b48/recipes/flycheck-kotlin";
           sha256 = "0vh4f3ap1ciddf2fvfnjz668d6spyx49xs2wfp1hrzxn5yqpnra5";
-          name = "flycheck-kotlin";
+          name = "recipe";
         };
         packageRequires = [ flycheck ];
         meta = {
@@ -25111,8 +31356,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    flycheck-ledger = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
-    melpaBuild {
+    flycheck-ledger = callPackage ({ fetchFromGitHub
+                                   , fetchurl
+                                   , flycheck
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "flycheck-ledger";
         version = "20180125.31";
         src = fetchFromGitHub {
@@ -25121,10 +31370,10 @@
           rev = "044f28d126d1bce55c4b78ba6d5bc92e1f6cfd69";
           sha256 = "1k14jwz79mjsm0cfig5lc0byfrhvm495wrkybdl36b56q4qhxf58";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/dc715e6849aa5d6017e2478514c4a0d84c7ddbe5/recipes/flycheck-ledger";
           sha256 = "0807pd2km4r60wgd6jakscbx63ab22d9kvf1cml0ad8wynsap7jl";
-          name = "flycheck-ledger";
+          name = "recipe";
         };
         packageRequires = [ flycheck ];
         meta = {
@@ -25132,20 +31381,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    flycheck-lilypond = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
-    melpaBuild {
+    flycheck-lilypond = callPackage ({ emacs
+                                     , fetchFromGitHub
+                                     , fetchurl
+                                     , flycheck
+                                     , lib
+                                     , melpaBuild }:
+      melpaBuild {
         pname = "flycheck-lilypond";
         version = "20171203.532";
         src = fetchFromGitHub {
           owner = "hinrik";
           repo = "flycheck-lilypond";
-          rev = "cc1b7677a932c42e5dab1661ad7b923d4aae744c";
-          sha256 = "1yfsg52z4nhbh33fbsig24c9s0mc4xm72ll36h6ibld9fvqsgv6k";
+          rev = "d6b2c03e94e0b9b6294d7ad0b2fe4a76907a8aed";
+          sha256 = "0vafllj20k8b3z7ybnnpny0dj4xmnr5s69p3krwchs77pi04727h";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/da99de90193c9ad362afdbbae28dfba52ef3676e/recipes/flycheck-lilypond";
           sha256 = "0yx0jbilr8z58df13wcssp3p95skcvl8mnhhr6lijak44sd7klbf";
-          name = "flycheck-lilypond";
+          name = "recipe";
         };
         packageRequires = [ emacs flycheck ];
         meta = {
@@ -25153,8 +31407,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    flycheck-liquidhs = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
-    melpaBuild {
+    flycheck-liquidhs = callPackage ({ fetchFromGitHub
+                                     , fetchurl
+                                     , flycheck
+                                     , lib
+                                     , melpaBuild }:
+      melpaBuild {
         pname = "flycheck-liquidhs";
         version = "20170412.1626";
         src = fetchFromGitHub {
@@ -25163,10 +31421,10 @@
           rev = "c27252ac24d77f4b6eec76a4ba9cd61761a3fba9";
           sha256 = "1v5s252w2ai0rrci0rkq6wsx110pw8hp60n67990jg6l6lpvir2s";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d5921fde4068ff1bb288f6f9e2fe03f4a7fdbbda/recipes/flycheck-liquidhs";
           sha256 = "07dn2ifj49z2jj9zw0f0ydp5rxx9wfmah4fh4vx8slnpjby367yh";
-          name = "flycheck-liquidhs";
+          name = "recipe";
         };
         packageRequires = [ flycheck ];
         meta = {
@@ -25174,8 +31432,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    flycheck-mercury = callPackage ({ dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, s }:
-    melpaBuild {
+    flycheck-mercury = callPackage ({ dash
+                                    , fetchFromGitHub
+                                    , fetchurl
+                                    , flycheck
+                                    , lib
+                                    , melpaBuild
+                                    , s }:
+      melpaBuild {
         pname = "flycheck-mercury";
         version = "20151122.2334";
         src = fetchFromGitHub {
@@ -25184,10 +31448,10 @@
           rev = "fa9e433a0a912f0fae9e4dec9ea616ef99fcf861";
           sha256 = "0isqa6ybdd4166h3rdcg0b8pcxn00v8dav58xwfcj92nhzvs0qca";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a775d12d9b9b6f27a44aeffbbb18de46a9e1b532/recipes/flycheck-mercury";
           sha256 = "1z2y6933f05yv9y2aapmn876jnsydh642zqid3j88bb9kqi67x0h";
-          name = "flycheck-mercury";
+          name = "recipe";
         };
         packageRequires = [ dash flycheck s ];
         meta = {
@@ -25195,8 +31459,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    flycheck-mix = callPackage ({ elixir-mode, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
-    melpaBuild {
+    flycheck-mix = callPackage ({ elixir-mode
+                                , fetchFromGitHub
+                                , fetchurl
+                                , flycheck
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "flycheck-mix";
         version = "20170118.630";
         src = fetchFromGitHub {
@@ -25205,10 +31474,10 @@
           rev = "76684d4b5987925b98b254aab656f8bf8198ab88";
           sha256 = "130ddx83h88krd64kss4z59lfrmdi3433r95939kqsqfmhzvgx0k";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fd2a4d71b7f4c0082b687a23fd367d55186625a9/recipes/flycheck-mix";
           sha256 = "1wp8lp45lc519w3xsws2c91jlbfmc0pc8764kxsifk74akwcizfl";
-          name = "flycheck-mix";
+          name = "recipe";
         };
         packageRequires = [ elixir-mode flycheck ];
         meta = {
@@ -25216,8 +31485,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    flycheck-mmark = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
-    melpaBuild {
+    flycheck-mmark = callPackage ({ emacs
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , flycheck
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "flycheck-mmark";
         version = "20180203.932";
         src = fetchFromGitHub {
@@ -25226,10 +31500,10 @@
           rev = "7fdcc48ff6ffa5e7db126a76f4948ab08b9eb8d4";
           sha256 = "0g6a8nm5mxgca7psyi127ky68mal0lj7n486fgrwsg3bxglbsk5m";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2fd10423ab80e32245bb494005c8f87a8987fffb/recipes/flycheck-mmark";
           sha256 = "0lnw7pz40hijcpi9b92vjxvvyh9v50ww2f2r8z9pyhl9mjy2245x";
-          name = "flycheck-mmark";
+          name = "recipe";
         };
         packageRequires = [ emacs flycheck ];
         meta = {
@@ -25237,20 +31511,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    flycheck-mypy = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
-    melpaBuild {
+    flycheck-mypy = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , flycheck
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "flycheck-mypy";
-        version = "20160220.1432";
+        version = "20180518.4";
         src = fetchFromGitHub {
           owner = "lbolla";
           repo = "emacs-flycheck-mypy";
-          rev = "2675dc0e31f8c08eb69f77b8d99e3f7d985c62ee";
-          sha256 = "01r2ycbayhsxh3dq4d3qky5s0gcv3fjlp8j08y8dgyl406pkzhdz";
+          rev = "043e8bba13a6d5e760cde8374c8f77d90946a1f5";
+          sha256 = "0rcw8nxs5n9l8gdgs1yy240qnbad60j1m15xdy35s99nq7x1ksvn";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b1f5ad8263ee33b8950ff68e39dca5b1f1748c1b/recipes/flycheck-mypy";
           sha256 = "1w418jm6x3vcg2x31nzc8a3b8asx6gznl6m76ip8w98riz7vy02f";
-          name = "flycheck-mypy";
+          name = "recipe";
         };
         packageRequires = [ flycheck ];
         meta = {
@@ -25258,8 +31536,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    flycheck-nim = callPackage ({ dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
-    melpaBuild {
+    flycheck-nim = callPackage ({ dash
+                                , fetchFromGitHub
+                                , fetchurl
+                                , flycheck
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "flycheck-nim";
         version = "20160714.2128";
         src = fetchFromGitHub {
@@ -25268,10 +31551,10 @@
           rev = "6d27349b66e44578851e6148299709d64d2bde41";
           sha256 = "08rjrh7rjx71fsxf931hhfcga7m6a8sd6bvvr4qbsmhldnzd1aa7";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/68747db46761f28aa2fdf13494d7cecc334cb604/recipes/flycheck-nim";
           sha256 = "0w6f6998rqx8a3i4xhga7mrmvhxrm690wkqwfzspidid2z7v71az";
-          name = "flycheck-nim";
+          name = "recipe";
         };
         packageRequires = [ dash flycheck ];
         meta = {
@@ -25279,8 +31562,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    flycheck-nimsuggest = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
-    melpaBuild {
+    flycheck-nimsuggest = callPackage ({ emacs
+                                       , fetchFromGitHub
+                                       , fetchurl
+                                       , flycheck
+                                       , lib
+                                       , melpaBuild }:
+      melpaBuild {
         pname = "flycheck-nimsuggest";
         version = "20171027.1508";
         src = fetchFromGitHub {
@@ -25289,10 +31577,10 @@
           rev = "dc9a5de1cb3ee05db5794d824610959a1f603bc9";
           sha256 = "1bf65hrz0s6f180kn2ir8l5qn7in789w8pyy96b9gqn21z50vb9d";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cb4170f002dbcd1906e81836f3ce035b1e81c379/recipes/flycheck-nimsuggest";
           sha256 = "099mlzramm6z66zyjb6ypn7qb0hpvwbbgk9ydsanj8sni0dd66hv";
-          name = "flycheck-nimsuggest";
+          name = "recipe";
         };
         packageRequires = [ emacs flycheck ];
         meta = {
@@ -25300,8 +31588,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    flycheck-objc-clang = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
-    melpaBuild {
+    flycheck-objc-clang = callPackage ({ emacs
+                                       , fetchFromGitHub
+                                       , fetchurl
+                                       , flycheck
+                                       , lib
+                                       , melpaBuild }:
+      melpaBuild {
         pname = "flycheck-objc-clang";
         version = "20180410.422";
         src = fetchFromGitHub {
@@ -25310,10 +31603,10 @@
           rev = "f4a76ac199b67ff383ab5e70434c9b98b48c92d5";
           sha256 = "0ryanx4vmy9jwqjnwvma6dm136y4fh227cyhz206km6595bbn3nc";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4ff4412f507371b93cfb85fc744e54110cd87338/recipes/flycheck-objc-clang";
           sha256 = "07mzwd04a69d7xpkjmhfmf95j69h6accnf9bb9br7jb1hi9vdalp";
-          name = "flycheck-objc-clang";
+          name = "recipe";
         };
         packageRequires = [ emacs flycheck ];
         meta = {
@@ -25321,8 +31614,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    flycheck-ocaml = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild, merlin }:
-    melpaBuild {
+    flycheck-ocaml = callPackage ({ emacs
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , flycheck
+                                  , let-alist
+                                  , lib
+                                  , melpaBuild
+                                  , merlin }:
+      melpaBuild {
         pname = "flycheck-ocaml";
         version = "20170730.1453";
         src = fetchFromGitHub {
@@ -25331,10 +31631,10 @@
           rev = "8707a7bf545a8639a6a5c600a98d9a2ea1487dc9";
           sha256 = "13vzxkjq6v1f1i9zgxgjbwpiba04k9frkcl2wx6a9h3vgd7jyay0";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8ce9283eb1285953a2578eb7c4d280b4d98c801f/recipes/flycheck-ocaml";
           sha256 = "1cv2bb66aql2kj1y1gsl4xji8yrzrq6rd8hxxs5vpfsk47052lf7";
-          name = "flycheck-ocaml";
+          name = "recipe";
         };
         packageRequires = [ emacs flycheck let-alist merlin ];
         meta = {
@@ -25342,20 +31642,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    flycheck-package = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, package-lint }:
-    melpaBuild {
+    flycheck-package = callPackage ({ fetchFromGitHub
+                                    , fetchurl
+                                    , flycheck
+                                    , lib
+                                    , melpaBuild
+                                    , package-lint }:
+      melpaBuild {
         pname = "flycheck-package";
         version = "20161111.1451";
         src = fetchFromGitHub {
           owner = "purcell";
           repo = "flycheck-package";
-          rev = "6d99248b45eea1e5236062f38e524230efdb1a84";
-          sha256 = "00wyi2adiv9cb3x8bid2fhg3cjqlkc7z70i18vldbpmrpppjg4x5";
+          rev = "afe8a49343d90d08ee72ac6f993d424dcc39cc38";
+          sha256 = "19pz8h01yacfqsyh5940pam6vigvavsqg6qd84994d7mmzl534qa";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d17ec69c9f192625e74dfadf03b11d0d7dc575e7/recipes/flycheck-package";
           sha256 = "0068kpia17rsgjdmzsjnw0n6x5z9jvfxggxlzkszvwsx73mvcs2d";
-          name = "flycheck-package";
+          name = "recipe";
         };
         packageRequires = [ flycheck package-lint ];
         meta = {
@@ -25363,20 +31668,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    flycheck-perl6 = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
-    melpaBuild {
+    flycheck-perl6 = callPackage ({ emacs
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , flycheck
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "flycheck-perl6";
-        version = "20171231.445";
+        version = "20180509.1501";
         src = fetchFromGitHub {
           owner = "hinrik";
           repo = "flycheck-perl6";
-          rev = "7a69ddbb54dc0748734ace95f598c69e9882aa94";
-          sha256 = "1bsbw5pjin7m556pnphq8plgfjvbp1pl738lf5qc85jcvinv998m";
+          rev = "b804702305d7a6e26f762ff98cfdeec2e9dd4cb7";
+          sha256 = "0gys38rlx9lx35bia6nj7kfhz1v5xfrirgf8adwk7b2hfjazrsib";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2f6ecdb2ce6bc74a27dca01ab4942778e986ac8f/recipes/flycheck-perl6";
           sha256 = "0czc0fqx7g543afzkbjyz4bhxfl4s3v5swn9xrkayv8cgk8acvp4";
-          name = "flycheck-perl6";
+          name = "recipe";
         };
         packageRequires = [ emacs flycheck ];
         meta = {
@@ -25384,20 +31694,53 @@
           license = lib.licenses.free;
         };
       }) {};
-    flycheck-pkg-config = callPackage ({ dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, s }:
-    melpaBuild {
+    flycheck-phpstan = callPackage ({ emacs
+                                    , fetchFromGitHub
+                                    , fetchurl
+                                    , flycheck
+                                    , lib
+                                    , melpaBuild
+                                    , phpstan }:
+      melpaBuild {
+        pname = "flycheck-phpstan";
+        version = "20180430.358";
+        src = fetchFromGitHub {
+          owner = "emacs-php";
+          repo = "phpstan.el";
+          rev = "3653f2a316f4199cbd3238e984eea2325e2618d5";
+          sha256 = "1dyba8hpr16nsdv1i45pl3w97728w7p8vl9gf5gvd18xcll4848d";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/5a2b6cc39957e6d7185bd2bdfa3755e5b1f474a6/recipes/flycheck-phpstan";
+          sha256 = "1dr0h6cnwxdjmhlackv4gpsljwzs27gk41p8q99r0m44dada9gaf";
+          name = "recipe";
+        };
+        packageRequires = [ emacs flycheck phpstan ];
+        meta = {
+          homepage = "https://melpa.org/#/flycheck-phpstan";
+          license = lib.licenses.free;
+        };
+      }) {};
+    flycheck-pkg-config = callPackage ({ dash
+                                       , fetchFromGitHub
+                                       , fetchurl
+                                       , flycheck
+                                       , lib
+                                       , melpaBuild
+                                       , s }:
+      melpaBuild {
         pname = "flycheck-pkg-config";
-        version = "20170214.1114";
+        version = "20180430.1543";
         src = fetchFromGitHub {
           owner = "Wilfred";
           repo = "flycheck-pkg-config";
-          rev = "fda3f828082bd957c838126577a6b7e4d747dd54";
-          sha256 = "0pvbw9qgpa8x3cs0xbql2spbaza2hxsnamk92pdqppm4g797k3k8";
+          rev = "e72e4c1b8153611ed82695673af84096f4d52795";
+          sha256 = "07zyrbib9qzy4kj3p7kljcfi53qhb28nf0sjhhkqzdj09iv2k9wf";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5b2e88f2f126c9ff8b4261d6adb4c0d8d3049f33/recipes/flycheck-pkg-config";
           sha256 = "0w7h4fa4mv8377sdbkilqcw4b9qda98c1k01nxic7a8i3iyq02d6";
-          name = "flycheck-pkg-config";
+          name = "recipe";
         };
         packageRequires = [ dash flycheck s ];
         meta = {
@@ -25405,8 +31748,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    flycheck-plantuml = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, plantuml-mode }:
-    melpaBuild {
+    flycheck-plantuml = callPackage ({ emacs
+                                     , fetchFromGitHub
+                                     , fetchurl
+                                     , flycheck
+                                     , lib
+                                     , melpaBuild
+                                     , plantuml-mode }:
+      melpaBuild {
         pname = "flycheck-plantuml";
         version = "20171017.1811";
         src = fetchFromGitHub {
@@ -25415,10 +31764,10 @@
           rev = "183be89e1dbba0b38237dd198dff600e0790309d";
           sha256 = "1fbdbpwrlkvbgv693ndr3zamkf3gp28v94jg911fsav8bk08f6pq";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/65f050860a0efda8cf472c2945b79a0a57651556/recipes/flycheck-plantuml";
           sha256 = "01l22isiym635471628b951n025ls3lm6gfhfp6f8n8w7v1sb986";
-          name = "flycheck-plantuml";
+          name = "recipe";
         };
         packageRequires = [ emacs flycheck plantuml-mode ];
         meta = {
@@ -25426,20 +31775,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    flycheck-pony = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
-    melpaBuild {
+    flycheck-pony = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , flycheck
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "flycheck-pony";
         version = "20160501.1417";
         src = fetchFromGitHub {
           owner = "SeanTAllen";
           repo = "flycheck-pony";
-          rev = "ef27475a14090396a01924d131bfee9e163cf6e9";
-          sha256 = "06wij2g3prj5qzd8csc6v0phww7prdsf8hqmli6kil954lyxxaxl";
+          rev = "3d3387133a44f5b3f0fb178ef4addf6e1ce1df2f";
+          sha256 = "1da10q378k5kbcj0rrpzhm7r3ym4rfwc7v1ialcndbmflsn09m5s";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e2bcb82f4ddb92243058c9ab1a67d4f7ef87b155/recipes/flycheck-pony";
           sha256 = "18w1d7y3jsmsc4wg0909p72cnvbxzsmnirmrahhwgsb963fij5qk";
-          name = "flycheck-pony";
+          name = "recipe";
         };
         packageRequires = [ flycheck ];
         meta = {
@@ -25447,8 +31800,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    flycheck-popup-tip = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, popup }:
-    melpaBuild {
+    flycheck-popup-tip = callPackage ({ emacs
+                                      , fetchFromGitHub
+                                      , fetchurl
+                                      , flycheck
+                                      , lib
+                                      , melpaBuild
+                                      , popup }:
+      melpaBuild {
         pname = "flycheck-popup-tip";
         version = "20170812.1651";
         src = fetchFromGitHub {
@@ -25457,10 +31816,10 @@
           rev = "ef86aad907f27ca076859d8d9416f4f7727619c6";
           sha256 = "1bi6f9nm4bylsbjv4qnkar35s6xzdf2cc2cxi3g691p9527apdz6";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9b2269ee9532bb092756ae0c0693cb44b73820e8/recipes/flycheck-popup-tip";
           sha256 = "1j8pgljnxcbfh08qpbr9jkw56l7d6k8lmdcsjbi6jd7jmyqbqvnx";
-          name = "flycheck-popup-tip";
+          name = "recipe";
         };
         packageRequires = [ emacs flycheck popup ];
         meta = {
@@ -25468,20 +31827,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    flycheck-pos-tip = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, pos-tip }:
-    melpaBuild {
+    flycheck-pos-tip = callPackage ({ emacs
+                                    , fetchFromGitHub
+                                    , fetchurl
+                                    , flycheck
+                                    , lib
+                                    , melpaBuild
+                                    , pos-tip }:
+      melpaBuild {
         pname = "flycheck-pos-tip";
-        version = "20170504.1504";
+        version = "20180610.915";
         src = fetchFromGitHub {
           owner = "flycheck";
           repo = "flycheck-pos-tip";
-          rev = "7b94c0c1e3185a4350dc39885add3927037ebad8";
-          sha256 = "0m56rflfdzddfsr1xlgzfl7i259786hxsnwa0m729140c6v8f5wh";
+          rev = "909113977d37739387c7f099d74a724cfe6efcec";
+          sha256 = "0rfbhvl8n656a9d58bjyzki9r3si3ypylbyjn67rnla4jzzi22v8";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/698843f75e17b9e6160487c0153f9d6b4af288f6/recipes/flycheck-pos-tip";
           sha256 = "09i2jmwj8b915fhyczwdb1j7c551ggbva33avis77ga1s9v3nsf9";
-          name = "flycheck-pos-tip";
+          name = "recipe";
         };
         packageRequires = [ emacs flycheck pos-tip ];
         meta = {
@@ -25489,8 +31854,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    flycheck-posframe = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, posframe }:
-    melpaBuild {
+    flycheck-posframe = callPackage ({ emacs
+                                     , fetchFromGitHub
+                                     , fetchurl
+                                     , flycheck
+                                     , lib
+                                     , melpaBuild
+                                     , posframe }:
+      melpaBuild {
         pname = "flycheck-posframe";
         version = "20180321.2307";
         src = fetchFromGitHub {
@@ -25499,10 +31870,10 @@
           rev = "61bdfd4b04e1651163fdcaa7dc631ad073b3e513";
           sha256 = "1r5cwmrszp5cvzlcc4dyhajxd0zrgxjpc0arhr2jkw1fc3d611x9";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/124f2a7833e3386a0bf57c8111d782ae7a7ee02e/recipes/flycheck-posframe";
           sha256 = "02ym2isn761w2nsfxiqjh0jk4md9wy3hk9na2aw7pyycm5cgmfwp";
-          name = "flycheck-posframe";
+          name = "recipe";
         };
         packageRequires = [ emacs flycheck posframe ];
         meta = {
@@ -25510,20 +31881,53 @@
           license = lib.licenses.free;
         };
       }) {};
-    flycheck-purescript = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild, seq }:
-    melpaBuild {
+    flycheck-prospector = callPackage ({ fetchFromGitHub
+                                       , fetchurl
+                                       , flycheck
+                                       , lib
+                                       , melpaBuild }:
+      melpaBuild {
+        pname = "flycheck-prospector";
+        version = "20180523.2150";
+        src = fetchFromGitHub {
+          owner = "chocoelho";
+          repo = "flycheck-prospector";
+          rev = "d5b81adb5c8261b935baf0a614dd4b776280392e";
+          sha256 = "1g66gm538dwkvyl5rb199rnp5y8knrr3697m2qi0x0f18l072cg6";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/45475a408ff287f4f9d2a8bc729b995635579c84/recipes/flycheck-prospector";
+          sha256 = "1z028qi40pk7jh0m8w332kr5qi6k6sw1kbymqdxxfakh1976fww9";
+          name = "recipe";
+        };
+        packageRequires = [ flycheck ];
+        meta = {
+          homepage = "https://melpa.org/#/flycheck-prospector";
+          license = lib.licenses.free;
+        };
+      }) {};
+    flycheck-purescript = callPackage ({ dash
+                                       , emacs
+                                       , fetchFromGitHub
+                                       , fetchurl
+                                       , flycheck
+                                       , let-alist
+                                       , lib
+                                       , melpaBuild
+                                       , seq }:
+      melpaBuild {
         pname = "flycheck-purescript";
         version = "20161121.907";
         src = fetchFromGitHub {
           owner = "emacs-pe";
           repo = "flycheck-purescript";
-          rev = "30f0435d5e2715053c8c6170b2bce2ae462ac819";
-          sha256 = "10is8l88827g7gs8qnmyif124agxj9smfav6l53hjv3i0q3m3h6f";
+          rev = "60087203dfc9a1338a77c5d621480eac6f0426e1";
+          sha256 = "00iyy7gfhxyz4zna423c6y4wyx0rcd6kd1z50s22bi31bya9w8k1";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a315aad238fa223058a495e1ca8c71da6447024c/recipes/flycheck-purescript";
           sha256 = "05j1iscyg9khw0zq63676zrisragklxp48hmbc7vrbmbiy964lwd";
-          name = "flycheck-purescript";
+          name = "recipe";
         };
         packageRequires = [ dash emacs flycheck let-alist seq ];
         meta = {
@@ -25531,20 +31935,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    flycheck-pycheckers = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
-    melpaBuild {
+    flycheck-pycheckers = callPackage ({ fetchFromGitHub
+                                       , fetchurl
+                                       , flycheck
+                                       , lib
+                                       , melpaBuild }:
+      melpaBuild {
         pname = "flycheck-pycheckers";
-        version = "20180402.1039";
+        version = "20180710.1157";
         src = fetchFromGitHub {
           owner = "msherry";
           repo = "flycheck-pycheckers";
-          rev = "facb6e6cff7baaf38cf4e76a3e27a508225fc3f7";
-          sha256 = "061iahihq348ncbx9zh8ihca6j2fkc1nygk5f7v2q4j2g7kmfv8n";
+          rev = "ca24cf5d0a1d09c6c99ce7e58fb0b62a0f2cc320";
+          sha256 = "1bj7pm6kz5dqz4r53i1ll9i9r7p1p0lvpfw7gawi8k75wfhl3xwd";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/af36dca316b318d25d65c9e842f15f736e19ea63/recipes/flycheck-pycheckers";
           sha256 = "18ski3bp8x33589pc273i5ia3hffvlb4czrd97wkfgr4k59ww6yq";
-          name = "flycheck-pycheckers";
+          name = "recipe";
         };
         packageRequires = [ flycheck ];
         meta = {
@@ -25552,8 +31960,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    flycheck-pyflakes = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
-    melpaBuild {
+    flycheck-pyflakes = callPackage ({ fetchFromGitHub
+                                     , fetchurl
+                                     , flycheck
+                                     , lib
+                                     , melpaBuild }:
+      melpaBuild {
         pname = "flycheck-pyflakes";
         version = "20170330.1611";
         src = fetchFromGitHub {
@@ -25562,10 +31974,10 @@
           rev = "61b045939e3743b2162b7e4e73249c66fc2b8f65";
           sha256 = "03p0666vpprp6ijkvx9ypaw58bdq42gh533270plv2k5l8r22cl1";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/05e6f3041151006e44f91e5bcbaa7be3750fb403/recipes/flycheck-pyflakes";
           sha256 = "186h5ky48i1xmjbvvhn1i0rzhsy8bgdv1d8f7rlr2z4brb52f9c1";
-          name = "flycheck-pyflakes";
+          name = "recipe";
         };
         packageRequires = [ flycheck ];
         meta = {
@@ -25573,8 +31985,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    flycheck-rebar3 = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
-    melpaBuild {
+    flycheck-rebar3 = callPackage ({ fetchFromGitHub
+                                   , fetchurl
+                                   , flycheck
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "flycheck-rebar3";
         version = "20161030.615";
         src = fetchFromGitHub {
@@ -25583,10 +31999,10 @@
           rev = "56a7c94857f0a0ea6a2a73c476a1a2faadc0f7c6";
           sha256 = "1pas49arri2vs9zm3r8jl4md74p5fpips3imc3s7nafbfrhh8ix3";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2acff5eea030b91e457df8aa75243993c87ca00e/recipes/flycheck-rebar3";
           sha256 = "1ml9k61n5vy4c2q6c10q9j10ky0iqkinx21bl7hip1r6b5b1kmmc";
-          name = "flycheck-rebar3";
+          name = "recipe";
         };
         packageRequires = [ flycheck ];
         meta = {
@@ -25594,20 +32010,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    flycheck-rtags = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, rtags }:
-    melpaBuild {
+    flycheck-rtags = callPackage ({ emacs
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , flycheck
+                                  , lib
+                                  , melpaBuild
+                                  , rtags }:
+      melpaBuild {
         pname = "flycheck-rtags";
-        version = "20170522.2154";
+        version = "20180619.124";
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "4747d5b695bee40c3b0a2e3591ac8897571edd66";
-          sha256 = "1qy71bx8nki73mqslw54hq5bn1asz5qg1b2848nrsj8zb2yd85x5";
+          rev = "5dbb594a7202c4a2e84329cf821bd28bfbea5ae3";
+          sha256 = "0x210bqv7618g85nzjy4x9gy31qcbjgppmk8zbpmqk59f2bp7bac";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/flycheck-rtags";
           sha256 = "00v6shfs7piqapmyqyi0fk3182rcfa3p8wr2cm5vqlrana13kbw4";
-          name = "flycheck-rtags";
+          name = "recipe";
         };
         packageRequires = [ emacs flycheck rtags ];
         meta = {
@@ -25615,8 +32037,16 @@
           license = lib.licenses.free;
         };
       }) {};
-    flycheck-rust = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild, seq }:
-    melpaBuild {
+    flycheck-rust = callPackage ({ dash
+                                 , emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , flycheck
+                                 , let-alist
+                                 , lib
+                                 , melpaBuild
+                                 , seq }:
+      melpaBuild {
         pname = "flycheck-rust";
         version = "20180327.945";
         src = fetchFromGitHub {
@@ -25625,10 +32055,10 @@
           rev = "a722204cff5bffe26b8f127c7003cfc9ed00e34b";
           sha256 = "1z0zkf4dxkma6qz83ysyhbfvr0sg2cwxvsapc9j9l1x9nskybv2g";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/68d8cdf3d225b13ebbbe5ce81a01366f33266aed/recipes/flycheck-rust";
           sha256 = "1k0n0y6lbp71v4465dwq7864vp1qqyx7zjz0kssszcpx5gl1596w";
-          name = "flycheck-rust";
+          name = "recipe";
         };
         packageRequires = [ dash emacs flycheck let-alist seq ];
         meta = {
@@ -25636,8 +32066,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    flycheck-stack = callPackage ({ fetchFromGitHub, fetchurl, flycheck, haskell-mode, lib, melpaBuild }:
-    melpaBuild {
+    flycheck-stack = callPackage ({ fetchFromGitHub
+                                  , fetchurl
+                                  , flycheck
+                                  , haskell-mode
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "flycheck-stack";
         version = "20160520.244";
         src = fetchFromGitHub {
@@ -25646,10 +32081,10 @@
           rev = "f04235e00998000ee2c305f5a3ee72bb5dbbc926";
           sha256 = "139q43ldvymfxns8zv7gxasn3sg0rn4i9yz08wgk50psg5zq5mjr";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b77f55989d11d1efacbad0fd3876dd27006f2679/recipes/flycheck-stack";
           sha256 = "1r9zppqmp1i5i06jhkrgvwy1p3yc8kmcvgibricydqsij26lhpmf";
-          name = "flycheck-stack";
+          name = "recipe";
         };
         packageRequires = [ flycheck haskell-mode ];
         meta = {
@@ -25657,8 +32092,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    flycheck-status-emoji = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild }:
-    melpaBuild {
+    flycheck-status-emoji = callPackage ({ cl-lib ? null
+                                         , emacs
+                                         , fetchFromGitHub
+                                         , fetchurl
+                                         , flycheck
+                                         , let-alist
+                                         , lib
+                                         , melpaBuild }:
+      melpaBuild {
         pname = "flycheck-status-emoji";
         version = "20180330.1625";
         src = fetchFromGitHub {
@@ -25667,10 +32109,10 @@
           rev = "61e93ac41847d27b8eea3a334ced2d1783687b77";
           sha256 = "104zz9fihvd5klzdcaxsdmmfp0q5qisq5bbff48rfwdxnlp8dskr";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5abd6aaa8d2bf55ae75cd217820763531f91958b/recipes/flycheck-status-emoji";
           sha256 = "0p42424b1fsmfcjyl252vhblppmpjwd6br2yqh10fi60wmprvn2p";
-          name = "flycheck-status-emoji";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs flycheck let-alist ];
         meta = {
@@ -25678,20 +32120,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    flycheck-swift = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
-    melpaBuild {
+    flycheck-swift = callPackage ({ emacs
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , flycheck
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "flycheck-swift";
         version = "20170128.2149";
         src = fetchFromGitHub {
           owner = "swift-emacs";
           repo = "flycheck-swift";
-          rev = "4c5ad401252400a78da395fd56a71e67ff8c2761";
-          sha256 = "094vpmpjq0skhkq634p3zgj3nmsiq1dl8k0z7hzafnaw2y157z1s";
+          rev = "c6c416a1b7a7d346e5c040e4e4065abc68d3a844";
+          sha256 = "0wa60i99jh0dsks30jssg7l17bcmr6jzkwmkjg8brl756p593zp5";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fd99bea06079c4231363c37e3361bd9e5b1ba490/recipes/flycheck-swift";
           sha256 = "1s6rn4wyz9la6bw228jfxx8dxjyk5hf8r3vbmq0k808p772zki0z";
-          name = "flycheck-swift";
+          name = "recipe";
         };
         packageRequires = [ emacs flycheck ];
         meta = {
@@ -25699,8 +32146,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    flycheck-swift3 = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
-    melpaBuild {
+    flycheck-swift3 = callPackage ({ emacs
+                                   , fetchFromGitHub
+                                   , fetchurl
+                                   , flycheck
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "flycheck-swift3";
         version = "20180411.652";
         src = fetchFromGitHub {
@@ -25709,10 +32161,10 @@
           rev = "06a6f98d7e498860b345bbd03e96bfe59608f508";
           sha256 = "0h1n4x0fvqfb6jcapbab1ck6bj4d7irbn9zz2hxv2rlrkqxfsmh3";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f1fb8c731c118327dc0bbb726e046fec46bcfb82/recipes/flycheck-swift3";
           sha256 = "05yfrn42svcvdkr8mx16ii8llhzn33lxdawksjqiqg671s6fgdpa";
-          name = "flycheck-swift3";
+          name = "recipe";
         };
         packageRequires = [ emacs flycheck ];
         meta = {
@@ -25720,8 +32172,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    flycheck-swiftlint = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
-    melpaBuild {
+    flycheck-swiftlint = callPackage ({ emacs
+                                      , fetchFromGitHub
+                                      , fetchurl
+                                      , flycheck
+                                      , lib
+                                      , melpaBuild }:
+      melpaBuild {
         pname = "flycheck-swiftlint";
         version = "20180312.1656";
         src = fetchFromGitHub {
@@ -25730,10 +32187,10 @@
           rev = "8496fd4499ef5c0e0cfeb65f4d76c6f9dd8991f3";
           sha256 = "0d2s9brccv7lgw2vnglhhaq29mxb3pxiclhx4w28gb76x8r2rsf7";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7e2a979726507e974a0a19dfc2ca6884157025be/recipes/flycheck-swiftlint";
           sha256 = "1nwxv4l3ml9hlc8qf8a8x1bnnvdj80sb8nfbkcfiqwak315wihr4";
-          name = "flycheck-swiftlint";
+          name = "recipe";
         };
         packageRequires = [ emacs flycheck ];
         meta = {
@@ -25741,8 +32198,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    flycheck-tcl = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
-    melpaBuild {
+    flycheck-tcl = callPackage ({ emacs
+                                , fetchFromGitHub
+                                , fetchurl
+                                , flycheck
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "flycheck-tcl";
         version = "20180327.559";
         src = fetchFromGitHub {
@@ -25751,10 +32213,10 @@
           rev = "7ca23f4673e178b9f5dcc8a82b86cf05b15d7236";
           sha256 = "17mmj0yx7d7cwyq35ll1lw4j0yyha172375apvanrkpgpzjpnvrq";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fafc86df6c15348711f16302bb86c0ee08c08454/recipes/flycheck-tcl";
           sha256 = "0rmc7rk0n4mgk11jgza1dn1nkjyi7rqs79d3p0cj1081znyj56f3";
-          name = "flycheck-tcl";
+          name = "recipe";
         };
         packageRequires = [ emacs flycheck ];
         meta = {
@@ -25762,20 +32224,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    flycheck-tip = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, popup }:
-    melpaBuild {
+    flycheck-tip = callPackage ({ emacs
+                                , fetchFromGitHub
+                                , fetchurl
+                                , flycheck
+                                , lib
+                                , melpaBuild
+                                , popup }:
+      melpaBuild {
         pname = "flycheck-tip";
         version = "20171020.348";
         src = fetchFromGitHub {
           owner = "yuutayamada";
           repo = "flycheck-tip";
-          rev = "9b0072d92e6b4a52834bf5a34120a0f5e1c8c2fd";
-          sha256 = "1adcxz2chy0qcv5z79hhj05gdzk4l0jijy5iy9nd3sg8sclxf6nq";
+          rev = "a8ea6c905e8ad2d0684a17f7e78ba11e8598e85d";
+          sha256 = "12igqdgy93s02mv9zik5x98x3dzk654w6j6n2mkbzipfgfwq6nms";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/024f1e588e94014734fa252ee7bdb00b4991ede9/recipes/flycheck-tip";
           sha256 = "0zab1zknrnsw5xh5pwzzcpz7p40bbywkf9zx99sgsd6b5j1jz656";
-          name = "flycheck-tip";
+          name = "recipe";
         };
         packageRequires = [ emacs flycheck popup ];
         meta = {
@@ -25783,8 +32251,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    flycheck-title = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
-    melpaBuild {
+    flycheck-title = callPackage ({ emacs
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , flycheck
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "flycheck-title";
         version = "20170216.1546";
         src = fetchFromGitHub {
@@ -25793,10 +32266,10 @@
           rev = "6faea67be8661faf8152217869d16e993cc2bc49";
           sha256 = "08b2cq5bzmq9aa8b8glx5js2nhfpgdsd0r2sgvi0ij937yz8lf37";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2996b70645cd6fd093e3b31b9586ce5acb036cf6/recipes/flycheck-title";
           sha256 = "1cxid9qmzy8pl8qkvr6kgvfqm05pjw8cxpz66x619hbkw2vr7sza";
-          name = "flycheck-title";
+          name = "recipe";
         };
         packageRequires = [ emacs flycheck ];
         meta = {
@@ -25804,8 +32277,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    flycheck-vale = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild }:
-    melpaBuild {
+    flycheck-vale = callPackage ({ emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , flycheck
+                                 , let-alist
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "flycheck-vale";
         version = "20180308.2243";
         src = fetchFromGitHub {
@@ -25814,10 +32293,10 @@
           rev = "7777e0d4cf961b6ee6ae4ef917636121d18b3ee8";
           sha256 = "1k0bhyy2r9c79lld7mbhw8n4c1hlzwr5qp5wmcxzya0fnp3s6g9j";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7693eeb536e601589b49f96d0e2734cd08fad4f2/recipes/flycheck-vale";
           sha256 = "1ny30q81hq62s178rj3jjwsf9f3988dd6pl82r0vq53z3asnsxyd";
-          name = "flycheck-vale";
+          name = "recipe";
         };
         packageRequires = [ emacs flycheck let-alist ];
         meta = {
@@ -25825,8 +32304,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    flycheck-xcode = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
-    melpaBuild {
+    flycheck-xcode = callPackage ({ emacs
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , flycheck
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "flycheck-xcode";
         version = "20180121.2251";
         src = fetchFromGitHub {
@@ -25835,10 +32319,10 @@
           rev = "6147ab777e2c08e4f5ffdbd85d3013ca700fa835";
           sha256 = "1jwd7xhg7gfjppimf1kxwxwsgzkqc8w86wgp7kqphp79ydd4jgp8";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5fc66203fdd1721bf1a6f8dcec51694c57d2e690/recipes/flycheck-xcode";
           sha256 = "0n86hn6rf0mrx1385pwxgkx28xrbnksarlzb07h9d63s0yb5shaa";
-          name = "flycheck-xcode";
+          name = "recipe";
         };
         packageRequires = [ emacs flycheck ];
         meta = {
@@ -25846,20 +32330,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    flycheck-yamllint = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
-    melpaBuild {
+    flycheck-yamllint = callPackage ({ fetchFromGitHub
+                                     , fetchurl
+                                     , flycheck
+                                     , lib
+                                     , melpaBuild }:
+      melpaBuild {
         pname = "flycheck-yamllint";
         version = "20170325.1035";
         src = fetchFromGitHub {
           owner = "krzysztof-magosa";
           repo = "flycheck-yamllint";
-          rev = "c2b273d84f15bd03464d6722391e595d7c179a5c";
-          sha256 = "0snj6kkshk8bivwsnhp7kiyhzcn7x6952vw098wgzwqw2hgdkq97";
+          rev = "110d310fae409e1869b82c34e60936bd3783dc69";
+          sha256 = "0xfmnwmc26wzfw1r4q70yxzm9qqvcpxx953pvssavrxfyg3bdgf4";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/932ee0a1f13a52d53102b90911da79145208cbb5/recipes/flycheck-yamllint";
           sha256 = "1q2sy0hsbnwdlwq99wk8n5gi9fd8bs4jvi859np8bylbhhb3kj8m";
-          name = "flycheck-yamllint";
+          name = "recipe";
         };
         packageRequires = [ flycheck ];
         meta = {
@@ -25867,8 +32355,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    flycheck-yang = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, yang-mode }:
-    melpaBuild {
+    flycheck-yang = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , flycheck
+                                 , lib
+                                 , melpaBuild
+                                 , yang-mode }:
+      melpaBuild {
         pname = "flycheck-yang";
         version = "20180312.1131";
         src = fetchFromGitHub {
@@ -25877,10 +32370,10 @@
           rev = "47881fc42ef0163c47064b72b5d6dbef4f83d778";
           sha256 = "0bkbl1pas44bl6s3xjdb5zjbd6bmfjk39md5ds1ix4wchnkjm3iy";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e58b4f4294d11424918b399898c0044f5b76ab14/recipes/flycheck-yang";
           sha256 = "0agfmirjwlz13aq1jh94agav0y1rxkyhj7mngdgys7mwjxy0ac9h";
-          name = "flycheck-yang";
+          name = "recipe";
         };
         packageRequires = [ flycheck yang-mode ];
         meta = {
@@ -25888,20 +32381,28 @@
           license = lib.licenses.free;
         };
       }) {};
-    flycheck-ycmd = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild, ycmd }:
-    melpaBuild {
+    flycheck-ycmd = callPackage ({ dash
+                                 , emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , flycheck
+                                 , let-alist
+                                 , lib
+                                 , melpaBuild
+                                 , ycmd }:
+      melpaBuild {
         pname = "flycheck-ycmd";
         version = "20180207.843";
         src = fetchFromGitHub {
           owner = "abingham";
           repo = "emacs-ycmd";
-          rev = "a35a2ddd911da6d3a926bdef2614a2898055a5e2";
-          sha256 = "1nig77gqi74k01309r3nfy45ylhi5mj7ajxlhib6i58zlib8ycbl";
+          rev = "e21c99de8fd2992031adaa758df0d495e55d682a";
+          sha256 = "1l9xsqlcqi25mdka806gz3h4y4x0dh00n6bajh3x908ayixjgf91";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/flycheck-ycmd";
           sha256 = "114k5y3jy470g5zzhxy03036gcayc08n6g61cidlr2zlyq80glyr";
-          name = "flycheck-ycmd";
+          name = "recipe";
         };
         packageRequires = [ dash emacs flycheck let-alist ycmd ];
         meta = {
@@ -25909,8 +32410,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    flymake-coffee = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }:
-    melpaBuild {
+    flymake-coffee = callPackage ({ fetchFromGitHub
+                                  , fetchurl
+                                  , flymake-easy
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "flymake-coffee";
         version = "20170722.1846";
         src = fetchFromGitHub {
@@ -25919,10 +32424,10 @@
           rev = "dee295acf30820ed15fe0de17137d50bc27fc80c";
           sha256 = "0706jbi3jcmffxmcpvh8w3007q8sh48kgrcjip5c9hhfqpagayld";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/flymake-coffee";
           sha256 = "1aig1d4fgjdg31vrg8k43z5hbqiydgfvxi45p1695s3kbdm8pr2d";
-          name = "flymake-coffee";
+          name = "recipe";
         };
         packageRequires = [ flymake-easy ];
         meta = {
@@ -25930,8 +32435,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    flymake-cppcheck = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }:
-    melpaBuild {
+    flymake-cppcheck = callPackage ({ fetchFromGitHub
+                                    , fetchurl
+                                    , flymake-easy
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "flymake-cppcheck";
         version = "20140415.557";
         src = fetchFromGitHub {
@@ -25940,10 +32449,10 @@
           rev = "9554f504d425a04fa6a875f7e3179bc7cf07dd03";
           sha256 = "1dlxn8hhz3gfrhvkwhlxjmby6zc0g8yy9n9j9dn8c4cbi2fhyx5m";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2a83d56c6e150de5d4fdbd89f271f18e5304afd8/recipes/flymake-cppcheck";
           sha256 = "11brzgq2zl32a8a2dgj2imsldjqaqvxwk2jypf4bmfwa3mkcqh3d";
-          name = "flymake-cppcheck";
+          name = "recipe";
         };
         packageRequires = [ flymake-easy ];
         meta = {
@@ -25951,8 +32460,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    flymake-css = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }:
-    melpaBuild {
+    flymake-css = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , flymake-easy
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "flymake-css";
         version = "20170722.1846";
         src = fetchFromGitHub {
@@ -25961,10 +32474,10 @@
           rev = "de090163ba289910ceeb61b13368ce42d0f2dfd8";
           sha256 = "18rqzah8p7mqwkddaav1d4r146amvn8jppazvsvc5vs01syj83m9";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/flymake-css";
           sha256 = "0kqm3wn9symqc9ivnh11gqgq8ql2bhpqvxfm86d8vwm082hd92c5";
-          name = "flymake-css";
+          name = "recipe";
         };
         packageRequires = [ flymake-easy ];
         meta = {
@@ -25972,20 +32485,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    flymake-cursor = callPackage ({ fetchFromGitHub, fetchurl, flymake ? null, lib, melpaBuild }:
-    melpaBuild {
+    flymake-cursor = callPackage ({ fetchFromGitHub
+                                  , fetchurl
+                                  , flymake ? null
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "flymake-cursor";
         version = "20120322.1057";
         src = fetchFromGitHub {
           owner = "flymake";
           repo = "emacs-flymake-cursor";
-          rev = "ecc539082c3fc9e91bba33d72c26989217411593";
-          sha256 = "0cdf5m3rfwsim505qjyyml0r5zzqx7jrlc8ayfvix70f3bmxnibs";
+          rev = "5cac5045398b1436ceb143d48961b50d38ae1396";
+          sha256 = "0xaq8zfd90kqqwg8ik081jblrdyj6p3fh2xpf6a4sdj8826ry93v";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a02597edee67c84bef259d7fc5c5b61bd39a5b86/recipes/flymake-cursor";
           sha256 = "0v5abg3h9kmybr0cyr7hqy4rn88h84snzxbsmqcbjw24s10v9p0s";
-          name = "flymake-cursor";
+          name = "recipe";
         };
         packageRequires = [ flymake ];
         meta = {
@@ -25993,20 +32510,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    flymake-easy = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    flymake-easy = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "flymake-easy";
         version = "20140818.55";
         src = fetchFromGitHub {
           owner = "purcell";
           repo = "flymake-easy";
-          rev = "de41ea49503f71f997e5c359a2ad08df696c0147";
-          sha256 = "1mylcsklnv3q27q1gvf7wrila39rmxab1ypmvjh5p56d91y6pszc";
+          rev = "09deafbcb5f094de8465c2bbfe270ba0f517f515";
+          sha256 = "1ld0g3hrbplmw3xgg6jg032hncnlxyc3hid4vn38lkcj3y7ls61b";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/flymake-easy";
           sha256 = "0y7nm2p5x1f0nqfj73zr6xzbpf4wrzx8sn8154yx0qm0qh3id39v";
-          name = "flymake-easy";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -26014,8 +32534,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    flymake-elixir = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    flymake-elixir = callPackage ({ fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "flymake-elixir";
         version = "20130810.717";
         src = fetchFromGitHub {
@@ -26024,10 +32547,10 @@
           rev = "3810566cffe35d04cc3f01e27fe397d68d52f802";
           sha256 = "04w6g4wixrpfidxbk2bwazhvf0cx3c2v2mxnycqqlqkg0m0sb0fn";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/05dae578f0dd6b5185f666431b3f36aad3aeffa1/recipes/flymake-elixir";
           sha256 = "15r3m58hnc75l3j02xdr8yg25fbn2sbz1295ac44widzis82m792";
-          name = "flymake-elixir";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -26035,20 +32558,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    flymake-gjshint = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    flymake-gjshint = callPackage ({ fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "flymake-gjshint";
         version = "20130327.532";
         src = fetchFromGitHub {
           owner = "yasuyk";
           repo = "flymake-gjshint-el";
-          rev = "dc957c14cb060819585de8aedb330e24efa4b784";
-          sha256 = "14kbqyw4v1c51dx7pfgqbn8x4j8j3rgyyq2fa9klqzxpldcskl24";
+          rev = "71495ee5303de18293decd57ab9f9abdbaabfa05";
+          sha256 = "002s01cymgx4z4l3j2pqirg7899pljdx2hmbz8k6cksdxlymzmkd";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b4673825b15519e9eb2204ade5cc045751771c52/recipes/flymake-gjshint";
           sha256 = "19jcd5z4883z3fzlrdn4fzmsvn16f4hfnhgw4vbs5b0ma6a8ka44";
-          name = "flymake-gjshint";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -26056,8 +32582,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    flymake-go = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    flymake-go = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "flymake-go";
         version = "20150714.33";
         src = fetchFromGitHub {
@@ -26066,10 +32595,10 @@
           rev = "ae83761aa908c1a50ff34af04f00dcc46bca2ce9";
           sha256 = "03gh0y988pksghmmvb5av2vnlbcsncafvn4nwihsis0bhys8k28q";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b42b8b34388803439c249f16fdf14257ef182ed6/recipes/flymake-go";
           sha256 = "030m67d8g60ljm7ny3jh4vwj3cshypsklgbjpcvh32y109ga1hy1";
-          name = "flymake-go";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -26077,20 +32606,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    flymake-google-cpplint = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }:
-    melpaBuild {
+    flymake-google-cpplint = callPackage ({ fetchFromGitHub
+                                          , fetchurl
+                                          , flymake-easy
+                                          , lib
+                                          , melpaBuild }:
+      melpaBuild {
         pname = "flymake-google-cpplint";
         version = "20140205.525";
         src = fetchFromGitHub {
           owner = "senda-akiha";
           repo = "flymake-google-cpplint";
-          rev = "905d32e84a27f18a78bec455ca930ab1ff9ae31e";
-          sha256 = "0zldhlvxmk0xcjmj4ns48pp4h3bvijrzs1md69ya7m3dmsbayfrc";
+          rev = "5d36ff947d4cdcc3ac5e7f48e543fe0be949ba72";
+          sha256 = "18a7l1wmgxqqzr9mzg5rb9626rwyifmiw34chg9jchfkm8wbz0fv";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/01f8e5c2b63e80f0411860fde38bf694df3bfc8f/recipes/flymake-google-cpplint";
           sha256 = "0q7v70xbprh03f1yabq216q4q82a58s2c1ykr6ig49cg1jdgzkf3";
-          name = "flymake-google-cpplint";
+          name = "recipe";
         };
         packageRequires = [ flymake-easy ];
         meta = {
@@ -26098,8 +32631,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    flymake-haml = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }:
-    melpaBuild {
+    flymake-haml = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , flymake-easy
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "flymake-haml";
         version = "20170722.1846";
         src = fetchFromGitHub {
@@ -26108,10 +32645,10 @@
           rev = "22a81e8484734552d461e7ae7305664dc244447e";
           sha256 = "0pgp2gl3wdwrzcik5b5csn4qp8iv6pc51brx8p7jrwn7bz4lkb82";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/flymake-haml";
           sha256 = "0dmdhh12h4xrx6mc0qrwavngk2sx0l4pfqkjjyavabsgcs9wlgp1";
-          name = "flymake-haml";
+          name = "recipe";
         };
         packageRequires = [ flymake-easy ];
         meta = {
@@ -26119,8 +32656,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    flymake-haskell-multi = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }:
-    melpaBuild {
+    flymake-haskell-multi = callPackage ({ fetchFromGitHub
+                                         , fetchurl
+                                         , flymake-easy
+                                         , lib
+                                         , melpaBuild }:
+      melpaBuild {
         pname = "flymake-haskell-multi";
         version = "20170722.1846";
         src = fetchFromGitHub {
@@ -26129,10 +32670,10 @@
           rev = "b564a94312259885b1380272eb867bf52a164020";
           sha256 = "1h21hy5fjwa5qxl31rq3jjp3wwkipdwaliq0ci184rw48kw51xjh";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e879eca5eb11b2ae77ee2cb8d8150d85e9e93ebd/recipes/flymake-haskell-multi";
           sha256 = "0cyzmmghwkkv6020s6n436lwymi6dr49i7gkci5n0hw5pdywcaij";
-          name = "flymake-haskell-multi";
+          name = "recipe";
         };
         packageRequires = [ flymake-easy ];
         meta = {
@@ -26140,8 +32681,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    flymake-hlint = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }:
-    melpaBuild {
+    flymake-hlint = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , flymake-easy
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "flymake-hlint";
         version = "20170722.1846";
         src = fetchFromGitHub {
@@ -26150,10 +32695,10 @@
           rev = "f910736b26784efc9a2fa29503f45c1f1dd0aa38";
           sha256 = "157f2l6hllwl12h8f502rq2kl33s202k9bcyfy2cmnn6vhky1b8s";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/17820f32d46e845cc44b237d0bfd5c2d898721de/recipes/flymake-hlint";
           sha256 = "0wq1ijhn3ypy31yk8jywl5hnz0r0vlhcxjyznzccwqbdc5vf7b2x";
-          name = "flymake-hlint";
+          name = "recipe";
         };
         packageRequires = [ flymake-easy ];
         meta = {
@@ -26161,8 +32706,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    flymake-jshint = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }:
-    melpaBuild {
+    flymake-jshint = callPackage ({ fetchFromGitHub
+                                  , fetchurl
+                                  , flymake-easy
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "flymake-jshint";
         version = "20140319.1500";
         src = fetchFromGitHub {
@@ -26171,10 +32720,10 @@
           rev = "79dd554c227883c487db38ac111306c8d5382c95";
           sha256 = "0ywm9fpb7d7ry2fly8719fa41q97yj9za3phqhv6j1chzaxvcv3a";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/144511ce3378b468751b1ee627b77a2d22fe8dfc/recipes/flymake-jshint";
           sha256 = "0j4djylz6mrq14qmbm35k3gvvsw6i9qc4gd9ma4fykiqzkdjsg7j";
-          name = "flymake-jshint";
+          name = "recipe";
         };
         packageRequires = [ flymake-easy ];
         meta = {
@@ -26182,8 +32731,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    flymake-jslint = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }:
-    melpaBuild {
+    flymake-jslint = callPackage ({ fetchFromGitHub
+                                  , fetchurl
+                                  , flymake-easy
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "flymake-jslint";
         version = "20170722.1846";
         src = fetchFromGitHub {
@@ -26192,10 +32745,10 @@
           rev = "8edb82be605542b0ef62d38d818adcdde335eecb";
           sha256 = "0i6bqpbibsbqhpqfy9zl0awiqkmddi3q8xlrslcjd429f0g5f1ad";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/flymake-jslint";
           sha256 = "1cq8fni4p0qhigx0qh34ypmcsbnilra1ixgnrn9mgg8x3cvcm4cm";
-          name = "flymake-jslint";
+          name = "recipe";
         };
         packageRequires = [ flymake-easy ];
         meta = {
@@ -26203,20 +32756,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    flymake-json = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }:
-    melpaBuild {
+    flymake-json = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , flymake-easy
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "flymake-json";
-        version = "20170722.1846";
+        version = "20180511.211";
         src = fetchFromGitHub {
           owner = "purcell";
           repo = "flymake-json";
-          rev = "d43e62fab69c4c39f54f1057c9801a3e645de619";
-          sha256 = "1zlhxl7x754p4bxipklvz0gjqlwg9c8fiyv7rxdkfaxdzpf9a6zm";
+          rev = "ae58795f948402e987cda4c15f10354f8ec2d0fd";
+          sha256 = "1hr35xxj6w34h7xs13n6sxs69j3z3i0r1qim3hgyiym797xjsa0p";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/acb0a4d29159aa6d74f754911f63152dac3425bd/recipes/flymake-json";
           sha256 = "1p5kajiycpqy2id664bs0fb1mbf73a43qqfdi4c57n6j9x7fxp4d";
-          name = "flymake-json";
+          name = "recipe";
         };
         packageRequires = [ flymake-easy ];
         meta = {
@@ -26224,8 +32781,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    flymake-less = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, less-css-mode, lib, melpaBuild }:
-    melpaBuild {
+    flymake-less = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , flymake-easy
+                                , less-css-mode
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "flymake-less";
         version = "20151110.2338";
         src = fetchFromGitHub {
@@ -26234,10 +32796,10 @@
           rev = "32d3c28a9a5c52b82d1741ff9d715013b6498421";
           sha256 = "0ggi8a4j4glpsar0sqg8q06rscajjaziis5ann31wphx88rc5wd7";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6d4eae8b7b7d81ebf4d85f38fc3a17b4bc918318/recipes/flymake-less";
           sha256 = "05k5daphxy94164c73ia7f4l1gv2cmlw8xzs8xnddg7ly22gjhi0";
-          name = "flymake-less";
+          name = "recipe";
         };
         packageRequires = [ flymake-easy less-css-mode ];
         meta = {
@@ -26245,20 +32807,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    flymake-lua = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    flymake-lua = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "flymake-lua";
         version = "20170128.1754";
         src = fetchFromGitHub {
           owner = "sroccaserra";
           repo = "flymake-lua";
-          rev = "84589f20066921a5b79cf3a1f914a223a2552d2a";
-          sha256 = "1f4nigl65g1g5w15ddf33ypk2b07xph964pkdq1bw81451vmvzhn";
+          rev = "dcc32b62a285215898ae774ba63dbda0656f6f53";
+          sha256 = "07my1w3cdj9iq2f9jfh04m5zivig7b97kha3ajjlx9avss976baq";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/63889df90a8cd4a39871cc43ccc559eff7b8dd5f/recipes/flymake-lua";
           sha256 = "05q6bifr1ywirk6sdn0pr812nlrzsi79bpbgn6ay4jyzmhhfi9z0";
-          name = "flymake-lua";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -26266,20 +32831,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    flymake-perlcritic = callPackage ({ fetchFromGitHub, fetchurl, flymake ? null, lib, melpaBuild }:
-    melpaBuild {
+    flymake-perlcritic = callPackage ({ fetchFromGitHub
+                                      , fetchurl
+                                      , flymake ? null
+                                      , lib
+                                      , melpaBuild }:
+      melpaBuild {
         pname = "flymake-perlcritic";
         version = "20120328.114";
         src = fetchFromGitHub {
           owner = "illusori";
           repo = "emacs-flymake-perlcritic";
-          rev = "edfaa86500ddfa8a6a6f51f5581a81a821277df6";
-          sha256 = "1f4l2r4gp03s18255jawc7s5abpjjrw54937wzygmvzvqvmaiikj";
+          rev = "0692d6ad5495f6e5438bde0a10345829b8e1def8";
+          sha256 = "11r982h5fhjkmm9ld8wfdip0ghinw523nm1w4fmy830g0bbkgkrq";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ca7bf43ef8893bf04e9658390e306ef69e80a156/recipes/flymake-perlcritic";
           sha256 = "0hibnh463wzhvpix7gygpgs04gi6salwjrsjc6d43lxlsn3y1im8";
-          name = "flymake-perlcritic";
+          name = "recipe";
         };
         packageRequires = [ flymake ];
         meta = {
@@ -26287,8 +32856,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    flymake-php = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }:
-    melpaBuild {
+    flymake-php = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , flymake-easy
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "flymake-php";
         version = "20170722.1846";
         src = fetchFromGitHub {
@@ -26297,10 +32870,10 @@
           rev = "c045d01e002ba5e09b05f40e25bf5068d02126bc";
           sha256 = "03fk8kzlwbs9k91ra91r7djxlpv5mhbha33dnyz50sqwa52cg8ck";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/flymake-php";
           sha256 = "12ds2l5kvs7fz38syp4amasbjkpqd36rlpajnb3xxll0hbk6vffk";
-          name = "flymake-php";
+          name = "recipe";
         };
         packageRequires = [ flymake-easy ];
         meta = {
@@ -26308,8 +32881,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    flymake-phpcs = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }:
-    melpaBuild {
+    flymake-phpcs = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , flymake-easy
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "flymake-phpcs";
         version = "20140712.2331";
         src = fetchFromGitHub {
@@ -26318,10 +32895,10 @@
           rev = "a4d383474e055e554aaf1cd617055d5d7181aa50";
           sha256 = "140rlp6m0aqibwa0bhv8w6l3giziybqdw7x271nq8f3r60ch13bi";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6e4d444198f593cfb03c7ca84f3e90db13ef5a01/recipes/flymake-phpcs";
           sha256 = "0zzxi3c203fiw6jp1ar9bb9f28x2lg23bczgy8n5cicrq59jfsn9";
-          name = "flymake-phpcs";
+          name = "recipe";
         };
         packageRequires = [ flymake-easy ];
         meta = {
@@ -26329,20 +32906,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    flymake-puppet = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }:
-    melpaBuild {
+    flymake-puppet = callPackage ({ fetchFromGitHub
+                                  , fetchurl
+                                  , flymake-easy
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "flymake-puppet";
         version = "20170731.2254";
         src = fetchFromGitHub {
           owner = "benprew";
           repo = "flymake-puppet";
-          rev = "8a772395f4ccc59d883712ab53a92a17c1d9a429";
-          sha256 = "00w87qa7r8rigmpv58vpjwpn9x13sv7db5m6z4cqh76qkgkghgqi";
+          rev = "9579e5c736cb890195464fabf51df113313de88d";
+          sha256 = "1bk16l8rbvrwmcd0zd2yg8xmfn7b036716niy21wfizmar0pk7p7";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/302dbe34e7949da9c65e9c7bf2ab924db91b968f/recipes/flymake-puppet";
           sha256 = "1izq6s33p74dy4wzfnjii8wjs723bm5ggl0w6hkvzgbmyjc01hxv";
-          name = "flymake-puppet";
+          name = "recipe";
         };
         packageRequires = [ flymake-easy ];
         meta = {
@@ -26350,8 +32931,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    flymake-python-pyflakes = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }:
-    melpaBuild {
+    flymake-python-pyflakes = callPackage ({ fetchFromGitHub
+                                           , fetchurl
+                                           , flymake-easy
+                                           , lib
+                                           , melpaBuild }:
+      melpaBuild {
         pname = "flymake-python-pyflakes";
         version = "20170722.1846";
         src = fetchFromGitHub {
@@ -26360,10 +32945,10 @@
           rev = "1d65c26bf65a5dcbd29fcd967e2feb90e1e7a33d";
           sha256 = "0hsvw6rxg3k1ymrav0bf5q3siqr9v2jp4c4h1f98szrj2lp200fm";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/49091c0eca4158b80269b6ff5f7f3fc8e981420b/recipes/flymake-python-pyflakes";
           sha256 = "0asbjxv03zkbcjayanv13qzbv4z7b6fi0z1j6yv7fl6q9mgvm497";
-          name = "flymake-python-pyflakes";
+          name = "recipe";
         };
         packageRequires = [ flymake-easy ];
         meta = {
@@ -26371,8 +32956,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    flymake-ruby = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }:
-    melpaBuild {
+    flymake-ruby = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , flymake-easy
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "flymake-ruby";
         version = "20170722.1846";
         src = fetchFromGitHub {
@@ -26381,10 +32970,10 @@
           rev = "6c320c6fb686c5223bf975cc35178ad6b195e073";
           sha256 = "0hzyxhg6y1rknvgj2ycivwrlrw7fznw9jrin5n9z627mzpjpfcnk";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/flymake-ruby";
           sha256 = "1shr6d03vx85nmyxnysglzlc1pz0zy3n28nrcmxqgdm02g197bzr";
-          name = "flymake-ruby";
+          name = "recipe";
         };
         packageRequires = [ flymake-easy ];
         meta = {
@@ -26392,8 +32981,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    flymake-rust = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }:
-    melpaBuild {
+    flymake-rust = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , flymake-easy
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "flymake-rust";
         version = "20170729.1439";
         src = fetchFromGitHub {
@@ -26402,10 +32995,10 @@
           rev = "2f42d1f2dad73ec9de460eda6176e3ab25c446f0";
           sha256 = "02fgkv9hxwrv8n5h6izb5jyjcpazlf86pjjj4zkv1ycpa6gyzzwn";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/flymake-rust";
           sha256 = "0fgpkz1d4y2ywizwwrhqdqncdmhdnbgf3mcv3hjpa82x44yb7j32";
-          name = "flymake-rust";
+          name = "recipe";
         };
         packageRequires = [ flymake-easy ];
         meta = {
@@ -26413,8 +33006,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    flymake-sass = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }:
-    melpaBuild {
+    flymake-sass = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , flymake-easy
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "flymake-sass";
         version = "20170722.1846";
         src = fetchFromGitHub {
@@ -26423,10 +33020,10 @@
           rev = "2de28148e92deb93bff3d55fe14e7c67ac476056";
           sha256 = "05v83l05knqv2inharmhjvzmjskjlany7dnwp5dz44bvy0jhnm39";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/flymake-sass";
           sha256 = "0sz6n5r9pdphgvvaljg9zdwj3dqayaxzxmb4s8x4b05c8yx3ba0d";
-          name = "flymake-sass";
+          name = "recipe";
         };
         packageRequires = [ flymake-easy ];
         meta = {
@@ -26434,8 +33031,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    flymake-shell = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }:
-    melpaBuild {
+    flymake-shell = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , flymake-easy
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "flymake-shell";
         version = "20170722.1846";
         src = fetchFromGitHub {
@@ -26444,10 +33045,10 @@
           rev = "a16cf453056b9849cc7c912bb127fb0b08fc6dab";
           sha256 = "1ki0zk5ijfkf4blavl62b55jnjzxw2b7blaxg51arpvvbflqmmlh";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/flymake-shell";
           sha256 = "13ff4r0k29yqgx8ybxz7hh50cjsadcjb7pd0075s9xcrzia5x63i";
-          name = "flymake-shell";
+          name = "recipe";
         };
         packageRequires = [ flymake-easy ];
         meta = {
@@ -26455,8 +33056,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    flymake-solidity = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }:
-    melpaBuild {
+    flymake-solidity = callPackage ({ fetchFromGitHub
+                                    , fetchurl
+                                    , flymake-easy
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "flymake-solidity";
         version = "20170804.2344";
         src = fetchFromGitHub {
@@ -26465,10 +33070,10 @@
           rev = "48bfe9525f764d8a68cc0270905dbf45bfd00bb8";
           sha256 = "0v8sf5m0mygqahjyadxgffdf7p59wb0qnghyxajhc69sbg58hnnd";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3b13f57b77f6648336a049a8dda37757d4dafd90/recipes/flymake-solidity";
           sha256 = "10d1g14y3l670lqgfdsnyxanzcjs2jpgnliih56n1xhcpyz551l3";
-          name = "flymake-solidity";
+          name = "recipe";
         };
         packageRequires = [ flymake-easy ];
         meta = {
@@ -26476,8 +33081,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    flymake-vala = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }:
-    melpaBuild {
+    flymake-vala = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , flymake-easy
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "flymake-vala";
         version = "20150325.2231";
         src = fetchFromGitHub {
@@ -26486,10 +33095,10 @@
           rev = "c3674f461fc84fb0300cd3a562fb903a59782745";
           sha256 = "0qpr0frcn3w0f6yz8vgavwbxvn6wb0qkfk653v4cfy57dvslr4wf";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/flymake-vala";
           sha256 = "1fs4alyf3dckdf1pm6vgh4wjpl22wrlhfx9nv072l0dg48zgyw16";
-          name = "flymake-vala";
+          name = "recipe";
         };
         packageRequires = [ flymake-easy ];
         meta = {
@@ -26497,20 +33106,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    flymake-yaml = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }:
-    melpaBuild {
+    flymake-yaml = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , flymake-easy
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "flymake-yaml";
         version = "20130423.848";
         src = fetchFromGitHub {
           owner = "yasuyk";
           repo = "flymake-yaml";
-          rev = "24cb5b744a1796e554e6dbfc6eeb237d06a00b10";
-          sha256 = "0mdam39a85csi9b90wak9j3zkd25lj6x54affwkg3fym8yphmplm";
+          rev = "0dd11eed29fe4054ff5b4e06e2c39b4d925d6aae";
+          sha256 = "1z6x4hkawjpch73lz2g4wcab1pbhg43wp8pmfcnnljy6jp3bmy2b";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/888bcbcb24866abd990abd5b467461a1e1fc13fa/recipes/flymake-yaml";
           sha256 = "17wghm797np4hlidf3wwb47w4klwc6qyk6ry1z05psl3nykws1g7";
-          name = "flymake-yaml";
+          name = "recipe";
         };
         packageRequires = [ flymake-easy ];
         meta = {
@@ -26518,8 +33131,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    flymd = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    flymd = callPackage ({ cl-lib ? null
+                         , fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "flymd";
         version = "20160617.514";
         src = fetchFromGitHub {
@@ -26528,10 +33145,10 @@
           rev = "84d5a68bcfed4a295952c33ffcd11e880978d9d7";
           sha256 = "0j2mmr9f0d3zkhb92zc820iw4vkz958rm3ca7l9k3gx37cc4sn2l";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/07e4121f4cfaf4c33828f84b6b06f9cf2b64a0a2/recipes/flymd";
           sha256 = "16wq34xv7hswbxw5w9wnnsw2mhc9qzhmaa6aydhh32blcszhp4rk";
-          name = "flymd";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -26539,8 +33156,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    flyparens = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    flyparens = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "flyparens";
         version = "20140723.1146";
         src = fetchFromGitHub {
@@ -26549,10 +33169,10 @@
           rev = "af9b8cfd647d0e5f97684d613dc2eea7cfc19398";
           sha256 = "07hy1kyw4cbxydmhp4scsy3dcbk2s50rmdp8rch1vbcjk5lj4mvb";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8c4565ae5b84eb8733cb7fd28cf6a087fd1fedab/recipes/flyparens";
           sha256 = "1mvbfq062qj8vmgzk6rymg3idlfc1makfp1scmjvpw98h30j2a0a";
-          name = "flyparens";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -26560,20 +33180,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    flyspell-correct = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    flyspell-correct = callPackage ({ fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "flyspell-correct";
-        version = "20171205.940";
+        version = "20180427.1135";
         src = fetchFromGitHub {
           owner = "d12frosted";
           repo = "flyspell-correct";
-          rev = "6a3392859531c36091a656fedcaebc0f995dbca5";
-          sha256 = "138y5zmqwrac0r32z14adz8gs047wlqikn4bzkyl0blnlr1fkhnf";
+          rev = "e47b83e5efb524dfab5a6f92304b319fa6376ae0";
+          sha256 = "1w1idyryxq496i1plx8xjyfidakyncx3sa9j3ik7x148ywaf8kwm";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fa06fbe3bc40ae5e3f6d10dee93a9d49e9288ba5/recipes/flyspell-correct";
           sha256 = "0d2205h234na9s942s83yvkq89l9w9jnl5yfrxkkdiq8pw0dvymd";
-          name = "flyspell-correct";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -26581,20 +33204,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    flyspell-correct-helm = callPackage ({ fetchFromGitHub, fetchurl, flyspell-correct, helm, lib, melpaBuild }:
-    melpaBuild {
+    flyspell-correct-helm = callPackage ({ fetchFromGitHub
+                                         , fetchurl
+                                         , flyspell-correct
+                                         , helm
+                                         , lib
+                                         , melpaBuild }:
+      melpaBuild {
         pname = "flyspell-correct-helm";
-        version = "20161031.1134";
+        version = "20180427.1135";
         src = fetchFromGitHub {
           owner = "d12frosted";
           repo = "flyspell-correct";
-          rev = "6a3392859531c36091a656fedcaebc0f995dbca5";
-          sha256 = "138y5zmqwrac0r32z14adz8gs047wlqikn4bzkyl0blnlr1fkhnf";
+          rev = "e47b83e5efb524dfab5a6f92304b319fa6376ae0";
+          sha256 = "1w1idyryxq496i1plx8xjyfidakyncx3sa9j3ik7x148ywaf8kwm";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7b9302d8f804c77eb81fee7ed27f13cb1176f6/recipes/flyspell-correct-helm";
           sha256 = "18s2bzszy6x31avqg7j2lsll2cf4asb8njwhmx4mm215agack976";
-          name = "flyspell-correct-helm";
+          name = "recipe";
         };
         packageRequires = [ flyspell-correct helm ];
         meta = {
@@ -26602,20 +33230,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    flyspell-correct-ivy = callPackage ({ fetchFromGitHub, fetchurl, flyspell-correct, ivy, lib, melpaBuild }:
-    melpaBuild {
+    flyspell-correct-ivy = callPackage ({ fetchFromGitHub
+                                        , fetchurl
+                                        , flyspell-correct
+                                        , ivy
+                                        , lib
+                                        , melpaBuild }:
+      melpaBuild {
         pname = "flyspell-correct-ivy";
-        version = "20161031.1134";
+        version = "20180427.1135";
         src = fetchFromGitHub {
           owner = "d12frosted";
           repo = "flyspell-correct";
-          rev = "6a3392859531c36091a656fedcaebc0f995dbca5";
-          sha256 = "138y5zmqwrac0r32z14adz8gs047wlqikn4bzkyl0blnlr1fkhnf";
+          rev = "e47b83e5efb524dfab5a6f92304b319fa6376ae0";
+          sha256 = "1w1idyryxq496i1plx8xjyfidakyncx3sa9j3ik7x148ywaf8kwm";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7b9302d8f804c77eb81fee7ed27f13cb1176f6/recipes/flyspell-correct-ivy";
           sha256 = "1n5iyab6bj761w6vxncyqvqzwh9k60pzq5f2n00ifrz74pqs537i";
-          name = "flyspell-correct-ivy";
+          name = "recipe";
         };
         packageRequires = [ flyspell-correct ivy ];
         meta = {
@@ -26623,20 +33256,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    flyspell-correct-popup = callPackage ({ fetchFromGitHub, fetchurl, flyspell-correct, lib, melpaBuild, popup }:
-    melpaBuild {
+    flyspell-correct-popup = callPackage ({ fetchFromGitHub
+                                          , fetchurl
+                                          , flyspell-correct
+                                          , lib
+                                          , melpaBuild
+                                          , popup }:
+      melpaBuild {
         pname = "flyspell-correct-popup";
-        version = "20161031.1134";
+        version = "20180427.1135";
         src = fetchFromGitHub {
           owner = "d12frosted";
           repo = "flyspell-correct";
-          rev = "6a3392859531c36091a656fedcaebc0f995dbca5";
-          sha256 = "138y5zmqwrac0r32z14adz8gs047wlqikn4bzkyl0blnlr1fkhnf";
+          rev = "e47b83e5efb524dfab5a6f92304b319fa6376ae0";
+          sha256 = "1w1idyryxq496i1plx8xjyfidakyncx3sa9j3ik7x148ywaf8kwm";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7b9302d8f804c77eb81fee7ed27f13cb1176f6/recipes/flyspell-correct-popup";
           sha256 = "1fr8ajwldcl58i8xm31dz1mjwbi9f4q8s58x5jrqhqha0x4p4h9l";
-          name = "flyspell-correct-popup";
+          name = "recipe";
         };
         packageRequires = [ flyspell-correct popup ];
         meta = {
@@ -26644,8 +33282,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    flyspell-lazy = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    flyspell-lazy = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "flyspell-lazy";
         version = "20180224.1306";
         src = fetchFromGitHub {
@@ -26654,10 +33295,10 @@
           rev = "3ebf68cc9eb10c972a2de8d7861cbabbbce69570";
           sha256 = "1n67y90vm041mz172gjqypw3b5za5f18sic54h7wz4a9naynwyb6";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a082c2dc0458e3007a947923f5b97e88217199e8/recipes/flyspell-lazy";
           sha256 = "0lzazrhsfh5m7n57dzx0v46d5mg87wpwwkjzf5j9gpv1mc1xfg1y";
-          name = "flyspell-lazy";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -26665,8 +33306,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    flyspell-popup = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, popup }:
-    melpaBuild {
+    flyspell-popup = callPackage ({ fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild
+                                  , popup }:
+      melpaBuild {
         pname = "flyspell-popup";
         version = "20170529.115";
         src = fetchFromGitHub {
@@ -26675,10 +33320,10 @@
           rev = "29311849bfd253b9b689bf331860b4c4d3bd4dde";
           sha256 = "0x7jilwb0fgzsr7ma59sgd0d4122cl0hwzr28vi3z5s8wdab7nc4";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/186d00724137c055b521a5f5c54acf71c4b16c32/recipes/flyspell-popup";
           sha256 = "0wp15ra1ry6xpwal6mb53ixh3f0s4nps0rdyfli7hhaiwbr9bhql";
-          name = "flyspell-popup";
+          name = "recipe";
         };
         packageRequires = [ popup ];
         meta = {
@@ -26686,8 +33331,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    fm-bookmarks = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    fm-bookmarks = callPackage ({ cl-lib ? null
+                                , emacs
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "fm-bookmarks";
         version = "20170104.916";
         src = fetchFromGitHub {
@@ -26696,10 +33346,10 @@
           rev = "11dacfd16a926bfecba96a94c6b13e162c7717f7";
           sha256 = "0is4617ivga8qrw19y7fy883fgczzdxvrl15ja1dydzj2cbn5d97";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1ca020aff7f19cc150cd6968ae7c441372e240c2/recipes/fm-bookmarks";
           sha256 = "12ami0k6rfwhrr6xgj0dls4mkk6dp0r9smwzhr4897dv0lw89bdj";
-          name = "fm-bookmarks";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -26707,20 +33357,27 @@
           license = lib.licenses.free;
         };
       }) {};
-    fn = callPackage ({ cl-lib ? null, dash, dash-functional, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    fn = callPackage ({ cl-lib ? null
+                      , dash
+                      , dash-functional
+                      , emacs
+                      , fetchFromGitHub
+                      , fetchurl
+                      , lib
+                      , melpaBuild }:
+      melpaBuild {
         pname = "fn";
         version = "20170209.1804";
         src = fetchFromGitHub {
           owner = "troyp";
           repo = "fn.el";
-          rev = "f685fd0c08ec3b1d1b9974b37e62edd78a000cb8";
-          sha256 = "1k8pwlpcvlwr4pavg85ja8hdc7rrbafqs1mhhqr5gbq8cp822sja";
+          rev = "fe65dc654d319e6fa9cef4d7eca0f8dd847b6a32";
+          sha256 = "1j2rrwizafwramlzrjcsfv8xbz72qmiaa120cb1ri8wp6nyvhys0";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6d2929604b6dd21d6cf425643927a9c216801dc1/recipes/fn";
           sha256 = "0cb98rxdb6sd0kws6bc4pa536kiyw3yk0hlfqcm3ps81hcgqjhhn";
-          name = "fn";
+          name = "recipe";
         };
         packageRequires = [ cl-lib dash dash-functional emacs ];
         meta = {
@@ -26728,8 +33385,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    focus = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    focus = callPackage ({ cl-lib ? null
+                         , emacs
+                         , fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "focus";
         version = "20171203.2103";
         src = fetchFromGitHub {
@@ -26738,10 +33400,10 @@
           rev = "045ee6175e9340f873db03445c74ff9eefa35a27";
           sha256 = "1hrx8bj4gf0dqbfxgvis62zxnkiyms6v730s55vd8711zxdl0pw4";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4e8f1217224514f9b048b7101c89e3b1a305821e/recipes/focus";
           sha256 = "0jw26j8npyl3dgsrs7ap2djxmkafn2hl6gfqvi7v76bccs4jkyv8";
-          name = "focus";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -26749,8 +33411,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    focus-autosave-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    focus-autosave-mode = callPackage ({ emacs
+                                       , fetchFromGitHub
+                                       , fetchurl
+                                       , lib
+                                       , melpaBuild }:
+      melpaBuild {
         pname = "focus-autosave-mode";
         version = "20160519.1416";
         src = fetchFromGitHub {
@@ -26759,10 +33425,10 @@
           rev = "e89ed22aa4dfc76e1b844b202aedd468ad58814a";
           sha256 = "1c1mh96kghp5d22assm9kzxlp0cy7bws9yrqwwgaw3d72cba40k3";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/focus-autosave-mode";
           sha256 = "10cd1x5b1w7apgxd2kq45lv0jlj7az4zmn2iz4iymf2r2hancrcd";
-          name = "focus-autosave-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -26770,8 +33436,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    foggy-night-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    foggy-night-theme = callPackage ({ emacs
+                                     , fetchFromGitHub
+                                     , fetchurl
+                                     , lib
+                                     , melpaBuild }:
+      melpaBuild {
         pname = "foggy-night-theme";
         version = "20160209.708";
         src = fetchFromGitHub {
@@ -26780,10 +33450,10 @@
           rev = "60a12abdac29c2d913e1cf24485d0cc083e26093";
           sha256 = "1mnak9k0hz99jq2p7gydxajzvx2vcql8yzwcm0v80a6xji2whl70";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/65b3f5959241e601fdf9469e407d153cebcbe24c/recipes/foggy-night-theme";
           sha256 = "03x3dhkk81d2zh9nflq6wd7v3khpy9046v8qhq4i9dw6davvy9j4";
-          name = "foggy-night-theme";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -26791,8 +33461,36 @@
           license = lib.licenses.free;
         };
       }) {};
-    fold-dwim-org = callPackage ({ fetchFromGitHub, fetchurl, fold-dwim, lib, melpaBuild }:
-    melpaBuild {
+    fold-dwim = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
+        pname = "fold-dwim";
+        version = "20140208.837";
+        src = fetchFromGitHub {
+          owner = "emacsattic";
+          repo = "fold-dwim";
+          rev = "c46f4bb2ce91b4e307136320e72c28dd50b6cd8b";
+          sha256 = "1yz1wis31asw6xa5maliyd1ck2q02xnnh7dc6swgj9cb4wi7k6i1";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/62064e272a658d998b1ccf13dc3c2e3e454acade/recipes/fold-dwim";
+          sha256 = "1k5186s69qahwbzvwq70af3bkcglls9a82c5jw5mdw3ic8k631sh";
+          name = "recipe";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/fold-dwim";
+          license = lib.licenses.free;
+        };
+      }) {};
+    fold-dwim-org = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , fold-dwim
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "fold-dwim-org";
         version = "20131203.551";
         src = fetchFromGitHub {
@@ -26801,10 +33499,10 @@
           rev = "c09bb2b46d65afbd1d0febc6fded7495be7a3037";
           sha256 = "14jvbkahwvv4wb0s9vp8gqmlpv1d4269j5rsjxn79q5pawjzslxw";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/97d22d9feaf521ce576b80d2933ecbc166c1dbe7/recipes/fold-dwim-org";
           sha256 = "0812p351rzvqcfn00k92nfhlg3y772y4z4b9f0xqnpa935y6harn";
-          name = "fold-dwim-org";
+          name = "recipe";
         };
         packageRequires = [ fold-dwim ];
         meta = {
@@ -26812,8 +33510,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    fold-this = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    fold-this = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "fold-this";
         version = "20180224.40";
         src = fetchFromGitHub {
@@ -26822,10 +33523,10 @@
           rev = "4fb509a4176e950d083a5321ad62742f2e9bcb7b";
           sha256 = "1csazxx6wnnriklbrdqxmf7nc67gqb7c5zppr797bk4j4calskgf";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9853fcb99bd8717c77fa2b3bafb6e85d0d5d491c/recipes/fold-this";
           sha256 = "1iri4a6ixw3q7qr803cj2ik7rvmww1b6ybj5q2pvkf1v25r8655d";
-          name = "fold-this";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -26833,8 +33534,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    folding = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    folding = callPackage ({ fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "folding";
         version = "20170925.838";
         src = fetchFromGitHub {
@@ -26843,10 +33547,10 @@
           rev = "3bf134fd1ecfa8767ab7020c25281ea5ce9968a2";
           sha256 = "0kcm4k71syz778cbwqf68a63k4vmhygaib3ylwxbm5dq1dmr7iry";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1912296b7879019bea5ba8353d511496e3a9ca2d/recipes/folding";
           sha256 = "0rb4f4llc4z502znmmc0hfi7n07lp01msx4y1iyqijvqzlq2i93y";
-          name = "folding";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -26854,8 +33558,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    font-lock-profiler = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    font-lock-profiler = callPackage ({ emacs
+                                      , fetchFromGitHub
+                                      , fetchurl
+                                      , lib
+                                      , melpaBuild }:
+      melpaBuild {
         pname = "font-lock-profiler";
         version = "20170208.1208";
         src = fetchFromGitHub {
@@ -26864,10 +33572,10 @@
           rev = "6e096458416888a4f63cca0d6bc5965a052753c8";
           sha256 = "186fvyfbakz54fr8j1l7cijvaklw96m1hfbjyw7nha08zc2m1hw5";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b372892a29376bc3f0101ea5865efead41e1df26/recipes/font-lock-profiler";
           sha256 = "089r74jgi5gwjk9w1bc600vkj0p5ac84rgcl7aqcpqfbh9ylwcp9";
-          name = "font-lock-profiler";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -26875,8 +33583,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    font-lock-studio = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    font-lock-studio = callPackage ({ emacs
+                                    , fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "font-lock-studio";
         version = "20170127.1251";
         src = fetchFromGitHub {
@@ -26885,10 +33597,10 @@
           rev = "12c35967b31233e06946c70627aa3152dacfe261";
           sha256 = "0q0s6f5vi3sfifj7vq2nnsmgyyivp1sd3idk32858md5ri71qif0";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f8046fef1ac09cac1113dd5d0a6e1bf8e0c77bb1/recipes/font-lock-studio";
           sha256 = "0swwbfaypc78cg4ak24cc92kgxmr1x9vcpaw3jz4zgpm2wzbgmrq";
-          name = "font-lock-studio";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -26896,8 +33608,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    font-utils = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, pcache, persistent-soft }:
-    melpaBuild {
+    font-utils = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild
+                              , pcache
+                              , persistent-soft }:
+      melpaBuild {
         pname = "font-utils";
         version = "20150806.1051";
         src = fetchFromGitHub {
@@ -26906,10 +33623,10 @@
           rev = "9192d3f8ee6a4e75f34c3fed10378674cc2b11d3";
           sha256 = "1k90w8v5rpswqb8fn1cc8sq5w12gf4sn6say5dhvqd63512b0055";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2af0a1644116e89c5a705ffe0885ffe3ee874eaf/recipes/font-utils";
           sha256 = "0k33jdchjkj7j211a23kfp5axg74cfsrrq4axsb1pfp124swh2n5";
-          name = "font-utils";
+          name = "recipe";
         };
         packageRequires = [ pcache persistent-soft ];
         meta = {
@@ -26917,8 +33634,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    fontawesome = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    fontawesome = callPackage ({ emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "fontawesome";
         version = "20170305.556";
         src = fetchFromGitHub {
@@ -26927,10 +33648,10 @@
           rev = "a743f80bfd53767ca9ee32da34c5ca032172a480";
           sha256 = "1mkyd2bbyd9avw2qaidkzkpv8i7lfiv9189bj49dxklg92823sip";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/93b92f10802ceffc353db3d220dccfd47ea7fa41/recipes/fontawesome";
           sha256 = "07hn4s929xklc74j8s6pd61rxmxw3911dq47wql77vb5pijv6dr3";
-          name = "fontawesome";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -26938,20 +33659,49 @@
           license = lib.licenses.free;
         };
       }) {};
-    forecast = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    fontify-face = callPackage ({ emacs
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
+        pname = "fontify-face";
+        version = "20180420.924";
+        src = fetchFromGitHub {
+          owner = "Fuco1";
+          repo = "fontify-face";
+          rev = "fc3325c98427523d86f0b411e0515cec51ac3d8a";
+          sha256 = "1zfld9a17xhisfwhmfxvx1x63ksl6jg5g99kbivj4nq70sf26dpw";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/72bd6750dd5a7d9ed6e408e690f76c260ffd7d9e/recipes/fontify-face";
+          sha256 = "1w7xlkladqkbh7gpnkbi53a7k9p5wzma4y9jgwbc58hng9ggm1k0";
+          name = "recipe";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/fontify-face";
+          license = lib.licenses.free;
+        };
+      }) {};
+    forecast = callPackage ({ emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "forecast";
-        version = "20180106.920";
+        version = "20180429.1515";
         src = fetchFromGitHub {
           owner = "cadadr";
           repo = "elisp";
-          rev = "35424f7360f5110833b7a9f4f53907b9e222be85";
-          sha256 = "1xi56c8f2wcmldr76ylrcqsy0wf75pv74b0455ki84fq1fk4n08s";
+          rev = "ffe03506694c94de0444995f973a925deccc400a";
+          sha256 = "02wcvka96zdlq3myfar7dqywfil2b77bc6ydmgcphwn3as3kl08r";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a7ea18a56370348715dec91f75adc162c800dd10/recipes/forecast";
           sha256 = "0zng8xdficpfccq484pghzg8yylihcy8aq0vpxd1w6l40m2qf6zn";
-          name = "forecast";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -26959,8 +33709,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    foreign-regexp = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    foreign-regexp = callPackage ({ fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "foreign-regexp";
         version = "20180224.321";
         src = fetchFromGitHub {
@@ -26969,10 +33722,10 @@
           rev = "2ec5c44f27c2396ee487aa0ed77ae47d143fa5aa";
           sha256 = "0zww0q8x99sfwzf05pk7blsi3v8xiw4xgmlwnv1qlf2qxjkz1xhb";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d05514013948a520cf0dcaf1dc2ef2300dd55e98/recipes/foreign-regexp";
           sha256 = "189cq8n759f28nx10fn3w4qbq7q49bb788kp9l70pj38jgnjn7n7";
-          name = "foreign-regexp";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -26980,8 +33733,16 @@
           license = lib.licenses.free;
         };
       }) {};
-    foreman-mode = callPackage ({ dash, dash-functional, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    foreman-mode = callPackage ({ dash
+                                , dash-functional
+                                , emacs
+                                , f
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild
+                                , s }:
+      melpaBuild {
         pname = "foreman-mode";
         version = "20170725.722";
         src = fetchFromGitHub {
@@ -26990,10 +33751,10 @@
           rev = "22b3bb13134b617870ed1e888af739f4818be929";
           sha256 = "01qanhif24czcmhpdfkcjs019ss4r79f7y2wfbzmj6w4z7g3rikk";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/edeeb2b52ac70f8bdad38d3af62a7e434853c504/recipes/foreman-mode";
           sha256 = "0p3kwbld05wf3dwcv0k6ynz727fiy0ik2srx4js9wvagy57x98kv";
-          name = "foreman-mode";
+          name = "recipe";
         };
         packageRequires = [ dash dash-functional emacs f s ];
         meta = {
@@ -27001,8 +33762,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    forest-blue-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    forest-blue-theme = callPackage ({ emacs
+                                     , fetchFromGitHub
+                                     , fetchurl
+                                     , lib
+                                     , melpaBuild }:
+      melpaBuild {
         pname = "forest-blue-theme";
         version = "20160627.142";
         src = fetchFromGitHub {
@@ -27011,10 +33776,10 @@
           rev = "58096ce1a25615d2bae806c3775bae3e2775019d";
           sha256 = "1qm74cfnc13wgv0c3657nd3xbgn492r24m5m2i0ipnpq49cddccf";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/49b8686c31f863dde58d56cddf0baa7757a0c453/recipes/forest-blue-theme";
           sha256 = "1pcpwil883k4n5na7jpq7h8a8gw6mily1cj5n5rf25lqqnsz6fxa";
-          name = "forest-blue-theme";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -27022,8 +33787,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    form-feed = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    form-feed = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "form-feed";
         version = "20160102.1453";
         src = fetchFromGitHub {
@@ -27032,10 +33800,10 @@
           rev = "799ca3e72b20a59a755a094b8cead57f654f3170";
           sha256 = "0nj056x87gcpdqkgx3li5syp6wbj58a1mw2aqa48zflbqwyvs03i";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/468503d8103766e8196e977325e3bcb696219f6b/recipes/form-feed";
           sha256 = "1abwjkzi3irw0jwpv3f584zc72my9n8iq8zp5s0354xk6iwrl1rh";
-          name = "form-feed";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -27043,8 +33811,36 @@
           license = lib.licenses.free;
         };
       }) {};
-    format-sql = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    format-all = callPackage ({ cl-lib ? null
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
+        pname = "format-all";
+        version = "20180710.329";
+        src = fetchFromGitHub {
+          owner = "lassik";
+          repo = "emacs-format-all-the-code";
+          rev = "f2b76915a50b25f0bdeb5f644fe842a8684943e2";
+          sha256 = "099yp2p4j4ig5zhpxlir5khshp846smnv3cbmcqcjz84zsxxnjlg";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/f53143ebd42ef5be793b86d50b23f0a57617d6cc/recipes/format-all";
+          sha256 = "1kmnv8ypxvgm3p79cc1wk8032fh7bl1pripys180vw89r2748qs9";
+          name = "recipe";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "https://melpa.org/#/format-all";
+          license = lib.licenses.free;
+        };
+      }) {};
+    format-sql = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "format-sql";
         version = "20150422.633";
         src = fetchFromGitHub {
@@ -27053,10 +33849,10 @@
           rev = "97f475c245cd6c81a72a265678e2087cee66ac7b";
           sha256 = "0mikksamljps1czacgqavlnzzhgs8s3f8q4jza6v3csf8kgp5zd0";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/085c03104aa5a809a112525547eec51100b6fb09/recipes/format-sql";
           sha256 = "0684xqzs933vj9d3n3lv7afk4gii41kaqykbb05cribaswapsanj";
-          name = "format-sql";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -27064,8 +33860,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    forth-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    forth-mode = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "forth-mode";
         version = "20170527.1230";
         src = fetchFromGitHub {
@@ -27074,10 +33873,10 @@
           rev = "522256d98d1a909983bcfd3ae20c65226d5929b6";
           sha256 = "110ycl8zkimy2818rhp3hk3mn2y25m695shdsy6dwxnrv90agss6";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e46832079ee34c655835f06bf565ad5a5ab48ebd/recipes/forth-mode";
           sha256 = "0j60abi5qyy94f4as90zhmkb12jdirysdbq4ajs5h91vi6gb1g3i";
-          name = "forth-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -27085,8 +33884,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    fortpy = callPackage ({ auto-complete, epc, fetchFromGitHub, fetchurl, lib, melpaBuild, pos-tip, python-environment }:
-    melpaBuild {
+    fortpy = callPackage ({ auto-complete
+                          , epc
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild
+                          , pos-tip
+                          , python-environment }:
+      melpaBuild {
         pname = "fortpy";
         version = "20150715.1332";
         src = fetchFromGitHub {
@@ -27095,10 +33901,10 @@
           rev = "c614517e9396ef7a78be3b8786fbf303879cf43b";
           sha256 = "1nqx2igxmwswjcrnzdjpx5qcjr60zjy3q9cadq5disms17wdcr6y";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/73b277e19f5f9f6605f3e9b7afac95152dac0599/recipes/fortpy";
           sha256 = "1nn5vx1rspfsijwhilnjhiy0mjw154ds3lwxvkpwxpchygirlyxj";
-          name = "fortpy";
+          name = "recipe";
         };
         packageRequires = [ auto-complete epc pos-tip python-environment ];
         meta = {
@@ -27106,8 +33912,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    fortune-cookie = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    fortune-cookie = callPackage ({ fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "fortune-cookie";
         version = "20170407.1517";
         src = fetchFromGitHub {
@@ -27116,10 +33925,10 @@
           rev = "bad99a2cd090f6646c7ee1125b95dd98744939c6";
           sha256 = "1kiflisiabc39lxi5hcazfvcwrpasl01lqsi2sri6pyrcrjyh8mf";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ab0d56626c9bf847c693b4d9ddb08acee636054f/recipes/fortune-cookie";
           sha256 = "0xg0zk7hnyhnbhqpxnzrgqs5yz0sy6wb0n9982qc0pa6jqnl9z78";
-          name = "fortune-cookie";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -27127,20 +33936,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    fountain-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    fountain-mode = callPackage ({ emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "fountain-mode";
-        version = "20180410.732";
+        version = "20180715.145";
         src = fetchFromGitHub {
           owner = "rnkn";
           repo = "fountain-mode";
-          rev = "1efbdbba6cb52c8bc2e70ca2636935d2b1ea8d98";
-          sha256 = "16hlywji8ny8b7dc6wq9vfxp6b1fbm1m4f3mzxgngs3gjv6vic82";
+          rev = "3f253598f2eb6c5eec71af967978a3ecf890240d";
+          sha256 = "1m3fq5mg87v48y0v9a5mlxjs49yqxkb718r6ympbihzknjh2a0qq";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/913386ac8d5049d37154da3ab32bde408a226511/recipes/fountain-mode";
           sha256 = "1i55gcjy8ycr1ww2fh1a2j0bchx1bsfs0zd6v4cv5zdgy7vw6840";
-          name = "fountain-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -27148,8 +33961,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    fraktur-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    fraktur-mode = callPackage ({ cl-lib ? null
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "fraktur-mode";
         version = "20160814.1927";
         src = fetchFromGitHub {
@@ -27158,10 +33975,10 @@
           rev = "514baf5546aed12a0d9fa0fe66e87cdcc7843b08";
           sha256 = "169d9j7jk3li96fkn2sr257835flkcpml24l4bmzp8j3q57a7wxw";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/fraktur-mode";
           sha256 = "0hy2cncbgpp7ysp7qwfpj0r075rxrc77bmc70bw7hf8m1xiw124k";
-          name = "fraktur-mode";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -27169,20 +33986,50 @@
           license = lib.licenses.free;
         };
       }) {};
-    frame-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    frame-local = callPackage ({ emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
+        pname = "frame-local";
+        version = "20180330.240";
+        src = fetchFromGitHub {
+          owner = "sebastiencs";
+          repo = "frame-local";
+          rev = "51c0889602626e2dcc6f1c1a812b058bc96df03c";
+          sha256 = "1ccq4iw1d4hy3irimci42knh66ix0vfzd3nm2wh63ygiaf1rjakw";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/556179857e2b46f5a48b45e1b71cd460ffd9f7d7/recipes/frame-local";
+          sha256 = "1lz4xmz67l99xbyg9gvgzl06yqh61xhr29vfhv68kq5pg5m881vs";
+          name = "recipe";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/frame-local";
+          license = lib.licenses.free;
+        };
+      }) {};
+    frame-mode = callPackage ({ emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild
+                              , s }:
+      melpaBuild {
         pname = "frame-mode";
         version = "20170419.1427";
         src = fetchFromGitHub {
           owner = "IvanMalison";
           repo = "frame-mode";
-          rev = "fcdbafbda45758cd60ab3acb492fbbd692987a58";
-          sha256 = "1sdxbjxx1lk2j220794af2qz9z068bmx55drm8h0b8kih0037ydn";
+          rev = "c0feebf8eab91ac0646a4d30be946e551bb5267f";
+          sha256 = "19a7vxr1qhxr1yh9mvlhrbnpmqk9qmbmb4gwxrwdsqrac3fs3lr7";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1e83da89eeee834cc14c0b128d55ef3634f76fd0/recipes/frame-mode";
           sha256 = "0ch58x07fnsx3v3r9cvcmqrqws121m8achjilhqk988hkg7y47c8";
-          name = "frame-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs s ];
         meta = {
@@ -27190,8 +34037,39 @@
           license = lib.licenses.free;
         };
       }) {};
-    frame-tag = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    frame-purpose = callPackage ({ dash
+                                 , dash-functional
+                                 , emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
+        pname = "frame-purpose";
+        version = "20180623.1757";
+        src = fetchFromGitHub {
+          owner = "alphapapa";
+          repo = "frame-purpose.el";
+          rev = "6cff3bff74f9cf1dc31bbc5e1f9a513a5f55def6";
+          sha256 = "08pmmzjdbvp09rxn3d332101qmg6c4xx2y6dwzczii70ac7m5v9f";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/033bd36a2419f4521944ccbfe8ce1eb56af20472/recipes/frame-purpose";
+          sha256 = "0mvzryfakz5g8smsg4ciaa0bs0jp692rnjbahp9vl62ml5dp62fz";
+          name = "recipe";
+        };
+        packageRequires = [ dash dash-functional emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/frame-purpose";
+          license = lib.licenses.free;
+        };
+      }) {};
+    frame-tag = callPackage ({ cl-lib ? null
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "frame-tag";
         version = "20170110.1606";
         src = fetchFromGitHub {
@@ -27200,10 +34078,10 @@
           rev = "73d6163568c7d32952175e663318b872f995a4e5";
           sha256 = "1ks8qw1vq30mjp7bpgrk3f11jhm9viibiap6zjk8r5rykjzl1ifv";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e69899b53c158903b9b147754021acf1a6136eda/recipes/frame-tag";
           sha256 = "1n13xcc3ny9j9h1h4vslpjl6k9mqksr73kgmqrmkq301p8zps94q";
-          name = "frame-tag";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -27211,20 +34089,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    frames-only-mode = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    frames-only-mode = callPackage ({ dash
+                                    , emacs
+                                    , fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild
+                                    , s }:
+      melpaBuild {
         pname = "frames-only-mode";
         version = "20180114.1048";
         src = fetchFromGitHub {
           owner = "davidshepherd7";
           repo = "frames-only-mode";
-          rev = "0f42139a41e97bb0a2ebc320d41cec071c034ca0";
-          sha256 = "0bfgqlfdjmxz8fq34ad9m6avja5z5pvw9cjxlfxd3k716ga1nc06";
+          rev = "9ebd895574bb0b3e4ef111d522b8039e274e8afc";
+          sha256 = "03fis931cb5k7a0jjjgkzmq30g43543kinr8hw6z8xkaivh2yixy";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1e628416ad9420b3ac5bbfacf930a86d98958ac8/recipes/frames-only-mode";
           sha256 = "17p04l16ghz9kk096xk37yjpi4rmla86gp7c8ysjf6q6nyh0608h";
-          name = "frames-only-mode";
+          name = "recipe";
         };
         packageRequires = [ dash emacs s ];
         meta = {
@@ -27232,20 +34116,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    frameshot = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    frameshot = callPackage ({ emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "frameshot";
         version = "20180228.408";
         src = fetchFromGitHub {
           owner = "tarsius";
           repo = "frameshot";
-          rev = "4e7b252e9fd9227de8b25f384af2c855ec45279a";
-          sha256 = "020irzkqr7gs99xsvdd0haja0jvw46dk40xi7ab0m3cq7957srjh";
+          rev = "65994602fdf3d8881f0cabffebbce6c0e493e3c8";
+          sha256 = "0crvvacpajlhdida54gvv4y11xx78qscr6nznx0bhdb12sj3n45q";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e5cfaa4b5fda97054d45691fad9d79b559f2df14/recipes/frameshot";
           sha256 = "1z5f988m9s25miyxbhaxk6m4af9afvblb2p5mdidva04szjklr70";
-          name = "frameshot";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -27253,8 +34141,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    framesize = callPackage ({ fetchFromGitHub, fetchurl, key-chord, lib, melpaBuild }:
-    melpaBuild {
+    framesize = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , key-chord
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "framesize";
         version = "20131017.1432";
         src = fetchFromGitHub {
@@ -27263,10 +34155,10 @@
           rev = "f2dbf5d2513b2bc45f2085370a55c1754b6025da";
           sha256 = "11h9xw6jnw7dacyv1jch2a77xp7hfb93690m7hhazy6l87xmm4dk";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c53062af16b26b6f64bd63fa62d7e9db264768f3/recipes/framesize";
           sha256 = "1rwiwx3n7gkpfihbf6ndl1lxza4zi2rlj5av6lfp5qypbw9wddkf";
-          name = "framesize";
+          name = "recipe";
         };
         packageRequires = [ key-chord ];
         meta = {
@@ -27274,8 +34166,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    frecency = callPackage ({ a, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    frecency = callPackage ({ a
+                            , dash
+                            , emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "frecency";
         version = "20170908.2331";
         src = fetchFromGitHub {
@@ -27284,10 +34182,10 @@
           rev = "132130088ef5695cffed6fcacfa219cb0c389026";
           sha256 = "17s34gaq6jvwr6f4l500xyhv33ykwxiwzsq2rrasgs7l301wqsw0";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d7a6e855d01e0b1c9a23c006af67c487719c50bd/recipes/frecency";
           sha256 = "033zhzwvh23igfqxbiy68cq6i1wflna19pbg81r0hh9kcfg2afpa";
-          name = "frecency";
+          name = "recipe";
         };
         packageRequires = [ a dash emacs ];
         meta = {
@@ -27295,8 +34193,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    free-keys = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    free-keys = callPackage ({ cl-lib ? null
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "free-keys";
         version = "20160726.1350";
         src = fetchFromGitHub {
@@ -27305,10 +34207,10 @@
           rev = "edfd69dc369b2647447b7c28c7c1163b1ddf45b4";
           sha256 = "0xgifa7s9n882f9ymyyz9gc11xfbj3vfpnxiq1fqfm5hmwx9pwbc";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/55067e899ba618d4394ad9657322c92a667a0774/recipes/free-keys";
           sha256 = "0j9cfgy2nkbska4lm5z32p804i9n8pdgn50bs5zzk1ilwd5vbalj";
-          name = "free-keys";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -27316,8 +34218,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    fringe-current-line = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    fringe-current-line = callPackage ({ fetchFromGitHub
+                                       , fetchurl
+                                       , lib
+                                       , melpaBuild }:
+      melpaBuild {
         pname = "fringe-current-line";
         version = "20140110.2011";
         src = fetchFromGitHub {
@@ -27326,10 +34231,10 @@
           rev = "0ef000bac76abae30601222e6f06c7d133ab4942";
           sha256 = "0zwlnzbi91hkfz1jgj9s9pxwi21s21cwp6psdm687wj2a3wy4231";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/eaaa6f7f2f753a7c8489415ae406c4169eda9fa8/recipes/fringe-current-line";
           sha256 = "125yn0wbrrxrmdn7qfxj0f4538sb3xnqb3r2inz3gpblc1vxnqb8";
-          name = "fringe-current-line";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -27337,20 +34242,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    fringe-helper = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    fringe-helper = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "fringe-helper";
         version = "20140620.1409";
         src = fetchFromGitHub {
           owner = "nschum";
           repo = "fringe-helper.el";
-          rev = "ef4a9c023bae18ec1ddd7265f1f2d6d2e775efdd";
-          sha256 = "0ra9rc53l1gvkqank8apasl3r7wz2yfjrcvmfk3wpxhh24ppxv9d";
+          rev = "9bc3d3e82c9cc3937aa090248dc4dd2e289fc55c";
+          sha256 = "0vqpgvjxh9dqc6is2ai1nrnwhv3fwx5b2nyhq5w3qr056hi995av";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/fringe-helper";
           sha256 = "1i5wra4j0rvrsl9vbg7fzga8cadw43ka2rwdj1m11wq8m3cs8g7m";
-          name = "fringe-helper";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -27358,8 +34266,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    fsbot-data-browser = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    fsbot-data-browser = callPackage ({ fetchFromGitHub
+                                      , fetchurl
+                                      , lib
+                                      , melpaBuild }:
+      melpaBuild {
         pname = "fsbot-data-browser";
         version = "20160921.833";
         src = fetchFromGitHub {
@@ -27368,10 +34279,10 @@
           rev = "6bca4f7de63e31839d2542f6c678b79931dec344";
           sha256 = "0lvpgfp89sz6f6rn576g1g88s0q3ibj5ghydjwfcg9w6h7vx5b5s";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/37a0901b98e1c66be6906234e6d6520a6e940e97/recipes/fsbot-data-browser";
           sha256 = "0jijvl07jk200fs01ln4dmw5nx9jg3f9b7gjaknyd18vyvbwr3s5";
-          name = "fsbot-data-browser";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -27379,20 +34290,30 @@
           license = lib.licenses.free;
         };
       }) {};
-    fsharp-mode = callPackage ({ company, company-quickhelp, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, popup, pos-tip, s }:
-    melpaBuild {
+    fsharp-mode = callPackage ({ company
+                               , company-quickhelp
+                               , dash
+                               , fetchFromGitHub
+                               , fetchurl
+                               , flycheck
+                               , lib
+                               , melpaBuild
+                               , popup
+                               , pos-tip
+                               , s }:
+      melpaBuild {
         pname = "fsharp-mode";
-        version = "20171021.431";
+        version = "20180518.1120";
         src = fetchFromGitHub {
           owner = "rneatherway";
           repo = "emacs-fsharp-mode-bin";
-          rev = "5504550605354146842c8f5c34482ece778b7b31";
-          sha256 = "0hjqgyjch8fdz54akcpw5kmx2z1yvck6k8qyc0mzzmb54iiayf5a";
+          rev = "68d2121a7317d90fe3794c9295d117f4aebd1438";
+          sha256 = "0mymvik20slbgsasjpn6nkqcb4z6z4mvd1sf1xalv0qjk24vrlmk";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/dc45611e2b629d8bc5f74555368f964420b79541/recipes/fsharp-mode";
           sha256 = "07pkj30cawh0diqhrp3jkshgsd0i3y34rdnjb4af8mr7dsbsxb6z";
-          name = "fsharp-mode";
+          name = "recipe";
         };
         packageRequires = [
           company
@@ -27408,20 +34329,30 @@
           license = lib.licenses.free;
         };
       }) {};
-    fstar-mode = callPackage ({ company, company-quickhelp, dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, quick-peek, yasnippet }:
-    melpaBuild {
+    fstar-mode = callPackage ({ company
+                              , company-quickhelp
+                              , dash
+                              , emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , flycheck
+                              , lib
+                              , melpaBuild
+                              , quick-peek
+                              , yasnippet }:
+      melpaBuild {
         pname = "fstar-mode";
-        version = "20180324.2211";
+        version = "20180713.1329";
         src = fetchFromGitHub {
           owner = "FStarLang";
           repo = "fstar-mode.el";
-          rev = "9b948a4ff5d54b5f72c7b004146121ab7d1b9018";
-          sha256 = "1r6dgi029hybsbkjbgb2bhsr4ashpfcx3x3sp3gb1ypg2nlck463";
+          rev = "a42763cdd81d6520651dfaad7a7e8c7388bad54c";
+          sha256 = "10nbzm22p9pgsh6zgc9fjy3v1i5vw8877g8f4x3fi8lvpv1ynwps";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c58ace42342c3d3ff5a56d86a16206f2ecb45f77/recipes/fstar-mode";
           sha256 = "1kwa6gqh91265vpp4gcady2brkizfkfjj0gnya9lar6x7rn4gj7s";
-          name = "fstar-mode";
+          name = "recipe";
         };
         packageRequires = [
           company
@@ -27437,20 +34368,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    fuel = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    fuel = callPackage ({ cl-lib ? null
+                        , emacs
+                        , fetchFromGitHub
+                        , fetchurl
+                        , lib
+                        , melpaBuild }:
+      melpaBuild {
         pname = "fuel";
         version = "20180224.1411";
         src = fetchFromGitHub {
           owner = "factor";
           repo = "factor";
-          rev = "9b2eac2942d777572e330ba5231e1ee3c0a4eea8";
-          sha256 = "1sz3n3dfrga2zgwmn7fy21vhgfw51ma8pbgr459hfq9ay96yvd94";
+          rev = "780bbd49cf82c9746ca5a3f42f4a4a27266ccee9";
+          sha256 = "1fs6200rsbnk2lagz8qj17iynaf4c1fvb6sm03i53shsbarak2c3";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1e2a0e4698d4e71ec28656594f6a83504a823490/recipes/fuel";
           sha256 = "08hzzg5dhqkl5c5lfhwcwmx8m8z3k1nxshn2wlpqf5gch8f2nj6z";
-          name = "fuel";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -27458,8 +34394,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    fuff = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, seq }:
-    melpaBuild {
+    fuff = callPackage ({ fetchFromGitHub
+                        , fetchurl
+                        , lib
+                        , melpaBuild
+                        , seq }:
+      melpaBuild {
         pname = "fuff";
         version = "20170202.703";
         src = fetchFromGitHub {
@@ -27468,10 +34408,10 @@
           rev = "278e849913df87bd8756c59382282d87474802c3";
           sha256 = "12s25c0abvghkhfbxcf77d2dc20y3xn9df7mfk8mkfwnlwdss2ga";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4d0fc6d19559a9ea1bb7fce0c26a2dd65fc71603/recipes/fuff";
           sha256 = "080a2lz6mv629c68z44qrrww080gy2iggfzajdq54rr8i23y14vf";
-          name = "fuff";
+          name = "recipe";
         };
         packageRequires = [ seq ];
         meta = {
@@ -27479,20 +34419,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    full-ack = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    full-ack = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "full-ack";
         version = "20140223.932";
         src = fetchFromGitHub {
           owner = "nschum";
           repo = "full-ack";
-          rev = "761d846e105b150f8e6d13d7a8983f0248313a45";
-          sha256 = "0bjny4ryrs788myhiaf3ir99vadf2v4swa5gkz9i36a7j6wzpgk5";
+          rev = "8345753e9569dabf6426a837f29387557e32f2af";
+          sha256 = "0x0c6cvsgzcc6336k9bz7pcjpg6s6w6cjlqbsafdqv8yx5ll59jd";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/full-ack";
           sha256 = "09ikhyhpvkcl6yl6pa4abnw6i7yfsx5jkmzypib94w7khikvb309";
-          name = "full-ack";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -27500,8 +34443,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    fullframe = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    fullframe = callPackage ({ cl-lib ? null
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "fullframe";
         version = "20170816.303";
         src = fetchFromGitHub {
@@ -27510,10 +34457,10 @@
           rev = "d6a5217f7f2a5a5edcb75140f3fa69b3a50f1cdd";
           sha256 = "0m43qnhp6ibsskpjkxc86p3lrjsjc0ndqml3lbd65s79x4x7i3fi";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/13d1dc5c39543b65c6bb4150c3690211872c00dc/recipes/fullframe";
           sha256 = "08sh8lmb6g8asv28fcb36ilcn0ka4fc6ka0pnslid0h4c32fxp2a";
-          name = "fullframe";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -27521,8 +34468,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    function-args = callPackage ({ fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
-    melpaBuild {
+    function-args = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , ivy
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "function-args";
         version = "20171031.1004";
         src = fetchFromGitHub {
@@ -27531,10 +34482,10 @@
           rev = "609b25305670fff08d5e357298e7128e4f4e3497";
           sha256 = "1xymwk42n2l7c7iaigz23i4l580qpjgq8nqhgr4mnw6invdsgg2c";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/80688d85a34b77783140ad2b8a47ef60c762b084/recipes/function-args";
           sha256 = "13yfscr993pll5yg019v9dwy71g123a166w114n2m78h0rbnzdak";
-          name = "function-args";
+          name = "recipe";
         };
         packageRequires = [ ivy ];
         meta = {
@@ -27542,8 +34493,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    fuo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    fuo = callPackage ({ emacs
+                       , fetchFromGitHub
+                       , fetchurl
+                       , lib
+                       , melpaBuild }:
+      melpaBuild {
         pname = "fuo";
         version = "20180314.948";
         src = fetchFromGitHub {
@@ -27552,10 +34507,10 @@
           rev = "5318bef9d935b53031e6312652554920def69af2";
           sha256 = "02f4kl1y277pry13hz1jscdh2nrbn3xp7zm1dmqyn8yfhn1s1yx2";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/25fb625becf7f582d2a8d53726d6f01d9ea89ecc/recipes/fuo";
           sha256 = "02mvgz2cxrdn5kp5dw0c57rl5nfavqli5yqbxczmbsih164ljdxf";
-          name = "fuo";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -27563,8 +34518,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    furl = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    furl = callPackage ({ fetchFromGitHub
+                        , fetchurl
+                        , lib
+                        , melpaBuild }:
+      melpaBuild {
         pname = "furl";
         version = "20150508.2016";
         src = fetchFromGitHub {
@@ -27573,10 +34531,10 @@
           rev = "014438271e0ef27333dfcd599cb247f12a20d870";
           sha256 = "0wrmbvx0risdjkaxqmh4li6iwvg4635cdpjvw32k2wkdsyn2dlsb";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0fda2b54a0ff0b6fc3bd6d20cfcbbf63cae5380f/recipes/furl";
           sha256 = "1z3yqx95qmvpi6vkkgcwvkmw96s24h8ssd5gc06988picw6vj76f";
-          name = "furl";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -27584,20 +34542,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    futhark-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    futhark-mode = callPackage ({ cl-lib ? null
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "futhark-mode";
-        version = "20180416.830";
+        version = "20180619.949";
         src = fetchFromGitHub {
-          owner = "HIPERFIT";
-          repo = "futhark";
-          rev = "314e43c80fc31e15741136e61f3ee5f793ba190c";
-          sha256 = "1i9rs9cb9l7hp678rf4w9r47zqy1pakyy7alfli192mm650w07l1";
+          owner = "diku-dk";
+          repo = "futhark-mode";
+          rev = "f834d03aeef2230315e541646e375e6c38a6a10c";
+          sha256 = "0ma8v56lv8bbb5159wg2nv286s5nn3jnjfy8kmrx751sw7jmzr2l";
         };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0607f01aad7e77d53595ad8db95d32acfd29b148/recipes/futhark-mode";
-          sha256 = "1k22xkg6vd60hk58zkxhmsw2gs6ikzmidvxcdglnr46m6x7r7pnq";
-          name = "futhark-mode";
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/97210774b450b7611d2bfdf36e04a425835d86b9/recipes/futhark-mode";
+          sha256 = "1sck984a8m0i9n07jnhpnin6k060756g73ix34ghzd65j5f0pvlw";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -27605,8 +34567,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    fuzzy = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    fuzzy = callPackage ({ fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "fuzzy";
         version = "20150729.2037";
         src = fetchFromGitHub {
@@ -27615,10 +34580,10 @@
           rev = "534d723ad2e06322ff8d9bd0ba4863d243f698e7";
           sha256 = "0rzp8c2164w775ggm2fs4j5dz33vqcah84ysp81majirwfql1niv";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9e0197df173fbd7ec1e7e35c47476fcf2aaa483f/recipes/fuzzy";
           sha256 = "1hwdh9bx4g4vzzyc20vdwxsii611za37kc9ik40kwjjk62qmll8h";
-          name = "fuzzy";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -27626,8 +34591,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    fvwm-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    fvwm-mode = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "fvwm-mode";
         version = "20160411.438";
         src = fetchFromGitHub {
@@ -27636,10 +34604,10 @@
           rev = "6832a1c1f68bf6249c3fd6672ea8e27dc7a5c79e";
           sha256 = "03zmk4v259pqx7gkwqq95lccn78rwmh7iq5j0d5jj4jf9h39rr20";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ac39130f8a031d6fe7df4411a5f94f2cdf652449/recipes/fvwm-mode";
           sha256 = "07y32cnp4qfhncp7s24gmlxljdrj5miicinfaf4gc7hihb4bkrkb";
-          name = "fvwm-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -27647,8 +34615,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    fwb-cmds = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    fwb-cmds = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "fwb-cmds";
         version = "20180318.1519";
         src = fetchFromGitHub {
@@ -27657,10 +34628,10 @@
           rev = "90258a5c7dbbaa2ac227e0fb4ff6c7d5aec3628f";
           sha256 = "1xwvv8wjgdaz96v1x1xc5w697bfvcanlcixd0n5qbx6ryakqrb72";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fe40cdeb5e19628937820181479897acdad40200/recipes/fwb-cmds";
           sha256 = "0wnjvi0v0l2h1mhwlsk2d8ggwh3nk7pks48l55gp18nmj00jxycx";
-          name = "fwb-cmds";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -27668,20 +34639,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    fxrd-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    fxrd-mode = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild
+                             , s }:
+      melpaBuild {
         pname = "fxrd-mode";
         version = "20170728.1101";
         src = fetchFromGitHub {
           owner = "msherry";
           repo = "fxrd-mode";
-          rev = "18a603474abb5a786a8d9f20c283d5f7beed3540";
-          sha256 = "1yprlpxxh7bbxg8filgb00lqqlavbz03h7hqf4280aiypkwi0y86";
+          rev = "795b969346982b75e24b5c8619b46197982fbb4d";
+          sha256 = "0aha13vqj6ygyr7bflrxll837g4z6wrmrhh5rhcd0vphqg70frgn";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/796eb6b2126ec616c0de6af6abb7598900557c12/recipes/fxrd-mode";
           sha256 = "17zimg64lqc1yh9gnp5izshkvviz996aym7q6n9p61a4kqq37z4r";
-          name = "fxrd-mode";
+          name = "recipe";
         };
         packageRequires = [ s ];
         meta = {
@@ -27689,8 +34664,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    fyure = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    fyure = callPackage ({ fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "fyure";
         version = "20130216.514";
         src = fetchFromGitHub {
@@ -27699,10 +34677,10 @@
           rev = "b6977f1eb148e8b63259f7233b55bb050e44d9b8";
           sha256 = "08x5li0mshrlamr7vswy7xh358bqhh3pngjr4ckswfi0l2r5fjbd";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/27f4188f460060277ad2f5422bc2bde8e6fd3ff3/recipes/fyure";
           sha256 = "0k5z2xqlrzp5lyvp2lr462x38kqdmqld845bvyvkfjd2k4yri71x";
-          name = "fyure";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -27710,20 +34688,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    fzf = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    fzf = callPackage ({ emacs
+                       , fetchFromGitHub
+                       , fetchurl
+                       , lib
+                       , melpaBuild }:
+      melpaBuild {
         pname = "fzf";
-        version = "20180102.1712";
+        version = "20180618.1845";
         src = fetchFromGitHub {
           owner = "bling";
           repo = "fzf.el";
-          rev = "b750cccae7c37a9ee4d40d928bb508cc3234bfbf";
-          sha256 = "0a1g7bv4qakzzrvvsh5m5ic3yhha57fj3d09gmr7rb5b3p2kl5cz";
+          rev = "521d18933cb586337c4e34281bdc71ac07202c98";
+          sha256 = "0fpzjslbhhwvs4nh5dxj9cyxyiw6n8qmg76mvq73k5mc8pk7d4ir";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1671e17c99ef1932c6a2e83fc4fa2e4eb6674bc8/recipes/fzf";
           sha256 = "0jjzm1gq85fx1gmj6nqaijnjws9bm8hmk40ws3x7fmsp41qq5py0";
-          name = "fzf";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -27731,20 +34713,51 @@
           license = lib.licenses.free;
         };
       }) {};
-    gams-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    gams-ac = callPackage ({ auto-complete
+                           , emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , gams-mode
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
+        pname = "gams-ac";
+        version = "20180423.226";
+        src = fetchFromGitHub {
+          owner = "ShiroTakeda";
+          repo = "gams-ac";
+          rev = "66d04ff36033f54205c19bc1d893e926d4dbf02e";
+          sha256 = "1hjbzwgzwqwpyfm8db1r1q14bbk42hrl5469gqfzjq0423wy7szw";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/ca2681b39ac5a985c2f70b4b84ee3c10af1a7ca4/recipes/gams-ac";
+          sha256 = "03w9ffscwaaspwxmrqhrfws0qjk3xxzz63k5wkrhx37899w75qha";
+          name = "recipe";
+        };
+        packageRequires = [ auto-complete emacs gams-mode ];
+        meta = {
+          homepage = "https://melpa.org/#/gams-ac";
+          license = lib.licenses.free;
+        };
+      }) {};
+    gams-mode = callPackage ({ emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "gams-mode";
         version = "20180416.206";
         src = fetchFromGitHub {
           owner = "ShiroTakeda";
           repo = "gams-mode";
-          rev = "3022e9f8411628e6a210fb5843d858b15a7513f5";
-          sha256 = "06hc8yy1g2vyvib8yrhwzs8fvgxnrxlw6iyzi7phjp9fgr3cp504";
+          rev = "0a7f3f5d44ea59c34677049882f0a34ff9935bc9";
+          sha256 = "0wl2dfcfvjy23gcwk6qfxbxjlykw438fi9h1y2855adcc9zrhwzx";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c895a716636b00c2a158d33aab18f664a8601833/recipes/gams-mode";
           sha256 = "0hx9mv4sqskz4nn7aks64hqd4vn3m7b34abzhy9bnmyw6d5zzfci";
-          name = "gams-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -27752,8 +34765,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    gandalf-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    gandalf-theme = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "gandalf-theme";
         version = "20130809.247";
         src = fetchFromGitHub {
@@ -27762,10 +34778,10 @@
           rev = "4e472fc851431458537d458d09c1f5895e338536";
           sha256 = "0sn3y1ilbg532mg941qmzipvzq86q31x86ypaf0h0m4015r7l59v";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4354bbc1ec16783dd286d69fd6e4682ae63e28f9/recipes/gandalf-theme";
           sha256 = "0wkmsg3pdw98gyp3q508wsqkzw821qsqi796ynm53zd7a4jfap4p";
-          name = "gandalf-theme";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -27773,7 +34789,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    gap-mode = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild {
+    gap-mode = callPackage ({ fetchhg
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "gap-mode";
         version = "20160204.736";
         src = fetchhg {
@@ -27781,10 +34801,10 @@
           rev = "617eff4ff846";
           sha256 = "08dx8ijivhsfmqkxn33121qcjd6nckpn0jdlh0lhx4z4zg8x37bl";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/83ec19a4ebac6b2d0fd84939b393848f82620978/recipes/gap-mode";
           sha256 = "07whab3gi4b8gsvy5ijmjnj700lw0rm3bnr1769byhnpi7qpqin2";
-          name = "gap-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -27792,20 +34812,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    gather = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    gather = callPackage ({ fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "gather";
         version = "20141230.538";
         src = fetchFromGitHub {
           owner = "mhayashi1120";
           repo = "Emacs-gather";
-          rev = "50809fbc22d70a1c724c2dd99ac5a1f818ffeb6b";
-          sha256 = "0j0dg7nl9kmanayvw0712x5c5x9h48qmqdsyi0pijvgmv8l5slg5";
+          rev = "8909c886d72a682710bb79ccfcfe4df54a399b7e";
+          sha256 = "0nj5fbn22ihfsdlb5bhj0ph71gkhrgfbb3540sx1x35gqfhb6p4g";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/595e40c7102294684badf86deb72d86bbc3c1426/recipes/gather";
           sha256 = "1f0cqqp1a7w8g1pfvzxxb0hjrxq4m79a4n85dncqj2xhjxrkm0xk";
-          name = "gather";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -27813,8 +34836,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    gdscript-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    gdscript-mode = callPackage ({ emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "gdscript-mode";
         version = "20180117.2056";
         src = fetchFromGitHub {
@@ -27823,10 +34850,10 @@
           rev = "31af5283eaec207bc864022a28e2824132471eaf";
           sha256 = "0f24zsklkhhvj6qdyid2j1qcyhjnncxjma93zhr0klvn5j1z3aar";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/52f99eafb2e80a7fa13a98add98b03a147f35e8b/recipes/gdscript-mode";
           sha256 = "0v4ab5xxpq1kya2is5qq61fmfgxgvbigyz7wp907z3mc00kg2818";
-          name = "gdscript-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -27834,8 +34861,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    geben = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    geben = callPackage ({ cl-lib ? null
+                         , emacs
+                         , fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "geben";
         version = "20170801.551";
         src = fetchFromGitHub {
@@ -27844,10 +34876,10 @@
           rev = "ec3f5e9376cf1ea5615990bd8c212543d57f033b";
           sha256 = "0860nnarbm76jp40v7p5d2wdnq12p03paiw17g3h5p27wnaj611d";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6f8648609e160f7dcefe4a963e8b00475f2fff78/recipes/geben";
           sha256 = "1ai1qcx76m8xh80c8zixq9cqbhnqmj3jk3r7lj3ngbiwx4pnlnwf";
-          name = "geben";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -27855,20 +34887,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    geben-helm-projectile = callPackage ({ emacs, fetchFromGitHub, fetchurl, geben, helm-projectile, lib, melpaBuild }:
-    melpaBuild {
+    geben-helm-projectile = callPackage ({ emacs
+                                         , fetchFromGitHub
+                                         , fetchurl
+                                         , geben
+                                         , helm-projectile
+                                         , lib
+                                         , melpaBuild }:
+      melpaBuild {
         pname = "geben-helm-projectile";
         version = "20160610.1759";
         src = fetchFromGitHub {
           owner = "ahungry";
           repo = "geben-helm-projectile";
-          rev = "31ce0faca5dcc71924884f03fd5a7a25d00ccd9b";
-          sha256 = "0a1srhwfbgkvndjfi9irg5s6snlxyqrw1vwyqg1sn8aqnbpgib04";
+          rev = "14db489efcb20c5aa9102288c94cec3c5a87c35d";
+          sha256 = "1nd1jhy393vkn2g65zhygxkpgna0l8gkndxr8jb6qjkkapk58k8l";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b7d28c45304a69e6ca78b3d00df2563171c027ee/recipes/geben-helm-projectile";
           sha256 = "11zhapys6wx2cadflvjimsmilwvjpfd4ihwzzmap8shxpyllsq9r";
-          name = "geben-helm-projectile";
+          name = "recipe";
         };
         packageRequires = [ emacs geben helm-projectile ];
         meta = {
@@ -27876,8 +34914,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    geeknote = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    geeknote = callPackage ({ emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "geeknote";
         version = "20160717.549";
         src = fetchFromGitHub {
@@ -27886,10 +34928,10 @@
           rev = "8ed607c76864afcc9c338972ab093caf4501cbf8";
           sha256 = "1dadsyvkzf0rg6immjdjkb0k7iaqh3hm1w9qhap94j54j7v75w2q";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/geeknote";
           sha256 = "03q0ca8m110qw8wczyyx94gwqymwnmamahw30j7fqkq6ry19yqsm";
-          name = "geeknote";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -27897,20 +34939,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    geiser = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    geiser = callPackage ({ fetchFromGitLab
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "geiser";
-        version = "20180413.1646";
-        src = fetchFromGitHub {
+        version = "20180626.440";
+        src = fetchFromGitLab {
           owner = "jaor";
           repo = "geiser";
-          rev = "ec3d0ea34081789da44f0b11b2cf05627a1e9b8e";
-          sha256 = "0g79vz9b73p7g2zy8ml0glwiivq48d64yq3kd6wmq1qpx3zflrf2";
+          rev = "1bdd966a4fbe0c8bd5bcb04dad5213e47a1534e6";
+          sha256 = "165vssixx16lvig7hjgh75pi15r53s3n8fn8wyfzdbnkihkwmqbk";
         };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/b0fe32d24cedd5307b4cccfb08a7095d81d639a0/recipes/geiser";
-          sha256 = "067rrjvyn5sz60w9h7qn542d9iycm2q4ryvx3n6xlard0dky5596";
-          name = "geiser";
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/67dc8d6e33f3522043f96761b23ea68c9c27084e/recipes/geiser";
+          sha256 = "1g7z6c3lfa7slwrxk7q8awqs39qibcv2kc4c2fwlwvgbcfhkw085";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -27918,20 +34963,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    general = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    general = callPackage ({ cl-lib ? null
+                           , emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "general";
-        version = "20180406.944";
+        version = "20180628.1112";
         src = fetchFromGitHub {
           owner = "noctuid";
           repo = "general.el";
-          rev = "d8fb9f69c9d66279316b096929454ebf242aa721";
-          sha256 = "025dakpmp2232n15rjz6kbs0vn1gazi4qkaagkm8fra703sx4v4v";
+          rev = "e690ef9e706f7eea071357520709ef5407a42159";
+          sha256 = "1kgd0v9lgwsxa1p7n3cgsd2f62wi86hcjslb0vf96b9l1n1wjwdl";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d86383b443622d78f6d8ff7b8ac74c8d72879d26/recipes/general";
           sha256 = "104ywsfylfymly64p1i3hsy9pnpz3dkpmcq1ygafnld8zjd08gpc";
-          name = "general";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -27939,8 +34989,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    genrnc = callPackage ({ concurrent, deferred, fetchFromGitHub, fetchurl, lib, log4e, melpaBuild, yaxception }:
-    melpaBuild {
+    genrnc = callPackage ({ concurrent
+                          , deferred
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , log4e
+                          , melpaBuild
+                          , yaxception }:
+      melpaBuild {
         pname = "genrnc";
         version = "20140612.537";
         src = fetchFromGitHub {
@@ -27949,10 +35006,10 @@
           rev = "da75b1966a73ad215ec2ced4522c25f4d0bf1f9a";
           sha256 = "08cw1fa25kbhbq2sp1cpn90bz38i9hjfdj93xf6wvki55b52s0nn";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/dd2d908ba5fa96d90643091573939e54d9165aaa/recipes/genrnc";
           sha256 = "1nwbdscl0yh9j1n421can93m6s8j9dkyb3xmpampr6x528g6z0lm";
-          name = "genrnc";
+          name = "recipe";
         };
         packageRequires = [ concurrent deferred log4e yaxception ];
         meta = {
@@ -27960,8 +35017,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    german-holidays = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    german-holidays = callPackage ({ fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "german-holidays";
         version = "20161011.13";
         src = fetchFromGitHub {
@@ -27970,10 +35030,10 @@
           rev = "d7d540c229c1a8be68ee09fbda08fe3ea31b7d29";
           sha256 = "1rfka83jwd68k93vn3f7llxd6z0ma5k98gws0081y8i9fc21fnsd";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bf5b3807ff989b13f95e8d6fad2f26a42ff0643c/recipes/german-holidays";
           sha256 = "0fgrxdgyl6va6axjc5l4sp90pyqaz5zha1g73xyhbxblshm5dwxn";
-          name = "german-holidays";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -27981,8 +35041,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    gerrit-download = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }:
-    melpaBuild {
+    gerrit-download = callPackage ({ emacs
+                                   , fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , magit
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "gerrit-download";
         version = "20150714.708";
         src = fetchFromGitHub {
@@ -27991,10 +35056,10 @@
           rev = "d568acc7c5935188c9bc19ba72719a6092d9f6fd";
           sha256 = "1ch8yp0mgk57x0pny9bvkknsqj27fd1rcmpm9s7qpryrwqkp1ix4";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/18725e799efd1694ff2397b6c877f926ac5f4ce8/recipes/gerrit-download";
           sha256 = "1rlz0iqgvr8yxnv5qmk29xs1jwf0g0ckzanlyldcxvs7n6mhkjjp";
-          name = "gerrit-download";
+          name = "recipe";
         };
         packageRequires = [ emacs magit ];
         meta = {
@@ -28002,20 +35067,49 @@
           license = lib.licenses.free;
         };
       }) {};
-    ggo-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    gf = callPackage ({ fetchFromGitHub
+                      , fetchurl
+                      , ht
+                      , lib
+                      , melpaBuild
+                      , s }:
+      melpaBuild {
+        pname = "gf";
+        version = "20180606.1455";
+        src = fetchFromGitHub {
+          owner = "grammaticalframework";
+          repo = "gf-emacs-mode";
+          rev = "41070ecd1cd64fa52cf299dc09a5ea19aca4cf05";
+          sha256 = "090jy6p94syvf20b61l2jnm7m5pv6d2qxfjhr1wm0bg1wkvyw50c";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/1c2cc74eb19c54219cd5c5c11d886074859f0948/recipes/gf";
+          sha256 = "170q5a7lwa9pbpn0ghcfzny0jfn42wgns1lcv8fngr0k1njfj6v8";
+          name = "recipe";
+        };
+        packageRequires = [ ht s ];
+        meta = {
+          homepage = "https://melpa.org/#/gf";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ggo-mode = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "ggo-mode";
         version = "20130524.443";
         src = fetchFromGitHub {
           owner = "mkjunker";
           repo = "ggo-mode";
-          rev = "e326899d9ed8217c7a4ea6cfdc4dd7aea61d6c1b";
-          sha256 = "0bwjiq4a4f5pg0ngvc3lmkk7aki8n9zqfa1dym0lk4vy6yfhcbhp";
+          rev = "ea5097f87072309c7b77204888d459d084bf630f";
+          sha256 = "1m9ra9qp7bgf6anfqyn56n3xa9a25ran10k9wd355qknd5skq1zz";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e055994c3c3042eab11f11ec916ad5b56689809f/recipes/ggo-mode";
           sha256 = "1403x530n90jlfz3lq2vfiqx84cxsrhgs6hhmniq960cjj31q35p";
-          name = "ggo-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -28023,20 +35117,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    ggtags = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ggtags = callPackage ({ cl-lib ? null
+                          , emacs
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "ggtags";
-        version = "20171203.1553";
+        version = "20180418.657";
         src = fetchFromGitHub {
           owner = "leoliu";
           repo = "ggtags";
-          rev = "eec392d2d639030c5a51bce8431f2815ad8e7bc5";
-          sha256 = "0mlva84zbi93jrvvd3bgyndc68iib27zsjsd2f52df89198brjqs";
+          rev = "bf263afd377992f7c5d9e8f727bd381e74feb327";
+          sha256 = "182wqrkvk4asa483sb2zcym5np3z4h7l7ncpcrfgcs80jqbcaywx";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b158bb1bc2fbe3de61a6b21174eac7b1457edda2/recipes/ggtags";
           sha256 = "1cmry4knxbx9257ivhfxsd09z07z3g3wjihi99nrwmhb9h4mpqyw";
-          name = "ggtags";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -28044,20 +35143,27 @@
           license = lib.licenses.free;
         };
       }) {};
-    gh = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, logito, marshal, melpaBuild, pcache }:
-    melpaBuild {
+    gh = callPackage ({ emacs
+                      , fetchFromGitHub
+                      , fetchurl
+                      , lib
+                      , logito
+                      , marshal
+                      , melpaBuild
+                      , pcache }:
+      melpaBuild {
         pname = "gh";
         version = "20180308.1338";
         src = fetchFromGitHub {
           owner = "sigma";
           repo = "gh.el";
-          rev = "f029fc11f345ef04ab62ee91c38657e29c462fea";
-          sha256 = "1rgdpi8ld5hi2rp30p8sxbrl6z95nvq80jfp3zsr7cmsniwz0vv3";
+          rev = "92418cd1b67ff6e8fb0a64478444975a4b8581a3";
+          sha256 = "1vl6wy904jw1mqdic54ssvvbs4xqxhmgacldnfkdkx586vwf0hqi";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/gh";
           sha256 = "1141l8pas3m755yzby4zsan7p81nbnlch3kj1zh69qzjpgqp30c0";
-          name = "gh";
+          name = "recipe";
         };
         packageRequires = [ emacs logito marshal pcache ];
         meta = {
@@ -28065,8 +35171,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    gh-md = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    gh-md = callPackage ({ emacs
+                         , fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "gh-md";
         version = "20151207.940";
         src = fetchFromGitHub {
@@ -28075,10 +35185,10 @@
           rev = "693cb0dcadff70e813e1a9d303d227aff7898557";
           sha256 = "0g3bjpnwgqczw6ddh4mv7pby0zyqzqgywjrjz2ib6hwmdqzyp1s0";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2794e59d5fea812ce5b376d3d9609f50f6bca40e/recipes/gh-md";
           sha256 = "0b72fl1hj7gkqlqrr8hklq0w3ryqqqfn5qpb7a9i6q0vh98652xm";
-          name = "gh-md";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -28086,8 +35196,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    ghc = callPackage ({ fetchFromGitHub, fetchurl, haskell-mode, lib, melpaBuild }:
-    melpaBuild {
+    ghc = callPackage ({ fetchFromGitHub
+                       , fetchurl
+                       , haskell-mode
+                       , lib
+                       , melpaBuild }:
+      melpaBuild {
         pname = "ghc";
         version = "20180121.418";
         src = fetchFromGitHub {
@@ -28096,10 +35210,10 @@
           rev = "39b96c475090f91e4f717197c96e083fdb2ccaf7";
           sha256 = "0f9qzk3czamqjb42xg2bmx70hafza8cn84zylx60bw8yx4i0q7nx";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/ghc";
           sha256 = "02nc7a9khqpd4ca2snam8dq72m53q8x7v5awx56bjq31z6vcmav5";
-          name = "ghc";
+          name = "recipe";
         };
         packageRequires = [ haskell-mode ];
         meta = {
@@ -28107,8 +35221,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    ghc-imported-from = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ghc-imported-from = callPackage ({ emacs
+                                     , fetchFromGitHub
+                                     , fetchurl
+                                     , lib
+                                     , melpaBuild }:
+      melpaBuild {
         pname = "ghc-imported-from";
         version = "20141124.1132";
         src = fetchFromGitHub {
@@ -28117,10 +35235,10 @@
           rev = "fcff08628a19f5d26151564659218cc677779b79";
           sha256 = "1ywwyc2kz1c1s26c412nmzh55cinh84cfiazyyi3jsy5zzwhrbhi";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ghc-imported-from";
           sha256 = "063kbymk4r1yrg5ks660d2byrnia6gs6nimjzrvqfi2ib1psc7jc";
-          name = "ghc-imported-from";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -28128,8 +35246,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    ghci-completion = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ghci-completion = callPackage ({ cl-lib ? null
+                                   , emacs
+                                   , fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "ghci-completion";
         version = "20151125.457";
         src = fetchFromGitHub {
@@ -28138,10 +35261,10 @@
           rev = "c47e23d585d2a3c7b13aac163693fdc4f2bb90e5";
           sha256 = "17fl3k2sqiavbv3bp6rnp3p89j6pnpkkp7wi26pzzk4675r5k45q";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/804aa2f9088dfc1b48b59aaa72a61f82fb5be971/recipes/ghci-completion";
           sha256 = "1a6k47z5kmacj1s5479393jyj27bjx0911yaqfmmwg2hr0yz7vll";
-          name = "ghci-completion";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -28149,8 +35272,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    gherkin-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    gherkin-mode = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "gherkin-mode";
         version = "20171224.553";
         src = fetchFromGitHub {
@@ -28159,10 +35285,10 @@
           rev = "0313492e7da152f0aa73ddf96c0287ded8f51253";
           sha256 = "15m9a2dcxgmbj0ni2qcxg3vpxvs50pyjvlacm3xd2xhm9wd484hr";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/82d80becedead8db441eed6f7856ca64d78815e2/recipes/gherkin-mode";
           sha256 = "0dhrsz24hn0sdf22wpmzbkn66g4540vdkl03pc27kv21gwa9ixxv";
-          name = "gherkin-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -28170,8 +35296,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    ghost-blog = callPackage ({ fetchFromGitHub, fetchurl, lib, markdown-mode, melpaBuild }:
-    melpaBuild {
+    ghost-blog = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , markdown-mode
+                              , melpaBuild }:
+      melpaBuild {
         pname = "ghost-blog";
         version = "20171023.42";
         src = fetchFromGitHub {
@@ -28180,10 +35310,10 @@
           rev = "71b358643cc9a2db1bf752281ff94aba9b59e4cc";
           sha256 = "1fkh7zslkdi7a4x2xrk73acmigbi7yx9k6iaj75zbjfd49gyqj13";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4a906d461bcb2aa07050b72669feb5787414d809/recipes/ghost-blog";
           sha256 = "0c591cx5kkfmhhqh8jall470iicxdv01mm3m13irq5xhmp3i5kjy";
-          name = "ghost-blog";
+          name = "recipe";
         };
         packageRequires = [ markdown-mode ];
         meta = {
@@ -28191,8 +35321,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    ghq = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ghq = callPackage ({ fetchFromGitHub
+                       , fetchurl
+                       , lib
+                       , melpaBuild }:
+      melpaBuild {
         pname = "ghq";
         version = "20160803.857";
         src = fetchFromGitHub {
@@ -28201,10 +35334,10 @@
           rev = "aae4b8cb22fd6c24d2c9e3962c7e8e9dac6d9825";
           sha256 = "0rh2k93c3a0vl073a3s3a3h6gkw454v1lyd7y8l3pd24vw9hc628";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a9daa3b0039f6b296b8176523cffbbe27506bb02/recipes/ghq";
           sha256 = "0prvywcgwdhx5pw66rv5kkfriahal2mli2ibam5np3z6bwcq4ngh";
-          name = "ghq";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -28212,20 +35345,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    ghub = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }:
-    melpaBuild {
+    ghub = callPackage ({ emacs
+                        , fetchFromGitHub
+                        , fetchurl
+                        , let-alist
+                        , lib
+                        , melpaBuild }:
+      melpaBuild {
         pname = "ghub";
-        version = "20180414.1654";
+        version = "20180715.1159";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "ghub";
-          rev = "27e7b17473d17b684ddf873e4281f2595c05ca65";
-          sha256 = "00yjgz8c03l8v99gi2ly08iwp10bv5s6hhhlvw1kyg00mflgn4m9";
+          rev = "4202c1f389a5ad0b7841be0ac8ab3cc3b6b77cb6";
+          sha256 = "1adi6wsfkhx46x28fajjf45jw60hkqqgg9y7wdzzq0a2vkp3hwya";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/70a4dbd62fd6ebb4e056d0e97fa1a958437ddc91/recipes/ghub";
           sha256 = "031bzp61aal2id5sazwjz30svydjvxvphw5wbv5cyy4dqyh7w2ps";
-          name = "ghub";
+          name = "recipe";
         };
         packageRequires = [ emacs let-alist ];
         meta = {
@@ -28233,20 +35371,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    ghub-plus = callPackage ({ apiwrap, emacs, fetchFromGitHub, fetchurl, ghub, lib, melpaBuild }:
-    melpaBuild {
+    ghub-plus = callPackage ({ apiwrap
+                             , emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , ghub
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "ghub-plus";
-        version = "20180330.1738";
+        version = "20180602.1545";
         src = fetchFromGitHub {
           owner = "vermiculus";
           repo = "ghub-plus";
-          rev = "3f609f5d8277e4282bf2b93366c9f911e0f721a8";
-          sha256 = "01a6sgzmyc3m4adik1sgvp19z12rap51xj72hjywgh116l9cqn52";
+          rev = "b4a9662f5a6562f8d1dfdda2f009ec78a107c9a2";
+          sha256 = "0xi7xhdla64xbcfqi8x8yzqc6v6rrqxd4q8lcrv7sw08ap5ykfas";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/03a412fd25218ff6f302734e078a699ff0234e36/recipes/ghub+";
           sha256 = "0xx7nwmjx3f7z6z164x1lb9arbb3m3d16mpn92v66w572rhbr34n";
-          name = "ghub-plus";
+          name = "recipe";
         };
         packageRequires = [ apiwrap emacs ghub ];
         meta = {
@@ -28254,20 +35398,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    gif-screencast = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    gif-screencast = callPackage ({ emacs
+                                  , fetchFromGitLab
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "gif-screencast";
-        version = "20180309.242";
-        src = fetchFromGitHub {
+        version = "20180616.1230";
+        src = fetchFromGitLab {
           owner = "Ambrevar";
           repo = "emacs-gif-screencast";
-          rev = "825e606950ec842304bf75cf85baef707b853b03";
-          sha256 = "0xdzfw19zll8v9kpvay2rm8piq92ksz574m2gb6b63nm3z7sia1j";
+          rev = "12b25442b97b84abae74ecb5190a9d14ff7cfe5a";
+          sha256 = "0p7gfccvrv2267abldsyjdqbj4rg25wdy6vmcygiggl3lk0wrnwz";
         };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/b149509fb245975b450d15470c7d915e3c7b474d/recipes/gif-screencast";
-          sha256 = "12kjr76b1180g3grfycghmgr3xf4vmhlhks8x3ri1gigdf0j8vaa";
-          name = "gif-screencast";
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/6d17ca0213ba5ef9dce92002e281e6f08c3492be/recipes/gif-screencast";
+          sha256 = "05l46bsnjdnvcgwx5rc5y7ry9p0hvmkf09rlpalgnrp8qpy8xw0q";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -28275,20 +35423,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    gift-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    gift-mode = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "gift-mode";
-        version = "20180204.1358";
+        version = "20180530.535";
         src = fetchFromGitHub {
           owner = "csrhodes";
           repo = "gift-mode";
-          rev = "b8dcb86c7f83df0fbdc0da4f80c187423c936e50";
-          sha256 = "01x87aam43xmhx7np9rvrdhln3pwn4zfn4d8s38rdpi77n9prw5k";
+          rev = "b0441ae6e02f343be3b611a2d4b40495ecd932f0";
+          sha256 = "0dwpmvjsczcdzwhjvpfxrkfha513538z8wq3gr3l1zc1kdggx2bk";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c4c9081a60bdbf4e5fe1ccc4809c0f6f396d11e4/recipes/gift-mode";
           sha256 = "0sybrjmcg90cjaax7lzzqvacirn5l23hqy9d843c660fsv98scg1";
-          name = "gift-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -28296,20 +35447,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    gildas-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, polymode }:
-    melpaBuild {
+    gildas-mode = callPackage ({ emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild
+                               , polymode }:
+      melpaBuild {
         pname = "gildas-mode";
         version = "20150919.1501";
         src = fetchFromGitHub {
           owner = "smaret";
           repo = "gildas-mode";
-          rev = "23e8a2e6066ff74af592de6d5d0d858442e2bf8a";
-          sha256 = "1na8pp1g940zi22jgqi6drsm12db0hyw99v493i5j1p2y67c4hxw";
+          rev = "1ac31c83ac363550d8ceb0041924d984cd62683f";
+          sha256 = "0a8wwczh9g8b0gpc4hlgg9n6y9n4x18b4pchm4arjsccmh3l5bs3";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f43d3aec955d31023056baba971805f0ebbb6702/recipes/gildas-mode";
           sha256 = "0bc3d8bnvg1w2chrr4rp9daq1x8p41qgklrniq0bbkr2h93cmkgv";
-          name = "gildas-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs polymode ];
         meta = {
@@ -28317,20 +35473,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    gist = callPackage ({ emacs, fetchFromGitHub, fetchurl, gh, lib, melpaBuild }:
-    melpaBuild {
+    gist = callPackage ({ emacs
+                        , fetchFromGitHub
+                        , fetchurl
+                        , gh
+                        , lib
+                        , melpaBuild }:
+      melpaBuild {
         pname = "gist";
         version = "20171127.2006";
         src = fetchFromGitHub {
           owner = "defunkt";
           repo = "gist.el";
-          rev = "314fe6ab80fae35b95f0734eceb82f72813b6f41";
-          sha256 = "0vbyzww9qmsvdpdc6d6wq6drlq1r9y92807fjhs0frgzmq6dg0rh";
+          rev = "b2712a61d04af98a05cc2556d85479803b6626be";
+          sha256 = "0zpdh7j0nm9qgzgp55kim04r9hi8cyi3f6kflxrs8srzxwb4gs6k";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/gist";
           sha256 = "053fl8aw0ram9wsabzvmlm5w2klwd2pgcn2w9r1yqfs4xqja5sd3";
-          name = "gist";
+          name = "recipe";
         };
         packageRequires = [ emacs gh ];
         meta = {
@@ -28338,20 +35499,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    git = callPackage ({ dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    git = callPackage ({ dash
+                       , f
+                       , fetchFromGitHub
+                       , fetchurl
+                       , lib
+                       , melpaBuild
+                       , s }:
+      melpaBuild {
         pname = "git";
         version = "20140128.241";
         src = fetchFromGitHub {
           owner = "rejeep";
           repo = "git.el";
-          rev = "a3396a7027a7d986598c6a2d6d5599bac918f3da";
-          sha256 = "10siqf21ay6vl1r1v2c93rajzyjc67m4wq9q88pbij0z18vkq2f0";
+          rev = "8b7f1477ef367b5b7de452589dd9a8ab30150d0a";
+          sha256 = "06ws3x5qa92drmn6rcp502jk2yil6q9gkzdmb2gww9gb2g695wl5";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ce19d2716416295966716db47241a0e37b412ab5/recipes/git";
           sha256 = "1nd2yvfgin13m368gjn7xah99glspnam4g4fh348x4makxcaw8w5";
-          name = "git";
+          name = "recipe";
         };
         packageRequires = [ dash f s ];
         meta = {
@@ -28359,20 +35526,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    git-annex = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    git-annex = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "git-annex";
-        version = "20170417.1653";
+        version = "20180427.856";
         src = fetchFromGitHub {
           owner = "jwiegley";
           repo = "git-annex-el";
-          rev = "22b7161adcd144f88681b9b904972cea42b27fca";
-          sha256 = "038h1dnvncdjy7q1ix3xrx4yqfqfp4ll69ksipj5kawsrch75nh6";
+          rev = "ebdb44aef1883f1b2b8058e05d30fb9315b03707";
+          sha256 = "1mzv40gj7k10h7h5s43my8msgzjpj680qprqa9pp8nbyhl49v3wh";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9c91e16bb9e92db9dc9be6a7af3944c3290d2f14/recipes/git-annex";
           sha256 = "0194y24vq1w6m2cjgqgx9dqp99cq8y9licyry2zxa5brbrsxi94l";
-          name = "git-annex";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -28380,8 +35550,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    git-attr = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    git-attr = callPackage ({ emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "git-attr";
         version = "20180204.15";
         src = fetchFromGitHub {
@@ -28390,10 +35564,10 @@
           rev = "c03078637a00ea301cbcc7ae301ae928b10af889";
           sha256 = "05wzy8g0yjkks0zmcvwn9dmr6kxk1bz91xic3c08b0j1z5lbsdv7";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3417e4bc586df60b5e6239b1f7683b87953f5b7c/recipes/git-attr";
           sha256 = "084l3zdcgy1ka2wq1fz9d6ryhg38gxvr52njlv43gwibzvbqniyi";
-          name = "git-attr";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -28401,8 +35575,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    git-auto-commit-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    git-auto-commit-mode = callPackage ({ fetchFromGitHub
+                                        , fetchurl
+                                        , lib
+                                        , melpaBuild }:
+      melpaBuild {
         pname = "git-auto-commit-mode";
         version = "20161229.817";
         src = fetchFromGitHub {
@@ -28411,10 +35588,10 @@
           rev = "2c8197e5d7813734d6a49f9b9c0b227b7ae022a8";
           sha256 = "0h8kma09r5fw4b2fbbia5z42x8gg72w6zk39pxnsw876kwa8798f";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5660fb76ce93e5fe56227698d079c6994ef3305f/recipes/git-auto-commit-mode";
           sha256 = "0nf4n63xnzcsizjk1yl8qvqj9wjdqy57kvn6r736xvsxwzd44xgl";
-          name = "git-auto-commit-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -28422,8 +35599,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    git-blamed = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    git-blamed = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "git-blamed";
         version = "20161028.1226";
         src = fetchFromGitHub {
@@ -28432,10 +35612,10 @@
           rev = "cef196abf398e2dd11f775d1e6cd8690567408aa";
           sha256 = "1n6x69z1s3hk6m6w8gpmqyrb2cxfzhi9w7q94d46c3z6r75v18vz";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/87bc01218964a01cfd471ee068ed75976793a568/recipes/git-blamed";
           sha256 = "08az5mwg8kv8xsivs63y4sym54l1n34zc9z6k0iwpfixv9f8bk9p";
-          name = "git-blamed";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -28443,20 +35623,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    git-command = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, term-run, with-editor }:
-    melpaBuild {
+    git-command = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild
+                               , term-run
+                               , with-editor }:
+      melpaBuild {
         pname = "git-command";
         version = "20160111.503";
         src = fetchFromGitHub {
           owner = "10sr";
           repo = "git-command-el";
-          rev = "dce465ca1cd80e16df0f8dce8e427a76e9edc3b7";
-          sha256 = "0nnh5y0px7aa9yai9f149v7pjcjp7i3f35cfihs9n3r6bnrmgp4h";
+          rev = "a2c192aa779f81a99a10f0eb6dd018f13b2ff949";
+          sha256 = "1irqmypgc4l1jlzj4g65ihpic3ffnnkcg1hlysj7qpip5nbflqgl";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8a55d697bc95a7026c7788c13e4765e1b71075e3/recipes/git-command";
           sha256 = "1hsxak63y6648n0jkzl5ajxg45w84qq8vljvjh0bmwfrbb67kwbg";
-          name = "git-command";
+          name = "recipe";
         };
         packageRequires = [ term-run with-editor ];
         meta = {
@@ -28464,20 +35649,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    git-commit = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, with-editor }:
-    melpaBuild {
+    git-commit = callPackage ({ dash
+                              , emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild
+                              , with-editor }:
+      melpaBuild {
         pname = "git-commit";
-        version = "20180411.1649";
+        version = "20180713.1444";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "16785d7962cf84df12cf1e498b2c96519e84d235";
-          sha256 = "0ifzqqsyqk5x3d8zvq0yspcfhlndl7ppv6yxzz8w27pgb4h0jqwn";
+          rev = "d7412da3277d6ec5810e7ac20d64eb6c5cc0c30b";
+          sha256 = "02xfxp6bsp9g0sz9kaykibygqxndgqa59w0a6flma4mkkgwsid9c";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/git-commit";
           sha256 = "1i7122fydqga68cilgzir80xfq77hnrw75zrvn52mjymfli6aza2";
-          name = "git-commit";
+          name = "recipe";
         };
         packageRequires = [ dash emacs with-editor ];
         meta = {
@@ -28485,8 +35676,16 @@
           license = lib.licenses.free;
         };
       }) {};
-    git-commit-insert-issue = callPackage ({ bitbucket, fetchFromGitLab, fetchurl, github-issues, gitlab, lib, melpaBuild, projectile, s }:
-    melpaBuild {
+    git-commit-insert-issue = callPackage ({ bitbucket
+                                           , fetchFromGitLab
+                                           , fetchurl
+                                           , github-issues
+                                           , gitlab
+                                           , lib
+                                           , melpaBuild
+                                           , projectile
+                                           , s }:
+      melpaBuild {
         pname = "git-commit-insert-issue";
         version = "20171102.1141";
         src = fetchFromGitLab {
@@ -28495,10 +35694,10 @@
           rev = "f986923b04b587206ce7ee8e0c456768600e8be7";
           sha256 = "1gffjf6byasisa9jdcv9n4n5zqalvzfsxv7z75zl0g3ph7wc7bbm";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/git-commit-insert-issue";
           sha256 = "0xhlchr7dbm0hp4cjba3x1fdf7lnfc97id327i2fqgkdc4yn9fax";
-          name = "git-commit-insert-issue";
+          name = "recipe";
         };
         packageRequires = [ bitbucket github-issues gitlab projectile s ];
         meta = {
@@ -28506,8 +35705,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    git-dwim = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    git-dwim = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "git-dwim";
         version = "20170126.414";
         src = fetchFromGitHub {
@@ -28516,10 +35718,10 @@
           rev = "485c732130686c2f28a026e385366006435394b9";
           sha256 = "0rcrsjx4ifa9y3rd5l4498kvqkh58zx21gl7mqp053jdsqqq1yrx";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f8e4328cae9b4759a75da0b26ea8b68821bc71af/recipes/git-dwim";
           sha256 = "0xcigah06ak5wdma4ddcix58q2v5hszncb65f272m4lc2racgsfl";
-          name = "git-dwim";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -28527,8 +35729,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    git-gutter = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    git-gutter = callPackage ({ emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "git-gutter";
         version = "20161105.656";
         src = fetchFromGitHub {
@@ -28537,10 +35743,10 @@
           rev = "00c05264af046b5ce248e5b0bc42f117d9c27a09";
           sha256 = "1c7byzv27sqcal0z7113s1897prxhynk6y89mq1fjlxmr0g20vzb";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/81f0f525680fea98e804f39dbde1dada887e8821/recipes/git-gutter";
           sha256 = "19s344i95piixlzq4mjgmgjw7cy8af02z6hg89jjjdbxrfl4i2fg";
-          name = "git-gutter";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -28548,8 +35754,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    git-gutter-fringe = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, fringe-helper, git-gutter, lib, melpaBuild }:
-    melpaBuild {
+    git-gutter-fringe = callPackage ({ cl-lib ? null
+                                     , emacs
+                                     , fetchFromGitHub
+                                     , fetchurl
+                                     , fringe-helper
+                                     , git-gutter
+                                     , lib
+                                     , melpaBuild }:
+      melpaBuild {
         pname = "git-gutter-fringe";
         version = "20170112.2133";
         src = fetchFromGitHub {
@@ -28558,10 +35771,10 @@
           rev = "16226caab44174301f1659f7bf8cc67a76153445";
           sha256 = "1y77gjl0yznamdj0f55d418zb75k22izisjg7ikvrfsl2yfqf3pm";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/81f0f525680fea98e804f39dbde1dada887e8821/recipes/git-gutter-fringe";
           sha256 = "10k07dzmkxsxzwc70vpv05rxjyps9494y6k7yhlv8d46x7xjyp0z";
-          name = "git-gutter-fringe";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs fringe-helper git-gutter ];
         meta = {
@@ -28569,20 +35782,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    git-gutter-fringe-plus = callPackage ({ fetchFromGitHub, fetchurl, fringe-helper, git-gutter-plus, lib, melpaBuild }:
-    melpaBuild {
+    git-gutter-fringe-plus = callPackage ({ fetchFromGitHub
+                                          , fetchurl
+                                          , fringe-helper
+                                          , git-gutter-plus
+                                          , lib
+                                          , melpaBuild }:
+      melpaBuild {
         pname = "git-gutter-fringe-plus";
         version = "20140729.403";
         src = fetchFromGitHub {
           owner = "nonsequitur";
           repo = "git-gutter-fringe-plus";
-          rev = "7a2f49d2455a3a872e90e5f7dd4e6b27f1d96cfc";
-          sha256 = "1rsj193zpblndki4khjjlwl2njxb329d42l75ki55msxifqrn4fi";
+          rev = "3857d486e5b3eca9281fba1c76756cb39a9f9866";
+          sha256 = "19sz3gaffirr95n4a8jag9wsqa86fpdn13k685lxrv5317h8iqfh";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ad46c349d13f7d40db706b487319ede40b96b09c/recipes/git-gutter-fringe+";
           sha256 = "1zkjb8p08cq2nqskn79rjszlhp9mrblplgamgi66yskz8qb1bgcc";
-          name = "git-gutter-fringe-plus";
+          name = "recipe";
         };
         packageRequires = [ fringe-helper git-gutter-plus ];
         meta = {
@@ -28590,8 +35808,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    git-gutter-plus = callPackage ({ dash, fetchFromGitHub, fetchurl, git-commit, lib, melpaBuild }:
-    melpaBuild {
+    git-gutter-plus = callPackage ({ dash
+                                   , fetchFromGitHub
+                                   , fetchurl
+                                   , git-commit
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "git-gutter-plus";
         version = "20151204.923";
         src = fetchFromGitHub {
@@ -28600,10 +35823,10 @@
           rev = "b7726997806d9a2da9fe84ff00ecf21d62b6f975";
           sha256 = "0bhrrgdzzj8gwxjx7b2kibp1b6s0vgvykfg0n47iq49m6rqkgi5q";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b2db25d23c2a1a4f38867aac25d687a150e95c2b/recipes/git-gutter+";
           sha256 = "1w78p5cz6kyl9kmndgvwnfrs80ha707s8952hycrihgfb6lixmp0";
-          name = "git-gutter-plus";
+          name = "recipe";
         };
         packageRequires = [ dash git-commit ];
         meta = {
@@ -28611,8 +35834,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    git-io = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    git-io = callPackage ({ emacs
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "git-io";
         version = "20180317.1052";
         src = fetchFromGitHub {
@@ -28621,10 +35848,10 @@
           rev = "48753acba73b48b997bb678fb5e2a938ae63b5d6";
           sha256 = "1zw24j6l0ap761q1knxjaxzdfz11kmfq29aag5av4n87m86rxzr8";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a713197f227e3c43de3609dd505cf7cd226d94b9/recipes/git-io";
           sha256 = "1acwc9iqchvlvx98fxh4xf3xphv0xzrnxpv8kkl8qaly41izfj0v";
-          name = "git-io";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -28632,20 +35859,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    git-lens = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    git-lens = callPackage ({ emacs
+                            , fetchFromGitLab
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "git-lens";
         version = "20180328.717";
-        src = fetchFromGitHub {
+        src = fetchFromGitLab {
           owner = "pidu";
           repo = "git-lens";
           rev = "ea49e2e005af977a08331f8caa8f64d102b3b932";
           sha256 = "0prx0xbnhhp46c09nnzpz07jgr3s5ngrw8zjksf48abr8acwywfv";
         };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/66fd7c0642e8e61b883d2030f88892d039380475/recipes/git-lens";
-          sha256 = "1vv3s89vk5ncinqh2f724z0qbbzp8g4y5y670ryy56w1l6v2acfb";
-          name = "git-lens";
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/a52b516b7b10bdada2f64499c8f43f85a236f254/recipes/git-lens";
+          sha256 = "02a393b5y4vpmf9ixgyi3a4gbzk4146zql827ljlav3j0434ssw2";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -28653,41 +35884,50 @@
           license = lib.licenses.free;
         };
       }) {};
-    git-link = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    git-link = callPackage ({ emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "git-link";
-        version = "20170603.1026";
+        version = "20180708.943";
         src = fetchFromGitHub {
           owner = "sshaw";
           repo = "git-link";
-          rev = "472af75eca7aba42a1934f408c4bda55e34c9dcf";
-          sha256 = "0xgvwg2zxb9akk3kxxcz5cvgw4zkbqx5p4b5in01z5aj4lqmjw6s";
+          rev = "efd14ab5f17f5942d25e165210447f3983f3250e";
+          sha256 = "0rd2g4s73xk8m595aa11vr59gnn5mx7lbcf0040w1xqvlrryzyc9";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1385443585e628e3d4efb3badb7611e9d653e0c9/recipes/git-link";
           sha256 = "1vqabnmdw8pxd84c15ghh1rnglwb5i4zxicvpkg1ci8xalayn1c7";
-          name = "git-link";
+          name = "recipe";
         };
-        packageRequires = [ cl-lib ];
+        packageRequires = [ emacs ];
         meta = {
           homepage = "https://melpa.org/#/git-link";
           license = lib.licenses.free;
         };
       }) {};
-    git-messenger = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, popup }:
-    melpaBuild {
+    git-messenger = callPackage ({ emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild
+                                 , popup }:
+      melpaBuild {
         pname = "git-messenger";
         version = "20170101.2040";
         src = fetchFromGitHub {
           owner = "syohex";
           repo = "emacs-git-messenger";
-          rev = "83815915eb8c1cb47443ff34bca3fecf7d2edf3a";
-          sha256 = "1jkfzcn8gl3s5y2hwqkac7lm88q80hgcp66zvy7vnylka1scb6lz";
+          rev = "bb838c62662dbc3bed2a8aae5f622fbd8f45dd08";
+          sha256 = "0w866cjzaqllf5xjs77mfsj1lw3ll4j5z770cndbkyfbmcwpama0";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e791293133f30e5d96c4b29e972f9016c06c476d/recipes/git-messenger";
           sha256 = "1rnqsv389why13cy6462vyq12qc2zk58p01m3hsazp1gpfw2hfzn";
-          name = "git-messenger";
+          name = "recipe";
         };
         packageRequires = [ emacs popup ];
         meta = {
@@ -28695,20 +35935,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    git-msg-prefix = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    git-msg-prefix = callPackage ({ dash
+                                  , emacs
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild
+                                  , s }:
+      melpaBuild {
         pname = "git-msg-prefix";
         version = "20180118.646";
         src = fetchFromGitHub {
           owner = "kidd";
           repo = "git-msg-prefix.el";
-          rev = "848f2c7475f5e4937b09f55e85ea89a3be5f8588";
-          sha256 = "0ab6qjq5nky15vj88j5s8sh7gp9lbwgxrfqsc08bg6gdf2rx2dvx";
+          rev = "c6acf10b014607f1541a398206208e568a4714e4";
+          sha256 = "1jpak1ji63xxpivyjxi0wicw66zbyxdc725nbg8dbf5n3h9v80bk";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bd37811d17beaa54e08eb4968791da960d37b391/recipes/git-msg-prefix";
           sha256 = "0vicaj91yhbzda76wrwmbfby2ikaja52bcm923jx8brjh1wd99wr";
-          name = "git-msg-prefix";
+          name = "recipe";
         };
         packageRequires = [ dash emacs s ];
         meta = {
@@ -28716,8 +35962,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    git-ps1-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    git-ps1-mode = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "git-ps1-mode";
         version = "20180413.247";
         src = fetchFromGitHub {
@@ -28726,10 +35975,10 @@
           rev = "6a06bf57cbe614ab26032b153d3dcf4fb4bfa7ee";
           sha256 = "1lgvzla1bg7gmkj41hmzhiqcbdmdw9ycpzfvpl6xl0sm0fk3j3rj";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ea177b5ea168828881bd8dcd29ef6b4cb81317f0/recipes/git-ps1-mode";
           sha256 = "15gswi9s0m3hrsl1qqyjnjgbglsai95klbdp51h3pcq7zj22wkn6";
-          name = "git-ps1-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -28737,20 +35986,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    git-timemachine = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    git-timemachine = callPackage ({ emacs
+                                   , fetchFromGitLab
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "git-timemachine";
-        version = "20180307.414";
-        src = fetchFromGitHub {
+        version = "20180607.120";
+        src = fetchFromGitLab {
           owner = "pidu";
           repo = "git-timemachine";
-          rev = "dbcb92ffaa5f8350d47f4fbd74512f4000b8c043";
-          sha256 = "1ml06jfjyrcqmbpr5hqvbpi3yy6l2aa836jq8qjla1h74g9qka7z";
+          rev = "90a980578249c102da3e904fccdc9a2a5a0e7bcc";
+          sha256 = "027zpl603kad2x59wzygiblpc84cn945fnqpm7m1yi3lw4smxsbr";
         };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/41e95e41fc429b688f0852f58ec6ce80303b68ce/recipes/git-timemachine";
-          sha256 = "0nhl3g31r4a8j7rp5kbh17ixi16w32h80bc92vvjj3dlmk996nzq";
-          name = "git-timemachine";
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/a52b516b7b10bdada2f64499c8f43f85a236f254/recipes/git-timemachine";
+          sha256 = "06xdzic7j3d3pqgwxp1q6fs8sf3mi02a9phjvhk90kyvbr8h94ck";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -28758,20 +36011,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    git-wip-timemachine = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    git-wip-timemachine = callPackage ({ fetchFromGitHub
+                                       , fetchurl
+                                       , lib
+                                       , melpaBuild
+                                       , s }:
+      melpaBuild {
         pname = "git-wip-timemachine";
         version = "20150408.306";
         src = fetchFromGitHub {
           owner = "itsjeyd";
           repo = "git-wip-timemachine";
-          rev = "ed4c7931a5f5233bf3e358b1e81647d063526460";
-          sha256 = "1ivnf4vsqk6c7iw1cid7q1hxp7047ajd1mpg0fl002d7m7ginhyl";
+          rev = "1ce257e6c25117b01f1b899aca21e07eae084d40";
+          sha256 = "116zn8hs1igfdlhga4pav9kq6znl1bk7shbmkck7jvhb2prmqjqb";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/81b5dd5765f52efdb88fdc14f48af641a18b3dcb/recipes/git-wip-timemachine";
           sha256 = "02fi51k6l23cgnwjp507ylkiwb8azmnhc0fips68nwn9dghzp6dw";
-          name = "git-wip-timemachine";
+          name = "recipe";
         };
         packageRequires = [ s ];
         meta = {
@@ -28779,20 +36036,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    gitattributes-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    gitattributes-mode = callPackage ({ fetchFromGitHub
+                                      , fetchurl
+                                      , lib
+                                      , melpaBuild }:
+      melpaBuild {
         pname = "gitattributes-mode";
         version = "20180318.1256";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "git-modes";
-          rev = "b08ac12f09a6cfe967ef70dad3f22430da4fbdab";
-          sha256 = "13zwdl0gn8ykqprqv3f3sfjsdqx9zk8ih4k4y7qm5i36crip8nyy";
+          rev = "95ad581ae2aeba87b418ae9554eb326cdba9837d";
+          sha256 = "15irwyc0fmp0k5dag1n07xa8ka7n84drbrg2savslvb9m71011dg";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4b4e2ddd2a80875afc0fc654052e6cbff2f3777f/recipes/gitattributes-mode";
           sha256 = "1gjs0pjh6ap0h54savamzx94lq6vqrg58jxqaq5n5qplrbg15a6x";
-          name = "gitattributes-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -28800,20 +36060,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    gitconfig = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    gitconfig = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "gitconfig";
         version = "20130718.235";
         src = fetchFromGitHub {
           owner = "tonini";
           repo = "gitconfig.el";
-          rev = "7612a37ca14009cac8fb8d6b6f54adad739a5741";
-          sha256 = "184q3vsxa9rvhc1n57ms47r73f3zap25wswzi66rm6rmfi2k7678";
+          rev = "6c313a39e20702ddcebc12d146f69db1ce668901";
+          sha256 = "0j0w6ywhiapmx7dk20yw3zgf8803kmccnjsr664am3g85kbb644v";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/gitconfig";
           sha256 = "0lqm04nfhhhsdagrjnnagkpg7vpswd8lkd3l52lmpdh0fy16kgrf";
-          name = "gitconfig";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -28821,20 +36084,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    gitconfig-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    gitconfig-mode = callPackage ({ fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "gitconfig-mode";
         version = "20180318.1256";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "git-modes";
-          rev = "b08ac12f09a6cfe967ef70dad3f22430da4fbdab";
-          sha256 = "13zwdl0gn8ykqprqv3f3sfjsdqx9zk8ih4k4y7qm5i36crip8nyy";
+          rev = "ae6e897c06d3ff609a65a3ac2500d21ccc888822";
+          sha256 = "111pm9wwq8p3wiqgap7gyi20say3daadlaxgq2v3mwxyax8fyx34";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/44a37f59b87f59a587f6681e7aadfabf137c98d7/recipes/gitconfig-mode";
           sha256 = "0hqky40kcgxdnghnf56gpi0xp7ik45ssia1x84v0mvfwqc50dgn1";
-          name = "gitconfig-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -28842,20 +36108,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    github-browse-file = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    github-browse-file = callPackage ({ cl-lib ? null
+                                      , fetchFromGitHub
+                                      , fetchurl
+                                      , lib
+                                      , melpaBuild }:
+      melpaBuild {
         pname = "github-browse-file";
         version = "20160205.627";
         src = fetchFromGitHub {
           owner = "osener";
           repo = "github-browse-file";
-          rev = "9742a5183af853788c6ecb83fb7ee0b00d1675ac";
-          sha256 = "0i3dkm0j4gh21b7r5vxr6dddql5rj7lg8xlaairvild0ccf3bhdl";
+          rev = "177667b8dac640f3dabacc4395e09451c5e88c53";
+          sha256 = "01vw0nvbhnk9mni3wsm3jf9lqca9x4kn1xfpviqfkciwln7hblqk";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f8bca60348fc5e2ad55663e69b8690093cf861ca/recipes/github-browse-file";
           sha256 = "03xvgxlw7wmfby898din7dfcg87ihahkhlav1n7qklw6qi7skjcr";
-          name = "github-browse-file";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -28863,8 +36133,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    github-clone = callPackage ({ emacs, fetchFromGitHub, fetchurl, gh, lib, magit, melpaBuild }:
-    melpaBuild {
+    github-clone = callPackage ({ emacs
+                                , fetchFromGitHub
+                                , fetchurl
+                                , gh
+                                , lib
+                                , magit
+                                , melpaBuild }:
+      melpaBuild {
         pname = "github-clone";
         version = "20160622.2010";
         src = fetchFromGitHub {
@@ -28873,10 +36149,10 @@
           rev = "467b40ca60a6c26257466ebc43c74414df7f19cc";
           sha256 = "1gdx9sl509vn4bagqg8vi1wvj1h3ryfvd5ggs2mv9rry6x9dg823";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ba11d6a5cc2fbc76037687c842f90dc815a6468e/recipes/github-clone";
           sha256 = "0ffrm4lmcj3d9kx3g2d5xbiih7hn4frs0prjrvcjq8acvsbc50q9";
-          name = "github-clone";
+          name = "recipe";
         };
         packageRequires = [ emacs gh magit ];
         meta = {
@@ -28884,20 +36160,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    github-elpa = callPackage ({ commander, fetchFromGitHub, fetchurl, git, lib, melpaBuild, package-build }:
-    melpaBuild {
+    github-elpa = callPackage ({ commander
+                               , fetchFromGitHub
+                               , fetchurl
+                               , git
+                               , lib
+                               , melpaBuild
+                               , package-build }:
+      melpaBuild {
         pname = "github-elpa";
-        version = "20160922.907";
+        version = "20180704.2247";
         src = fetchFromGitHub {
           owner = "10sr";
           repo = "github-elpa";
-          rev = "7619a564edb1985b0487786a3b4ec6d12f897b5b";
-          sha256 = "176x0dclclpa6am091f866ybqhhdnlq7jgsik5b5m74dl26bcxcg";
+          rev = "abe92cc25c9d75dab4f8bcf0eccafdd8a26774d6";
+          sha256 = "0rx61fsvl99r2p3f3y7rgwf7m084lqi0xsdz0w8cml67sd5qm54g";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/81ec06e370f51b750ba3313b661d7386710cffb0/recipes/github-elpa";
           sha256 = "1981dnz49l5r4qsn49i4dhy6x4ln0haff6gl2zx0p5p0zfkzbi7x";
-          name = "github-elpa";
+          name = "recipe";
         };
         packageRequires = [ commander git package-build ];
         meta = {
@@ -28905,8 +36187,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    github-issues = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    github-issues = callPackage ({ emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "github-issues";
         version = "20160616.1141";
         src = fetchFromGitHub {
@@ -28915,10 +36201,10 @@
           rev = "816f7712b0eb05bffec0add3507302862d2629c4";
           sha256 = "1x6jbnx9lwgy64nl9lpp01xcj9cbx5fq435iwhiarjdsm4kvixb5";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f761e76236e9372d5fae6b5c5dcb1992c5d64d37/recipes/github-issues";
           sha256 = "12c6yb3v7xwkzc51binfgl4jb3sm3al5nlrklbsxhn44alazsvb0";
-          name = "github-issues";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -28926,8 +36212,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    github-modern-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    github-modern-theme = callPackage ({ fetchFromGitHub
+                                       , fetchurl
+                                       , lib
+                                       , melpaBuild }:
+      melpaBuild {
         pname = "github-modern-theme";
         version = "20171109.451";
         src = fetchFromGitHub {
@@ -28936,10 +36225,10 @@
           rev = "a7e7b8e5e9c122138e79e837caf9b7299e748d44";
           sha256 = "0agfy3wiznb2ksfa00g7066mb0vps4g74mj6nl9wkvx847dzg34h";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d5506d93bd8cf59cd281091b377c1bb9a4243666/recipes/github-modern-theme";
           sha256 = "1falal6cffiih3q8q9xdyv7bkzw43p56d8ln13g9ad1jz319b3fi";
-          name = "github-modern-theme";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -28947,20 +36236,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    github-notifier = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    github-notifier = callPackage ({ emacs
+                                   , fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "github-notifier";
-        version = "20170604.2119";
+        version = "20180420.2016";
         src = fetchFromGitHub {
           owner = "xuchunyang";
           repo = "github-notifier.el";
-          rev = "f8d011ebef9f626a94a27b5576c8ed06e6ff8987";
-          sha256 = "0glkn36fs93y2n1583k8v958qfhl212hbdk3cpkq432hj08wzjnr";
+          rev = "274f3812926ea371346f639fcee98066f6e8c96f";
+          sha256 = "1qv66sdi8zm8nv1xc32lsmm2bgkxf03hb8sfz59mbvzhy6r7dxin";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c09f4e7e8a84a241881d214e8359f8a50ab14ddf/recipes/github-notifier";
           sha256 = "1jqc2wx1pvkca8syj97ds32404szm0wn12b7zpa98265sg3n64nw";
-          name = "github-notifier";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -28968,20 +36261,27 @@
           license = lib.licenses.free;
         };
       }) {};
-    github-pullrequest = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild, request }:
-    melpaBuild {
+    github-pullrequest = callPackage ({ dash
+                                      , emacs
+                                      , fetchFromGitHub
+                                      , fetchurl
+                                      , lib
+                                      , magit
+                                      , melpaBuild
+                                      , request }:
+      melpaBuild {
         pname = "github-pullrequest";
         version = "20170115.2216";
         src = fetchFromGitHub {
           owner = "jakoblind";
           repo = "github-pullrequest";
-          rev = "6ae5c38b0fc15b638b5ba4490112d9822ce5e267";
-          sha256 = "1yr7v2wdrvwb1slks83bbh857qq1n207rdk48y8qwlcxbk4ygdr6";
+          rev = "471816e09d1e140a0975911fe020c6c659f71209";
+          sha256 = "0y7i2zgln3mjj8sm8r4fi67izzyqdxfzj71m2q43dzr8rkrby0qc";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/github-pullrequest";
           sha256 = "1p5mwpl59iwd1aqczf1b5shcpzhlqwrcy2vp46c276mhqx15r8fr";
-          name = "github-pullrequest";
+          name = "recipe";
         };
         packageRequires = [ dash emacs magit request ];
         meta = {
@@ -28989,8 +36289,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    github-search = callPackage ({ fetchFromGitHub, fetchurl, gh, lib, magit, melpaBuild }:
-    melpaBuild {
+    github-search = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , gh
+                                 , lib
+                                 , magit
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "github-search";
         version = "20170823.2023";
         src = fetchFromGitHub {
@@ -28999,10 +36304,10 @@
           rev = "c5fa1d9f8f9bcf201fa31478a6f5e02ed5ac086b";
           sha256 = "1v9kswj65sdb90lr4a2xqai55kyp3jp46nksikxx9m243nxdsh9q";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/733a808400858513137e0e3d7d38b5b25e8ddc5a/recipes/github-search";
           sha256 = "1pwrzbbwnq0il5494561fyvkr0vmm5jqlvpffgkk28c54vs7ms0b";
-          name = "github-search";
+          name = "recipe";
         };
         packageRequires = [ gh magit ];
         meta = {
@@ -29010,20 +36315,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    github-stars = callPackage ({ emacs, fetchFromGitHub, fetchurl, ghub, lib, melpaBuild }:
-    melpaBuild {
+    github-stars = callPackage ({ emacs
+                                , fetchFromGitHub
+                                , fetchurl
+                                , ghub
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "github-stars";
         version = "20180328.433";
         src = fetchFromGitHub {
           owner = "xuchunyang";
           repo = "github-stars.el";
-          rev = "15cbf15cdd3fbd2139b5c128a173bb8f6a4ef496";
-          sha256 = "10hyjkdbf5b792vfm072g9wizkszwghxs2x5k1hi1q0c4gw5w518";
+          rev = "283dbe4d10f2b11d15d6871e86c28b8f42759b63";
+          sha256 = "1bdhvf2mjg818mfl8w9c2b8prqbd0v59xnjjkaq8qwgb7n7925bq";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/58df7d536f9711e10ecaa6e0a37b9ad255e8fca5/recipes/github-stars";
           sha256 = "1vljmrjid5xxmq5yfmsaq09js7zd75nmm4gd0kwm3lf71pb3lp6f";
-          name = "github-stars";
+          name = "recipe";
         };
         packageRequires = [ emacs ghub ];
         meta = {
@@ -29031,8 +36341,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    github-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    github-theme = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "github-theme";
         version = "20170630.1501";
         src = fetchFromGitHub {
@@ -29041,10 +36354,10 @@
           rev = "29f00a51d949a248a5f6355a97131e216747c797";
           sha256 = "16ldfz1k0hxc1b785gzrf70hg0q88ijjxp39hb62iax1k1aw9vlw";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f4ace4a150faa312ef531182f328a3e039045bd7/recipes/github-theme";
           sha256 = "1c22p17a1d0s30cj40zrszyznch6nji2risq3b47jhh9i6m32jif";
-          name = "github-theme";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -29052,20 +36365,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    gitignore-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    gitignore-mode = callPackage ({ fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "gitignore-mode";
         version = "20180318.1256";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "git-modes";
-          rev = "b08ac12f09a6cfe967ef70dad3f22430da4fbdab";
-          sha256 = "13zwdl0gn8ykqprqv3f3sfjsdqx9zk8ih4k4y7qm5i36crip8nyy";
+          rev = "ae6e897c06d3ff609a65a3ac2500d21ccc888822";
+          sha256 = "111pm9wwq8p3wiqgap7gyi20say3daadlaxgq2v3mwxyax8fyx34";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/44a37f59b87f59a587f6681e7aadfabf137c98d7/recipes/gitignore-mode";
           sha256 = "1i98ribmnxr4hwphd95f9hcfm5wfwgdbcxw3g0w17ws7z0ir61mn";
-          name = "gitignore-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -29073,20 +36389,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    gitignore-templates = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    gitignore-templates = callPackage ({ emacs
+                                       , fetchFromGitHub
+                                       , fetchurl
+                                       , lib
+                                       , melpaBuild }:
+      melpaBuild {
         pname = "gitignore-templates";
         version = "20180327.626";
         src = fetchFromGitHub {
           owner = "xuchunyang";
           repo = "gitignore-templates.el";
-          rev = "b0705b8de4cbdd631c64c4e0024d62ba4ad68052";
-          sha256 = "1f0lcyw7yrdfmv0h8b87kz0pdrzhy28fzv688z4aaw964qn8jz0k";
+          rev = "2b729c6b76ec940e15c1599a0105149c2e1f4b17";
+          sha256 = "14zsqp128x48d304racw25f1vdi20fadagfqswa5l3rklb0ilbsb";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4c9aa71eac2e68eb1925ed00a2c659c4375bd39c/recipes/gitignore-templates";
           sha256 = "17zx52pmpd4yqlnj39v7ym728i710mdl0by3lc8zk6ljfz77933w";
-          name = "gitignore-templates";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -29094,8 +36414,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    gitlab = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, request, s }:
-    melpaBuild {
+    gitlab = callPackage ({ dash
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild
+                          , pkg-info
+                          , request
+                          , s }:
+      melpaBuild {
         pname = "gitlab";
         version = "20180312.947";
         src = fetchFromGitHub {
@@ -29104,10 +36431,10 @@
           rev = "68318aca3206d50701039c9aae39734ca29a49f9";
           sha256 = "0arsjdn0anp7pacwxd3cw4db8a7pgzjlnwav1l3maaz1176h4lpb";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1d012991188956f6e06c37d504b0d06ab31487b9/recipes/gitlab";
           sha256 = "0vxsqfnipgapnd2ijvdnkspk68dlnki3pkpkzg2h6hyazmzrsqnq";
-          name = "gitlab";
+          name = "recipe";
         };
         packageRequires = [ dash pkg-info request s ];
         meta = {
@@ -29115,20 +36442,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    gitlab-ci-mode = callPackage ({ emacs, fetchFromGitLab, fetchurl, lib, melpaBuild, yaml-mode }:
-    melpaBuild {
+    gitlab-ci-mode = callPackage ({ emacs
+                                  , fetchFromGitLab
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild
+                                  , yaml-mode }:
+      melpaBuild {
         pname = "gitlab-ci-mode";
-        version = "20180401.252";
+        version = "20180604.1503";
         src = fetchFromGitLab {
           owner = "joewreschnig";
           repo = "gitlab-ci-mode";
-          rev = "19a377aa42cd8a8bea74ae900fedc2ac74a323a5";
-          sha256 = "0wjz87nhcwzp201jxv3qlj88hn7p8nvq20924y06gra2d656znar";
+          rev = "b9fd692d27351e959c4d272a2149def63ef1c00c";
+          sha256 = "132b0m3sp6vwknr665aw1mwx1q69ksrmr6xih7qi6nfgny6938qc";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d7915ddcf21fdec539a86bb86c209cf0bbd378cb/recipes/gitlab-ci-mode";
           sha256 = "1jg6ihrgccrcwg30ysyqw9k7rmvfmsrp70skr2057hfamvccwn4f";
-          name = "gitlab-ci-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs yaml-mode ];
         meta = {
@@ -29136,20 +36468,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    gitlab-ci-mode-flycheck = callPackage ({ emacs, fetchFromGitLab, fetchurl, flycheck, gitlab-ci-mode, lib, melpaBuild }:
-    melpaBuild {
+    gitlab-ci-mode-flycheck = callPackage ({ emacs
+                                           , fetchFromGitLab
+                                           , fetchurl
+                                           , flycheck
+                                           , gitlab-ci-mode
+                                           , lib
+                                           , melpaBuild }:
+      melpaBuild {
         pname = "gitlab-ci-mode-flycheck";
-        version = "20180401.255";
+        version = "20180604.1504";
         src = fetchFromGitLab {
           owner = "joewreschnig";
           repo = "gitlab-ci-mode-flycheck";
-          rev = "adc5658fe3c90ff944b6ca481773b316a6016e86";
-          sha256 = "111clb37329c7v0lv1lwypb8bv7qb9f495f2cy45j2n711vymdna";
+          rev = "30ea0eab74b24818f187242b079845785035e967";
+          sha256 = "0awv24znkxs0h8pkj4b5jwjajxkf1agam09m5glr8zn5g3xbj798";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d7915ddcf21fdec539a86bb86c209cf0bbd378cb/recipes/gitlab-ci-mode-flycheck";
           sha256 = "19ixd60yynsvmaj7mkppp6k73793x794vrnhx3hh6n7dap1rsjdh";
-          name = "gitlab-ci-mode-flycheck";
+          name = "recipe";
         };
         packageRequires = [ emacs flycheck gitlab-ci-mode ];
         meta = {
@@ -29157,8 +36495,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    gitolite-clone = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pcache, s }:
-    melpaBuild {
+    gitolite-clone = callPackage ({ dash
+                                  , emacs
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild
+                                  , pcache
+                                  , s }:
+      melpaBuild {
         pname = "gitolite-clone";
         version = "20160609.1655";
         src = fetchFromGitHub {
@@ -29167,10 +36512,10 @@
           rev = "d8a4c2875c984e51137c980b5773f42703602721";
           sha256 = "11i9hxj76869w1z9xn7wq370v56hx5hm4d7msn4zgp64glpa66j9";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/gitolite-clone";
           sha256 = "0mv2bdfqqq47wgikkm5kwpr8gajylf1yzk2j6cxljz09amgq6c8q";
-          name = "gitolite-clone";
+          name = "recipe";
         };
         packageRequires = [ dash emacs pcache s ];
         meta = {
@@ -29178,8 +36523,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    gitpatch = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    gitpatch = callPackage ({ emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "gitpatch";
         version = "20170721.2110";
         src = fetchFromGitHub {
@@ -29188,10 +36537,10 @@
           rev = "577d5adf65c8133caa325c10e89e1e2fc323c907";
           sha256 = "1jj12pjwza6cq8a3kr8nqnmm3vxs0wam8h983irry4xr4ifywsn4";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e1746d87f65dc4b0d8f47c7d6ba4c7e0dfa35953/recipes/gitpatch";
           sha256 = "0qaswkk06z24v40nkjkv7f6gfv0dlsjd6wchkn0ppqw95883vhv1";
-          name = "gitpatch";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -29199,8 +36548,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    gitter = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }:
-    melpaBuild {
+    gitter = callPackage ({ emacs
+                          , fetchFromGitHub
+                          , fetchurl
+                          , let-alist
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "gitter";
         version = "20180122.56";
         src = fetchFromGitHub {
@@ -29209,10 +36563,10 @@
           rev = "11cb9b4b45f67bdc24f055a9bfac21d2bd19ea1a";
           sha256 = "14ri86kxqz9qfhcr0bkgfyggy4bgg9imk9akhw6dfzqkl90gn2gy";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b8076c3b4d60e4c505bb6f4e426ecc4f69d74684/recipes/gitter";
           sha256 = "1ad5abqgfh6x2fcqbbdvgbg8xin69j0h93z7bav1hs3jla7mgwnv";
-          name = "gitter";
+          name = "recipe";
         };
         packageRequires = [ emacs let-alist ];
         meta = {
@@ -29220,8 +36574,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    gl-conf-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    gl-conf-mode = callPackage ({ emacs
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "gl-conf-mode";
         version = "20170714.610";
         src = fetchFromGitHub {
@@ -29230,10 +36588,10 @@
           rev = "9136a9b737e0a5b6471a91571d104c487c43f35b";
           sha256 = "0wls3sfplrf7wkg7g7fxx4s87cvm3p7myxw6k91np6pbfh8p0s9q";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e3117e62d429e44506f7d82fc64252d41bc1a4b6/recipes/gl-conf-mode";
           sha256 = "0lf8xmq309aqyf16ymqlr8gj2qawlsqagbdndj0kgj72dnnw4cfm";
-          name = "gl-conf-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -29241,20 +36599,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    glab = callPackage ({ emacs, fetchFromGitHub, fetchurl, ghub, lib, melpaBuild }:
-    melpaBuild {
+    glab = callPackage ({ emacs
+                        , fetchFromGitHub
+                        , fetchurl
+                        , ghub
+                        , lib
+                        , melpaBuild }:
+      melpaBuild {
         pname = "glab";
-        version = "20180319.828";
+        version = "20180419.308";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "ghub";
-          rev = "27e7b17473d17b684ddf873e4281f2595c05ca65";
-          sha256 = "00yjgz8c03l8v99gi2ly08iwp10bv5s6hhhlvw1kyg00mflgn4m9";
+          rev = "4831933da059ee084a16016558b9ccd8c581a8ff";
+          sha256 = "1b5jrpj3z989r3mf4jfch8rnaaa5hyb2395xz3v37f0vsphd7s0y";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/70a4dbd62fd6ebb4e056d0e97fa1a958437ddc91/recipes/glab";
           sha256 = "0ym8bgym11mdv5bw22lgkcxyqy7qgxxm0yjmrq8qx7i55gqayyb8";
-          name = "glab";
+          name = "recipe";
         };
         packageRequires = [ emacs ghub ];
         meta = {
@@ -29262,8 +36625,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    glsl-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    glsl-mode = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "glsl-mode";
         version = "20170927.736";
         src = fetchFromGitHub {
@@ -29272,10 +36638,10 @@
           rev = "384968506cf25c5c2df61b32fdfdbd041e3bf651";
           sha256 = "0729s4w010vw4ajvh1zpni7szxv9rpm6jk2y9hp7qyi67zbgjjgc";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c416822d54df436f29dcf9a5f26398685fdc17a2/recipes/glsl-mode";
           sha256 = "0d05qb60k5f7wwpsp3amzghayfbwcha6rh8nrslhnklpjbg87aw5";
-          name = "glsl-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -29283,8 +36649,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    gmail-message-mode = callPackage ({ fetchFromGitHub, fetchurl, ham-mode, lib, melpaBuild }:
-    melpaBuild {
+    gmail-message-mode = callPackage ({ fetchFromGitHub
+                                      , fetchurl
+                                      , ham-mode
+                                      , lib
+                                      , melpaBuild }:
+      melpaBuild {
         pname = "gmail-message-mode";
         version = "20160627.1147";
         src = fetchFromGitHub {
@@ -29293,10 +36663,10 @@
           rev = "ec36672a9dc93c09ebe2f77597b498d11883d008";
           sha256 = "0xcdd3abcrqr7nabdmmh0kgfar64hhgnrhsiwg3q201cymhnv49p";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/gmail-message-mode";
           sha256 = "0py0i7b893ihb8l1hmk3jfl0xil450znadcd18q7svr3zl2m0gkk";
-          name = "gmail-message-mode";
+          name = "recipe";
         };
         packageRequires = [ ham-mode ];
         meta = {
@@ -29304,8 +36674,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    gmail2bbdb = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    gmail2bbdb = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "gmail2bbdb";
         version = "20170423.444";
         src = fetchFromGitHub {
@@ -29314,10 +36687,10 @@
           rev = "a84fa385cfaec7fc5f1518c368e52722da139f99";
           sha256 = "1qbf3r8a66xlrbni3hv5q5b5v3izis5aid06228rfpc2hwa97hr7";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fb3c88b20a7614504165cd5fb459b0a9d5c73f60/recipes/gmail2bbdb";
           sha256 = "03jhrk4vpjim3ybzjxy7s9r1cgjysj9vlc4criz5k0w7vqz3r28j";
-          name = "gmail2bbdb";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -29325,8 +36698,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    gmpl-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    gmpl-mode = callPackage ({ emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "gmpl-mode";
         version = "20171031.1354";
         src = fetchFromGitHub {
@@ -29335,10 +36712,10 @@
           rev = "c5d362169819ee8b8e8954145daee7e260c54921";
           sha256 = "00p2z6kbyc0bas21d1zygx7z49w6mf22y9kf1rcm9gqsnnadb4j9";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c89a523f87db358c477e5840b0e043e9f253e640/recipes/gmpl-mode";
           sha256 = "1f60xim8h85jmqpvgfg402ff8mjd66gla8fa0cwi7l18ijnjblpz";
-          name = "gmpl-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -29346,20 +36723,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    gnome-calendar = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    gnome-calendar = callPackage ({ fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "gnome-calendar";
         version = "20161110.456";
         src = fetchFromGitHub {
           owner = "NicolasPetton";
           repo = "gnome-calendar.el";
-          rev = "489f9f15f7bb35696b1cc19db75b554ae8328df2";
-          sha256 = "1aca65g4rfpsm4yk5k2bj6kbb2wrf6s14m8jgv1p94mqmzkj7rlq";
+          rev = "668591bec95c23934c5e1ef100cec4824e7cb25d";
+          sha256 = "01dgv24snakxr7smkza6334wr74q74g0mrkzd93xwdxrm5k68ahg";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8e497668d65f0eabd15e39b7492adb395a5a8e75/recipes/gnome-calendar";
           sha256 = "00clamlm5b42zqggxywdqrf6s2dnsxir5rpd8mjpyc502kqmsfn6";
-          name = "gnome-calendar";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -29367,8 +36747,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    gnomenm = callPackage ({ dash, fetchFromGitHub, fetchurl, kv, lib, melpaBuild, s }:
-    melpaBuild {
+    gnomenm = callPackage ({ dash
+                           , fetchFromGitHub
+                           , fetchurl
+                           , kv
+                           , lib
+                           , melpaBuild
+                           , s }:
+      melpaBuild {
         pname = "gnomenm";
         version = "20150316.1218";
         src = fetchFromGitHub {
@@ -29377,10 +36763,10 @@
           rev = "9065cda44ffc9e06239b8189a0154d31314c3b4d";
           sha256 = "1svnvm9fqqx4mrk9jjn11pzqwk71w8kyyd9wwxam8gz22ykw5jb2";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/dd98221d3498528efb0f2d943102d32ebd7b34b3/recipes/gnomenm";
           sha256 = "01vmr64j6hcvdbzg945c5a2g4fiidl18dsk4px7mdf85cv45kzqm";
-          name = "gnomenm";
+          name = "recipe";
         };
         packageRequires = [ dash kv s ];
         meta = {
@@ -29388,8 +36774,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    gntp = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    gntp = callPackage ({ fetchFromGitHub
+                        , fetchurl
+                        , lib
+                        , melpaBuild }:
+      melpaBuild {
         pname = "gntp";
         version = "20141024.1950";
         src = fetchFromGitHub {
@@ -29398,10 +36787,10 @@
           rev = "767571135e2c0985944017dc59b0be79af222ef5";
           sha256 = "1nvyjjjydrimpxy4cpg90si7sr8lmldbhlcm2mx8npklp9pn5y3a";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c69a148d3b72d1be6ea10100a8e0cbbd918baa9c/recipes/gntp";
           sha256 = "1ywj3p082g54dcpy8q4jnkqfr12npikx8yz14r0njxdlr0janh4f";
-          name = "gntp";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -29409,8 +36798,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    gnu-apl-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    gnu-apl-mode = callPackage ({ emacs
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "gnu-apl-mode";
         version = "20180129.2300";
         src = fetchFromGitHub {
@@ -29419,10 +36812,10 @@
           rev = "fa569827c916ed46e410e9f28e4b4d28f8567654";
           sha256 = "0x1i1xcd3d34c9c87isd39d9ra69ywd01ag0hgkkgdzrk44znshj";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/369a55301bba0c4f7ce27f6e141944a523beaa0f/recipes/gnu-apl-mode";
           sha256 = "0971pzc14gw8f0b4lzvicxww1k3wc58gbr3fd0qvdra2jifk2is6";
-          name = "gnu-apl-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -29430,8 +36823,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    gnuplot = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    gnuplot = callPackage ({ fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "gnuplot";
         version = "20141231.1337";
         src = fetchFromGitHub {
@@ -29440,10 +36836,10 @@
           rev = "21f9046e3f5caad41b750b5c9cee02fa4fd20fb9";
           sha256 = "1gm116479gdwc4hr3nyv1id692dcd1sx7w2a80pvmgr35ybccn7c";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/78be03893e4b0502ce999375e5630d32bda56ac1/recipes/gnuplot";
           sha256 = "06c5gqf02fkra8c52xck1lqvf4yg45zfibyf9zqmnbwk7p2jxrds";
-          name = "gnuplot";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -29451,8 +36847,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    gnuplot-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    gnuplot-mode = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "gnuplot-mode";
         version = "20171013.916";
         src = fetchFromGitHub {
@@ -29461,10 +36860,10 @@
           rev = "601f6392986f0cba332c87678d31ae0d0a496ce7";
           sha256 = "14f0yh1rjqc3337j4sbqzfb7pjim2c8a7wk1a73xkrdkmjn82vgb";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d801a2e0ba5ae7c65b5d312fbf41261278a8b1ba/recipes/gnuplot-mode";
           sha256 = "1avpik06cmi4h6v6039c64b4zw1r1nsg3nrryl254gl881pysfxg";
-          name = "gnuplot-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -29472,8 +36871,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    gnus-alias = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    gnus-alias = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "gnus-alias";
         version = "20150315.1742";
         src = fetchFromGitHub {
@@ -29482,10 +36884,10 @@
           rev = "9447d3ccb4c0e75d0468899cccff7aa249657bac";
           sha256 = "1i278npayv3kfxxd1ypi9n83q5l402sbc1zkm11pf8g006ifqsp4";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6176257e00ca09e79fdff03c6dd450af8eb83666/recipes/gnus-alias";
           sha256 = "0mbq9v8fiqqyldpb66v9bc777mzxywaq2dabivabxjg6554s8chf";
-          name = "gnus-alias";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -29493,20 +36895,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    gnus-desktop-notify = callPackage ({ fetchFromGitHub, fetchurl, gnus ? null, lib, melpaBuild }:
-    melpaBuild {
+    gnus-desktop-notify = callPackage ({ fetchFromGitLab
+                                       , fetchurl
+                                       , gnus ? null
+                                       , lib
+                                       , melpaBuild }:
+      melpaBuild {
         pname = "gnus-desktop-notify";
-        version = "20171007.1235";
-        src = fetchFromGitHub {
+        version = "20180623.838";
+        src = fetchFromGitLab {
           owner = "wavexx";
           repo = "gnus-desktop-notify.el";
-          rev = "52e5de0961ce0f6890d5e7f26bc05152b99d9979";
-          sha256 = "0r28hrlkji8z62nra71p0q6gvh21w90pyvmgskzjldmj78yjqbdj";
+          rev = "44ebe0241a19f4052cd427dff408206542aa3c8f";
+          sha256 = "1fqkclbddwfqywvkrb7l2cpibapxrk82ikdpbxapj09iwyn3ijlz";
         };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/gnus-desktop-notify";
-          sha256 = "08k32vhdp6i8c03rp1k6b5jmvj5ijplj26mdblrgasklcqbdnlfs";
-          name = "gnus-desktop-notify";
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/c1cf98dff029d494007fe25d29bd8bcfecc5b8e6/recipes/gnus-desktop-notify";
+          sha256 = "1cfcmmq0ywgp41g0rf8s5fabh3yqbv9iacxi7v74kqh59bqdnz3x";
+          name = "recipe";
         };
         packageRequires = [ gnus ];
         meta = {
@@ -29514,8 +36920,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    gnus-select-account = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    gnus-select-account = callPackage ({ fetchFromGitHub
+                                       , fetchurl
+                                       , lib
+                                       , melpaBuild }:
+      melpaBuild {
         pname = "gnus-select-account";
         version = "20170721.2211";
         src = fetchFromGitHub {
@@ -29524,10 +36933,10 @@
           rev = "ddc8c135eeaf90f5b6692a033af2badae36e68ce";
           sha256 = "0csq8cqv028g3mrvk88l0nlj3dk5fh67c10hdjwvxbf7winv0391";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e1746d87f65dc4b0d8f47c7d6ba4c7e0dfa35953/recipes/gnus-select-account";
           sha256 = "1yini6kif7vp5msmhnnpfkab5m5px8y4wgvc0f0k79kdd17gvpsx";
-          name = "gnus-select-account";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -29535,8 +36944,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    gnus-summary-ext = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    gnus-summary-ext = callPackage ({ fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "gnus-summary-ext";
         version = "20180113.516";
         src = fetchFromGitHub {
@@ -29545,10 +36957,10 @@
           rev = "025fd853fe9280ae696a89ec2c2cac9befd010aa";
           sha256 = "07ww2nc03daz70f2ajw7b2gin22xa306001zclhrxkm1cpjif2fi";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5ca4a905b5f81991074c7d3e41d4422c7e6713d5/recipes/gnus-summary-ext";
           sha256 = "0svyz8fy4k9ba6gpdymf4cf8zjjpgm71y48vlybxbv507xjm17qf";
-          name = "gnus-summary-ext";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -29556,20 +36968,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    gnus-x-gm-raw = callPackage ({ fetchFromGitHub, fetchurl, lib, log4e, melpaBuild, yaxception }:
-    melpaBuild {
+    gnus-x-gm-raw = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , log4e
+                                 , melpaBuild
+                                 , yaxception }:
+      melpaBuild {
         pname = "gnus-x-gm-raw";
         version = "20140610.31";
         src = fetchFromGitHub {
           owner = "aki2o";
           repo = "gnus-x-gm-raw";
-          rev = "978bdfcecc8844465b71641c2e909fcdc66b22be";
-          sha256 = "1i3f67x2l9l5c5agspbkxr2mmh3rpq3009d8yzh6r1lih0b4hril";
+          rev = "c2c8c5e94ac94f4c40e023452119c088ac59eac9";
+          sha256 = "0gf418ri69yzi9cbxdyna9kxjsniyw72xix2r94m439k1axpwa3f";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/263b87e40e32421ae56a99971a7e1baca0484778/recipes/gnus-x-gm-raw";
           sha256 = "1a5iccghzqmcndql2bppvr48535sf6jbvc83iypr1031z1b5k4wg";
-          name = "gnus-x-gm-raw";
+          name = "recipe";
         };
         packageRequires = [ log4e yaxception ];
         meta = {
@@ -29577,8 +36994,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    go = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    go = callPackage ({ emacs
+                      , fetchFromGitHub
+                      , fetchurl
+                      , lib
+                      , melpaBuild }:
+      melpaBuild {
         pname = "go";
         version = "20161110.1849";
         src = fetchFromGitHub {
@@ -29587,10 +37008,10 @@
           rev = "ff45fb44d9cb6579d8511d8b6156ed0b34d5ac97";
           sha256 = "14av8zcxp9r4ka0h9x73i6gzwbf231wqkin65va3agrzwaf8swz1";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/50e8d089f4e163eb459fc602cb90440b110b489f/recipes/go";
           sha256 = "1mk1j504xwi3xswc0lfr3czs9j6wcsbrw2halr46mraiy8lnbz6h";
-          name = "go";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -29598,8 +37019,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    go-add-tags = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    go-add-tags = callPackage ({ emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild
+                               , s }:
+      melpaBuild {
         pname = "go-add-tags";
         version = "20161123.427";
         src = fetchFromGitHub {
@@ -29608,10 +37034,10 @@
           rev = "54879945e46a0884c5f93d7fd6c866a9cdf401ac";
           sha256 = "1gr65skrd41pk46ilfsbxfdng4br6h9c6blf1q1wx6i9ylhs0ak5";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/55d3b893bd68d3d2d86ecdbb4ed442edd256516a/recipes/go-add-tags";
           sha256 = "0nvas44rsvqzk2ay5bhzkbrnzql13vnxq9pk4lp4mvp86dda9qim";
-          name = "go-add-tags";
+          name = "recipe";
         };
         packageRequires = [ emacs s ];
         meta = {
@@ -29619,20 +37045,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    go-autocomplete = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    go-autocomplete = callPackage ({ auto-complete
+                                   , fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "go-autocomplete";
         version = "20170626.323";
         src = fetchFromGitHub {
           owner = "nsf";
           repo = "gocode";
-          rev = "d7aee89652f1bd8ca319c64d6dee1bc1dfd9b6ef";
-          sha256 = "1mbz80y0qa6vyvjs33hxsrq5vc2mza5rjhi6rvbxzy2a3lrx4cig";
+          rev = "beae6bdcc6fc300059038961b7a3e977e0fb7c61";
+          sha256 = "0fhs17v2x24nhs0kd2yjzr56jni2767yrjxims6phsaxs9m5aih2";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/go-autocomplete";
           sha256 = "1ldsq81a167dk2r2mvzyp3v3j2mxc4l9p6b12i7pv8zrjlkhma5a";
-          name = "go-autocomplete";
+          name = "recipe";
         };
         packageRequires = [ auto-complete ];
         meta = {
@@ -29640,8 +37070,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    go-complete = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }:
-    melpaBuild {
+    go-complete = callPackage ({ cl-lib ? null
+                               , fetchFromGitHub
+                               , fetchurl
+                               , go-mode
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "go-complete";
         version = "20151015.228";
         src = fetchFromGitHub {
@@ -29650,10 +37085,10 @@
           rev = "e39efc356f6e19f17db3f3d2c81f28d38b31a55e";
           sha256 = "0phy24cra8cza89xrqsx9xrwg98v9qwqx0fzgm1gwlf333zb3hha";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4df81abbf3b16f06fa327c1626bef1245ea77758/recipes/go-complete";
           sha256 = "0dl0ibw145f84kd709r5i2kaw07z1sjzn3dmsiqn8dncspcf2vb4";
-          name = "go-complete";
+          name = "recipe";
         };
         packageRequires = [ cl-lib go-mode ];
         meta = {
@@ -29661,20 +37096,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    go-direx = callPackage ({ cl-lib ? null, direx, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    go-direx = callPackage ({ cl-lib ? null
+                            , direx
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "go-direx";
         version = "20150315.1843";
         src = fetchFromGitHub {
           owner = "syohex";
           repo = "emacs-go-direx";
-          rev = "8f2206469328ee932c7f1892f5e1fb02dec98432";
-          sha256 = "09rxz40bkr0l75v3lmf8lcwqsgjiv5c8zjmwzy2d4syj4qv69c5y";
+          rev = "aecb9fef4d56d04d230d37c75c260c8392b5ad9f";
+          sha256 = "05yc0nylg3457an5j7yp3x23157j0hbi21qhcpgsa01144mwnwln";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/032c0c3cd04f36f1bc66bb7d9d789d354c620a09/recipes/go-direx";
           sha256 = "0dq5d7fsld4hww8fl68c18qp6fl3781dqqwd98cg68bihw2wwni7";
-          name = "go-direx";
+          name = "recipe";
         };
         packageRequires = [ cl-lib direx ];
         meta = {
@@ -29682,8 +37122,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    go-dlv = callPackage ({ fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }:
-    melpaBuild {
+    go-dlv = callPackage ({ fetchFromGitHub
+                          , fetchurl
+                          , go-mode
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "go-dlv";
         version = "20160517.1346";
         src = fetchFromGitHub {
@@ -29692,10 +37136,10 @@
           rev = "45a9e8a047c9995eb7c802268d96b3e527569f41";
           sha256 = "0pph99fl3bwws9vr1r8fs411frd04rfdhl87fy2a75cqcpxlhsj4";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/go-dlv";
           sha256 = "0lb5v9pmd6m8nvk4c9gcda5dmshrf5812gg1arq5p2g0nzg32mm8";
-          name = "go-dlv";
+          name = "recipe";
         };
         packageRequires = [ go-mode ];
         meta = {
@@ -29703,8 +37147,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    go-eldoc = callPackage ({ emacs, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }:
-    melpaBuild {
+    go-eldoc = callPackage ({ emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , go-mode
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "go-eldoc";
         version = "20170305.627";
         src = fetchFromGitHub {
@@ -29713,10 +37162,10 @@
           rev = "cbbd2ea1e94a36004432a9ac61414cb5a95a39bd";
           sha256 = "1029qg6ida3cw4ynxll6ykpnqkpbrbrx12nnzcplhc25vqpz7hik";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6ce1190db06cc214746215dd27648eded5fe5140/recipes/go-eldoc";
           sha256 = "1k115dirfqxdnb6hdzlw41xdy2dxp38g3vq5wlvslqggha7gzhkk";
-          name = "go-eldoc";
+          name = "recipe";
         };
         packageRequires = [ emacs go-mode ];
         meta = {
@@ -29724,8 +37173,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    go-errcheck = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    go-errcheck = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "go-errcheck";
         version = "20160722.1743";
         src = fetchFromGitHub {
@@ -29734,10 +37186,10 @@
           rev = "9db21eccecedc2490793f176246094167164af31";
           sha256 = "1ngzgkmcbk6qa3p97hch75k446h15515arsdfv7mqb4m5va6429h";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c874f608a55cafcc6e57ca2c80bdae6b1c2e47e9/recipes/go-errcheck";
           sha256 = "11a75h32cd5h5xjv30x83k60s49k9fhgis31358q46y2gbvqp5bs";
-          name = "go-errcheck";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -29745,8 +37197,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    go-fill-struct = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    go-fill-struct = callPackage ({ emacs
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "go-fill-struct";
         version = "20171224.1931";
         src = fetchFromGitHub {
@@ -29755,10 +37211,10 @@
           rev = "a613d0b378473eef39e8fd5724abe790aea84321";
           sha256 = "16bgfykvqc61hlx1hj55z15y83zgpavhb853sblds75m8w7mndqg";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0c03d2382efd20e248b27b5505cdeed67d000f73/recipes/go-fill-struct";
           sha256 = "19xxqb836saxigvwdqf4xv0y9zrl7csv97x0facgyjyiqmwhx3x7";
-          name = "go-fill-struct";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -29766,8 +37222,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    go-gen-test = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    go-gen-test = callPackage ({ emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild
+                               , s }:
+      melpaBuild {
         pname = "go-gen-test";
         version = "20171022.2058";
         src = fetchFromGitHub {
@@ -29776,10 +37237,10 @@
           rev = "44c202ac97e728e93a35cee028a0ea8dd6e4292c";
           sha256 = "1vi5xsf0xbcbvapi20hsjangwyp38cbgi8kiccpmingnq2kp8ghs";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0861c126161a2674f0e115eac6f948490b142b44/recipes/go-gen-test";
           sha256 = "1pj8n8xj9ccq9ips4wy4v6hdxxgwv11pwi671l6jjrig38v13dzr";
-          name = "go-gen-test";
+          name = "recipe";
         };
         packageRequires = [ emacs s ];
         meta = {
@@ -29787,8 +37248,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    go-gopath = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    go-gopath = callPackage ({ cl-lib ? null
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "go-gopath";
         version = "20160705.334";
         src = fetchFromGitHub {
@@ -29797,10 +37262,10 @@
           rev = "5172fc53f21edbf9347d5ee7d1d745da1ec88a15";
           sha256 = "0gqb3k33y42gchc89rw3k1pvb7ai9ka50ljfd4avk31fdpr4dln5";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1ca8d10b10b015c5bdafe1dbc8e53eb4c0d26d9c/recipes/go-gopath";
           sha256 = "0jfy2r3axqpn2cnibp8f9vw36kmx0icixhj6zy43d9xa4znvdqal";
-          name = "go-gopath";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -29808,20 +37273,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    go-guru = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }:
-    melpaBuild {
+    go-guru = callPackage ({ cl-lib ? null
+                           , fetchFromGitHub
+                           , fetchurl
+                           , go-mode
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "go-guru";
-        version = "20170718.1046";
+        version = "20180628.310";
         src = fetchFromGitHub {
           owner = "dominikh";
           repo = "go-mode.el";
-          rev = "ff87a1e80945d958d9c348ce4d2e65a797b38a4b";
-          sha256 = "182z309aysvi5xg5ymxmdxhkwdllj9v3pi1pajxsgwiq314bycdr";
+          rev = "7f87c32464d2eb22ac7a413cac741a89fbfdc740";
+          sha256 = "06znpm5zfi41rcdrjgf79w9zifn2my56sfys5fyafqc53rjya4pv";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0cede3a468b6f7e4ad88e9fa985f0fdee7d195f5/recipes/go-guru";
           sha256 = "01f0gz65z8d0iv8k49xl2sp6q4qnsvwhd4g8fb2irp7iclb0xmvk";
-          name = "go-guru";
+          name = "recipe";
         };
         packageRequires = [ cl-lib go-mode ];
         meta = {
@@ -29829,8 +37299,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    go-impl = callPackage ({ emacs, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }:
-    melpaBuild {
+    go-impl = callPackage ({ emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , go-mode
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "go-impl";
         version = "20170125.752";
         src = fetchFromGitHub {
@@ -29839,10 +37314,10 @@
           rev = "69f0d0ef05771487e15abec500cd06befd171abf";
           sha256 = "1rmik6g3l9q1bqavmqx1fhcadz4pwswgfnkbaxl6c5b6g2sl26iq";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/aa1a0845cc1a6970018b397d13394aaa8147e5d0/recipes/go-impl";
           sha256 = "09frwpwc080rfpwkb63yv47dyj741lrpyrp65sq2bn4sf03xw0cx";
-          name = "go-impl";
+          name = "recipe";
         };
         packageRequires = [ emacs go-mode ];
         meta = {
@@ -29850,20 +37325,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    go-imports = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    go-imports = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "go-imports";
-        version = "20180325.1918";
+        version = "20180709.2228";
         src = fetchFromGitHub {
           owner = "yasushi-saito";
           repo = "go-imports";
-          rev = "7955b820668af7380e65b418e66e445729ea8ef3";
-          sha256 = "0yykpnnrxjp4zf66l6pcx9xx4v26b6468gyqyf77kr5890ry9sl1";
+          rev = "d9950309c868aa46c45f8671413e53f97dc7fe0b";
+          sha256 = "1nq0s6zkk87jggj91iza9ap255i8r1c8ahb1118s25pvb5gcfnfv";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4118ebf0db84cc047fab311c789bfbffd6eb2d92/recipes/go-imports";
           sha256 = "0xxlh4rmyvfxiynsdqng6wd3js7h3azhb8ii0ch7n0hhqkcnda4x";
-          name = "go-imports";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -29871,20 +37349,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    go-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    go-mode = callPackage ({ fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "go-mode";
         version = "20180327.830";
         src = fetchFromGitHub {
           owner = "dominikh";
           repo = "go-mode.el";
-          rev = "ff87a1e80945d958d9c348ce4d2e65a797b38a4b";
-          sha256 = "182z309aysvi5xg5ymxmdxhkwdllj9v3pi1pajxsgwiq314bycdr";
+          rev = "7c50c800bc06f7e3b2f2d3fc0410e2cea78a5cb3";
+          sha256 = "1ain754h3kglk1qiqjkc3mwcyl2wmqywv4qkqfp7wkyyj34gncb6";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0cede3a468b6f7e4ad88e9fa985f0fdee7d195f5/recipes/go-mode";
           sha256 = "0ghqm4lbkfla79plqiyb1lzf5kbz0380h9vf8px15zal00xrv0bl";
-          name = "go-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -29892,8 +37373,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    go-playground = callPackage ({ emacs, fetchFromGitHub, fetchurl, go-mode, gotest, lib, melpaBuild }:
-    melpaBuild {
+    go-playground = callPackage ({ emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , go-mode
+                                 , gotest
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "go-playground";
         version = "20170226.43";
         src = fetchFromGitHub {
@@ -29902,10 +37389,10 @@
           rev = "559d53bbc507394aaca3683325d17286637bf4f0";
           sha256 = "04hxgi27cyhs07mb0wz21q11b1nxmfsx56gynxjc2gqj2wb5i086";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/900aabb7bc2350698f8740d72a5fad69c9219c33/recipes/go-playground";
           sha256 = "1rabwc80qwkafq833m6a199zfiwwmf0hha89721gc7i0myk9pac6";
-          name = "go-playground";
+          name = "recipe";
         };
         packageRequires = [ emacs go-mode gotest ];
         meta = {
@@ -29913,8 +37400,19 @@
           license = lib.licenses.free;
         };
       }) {};
-    go-playground-cli = callPackage ({ cl-lib ? null, deferred, emacs, f, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, names, request, s }:
-    melpaBuild {
+    go-playground-cli = callPackage ({ cl-lib ? null
+                                     , deferred
+                                     , emacs
+                                     , f
+                                     , fetchFromGitHub
+                                     , fetchurl
+                                     , let-alist
+                                     , lib
+                                     , melpaBuild
+                                     , names
+                                     , request
+                                     , s }:
+      melpaBuild {
         pname = "go-playground-cli";
         version = "20160503.214";
         src = fetchFromGitHub {
@@ -29923,10 +37421,10 @@
           rev = "60beebd98e3930641d41cee0189c579626f223bc";
           sha256 = "1fcm65r1sy2fmcp2i7mwc7mxqiaf4aaxda4i2qrm8s25cxsffir7";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3af0a72ee1222c133ccfd76f004a346fd6110eee/recipes/go-playground-cli";
           sha256 = "00h89rh8d7lq1di77nv609xbzxmjmffq6mz3cmagylxncflg81jc";
-          name = "go-playground-cli";
+          name = "recipe";
         };
         packageRequires = [ cl-lib deferred emacs f let-alist names request s ];
         meta = {
@@ -29934,8 +37432,16 @@
           license = lib.licenses.free;
         };
       }) {};
-    go-projectile = callPackage ({ fetchFromGitHub, fetchurl, go-eldoc, go-guru, go-mode, go-rename, lib, melpaBuild, projectile }:
-    melpaBuild {
+    go-projectile = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , go-eldoc
+                                 , go-guru
+                                 , go-mode
+                                 , go-rename
+                                 , lib
+                                 , melpaBuild
+                                 , projectile }:
+      melpaBuild {
         pname = "go-projectile";
         version = "20170302.1705";
         src = fetchFromGitHub {
@@ -29944,10 +37450,10 @@
           rev = "4c449eae696d4e3a15078c336c98ea779da227ab";
           sha256 = "1cyvd2va0vgbh7im5rhapyd66ql469cl2hswg946qj961kdxc7s9";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3559a179be2a5cda71ee0a5a18bead4b3a1a8138/recipes/go-projectile";
           sha256 = "07diik27gr82n11a8k62v1jxq8rhi16f02ybk548f6cn7iqgp2ml";
-          name = "go-projectile";
+          name = "recipe";
         };
         packageRequires = [ go-eldoc go-guru go-mode go-rename projectile ];
         meta = {
@@ -29955,20 +37461,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    go-rename = callPackage ({ fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }:
-    melpaBuild {
+    go-rename = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , go-mode
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "go-rename";
-        version = "20161117.331";
+        version = "20180626.2348";
         src = fetchFromGitHub {
           owner = "dominikh";
           repo = "go-mode.el";
-          rev = "ff87a1e80945d958d9c348ce4d2e65a797b38a4b";
-          sha256 = "182z309aysvi5xg5ymxmdxhkwdllj9v3pi1pajxsgwiq314bycdr";
+          rev = "da55ef1ad3a4802f7d056d3065f6962db3d6fd14";
+          sha256 = "1mphf9msxc24q2i0ghcgd0ah6r0x6svxak6kn9is7x0kbfiy9226";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d806abe90da9a8951fdb0c31e2167bde13183c5c/recipes/go-rename";
           sha256 = "1cd2nfgwnqzylbry11ahahdip8w66w5hnrndrs65ip10s08w2xki";
-          name = "go-rename";
+          name = "recipe";
         };
         packageRequires = [ go-mode ];
         meta = {
@@ -29976,8 +37486,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    go-scratch = callPackage ({ emacs, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }:
-    melpaBuild {
+    go-scratch = callPackage ({ emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , go-mode
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "go-scratch";
         version = "20150809.2140";
         src = fetchFromGitHub {
@@ -29986,10 +37501,10 @@
           rev = "3f68cbcce04f59eb8e83af109164731ec0454be0";
           sha256 = "1a6vg2vwgnafb61pwrd837fwlq5gs80wawbzjsnykawnmcaag8pm";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1713e6f02f8908b828ac2722a3185ea7cceb0609/recipes/go-scratch";
           sha256 = "11ahvmxbh67wa39cymymxmcpkq0kcn5jz0rrvazjy2p1hx3x1ma5";
-          name = "go-scratch";
+          name = "recipe";
         };
         packageRequires = [ emacs go-mode ];
         meta = {
@@ -29997,8 +37512,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    go-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
-    melpaBuild {
+    go-snippets = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild
+                               , yasnippet }:
+      melpaBuild {
         pname = "go-snippets";
         version = "20180112.2211";
         src = fetchFromGitHub {
@@ -30007,10 +37526,10 @@
           rev = "d437df148879566ffe7f2e503a3cf2602aa9fb28";
           sha256 = "0rs2yj9bh0snf13hfj9bvyawl16j8416naz6h52l21q72ymd4b0k";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ca9f3022e7f4d5391be394cd56f6db75c9cff3b6/recipes/go-snippets";
           sha256 = "1wcbnfzxailv18spxyv4a0nwlqh9l7yf5vxg0qcjcp5ajd2w12kn";
-          name = "go-snippets";
+          name = "recipe";
         };
         packageRequires = [ yasnippet ];
         meta = {
@@ -30018,8 +37537,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    go-stacktracer = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    go-stacktracer = callPackage ({ fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "go-stacktracer";
         version = "20150430.1442";
         src = fetchFromGitHub {
@@ -30028,10 +37550,10 @@
           rev = "a2ac6d801b389f80ca4e2fcc1ab44513a9e55976";
           sha256 = "0n5nsyfwx2pdlwx6bl35wrfyady5dwraimv92f58mhc344ajd70y";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/401996c585d2ccf97add1bc420250d96188b651a/recipes/go-stacktracer";
           sha256 = "1laz2ggqydnyr7b36ggb7sphlib79dhp7nszw42wssmv212v94cy";
-          name = "go-stacktracer";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -30039,20 +37561,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    go-tag = callPackage ({ emacs, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }:
-    melpaBuild {
+    go-tag = callPackage ({ emacs
+                          , fetchFromGitHub
+                          , fetchurl
+                          , go-mode
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "go-tag";
         version = "20180226.2011";
         src = fetchFromGitHub {
           owner = "brantou";
           repo = "emacs-go-tag";
-          rev = "59b243f2fa079d9de9d56f6e2d94397e9560310a";
-          sha256 = "0r72qk79q8yyidpxgq4r0295fm73id946p1r4s65bwyzii76rjyi";
+          rev = "8dbcb7d42dccac046c7beb31bdf79bb09a0fef40";
+          sha256 = "1l20az4lhgbrh96sk6bpvp3w4bh29653fms4bimmiaqmhn2n14y2";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fc4cd3fd8fb0707912e205b9d71789ea8126c442/recipes/go-tag";
           sha256 = "18ff41i0gr708fl4gzzspf9cc09nv4wy21wsn609yhwlh7w0vs1f";
-          name = "go-tag";
+          name = "recipe";
         };
         packageRequires = [ emacs go-mode ];
         meta = {
@@ -30060,8 +37587,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    gobgen = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    gobgen = callPackage ({ emacs
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "gobgen";
         version = "20161020.823";
         src = fetchFromGitHub {
@@ -30070,10 +37601,10 @@
           rev = "ed2c2b0d217deae293096f3cf14aa492791ddd4f";
           sha256 = "1isda941gzrl9r2xxaxbsqjxq146cmnhl04m634m8m0q2d751pwk";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8c9fed22bb8dbfb359e4fdb0d802ed4b5781f50d/recipes/gobgen";
           sha256 = "0fb0q9x7wj8gs1iyr87q1vpxmfa2d43zy6cgxpzmv2wc26x96vi7";
-          name = "gobgen";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -30081,8 +37612,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    god-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    god-mode = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "god-mode";
         version = "20180117.334";
         src = fetchFromGitHub {
@@ -30091,10 +37625,10 @@
           rev = "344167ed9b4c212273dd056e7481cf1373b461d0";
           sha256 = "0y7phh7amrdphv9dkf0304z2knyas745ir59ybngh1a55dfc2mf4";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2dff8dc08583048f9b7b4cb6d8f05a18dd4e8b42/recipes/god-mode";
           sha256 = "01xx2byjh6vlckaxamm2x2qzicd9qc8h6amyjg0bxz3932a4llaa";
-          name = "god-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -30102,20 +37636,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    godoctor = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    godoctor = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "godoctor";
-        version = "20161205.143";
+        version = "20180710.1452";
         src = fetchFromGitHub {
           owner = "microamp";
           repo = "godoctor.el";
-          rev = "f892a4dbabe61186540d6035c5185fd929a6a543";
-          sha256 = "1cg09mihvqchgvdxwlrg9vcdj1kvmmy8zmlkscxi6smaxbi0yvjm";
+          rev = "4b45ff3d0572f0e84056e4c3ba91fcc178199859";
+          sha256 = "12gga1ghc54r6f2adyaq30hm2yxspvgg54zd4k82c3d6cj51qwci";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0e23e1362ff7d477ad9ce6cfff694db989dfb87b/recipes/godoctor";
           sha256 = "0k734hry9npsr6zhsplcvmcjqw6jdf79pv4k9dw0xvd598hkpazz";
-          name = "godoctor";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -30123,8 +37660,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    gold-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, sws-mode }:
-    melpaBuild {
+    gold-mode = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild
+                             , sws-mode }:
+      melpaBuild {
         pname = "gold-mode";
         version = "20140606.1906";
         src = fetchFromGitHub {
@@ -30133,10 +37674,10 @@
           rev = "6d3aa59602b1b835495271c8c9741ac344c2eab1";
           sha256 = "1k4i9z9h4m0h0y92mncr96jir63q5h1bix5bpnlfxhxl5w8pvk1q";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6d1991b63067c581c7576df4b69b509ab5a44d5a/recipes/gold-mode";
           sha256 = "1b67hd1fp6xcj65xxp5jcpdjspxsbzxy26v6lqg5kiy8knls57kf";
-          name = "gold-mode";
+          name = "recipe";
         };
         packageRequires = [ sws-mode ];
         meta = {
@@ -30144,8 +37685,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    golden-ratio = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    golden-ratio = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "golden-ratio";
         version = "20150819.420";
         src = fetchFromGitHub {
@@ -30154,10 +37698,10 @@
           rev = "72b028808b41d23fa3f7e8c0d23d2c475e7b46ae";
           sha256 = "0wdw89n7ngxpcdigv8c01h4i84hsdh0y7xq6jdj1i6mnajl8gk92";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e87b2af052d0406431957d75aa3717899bdbc8ae/recipes/golden-ratio";
           sha256 = "15fkrv0sgpzmnw2h4fp2gb83d8s42khkfq1h76l241njjayk1f81";
-          name = "golden-ratio";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -30165,20 +37709,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    golden-ratio-scroll-screen = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    golden-ratio-scroll-screen = callPackage ({ fetchFromGitHub
+                                              , fetchurl
+                                              , lib
+                                              , melpaBuild }:
+      melpaBuild {
         pname = "golden-ratio-scroll-screen";
         version = "20170223.1829";
         src = fetchFromGitHub {
           owner = "jixiuf";
           repo = "golden-ratio-scroll-screen";
-          rev = "44e947194d3e5cbe0fd2f3c4886a4e6e1a0c0791";
-          sha256 = "1wd19jskpp9w0lrg0ky3hvnliq9l09kmxy59hdp06hsdmvr31jwv";
+          rev = "0428fbe020ddb90811f2932e661796f667bf4ac5";
+          sha256 = "1v4rz5ddd0x7szk9pz5hrxp25xqdf6gngrm8y2cf8xgyvrlscyba";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/af044c4a28149362347c2477f0d8d0f8d1dc8c0d/recipes/golden-ratio-scroll-screen";
           sha256 = "1ygh104vr65s7frlkzyhrfi6shrbvp2b2j3ynj5dip253v85xki5";
-          name = "golden-ratio-scroll-screen";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -30186,8 +37733,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    goldendict = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    goldendict = callPackage ({ cl-lib ? null
+                              , emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "goldendict";
         version = "20180121.120";
         src = fetchFromGitHub {
@@ -30196,10 +37748,10 @@
           rev = "1aac19daaec811deb9afe45eea4929309c09ac8b";
           sha256 = "1il432f6ayj2whl4s804n5wykgs51jhbx4xkcbfgqra58cbjrjhi";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/af87026905478d9134a4a036e792f6afd9c10768/recipes/goldendict";
           sha256 = "0zvrlz169pg9bj1bmks4lh5zn8cygqzwiyzg49na2a7wf2sk9m1f";
-          name = "goldendict";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -30207,20 +37759,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    golint = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    golint = callPackage ({ fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "golint";
         version = "20180221.1215";
         src = fetchFromGitHub {
           owner = "golang";
           repo = "lint";
-          rev = "85993ffd0a6cd043291f3f63d45d656d97b165bd";
-          sha256 = "0kag4ki3dx9xnm41gj4q77wcl77785id4qqb8kb7k5rhfrs29psz";
+          rev = "0562613f16a6ec439a4a68e817e69e0f7c405c87";
+          sha256 = "1lhzas39dkf38965ibrxdfdh7gxsjiyzqas7h51zr5fdx6cyjwnf";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/34f22d829257456abbc020c006b92da9c7a7860e/recipes/golint";
           sha256 = "1q4y6mgll8wyp0c7zx810nzsm0k4wvz0wkly1fbja9z63sjzzxwb";
-          name = "golint";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -30228,8 +37783,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    gom-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    gom-mode = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "gom-mode";
         version = "20131007.1953";
         src = fetchFromGitHub {
@@ -30238,10 +37796,10 @@
           rev = "972e33df1d38ff323bc97de87477305826013701";
           sha256 = "1anjzlg53kjdqfjcdahbxy8zk9hdha075c1f9nzrnnbbqvmirbbb";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0a1e5f505e048b36c12de36b23b779beeaefc45f/recipes/gom-mode";
           sha256 = "07zr38gzqb3ds9mpf94c1vhl1rqd0cjh4g4j2bz86q16c0rnmp7m";
-          name = "gom-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -30249,8 +37807,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    google = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    google = callPackage ({ fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "google";
         version = "20140416.1048";
         src = fetchFromGitHub {
@@ -30259,10 +37820,10 @@
           rev = "3b3189a8b201c8d36fed6e61496274e530dd40bd";
           sha256 = "06p1dpnmg7lhdff1g7c04qq8f9srgkmnm42jlqy85k87j3p5ys2i";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/45237d37da807559498bb958184e05109f880070/recipes/google";
           sha256 = "11a521cq5bj7afl7bqiilg0c81dy00lnhak7h3d9c9kwg7kfljiq";
-          name = "google";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -30270,20 +37831,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    google-c-style = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    google-c-style = callPackage ({ fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "google-c-style";
         version = "20180130.936";
         src = fetchFromGitHub {
           owner = "google";
           repo = "styleguide";
-          rev = "1b206ee36263b16ec18f7b2f86a2b770b7490844";
-          sha256 = "0vwx5h7b0f4yv5aqznw8zq2fnwwdmrcfa270v16dzdfr5a7n3pj3";
+          rev = "505ba68c74eb97e6966f60907ce893001bedc706";
+          sha256 = "0277vsj0shrlgb96zgy8lln55l2klzkk6h28g4srbpgkwz5xxsx7";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/google-c-style";
           sha256 = "10gsbg880jbvxs4291vi2ww30ird2f313lbgcb11lswivmhrmd1r";
-          name = "google-c-style";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -30291,8 +37855,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    google-contacts = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, oauth2 }:
-    melpaBuild {
+    google-contacts = callPackage ({ cl-lib ? null
+                                   , fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild
+                                   , oauth2 }:
+      melpaBuild {
         pname = "google-contacts";
         version = "20171027.1033";
         src = fetchFromGitHub {
@@ -30301,10 +37870,10 @@
           rev = "a40389bae006ae094aeb1a39fae9891ca687c0fa";
           sha256 = "06mfdmr3dlmk4gyq8fxqv78c5jyis8vxx4ih2azcr5c831pkayzi";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/671afe0ff3889ae8c4b2d7b8617a3a25c16f3f0f/recipes/google-contacts";
           sha256 = "0wgi244zy2am90alimgzazshk2z756bk1hchphssfa4j15n16jgn";
-          name = "google-contacts";
+          name = "recipe";
         };
         packageRequires = [ cl-lib oauth2 ];
         meta = {
@@ -30312,8 +37881,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    google-maps = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    google-maps = callPackage ({ emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "google-maps";
         version = "20171002.734";
         src = fetchFromGitHub {
@@ -30322,10 +37895,10 @@
           rev = "c0e5dccfdc9f7f77ff8f29177547be47833d7156";
           sha256 = "1agsfmbd2zbn1xs05kxlb32hhkmrri3hdmcrvf0w1fcsgc5a9085";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/671afe0ff3889ae8c4b2d7b8617a3a25c16f3f0f/recipes/google-maps";
           sha256 = "0a0wqs3cnlpar2dzdi6h14isw78vgqr2r6psmrzbdl00s4fcyxwx";
-          name = "google-maps";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -30333,8 +37906,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    google-this = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    google-this = callPackage ({ emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "google-this";
         version = "20170810.515";
         src = fetchFromGitHub {
@@ -30343,10 +37920,10 @@
           rev = "8a2e3ca5da6a8c89bfe99a21486c6c7db125dc84";
           sha256 = "1dbra309w8awmi0g0pp7r2dm9nwrj2j9lpl7md8wa89rnzazwahl";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/google-this";
           sha256 = "0hg9y1b03aiamyn3mam3hyxmxy21wygxrnrww91zcbwlzgp4dd2c";
-          name = "google-this";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -30354,20 +37931,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    google-translate = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    google-translate = callPackage ({ fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "google-translate";
         version = "20170713.119";
         src = fetchFromGitHub {
           owner = "atykhonov";
           repo = "google-translate";
-          rev = "d8b84a8359fcc697114d1298840e9a45b111c974";
-          sha256 = "1qs4hcg1i2m487z50nnwgs0sa2xj4lpgizbrvi2yda0mf3m75fgc";
+          rev = "486c63bbfa0338589589f628703c38112035a5b2";
+          sha256 = "08b4lxnwy9iqxacbjjljybvvdkl9g2dy6vga6hw7h7h32qra8w2j";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e3c275e59cbfe6e40f9cd4c470fc66544c9a6d21/recipes/google-translate";
           sha256 = "1crgzdd32mk6hrawdypg496dwh51wzwfb5wqw4a2j5l8y958xf47";
-          name = "google-translate";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -30375,8 +37955,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    goose-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    goose-theme = callPackage ({ emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "goose-theme";
         version = "20160828.545";
         src = fetchFromGitHub {
@@ -30385,10 +37969,10 @@
           rev = "acd017b50ab25a75fd1331eb3de66467e2042e9c";
           sha256 = "1mmdvjsgnwgs6akhyj96fgj30mz53djdq85dl5q4cmiznlbma7hy";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e23a52e068ec0e6d457402254727673ea02bd407/recipes/goose-theme";
           sha256 = "1nw948js678xc5vgrpdkykpcbn1b1id4k1clf87vfv7y5zssvd0x";
-          name = "goose-theme";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -30396,8 +37980,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    gore-mode = callPackage ({ fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }:
-    melpaBuild {
+    gore-mode = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , go-mode
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "gore-mode";
         version = "20151123.1127";
         src = fetchFromGitHub {
@@ -30406,10 +37994,10 @@
           rev = "94d7f3e99104e06167967c98fdc201049c433c2d";
           sha256 = "0l022aqpnb38q6kgdqpbxrc1r7fljwl7xq14yi5jb7qgzw2v43cz";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/de09fcf14f778efe4247a93fb887b77050258f39/recipes/gore-mode";
           sha256 = "0nljybh2pw8pbbajfsz57r11rs4bvzfxmwpbm5qrdn6dzzv65nq3";
-          name = "gore-mode";
+          name = "recipe";
         };
         packageRequires = [ go-mode ];
         meta = {
@@ -30417,8 +38005,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    gorepl-mode = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild, s }:
-    melpaBuild {
+    gorepl-mode = callPackage ({ emacs
+                               , f
+                               , fetchFromGitHub
+                               , fetchurl
+                               , hydra
+                               , lib
+                               , melpaBuild
+                               , s }:
+      melpaBuild {
         pname = "gorepl-mode";
         version = "20170905.245";
         src = fetchFromGitHub {
@@ -30427,10 +38022,10 @@
           rev = "bbd27f6a0a77f484e2a3f082d70dc69da63ae52a";
           sha256 = "01lqirxgw7svxy1fdv49mvcbhpslf64in6c4dk36b8xhngyqbilf";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/gorepl-mode";
           sha256 = "0xcjjh9hf3pv5jgv089c6bb00s215fc9qwn72fav1xbm5f49nkaq";
-          name = "gorepl-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs f hydra s ];
         meta = {
@@ -30438,20 +38033,27 @@
           license = lib.licenses.free;
         };
       }) {};
-    gotest = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild, s }:
-    melpaBuild {
+    gotest = callPackage ({ emacs
+                          , f
+                          , fetchFromGitHub
+                          , fetchurl
+                          , go-mode
+                          , lib
+                          , melpaBuild
+                          , s }:
+      melpaBuild {
         pname = "gotest";
-        version = "20180319.137";
+        version = "20180617.633";
         src = fetchFromGitHub {
           owner = "nlamirault";
           repo = "gotest.el";
-          rev = "ad0d617887eed837eed72f7d3daba40d1bb7cba8";
-          sha256 = "1lsc6bri8rqkqrmhdslqpph2rdad4b3x8zabg55d9msc4fh25jlv";
+          rev = "4b21b86c07a1597e5e3ca795603787906695ee1b";
+          sha256 = "1s1m7r74h2qa10z11xcrsv9ivfn9xc6bbzcxy41whdjp46m65qjm";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0670b42c0c998daa7bf01080757976ac3589ec06/recipes/gotest";
           sha256 = "1kan3gykhci33jgg67jjiiz7rqlz5mpxp8sh6mb0n6kpfmgb4ly9";
-          name = "gotest";
+          name = "recipe";
         };
         packageRequires = [ emacs f go-mode s ];
         meta = {
@@ -30459,8 +38061,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    gotham-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    gotham-theme = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "gotham-theme";
         version = "20171013.1216";
         src = fetchFromGitHub {
@@ -30469,10 +38074,10 @@
           rev = "5e97554d1f9639698faedb0660e63694be33bd84";
           sha256 = "18x0b2qmyzf9sddsv9ps1059pi4ndzq44rm4yl87slq03y75nxi9";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4b388de872be397864a1217a330ba80437c287c0/recipes/gotham-theme";
           sha256 = "0jars6rvf7hkyf71vq06mqki1r840i1dvv43dissqjg5i4lr79cl";
-          name = "gotham-theme";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -30480,8 +38085,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    goto-chg = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    goto-chg = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "goto-chg";
         version = "20180105.1033";
         src = fetchFromGitHub {
@@ -30490,10 +38098,10 @@
           rev = "e5b38e4e1378f6ea48fa9e8439f49c2998654aa4";
           sha256 = "1fxdvgdafavc4sad5i8g0wvpdqzlgzmvfi07yrah1c5vwkrslbvj";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cf1fc176430fe3ab55ce537a0efc59780bb812be/recipes/goto-chg";
           sha256 = "1yd4jq4zql4av9nr1sdk4nsnnk54c3brgjhpczndy1ipiaxlnydy";
-          name = "goto-chg";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -30501,20 +38109,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    goto-gem = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    goto-gem = callPackage ({ fetchFromGitLab
+                            , fetchurl
+                            , lib
+                            , melpaBuild
+                            , s }:
+      melpaBuild {
         pname = "goto-gem";
         version = "20140729.1145";
-        src = fetchFromGitHub {
+        src = fetchFromGitLab {
           owner = "pidu";
           repo = "goto-gem";
           rev = "e3206f11f48bb7e798514a4ca2c2f60649613e5e";
           sha256 = "0j2hdxqfsifm0d8ilwcw7np6mvn4xm58xglzh42gigj2fxv87g99";
         };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/5f576f6fab4ee466c54ce2c50569a447b6d617cc/recipes/goto-gem";
-          sha256 = "06vy9m01qccvahxr5xn0plzw9knl5ig7gi5q5r1smfx92bmzkg3a";
-          name = "goto-gem";
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/a52b516b7b10bdada2f64499c8f43f85a236f254/recipes/goto-gem";
+          sha256 = "0i79z1isdbnqmz5rlqjjys68l27nl90m1gzks4f9d6dsgfryhgwx";
+          name = "recipe";
         };
         packageRequires = [ s ];
         meta = {
@@ -30522,8 +38134,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    goto-last-change = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    goto-last-change = callPackage ({ fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "goto-last-change";
         version = "20150109.1023";
         src = fetchFromGitHub {
@@ -30532,10 +38147,10 @@
           rev = "58b0928bc255b47aad318cd183a5dce8f62199cc";
           sha256 = "1f0zlvva7d7iza1v79yjp0bm7vd011q4cy14g1saryll32z115z5";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d68945f5845e5e44fb6c11726a56acd4dc56e101/recipes/goto-last-change";
           sha256 = "1yl9p95ls04bkmf4d6az72pycp27bv7q7wxxzvj8sj97bgwvwajx";
-          name = "goto-last-change";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -30543,20 +38158,28 @@
           license = lib.licenses.free;
         };
       }) {};
-    govc = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, json-mode, lib, magit-popup, melpaBuild, s }:
-    melpaBuild {
+    govc = callPackage ({ dash
+                        , emacs
+                        , fetchFromGitHub
+                        , fetchurl
+                        , json-mode
+                        , lib
+                        , magit-popup
+                        , melpaBuild
+                        , s }:
+      melpaBuild {
         pname = "govc";
-        version = "20180402.2025";
+        version = "20180524.1323";
         src = fetchFromGitHub {
           owner = "vmware";
           repo = "govmomi";
-          rev = "d3ae3004773719bcc413ff8e3396f2ce6bf0827b";
-          sha256 = "0l06li4d7mppj7r7xvx4dpvi0asdcazwj3nil6kd1in2pfq3hh4y";
+          rev = "e3a01f9611c32b2362366434bcd671516e78955d";
+          sha256 = "0cicd4m8ll7y1n0c97drmvmqwsqaspwpzc6nfp73f887m8ff1xis";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/92d6391318021c63b06fe39b0ca38f667bb45ae9/recipes/govc";
           sha256 = "1ivgaziv25wlzg6y4zh8x7mv97pnyhi7p8jpvgh5fg5lnqpzhl4v";
-          name = "govc";
+          name = "recipe";
         };
         packageRequires = [ dash emacs json-mode magit-popup s ];
         meta = {
@@ -30564,20 +38187,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    govet = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    govet = callPackage ({ fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "govet";
         version = "20170808.1024";
         src = fetchFromGitHub {
           owner = "meshelton";
           repo = "govet";
-          rev = "1c05817cf8b96589076c7ac4e52ee58a860a0cbf";
-          sha256 = "1n223i87xmk8p8h8dswnhhvazy0z53dzl36gmk9y7ck8bd9vz706";
+          rev = "1b8c044aa856f4b62a682bc57494af19d22a6053";
+          sha256 = "1d0gd4awkkfsppqv7367bn5h8k8dlyvrg9cbvsn6mqn5j93mr3fx";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7e4a5f5031c76056d8f1b64b27a39a512c7c59cd/recipes/govet";
           sha256 = "1rpgngixf1xnnqf0l2vvh6y9q3395qyj9ln1rh0xz5lm7d4pq4hy";
-          name = "govet";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -30585,8 +38211,37 @@
           license = lib.licenses.free;
         };
       }) {};
-    grab-mac-link = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    gpastel = callPackage ({ emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
+        pname = "gpastel";
+        version = "20180419.2350";
+        src = fetchFromGitHub {
+          owner = "DamienCassou";
+          repo = "gpastel";
+          rev = "21b7d79530134d6a47eeb252b684f884c769d291";
+          sha256 = "1s1gnkpz6byf6by8r1bl9vq3slmsdavjb2ybp2zgic48favz1qm2";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/9b70e05ff0a074f9e2f1373e8495dc8df462deea/recipes/gpastel";
+          sha256 = "0mjy4n26s89b481dby018l80glgfwfaacihmd7vhh2c75ns671a6";
+          name = "recipe";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/gpastel";
+          license = lib.licenses.free;
+        };
+      }) {};
+    grab-mac-link = callPackage ({ emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "grab-mac-link";
         version = "20180328.745";
         src = fetchFromGitHub {
@@ -30595,10 +38250,10 @@
           rev = "35edb57d136c2a9726fd14e6a59cce4fc0248771";
           sha256 = "1c3g6ygi71qm3lqvhjjzxkpdhwkpx4qwm8mhinwffcib5hagrafn";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e4cc8a72a9f161f024ed9415ad281dbea5f07a18/recipes/grab-mac-link";
           sha256 = "1a4wyvx1mlgnd45nn99lwy3vaiwhi1nrphfln86pb6z939dxakj3";
-          name = "grab-mac-link";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -30606,8 +38261,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    grab-x-link = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    grab-x-link = callPackage ({ cl-lib ? null
+                               , emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "grab-x-link";
         version = "20180205.346";
         src = fetchFromGitHub {
@@ -30616,10 +38276,10 @@
           rev = "d19f0c0da0ddc55005a4c1cdc2b8c5de8bea1e8c";
           sha256 = "1l9jg2w8ym169b5dhg3k5vksbmicg4n1a55x7ddjysf8n887cpid";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/64d4d4e6f9d6a3ea670757f248afd355baf1d933/recipes/grab-x-link";
           sha256 = "1kni49n1v716w4hjfm49mk25jshfc6idpby0k58qvngbfqk3kzy5";
-          name = "grab-x-link";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -30627,20 +38287,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    gradle-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    gradle-mode = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild
+                               , s }:
+      melpaBuild {
         pname = "gradle-mode";
         version = "20150313.1205";
         src = fetchFromGitHub {
           owner = "jacobono";
           repo = "emacs-gradle-mode";
-          rev = "e4d665d5784ecda7ddfba015f07c69be3cfc45f2";
-          sha256 = "0xs2278gamzg0710bm1fkhjh1p75m2l1jcl98ldhyjhvaf9d0ysc";
+          rev = "579de06674551919cddac9cfe42129f4fb0155c9";
+          sha256 = "0k86lrb55d701nj6pvlw3kjp1dcd3lzfya0hv6q56c529y69d782";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/771cc597daebf9b4aa308f8b350af91a515b44c9/recipes/gradle-mode";
           sha256 = "0lx9qi93wmiy9pxjxqp68scbcb4bx88b6jiqk3y8jg5cajizh24g";
-          name = "gradle-mode";
+          name = "recipe";
         };
         packageRequires = [ s ];
         meta = {
@@ -30648,8 +38312,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    grails = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    grails = callPackage ({ emacs
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "grails";
         version = "20160416.2336";
         src = fetchFromGitHub {
@@ -30658,10 +38326,10 @@
           rev = "fa638abe5c37f3f8af4fcd32f212453185ce50b1";
           sha256 = "1npsjniazaq20vz3kvwr8p30ivc6x24r9a16rfcwhr5wjx3nn91b";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/be0196207245ea9d23fda09121d624db9ea6d83d/recipes/grails";
           sha256 = "177y6xv35d2dhc3pdx5qhpywlmlqgfnjpzfm9yxc8l6q2rgs8irw";
-          name = "grails";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -30669,20 +38337,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    grails-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    grails-mode = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "grails-mode";
         version = "20160504.211";
         src = fetchFromGitHub {
           owner = "Groovy-Emacs-Modes";
           repo = "groovy-emacs-modes";
-          rev = "0aea74def58791b2343a8f0139c2f2a6a0941877";
-          sha256 = "0aih46rk2zzxhbx4k65w1lmg3ibxnkimdfpyxc5qfdcr4kyfg06i";
+          rev = "50801257d376fd7383ddf9c19ff567183c24ad0b";
+          sha256 = "0wy8iw12b9bs7xza8jjnjvggr59rgbsgn1kk2g0pj0nppvfdrvjm";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe318b4e51a280a55c01fa30455e4a180df8bd6/recipes/grails-mode";
           sha256 = "1zdlmdkwyaj2zns3xwmqpil83j7857aj2070kvx8xza66dxcnlm4";
-          name = "grails-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -30690,8 +38361,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    grails-projectile-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }:
-    melpaBuild {
+    grails-projectile-mode = callPackage ({ cl-lib ? null
+                                          , emacs
+                                          , fetchFromGitHub
+                                          , fetchurl
+                                          , lib
+                                          , melpaBuild
+                                          , projectile }:
+      melpaBuild {
         pname = "grails-projectile-mode";
         version = "20160327.624";
         src = fetchFromGitHub {
@@ -30700,10 +38377,10 @@
           rev = "8efca50ce92b556fe9d467b157d7aec635bcc017";
           sha256 = "0xnj0wp0na53l0y8fiaah50ij4r80j8a29hbjbcicska21p5w1s1";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/35d49029c1f665ad40e543040d98d5a770bfea96/recipes/grails-projectile-mode";
           sha256 = "0dy8v2mila7ccvb7j5jlfkhfjsjfk3bm3rcy84m0rgbqjai67amn";
-          name = "grails-projectile-mode";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs projectile ];
         meta = {
@@ -30711,20 +38388,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    grandshell-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    grandshell-theme = callPackage ({ fetchgit
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "grandshell-theme";
-        version = "20180131.1439";
-        src = fetchFromGitHub {
-          owner = "steckerhalter";
-          repo = "grandshell-theme";
-          rev = "823232a83a51e8a3f7b4db09e23658fc1a1c93ca";
-          sha256 = "0a1svfbxw7g31rnf3lcjsy2x21s14c2gpbrzjpl06qa0p3cnn4db";
+        version = "20180605.2217";
+        src = fetchgit {
+          url = "https://framagit.org/steckerhalter/grandshell-theme.git";
+          rev = "0ed8e4273607dd4fcaa742b4097259233b09eda6";
+          sha256 = "04vx5p1ffln5b9rxgfi15q735plxcjvskby3c5k4slgwf4p91bpq";
         };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/5b04b0024f5a0367e2998d35ca88c2613a8e3470/recipes/grandshell-theme";
-          sha256 = "1mnnjsw1kx40b6ws8wmk25fz9rq8rd70xia9cjpwdfkg7kh8xvsa";
-          name = "grandshell-theme";
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/f0a8eb0eefe88b4ea683a4743c0f8393506e014b/recipes/grandshell-theme";
+          sha256 = "1r0r0r0g116f4jp3rip8mjqqgdam4h5dr5qvdglr9xpirfcw6wq3";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -30732,20 +38411,34 @@
           license = lib.licenses.free;
         };
       }) {};
-    graphene = callPackage ({ company, dash, exec-path-from-shell, fetchFromGitHub, fetchurl, flycheck, graphene-meta-theme, ido-completing-read-plus, lib, melpaBuild, ppd-sr-speedbar, smartparens, smex, sr-speedbar, web-mode }:
-    melpaBuild {
+    graphene = callPackage ({ company
+                            , dash
+                            , exec-path-from-shell
+                            , fetchFromGitHub
+                            , fetchurl
+                            , flycheck
+                            , graphene-meta-theme
+                            , ido-completing-read-plus
+                            , lib
+                            , melpaBuild
+                            , ppd-sr-speedbar
+                            , smartparens
+                            , smex
+                            , sr-speedbar
+                            , web-mode }:
+      melpaBuild {
         pname = "graphene";
-        version = "20171125.854";
+        version = "20180529.412";
         src = fetchFromGitHub {
           owner = "rdallasgray";
           repo = "graphene";
-          rev = "9dbd50e532ca45076e03db0f96a57d21528fc460";
-          sha256 = "0sqxnjmfbr0plahdmp87j8xpl3qkyimf9vkqall4ccljx8irdl6s";
+          rev = "cc8477fcfb7771ea4e5bbaf3c01f9e679234c1c1";
+          sha256 = "0j0igcmfl61c4pakqmyxpwr4kjar9i81vkl84rw19phc7k9497nb";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0206d6adcb7855c2174c3cd506b71c21def1209b/recipes/graphene";
           sha256 = "1wz3rvd8b7gx5d0k7yi4dd69ax5bybcm10vdc7xp4yn296lmyl9k";
-          name = "graphene";
+          name = "recipe";
         };
         packageRequires = [
           company
@@ -30765,8 +38458,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    graphene-meta-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    graphene-meta-theme = callPackage ({ fetchFromGitHub
+                                       , fetchurl
+                                       , lib
+                                       , melpaBuild }:
+      melpaBuild {
         pname = "graphene-meta-theme";
         version = "20161204.807";
         src = fetchFromGitHub {
@@ -30775,10 +38471,10 @@
           rev = "62cc73fee31f1bd9474027b83a249feee050271e";
           sha256 = "1ydl6dlg5z4infq8j09izwgs6n97yza6nbq5rs1xfv00zd9gr63c";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/44af719ede73c9fe7787272d7868587ce8966e3d/recipes/graphene-meta-theme";
           sha256 = "1cqdr93lccdpxkzgap3r3qc92dh8vqgdlnxvqkw7lrcbs31fvf3q";
-          name = "graphene-meta-theme";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -30786,8 +38482,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    graphql-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    graphql-mode = callPackage ({ emacs
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "graphql-mode";
         version = "20180303.1558";
         src = fetchFromGitHub {
@@ -30796,10 +38496,10 @@
           rev = "36b1a4ed9fe78ccd1f386111644e69a5424a1a7b";
           sha256 = "1azq0igx07aff9r7fbl0l4vbr44c4ylfq41g5rahbc70spd85bk6";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3850073e6706d4d8151bc6ab12963a19deae8be9/recipes/graphql-mode";
           sha256 = "074dc8fgbrikb5inv837n9bpmz1ami7aaxsqcci1f94x3iw8i74i";
-          name = "graphql-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -30807,8 +38507,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    graphviz-dot-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    graphviz-dot-mode = callPackage ({ fetchFromGitHub
+                                     , fetchurl
+                                     , lib
+                                     , melpaBuild }:
+      melpaBuild {
         pname = "graphviz-dot-mode";
         version = "20171103.127";
         src = fetchFromGitHub {
@@ -30817,10 +38520,10 @@
           rev = "c456a2b65c734089e6c44e87209a5a432a741b1a";
           sha256 = "0j1r2rspaakw37b0mx7pwpvdsvixq9sw3xjbww5piihzpdxz58z1";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6e2f1e66b33fd95142be4622c996911e38d56281/recipes/graphviz-dot-mode";
           sha256 = "04rkynsrsk6w4sxn1pc0b9b6pij1p7yraywbrk7qvv05fv69kri2";
-          name = "graphviz-dot-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -30828,20 +38531,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    grapnel = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    grapnel = callPackage ({ fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "grapnel";
         version = "20131001.834";
         src = fetchFromGitHub {
           owner = "leathekd";
           repo = "grapnel";
-          rev = "fbd0f9a51139973d35e4014855964fa435e8ecaf";
-          sha256 = "0nvl8mh7jxailisq31h5bi64s9b74ah1465wiwh18x502swr2s3c";
+          rev = "7387234eb3f0285a490fddb1e06a4bf029719fb7";
+          sha256 = "0xcj1kqzgxifhrhpl9j2nfpnkd6213ix5z7f97269v3inpzaiyf5";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/dd482e4b2c45921b81c5fb3dfce53acfec3c3093/recipes/grapnel";
           sha256 = "019cdx1wdx8sc2ibqwgp1akgckzxxvrayyp2sv806gha0kn6yf6r";
-          name = "grapnel";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -30849,8 +38555,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    grass-mode = callPackage ({ cl-lib ? null, dash, fetchhg, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    grass-mode = callPackage ({ cl-lib ? null
+                              , dash
+                              , fetchhg
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "grass-mode";
         version = "20170503.800";
         src = fetchhg {
@@ -30858,10 +38569,10 @@
           rev = "1ae8eae88117";
           sha256 = "1sl3d5759fjm98pb50ykz2c05czb2298ipccwj2qz2hdzq63hfv8";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/grass-mode";
           sha256 = "1lq6bk4bwgcy4ra3d9rlca3fk87ydg7xnnqcqjg0pw4m9xnr3f7v";
-          name = "grass-mode";
+          name = "recipe";
         };
         packageRequires = [ cl-lib dash ];
         meta = {
@@ -30869,20 +38580,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    grayscale-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    grayscale-theme = callPackage ({ fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "grayscale-theme";
         version = "20171005.102";
         src = fetchFromGitHub {
           owner = "belak";
           repo = "emacs-grayscale-theme";
-          rev = "53ad50e10e68f2f076ebfc96e10ecef7a932d38d";
-          sha256 = "034pa35cjl07bhqdyw3xrcl97xcdg7jg0jvgn034fs3hssmsyxgv";
+          rev = "917d63c0effc8459502a41e0cad5822d2b200499";
+          sha256 = "0vkv34aslcw2fl9yx8j6094s8j5mgpqrwvyf07a1d16rixncffpm";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2993881c7285cfbfc590b4118db46bfd435817bc/recipes/grayscale-theme";
           sha256 = "0jbzb1zxv5mg3pivii31d4kz75igm339nw4cmx9kgzia9zal5f1r";
-          name = "grayscale-theme";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -30890,8 +38604,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    green-is-the-new-black-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    green-is-the-new-black-theme = callPackage ({ fetchFromGitHub
+                                                , fetchurl
+                                                , lib
+                                                , melpaBuild }:
+      melpaBuild {
         pname = "green-is-the-new-black-theme";
         version = "20180322.1903";
         src = fetchFromGitHub {
@@ -30900,10 +38617,10 @@
           rev = "8a03687a2b8b55c5dc7f099086019278d505d8d8";
           sha256 = "07j5sv8dskqxpbzr5f58n75cziyqm9v01c3f7wmwfs8jl7h5nc4m";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3e42528d5677fd90515cad47266c07ea3d4363fb/recipes/green-is-the-new-black-theme";
           sha256 = "03q0vj409icmawffy2kd9yl04r453q80cy1p9y4i3xk368z0362g";
-          name = "green-is-the-new-black-theme";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -30911,20 +38628,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    green-phosphor-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    green-phosphor-theme = callPackage ({ fetchFromGitHub
+                                        , fetchurl
+                                        , lib
+                                        , melpaBuild }:
+      melpaBuild {
         pname = "green-phosphor-theme";
         version = "20150515.747";
         src = fetchFromGitHub {
           owner = "aalpern";
           repo = "emacs-color-theme-green-phosphor";
-          rev = "fa42f598626adfdc5450e5c380fa2d5df6110f28";
-          sha256 = "0rgv96caigcjffg1983274p4ff1icx1xh5bj7rcd53hai5ag16mp";
+          rev = "5549781559ff5daa85c1d6c635c94524c1c5f644";
+          sha256 = "0rzbq3vxx8ymgb73smlbjlsffrrrmwp266q93wv6k08h5laj9vwr";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c6770f5d800232c152833d32efb814005e65ffc6/recipes/green-phosphor-theme";
           sha256 = "1p4l75lahmbjcx74ca5jcyc04828vlcahk7gzv5lr7z9mhvq6fbh";
-          name = "green-phosphor-theme";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -30932,8 +38652,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    green-screen-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    green-screen-theme = callPackage ({ fetchFromGitHub
+                                      , fetchurl
+                                      , lib
+                                      , melpaBuild }:
+      melpaBuild {
         pname = "green-screen-theme";
         version = "20171130.234";
         src = fetchFromGitHub {
@@ -30942,10 +38665,10 @@
           rev = "c348ea0adf0e6ae99294a05be183a7b425a4bab0";
           sha256 = "1rqhac5j06gpc9gp44g4r3zdkw1baskwrz3bw1n1haw4a1k0657q";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/821744ca106f1b74941524782e4581fc93800fed/recipes/green-screen-theme";
           sha256 = "0a45xcl74kp3v39bl169sq46mqxiwvvis6jzwcy6yrl2vqqi4mab";
-          name = "green-screen-theme";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -30953,20 +38676,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    gregorio-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    gregorio-mode = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "gregorio-mode";
         version = "20170705.751";
         src = fetchFromGitHub {
           owner = "jsrjenkins";
           repo = "gregorio-mode";
-          rev = "736fd3d05fb67f707cca1a7ce24e3ee7ca5e9567";
-          sha256 = "1w13a3irak6i74kl7va8d2simd2kjvw5253s8jvapi1mg4ifw379";
+          rev = "2b45f91246286abc449cb71f28583403181051c2";
+          sha256 = "1g9x21nmzbm4sqybx5k4pgbjd9x0g27ngwczagplvjzsq9qzv7y6";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/34cdc536cd0509c5a151c16f44f4db2c5b44365f/recipes/gregorio-mode";
           sha256 = "1x3z4gc88h13miz72a597lz9hcn2lxps9jvldl2j62s6nvr88pff";
-          name = "gregorio-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -30974,8 +38700,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    grep-a-lot = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    grep-a-lot = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "grep-a-lot";
         version = "20131006.647";
         src = fetchFromGitHub {
@@ -30984,10 +38713,10 @@
           rev = "9f9f645b9e308a0d887b66864ff97d0fca1ba4ad";
           sha256 = "1f8262mrlinzgnn4m49hbj1hm3c1mvzza24py4b37sasn49546lw";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/grep-a-lot";
           sha256 = "1cbl4gl91dx73q3i2glsivfxd8jkanrcrzy35zf6rb7raj7rc1bw";
-          name = "grep-a-lot";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -30995,8 +38724,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    grep-context = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    grep-context = callPackage ({ cl-lib ? null
+                                , dash
+                                , emacs
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "grep-context";
         version = "20180415.435";
         src = fetchFromGitHub {
@@ -31005,10 +38740,10 @@
           rev = "4c63d0f2654dee1e249c2054d118d674a757bd45";
           sha256 = "0n2bc9q6bvbfpaqivp3ajy9ad1wr7hfdd98qhnspsap67p73kfn4";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/41dbaf627ae4ef86c222d2b6b5d3523fdb9a4637/recipes/grep-context";
           sha256 = "175s9asbnk2wlgpzc5izcd3vlfvdj064n38myy9qf4awn12c2y1g";
-          name = "grep-context";
+          name = "recipe";
         };
         packageRequires = [ cl-lib dash emacs ];
         meta = {
@@ -31016,8 +38751,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    greymatters-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    greymatters-theme = callPackage ({ emacs
+                                     , fetchFromGitHub
+                                     , fetchurl
+                                     , lib
+                                     , melpaBuild }:
+      melpaBuild {
         pname = "greymatters-theme";
         version = "20150621.423";
         src = fetchFromGitHub {
@@ -31026,10 +38765,10 @@
           rev = "a7220a8c6cf18ccae2b76946b6f01188a7c9d5d1";
           sha256 = "14c09m9p6556rrf0qfad4zsv7qxa5flamzg6fa83cxh0qfg7wjbp";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d13621f3033b180d06852d90bd3ebe03276031f5/recipes/greymatters-theme";
           sha256 = "10cxajyws5rwk62i4vk26c1ih0dq490kcfx7gijw38q3b5r1l8nr";
-          name = "greymatters-theme";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -31037,7 +38776,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    grin = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild {
+    grin = callPackage ({ fetchhg
+                        , fetchurl
+                        , lib
+                        , melpaBuild }:
+      melpaBuild {
         pname = "grin";
         version = "20110805.2358";
         src = fetchhg {
@@ -31045,10 +38788,10 @@
           rev = "f541aa22da52";
           sha256 = "0rqpgc50z86j4waijfm6kw4zjmzqfii6nnvyix4rkd4y3ryny1x2";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/grin";
           sha256 = "0rak710fp9c7wx39qn4dc9d0xfjr5w7hwklxh99v1x1ihkla9378";
-          name = "grin";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -31056,8 +38799,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    grizzl = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    grizzl = callPackage ({ cl-lib ? null
+                          , emacs
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "grizzl";
         version = "20160818.37";
         src = fetchFromGitHub {
@@ -31066,10 +38814,10 @@
           rev = "d554d93afa8519ee3a41340ec8aa6b4555065446";
           sha256 = "0ks47pb71ywfxv3jsx8kwb7mgl1xj4fxny3764hfdsgwv1aw0r4c";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/grizzl";
           sha256 = "0354xskqzxc38l14zxqs31hadwh27v9lyx67y3hnd94d8abr0qcb";
-          name = "grizzl";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -31077,8 +38825,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    groovy-imports = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pcache, s }:
-    melpaBuild {
+    groovy-imports = callPackage ({ emacs
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild
+                                  , pcache
+                                  , s }:
+      melpaBuild {
         pname = "groovy-imports";
         version = "20161003.151";
         src = fetchFromGitHub {
@@ -31087,10 +38841,10 @@
           rev = "e56d7dda617555ec6205644d32ffddf2e1fa43d9";
           sha256 = "060zxl2y4p50g5fwgplgx07h5akfplp49rkv5cx09rqlcyzqhqwa";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b18a6842805856062e9452dc32bf0fd458f7d51a/recipes/groovy-imports";
           sha256 = "09yjkwsm192lgala1pvxw47id4j7362sl3j1hn9ald2m8m3ddyfs";
-          name = "groovy-imports";
+          name = "recipe";
         };
         packageRequires = [ emacs pcache s ];
         meta = {
@@ -31098,20 +38852,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    groovy-mode = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    groovy-mode = callPackage ({ dash
+                               , emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild
+                               , s }:
+      melpaBuild {
         pname = "groovy-mode";
-        version = "20180412.538";
+        version = "20180601.738";
         src = fetchFromGitHub {
           owner = "Groovy-Emacs-Modes";
           repo = "groovy-emacs-modes";
-          rev = "0aea74def58791b2343a8f0139c2f2a6a0941877";
-          sha256 = "0aih46rk2zzxhbx4k65w1lmg3ibxnkimdfpyxc5qfdcr4kyfg06i";
+          rev = "a5afa3ac0a23c1bdebea014d06e5c30dde56ee8b";
+          sha256 = "04jciwr7614cw3dl9hfiypmqc28njbrin6j3g5r27xn1f91sd5ni";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe318b4e51a280a55c01fa30455e4a180df8bd6/recipes/groovy-mode";
           sha256 = "1pxw7rdn56klmr6kw21lhzh7zhp338gyf54ypsml64ibzr1x9kal";
-          name = "groovy-mode";
+          name = "recipe";
         };
         packageRequires = [ dash emacs s ];
         meta = {
@@ -31119,20 +38879,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    gruber-darker-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    gruber-darker-theme = callPackage ({ fetchFromGitHub
+                                       , fetchurl
+                                       , lib
+                                       , melpaBuild }:
+      melpaBuild {
         pname = "gruber-darker-theme";
-        version = "20170719.2229";
+        version = "20180529.12";
         src = fetchFromGitHub {
           owner = "rexim";
           repo = "gruber-darker-theme";
-          rev = "8e6bb26ce0abe20e6129ae8c8ad5c41e0832334e";
-          sha256 = "1dxlpyc4w6ys08ir2bivv9lhjpwfjlh3wczmr0r03pc1fqx0w2ap";
+          rev = "c7687ec0511941db1371dcd70b31061d74aa5668";
+          sha256 = "1dn4vb07wrnc6w94563isx8jfv6vbpp04kh0jfqjmc7nbmyzpaf2";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/87ade74553c04cb9dcfe16d03f263cc6f1fed046/recipes/gruber-darker-theme";
           sha256 = "0vn4msixb77xj6p5mlfchjyyjhzah0lcmp0z82s8849zd194fxqi";
-          name = "gruber-darker-theme";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -31140,8 +38903,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    grunt = callPackage ({ ansi-color ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    grunt = callPackage ({ ansi-color ? null
+                         , dash
+                         , emacs
+                         , fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "grunt";
         version = "20160316.828";
         src = fetchFromGitHub {
@@ -31150,10 +38919,10 @@
           rev = "4c269e2738658643ec2ed9ef61a2a3d71b08d304";
           sha256 = "1xd6gv9bkqnj7j5mcnwvl1mxjmzvxqhp135hxj0ijc0ybdybacf7";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/acc9b816796b9f142c53f90593952b43c962d2d8/recipes/grunt";
           sha256 = "1qdzqcrff9x97kyy0d4j636d5i751qja10liw8i0lf4lk6n0lywz";
-          name = "grunt";
+          name = "recipe";
         };
         packageRequires = [ ansi-color dash emacs ];
         meta = {
@@ -31161,20 +38930,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    gruvbox-theme = callPackage ({ autothemer, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    gruvbox-theme = callPackage ({ autothemer
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "gruvbox-theme";
-        version = "20180313.1451";
+        version = "20180623.2009";
         src = fetchFromGitHub {
           owner = "Greduan";
           repo = "emacs-theme-gruvbox";
-          rev = "dd5e5ad109cf0b5db6c5d9ba279337a799e12b89";
-          sha256 = "17ga9qrjmvyjj7i77k6k0riy1jc3lvjvc3v631yvza4qi28492fv";
+          rev = "796999e5db2a0e43ad64c062c1bec3c966d095bc";
+          sha256 = "0qj5k0c1592ikrb7gcibqwf8hhj6lq4cw7zrb3kmpk4zakzy7a2w";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2bd48c87919f64ced9f3add4860751bb34cb5ecb/recipes/gruvbox-theme";
           sha256 = "042mnwlmixygk2mf24ygk7rkv1rfavc5a36hs9x8b68jnf3khj32";
-          name = "gruvbox-theme";
+          name = "recipe";
         };
         packageRequires = [ autothemer ];
         meta = {
@@ -31182,8 +38955,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    gs-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    gs-mode = callPackage ({ fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "gs-mode";
         version = "20151202.206";
         src = fetchFromGitHub {
@@ -31192,10 +38968,10 @@
           rev = "1a13051db21b999c7682a015b33a03096ff9d891";
           sha256 = "1d89gxyzv0z0nk7v1aa4qa0xfms2g2dsrr07cw0d99xsnyxfky31";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bc1aa5335810e3d6572ebe9cd8949932b74d0f46/recipes/gs-mode";
           sha256 = "02ldd92fv1k28nygl34i8gv0b0i1v5qd7nl1l17cf5f3akdwc6iq";
-          name = "gs-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -31203,8 +38979,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    gscholar-bibtex = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    gscholar-bibtex = callPackage ({ fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "gscholar-bibtex";
         version = "20170913.1457";
         src = fetchFromGitHub {
@@ -31213,10 +38992,10 @@
           rev = "ba4ce159e385d695d8560e8b06b3cbe48424861c";
           sha256 = "0idnfhk17avp0r4706grjqqkz0xl98gs0bx7wrkvwym3y2gadlz2";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9fa546d3dce59b07a623ee83e3befe139dc10481/recipes/gscholar-bibtex";
           sha256 = "0d41gr9amf9vdn9pl9lamhp2swqllxslv9r3wsgzqvjl7zayd1az";
-          name = "gscholar-bibtex";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -31224,8 +39003,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    gtk-pomodoro-indicator = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    gtk-pomodoro-indicator = callPackage ({ fetchFromGitHub
+                                          , fetchurl
+                                          , lib
+                                          , melpaBuild }:
+      melpaBuild {
         pname = "gtk-pomodoro-indicator";
         version = "20171230.840";
         src = fetchFromGitHub {
@@ -31234,10 +39016,10 @@
           rev = "eb59b229de0dde307b20654075a9bbac69899a66";
           sha256 = "0dmaazcscg9mdsmij26873af5jl2np4q9xf2klw1jmcl61wzggb0";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a58f1acaafc459e055d751acdb68427e4b11275e/recipes/gtk-pomodoro-indicator";
           sha256 = "1lkz1bk3zl51jdgp7pg6sr57drdwz8mlvl9ryky3iv73kr5i0q6c";
-          name = "gtk-pomodoro-indicator";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -31245,8 +39027,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    guess-language = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    guess-language = callPackage ({ cl-lib ? null
+                                  , emacs
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "guess-language";
         version = "20170620.308";
         src = fetchFromGitHub {
@@ -31255,10 +39042,10 @@
           rev = "1f1602f74d7159e7fb8c90f92ec5a3d1df5429da";
           sha256 = "1764v96sdn3zvpd35ppn31ib4p8cvdrj0bfmbplxg2xhp7xkgmca";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6e78cb707943fcaaba0414d7af2af717efce84d0/recipes/guess-language";
           sha256 = "1p8j18hskvsv4pn3cal5s91l19hgshq8hpclmp84z9hlnj9g9fpm";
-          name = "guess-language";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -31266,8 +39053,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    guide-key = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, popwin, s }:
-    melpaBuild {
+    guide-key = callPackage ({ dash
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild
+                             , popwin
+                             , s }:
+      melpaBuild {
         pname = "guide-key";
         version = "20150107.2235";
         src = fetchFromGitHub {
@@ -31276,10 +39069,10 @@
           rev = "9236d287a7272e307fb941237390a96037c8c0a2";
           sha256 = "14sx5m6fpkm2q8ljkicl1yy1sw003k4rzz9hi7lm1nfqr2l4n6q0";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/490b81308ae8132d8c3fd8c3951be88159719172/recipes/guide-key";
           sha256 = "0zjrdvppcg8b2k6hfdj45rswc1ks9xgimcr2yvgpc8prrwk1yjsf";
-          name = "guide-key";
+          name = "recipe";
         };
         packageRequires = [ dash popwin s ];
         meta = {
@@ -31287,8 +39080,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    guide-key-tip = callPackage ({ fetchFromGitHub, fetchurl, guide-key, lib, melpaBuild, pos-tip }:
-    melpaBuild {
+    guide-key-tip = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , guide-key
+                                 , lib
+                                 , melpaBuild
+                                 , pos-tip }:
+      melpaBuild {
         pname = "guide-key-tip";
         version = "20161011.123";
         src = fetchFromGitHub {
@@ -31297,10 +39095,10 @@
           rev = "02c5d4b0b65f3e91be5a47f0ff1ae5e86e00c64e";
           sha256 = "1xkrfjmhprnj8i39a85wfcs5whm93fw8l57c606wdhiwqj719ciz";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1f23db7563654ab58632d56e3b01d2f78276fc3e/recipes/guide-key-tip";
           sha256 = "0h2vkkbxq361dkn6irm1v19qj7bkhxcjljiksd5wwlq5zsq6bd06";
-          name = "guide-key-tip";
+          name = "recipe";
         };
         packageRequires = [ guide-key pos-tip ];
         meta = {
@@ -31308,20 +39106,29 @@
           license = lib.licenses.free;
         };
       }) {};
-    guix = callPackage ({ bui, dash, edit-indirect, emacs, fetchFromGitHub, fetchurl, geiser, lib, magit-popup, melpaBuild }:
-    melpaBuild {
+    guix = callPackage ({ bui
+                        , dash
+                        , edit-indirect
+                        , emacs
+                        , fetchFromGitHub
+                        , fetchurl
+                        , geiser
+                        , lib
+                        , magit-popup
+                        , melpaBuild }:
+      melpaBuild {
         pname = "guix";
-        version = "20180414.1025";
+        version = "20180705.315";
         src = fetchFromGitHub {
           owner = "alezost";
           repo = "guix.el";
-          rev = "00c87a9cafa3d74840be02efa2516286515b6f93";
-          sha256 = "0mbri7p7hm5bfqw8i8wl5yc5av13sd77bs15af44nv8p5gqx7wng";
+          rev = "f220e82b2dd94fb349ae37665912a42196d53975";
+          sha256 = "12k2qib7qbxxkidsnw2a44jakw0lgbz8kksgxfbqmaryzi35wh5v";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b3d8c73e8a946b8265487a0825d615d80aa3337d/recipes/guix";
           sha256 = "0h4jwc4h2jv09c6rngb614fc39qfy04rmvqrn1l54hn28s6q7sk9";
-          name = "guix";
+          name = "recipe";
         };
         packageRequires = [ bui dash edit-indirect emacs geiser magit-popup ];
         meta = {
@@ -31329,8 +39136,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    gulp-task-runner = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    gulp-task-runner = callPackage ({ fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "gulp-task-runner";
         version = "20170718.1341";
         src = fetchFromGitHub {
@@ -31339,10 +39149,10 @@
           rev = "877990e956b1d71e2d9c7c3e5a129ad199b9debb";
           sha256 = "13qy4x4ap43qm5w2vrsy6w01z2s2kymfr9qvlj2yri4xk3r4vrps";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/34a2bede5ea70cf9df623c32e789d78205f9ebb0/recipes/gulp-task-runner";
           sha256 = "0211mws99bc9ipg7r3qqm1n7gszvwil31psinf0250wliyppjij7";
-          name = "gulp-task-runner";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -31350,8 +39160,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    guru-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    guru-mode = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "guru-mode";
         version = "20170730.31";
         src = fetchFromGitHub {
@@ -31360,10 +39173,10 @@
           rev = "c180e05ebc1484764aad245c85b69de779826e4e";
           sha256 = "0qb6yr6vbic0rh8ayrpbz5byq7jxmwm1fc9l4alpz7dhyb11z07v";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e60af6ccb902d8ef00cfecbb13cafebbe3b00d89/recipes/guru-mode";
           sha256 = "0j25nxs3ndybq1ik36qyqdprmhav4ba8ny7v2z61s23id8hz3xjs";
-          name = "guru-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -31371,20 +39184,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    gvpr-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    gvpr-mode = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "gvpr-mode";
         version = "20131208.918";
         src = fetchFromGitHub {
           owner = "rodw";
           repo = "gvpr-lib";
-          rev = "3d6cc6f4416faf2a1913821d12ba6eb624362af0";
-          sha256 = "0060qw4gr9fv6db20xf3spgl2fwg2iid5ckfjm3vj3ydyv62q13s";
+          rev = "1fb539b8227200f75d7eeb9706a236f805159a63";
+          sha256 = "18902m92yyw4mqr5x3gzpqw13lykwv7llbqvck0kipyp3fpjjn7y";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ab25afcf4232082dc0e48706734f141a308912a7/recipes/gvpr-mode";
           sha256 = "19p6f06qdjvh2vmgbabajvkfxpn13j899jrivw9mqyssz0cyvzgw";
-          name = "gvpr-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -31392,8 +39208,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    gxref = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    gxref = callPackage ({ emacs
+                         , fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "gxref";
         version = "20170411.1053";
         src = fetchFromGitHub {
@@ -31402,10 +39222,10 @@
           rev = "380b02c3c3c2586c828456716eef6a6392bb043b";
           sha256 = "1c5j28rwqx53qdsqglif8yblhm2bwm4qzpl2dg0l0g3pr8pk8zjk";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/429b9150d4054fcadab8c5ca3b688921eeb19b78/recipes/gxref";
           sha256 = "06qlfjclfx00m8pr7lk6baim3vjk5i0m75i1p4aihp2vflvgjaby";
-          name = "gxref";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -31413,8 +39233,38 @@
           license = lib.licenses.free;
         };
       }) {};
-    habitica = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
-    melpaBuild {
+    habamax-theme = callPackage ({ emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
+        pname = "habamax-theme";
+        version = "20180702.958";
+        src = fetchFromGitHub {
+          owner = "habamax";
+          repo = "habamax-theme";
+          rev = "b40e3e7c637e67c8f9164b0db9e75c0ec4eb6a0f";
+          sha256 = "0fgvnfqgg6gqrwlb8yibs4nybvskd6awxqdpj4yy9jfqibggppld";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/77386484ad0b31c2818fae52cd312821c4632cb8/recipes/habamax-theme";
+          sha256 = "1rmir9gc1niwkshxg1826nkh8xxmpim5pbhp61wx1m273lfn2h69";
+          name = "recipe";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/habamax-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    habitica = callPackage ({ emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild
+                            , org }:
+      melpaBuild {
         pname = "habitica";
         version = "20171022.1922";
         src = fetchFromGitHub {
@@ -31423,10 +39273,10 @@
           rev = "e51ff7436fe1da10404e2c0872b15d6a7a926717";
           sha256 = "1hiiqf82nagnpq2qdcdv6y2blfiqs6f8ia8k66a4zn5xgwpd13f4";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cf9543db3564f4806440ed8c5c30fecbbc625fa1/recipes/habitica";
           sha256 = "0g7rb8ip5d6xvlsfk8cvf81hgzlq5p4kw9pkisjq9ri8mvkfmxf3";
-          name = "habitica";
+          name = "recipe";
         };
         packageRequires = [ emacs org ];
         meta = {
@@ -31434,8 +39284,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    hack-time-mode = callPackage ({ emacs, fetchFromGitLab, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    hack-time-mode = callPackage ({ emacs
+                                  , fetchFromGitLab
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "hack-time-mode";
         version = "20170527.910";
         src = fetchFromGitLab {
@@ -31444,10 +39298,10 @@
           rev = "73d6fcf8b39283526e5d4e3919193611e25a0898";
           sha256 = "1w0idf28fhyn0qmjk1zgh80gzcrkgx5bc8mb0xamc20i53wpr4xl";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6481dc9f487c5677f2baf1bffdf8f2297185345e/recipes/hack-time-mode";
           sha256 = "0vz72ykl679a69sb0r2h9ymcr3xms7bij1w6vxndlfw5v9hg3hk5";
-          name = "hack-time-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -31455,8 +39309,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    hacker-typer = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    hacker-typer = callPackage ({ emacs
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "hacker-typer";
         version = "20170206.720";
         src = fetchFromGitHub {
@@ -31465,10 +39323,10 @@
           rev = "d5a23714a4ccc5071580622f278597d5973f40bd";
           sha256 = "13wp7cg9d9ij44inxxyk1knczglxrbfaq50wyhc4x5zfhz5yw7wx";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8e04a3a1606ea23865c04d93e3dc77cb55b9931f/recipes/hacker-typer";
           sha256 = "128y562cxi8rblnqjdzhqc6b58bxi67f6hz569gqw4jywz0xcd0g";
-          name = "hacker-typer";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -31476,20 +39334,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    hackernews = callPackage ({ fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }:
-    melpaBuild {
+    hackernews = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , json ? null
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "hackernews";
         version = "20180220.419";
         src = fetchFromGitHub {
           owner = "clarete";
           repo = "hackernews.el";
-          rev = "309c60c974eb5af4554e0675d4285baa77d89e54";
-          sha256 = "0gz5f17654bbjwydznpcy6aqzxbv2infbb4wd8zawf9dmb0wxc3q";
+          rev = "89077fdb98ab1e77459c7839decdf21b87f4341b";
+          sha256 = "11id6gp6mz97sm2izz6y47n3sphlibdb6nzvbkcxl7l7av53wxg7";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c43a342e47e5ede468bcf51a60d4dea3926f51bd/recipes/hackernews";
           sha256 = "1x1jf5gkhmpiby5rmy0sziywh6c1f1n0p4f6dlz6ifbwns7har6a";
-          name = "hackernews";
+          name = "recipe";
         };
         packageRequires = [ json ];
         meta = {
@@ -31497,8 +39359,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    hal-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    hal-mode = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "hal-mode";
         version = "20160704.1046";
         src = fetchFromGitHub {
@@ -31507,10 +39372,10 @@
           rev = "cd2f66f219ee520198d4586fb6b169cef7ad3f21";
           sha256 = "0xibwmngijq0wv9hkahs5nh02qj3ma0bkczl07hx8wnl6j27f0nj";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/955a4d94110bb2048d899a3d7671937e69d5ac79/recipes/hal-mode";
           sha256 = "1b1hvlm80awbyjjs5d51v46hw8a2jfz8dv9r61h7vvwh9a8wpgk2";
-          name = "hal-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -31518,8 +39383,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    ham-mode = callPackage ({ fetchFromGitHub, fetchurl, html-to-markdown, lib, markdown-mode, melpaBuild }:
-    melpaBuild {
+    ham-mode = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , html-to-markdown
+                            , lib
+                            , markdown-mode
+                            , melpaBuild }:
+      melpaBuild {
         pname = "ham-mode";
         version = "20150811.606";
         src = fetchFromGitHub {
@@ -31528,10 +39398,10 @@
           rev = "3a141986a21c2aa6eefb428983352abb8b7907d2";
           sha256 = "0d3xmagl18pas19zbpg27j0lmdiry23df48z4vkjsrcllqg25v5g";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/ham-mode";
           sha256 = "000qrdby7d6zmp5066vs4gjlc9ik0ybrgcwzcbfgxb16w1g9xpmz";
-          name = "ham-mode";
+          name = "recipe";
         };
         packageRequires = [ html-to-markdown markdown-mode ];
         meta = {
@@ -31539,20 +39409,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    hamburg-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    hamburg-theme = callPackage ({ emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "hamburg-theme";
         version = "20160122.2340";
         src = fetchFromGitHub {
           owner = "mswift42";
           repo = "hamburg-theme";
-          rev = "aacefdf1501d97a5afc0e63c8ead4b2463323028";
-          sha256 = "1rnkzl51h263nck1bd0jyb7q58b54d764gcsh7wqxfgzs1jfr4am";
+          rev = "a05bf090e0c57c34cc59e301f95d9961280db244";
+          sha256 = "1k0z2x95lb4in325nsyl1r75m4px61wp077ak2asmp0i2p8g34g7";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/465ac6063c4f91652e59a8bbb493897109791728/recipes/hamburg-theme";
           sha256 = "149ln7670kjyhdfj5j9akxch47dlff2hd58amla7j3297z1nhg4k";
-          name = "hamburg-theme";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -31560,20 +39434,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    hamburger-menu = callPackage ({ emacs, fetchFromGitLab, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    hamburger-menu = callPackage ({ emacs
+                                  , fetchFromGitLab
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "hamburger-menu";
         version = "20160825.1331";
         src = fetchFromGitLab {
           owner = "iain";
           repo = "hamburger-menu-mode";
-          rev = "3568159c693c30bed7f61580e4f3b6241253ad4e";
-          sha256 = "1nykpp8afa0c0wiax1qn8wf5hfjaixk5kn4yhcw40z00pb8i2z5f";
+          rev = "cfeff6e0dd80bf89ed671af9de3dac2e7f90b619";
+          sha256 = "05skvms2lz3fsgzg873nk887flr6ga5h8bkhrf6qawaj26naj6i9";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e8017730403cc0e613e3939017f85074753c3778/recipes/hamburger-menu";
           sha256 = "0ws9729i51arjqwpiywcpb7y3c5sm3c9wrq8q0k0m9hpq8h11wdb";
-          name = "hamburger-menu";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -31581,8 +39459,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    haml-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    haml-mode = callPackage ({ cl-lib ? null
+                             , emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "haml-mode";
         version = "20170923.2153";
         src = fetchFromGitHub {
@@ -31591,10 +39474,10 @@
           rev = "1cbb2de8f0fc25f35448c5cad04642f28078f3bb";
           sha256 = "1045bf7bq914d3577kg9xakm4yciwwsvlh5qwfk4wnsraf7rld0r";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/haml-mode";
           sha256 = "0ih0m7zr6kgn6zd45zbp1jgs1ydc5i5gmq6l080wma83v5w1436f";
-          name = "haml-mode";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -31602,8 +39485,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    hamlet-mode = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    hamlet-mode = callPackage ({ cl-lib ? null
+                               , dash
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild
+                               , s }:
+      melpaBuild {
         pname = "hamlet-mode";
         version = "20131207.2324";
         src = fetchFromGitHub {
@@ -31612,10 +39501,10 @@
           rev = "7362b955e556a3d007fa06945a27e5b99349527d";
           sha256 = "1njrpb1s2v9skyfbgb28clrxyvyp8i4b8kwa68ynvq3vjb4fnws6";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/hamlet-mode";
           sha256 = "16cyfzv2yrf249jklxdahfmsy8rg6hargjpafy4fz4a532fcbw81";
-          name = "hamlet-mode";
+          name = "recipe";
         };
         packageRequires = [ cl-lib dash s ];
         meta = {
@@ -31623,8 +39512,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    handlebars-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    handlebars-mode = callPackage ({ fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "handlebars-mode";
         version = "20150211.949";
         src = fetchFromGitHub {
@@ -31633,10 +39525,10 @@
           rev = "81f6b73fea8f397807781a1b51568397af21a6ef";
           sha256 = "0w443knp6kvjm2m79cni5d17plyhbsl0a4kip7yrpv5nmg370q3p";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/handlebars-mode";
           sha256 = "0wizasjihnabnqzn1226vh4gb571rs7s86bffhvkfvbk95zkiafq";
-          name = "handlebars-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -31644,20 +39536,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    handlebars-sgml-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    handlebars-sgml-mode = callPackage ({ fetchFromGitHub
+                                        , fetchurl
+                                        , lib
+                                        , melpaBuild }:
+      melpaBuild {
         pname = "handlebars-sgml-mode";
         version = "20130623.1633";
         src = fetchFromGitHub {
           owner = "jacott";
           repo = "handlebars-sgml-mode";
-          rev = "c76df93a9a8c1b1b3efdcc4add32bf93304192a4";
-          sha256 = "1z37di9vk1l35my8kl8jnyqlkr1rnp0iz13hpc0r065mib67v58k";
+          rev = "005282c33dfb6dbd2cfd46a4147d261504e8323c";
+          sha256 = "1vx9lxwhj7n928ddzj9vzy8mw0fj7vgzx477x8ay79rhpvs8v122";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/87aec68ed80545a61ad46b71e7bd9dbfc7634108/recipes/handlebars-sgml-mode";
           sha256 = "10sxm7v94yxa92mqbwj3shqjs6f3zbxjvwgbvg9m2fh3b7xj617w";
-          name = "handlebars-sgml-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -31665,8 +39560,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    handoff = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    handoff = callPackage ({ fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "handoff";
         version = "20150916.2300";
         src = fetchFromGitHub {
@@ -31675,10 +39573,10 @@
           rev = "75dc7a7e352f38679f65d0ca80ad158798e168bd";
           sha256 = "0whn8rc98dhncgizzrb22nx6b6cm655q1cf2fpn6g3knq1c2471r";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bbdb89413b3f5de680e3f9fa625039c73a377e97/recipes/handoff";
           sha256 = "0iqqvygx50wi2vcbs6bfgqzhcz9a89zrwb7sg0ang9qrkiz5k36w";
-          name = "handoff";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -31686,8 +39584,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    hardcore-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    hardcore-mode = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "hardcore-mode";
         version = "20151113.2301";
         src = fetchFromGitHub {
@@ -31696,10 +39597,10 @@
           rev = "b1dda19692b4a7a58a689e81784a9b35be39e70d";
           sha256 = "124k803pgxc7fz325yy6jcyam69f5fk9kdwfgmnwwca9ablq4cfb";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b929b3343cd5925944665e4e09b4524bca873c95/recipes/hardcore-mode";
           sha256 = "1bgi1acpw4z7i03d0i8mrd2hpjn6hyvkdsk0ks9q380yp9mqmiwd";
-          name = "hardcore-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -31707,8 +39608,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    hardhat = callPackage ({ fetchFromGitHub, fetchurl, ignoramus, lib, melpaBuild }:
-    melpaBuild {
+    hardhat = callPackage ({ fetchFromGitHub
+                           , fetchurl
+                           , ignoramus
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "hardhat";
         version = "20160414.713";
         src = fetchFromGitHub {
@@ -31717,10 +39622,10 @@
           rev = "9038a49ab55cd4c502cf7f07ed0d1b9b6bc3626e";
           sha256 = "0j9z46j777y3ljpai5czdlwl07f0irp4fsk4677n11ndyqm1amb5";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/081aa3e1d50c2c9e5a9b9ce0716258a93279f605/recipes/hardhat";
           sha256 = "16pdbpm647ag9cadmdm75nwwyzrqsd9y1b4zgkl3pg669mi5vl5z";
-          name = "hardhat";
+          name = "recipe";
         };
         packageRequires = [ ignoramus ];
         meta = {
@@ -31728,8 +39633,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    harvest = callPackage ({ fetchFromGitHub, fetchurl, hydra, lib, melpaBuild, s, swiper }:
-    melpaBuild {
+    harvest = callPackage ({ fetchFromGitHub
+                           , fetchurl
+                           , hydra
+                           , lib
+                           , melpaBuild
+                           , s
+                           , swiper }:
+      melpaBuild {
         pname = "harvest";
         version = "20170822.1046";
         src = fetchFromGitHub {
@@ -31738,10 +39649,10 @@
           rev = "7acbc0564b250521b67131ee2a0a92720239454f";
           sha256 = "0wzv67kkfyaw19ddw0ra45p6rja6bk6d1xi3ak5lkyzvgqvylr3b";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c97d3f653057eab35c612109792884334be556fe/recipes/harvest";
           sha256 = "1r6brld6iq03wsr1b3jhdkxwrcxa6g6fwa1jiy1kgjsr9dq1m51c";
-          name = "harvest";
+          name = "recipe";
         };
         packageRequires = [ hydra s swiper ];
         meta = {
@@ -31749,8 +39660,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    haskell-emacs = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    haskell-emacs = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "haskell-emacs";
         version = "20160904.1326";
         src = fetchFromGitHub {
@@ -31759,10 +39673,10 @@
           rev = "a2c6a079175904689eed7c6c200754bfa85d1ed9";
           sha256 = "1xpaqcj33vyzs5yv2w4dahw8a2vb6zcb3z7y2aqc5jdg3fx9ypam";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5daff329a96a6d10bca11d838bbc95d1c8bcfbd9/recipes/haskell-emacs";
           sha256 = "1wkh7qws35c32hha0p9rpjz5pls2844920nh919lvp2wmq9l6jd6";
-          name = "haskell-emacs";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -31770,20 +39684,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    haskell-emacs-base = callPackage ({ fetchFromGitHub, fetchurl, haskell-emacs, lib, melpaBuild }:
-    melpaBuild {
+    haskell-emacs-base = callPackage ({ fetchFromGitHub
+                                      , fetchurl
+                                      , haskell-emacs
+                                      , lib
+                                      , melpaBuild }:
+      melpaBuild {
         pname = "haskell-emacs-base";
         version = "20150714.859";
         src = fetchFromGitHub {
           owner = "knupfer";
           repo = "haskell-emacs";
-          rev = "a2c6a079175904689eed7c6c200754bfa85d1ed9";
-          sha256 = "1xpaqcj33vyzs5yv2w4dahw8a2vb6zcb3z7y2aqc5jdg3fx9ypam";
+          rev = "7f91f65254902b8ff04fdb679bc569b2f6a51637";
+          sha256 = "17i9l6wgrvmp31ca4xrax31f7bjnn0vn2figycxhfaq9f6vxgkkn";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5daff329a96a6d10bca11d838bbc95d1c8bcfbd9/recipes/haskell-emacs-base";
           sha256 = "1fwkds6qyhbxxdgxfzmgd7dlcxr08ynrrg5jdp9r7f924pd536vb";
-          name = "haskell-emacs-base";
+          name = "recipe";
         };
         packageRequires = [ haskell-emacs ];
         meta = {
@@ -31791,20 +39709,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    haskell-emacs-text = callPackage ({ fetchFromGitHub, fetchurl, haskell-emacs, lib, melpaBuild }:
-    melpaBuild {
+    haskell-emacs-text = callPackage ({ fetchFromGitHub
+                                      , fetchurl
+                                      , haskell-emacs
+                                      , lib
+                                      , melpaBuild }:
+      melpaBuild {
         pname = "haskell-emacs-text";
         version = "20150713.716";
         src = fetchFromGitHub {
           owner = "knupfer";
           repo = "haskell-emacs";
-          rev = "a2c6a079175904689eed7c6c200754bfa85d1ed9";
-          sha256 = "1xpaqcj33vyzs5yv2w4dahw8a2vb6zcb3z7y2aqc5jdg3fx9ypam";
+          rev = "cc240612740fc3fd6e3c3d8cdfe486a89954f5d1";
+          sha256 = "09g6b1ad7qi9k58ymgmssgapwapxcwf30qhmfl2w8sl045ngzlkk";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5daff329a96a6d10bca11d838bbc95d1c8bcfbd9/recipes/haskell-emacs-text";
           sha256 = "1j18fhhra6lv32xrq8jc6l8i56fgn68da81wymcimpmpbp0hl5fy";
-          name = "haskell-emacs-text";
+          name = "recipe";
         };
         packageRequires = [ haskell-emacs ];
         meta = {
@@ -31812,20 +39734,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    haskell-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    haskell-mode = callPackage ({ emacs
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "haskell-mode";
-        version = "20180406.2222";
+        version = "20180601.143";
         src = fetchFromGitHub {
           owner = "haskell";
           repo = "haskell-mode";
-          rev = "d71cca7f5ddc8178f5fe331563edcefe91cc0bcb";
-          sha256 = "1amg9k50nw90b1dci6bylhrdkfmwminxcx3hlxxwvfvdgszfs2s4";
+          rev = "dd0ea640fa449d021399a17db65e4d50d3f0f2a9";
+          sha256 = "0cc8mhjn4qhn3zs3x7azkjnvalg156b6h0n13b8wzlvyp9ka28yj";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7f18b4dcbad4192b0153a316cff6533272898f1a/recipes/haskell-mode";
           sha256 = "0wijvcpfdbl17iwzy47vf8brkj2djarfr8y28rw0wqvbs381zzwp";
-          name = "haskell-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -31833,8 +39759,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    haskell-snippets = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
-    melpaBuild {
+    haskell-snippets = callPackage ({ cl-lib ? null
+                                    , fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild
+                                    , yasnippet }:
+      melpaBuild {
         pname = "haskell-snippets";
         version = "20160918.1722";
         src = fetchFromGitHub {
@@ -31843,10 +39774,10 @@
           rev = "07b0f460b946fd1be26c29652cb0468b47782f3a";
           sha256 = "0a7y3awi9hcyahggf0ghsdwvsmrhr9yq634wy9lkqjzrm2hqj0ci";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b5534e58ea66fd90ba4a69262f0b303c7fb85af4/recipes/haskell-snippets";
           sha256 = "10bvv7q694fahcpm83v8lpqihg1gvfzrp1hdzwiffxydfvdbalh2";
-          name = "haskell-snippets";
+          name = "recipe";
         };
         packageRequires = [ cl-lib yasnippet ];
         meta = {
@@ -31854,8 +39785,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    haskell-tab-indent = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    haskell-tab-indent = callPackage ({ fetchgit
+                                      , fetchurl
+                                      , lib
+                                      , melpaBuild }:
+      melpaBuild {
         pname = "haskell-tab-indent";
         version = "20170701.258";
         src = fetchgit {
@@ -31863,10 +39797,10 @@
           rev = "b4cb851aef96c42ec7b3cc37b6fdd867fe5a0853";
           sha256 = "1ah1xagfzsbsgggva621p95qgd0bnsn733gb0ap4p4kgi5hwdqll";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/371f9f45e441cdf4e95557d1e9692619fab3024a/recipes/haskell-tab-indent";
           sha256 = "0vdfmy56w5yi202nbd28v1bzj97v1wxnfnb5z3dh9687p2abgnr7";
-          name = "haskell-tab-indent";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -31874,20 +39808,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    hasky-extensions = callPackage ({ avy-menu, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    hasky-extensions = callPackage ({ avy-menu
+                                    , emacs
+                                    , fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "hasky-extensions";
         version = "20180107.2112";
         src = fetchFromGitHub {
           owner = "hasky-mode";
           repo = "hasky-extensions";
-          rev = "6909022bccb7e5c26d1c4e5fa20cbc6b65c62d69";
-          sha256 = "0s5y84ih5hy6m5krmbgbr027xzhw0vybha0pdi0njjyggagirgxd";
+          rev = "d75dc57f4eaeb92785bde6c26c1031710be1cf00";
+          sha256 = "135rn33ldrhz3z6fg1rcdaxs1dnahliw782qc4ffxkays186id63";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e3f73e3df8476fa231d04211866671dd74911603/recipes/hasky-extensions";
           sha256 = "0ymigba1d0qkrk3ccd3cx754safzmx1v5d13976571rszgmkvr15";
-          name = "hasky-extensions";
+          name = "recipe";
         };
         packageRequires = [ avy-menu emacs ];
         meta = {
@@ -31895,8 +39834,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    hasky-stack = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, magit-popup, melpaBuild }:
-    melpaBuild {
+    hasky-stack = callPackage ({ emacs
+                               , f
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , magit-popup
+                               , melpaBuild }:
+      melpaBuild {
         pname = "hasky-stack";
         version = "20180331.208";
         src = fetchFromGitHub {
@@ -31905,10 +39850,10 @@
           rev = "3e17ce07dd6b0207474e4ff14ad7b8c467382947";
           sha256 = "0cdsdlgapf9xxj928hlb7ch9x8rznayrvj7n8j2vzfa0kfmg7qwf";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c3faf544872478c3bccf2fe7dc51d406031e4d80/recipes/hasky-stack";
           sha256 = "08ds0v5p829s47lbhibswnbn1aqfnwf6xx7p5bc5062wxdvqahw8";
-          name = "hasky-stack";
+          name = "recipe";
         };
         packageRequires = [ emacs f magit-popup ];
         meta = {
@@ -31916,20 +39861,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    haste = callPackage ({ fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }:
-    melpaBuild {
+    haste = callPackage ({ fetchFromGitHub
+                         , fetchurl
+                         , json ? null
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "haste";
         version = "20141030.1334";
         src = fetchFromGitHub {
           owner = "rlister";
           repo = "emacs-haste-client";
-          rev = "22d05aacc3296ab50a7361222ab139fb4d447c25";
-          sha256 = "1gmh455ahd9if11f8mrqbfky24c784bb4fgdl3pj8i0n5sl51i88";
+          rev = "f1099c6296fc9575675e281402b89854739114bb";
+          sha256 = "1a6almgsh93jzi5h59mmrlwcz805j3fnr8vrcfxnirxpr39159sq";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/haste";
           sha256 = "175kprxqbpmssjxavcm7lyzg1cwsxkrfg9pc72vgqyfmcmjyk34c";
-          name = "haste";
+          name = "recipe";
         };
         packageRequires = [ json ];
         meta = {
@@ -31937,20 +39886,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    haxe-imports = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pcache, s }:
-    melpaBuild {
+    haxe-imports = callPackage ({ emacs
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild
+                                , pcache
+                                , s }:
+      melpaBuild {
         pname = "haxe-imports";
         version = "20170330.1604";
         src = fetchFromGitHub {
           owner = "accidentalrebel";
           repo = "emacs-haxe-imports";
-          rev = "f104a641f3dfe698359d9aca1f28d9383cf43e04";
-          sha256 = "09crkm4ibi4m23qw4saqm0nm2i4cv40md3p768j2vniamby2q78f";
+          rev = "a4ab31759bd237e78c055dda73e808a4ee1b5fde";
+          sha256 = "1x721jwdngahdmj0799ayg91kqxf6jv627b766bbq2hmagsf9si4";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/db7d2b08e914aab7719c6d3a951b142ec7252f34/recipes/haxe-imports";
           sha256 = "10xh57ir49f18pzw9ihpwffchm1mba0ck1zdqsfllh3p5gry1msg";
-          name = "haxe-imports";
+          name = "recipe";
         };
         packageRequires = [ emacs pcache s ];
         meta = {
@@ -31958,8 +39913,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    haxe-mode = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    haxe-mode = callPackage ({ fetchhg
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "haxe-mode";
         version = "20131004.142";
         src = fetchhg {
@@ -31967,10 +39925,10 @@
           rev = "850f29d9f70e";
           sha256 = "106a7kpjj4laxl7x8aqpv75ih54569b3bs2a1b8z4rghmikqc4aw";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/haxe-mode";
           sha256 = "07krrpi636dadgyxxhh5037kq527wpnszbl22lk6i5fcxqidcnw9";
-          name = "haxe-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -31978,8 +39936,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    haxor-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    haxor-mode = callPackage ({ emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "haxor-mode";
         version = "20160618.429";
         src = fetchFromGitHub {
@@ -31988,10 +39950,10 @@
           rev = "6fa25a8e6b6a59481bc0354c2fe1e0ed53cbdc91";
           sha256 = "0pdfvqbz4wmjl15wi3k4h7myij8v63vmyiq8g9fai18f7ad2klp1";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/haxor-mode";
           sha256 = "0ss0kkwjyc7z7vcb89qr02p70c6m2jarr34mxmdv6ipwil58jj1s";
-          name = "haxor-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -31999,8 +39961,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    hayoo = callPackage ({ emacs, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }:
-    melpaBuild {
+    hayoo = callPackage ({ emacs
+                         , fetchFromGitHub
+                         , fetchurl
+                         , json ? null
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "hayoo";
         version = "20140831.521";
         src = fetchFromGitHub {
@@ -32009,10 +39976,10 @@
           rev = "3ca2fb0c4d5f337d0410c21b2702dd147014e984";
           sha256 = "0pjxyhh8a02i54a9jsqr8p1mcqfl6k9b8gv9lnzb242gy4518y3l";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/01c1b96a4d076323264b2762d2c5a61680e21cff/recipes/hayoo";
           sha256 = "1rqvnv5nxlsyvsa5my1wpfm82sw21s7kfbg80vrjmxh0mwlyv4p9";
-          name = "hayoo";
+          name = "recipe";
         };
         packageRequires = [ emacs json ];
         meta = {
@@ -32020,8 +39987,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    hc-zenburn-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    hc-zenburn-theme = callPackage ({ fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "hc-zenburn-theme";
         version = "20150928.933";
         src = fetchFromGitHub {
@@ -32030,10 +40000,10 @@
           rev = "fd0024a5191cdce204d91c8f1db99ba31640f6e9";
           sha256 = "0rgcj47h7a67qkw6696pcm1a4g4ryx8nrz55s69fw86958fp08hk";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/01ccd40bd5fc2699a4756ebf503ac50f562cf600/recipes/hc-zenburn-theme";
           sha256 = "0jcddk9ppgcizyyciabj3sgk1pmingl97knf9nmr0mi89h7n2g5y";
-          name = "hc-zenburn-theme";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -32041,20 +40011,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    hcl-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    hcl-mode = callPackage ({ emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "hcl-mode";
         version = "20170107.27";
         src = fetchFromGitHub {
           owner = "syohex";
           repo = "emacs-hcl-mode";
-          rev = "0f2c5ec7e7bcf77c8548e8cac8721ea935ca1b5e";
-          sha256 = "0qggby20h8sir4cs5af9y6b2cibix3r067sadygsrvx9ml17indw";
+          rev = "f940f425bcdb4111d69f5fbf79f0b1c98848c5b6";
+          sha256 = "06mdz9fnqkaxf4036ad1f6pr3km2vaz52rbpkjwk8bsqvzbya98i";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/66b441525dc300b364d9be0358ae1e0fa2a8b4fe/recipes/hcl-mode";
           sha256 = "1wrs9kj6ahsdnbn3fdaqhclq1ia6w4x726hjvl6pyk01sb0spnin";
-          name = "hcl-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -32062,8 +40036,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    headlong = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    headlong = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "headlong";
         version = "20150417.826";
         src = fetchFromGitHub {
@@ -32072,10 +40049,10 @@
           rev = "f6830f87f236eee88263cb6976125f72422abe72";
           sha256 = "06hq6p6a4fzprbj4r885vsvzddlvx0wxqk5kik06v5bm7hjmnyrq";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/826e9a8221d9378dd3b9fcc16ce5f50fd6ed2dce/recipes/headlong";
           sha256 = "042ybplkqjb30qf5cpbw5d91j1rdc71b789v277h036bri7hgxz6";
-          name = "headlong";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -32083,20 +40060,52 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }:
-    melpaBuild {
+    heaven-and-hell = callPackage ({ emacs
+                                   , fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
+        pname = "heaven-and-hell";
+        version = "20180421.221";
+        src = fetchFromGitHub {
+          owner = "valignatev";
+          repo = "heaven-and-hell";
+          rev = "c2af013e0def7d3234e0eb2fb66a0a2374d5a7f2";
+          sha256 = "08n7sr0l4di1c4zgfa17i3x43451sd60z70pjka8rmznys766lsg";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/685edd63bf65520be304cbd564db7f5974fc5ae1/recipes/heaven-and-hell";
+          sha256 = "19r0p78r9c78ly8awkgc33xa5b75zkkrb5kwvxbagirxdgkjv74r";
+          name = "recipe";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/heaven-and-hell";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm = callPackage ({ async
+                        , emacs
+                        , fetchFromGitHub
+                        , fetchurl
+                        , helm-core
+                        , lib
+                        , melpaBuild
+                        , popup }:
+      melpaBuild {
         pname = "helm";
-        version = "20180413.335";
+        version = "20180714.445";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm";
-          rev = "b72baa1183fabf5213e4d50a38358288f7af5a86";
-          sha256 = "0q89c9axk8a7w3hncl7wak0z3yg022vwf3lwfmww6xkn9daxldjx";
+          rev = "75db7c3be86c8c35570bed19edfde2b029590cfd";
+          sha256 = "1gbryi4qq73l0jsg4pipl1ppwpbgrhizrd9y2wfxcz6cq8lk3rvr";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm";
           sha256 = "03la01d0syikjgsjq0krlp3p894djwfxqfmd2srddwks7ish6xjf";
-          name = "helm";
+          name = "recipe";
         };
         packageRequires = [ async emacs helm-core popup ];
         meta = {
@@ -32104,8 +40113,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-R = callPackage ({ ess, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
-    melpaBuild {
+    helm-R = callPackage ({ ess
+                          , fetchFromGitHub
+                          , fetchurl
+                          , helm
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "helm-R";
         version = "20120819.1714";
         src = fetchFromGitHub {
@@ -32114,10 +40128,10 @@
           rev = "b0eb9d5f6a483a9dbe6eb6cf1f2024d4f5938bc2";
           sha256 = "0nip0zrmn944wy0x2dc5ryr0m7a948rn2a8cbaajghs7a7zai4cr";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ce6eb840368f8cbee66dc061478d5096b9dacb68/recipes/helm-R";
           sha256 = "0zq9f2xhgap3ihnrlsrsaxaz0nx014k0820bfsq7lckwcnm0mng1";
-          name = "helm-R";
+          name = "recipe";
         };
         packageRequires = [ ess helm ];
         meta = {
@@ -32125,20 +40139,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-ack = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
-    melpaBuild {
+    helm-ack = callPackage ({ cl-lib ? null
+                            , fetchFromGitHub
+                            , fetchurl
+                            , helm
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "helm-ack";
         version = "20141030.526";
         src = fetchFromGitHub {
           owner = "syohex";
           repo = "emacs-helm-ack";
-          rev = "889bc225318d14c6e3be80e73b1d9d6fb30e48c3";
-          sha256 = "04rvbafa77blps7x7cmlsciys8fgmvhfhq4v51pk8z5q3j1lrgc5";
+          rev = "5982f3cb6ec9f460ebbe06ec0ce7b3590bca3118";
+          sha256 = "0ps86zpyywibjwcm9drmamla979ad61fyqr8d6bv71fr56k9ak21";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/258d447778525c26c65a5819ba1edc00e2bb65e5/recipes/helm-ack";
           sha256 = "1a8sc5gd2g57dl9g18wyydfmihy74yniwhjr27h7vxylnf2g3pni";
-          name = "helm-ack";
+          name = "recipe";
         };
         packageRequires = [ cl-lib helm ];
         meta = {
@@ -32146,8 +40165,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-ad = callPackage ({ dash, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
-    melpaBuild {
+    helm-ad = callPackage ({ dash
+                           , fetchFromGitHub
+                           , fetchurl
+                           , helm
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "helm-ad";
         version = "20151209.215";
         src = fetchFromGitHub {
@@ -32156,10 +40180,10 @@
           rev = "8ac044705d8620ee354a9cfa8cc1b865e83c0d55";
           sha256 = "0hxfgdn56c7qr64r59g9hvxxwa4mw0ad9c9m0z5cj85bsdd7rlx4";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b44ec4e059ab830a3708697fa95fada5f6a30a91/recipes/helm-ad";
           sha256 = "0h2zjfj9hy7bkpmmjjs0a4a06asbw0yww8mw9rk2xi1gc2aqq4hi";
-          name = "helm-ad";
+          name = "recipe";
         };
         packageRequires = [ dash helm ];
         meta = {
@@ -32167,8 +40191,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-addressbook = callPackage ({ addressbook-bookmark, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
-    melpaBuild {
+    helm-addressbook = callPackage ({ addressbook-bookmark
+                                    , cl-lib ? null
+                                    , emacs
+                                    , fetchFromGitHub
+                                    , fetchurl
+                                    , helm
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "helm-addressbook";
         version = "20170903.28";
         src = fetchFromGitHub {
@@ -32177,10 +40208,10 @@
           rev = "62497f72d46afd3a9f9f94b27d062a82fb232de4";
           sha256 = "1lmq7j19qv3pabs5arapx3lv2xhf0sgn4b2hl0l0kzph52fvics7";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4bb805b0f2d2055aa4e88bd41239d75ec34f5785/recipes/helm-addressbook";
           sha256 = "1d8byi6sr5gz1rx3kglnkp47sn9dqdd83s12d84wyay06ix3cqqi";
-          name = "helm-addressbook";
+          name = "recipe";
         };
         packageRequires = [ addressbook-bookmark cl-lib emacs helm ];
         meta = {
@@ -32188,20 +40219,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-ag = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
-    melpaBuild {
+    helm-ag = callPackage ({ emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , helm
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "helm-ag";
         version = "20170209.745";
         src = fetchFromGitHub {
           owner = "syohex";
           repo = "emacs-helm-ag";
-          rev = "2fc02c4ead29bf0db06fd70740cc7c364cb650ac";
-          sha256 = "1gnn0byywbld6afcq1vp92cjvy4wlag9d1wgymnqn86c3b1bcf21";
+          rev = "39ed137823665fca2fa5b215f7c3e8701173f7b7";
+          sha256 = "0a6yls52pkqsaj6s5nsi70kzpvssdvb87bfnp8gp26q2y3syx4ni";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/81f0f525680fea98e804f39dbde1dada887e8821/recipes/helm-ag";
           sha256 = "050qh5xqh8lwkgmz3jxm8gql5nd7bq8sp9q6mzm2z7367qy4qqyf";
-          name = "helm-ag";
+          name = "recipe";
         };
         packageRequires = [ emacs helm ];
         meta = {
@@ -32209,8 +40245,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-ag-r = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
-    melpaBuild {
+    helm-ag-r = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , helm
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "helm-ag-r";
         version = "20131123.731";
         src = fetchFromGitHub {
@@ -32219,10 +40259,10 @@
           rev = "67de4ebafe9b088db950eefa5ef590a6d78b4ac8";
           sha256 = "1rifdkhzvf7xd2npban0i8v3rjcji69063dw9rs1d32w4n7fzlfa";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6aa1cf029db913dafb561e4c8ccc1ca9099524de/recipes/helm-ag-r";
           sha256 = "0ivh7f021lbmbaj6gs4y8m99s63js57w04q7cwx7v4i32cpas7r9";
-          name = "helm-ag-r";
+          name = "recipe";
         };
         packageRequires = [ helm ];
         meta = {
@@ -32230,20 +40270,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-aws = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }:
-    melpaBuild {
+    helm-aws = callPackage ({ cl-lib ? null
+                            , fetchFromGitHub
+                            , fetchurl
+                            , helm
+                            , lib
+                            , melpaBuild
+                            , s }:
+      melpaBuild {
         pname = "helm-aws";
-        version = "20171227.132";
+        version = "20180514.332";
         src = fetchFromGitHub {
           owner = "istib";
           repo = "helm-aws";
-          rev = "d69a0241601d170c034e3b69e8df0b1fec72bff7";
-          sha256 = "0975a0nwxlnpln7vrq4hqq4xamrhp1zc4bkwnzpw06dk95s23cb9";
+          rev = "b36c744b3f00f458635a91d1f5158fccbb5baef6";
+          sha256 = "11683s12dabgi9j6cyx0i147pgz4jdd240xviry7w3cxgarqki8y";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/421182006b8af17dae8b5ad453cc11e2d990a053/recipes/helm-aws";
           sha256 = "0sjgdjpznjxsf6nlv2ah45fw17j8j5apdphd1fp43rjv1lskkgc5";
-          name = "helm-aws";
+          name = "recipe";
         };
         packageRequires = [ cl-lib helm s ];
         meta = {
@@ -32251,8 +40297,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-backup = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }:
-    melpaBuild {
+    helm-backup = callPackage ({ cl-lib ? null
+                               , fetchFromGitHub
+                               , fetchurl
+                               , helm
+                               , lib
+                               , melpaBuild
+                               , s }:
+      melpaBuild {
         pname = "helm-backup";
         version = "20171204.2357";
         src = fetchFromGitHub {
@@ -32261,10 +40313,10 @@
           rev = "a2c0fa16113e628500d6822c6605280b94e24038";
           sha256 = "0j4dkz9za2zng43dx8ph688gl5973isxr89v5bw160c65n4lbc6w";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5e6eba7b201e91211e43c39e501f6066f0afeb8b/recipes/helm-backup";
           sha256 = "182jbm36yzayxi9y3vhpyn25ivrgay37sncqvah35vbw52lnjcn3";
-          name = "helm-backup";
+          name = "recipe";
         };
         packageRequires = [ cl-lib helm s ];
         meta = {
@@ -32272,20 +40324,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-bbdb = callPackage ({ bbdb, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
-    melpaBuild {
+    helm-bbdb = callPackage ({ bbdb
+                             , fetchFromGitHub
+                             , fetchurl
+                             , helm
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "helm-bbdb";
-        version = "20180412.807";
+        version = "20180505.808";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm-bbdb";
-          rev = "1f182900207cff383d62d91e839b48dd4874f2a5";
-          sha256 = "0m08zb1i6m8i0n590f1717p8dxb7w9d4mh3wnkd829zjhycradrd";
+          rev = "db286b0ee0ea18142f7d005e465832bb755bb0cb";
+          sha256 = "193xkwdhl3k0ka7qs9pd92mx0ild7dv11lmgydkpx8w1rcd20yyx";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7025c319fcabc64576c0c6554d0d572cef697693/recipes/helm-bbdb";
           sha256 = "1wlacbfs23shvyaq616r1p84h8321zz1k5nzir5qg8nr6lssi8vp";
-          name = "helm-bbdb";
+          name = "recipe";
         };
         packageRequires = [ bbdb helm ];
         meta = {
@@ -32293,20 +40350,30 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-bibtex = callPackage ({ biblio, cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, parsebib, s }:
-    melpaBuild {
+    helm-bibtex = callPackage ({ biblio
+                               , cl-lib ? null
+                               , dash
+                               , f
+                               , fetchFromGitHub
+                               , fetchurl
+                               , helm
+                               , lib
+                               , melpaBuild
+                               , parsebib
+                               , s }:
+      melpaBuild {
         pname = "helm-bibtex";
-        version = "20180328.1147";
+        version = "20180612.619";
         src = fetchFromGitHub {
           owner = "tmalsburg";
           repo = "helm-bibtex";
-          rev = "5be84d36758ed7d5838cc5c8796a6ff427ba7043";
-          sha256 = "1pqg49mj22izilx8x9rshflpyiw1q9zrp881nasp5lvbihwydvrg";
+          rev = "21f802aaf5b78dec18b72601dd8276c5244e39f5";
+          sha256 = "13jg728v8k227p68ngiwknlygzqdvasg6n9ax1a2xgjbx3di12vv";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f4118a7721435240cf8489daa4dd39369208855b/recipes/helm-bibtex";
           sha256 = "037pqgyyb2grg88yfxx1r8yp4lrgz2fyzz9fbbp34l8s6vk3cp4z";
-          name = "helm-bibtex";
+          name = "recipe";
         };
         packageRequires = [ biblio cl-lib dash f helm parsebib s ];
         meta = {
@@ -32314,8 +40381,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-bibtexkey = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
-    melpaBuild {
+    helm-bibtexkey = callPackage ({ fetchFromGitHub
+                                  , fetchurl
+                                  , helm
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "helm-bibtexkey";
         version = "20140214.704";
         src = fetchFromGitHub {
@@ -32324,10 +40395,10 @@
           rev = "aa1637ea5c8c5f1817e480fc2a3750cafab3d99f";
           sha256 = "10k7hjfz9jmfpbmsv20jy9vr6fqxx1yp8v115hprqvw057iifsl9";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d35a2e5cb5232d16d5c98168706d8b6426fcfb44/recipes/helm-bibtexkey";
           sha256 = "00i7ni4r73mmxavhfcm0fd7jhx6gxvxx7prax1yxmhs46fpz8jwj";
-          name = "helm-bibtexkey";
+          name = "recipe";
         };
         packageRequires = [ helm ];
         meta = {
@@ -32335,8 +40406,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-bind-key = callPackage ({ bind-key, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
-    melpaBuild {
+    helm-bind-key = callPackage ({ bind-key
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , helm
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "helm-bind-key";
         version = "20141108.2115";
         src = fetchFromGitHub {
@@ -32345,10 +40421,10 @@
           rev = "9da6ad8b7530e72fb4ac67be8c6a482898dddc25";
           sha256 = "1wmcy7q4ys2sf8ya5l4n7a6bq5m9d6m19amjfwkmkh4ajkwl041y";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9ae8bfd320cdef6c65da2a00439f8108d7ffa7ce/recipes/helm-bind-key";
           sha256 = "1yfj6mmxc165in1i85ccanssch6bg19ib1fcm7sa4i4hv0mgwaid";
-          name = "helm-bind-key";
+          name = "recipe";
         };
         packageRequires = [ bind-key helm ];
         meta = {
@@ -32356,8 +40432,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-bm = callPackage ({ bm, cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }:
-    melpaBuild {
+    helm-bm = callPackage ({ bm
+                           , cl-lib ? null
+                           , fetchFromGitHub
+                           , fetchurl
+                           , helm
+                           , lib
+                           , melpaBuild
+                           , s }:
+      melpaBuild {
         pname = "helm-bm";
         version = "20160321.631";
         src = fetchFromGitHub {
@@ -32366,10 +40449,10 @@
           rev = "d66341f5646c23178d4d8bffb6cfebe3fb73f1d7";
           sha256 = "011k37p4vnzm1x8vyairllanvjfknskl20bdfv0glf64xgbdpfil";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/115033d7b02d3ca42902195de933f62c5f927ae4/recipes/helm-bm";
           sha256 = "1dnlcvn0zv4qv4ii4j0h9r8w6vhi3l0c5aa768kblh5r2rf4bjjh";
-          name = "helm-bm";
+          name = "recipe";
         };
         packageRequires = [ bm cl-lib helm s ];
         meta = {
@@ -32377,20 +40460,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-books = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
-    melpaBuild {
+    helm-books = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , helm
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "helm-books";
         version = "20170324.2331";
         src = fetchFromGitHub {
           owner = "grugrut";
           repo = "helm-books";
-          rev = "625aadec1541a5ca36951e4ce1301f4b6fe2bf3f";
-          sha256 = "1d3nps765gxmadhbd1yqn4qvs23bczglwhxkciprky7ixm5lx53k";
+          rev = "6735e1787f99b5ef77b276fa5c43e565b4d3e792";
+          sha256 = "0gsa0qf88x4rgkzhgp4dr19l772fla3gd6854z4gwpn0s52rl7h7";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/acba3db40f37e74e1bf9e30f2abed431c259ff50/recipes/helm-books";
           sha256 = "0xh53vji7nsnpi0b38cjh97x26ryxk61mj7bd6m63qwh8dyhs3yx";
-          name = "helm-books";
+          name = "recipe";
         };
         packageRequires = [ helm ];
         meta = {
@@ -32398,20 +40485,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-bundle-show = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
-    melpaBuild {
+    helm-bundle-show = callPackage ({ fetchFromGitHub
+                                    , fetchurl
+                                    , helm
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "helm-bundle-show";
         version = "20151221.430";
         src = fetchFromGitHub {
           owner = "masutaka";
           repo = "emacs-helm-bundle-show";
-          rev = "850fecb36f609f1dfd5d20ca0170c9a6b7f90ab9";
-          sha256 = "06xi91dy88qnqwqsknhf695324vsiz1vn2fmwl6llywa03k0xnl1";
+          rev = "b34523aa8a7f82ed9a1bf3643c35b65866a7877a";
+          sha256 = "1j9xmlidipsfbz0kfxwz0c6hi9xsbk36h6i30wqdd0ls0zw5xm30";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2f10f7387cca102696c38af1d8dc0fe5da5e366f/recipes/helm-bundle-show";
           sha256 = "1af5g233kjf04m2fryizk51a1s2mcmj36zip5nyb8skcsfl4riq7";
-          name = "helm-bundle-show";
+          name = "recipe";
         };
         packageRequires = [ helm ];
         meta = {
@@ -32419,8 +40510,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-c-moccur = callPackage ({ color-moccur, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
-    melpaBuild {
+    helm-c-moccur = callPackage ({ color-moccur
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , helm
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "helm-c-moccur";
         version = "20151230.124";
         src = fetchFromGitHub {
@@ -32429,10 +40525,10 @@
           rev = "b0a906f85fa352db091f88b91a9c510de607dfe9";
           sha256 = "0w4svbg32y63v049plvk7djc1m2amjzrr1v979d9s6jbnnpzlb5c";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/462a43341a5811822928bcac331d617a38b52e8a/recipes/helm-c-moccur";
           sha256 = "1i6a4jqjy9amlhdbj5d26wzagndfgszha09vs5qf4760vjl7kn4b";
-          name = "helm-c-moccur";
+          name = "recipe";
         };
         packageRequires = [ color-moccur helm ];
         meta = {
@@ -32440,8 +40536,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-c-yasnippet = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, yasnippet }:
-    melpaBuild {
+    helm-c-yasnippet = callPackage ({ cl-lib ? null
+                                    , fetchFromGitHub
+                                    , fetchurl
+                                    , helm
+                                    , lib
+                                    , melpaBuild
+                                    , yasnippet }:
+      melpaBuild {
         pname = "helm-c-yasnippet";
         version = "20170128.742";
         src = fetchFromGitHub {
@@ -32450,10 +40552,10 @@
           rev = "65ca732b510bfc31636708aebcfe4d2d845b59b0";
           sha256 = "1cbafjqlzxbg19xfdqsinsh7afq58gkf44rsg1qxfgm8g6zhr7f8";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2fc20598a2cd22efb212ba43159c6728f0249e5e/recipes/helm-c-yasnippet";
           sha256 = "0jwj4giv6lxb3h7vqqb2alkwq5kp0shy2nraik33956p4l8dfs90";
-          name = "helm-c-yasnippet";
+          name = "recipe";
         };
         packageRequires = [ cl-lib helm yasnippet ];
         meta = {
@@ -32461,8 +40563,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-charinfo = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
-    melpaBuild {
+    helm-charinfo = callPackage ({ cl-lib ? null
+                                 , emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , helm
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "helm-charinfo";
         version = "20170810.531";
         src = fetchFromGitHub {
@@ -32471,10 +40579,10 @@
           rev = "91798a49dc115342a7e01e48b264e9a0bf5ea414";
           sha256 = "1ifj6zz5k7qjalg06fvfc7rdmlha0n9hll2hiq7mrcj7lfac6jga";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6667774bba495c45703ef75261f1f14d89684e3a/recipes/helm-charinfo";
           sha256 = "04k6crcwhv2k69f5w75g0dg0f5qsbhyxl93qzxxdb5bnr56ad7f6";
-          name = "helm-charinfo";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs helm ];
         meta = {
@@ -32482,8 +40590,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-chrome = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
-    melpaBuild {
+    helm-chrome = callPackage ({ cl-lib ? null
+                               , emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , helm
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "helm-chrome";
         version = "20160718.2220";
         src = fetchFromGitHub {
@@ -32492,10 +40606,10 @@
           rev = "fd630ace4b4b4f33355a973743bbfe0c90ce4830";
           sha256 = "0r8s85fs5lnwdn377z5zgi3d090k2n1mgiyxwgy49i8yirssgz51";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7f6ca33fe8ec8a0af8fb166451050f5502838deb/recipes/helm-chrome";
           sha256 = "0p3n2pna83mp4ym8x69lk4r3q4apbj5v2blg2mwcsd9zij153nxz";
-          name = "helm-chrome";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs helm ];
         meta = {
@@ -32503,8 +40617,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-chronos = callPackage ({ chronos, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
-    melpaBuild {
+    helm-chronos = callPackage ({ chronos
+                                , fetchFromGitHub
+                                , fetchurl
+                                , helm
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "helm-chronos";
         version = "20150528.1336";
         src = fetchFromGitHub {
@@ -32513,10 +40632,10 @@
           rev = "a14fc3d65dd96ce6616234b3f7b8b08b4c1817ef";
           sha256 = "1dmj4f8pris1i7wvfplp4dbnyfm403l6rplxfrfi0cd9afg7m68i";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b6f5eef6ac62ed8d035f4dd272695655d00a4180/recipes/helm-chronos";
           sha256 = "1a65b680741cx4cyyizyl2c3bss36x3j2m9sh9hjc87xrzarg0s3";
-          name = "helm-chronos";
+          name = "recipe";
         };
         packageRequires = [ chronos helm ];
         meta = {
@@ -32524,8 +40643,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-cider = callPackage ({ cider, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }:
-    melpaBuild {
+    helm-cider = callPackage ({ cider
+                              , emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , helm-core
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "helm-cider";
         version = "20180306.2058";
         src = fetchFromGitHub {
@@ -32534,10 +40659,10 @@
           rev = "9363cc537f06233345aa3af5cd46aa5681ad607b";
           sha256 = "0vfn4smqba1vsshz48ggkj8gs94la0sxb1sq4shrb41qj2x3dci7";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-cider";
           sha256 = "0ykhrvh6mix55sv4j8q6614sibksdlwaks736maamqwl3wk6826x";
-          name = "helm-cider";
+          name = "recipe";
         };
         packageRequires = [ cider emacs helm-core ];
         meta = {
@@ -32545,8 +40670,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-cider-history = callPackage ({ cider, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
-    melpaBuild {
+    helm-cider-history = callPackage ({ cider
+                                      , fetchFromGitHub
+                                      , fetchurl
+                                      , helm
+                                      , lib
+                                      , melpaBuild }:
+      melpaBuild {
         pname = "helm-cider-history";
         version = "20150719.1420";
         src = fetchFromGitHub {
@@ -32555,10 +40685,10 @@
           rev = "c391fcb2e162a02001605a0b9449783575a831fd";
           sha256 = "18j4ikb3q8ygdq74zqzm83wgb39x7w209n3186mm051n8lfmkaif";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/31a9c900d57f2eeed4f0101af73f8a59c20e9a99/recipes/helm-cider-history";
           sha256 = "12l8jyl743zqk8m2xzcz75y1ybdkbkvcbvfkn1k88k09s31kdq4h";
-          name = "helm-cider-history";
+          name = "recipe";
         };
         packageRequires = [ cider helm ];
         meta = {
@@ -32566,8 +40696,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-circe = callPackage ({ circe, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
-    melpaBuild {
+    helm-circe = callPackage ({ circe
+                              , cl-lib ? null
+                              , emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , helm
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "helm-circe";
         version = "20160206.2252";
         src = fetchFromGitHub {
@@ -32576,10 +40713,10 @@
           rev = "9091651d9fdd8d49d8ff6f9dcf3a2ae416c9f15a";
           sha256 = "1gwg299s8ps0q97iw6p515gwn73rjk1icgl3j7cj1s143njjg122";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-circe";
           sha256 = "07559rg55b0glxiw787xmvxrhms14jz21bvprc5n24b4j827g9xw";
-          name = "helm-circe";
+          name = "recipe";
         };
         packageRequires = [ circe cl-lib emacs helm ];
         meta = {
@@ -32587,8 +40724,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-clojuredocs = callPackage ({ edn, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
-    melpaBuild {
+    helm-clojuredocs = callPackage ({ edn
+                                    , fetchFromGitHub
+                                    , fetchurl
+                                    , helm
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "helm-clojuredocs";
         version = "20160405.23";
         src = fetchFromGitHub {
@@ -32597,10 +40739,10 @@
           rev = "5a7f0f2cb401be0b09e73262a1c18265ab9a3cea";
           sha256 = "015b8zxh91ljhqvn6z43gy08di54xcw9skw0i7frj3d7gk984qhl";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/adb117e04c158b1c77a8c1174329477d7eaca838/recipes/helm-clojuredocs";
           sha256 = "0yz0wlyay9286by8i30gs3ispswq8ayqlcnna1s7bgspjvb7scmk";
-          name = "helm-clojuredocs";
+          name = "recipe";
         };
         packageRequires = [ edn helm ];
         meta = {
@@ -32608,8 +40750,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-cmd-t = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    helm-cmd-t = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "helm-cmd-t";
         version = "20170125.659";
         src = fetchFromGitHub {
@@ -32618,10 +40763,10 @@
           rev = "7fa3d4a9f7271512e54c5de999079b27c9eec6bf";
           sha256 = "06jdvkgnmwrgsdh9y2bwzdng7hy4331v3lh11jvdy4704w4khmak";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/helm-cmd-t";
           sha256 = "1w870ldq029wgicgv4cqm31zw2i8vkap3m9hsr9d0i3gv2virnc6";
-          name = "helm-cmd-t";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -32629,8 +40774,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-codesearch = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }:
-    melpaBuild {
+    helm-codesearch = callPackage ({ cl-lib ? null
+                                   , dash
+                                   , fetchFromGitHub
+                                   , fetchurl
+                                   , helm
+                                   , lib
+                                   , melpaBuild
+                                   , s }:
+      melpaBuild {
         pname = "helm-codesearch";
         version = "20180203.2033";
         src = fetchFromGitHub {
@@ -32639,10 +40791,10 @@
           rev = "87a68168b7c1490769305db0df60035e47799a75";
           sha256 = "0wiyz0kh2m2mpjhnl2mvsx2gvhkmmk0xaw432mxr48zz9jjnlha9";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0a992824e46a4170e2f0915f7a507fcb8a9ef0a6/recipes/helm-codesearch";
           sha256 = "1v21zwcyx73bc1lcfk60v8xim31bwdk4p06g9i4qag3cijdlli9q";
-          name = "helm-codesearch";
+          name = "recipe";
         };
         packageRequires = [ cl-lib dash helm s ];
         meta = {
@@ -32650,8 +40802,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-commandlinefu = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, json ? null, let-alist, lib, melpaBuild }:
-    melpaBuild {
+    helm-commandlinefu = callPackage ({ emacs
+                                      , fetchFromGitHub
+                                      , fetchurl
+                                      , helm
+                                      , json ? null
+                                      , let-alist
+                                      , lib
+                                      , melpaBuild }:
+      melpaBuild {
         pname = "helm-commandlinefu";
         version = "20150610.2245";
         src = fetchFromGitHub {
@@ -32660,10 +40819,10 @@
           rev = "9ee7e018c5db23ae9c8d1c8fa969876f15b7280d";
           sha256 = "0fxrmvb64lav4aqs61z3a4d2mcp9s2nw7fvysyjn0r1291pkzk9j";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7eaf1e41ef2fa90b6bb6a80891ef1bf52ef1029b/recipes/helm-commandlinefu";
           sha256 = "150nqib0sr4n35vdj1xrxcja8gkv3chzhdbgkjxqgkz2yq10xxnd";
-          name = "helm-commandlinefu";
+          name = "recipe";
         };
         packageRequires = [ emacs helm json let-alist ];
         meta = {
@@ -32671,8 +40830,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-company = callPackage ({ company, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
-    melpaBuild {
+    helm-company = callPackage ({ company
+                                , fetchFromGitHub
+                                , fetchurl
+                                , helm
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "helm-company";
         version = "20180213.1405";
         src = fetchFromGitHub {
@@ -32681,10 +40845,10 @@
           rev = "acc9c7901e094c1591327a0db1ec7a439f67a84d";
           sha256 = "1d4q9clp0q56br80c21a4wz1gc4jw3mdy97z9mq07x9i8rhlppzs";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8acf7420f2ac8a36474594bc34316f187b43d771/recipes/helm-company";
           sha256 = "1wl1mzm1h9ig351y77yascdv4z0cka1gayi8cnnlayk763is7q34";
-          name = "helm-company";
+          name = "recipe";
         };
         packageRequires = [ company helm ];
         meta = {
@@ -32692,20 +40856,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    helm-core = callPackage ({ async
+                             , emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "helm-core";
-        version = "20180414.2257";
+        version = "20180712.137";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm";
-          rev = "b72baa1183fabf5213e4d50a38358288f7af5a86";
-          sha256 = "0q89c9axk8a7w3hncl7wak0z3yg022vwf3lwfmww6xkn9daxldjx";
+          rev = "8de42d08f45a7052ed858132de43a76f933f58f7";
+          sha256 = "1g36knyppz8lfbcn84hx6ivf8b34s26wx5dh4xw85sq6pwi5yn7s";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core";
           sha256 = "1dyv8rv1728vwsp6vfdq954sp878jbp3srbfxl9gsgjnv1l6vjda";
-          name = "helm-core";
+          name = "recipe";
         };
         packageRequires = [ async emacs ];
         meta = {
@@ -32713,8 +40882,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-cscope = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, xcscope }:
-    melpaBuild {
+    helm-cscope = callPackage ({ cl-lib ? null
+                               , emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , helm
+                               , lib
+                               , melpaBuild
+                               , xcscope }:
+      melpaBuild {
         pname = "helm-cscope";
         version = "20170326.22";
         src = fetchFromGitHub {
@@ -32723,10 +40899,10 @@
           rev = "3cc7259ab4989f9f7ca039e703cdac14b907530a";
           sha256 = "0gh4csq6v6lqqpi966iwl2238wgkmr3vxb4kxffajpk8r0cq1c9x";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3d2e3460df1ec750053bc8402ad6eb822c10c697/recipes/helm-cscope";
           sha256 = "13a76wc1ia4c0v701dxqc9ycbb43d5k09m5pfsvs8mccisfzk9y4";
-          name = "helm-cscope";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs helm xcscope ];
         meta = {
@@ -32734,20 +40910,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-css-scss = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
-    melpaBuild {
+    helm-css-scss = callPackage ({ emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , helm
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "helm-css-scss";
         version = "20140626.1725";
         src = fetchFromGitHub {
           owner = "ShingoFukuyama";
           repo = "helm-css-scss";
-          rev = "ab8348aa98e0daa2f1b771e35bdb06bfacbe5016";
-          sha256 = "01a3pahpsxb7d15dkfgxypl7gzqb4dy4f36lmid1w77b9rhs6nph";
+          rev = "363d5ebe9ecf8fab8422b83a414d054c3eff79fa";
+          sha256 = "1wwkcjw7q660a7v7f6qr6hr5blharyylr5ddfz013xa3lnzy72cv";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9b985973ff12135f893e6d2742223725c2143720/recipes/helm-css-scss";
           sha256 = "0iflwl0rijbkx1b7i1s7984dw7sz1wa1cb74fqij0kcn76kal7ak";
-          name = "helm-css-scss";
+          name = "recipe";
         };
         packageRequires = [ emacs helm ];
         meta = {
@@ -32755,8 +40936,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-ctest = callPackage ({ dash, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, s }:
-    melpaBuild {
+    helm-ctest = callPackage ({ dash
+                              , fetchFromGitHub
+                              , fetchurl
+                              , helm-core
+                              , lib
+                              , melpaBuild
+                              , s }:
+      melpaBuild {
         pname = "helm-ctest";
         version = "20180125.2058";
         src = fetchFromGitHub {
@@ -32765,10 +40952,10 @@
           rev = "034927a922f40d9f5978786feed9bc9fe1f7655f";
           sha256 = "0mbsxlc0isfzqlwvwqxyjkcdvpn9a6qsa29r7mqqihy0jkqi4473";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1cc85ff5554df10fc2066eec4d90de3b25536923/recipes/helm-ctest";
           sha256 = "1mphc9fsclbw19p5i1xf52qg6ljljbajvbcsl95hisrnvhg89vpm";
-          name = "helm-ctest";
+          name = "recipe";
         };
         packageRequires = [ dash helm-core s ];
         meta = {
@@ -32776,20 +40963,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-dash = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
-    melpaBuild {
+    helm-dash = callPackage ({ cl-lib ? null
+                             , fetchFromGitHub
+                             , fetchurl
+                             , helm
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "helm-dash";
-        version = "20171120.446";
+        version = "20180503.218";
         src = fetchFromGitHub {
           owner = "areina";
           repo = "helm-dash";
-          rev = "13dcc176556a7dd0970790e96dbbf9105dc395de";
-          sha256 = "1cxfmlf2ddx9rm5f70r1sh9vwmn5s1a6m5in41skspvpm0avc8vi";
+          rev = "0ac2db529577fa63f2ed32310062873c585b91de";
+          sha256 = "0jsa4vvhbcndv47gssjnk3fwbld73jhf0f5l7hjkq82ckimw0bvi";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-dash";
           sha256 = "032hwwq4r72grzls5ww7bjyj39c82wkcgf3k7myfcrqd3lgblrwb";
-          name = "helm-dash";
+          name = "recipe";
         };
         packageRequires = [ cl-lib helm ];
         meta = {
@@ -32797,20 +40989,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-descbinds = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
-    melpaBuild {
+    helm-descbinds = callPackage ({ fetchFromGitHub
+                                  , fetchurl
+                                  , helm
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "helm-descbinds";
-        version = "20180411.2215";
+        version = "20180429.756";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm-descbinds";
-          rev = "cc000b1bf580577d032c9f0563168b6bbdd6d290";
-          sha256 = "1z5z0yfj1h3852zn4sh0p9dl3viyfiqpw28jczqgm8rcng94rvbw";
+          rev = "033be73f21778633813264ce1634a6e1ad873d8e";
+          sha256 = "1n89p56qwa243w1c85i5awnaf7piwjsvfi7nmnsrwm33hix5dknk";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/447610a05422cd2f35399e43d98bf46410ff0408/recipes/helm-descbinds";
           sha256 = "1890ss4pimjxskzzllf57fg07xbs8zqcrp6r8r6x989llrfvd1h7";
-          name = "helm-descbinds";
+          name = "recipe";
         };
         packageRequires = [ helm ];
         meta = {
@@ -32818,20 +41014,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-describe-modes = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
-    melpaBuild {
+    helm-describe-modes = callPackage ({ cl-lib ? null
+                                       , emacs
+                                       , fetchFromGitHub
+                                       , fetchurl
+                                       , helm
+                                       , lib
+                                       , melpaBuild }:
+      melpaBuild {
         pname = "helm-describe-modes";
         version = "20160211.2118";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm-describe-modes";
-          rev = "11fb36af119b784539d31c6160002de1957408aa";
-          sha256 = "1d5b85m33hsdb4wswh9wpid0ghsr2zrj3f6ky587lc32s4bs0w0z";
+          rev = "d2253c7c2bf4f28b9ff8a2d281bd7527c0106527";
+          sha256 = "0li9bi1lm5ldwfpvzahxp7hyfd94jr1kl43rprx0myxb016yk2p5";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/23f0b2025073850c477ba4646c3821b3c7de6c42/recipes/helm-describe-modes";
           sha256 = "0ajy9kwspm8rzafl0df57fad5867s86yjqj29shznqb12r91lpqb";
-          name = "helm-describe-modes";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs helm ];
         meta = {
@@ -32839,8 +41041,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-dictionary = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
-    melpaBuild {
+    helm-dictionary = callPackage ({ fetchFromGitHub
+                                   , fetchurl
+                                   , helm
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "helm-dictionary";
         version = "20160817.1333";
         src = fetchFromGitHub {
@@ -32849,10 +41055,10 @@
           rev = "805ce850d4cbe811227d9c9b16cc51f652198f3f";
           sha256 = "0ambb6i8ipz5y0mnc8jd07j3iiwb7ah87pw8x8pi3phv1r80l0k1";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b8cc457b06ce271f7c19729cde7728286bb85528/recipes/helm-dictionary";
           sha256 = "1pak8qn0qvbzyclhzvr5ka3pl370i4kiykypfkwbfgvqqwczhl3n";
-          name = "helm-dictionary";
+          name = "recipe";
         };
         packageRequires = [ helm ];
         meta = {
@@ -32860,20 +41066,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-directory = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
-    melpaBuild {
+    helm-directory = callPackage ({ emacs
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , helm
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "helm-directory";
         version = "20170705.2102";
         src = fetchFromGitHub {
           owner = "masasam";
           repo = "emacs-helm-directory";
-          rev = "29f05c87046f9a04329f817e9d7489a290a2592a";
-          sha256 = "0dp9s5yicjn91mmrzb15hidf05c8lffpgk2sq23d9x6b9ddnlcl1";
+          rev = "caa013b820b5263bf1c6446debfea0766dae8ab8";
+          sha256 = "15ljhz7cik7qzbh69l28c9mcvls5zgk42lp5bm9kl9fg6m6aasvq";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d0c066d6f285ab6d572dab4549781101547cb704/recipes/helm-directory";
           sha256 = "01c5a08v6rd867kdyrfwdvj05z4srzj9g6xy4scirlbwbff0q76n";
-          name = "helm-directory";
+          name = "recipe";
         };
         packageRequires = [ emacs helm ];
         meta = {
@@ -32881,8 +41092,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-dired-history = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
-    melpaBuild {
+    helm-dired-history = callPackage ({ cl-lib ? null
+                                      , fetchFromGitHub
+                                      , fetchurl
+                                      , helm
+                                      , lib
+                                      , melpaBuild }:
+      melpaBuild {
         pname = "helm-dired-history";
         version = "20170524.346";
         src = fetchFromGitHub {
@@ -32891,10 +41107,10 @@
           rev = "281523f9fc46cf00fafd670ba5cd16552a607212";
           sha256 = "1bqavj5ljr350dckyf39i9plkb0rbhyd17ka94n2g6daapgpq0x6";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-dired-history";
           sha256 = "0qciafa42rbw0dxgkp5mbbwbrcziswmwdj2lszm0px1bip4x7yb8";
-          name = "helm-dired-history";
+          name = "recipe";
         };
         packageRequires = [ cl-lib helm ];
         meta = {
@@ -32902,8 +41118,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-dired-recent-dirs = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
-    melpaBuild {
+    helm-dired-recent-dirs = callPackage ({ fetchFromGitHub
+                                          , fetchurl
+                                          , helm
+                                          , lib
+                                          , melpaBuild }:
+      melpaBuild {
         pname = "helm-dired-recent-dirs";
         version = "20131228.614";
         src = fetchFromGitHub {
@@ -32912,10 +41132,10 @@
           rev = "3bcd125b44f5a707588ae3868777d91192351523";
           sha256 = "14sifdrfg8ydvi9mj8qm2bfphbffglxrkb5ky4q5b3j96bn8v110";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e24a676ec0c5804b80c1497606b32c4f2cbe9d/recipes/helm-dired-recent-dirs";
           sha256 = "0kh0n5674ksswjzi9gji2qmx8v8g0axx8xbi0m3zby9nwcpv4qzs";
-          name = "helm-dired-recent-dirs";
+          name = "recipe";
         };
         packageRequires = [ helm ];
         meta = {
@@ -32923,8 +41143,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-dirset = callPackage ({ cl-lib ? null, f, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }:
-    melpaBuild {
+    helm-dirset = callPackage ({ cl-lib ? null
+                               , f
+                               , fetchFromGitHub
+                               , fetchurl
+                               , helm
+                               , lib
+                               , melpaBuild
+                               , s }:
+      melpaBuild {
         pname = "helm-dirset";
         version = "20151208.1612";
         src = fetchFromGitHub {
@@ -32933,10 +41160,10 @@
           rev = "eb30810cd26e1ee73d84a863e6b2667700e9aead";
           sha256 = "183vj5yi575aqkak19hl8k4mw38r0ki9p1fnpa8nny2srjyy34yb";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-dirset";
           sha256 = "1bwgv1pm047xafidq23mdqj3sdc5bvqlw74s80dj88ybp3vrpvlk";
-          name = "helm-dirset";
+          name = "recipe";
         };
         packageRequires = [ cl-lib f helm s ];
         meta = {
@@ -32944,8 +41171,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-elscreen = callPackage ({ cl-lib ? null, elscreen, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
-    melpaBuild {
+    helm-elscreen = callPackage ({ cl-lib ? null
+                                 , elscreen
+                                 , emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , helm
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "helm-elscreen";
         version = "20170709.214";
         src = fetchFromGitHub {
@@ -32954,10 +41188,10 @@
           rev = "b8212866939dc4a1e1dc23ad572407b688e130e3";
           sha256 = "0gy6lbdngiwfl9vfw32clagbmv70f93slc9zkm3dz3mca37435kz";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/dfe42a7fe2dc051c6c49aa75bce89bfe1b5fdbbb/recipes/helm-elscreen";
           sha256 = "186k66kf2ak2ihha39989cz1aarqrvbgp213y1fwh9qsn1kxclnd";
-          name = "helm-elscreen";
+          name = "recipe";
         };
         packageRequires = [ cl-lib elscreen emacs helm ];
         meta = {
@@ -32965,8 +41199,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-emmet = callPackage ({ emmet-mode, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
-    melpaBuild {
+    helm-emmet = callPackage ({ emmet-mode
+                              , fetchFromGitHub
+                              , fetchurl
+                              , helm
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "helm-emmet";
         version = "20160713.531";
         src = fetchFromGitHub {
@@ -32975,10 +41214,10 @@
           rev = "f0364e736b10cf44232053a78de04133a88185ae";
           sha256 = "1zl6vhzbf29864q97q5v7c318x36y1a4cjm0i7kgj3hc6qla5j88";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/acbc5e9fab159ad2d63b10c0fa6ac18636bb2379/recipes/helm-emmet";
           sha256 = "1dkn9qa3dv2im11lm19wfh5jwwwp42sv7jc0p6qg35rhzwdpfg03";
-          name = "helm-emmet";
+          name = "recipe";
         };
         packageRequires = [ emmet-mode helm ];
         meta = {
@@ -32986,8 +41225,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-emms = callPackage ({ cl-lib ? null, emacs, emms, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
-    melpaBuild {
+    helm-emms = callPackage ({ cl-lib ? null
+                             , emacs
+                             , emms
+                             , fetchFromGitHub
+                             , fetchurl
+                             , helm
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "helm-emms";
         version = "20180405.2228";
         src = fetchFromGitHub {
@@ -32996,10 +41242,10 @@
           rev = "d3f9bdef8ff0d093eaf6e26af50ea905ab53fdec";
           sha256 = "0bdb8xp0yp3gijpa9i2rc17gfzjhzlm92vdzw93i10qpd1xhj4aa";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/db836b671705607f6cd9bce8229884b1f29b4a76/recipes/helm-emms";
           sha256 = "1vq7cxnacmhyczsa4s5h1nnzc08m66harfnxsqxyrdsnggv9hbf5";
-          name = "helm-emms";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs emms helm ];
         meta = {
@@ -33007,20 +41253,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-etags-plus = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
-    melpaBuild {
+    helm-etags-plus = callPackage ({ fetchFromGitHub
+                                   , fetchurl
+                                   , helm
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "helm-etags-plus";
         version = "20170113.614";
         src = fetchFromGitHub {
           owner = "jixiuf";
           repo = "helm-etags-plus";
-          rev = "704f0991ee4a2298b01c33aafc224eef322e15e3";
-          sha256 = "03n7c9jlpqkz5z1gygx2s3yf46caav2l11d9xnmqhyhbvyimjqf9";
+          rev = "dd13aa768e7edc5809c8b5c52daa108eceb7d3f1";
+          sha256 = "08yzs82bqj4j7k4hp4hh53ip5p8bh6325j4lg73hh6zsy0jpb9sh";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e5d0c347ff8cf6e0ade80853775fd6b84f387fa5/recipes/helm-etags-plus";
           sha256 = "0lw21yp1q6iggzlb1dks3p6qdfppnqf50f3rijjs18lisp4izp99";
-          name = "helm-etags-plus";
+          name = "recipe";
         };
         packageRequires = [ helm ];
         meta = {
@@ -33028,20 +41278,52 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-ext = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
-    melpaBuild {
+    helm-eww = callPackage ({ emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , helm
+                            , lib
+                            , melpaBuild
+                            , seq }:
+      melpaBuild {
+        pname = "helm-eww";
+        version = "20180511.618";
+        src = fetchFromGitHub {
+          owner = "emacs-helm";
+          repo = "helm-eww";
+          rev = "1a09f11b2376dec8237df40140f056be8a256ef0";
+          sha256 = "1kqdjhz2xiqw3bxjhfl9namhqrkbc2x70gcv6ljljya5hbkm62sm";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/455a32c1d4642dc6752408c4f5055f5f4d1288eb/recipes/helm-eww";
+          sha256 = "0pl8s7jmk1kak13bal43kp2awjji9lgr3npq9m09zms121rh709w";
+          name = "recipe";
+        };
+        packageRequires = [ emacs helm seq ];
+        meta = {
+          homepage = "https://melpa.org/#/helm-eww";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-ext = callPackage ({ emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , helm
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "helm-ext";
-        version = "20171218.1543";
+        version = "20180525.2050";
         src = fetchFromGitHub {
           owner = "cute-jumper";
           repo = "helm-ext";
-          rev = "bdc0d86d43d965dda5ac94ec9c3fdcaa1e71aab1";
-          sha256 = "1qfawx9k74rhm9rxcdrx9gpxqrvpgpiv3dz8qgl06mdr0hxrcrrb";
+          rev = "90b788aced21ec467a234b6b77b5a6ebae6de75f";
+          sha256 = "11a27556slh95snzqyvy0rlf6p7f51nx8rxglnv0d34529h72508";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1ee74cb0aa3445bc9ae4226c2043ee4de3ac6cd3/recipes/helm-ext";
           sha256 = "0la2i0b7nialib4wq26cxcak8nq1jzavsw8f0mvbavsb7hfwkpgw";
-          name = "helm-ext";
+          name = "recipe";
         };
         packageRequires = [ emacs helm ];
         meta = {
@@ -33049,20 +41331,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-exwm = callPackage ({ emacs, exwm, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
-    melpaBuild {
+    helm-exwm = callPackage ({ emacs
+                             , exwm
+                             , fetchFromGitHub
+                             , fetchurl
+                             , helm
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "helm-exwm";
-        version = "20180301.958";
+        version = "20180703.919";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm-exwm";
-          rev = "9eec927d7fa092762b467d400d996b66c1f6d9c2";
-          sha256 = "131xb40y8n3laivzbx4pjynbv0c5v09ihvq4r9c3m1d7qmq6x3kh";
+          rev = "56266f261ba3b3d2753b374b50da20eb768c06f5";
+          sha256 = "064ziinqa5sdv7rfjn0y278l12kld176fr88k4h78pgf2f2n7cd8";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8ecdf9e00cf19fabbeade12a66d66cd010561366/recipes/helm-exwm";
           sha256 = "0g15c4bg794vqigafl9g2w85jbs1lbw9qplaf8ffx0az4qwhnvqz";
-          name = "helm-exwm";
+          name = "recipe";
         };
         packageRequires = [ emacs exwm helm ];
         meta = {
@@ -33070,8 +41358,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-filesets = callPackage ({ fetchFromGitHub, fetchurl, filesets-plus, helm, lib, melpaBuild }:
-    melpaBuild {
+    helm-filesets = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , filesets-plus
+                                 , helm
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "helm-filesets";
         version = "20140929.1135";
         src = fetchFromGitHub {
@@ -33080,10 +41373,10 @@
           rev = "b352910af4c3099267a8aa0169c7f743b35bb1fa";
           sha256 = "00yhmpv5xjlw1gwbcrznz83gkaby8zlqv74d3p7plca2cwjll1g9";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/71c0d98ede6119e838e3db146dea5c16d8ba8ed8/recipes/helm-filesets";
           sha256 = "1yhhchksi0r4r5c5q1mggz2hykkvk93baq91b5hkaflqi30d1v8f";
-          name = "helm-filesets";
+          name = "recipe";
         };
         packageRequires = [ filesets-plus helm ];
         meta = {
@@ -33091,20 +41384,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-firefox = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
-    melpaBuild {
+    helm-firefox = callPackage ({ cl-lib ? null
+                                , emacs
+                                , fetchFromGitHub
+                                , fetchurl
+                                , helm
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "helm-firefox";
         version = "20161202.517";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm-firefox";
-          rev = "0ad34b7b5abc485a86cae6920c14de861cbeb085";
-          sha256 = "08mjsi2f9s29fkk35cj1rrparjnkm836qmbfdwdz7y51f9varjbs";
+          rev = "294850c4ce16ae25f2214f863cee0118add60974";
+          sha256 = "1kaa58xlnr82qsvdzn8sxk5kkd2lxqnvfciyw7kfi2fdrl6nr4pf";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/257e452d37768d2f3a6e0a5ccd062d128b2bc867/recipes/helm-firefox";
           sha256 = "0677nj0zsk11vvp3q3xl9nk8dhz3ki9yl3kfb57wgnmprp109wgs";
-          name = "helm-firefox";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs helm ];
         meta = {
@@ -33112,8 +41411,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-flx = callPackage ({ emacs, fetchFromGitHub, fetchurl, flx, helm, lib, melpaBuild }:
-    melpaBuild {
+    helm-flx = callPackage ({ emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , flx
+                            , helm
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "helm-flx";
         version = "20180102.2116";
         src = fetchFromGitHub {
@@ -33122,10 +41427,10 @@
           rev = "6640fac5cb16bee73c95b8ed1248a4e5e113690e";
           sha256 = "1fh1dy6xpc476hs87mn9fwxhxi97h7clfnnm7dxb7hg43xmgsjjs";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f1418d260f34d698cec611978001c7fd1d1a8a89/recipes/helm-flx";
           sha256 = "03vxr5f5m4s6k6rm0976w8h3s4c3b5mrdqgmkd281hmyh9q3cslq";
-          name = "helm-flx";
+          name = "recipe";
         };
         packageRequires = [ emacs flx helm ];
         meta = {
@@ -33133,20 +41438,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-flycheck = callPackage ({ dash, fetchFromGitHub, fetchurl, flycheck, helm-core, lib, melpaBuild }:
-    melpaBuild {
+    helm-flycheck = callPackage ({ dash
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , flycheck
+                                 , helm-core
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "helm-flycheck";
         version = "20160710.129";
         src = fetchFromGitHub {
           owner = "yasuyk";
           repo = "helm-flycheck";
-          rev = "3cf7d3bb194acacc6395f88360588013d92675d6";
-          sha256 = "1a2yfxhz04klwhcandqvfzysxp6b7bxyxx1xk1x3kds5hif5fkl4";
+          rev = "a15e62a6432c165c4f2c17388686873383400d7d";
+          sha256 = "0q9yksx66ry4x3vkcyyj437il225s2ad5h6vkxpyz04p62g3ysnx";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9cce1662d4ca7b7d868685084294d22ebf6c39e9/recipes/helm-flycheck";
           sha256 = "038f9294qc0jnkzrrjxm97hyhwa4sca3wdsjbaya50cf0g4cmk7b";
-          name = "helm-flycheck";
+          name = "recipe";
         };
         packageRequires = [ dash flycheck helm-core ];
         meta = {
@@ -33154,8 +41465,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-flymake = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
-    melpaBuild {
+    helm-flymake = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , helm
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "helm-flymake";
         version = "20160609.1702";
         src = fetchFromGitHub {
@@ -33164,10 +41479,10 @@
           rev = "72cf18a1a1f843db9bb5d58301739ea9ccb1655b";
           sha256 = "05wpclg4ibp0ida692m3s8nknx4aizfcdgxgfzlwczgdgw0922kn";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d8547036dceaa466957f4c5a07eb0461f313b924/recipes/helm-flymake";
           sha256 = "0h87yd56nhxpahrcpk6hin142hzv3sdr5bvz0injbv8a2lwnny3b";
-          name = "helm-flymake";
+          name = "recipe";
         };
         packageRequires = [ helm ];
         meta = {
@@ -33175,8 +41490,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-flyspell = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
-    melpaBuild {
+    helm-flyspell = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , helm
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "helm-flyspell";
         version = "20170210.1101";
         src = fetchFromGitHub {
@@ -33185,10 +41504,10 @@
           rev = "8d4d947c687cb650cb149aa2271ad5201ea92594";
           sha256 = "0q0xcgg8w9rrlsrrnk0l7qd8q7jc6x1agm2i769j21wpyfv1nbns";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f8c5b91762d47a4d3024f1ed7f19666c6f2d5ce5/recipes/helm-flyspell";
           sha256 = "1g6xry2y6396pg7rg8hc0l84z5r3j2df7dpd1jgffxa8xa3i661f";
-          name = "helm-flyspell";
+          name = "recipe";
         };
         packageRequires = [ helm ];
         meta = {
@@ -33196,8 +41515,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-frame = callPackage ({ emacs, fetchFromGitLab, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    helm-frame = callPackage ({ emacs
+                              , fetchFromGitLab
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "helm-frame";
         version = "20170515.1250";
         src = fetchFromGitLab {
@@ -33206,10 +41529,10 @@
           rev = "389e6461a423d649b7062ba99a2234bef7770059";
           sha256 = "1z7iwgl1v8nkwyz3h610l97amgq9slrfxxiicsnigc9vgsqlh987";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/febb2599e50518dadb30088bc9576aea2af092a7/recipes/helm-frame";
           sha256 = "18wbwm4r3ra9214whhdbxnjrxzra4pn12wqgq5lxli1khylihm3i";
-          name = "helm-frame";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -33217,8 +41540,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-fuzzier = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
-    melpaBuild {
+    helm-fuzzier = callPackage ({ emacs
+                                , fetchFromGitHub
+                                , fetchurl
+                                , helm
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "helm-fuzzier";
         version = "20160605.1445";
         src = fetchFromGitHub {
@@ -33227,10 +41555,10 @@
           rev = "8798dcf3583b863df5b9dea7fe3b0179ba1c35bc";
           sha256 = "1250mh0ydap0sifcyrgs32dnr6c8d723v4c55yvwm23dzvzwycp8";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/51dc6f01e0e5ee0593bea6616894bc0163878cd0/recipes/helm-fuzzier";
           sha256 = "0qdgf0phs3iz29zj3qjhdgb3i4xvf5r2vi0709pwxx2s6r13pvcc";
-          name = "helm-fuzzier";
+          name = "recipe";
         };
         packageRequires = [ emacs helm ];
         meta = {
@@ -33238,8 +41566,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-fuzzy-find = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
-    melpaBuild {
+    helm-fuzzy-find = callPackage ({ emacs
+                                   , fetchFromGitHub
+                                   , fetchurl
+                                   , helm
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "helm-fuzzy-find";
         version = "20171105.2000";
         src = fetchFromGitHub {
@@ -33248,10 +41581,10 @@
           rev = "de2abbf7ca13609587325bacd4a1ed4376b5c927";
           sha256 = "1dacvnkqqiax02c627z9qi61iyqgr0j3qqmjp29h0v494czvrdbs";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/34f76bb377ed31aa42663858c407cc5476e6fe1f/recipes/helm-fuzzy-find";
           sha256 = "0lczlrpd5jy2vhy9jl3rjcdyiwr136spqm8k2rj8m9s8wpn0v75i";
-          name = "helm-fuzzy-find";
+          name = "recipe";
         };
         packageRequires = [ emacs helm ];
         meta = {
@@ -33259,20 +41592,27 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-ghc = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, ghc, helm, lib, melpaBuild }:
-    melpaBuild {
+    helm-ghc = callPackage ({ cl-lib ? null
+                            , emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , ghc
+                            , helm
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "helm-ghc";
         version = "20141105.659";
         src = fetchFromGitHub {
           owner = "david-christiansen";
           repo = "helm-ghc";
-          rev = "e5ee7b8d3b745d162553aecfbd41381c4de85f35";
-          sha256 = "16p1gisbza48qircsvrwx020n96ss1c6s68d7cgqqfc0bf2467is";
+          rev = "3947bfd6b5a05074e776f0b51f414f1a5a724888";
+          sha256 = "0j8mbn33rv4jky9zh1hgw8da8wgs2760057mx8rv5x6i1qcm3bqd";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-ghc";
           sha256 = "0bv0sfpya1jyay9p80lv0w6h9kdp96r8lnp6nj15w660p1b51c0d";
-          name = "helm-ghc";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ghc helm ];
         meta = {
@@ -33280,20 +41620,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-ghq = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
-    melpaBuild {
+    helm-ghq = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , helm
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "helm-ghq";
         version = "20161015.117";
         src = fetchFromGitHub {
           owner = "masutaka";
           repo = "emacs-helm-ghq";
-          rev = "49481685adbb25b3f766aabfdb7472becc673a94";
-          sha256 = "1gxb4cqfzkdag8v6id7bvlv0bvqbfl8mdxphll4pkf1nqj9fk69j";
+          rev = "21ccdb537a3be3d9351e01c6365df8e804e8bc56";
+          sha256 = "1v3h6dszj223yvlkrjj6r4jwiyaj3iswbcl5d4ffwgaf72cxm4gn";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e94eec646def7c77b15f6a6ac1841200848e62c7/recipes/helm-ghq";
           sha256 = "14f3cbsj7jhlhrp561d8pasllnx1cmi7jk6v2fja7ghzj76dnvq6";
-          name = "helm-ghq";
+          name = "recipe";
         };
         packageRequires = [ helm ];
         meta = {
@@ -33301,20 +41645,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-ghs = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
-    melpaBuild {
+    helm-ghs = callPackage ({ emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , helm
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "helm-ghs";
         version = "20170714.2241";
         src = fetchFromGitHub {
           owner = "iory";
           repo = "emacs-helm-ghs";
-          rev = "17a70bf16255d90d67c8350e88200ec8bfd47563";
-          sha256 = "1jc51anmkr44db4kbcwza17x3ln78ihpslrf2v9xs0sq0ggw1rva";
+          rev = "f9d4ab80e8a33b21cd635285289ec5779bbe629f";
+          sha256 = "0f7wsln7z2dhqn334pjk6hrj36gvx39vg19g8ds9sj9dq9djlf27";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0f8d37030806905344a2ca56bfc469f5a238cd69/recipes/helm-ghs";
           sha256 = "0bzy2vr2h9c886cm4gd161n7laym952bzy5fhcibafhzm4abl4sh";
-          name = "helm-ghs";
+          name = "recipe";
         };
         packageRequires = [ emacs helm ];
         meta = {
@@ -33322,20 +41671,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-git = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    helm-git = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "helm-git";
         version = "20120630.1403";
         src = fetchFromGitHub {
           owner = "maio";
           repo = "helm-git";
-          rev = "cb96a52b5aecadd3c27aba7749d14e43ab128d55";
-          sha256 = "1yfy4a52hx44r32i0b75bka8gfcn5lp61jl86lzrsi2cr9wg10pn";
+          rev = "5b4a6eb7a97b2583236a1f919b75249957918e29";
+          sha256 = "1z5q47sly41amjiq5wcvdxf8slhl8wd24crgzpbn6m3lw2jk420r";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/707696fbec477027e675ff01c502e0b81096025c/recipes/helm-git";
           sha256 = "1ib73p7cmkw96csxxpkqwn6m60k1xrd46z6vyp29gj85cs4fpsb8";
-          name = "helm-git";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -33343,8 +41695,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-git-files = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
-    melpaBuild {
+    helm-git-files = callPackage ({ fetchFromGitHub
+                                  , fetchurl
+                                  , helm
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "helm-git-files";
         version = "20141212.517";
         src = fetchFromGitHub {
@@ -33353,10 +41709,10 @@
           rev = "43193960774069369ac6964bbf7c026900206fa8";
           sha256 = "157b525h0kiaknn12fsw67fg26lzb20apx8sssmvlcicqcd51iaw";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/23bfa0b94f242f9da06366b4aefdf6ece72561e7/recipes/helm-git-files";
           sha256 = "02109r956nc1dmqh4v082vkr9wdixh03xhl7icwkzl7ipr5453s6";
-          name = "helm-git-files";
+          name = "recipe";
         };
         packageRequires = [ helm ];
         meta = {
@@ -33364,8 +41720,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-git-grep = callPackage ({ fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }:
-    melpaBuild {
+    helm-git-grep = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , helm-core
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "helm-git-grep";
         version = "20170614.711";
         src = fetchFromGitHub {
@@ -33374,10 +41734,10 @@
           rev = "744cea07dba6e6a5effbdba83f1b786c78fd86d3";
           sha256 = "172m7wbgx9qnv9n1slbzpd9j24p6blddik49z6bq3zdg1vlnf3dv";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/338d28c3fe201a7b2f15793be6d540f44819f4d8/recipes/helm-git-grep";
           sha256 = "1ww6a4q78w5hnwikq7y93ic2b7x070c27r946lh6p8cz1k4b8vqi";
-          name = "helm-git-grep";
+          name = "recipe";
         };
         packageRequires = [ helm-core ];
         meta = {
@@ -33385,20 +41745,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-github-stars = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
-    melpaBuild {
+    helm-github-stars = callPackage ({ emacs
+                                     , fetchFromGitHub
+                                     , fetchurl
+                                     , helm
+                                     , lib
+                                     , melpaBuild }:
+      melpaBuild {
         pname = "helm-github-stars";
-        version = "20150625.1523";
+        version = "20180713.1743";
         src = fetchFromGitHub {
           owner = "Sliim";
           repo = "helm-github-stars";
-          rev = "9211be3fbb65ca8819e0d1a54524ed8abbfaa4fa";
-          sha256 = "1sbhh3dmb47sy3r2iw6vmvbq5bpjac4xdg8i5a0m0c392a38nfqn";
+          rev = "c0ca595e23246165adc12bd85ba7b09760290bc3";
+          sha256 = "0z3nangwhxxhlzd7la9k8gqqxr321iy9z5w6hlvb3f3qgxc84y17";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2e77f4a75504ca3e1091cdc757e91fb1ae361fa7/recipes/helm-github-stars";
           sha256 = "1r4mc4v71171sq9rbbhm346s92fb7jnvvl91y2q52jqmrnzzl9zy";
-          name = "helm-github-stars";
+          name = "recipe";
         };
         packageRequires = [ emacs helm ];
         meta = {
@@ -33406,8 +41771,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-gitignore = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, gitignore-mode, helm, lib, melpaBuild, request }:
-    melpaBuild {
+    helm-gitignore = callPackage ({ cl-lib ? null
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , gitignore-mode
+                                  , helm
+                                  , lib
+                                  , melpaBuild
+                                  , request }:
+      melpaBuild {
         pname = "helm-gitignore";
         version = "20170210.1608";
         src = fetchFromGitHub {
@@ -33416,10 +41788,10 @@
           rev = "2a2e7da7855a6db0ab3bb6a6a087863d7abd4391";
           sha256 = "07770qhy56cf5l69mk6aq882sryjbfjd05kdk78v65mgmlwv806a";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3146b9309e8cbe464330dcd1f5b8a9fd8788ad6f/recipes/helm-gitignore";
           sha256 = "01l7mx8g1m5qnwz973hzrgds4gywm56jgl4hcdxqvpi1n56md3x6";
-          name = "helm-gitignore";
+          name = "recipe";
         };
         packageRequires = [ cl-lib gitignore-mode helm request ];
         meta = {
@@ -33427,8 +41799,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-gitlab = callPackage ({ dash, fetchFromGitHub, fetchurl, gitlab, helm, lib, melpaBuild, s }:
-    melpaBuild {
+    helm-gitlab = callPackage ({ dash
+                               , fetchFromGitHub
+                               , fetchurl
+                               , gitlab
+                               , helm
+                               , lib
+                               , melpaBuild
+                               , s }:
+      melpaBuild {
         pname = "helm-gitlab";
         version = "20180312.947";
         src = fetchFromGitHub {
@@ -33437,10 +41816,10 @@
           rev = "68318aca3206d50701039c9aae39734ca29a49f9";
           sha256 = "0arsjdn0anp7pacwxd3cw4db8a7pgzjlnwav1l3maaz1176h4lpb";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1d012991188956f6e06c37d504b0d06ab31487b9/recipes/helm-gitlab";
           sha256 = "010ihx3yddhb8j3jqcssc49qnf3i7xlz0s380mpgrdxgz6yahsmd";
-          name = "helm-gitlab";
+          name = "recipe";
         };
         packageRequires = [ dash gitlab helm s ];
         meta = {
@@ -33448,20 +41827,27 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-go-package = callPackage ({ deferred, emacs, fetchFromGitHub, fetchurl, go-mode, helm-core, lib, melpaBuild }:
-    melpaBuild {
+    helm-go-package = callPackage ({ deferred
+                                   , emacs
+                                   , fetchFromGitHub
+                                   , fetchurl
+                                   , go-mode
+                                   , helm-core
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "helm-go-package";
         version = "20161102.1853";
         src = fetchFromGitHub {
           owner = "yasuyk";
           repo = "helm-go-package";
-          rev = "e42c563936c205ceedb930a687c11b4bb56447bc";
-          sha256 = "1169q25paz7x3hia5px4vmn06zzss179q9179x95vx8vfr43ny08";
+          rev = "bf741f4a455fcb129c1a9dcec710a52621f9719d";
+          sha256 = "0g7i8lnjav9730zsz12181v9xi9rcvdyhs9vzch01dksixq10hvi";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/449d272b94c189176305ca17652d76adac087ce5/recipes/helm-go-package";
           sha256 = "102yhn1xg83l67yaq3brn35a03fkvqqhad10rq0h39n4i1slq3z6";
-          name = "helm-go-package";
+          name = "recipe";
         };
         packageRequires = [ deferred emacs go-mode helm-core ];
         meta = {
@@ -33469,20 +41855,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-google = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
-    melpaBuild {
+    helm-google = callPackage ({ fetchgit
+                               , fetchurl
+                               , helm
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "helm-google";
-        version = "20180212.240";
-        src = fetchFromGitHub {
-          owner = "steckerhalter";
-          repo = "helm-google";
-          rev = "f9b5f0dfd51e16278eba70d8fc94a599563dab61";
-          sha256 = "1s2y4fyax4487bz7p16jhgwsjjnzqrjz7pq22p8h23jzcvgh6wzx";
+        version = "20180605.2220";
+        src = fetchgit {
+          url = "https://framagit.org/steckerhalter/helm-google.git";
+          rev = "48e91a73d5f48c39d7a219022a24440cff548e1a";
+          sha256 = "05xj6bkr330glh56n8c63297zqh1cmlhxlyxpr04srjraifyzba1";
         };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/88ed6db7b53d1ac75c40d12c21de1dec6d717fbe/recipes/helm-google";
-          sha256 = "0d1y7232rm888car3h40fba1m1pna2nh1a3fcvpra74igwarfi32";
-          name = "helm-google";
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/f0a8eb0eefe88b4ea683a4743c0f8393506e014b/recipes/helm-google";
+          sha256 = "0hv7wfrahjn8j4914dp2p4fl2cj85pmxnyxf5cnmv6p97yis0ham";
+          name = "recipe";
         };
         packageRequires = [ helm ];
         meta = {
@@ -33490,8 +41879,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-grepint = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
-    melpaBuild {
+    helm-grepint = callPackage ({ emacs
+                                , fetchFromGitHub
+                                , fetchurl
+                                , helm
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "helm-grepint";
         version = "20161001.713";
         src = fetchFromGitHub {
@@ -33500,10 +41894,10 @@
           rev = "a62ca27515ff6a366b89b420500eb16d380cc653";
           sha256 = "1v87v6a34zv998z1dwwcqx49476pvy9g5zml7w5vzfkms0l8l28w";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/26446d6a2215bfa622d86837b30f2754dd25eb4c/recipes/helm-grepint";
           sha256 = "00wr3wk41sbpamxbjkqlby49g8y5z9n79p51sg7ginban4qy91gf";
-          name = "helm-grepint";
+          name = "recipe";
         };
         packageRequires = [ emacs helm ];
         meta = {
@@ -33511,8 +41905,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-growthforecast = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
-    melpaBuild {
+    helm-growthforecast = callPackage ({ fetchFromGitHub
+                                       , fetchurl
+                                       , helm
+                                       , lib
+                                       , melpaBuild }:
+      melpaBuild {
         pname = "helm-growthforecast";
         version = "20140119.1944";
         src = fetchFromGitHub {
@@ -33521,10 +41919,10 @@
           rev = "0f94ac090d6c354058ad89a86e5c18385c136d9b";
           sha256 = "0p0mk44y2z875ra8mzcb6vlf4rbkiq9yank5hdxvg2x2sxsaambk";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7d92e66cad586d4dc6b1de12d1b41b818b5232c2/recipes/helm-growthforecast";
           sha256 = "1qlyp263rl0892hr53kgc16jlx3jylw2pplbzlx05a60k5348jjv";
-          name = "helm-growthforecast";
+          name = "recipe";
         };
         packageRequires = [ helm ];
         meta = {
@@ -33532,8 +41930,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-gtags = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
-    melpaBuild {
+    helm-gtags = callPackage ({ emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , helm
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "helm-gtags";
         version = "20170115.2129";
         src = fetchFromGitHub {
@@ -33542,10 +41945,10 @@
           rev = "108e93d0d099ebb7b98847388f368311cf177033";
           sha256 = "0hfshcnzrrvf08yw4xz5c93g9pw6bvjp2bmv0s6acrsjqgwhx158";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/81f0f525680fea98e804f39dbde1dada887e8821/recipes/helm-gtags";
           sha256 = "1kbpfqhhbxmp3f70h91x2fws9mhx87zx4nzjjl29lpl93vf8xckl";
-          name = "helm-gtags";
+          name = "recipe";
         };
         packageRequires = [ emacs helm ];
         meta = {
@@ -33553,20 +41956,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-hatena-bookmark = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
-    melpaBuild {
+    helm-hatena-bookmark = callPackage ({ fetchFromGitHub
+                                        , fetchurl
+                                        , helm
+                                        , lib
+                                        , melpaBuild }:
+      melpaBuild {
         pname = "helm-hatena-bookmark";
         version = "20170821.646";
         src = fetchFromGitHub {
           owner = "masutaka";
           repo = "emacs-helm-hatena-bookmark";
-          rev = "ee0d2554f573779210b0e2595e539b3e28461f1d";
-          sha256 = "12qb9jnqa2nl3asfa178ijjrrxkrwddlxf6y6m0d79j2fnqrgbr6";
+          rev = "d64833a5bbb4ae112ed176f6473232e526138572";
+          sha256 = "01b6nlbidk93arnnd2irm088qlws4i4p1sagsh9v153x6sk0r38k";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3e9335ad16d4151dd4970c4a3ad1fee9a84404fa/recipes/helm-hatena-bookmark";
           sha256 = "14091zrp4vj7752rb5s3pkyvrrsdl7iaj3q9ys8rjmbsjwcv30id";
-          name = "helm-hatena-bookmark";
+          name = "recipe";
         };
         packageRequires = [ helm ];
         meta = {
@@ -33574,8 +41981,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-hayoo = callPackage ({ fetchFromGitHub, fetchurl, haskell-mode, helm, json ? null, lib, melpaBuild }:
-    melpaBuild {
+    helm-hayoo = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , haskell-mode
+                              , helm
+                              , json ? null
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "helm-hayoo";
         version = "20151013.2351";
         src = fetchFromGitHub {
@@ -33584,10 +41997,10 @@
           rev = "dd4c0c8c87521026edf1b808c4de01fa19b7c693";
           sha256 = "08pfzs030d8g5s7vkpgicz4srp5cr3xpd84lhrr24ncrhbszxar9";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-hayoo";
           sha256 = "06nbilb6vfa8959ss5d06zbcwqxlbyi3cb5jnbdag0jnpxvv1hqb";
-          name = "helm-hayoo";
+          name = "recipe";
         };
         packageRequires = [ haskell-mode helm json ];
         meta = {
@@ -33595,20 +42008,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-helm-commands = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
-    melpaBuild {
+    helm-helm-commands = callPackage ({ fetchFromGitHub
+                                      , fetchurl
+                                      , helm
+                                      , lib
+                                      , melpaBuild }:
+      melpaBuild {
         pname = "helm-helm-commands";
         version = "20130902.1048";
         src = fetchFromGitHub {
           owner = "vapniks";
           repo = "helm-helm-commands";
-          rev = "3a05aa19c976501343ad9ae630a36810921a85f6";
-          sha256 = "05ksfx54ar2j4mypzwh0gfir8r26s4f1i4xw319q5pa1y2100cpn";
+          rev = "1c37bb0d4cda6877162603cd1ddc9f596a7a5cb9";
+          sha256 = "0c31qr8lk58w86n5iisx0vpd19y44vmqg7xnpjh6mnz102xif7rn";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f8bd33d5d5c8653df5373984d01c3ec87b30c51b/recipes/helm-helm-commands";
           sha256 = "0dq9p37i5rrp2nb1vhqzzqfmdg11va2xr3yz8hdxpwykm1ldqdcf";
-          name = "helm-helm-commands";
+          name = "recipe";
         };
         packageRequires = [ helm ];
         meta = {
@@ -33616,8 +42033,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-hoogle = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
-    melpaBuild {
+    helm-hoogle = callPackage ({ emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , helm
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "helm-hoogle";
         version = "20161026.2234";
         src = fetchFromGitHub {
@@ -33626,10 +42048,10 @@
           rev = "73969a9d46d2121a849a01a9f7ed3636d01f7bbc";
           sha256 = "043bddm6lldl6wkifr1plqip7laai771z1a1l0x2h35l3g8c64h0";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8ccc21c2acc76a6794aee94902b1bc4c14119901/recipes/helm-hoogle";
           sha256 = "0vhk4vwqfirdm5d0pppplfpqyc2sfj6jybhzp9n1w8xgrh2d1c0x";
-          name = "helm-hoogle";
+          name = "recipe";
         };
         packageRequires = [ emacs helm ];
         meta = {
@@ -33637,8 +42059,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-hunks = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
-    melpaBuild {
+    helm-hunks = callPackage ({ emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , helm
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "helm-hunks";
         version = "20171217.1133";
         src = fetchFromGitHub {
@@ -33647,10 +42074,10 @@
           rev = "6392bf716f618eac23ce81140aceb0dfacb9c6d0";
           sha256 = "1ih2pgyhshv8nl7hhchd4h0pbjgj45irp5dy1fq2gy05v4rn7wi4";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d61cbe53ad42f2405a66de9f551f5b870a60709f/recipes/helm-hunks";
           sha256 = "1fhb9sf7fpz3f3ylc906w5xa4zzfr0gix6m7zc4c8qmz33zbhbp5";
-          name = "helm-hunks";
+          name = "recipe";
         };
         packageRequires = [ emacs helm ];
         meta = {
@@ -33658,8 +42085,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-idris = callPackage ({ fetchFromGitHub, fetchurl, helm, idris-mode, lib, melpaBuild }:
-    melpaBuild {
+    helm-idris = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , helm
+                              , idris-mode
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "helm-idris";
         version = "20141202.957";
         src = fetchFromGitHub {
@@ -33668,10 +42100,10 @@
           rev = "a2f45d6817974f318b55ad9b7fd19d5df132d47e";
           sha256 = "0128nrhwyzslzl0l7wcjxn3dlx3h1sjmwnbbnp2fj4bjk7chc59q";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-idris";
           sha256 = "04f1963ksbjdza1syajb5vkwwsc9gzk0az6c1m1zgvsianrq4rd9";
-          name = "helm-idris";
+          name = "recipe";
         };
         packageRequires = [ helm idris-mode ];
         meta = {
@@ -33679,8 +42111,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-img = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
-    melpaBuild {
+    helm-img = callPackage ({ cl-lib ? null
+                            , fetchFromGitHub
+                            , fetchurl
+                            , helm
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "helm-img";
         version = "20151224.1521";
         src = fetchFromGitHub {
@@ -33689,10 +42126,10 @@
           rev = "aa3f8a5dce8d0413bf07584f07153a39015c2bfc";
           sha256 = "0py4xs27z2jvg99i6qaf2ccz0mvk6bb9cvdyz8v8ngmnj3rw2vla";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e0ea97a55f8f4183d375424c94705f372189d6ed/recipes/helm-img";
           sha256 = "0sq9l1wgm97ppfc45w3bdcv0qq5m85ygnanv1bdcp8bxbdl4vg0q";
-          name = "helm-img";
+          name = "recipe";
         };
         packageRequires = [ cl-lib helm ];
         meta = {
@@ -33700,8 +42137,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-img-tiqav = callPackage ({ fetchFromGitHub, fetchurl, helm-img, lib, melpaBuild }:
-    melpaBuild {
+    helm-img-tiqav = callPackage ({ fetchFromGitHub
+                                  , fetchurl
+                                  , helm-img
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "helm-img-tiqav";
         version = "20151224.1522";
         src = fetchFromGitHub {
@@ -33710,10 +42151,10 @@
           rev = "33a7e9508bc8f37d53320b56c92b53d321a57bb0";
           sha256 = "04vdin0n3514c8bycdjrwk3l6pkarrwanlklnm75315b91nkkbcp";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f6a948f91dc58ce565e54967ab75fe572f37f616/recipes/helm-img-tiqav";
           sha256 = "1m083hiih2rpyy8i439745mj4ldqy85fpnvms8qnv3042b8x35y0";
-          name = "helm-img-tiqav";
+          name = "recipe";
         };
         packageRequires = [ helm-img ];
         meta = {
@@ -33721,8 +42162,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-ispell = callPackage ({ fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }:
-    melpaBuild {
+    helm-ispell = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , helm-core
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "helm-ispell";
         version = "20151231.53";
         src = fetchFromGitHub {
@@ -33731,10 +42176,10 @@
           rev = "cb735695ab3a0e66c123c2f3f3e8911fb1c2d5fc";
           sha256 = "04ddjdia09y14gq4h6m8g6aiwkqvdxp66yjx3j5dh2xrkyxhlxpz";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/edc42b26027dcd7daf0d6f2bd19ca4736fc12d6d/recipes/helm-ispell";
           sha256 = "0qyj6whgb2p0v231wn6pvx4awvl1wxppppqqbx5255j8r1f3l1b0";
-          name = "helm-ispell";
+          name = "recipe";
         };
         packageRequires = [ helm-core ];
         meta = {
@@ -33742,8 +42187,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-itunes = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
-    melpaBuild {
+    helm-itunes = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , helm
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "helm-itunes";
         version = "20151012.2348";
         src = fetchFromGitHub {
@@ -33752,10 +42201,10 @@
           rev = "966de755a5aadbe02311a6cef77bd4790e84c263";
           sha256 = "1czgf5br89x192g3lh3x2n998f79hi1n2f309ll264qnl35kv14w";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/helm-itunes";
           sha256 = "0zi4wyraqkjwp954pkng8b23giv1q9618apd9v3dczsvlmaar9hf";
-          name = "helm-itunes";
+          name = "recipe";
         };
         packageRequires = [ helm ];
         meta = {
@@ -33763,8 +42212,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-j-cheatsheet = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
-    melpaBuild {
+    helm-j-cheatsheet = callPackage ({ fetchFromGitHub
+                                     , fetchurl
+                                     , helm
+                                     , lib
+                                     , melpaBuild }:
+      melpaBuild {
         pname = "helm-j-cheatsheet";
         version = "20170217.29";
         src = fetchFromGitHub {
@@ -33773,10 +42226,10 @@
           rev = "6c47e7162b9ba2de4b41221d01180146973d860b";
           sha256 = "0ayv6aqmwjy95gc9cpyx0s71486rvlmn04iwgfn43mr192c38y9p";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/681b43eb224942155b97181bbb78bcd295347d04/recipes/helm-j-cheatsheet";
           sha256 = "0lppzk60vl3ps9fqnrh020awiy5w46gwlb6d91pr889x24ryphmm";
-          name = "helm-j-cheatsheet";
+          name = "recipe";
         };
         packageRequires = [ helm ];
         meta = {
@@ -33784,8 +42237,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-js-codemod = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm-core, js-codemod, lib, melpaBuild }:
-    melpaBuild {
+    helm-js-codemod = callPackage ({ emacs
+                                   , fetchFromGitHub
+                                   , fetchurl
+                                   , helm-core
+                                   , js-codemod
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "helm-js-codemod";
         version = "20171106.244";
         src = fetchFromGitHub {
@@ -33794,10 +42253,10 @@
           rev = "18503d94e64418e8ea5c5854f197ae9f3009cdbf";
           sha256 = "0d5fsvfa017gda0jryjdvva1q04nry6grc1433gvgrqqp6vxayxc";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/dd005bfb170df2f0c992043130a5e9588dcf4d77/recipes/helm-js-codemod";
           sha256 = "1m07xh97fjyah8di363yalg9f5g5rfr3k5mbjql3n67lfwgxrz94";
-          name = "helm-js-codemod";
+          name = "recipe";
         };
         packageRequires = [ emacs helm-core js-codemod ];
         meta = {
@@ -33805,20 +42264,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-jstack = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
-    melpaBuild {
+    helm-jstack = callPackage ({ cl-lib ? null
+                               , emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , helm
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "helm-jstack";
         version = "20150602.2122";
         src = fetchFromGitHub {
           owner = "raghavgautam";
           repo = "helm-jstack";
-          rev = "2064f7215dcf4ccbd6a7b8784223251507746da4";
-          sha256 = "0vhqpcv8xi6a6q7n6xxahdzijr1x5s40fvk9nc44q55psbyv627g";
+          rev = "aab0fd9f14794ae3a6e7cfbe7f6a81842ce4c23b";
+          sha256 = "133fgmhh5phxssagriw1jsi48va4kyphwbcrha7pfnkmrmr1dgqb";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a92ffbc4de86248729773dd8729e6487bf56fbb0/recipes/helm-jstack";
           sha256 = "0giix1rv2jrmdxyg990w90ivl8bvgbbvah6nkpj7gb6vbnm15ldz";
-          name = "helm-jstack";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs helm ];
         meta = {
@@ -33826,8 +42291,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-kythe = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
-    melpaBuild {
+    helm-kythe = callPackage ({ dash
+                              , emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , helm
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "helm-kythe";
         version = "20170709.26";
         src = fetchFromGitHub {
@@ -33836,10 +42307,10 @@
           rev = "eabbef4948f8ec7c7b2fac498e9145dfdb10ca82";
           sha256 = "1ws7vl0pvznmxb7yj77kfv4l52xkzblhsl68lfkf9cdxcj9g6177";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/dd1a6d0b08ad750a0e44ebdf76109d29ab226bd3/recipes/helm-kythe";
           sha256 = "1yybpic3jzp3yy8xlfdn2jj12h087vn0lj3mqx6xxj2nxd9q4949";
-          name = "helm-kythe";
+          name = "recipe";
         };
         packageRequires = [ dash emacs helm ];
         meta = {
@@ -33847,20 +42318,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-lastpass = callPackage ({ csv, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
-    melpaBuild {
+    helm-lastpass = callPackage ({ csv
+                                 , emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , helm
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "helm-lastpass";
-        version = "20180114.937";
+        version = "20180430.1012";
         src = fetchFromGitHub {
           owner = "xuchunyang";
           repo = "helm-lastpass";
-          rev = "65ac0a80b5908b43ecd6a89c17f22f5c9c6734b0";
-          sha256 = "18ncb6lnw06amwr1avh53gqifwg0wpwf2849z2k781dls3n5j4hr";
+          rev = "522e14893f26c5342543bde8bb76f2e9ce1ee691";
+          sha256 = "1kdrs927myrp6h6f0xskd1ipli12y2s5k6nk8w2hnq82a6a5b484";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a39f1b0a5b22e91eb9e298949def6c29e7bc5755/recipes/helm-lastpass";
           sha256 = "0zgq3szds5l3ah39wiacqcc1j0dlbhwm0cjx64j28jx93300kx57";
-          name = "helm-lastpass";
+          name = "recipe";
         };
         packageRequires = [ csv emacs helm ];
         meta = {
@@ -33868,20 +42345,27 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-lean = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, helm, lean-mode, lib, melpaBuild }:
-    melpaBuild {
+    helm-lean = callPackage ({ dash
+                             , emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , helm
+                             , lean-mode
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "helm-lean";
         version = "20171102.754";
         src = fetchFromGitHub {
           owner = "leanprover";
           repo = "lean-mode";
-          rev = "ae90bd280588c96d540892d0f42247db5a126f51";
-          sha256 = "06d5f577rv82g72m719w8z9w7m63amxjsdppcyvg2i6icymlhnqa";
+          rev = "c0af876c967fc969d67c467bc6767210d19c5d87";
+          sha256 = "04qzck156wb2bvrb8adbn7rx2v0bsjcirlbx4ajajjsqy858ayn9";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/42f4d6438c8aeb94ebc1782f2f5e2abd17f0ffde/recipes/helm-lean";
           sha256 = "0j5ax14lhlyd9mpqk1jwh7nfp090kj71r045v2qjfaw2fa23b7si";
-          name = "helm-lean";
+          name = "recipe";
         };
         packageRequires = [ dash emacs helm lean-mode ];
         meta = {
@@ -33889,20 +42373,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-lib-babel = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
-    melpaBuild {
+    helm-lib-babel = callPackage ({ cl-lib ? null
+                                  , emacs
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , helm
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "helm-lib-babel";
-        version = "20180225.1322";
+        version = "20180510.624";
         src = fetchFromGitHub {
           owner = "dfeich";
           repo = "helm-lib-babel";
-          rev = "69bce58c1ef109dd33cc7f7696ad02a536f1b215";
-          sha256 = "0x39ds3hziabizaa3hrqfbz2a9by4s25dndp8ymxbl8jjvqgdi3a";
+          rev = "41bc0cdea8a604c6c8dc83ed5066644d33688fad";
+          sha256 = "1jrpaip5v9kzk0rf8wivsq8irdfd39svxd7p3v80cwgrrl7546xj";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d6718da5d8849a8c3ec17188b89a1273cf963047/recipes/helm-lib-babel";
           sha256 = "0ddj6xrhz4n0npplkjmblqb43jnd6fmr4i4vv1cigrgb7zj6bjx4";
-          name = "helm-lib-babel";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs helm ];
         meta = {
@@ -33910,20 +42400,51 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-lobsters = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
-    melpaBuild {
+    helm-lines = callPackage ({ emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , helm
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
+        pname = "helm-lines";
+        version = "20180601.1333";
+        src = fetchFromGitHub {
+          owner = "torgeir";
+          repo = "helm-lines.el";
+          rev = "3bfe15a60c6405682085ab289de3eb364624c4e9";
+          sha256 = "1fi0khqx35v48s14jr59jp06bpnhx9dy2rdasj2wn1a34jwgd49i";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/b0aee0be5f388a6d778cb22ce5ad930d21c6f521/recipes/helm-lines";
+          sha256 = "110y0vdmab4zr3ab6cpf93b6iidxhanq4rh1cfrzqjf7a7xik78h";
+          name = "recipe";
+        };
+        packageRequires = [ emacs helm ];
+        meta = {
+          homepage = "https://melpa.org/#/helm-lines";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-lobsters = callPackage ({ cl-lib ? null
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , helm
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "helm-lobsters";
         version = "20150213.746";
         src = fetchFromGitHub {
           owner = "julienXX";
           repo = "helm-lobste.rs";
-          rev = "53c5b42baf72776dcba891fc3d7cd7d47721e9b0";
-          sha256 = "1ic0pcr7cfrfalb7760viixz5gfdg5hfazzwfhhw08vx44xx0jk4";
+          rev = "4121b232aeded2f82ad2c8a85c7dda17ef9d97bb";
+          sha256 = "0nkmc17ggyfi7iz959mvzh6q7116j44zqwi7ydm9i8z49xfpzafy";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6247e3786131e5b2a7824804e49927ed65d266d5/recipes/helm-lobsters";
           sha256 = "0dkb78n373kywxj8zba2s5a2g85vx19rdswv9i78xjwv1lqh8cpp";
-          name = "helm-lobsters";
+          name = "recipe";
         };
         packageRequires = [ cl-lib helm ];
         meta = {
@@ -33931,20 +42452,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-ls-git = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
-    melpaBuild {
+    helm-ls-git = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , helm
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "helm-ls-git";
-        version = "20180415.2336";
+        version = "20180711.223";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm-ls-git";
-          rev = "c63c27f10d0cc409ab528d20700bccc52abbab26";
-          sha256 = "1xmrg49b7r3ry85gizllnll4v6wk3qxmhwrd7d0jifx5df9v13f9";
+          rev = "e38cee59c42fbf16b6de239a537d27af58473394";
+          sha256 = "0c53x1dzb80xs6qsmd6py7b9g7d0zva0dhvvxmipjy48dlzr3k5z";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b487b4c0db9092bb7e32aad9265b79a9d18c8478/recipes/helm-ls-git";
           sha256 = "08rsy9479nk03kinjfkxddrq6wi4sx2a0wrz37cl2q517qi7sibj";
-          name = "helm-ls-git";
+          name = "recipe";
         };
         packageRequires = [ helm ];
         meta = {
@@ -33952,8 +42477,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-ls-hg = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
-    melpaBuild {
+    helm-ls-hg = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , helm
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "helm-ls-hg";
         version = "20150908.2243";
         src = fetchFromGitHub {
@@ -33962,10 +42491,10 @@
           rev = "61b91a22fcfb62d0fc56e361ec01ce96973c7165";
           sha256 = "1msrsqiwk7bg5gry5cia8a6c7ifymfyn738hk8g2qwzzw4vkxxcs";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/03a22c9ec281330c4603aec6feb04cf580dee340/recipes/helm-ls-hg";
           sha256 = "0ca0xn7n8bagxb504xgkcv04rpm1vxhx2m77biqrx5886pwl25bh";
-          name = "helm-ls-hg";
+          name = "recipe";
         };
         packageRequires = [ helm ];
         meta = {
@@ -33973,8 +42502,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-ls-svn = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
-    melpaBuild {
+    helm-ls-svn = callPackage ({ cl-lib ? null
+                               , emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , helm
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "helm-ls-svn";
         version = "20150717.39";
         src = fetchFromGitHub {
@@ -33983,10 +42518,10 @@
           rev = "4d4dc1a272f27fba5fdd7cc47e5d309b53c63ae3";
           sha256 = "0b7gah21rkfd43mb89lrwaqrrwq646abh7wi4q74sx796gmpz4dz";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/30de78c9cf83de30093a5647976eeaf552d4b2cb/recipes/helm-ls-svn";
           sha256 = "0rqsy6gk114khqr28bp2fi0ixaa8wbqd952yxph517p1pbfwxy66";
-          name = "helm-ls-svn";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs helm ];
         meta = {
@@ -33994,20 +42529,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-make = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild, projectile }:
-    melpaBuild {
+    helm-make = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , helm
+                             , lib
+                             , melpaBuild
+                             , projectile }:
+      melpaBuild {
         pname = "helm-make";
-        version = "20180322.1251";
+        version = "20180602.653";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "helm-make";
-          rev = "51dfe9871ae2851d8d82530346c8e0a846cdfd94";
-          sha256 = "0zipg6zv62839n0px8sil86jdv9qlqy877kj1m8x3dln3c7pf0x3";
+          rev = "014e81c638fae3ad891a0b9317ae368d9eee7c5f";
+          sha256 = "1p7pdrq4vh9adk9m19dyapadaz6karlcksmah3g4l1c8zr0awf4h";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0f25f066c60d4caff1fbf885bc944cac47515ec8/recipes/helm-make";
           sha256 = "1r6jjy1rlsii6p6pinbz7h6gcw4vmcycd3vj338bfbnqp5rrf2mc";
-          name = "helm-make";
+          name = "recipe";
         };
         packageRequires = [ helm projectile ];
         meta = {
@@ -34015,8 +42555,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-migemo = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, migemo }:
-    melpaBuild {
+    helm-migemo = callPackage ({ cl-lib ? null
+                               , emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , helm-core
+                               , lib
+                               , melpaBuild
+                               , migemo }:
+      melpaBuild {
         pname = "helm-migemo";
         version = "20151009.2056";
         src = fetchFromGitHub {
@@ -34025,10 +42572,10 @@
           rev = "66c6a19d07c6a385daefd2090d0709d26b608b4e";
           sha256 = "0gzlprf5js4y3vzkf7si2xc7ai5j97b5cqrs002hyjj5ij4f2vix";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ce6eb840368f8cbee66dc061478d5096b9dacb68/recipes/helm-migemo";
           sha256 = "1cjvb1lm1fsg5ky63fvrphwl5a7r7xf6qzb4mvl06ikj8hv2h33x";
-          name = "helm-migemo";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs helm-core migemo ];
         meta = {
@@ -34036,8 +42583,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-mode-manager = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
-    melpaBuild {
+    helm-mode-manager = callPackage ({ fetchFromGitHub
+                                     , fetchurl
+                                     , helm
+                                     , lib
+                                     , melpaBuild }:
+      melpaBuild {
         pname = "helm-mode-manager";
         version = "20151124.138";
         src = fetchFromGitHub {
@@ -34046,10 +42597,10 @@
           rev = "5d9c3ca4f8205d07ff4e03c4c3e88f596751c1fc";
           sha256 = "1lbxb4vnnv6s46m90qihkj99qdbdylwncwaijjfd7i2kap2ayawh";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-mode-manager";
           sha256 = "04yhqbb9cliv1922b0abpc1wrladvhyfmwn8ifqfkzaks4067rhl";
-          name = "helm-mode-manager";
+          name = "recipe";
         };
         packageRequires = [ helm ];
         meta = {
@@ -34057,8 +42608,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-mt = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, multi-term }:
-    melpaBuild {
+    helm-mt = callPackage ({ cl-lib ? null
+                           , emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , helm
+                           , lib
+                           , melpaBuild
+                           , multi-term }:
+      melpaBuild {
         pname = "helm-mt";
         version = "20160917.2152";
         src = fetchFromGitHub {
@@ -34067,10 +42625,10 @@
           rev = "d2bff4100118483bc398c56d0ff095294209265b";
           sha256 = "1wci63y0vjvrvrylkhhrz8p9q0ml6la5cpj4rx5cwin9rkmislm6";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e726bf0b9b3f371b21f1f0d75175e0dda62f6fb0/recipes/helm-mt";
           sha256 = "04hx8cg8wmm2w8g942nc9mvm12ammmjnx4k61ljrq76smd8s3x2a";
-          name = "helm-mt";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs helm multi-term ];
         meta = {
@@ -34078,20 +42636,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-mu = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
-    melpaBuild {
+    helm-mu = callPackage ({ fetchFromGitHub
+                           , fetchurl
+                           , helm
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "helm-mu";
-        version = "20171027.933";
+        version = "20180513.221";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm-mu";
-          rev = "cda769ef48e1e11e3b21cdafa85adb8e36384d78";
-          sha256 = "0s7v2hdrsd3xmdw0iwd3zqpdj3zp3z0akcyyw3cicpmic7wrcc75";
+          rev = "77e6fea24e01481418738421dbcfe28ef1bd63cf";
+          sha256 = "1lh0ahxdc5b2z18m9p30gwg8sbg33sjwkjr38p7h5xsm5fm7i0fz";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/63ee2e2aa622c96993c1b705d0fd223d6b36fd0f/recipes/helm-mu";
           sha256 = "0pydp6scj5icaqfp3dp5h0q1y2i7z9mfyw1ll6iphsz9qh3x2bj2";
-          name = "helm-mu";
+          name = "recipe";
         };
         packageRequires = [ helm ];
         meta = {
@@ -34099,20 +42661,27 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-navi = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, navi-mode, s }:
-    melpaBuild {
+    helm-navi = callPackage ({ emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , helm
+                             , lib
+                             , melpaBuild
+                             , navi-mode
+                             , s }:
+      melpaBuild {
         pname = "helm-navi";
         version = "20170402.752";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm-navi";
-          rev = "2256591174ff79f889450fdc10822316819d6476";
-          sha256 = "0bbb52v1c81a6ap10qi7mqigi237vwrlmf8mg3ckglm1i710636j";
+          rev = "eb5d53f2abc640bea90e3c221562913c4d144638";
+          sha256 = "0d2nm35hnp26xlpp4s60ddg8mn89bpaa5b6qsap9ff6kqxfnhww1";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e5ffbc25c0eb30b9c96594d50f47cd0383aa8ebc/recipes/helm-navi";
           sha256 = "0v3amm15pwja2y7zg92hsfhp3scmswwl0q0slg33g11rvj26iiks";
-          name = "helm-navi";
+          name = "recipe";
         };
         packageRequires = [ emacs helm navi-mode s ];
         meta = {
@@ -34120,20 +42689,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-nixos-options = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild, nixos-options }:
-    melpaBuild {
+    helm-nixos-options = callPackage ({ fetchFromGitHub
+                                      , fetchurl
+                                      , helm
+                                      , lib
+                                      , melpaBuild
+                                      , nixos-options }:
+      melpaBuild {
         pname = "helm-nixos-options";
         version = "20151013.1609";
         src = fetchFromGitHub {
           owner = "travisbhartwell";
           repo = "nix-emacs";
-          rev = "7007363e773a419203a69798fb0e0731b2eb0f73";
-          sha256 = "00hv8fhyahkdh1vfy1qkahqvsik6d81c7mqh4gjiqxrmb2l1vbcb";
+          rev = "f7709bb007ebafb4d6b32778c7764e2c44e0420d";
+          sha256 = "1q7z9rdd00c562qbr51xy3qrqfj7wm4ycysx5fiasjisqa9vphkv";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6846c7d86e70a9dd8300b89b61435aa7e146be96/recipes/helm-nixos-options";
           sha256 = "1nsi4hfw53iwn29fp33dkri1c6w8kdyn4sa0yn2fi6144ilmq933";
-          name = "helm-nixos-options";
+          name = "recipe";
         };
         packageRequires = [ helm nixos-options ];
         meta = {
@@ -34141,20 +42715,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-notmuch = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild, notmuch }:
-    melpaBuild {
+    helm-notmuch = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , helm
+                                , lib
+                                , melpaBuild
+                                , notmuch }:
+      melpaBuild {
         pname = "helm-notmuch";
-        version = "20170903.2159";
+        version = "20180521.407";
         src = fetchFromGitHub {
           owner = "xuchunyang";
           repo = "helm-notmuch";
-          rev = "782c221bf293eee55990de5b54171f08d881dcee";
-          sha256 = "04mlsjqhh2nw2javxz8m1hbnsq0s70dw5pnwdbx8s9dk1p8ikxvw";
+          rev = "3176305a700c571e3bd6cdb37598708ad283ea73";
+          sha256 = "097h2v5dxlcyb5myk9ijbjnf1qfi52ivaqq56hf5yll3k7i9m65d";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/98667b3aa43d3e0f6174eeef82acaf71d7019aac/recipes/helm-notmuch";
           sha256 = "1ixdc1ba4ygxl0lpg6ijk06dgj2hfv5p5k6ivq60ss0axyisnnv0";
-          name = "helm-notmuch";
+          name = "recipe";
         };
         packageRequires = [ helm notmuch ];
         meta = {
@@ -34162,8 +42741,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-open-github = callPackage ({ emacs, fetchFromGitHub, fetchurl, gh, helm-core, lib, melpaBuild }:
-    melpaBuild {
+    helm-open-github = callPackage ({ emacs
+                                    , fetchFromGitHub
+                                    , fetchurl
+                                    , gh
+                                    , helm-core
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "helm-open-github";
         version = "20170219.1759";
         src = fetchFromGitHub {
@@ -34172,10 +42757,10 @@
           rev = "2f03d97552a1233db7694116d5f80ecde7612756";
           sha256 = "1nzi2m23mqvxkpa7wsd2j0rwvlv5pj0mcaz2ypgfd023k2vh9is1";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/81f0f525680fea98e804f39dbde1dada887e8821/recipes/helm-open-github";
           sha256 = "1wqlwg21s9pjgcrwr8kdrppinmjn235nadkp4003g0md1d64zxpx";
-          name = "helm-open-github";
+          name = "recipe";
         };
         packageRequires = [ emacs gh helm-core ];
         meta = {
@@ -34183,20 +42768,28 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-org-rifle = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }:
-    melpaBuild {
+    helm-org-rifle = callPackage ({ dash
+                                  , emacs
+                                  , f
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , helm
+                                  , lib
+                                  , melpaBuild
+                                  , s }:
+      melpaBuild {
         pname = "helm-org-rifle";
-        version = "20180207.1539";
+        version = "20180712.1545";
         src = fetchFromGitHub {
           owner = "alphapapa";
           repo = "helm-org-rifle";
-          rev = "f4936509b4a5658ea325fc9f941f2e2e9e3018cf";
-          sha256 = "020jg7mwyibd6c3lrzdsrc5jbn7vh6y6iyxfc6r28k8bwv4fggv3";
+          rev = "b712ced914da3ae733ee7c355261071d4eed4876";
+          sha256 = "0s8dq2x73p6dfrkyiq7zajl24wrsdmh6wgwrjjf9d6hdla64pfy8";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f39cc94dde5aaf0d6cfea5c98dd52cdb0bcb1615/recipes/helm-org-rifle";
           sha256 = "0hx764vql2qgw9i8qrr3kkn23lw6jx3x604dm1y33ig6a15gy3a3";
-          name = "helm-org-rifle";
+          name = "recipe";
         };
         packageRequires = [ dash emacs f helm s ];
         meta = {
@@ -34204,8 +42797,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-orgcard = callPackage ({ fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }:
-    melpaBuild {
+    helm-orgcard = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , helm-core
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "helm-orgcard";
         version = "20151001.824";
         src = fetchFromGitHub {
@@ -34214,10 +42811,10 @@
           rev = "9655ac340d1ccc5f3d1c0f7c49be8dd3556d4d0d";
           sha256 = "1zyjxrrda7nxxjqczv2p3sfimxy2pq734kf51j6v2y0biclc4bk3";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ce6eb840368f8cbee66dc061478d5096b9dacb68/recipes/helm-orgcard";
           sha256 = "1a56y8fny7qxxidc357n7l3yi7h66hidhvwhkam8y5wk6k61460p";
-          name = "helm-orgcard";
+          name = "recipe";
         };
         packageRequires = [ helm-core ];
         meta = {
@@ -34225,8 +42822,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-pages = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
-    melpaBuild {
+    helm-pages = callPackage ({ cl-lib ? null
+                              , emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , helm
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "helm-pages";
         version = "20161120.1826";
         src = fetchFromGitHub {
@@ -34235,10 +42838,10 @@
           rev = "51dcb9374d1df9feaae85e60cfb39b970554ecba";
           sha256 = "0znmj13nshzspysnzrn2x6k9fym21n9ywkpjibljy0s05m36nbs5";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7a33cb19b6e71240896bbe5da07ab25f2ee11f0b/recipes/helm-pages";
           sha256 = "1v3w8100invb5wsmm3dyl41pjs7s889s3b1rlr6vlcspa1ncv3wj";
-          name = "helm-pages";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs helm ];
         meta = {
@@ -34246,20 +42849,27 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-pass = callPackage ({ auth-source-pass, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, password-store }:
-    melpaBuild {
+    helm-pass = callPackage ({ auth-source-pass
+                             , emacs
+                             , fetchFromGitLab
+                             , fetchurl
+                             , helm
+                             , lib
+                             , melpaBuild
+                             , password-store }:
+      melpaBuild {
         pname = "helm-pass";
-        version = "20180415.2038";
-        src = fetchFromGitHub {
+        version = "20180607.1648";
+        src = fetchFromGitLab {
           owner = "jabranham";
           repo = "helm-pass";
-          rev = "ebcbef1a962795a36e3491ae926e2a4b8a8b0ebb";
-          sha256 = "13far24blzmcjyxkwnsqbx0g865p233bx21885nw59rp28frg538";
+          rev = "fdff8f8f2e2b8a61caed7b6c171624700dbe1346";
+          sha256 = "1rq4gsz924m06l01x0058cgxxmqwvh4jga8fb7lwviispxi21nbn";
         };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/d8100599d69a760cd4548004a552cc0adcdb3bed/recipes/helm-pass";
-          sha256 = "11yknsch0avdl8jmj54xk45nba3qh8bhsdrc2rds084i7d5gmqia";
-          name = "helm-pass";
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/7d3c7af03e0bca3f834c32827cbcca29e29ef4db/recipes/helm-pass";
+          sha256 = "0a2yqd99j295ingljrvrni4z8qvlk9l827xi3rmkpafhhysch66h";
+          name = "recipe";
         };
         packageRequires = [ auth-source-pass emacs helm password-store ];
         meta = {
@@ -34267,8 +42877,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-perldoc = callPackage ({ deferred, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }:
-    melpaBuild {
+    helm-perldoc = callPackage ({ deferred
+                                , emacs
+                                , fetchFromGitHub
+                                , fetchurl
+                                , helm-core
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "helm-perldoc";
         version = "20160917.2256";
         src = fetchFromGitHub {
@@ -34277,10 +42893,10 @@
           rev = "1979f9f67814c11ec9498502237c89a5e1153100";
           sha256 = "0fvjw8sqnwnjx978y7fghvgp5dznx31hx0pjp4iih01xa1hcwbnc";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/81f0f525680fea98e804f39dbde1dada887e8821/recipes/helm-perldoc";
           sha256 = "1qx0g81qcqanjiz5fxysagjhsxaj31g6nsi2hhdgq4x4nqrlmrhb";
-          name = "helm-perldoc";
+          name = "recipe";
         };
         packageRequires = [ deferred emacs helm-core ];
         meta = {
@@ -34288,8 +42904,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-perspeen = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild, perspeen }:
-    melpaBuild {
+    helm-perspeen = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , helm
+                                 , lib
+                                 , melpaBuild
+                                 , perspeen }:
+      melpaBuild {
         pname = "helm-perspeen";
         version = "20170228.545";
         src = fetchFromGitHub {
@@ -34298,10 +42919,10 @@
           rev = "7fe2922d85608bfa9e18269fc44181428b8849ff";
           sha256 = "1m89c95vzmhsvrg5g7ixz5a5ckw2n983x58cwh8rkmaklavacgsy";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1ee26a57aacbd571da0cfaca2c31eec6ea86a543/recipes/helm-perspeen";
           sha256 = "07cnsfhph807fqyai3by2c5ml9a40gxkq280f27disf8sc45rg1y";
-          name = "helm-perspeen";
+          name = "recipe";
         };
         packageRequires = [ helm perspeen ];
         meta = {
@@ -34309,8 +42930,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-phpunit = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild, phpunit }:
-    melpaBuild {
+    helm-phpunit = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , helm
+                                , lib
+                                , melpaBuild
+                                , phpunit }:
+      melpaBuild {
         pname = "helm-phpunit";
         version = "20160513.153";
         src = fetchFromGitHub {
@@ -34319,10 +42945,10 @@
           rev = "739f26204ad2ba76c25f45e8eab1e5216f7c3518";
           sha256 = "0wirqnzprfxbppdawfx6ah5rdawgyvl8b4zn2r3zm9mnj9jci4dw";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/96470d7190199bfb13dd54e7e8f5ea50cf0a5039/recipes/helm-phpunit";
           sha256 = "0anbrzlpmashcklifyvnnf2rwv5fk4x0kbls2dp2db1bliw3rdh6";
-          name = "helm-phpunit";
+          name = "recipe";
         };
         packageRequires = [ helm phpunit ];
         meta = {
@@ -34330,8 +42956,39 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-proc = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
-    melpaBuild {
+    helm-posframe = callPackage ({ emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , helm
+                                 , lib
+                                 , melpaBuild
+                                 , posframe }:
+      melpaBuild {
+        pname = "helm-posframe";
+        version = "20180610.1048";
+        src = fetchFromGitHub {
+          owner = "tumashu";
+          repo = "helm-posframe";
+          rev = "d28f96ea92ee9393658901bb552723db10f40dc3";
+          sha256 = "1ycf5m06n32axqpm2vkvszff6gxdps1y8gm46682nf8mk2i3xa6f";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/a99c37bc50c371aae8ccc27de8120d4773981cf7/recipes/helm-posframe";
+          sha256 = "16mhi17kl3cgwk7ymzg8crakwrwrzsg5p9ijgrdawa7px2z9ym78";
+          name = "recipe";
+        };
+        packageRequires = [ emacs helm posframe ];
+        meta = {
+          homepage = "https://melpa.org/#/helm-posframe";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-proc = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , helm
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "helm-proc";
         version = "20161005.2005";
         src = fetchFromGitHub {
@@ -34340,10 +42997,10 @@
           rev = "576d31c2d74ba3897d56e2acd2b0993f52c2547c";
           sha256 = "11xahzybwh02ds19y6h5hbpqdj278kcb4239vyykdl3wx8p048a7";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-proc";
           sha256 = "11mh8ny8mhdmp16s21vy9yyql56zxcgmj2aapqs5jy4yad5q62rz";
-          name = "helm-proc";
+          name = "recipe";
         };
         packageRequires = [ helm ];
         meta = {
@@ -34351,8 +43008,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-project-persist = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild, project-persist }:
-    melpaBuild {
+    helm-project-persist = callPackage ({ fetchFromGitHub
+                                        , fetchurl
+                                        , helm
+                                        , lib
+                                        , melpaBuild
+                                        , project-persist }:
+      melpaBuild {
         pname = "helm-project-persist";
         version = "20151210.743";
         src = fetchFromGitHub {
@@ -34361,10 +43023,10 @@
           rev = "357950fbac18090985a750e40d5d8b10ee9dcd53";
           sha256 = "0j54c1kzsjgr05qx25rg3ylawvyw6n6liypiwaas47vpyfswbxhv";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/98780edaf8b1d97aec9e25d07d93289c90fd5069/recipes/helm-project-persist";
           sha256 = "1n87kn1n3453mpdj6amyrgivslskmnzdafpspvkz7b0smf9mv2ld";
-          name = "helm-project-persist";
+          name = "recipe";
         };
         packageRequires = [ helm project-persist ];
         meta = {
@@ -34372,20 +43034,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-projectile = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, projectile }:
-    melpaBuild {
+    helm-projectile = callPackage ({ cl-lib ? null
+                                   , fetchFromGitHub
+                                   , fetchurl
+                                   , helm
+                                   , lib
+                                   , melpaBuild
+                                   , projectile }:
+      melpaBuild {
         pname = "helm-projectile";
-        version = "20180407.1842";
+        version = "20180620.935";
         src = fetchFromGitHub {
           owner = "bbatsov";
           repo = "helm-projectile";
-          rev = "213339b896eebff6d61778b2b1816301ab583081";
-          sha256 = "1wjlm3i0ygcgy37nn1ljaxx9w7nw3pfczrmv5ibm2dyna88kafr5";
+          rev = "8aae5d87fa9937777cfa67b7012f5ca33c81893f";
+          sha256 = "08xhmz8d5lksl7anlmqgpcl8ibqrwid8ask271mdbxix7d1011iq";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8bc4e3a5af7ba86d277c73a1966a91c87d3d855a/recipes/helm-projectile";
           sha256 = "18y7phrvbpdi3cnghwyhh0v1bwm95nwq1lymzf8lrcbmrwcvh36a";
-          name = "helm-projectile";
+          name = "recipe";
         };
         packageRequires = [ cl-lib helm projectile ];
         meta = {
@@ -34393,20 +43061,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-prosjekt = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild, prosjekt }:
-    melpaBuild {
+    helm-prosjekt = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , helm
+                                 , lib
+                                 , melpaBuild
+                                 , prosjekt }:
+      melpaBuild {
         pname = "helm-prosjekt";
         version = "20140128.2317";
         src = fetchFromGitHub {
           owner = "abingham";
           repo = "prosjekt";
-          rev = "a864a8be5842223043702395f311e3350c28e9db";
-          sha256 = "1m8zvrv5aws7b0dffk8y6b5mncdk2c4k90mx69jys10fs0gc5hb3";
+          rev = "f94f970c2d375e0973b66ba99b29c7aa42fd550f";
+          sha256 = "1kfifsqxybvrff6mwifjp0igbad11winsks05l8k661blsh7m5ir";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6d359ec827573dd8c871c4f23df5d1737f1830e7/recipes/helm-prosjekt";
           sha256 = "019rya3bf13cnval8iz680wby3sqlmqg4nbn0a13l1pkhlnv9fvm";
-          name = "helm-prosjekt";
+          name = "recipe";
         };
         packageRequires = [ helm prosjekt ];
         meta = {
@@ -34414,8 +43087,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-pt = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
-    melpaBuild {
+    helm-pt = callPackage ({ fetchFromGitHub
+                           , fetchurl
+                           , helm
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "helm-pt";
         version = "20160214.1542";
         src = fetchFromGitHub {
@@ -34424,10 +43101,10 @@
           rev = "8acc52911dad1ed0c3975f134a468762afe0b76b";
           sha256 = "03ys40rr0pvgp35j5scw9c28j184f1c9m58a3x0c8f0lgyfpssjk";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/550eb9f42c90fd9e80714579c12ee6bfcacb5bb7/recipes/helm-pt";
           sha256 = "1imhy0bsm9aldv0pvf88280qdya01lznxpx5gi5wffhrz17yh4pi";
-          name = "helm-pt";
+          name = "recipe";
         };
         packageRequires = [ helm ];
         meta = {
@@ -34435,8 +43112,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-purpose = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, window-purpose }:
-    melpaBuild {
+    helm-purpose = callPackage ({ emacs
+                                , fetchFromGitHub
+                                , fetchurl
+                                , helm
+                                , lib
+                                , melpaBuild
+                                , window-purpose }:
+      melpaBuild {
         pname = "helm-purpose";
         version = "20170114.836";
         src = fetchFromGitHub {
@@ -34445,10 +43128,10 @@
           rev = "9ff4c21c1e9ebc7afb851b738f815df7343bb287";
           sha256 = "1xh6v5xlf1prgk6mrvkc6qa0r0bz74s5f4z3dl7d00chsi7i2m5v";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-purpose";
           sha256 = "16c9if636v7l8z5df011vdj4a3ci5kf3rdfk4g9hdbbl639yca79";
-          name = "helm-purpose";
+          name = "recipe";
         };
         packageRequires = [ emacs helm window-purpose ];
         meta = {
@@ -34456,8 +43139,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-pydoc = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }:
-    melpaBuild {
+    helm-pydoc = callPackage ({ emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , helm-core
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "helm-pydoc";
         version = "20160917.2242";
         src = fetchFromGitHub {
@@ -34466,10 +43154,10 @@
           rev = "85480a29b56dacde425655bc8f5a597c785afdf5";
           sha256 = "1wrs2d84xzjnsmw255bmnd1wcpwd36m0vyni48aa7661d4dh10x3";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/81f0f525680fea98e804f39dbde1dada887e8821/recipes/helm-pydoc";
           sha256 = "1sh7gqqiwk85kx89l1sihlkb8ff1g9n460nwj1y1bsrpfl6if4j7";
-          name = "helm-pydoc";
+          name = "recipe";
         };
         packageRequires = [ emacs helm-core ];
         meta = {
@@ -34477,8 +43165,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-qiita = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
-    melpaBuild {
+    helm-qiita = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , helm
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "helm-qiita";
         version = "20180301.635";
         src = fetchFromGitHub {
@@ -34487,10 +43179,10 @@
           rev = "3ccb85640bf54491ed3c3c8110d454ae181650dc";
           sha256 = "03km0hm3jy6qcs8szqsmzpdmhfmyh121i5f68cf60am8y616f0kp";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/37331f6cc8a95fd2b2ed5b20be0bcb604ea66dee/recipes/helm-qiita";
           sha256 = "1iz2w1901zz3zk9zazikmnkzng5klnvqn4ph1id7liksrcdpdmpm";
-          name = "helm-qiita";
+          name = "recipe";
         };
         packageRequires = [ helm ];
         meta = {
@@ -34498,8 +43190,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-rage = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }:
-    melpaBuild {
+    helm-rage = callPackage ({ dash
+                             , emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , helm
+                             , lib
+                             , melpaBuild
+                             , s }:
+      melpaBuild {
         pname = "helm-rage";
         version = "20180118.732";
         src = fetchFromGitHub {
@@ -34508,10 +43207,10 @@
           rev = "5d0aefb53d859186181d4bdcfeff7d315339c7b8";
           sha256 = "0msj3rrv9bwhhwz7r1ayr6qvnxjsq7374j0xfhqbrx49pix4qf3q";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/84f831fdc5a0e90c23ac11c79f193f4d3c1ebb04/recipes/helm-rage";
           sha256 = "02pdmkzwnqhf1r0v7b498z5b2il3ng75ykdwgmwd60k6hiygj70x";
-          name = "helm-rage";
+          name = "recipe";
         };
         packageRequires = [ dash emacs helm s ];
         meta = {
@@ -34519,20 +43218,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-rails = callPackage ({ fetchFromGitHub, fetchurl, helm, inflections, lib, melpaBuild }:
-    melpaBuild {
+    helm-rails = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , helm
+                              , inflections
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "helm-rails";
         version = "20130424.819";
         src = fetchFromGitHub {
           owner = "asok";
           repo = "helm-rails";
-          rev = "506d9948d45dfbc575c9c4c0d102c1ad2f511e82";
-          sha256 = "0i5ps5yds21bsrx86piy9bdgca95l1farsrbjpqz88ad8pq6xa9c";
+          rev = "723c2a27f3843570ec1039e3c526953e48b4ed40";
+          sha256 = "1gpy6jc932p4yiyglnwylriw3jk2f4bs7rrxbwc0z9xzjzzn4qnz";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3af52fd266364a81ff42eb6d08389fa549bd6c2c/recipes/helm-rails";
           sha256 = "1iihfsmnkpfp08pldghf3w5k8v5dlmy5ns0l4niwdwp5w8lyjcd6";
-          name = "helm-rails";
+          name = "recipe";
         };
         packageRequires = [ helm inflections ];
         meta = {
@@ -34540,8 +43244,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-rb = callPackage ({ fetchFromGitHub, fetchurl, helm, helm-ag-r, lib, melpaBuild }:
-    melpaBuild {
+    helm-rb = callPackage ({ fetchFromGitHub
+                           , fetchurl
+                           , helm
+                           , helm-ag-r
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "helm-rb";
         version = "20131123.839";
         src = fetchFromGitHub {
@@ -34550,10 +43259,10 @@
           rev = "4949d646420a9849af234dacdd8eb34a77c662fd";
           sha256 = "1b74jsr28ldz80mrqz3d1bmykpcprdbhf3fzhc0awd5i5xdnfaid";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7ba8e94755f5a96881bbf4c4ffbff67bec9b804a/recipes/helm-rb";
           sha256 = "14pkrj1rpi2ihpb7c1hx6xwzvc1x7l41lwr9znp5vn7z93i034fr";
-          name = "helm-rb";
+          name = "recipe";
         };
         packageRequires = [ helm helm-ag-r ];
         meta = {
@@ -34561,8 +43270,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-rdefs = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
-    melpaBuild {
+    helm-rdefs = callPackage ({ emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , helm
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "helm-rdefs";
         version = "20161129.2136";
         src = fetchFromGitHub {
@@ -34571,10 +43285,10 @@
           rev = "cd3a6b3af3015ee58ef30cb7c81c79ebe5fc867b";
           sha256 = "0ji7ak9pkmw0wxzmw5a1amvn3pkj90v9jv1yi12w388njxn7qsvj";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e1c7a20847513dc1153d54a3a700bc120f71dc6b/recipes/helm-rdefs";
           sha256 = "0z3nrqrz63j9nxkbxdsjj3z8zhsqlik28iry3j1plgsxq1mhrn0y";
-          name = "helm-rdefs";
+          name = "recipe";
         };
         packageRequires = [ emacs helm ];
         meta = {
@@ -34582,8 +43296,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-recoll = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
-    melpaBuild {
+    helm-recoll = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , helm
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "helm-recoll";
         version = "20160731.221";
         src = fetchFromGitHub {
@@ -34592,10 +43310,10 @@
           rev = "cc4c4fa9c8f4f99383647baa8512b60523dc8b36";
           sha256 = "1ic2k8ls084yn9h96pk8815wlvxkwwdq75zhm1ls197pkbw7gh7y";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0a0d168f96470753c22b92ad863be98d8c421ccd/recipes/helm-recoll";
           sha256 = "0pr2pllplml55k1xx9inr3dm90ichg2wb62dvgvmbq2sqdf4606b";
-          name = "helm-recoll";
+          name = "recipe";
         };
         packageRequires = [ helm ];
         meta = {
@@ -34603,29 +43321,41 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-rg = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, pcre2el }:
-    melpaBuild {
+    helm-rg = callPackage ({ cl-lib ? null
+                           , dash
+                           , emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , helm
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "helm-rg";
-        version = "20180220.731";
+        version = "20180629.220";
         src = fetchFromGitHub {
           owner = "cosmicexplorer";
           repo = "helm-rg";
-          rev = "cbce7b4f1afefa1e9a505b45c1b58c688a42f3b9";
-          sha256 = "1z8ijiqih902mzfc7kbnfbdhjwfqh5yzg4w3v4mxac0ys5j4z6sg";
+          rev = "008b4b06036d95921f176f222e6055255516116d";
+          sha256 = "1zkcqcvr2svfa7i4d0vghr80nnksgmvdhfigb3r6prv9v84ghwkm";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/958fbafdcb214f1ec89fd0d84c6600c89890e0cf/recipes/helm-rg";
           sha256 = "0gfq59540q9s6mr04q7dz638zqmqbqmbl1qaczddgmjn4vyjmf7v";
-          name = "helm-rg";
+          name = "recipe";
         };
-        packageRequires = [ cl-lib dash emacs helm pcre2el ];
+        packageRequires = [ cl-lib dash emacs helm ];
         meta = {
           homepage = "https://melpa.org/#/helm-rg";
           license = lib.licenses.free;
         };
       }) {};
-    helm-rhythmbox = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
-    melpaBuild {
+    helm-rhythmbox = callPackage ({ cl-lib ? null
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , helm
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "helm-rhythmbox";
         version = "20160524.458";
         src = fetchFromGitHub {
@@ -34634,10 +43364,10 @@
           rev = "c92e1ded34ddd4e62e7e9a558259c232e05193fa";
           sha256 = "1ng73dmligj38xbfdfr8sb69czppks7wfvh5q5xcm2pha828kcwm";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8a81c43958308ad8035a9d0b2422fd094adc72f0/recipes/helm-rhythmbox";
           sha256 = "0pnm7yvas0q3b38ch5idm7v4ih2fjyfai8217j74xhkpcc2w4g4a";
-          name = "helm-rhythmbox";
+          name = "recipe";
         };
         packageRequires = [ cl-lib helm ];
         meta = {
@@ -34645,20 +43375,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-robe = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
-    melpaBuild {
+    helm-robe = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , helm
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "helm-robe";
         version = "20151208.1955";
         src = fetchFromGitHub {
           owner = "syohex";
           repo = "emacs-helm-robe";
-          rev = "6e69543b4ee76c5f8f3f2510c76e6d9aed17a370";
-          sha256 = "1qcx036pgrg4xc1y74amd8jkjylnc0g1c4841cc3fbknnn1ap54g";
+          rev = "7348d0bc0251b51979554ea678b970fd01c0efe9";
+          sha256 = "163ljqar3vvbavzc8sk6rnf8awyc2rhh2g117fglswich3c8lnqg";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e7018f57f6f0e4bd71e172ae23c050b44276581b/recipes/helm-robe";
           sha256 = "1gi4nkm9xvnxv0frmhiiw8dkmnmhfpr9n0b6jpidlvr8xr4s5kyw";
-          name = "helm-robe";
+          name = "recipe";
         };
         packageRequires = [ helm ];
         meta = {
@@ -34666,8 +43400,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-ros = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, xterm-color }:
-    melpaBuild {
+    helm-ros = callPackage ({ cl-lib ? null
+                            , fetchFromGitHub
+                            , fetchurl
+                            , helm
+                            , lib
+                            , melpaBuild
+                            , xterm-color }:
+      melpaBuild {
         pname = "helm-ros";
         version = "20160812.1052";
         src = fetchFromGitHub {
@@ -34676,10 +43416,10 @@
           rev = "92b0b215f6a017f0f57f1af15466cc0b2a5a0135";
           sha256 = "1fgph8wsm2nakn53zj19r59mirzn25r601rljmdv2xpw5h3axywg";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2c9ddf53b4060c33550a445f877aef37dffaeb7e/recipes/helm-ros";
           sha256 = "1q9qqjchkj6anikaamhw998f5aaampc1z7085v9pigg3x11vv9fm";
-          name = "helm-ros";
+          name = "recipe";
         };
         packageRequires = [ cl-lib helm xterm-color ];
         meta = {
@@ -34687,20 +43427,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-rtags = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild, rtags }:
-    melpaBuild {
+    helm-rtags = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , helm
+                              , lib
+                              , melpaBuild
+                              , rtags }:
+      melpaBuild {
         pname = "helm-rtags";
         version = "20170812.2111";
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "4747d5b695bee40c3b0a2e3591ac8897571edd66";
-          sha256 = "1qy71bx8nki73mqslw54hq5bn1asz5qg1b2848nrsj8zb2yd85x5";
+          rev = "ccba23e842a43e8079e22c2fc93d022ac40dedaf";
+          sha256 = "091gh5mmgz357mz0jpmbzzrsy04bjczac02i94jxf49p6yw9v4ga";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/helm-rtags";
           sha256 = "1vv6wnniplyls344qzgcf1ivv25c8qilax6sbhvsf46lvrwnr48n";
-          name = "helm-rtags";
+          name = "recipe";
         };
         packageRequires = [ helm rtags ];
         meta = {
@@ -34708,8 +43453,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-rubygems-local = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
-    melpaBuild {
+    helm-rubygems-local = callPackage ({ fetchFromGitHub
+                                       , fetchurl
+                                       , helm
+                                       , lib
+                                       , melpaBuild }:
+      melpaBuild {
         pname = "helm-rubygems-local";
         version = "20130711.1811";
         src = fetchFromGitHub {
@@ -34718,10 +43467,10 @@
           rev = "289cb33d41c703af9791d6da46b55f070013c2e3";
           sha256 = "0s4hb1fvwr9za5gkz8s5w1kh9qjyygz6g59w7vmrg2d8ds2an03d";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/helm-rubygems-local";
           sha256 = "134qyqnh9l05lfj0vizlx35631q8ih6cdblrvka3p8i571300ikh";
-          name = "helm-rubygems-local";
+          name = "recipe";
         };
         packageRequires = [ helm ];
         meta = {
@@ -34729,8 +43478,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-rubygems-org = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
-    melpaBuild {
+    helm-rubygems-org = callPackage ({ cl-lib ? null
+                                     , emacs
+                                     , fetchFromGitHub
+                                     , fetchurl
+                                     , helm
+                                     , lib
+                                     , melpaBuild }:
+      melpaBuild {
         pname = "helm-rubygems-org";
         version = "20140826.456";
         src = fetchFromGitHub {
@@ -34739,10 +43494,10 @@
           rev = "6aaed984f698cbdf9f9aceb0221404563e28764d";
           sha256 = "1sff8kagyhmwcxf9062il1077d4slvr2kq76abj496610gpb75i0";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/655be547d57d358eff968f42c13dcf4371529a72/recipes/helm-rubygems-org";
           sha256 = "04ni03ak53z3rggdgf68qh7ksgcf3s0f2cv6skwjqw7v8qhph6qs";
-          name = "helm-rubygems-org";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs helm ];
         meta = {
@@ -34750,8 +43505,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-safari = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
-    melpaBuild {
+    helm-safari = callPackage ({ emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , helm
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "helm-safari";
         version = "20160403.2024";
         src = fetchFromGitHub {
@@ -34760,10 +43520,10 @@
           rev = "664c7f4488829228eed7e90cd53002e14bec555b";
           sha256 = "1ws5zxanaiaaxpgkcb2914qa8wxp6ml019hfnfcp7amjnajq9pyz";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-safari";
           sha256 = "0lvwghcl5w67g0lc97r7hfvca7ss0mysy2mxj9axxbpyiq6fmh0y";
-          name = "helm-safari";
+          name = "recipe";
         };
         packageRequires = [ emacs helm ];
         meta = {
@@ -34771,8 +43531,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-sage = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, sage-shell-mode }:
-    melpaBuild {
+    helm-sage = callPackage ({ cl-lib ? null
+                             , fetchFromGitHub
+                             , fetchurl
+                             , helm
+                             , lib
+                             , melpaBuild
+                             , sage-shell-mode }:
+      melpaBuild {
         pname = "helm-sage";
         version = "20160514.45";
         src = fetchFromGitHub {
@@ -34781,10 +43547,10 @@
           rev = "f14e9281d8f2162df7d8f9c2ad9ad1248a24803b";
           sha256 = "0padb6mncgc52wib3dgvdc9r4dp591gf8nblbfnsnxx4zjrcwawb";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/09760a7f7b3cff6551c394fc7b2298567ca88eb0/recipes/helm-sage";
           sha256 = "1vnq15fjaap0ai7dadi64sm4415xssmahk2j7kx45sasy4qaxlbj";
-          name = "helm-sage";
+          name = "recipe";
         };
         packageRequires = [ cl-lib helm sage-shell-mode ];
         meta = {
@@ -34792,20 +43558,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-selected = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, selected }:
-    melpaBuild {
+    helm-selected = callPackage ({ emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , helm
+                                 , lib
+                                 , melpaBuild
+                                 , selected }:
+      melpaBuild {
         pname = "helm-selected";
         version = "20171222.1810";
         src = fetchFromGitHub {
           owner = "takaxp";
           repo = "helm-selected";
-          rev = "6743ede584571319e4c29204197e9ff6b7ee97cf";
-          sha256 = "199a1ycv6pi4kljv7ln0i59l85yr6ngvd3acjakq3416nnjlvhzh";
+          rev = "d2609cdfce14052ab2d9c23761d4fe56966a8ed1";
+          sha256 = "0nbfs5s6lshxib6kp20dzh1qbmq079hwcqwi1n61ank22qa9qw5x";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/acc087661e614d9f30c23fe4a65c020bd3656a29/recipes/helm-selected";
           sha256 = "0ksyh0r59y4abwls6v6v519yxmcjnaryfnxlam48fqqfrsxv1j0h";
-          name = "helm-selected";
+          name = "recipe";
         };
         packageRequires = [ emacs helm selected ];
         meta = {
@@ -34813,8 +43585,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-sheet = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
-    melpaBuild {
+    helm-sheet = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , helm
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "helm-sheet";
         version = "20130630.539";
         src = fetchFromGitHub {
@@ -34823,10 +43599,10 @@
           rev = "d360b68d0ddb09aa1854e7b2f3cb39caeee26463";
           sha256 = "00wnqcgpf4hqdnqj5zrizr4s0pffb93xwya8k5c3rp4plncrcdzx";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/010c5c5e6ad6e7b05e63936079229739963bf970/recipes/helm-sheet";
           sha256 = "0lx70l5gq43hckgdfna8s6wx287sw5ms9l1z3n6vg2x8nr9m61kc";
-          name = "helm-sheet";
+          name = "recipe";
         };
         packageRequires = [ helm ];
         meta = {
@@ -34834,8 +43610,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-smex = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, smex }:
-    melpaBuild {
+    helm-smex = callPackage ({ emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , helm
+                             , lib
+                             , melpaBuild
+                             , smex }:
+      melpaBuild {
         pname = "helm-smex";
         version = "20171004.1308";
         src = fetchFromGitHub {
@@ -34844,10 +43626,10 @@
           rev = "2269375dfa452b88b5170d1a5d5849ebb2c1e413";
           sha256 = "0n2ki7g0hygsq4bi5zkhp3v772ld7niiajfznxmv11dgn949a52s";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/85568bd732da952053148e07b95e53f7caf5f62c/recipes/helm-smex";
           sha256 = "02jvq2hyq4wwc9v8gaxr9vkjldc60khdbjf71p8w2iny5w3k0jbj";
-          name = "helm-smex";
+          name = "recipe";
         };
         packageRequires = [ emacs helm smex ];
         meta = {
@@ -34855,8 +43637,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-spaces = callPackage ({ fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, spaces }:
-    melpaBuild {
+    helm-spaces = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , helm-core
+                               , lib
+                               , melpaBuild
+                               , spaces }:
+      melpaBuild {
         pname = "helm-spaces";
         version = "20161001.709";
         src = fetchFromGitHub {
@@ -34865,10 +43652,10 @@
           rev = "877e2b5178926308d6a7c2a37477bb12c33a96d4";
           sha256 = "1cz8aw6zprzfalagma7jmbycwll2chk2l4n5hkgqyhakdfm2ryzm";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8c2ffb50643223b68a62fab348cd5aba24ce92e6/recipes/helm-spaces";
           sha256 = "0hdvkk173k98iycvii5xpbiblx044125pl7jyz4kb8r1vvwcv791";
-          name = "helm-spaces";
+          name = "recipe";
         };
         packageRequires = [ helm-core spaces ];
         meta = {
@@ -34876,8 +43663,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-spotify = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild, multi }:
-    melpaBuild {
+    helm-spotify = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , helm
+                                , lib
+                                , melpaBuild
+                                , multi }:
+      melpaBuild {
         pname = "helm-spotify";
         version = "20160905.1447";
         src = fetchFromGitHub {
@@ -34886,10 +43678,10 @@
           rev = "f7a62d1ff88e3127de9be7cd3e818b0a92268ab3";
           sha256 = "0q3h84zj63b1rnlvmsznrpmvvf0qbic5yb9xkdjcz4jz4h8p3h1w";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1bf9eda57cba4742656f37a621b6d394483ff638/recipes/helm-spotify";
           sha256 = "1rzvxnaqh8bm78qp0rhpqs971pc855qrq589r3s8z3gpqzmwlnmf";
-          name = "helm-spotify";
+          name = "recipe";
         };
         packageRequires = [ helm multi ];
         meta = {
@@ -34897,20 +43689,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-spotify-plus = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, multi }:
-    melpaBuild {
+    helm-spotify-plus = callPackage ({ emacs
+                                     , fetchFromGitHub
+                                     , fetchurl
+                                     , helm
+                                     , lib
+                                     , melpaBuild
+                                     , multi }:
+      melpaBuild {
         pname = "helm-spotify-plus";
         version = "20180107.338";
         src = fetchFromGitHub {
           owner = "wandersoncferreira";
           repo = "helm-spotify-plus";
-          rev = "895f241f1259891d5c89cd42023f119f9fa121d6";
-          sha256 = "1sjw0bapik01f3lfnsirpayn7b0169lbjhppb2mqzr3xjxm58wbs";
+          rev = "c0903491da0adf215ad44bd31e11604da95062d6";
+          sha256 = "0wqj28i5l43xf8l24g4qn6vra489f0lp7nb5rj7yywy6siikmvx6";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/306aa9fd29f1495eef71476dfcba3b494223b0a9/recipes/helm-spotify-plus";
           sha256 = "1f39g2kgx4jr7ahhhswkrj0m5rbsykvkgh00d7jy8czpp8r4dl20";
-          name = "helm-spotify-plus";
+          name = "recipe";
         };
         packageRequires = [ emacs helm multi ];
         meta = {
@@ -34918,8 +43716,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-sql-connect = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
-    melpaBuild {
+    helm-sql-connect = callPackage ({ fetchFromGitHub
+                                    , fetchurl
+                                    , helm
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "helm-sql-connect";
         version = "20170319.551";
         src = fetchFromGitHub {
@@ -34928,10 +43730,10 @@
           rev = "5aead55b6f8636140945714d8c332b287ab9ef10";
           sha256 = "037gri2r9y135av8gbgi9d8k90qs8jlax0bimzcbwdkyhibhzrcp";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/58347c583dcf4a915c1af1262a5348755f28fe03/recipes/helm-sql-connect";
           sha256 = "1av42580c68iq694yr532hhcq0jn7m58x3cib4ix5c8b4ljvnnvd";
-          name = "helm-sql-connect";
+          name = "recipe";
         };
         packageRequires = [ helm ];
         meta = {
@@ -34939,8 +43741,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-swoop = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
-    melpaBuild {
+    helm-swoop = callPackage ({ emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , helm
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "helm-swoop";
         version = "20180215.354";
         src = fetchFromGitHub {
@@ -34949,10 +43756,10 @@
           rev = "c66336b8245ddc51c4206f19c119f1081920985c";
           sha256 = "0b23j1bkpg4pm310hqdhgnl4mxsj05gpl08b6kb2ja4fzrg6adsk";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-swoop";
           sha256 = "1b3nyh4h5kcvwam539va4gzxa3rl4a0rdcriif21yq340yifjbdx";
-          name = "helm-swoop";
+          name = "recipe";
         };
         packageRequires = [ emacs helm ];
         meta = {
@@ -34960,20 +43767,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-system-packages = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, seq }:
-    melpaBuild {
+    helm-system-packages = callPackage ({ emacs
+                                        , fetchFromGitHub
+                                        , fetchurl
+                                        , helm
+                                        , lib
+                                        , melpaBuild
+                                        , seq }:
+      melpaBuild {
         pname = "helm-system-packages";
-        version = "20180412.2325";
+        version = "20180628.1131";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm-system-packages";
-          rev = "986b7bd360a705053500c4ce2c9bea03dd7b24a6";
-          sha256 = "19iklhpxgh5xx6h4dysf58nd46lmyb46xj601lf7kbwl6yq0y61f";
+          rev = "d510562f4ea21245496199dffb731d00152f8a2b";
+          sha256 = "0qzv395gm1i56f7rahx44b0v816mjk7fx52nwkwspdmixyzckzn2";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0c46cfb0fcda0500e15d04106150a072a1a75ccc/recipes/helm-system-packages";
           sha256 = "01mndx2zzh7r7gmpn6gd1vy1w3l6dnhvgn7n2p39viji1r8b39s4";
-          name = "helm-system-packages";
+          name = "recipe";
         };
         packageRequires = [ emacs helm seq ];
         meta = {
@@ -34981,8 +43794,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-systemd = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, with-editor }:
-    melpaBuild {
+    helm-systemd = callPackage ({ emacs
+                                , fetchFromGitHub
+                                , fetchurl
+                                , helm
+                                , lib
+                                , melpaBuild
+                                , with-editor }:
+      melpaBuild {
         pname = "helm-systemd";
         version = "20180130.2034";
         src = fetchFromGitHub {
@@ -34991,10 +43810,10 @@
           rev = "96f5cd3ee3412539c2f8d145201f47c4f8e53b4f";
           sha256 = "0wyabh76q2lighd7qxpkzp35fkblxlz8g7p4lpgfwvjid0ixmnvq";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-systemd";
           sha256 = "0k2yqmvwswihcn75wzn5923z5y4njarmvdlx3j7w3hwsxh6k1mcw";
-          name = "helm-systemd";
+          name = "recipe";
         };
         packageRequires = [ emacs helm with-editor ];
         meta = {
@@ -35002,8 +43821,39 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-themes = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }:
-    melpaBuild {
+    helm-tail = callPackage ({ emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , helm
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
+        pname = "helm-tail";
+        version = "20180624.203";
+        src = fetchFromGitHub {
+          owner = "akirak";
+          repo = "helm-tail";
+          rev = "ff3895e2fbc6d3cc6503bc295a49bba70654aaef";
+          sha256 = "0ixdr93axjqdqv2m4yvpnf2v4g7c1d1hkqhid2lfg8vaqb9dvqpw";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/74b235c2ecf8c8f8206670bca3b915deb4b77c2b/recipes/helm-tail";
+          sha256 = "0sw97fzpnrk335l3vjaj3nw87cajhzwsjsxx16r0x6npbiv51wd4";
+          name = "recipe";
+        };
+        packageRequires = [ emacs helm ];
+        meta = {
+          homepage = "https://melpa.org/#/helm-tail";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-themes = callPackage ({ emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , helm-core
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "helm-themes";
         version = "20160917.2245";
         src = fetchFromGitHub {
@@ -35012,10 +43862,10 @@
           rev = "1160af42590b0d845a55e65e1e782d9e4027fd6e";
           sha256 = "0856h8rnbgrxp3v3jpfmwq7kcdm1ymd4gcfvh0h27mk05113vz53";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/81f0f525680fea98e804f39dbde1dada887e8821/recipes/helm-themes";
           sha256 = "0r7kyd0i0spwi7xkjrpm2kyphrsl3hqm5pw96nd3ia0jiwp8550j";
-          name = "helm-themes";
+          name = "recipe";
         };
         packageRequires = [ emacs helm-core ];
         meta = {
@@ -35023,20 +43873,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-tramp = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
-    melpaBuild {
+    helm-tramp = callPackage ({ emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , helm
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "helm-tramp";
-        version = "20180311.2157";
+        version = "20180610.717";
         src = fetchFromGitHub {
           owner = "masasam";
           repo = "emacs-helm-tramp";
-          rev = "34cc68bededd3ff6cbec8140f33c530fd3206a64";
-          sha256 = "1lway52ssh6zn6jw8157fp8d4brrkdln03vgll2r53bd69i2ipmn";
+          rev = "07d2f02166038c14052009f6fb9c2a163118e2cc";
+          sha256 = "1yi4wq484nrjb1yphp6dbaqjgfq7hr78gh9v9cys7dqg910ngy4f";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-tramp";
           sha256 = "0wqnabaywkhj1fnc3wpx7czrqbja1hsqwcpixmvv0fyrflmza517";
-          name = "helm-tramp";
+          name = "recipe";
         };
         packageRequires = [ emacs helm ];
         meta = {
@@ -35044,20 +43899,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-unicode = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
-    melpaBuild {
+    helm-unicode = callPackage ({ emacs
+                                , fetchFromGitHub
+                                , fetchurl
+                                , helm
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "helm-unicode";
-        version = "20160715.533";
+        version = "20180608.707";
         src = fetchFromGitHub {
           owner = "bomgar";
           repo = "helm-unicode";
-          rev = "1ad1fcca7a83c163ae74eb72a443cfc102128e33";
-          sha256 = "16s0k6l2k32nxmgqc159kr5vzgn8gydj3bkrkvhhydm3lnh8ki0n";
+          rev = "b7092ed6a7191805651efae40947e4781c453211";
+          sha256 = "15qn5xynah23dfz3mdw5jabv9qfs2hjdjgn3ifmqn3r6sgd8hcjn";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f720b9f9b667bf9ff3080938beab36aa0036dc92/recipes/helm-unicode";
           sha256 = "1j95qy2zwdb46dl30ankfx7013l0akc61m14s473j93w320j5224";
-          name = "helm-unicode";
+          name = "recipe";
         };
         packageRequires = [ emacs helm ];
         meta = {
@@ -35065,8 +43925,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-w32-launcher = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
-    melpaBuild {
+    helm-w32-launcher = callPackage ({ cl-lib ? null
+                                     , emacs
+                                     , fetchFromGitHub
+                                     , fetchurl
+                                     , helm
+                                     , lib
+                                     , melpaBuild }:
+      melpaBuild {
         pname = "helm-w32-launcher";
         version = "20141223.1214";
         src = fetchFromGitHub {
@@ -35075,10 +43941,10 @@
           rev = "3e59ad62b89dd21d334af0203d445a83eb25dc5b";
           sha256 = "0xlz9rxx7y9pkrzvxmv42vgys5iwx75zv9g50k8ihwc08z80dhcq";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fa678329a5081e1affa460c00239dabfd1b9dd82/recipes/helm-w32-launcher";
           sha256 = "0bzn2vhspn6lla815qxwsl9gwfyiwgwmnysr6rjpyacmi17d73ri";
-          name = "helm-w32-launcher";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs helm ];
         meta = {
@@ -35086,8 +43952,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-w3m = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, w3m }:
-    melpaBuild {
+    helm-w3m = callPackage ({ cl-lib ? null
+                            , emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , helm
+                            , lib
+                            , melpaBuild
+                            , w3m }:
+      melpaBuild {
         pname = "helm-w3m";
         version = "20171102.216";
         src = fetchFromGitHub {
@@ -35096,10 +43969,10 @@
           rev = "8345b7e60702911f54eb6571e429c0d31878957d";
           sha256 = "05izdvs8hwkkmz6hvlm2b5p5jmha39nsnnzzhnli70jrbqj013cq";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f683fc9c7990e9ecb8a94808a7d03eb90c5569b1/recipes/helm-w3m";
           sha256 = "1rr83ija93iqz74k236hk3v75jk0iwcccwqpqgys7spvrld0b9pz";
-          name = "helm-w3m";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs helm w3m ];
         meta = {
@@ -35107,8 +43980,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-wordnet = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
-    melpaBuild {
+    helm-wordnet = callPackage ({ cl-lib ? null
+                                , emacs
+                                , fetchFromGitHub
+                                , fetchurl
+                                , helm
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "helm-wordnet";
         version = "20160128.707";
         src = fetchFromGitHub {
@@ -35117,10 +43996,10 @@
           rev = "a36dbc6fcb570b812870bc1e190f203e0a0042fc";
           sha256 = "03a5hzgqak8wg6i2h2p3fr9ij55lqarcsblml8qrnrj27ghcvzzh";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/11626120951afc589beac4cf5a0f49bffa752349/recipes/helm-wordnet";
           sha256 = "0di8gxsa9r8mzja4akhz0wpgrhlidqyn1s1ix5szplwxklwf2r2f";
-          name = "helm-wordnet";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs helm ];
         meta = {
@@ -35128,8 +44007,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-xcdoc = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
-    melpaBuild {
+    helm-xcdoc = callPackage ({ emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , helm
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "helm-xcdoc";
         version = "20160116.218";
         src = fetchFromGitHub {
@@ -35138,10 +44022,10 @@
           rev = "a85612149a6d8e18ab309b3db2d222ce39c42049";
           sha256 = "1yqr5z5sw7schvaq9pmwg79anp806gikm28s6xvrayzyn4idz2n6";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e3352ce89039fb48827b74f22fcf543722a27738/recipes/helm-xcdoc";
           sha256 = "1ikphlnj053i4g1l8r2pqaljvdqglj1yk0xx4vygnw98qyzdsx4v";
-          name = "helm-xcdoc";
+          name = "recipe";
         };
         packageRequires = [ emacs helm ];
         meta = {
@@ -35149,20 +44033,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-xref = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
-    melpaBuild {
+    helm-xref = callPackage ({ emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , helm
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "helm-xref";
-        version = "20171209.346";
+        version = "20180528.816";
         src = fetchFromGitHub {
           owner = "brotzeit";
           repo = "helm-xref";
-          rev = "ad98c3f6e5404e44e7e87210b5827bef75e16a25";
-          sha256 = "1z1343lp9n0kn3y4z08bwnxlfvg5pchznnfqy2xhjjbm9ndlhc16";
+          rev = "6f7e8eeec5cc4db64a76ba242c0f2f61e7ee1e46";
+          sha256 = "13f47b3pv37181bbvpaws2z4jcfbim8b2b7zh988gbm579qi4fq6";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6d1796688ed0d6957557d960ca28e450f9bcb6cf/recipes/helm-xref";
           sha256 = "1wyh25gxqgsc151bv4j5l050z1cz0n3yq174m62ihi1fy1pkra4l";
-          name = "helm-xref";
+          name = "recipe";
         };
         packageRequires = [ emacs helm ];
         meta = {
@@ -35170,20 +44059,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-youtube = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, request }:
-    melpaBuild {
+    helm-youtube = callPackage ({ cl-lib ? null
+                                , fetchFromGitHub
+                                , fetchurl
+                                , helm
+                                , lib
+                                , melpaBuild
+                                , request }:
+      melpaBuild {
         pname = "helm-youtube";
         version = "20161113.1848";
         src = fetchFromGitHub {
           owner = "maximus12793";
           repo = "helm-youtube";
-          rev = "202c27fc3b54927611e9d9c764465e1b42ef7e41";
-          sha256 = "1wqxcz03fq2z31a1n90dg9ap3451vx1376ijbpfy9sg66pgj8yxv";
+          rev = "7a944bc25f0f9e915011e9325caf46b46fcaa1b8";
+          sha256 = "0948rq6i4ibwhmi6m2k23f83yvf56vwgri1sg2060d901zd86cxy";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7537f732091b96b6c1b96c0174895278eba6776a/recipes/helm-youtube";
           sha256 = "1qal5q83p06ghn482rflcfklr17mir582r0mvchxabb5ql60dy0b";
-          name = "helm-youtube";
+          name = "recipe";
         };
         packageRequires = [ cl-lib helm request ];
         meta = {
@@ -35191,8 +44086,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-z = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
-    melpaBuild {
+    helm-z = callPackage ({ fetchFromGitHub
+                          , fetchurl
+                          , helm
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "helm-z";
         version = "20171203.1925";
         src = fetchFromGitHub {
@@ -35201,10 +44100,10 @@
           rev = "37212220bebea8b9c238cb1bbacd8332b7f26c03";
           sha256 = "1vz958yiva01yl1qj2pz84savcx8jgkvbywhcp4c3a8x3fikf0yl";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/48c9b83fff8fc428d9d1ecf0005d47f2adb8cb00/recipes/helm-z";
           sha256 = "1m268zsr4z7a9l5wj0i8qpimv0kyl8glgm0yb3f08959538nlmd1";
-          name = "helm-z";
+          name = "recipe";
         };
         packageRequires = [ helm ];
         meta = {
@@ -35212,8 +44111,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-zhihu-daily = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
-    melpaBuild {
+    helm-zhihu-daily = callPackage ({ cl-lib ? null
+                                    , emacs
+                                    , fetchFromGitHub
+                                    , fetchurl
+                                    , helm
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "helm-zhihu-daily";
         version = "20160625.445";
         src = fetchFromGitHub {
@@ -35222,10 +44127,10 @@
           rev = "be27dcc6be1eb97663b65581a9a5c0fc81cfaba7";
           sha256 = "1s8q97pra27bacvm5knj0sjgj7iqljlhxqiniaw8ij8w4fhcdh93";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/27246ec2bad3c85f8bb76aa26ebcd800edfe0d70/recipes/helm-zhihu-daily";
           sha256 = "0hkgail60s9qhxl0pskqxjvfz93iq1qh1kcmcq0x5kq7d08b911r";
-          name = "helm-zhihu-daily";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs helm ];
         meta = {
@@ -35233,20 +44138,30 @@
           license = lib.licenses.free;
         };
       }) {};
-    helpful = callPackage ({ dash, dash-functional, elisp-refs, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s, shut-up }:
-    melpaBuild {
+    helpful = callPackage ({ dash
+                           , dash-functional
+                           , elisp-refs
+                           , emacs
+                           , f
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild
+                           , s
+                           , shut-up }:
+      melpaBuild {
         pname = "helpful";
-        version = "20180407.351";
+        version = "20180708.1356";
         src = fetchFromGitHub {
           owner = "Wilfred";
           repo = "helpful";
-          rev = "5e9f90776ddfa64e11823c98406362bfabc03a3c";
-          sha256 = "1zwnh03ifkmq5r78m714yxha9d0j7bflb78f5jak58f3ympnms76";
+          rev = "07fd87cffbcc243b77c1598477167ce702250c48";
+          sha256 = "18dmpgr2vlpa3ilj1xqdxmq5jls0i8swmgprfrh94vl11b6k7rvz";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/889d34b654de13bd413d46071a5ff191cbf3d157/recipes/helpful";
           sha256 = "17w9j5v1r2c8ka1fpzbr295cgnsbiw8fxlslh4zbjqzaazamchn2";
-          name = "helpful";
+          name = "recipe";
         };
         packageRequires = [ dash dash-functional elisp-refs emacs f s shut-up ];
         meta = {
@@ -35254,8 +44169,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    hemera-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    hemera-theme = callPackage ({ emacs
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "hemera-theme";
         version = "20170910.603";
         src = fetchFromGitHub {
@@ -35264,10 +44183,10 @@
           rev = "354ae3b788c11ac08e6e2fe7c86adc621e2b16fd";
           sha256 = "00cfi9gsn9fvjpgxkz931p02gs8dcgwwsaqz3anss9qadxxmi9xv";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3440905a20bc91bb2637a87c04ff8410379f150d/recipes/hemera-theme";
           sha256 = "0lxm06gv5f75s86320m8wh3dirdcspb6zd5n1a6l0pnn585xqkrn";
-          name = "hemera-theme";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -35275,20 +44194,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    hemisu-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    hemisu-theme = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "hemisu-theme";
         version = "20130508.1144";
         src = fetchFromGitHub {
           owner = "andrzejsliwa";
           repo = "hemisu-theme";
-          rev = "5c206561aa2c844ecdf3e3b672c3235e559ddd7f";
-          sha256 = "178dvigiw162m01x7dm8pf61w2n3bq51lvk5q7jzpb9s35pz1697";
+          rev = "ae593ac58e6bffef97467259c1d1472840385e84";
+          sha256 = "0vjc6aalwplz9sm9nqca7d07ypijjp366vdzg7gqyfzsvdhr1s0v";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bb4dd85ccbd2c8936e59ca5c5e6234290b8bdf1b/recipes/hemisu-theme";
           sha256 = "0byzrz74yvk12m8dl47kkmkziwrrql193q72qx974zbqdj8h2sph";
-          name = "hemisu-theme";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -35296,8 +44218,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    heroku = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    heroku = callPackage ({ fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "heroku";
         version = "20120629.1113";
         src = fetchFromGitHub {
@@ -35306,10 +44231,10 @@
           rev = "92af1c073b593c4def99c8777c869992aa4d0b3a";
           sha256 = "0c45pib8qpwgyr271g5ddnsn7hzq68mqflv0yyc8803ni06w9vhj";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/heroku";
           sha256 = "1wavsymviybfcmwdfrffbkdwbiydggx55jqg6ql79wf9bx7agacp";
-          name = "heroku";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -35317,20 +44242,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    heroku-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    heroku-theme = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "heroku-theme";
         version = "20150522.1919";
         src = fetchFromGitHub {
           owner = "jonathanchu";
           repo = "heroku-theme";
-          rev = "8083643fe92ec3a1c3eb82f1b8dc2236c9c9691d";
-          sha256 = "15hk0v6ck076mahsz4spq75jcnv587fx4d3w50c7bdh423fl0xvx";
+          rev = "7c1e80f8b5087c37008fec687070344638cd4752";
+          sha256 = "05h4q7gykh18v9pn9zjhgrzjwbn21z58a2mrifmis3bpwa5zypvd";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/348f0e7aec86c3efd87ab06849a5f1ce90ba23e2/recipes/heroku-theme";
           sha256 = "0mchh9y3pqwamry6105qrv1bp1qg1g0jmz7rzc5svz9giynypwf9";
-          name = "heroku-theme";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -35338,8 +44266,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    hexo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    hexo = callPackage ({ emacs
+                        , fetchFromGitHub
+                        , fetchurl
+                        , lib
+                        , melpaBuild }:
+      melpaBuild {
         pname = "hexo";
         version = "20180223.1944";
         src = fetchFromGitHub {
@@ -35348,10 +44280,10 @@
           rev = "ff21ab2d95e13666f36a243989ffea2027842191";
           sha256 = "1g7i4vlpac7npx8c7f7i9w3f30is7q7zsxp0sqwp7x7rsa5783nn";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/21de1b7db0fa4af4fc0014207d41893a0713d738/recipes/hexo";
           sha256 = "0fgrxf6gdw0kzs6x6y8qr511cazaaiyk7licgkgznngj4w6g7jyn";
-          name = "hexo";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -35359,8 +44291,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    hfst-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    hfst-mode = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "hfst-mode";
         version = "20160708.502";
         src = fetchFromGitHub {
@@ -35369,10 +44304,10 @@
           rev = "ac1bb9dd92545d3e7fdc05c83996c227cc15c6b8";
           sha256 = "0zsz8542kh51clzy8j7g29bwm8zcnfxm9sjzh3xjpqk2ziqf4ii6";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e324bb114997f9cc57d76d8a66fec4ff4d1d71fe/recipes/hfst-mode";
           sha256 = "1w342n5k9ak1m5znysvrplpr9dhmi7hxbkr4d1dx51dn0azbpjh7";
-          name = "hfst-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -35380,8 +44315,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    hgignore-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    hgignore-mode = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "hgignore-mode";
         version = "20160430.1707";
         src = fetchFromGitHub {
@@ -35390,10 +44328,10 @@
           rev = "7aa9f3b8a9c610dbd80b952061b40194e1d9c5bd";
           sha256 = "0l22sqi9lmy25idh231p0hgq22b3dxwb9wq60yxk8dck9zlkv7rr";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f3e325c84d0a30789fab7e897b4fe5040c5093ba/recipes/hgignore-mode";
           sha256 = "0ja71l3cghhn1c6w2pff80km8h8xgzf0j9gcldfyc72ar6ifhjkj";
-          name = "hgignore-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -35401,8 +44339,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    hgrc-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    hgrc-mode = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "hgrc-mode";
         version = "20150409.1343";
         src = fetchFromGitHub {
@@ -35411,10 +44352,10 @@
           rev = "314e8320b82cc1ce74b1bd372f296252e7a23090";
           sha256 = "1ky5s7hzqbxgasdz285q3rnvzh3irwsq61rlivjrcxyfdxdjbbvp";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/31a24d95efce2f04f0b555ed16b8d3d5a3aa255a/recipes/hgrc-mode";
           sha256 = "18400dhdackdpndkz6shjmd4klfh6b4vlccnnqlzf3a93alw6vqf";
-          name = "hgrc-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -35422,8 +44363,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    hi2 = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    hi2 = callPackage ({ fetchFromGitHub
+                       , fetchurl
+                       , lib
+                       , melpaBuild }:
+      melpaBuild {
         pname = "hi2";
         version = "20141005.1231";
         src = fetchFromGitHub {
@@ -35432,10 +44376,10 @@
           rev = "c9d199727b5cdcb9e36a972b38131ce4611fd6c8";
           sha256 = "1s08sgbh5v59lqskd0s1dscs6dy7z5mkqqkabs3gd35agbfvbmlf";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ba880f0130707098e5b648f74d14e151b0110e4e/recipes/hi2";
           sha256 = "1wxkjg1jnw05lqzggi20jy2jl20d8brvv76vmrf6lnz62g6jv9h2";
-          name = "hi2";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -35443,8 +44387,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    hide-lines = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    hide-lines = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "hide-lines";
         version = "20151127.1040";
         src = fetchFromGitHub {
@@ -35453,10 +44400,10 @@
           rev = "331122bf19361130351cfe55968c2a7820329eb3";
           sha256 = "183l0sx8zn3jv1fqa3xj7a6fd792sp50jyhm50j3hy7c54m4capf";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ae489be43b1aee93614e40f492ebdf0b98a3fbc1/recipes/hide-lines";
           sha256 = "18h5ygi6idpb5wjlmjjvjmwcw7xiljkfxdvq7pm8wnw75p705x4d";
-          name = "hide-lines";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -35464,8 +44411,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    hide-mode-line = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    hide-mode-line = callPackage ({ emacs
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "hide-mode-line";
         version = "20180302.1110";
         src = fetchFromGitHub {
@@ -35474,10 +44425,10 @@
           rev = "86b9057391edad75467261c2e579603567e608f9";
           sha256 = "0qmjmwhmlm008r22n2mv7lir4v1lpfz1c3yvqlwjgv0glbyvqd88";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2af28365f9fbc6ae71043a67966490c5d18a6095/recipes/hide-mode-line";
           sha256 = "0yl6aicpib5h1ckqi3gyilh2nwvp8gf1017n1w1755j01gw1p9hl";
-          name = "hide-mode-line";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -35485,8 +44436,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    hideshow-org = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    hideshow-org = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "hideshow-org";
         version = "20120223.1450";
         src = fetchFromGitHub {
@@ -35495,10 +44449,10 @@
           rev = "16419e52e6cdd2f46f755144c0ab11ce00d1a626";
           sha256 = "1dr06b9njzih8z97k62l9w3x0a801x4bp043zvk7av9qkz8izl2r";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3de48eee24a5cca9c8b7dba2d6d01dfbc679d8d6/recipes/hideshow-org";
           sha256 = "1bzx5ii06r64nra92zv1dvw5zv3im7la2dd3md801hxyfrpb74gc";
-          name = "hideshow-org";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -35506,8 +44460,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    hierarchy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    hierarchy = callPackage ({ emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "hierarchy";
         version = "20171221.351";
         src = fetchFromGitHub {
@@ -35516,10 +44474,10 @@
           rev = "06f21d3fc16c44c1fa45dc9c91d10100b4db9355";
           sha256 = "1sp59nc82qb40n8p08hr0j4ig7ypc2icvgz74057vs1q042asqqw";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7aea238a2d14e9f58c0474251984b6c617b6854d/recipes/hierarchy";
           sha256 = "0fh1a590pdq21b4mwh9wrfsmm2lw2faw18r35cdzy8fgyf89yimp";
-          name = "hierarchy";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -35527,20 +44485,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    highlight = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    highlight = callPackage ({ fetchgit
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "highlight";
-        version = "20180131.1216";
-        src = fetchFromGitHub {
-          owner = "steckerhalter";
-          repo = "highlight.el";
-          rev = "bb8694b8e642a45f07ce8897de0785c5a776441c";
-          sha256 = "0s4fkxnd4x3j864mgaiv95iwdjmps4xj2mlaljljc8y04k9q5l9k";
+        version = "20180604.2335";
+        src = fetchgit {
+          url = "https://framagit.org/steckerhalter/highlight.el.git";
+          rev = "6f92253690dde26d9bfd21546fdf68ef2fdd486b";
+          sha256 = "01c911p0bqq391hv7lfvz51fyismrvbkk5yyzwipmx0wrr9qjgfv";
         };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/89c619b90665385c8f5408935105c52b4d0290ab/recipes/highlight";
-          sha256 = "0hc515042gpwqj2wqa3lmbgmccb3im5d313nk5lma9sphqi2yx9q";
-          name = "highlight";
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/f0a8eb0eefe88b4ea683a4743c0f8393506e014b/recipes/highlight";
+          sha256 = "11icn6f46synw6xvs2a266g43fvpnz8i7d7dyr0iywzjpbpyhsd2";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -35548,8 +44508,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    highlight-blocks = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    highlight-blocks = callPackage ({ emacs
+                                    , fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "highlight-blocks";
         version = "20151201.815";
         src = fetchFromGitHub {
@@ -35558,10 +44522,10 @@
           rev = "9c4240a5d16008db430d1a81c76dad474d3deb0c";
           sha256 = "0c65jk00j88qxfki2g88hy9g6n92rzskwcn1fbmwcw3qgaz4b6w5";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/eaf524488c408483ea8f2c3a71174b1b5fc3f5da/recipes/highlight-blocks";
           sha256 = "1a32iv5kgf6g6ygbs559w156dh578k45m860czazfx0d6ap3k5m1";
-          name = "highlight-blocks";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -35569,20 +44533,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    highlight-context-line = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    highlight-context-line = callPackage ({ fetchFromGitHub
+                                          , fetchurl
+                                          , lib
+                                          , melpaBuild }:
+      melpaBuild {
         pname = "highlight-context-line";
         version = "20170319.1442";
         src = fetchFromGitHub {
           owner = "ska2342";
           repo = "highlight-context-line";
-          rev = "716e10a0c7b703b5f1d9c6ca1481524a4d06b7b8";
-          sha256 = "1ipj5l6d3d0mck3k8qsr685phk3zc7k4366vzvjyxvhgp5g2385l";
+          rev = "f91e99c178831830801299b9c3a512c4d70871a0";
+          sha256 = "0q8z7i0jijj0yjz9smsqhx2hgrps0vyspadpc1ssb8vn5mn7vngb";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/00df721571ff67fe158251fa843c8f515ded3469/recipes/highlight-context-line";
           sha256 = "0zmqcfsr2j0m2l76c8h6lmdqwrd1b38gi6yp5sdib0m4vj9d0pnd";
-          name = "highlight-context-line";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -35590,8 +44557,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    highlight-defined = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    highlight-defined = callPackage ({ emacs
+                                     , fetchFromGitHub
+                                     , fetchurl
+                                     , lib
+                                     , melpaBuild }:
+      melpaBuild {
         pname = "highlight-defined";
         version = "20141225.730";
         src = fetchFromGitHub {
@@ -35600,10 +44571,10 @@
           rev = "243478cc204ab42d29805ed610961cbb260c1dfd";
           sha256 = "1l10xnjyvcbv1v8xlldaca7z3fk5qav7nsbhfnjxxd0bgh5v9by2";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/acc9b816796b9f142c53f90593952b43c962d2d8/recipes/highlight-defined";
           sha256 = "1vjxm35wf4c2qphpkjh57hf03a5qdssdlmfj0n0gwxsdw1q5rpms";
-          name = "highlight-defined";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -35611,8 +44582,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    highlight-escape-sequences = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    highlight-escape-sequences = callPackage ({ fetchFromGitHub
+                                              , fetchurl
+                                              , lib
+                                              , melpaBuild }:
+      melpaBuild {
         pname = "highlight-escape-sequences";
         version = "20171117.437";
         src = fetchFromGitHub {
@@ -35621,10 +44595,10 @@
           rev = "08d846a7aa748209d65fecead2b6a766c3e5cb41";
           sha256 = "05mc3w1f8ykf80914a1yddw6j8cmh0h57llm07xh89s53821v2is";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cd087f2c5a9524986b0f2c7fd7efd1f296363101/recipes/highlight-escape-sequences";
           sha256 = "0938b29cqapid9v9q4w2jwh8kdb0p70qwzy9xm2nxaairm7436d6";
-          name = "highlight-escape-sequences";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -35632,8 +44606,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    highlight-function-calls = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    highlight-function-calls = callPackage ({ emacs
+                                            , fetchFromGitHub
+                                            , fetchurl
+                                            , lib
+                                            , melpaBuild }:
+      melpaBuild {
         pname = "highlight-function-calls";
         version = "20170907.2200";
         src = fetchFromGitHub {
@@ -35642,10 +44620,10 @@
           rev = "f7a1eaf95fc64cc0db4d0567f9ff79ec4ae04787";
           sha256 = "1gbj1awjp69352a5p49ldimvij5mj8cngjp2sh45qw1cm5dpq653";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2d1eed3f9af218d21ea8db37ee91888e23e59bd5/recipes/highlight-function-calls";
           sha256 = "0wmxijkhx74da3ygnvzsdvbh2iii4f7424wmm01b5skbr7qva690";
-          name = "highlight-function-calls";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -35653,20 +44631,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    highlight-indent-guides = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    highlight-indent-guides = callPackage ({ emacs
+                                           , fetchFromGitHub
+                                           , fetchurl
+                                           , lib
+                                           , melpaBuild }:
+      melpaBuild {
         pname = "highlight-indent-guides";
-        version = "20180404.1216";
+        version = "20180529.1039";
         src = fetchFromGitHub {
           owner = "DarthFennec";
           repo = "highlight-indent-guides";
-          rev = "a968436711520d4728c0b6c64279eb5eae7e0e5d";
-          sha256 = "0cbdhxmd2a2pygnr4fb246dxyqggv2h8f5q2sflbq05jb81k5fal";
+          rev = "88b9bc22efc2006cc7a650c81b95c210a96828ba";
+          sha256 = "0qv9010q1ylgh3l0yxlg7js6pxc8bkdxw20r6vrihglb5qf49m08";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c8acca65a5c134d4405900a43b422c4f4e18b586/recipes/highlight-indent-guides";
           sha256 = "00ghp677qgb5clxhdjarfl8ab3mbp6v7yfsldm9bn0s14lyaq5pm";
-          name = "highlight-indent-guides";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -35674,8 +44656,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    highlight-indentation = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    highlight-indentation = callPackage ({ fetchFromGitHub
+                                         , fetchurl
+                                         , lib
+                                         , melpaBuild }:
+      melpaBuild {
         pname = "highlight-indentation";
         version = "20171218.137";
         src = fetchFromGitHub {
@@ -35684,10 +44669,10 @@
           rev = "35e2c1d4f8f368685893128f77f90454cb9c2708";
           sha256 = "1rmqi8k8p0f3aawh2l119hsfnnd060bv9hhjx13pabid8xhhvs73";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/31c443de5088410c0fe1b1c18f664b33ad259277/recipes/highlight-indentation";
           sha256 = "0iblrrbssjwfn71n8xxjcl98pjv1qw1igf3hlz6mh8740fsca3d6";
-          name = "highlight-indentation";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -35695,8 +44680,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    highlight-leading-spaces = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    highlight-leading-spaces = callPackage ({ emacs
+                                            , fetchFromGitHub
+                                            , fetchurl
+                                            , lib
+                                            , melpaBuild }:
+      melpaBuild {
         pname = "highlight-leading-spaces";
         version = "20151216.422";
         src = fetchFromGitHub {
@@ -35705,10 +44694,10 @@
           rev = "840db19d863dd97993fd9f893f5be501627b6354";
           sha256 = "1vy6j63jp83ljdqkrqglpys74yfh7p61sd0lqiwczgr5nqyc60rl";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/74a4af76be764896cef169e24994630498cf19c1/recipes/highlight-leading-spaces";
           sha256 = "0h2ww2vqmarghf4zg0wbwn0wgndmkcjy696mc885rwavck2dav4p";
-          name = "highlight-leading-spaces";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -35716,8 +44705,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    highlight-numbers = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, parent-mode }:
-    melpaBuild {
+    highlight-numbers = callPackage ({ emacs
+                                     , fetchFromGitHub
+                                     , fetchurl
+                                     , lib
+                                     , melpaBuild
+                                     , parent-mode }:
+      melpaBuild {
         pname = "highlight-numbers";
         version = "20170905.342";
         src = fetchFromGitHub {
@@ -35726,10 +44720,10 @@
           rev = "f952ecb7448c125d4ef82ee6ad136b25e640d74a";
           sha256 = "0fgb63iwdaakzm9cddivmr2j0mmay3512wmd14dh804a62j5l2pv";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/882e3a4877ddd22cc52f56f0ce3d55b6e4831c7a/recipes/highlight-numbers";
           sha256 = "1bywrjv9ybr65mwkrxggb52jdqn16z8acgs5vqm0faq43an8i5yv";
-          name = "highlight-numbers";
+          name = "recipe";
         };
         packageRequires = [ emacs parent-mode ];
         meta = {
@@ -35737,8 +44731,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    highlight-operators = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    highlight-operators = callPackage ({ fetchhg
+                                       , fetchurl
+                                       , lib
+                                       , melpaBuild }:
+      melpaBuild {
         pname = "highlight-operators";
         version = "20170213.1420";
         src = fetchhg {
@@ -35746,10 +44743,10 @@
           rev = "3938e88e78c5";
           sha256 = "1h5whrc1iphzq0g8x9mmkhjkbmbdg9i9bvr1y8zrwrs8za8k127y";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e7bd74b7a3484e437c6db4f18613744ebae030f5/recipes/highlight-operators";
           sha256 = "00agrwp2i3mkacnp4qhqcnpwn5qlbj9qv97zrw7a7ldqga0vwvhn";
-          name = "highlight-operators";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -35757,20 +44754,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    highlight-parentheses = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    highlight-parentheses = callPackage ({ fetchFromGitHub
+                                         , fetchurl
+                                         , lib
+                                         , melpaBuild }:
+      melpaBuild {
         pname = "highlight-parentheses";
-        version = "20170809.1151";
+        version = "20180704.402";
         src = fetchFromGitHub {
           owner = "tsdh";
           repo = "highlight-parentheses.el";
-          rev = "c38885bba4f174c0a2cad3a60fe12b7cf8699aa1";
-          sha256 = "0j3rv7cpvckbsdl7lppgdyxbbznqzds5hvjl1qfwip1plbc8vcb2";
+          rev = "f0bd58c8dadd2db703b7bfd09e911b5fda05b3df";
+          sha256 = "14jzh0vr2sig2ql1iq2x7svvk8ayvy9ahz04y407f53h70ifbmdl";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/highlight-parentheses";
           sha256 = "1d38wxk5bwblddr74crzwjwpgyr8zgcl5h5ilywg35jpv7n66lp5";
-          name = "highlight-parentheses";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -35778,20 +44778,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    highlight-quoted = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    highlight-quoted = callPackage ({ emacs
+                                    , fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "highlight-quoted";
         version = "20140916.1122";
         src = fetchFromGitHub {
           owner = "Fanael";
           repo = "highlight-quoted";
-          rev = "24103478158cd19fbcfb4339a3f1fa1f054f1469";
-          sha256 = "1gq8inxfni9zgz2brqm4nlswgr8b0spq15wr532xfrgr456g10ks";
+          rev = "ec9108486cf7f21f9a0b13f81369849b3b525f1f";
+          sha256 = "0vqkadhzszlxiqb4ysr7p86hhmi4z1j95llxa680xn6md8x2sj8a";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/93b5ba18e4bc31ca60aee9cb4674586cd8523bcf/recipes/highlight-quoted";
           sha256 = "0x6gxi0jfxvpx7r1fm43ikxlxilnbk2xbhdy9xivhgmmdyqiqqkl";
-          name = "highlight-quoted";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -35799,8 +44803,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    highlight-refontification = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    highlight-refontification = callPackage ({ fetchFromGitHub
+                                             , fetchurl
+                                             , lib
+                                             , melpaBuild }:
+      melpaBuild {
         pname = "highlight-refontification";
         version = "20170211.1224";
         src = fetchFromGitHub {
@@ -35809,10 +44816,10 @@
           rev = "32632897d88c4611fadb08517ca00ef5cbc989b6";
           sha256 = "1k6af947h70ivkj31mk3nv2vkxlfpqvpwq8za53n2l7adsjdlf73";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d6c59f2b5cf1594248e8365b6ce3324f493c5647/recipes/highlight-refontification";
           sha256 = "0cm9p4d7yhkz5a88m0y4646a6b9lb2ha7q12fcrdikyckpmbkqss";
-          name = "highlight-refontification";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -35820,20 +44827,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    highlight-stages = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    highlight-stages = callPackage ({ fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "highlight-stages";
         version = "20161212.657";
         src = fetchFromGitHub {
           owner = "zk-phi";
           repo = "highlight-stages";
-          rev = "29cbc5b78261916da042ddb107420083da49b271";
-          sha256 = "0r6nbcrr0dqpgm8dir8ahzjy7rw4nrac48byamzrq96r7ajlxlv0";
+          rev = "87c476f8ca0474912af41680a8de243c0c8d5b46";
+          sha256 = "1s7hxv4vpbrpk4makdjn3589flddgfy35scyd3kac629fbqiiz79";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/46884aa6588f55d6f688477a5e9f528f57673131/recipes/highlight-stages";
           sha256 = "0r4kmjmrpi38q3y0q9h5xkxh7x728ha2nbnc152lzw6zfsxnm4x4";
-          name = "highlight-stages";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -35841,8 +44851,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    highlight-symbol = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    highlight-symbol = callPackage ({ fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "highlight-symbol";
         version = "20160102.1209";
         src = fetchFromGitHub {
@@ -35851,10 +44864,10 @@
           rev = "7a789c779648c55b16e43278e51be5898c121b3a";
           sha256 = "19cgyk0sh8nsmf3jbi92i8qsdx4l4yilfq5jj9zfdbj9p5gvwx96";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/highlight-symbol";
           sha256 = "01zw7xrkpgc89m55d60dx3s3kjajh5c164f64s2fzrgl9xj92h0r";
-          name = "highlight-symbol";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -35862,20 +44875,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    highlight-thing = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    highlight-thing = callPackage ({ fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "highlight-thing";
         version = "20170919.704";
         src = fetchFromGitHub {
           owner = "fgeller";
           repo = "highlight-thing.el";
-          rev = "4eadd178175772fb04ae50e1199d797a6375ad4d";
-          sha256 = "1h2ka1fi0pdh0mx3z8sh4fvwyiyc18d56nl9wd4c96h3n93f7py0";
+          rev = "efa9abbef9b23d24179fad2518ac03e31d2dd9a9";
+          sha256 = "1a39nvlcih26qsjb5s0051j9c9vqv5l66m7wl3ja4pnxx9k4754g";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/84b6cb403ff9a588771d051e472596f4e3cc974d/recipes/highlight-thing";
           sha256 = "0rvdb1lx9xn9drqw0sw9ih759n10g7k0af39w6n8g0wfr67p96w1";
-          name = "highlight-thing";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -35883,20 +44899,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    highlight-unique-symbol = callPackage ({ deferred, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    highlight-unique-symbol = callPackage ({ deferred
+                                           , fetchFromGitHub
+                                           , fetchurl
+                                           , lib
+                                           , melpaBuild }:
+      melpaBuild {
         pname = "highlight-unique-symbol";
         version = "20130611.2242";
         src = fetchFromGitHub {
           owner = "hitode909";
           repo = "emacs-highlight-unique-symbol";
-          rev = "4141bf86a94e30d94d9af9c29d40b16886226e1c";
-          sha256 = "0hhc2l4pz6q8injpplv6b5l08l8q2lnjdpwabp7gwmhraq54rhjx";
+          rev = "d760015b4a5ce31d6da5a30890b599a8e1312be5";
+          sha256 = "1sib511n4plbipl4mgjq6vshf03q4h50kga7lyj1qrwf32yxxf10";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/78b7caccef56cd2f1a9d8001417af52cc06d6573/recipes/highlight-unique-symbol";
           sha256 = "0lwl8pkmq0q4dvyflarggnn8vzpvk5hhcnk508r6xml2if1sg9zx";
-          name = "highlight-unique-symbol";
+          name = "recipe";
         };
         packageRequires = [ deferred ];
         meta = {
@@ -35904,8 +44924,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    highlight2clipboard = callPackage ({ fetchFromGitHub, fetchurl, htmlize, lib, melpaBuild }:
-    melpaBuild {
+    highlight2clipboard = callPackage ({ fetchFromGitHub
+                                       , fetchurl
+                                       , htmlize
+                                       , lib
+                                       , melpaBuild }:
+      melpaBuild {
         pname = "highlight2clipboard";
         version = "20151020.1140";
         src = fetchFromGitHub {
@@ -35914,10 +44938,10 @@
           rev = "6ce58a060d9c5843ccb8c79ec2bba7858c68ac15";
           sha256 = "06nnqry36ncqacfzd8yvc4q59bwk3vgf9a14rkpph2hk2rfvq2m6";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/87afa08061dc406528e7666cd4ee16995839b2d9/recipes/highlight2clipboard";
           sha256 = "19r7abbpm31b0azf2v3xn0rjagg9h01i8g72qapp8dhqb4d9n9r0";
-          name = "highlight2clipboard";
+          name = "recipe";
         };
         packageRequires = [ htmlize ];
         meta = {
@@ -35925,8 +44949,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    himp = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, vimish-fold }:
-    melpaBuild {
+    himp = callPackage ({ emacs
+                        , fetchFromGitHub
+                        , fetchurl
+                        , lib
+                        , melpaBuild
+                        , vimish-fold }:
+      melpaBuild {
         pname = "himp";
         version = "20170814.1215";
         src = fetchFromGitHub {
@@ -35935,10 +44964,10 @@
           rev = "140234b7f7cde03cf858c5011a2ab63e3bc802ec";
           sha256 = "1g3ivash185anw8i67di1mxdfxa9py51prdy5ixl95vpqk5nmwbw";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/51b31fb1fa7052d16d659313d249eef01ca3ee88/recipes/himp";
           sha256 = "1igzlvm4g4rcnlvnwi5kn1jfvyrw2vnmp1kpvfnv7w9n6d8kflla";
-          name = "himp";
+          name = "recipe";
         };
         packageRequires = [ emacs vimish-fold ];
         meta = {
@@ -35946,20 +44975,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    hindent = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    hindent = callPackage ({ cl-lib ? null
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "hindent";
-        version = "20171215.848";
+        version = "20180518.202";
         src = fetchFromGitHub {
           owner = "chrisdone";
           repo = "hindent";
-          rev = "6f6db40cca1b759f78d7e4b971111e40833c3aa0";
-          sha256 = "05xlk8pq19vh61cvpbp6156pd5ynnp8zqnj09j0hp8k6kd3wq62z";
+          rev = "dc47d8b98ebd6ee7fdd7de5f75e65e5b5eedf72f";
+          sha256 = "0xp3mpiyrc6886bi9rih4vbmsar56h8i5sapigd3gn2pv2v688bc";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/dbae71a47446095f768be35e689025aed57f462f/recipes/hindent";
           sha256 = "1f3vzgnqigwbwvglxv0ziz3kyp5dxjraw3vlghkpw39f57mky4xz";
-          name = "hindent";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -35967,8 +45000,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    hippie-exp-ext = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    hippie-exp-ext = callPackage ({ fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "hippie-exp-ext";
         version = "20160502.1626";
         src = fetchFromGitHub {
@@ -35977,10 +45013,10 @@
           rev = "4eda13f90da51ab217d024701f4c30f91ffcb90e";
           sha256 = "141ikpyns1gd6kjply8m9jy9gifx5xdw5bn4p29hrxgiw994a78d";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f8e4328cae9b4759a75da0b26ea8b68821bc71af/recipes/hippie-exp-ext";
           sha256 = "142s7cmgjnqdmac21yps3b071sv18lw068kmxchyxb0zsa067g9l";
-          name = "hippie-exp-ext";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -35988,8 +45024,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    hippie-expand-slime = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    hippie-expand-slime = callPackage ({ fetchFromGitHub
+                                       , fetchurl
+                                       , lib
+                                       , melpaBuild }:
+      melpaBuild {
         pname = "hippie-expand-slime";
         version = "20170722.1846";
         src = fetchFromGitHub {
@@ -35998,10 +45037,10 @@
           rev = "39bbae94896a62854d31754debdfae71d35fec62";
           sha256 = "1l2j5k4jk8jpm1vdf0z5zwa287859afsgd3gda778sdsiy38l6r7";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/hippie-expand-slime";
           sha256 = "0kxyv1lpkg33qgfv1jfqx03640py7525bcnc9dk98w6y6y92zf4m";
-          name = "hippie-expand-slime";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -36009,20 +45048,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    hippie-namespace = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    hippie-namespace = callPackage ({ fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "hippie-namespace";
         version = "20140508.1341";
         src = fetchFromGitHub {
           owner = "rolandwalker";
           repo = "hippie-namespace";
-          rev = "d0d0f15c67ab8bef5e9d1e29a89ecd3613a60b49";
-          sha256 = "0b5wrid428s11afc48d6mdifmd31gmzyrj9zcpd3jwk63ydiihdc";
+          rev = "107d927634032062483e83c6de9b7698b64809d1";
+          sha256 = "0lyw9llblicc9fs1y6n5l5wsh7va5dzm684q0n48aaqy3d1kvdpw";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c9db386ab3910940addae6e925b2ac17e64e0f87/recipes/hippie-namespace";
           sha256 = "1bzjhq116ci9c9f0aw121fn3drmg2pw5ny1w6wcasa4p30syxxf0";
-          name = "hippie-namespace";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -36030,20 +45072,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    historian = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    historian = callPackage ({ emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "historian";
-        version = "20180210.2119";
+        version = "20180619.1223";
         src = fetchFromGitHub {
           owner = "PythonNut";
           repo = "historian.el";
-          rev = "ec3dfa8786473e52ffc5ca9be95dbc59a9a87ff7";
-          sha256 = "1bxigdg3pmgc0s4il1spdw0p8y98k4hwwd89m4i3y97l43asy6p1";
+          rev = "6be869f585b854eb849303c452ab4f91dab04fa9";
+          sha256 = "07iw04aibmiz5fn97dafyk5k67yl525w6i1gwzazil4wb81q4b21";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f16dacf64c52767c0c8aef653ac5d1a7a3bd0883/recipes/historian";
           sha256 = "00cghcyb3liz2prgygjwsw82d9h70zjddnbf7dvglmj7ph9wn9ab";
-          name = "historian";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -36051,8 +45097,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    history = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    history = callPackage ({ emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "history";
         version = "20160821.902";
         src = fetchFromGitHub {
@@ -36061,10 +45111,10 @@
           rev = "5317663fb45bbd5e96d258cb0807dcc266ce67ff";
           sha256 = "1ghbpfmmp5p0wvivd79165dx5kia8qkmac3a6asg2d6l1h9y58n1";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f51d4cc6521546c99197adeb35459fcd53bd67d4/recipes/history";
           sha256 = "0s8pcz53bk1w4h5847204vb6j838vr8za66ni1b2y4pas76zjr5g";
-          name = "history";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -36072,20 +45122,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    historyf = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    historyf = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "historyf";
         version = "20151123.1759";
         src = fetchFromGitHub {
           owner = "k1LoW";
           repo = "emacs-historyf";
-          rev = "196c058ceb092fdd56b0e4ce85b7e714d6f72224";
-          sha256 = "0fgm1m9mq1zn5gnrynf332hamif05qhh8haqci7gii7crzy47c0g";
+          rev = "64ab6c9d2cd6dec6982622bf675326e011373cd2";
+          sha256 = "1mxicha6m61qxz1mv9z76x4g9fpqk4ch9i6jf7nnpxd6x4xz3f7z";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a67279875c19475433fa13625c95ee5855962a59/recipes/historyf";
           sha256 = "15pcaqfjpkfwcy46yqqw10q8kpw7aamcg0gr4frbdgzbv0yld08s";
-          name = "historyf";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -36093,20 +45146,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    hive = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, sql ? null }:
-    melpaBuild {
+    hive = callPackage ({ fetchFromGitHub
+                        , fetchurl
+                        , lib
+                        , melpaBuild
+                        , sql ? null }:
+      melpaBuild {
         pname = "hive";
         version = "20131217.712";
         src = fetchFromGitHub {
           owner = "r0man";
           repo = "hive-el";
-          rev = "11b5172e081ad8079fc78758bef6f306f82ae32b";
-          sha256 = "097lrj9lgfa7szww324hlqywwkbi31n1pxfqyg0zbfj45djkp9bx";
+          rev = "131f2816a0cf4d1fee44198ca305e6e2d1cab750";
+          sha256 = "1hz1j1jv86k80g8safyy7h40j94xhczxmq6kz70cb1czn5df0zlh";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b167265dff60950823a5e98a299462b2b535b9a9/recipes/hive";
           sha256 = "1marz8gmk824hb0nkhaw48d4qw1xjk1aad27gviya7f5ilypxrya";
-          name = "hive";
+          name = "recipe";
         };
         packageRequires = [ sql ];
         meta = {
@@ -36114,8 +45171,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    hiwin = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    hiwin = callPackage ({ fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "hiwin";
         version = "20150825.127";
         src = fetchFromGitHub {
@@ -36124,10 +45184,10 @@
           rev = "6ee8ed051405653bd9b7332d7e9fbb591d954051";
           sha256 = "177blksgncxpxd1zi9kmbcfjnpd3ll1szjxiyc4am8a6hs1dyyqk";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5f050fd2b1038dce05a1302d3670933546f86525/recipes/hiwin";
           sha256 = "0klhxwxsz7xan2vsknw79r1dj4qhhjbfpddr67mk9qzccp8q0w8g";
-          name = "hiwin";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -36135,20 +45195,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    hl-anything = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    hl-anything = callPackage ({ emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "hl-anything";
         version = "20160422.1008";
         src = fetchFromGitHub {
           owner = "hl-anything";
           repo = "hl-anything-emacs";
-          rev = "8696bc55a8cba408f0fc83a907a9ec529d79e558";
-          sha256 = "10ps1rb5fqwaw4lz3nz2rbsry4y81asmi5557g229h8xjhp6gpnm";
+          rev = "c2e50f91a05d6c43e8a1c169f709cd1f23e47b0a";
+          sha256 = "1i93zh2ivm1xd6f13wp9fidn94rjnlx89xcgkz95lpiv90icqm3b";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f38d26ede4e2e1d495a02c68e3b5041702b032e8/recipes/hl-anything";
           sha256 = "0czpc82j5hbzprc66aall72lqnk38dxgpzx4rs8sbx95cag12dxa";
-          name = "hl-anything";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -36156,8 +45220,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    hl-indent = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    hl-indent = callPackage ({ cl-lib ? null
+                             , emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "hl-indent";
         version = "20170429.1404";
         src = fetchFromGitHub {
@@ -36166,10 +45235,10 @@
           rev = "bdb2e0177a7c8b29af26998e688b856adc6ded93";
           sha256 = "0fwb64ja5ij97308pnd7g6l5mascavcp7jcar8igxv9yyqnw6pfi";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3aa6ce8f3d1349e28dd9dea8396c38257e3cea2f/recipes/hl-indent";
           sha256 = "1z42kcwcyinjay65mv042ijh4xfaaiyri368g0sjw0fflsg0ikcr";
-          name = "hl-indent";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -36177,8 +45246,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    hl-sentence = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    hl-sentence = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "hl-sentence";
         version = "20171018.819";
         src = fetchFromGitHub {
@@ -36187,10 +45259,10 @@
           rev = "86ae38d3103bd20da5485cbdd59dfbd396c45ee4";
           sha256 = "1rzc74ckj06qs8kq2bd1cgqvgjd2qc3zxmk7bvgg6dy2m9nj52cm";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/hl-sentence";
           sha256 = "16sjfs0nnpwzj1cqfna9vhmxgznwwhb2qdmjci25hlgrdxwwyahs";
-          name = "hl-sentence";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -36198,20 +45270,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    hl-todo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    hl-todo = callPackage ({ fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "hl-todo";
-        version = "20180327.1716";
+        version = "20180709.2155";
         src = fetchFromGitHub {
           owner = "tarsius";
           repo = "hl-todo";
-          rev = "54d6562ba33182b16a7225c5fe6bb17a68025302";
-          sha256 = "1jkxvik625rqbazbm8r83pcdmd288g26a4vvchsp4717k82sklkj";
+          rev = "3401f322d954e635372995bf5cc77dae171a78ba";
+          sha256 = "1dk4sb2z07cnndzs4dclqgnp3bldl2k3acr21cfdvp87flvpph0y";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7c262f6a1a10e8b3cc30151cad2e34ceb66c6ed7/recipes/hl-todo";
           sha256 = "1iyh68xwldj1r02blar5zi01wnb90dkbmi67vd6h78ksghl3z9j4";
-          name = "hl-todo";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -36219,8 +45294,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    hledger-mode = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, htmlize, lib, melpaBuild, popup }:
-    melpaBuild {
+    hledger-mode = callPackage ({ async
+                                , emacs
+                                , fetchFromGitHub
+                                , fetchurl
+                                , htmlize
+                                , lib
+                                , melpaBuild
+                                , popup }:
+      melpaBuild {
         pname = "hledger-mode";
         version = "20171201.1156";
         src = fetchFromGitHub {
@@ -36229,10 +45311,10 @@
           rev = "594ce27f898ba027cb7f326179ff7875072b03e0";
           sha256 = "1jla31az52qygabd99m8ibq60f4almkbjlg1z63kz7zl98hfxnw7";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/hledger-mode";
           sha256 = "15s8rqc94z70jzv13961nvcm9a9qadq04pf0m6xrzf8qqk71zn52";
-          name = "hledger-mode";
+          name = "recipe";
         };
         packageRequires = [ async emacs htmlize popup ];
         meta = {
@@ -36240,8 +45322,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    hlint-refactor = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    hlint-refactor = callPackage ({ fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "hlint-refactor";
         version = "20170817.2148";
         src = fetchFromGitHub {
@@ -36250,10 +45335,10 @@
           rev = "92c69aa01c65968e86c15db087bb1ea785e4736c";
           sha256 = "0khnn8qk0948hlq513i7nhf7vg09iwznmj3bgw1b5k5r8j6lhs0g";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/384ffc463cc6edb4806f8da68bd251e662718e65/recipes/hlint-refactor";
           sha256 = "1311z6y7ycwx0mj67bya7a39j5hiypg72y6yg93dhgpk23wk7frq";
-          name = "hlint-refactor";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -36261,20 +45346,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    hlinum = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    hlinum = callPackage ({ cl-lib ? null
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "hlinum";
-        version = "20170507.2227";
+        version = "20180421.2112";
         src = fetchFromGitHub {
           owner = "tom-tan";
           repo = "hlinum-mode";
-          rev = "2b4a08db4ff361ac8eeee1ed94eca7e26c614595";
-          sha256 = "0j2ras605i2zsna02lp8k4mkyhln65cggmgkhgr9imcxfzwpjzqk";
+          rev = "f17360fe93de6df99a05b4b64b0a1ca4ee45abb6";
+          sha256 = "01sfba4sd3mjc7bs1y4qdzryfawg1xzg3hbwy9afwfaz0w5czni8";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/41bca7b89a7ce52d4c9381b9a4046b7103996c4f/recipes/hlinum";
           sha256 = "04b6m0njr7yrbcbpkhqz4hmqpfacmyca3lw75dyw3vpjpsj2g0iv";
-          name = "hlinum";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -36282,8 +45371,37 @@
           license = lib.licenses.free;
         };
       }) {};
-    hoa-mode = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    hmac = callPackage ({ cl-lib ? null
+                        , emacs
+                        , fetchFromGitHub
+                        , fetchurl
+                        , lib
+                        , melpaBuild }:
+      melpaBuild {
+        pname = "hmac";
+        version = "20180429.1310";
+        src = fetchFromGitHub {
+          owner = "grimnebulin";
+          repo = "emacs-hmac";
+          rev = "30132cd3fee7d3d91a9f04709d49ca0dcb96d565";
+          sha256 = "0l4msj1i8amcn10dk1shcyh6hn49iphma1q03kp2h84ga79xdpi3";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/7cabf363dbdfc87f29ab3dcf63bfe39b9e0920f7/recipes/hmac";
+          sha256 = "0am8pbjwf43nvhqa2mppdgiyd7kil7jxnaq7hhi5214bsrqgxk31";
+          name = "recipe";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/hmac";
+          license = lib.licenses.free;
+        };
+      }) {};
+    hoa-mode = callPackage ({ fetchgit
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "hoa-mode";
         version = "20151203.850";
         src = fetchgit {
@@ -36291,10 +45409,10 @@
           rev = "3c608e15b655d2375c5f81323ac561c7848dc029";
           sha256 = "19360wx1i7lkr8igddm7zl9yh5hlm3r013rkd512cs18iz1y753x";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f8b91f35d06f9e7e17c9aaf2fb9ee43a77257113/recipes/hoa-mode";
           sha256 = "06rfqn7sqvmgpvwhfmk17qqs4q0frfzhm597z3p1q7kys2035kiv";
-          name = "hoa-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -36302,20 +45420,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    hoa-pp-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, names }:
-    melpaBuild {
+    hoa-pp-mode = callPackage ({ emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild
+                               , names }:
+      melpaBuild {
         pname = "hoa-pp-mode";
         version = "20151027.36";
         src = fetchFromGitHub {
           owner = "hoaproject";
           repo = "Contributions-Emacs-Pp";
-          rev = "925b79930a3f4377b0fb2a36b3c6d5566d4b9a8e";
-          sha256 = "0g2r4d0ivbadqw1k8jsv0jwv8krpfahsg0qmzyi909p2yfddqk1l";
+          rev = "a72104a191214fba502653643a0d166a8f5341d9";
+          sha256 = "1wg6vc9swwspi6s6jpig3my83i2pq8vkq2cy1q3an87rczacmfzp";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0c0d707dad9dc86bb3d6a829a60e21e92a5f3160/recipes/hoa-pp-mode";
           sha256 = "01ijfn0hd645j6j88rids5dsanmzwmky37slf50yqffnv69jwvla";
-          name = "hoa-pp-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs names ];
         meta = {
@@ -36323,8 +45446,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    holiday-pascha-etc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    holiday-pascha-etc = callPackage ({ fetchFromGitHub
+                                      , fetchurl
+                                      , lib
+                                      , melpaBuild }:
+      melpaBuild {
         pname = "holiday-pascha-etc";
         version = "20160821.1758";
         src = fetchFromGitHub {
@@ -36333,10 +45459,10 @@
           rev = "eb198656f63cb8679fb0e3a8248782df071a0f3c";
           sha256 = "1dd0k7r5kx15sph12vzakhq27zh7vy9r541qdp8w5051k6apw3pw";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4108926b1fee78e54c9fa68445c7a2b1b20404ea/recipes/holiday-pascha-etc";
           sha256 = "0v2mhga1db6qy1160i730pzzrzisvhl3fjkazj4cjbkpjlshfc5j";
-          name = "holiday-pascha-etc";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -36344,8 +45470,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    homebrew-mode = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, inf-ruby, lib, melpaBuild }:
-    melpaBuild {
+    homebrew-mode = callPackage ({ dash
+                                 , emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , inf-ruby
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "homebrew-mode";
         version = "20160615.620";
         src = fetchFromGitHub {
@@ -36354,10 +45486,10 @@
           rev = "d422307aee2f897d1a92e3b959c3214bc54cbe38";
           sha256 = "1z4d0niz8q24f2z8rnfnc2rlmkffkf7qc57qn4695jbkzb7galfz";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1e4007f6d15574098722fb427b6a9903f77afb21/recipes/homebrew-mode";
           sha256 = "088wc5fq4r5yj1nbh7mriyqf0xwqmbxvblj9d2wwrkkdm5flc8mj";
-          name = "homebrew-mode";
+          name = "recipe";
         };
         packageRequires = [ dash emacs inf-ruby ];
         meta = {
@@ -36365,20 +45497,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    honcho = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, sudo-edit }:
-    melpaBuild {
+    honcho = callPackage ({ emacs
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild
+                          , sudo-edit }:
+      melpaBuild {
         pname = "honcho";
-        version = "20180319.1441";
+        version = "20180706.1724";
         src = fetchFromGitHub {
           owner = "emacs-pe";
           repo = "honcho.el";
-          rev = "fd3306f5cb870b557fc7d700fcb0a560feb3fbc7";
-          sha256 = "0pdpnn206nfkc8pl36lxc2jfrmii8ai1gvf21ycx0r37g9q64qhq";
+          rev = "f6a89a27e255b3ecb1f0b13058933558b1f0c6fb";
+          sha256 = "06q0rw1vc3h1jd7q544csqn6mkfzcqmdlcr7pcrs7y2jsgb01k4s";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/76487b6776d148325c0200d2f788815f115feac9/recipes/honcho";
           sha256 = "1ywx67dmvackfx19p4fvrb8mm27a7pri3m3bwr2acwd29lrrid2x";
-          name = "honcho";
+          name = "recipe";
         };
         packageRequires = [ emacs sudo-edit ];
         meta = {
@@ -36386,20 +45523,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    hookify = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    hookify = callPackage ({ dash
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild
+                           , s }:
+      melpaBuild {
         pname = "hookify";
         version = "20141216.1409";
         src = fetchFromGitHub {
           owner = "Silex";
           repo = "hookify";
-          rev = "21baae7393b07257de5796402fde0ca72fb00d77";
-          sha256 = "0sg4h0m1ds3f6kpzd3vk30g6x2xl74r5j9bidw658f3mmai7m1l8";
+          rev = "e76127230716f7fab6662410c03c3872d17a172b";
+          sha256 = "1yvz9d5h7npxhsdf6s9fgxpmqk5ixx91iwivbhzcz935gs2886hc";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/aa04ccd0ac05beed5de8d51ed96ccbf0071fdea1/recipes/hookify";
           sha256 = "0prls539ifk2fsqklcxmbrwmgbm9hya50z486d7sw426lh648qmy";
-          name = "hookify";
+          name = "recipe";
         };
         packageRequires = [ dash s ];
         meta = {
@@ -36407,8 +45549,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    horoscope = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    horoscope = callPackage ({ emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "horoscope";
         version = "20180408.2341";
         src = fetchFromGitHub {
@@ -36417,10 +45563,10 @@
           rev = "f4c683e991adce0a8f9023f15050f306f9b9a9ed";
           sha256 = "17k4j4q19l4ahxlzzic1jlbbh7l378j9vgnrcrvpm0lxa9ipclk0";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/180248c19160940a208b32fa7a9660a838f68de5/recipes/horoscope";
           sha256 = "1y2nzhdl7ghi5l3iyzb04xics7gr5981jmb5z5y8y1z04xhqpfs6";
-          name = "horoscope";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -36428,8 +45574,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    hound = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, request }:
-    melpaBuild {
+    hound = callPackage ({ cl-lib ? null
+                         , fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild
+                         , request }:
+      melpaBuild {
         pname = "hound";
         version = "20170627.1259";
         src = fetchFromGitHub {
@@ -36438,10 +45589,10 @@
           rev = "0c5a250ef82870dca737a429b6e9b9db93874ed3";
           sha256 = "0kf2nhp5k3gk82ad1k9qi4aysqhw36x4mcdhg6kjckmcakfjw3g6";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/90cfc34eb4e8be7bf887533b85feba91131a435b/recipes/hound";
           sha256 = "0qri6bddd3c4sqvaqvmqw6xg46vwlfi1by3gc9i3izpq4xl1cr1v";
-          name = "hound";
+          name = "recipe";
         };
         packageRequires = [ cl-lib request ];
         meta = {
@@ -36449,8 +45600,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    how-many-lines-in-project = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    how-many-lines-in-project = callPackage ({ fetchFromGitHub
+                                             , fetchurl
+                                             , lib
+                                             , melpaBuild }:
+      melpaBuild {
         pname = "how-many-lines-in-project";
         version = "20140806.2142";
         src = fetchFromGitHub {
@@ -36459,10 +45613,10 @@
           rev = "8a37ef885d004fe2ce231bfe05ed4867c6192d9b";
           sha256 = "0vygbdjy2dv7n50vrkcnqyswq48sgas0zzjfsac8x5g9vhxjkawj";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/how-many-lines-in-project";
           sha256 = "1dfh1ydpjbrawqpsj6kydvy8sz3rlwn4ma5cizfw5spd2gcmj1zb";
-          name = "how-many-lines-in-project";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -36470,8 +45624,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    howdoi = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    howdoi = callPackage ({ fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "howdoi";
         version = "20150203.1643";
         src = fetchFromGitHub {
@@ -36480,10 +45637,10 @@
           rev = "5fbf7069ee160c597a328e5ce5fb32920e1ca88f";
           sha256 = "01sj9c8mxqaif8wh6zz9v2czjaq7vcdi66drldyjmifkln6rg2v8";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d08f4d6c8bdf16f47d2474f92273fd214179cb18/recipes/howdoi";
           sha256 = "12vgbypawxhhrnjp8dgh0wrcp7pvjccfaxw4yhq7msai7ik3h83b";
-          name = "howdoi";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -36491,8 +45648,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    howm = callPackage ({ cl-lib ? null, fetchgit, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    howm = callPackage ({ cl-lib ? null
+                        , fetchgit
+                        , fetchurl
+                        , lib
+                        , melpaBuild }:
+      melpaBuild {
         pname = "howm";
         version = "20180225.205";
         src = fetchgit {
@@ -36500,10 +45661,10 @@
           rev = "b932fa603f074049637907d35594f73c3fba45d0";
           sha256 = "189j3061g2s1286434x3zyh6xyjycfrd2sqxx655biicy1xxyk52";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0099a1f9b0efb3fc3a1420cfe71a647ec6458998/recipes/howm";
           sha256 = "07wx3wmc51vm42s81km5sdbm600ax2pv83xg0116xsyn05za3bfn";
-          name = "howm";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -36511,8 +45672,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    ht = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ht = callPackage ({ dash
+                      , fetchFromGitHub
+                      , fetchurl
+                      , lib
+                      , melpaBuild }:
+      melpaBuild {
         pname = "ht";
         version = "20180129.1434";
         src = fetchFromGitHub {
@@ -36521,10 +45686,10 @@
           rev = "5a665d00dc8fda77bad2a43277d8809c23e46ab8";
           sha256 = "0w0zi393ixgi154c6dq2i1kf3kraqyfw8alfxcn6fhhxy1g9p02y";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6c7589bca1c1dfcc0fe76779f6847fda946ab981/recipes/ht";
           sha256 = "16vmxksannn2wyn8r44jbkdp19jvz1bg57ggbs1vn0yi7nkanwbd";
-          name = "ht";
+          name = "recipe";
         };
         packageRequires = [ dash ];
         meta = {
@@ -36532,8 +45697,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    html-check-frag = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    html-check-frag = callPackage ({ emacs
+                                   , fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "html-check-frag";
         version = "20160130.2135";
         src = fetchFromGitHub {
@@ -36542,10 +45711,10 @@
           rev = "feb89765eafd69dfcf07afeebded8985dc456e7c";
           sha256 = "10lbxf56gvy26grzrhhx2p710fzs0h866jd2zmmgkisvyb0vaiay";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a53c9877f6f4c4e72c565fb8bd7cbe81ddbc565c/recipes/html-check-frag";
           sha256 = "0drancb9ryifiln44b40l6cal0c7nyp597a6q26288s3v909yk2a";
-          name = "html-check-frag";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -36553,20 +45722,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    html-script-src = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    html-script-src = callPackage ({ fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "html-script-src";
         version = "20120403.1115";
         src = fetchFromGitHub {
           owner = "rejeep";
           repo = "html-script-src.el";
-          rev = "66460f8ab1b24656e6f3ce5bd50cff6a81be8422";
-          sha256 = "0k9ga0qi6h33akip2vrpclfp4zljnbw5ax40lxyxc1813hwkdrmh";
+          rev = "0efeed7ab948e48128e6f1a7ddff17ef2951e1c2";
+          sha256 = "11zffiy5s0zqwi8hxwa87j2k8n2lm54v8knnbwa5zafhqpb53znm";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/html-script-src";
           sha256 = "0pdyc2a9wxxc9rivjm2kgh4ysdxmdp73wg37nfy2nzka1m7qni7j";
-          name = "html-script-src";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -36574,8 +45746,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    html-to-hiccup = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    html-to-hiccup = callPackage ({ dash
+                                  , emacs
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild
+                                  , s }:
+      melpaBuild {
         pname = "html-to-hiccup";
         version = "20161028.701";
         src = fetchFromGitHub {
@@ -36584,10 +45762,10 @@
           rev = "99217a5058626d253ed8ada51a7642071fe54ba5";
           sha256 = "1cvlh1iqjdmgwbw254g0rfdshsj7dhqjjp56gwqhn2fqkga44a7i";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/html-to-hiccup";
           sha256 = "0gyghgdil14i4p0yv5mb6la1ajzf8xcgdm1si5i5w7cn72vfapmz";
-          name = "html-to-hiccup";
+          name = "recipe";
         };
         packageRequires = [ dash emacs s ];
         meta = {
@@ -36595,8 +45773,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    html-to-markdown = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    html-to-markdown = callPackage ({ cl-lib ? null
+                                    , fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "html-to-markdown";
         version = "20151105.40";
         src = fetchFromGitHub {
@@ -36605,10 +45787,10 @@
           rev = "60c5498c801be186478cf7c05be05b4430c4a144";
           sha256 = "09n3zm9ivln8ng80fv5vwwzh9mj355ni685axda3m85xfxgai8gi";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/html-to-markdown";
           sha256 = "1gjh9ndqsb3nfb7w5h7carjckkgy6qh63b4mg141j19dsyx9rrjv";
-          name = "html-to-markdown";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -36616,8 +45798,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    html2org = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    html2org = callPackage ({ emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "html2org";
         version = "20170417.2201";
         src = fetchFromGitHub {
@@ -36626,10 +45812,10 @@
           rev = "6904aed40259ad8afccff079ebd8a07bff319ebc";
           sha256 = "0dryk622fz0yj939pbs0fbb9i4m8qjnmkcxjsssws8f90plk06af";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/771e6604edc90182697bbd4827c8c46c34b48289/recipes/html2org";
           sha256 = "1lj4dwmjkc43dfmsc7z4nvydmmf6wrk5v9ms23zf0llnk9h3hvnk";
-          name = "html2org";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -36637,8 +45823,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    htmlize = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    htmlize = callPackage ({ fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "htmlize";
         version = "20180412.1244";
         src = fetchFromGitHub {
@@ -36647,10 +45836,10 @@
           rev = "315a8f23cfd3e87642ff9e30ae3300c7a84244d5";
           sha256 = "0pjiid5a16xx9n5bvfff612mpli00y9nbzjapn9f1y79yl99yvxy";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/075aa00a0757c6cd1ad392f0300bf5f1b937648d/recipes/htmlize";
           sha256 = "16nvvsi4nxi0zzk5a6mwmp43p0ls20zdx9r18mxz6bsaw6jangh2";
-          name = "htmlize";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -36658,8 +45847,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    http = callPackage ({ edit-indirect, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }:
-    melpaBuild {
+    http = callPackage ({ edit-indirect
+                        , emacs
+                        , fetchFromGitHub
+                        , fetchurl
+                        , lib
+                        , melpaBuild
+                        , request }:
+      melpaBuild {
         pname = "http";
         version = "20170906.1111";
         src = fetchFromGitHub {
@@ -36668,10 +45863,10 @@
           rev = "193a7bf843dd6b6805c7b18dab31f50c8325d710";
           sha256 = "1v6adfy1774axplsjfsdkm0azfwb5g7iq26zcss4mj966q1633xv";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c7c63aaf27240706d84e464881d40cfb7cbe9ee3/recipes/http";
           sha256 = "1176jhm8m7s1pzp0zv1sqawcgn4m5zvxghypmsrjyyb5p7m6dalm";
-          name = "http";
+          name = "recipe";
         };
         packageRequires = [ edit-indirect emacs request ];
         meta = {
@@ -36679,8 +45874,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    http-post-simple = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    http-post-simple = callPackage ({ fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "http-post-simple";
         version = "20170715.240";
         src = fetchFromGitHub {
@@ -36689,10 +45887,10 @@
           rev = "f53697fca278c741051aeb668b00466b5e0fd3fe";
           sha256 = "0krdbvvvzn323vx554yw7947nddl3icfjk4wf5kfx7fim5v3mdn6";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ae489be43b1aee93614e40f492ebdf0b98a3fbc1/recipes/http-post-simple";
           sha256 = "0z3zphaqywbm7vn2g1f7fkrdamgsc26i8zydm9y53v9z9fmzch5s";
-          name = "http-post-simple";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -36700,20 +45898,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    http-twiddle = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    http-twiddle = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "http-twiddle";
         version = "20160801.1211";
         src = fetchFromGitHub {
           owner = "hassy";
           repo = "http-twiddle";
-          rev = "4d0c73b7dcbde8b483d4f3a75c49c74d2fe3ca45";
-          sha256 = "0fxmk5b4ggi92n5gi2nim08a2gx1yg7jlp4hj4m0qazxqdcy38i1";
+          rev = "46da2dbc40209925aa88ab19014ca982bcf9ac70";
+          sha256 = "03fdpl64lgwlz8yc29ia9scbh0s5xh7g7jbyfvvp6hcy2f0yiyx7";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/http-twiddle";
           sha256 = "1d8xnwhb8lp4p4xnnkryx5c6isd8ckalp0smx66lbi1pa4g6iqsh";
-          name = "http-twiddle";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -36721,8 +45922,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    httpcode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    httpcode = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "httpcode";
         version = "20121001.2045";
         src = fetchFromGitHub {
@@ -36731,10 +45935,10 @@
           rev = "a45e735082b09477cd704a99294d336cdbeb12ba";
           sha256 = "02jz8qwxl69zhwvpmlqc15znr8x4f30paqszmm7xrrrz5x1c1rn4";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/906da23e26d44f8c71ba57ab59bb089caea673a9/recipes/httpcode";
           sha256 = "05k1al1j119x6zf03p7jn2r9qql33859583nbf85k41bhicknpgh";
-          name = "httpcode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -36742,8 +45946,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    httprepl = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    httprepl = callPackage ({ dash
+                            , emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild
+                            , s }:
+      melpaBuild {
         pname = "httprepl";
         version = "20141101.1034";
         src = fetchFromGitHub {
@@ -36752,10 +45962,10 @@
           rev = "cfa3693267a8ed1c96a86a126823f37dbfe077d8";
           sha256 = "0wd4wmy99mx677x4sdbp57bxxll1fsnnf8hk97r85xdmmjsmrkld";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c49824f6e2dc2f3482e607c2d3a1e2d7685bf688/recipes/httprepl";
           sha256 = "0899qb1yfnsyf04hhvnk47qnq4d1f4vd5ghj43x4743wd2b9qawh";
-          name = "httprepl";
+          name = "recipe";
         };
         packageRequires = [ dash emacs s ];
         meta = {
@@ -36763,20 +45973,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    hugsql-ghosts = callPackage ({ cider, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    hugsql-ghosts = callPackage ({ cider
+                                 , dash
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild
+                                 , s }:
+      melpaBuild {
         pname = "hugsql-ghosts";
-        version = "20170612.1223";
+        version = "20180425.429";
         src = fetchFromGitHub {
           owner = "rkaercher";
           repo = "hugsql-ghosts";
-          rev = "2f3f98b644b4da35f4fb80b7c3b63f986417b415";
-          sha256 = "0ng01pzxipzb3vkdn8yy5128kmnqnc4rhkszqji8lf8489jxfn8n";
+          rev = "f3ebc60c66204ad39058cb84eb4bd5facce091df";
+          sha256 = "0pcr39x8yxl5aa0sz20gw20ixz5imw5m19bzhzbzyn7slr65hlqn";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/969fd5e51bf93b5eff6919956c43c041a3b24d1e/recipes/hugsql-ghosts";
           sha256 = "1v1iypis5iyimdr9796qpqw0qmhzijap0nbr0mhhyp4001kakkwz";
-          name = "hugsql-ghosts";
+          name = "recipe";
         };
         packageRequires = [ cider dash s ];
         meta = {
@@ -36784,8 +46000,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    hungarian-holidays = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    hungarian-holidays = callPackage ({ fetchFromGitHub
+                                      , fetchurl
+                                      , lib
+                                      , melpaBuild }:
+      melpaBuild {
         pname = "hungarian-holidays";
         version = "20161020.438";
         src = fetchFromGitHub {
@@ -36794,10 +46013,10 @@
           rev = "653108769279499d84a79267c90e640d98823872";
           sha256 = "0jjparw5axydjf2lj8asccmksbbj9zgdiv2kc211h122q5712gvm";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0c2dc20ce4b878a32c540744016a40f6cc2a657a/recipes/hungarian-holidays";
           sha256 = "1bdl0ynlni1i19hq4h48k8j9b2davv2kfgrpd2mrl2xqmjvhm1m2";
-          name = "hungarian-holidays";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -36805,8 +46024,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    hungry-delete = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    hungry-delete = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "hungry-delete";
         version = "20170411.1802";
         src = fetchFromGitHub {
@@ -36815,10 +46037,10 @@
           rev = "0434458d3f6b2b585f332271feaa054bf4ec96d7";
           sha256 = "04g8gdfqpzdhxf5rnl2k49f2klmzxwys79aib7xs30i0n8c8qb7d";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e33960d9b7e24f830ebe4e5a26a562422d52fe97/recipes/hungry-delete";
           sha256 = "0hcsm3yndkyfqzb77ibx7df6bjppc34x5yabi6nd389pdscp9rpz";
-          name = "hungry-delete";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -36826,20 +46048,27 @@
           license = lib.licenses.free;
         };
       }) {};
-    hy-mode = callPackage ({ dash, dash-functional, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    hy-mode = callPackage ({ dash
+                           , dash-functional
+                           , emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild
+                           , s }:
+      melpaBuild {
         pname = "hy-mode";
-        version = "20180411.1231";
+        version = "20180702.1240";
         src = fetchFromGitHub {
           owner = "hylang";
           repo = "hy-mode";
-          rev = "d72192e36aeeae1c7784c95569cc330981465714";
-          sha256 = "1ld1q06i2srnwz1vkwf023vmcranb76xvskhclb8bmwk7gimz95s";
+          rev = "71a12a9208c4b87859bcbb6978e7915dd518e8dd";
+          sha256 = "1px4kws91y581bg2zaav2nx972v73r4r0j135p5cbnynvkrknhnz";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fc9ab5cf16b61bb27559cd8ec5cf665a5aab2154/recipes/hy-mode";
           sha256 = "1vxrqla3p82x7s3kn7x4h33vcdfms21srxgxzidr02k37f0vi82m";
-          name = "hy-mode";
+          name = "recipe";
         };
         packageRequires = [ dash dash-functional emacs s ];
         meta = {
@@ -36847,20 +46076,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    hyai = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    hyai = callPackage ({ cl-lib ? null
+                        , emacs
+                        , fetchFromGitHub
+                        , fetchurl
+                        , lib
+                        , melpaBuild }:
+      melpaBuild {
         pname = "hyai";
         version = "20170301.647";
         src = fetchFromGitHub {
           owner = "iquiw";
           repo = "hyai";
-          rev = "286cece5ca187ebb9d5fba5ac86e452cc638b8d3";
-          sha256 = "1gycq2jp6540kiggv3fhmgqsyqvc36jwbyydx1i6w1brpcwvc6dx";
+          rev = "e9a7e945fed12d8e664e898cf8b434b0376d5d80";
+          sha256 = "1sbn4h74crawdy8yjdjklxh1q6js5y9ip5qxf6dfi85h82qizpa8";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1dd9bd1cfd2f3b760b664a4677b0e4e617cbdfa6/recipes/hyai";
           sha256 = "00ns7q5b11c5amwkq11fs4p5vrmdfmjljfrcxbwb39gc12yrhn7s";
-          name = "hyai";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -36868,20 +46102,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    hydandata-light-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    hydandata-light-theme = callPackage ({ fetchFromGitHub
+                                         , fetchurl
+                                         , lib
+                                         , melpaBuild }:
+      melpaBuild {
         pname = "hydandata-light-theme";
         version = "20160815.2118";
         src = fetchFromGitHub {
           owner = "hydandata";
           repo = "hydandata-light-theme";
-          rev = "0fbc91678ef65e1f65d7ec6792ff0b2f104d16a9";
-          sha256 = "0bkj5cw173l829fkgigghs07mc2i84ngvs2y9g6kamrpg6zhq7g8";
+          rev = "169c0d9ab1272b0f4a1f29eb5f1cd5ffb2365e1e";
+          sha256 = "19q63kg1higqxf26bhwnqwvqxpayjq2j24yi54b1wkvwbv5f28nr";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/413c617f15947782891159a240e0c9014f1f7d11/recipes/hydandata-light-theme";
           sha256 = "0jw43m91m10ifqg335y6d52r6ri77hcmxkird8wsyrpsnk3cfb60";
-          name = "hydandata-light-theme";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -36889,8 +46126,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    hyde = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    hyde = callPackage ({ fetchFromGitHub
+                        , fetchurl
+                        , lib
+                        , melpaBuild }:
+      melpaBuild {
         pname = "hyde";
         version = "20160507.2008";
         src = fetchFromGitHub {
@@ -36899,10 +46139,10 @@
           rev = "a8cd6ed00ecd8d7de0ded2f4867015b412b15b76";
           sha256 = "14sk9gai7sscvwgbl7y3dzz8fdhrqynilscmdimlncpm15w56m6i";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/151f5c1097e5020dbc13e41f2657aae781c5942b/recipes/hyde";
           sha256 = "18kjcxm7qmv9bfh4crw37zgax8khjqs9zkp4lrb490zlad2asbs3";
-          name = "hyde";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -36910,20 +46150,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    hydra = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    hydra = callPackage ({ cl-lib ? null
+                         , fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "hydra";
-        version = "20180226.1116";
+        version = "20180703.802";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "hydra";
-          rev = "62e0f374623df15c1eabebe78f4100850d708227";
-          sha256 = "1ydipk4fkc7dlfjr7isadgap9mfnmi1lj6n7ckrnzia22vyi9i7r";
+          rev = "87cc74b2644daa2e9e660bc8a447c84a0ddeeab6";
+          sha256 = "1pizlg7qbzjy6jrs1ivhxx5kfnlbkkfwf5q3jl4695gh7z0spfkb";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a4375d8ae519290fd5018626b075c226016f951d/recipes/hydra";
           sha256 = "1c59l43p39ins3dn9690gm6llwm4b9p0pk78lip0dwlx736drdbw";
-          name = "hydra";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -36931,8 +46175,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    i2b2-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    i2b2-mode = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "i2b2-mode";
         version = "20140709.1804";
         src = fetchFromGitHub {
@@ -36941,10 +46188,10 @@
           rev = "db10efcfc8bed369a516bbf7526ede41f98cb95a";
           sha256 = "17k41rah17l9kf7bvlm83x71nzz4aizgn7254cl5sb59mdhcm8pm";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/i2b2-mode";
           sha256 = "1jnlisdnp9sz54p444vlq00y3080i4ljcvclri9fy382g1s5ags5";
-          name = "i2b2-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -36952,7 +46199,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    i3wm = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
+    i3wm = callPackage ({ fetchgit
+                        , fetchurl
+                        , lib
+                        , melpaBuild }:
+      melpaBuild {
         pname = "i3wm";
         version = "20170822.738";
         src = fetchgit {
@@ -36960,10 +46211,10 @@
           rev = "71391dc61063fee77ad174f3b2ca25c60b41009e";
           sha256 = "16rwqfg517ask3y6mqxw689w8xx4i51nq8js5wnzbz9a55aj776n";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2e12638554a13ef49ab24da08fe20ed2a53dbd11/recipes/i3wm";
           sha256 = "11246d71g82iv9zrd44013zwkmnf32m1x8zbrbb656dnzx7ps4rl";
-          name = "i3wm";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -36971,20 +46222,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    ialign = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ialign = callPackage ({ emacs
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "ialign";
-        version = "20180322.848";
+        version = "20180705.453";
         src = fetchFromGitHub {
           owner = "mkcms";
           repo = "interactive-align";
-          rev = "0f3b412dc7688d99ea8c8810dd5e57a70d580b59";
-          sha256 = "1hqblgk14qrjd339p9hm640q11mixkhk5jd72sjja74xhbaxciab";
+          rev = "e92664e673647826161a19e9cfc327fa8c69ba6e";
+          sha256 = "0x3naly4qh3q2ngm91y1pkm5s59kqgbgydax46hp6jnasdk4klk5";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/072f1f7ce17e2972863bce10af9c52b3c6502eab/recipes/ialign";
           sha256 = "070a0fa2vbdfvbnpbzv4z0c7311lf8sy2zw2ifn9k548n4l8k62j";
-          name = "ialign";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -36992,8 +46247,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    iasm-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    iasm-mode = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "iasm-mode";
         version = "20171023.722";
         src = fetchFromGitHub {
@@ -37002,10 +46260,10 @@
           rev = "abbec7f308f9ce97beeb57e459fff35f559b4c18";
           sha256 = "0hvpcckhlxab5f7w4s6iw5lhdbjrqn0l8gayg1w42rn6gssr3rap";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5c230ec10eb62d1b3f6df10c05c5dbc2e25d4507/recipes/iasm-mode";
           sha256 = "09xh41ayaha07fi5crk3c6pn17gwm3samsf6h71ldkywvz74kipv";
-          name = "iasm-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -37013,8 +46271,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    ibuffer-git = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ibuffer-git = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "ibuffer-git";
         version = "20110508.31";
         src = fetchFromGitHub {
@@ -37023,10 +46284,10 @@
           rev = "d326319c05ddb8280885b31f9094040c1b365876";
           sha256 = "1s5qvlf310b0z7q9k1xhcf4qmyfqd37jpqd67ciahaxk7cp224rd";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d341da1b9bac782c75ab931fd53a9525a85c702e/recipes/ibuffer-git";
           sha256 = "048888y07bzmi9x5i43fg6bgqbzdqi3nfjfnn6zr29jvlx366r5z";
-          name = "ibuffer-git";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -37034,8 +46295,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    ibuffer-projectile = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }:
-    melpaBuild {
+    ibuffer-projectile = callPackage ({ fetchFromGitHub
+                                      , fetchurl
+                                      , lib
+                                      , melpaBuild
+                                      , projectile }:
+      melpaBuild {
         pname = "ibuffer-projectile";
         version = "20180324.2025";
         src = fetchFromGitHub {
@@ -37044,10 +46309,10 @@
           rev = "1e89bfa7cae0629d29f24af3d81774b88b3cede0";
           sha256 = "0y0pvjic5n5wmkrjzjjnhz2xaknib6w5p01vgv2jf5ylwq84wray";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/363a6a888945f2c8b02f5715539439ba744d737d/recipes/ibuffer-projectile";
           sha256 = "1qh4krggmsc6lx5mg60n8aakmi3f6ppl1gw094vfcsni96jl34fk";
-          name = "ibuffer-projectile";
+          name = "recipe";
         };
         packageRequires = [ projectile ];
         meta = {
@@ -37055,8 +46320,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    ibuffer-rcirc = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ibuffer-rcirc = callPackage ({ cl-lib ? null
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "ibuffer-rcirc";
         version = "20150215.1318";
         src = fetchFromGitHub {
@@ -37065,10 +46334,10 @@
           rev = "8a4409b1c679d65c819dee4085faf929840e79f8";
           sha256 = "15lapyj7qkkw1i1g1aizappm7gxkfnxhvd4fq66lghkzb76clz2m";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d8bcf68d54fce13fcb0fb0ae0b6aa975e8127a1f/recipes/ibuffer-rcirc";
           sha256 = "1y6pyc6g8j42hs103yynjsdkkxvcq0q4xsz4r93rqwsr3za3wcmc";
-          name = "ibuffer-rcirc";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -37076,20 +46345,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    ibuffer-sidebar = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ibuffer-sidebar = callPackage ({ emacs
+                                   , fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "ibuffer-sidebar";
         version = "20180218.1731";
         src = fetchFromGitHub {
           owner = "jojojames";
           repo = "ibuffer-sidebar";
-          rev = "7ddf1b5a158b33e9a7d3fe5dad7ea626a464d2bc";
-          sha256 = "18rl379bfilzvyi4f4kmy74l4vq2q8hhy5i8kflcgvn0ibipwqjz";
+          rev = "b18a8ca0fac9cbfb6e99bcccc2cea488d5876add";
+          sha256 = "1vvzmx4wi0bscig0aqrs9rmxw6mnyyqcxg3mi8mr52j43p1kdmr3";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/19c7c36af8e30b9a9ccc4afda2a7b7e39e8d32ff/recipes/ibuffer-sidebar";
           sha256 = "0rzdybkqaf8r6v19isgw4wv0mwdqxvf55gq1ig4shscjc7ys22wp";
-          name = "ibuffer-sidebar";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -37097,20 +46370,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    ibuffer-tramp = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ibuffer-tramp = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "ibuffer-tramp";
         version = "20151118.939";
         src = fetchFromGitHub {
           owner = "svend";
           repo = "ibuffer-tramp";
-          rev = "bcad0bda3a67f55d1be936bf8fa9ef735fe1e3f3";
-          sha256 = "1ry7nbhqhjy6gkxd10s97nbm6flk5nm0l5q8071fprx8xxphqj8f";
+          rev = "41fab2ad174f53a4cf5ef7d2ebef518dede82ab4";
+          sha256 = "1mfrbr725p27p3s5nxh7xhm81pdr78ysz8l3kwrlp97bb6dmljmq";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a1a7449b15cb2a89cf06ea3de2cfdc6bc387db3b/recipes/ibuffer-tramp";
           sha256 = "11a9b9g1jk2r3fldi012zka4jzy68kfn4991xp046qm2fbc7la32";
-          name = "ibuffer-tramp";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -37118,8 +46394,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    ibuffer-vc = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ibuffer-vc = callPackage ({ cl-lib ? null
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "ibuffer-vc";
         version = "20171106.2341";
         src = fetchFromGitHub {
@@ -37128,10 +46408,10 @@
           rev = "83d60aefd21e2aa20c7217d224f38a40bb75e63b";
           sha256 = "06jk5ccsfivh6bf6ppkli6cni39rvmm9asack1056f9q6jq6l8p1";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/ibuffer-vc";
           sha256 = "0bn5qyiq07cgzci10xl57ss5wsk7bfhi3hjq2v6yvpy9v704dvla";
-          name = "ibuffer-vc";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -37139,8 +46419,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    id-manager = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    id-manager = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "id-manager";
         version = "20170320.546";
         src = fetchFromGitHub {
@@ -37149,10 +46432,10 @@
           rev = "14ebc35db298aac4dedc8aa188bc46bacab81f3b";
           sha256 = "0k9b12gzvjw06y5ycjkigkj8vcmj4rz57d4hyzip27g1v93vvimc";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/64a61b3801a0cafec87b1875eaec5950746f716d/recipes/id-manager";
           sha256 = "13g5fi06hvx0x2wn1d1d8rkfq5n6wbk9g5bhx2b5sar2yw0akmwm";
-          name = "id-manager";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -37160,8 +46443,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    idea-darkula-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    idea-darkula-theme = callPackage ({ emacs
+                                      , fetchFromGitHub
+                                      , fetchurl
+                                      , lib
+                                      , melpaBuild }:
+      melpaBuild {
         pname = "idea-darkula-theme";
         version = "20160416.1603";
         src = fetchFromGitHub {
@@ -37170,10 +46457,10 @@
           rev = "52602d9b91883e1f297d000951aeed48bf60176e";
           sha256 = "1hknhbm3b5rsba2s84iwspylhzjsm91zdckz22j9gyrq37wjgyrr";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/abf27cce70443010f996b5577d71fe78f7eab6fb/recipes/idea-darkula-theme";
           sha256 = "0lanhwlhd7pbzjc047vd5sgsmi2bx66gr3inr8y57swgrfw3l8sk";
-          name = "idea-darkula-theme";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -37181,8 +46468,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    identica-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    identica-mode = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "identica-mode";
         version = "20130204.1453";
         src = fetchFromGitHub {
@@ -37191,10 +46481,10 @@
           rev = "cf9183ee11ac922e85c7c908f04e2d00b03111b3";
           sha256 = "047gzycr49cs8wlmm9j4ry7b7jxmfhmbayx6rbbxs49lba8dgwlk";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/812b7c1fbc435f0530b7f66a1e65f62f5f00da01/recipes/identica-mode";
           sha256 = "1r69ylykjap305g23cry4wajiqhpgw08nw3b5d9i1y3mwx0j253q";
-          name = "identica-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -37202,8 +46492,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    idle-highlight-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    idle-highlight-mode = callPackage ({ fetchFromGitHub
+                                       , fetchurl
+                                       , lib
+                                       , melpaBuild }:
+      melpaBuild {
         pname = "idle-highlight-mode";
         version = "20120920.948";
         src = fetchFromGitHub {
@@ -37212,10 +46505,10 @@
           rev = "c466f2a9e291f9da1167dc879577b2e1a7880482";
           sha256 = "0x4w1ksrw7dicl84zpf4d4scg672dyan9g95jkn6zvri0lr8xciv";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/idle-highlight-mode";
           sha256 = "1i5ky61bq0dpk71yasfpjhsrv29mmp9nly9f5xxin7gz3x0f36fc";
-          name = "idle-highlight-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -37223,8 +46516,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    idle-require = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    idle-require = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "idle-require";
         version = "20090715.1503";
         src = fetchFromGitHub {
@@ -37233,10 +46529,10 @@
           rev = "33592bb098223b4432d7a35a1d65ab83f47c1ec1";
           sha256 = "0f8rxvc3dk2hi4x524l18fx73xrxy0qqwbybdma4ca67ck9n6xam";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/idle-require";
           sha256 = "03z8d06ifzaf81h8b3h16ab69cp3ssky3my07spy81rbhbjl5nn3";
-          name = "idle-require";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -37244,20 +46540,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    ido-at-point = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ido-at-point = callPackage ({ emacs
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "ido-at-point";
         version = "20151021.57";
         src = fetchFromGitHub {
           owner = "katspaugh";
           repo = "ido-at-point";
-          rev = "e5907bbe8a3d148d07698b76bd994dc3076e16ee";
-          sha256 = "1bii7vj8pmmijcpvq3a1scky4ais7k6d7zympb3m9dmz355m9rpp";
+          rev = "6b267f202dc3d3d924c904fbd894e9a209f231de";
+          sha256 = "1bj8k5fq6x3s5qmr02bnkcls7sndmg4wjjjrsd3fr6yl8c4jcy3k";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6ffbfa66c4284a134265efc606fdc7652b0a7f75/recipes/ido-at-point";
           sha256 = "0jpgq2iiwgqifwdhwhqv0cd3lp846pdqar6rxqgw9fvvb8bijqm0";
-          name = "ido-at-point";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -37265,8 +46565,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    ido-clever-match = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ido-clever-match = callPackage ({ cl-lib ? null
+                                    , emacs
+                                    , fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "ido-clever-match";
         version = "20151011.1026";
         src = fetchFromGitHub {
@@ -37275,10 +46580,10 @@
           rev = "f173473e99c8b0756f12e4cc8f67e68fa59eadd3";
           sha256 = "14nmldahr0pj2x4vkzpnpx0bsxafmiihgjylk5j5linqvy8q6wk6";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/add68b4815cdfe83402b217595a4a46068f83a2a/recipes/ido-clever-match";
           sha256 = "081i6cjvqyfpgj0nvzc94zrl2v3l6nv6mhfda4zf7c8qqbvx1m8m";
-          name = "ido-clever-match";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -37286,8 +46591,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    ido-complete-space-or-hyphen = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ido-complete-space-or-hyphen = callPackage ({ fetchFromGitHub
+                                                , fetchurl
+                                                , lib
+                                                , melpaBuild }:
+      melpaBuild {
         pname = "ido-complete-space-or-hyphen";
         version = "20130228.208";
         src = fetchFromGitHub {
@@ -37296,10 +46604,10 @@
           rev = "3fe1fe1e1a743f8deb8f4025977647afecd58f14";
           sha256 = "1aih8n10lcrw0bdgvlrkxzhkpxpmphw07cvbp6zd27ia25037fzw";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/59e11094068d3a0c0e4edc1f82158c43d3b15e0e/recipes/ido-complete-space-or-hyphen";
           sha256 = "1wk0cq5gjnprmpyvhh80ksz3fash42hckvmx8m95crbzjg9j0gbc";
-          name = "ido-complete-space-or-hyphen";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -37307,20 +46615,27 @@
           license = lib.licenses.free;
         };
       }) {};
-    ido-completing-read-plus = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, memoize, s }:
-    melpaBuild {
+    ido-completing-read-plus = callPackage ({ cl-lib ? null
+                                            , emacs
+                                            , fetchFromGitHub
+                                            , fetchurl
+                                            , lib
+                                            , melpaBuild
+                                            , memoize
+                                            , s }:
+      melpaBuild {
         pname = "ido-completing-read-plus";
-        version = "20180222.1504";
+        version = "20180627.1944";
         src = fetchFromGitHub {
           owner = "DarwinAwardWinner";
           repo = "ido-completing-read-plus";
-          rev = "2f4050ebd9591a3c2c73cbae1014c908226c43ec";
-          sha256 = "1jg3k8ivfjfqh5gw0zzwknvpa8hq21n9p2k913wvxyazv0b1gvqx";
+          rev = "03bdf989a9af88d4eeed4003ae74c98baf58ff72";
+          sha256 = "08d77ysbzd25rm8rjslckhqlsyim047c9zwq2ybbzqpjy3q52qfy";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6104efc035bcf469d133ab9a2caf42c9d4482334/recipes/ido-completing-read+";
           sha256 = "0rxdv3cd0bg0p8c1bck5vichdq941dki934k23qf5p6cfgw8gw4z";
-          name = "ido-completing-read-plus";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs memoize s ];
         meta = {
@@ -37328,8 +46643,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    ido-describe-bindings = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ido-describe-bindings = callPackage ({ dash
+                                         , fetchFromGitHub
+                                         , fetchurl
+                                         , lib
+                                         , melpaBuild }:
+      melpaBuild {
         pname = "ido-describe-bindings";
         version = "20161023.402";
         src = fetchFromGitHub {
@@ -37338,10 +46657,10 @@
           rev = "a142ff1c33df23ed9665497d0dcae2943b3c706a";
           sha256 = "0967709jyp9s04i6gi90axgqzhz03cdf1j1w39yrkds6q1b6v7jw";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/31b8e255630f1348a5b5730f7b624ad550d219ad/recipes/ido-describe-bindings";
           sha256 = "1lsa09h025vd908r9q571iq2ia0zdpnq04mlihb3crpp5v9n9ws2";
-          name = "ido-describe-bindings";
+          name = "recipe";
         };
         packageRequires = [ dash ];
         meta = {
@@ -37349,8 +46668,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    ido-exit-target = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ido-exit-target = callPackage ({ emacs
+                                   , fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "ido-exit-target";
         version = "20170717.1151";
         src = fetchFromGitHub {
@@ -37359,10 +46682,10 @@
           rev = "e56fc6928649c87ccf39d56d84ab53ebaced1f73";
           sha256 = "1a1bcvmihf22kr8rpv6kyp4b7x79hla5qdys48d6kl06m53gyckp";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b815e7492eb0bd39c5d1be5a95784f9fe5612b62/recipes/ido-exit-target";
           sha256 = "17vmg47xwk6yjlbcsswirl8s2q565k291ajzjglnz7qg2fwx6spi";
-          name = "ido-exit-target";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -37370,20 +46693,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    ido-flex-with-migemo = callPackage ({ emacs, fetchFromGitHub, fetchurl, flx-ido, lib, melpaBuild, migemo }:
-    melpaBuild {
+    ido-flex-with-migemo = callPackage ({ emacs
+                                        , fetchFromGitHub
+                                        , fetchurl
+                                        , flx-ido
+                                        , lib
+                                        , melpaBuild
+                                        , migemo }:
+      melpaBuild {
         pname = "ido-flex-with-migemo";
         version = "20180323.456";
         src = fetchFromGitHub {
           owner = "ROCKTAKEY";
           repo = "ido-flex-with-migemo";
-          rev = "9684ffc47d838e82d611d0955b390d8387cf5741";
-          sha256 = "06wi05bqwr1va589vzcyakjvh2z3vnn17ccbx0cgb7b3l8md73qs";
+          rev = "02fa776e44cb5756205aa574ebfd5c3f86f4cf3c";
+          sha256 = "0cyszakyj3kb2bdy6wb5y3m3w6y1fniakjlx92g8mvb6ycwkj2p3";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1647d1ae7400ddbc8367c355ade16b5c360b42fc/recipes/ido-flex-with-migemo";
           sha256 = "1w8f1r17l4r7w5bacckv9zfl9qynv2ivsw639rzr5acg2ndxagv7";
-          name = "ido-flex-with-migemo";
+          name = "recipe";
         };
         packageRequires = [ emacs flx-ido migemo ];
         meta = {
@@ -37391,8 +46720,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    ido-gnus = callPackage ({ fetchFromGitHub, fetchurl, gnus ? null, lib, melpaBuild }:
-    melpaBuild {
+    ido-gnus = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , gnus ? null
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "ido-gnus";
         version = "20140216.846";
         src = fetchFromGitHub {
@@ -37401,10 +46734,10 @@
           rev = "f5fe3f6aa8086f675ba216abace9e3d5f2e3a089";
           sha256 = "0ifdwd5vnjv2iyb5bnz8pij35lc0ymmyx8j8zhpkbgjigz8f05ip";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3c5cd46d72a3f99ef1344b5f1156f5bf7a5b9adc/recipes/ido-gnus";
           sha256 = "14ijb8q4s846984h102h72ij713v5bj3k2vfdvr94gw1f0iya2yg";
-          name = "ido-gnus";
+          name = "recipe";
         };
         packageRequires = [ gnus ];
         meta = {
@@ -37412,8 +46745,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    ido-grid-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ido-grid-mode = callPackage ({ emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "ido-grid-mode";
         version = "20160122.339";
         src = fetchFromGitHub {
@@ -37422,10 +46759,10 @@
           rev = "7cfca3988a6dc3ad18e28abe114218095ff2366f";
           sha256 = "1ip8g0r0aimhc4a1f06m711zmbs0krxn8hmayk99gk5kkz12igkb";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ido-grid-mode";
           sha256 = "0sq1d2fwvv247rr9lqg9x87d5h910k5ifqr9cjyskc74mvhrcsr3";
-          name = "ido-grid-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -37433,8 +46770,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    ido-hacks = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ido-hacks = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "ido-hacks";
         version = "20150331.1209";
         src = fetchFromGitHub {
@@ -37443,10 +46783,10 @@
           rev = "b7e7514a0e011e4d767d1f5755c5eae9d85f83dc";
           sha256 = "01p4az128k1jvd9i1gshgg87z6048cw9cnm57l8qdlw01c3h6dkx";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4ac3074d28e76133835366273219e180c6e75b18/recipes/ido-hacks";
           sha256 = "05f9pdkqppnp7wafka2d2yj84gqchjd7vnrl5rcywy1l47gbxiw0";
-          name = "ido-hacks";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -37454,20 +46794,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    ido-load-library = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, pcache, persistent-soft }:
-    melpaBuild {
+    ido-load-library = callPackage ({ fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild
+                                    , pcache
+                                    , persistent-soft }:
+      melpaBuild {
         pname = "ido-load-library";
         version = "20140611.900";
         src = fetchFromGitHub {
           owner = "rolandwalker";
           repo = "ido-load-library";
-          rev = "e03b55957c93aa1a7dd190e173e16ec59dbb2ba7";
-          sha256 = "0l69sr3g1n2x61j6sv6hnbiyk8a2qra6y2kh413qp0sfpx4fzchv";
+          rev = "f439559721c5fecb2572dcaf3e357c5d94a20f4a";
+          sha256 = "1cmq6kpsh5ngiib67a0vsvhlyl0qy29zxcq03bpcbpm76sv7nc0a";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/baa49e7d2d5c07ebf77e7941c240b88fcfd0fc8b/recipes/ido-load-library";
           sha256 = "13f83gqh39p3yjy7r7qc7kzgdcmqh4b5c07zl7rwzb8y9rz59lhj";
-          name = "ido-load-library";
+          name = "recipe";
         };
         packageRequires = [ pcache persistent-soft ];
         meta = {
@@ -37475,20 +46820,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    ido-migemo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, migemo }:
-    melpaBuild {
+    ido-migemo = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild
+                              , migemo }:
+      melpaBuild {
         pname = "ido-migemo";
         version = "20150921.1544";
         src = fetchFromGitHub {
           owner = "myuhe";
           repo = "ido-migemo.el";
-          rev = "e71114a92dd69cb46abf3fb71a09ce27506fcf77";
-          sha256 = "15iajhrgy989pn91ijcd1mq2015bkaacaplm79rmb0ggxhh8vq38";
+          rev = "eec329e315c4782ab966f162a6c91fd3a01ef358";
+          sha256 = "1d7jrfs9vihsi88a0aa139xsad00w5rmzh54s3qp8ismljn8dlql";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8550601b8989f9838dfa7848977b2509b8e16175/recipes/ido-migemo";
           sha256 = "02hbwchwx2bcwdxz7gz555699l7n9wisfikax1j6idn167n4wdpi";
-          name = "ido-migemo";
+          name = "recipe";
         };
         packageRequires = [ migemo ];
         meta = {
@@ -37496,8 +46845,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    ido-occasional = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ido-occasional = callPackage ({ emacs
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "ido-occasional";
         version = "20150214.448";
         src = fetchFromGitHub {
@@ -37506,10 +46859,10 @@
           rev = "d405f1795e1e0c63be411ee2825184738d29c33a";
           sha256 = "0zlkq29wxd3a4vg0w6ds2jad5h1pja7ccd3l6ppl0kz1b1517qlr";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ed49d07aa36dfc742ca3fbfa83a6d624bf2fa525/recipes/ido-occasional";
           sha256 = "1vdh5i9qznzd9r148a6jw9v47swf7ykwyciqfzc3ismv5q909bl2";
-          name = "ido-occasional";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -37517,20 +46870,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    ido-occur = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ido-occur = callPackage ({ dash
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "ido-occur";
         version = "20160820.740";
         src = fetchFromGitHub {
           owner = "danil";
           repo = "ido-occur";
-          rev = "522af5d55b3d4cd6885f3b4100913566c202cec4";
-          sha256 = "0yh8px5ffx4pjmy97v1z9nwxb3qgzc5pdaj9nn6lsdxv9z7w5p3v";
+          rev = "b0e67fe4835c162cbcf8a982bdf377955b9ac5ae";
+          sha256 = "13f21vx3q1qbnl13n3lx1rnr8dhq3zwch22pvy53h8q6sdf7r73a";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8a576d8569bf82be01e7d50defcc99a90aab1436/recipes/ido-occur";
           sha256 = "058l2pklg12wkvyyshk8va6shphpbc508fv9a8x25pw857a28pji";
-          name = "ido-occur";
+          name = "recipe";
         };
         packageRequires = [ dash ];
         meta = {
@@ -37538,20 +46895,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    ido-select-window = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ido-select-window = callPackage ({ emacs
+                                     , fetchFromGitHub
+                                     , fetchurl
+                                     , lib
+                                     , melpaBuild }:
+      melpaBuild {
         pname = "ido-select-window";
         version = "20131220.1247";
         src = fetchFromGitHub {
           owner = "pjones";
           repo = "ido-select-window";
-          rev = "a64707d8d154664d50d12e26417d586e4c3dd78b";
-          sha256 = "1iifpgdpa98si0g2ykr0xbxcbqrvzqfl6r1dv9zihmxhdr7hs9c8";
+          rev = "946db3db7a3fec582cc1a0097877f1250303b53a";
+          sha256 = "0qvf3h2ljlbf3z36dhywzza62mfi6mqbrfc0sqfsbyia9bn1df4f";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/775c8361322c2ba9026130dd60083e0255170b8f/recipes/ido-select-window";
           sha256 = "03xqfpnagy2sk67yq7n7s6ma3im37d558zzx8sdzd9pbfxy9ij23";
-          name = "ido-select-window";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -37559,8 +46920,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    ido-skk = callPackage ({ ddskk, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ido-skk = callPackage ({ ddskk
+                           , emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "ido-skk";
         version = "20151111.150";
         src = fetchFromGitHub {
@@ -37569,10 +46935,10 @@
           rev = "89a2e62799bff2841ff634517c86084c4ce69246";
           sha256 = "149cznbybwj0gkjyvpnh4kn258kxw449m7cn95n9jbh1r45vljvy";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6da9bd69a646a8edfaf9dc7f2e31e5f057f44b6b/recipes/ido-skk";
           sha256 = "1fyzjkw9xp126bzfv1254bvyakh323iw3wdzrkd9gb4ir39k5jzw";
-          name = "ido-skk";
+          name = "recipe";
         };
         packageRequires = [ ddskk emacs ];
         meta = {
@@ -37580,8 +46946,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    ido-sort-mtime = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ido-sort-mtime = callPackage ({ fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "ido-sort-mtime";
         version = "20171121.59";
         src = fetchFromGitHub {
@@ -37590,10 +46959,10 @@
           rev = "f638ff0c922af862f5211779f2311a27fde428eb";
           sha256 = "0isy3rmw69664fsypg58rs42ql43drf27l90yvplnbcqd7nnnb21";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/36d2f7f1bb0d0694a25c1e83340781e08bee814b/recipes/ido-sort-mtime";
           sha256 = "1dkny9y3x49dv1vjwz78x2qhb6kdq3fa8qh1xkm30jyapvgiwdg2";
-          name = "ido-sort-mtime";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -37601,8 +46970,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    ido-springboard = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ido-springboard = callPackage ({ fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "ido-springboard";
         version = "20170105.2355";
         src = fetchFromGitHub {
@@ -37611,10 +46983,10 @@
           rev = "263a8cd4582c81bfc29d7db37d5267e2488b148c";
           sha256 = "14mbmkqnw2kkzcb8f9z1g3c8f8f9lca3zb6f3q8jk9dsyp9vh81z";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/409d847fb464a320e626fae56521a81a8e862a3e/recipes/ido-springboard";
           sha256 = "04jqnag8jiyfbwvc3vd9ikrsmf6cajld7dz2gz9y0zkj1k4gs7zv";
-          name = "ido-springboard";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -37622,20 +46994,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    ido-vertical-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ido-vertical-mode = callPackage ({ fetchFromGitHub
+                                     , fetchurl
+                                     , lib
+                                     , melpaBuild }:
+      melpaBuild {
         pname = "ido-vertical-mode";
-        version = "20160429.1037";
+        version = "20180618.1401";
         src = fetchFromGitHub {
           owner = "creichert";
           repo = "ido-vertical-mode.el";
-          rev = "b42e4227ed5d37b5d840a9d9d1cdaabf50e189b1";
-          sha256 = "1h0kwsrg0xaqmk37hij2ssi9vcvxq49bdc4s3amwc45x1i369q7q";
+          rev = "16c4c1a112796ee0bcf401ea39d3e2643a89feaf";
+          sha256 = "10cfm765qwba0bnablwy8c4mjxvb1lwm89d16svwhp1pn20an6a8";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d4bbd212ea4606b9871cf583d06b5cee2f6ce0a9/recipes/ido-vertical-mode";
           sha256 = "1vg5s6nd6v2g8ychz1q9cdqvsdw6vag7d9w68sn7blpmlr0nqhfm";
-          name = "ido-vertical-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -37643,20 +47018,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    ido-yes-or-no = callPackage ({ fetchFromGitHub, fetchurl, ido-completing-read-plus, lib, melpaBuild }:
-    melpaBuild {
+    ido-yes-or-no = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , ido-completing-read-plus
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "ido-yes-or-no";
         version = "20161108.1551";
         src = fetchFromGitHub {
           owner = "DarwinAwardWinner";
           repo = "ido-yes-or-no";
-          rev = "c55383b1fce5879e87e7ca6809fc60534508e182";
-          sha256 = "1p50ycsn1mcq5nqa16w10hm8v2pixibvandc91mj5l7s8zspanik";
+          rev = "8953eadaaa7811ebc66d8a9eb7ac43f38913ab59";
+          sha256 = "0pi5kak267v571j5y0khz1s0nlxyp9jrsbh09dk3j6a44d2iyypl";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e575f46b8597a34523df6b6a75da5a640f4c5a2e/recipes/ido-yes-or-no";
           sha256 = "0glag4yb9xyf1lxxbdhph2nq6s1vg44i6f2z1ii8bkxpambz2ana";
-          name = "ido-yes-or-no";
+          name = "recipe";
         };
         packageRequires = [ ido-completing-read-plus ];
         meta = {
@@ -37664,8 +47043,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    idomenu = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    idomenu = callPackage ({ fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "idomenu";
         version = "20141123.1320";
         src = fetchFromGitHub {
@@ -37674,10 +47056,10 @@
           rev = "4b0152d606360c70204fb4c27f68de79ca885386";
           sha256 = "1vx2g1xgxpcabr49mkl6ggzrpa3k2zhm479j6262vb64swzx33jw";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f856045bc5ab2aee4dd4ad9806917e27e56ec64c/recipes/idomenu";
           sha256 = "0mg601ak9mhp2fg5n13npcfzphgyms4vkqd18ldmv098z2z1412h";
-          name = "idomenu";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -37685,20 +47067,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    idris-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, prop-menu }:
-    melpaBuild {
+    idris-mode = callPackage ({ cl-lib ? null
+                              , emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild
+                              , prop-menu }:
+      melpaBuild {
         pname = "idris-mode";
-        version = "20180210.400";
+        version = "20180416.2245";
         src = fetchFromGitHub {
           owner = "idris-hackers";
           repo = "idris-mode";
-          rev = "cc35d124332aba84dc3e4da94433127a12459351";
-          sha256 = "056yfgfqxzcfmlk2kj34r1dpjxi0xllcllkhrc9v8d9cib7hjqqf";
+          rev = "2cd2ace9327248e141c35127b8ef9114a1301a1d";
+          sha256 = "1bszb2bccjvamxbyyhbmw7hqhs71yyx4x0bxzszs9036f6p1znph";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/17a86efca3bdebef7c92ba6ece2de214d283c627/recipes/idris-mode";
           sha256 = "0hiiizz976hz3z3ciwg1gs9y10qhxbs8givhz89kvyn4s4861a1s";
-          name = "idris-mode";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs prop-menu ];
         meta = {
@@ -37706,8 +47094,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    ids-edit = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ids-edit = callPackage ({ emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "ids-edit";
         version = "20170818.802";
         src = fetchFromGitHub {
@@ -37716,10 +47108,10 @@
           rev = "8562a6cbfb3f2d44bc6f62ab15081a80f8fee502";
           sha256 = "10h64c5n9piq9ly7ipqq33ji8x8vwh9j1h7r05yab8a2sn0h8587";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ca17de8cdd53bb32a9d3faaeb38f19f92b18ee38/recipes/ids-edit";
           sha256 = "1n4gpcl3qj65cmaq9cdljsmrf84570z4chfvga6slsqjz5him8d1";
-          name = "ids-edit";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -37727,8 +47119,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    iedit = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    iedit = callPackage ({ fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "iedit";
         version = "20180207.219";
         src = fetchFromGitHub {
@@ -37737,10 +47132,10 @@
           rev = "412490db4387ad9d040bfb5854f25de4c40c2146";
           sha256 = "1995j0yvvls5i7zfxw8zwfk05in8b0n82k05qdrap29v6nq2v4bx";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/iedit";
           sha256 = "0bh8ir6kspxjsvjww5y3b5hl3flbm2cc77jh8vnnva3z086f18mh";
-          name = "iedit";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -37748,8 +47143,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    ietf-docs = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ietf-docs = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "ietf-docs";
         version = "20150928.257";
         src = fetchFromGitHub {
@@ -37758,10 +47156,10 @@
           rev = "ede30d6d26044069e1731fd20c0ab2324552c0b4";
           sha256 = "0b86x675g95yrlc0alffx0z9fmficlwv3gpy5cy86z1xvvyh3nzw";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cedfdfe2c282d0484ea8239726f46a4861ef07ea/recipes/ietf-docs";
           sha256 = "0wnk36z9g7lksmynd04hb2m6rx45wpxnxj1lhrlpjnzsrknhf4k3";
-          name = "ietf-docs";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -37769,8 +47167,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    iflipb = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    iflipb = callPackage ({ fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "iflipb";
         version = "20171113.1244";
         src = fetchFromGitHub {
@@ -37779,10 +47180,10 @@
           rev = "a5ad1fbd1173cff5228dab265515c92c0778f86a";
           sha256 = "0gyxd5d57j0x93mqnfwwdf28plp102xh0ag2d2iws7y1d5m99wm2";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fad6fc8bc3c0be0d5789a0d7626ebc3f298b4318/recipes/iflipb";
           sha256 = "1nfrrxgi9nlhn477z8ay7jxycpcghhhmmg9dagdhrlrr20fx697d";
-          name = "iflipb";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -37790,8 +47191,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    ignoramus = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ignoramus = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "ignoramus";
         version = "20160414.709";
         src = fetchFromGitHub {
@@ -37800,10 +47204,10 @@
           rev = "b37dc7c07edd9d152436f9019c14df158b599be3";
           sha256 = "1b4r4h8yrs8zkyr1hnnx2wjrmm39wbqxfhyxpjb5pxi4zk3fh4rj";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ac5439afe2f9a902e615f0cf919ef7138559c0f0/recipes/ignoramus";
           sha256 = "1czqdmlrds1l5afi8ldg7nrxcwav86538z2w1npad3dz8xk67da9";
-          name = "ignoramus";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -37811,7 +47215,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    igv = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
+    igv = callPackage ({ fetchgit
+                       , fetchurl
+                       , lib
+                       , melpaBuild }:
+      melpaBuild {
         pname = "igv";
         version = "20141210.427";
         src = fetchgit {
@@ -37819,10 +47227,10 @@
           rev = "47ac6ceede252f451348a2c696398c0cb5279555";
           sha256 = "11pss3hfxkfkyi273zfajdj43shdl6pn739zfv9jbm75v7m9bz6f";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/igv";
           sha256 = "0vjqdyj9j26y0hhzmip6lpwc8g1c9vnmgya1p7v77bkgdicgl659";
-          name = "igv";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -37830,20 +47238,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    image-archive = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    image-archive = callPackage ({ cl-lib ? null
+                                 , emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "image-archive";
         version = "20150620.1832";
         src = fetchFromGitHub {
           owner = "mhayashi1120";
           repo = "Emacs-image-archive";
-          rev = "8d29535bd832329ffeeac780aae7aa8919af1175";
-          sha256 = "068z3ygq9p139ikm04xqhhqhc994an5isba5c7kpqs009y09xw3w";
+          rev = "4cf0edabfd6a4da2ffb920ff1e5009a002fc1e53";
+          sha256 = "0k5iv2s33d6yj7bb9m7xskd52cfs0bkrq3g1qkby17drd29iwdhv";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/17464f31b07f64da0e9db187cd6f5facee3ad7ce/recipes/image-archive";
           sha256 = "0x0lv5dr1gc9bnr3dn26bc9s1ccq2rp8c4a1licbi929f0jyxxfp";
-          name = "image-archive";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -37851,8 +47264,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    image-dired-plus = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    image-dired-plus = callPackage ({ cl-lib ? null
+                                    , fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "image-dired-plus";
         version = "20150429.2244";
         src = fetchFromGitHub {
@@ -37861,10 +47278,10 @@
           rev = "b68094625d963056ad64e0e44af0e2266b2eadc7";
           sha256 = "1n2ya9s0ld257a8iryjd0dz0z2zs1xhzfiwsdkq4l4azwxl54m29";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/98f83f450804f1dc496a7bda17818cdae3f52151/recipes/image-dired+";
           sha256 = "0hhwqfn490n7p12n7ij4xbjh15gfvicmn21fvwbnrmfqc343pcdy";
-          name = "image-dired-plus";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -37872,8 +47289,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    image-plus = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    image-plus = callPackage ({ cl-lib ? null
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "image-plus";
         version = "20150707.916";
         src = fetchFromGitHub {
@@ -37882,10 +47303,10 @@
           rev = "6834d0c09bb4df9ecc0d7a559bd7827fed48fffc";
           sha256 = "0v66wk9nh0raih4jhrzmmyi5lbysjnmbv791vm2230ffi2hmwxnd";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/02d7400477a993b7a3cae327501dbf8db97dfa28/recipes/image+";
           sha256 = "1a9dxswnqn6cvx28180kclpjc0vc6fimzp7n91gpdwnmy123x6hg";
-          name = "image-plus";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -37893,8 +47314,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    imakado = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    imakado = callPackage ({ fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "imakado";
         version = "20141024.223";
         src = fetchFromGitHub {
@@ -37903,10 +47327,10 @@
           rev = "00a1e7eea2cb9e9066343a23927d6c747707902f";
           sha256 = "0f3xdqhq9nprvl8bnmgrx20h08ddkfak0is29bsqwckkfgn7pmqp";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ca131089c823065852f58347a88bd49217a22072/recipes/imakado";
           sha256 = "18mj0vpv3dybfpa8hl9jwlagsivbhgqgz8lwb8cswsq9hwv3jgd3";
-          name = "imakado";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -37914,8 +47338,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    imake = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    imake = callPackage ({ emacs
+                         , fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "imake";
         version = "20180318.1559";
         src = fetchFromGitHub {
@@ -37924,10 +47352,10 @@
           rev = "7df5fb9684a0288313ef5f64594078d477105959";
           sha256 = "0xc19ir5ak1bfq0ag48ql5rj58zd565csgxhpa30s9lvvkc8kvr5";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/28de8f7f5302b27c7c6600ad65a998119518be43/recipes/imake";
           sha256 = "0j732fi6999n9990w4l28raw140fvqfbynyh4x65yilhw95r7c34";
-          name = "imake";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -37935,20 +47363,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    imapfilter = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    imapfilter = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "imapfilter";
         version = "20180318.1327";
         src = fetchFromGitHub {
           owner = "tarsius";
           repo = "imapfilter";
-          rev = "79bbbe918319bc1e8f42a0bef53dc7c77fe868ea";
-          sha256 = "0lqhwh8kav7f526a40rjdy2hzarzph1i3ig2dmbf02gp32sl7rg9";
+          rev = "5e842a8c60ba98f344edf1b1e65f5a480ed938ed";
+          sha256 = "16k7cxzdjbblzckp5qppw1ga0rzdh3ww2ni7ry1h43p9cfna0kcx";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2415894afa3404fbd73c84c58f8b8267187d6d86/recipes/imapfilter";
           sha256 = "0i893kqj6yzadhza800r6ri7fihl01r57z8yrzzh3d09qaias5vz";
-          name = "imapfilter";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -37956,8 +47387,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    imenu-anywhere = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    imenu-anywhere = callPackage ({ cl-lib ? null
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "imenu-anywhere";
         version = "20170805.1155";
         src = fetchFromGitHub {
@@ -37966,10 +47401,10 @@
           rev = "fc7f0fd2f19e5ebee70156a99bf87393123893e3";
           sha256 = "0g2gb7jrys81kphmhlvhvzwl8l75j36y6pqjawh9wmzzwad876q5";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/imenu-anywhere";
           sha256 = "1ylqzdnd3nzcpyyd6rh6i5q9mvf8c99rvpk51fzfm3yq2kyw4dbq";
-          name = "imenu-anywhere";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -37977,20 +47412,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    imenu-list = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    imenu-list = callPackage ({ cl-lib ? null
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "imenu-list";
-        version = "20171120.1255";
+        version = "20180601.702";
         src = fetchFromGitHub {
           owner = "bmag";
           repo = "imenu-list";
-          rev = "0d3d445ce60a77a6c7bcbdbf1ae62cc20d2b5575";
-          sha256 = "0q7124qaa3kmag3p3a1wq4axj59dvcsd7ydsh6cl9np2p18illvx";
+          rev = "04f0632f7b8c81be8747617768c57b66e5d60994";
+          sha256 = "0lmcnbps7fbqcsimynil5xq9d7n4jmcclw1qprbj8yjk42lxz0d1";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/86dea881a5b2d0458449f08b82c2614ad9abd068/recipes/imenu-list";
           sha256 = "092fsn7hnbfabcyakbqyk20pk62sr8xrs45aimkv1l91681np98s";
-          name = "imenu-list";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -37998,20 +47437,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    imenus = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    imenus = callPackage ({ cl-lib ? null
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "imenus";
-        version = "20170217.47";
+        version = "20180505.1017";
         src = fetchFromGitHub {
           owner = "alezost";
           repo = "imenus.el";
-          rev = "7eea33f0aeca0737b3d7d87aeb67073ef4b5d978";
-          sha256 = "1xcw3gsw5alhdnvh7c98cwhxdjhfxrrx1nrl5zn3ibdk8cj3z0p6";
+          rev = "149cfa579ee231014d3341a0e05add69759757a5";
+          sha256 = "00licvs457wzqq06a8cx7vw22kyqky20i7yq7a2nzf3cfl7vaya7";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cc571105a8d7e2ea85391812f1fa639787fa7563/recipes/imenus";
           sha256 = "1q0j6r2n5vjlbgchkz9zdglmmbpd8agawzcg61knqrgzpc4lk82r";
-          name = "imenus";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -38019,8 +47462,37 @@
           license = lib.licenses.free;
         };
       }) {};
-    immortal-scratch = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    imgbb = callPackage ({ emacs
+                         , fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild
+                         , request }:
+      melpaBuild {
+        pname = "imgbb";
+        version = "20180609.949";
+        src = fetchFromGitHub {
+          owner = "ecraven";
+          repo = "imgbb.el";
+          rev = "a524a46263835aa474f908827ebab4e8fa586001";
+          sha256 = "1fhhpz29x9vkhzms2qkxblic96kqzg0rqsxj71vgz6fpwdb4f9gy";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/89d363862890aa7f25db1a5fc5e209bccbadf0bf/recipes/imgbb";
+          sha256 = "0p29pasq0f0b5x7yig4g4n1k0y82aiapxazz359pm7n4kjy2s6qp";
+          name = "recipe";
+        };
+        packageRequires = [ emacs request ];
+        meta = {
+          homepage = "https://melpa.org/#/imgbb";
+          license = lib.licenses.free;
+        };
+      }) {};
+    immortal-scratch = callPackage ({ fetchhg
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "immortal-scratch";
         version = "20160517.1418";
         src = fetchhg {
@@ -38028,10 +47500,10 @@
           rev = "b354aba33d91";
           sha256 = "1mx9f8pwnbrm6q9ngdyv64aqkw1izj83m0mf7zqlpww7yfhv1q9b";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1f9f4a59d88106ddfee740653abd28e305f6dfe0/recipes/immortal-scratch";
           sha256 = "0rxhaqivvjij59hhv3mh4wwrc0bl0xv144j1i237xhlvhxk6nnn6";
-          name = "immortal-scratch";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -38039,8 +47511,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    immutant-server = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    immutant-server = callPackage ({ fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "immutant-server";
         version = "20140311.1508";
         src = fetchFromGitHub {
@@ -38049,10 +47524,10 @@
           rev = "2a21e65588acb6a976f2998e30b21fdabdba4dbb";
           sha256 = "0rbamm9qvipgswxng8g1d7rbdbcj7sgwrccg7imcfapwwq7xhj4h";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d6e906492f9982e2cebd1e4838d7b7c81a295efa/recipes/immutant-server";
           sha256 = "15vcxag1ni41ja4b3q0444sq5ysrisis59la7li6h3617wy8r02i";
-          name = "immutant-server";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -38060,20 +47535,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    impatient-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, htmlize, lib, melpaBuild, simple-httpd }:
-    melpaBuild {
+    impatient-mode = callPackage ({ cl-lib ? null
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , htmlize
+                                  , lib
+                                  , melpaBuild
+                                  , simple-httpd }:
+      melpaBuild {
         pname = "impatient-mode";
-        version = "20180124.1828";
+        version = "20180528.916";
         src = fetchFromGitHub {
           owner = "skeeto";
           repo = "impatient-mode";
-          rev = "4099906914cee4991907fc501799fb80cafa3f7d";
-          sha256 = "1j9s5zpdi03qvvga59izxx3389k0g1vk2hiiivc8bph6zyr52fw0";
+          rev = "96c068d5add95595dc5be42115d100cf99f908ba";
+          sha256 = "18fawpnqcm1yv7f83sz05pjihwydmafmccfmizyg0hlgayhj0izf";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/aaa64c4d43139075d77f4518de94bcbe475d21fc/recipes/impatient-mode";
           sha256 = "07z5ds3zgzkxvxwaalp9i5x2rl5sq4jjk8ygk1rfmsl52l5y1z6j";
-          name = "impatient-mode";
+          name = "recipe";
         };
         packageRequires = [ cl-lib htmlize simple-httpd ];
         meta = {
@@ -38081,20 +47562,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    import-js = callPackage ({ emacs, fetchFromGitHub, fetchurl, grizzl, lib, melpaBuild }:
-    melpaBuild {
+    import-js = callPackage ({ emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , grizzl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "import-js";
-        version = "20171026.1628";
+        version = "20180709.1133";
         src = fetchFromGitHub {
           owner = "Galooshi";
           repo = "emacs-import-js";
-          rev = "0a1032894445062b87dbe4e2c8cdba35ac25c250";
-          sha256 = "0vx2k4k8ig1k74ifxaxvhbkmfmba683qza7f9pp08daa43mgr1r3";
+          rev = "fb1f167e33c388b09a2afd32fbda90a67bfb2e40";
+          sha256 = "0if117lia2ykd6ai0cf5z4ddhsm9icijigwbrn079v7m9s8yl43p";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6f26b8281f9bd05e3c8f2ef21838275711e622c9/recipes/import-js";
           sha256 = "00b2qv1y8879cf8ayplmwqd36w7sppx57myi2wjhy9i2rnvdbmgn";
-          name = "import-js";
+          name = "recipe";
         };
         packageRequires = [ emacs grizzl ];
         meta = {
@@ -38102,8 +47588,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    import-popwin = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, popwin }:
-    melpaBuild {
+    import-popwin = callPackage ({ emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild
+                                 , popwin }:
+      melpaBuild {
         pname = "import-popwin";
         version = "20170218.607";
         src = fetchFromGitHub {
@@ -38112,10 +47603,10 @@
           rev = "bb05a9e226f8c63fe7b18a3e92010357049ab5ba";
           sha256 = "0jjm214zfq2kk8vzf67vala46lbbkjyms7qm27qv3yhcbc7ricvn";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a6f0629515f36e2e98839a6894ca8c0f58862dc2/recipes/import-popwin";
           sha256 = "0vkw6y09m68bvvn1wzah4gzm69z099xnqhn359xfns2ljm74bvgy";
-          name = "import-popwin";
+          name = "recipe";
         };
         packageRequires = [ emacs popwin ];
         meta = {
@@ -38123,20 +47614,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    importmagic = callPackage ({ emacs, epc, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    importmagic = callPackage ({ emacs
+                               , epc
+                               , f
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "importmagic";
-        version = "20170702.1844";
+        version = "20180519.2003";
         src = fetchFromGitHub {
           owner = "anachronic";
           repo = "importmagic.el";
-          rev = "c0360a8146ca65565a7fa66c6d72986edd916dd5";
-          sha256 = "0s6hp62kmhvmgj3m5jr3cfqc8yv3p8jfxk0piq8xbf2chr1hp6l5";
+          rev = "e32ee9f6a5eef937b76eba82fdae8bae85d18088";
+          sha256 = "09jq913vhqndqkck1wyp37r15pnz747rgaxivlrjgp9xd3zzpz1s";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/importmagic";
           sha256 = "1kpmgpll0zz3zlr3q863v1fq6wmwdwx7mn676x0r7g4iy1bdslmv";
-          name = "importmagic";
+          name = "recipe";
         };
         packageRequires = [ emacs epc f ];
         meta = {
@@ -38144,20 +47641,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    indent-guide = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    indent-guide = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "indent-guide";
         version = "20170221.327";
         src = fetchFromGitHub {
           owner = "zk-phi";
           repo = "indent-guide";
-          rev = "d64f43011c72068e008621e620009ec592b35913";
-          sha256 = "1zjxfwbbmg95llpkvgbwdgk6cx7g9x48y3i4v75r8d4iy2xndgq8";
+          rev = "b6eb32b1ea150e54e491f1eed3b598990c4bd631";
+          sha256 = "096x6fyl8cy62kbsglbhkyx45qr7a9wsmnihi8nj80d43qyzcjc2";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5d7110054801e3af5e5ef710a29f73116a2bc746/recipes/indent-guide";
           sha256 = "029fj9rr9vfmkysi6lzpwra92j6ppw675qpj3sinfq7fqqlicvp7";
-          name = "indent-guide";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -38165,20 +47665,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    indent-info = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    indent-info = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "indent-info";
-        version = "20171216.1509";
+        version = "20180423.1212";
         src = fetchFromGitHub {
           owner = "terlar";
           repo = "indent-info.el";
-          rev = "e63a918b16d6d1986dd9123670a762e49102ce2b";
-          sha256 = "0smh7x49cl8zhhjfvcgbcnr1a4n5rck7cpg797xwi3vr00b4bzv8";
+          rev = "d218b4cb3726476caee91db6f6c920856ab992bc";
+          sha256 = "0z427rvvhw5raql5391sajm4rk1n2y8khsy2wqr7r66fdv5hg2mg";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1274c0d871c51e358b3de577372dae8e3a04ead0/recipes/indent-info";
           sha256 = "0fa6p5fvyxib1iz025kqak7navb11jlfxw5x2jr47180vv9a1373";
-          name = "indent-info";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -38186,8 +47689,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    indent-tools = callPackage ({ fetchFromGitLab, fetchurl, hydra, lib, melpaBuild, s, yafolding }:
-    melpaBuild {
+    indent-tools = callPackage ({ fetchFromGitLab
+                                , fetchurl
+                                , hydra
+                                , lib
+                                , melpaBuild
+                                , s
+                                , yafolding }:
+      melpaBuild {
         pname = "indent-tools";
         version = "20180124.408";
         src = fetchFromGitLab {
@@ -38196,10 +47705,10 @@
           rev = "b650b2ca82ccd9ccb4f3142afa0da4737ddd364f";
           sha256 = "01xkkrdfn3c8ivs2wc3ck2278m75gq73wv59fchb6gw1a9d6xj7d";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/indent-tools";
           sha256 = "12rawl9qaihgyascy53yxpkknp95wh8fiqygb5cgl7d761qizvp6";
-          name = "indent-tools";
+          name = "recipe";
         };
         packageRequires = [ hydra s yafolding ];
         meta = {
@@ -38207,8 +47716,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    indicators = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    indicators = callPackage ({ cl-lib ? null
+                              , dash
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "indicators";
         version = "20161211.326";
         src = fetchFromGitHub {
@@ -38217,10 +47731,10 @@
           rev = "f62a1201f21453e3aca93f48483e65ae8251432e";
           sha256 = "0n933jigp0awba2hxg3kwscmfmmqn3jwbrxcw3vw9aj0a5rg5bq6";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/72c96bad0d0b5a4f738fd1b2afe5d302eded440d/recipes/indicators";
           sha256 = "1rhmz8sfi2gnv72sbw6kgyzidk43mnp05wnscw9vjvz9v0vwirss";
-          name = "indicators";
+          name = "recipe";
         };
         packageRequires = [ cl-lib dash ];
         meta = {
@@ -38228,20 +47742,28 @@
           license = lib.licenses.free;
         };
       }) {};
-    indium = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, seq, websocket }:
-    melpaBuild {
+    indium = callPackage ({ company
+                          , emacs
+                          , fetchFromGitHub
+                          , fetchurl
+                          , js2-mode
+                          , lib
+                          , melpaBuild
+                          , seq
+                          , websocket }:
+      melpaBuild {
         pname = "indium";
-        version = "20180410.457";
+        version = "20180521.1355";
         src = fetchFromGitHub {
           owner = "NicolasPetton";
           repo = "Indium";
-          rev = "3b758dff8a5153d6ad8c0d08385e5bcdd69232e4";
-          sha256 = "1yv2nz8x7i0dv2g9485hqq8b5qq397fa5yxv5d8bn5msvj81vl6c";
+          rev = "bc9ab60ded9af501fb4424359737cbff29cecfb1";
+          sha256 = "1f6asv98vsxkizb1nf37q6wacqdbqnqzk035j6sdsmj7p3plb3iy";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4292058cc6e31cabc0de575134427bce7fcef541/recipes/indium";
           sha256 = "024ljx7v8xahmr8jm41fiy8i5jbg48ybqp5n67k4jwg819cz8wvl";
-          name = "indium";
+          name = "recipe";
         };
         packageRequires = [ company emacs js2-mode seq websocket ];
         meta = {
@@ -38249,20 +47771,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    indy = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    indy = callPackage ({ fetchFromGitHub
+                        , fetchurl
+                        , lib
+                        , melpaBuild }:
+      melpaBuild {
         pname = "indy";
         version = "20150610.1006";
         src = fetchFromGitHub {
           owner = "kwrooijen";
           repo = "indy";
-          rev = "4604867d8111f0e186a5351e68e054a77cb14abf";
-          sha256 = "17xvi39v358nff4h1f6l3l3xwjlcr9hzln5v8qmk0kq9b8gkzgxa";
+          rev = "faff56fda87bafed6a1e79dc3426800f256ed1a1";
+          sha256 = "1p694bcg4g7qzngak6nshcrrnf7mxb8j2cf9yskcznwri1s064dd";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e997b356b009b3d2ab467fe49b79d728a8cfe24b/recipes/indy";
           sha256 = "118n3n07h1vx576fdv6v5a94aa004q0gmy9hlsnrswpxa30ahnw7";
-          name = "indy";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -38270,8 +47795,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    inf-clojure = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    inf-clojure = callPackage ({ clojure-mode
+                               , emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "inf-clojure";
         version = "20180402.1403";
         src = fetchFromGitHub {
@@ -38280,10 +47810,10 @@
           rev = "59868ff0433f7631c362ce25879bd4271d350ebc";
           sha256 = "1xh901krzwmvkj0rdq0hjbf41vsf92mr0w9vjb9ki660wnnjw8wc";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5d6112e06d1efcb7cb5652b0bec8d282d7f67bd9/recipes/inf-clojure";
           sha256 = "0n8w0vx1dnbfz88j45a57z9bsmkxr2zyh6ld72ady8asanf17zhl";
-          name = "inf-clojure";
+          name = "recipe";
         };
         packageRequires = [ clojure-mode emacs ];
         meta = {
@@ -38291,20 +47821,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    inf-crystal = callPackage ({ crystal-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    inf-crystal = callPackage ({ crystal-mode
+                               , emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "inf-crystal";
         version = "20180118.1811";
         src = fetchFromGitHub {
           owner = "brantou";
           repo = "inf-crystal.el";
-          rev = "02007b2a2a3bea44902d7c83c4acba1e39d278e3";
-          sha256 = "18627gvpgw2ay7zcbglw6gwpslgh69hbvynwcyqln4c17fk9h0kw";
+          rev = "dd5c85e621976ea09b602182a15396e3b510ec63";
+          sha256 = "0yw2p13iah9alqq684cy410xph2a83lqs5401j0fah0qkgnjv6mh";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ff84c742eebb84577f362b2739f4bcf1434d58ac/recipes/inf-crystal";
           sha256 = "09ssq7i5c2fxxbrsp3nn1f1ah1yv2nb19n5s1iqyykkk316k2q26";
-          name = "inf-crystal";
+          name = "recipe";
         };
         packageRequires = [ crystal-mode emacs ];
         meta = {
@@ -38312,8 +47847,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    inf-mongo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    inf-mongo = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "inf-mongo";
         version = "20180408.638";
         src = fetchFromGitHub {
@@ -38322,10 +47860,10 @@
           rev = "2e498d1c88bd1904eeec18ed06b1a0cf8bdc2a92";
           sha256 = "1m6skisj6r3fbxadpwwgf3a3934b2qvwb7zj975qksxq56ij0wkq";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/be9b27d5354d4b30cc9dd3be730d79e5a5bc1f74/recipes/inf-mongo";
           sha256 = "09hf3jmacsk4hl0rxk35cza8vjl0xfmv19dagb8h8fli97fb65hh";
-          name = "inf-mongo";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -38333,20 +47871,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    inf-ruby = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    inf-ruby = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "inf-ruby";
-        version = "20180309.433";
+        version = "20180521.648";
         src = fetchFromGitHub {
           owner = "nonsequitur";
           repo = "inf-ruby";
-          rev = "57710da5c8c146fef805deb7dc6a2cd8ccbc11d4";
-          sha256 = "0kwxa8mpn3drvn1rnfh4g1hvin8l2sa1gns01dshf1qqaa829jkb";
+          rev = "49d59a7897f594e3be74ecbddae83719f9a6c0f0";
+          sha256 = "1bkv825n1316sisajzrqza3mz0pjc03r6bl40dhgqf8qyjkkcq3c";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/inf-ruby";
           sha256 = "02f01vwzr6j9iqcdns4l579bhia99sw8hwdqfwqjs9gk3xampfpp";
-          name = "inf-ruby";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -38354,20 +47895,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    inferior-spim = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    inferior-spim = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "inferior-spim";
         version = "20160826.646";
         src = fetchFromGitHub {
           owner = "hiddenlotus";
           repo = "inferior-spim";
-          rev = "fb9aa091f6058bf320793f1a608c1ed7322c1f47";
-          sha256 = "0855w29rsgy04bc6m6bjggpzmlkv5z9zxx1p0qlhqr3msj1dqgfn";
+          rev = "93f67ee49f1c6899a7efd52ea4e80e9f9da3371c";
+          sha256 = "1ffa29clfsr3wb00irzqlazk9d0qmjxn9wy8zfca61lh0ax5khbg";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d2ce70b5dc05096a6de46069e8d26323d3df78b6/recipes/inferior-spim";
           sha256 = "1bl29ww55vabgly84wdg18qq1md4vxzvsb6kvxymf6bpw55k313s";
-          name = "inferior-spim";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -38375,8 +47919,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    inflections = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    inflections = callPackage ({ cl-lib ? null
+                               , emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "inflections";
         version = "20170913.216";
         src = fetchFromGitHub {
@@ -38385,10 +47934,10 @@
           rev = "e4f1372cf22e811faca52fc86bdd5d817498a4d8";
           sha256 = "0354b64drvv8v5g13xy5nc1klwx4hldz1b5mf1frhna7h2dqz0j9";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/392c7616d27bf12b29ef3c2ea71e42ffaea81cc6/recipes/inflections";
           sha256 = "0f02bhm2a5xiaxnf2c2hlpa4p121xfyyj3c59fy0yldipdxhvw70";
-          name = "inflections";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -38396,8 +47945,36 @@
           license = lib.licenses.free;
         };
       }) {};
-    info-buffer = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    info-beamer = callPackage ({ emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
+        pname = "info-beamer";
+        version = "20180604.1422";
+        src = fetchFromGitHub {
+          owner = "dakra";
+          repo = "info-beamer.el";
+          rev = "af443795af20481af91ac54a489b20f6a9d90b0a";
+          sha256 = "0r938pp10szrqiv37ryzfir4h5pg68farm56cpnh9hh8cnix6nrh";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e9da9aac33df6e53a8cbabcffd8e3a363298b9f3/recipes/info-beamer";
+          sha256 = "0jlwvn96diwnngjbabq6wzp5q6rvmwa6p36d80nv8r7x7ch0740q";
+          name = "recipe";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/info-beamer";
+          license = lib.licenses.free;
+        };
+      }) {};
+    info-buffer = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "info-buffer";
         version = "20170112.622";
         src = fetchFromGitHub {
@@ -38406,10 +47983,10 @@
           rev = "d35dad6e766c6e2ddb8dc6acb4ce5b6e10fbcaa7";
           sha256 = "0czkp7cf7qmdm1jdn67gxyxz8b4qj2kby8if50d450xqwbx0da7x";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3c44a1d69725b687444329d8af43c9799112b407/recipes/info-buffer";
           sha256 = "1vkgkwgwym0j5xip7mai11anlpa2h7vd5m9i1xga1b23hcs9r1w4";
-          name = "info-buffer";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -38417,8 +47994,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    info-colors = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    info-colors = callPackage ({ cl-lib ? null
+                               , emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "info-colors";
         version = "20180205.350";
         src = fetchFromGitHub {
@@ -38427,10 +48009,10 @@
           rev = "a8ebb7b8efa314c08ea8110d8b1876afb562bb45";
           sha256 = "0wvyf2w5s184kwacs6lbpjryx6hziayvdrl3crxir8gmg2kcv07m";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d671ae8dc27439eea427e1848fc11c96ec5aee64/recipes/info-colors";
           sha256 = "1mbabrfdy9xn7lpqivqm8prp83qmdv5r0acijwvxqd3a52aadc2x";
-          name = "info-colors";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -38438,8 +48020,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    inherit-local = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    inherit-local = callPackage ({ emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "inherit-local";
         version = "20170409.949";
         src = fetchFromGitHub {
@@ -38448,10 +48034,10 @@
           rev = "b1f4ff9c41f9d64e4adaf5adcc280b82f084cdc7";
           sha256 = "1fargashyqn4ga420k3ikc1akf7mw3zcarpg24gh2591p4swa0ih";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/08b978724ff26b3ea7a134d307d888c80e2a92a9/recipes/inherit-local";
           sha256 = "1v3q3s6qq64k1f4ck6rfgsy1arnf9cxg2kw6d1ahfrwr4ixsqm87";
-          name = "inherit-local";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -38459,8 +48045,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    ini-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ini-mode = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "ini-mode";
         version = "20170424.209";
         src = fetchFromGitHub {
@@ -38469,10 +48058,10 @@
           rev = "2194cfa2fd13196a37350ec20b3f00dcf6162b7c";
           sha256 = "0s3dcqywrbggrcn9j5nibhcl4xbnhdndz5sibcp26qswd18jyrdk";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/000cca577d000bafe7bf5711d0bfe7593fb6975a/recipes/ini-mode";
           sha256 = "0f6fbmg4wmlzghcibfbcx3z124b2017rhsasi5smgx9i2vkydzrm";
-          name = "ini-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -38480,20 +48069,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    init-loader = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    init-loader = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "init-loader";
         version = "20160528.615";
         src = fetchFromGitHub {
           owner = "emacs-jp";
           repo = "init-loader";
-          rev = "5d3cea1004c11ff96b33020e337b03b925c67c42";
-          sha256 = "17bg4s8yz7yz28m04fp2ff6ld0y01yl99wkn2k5rkg4j441xg3n2";
+          rev = "287da99eadfa3dd85492506db43d68324069b593";
+          sha256 = "03a655qzcwizv9hvfcp47466axsrq0h049fdd79xk6zmans5s6fj";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e46e6ec79ff4c76fc85e13321e6dabd5797c5f45/recipes/init-loader";
           sha256 = "0rq7759abp0ml0l8dycvdl0j5wsxw9z5y9pyx68973a4ssbx2i0r";
-          name = "init-loader";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -38501,20 +48093,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    init-open-recentf = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    init-open-recentf = callPackage ({ emacs
+                                     , fetchFromGitHub
+                                     , fetchurl
+                                     , lib
+                                     , melpaBuild }:
+      melpaBuild {
         pname = "init-open-recentf";
         version = "20161206.645";
         src = fetchFromGitHub {
           owner = "zonuexe";
           repo = "init-open-recentf.el";
-          rev = "7d8fb124806291f7f6ef2ec3a664ea25899b6d68";
-          sha256 = "0vswa7304s7m6cirbaky9rmrxjb2aylvif2vg2p6l274k37c4jyh";
+          rev = "5b0e1053bb4b3fa755d3b2e4f3edf0c16b8eacfe";
+          sha256 = "1y6avl71lmbj5f0wprkkw5f252jhcf3nihbr460wlp3nlvhsxgan";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4db8b6eced50726c788d7343137f6b4558575abf/recipes/init-open-recentf";
           sha256 = "0xlmfxhxb2car8vfx7krxmxb3d56x0r3zzkj8ds7yqvr65z85x2r";
-          name = "init-open-recentf";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -38522,8 +48118,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    initsplit = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    initsplit = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "initsplit";
         version = "20160919.1118";
         src = fetchFromGitHub {
@@ -38532,10 +48131,10 @@
           rev = "c941d436eb2b10b01c76a582c5a2b23fb30751aa";
           sha256 = "0vz0pfm2m3v0zk65b4ikk6yfpk282nzbm99fbzj8w76yfg240dfn";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5a908c8fad08cd4d7dbb586570d0f0b384bf9071/recipes/initsplit";
           sha256 = "0n9dk3x62vgxfn39jkmdg8wxsik0xqkprifgvqzyvn8xcx1blyyq";
-          name = "initsplit";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -38543,8 +48142,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    ink-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ink-mode = callPackage ({ emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "ink-mode";
         version = "20160814.416";
         src = fetchFromGitHub {
@@ -38553,10 +48156,10 @@
           rev = "e35f26abbaf8ea23c5aa0a0c7ef15334cdfb7b48";
           sha256 = "0ixqgk101gnm2q6f2bjk2pnqlrj41krqz56lss6fmf81xhxavmpp";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ink-mode";
           sha256 = "02q95xay6z56i4l0j24dszxnfpjbxijlj4150nsadbv55m7nnjcf";
-          name = "ink-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -38564,8 +48167,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    inkpot-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    inkpot-theme = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "inkpot-theme";
         version = "20171217.144";
         src = fetchFromGitHub {
@@ -38574,10 +48180,10 @@
           rev = "8d59548ff5171bf6be6acc58d111674579646124";
           sha256 = "0r63rb99nm7fpw8yn3gkbfka12jqwzkdhv97hm89nvdrxdnbggfs";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/dd3e02aaf8865d8038b9c590c8545e7a1b21d620/recipes/inkpot-theme";
           sha256 = "1m3iygb8vbqcnsxsnwr7g2mq1n2a9r7qxp3pgm1fpwz1lngvaagf";
-          name = "inkpot-theme";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -38585,20 +48191,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    inline-crypt = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    inline-crypt = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "inline-crypt";
         version = "20170824.200";
         src = fetchFromGitHub {
           owner = "Sodel-the-Vociferous";
           repo = "inline-crypt-el";
-          rev = "281385b383f850fd2e895926b1cef804dd052633";
-          sha256 = "0hjmq8j7y4wnjgk6z92w4ci0ag9fm6rn63z9mi3krvdv154vz2n0";
+          rev = "af4981c613bfd355d5ef34da1995a8384f167fd9";
+          sha256 = "119ns1a0v222wyysrf07cx94adrm26fhci530gnfc6xy5vaf24k7";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b04fffe5e52f26e92930a112a64531228f94e340/recipes/inline-crypt";
           sha256 = "04mcyyqa9h6g6wrzphzqalpqxsndmzxpavlpdc24z4a2c5s3yz8n";
-          name = "inline-crypt";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -38606,8 +48215,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    inline-docs = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    inline-docs = callPackage ({ emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "inline-docs";
         version = "20170522.2150";
         src = fetchFromGitHub {
@@ -38616,10 +48229,10 @@
           rev = "b57f1681be6147f999cdc12abff414a0442e8897";
           sha256 = "0ji8qgscs4fxp2i29l3v8z9y6i2glga6bysbcsn855pqsn00xkcv";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/inline-docs";
           sha256 = "1imjcx4qgrs5llindgmnvkb73fagnlxfg04s72kckgcy47c4352p";
-          name = "inline-docs";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -38627,8 +48240,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    inlineR = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    inlineR = callPackage ({ fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "inlineR";
         version = "20120520.732";
         src = fetchFromGitHub {
@@ -38637,10 +48253,10 @@
           rev = "29357186beca825e3d0451b700ec09b9ed65e37b";
           sha256 = "15nasjknmzy57ilj1gaz3w5sj8b3ijcpgwcd6w2r9xhgcl86m40q";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3a7228e5f23a4e66f4510b2f6fc41c36aa791991/recipes/inlineR";
           sha256 = "1fflq2gkpfn3jkv4a6yywzmxsq6qszfid1ri85ass1ppw6scdvzw";
-          name = "inlineR";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -38648,8 +48264,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    insert-shebang = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    insert-shebang = callPackage ({ fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "insert-shebang";
         version = "20180403.514";
         src = fetchFromGitHub {
@@ -38658,10 +48277,10 @@
           rev = "7bfea92ba1dae9d13d442e2f84f9fb6c05a0a9bd";
           sha256 = "01f2p58qsny7p9l6vrra0i2m2g1k05p39m0bzi906zm5awx7l0rr";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c257f4f5011cd7d0b2a5ef3adf13f9871bf0be92/recipes/insert-shebang";
           sha256 = "0z88l1q925v9lwzr6nas9qjy0f57qxilg6smgpx9wj6lll3f7p5v";
-          name = "insert-shebang";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -38669,8 +48288,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    insfactor = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    insfactor = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "insfactor";
         version = "20141116.1602";
         src = fetchFromGitHub {
@@ -38679,10 +48301,10 @@
           rev = "7ef5446cebb08a17d4106d2e6f3c053e49e1e829";
           sha256 = "112s3c0ii8zjc6vlj2im2qd2pl3hb95pq4zibm86gjpw428wd8iy";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c9a76a6498c2a0b0d471d3df7ae3d510d027f08c/recipes/insfactor";
           sha256 = "0c6q1d864qc78sqk9iadjpd01xc7myipgnf89pqa2z75yprndvyn";
-          name = "insfactor";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -38690,8 +48312,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    instapaper = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    instapaper = callPackage ({ fetchhg
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "instapaper";
         version = "20130104.621";
         src = fetchhg {
@@ -38699,10 +48324,10 @@
           rev = "8daa0058ede7";
           sha256 = "0krscid3yz2b7kv75gd9fs92zgfl7pnl77dbp5gycv5rmw5mivp8";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/instapaper";
           sha256 = "1yibdpj3lx6vr33s75s1y415lxqljrk7pqc901f8nfa01kca7axn";
-          name = "instapaper";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -38710,8 +48335,35 @@
           license = lib.licenses.free;
         };
       }) {};
-    intellij-theme = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    intel-hex-mode = callPackage ({ fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
+        pname = "intel-hex-mode";
+        version = "20180422.1731";
+        src = fetchFromGitHub {
+          owner = "mschuldt";
+          repo = "intel-hex-mode";
+          rev = "e83c94e1c31a8435a88b3ae395f2bc842ef83217";
+          sha256 = "0jpc6wh3agdh38wdjr1x880iiaj6698nr8dkgx114fsfj1la6f7v";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/f1bf82134671b1383f5f4d4a3c180081bea66814/recipes/intel-hex-mode";
+          sha256 = "02ffbrkr3zajqhrxc3grmqm632ji4fmgnfabn42islpcfq12q3i4";
+          name = "recipe";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/intel-hex-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    intellij-theme = callPackage ({ fetchFromGitLab
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "intellij-theme";
         version = "20171017.715";
         src = fetchFromGitLab {
@@ -38720,10 +48372,10 @@
           rev = "1bbfff8e6742d18e9b77ed796f44da3b7bd10606";
           sha256 = "0ml1gi2cn6h3xm5c78vxwv327r0rgimia1vqqi9jb09yb6lckbgj";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cfe86071b2e84929476a771da99341f4a73cfd06/recipes/intellij-theme";
           sha256 = "1g8cninmq840sl8fmhq2hcsmz7nccbjmprzcl8w1zdavfp86b97g";
-          name = "intellij-theme";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -38731,20 +48383,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    interaction-log = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    interaction-log = callPackage ({ cl-lib ? null
+                                   , fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "interaction-log";
         version = "20160305.501";
         src = fetchFromGitHub {
           owner = "michael-heerdegen";
           repo = "interaction-log.el";
-          rev = "a49a06746d4df6bcfceec3c48dece065d635f9f9";
-          sha256 = "1vmaj14k5idx1ykkp1yl0b9qr4fimwagz7p6c00xi9klvjsx566y";
+          rev = "0f2d773269d1f7b93c9281226719113f5410cbd0";
+          sha256 = "0mvhydb4lfm2kazmb7fab8zh7sd8l9casghn8wl42mqji3v7lfwh";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b72951c339c601350a7f10aee05a7fb94bac37ea/recipes/interaction-log";
           sha256 = "1r9qbvgssc2zdwgwmmwv5kapvmg1y3px7268gkiakkfanw3kqk6j";
-          name = "interaction-log";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -38752,8 +48408,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    interleave = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    interleave = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "interleave";
         version = "20171003.2324";
         src = fetchFromGitHub {
@@ -38762,10 +48421,10 @@
           rev = "87549df30cbc681baf86b238bd14c7cf7ec11fc4";
           sha256 = "07430hsyq9q90rjzxq7ifq4mlfc8k8b7l6b31s7xk1xm2snbky6b";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6c43d4aaaf4fca17f2bc0ee90a21c51071886ae2/recipes/interleave";
           sha256 = "18b3fpxn07y5abkcnaw9is9ihdhik7xjdj6kzl1pz958lk9f4hfy";
-          name = "interleave";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -38773,20 +48432,27 @@
           license = lib.licenses.free;
         };
       }) {};
-    intero = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lib, melpaBuild }:
-    melpaBuild {
+    intero = callPackage ({ company
+                          , emacs
+                          , fetchFromGitHub
+                          , fetchurl
+                          , flycheck
+                          , haskell-mode
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "intero";
-        version = "20180409.1854";
+        version = "20180703.18";
         src = fetchFromGitHub {
           owner = "commercialhaskell";
           repo = "intero";
-          rev = "37af01509e55341ffcc81b56d1f30032a055d1e5";
-          sha256 = "0fqm6r73lk2ysv2zif6mi7zkdzsxar8dxgc5g6j64426hp6jc5m0";
+          rev = "60e2e3f76f647b20d9de8418f9576ea157e21864";
+          sha256 = "0srim6q3p749xpqp28c6zfxf0aj0d87jdc1smn62wc37fxkf1wgq";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/intero";
           sha256 = "15n7ipsq8ylmq4blsycpszkx034j9sb92vqvaz30j5v307fmvs99";
-          name = "intero";
+          name = "recipe";
         };
         packageRequires = [ company emacs flycheck haskell-mode ];
         meta = {
@@ -38794,8 +48460,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    interval-list = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    interval-list = callPackage ({ cl-lib ? null
+                                 , dash
+                                 , emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "interval-list";
         version = "20150327.1018";
         src = fetchFromGitHub {
@@ -38804,10 +48476,10 @@
           rev = "38af7ecf0a493ad8f487074938a2a115f3531177";
           sha256 = "1zv6m24ryls9hvla3hf8wzp6r7fzbxa1lzr1mb0wz0s292l38wjz";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/afee0fed80f4fa444116b12653c034d760f5f1fb/recipes/interval-list";
           sha256 = "0926z3lxkmpxalpq7hj355cjzbgpdiw7z4s8xdrpa1pi818d35zf";
-          name = "interval-list";
+          name = "recipe";
         };
         packageRequires = [ cl-lib dash emacs ];
         meta = {
@@ -38815,8 +48487,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    interval-tree = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    interval-tree = callPackage ({ dash
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "interval-tree";
         version = "20130325.707";
         src = fetchFromGitHub {
@@ -38825,10 +48501,10 @@
           rev = "301302f480617091cf3ab6989caac385d52543dc";
           sha256 = "0fqnn9xhrc9hkaiziafjgg288l6m05416z9kz8l5845fnqsb7pb3";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ca0f4b62aee7ff7c4457da29fd25860a5c768319/recipes/interval-tree";
           sha256 = "13zynac3h50x68f1ja72kqdrapjks2zmgqd4g7qwscq92mmh60i9";
-          name = "interval-tree";
+          name = "recipe";
         };
         packageRequires = [ dash ];
         meta = {
@@ -38836,8 +48512,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    inverse-acme-theme = callPackage ({ autothemer, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    inverse-acme-theme = callPackage ({ autothemer
+                                      , cl-lib ? null
+                                      , fetchFromGitHub
+                                      , fetchurl
+                                      , lib
+                                      , melpaBuild }:
+      melpaBuild {
         pname = "inverse-acme-theme";
         version = "20170822.1954";
         src = fetchFromGitHub {
@@ -38846,10 +48527,10 @@
           rev = "74d6f3e2f6534371509dd2d77006435156c276d6";
           sha256 = "15fk60ky8kbj665yjylmgc4nn4qsk57fvarqzwv3fns64yfshkv3";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1c44dbc8d3ca29d8715af755b845af7236e95406/recipes/inverse-acme-theme";
           sha256 = "03g6h8dpn42qnr593ryhj22lj1h2nx4rdr1knhkvxygfv3c4lgh5";
-          name = "inverse-acme-theme";
+          name = "recipe";
         };
         packageRequires = [ autothemer cl-lib ];
         meta = {
@@ -38857,8 +48538,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    io-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    io-mode = callPackage ({ fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "io-mode";
         version = "20161004.56";
         src = fetchFromGitHub {
@@ -38867,10 +48551,10 @@
           rev = "fd65ae769093defcf554d6d637eba6e6dfc29f56";
           sha256 = "1x3j4asbczfr9vrqd7bms57ngqzaik73sm2njcgjshf9c3js3aa9";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/29ac993c86f992a452784c75c1511d15c4718c91/recipes/io-mode";
           sha256 = "1fpiml7lvbl4s2xw4wk2y10iifvfza24kd9j8qvi1bgd85qkx42q";
-          name = "io-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -38878,8 +48562,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    io-mode-inf = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    io-mode-inf = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "io-mode-inf";
         version = "20140128.1134";
         src = fetchFromGitHub {
@@ -38888,10 +48575,10 @@
           rev = "6dd2bac3fd87484bb7d97e135b06c29d70b444b6";
           sha256 = "1ard88kc13c57y9zdkyr012w8rdrwahz8a3fb5v6hwqymg16m20s";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/df121fc9f71af1d060c83555ec611c422cbe8d0d/recipes/io-mode-inf";
           sha256 = "0hwhvf1qwkmzzlzdda1flw6p1jjh9rzxsfwm2sc4795ac2xm6dhc";
-          name = "io-mode-inf";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -38899,20 +48586,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    ioccur = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ioccur = callPackage ({ fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "ioccur";
         version = "20130821.2248";
         src = fetchFromGitHub {
           owner = "thierryvolpiatto";
           repo = "ioccur";
-          rev = "4c0ef992a6fcd2aed62e3866d56650463108ab5a";
-          sha256 = "1rz5wf19lg1lnm0h73ynhb0vl3c99k7vpipay2f8jls24pv60bra";
+          rev = "2e4f83ba72bc7d0225606176de2ef7a970ca301c";
+          sha256 = "111rrn1l2k40bfpcf6d9n06vhlhxhv3718kgd40ksrqz97pzq0dx";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/308c27227795560adf8c979ba1d046286549843d/recipes/ioccur";
           sha256 = "1a9iy6x4lkm4wgkcb0pv86c2kvpq8ymrc4ssp109r67kwqw7lrr6";
-          name = "ioccur";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -38920,8 +48610,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    iodine-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    iodine-theme = callPackage ({ emacs
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "iodine-theme";
         version = "20151031.939";
         src = fetchFromGitHub {
@@ -38930,10 +48624,10 @@
           rev = "02fb780e1d8d8a6b9c709bfac399abe1665c6999";
           sha256 = "14zfxa8fc7h4rkz1hyplwf4q2lga3l5dd7a2xq5kk0kvf2fs4mk3";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6893ce6309f1e3b3457c99e84611044e653b827a/recipes/iodine-theme";
           sha256 = "05mnq0bgcla0pxsgywpvcdgd4sk2xr7bjlp87l0dx8j121vqripj";
-          name = "iodine-theme";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -38941,8 +48635,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    ipcalc = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ipcalc = callPackage ({ cl-lib ? null
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "ipcalc";
         version = "20170926.105";
         src = fetchFromGitHub {
@@ -38951,10 +48649,10 @@
           rev = "2720f7e3e662e04e195f8338b81a499cf321296a";
           sha256 = "1kmqbb9ca3sca59462ha21grbgxkl4wynz2lr4yqb4qk7cijgd6g";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ipcalc";
           sha256 = "0hw5g30pnqwzvbhf6kggyj6wij5iw7d8jgmr88pyw63kxach8vkv";
-          name = "ipcalc";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -38962,8 +48660,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    iplayer = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    iplayer = callPackage ({ fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "iplayer";
         version = "20161120.1320";
         src = fetchFromGitHub {
@@ -38972,10 +48673,10 @@
           rev = "b788fffa4b36bbd558047ffa6be51b1f0f462f23";
           sha256 = "0x82mxbc6f5azzg7c4zrxz1q763k8i3y1kfb79xfspb2i64dgg5g";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6e9a97667365f1c30f53a6aeeb7b909a78888eb1/recipes/iplayer";
           sha256 = "0wnxvdlnvlmspqsaqx0ldw8j03qjckkqzvx3cbpc2yfs55pm3p7r";
-          name = "iplayer";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -38983,20 +48684,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    ipretty = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ipretty = callPackage ({ fetchgit
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "ipretty";
-        version = "20140406.2220";
-        src = fetchFromGitHub {
-          owner = "steckerhalter";
-          repo = "ipretty";
-          rev = "6f6da8907abea53d6d246d61e1a0f4ebeb0b9f38";
-          sha256 = "0skyd9c7pz68v17aj3h47ralszbmc4gqg552q8jpimcjd1lacc7l";
+        version = "20180605.2222";
+        src = fetchgit {
+          url = "https://framagit.org/steckerhalter/ipretty.git";
+          rev = "042f5cc4e6f81d59115e8335c582bb5c571c2585";
+          sha256 = "0vk8k4zfqa0869fg1kzbzzgz65xg7six5m4jm8088pb2nvfn1lrr";
         };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0a28fb8952b3827e857d49b1366ddfbc3a266813/recipes/ipretty";
-          sha256 = "1zysip6cb8s4nzsxiwk052gq6higz2xnd376r9wxmgj7w8him2c4";
-          name = "ipretty";
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/f0a8eb0eefe88b4ea683a4743c0f8393506e014b/recipes/ipretty";
+          sha256 = "0nlp7xmgqsipdq8xjld0xpw3q3qlxm31r2k52hxs32rx044y6c71";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -39004,8 +48707,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    ipython-shell-send = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ipython-shell-send = callPackage ({ emacs
+                                      , fetchFromGitHub
+                                      , fetchurl
+                                      , lib
+                                      , melpaBuild }:
+      melpaBuild {
         pname = "ipython-shell-send";
         version = "20171212.318";
         src = fetchFromGitHub {
@@ -39014,10 +48721,10 @@
           rev = "36523a387c15ee1652a5b0e291d4d4838da5e912";
           sha256 = "1iba7jpagc0n436pbylpcbwbdxk6bw7y0i7pjgxxwfm8akaj9i68";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9d3513d38f94de4d86124b5d5a33be8d5f0bfa43/recipes/ipython-shell-send";
           sha256 = "07im2f3890yxpcy4qz1bihi68aslam7qir4vqf05bhqlgaqzamv8";
-          name = "ipython-shell-send";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -39025,8 +48732,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    iqa = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    iqa = callPackage ({ emacs
+                       , fetchFromGitHub
+                       , fetchurl
+                       , lib
+                       , melpaBuild }:
+      melpaBuild {
         pname = "iqa";
         version = "20170722.834";
         src = fetchFromGitHub {
@@ -39035,10 +48746,10 @@
           rev = "08e3f70d0a3ed95a0c5675ae88e7966474ecc45a";
           sha256 = "1n7ghcixk16n6x8p7128mqjfcsalxfyp3asydnijw7qp358l7f9r";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a9bd2e952d98f7ac2dc823581b07b65e951e9e45/recipes/iqa";
           sha256 = "02yrkizk4ssip44s6r62finsrf45hxj9cpil1xrvh8g4jbsmfsw4";
-          name = "iqa";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -39046,20 +48757,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    ir-black-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ir-black-theme = callPackage ({ fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "ir-black-theme";
         version = "20130302.2355";
         src = fetchFromGitHub {
           owner = "jmdeldin";
           repo = "ir-black-theme.el";
-          rev = "36e930d107604b5763c80294a6f92aaa02e6c272";
-          sha256 = "1cy9xwhswj9vahg8zr16r2crm2mm3vczqs73gc580iidasb1q1i2";
+          rev = "ee6078bc67cbc15184e64e0f1fc8542d4079d55f";
+          sha256 = "0yha2623zfy9q97y48v6fgg20ghig9zdlv80s30iqj9lwaf3v2md";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5e725582bc322d03c9dca2b22e8606444fd8753c/recipes/ir-black-theme";
           sha256 = "1qpq9zbv63ywzk5mlr8x53g3rn37k0mdv6x1l1hcd90gka7vga9v";
-          name = "ir-black-theme";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -39067,8 +48781,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    iregister = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    iregister = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "iregister";
         version = "20150515.1407";
         src = fetchFromGitHub {
@@ -39077,10 +48794,10 @@
           rev = "6a48c66187289de5f300492be11c83e98410c018";
           sha256 = "1ch610b3d0x3nxglp749305syliivamc108rgv9if4ihb67gp8b5";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a12a51873444b84765758e18c9cf24d85a200e44/recipes/iregister";
           sha256 = "0iq1nlj5czi4nblrszfv3grkl1fni7blh8bhcfccidms8v9r3mdm";
-          name = "iregister";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -39088,20 +48805,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    irony = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }:
-    melpaBuild {
+    irony = callPackage ({ cl-lib ? null
+                         , fetchFromGitHub
+                         , fetchurl
+                         , json ? null
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "irony";
-        version = "20180408.429";
+        version = "20180703.1040";
         src = fetchFromGitHub {
           owner = "Sarcasm";
           repo = "irony-mode";
-          rev = "94856c65ea9242aee5f57a66212ad12f5f39252b";
-          sha256 = "1n6malmrxfzrzc9m44ycgp122x3hqkm6yhgiyna53z7bmx6whq70";
+          rev = "91353a291509f0615fabaedcd92663cd6d94d345";
+          sha256 = "12951pqrk5r9wr4ir1nr810g8p6ddyldh1m6f48r7999fb5y14rw";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d2b6a8d57b192325dcd30fddc9ff8dd1516ad680/recipes/irony";
           sha256 = "1xcxrdrs7imi31nxpszgpaywq4ivni75hrdl4zzrf103xslqpl8a";
-          name = "irony";
+          name = "recipe";
         };
         packageRequires = [ cl-lib json ];
         meta = {
@@ -39109,8 +48831,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    irony-eldoc = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, irony, lib, melpaBuild }:
-    melpaBuild {
+    irony-eldoc = callPackage ({ cl-lib ? null
+                               , emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , irony
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "irony-eldoc";
         version = "20170502.1208";
         src = fetchFromGitHub {
@@ -39119,10 +48847,10 @@
           rev = "0df5831eaae264a25422b061eb2792aadde8b3f2";
           sha256 = "1l5qpr66v1l12fb50yh73grb2rr85xxmbj19mm33b5rdrq2bqmmd";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fc42459d5c1671bd478d781339f2572b3de2e7d0/recipes/irony-eldoc";
           sha256 = "03m0h13jd37vfvn4mavaq3vbzx4x0lklbs0mbc29zaz8pwqlcwz6";
-          name = "irony-eldoc";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs irony ];
         meta = {
@@ -39130,8 +48858,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    isearch-dabbrev = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    isearch-dabbrev = callPackage ({ cl-lib ? null
+                                   , fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "isearch-dabbrev";
         version = "20141223.2222";
         src = fetchFromGitHub {
@@ -39140,10 +48872,10 @@
           rev = "1efe7abba4923015cbc2462395deaec5446a9cc8";
           sha256 = "17d0816awadvsw1qc7r0p6ira75jmgxaj9hsk9ypayxsaf6ynyrb";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b9dfc7c1112bac8744910c58f77a98a901fd8065/recipes/isearch-dabbrev";
           sha256 = "1hl7zl5vjcsk3z452874g4nfcnmna8m2242dc9cgpl5jddzwqa7x";
-          name = "isearch-dabbrev";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -39151,8 +48883,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    isearch-symbol-at-point = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    isearch-symbol-at-point = callPackage ({ fetchFromGitHub
+                                           , fetchurl
+                                           , lib
+                                           , melpaBuild }:
+      melpaBuild {
         pname = "isearch-symbol-at-point";
         version = "20130728.1521";
         src = fetchFromGitHub {
@@ -39161,10 +48896,10 @@
           rev = "51a1029bec1ec414885f9edb7e5947603dffdab2";
           sha256 = "09z49850c32x0rchxg203cxg504xi2b6cjgnd0i4axcs5fmq7gv9";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5733de00a1800645674e83c5e21c80f2890c4e7c/recipes/isearch-symbol-at-point";
           sha256 = "0j5fr7qdvpd5b096h5a83fz8sh9wybdnsgix6v94gv8lkzdsqkr8";
-          name = "isearch-symbol-at-point";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -39172,8 +48907,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    isend-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    isend-mode = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "isend-mode";
         version = "20171118.745";
         src = fetchFromGitHub {
@@ -39182,10 +48920,10 @@
           rev = "88d4576e70e5874115c305ab2767d181dfda5985";
           sha256 = "0pnzy5000m34f20q97my8ahcsgr0fqyhmfzbmds5bc269vsnbr6g";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8ef6e4dab78a4c333647a85ed07a81da8083ec0c/recipes/isend-mode";
           sha256 = "0sk80a08ny9vqw94klqfgii297qm633000wlcldha76ip8viikdv";
-          name = "isend-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -39193,8 +48931,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    isgd = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    isgd = callPackage ({ fetchFromGitHub
+                        , fetchurl
+                        , lib
+                        , melpaBuild }:
+      melpaBuild {
         pname = "isgd";
         version = "20150414.236";
         src = fetchFromGitHub {
@@ -39203,10 +48944,10 @@
           rev = "764306dadd5a9213799081a48aba22f7c75cca9a";
           sha256 = "09hx28lmldm7z3x22a0qx34id09fdp3z61pdr61flgny213q1ach";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d5ff75b269fd57c5822277b9ed850c69b626f1a5/recipes/isgd";
           sha256 = "0yc9mkjzj3w64f48flnjvd193mk9gndrrqbxz3cvmvq3vgahhzyi";
-          name = "isgd";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -39214,29 +48955,37 @@
           license = lib.licenses.free;
         };
       }) {};
-    isortify = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    isortify = callPackage ({ emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild
+                            , pythonic }:
+      melpaBuild {
         pname = "isortify";
-        version = "20180312.2132";
+        version = "20180612.622";
         src = fetchFromGitHub {
           owner = "proofit404";
           repo = "isortify";
-          rev = "2e53c9ce3fa1ef80b08a8568cdae19a3669f3056";
-          sha256 = "1l2py65xr0m3w9lc6qp2jcc9477kjhkfnjdnkgfimz6aqlg1p9xg";
+          rev = "442f12fa91695a43a4b542f7b82d6ac9b004729b";
+          sha256 = "02rjyza8a0j3a2jfm9ps8gvsjqx3gxznaxw1d1zjam0a87fp7p1k";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9d4ad18492e7f4a56a1515873bc0b66fa49829bb/recipes/isortify";
           sha256 = "0nlpjd6mrhv8iccdny0x5lb41dpyp6l7kiax4xqra0rb2vq0chcs";
-          name = "isortify";
+          name = "recipe";
         };
-        packageRequires = [];
+        packageRequires = [ emacs pythonic ];
         meta = {
           homepage = "https://melpa.org/#/isortify";
           license = lib.licenses.free;
         };
       }) {};
-    iss-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    iss-mode = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "iss-mode";
         version = "20141001.1213";
         src = fetchFromGitHub {
@@ -39245,10 +48994,10 @@
           rev = "3b517aff31529bab33f8d7b562bd17aff0107fd1";
           sha256 = "0992lzgar0kz9i1sk5vz17q9qzfgl8fkyxa1q0hmhgnpjf503cnj";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ecc9f618b9f065f593b91c1c1221a550ab752bae/recipes/iss-mode";
           sha256 = "1my4vi1x07hg0dva97i685lx6m6fcbfk16j1zy93zriyd7z5plkc";
-          name = "iss-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -39256,8 +49005,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    itail = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    itail = callPackage ({ fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "itail";
         version = "20171112.4";
         src = fetchFromGitHub {
@@ -39266,10 +49018,10 @@
           rev = "6e43c20da03be3b9c6ece93b7dc3495975ec1888";
           sha256 = "044nzxh1hq41faxw3lix0wy78vfz304pjcaa5a11dqfz7q3gx5cv";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6b810bf1deeb79064144d8b684fab336686018ef/recipes/itail";
           sha256 = "0mcyly88a3c15hl3wll56agpdsyvd26r501h0v64lasfr4k634m7";
-          name = "itail";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -39277,8 +49029,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    itasca = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    itasca = callPackage ({ emacs
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "itasca";
         version = "20170601.922";
         src = fetchFromGitHub {
@@ -39287,10 +49043,10 @@
           rev = "3d15dd1b70d6db69b0f4758a3e28b8b506cc84ca";
           sha256 = "0mfcl7ka7r5mx52xvf13i3799ddkdi9sq2q4p2rkgb96r37ia221";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/itasca";
           sha256 = "0j0lvs9x2j3z5yyhbgmymccswi40vv1gz3sl56bl857m1hlxzshz";
-          name = "itasca";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -39298,20 +49054,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    iter2 = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    iter2 = callPackage ({ emacs
+                         , fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "iter2";
-        version = "20171128.1211";
+        version = "20180510.633";
         src = fetchFromGitHub {
           owner = "doublep";
           repo = "iter2";
-          rev = "b0e8ecebe2d6807403a5eb1c75d68a4706259d4e";
-          sha256 = "038z7scy572n6cx0z59kiz59v7zqvn70wg2bwka5f3pglr67wzhp";
+          rev = "f8fb8dc7230cdcd37c5d0e4e5a432125c13816d2";
+          sha256 = "13q8p9cjz9c9j2l4vlwy6nvwh9y3b0aclg1b32zfdqhs6kmypisd";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d94316660051ee0ba0c12e380e6203986440368f/recipes/iter2";
           sha256 = "0kl3z2wwpvk2ddsb3798g41pv0xycsf9dclhv00snpzsr61d9v65";
-          name = "iter2";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -39319,8 +49079,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    iterator = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    iterator = callPackage ({ cl-lib ? null
+                            , emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "iterator";
         version = "20170207.38";
         src = fetchFromGitHub {
@@ -39329,10 +49094,10 @@
           rev = "9da54f9aed945b46866782cdf962c9e530419297";
           sha256 = "0r50hdyr9s18p7ggiyv36g011jgg47bgszvjgcmpp23rz131mxyw";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/66aa4c3b43083a0098ee3163005dcc36d7251146/recipes/iterator";
           sha256 = "17q10fw6y0icsv6vv9n968bwmbjlihrpkkyw62d1kfxhs9yw659z";
-          name = "iterator";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -39340,8 +49105,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    ivariants = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivs-edit, lib, melpaBuild }:
-    melpaBuild {
+    ivariants = callPackage ({ emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , ivs-edit
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "ivariants";
         version = "20170822.1924";
         src = fetchFromGitHub {
@@ -39350,10 +49120,10 @@
           rev = "ca0b74d32b5d2d77a45cc6ad6edc00be0ee85284";
           sha256 = "16hygfx9gla6yhc3kaiy4m6g910m1hak3v86fnpf12kzvjjs9zfx";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ca17de8cdd53bb32a9d3faaeb38f19f92b18ee38/recipes/ivariants";
           sha256 = "00fgcm62g4fw4306lw9ld2k7w0c358fcbkxn969k5p009g7pk5bw";
-          name = "ivariants";
+          name = "recipe";
         };
         packageRequires = [ emacs ivs-edit ];
         meta = {
@@ -39361,8 +49131,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    ivs-edit = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ivs-edit = callPackage ({ cl-lib ? null
+                            , dash
+                            , emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "ivs-edit";
         version = "20170818.741";
         src = fetchFromGitHub {
@@ -39371,10 +49147,10 @@
           rev = "5db39c234aa7393b591168a4fd0a9a4cbbca347d";
           sha256 = "1sdl83cf87zbv0ynvb6qlgbpm4d3dqhdn84jhhs5j247r5qzhmz6";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ca17de8cdd53bb32a9d3faaeb38f19f92b18ee38/recipes/ivs-edit";
           sha256 = "0gzhvzrfk17j2vwlg82f5ifk4dcfc1yv7barcij38ckran8cqmb2";
-          name = "ivs-edit";
+          name = "recipe";
         };
         packageRequires = [ cl-lib dash emacs ];
         meta = {
@@ -39382,20 +49158,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    ivy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ivy = callPackage ({ emacs
+                       , fetchFromGitHub
+                       , fetchurl
+                       , lib
+                       , melpaBuild }:
+      melpaBuild {
         pname = "ivy";
-        version = "20180415.905";
+        version = "20180713.946";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "1181d0f7acb9e77a15fa7e62cb1027979185c853";
-          sha256 = "0vsl346axdlkcv96cxlciw7bmvxwl2ficjgw9nxrsvhsjsy7md02";
+          rev = "93d51d6188956da2592c1458b68d7cef48d967ae";
+          sha256 = "024kj37xa4s49z8klcmn3a30zy3yzk5n9j9damzqmzd4d8klawi6";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy";
           sha256 = "0xf5p91r2ljl93wbr5wbgnb4hzhs00wkaf4fmdlf31la8xwwp5ci";
-          name = "ivy";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -39403,20 +49183,30 @@
           license = lib.licenses.free;
         };
       }) {};
-    ivy-bibtex = callPackage ({ biblio, cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib, s, swiper }:
-    melpaBuild {
+    ivy-bibtex = callPackage ({ biblio
+                              , cl-lib ? null
+                              , dash
+                              , f
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild
+                              , parsebib
+                              , s
+                              , swiper }:
+      melpaBuild {
         pname = "ivy-bibtex";
-        version = "20180328.1147";
+        version = "20180612.619";
         src = fetchFromGitHub {
           owner = "tmalsburg";
           repo = "helm-bibtex";
-          rev = "5be84d36758ed7d5838cc5c8796a6ff427ba7043";
-          sha256 = "1pqg49mj22izilx8x9rshflpyiw1q9zrp881nasp5lvbihwydvrg";
+          rev = "21f802aaf5b78dec18b72601dd8276c5244e39f5";
+          sha256 = "13jg728v8k227p68ngiwknlygzqdvasg6n9ax1a2xgjbx3di12vv";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c23c09225c57a9b9abe0a0a770a9184ae2e58f7c/recipes/ivy-bibtex";
           sha256 = "0qni48s09lgzqr98r49dhrzpfqp9yfwga11h7vhqclscjvlalpc2";
-          name = "ivy-bibtex";
+          name = "recipe";
         };
         packageRequires = [ biblio cl-lib dash f parsebib s swiper ];
         meta = {
@@ -39424,8 +49214,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    ivy-dired-history = callPackage ({ cl-lib ? null, counsel, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
-    melpaBuild {
+    ivy-dired-history = callPackage ({ cl-lib ? null
+                                     , counsel
+                                     , fetchFromGitHub
+                                     , fetchurl
+                                     , ivy
+                                     , lib
+                                     , melpaBuild }:
+      melpaBuild {
         pname = "ivy-dired-history";
         version = "20170625.2256";
         src = fetchFromGitHub {
@@ -39434,10 +49230,10 @@
           rev = "c9c67ea1ee5e68443f0e6006ba162d6c8d868b69";
           sha256 = "1lim9zi57w011df5zppb18yjkaxkgfy796pc6i01p4dl32x0rpfv";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ad37f6b04ff45fbffeadefc94db16baa27bcc2ac/recipes/ivy-dired-history";
           sha256 = "1vj073k5m0l8rx9iiisikzl053ad9mlhvbk30f5zmw9sw7b9blyl";
-          name = "ivy-dired-history";
+          name = "recipe";
         };
         packageRequires = [ cl-lib counsel ivy ];
         meta = {
@@ -39445,8 +49241,16 @@
           license = lib.licenses.free;
         };
       }) {};
-    ivy-erlang-complete = callPackage ({ async, counsel, emacs, erlang, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
-    melpaBuild {
+    ivy-erlang-complete = callPackage ({ async
+                                       , counsel
+                                       , emacs
+                                       , erlang
+                                       , fetchFromGitHub
+                                       , fetchurl
+                                       , ivy
+                                       , lib
+                                       , melpaBuild }:
+      melpaBuild {
         pname = "ivy-erlang-complete";
         version = "20180311.558";
         src = fetchFromGitHub {
@@ -39455,10 +49259,10 @@
           rev = "62e2b14ff25b0c143c882cb38d029b216acc3dd6";
           sha256 = "0sbxmj3ap0navgi7lxlgwb9ykfb8khgh7nl1hmqfh2jn9vx2s568";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ac1b9e350d3f066e4e56202ebb443134d5fc3669/recipes/ivy-erlang-complete";
           sha256 = "00fqjgrhvcn3ibpgiy4b0sr4x9p6ym5r1rvi4rdzsw2i3nxmgf3a";
-          name = "ivy-erlang-complete";
+          name = "recipe";
         };
         packageRequires = [ async counsel emacs erlang ivy ];
         meta = {
@@ -39466,29 +49270,39 @@
           license = lib.licenses.free;
         };
       }) {};
-    ivy-feedwrangler = callPackage ({ fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
-    melpaBuild {
+    ivy-feedwrangler = callPackage ({ fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "ivy-feedwrangler";
-        version = "20171121.1306";
+        version = "20180618.822";
         src = fetchFromGitHub {
           owner = "asimpson";
           repo = "ivy-feedwrangler";
-          rev = "ad4f94f8cc4557876ea0b0fb9b519f16ce23e96a";
-          sha256 = "1w312qh6ng4xrj3xmpm4pzfswj3kpwzjb3vbad0pig8cp0zrc39c";
+          rev = "051eac49cae32b16fab2e06ff0115cd8fb5dc499";
+          sha256 = "1irp76kbg8d7wmgvfjbb4c3wmd29bdrl503jkq4w52fl57g94cvj";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cf1c112939545f6d157111eabcb573738b09ef7c/recipes/ivy-feedwrangler";
           sha256 = "1mxm37biix8c0s32gfv4pidffvlgdz5i9325zk71fhgfzqwkf5vx";
-          name = "ivy-feedwrangler";
+          name = "recipe";
         };
-        packageRequires = [ ivy ];
+        packageRequires = [];
         meta = {
           homepage = "https://melpa.org/#/ivy-feedwrangler";
           license = lib.licenses.free;
         };
       }) {};
-    ivy-gitlab = callPackage ({ dash, fetchFromGitHub, fetchurl, gitlab, ivy, lib, melpaBuild, s }:
-    melpaBuild {
+    ivy-gitlab = callPackage ({ dash
+                              , fetchFromGitHub
+                              , fetchurl
+                              , gitlab
+                              , ivy
+                              , lib
+                              , melpaBuild
+                              , s }:
+      melpaBuild {
         pname = "ivy-gitlab";
         version = "20180312.947";
         src = fetchFromGitHub {
@@ -39497,10 +49311,10 @@
           rev = "68318aca3206d50701039c9aae39734ca29a49f9";
           sha256 = "0arsjdn0anp7pacwxd3cw4db8a7pgzjlnwav1l3maaz1176h4lpb";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/35d4d4f22e4c567954287b2a1cabcb595497095a/recipes/ivy-gitlab";
           sha256 = "0gbwsmb6my0327f9j96s20mybnjaw9yaiwhs3sy3vav0qww91z1y";
-          name = "ivy-gitlab";
+          name = "recipe";
         };
         packageRequires = [ dash gitlab ivy s ];
         meta = {
@@ -39508,20 +49322,27 @@
           license = lib.licenses.free;
         };
       }) {};
-    ivy-historian = callPackage ({ emacs, fetchFromGitHub, fetchurl, flx, historian, ivy, lib, melpaBuild }:
-    melpaBuild {
+    ivy-historian = callPackage ({ emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , flx
+                                 , historian
+                                 , ivy
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "ivy-historian";
         version = "20170715.2120";
         src = fetchFromGitHub {
           owner = "PythonNut";
           repo = "historian.el";
-          rev = "ec3dfa8786473e52ffc5ca9be95dbc59a9a87ff7";
-          sha256 = "1bxigdg3pmgc0s4il1spdw0p8y98k4hwwd89m4i3y97l43asy6p1";
+          rev = "6cc124987e18501a1f6f9a384144a22424be3ad8";
+          sha256 = "1r2p8fqbc1ms9wrhkxqqmmi8cyba1xdsy9yk2yq1rrivhqpl9fq7";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fb79cbc9af6cd443b9de97817d24bcc9050d5940/recipes/ivy-historian";
           sha256 = "0yzq3rr51q5d64pfc7x5jszz77x6nwpbjj0g74x5ga3bsw3i67d9";
-          name = "ivy-historian";
+          name = "recipe";
         };
         packageRequires = [ emacs flx historian ivy ];
         meta = {
@@ -39529,20 +49350,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    ivy-hydra = callPackage ({ emacs, fetchFromGitHub, fetchurl, hydra, ivy, lib, melpaBuild }:
-    melpaBuild {
+    ivy-hydra = callPackage ({ emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , hydra
+                             , ivy
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "ivy-hydra";
-        version = "20180208.912";
+        version = "20180614.1500";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "1181d0f7acb9e77a15fa7e62cb1027979185c853";
-          sha256 = "0vsl346axdlkcv96cxlciw7bmvxwl2ficjgw9nxrsvhsjsy7md02";
+          rev = "8c1a191764446397f31d4c8e47e687f5b521e46f";
+          sha256 = "14csqz3mj33rjby8vgzlarcymn97jx8678w4n6mfd9m1h40fb7nv";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy-hydra";
           sha256 = "1xv8nfi6dzhx868h44ydq4f5jmsa7rbqfa7jk8g0z0ifv477hrvx";
-          name = "ivy-hydra";
+          name = "recipe";
         };
         packageRequires = [ emacs hydra ivy ];
         meta = {
@@ -39550,8 +49377,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    ivy-lobsters = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
-    melpaBuild {
+    ivy-lobsters = callPackage ({ cl-lib ? null
+                                , fetchFromGitHub
+                                , fetchurl
+                                , ivy
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "ivy-lobsters";
         version = "20171202.1241";
         src = fetchFromGitHub {
@@ -39560,10 +49392,10 @@
           rev = "4364df4b3685fd1b50865ac9360fb948c0288dd1";
           sha256 = "1cfcy2ks0kb04crwlfp02052zcwg384cgz7xjyafwqynm77d35l0";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d9774fbf133ce8db3ce996b1a40c586309a2fec6/recipes/ivy-lobsters";
           sha256 = "1g8bwlh4nls21k16r1pmqmb633j19h3jnjbfl2vixyrh2na8ff1w";
-          name = "ivy-lobsters";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ivy ];
         meta = {
@@ -39571,20 +49403,27 @@
           license = lib.licenses.free;
         };
       }) {};
-    ivy-mpdel = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, libmpdel, melpaBuild, mpdel }:
-    melpaBuild {
+    ivy-mpdel = callPackage ({ emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , ivy
+                             , lib
+                             , libmpdel
+                             , melpaBuild
+                             , mpdel }:
+      melpaBuild {
         pname = "ivy-mpdel";
-        version = "20180401.1207";
+        version = "20180502.1148";
         src = fetchFromGitHub {
           owner = "mpdel";
           repo = "ivy-mpdel";
-          rev = "f9f745792abfed85d535b4cb5b2a95f944bbad1d";
-          sha256 = "1sxd9hny0n751irf87bab0g3ygq6j4g32gdy4yk27y3r00i9g4b6";
+          rev = "16c0e67e4411c4da158a708edf427505ebbf8845";
+          sha256 = "0ddvp8d5vxab40rmk7zj5r8hwgszrl18p0mj8fal7yp1f8la550d";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bb25443752e18e47afc63d5497cc5052c388a607/recipes/ivy-mpdel";
           sha256 = "1v9xiy4bs7r24li6fwi5dfqav8dfr3dy0xhj3wnzvcgwxp5ji56r";
-          name = "ivy-mpdel";
+          name = "recipe";
         };
         packageRequires = [ emacs ivy libmpdel mpdel ];
         meta = {
@@ -39592,20 +49431,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    ivy-pages = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
-    melpaBuild {
+    ivy-pages = callPackage ({ emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , ivy
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "ivy-pages";
         version = "20160728.1220";
         src = fetchFromGitHub {
           owner = "igorepst";
           repo = "ivy-pages";
-          rev = "47b03a1f9384502cf22369ff31a2898c863d3aff";
-          sha256 = "0jv74s8jn1sdwdhxkx11gnaqcc49369gld1g6a1hl62521j897rc";
+          rev = "428a901f94c9625c8407fd2bf76f9d7714d40d87";
+          sha256 = "11lcv8dqlmfqvhn7n3wfp9idr5hf30312p213y5pvs4m70lbc9k2";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/93f1183beb74aa4a96de8cd043a2a8eefdd7ad7e/recipes/ivy-pages";
           sha256 = "0zz8nbjma8r6r7xxbg7xfz13202d77k1ybzpib41slmljzh7xgwv";
-          name = "ivy-pages";
+          name = "recipe";
         };
         packageRequires = [ emacs ivy ];
         meta = {
@@ -39613,8 +49457,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    ivy-pass = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild, password-store }:
-    melpaBuild {
+    ivy-pass = callPackage ({ emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , ivy
+                            , lib
+                            , melpaBuild
+                            , password-store }:
+      melpaBuild {
         pname = "ivy-pass";
         version = "20170812.1255";
         src = fetchFromGitHub {
@@ -39623,10 +49473,10 @@
           rev = "5b523de1151f2109fdd6a8114d0af12eef83d3c5";
           sha256 = "18crb4zh2pjf0cmv3b913m9vfng27girjwfqc3mk7vqd1r5a49yk";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7bfef855e071442d2b9d1e0ce9b5706937bffc53/recipes/ivy-pass";
           sha256 = "1sb29q22fsjqfxqznf73xcqhzy132bjd45w7r27sfmf825vcysci";
-          name = "ivy-pass";
+          name = "recipe";
         };
         packageRequires = [ emacs ivy password-store ];
         meta = {
@@ -39634,8 +49484,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    ivy-phpunit = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild, phpunit }:
-    melpaBuild {
+    ivy-phpunit = callPackage ({ emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , ivy
+                               , lib
+                               , melpaBuild
+                               , phpunit }:
+      melpaBuild {
         pname = "ivy-phpunit";
         version = "20180219.115";
         src = fetchFromGitHub {
@@ -39644,10 +49500,10 @@
           rev = "ffedb0138d36564e8e36a28fd9bc71ea8944681f";
           sha256 = "0kf1k3jqg2r20x985h6brg92sg7y47c5vkfjky8xp11gqyqw47bi";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/93822c5588f81683e3d43f690785b80c207d331d/recipes/ivy-phpunit";
           sha256 = "1spvcf41lvjdmiwp6058wrpp0hfg1cjld6b7zm28m2ys6mn35ycs";
-          name = "ivy-phpunit";
+          name = "recipe";
         };
         packageRequires = [ emacs ivy phpunit ];
         meta = {
@@ -39655,20 +49511,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    ivy-posframe = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild, posframe }:
-    melpaBuild {
+    ivy-posframe = callPackage ({ emacs
+                                , fetchFromGitHub
+                                , fetchurl
+                                , ivy
+                                , lib
+                                , melpaBuild
+                                , posframe }:
+      melpaBuild {
         pname = "ivy-posframe";
-        version = "20180309.132";
+        version = "20180707.2016";
         src = fetchFromGitHub {
           owner = "tumashu";
           repo = "ivy-posframe";
-          rev = "b9b9a45455692d06b89d4fbf40bba6852b9a109a";
-          sha256 = "1sc8mwk5ans3l0p465wl3blvchfmkhyg06x95b0dnkjldzkk2v6a";
+          rev = "ff2578a044dbe3ba5711ed727cc778b5aa108676";
+          sha256 = "0nphklyn3czr5zvdl5m31fc3sc80mn0izdmmxnq9cj7hz8fc61ch";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9e7c6f7ca439683abf11dcaa38672ac139c0da4f/recipes/ivy-posframe";
           sha256 = "1sv4xvdvb1g8g5m4f1f159lxbxaz96drsmvhh0k43hp1dh3bhj3b";
-          name = "ivy-posframe";
+          name = "recipe";
         };
         packageRequires = [ emacs ivy posframe ];
         meta = {
@@ -39676,8 +49538,41 @@
           license = lib.licenses.free;
         };
       }) {};
-    ivy-purpose = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild, window-purpose }:
-    melpaBuild {
+    ivy-prescient = callPackage ({ emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , ivy
+                                 , lib
+                                 , melpaBuild
+                                 , prescient }:
+      melpaBuild {
+        pname = "ivy-prescient";
+        version = "20180714.825";
+        src = fetchFromGitHub {
+          owner = "raxod502";
+          repo = "prescient.el";
+          rev = "f9ac261eb45faef9a87c36b997d9a496fe63d1cd";
+          sha256 = "0kjz6wdyhvs4mbp0n1avprx4mwyx3az5p1sak6c4xnqdqnn2azly";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/a92495d09689932ab9f0b716078ceeeb9cc154e0/recipes/ivy-prescient";
+          sha256 = "017ibpbj390q5d051k3wn50774wvcixzbwikvi5ifzqkhgixqk9c";
+          name = "recipe";
+        };
+        packageRequires = [ emacs ivy prescient ];
+        meta = {
+          homepage = "https://melpa.org/#/ivy-prescient";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ivy-purpose = callPackage ({ emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , ivy
+                               , lib
+                               , melpaBuild
+                               , window-purpose }:
+      melpaBuild {
         pname = "ivy-purpose";
         version = "20160724.303";
         src = fetchFromGitHub {
@@ -39686,10 +49581,10 @@
           rev = "0495f2f3aed64d7e0028125e76a9a68f8fc4107e";
           sha256 = "1hiw7mnrr0cnnp0a2mh837pzdaknadwv0sk82vya6blx0a7m691g";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1fa2a37a1a6492eddf638216acec4b9d54d3498d/recipes/ivy-purpose";
           sha256 = "0c5n7x3sa57wslwnldvc0i315xhyi1zndyhr07rzka1rhj8v1c4v";
-          name = "ivy-purpose";
+          name = "recipe";
         };
         packageRequires = [ emacs ivy window-purpose ];
         meta = {
@@ -39697,20 +49592,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    ivy-rich = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
-    melpaBuild {
+    ivy-rich = callPackage ({ emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , ivy
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "ivy-rich";
-        version = "20180314.1909";
+        version = "20180704.1845";
         src = fetchFromGitHub {
           owner = "yevgnen";
           repo = "ivy-rich";
-          rev = "69314197b6563b87d145eb13ea16efd5b20513a6";
-          sha256 = "1a09mf51nbjvz8i91vx09rricvnlpmnh1znwhrxi5iiwa1pd0dlh";
+          rev = "6575eb27510e841607b9e8cea87998a50fbc7be7";
+          sha256 = "0agnpkkwvhf3g0cpl1c8p5dj4cnlg3890pg73p4rvrv2i27ni2h4";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0fc297f4949e8040d1b0b3271c9a70c64887b960/recipes/ivy-rich";
           sha256 = "0knkqc403gch4dp1q114h64cwwisxwnsxjqbl3cnidlwkn7lzk7m";
-          name = "ivy-rich";
+          name = "recipe";
         };
         packageRequires = [ emacs ivy ];
         meta = {
@@ -39718,20 +49618,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    ivy-rtags = callPackage ({ fetchFromGitHub, fetchurl, ivy, lib, melpaBuild, rtags }:
-    melpaBuild {
+    ivy-rtags = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , ivy
+                             , lib
+                             , melpaBuild
+                             , rtags }:
+      melpaBuild {
         pname = "ivy-rtags";
         version = "20170522.2154";
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "4747d5b695bee40c3b0a2e3591ac8897571edd66";
-          sha256 = "1qy71bx8nki73mqslw54hq5bn1asz5qg1b2848nrsj8zb2yd85x5";
+          rev = "7e6b6f21935eedbe4678ba91c5531ac162b51a5a";
+          sha256 = "12629d1s8rplhjh17n3bmgnkpscq4gljgyl84j8qyhh40dwq1qk0";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ivy-rtags";
           sha256 = "18f0jak643dd8lmx701wgk95miajabd8190ls35831slr28lqxsq";
-          name = "ivy-rtags";
+          name = "recipe";
         };
         packageRequires = [ ivy rtags ];
         meta = {
@@ -39739,8 +49644,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    ivy-todo = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
-    melpaBuild {
+    ivy-todo = callPackage ({ emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , ivy
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "ivy-todo";
         version = "20171208.809";
         src = fetchFromGitHub {
@@ -39749,10 +49659,10 @@
           rev = "964e347cea1a6097854d7113f5b07f6c5ef81df0";
           sha256 = "07208qdk1a77dgh9qmpn164x5mgkzvprsdvb7y35ax12r2q541b8";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/97909da7899d4187e8eb6b3284f6225ebec7fa51/recipes/ivy-todo";
           sha256 = "12sfg2rbnk73a34ap94g4g70gx13llcgsrmfdrgrzk83a2274a2r";
-          name = "ivy-todo";
+          name = "recipe";
         };
         packageRequires = [ emacs ivy ];
         meta = {
@@ -39760,20 +49670,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    ivy-xcdoc = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
-    melpaBuild {
+    ivy-xcdoc = callPackage ({ emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , ivy
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "ivy-xcdoc";
         version = "20160917.355";
         src = fetchFromGitHub {
           owner = "hex2010";
           repo = "emacs-ivy-xcdoc";
-          rev = "5ea22af36c4c2737fb0bec53432c233482d8b314";
-          sha256 = "1m5ljx395yw70fx643pnf7pk709s9v5b77zvvv3j21d0cjnppqz5";
+          rev = "fbf264b0746182567b17fd7409fff8eed3658c71";
+          sha256 = "1y55p3qaz054lxb7q8vq00h3spyfbc9xnilm26b4vcps5y0limp6";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d2fd855c098ca65293d84c3b526b0c39f7b07ade/recipes/ivy-xcdoc";
           sha256 = "1my45325ys2m2l5y8pmi5jnbplqm16b1n7zll37163vv16zwnd53";
-          name = "ivy-xcdoc";
+          name = "recipe";
         };
         packageRequires = [ emacs ivy ];
         meta = {
@@ -39781,20 +49696,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    ivy-xref = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
-    melpaBuild {
+    ivy-xref = callPackage ({ emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , ivy
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "ivy-xref";
-        version = "20180405.1721";
+        version = "20180701.2117";
         src = fetchFromGitHub {
           owner = "alexmurray";
           repo = "ivy-xref";
-          rev = "5c21aa14c81df1b75a4c7090729a41f755b74916";
-          sha256 = "0qw3yqbs340k4mv0wy42nrn7r1wx537ypnr2idrll4v8fppfz24n";
+          rev = "f8ab1eeab05f025a97ddf2f239862db14e3430e9";
+          sha256 = "0k6v3iamdchwnlpr1vbw1wjzc8hr2745qpvmwa74rsqgbj79p9pg";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a4cd8724e8a4119b61950a97b88219bf56ce3945/recipes/ivy-xref";
           sha256 = "1p5a0x83b0bc7b654j1d207s7vifffgwmp26pya2mz0czd68ywy8";
-          name = "ivy-xref";
+          name = "recipe";
         };
         packageRequires = [ emacs ivy ];
         meta = {
@@ -39802,20 +49722,54 @@
           license = lib.licenses.free;
         };
       }) {};
-    ivy-youtube = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild, request }:
-    melpaBuild {
+    ivy-yasnippet = callPackage ({ dash
+                                 , emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , ivy
+                                 , lib
+                                 , melpaBuild
+                                 , yasnippet }:
+      melpaBuild {
+        pname = "ivy-yasnippet";
+        version = "20180620.2336";
+        src = fetchFromGitHub {
+          owner = "mkcms";
+          repo = "ivy-yasnippet";
+          rev = "817c52a0f74dcd156c7f8c6433dfb6b32753428a";
+          sha256 = "1qx71alaj3bzis6qd3vs9jg52lkr871830rbpgxy1s7ks6qj79yd";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/8c76857d716afab46f5efe46e353935921d5f217/recipes/ivy-yasnippet";
+          sha256 = "180q6hrsnkssbf9x9bj74dyy26kym4akbsjlj81x4193nnmc5w67";
+          name = "recipe";
+        };
+        packageRequires = [ dash emacs ivy yasnippet ];
+        meta = {
+          homepage = "https://melpa.org/#/ivy-yasnippet";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ivy-youtube = callPackage ({ cl-lib ? null
+                               , fetchFromGitHub
+                               , fetchurl
+                               , ivy
+                               , lib
+                               , melpaBuild
+                               , request }:
+      melpaBuild {
         pname = "ivy-youtube";
         version = "20171112.732";
         src = fetchFromGitHub {
           owner = "squiter";
           repo = "ivy-youtube";
-          rev = "8168dc1f26521830dfd99466d35ab93159afd004";
-          sha256 = "1yds7ffqd9rd87vypvnpzl4i7678f6879hdj4whr9zn47hsbdfzn";
+          rev = "23e1089d4c4fc32db20df14ba10078aabf117e87";
+          sha256 = "0m70vxjj49kf8bzni2qchgzgx808z1fcfh02cflkhjcb77dkq8d6";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ivy-youtube";
           sha256 = "1masw9qc33valx55klfhzx0bg1hfazmn5yd9wh12q2gjsz8nxyw4";
-          name = "ivy-youtube";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ivy request ];
         meta = {
@@ -39823,20 +49777,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    ix = callPackage ({ fetchFromGitHub, fetchurl, grapnel, lib, melpaBuild }:
-    melpaBuild {
+    ix = callPackage ({ fetchFromGitHub
+                      , fetchurl
+                      , grapnel
+                      , lib
+                      , melpaBuild }:
+      melpaBuild {
         pname = "ix";
         version = "20131027.929";
         src = fetchFromGitHub {
           owner = "theanalyst";
           repo = "ix.el";
-          rev = "aea4c54a5cc5a6f26637353c16a3a0e70fc76963";
-          sha256 = "069alh9vs6is3hvbwxbwr9g8qq9md5c92wg5bfswi99yciqdvc4i";
+          rev = "47632caf925fbb3cc8633834d2d619032d039336";
+          sha256 = "1j6axmi6fxcl2ja4660ygxchggm2dzjngi0k3g6pimawykvgxs3n";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3a9d68fcf5bddbf07909b77682474dc592077051/recipes/ix";
           sha256 = "1fl76dk8vgw3mrh5iz99lrsllwya6ij9d1lj3szcrs4qnj0b5ql3";
-          name = "ix";
+          name = "recipe";
         };
         packageRequires = [ grapnel ];
         meta = {
@@ -39844,20 +49802,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    iy-go-to-char = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    iy-go-to-char = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "iy-go-to-char";
         version = "20141029.846";
         src = fetchFromGitHub {
           owner = "doitian";
           repo = "iy-go-to-char";
-          rev = "04ab4f5f3a241cbbc9b8c178a22b412a62f632f9";
-          sha256 = "0bcm3y3qvsrk7gd23xfzz5bgcnm3h4l63w9hv8cr9n86sm8475m1";
+          rev = "11b2a90d10e29151d18f8997f804b745b710b040";
+          sha256 = "1jgs41mf3nizjiiq64gzymjvd559mffr1agj9hvq0x42a3dwfc81";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0fda2b54a0ff0b6fc3bd6d20cfcbbf63cae5380f/recipes/iy-go-to-char";
           sha256 = "10szn9y7gl8947p3f9w6p6vzjf1a9cjif9mbj3qdqx4vbsl9mqpz";
-          name = "iy-go-to-char";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -39865,8 +49826,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    j-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    j-mode = callPackage ({ fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "j-mode";
         version = "20171224.1056";
         src = fetchFromGitHub {
@@ -39875,10 +49839,10 @@
           rev = "e8725ac8af95498faabb2ca3ab3bd809a8f148e6";
           sha256 = "0icrwny3cif0iwgyf9i25sj9i5gy056cn9ic2wwwbzqjqb4xg6dd";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/410134ab2145adad3648b1024bfe4f6801df82c9/recipes/j-mode";
           sha256 = "0f9lsr9hjhdvmzx565ivlncfzb4iq4rjjn6a41053cjy50bl066i";
-          name = "j-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -39886,19 +49850,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    jabber = callPackage ({ fetchgit, fetchurl, fsm, lib, melpaBuild }:
-    melpaBuild {
+    jabber = callPackage ({ fetchgit
+                          , fetchurl
+                          , fsm
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "jabber";
-        version = "20170106.1603";
+        version = "20170423.513";
         src = fetchgit {
-          url = "https://git.code.sf.net/p/emacs-jabber/git";
-          rev = "2ef76cff4a5a932cf17dc6107a0c5adee806081e";
-          sha256 = "0jvgp121544vc0yd31cncz06dkgw4za605nkk914vmql321zjzr2";
+          url = "https://github.com/legoscia/emacs-jabber.git";
+          rev = "3de7fb40ab9c82ada2a4b5f364a2417345953050";
+          sha256 = "0miq8y9yfnhihwxayzri81s21qwqm5vyj3h7j95q5kmdml661fb4";
         };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/jabber";
-          sha256 = "0saajvfpzgcsqa7h7aa6l0bns6swr40c46md6s0d90x9lrvwp7ws";
-          name = "jabber";
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7dbf3c2ffee5a4d71466ce037c618e0434a346/recipes/jabber";
+          sha256 = "04d2jdzs3c790ms70px8xvyip1liqvd3jy2mbs8qqbwyiccb74xx";
+          name = "recipe";
         };
         packageRequires = [ fsm ];
         meta = {
@@ -39906,8 +49874,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    jabber-otr = callPackage ({ emacs, fetchFromGitHub, fetchurl, jabber, lib, melpaBuild }:
-    melpaBuild {
+    jabber-otr = callPackage ({ emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , jabber
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "jabber-otr";
         version = "20150918.444";
         src = fetchFromGitHub {
@@ -39916,10 +49889,10 @@
           rev = "2692b1530234e0ba9a0d6c1eaa1cbe8679f193c0";
           sha256 = "0yv86nadp6dfzl05vhk8c1kahg2pcrhfmd3mnfjrngp7ksac5lyf";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9219f685c18c8e799cae3dc43cc1c740c0f67733/recipes/jabber-otr";
           sha256 = "114z5bwhkza03yvfa4nmicaih2jdq83lh6micxjimpddsc8fjgi0";
-          name = "jabber-otr";
+          name = "recipe";
         };
         packageRequires = [ emacs jabber ];
         meta = {
@@ -39927,8 +49900,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    jack-connect = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    jack-connect = callPackage ({ fetchgit
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "jack-connect";
         version = "20141207.407";
         src = fetchgit {
@@ -39936,10 +49912,10 @@
           rev = "b00658dfe3d5d67431c18ffa693d5a3705067ba0";
           sha256 = "1a33z07m9rh42pbcjv7sd640gf6jjzs4yn6idx52g8i5vzns0dkh";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c0f5c5f8051f3046baebb08f41b0ca0bf0d73c85/recipes/jack-connect";
           sha256 = "1ssl126wihaf8m2f6ms0l5ai6pz5wn348a09k6l0h3jfww032g1q";
-          name = "jack-connect";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -39947,8 +49923,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    jade-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    jade-mode = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "jade-mode";
         version = "20160525.741";
         src = fetchFromGitHub {
@@ -39957,10 +49936,10 @@
           rev = "4dbde92542fc7ad61df38776980905a4721d642e";
           sha256 = "0p6pfxbl98kkwa3lgx82h967w4p0wbd9s96gvs72d74ryan07ij1";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/877b5a3e612e1b1d6d51e60c66b0b79f231abdb2/recipes/jade-mode";
           sha256 = "156j0d9wx6hrhph0nsjsi1jha4h65rcbrbff1j2yr8vdsszjrs94";
-          name = "jade-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -39968,8 +49947,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    jammer = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    jammer = callPackage ({ fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "jammer";
         version = "20160310.59";
         src = fetchFromGitHub {
@@ -39978,10 +49960,10 @@
           rev = "48aa795df6df7ae6484518bcd0398293ca49d7c6";
           sha256 = "1gnj8vmpxds2wdkz49swiby5vq2hvbf64q5hhvwymfdvwlk54v55";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cb82a6e936e2d5d1dd5930b600ede52dac3ceb33/recipes/jammer";
           sha256 = "01c4bii7gswhp6z9dgx4bhvsywiwbbdv7mg1zj6vp1530l74zx6z";
-          name = "jammer";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -39989,20 +49971,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    japanese-holidays = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    japanese-holidays = callPackage ({ cl-lib ? null
+                                     , fetchFromGitHub
+                                     , fetchurl
+                                     , lib
+                                     , melpaBuild }:
+      melpaBuild {
         pname = "japanese-holidays";
         version = "20160927.2318";
         src = fetchFromGitHub {
           owner = "emacs-jp";
           repo = "japanese-holidays";
-          rev = "0bccfac342d6ebda1c1a35c3babca0c800ff0c9b";
-          sha256 = "1id40wxjb9j20lxhsq16j6qmdr6c7sh65iq7iyjqhrz5c4706x66";
+          rev = "4207ee349356837ebfbf0badb6c42f256412c833";
+          sha256 = "1n4imcnwqdixd8ybc06hmmh6l28gv0c6mvrpwg7fh9lgsvmgbxb3";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/80088028a1322e99e5fc50bebe08fcb6d1a2a44d/recipes/japanese-holidays";
           sha256 = "0pxpkikkn2ys0kgf3lbrdxv8iym50h5ik2xzza0qk7cw1v93jza9";
-          name = "japanese-holidays";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -40010,20 +49996,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    japanlaw = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    japanlaw = callPackage ({ cl-lib ? null
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "japanlaw";
         version = "20160129.20";
         src = fetchFromGitHub {
           owner = "mhayashi1120";
           repo = "japanlaw.el";
-          rev = "c160e195cda0e02a709a2d39c62bc2a1ed39a09a";
-          sha256 = "1lrsm282lhp7pf0gwr3aad2228lvpqnqs1qdv2xk0zljqnqc0bhx";
+          rev = "ad318559d626652d1bc59baa8ab86d5075361e33";
+          sha256 = "1wjgjbzk66a4bv60lkf76g1bd9rw892kx36ijvr9vl6z760rrrcm";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6192e1db76f017c3b1315453144cffc47cdd495d/recipes/japanlaw";
           sha256 = "1pxss1mjk5660k80r1xqgslnbrsr6r4apgp9abjwjfxpg4f6d0sa";
-          name = "japanlaw";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -40031,20 +50021,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    jape-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    jape-mode = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "jape-mode";
         version = "20140903.806";
         src = fetchFromGitHub {
           owner = "tanzoniteblack";
           repo = "jape-mode";
-          rev = "85b9182850707b5d107391f6caee5bd401507a7d";
-          sha256 = "0xmv7gw5xms6nhjcl51cw33yvjgw0c6bpnlyca3195x7g34sg1zj";
+          rev = "27dbebc4de93eb887038fda7a11671349efe8dbb";
+          sha256 = "0bnh5jvqjwrd5wqh1gvbx2z7sjczf8cvah9y58c2v68ia5drxb3z";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b034024bd31c4be96c478a951b0ef63d8f89a1b7/recipes/jape-mode";
           sha256 = "1gd685r86h0kr36msw81gfgwv7d35hihz6h0jkc6vd22wf6qc3ly";
-          name = "jape-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -40052,8 +50045,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    jar-manifest-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    jar-manifest-mode = callPackage ({ fetchFromGitHub
+                                     , fetchurl
+                                     , lib
+                                     , melpaBuild }:
+      melpaBuild {
         pname = "jar-manifest-mode";
         version = "20160430.1726";
         src = fetchFromGitHub {
@@ -40062,10 +50058,10 @@
           rev = "270dae14c481300f75ed96dad3a5ae42ca928a1d";
           sha256 = "1p7w3hq2cyn1245q0zn8m7hpjs8nbp7kqfmd2gzi2k209czipy21";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ed68a9120d4f1e2895606938d1a117fb01abd1bc/recipes/jar-manifest-mode";
           sha256 = "0kx358m3p23r8m7z45454i62ijmdlf4mljlbqc20jkihfanr6wqd";
-          name = "jar-manifest-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -40073,20 +50069,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    jasminejs-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    jasminejs-mode = callPackage ({ fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "jasminejs-mode";
         version = "20150526.1705";
         src = fetchFromGitHub {
           owner = "stoltene2";
           repo = "jasminejs-mode";
-          rev = "9f8044bf81ab5b4841a30b0bd099916e1b7ff54a";
-          sha256 = "1zcrxijcwqfs6r1cd6w4jq8g3ly0a69nf0cbx93w5v86x2kjpz0l";
+          rev = "23637d6718423d376eebbdaa4d6d914c7cab26ed";
+          sha256 = "1p31x23cc1xjziydbphfh4pbv43703x2x0i2kz7a8c6hvka07lym";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8e58e8c102f6110f9a8bda47a4601197db47e743/recipes/jasminejs-mode";
           sha256 = "1a70j3aglrwmaw9g8m99sxad2vs53y4swxh97gqjsgx1rrx03g52";
-          name = "jasminejs-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -40094,8 +50093,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    jastadd-ast-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    jastadd-ast-mode = callPackage ({ emacs
+                                    , fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "jastadd-ast-mode";
         version = "20161219.126";
         src = fetchFromGitHub {
@@ -40104,10 +50107,10 @@
           rev = "a29fdb470cbf0a398164950a3b0d2217de48e0c0";
           sha256 = "01fv0ixkshy7i6wzcgq6xvijvh3n402vyhmh3qzjwi9p0vxvdyxv";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/32d59dd9e796438f1752d36a30d4e062abbb6dd1/recipes/jastadd-ast-mode";
           sha256 = "1cwqxzmqx5wxaax12rq0hy0whpaivqncykym43p3an2sl9s6ngva";
-          name = "jastadd-ast-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -40115,8 +50118,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    java-imports = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pcache, s }:
-    melpaBuild {
+    java-imports = callPackage ({ emacs
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild
+                                , pcache
+                                , s }:
+      melpaBuild {
         pname = "java-imports";
         version = "20170913.710";
         src = fetchFromGitHub {
@@ -40125,10 +50134,10 @@
           rev = "e96ff44ed48b362ab6227b8b802b84d84f78bcaa";
           sha256 = "0nryawj8v6gj6hnb81yf6966kjnydcz49zsg2k355gldryqf4v5p";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5f6f4e4c14c422c2066f2200bb9b8f35e2ecc896/recipes/java-imports";
           sha256 = "1waz6skyrm1n8wpc0pwa652l11wz8qz1m89mqxk27k3lwyd84n98";
-          name = "java-imports";
+          name = "recipe";
         };
         packageRequires = [ emacs pcache s ];
         meta = {
@@ -40136,8 +50145,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    java-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
-    melpaBuild {
+    java-snippets = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild
+                                 , yasnippet }:
+      melpaBuild {
         pname = "java-snippets";
         version = "20160626.1952";
         src = fetchFromGitHub {
@@ -40146,10 +50159,10 @@
           rev = "738523debb1018439bda0ce70e00248154a600ac";
           sha256 = "0k9iq8f5ngx80r965hc9bzmaa7y4vwn4vx10v1v9f46h48kmsg0q";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ec561bb8ee3d6df0d493c20497dd8c5897bf1e5e/recipes/java-snippets";
           sha256 = "0bsmp6sc3khdadkmwqy8khz8kzqijcsv70gimm2cs1kwnbyj6pfp";
-          name = "java-snippets";
+          name = "recipe";
         };
         packageRequires = [ yasnippet ];
         meta = {
@@ -40157,8 +50170,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    javadoc-lookup = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    javadoc-lookup = callPackage ({ cl-lib ? null
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "javadoc-lookup";
         version = "20160213.1631";
         src = fetchFromGitHub {
@@ -40167,10 +50184,10 @@
           rev = "507a2dd443d60b537b8f779c1847e2cd0ccd1382";
           sha256 = "16gywcma1s8kslwznlxwlx0xj0gs5g31637kb74vfdplk48f04zj";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3d7d5f55c7d90181cc4eff68bb472f772f070a93/recipes/javadoc-lookup";
           sha256 = "1fffs0iqkk9rg5vbxifvn09j4i2751p81bzcvy5fslr3r1r2nv79";
-          name = "javadoc-lookup";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -40178,8 +50195,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    javap-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    javap-mode = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "javap-mode";
         version = "20120223.1408";
         src = fetchFromGitHub {
@@ -40188,10 +50208,10 @@
           rev = "864c1130e204b2072e1d19cd027b6fce8ebe6629";
           sha256 = "070r4mg4v937n4h2bmzdbn3vsmmq7ijz69nankqs761jxv5gcwlg";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/009ce356c410d980613f21fa7c9f1c97ee9af76f/recipes/javap-mode";
           sha256 = "19p39l4nwgxm52yimy4j6l43845cpk8g5qdrldlwfxd7dvay09ay";
-          name = "javap-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -40199,20 +50219,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    jaword = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, tinysegmenter }:
-    melpaBuild {
+    jaword = callPackage ({ fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild
+                          , tinysegmenter }:
+      melpaBuild {
         pname = "jaword";
         version = "20170425.2327";
         src = fetchFromGitHub {
           owner = "zk-phi";
           repo = "jaword";
-          rev = "ac062b0e5ab4bd3270497e80aa0f3ac033a0493f";
-          sha256 = "05kbscympb59njfrs94w4b2lwkc3057wzib65kq0l93bx4pcw2iy";
+          rev = "a084558075f8892d61214aa21ff3663dd466cf4c";
+          sha256 = "0vjim6a9hy6bkbiaggdljlkbga2gpyv89zrla8sdgw8s2yh8m8bl";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/00fe123ddc7fbcb9fd2b97e8a9fc8a8c5fabbf7f/recipes/jaword";
           sha256 = "05pzh99zfl8n3p6lxdd9abr52m24hqcb105458i1cy0ra840bf4d";
-          name = "jaword";
+          name = "recipe";
         };
         packageRequires = [ tinysegmenter ];
         meta = {
@@ -40220,8 +50244,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    jazz-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    jazz-theme = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "jazz-theme";
         version = "20170411.711";
         src = fetchFromGitHub {
@@ -40230,10 +50257,10 @@
           rev = "b1cb78a97cc4050f19d88a89e455c3e52d98240e";
           sha256 = "0q9gfa40qh9wypvzg3xrv4kh6l51az9swb39133961dc8zrrrinm";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/da25345df9d8d567541ed6b0ec832310cde67115/recipes/jazz-theme";
           sha256 = "0ad8kvrmd3gyb8wfghcl4r3kwzplk5gxlw3p23wsbx6c2xq6xr7g";
-          name = "jazz-theme";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -40241,8 +50268,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    jbeans-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    jbeans-theme = callPackage ({ emacs
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "jbeans-theme";
         version = "20180309.825";
         src = fetchFromGitHub {
@@ -40251,10 +50282,10 @@
           rev = "3caa95998d8492a2ca6c17971de499ca15609871";
           sha256 = "0k8bd5j09753czl55dcwijs4j1vxir4zwcwlgsxli4b4f8sl2z8r";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6dd4bd78795ec7509d8744fec1e80426ce0557ec/recipes/jbeans-theme";
           sha256 = "0y7ccycfnpykgzr88968w7dl45qazf8b9zlf7ydw3ghkl4f6lbwl";
-          name = "jbeans-theme";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -40262,8 +50293,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    jdecomp = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    jdecomp = callPackage ({ emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "jdecomp";
         version = "20170224.1400";
         src = fetchFromGitHub {
@@ -40272,10 +50307,10 @@
           rev = "692866abc83deedce62be8d6040cf24dda7fb7a8";
           sha256 = "00l6mc643na97jrb0k595kwmfg8wc7m5iqjd9l9vvf3dal6389b8";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/jdecomp";
           sha256 = "1vgjmz7rxvgy9lprzr5b018lzqy3h0zg8913la1bzgwlm3mr68y5";
-          name = "jdecomp";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -40283,20 +50318,28 @@
           license = lib.licenses.free;
         };
       }) {};
-    jdee = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, memoize, s }:
-    melpaBuild {
+    jdee = callPackage ({ dash
+                        , emacs
+                        , fetchFromGitHub
+                        , fetchurl
+                        , flycheck
+                        , lib
+                        , melpaBuild
+                        , memoize
+                        , s }:
+      melpaBuild {
         pname = "jdee";
-        version = "20180218.919";
+        version = "20180711.1336";
         src = fetchFromGitHub {
           owner = "jdee-emacs";
           repo = "jdee";
-          rev = "07afc434bb502d85fc8b882f62fc4d237d23f34e";
-          sha256 = "0pnf80l5v0sn24p64pb36lrajs9b7p4y9m984hm52k2ah8kjg2n5";
+          rev = "9192578df89dc92c88a7faf71d8aaf4f60bcb84c";
+          sha256 = "0ahpygiw7ik82y75khhhr8d81883cpnld10xdcarzj0mblhi3vqf";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a6d2c98f3bf2075e33d95c7befe205df802e798d/recipes/jdee";
           sha256 = "15n76w0ygjmsa2bym59bkmbbh0kpqx6nacp4zz32hlg48kgz1dx4";
-          name = "jdee";
+          name = "recipe";
         };
         packageRequires = [ dash emacs flycheck memoize s ];
         meta = {
@@ -40304,20 +50347,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    jedi = callPackage ({ auto-complete, emacs, fetchFromGitHub, fetchurl, jedi-core, lib, melpaBuild }:
-    melpaBuild {
+    jedi = callPackage ({ auto-complete
+                        , emacs
+                        , fetchFromGitHub
+                        , fetchurl
+                        , jedi-core
+                        , lib
+                        , melpaBuild }:
+      melpaBuild {
         pname = "jedi";
         version = "20160425.2156";
         src = fetchFromGitHub {
           owner = "tkf";
           repo = "emacs-jedi";
-          rev = "b0764f425766786dfb1bff910ed1d1670f11eb9c";
-          sha256 = "19q1bii0dg3q566bwm63rw3fnnmwvas9i2ibjrlnni8laavc9r5p";
+          rev = "1521c525483263b7241c4881b15299b38700070c";
+          sha256 = "1xj6rswsnicwcgcqid4qji1x4yhdhrgvvjdd3jhb4z8mfahpnpp6";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bded1840a39fbf1e014c01276eb2f9c5a4fc218f/recipes/jedi";
           sha256 = "1777060q25k9n2g6h1lm5lkki900pmjqkxq72mrk3j19jr4pk9m4";
-          name = "jedi";
+          name = "recipe";
         };
         packageRequires = [ auto-complete emacs jedi-core ];
         meta = {
@@ -40325,20 +50374,27 @@
           license = lib.licenses.free;
         };
       }) {};
-    jedi-core = callPackage ({ cl-lib ? null, emacs, epc, fetchFromGitHub, fetchurl, lib, melpaBuild, python-environment }:
-    melpaBuild {
+    jedi-core = callPackage ({ cl-lib ? null
+                             , emacs
+                             , epc
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild
+                             , python-environment }:
+      melpaBuild {
         pname = "jedi-core";
         version = "20170121.610";
         src = fetchFromGitHub {
           owner = "tkf";
           repo = "emacs-jedi";
-          rev = "b0764f425766786dfb1bff910ed1d1670f11eb9c";
-          sha256 = "19q1bii0dg3q566bwm63rw3fnnmwvas9i2ibjrlnni8laavc9r5p";
+          rev = "de1f5597b600c0cb7661b5f451da2af4cb722571";
+          sha256 = "120l9zfh432ffj5n6q4x16msvnqwcazkaxib2n19k4pdyvpd1gbp";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bded1840a39fbf1e014c01276eb2f9c5a4fc218f/recipes/jedi-core";
           sha256 = "0pzi32zdb4g9n4kvpmkdflmqypa7nckmnjq60a3ngym4wlzbb32f";
-          name = "jedi-core";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs epc python-environment ];
         meta = {
@@ -40346,8 +50402,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    jedi-direx = callPackage ({ direx, fetchFromGitHub, fetchurl, jedi, lib, melpaBuild }:
-    melpaBuild {
+    jedi-direx = callPackage ({ direx
+                              , fetchFromGitHub
+                              , fetchurl
+                              , jedi
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "jedi-direx";
         version = "20140310.236";
         src = fetchFromGitHub {
@@ -40356,10 +50417,10 @@
           rev = "7a2e677400717ed12b959cb5988e7b3fb1c12117";
           sha256 = "1pgi5vnwz5agrpvy7nwg3gv2nfbbmimhk8dxkg81k6yf1iiqxcap";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a058c3007e63b2b651689fd17c789f7d69348f83/recipes/jedi-direx";
           sha256 = "1y4n4c2imnm3f1q129bvbi4gzk0iazd8qq959gvq9j9fl1aziiz1";
-          name = "jedi-direx";
+          name = "recipe";
         };
         packageRequires = [ direx jedi ];
         meta = {
@@ -40367,8 +50428,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    jekyll-modes = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, polymode }:
-    melpaBuild {
+    jekyll-modes = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild
+                                , polymode }:
+      melpaBuild {
         pname = "jekyll-modes";
         version = "20141117.514";
         src = fetchFromGitHub {
@@ -40377,10 +50442,10 @@
           rev = "7cb10b50fd2883e3f7b10fdfd98f19f2f0b2381c";
           sha256 = "0rx72rid7922mhw21j85kxmx0fhpkmkv9jvxmj9izy01xnjbk00c";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6667529d56dc35c5c56e4b4a4d1f06b6172df677/recipes/jekyll-modes";
           sha256 = "1305f1yg1mamyw3bkzrk5q3q58ihs8f5k9vjknsww5xvrzz3r1si";
-          name = "jekyll-modes";
+          name = "recipe";
         };
         packageRequires = [ polymode ];
         meta = {
@@ -40388,8 +50453,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    jemdoc-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    jemdoc-mode = callPackage ({ emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "jemdoc-mode";
         version = "20170704.1327";
         src = fetchFromGitHub {
@@ -40398,10 +50467,10 @@
           rev = "529b4d4681e1198b9892f340fdd6c3f1592a047a";
           sha256 = "1f8nn8mv18q3x3k32i6kjis9f3g1ybdjcfaw8hywqwy6k8dr734m";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/49a8c0f885df0b91d758b4d7c92bd67368da8a56/recipes/jemdoc-mode";
           sha256 = "1bl8a9fcilrqjzh92q7nvd16pxjiwmbnj157q2bx36y7bxm60acv";
-          name = "jemdoc-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -40409,8 +50478,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    jenkins = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }:
-    melpaBuild {
+    jenkins = callPackage ({ dash
+                           , emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , json ? null
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "jenkins";
         version = "20170721.236";
         src = fetchFromGitHub {
@@ -40419,10 +50494,10 @@
           rev = "1ec967973db685c9d84133ec6a5e06489ce06b62";
           sha256 = "1ai5adv46van2g029x9idj394ycczfacyhyv291sasf8mv9i7j4b";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2ed2da33db5eaea1a37f86057da174a45cd37ea5/recipes/jenkins";
           sha256 = "0ji42r7p3f3hh643839xf74gb231vr7anycr2xhkga8qy2vwa53s";
-          name = "jenkins";
+          name = "recipe";
         };
         packageRequires = [ dash emacs json ];
         meta = {
@@ -40430,8 +50505,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    jenkins-watch = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    jenkins-watch = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "jenkins-watch";
         version = "20121004.1626";
         src = fetchFromGitHub {
@@ -40440,10 +50518,10 @@
           rev = "37b84dfbd98240a57ff798e1ff8bc7dba2913577";
           sha256 = "0jayhv8j7b527dimhvcs0d7ax25x7v50dk0k6apisqc23psvkq66";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/jenkins-watch";
           sha256 = "1mdmh62rq3b8p23xgaf4i0kzpgq3ldljdxsnk07wa8bp3p7jxvgs";
-          name = "jenkins-watch";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -40451,8 +50529,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    jetbrains = callPackage ({ cl-lib ? null, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    jetbrains = callPackage ({ cl-lib ? null
+                             , emacs
+                             , f
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "jetbrains";
         version = "20180228.2102";
         src = fetchFromGitHub {
@@ -40461,10 +50545,10 @@
           rev = "56f71a17d455581c10d48f6dbb31d9e2126227bf";
           sha256 = "0v948k7xjm66px20ad331pskc7svpcrcffh3hbkjsksd4k0pggds";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/00dd4626e261d9831fc62d866d50b7257ee418c4/recipes/jetbrains";
           sha256 = "0254dkzf2x5dj3j549xjash0lsadkn0bdcyjkjlrv8hqvdr1f1m7";
-          name = "jetbrains";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs f ];
         meta = {
@@ -40472,8 +50556,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    jg-quicknav = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    jg-quicknav = callPackage ({ cl-lib ? null
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild
+                               , s }:
+      melpaBuild {
         pname = "jg-quicknav";
         version = "20170808.1830";
         src = fetchFromGitHub {
@@ -40482,10 +50571,10 @@
           rev = "c8d53e774d63e68a944092c08a026b57da741038";
           sha256 = "0rdrryfppgj5smrds5gyyhc4z8x36aq3gxdpckq80rbl4s729chy";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0fda2b54a0ff0b6fc3bd6d20cfcbbf63cae5380f/recipes/jg-quicknav";
           sha256 = "1pxyv1nbnqb0s177kczy6b6q4l8d2r52xqhx2rdb0wxdmp6m5x9c";
-          name = "jg-quicknav";
+          name = "recipe";
         };
         packageRequires = [ cl-lib s ];
         meta = {
@@ -40493,8 +50582,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    jinja2-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    jinja2-mode = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "jinja2-mode";
         version = "20141128.207";
         src = fetchFromGitHub {
@@ -40503,10 +50595,10 @@
           rev = "cfaa7bbe7bb290cc500440124ce89686f3e26f86";
           sha256 = "0l26wcy496k6xk7q5sf905xir0p73ziy6c44is77854lv3y0z381";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b79196cf0dc0b436ff75eabea369a62f92825d9f/recipes/jinja2-mode";
           sha256 = "0480fh719r4v7xdwyf4jlg1k36y54i5zrv7gxlhfm66pil75zafx";
-          name = "jinja2-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -40514,20 +50606,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    jira-markup-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    jira-markup-mode = callPackage ({ fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "jira-markup-mode";
         version = "20150601.1409";
         src = fetchFromGitHub {
           owner = "mnuessler";
           repo = "jira-markup-mode";
-          rev = "4fc534c47df26a2f402bf835ebe2ed89474a4062";
-          sha256 = "1ack7dmapva3wc2gm22prd5wd3cmq19sl4xl9f04a3nk2msr6ksx";
+          rev = "53bf083fdbece483f1351f32085b424b38c4c1f2";
+          sha256 = "1lqk7x7h8n6xvqzfwjh220gprk5jfi8f87z6afps9rib2scz7kbh";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e7e0349bff91ed27ad14dfc12178719453a8df55/recipes/jira-markup-mode";
           sha256 = "0f3sw41b4wl0aajq0ap66942rb2015d9iks0ss016jgzashw7zsp";
-          name = "jira-markup-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -40535,20 +50630,29 @@
           license = lib.licenses.free;
         };
       }) {};
-    jist = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, let-alist, lib, magit, melpaBuild, request, seq }:
-    melpaBuild {
+    jist = callPackage ({ dash
+                        , emacs
+                        , fetchFromGitHub
+                        , fetchurl
+                        , let-alist
+                        , lib
+                        , magit
+                        , melpaBuild
+                        , request
+                        , seq }:
+      melpaBuild {
         pname = "jist";
         version = "20161229.921";
         src = fetchFromGitHub {
           owner = "emacs-pe";
           repo = "jist.el";
-          rev = "da0692452e312a99bb27d8708504b521798aca48";
-          sha256 = "13dic7bmj7a8vvjz47s1fnz8p5m22d2m2h2vlkmlq7322qwxxw6p";
+          rev = "ec4b27eb4051f0084cb3b1e4f19fab9e2db77665";
+          sha256 = "163zip2fhyn41wmwhyrx8przcq2qmlq841b6hpm9lw8mm3wfnqbq";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/898bfa0b315240ef9335fde24ff0386a4c6c6595/recipes/jist";
           sha256 = "11m9li1016cfkm4931h69d7g1dc59lwjl83wy3yipswdg3zlw0ar";
-          name = "jist";
+          name = "recipe";
         };
         packageRequires = [ dash emacs let-alist magit request seq ];
         meta = {
@@ -40556,8 +50660,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    jknav = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    jknav = callPackage ({ fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "jknav";
         version = "20121006.1325";
         src = fetchFromGitHub {
@@ -40566,10 +50673,10 @@
           rev = "861245715c728503dad6573278fdd75c271dbf8b";
           sha256 = "1idby2rjkslw85593qd4zy6an9zz71yzwqc6rck57r54xyfs8mij";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3673aebf53a7a3d54aee4e979b9dc7e37842f4db/recipes/jknav";
           sha256 = "0c0a8plqrlsw8lhmyj9c1lfkj2b48cjkbw9pna8qcizvwgym9089";
-          name = "jknav";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -40577,8 +50684,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    jonprl-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
-    melpaBuild {
+    jonprl-mode = callPackage ({ cl-lib ? null
+                               , emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild
+                               , yasnippet }:
+      melpaBuild {
         pname = "jonprl-mode";
         version = "20160818.1759";
         src = fetchFromGitHub {
@@ -40587,10 +50700,10 @@
           rev = "6059bb64891fae45827174e044d6a87ac07172d8";
           sha256 = "0v4xiq3xf7c52rmyymw8a4ws85ij0xy7pr7625gf15359cs5chs9";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d26b6aea2b0567b971c4f013b58b598e9eb76af6/recipes/jonprl-mode";
           sha256 = "0763ad65dmpl2l5lw91mlppfdvrjg6ym45brhi8sdwwri1xnyv9z";
-          name = "jonprl-mode";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs yasnippet ];
         meta = {
@@ -40598,8 +50711,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    jpop = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    jpop = callPackage ({ cl-lib ? null
+                        , dash
+                        , emacs
+                        , fetchFromGitHub
+                        , fetchurl
+                        , lib
+                        , melpaBuild }:
+      melpaBuild {
         pname = "jpop";
         version = "20170410.550";
         src = fetchFromGitHub {
@@ -40608,10 +50727,10 @@
           rev = "7628b03260be96576b34459d45959ee77d8b2110";
           sha256 = "1x7qha7xyn2j225h7axhskngc8icjhgm3f451iq3qysj22q8g4d6";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2a52a3cf909d12201196b92685435f9fa338b7ba/recipes/jpop";
           sha256 = "00chh1aqnkkkhdp44sapdjx37cbn92g42wapdq7kcl8v1v0xmnjr";
-          name = "jpop";
+          name = "recipe";
         };
         packageRequires = [ cl-lib dash emacs ];
         meta = {
@@ -40619,8 +50738,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    jq-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    jq-mode = callPackage ({ emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "jq-mode";
         version = "20180407.1048";
         src = fetchFromGitHub {
@@ -40629,10 +50752,10 @@
           rev = "72ea5e35e0a66c7275cf4fe4af25a619761653d7";
           sha256 = "0xgkmadbbs3zid11pn6silb25kyng424ikgx0wib48yzcra0kdw4";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/318705966e26e58f87b53c115c519db95874ac1c/recipes/jq-mode";
           sha256 = "1xvh641pdkvbppb2nzwn1ljdk7sv6laq29kdv09kxaqd89vm0vin";
-          name = "jq-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -40640,8 +50763,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    jquery-doc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    jquery-doc = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "jquery-doc";
         version = "20150812.58";
         src = fetchFromGitHub {
@@ -40650,10 +50776,10 @@
           rev = "24032284919b942ec27707d929bdd8bf48420062";
           sha256 = "0gh2bgmsbi9lby89ssvl49kpz07jqrfnyg47g6b9xmf5rw42s1z9";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/504d8cfac08f3fcd856610bc2caeb4d4178aeedf/recipes/jquery-doc";
           sha256 = "0pyg90izdrb9mvpbz9nx21mp8m3svqjnz1jr8i7wqgfjxsxdklxj";
-          name = "jquery-doc";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -40661,20 +50787,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    js-auto-beautify = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, web-beautify, web-mode }:
-    melpaBuild {
+    js-auto-beautify = callPackage ({ fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild
+                                    , web-beautify
+                                    , web-mode }:
+      melpaBuild {
         pname = "js-auto-beautify";
         version = "20161030.2209";
         src = fetchFromGitHub {
           owner = "Qquanwei";
           repo = "auto-beautify.el";
-          rev = "180d15af7b5dfaab4ee1954cca2fdc797932f9de";
-          sha256 = "0xwkjq41v32dqc5gq8hcmcvdjg2y38xq6hkw5pja0kyvyk92c82d";
+          rev = "6bc9fef474197ca1722cb1e9051b270f80cdd7cc";
+          sha256 = "1jj4zbdw76ir7zigdhad4qdw1cabbql71847bzkqh6zzjwpg9h3p";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/js-auto-beautify";
           sha256 = "0hpp6im24xy4g5l1n9kvpmpj26rnxxnf4snf7xgh5gxx6wsiicy1";
-          name = "js-auto-beautify";
+          name = "recipe";
         };
         packageRequires = [ web-beautify web-mode ];
         meta = {
@@ -40682,20 +50813,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    js-auto-format-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    js-auto-format-mode = callPackage ({ emacs
+                                       , fetchFromGitHub
+                                       , fetchurl
+                                       , lib
+                                       , melpaBuild }:
+      melpaBuild {
         pname = "js-auto-format-mode";
         version = "20180123.830";
         src = fetchFromGitHub {
           owner = "ybiquitous";
           repo = "js-auto-format-mode";
-          rev = "6bd44162ac422304803f606278bb0c08ab940a5d";
-          sha256 = "1hy4wyw7yi93ngagg9qmkljjqaypfnzks3vny1pn6d5nw2acb1vx";
+          rev = "1558fb539e0beb7f98901280d695968a2351384d";
+          sha256 = "16l2mjklazmfpdin3vz3ddf083phhyrhi18n0rfhv5rwh9m23wr9";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2d3be16771b5b5fde639da3ee97890620354ee7a/recipes/js-auto-format-mode";
           sha256 = "1gxf7xz1j3ga2pk5w8cgny7l8kid59zap2a97lhb50w1qczfqqzs";
-          name = "js-auto-format-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -40703,8 +50838,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    js-codemod = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    js-codemod = callPackage ({ emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "js-codemod";
         version = "20171104.454";
         src = fetchFromGitHub {
@@ -40713,10 +50852,10 @@
           rev = "014e56c846487d1eeaf8a91dd503b9d96eb1510a";
           sha256 = "0s07ypjlqsx2pgq89wmr69w9p7ybc62abqp53kzf5gmdl6fdzgxq";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/81670a2467fa846a3f0e6c81e870e8ae140dd54e/recipes/js-codemod";
           sha256 = "1m5wbyx12sc5qwbrh948ikskck10p6j05ahrrvmmflvfb3q4vpcj";
-          name = "js-codemod";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -40724,8 +50863,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    js-comint = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    js-comint = callPackage ({ emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "js-comint";
         version = "20171129.2056";
         src = fetchFromGitHub {
@@ -40734,10 +50877,10 @@
           rev = "83e932e4a83d1a69098ee87e0ab911d299368e60";
           sha256 = "1r2fwsdfkbqnm4n4dwlp7gc267ghj4vd0naj431w7pl529dmrb6x";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bc9d20b95e369e5a73c85a4a9385d3a8f9edd4ca/recipes/js-comint";
           sha256 = "0jvkjb0rmh87mf20v6rjapi2j6qv8klixy0y0kmh3shylkni3an1";
-          name = "js-comint";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -40745,8 +50888,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    js-doc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    js-doc = callPackage ({ fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "js-doc";
         version = "20160714.2134";
         src = fetchFromGitHub {
@@ -40755,10 +50901,10 @@
           rev = "f0606e89d5aa89146f96edb38cf69af0068a9d1e";
           sha256 = "1ffayl6hca9zanbznh6rkql7fbr53id1lyrj2vllx8zakfac4dyv";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5621f60b3f580db652c347719d004d7168944caa/recipes/js-doc";
           sha256 = "0nafqgb4kf8jgrb7ijfcvigq8kf043ki89h61izda4hccm3c42pk";
-          name = "js-doc";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -40766,8 +50912,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    js-format = callPackage ({ emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild }:
-    melpaBuild {
+    js-format = callPackage ({ emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , js2-mode
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "js-format";
         version = "20170118.1702";
         src = fetchFromGitHub {
@@ -40776,10 +50927,10 @@
           rev = "544bda9be72b74ec2d442543ba60cff727d96669";
           sha256 = "18wr2z2w2fqgy51f5m5izrnywarxn6w4qs04lsgbwlsc6ahpwwpf";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0d6deaa93f7deaba9f5f36f1963522b6dc5c673a/recipes/js-format";
           sha256 = "112zqb3q1gjlaa9zkmhx7vamh0g97dwp9j55215i1sx66lmp18iq";
-          name = "js-format";
+          name = "recipe";
         };
         packageRequires = [ emacs js2-mode ];
         meta = {
@@ -40787,8 +50938,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    js-import = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }:
-    melpaBuild {
+    js-import = callPackage ({ dash
+                             , emacs
+                             , f
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild
+                             , projectile }:
+      melpaBuild {
         pname = "js-import";
         version = "20170115.853";
         src = fetchFromGitHub {
@@ -40797,10 +50955,10 @@
           rev = "7b1b7c963e3df9c76ed6cfb66c908c80775c6cfb";
           sha256 = "03a13bcipk32hdvh5bm2z8kxs4b2xp3r1phwxmvb49lxx6417bs9";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/js-import";
           sha256 = "0r653ls1a4kr7i7249afgfj7vz365gadfm8bc1vmqfabxn8mysd4";
-          name = "js-import";
+          name = "recipe";
         };
         packageRequires = [ dash emacs f projectile ];
         meta = {
@@ -40808,20 +50966,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    js2-closure = callPackage ({ fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild }:
-    melpaBuild {
+    js2-closure = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , js2-mode
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "js2-closure";
         version = "20170816.1218";
         src = fetchFromGitHub {
           owner = "jart";
           repo = "js2-closure";
-          rev = "f59db386d7d0693935d0bf52babcd2c203c06d04";
-          sha256 = "09zfmxi9m883lzsafnws06ifpq92b2i9q05pxk085vgkdpq35nss";
+          rev = "74a75f001a8bc2b9c02b9e8b4557f7ee3c5f84fb";
+          sha256 = "1gapx656s4ngy8s8y1p56xxnclwf4qqg83l3jizknxky7yhayyl9";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/61bf3e70ae38a78184f0b373ff6f0db234f51cb2/recipes/js2-closure";
           sha256 = "19732bf98lk2ah2ssgkr1ngxx7rz3nhsiw84lsfmydb0vvm4fpk7";
-          name = "js2-closure";
+          name = "recipe";
         };
         packageRequires = [ js2-mode ];
         meta = {
@@ -40829,8 +50991,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    js2-highlight-vars = callPackage ({ emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild }:
-    melpaBuild {
+    js2-highlight-vars = callPackage ({ emacs
+                                      , fetchFromGitHub
+                                      , fetchurl
+                                      , js2-mode
+                                      , lib
+                                      , melpaBuild }:
+      melpaBuild {
         pname = "js2-highlight-vars";
         version = "20170418.1129";
         src = fetchFromGitHub {
@@ -40839,10 +51006,10 @@
           rev = "e3bb177e50f76b272e8073a94d4f46be6512a163";
           sha256 = "0yy8sqkn6c7r377qr2id4z550vw1x70xjd4i7yg0g1rj7q1kg98l";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5f4a7c90be2e032277ae87b8de36d2e3f6146f09/recipes/js2-highlight-vars";
           sha256 = "07bq393g2jy8ydvaqyqn6vdyfvyminvgi239yvwzg5g9a1xjc475";
-          name = "js2-highlight-vars";
+          name = "recipe";
         };
         packageRequires = [ emacs js2-mode ];
         meta = {
@@ -40850,20 +51017,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    js2-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    js2-mode = callPackage ({ cl-lib ? null
+                            , emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "js2-mode";
-        version = "20180331.2247";
+        version = "20180627.744";
         src = fetchFromGitHub {
           owner = "mooz";
           repo = "js2-mode";
-          rev = "d76b4df4427e7bf4dfb2ba7b5dfff3c2aea52459";
-          sha256 = "0m6pv3a6ji5dxjc8wp4z40rms63y4wz5k0bbl0ayi0k6miliik0d";
+          rev = "3bea9ab39b6c0b6dd442d69fe53183c1f7652284";
+          sha256 = "039ffsqc40ydg4ma4ycvw76rxa6s8g54dbvcm8fyypkb8ibn7yn6";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/js2-mode";
           sha256 = "0f9cj3n55qnlifxwk1yp8n1kfd319jf7qysnkk28xpvglzw24yjv";
-          name = "js2-mode";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -40871,20 +51043,28 @@
           license = lib.licenses.free;
         };
       }) {};
-    js2-refactor = callPackage ({ dash, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, multiple-cursors, s, yasnippet }:
-    melpaBuild {
+    js2-refactor = callPackage ({ dash
+                                , fetchFromGitHub
+                                , fetchurl
+                                , js2-mode
+                                , lib
+                                , melpaBuild
+                                , multiple-cursors
+                                , s
+                                , yasnippet }:
+      melpaBuild {
         pname = "js2-refactor";
-        version = "20180410.201";
+        version = "20180502.342";
         src = fetchFromGitHub {
           owner = "magnars";
           repo = "js2-refactor.el";
-          rev = "391e06c80e9197581c9d0b04edb5a65ffc149dcf";
-          sha256 = "1w6pjhvcc8i7rmg85nxbnch3yxfcz81i7d1kdpbyra0i2ls7ikvm";
+          rev = "186e1abf8c818623e1eef8bb07509d2ea11367b8";
+          sha256 = "1g877cxvmv29089m0phh551clpz995ja9585nvwiycdzc7w2mqga";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8935264dfea9bacc89fef312215624d1ad9fc437/recipes/js2-refactor";
           sha256 = "09dcfwpxxyw0ffgjjjaaxbsj0x2nwfrmxy1a05h8ba3r3jl4kl1r";
-          name = "js2-refactor";
+          name = "recipe";
         };
         packageRequires = [ dash js2-mode multiple-cursors s yasnippet ];
         meta = {
@@ -40892,20 +51072,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    js3-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    js3-mode = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "js3-mode";
         version = "20160515.850";
         src = fetchFromGitHub {
           owner = "thomblake";
           repo = "js3-mode";
-          rev = "229aeb374f1b1f3ee5c59b8ba3eebb6385c232cb";
-          sha256 = "0yd2lck1kq01pxk86jpxff5ih6fxx1a1wvl7v8b5ys7gi33fjqz2";
+          rev = "7fceb21ec56aac7af4b189bb0c0d0cf620327f5a";
+          sha256 = "18c0s3i21b77pi5y86zi7jg9pwxc0h5dzznjiyrig0jab0cksln5";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/805a7c7fee2bafd8785813963bf91ac1ca417fd1/recipes/js3-mode";
           sha256 = "12s5qf6zfcv4m5kqxvh9b4zgwf433x39a210d957gjjp5mywbb1r";
-          name = "js3-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -40913,8 +51096,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    jscs = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    jscs = callPackage ({ cl-lib ? null
+                        , emacs
+                        , fetchFromGitHub
+                        , fetchurl
+                        , lib
+                        , melpaBuild }:
+      melpaBuild {
         pname = "jscs";
         version = "20151015.1049";
         src = fetchFromGitHub {
@@ -40923,10 +51111,10 @@
           rev = "9d39d0f2355e69a020bf76242504f3a33e013ccf";
           sha256 = "1bqsv2drhcs8ia7nxss33f80p2mhcl4mr1nalphzw6s1f4mq2sgy";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f59d039a199ff93d7280669511a752f12a74f0bd/recipes/jscs";
           sha256 = "1yw251f6vpj2bikjw79arywprk8qnmmfcki99mvwnqhsqlv1a8iv";
-          name = "jscs";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -40934,8 +51122,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    jsfmt = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    jsfmt = callPackage ({ fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "jsfmt";
         version = "20150727.1525";
         src = fetchFromGitHub {
@@ -40944,10 +51135,10 @@
           rev = "68109120f553fbc651fafb6fc35ed83c3e79f8a6";
           sha256 = "0h9gx5cl3lashk0n8pv9yzb0mm8dyziddfbwfqfm70638p93ylhc";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4ddc99843dec18a295dfc36e7b429f0e1ab7fb71/recipes/jsfmt";
           sha256 = "1syy32sv2d57b3gja0ly65h36mfnyq6hzf5lnnl3r58yvbdzngqd";
-          name = "jsfmt";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -40955,8 +51146,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    json-mode = callPackage ({ fetchFromGitHub, fetchurl, json-reformat, json-snatcher, lib, melpaBuild }:
-    melpaBuild {
+    json-mode = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , json-reformat
+                             , json-snatcher
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "json-mode";
         version = "20170719.2205";
         src = fetchFromGitHub {
@@ -40965,10 +51161,10 @@
           rev = "32d5a9b3319e6797c4d52e7d61a65e5638102ef4";
           sha256 = "04n68ppxdga5r7mbahiqjkykf3i5simpx91aa8x9h197y5wwi4ww";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/03d0ff6c8d724cf39446fa27f52aa5cc1a3cefb6/recipes/json-mode";
           sha256 = "014j10wgxsqy6d6aksnkz2dr5cmpsi8c7v4a825si1vgb4622a70";
-          name = "json-mode";
+          name = "recipe";
         };
         packageRequires = [ json-reformat json-snatcher ];
         meta = {
@@ -40976,8 +51172,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    json-navigator = callPackage ({ emacs, fetchFromGitHub, fetchurl, hierarchy, lib, melpaBuild }:
-    melpaBuild {
+    json-navigator = callPackage ({ emacs
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , hierarchy
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "json-navigator";
         version = "20171220.19";
         src = fetchFromGitHub {
@@ -40986,10 +51187,10 @@
           rev = "7a1fec93500c46ccba4086d10115d8188607d0d0";
           sha256 = "03gjvzlyf90sh2q735qfbbjyqx4z9c3yc8jjp2sjpmp5fjvdm9yf";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/62d4d68bd473652b80988a68250e9190b886ad6e/recipes/json-navigator";
           sha256 = "0yfl31cg0mkgsbpgx00m9h2cxnhsavcf7zlspb0qr4g2zq6ya1wx";
-          name = "json-navigator";
+          name = "recipe";
         };
         packageRequires = [ emacs hierarchy ];
         meta = {
@@ -40997,20 +51198,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    json-reformat = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    json-reformat = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "json-reformat";
         version = "20160212.53";
         src = fetchFromGitHub {
           owner = "gongo";
           repo = "json-reformat";
-          rev = "8eb6668ed447988aea06467ba8f42e1f2178246f";
-          sha256 = "11y11yybhb8wfj8qcj4gw8rhhly7kjs7ylyxwsh7qnfgq6f771qh";
+          rev = "24c2bf3c41897b5cf1398dcaedfec88526308bf4";
+          sha256 = "05bjyw0hkpiyfadsx3giawykbj4qinfr1ilzd0xvx8akzq2ipq0y";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f8c7976237f327fdfa58eea26ac8679f40ef3163/recipes/json-reformat";
           sha256 = "1m5p895w9qdgb8f67xykhzriribgmp20a1lvj64iap4aam6wp8na";
-          name = "json-reformat";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -41018,8 +51222,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    json-rpc = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    json-rpc = callPackage ({ cl-lib ? null
+                            , emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "json-rpc";
         version = "20180104.728";
         src = fetchFromGitHub {
@@ -41028,10 +51237,10 @@
           rev = "0992ae71964055230aa5d4d934a1b93b5dfd7eb4";
           sha256 = "0nfccwxss3dz1ig6i3dig703xpsy90m7i96bm3pysrw2jfp4by9s";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/82c6b97cdfe2970f028a00146b01e5734710291b/recipes/json-rpc";
           sha256 = "1v1pfmm9g18p6kgn27q1m1bjgwbzvwfm0jbsxp8gdsssaygky71k";
-          name = "json-rpc";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -41039,8 +51248,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    json-snatcher = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    json-snatcher = callPackage ({ emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "json-snatcher";
         version = "20150511.2047";
         src = fetchFromGitHub {
@@ -41049,10 +51262,10 @@
           rev = "c4cecc0a5051bd364373aa499c47a1bb7a5ac51c";
           sha256 = "05zsgnk7grgw9jzwl80h5sxfpifxlr37b4mkbvx7mjq4z14xc2jw";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/990de179e20c169aa02ffec42c89f18ce02239c8/recipes/json-snatcher";
           sha256 = "0f6j9g3c5fz3wlqa88706cbzinrs3dnfpgsr2d3h3117gic4iwp4";
-          name = "json-snatcher";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -41060,8 +51273,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    jsonnet-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    jsonnet-mode = callPackage ({ emacs
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "jsonnet-mode";
         version = "20180310.2256";
         src = fetchFromGitHub {
@@ -41070,10 +51287,10 @@
           rev = "4eb52cff8ce6020f5a6309a1c0465b5cdd6c698e";
           sha256 = "0l9q6g00yxz5j1hchd2vim33n39zshv7qmmga1zf8qcn20yxz7mm";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ba17372732723f73e8eeb6e7c47abc0edeb20da4/recipes/jsonnet-mode";
           sha256 = "1aadys887szlc924qr645lby9f8vzvxkwhq6byhppk1b01h911ia";
-          name = "jsonnet-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -41081,8 +51298,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    jss = callPackage ({ emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, websocket }:
-    melpaBuild {
+    jss = callPackage ({ emacs
+                       , fetchFromGitHub
+                       , fetchurl
+                       , js2-mode
+                       , lib
+                       , melpaBuild
+                       , websocket }:
+      melpaBuild {
         pname = "jss";
         version = "20130508.723";
         src = fetchFromGitHub {
@@ -41091,10 +51314,10 @@
           rev = "41749257aecf13c7bd6ed489b5ab3304d06e40bc";
           sha256 = "07yd7sxb5f2mbm2nva7b2nwyxxkmsi2rdd5qig0bq1b2mf3g5l83";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e3dc3607f512df378ba141327802820da4991a97/recipes/jss";
           sha256 = "050hskqcjz5kc8nni255vj3hc9m936w1rybvg5kqyz4p4lpzj00k";
-          name = "jss";
+          name = "recipe";
         };
         packageRequires = [ emacs js2-mode websocket ];
         meta = {
@@ -41102,20 +51325,28 @@
           license = lib.licenses.free;
         };
       }) {};
-    jst = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pcache, s }:
-    melpaBuild {
+    jst = callPackage ({ dash
+                       , emacs
+                       , f
+                       , fetchFromGitHub
+                       , fetchurl
+                       , lib
+                       , melpaBuild
+                       , pcache
+                       , s }:
+      melpaBuild {
         pname = "jst";
         version = "20150604.438";
         src = fetchFromGitHub {
           owner = "cheunghy";
           repo = "jst-mode";
-          rev = "2a3fd16c992f7790dc67134ef06a814c3d20579c";
-          sha256 = "16jgmabcqrjb3v9c6q711jqn9dna88bmzm4880mdry69ixwcydxy";
+          rev = "865ff97449a4cbbcb40d38b4908cf4d7b22a5108";
+          sha256 = "066ql5czrzikznlx7vww6m8h0pfkixfm8qnydfwpfndcqq6ypd90";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/85d7aec81b7b8ff3721fd577cbdc10ed2288f76d/recipes/jst";
           sha256 = "0hp1f7p6m1gfv1a3plavzkzn87dllb5g2xrgg3mch4qsgdbqx65i";
-          name = "jst";
+          name = "recipe";
         };
         packageRequires = [ dash emacs f pcache s ];
         meta = {
@@ -41123,20 +51354,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    jsx-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    jsx-mode = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "jsx-mode";
         version = "20130908.1024";
         src = fetchFromGitHub {
           owner = "jsx";
           repo = "jsx-mode.el";
-          rev = "47213429c09259126cddb5742482cfc444c70d50";
-          sha256 = "1g648r0wrd8m5ggl5jrplmj7jmr68bh2ykyii5wv30zfba97r1sh";
+          rev = "3a0d688f0f93cbb4596e562e596f7736a0926160";
+          sha256 = "1kldk8i3galix9nbrcn92a8j942nx6nwzihl8w17lh8v95d51rhn";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7dea24e922f18c1f7e1b97da07ba2e4f33170557/recipes/jsx-mode";
           sha256 = "1lnjnyn8qf3biqr92z443z6b58dly7glksp1g986vgqzdprq3n1b";
-          name = "jsx-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -41144,18 +51378,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    jtags = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
+    jtags = callPackage ({ fetchgit
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "jtags";
         version = "20160211.1229";
         src = fetchgit {
           url = "https://git.code.sf.net/p/jtags/code";
-          rev = "b50daa48510f71e74ce0ec2eb85030896a79cf96";
-          sha256 = "03w5y9c1109kpsn6xnxdaz3maiwbvxywqshc1l5wngfc85jwiv8y";
+          rev = "f7d29e1635ef7ee4ee2cdb8f1f6ab83e1015c84a";
+          sha256 = "029arf0m39rrb3x81hpd3ljwd4ki37hwa4n38hynn8lfmwrrdy2x";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/jtags";
           sha256 = "1f3dw9fr31lcqmida14d9rsvy1r1b5d6ihqwdj9hbx5kv7d8jyj7";
-          name = "jtags";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -41163,8 +51401,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    julia-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    julia-mode = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "julia-mode";
         version = "20171116.642";
         src = fetchFromGitHub {
@@ -41173,10 +51414,10 @@
           rev = "2ef6992125a85674532a1e37dacd5c60bee4feeb";
           sha256 = "0vjsaws0rqrkv1mqxwf9lp8qmaq92piippybsf4ncizxwbnh8x6d";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8522d197cb1b2c139959e7189765001c5ee7e61a/recipes/julia-mode";
           sha256 = "0m49v67fs5yq0q3lwkcfmrzsjdzi1qrkfjyvjcdwnfmp29w14kq6";
-          name = "julia-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -41184,8 +51425,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    julia-repl = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    julia-repl = callPackage ({ emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "julia-repl";
         version = "20171116.46";
         src = fetchFromGitHub {
@@ -41194,10 +51439,10 @@
           rev = "f808a12e7ebe403f82036899c2dace640be73154";
           sha256 = "1lh4pbxrnld205ga58036jwnxkmgabdd8hyr6g7fahw94llq2cpa";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9a2a494969a9caf2f4513b12504379c9685047dc/recipes/julia-repl";
           sha256 = "1k8a54s7g64zasmmnywygr0ra3s3din5mkqb7b5van2l0d4hcmzn";
-          name = "julia-repl";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -41205,8 +51450,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    julia-shell = callPackage ({ fetchFromGitHub, fetchurl, julia-mode, lib, melpaBuild }:
-    melpaBuild {
+    julia-shell = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , julia-mode
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "julia-shell";
         version = "20161125.1110";
         src = fetchFromGitHub {
@@ -41215,10 +51464,10 @@
           rev = "583a0b2ca20461ab4356929fd0f2212c22341b69";
           sha256 = "182r7x7w3xnx7c54izz3rlz0khcwh7v21m89qpq99f9dvcs6273k";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a812c6a8498949d8bd9828a95433c539da87c1c8/recipes/julia-shell";
           sha256 = "0182irlvk6nn71zk4j8xjgcqp4bxi7a2dbj44frrssy6018cd410";
-          name = "julia-shell";
+          name = "recipe";
         };
         packageRequires = [ julia-mode ];
         meta = {
@@ -41226,8 +51475,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    jumblr = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    jumblr = callPackage ({ dash
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild
+                          , s }:
+      melpaBuild {
         pname = "jumblr";
         version = "20170727.1343";
         src = fetchFromGitHub {
@@ -41236,10 +51490,10 @@
           rev = "34533dfb9db8538c005f4eaffafeff7ed193729f";
           sha256 = "0nn2m27c70nykin4iakrna0c61qd1hr09czrfmfpk06k70iifjky";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b47000c35a181c03263e85e8955eb4b4c9e69e4d/recipes/jumblr";
           sha256 = "1wnawz1m6x95iyzac453p55h7hlr5q0ry5437aqqx0bw7gdwg3dp";
-          name = "jumblr";
+          name = "recipe";
         };
         packageRequires = [ dash s ];
         meta = {
@@ -41247,20 +51501,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    jump = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, findr, inflections, lib, melpaBuild }:
-    melpaBuild {
+    jump = callPackage ({ cl-lib ? null
+                        , fetchFromGitHub
+                        , fetchurl
+                        , findr
+                        , inflections
+                        , lib
+                        , melpaBuild }:
+      melpaBuild {
         pname = "jump";
         version = "20161126.1728";
         src = fetchFromGitHub {
           owner = "eschulte";
           repo = "jump.el";
-          rev = "e4f1372cf22e811faca52fc86bdd5d817498a4d8";
-          sha256 = "0354b64drvv8v5g13xy5nc1klwx4hldz1b5mf1frhna7h2dqz0j9";
+          rev = "9519c675e8a650f6afade7d870e925d0fb50f112";
+          sha256 = "1bm1mgd632gq3cl4zrq66vnqq9ynvc01iy6szp464ccnm3cmqdzr";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f0c791aebccc08b770b3969ce5d2e82cbe26f80e/recipes/jump";
           sha256 = "18g0fa9g8m9jscsm6pn7jwdq94l4aj0dfhrv2hqapq1q1x537364";
-          name = "jump";
+          name = "recipe";
         };
         packageRequires = [ cl-lib findr inflections ];
         meta = {
@@ -41268,20 +51528,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    jump-char = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    jump-char = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "jump-char";
-        version = "20160505.851";
+        version = "20180601.648";
         src = fetchFromGitHub {
           owner = "lewang";
           repo = "jump-char";
-          rev = "9c1c3618662e7b43d5937342816fd63b5a31e861";
-          sha256 = "1dgghswf6s7h6h04mhfnsh2m0ld8qqk70l0dq3cxhdjzqx16vnms";
+          rev = "1e31a3c687f2b3c71bbfab881c6d75915534bb9e";
+          sha256 = "1nzln2l6sy67qz30107sgyhhfacy85im9vdlbv1hp4fzdmxxkx84";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/jump-char";
           sha256 = "1r6d1vhm87zafi7rr7z8jwyz3yy7i7s4774n84jsql24j1rzzwd4";
-          name = "jump-char";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -41289,8 +51552,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    jump-to-line = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    jump-to-line = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "jump-to-line";
         version = "20130122.853";
         src = fetchFromGitHub {
@@ -41299,10 +51565,10 @@
           rev = "01ef8c3529d85e6c59cc20840acbc4a8e8325bc8";
           sha256 = "1s9plmg323m1p625xqnks0yqz0zlsjacdj7pv8f783r0d9jmfq3s";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4b6c700a28b65cbbad36a9bbaf88cc36c8191eb0/recipes/jump-to-line";
           sha256 = "09ifhsggl5mrb6l8nqnl38yph0v26v30y98ic8hl23i455hqkkdr";
-          name = "jump-to-line";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -41310,8 +51576,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    jump-tree = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    jump-tree = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "jump-tree";
         version = "20171014.851";
         src = fetchFromGitHub {
@@ -41320,10 +51589,10 @@
           rev = "282267dc6305889e31d46b405b7ad4dfe5923b66";
           sha256 = "0r6cwpks4aylndvq5lcny3799fag05zm36gd11043wca7sgr90fz";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fe6b08848929c83e3cdea623b331176c0f20cbe9/recipes/jump-tree";
           sha256 = "1gknpwd1vjpd1jqpi2axhyi6sg4clarr32rfrfz6hi6kmzr848mj";
-          name = "jump-tree";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -41331,8 +51600,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    jumplist = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    jumplist = callPackage ({ cl-lib ? null
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "jumplist";
         version = "20151119.1945";
         src = fetchFromGitHub {
@@ -41341,10 +51614,10 @@
           rev = "c482d137d95bc5e1bcd790cdbde25b7f729b2502";
           sha256 = "0ykzvy8034mchq6ffyi7vqnwyrj6gnqqgn39ki81pv97qh8hh8yl";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b2b7c688b881615c5f0b00f3879b9469d380a4e6/recipes/jumplist";
           sha256 = "06xjg1q8b2fwfhfmdkb76bw2id8pgqc61fmwlgri5746jgdmd7nf";
-          name = "jumplist";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -41352,8 +51625,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    jvm-mode = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    jvm-mode = callPackage ({ dash
+                            , emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "jvm-mode";
         version = "20150422.8";
         src = fetchFromGitHub {
@@ -41362,10 +51640,10 @@
           rev = "3355dbaf5b0185aadfbad24160399abb32c5bea0";
           sha256 = "0k91cdjlpil8npc4d3zsgx2gk41crl7qgm9r85khcgxs59kmkniw";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7cdb7d7d7b955405eb6357277b5d049df8aa85ce/recipes/jvm-mode";
           sha256 = "1r283b4s0pzq4hgwcz5cnhlvdvq4gy0x51g3vp0762s8qx969a5w";
-          name = "jvm-mode";
+          name = "recipe";
         };
         packageRequires = [ dash emacs ];
         meta = {
@@ -41373,8 +51651,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    kaesar = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    kaesar = callPackage ({ cl-lib ? null
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "kaesar";
         version = "20160128.208";
         src = fetchFromGitHub {
@@ -41383,10 +51665,10 @@
           rev = "d087075cb1a46c2c85cd075220e09b2eaef9b86e";
           sha256 = "1pl0514rj99b1j3y33x2bnhjbdbv9bfxgqn9498bf4ns8zayc6y9";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/201fac8639e59dc923ea31da1f84a99f83d51b47/recipes/kaesar";
           sha256 = "0zhi1dv1ay1azh7afq4x6bdg91clwpsr13nrzy7539yrn9sglj5l";
-          name = "kaesar";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -41394,8 +51676,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    kaesar-file = callPackage ({ fetchFromGitHub, fetchurl, kaesar, lib, melpaBuild }:
-    melpaBuild {
+    kaesar-file = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , kaesar
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "kaesar-file";
         version = "20160128.208";
         src = fetchFromGitHub {
@@ -41404,10 +51690,10 @@
           rev = "d087075cb1a46c2c85cd075220e09b2eaef9b86e";
           sha256 = "1pl0514rj99b1j3y33x2bnhjbdbv9bfxgqn9498bf4ns8zayc6y9";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/201fac8639e59dc923ea31da1f84a99f83d51b47/recipes/kaesar-file";
           sha256 = "0dcizg82maad98mbqqw5lamwz7n2lpai09jsrc66x3wy8k784alc";
-          name = "kaesar-file";
+          name = "recipe";
         };
         packageRequires = [ kaesar ];
         meta = {
@@ -41415,8 +51701,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    kaesar-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, kaesar, lib, melpaBuild }:
-    melpaBuild {
+    kaesar-mode = callPackage ({ cl-lib ? null
+                               , fetchFromGitHub
+                               , fetchurl
+                               , kaesar
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "kaesar-mode";
         version = "20160128.208";
         src = fetchFromGitHub {
@@ -41425,10 +51716,10 @@
           rev = "d087075cb1a46c2c85cd075220e09b2eaef9b86e";
           sha256 = "1pl0514rj99b1j3y33x2bnhjbdbv9bfxgqn9498bf4ns8zayc6y9";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/201fac8639e59dc923ea31da1f84a99f83d51b47/recipes/kaesar-mode";
           sha256 = "0yqnlchbpmhsqc8j531n08vybwa32cy0v9sy4f9fgxa90rfqczry";
-          name = "kaesar-mode";
+          name = "recipe";
         };
         packageRequires = [ cl-lib kaesar ];
         meta = {
@@ -41436,20 +51727,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    kakapo-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    kakapo-mode = callPackage ({ cl-lib ? null
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "kakapo-mode";
         version = "20171003.2151";
         src = fetchFromGitHub {
           owner = "listx";
           repo = "kakapo-mode";
-          rev = "292e07203c676361a1d918deb5acf2123cd70eaf";
-          sha256 = "00rl5y7wra7kyp867ps2inx0vng9jrmym0sm4jhnk6pqj50c8i9y";
+          rev = "67d516138172fd60782df94454b3d0bd247e84f3";
+          sha256 = "0r2n410arr48skcwm39c6mjhzsia117lb8xd7pc4854y0rbrvrvs";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a43f0f1f6a0773240a51d379ec786c20a9389e7b/recipes/kakapo-mode";
           sha256 = "0a99cqflpzasl4wcmmf99aj8xgywkym37j7mvnsajrsk5wawdlss";
-          name = "kakapo-mode";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -41457,20 +51752,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    kaleidoscope = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    kaleidoscope = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild
+                                , s }:
+      melpaBuild {
         pname = "kaleidoscope";
         version = "20170808.117";
         src = fetchFromGitHub {
           owner = "algernon";
           repo = "kaleidoscope.el";
-          rev = "e932103e043bd1503bf5d98dd117ff6737b852bc";
-          sha256 = "1vz4f3w9630dpr4ba4gdiwza29dacakm9h9vzyjrg643wcsgi6v1";
+          rev = "b89a243f6024099192f1bc38d8a54e3e7a654090";
+          sha256 = "154myfd3nag9nhpc3lrhq13191q7a9bzi0ml8a3k0fwy1810yi29";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/148d47626879be1608f35827ef82a28274ff4de3/recipes/kaleidoscope";
           sha256 = "0nfz207rzpnni7jyzvdvz5lr0zcpzy278a86821cmw8d5l81a3yp";
-          name = "kaleidoscope";
+          name = "recipe";
         };
         packageRequires = [ s ];
         meta = {
@@ -41478,20 +51777,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    kaleidoscope-evil-state-flash = callPackage ({ evil, fetchFromGitHub, fetchurl, kaleidoscope, lib, melpaBuild, s }:
-    melpaBuild {
+    kaleidoscope-evil-state-flash = callPackage ({ evil
+                                                 , fetchFromGitHub
+                                                 , fetchurl
+                                                 , kaleidoscope
+                                                 , lib
+                                                 , melpaBuild
+                                                 , s }:
+      melpaBuild {
         pname = "kaleidoscope-evil-state-flash";
         version = "20170728.320";
         src = fetchFromGitHub {
           owner = "algernon";
           repo = "kaleidoscope.el";
-          rev = "e932103e043bd1503bf5d98dd117ff6737b852bc";
-          sha256 = "1vz4f3w9630dpr4ba4gdiwza29dacakm9h9vzyjrg643wcsgi6v1";
+          rev = "5b88327350c3d6375ef1d43fb31342eaabd88fdc";
+          sha256 = "1rbifir3rpp6i7il13b9yawkwllr2ima1d9rsff46n6h2920d5x1";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/148d47626879be1608f35827ef82a28274ff4de3/recipes/kaleidoscope-evil-state-flash";
           sha256 = "17a4nmdi6h0z4va3kiw4ivaywiisblz6cicypk9d3g9sl92drcvq";
-          name = "kaleidoscope-evil-state-flash";
+          name = "recipe";
         };
         packageRequires = [ evil kaleidoscope s ];
         meta = {
@@ -41499,7 +51804,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    kanban = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild {
+    kanban = callPackage ({ fetchhg
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "kanban";
         version = "20170418.110";
         src = fetchhg {
@@ -41507,10 +51816,10 @@
           rev = "dd11d722b20a";
           sha256 = "07g0spi9jf48vap76f9rgl61sg3jqy03qdxnmchzwlia8wvcsscb";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/kanban";
           sha256 = "1j4qv3xcg0gk07yx3b4kayiy1n3w8yq1r78h07613iljx2ny91fz";
-          name = "kanban";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -41518,20 +51827,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    kanji-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    kanji-mode = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "kanji-mode";
         version = "20160826.439";
         src = fetchFromGitHub {
           owner = "wsgac";
           repo = "kanji-mode";
-          rev = "eda4f8666486689d36317db7dbda54fb73d3e3d2";
-          sha256 = "1m0s1kdgz1psiidpxcrzm8qmvmrmk5g2k8lz1lq357z482l4i7ll";
+          rev = "5e9d5b72468ece11cfb81b729be6babf63ede425";
+          sha256 = "1zh7klqaza840q5f44zzh1wrnd6sqa2k93z3dgx3yhhsxfd1dxvy";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c9f1fb16f2f7f677d0817fd63633dd071ba2cf12/recipes/kanji-mode";
           sha256 = "0nnkv7lp7ks9qhkbhz15ixm53grc2q0xfspzykxi9c4b59kypcq5";
-          name = "kanji-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -41539,20 +51851,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    kaolin-themes = callPackage ({ autothemer, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    kaolin-themes = callPackage ({ autothemer
+                                 , cl-lib ? null
+                                 , emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "kaolin-themes";
-        version = "20180416.401";
+        version = "20180627.1013";
         src = fetchFromGitHub {
           owner = "ogdenwebb";
           repo = "emacs-kaolin-themes";
-          rev = "2afd1be2a431b59e82ce22353b57bb7def851da5";
-          sha256 = "19y5j2jha3q3i0l06bzywgxbc8q34sc1rh76j0wfvm6r6yxq1bwa";
+          rev = "e183b7adb06338046f1a17a94e18ec67e62d4e42";
+          sha256 = "1mvspqll53p8rz66588lvdflwfx4av6cnzigid6n10d1cy35p5vg";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/043a4e3bd5301ef8f4df2cbda0b3f4111eb399e4/recipes/kaolin-themes";
           sha256 = "1pd2v54d578f1wbwvqzplkdz1qvy8w8s6na511b0v5y9sksgm2xw";
-          name = "kaolin-themes";
+          name = "recipe";
         };
         packageRequires = [ autothemer cl-lib emacs ];
         meta = {
@@ -41560,8 +51878,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    kaomoji = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }:
-    melpaBuild {
+    kaomoji = callPackage ({ emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , helm-core
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "kaomoji";
         version = "20171226.2040";
         src = fetchFromGitHub {
@@ -41570,10 +51893,10 @@
           rev = "90a1490743b2a30762f5454c9d9309018eff83dd";
           sha256 = "1jc796nyrck3k50x6jb1wsaawk396y4gk87gkwb8yd5qks7ci35q";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/140c65cb3cdf6c197b085ccf8ba079e1efd15f38/recipes/kaomoji";
           sha256 = "1p61pbqf2lnwr6ryxxc4jkd5bmlgknrc27lg89h3b4pw7k39cqy1";
-          name = "kaomoji";
+          name = "recipe";
         };
         packageRequires = [ emacs helm-core ];
         meta = {
@@ -41581,8 +51904,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    karma = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }:
-    melpaBuild {
+    karma = callPackage ({ emacs
+                         , fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild
+                         , pkg-info }:
+      melpaBuild {
         pname = "karma";
         version = "20160220.445";
         src = fetchFromGitHub {
@@ -41591,10 +51919,10 @@
           rev = "31d3e7708246183d7ed0686be92bf23140af348c";
           sha256 = "12v242kfcx849j8w95v2g7djh9xqbx8n033iaxyavfxnz0pp7zdl";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/681e12556c3ab3e2a8376d5c7c33ee5a213de650/recipes/karma";
           sha256 = "19wl7js7wmw7jv2q3l4r5zl718lhy2a0jhl79k57ihwhxdc58fwc";
-          name = "karma";
+          name = "recipe";
         };
         packageRequires = [ emacs pkg-info ];
         meta = {
@@ -41602,8 +51930,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    kdeconnect = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    kdeconnect = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "kdeconnect";
         version = "20180126.1540";
         src = fetchFromGitHub {
@@ -41612,10 +51943,10 @@
           rev = "ca0cbf9a628ba7b519b43fa85e0d988ca26bf853";
           sha256 = "07aqzfg2nn35bkikrmk1lszqkc6h8vn2551m22mwc19lmdx94p2i";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c363866d30fb86ae636d30def8c3847711ada762/recipes/kdeconnect";
           sha256 = "1bcwpnwmm1l2jzc5znw8z6f5knysinidsbm12v4r1j8v6v80ydw6";
-          name = "kdeconnect";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -41623,8 +51954,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    kerl = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    kerl = callPackage ({ fetchFromGitHub
+                        , fetchurl
+                        , lib
+                        , melpaBuild }:
+      melpaBuild {
         pname = "kerl";
         version = "20150424.1305";
         src = fetchFromGitHub {
@@ -41633,10 +51967,10 @@
           rev = "1732ee26213f021bf040919c45ad276aafcaae14";
           sha256 = "1kkzs7nrcr74qn1m456vaj52a9j3ah4biakimz06hls415l56yk9";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/166afdc776689b0da93576dbeaa71ff6dfb627db/recipes/kerl";
           sha256 = "0f8n7cm5c432pwj28bcpv2jj5z3br3k164xj6nwfis3dvijwsgss";
-          name = "kerl";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -41644,8 +51978,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    key-chord = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    key-chord = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "key-chord";
         version = "20160227.438";
         src = fetchFromGitHub {
@@ -41654,10 +51991,10 @@
           rev = "72443e9ff3c4f1c3ccaced3130236801efde3d83";
           sha256 = "15jfpysyydcvqlvdannxg2s4bh4i9z6i950fad1qlq43jfmq7k55";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ae489be43b1aee93614e40f492ebdf0b98a3fbc1/recipes/key-chord";
           sha256 = "1g0jqmnn575h5n4figxbc5xs76zl8b1cdqa6wbi3d1p2rn3g8scr";
-          name = "key-chord";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -41665,20 +52002,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    key-combo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    key-combo = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "key-combo";
         version = "20150324.739";
         src = fetchFromGitHub {
           owner = "uk-ar";
           repo = "key-combo";
-          rev = "2fb5c65bc82d5bd2964e2b163822429ab45d90a1";
-          sha256 = "1d445784mar1jrmrlswwxh3w52l3aym8kx3k4lgqwqa1p0i0pjqz";
+          rev = "09a917bdfd3b309b4b3cbe3b11212e1ae6fab38d";
+          sha256 = "0af0yzw95624s0wwh1rw9q7djwwhw6mrk9zhzj66cir555lsshlz";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/99b422ef5f7b9dda894207e3133791fb9963a092/recipes/key-combo";
           sha256 = "1v8saw92jphvjkyy7j9jx7cxzgisl4zpf4wjzdjfw3la5lz11waf";
-          name = "key-combo";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -41686,8 +52026,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    key-intercept = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    key-intercept = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "key-intercept";
         version = "20140210.2349";
         src = fetchFromGitHub {
@@ -41696,10 +52039,10 @@
           rev = "d9a60edb4ce893f2d3d94f242164fdcc62d43cf2";
           sha256 = "143nfs8pgi5yy3mjq7nirffplk4vb8kik4q7zypynh2pddip30a4";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ad758d865bde8c97d27c0d57cabe1606f8b36974/recipes/key-intercept";
           sha256 = "1z776jbpjks5bir6bd0748mlrmz05nf0jy9l4hlmwgyn72dcbx16";
-          name = "key-intercept";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -41707,8 +52050,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    key-leap = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    key-leap = callPackage ({ emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "key-leap";
         version = "20160831.747";
         src = fetchFromGitHub {
@@ -41717,10 +52064,10 @@
           rev = "b3f6ef15c8a13870475d5af159fa24b30f97dea0";
           sha256 = "1f2k7jpxfvjirxzjc5c4s4lpg1hdgw8k7lfchx362jqijny1ipfp";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8b56e18063e6292bb2aca2acc7077b32f3d62262/recipes/key-leap";
           sha256 = "0z1fhpf8g0c4rh3bf8dfmdgyhj5w686kavjr214czaga0x7mwlwj";
-          name = "key-leap";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -41728,8 +52075,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    key-seq = callPackage ({ fetchFromGitHub, fetchurl, key-chord, lib, melpaBuild }:
-    melpaBuild {
+    key-seq = callPackage ({ fetchFromGitHub
+                           , fetchurl
+                           , key-chord
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "key-seq";
         version = "20150907.56";
         src = fetchFromGitHub {
@@ -41738,10 +52089,10 @@
           rev = "e29b083a6427d061638749194fc249ef69ad2cc0";
           sha256 = "05vpydcgiaya35b62cdjxna9y02vnwzzg6p8jh0dkr9k44h4iy3f";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0d54ab1b6973a44362e50559dd91344d0b17f513/recipes/key-seq";
           sha256 = "166k6hl9vvsnnksvhrv5cbhv9bdiclnbfv7qf67q4c1an9xzqi74";
-          name = "key-seq";
+          name = "recipe";
         };
         packageRequires = [ key-chord ];
         meta = {
@@ -41749,20 +52100,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    keycast = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    keycast = callPackage ({ emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "keycast";
         version = "20180318.1321";
         src = fetchFromGitHub {
           owner = "tarsius";
           repo = "keycast";
-          rev = "46370b8a72922902921d3ed2fa194564568053dc";
-          sha256 = "0wgicba3v5l7a0wmmr3awf026vhf4grrn8c4i2hipi9ij3wckqzc";
+          rev = "0d28c26b07a062ab58c01c6cbedc3e68bd4ec8a1";
+          sha256 = "0wfy5wbr150y57mlzsxhb6bq9ycqj2jk5i6nhwl4q8b6xd3mh6p6";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/aaaf62c586818f2493667ad6ec8877234a58da53/recipes/keycast";
           sha256 = "19qq5y1zjp3029kfq0c59xl9xnxqmdn2pd04sblznchcr9jdy5id";
-          name = "keycast";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -41770,8 +52125,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    keychain-environment = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    keychain-environment = callPackage ({ fetchFromGitHub
+                                        , fetchurl
+                                        , lib
+                                        , melpaBuild }:
+      melpaBuild {
         pname = "keychain-environment";
         version = "20180318.1523";
         src = fetchFromGitHub {
@@ -41780,10 +52138,10 @@
           rev = "d3643196de6dc79ea77f9f4805028350fd76100b";
           sha256 = "0wzs77nwal6apinc39d4arj3lralv2cb9aw9gkikk46fgk404hwj";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4382c9e7e8dee2cafea9ee49965d0952ca359dd5/recipes/keychain-environment";
           sha256 = "1w77cg00bwx68h0d6k6r1fzwdwz97q12ch2hmpzjnblqs0i4sv8v";
-          name = "keychain-environment";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -41791,8 +52149,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    keydef = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    keydef = callPackage ({ fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "keydef";
         version = "20090428.1231";
         src = fetchFromGitHub {
@@ -41801,10 +52162,10 @@
           rev = "dff2be9f58d12d8c6a490ad0c1b2b10b55528dc0";
           sha256 = "0dkc51bmix4b8czs2wg6vz8vk32qlll1b9fjmx6xshrxm85cyhvv";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5f2a50f62475639af011c99c6cc38928b74b3b0a/recipes/keydef";
           sha256 = "0yb2vgj7abyg8j7qmv74nsanv50lf350q1m58rjv8wm31yykg992";
-          name = "keydef";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -41812,8 +52173,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    keyfreq = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    keyfreq = callPackage ({ cl-lib ? null
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "keyfreq";
         version = "20160516.716";
         src = fetchFromGitHub {
@@ -41822,10 +52187,10 @@
           rev = "9c665c8c219d18866403897936427bb408e3d6b9";
           sha256 = "1dhdk4f6q340n0r9n8jld2n2fykp7m40x23n7sw4wpm8g151gxin";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cd7157bad0f3039321b5b279a88e7e4fce895543/recipes/keyfreq";
           sha256 = "1rw6hzmw7h5ngvndy7aa41pq911y2hr9kqc9w4gdd5v2p4ln1qh7";
-          name = "keyfreq";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -41833,8 +52198,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    keymap-utils = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    keymap-utils = callPackage ({ cl-lib ? null
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "keymap-utils";
         version = "20180318.1537";
         src = fetchFromGitHub {
@@ -41843,10 +52212,10 @@
           rev = "1ad766dbc111ec78b1a292da97b9bd4856cd2ff7";
           sha256 = "0imx8zp21bm066bzdynvasylrlhw0gr8mpk2bwkz8j1y5lsp54v8";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c03acebf1462dea36c81d4b9ab41e2e5739be3c3/recipes/keymap-utils";
           sha256 = "0nbcwz4nls0pva79lbx91bpzkl38g98yavwkvg2rxbhn9vjbhzs9";
-          name = "keymap-utils";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -41854,20 +52223,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    keyset = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    keyset = callPackage ({ cl-lib ? null
+                          , dash
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "keyset";
         version = "20150219.2130";
         src = fetchFromGitHub {
           owner = "HKey";
           repo = "keyset";
-          rev = "41bbfc4dbed5de6ecf3ec1dba634c7c26241ca84";
-          sha256 = "0cm6naqlwk65xy9lwnn5r7m6nc1l7ims2ckydmyzny5ak8y5jbws";
+          rev = "c6b375fbe8035fde593d1d96895eb6e3f111d379";
+          sha256 = "1vdlx8p0s0zh7sxawd7hfcb66aqap9wdcl1z5ilidnbba4if212g";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7bad8a1f1b94fbfbde5d8035f7e22431e64a9eec/recipes/keyset";
           sha256 = "1kfw0pfb6qm2ji1v0kb8xgz8q2yd2k9kxmaz5vxcdixdlax3xiqg";
-          name = "keyset";
+          name = "recipe";
         };
         packageRequires = [ cl-lib dash ];
         meta = {
@@ -41875,8 +52249,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    keyswap = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    keyswap = callPackage ({ emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "keyswap";
         version = "20160813.257";
         src = fetchFromGitHub {
@@ -41885,10 +52263,10 @@
           rev = "cd682a7c4a8d64d6bae6a005db5045232e5e7b95";
           sha256 = "191i2b2xx6180sly0dd6b1z6npsrzjqhxrbak9wm6yblx7alsgn2";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ed8303f5009604ae3d83769063d38749e37fc5d8/recipes/keyswap";
           sha256 = "0ck9w2jr4vdk3yjlcdzblsbgw5w5x1cxbx7h1am5vkr6fhxh2hdi";
-          name = "keyswap";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -41896,20 +52274,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    keyword-search = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    keyword-search = callPackage ({ fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "keyword-search";
-        version = "20170309.2247";
+        version = "20180424.402";
         src = fetchFromGitHub {
           owner = "keyword-search";
           repo = "keyword-search";
-          rev = "33682e93429027805ee7c51c5f6f608872b6f5dc";
-          sha256 = "03qz2sdyrlww1xc9bkarc07pf3rk42h7jjnl0dw76ffrci1z1mj1";
+          rev = "f8475ecaddb8804a9be6bee47678207c86ac8dee";
+          sha256 = "1ymqnpm9his2bkchq23vwazprwyw0d2sdgza7zjxvs3q0f4nj0vx";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8ecdc51938f2300bf005e2d1b1819e0fa59e0bd7/recipes/keyword-search";
           sha256 = "0wvci1v8pblfbdslfzpi46c149y8pi49kza9jf33jzhj357lp5qa";
-          name = "keyword-search";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -41917,41 +52298,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    kfg = callPackage ({ f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
-        pname = "kfg";
-        version = "20140908.2238";
-        src = fetchFromGitHub {
-          owner = "abingham";
-          repo = "kfg";
-          rev = "d2c9dd26618fb2f7bf1e7b6eae193b1cceba3c97";
-          sha256 = "0xq835xzywks4b4kaz5i0pp759i23kibs5gkvvxasw0dncqh7j5c";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/9b212de583b43dd05d2acd15bb2245e735d0b14c/recipes/kfg";
-          sha256 = "0vvvxl6a4ac27igwmsgzpf0whf9h2pjl9d89fd9fizad6gi8x1fs";
-          name = "kfg";
-        };
-        packageRequires = [ f ];
-        meta = {
-          homepage = "https://melpa.org/#/kfg";
-          license = lib.licenses.free;
-        };
-      }) {};
-    kibit-helper = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    kibit-helper = callPackage ({ emacs
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild
+                                , s }:
+      melpaBuild {
         pname = "kibit-helper";
         version = "20150508.833";
         src = fetchFromGitHub {
           owner = "brunchboy";
           repo = "kibit-helper";
-          rev = "16bdfff785ee05d8e74a5780f6808506d990cef7";
-          sha256 = "0s2hb2lvfmcvm3n1fg4biaafc1p7j7w990d7w15gicaw6rr2j4nr";
+          rev = "ec5f154db3bb0c838e86f527353f08644cede926";
+          sha256 = "0ky167xh1hrmqsldybzjhyqjizgjzs1grn5mf8sm2j9qwcvjw2zv";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f7fee551ca9ed226f1285dffe87027e1e1047f65/recipes/kibit-helper";
           sha256 = "15viybjqksylvm5ash2kzsil0cpdka56wj1rryixa8y1bwlj8y4s";
-          name = "kibit-helper";
+          name = "recipe";
         };
         packageRequires = [ emacs s ];
         meta = {
@@ -41959,20 +52324,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    kill-or-bury-alive = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    kill-or-bury-alive = callPackage ({ cl-lib ? null
+                                      , emacs
+                                      , fetchFromGitHub
+                                      , fetchurl
+                                      , lib
+                                      , melpaBuild }:
+      melpaBuild {
         pname = "kill-or-bury-alive";
         version = "20171231.2218";
         src = fetchFromGitHub {
           owner = "mrkkrp";
           repo = "kill-or-bury-alive";
-          rev = "0ba8f44efe60058ef66b10a059fd30489b42546f";
-          sha256 = "09y6905ig6qphfwjk1xn79sv4qxx75gnrmnwd9i80ig3lfp8ps2r";
+          rev = "d21aa7a12f1a76d47249db36eb9825242df9d512";
+          sha256 = "1m790afdrns8afh7f690slq2gcya5bp7630fxwi8fqp5vil7lswg";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/25016ed09b6333bd79b989a8f6b7b03cd92e08b3/recipes/kill-or-bury-alive";
           sha256 = "0mm0m8hpy5v98cap4f0s38dcviirm7s6ra4l94mknyvnx0f73lz8";
-          name = "kill-or-bury-alive";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -41980,8 +52350,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    kill-ring-search = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    kill-ring-search = callPackage ({ fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "kill-ring-search";
         version = "20140422.855";
         src = fetchFromGitHub {
@@ -41990,10 +52363,10 @@
           rev = "23535b4a01a1cb1574604e36c49614e84e85c883";
           sha256 = "0yrc09k64rv5is4wvss938mkj2pkvbr98lr3ahsi7p0aqn7s444v";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/kill-ring-search";
           sha256 = "1jggi6r5j2dr9y17v4cyskc0wydfdpqgp1pib5dr2kg6n6w0s5xl";
-          name = "kill-ring-search";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -42001,8 +52374,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    killer = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    killer = callPackage ({ fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "killer";
         version = "20120808.422";
         src = fetchFromGitHub {
@@ -42011,10 +52387,10 @@
           rev = "7bbb223f875402a7b2abee4baa5a54f10bd97212";
           sha256 = "05rbh5hkj3jsn9pw0qa4d5a5pi6367vdqkijcn9k14fdfbmyd30x";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bd8c3ec8fa272273128134dea96c0c999a524549/recipes/killer";
           sha256 = "10z4vqwrpss7mk0gq8xdsbsl0qibpp7s1g0l8wlmrsgn6kjkr2ma";
-          name = "killer";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -42022,8 +52398,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    kite = callPackage ({ fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild, websocket }:
-    melpaBuild {
+    kite = callPackage ({ fetchFromGitHub
+                        , fetchurl
+                        , json ? null
+                        , lib
+                        , melpaBuild
+                        , websocket }:
+      melpaBuild {
         pname = "kite";
         version = "20130201.1138";
         src = fetchFromGitHub {
@@ -42032,10 +52413,10 @@
           rev = "7ed74d1147a6ddd152d3da65dc30df3517d53144";
           sha256 = "1cr4i66lws6yhyxmyx5jw6d5x7i75435mafkkych4nfa0mv4vicd";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/kite";
           sha256 = "17bpk9ycx2xkwm3j1dxi5216lbzf5lgnscs8i4y0pkpicdn0wyr6";
-          name = "kite";
+          name = "recipe";
         };
         packageRequires = [ json websocket ];
         meta = {
@@ -42043,20 +52424,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    kite-mini = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, websocket }:
-    melpaBuild {
+    kite-mini = callPackage ({ dash
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild
+                             , websocket }:
+      melpaBuild {
         pname = "kite-mini";
         version = "20160508.406";
         src = fetchFromGitHub {
           owner = "tungd";
           repo = "kite-mini.el";
-          rev = "a68619dbc109c7989f3448426d8c1ee9e797c11f";
-          sha256 = "1qmg5mdf3zhmpa4kdvkh62y6if6mj4ag885dg7y6461dg2y6ymlh";
+          rev = "48734092e735033ad7664a9933acd4556e095f79";
+          sha256 = "0ralsdjzj09g6nsa04jvyyzr6cgsi0d7gi1ji77f52m31dl0b8cw";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a9b76d0ee09efc6652d0541cf72c9623760dda66/recipes/kite-mini";
           sha256 = "1g644406zm3db0fjyv704aa8dbd20v1apmysb3mmh2vldbch4iyh";
-          name = "kite-mini";
+          name = "recipe";
         };
         packageRequires = [ dash websocket ];
         meta = {
@@ -42064,20 +52450,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    kivy-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    kivy-mode = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "kivy-mode";
-        version = "20160902.1041";
+        version = "20180702.1329";
         src = fetchFromGitHub {
           owner = "kivy";
           repo = "kivy";
-          rev = "94d623f914745aab67715356db6731860a3e37e1";
-          sha256 = "1hs69p79f27rdy8v4dld46qdnsszm7f4xx0nqlvz1pgy0wm3lq71";
+          rev = "3e57ac0b07385384619a8042dafcab89cc10da57";
+          sha256 = "1pm0660x688rpgns9jpzg1y08pavp65dazm1aznkvpnvdhy2zs93";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/688e2a114073958c413e56e1d117d48db9d16fb8/recipes/kivy-mode";
           sha256 = "02l230rwivr7rbiqm4vg70458z35f9v9w3mdapcrqd5d07y5mvi1";
-          name = "kivy-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -42085,8 +52474,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    kiwix = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    kiwix = callPackage ({ cl-lib ? null
+                         , emacs
+                         , fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "kiwix";
         version = "20170927.120";
         src = fetchFromGitHub {
@@ -42095,10 +52489,10 @@
           rev = "86dbead6c0017beefd92a0b64a0bb5f5d12c5b16";
           sha256 = "142mm1wy8zvlkzairnc1rjdi1lsq1asfk4zdbs1aria1nxz1sx6x";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/kiwix";
           sha256 = "0x5ld557kxzx5s8ziy5axgvm1fxlq81l9gvinfgs8f257vjlki07";
-          name = "kiwix";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -42106,8 +52500,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    kixtart-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    kixtart-mode = callPackage ({ emacs
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "kixtart-mode";
         version = "20150611.904";
         src = fetchFromGitHub {
@@ -42116,10 +52514,10 @@
           rev = "1c2356797e7b766bbaaa2b341176a8b10499cd79";
           sha256 = "1ld3ccg8q7hmjrj60rxvmmfy4dpm2lvlshjqdf9ifgjzp221g4vb";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/672cfc166209b6c2ffcb0e549fd2416be7212a5a/recipes/kixtart-mode";
           sha256 = "079bw4lgxbmk65rrfyy8givs8j5wsyhpcjjw915ifkg577gj87qp";
-          name = "kixtart-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -42127,20 +52525,48 @@
           license = lib.licenses.free;
         };
       }) {};
-    know-your-http-well = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    klere-theme = callPackage ({ emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
+        pname = "klere-theme";
+        version = "20180415.1123";
+        src = fetchFromGitHub {
+          owner = "WammKD";
+          repo = "emacs-klere-theme";
+          rev = "8e389530dd783dcaab2365e0970181c72d782efb";
+          sha256 = "1217yr4qpax4snzyi64wzcr13qjnmd0dcqw7ch3vniqn48vnla92";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/07a3e348d69738ae59fce3570a61b0cdc565fdb8/recipes/klere-theme";
+          sha256 = "1lgvk6q2853rpk15i91zf917r8wmrb7bnagp4x02fws49x83hqrs";
+          name = "recipe";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/klere-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    know-your-http-well = callPackage ({ fetchFromGitHub
+                                       , fetchurl
+                                       , lib
+                                       , melpaBuild }:
+      melpaBuild {
         pname = "know-your-http-well";
         version = "20160208.1504";
         src = fetchFromGitHub {
           owner = "for-GET";
           repo = "know-your-http-well";
-          rev = "3cc5ab6d2764ab7aacb1b6e026abaccbeb6c37f2";
-          sha256 = "0hni9xvv0759nqwhngijiqkvpiz7alyd4ydf0mvi2vkmbxkci8n1";
+          rev = "ab8cf84ad8031ff85b983c528ebb7117dc784aad";
+          sha256 = "19qky551arnb7gl7w0yp54kkdls03m9wn9bxnr7hm5nv1bml2y64";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2ab50ae6278022281b2b7297c086089e5e669c7a/recipes/know-your-http-well";
           sha256 = "0k2x0ajxkivim8nfpli716y7f4ssrmvwi56r94y34x4j3ib3px3q";
-          name = "know-your-http-well";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -42148,20 +52574,27 @@
           license = lib.licenses.free;
         };
       }) {};
-    kodi-remote = callPackage ({ elnode, fetchFromGitHub, fetchurl, json ? null, let-alist, lib, melpaBuild, request }:
-    melpaBuild {
+    kodi-remote = callPackage ({ elnode
+                               , fetchFromGitHub
+                               , fetchurl
+                               , json ? null
+                               , let-alist
+                               , lib
+                               , melpaBuild
+                               , request }:
+      melpaBuild {
         pname = "kodi-remote";
-        version = "20180223.1905";
+        version = "20180609.1654";
         src = fetchFromGitHub {
           owner = "spiderbit";
           repo = "kodi-remote.el";
-          rev = "aa8c8bb8e64f1f61fadeb4e93973b14dfe19e4a9";
-          sha256 = "1gsaw4yfv68ilf0z130rf13300lnz1fdgi2x8rm8hc0q0dlsp1a6";
+          rev = "bca7250bb69e09c1a9829e15ef4aed1f486777eb";
+          sha256 = "1d67gvhkvcdii2nj0ngh5lnvv1y3iw1ccl70lmi39srz5p2hjw59";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/08f06dd824e67250afafdecc25128ba794ca971f/recipes/kodi-remote";
           sha256 = "0f3n7b3plsw28xpz07lf5pv71b6s2xjhq2h23gpyg0r69v99chh5";
-          name = "kodi-remote";
+          name = "recipe";
         };
         packageRequires = [ elnode json let-alist request ];
         meta = {
@@ -42169,8 +52602,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    kolon-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    kolon-mode = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "kolon-mode";
         version = "20140122.334";
         src = fetchFromGitHub {
@@ -42179,10 +52615,10 @@
           rev = "5af0955e280ae991862189ebecd3937c5fc8fb9f";
           sha256 = "0yr4yxwxgxp5pm9f8gaqlikxp26inv01inq0ya42dzam5yphkafw";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b18f38d291303ff362e11ca711bb00bf411e2180/recipes/kolon-mode";
           sha256 = "0wcg8ph3mk4zcmzqpvl2w6rfgvrfvhmgwb14y8agh9b7v5d9xwj3";
-          name = "kolon-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -42190,8 +52626,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    kooten-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    kooten-theme = callPackage ({ emacs
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "kooten-theme";
         version = "20161023.205";
         src = fetchFromGitHub {
@@ -42200,10 +52640,10 @@
           rev = "d10197b4dd7af02cd14aeab2573c273a294798c3";
           sha256 = "1vc97d3i7jh4fbpan7lfnmsm32c4gwgrg11j2vq7z3rwm42wkkyr";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/kooten-theme";
           sha256 = "1zhrjli65pn5nshz8pqn5vbsndzk2h8mhbcldq9k0mc7ki2rrdlv";
-          name = "kooten-theme";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -42211,20 +52651,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    korean-holidays = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    korean-holidays = callPackage ({ fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "korean-holidays";
         version = "20170228.2045";
         src = fetchFromGitHub {
           owner = "tttuuu888";
           repo = "korean-holidays";
-          rev = "6e94c2e071069aee9ed12ebbfd9b0ad863b8c78e";
-          sha256 = "1xs81yafp783sz1clb65yc9w2xlf2kmshbsjynnafqd6pfd0skps";
+          rev = "aed79c24e3f91d8f9508367758b18e5fa3a9eaf4";
+          sha256 = "1kqbxnjmp7hxjcv8zhy9v8v6220l9vd7rgqicjln4yrjz82z4579";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/korean-holidays";
           sha256 = "1yf0z9vpiwhlsnyb0fy9wf5rz6f2fzzign96zgj0zd5hwmznbmyr";
-          name = "korean-holidays";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -42232,8 +52675,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    kosmos-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    kosmos-theme = callPackage ({ emacs
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "kosmos-theme";
         version = "20170502.1150";
         src = fetchFromGitHub {
@@ -42242,10 +52689,10 @@
           rev = "616456d2376a75dc31190ad65137d179fbad4336";
           sha256 = "193zwgwfnj0lyk0msa16y0dfg7asp953p3jm56d9wdacggbcraj9";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/kosmos-theme";
           sha256 = "0vj1z69hz0j7kxnzj13c4vck1qj5j1glr9lymk5ns2v8l56gakwb";
-          name = "kosmos-theme";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -42253,8 +52700,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    kotlin-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    kotlin-mode = callPackage ({ emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "kotlin-mode";
         version = "20180219.853";
         src = fetchFromGitHub {
@@ -42263,10 +52714,10 @@
           rev = "a2c2628d55c4e8b018ffe9f55ca38d89302a1bbc";
           sha256 = "12zng3rq134f0d49fr2rsf0jgmxl3qc7kkhziy7r27hx6ny9h8z2";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9f2560e913b215821221c96069a1385fe4e19c3e/recipes/kotlin-mode";
           sha256 = "08jn8r4nhhlck0f7n5agibwh049rigdiy12lpmijbwk1zmcvsqws";
-          name = "kotlin-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -42274,8 +52725,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    kpm-list = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    kpm-list = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "kpm-list";
         version = "20170924.652";
         src = fetchFromGitHub {
@@ -42284,10 +52738,10 @@
           rev = "e0f5112e5ce8ec1b603f4428fa51681c68bb28f5";
           sha256 = "1achcr3v0d85narnxqpbfxy9qfk537kl83wiq5lyfy3lwqqf7dmp";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6b7065d016e2da49277b165edf565bef5819d483/recipes/kpm-list";
           sha256 = "0022bhy1mzngjmjydyqnmlgnhww05v4dxsfav034r8nyyc7677z0";
-          name = "kpm-list";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -42295,20 +52749,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    kroman = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    kroman = callPackage ({ fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "kroman";
         version = "20150827.1640";
         src = fetchFromGitHub {
           owner = "cheunghy";
           repo = "kroman-el";
-          rev = "90402b6ae40383e75d8ba97d66eee93eebf40f70";
-          sha256 = "11axxmhdpwgrcyjz200pf5bqzjw9wz4085r8p1n2vr5gx98374fr";
+          rev = "431144a3cd629a2812a668a29ad85182368dc9b0";
+          sha256 = "0miywc3vfqi3hjb7lk8baz1y2nbp9phjjxclqriyqra4gw4n0vhc";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/07ff16db526dce9d720a858aa14010f297bf31a6/recipes/kroman";
           sha256 = "0y9ji3c8kndrz605n7b4w5xq0qp093d61hxwhblm3qrh3370mws7";
-          name = "kroman";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -42316,20 +52773,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    ksp-cfg-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ksp-cfg-mode = callPackage ({ cl-lib ? null
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "ksp-cfg-mode";
-        version = "20170724.1127";
+        version = "20180608.2247";
         src = fetchFromGitHub {
           owner = "lashtear";
           repo = "ksp-cfg-mode";
-          rev = "713a22ee28688e581ec3ad60228c853b516a14b6";
-          sha256 = "04r8mfsc349wdhx1brlf2l54v4dn58y69fqv3glhvml12962lwy3";
+          rev = "fda64705f605fb8fccee53a5040fe4865ca17d44";
+          sha256 = "19brscxk85cky2kzwyyljz6xqrfvyyyg7dqmadlnlrf8kw9wnb2x";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d49db5938fa4e3ab1176a955a4788b15c63d9e69/recipes/ksp-cfg-mode";
           sha256 = "0azcn4qvziacbw1qy33fwdaldw7xpzr672vzjsqhr0b2vg9m2ipi";
-          name = "ksp-cfg-mode";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -42337,20 +52798,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    kubernetes = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }:
-    melpaBuild {
+    kubernetes = callPackage ({ dash
+                              , emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , magit
+                              , melpaBuild }:
+      melpaBuild {
         pname = "kubernetes";
-        version = "20171122.1819";
+        version = "20180706.520";
         src = fetchFromGitHub {
           owner = "chrisbarrett";
           repo = "kubernetes-el";
-          rev = "d4ce5eb5da1ea0879b7d3266d97aecc8aee2807c";
-          sha256 = "1asjmxw24bvaapjaljj37pv9cbvqqw7577q1mds4lnicvnbdsxzi";
+          rev = "2b5ce22b12bd8a569cb0a8019a395173e3a13523";
+          sha256 = "19abr8q9mz3g5i0jb5j6p3jll93jrpvzgj14q2l81c4dng0yamdc";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/16850227ea48f6f38102b9cdf80e0758766a24d2/recipes/kubernetes";
           sha256 = "06357a8y3rpvid03r9vhmjgq97hmiah5g8gff32dij9424vidil9";
-          name = "kubernetes";
+          name = "recipe";
         };
         packageRequires = [ dash emacs magit ];
         meta = {
@@ -42358,8 +52825,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    kubernetes-evil = callPackage ({ evil, fetchFromGitHub, fetchurl, kubernetes, lib, melpaBuild }:
-    melpaBuild {
+    kubernetes-evil = callPackage ({ evil
+                                   , fetchFromGitHub
+                                   , fetchurl
+                                   , kubernetes
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "kubernetes-evil";
         version = "20171122.1819";
         src = fetchFromGitHub {
@@ -42368,10 +52840,10 @@
           rev = "d4ce5eb5da1ea0879b7d3266d97aecc8aee2807c";
           sha256 = "1asjmxw24bvaapjaljj37pv9cbvqqw7577q1mds4lnicvnbdsxzi";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/16850227ea48f6f38102b9cdf80e0758766a24d2/recipes/kubernetes-evil";
           sha256 = "12ygfs6g9aivf2ws3lxwjm5xnd2kidhli889icpygd5v7gnk9pg8";
-          name = "kubernetes-evil";
+          name = "recipe";
         };
         packageRequires = [ evil kubernetes ];
         meta = {
@@ -42379,8 +52851,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    kubernetes-tramp = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    kubernetes-tramp = callPackage ({ cl-lib ? null
+                                    , emacs
+                                    , fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "kubernetes-tramp";
         version = "20171026.922";
         src = fetchFromGitHub {
@@ -42389,10 +52866,10 @@
           rev = "9fa84df71f6e88bc23a756cdf2df393a35aec945";
           sha256 = "1l1ibc97ahp3zwwypqfg3201qdxad4sdpdaq7nsfb87gh46vsbz8";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8ea4b15e64a9dc33b9977650488693cacadd1ab1/recipes/kubernetes-tramp";
           sha256 = "15nlx3w2v0gky0zgbx7n0w1mdr6yaj4dh028ay2k19wg8wbsckjq";
-          name = "kubernetes-tramp";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -42400,8 +52877,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    kurecolor = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    kurecolor = callPackage ({ emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild
+                             , s }:
+      melpaBuild {
         pname = "kurecolor";
         version = "20180401.521";
         src = fetchFromGitHub {
@@ -42410,10 +52892,10 @@
           rev = "a27153f6a01f38226920772dc4917b73166da5e6";
           sha256 = "04av67q5841jli6rp39hav3a5gr2vcf3db4qsv553i23ffplb955";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/58a5ebdbf82e83e6602161bca049d468887abe02/recipes/kurecolor";
           sha256 = "0q0q0dfv376h7j3sgwxqwfpxy1qjbvb6i5clsxz9xp4ly89w4d4f";
-          name = "kurecolor";
+          name = "recipe";
         };
         packageRequires = [ emacs s ];
         meta = {
@@ -42421,8 +52903,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    kv = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    kv = callPackage ({ fetchFromGitHub
+                      , fetchurl
+                      , lib
+                      , melpaBuild }:
+      melpaBuild {
         pname = "kv";
         version = "20140108.734";
         src = fetchFromGitHub {
@@ -42431,10 +52916,10 @@
           rev = "721148475bce38a70e0b678ba8aa923652e8900e";
           sha256 = "0r0lz2s6gvy04fwnafai668jsf4546h4k6zd6isx5wpk0n33pj5m";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/kv";
           sha256 = "0c10r7mhg517p62lc87ccqypsjrm28xh3bgv4f01fnx569jqgzgp";
-          name = "kv";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -42442,8 +52927,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    kwin = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    kwin = callPackage ({ fetchFromGitHub
+                        , fetchurl
+                        , lib
+                        , melpaBuild }:
+      melpaBuild {
         pname = "kwin";
         version = "20150308.1112";
         src = fetchFromGitHub {
@@ -42452,10 +52940,10 @@
           rev = "d4f8f3593598b71ee596e0a87b2c1d6a912a9566";
           sha256 = "0irbfgip493hyh45msnb7climgfwr8f05nvc97bzaqggnay88scy";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/04e6d622a1f1cb765c33297a99f06ed513985498/recipes/kwin";
           sha256 = "1pxnyj81py3ygadmyfrqndb0jkk6xlbf0rg3857hsy3ccblzm7ki";
-          name = "kwin";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -42463,8 +52951,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    labburn-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    labburn-theme = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "labburn-theme";
         version = "20170502.207";
         src = fetchFromGitHub {
@@ -42473,10 +52964,10 @@
           rev = "e95334acd8a73fbe8e156f70e047014a87e92e66";
           sha256 = "0ai8gr4an4d44lgin7kdzydn2d0a98jb8mv0n9b93bq160lbmkwj";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b1bfc9870fbe61f58f107b72fd7f16efba22c902/recipes/labburn-theme";
           sha256 = "09qqb62hfga88zka0pc27rc8i43cxi84cv1x8wj0vvzx6mvic1lm";
-          name = "labburn-theme";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -42484,8 +52975,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    lang-refactor-perl = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    lang-refactor-perl = callPackage ({ fetchFromGitHub
+                                      , fetchurl
+                                      , lib
+                                      , melpaBuild }:
+      melpaBuild {
         pname = "lang-refactor-perl";
         version = "20131122.1327";
         src = fetchFromGitHub {
@@ -42494,10 +52988,10 @@
           rev = "691bd69639de6b7af357e3b7143563ececd9c497";
           sha256 = "135k7inkvdz51j7al3nndaamrkyn989vlv1mxcp8lwx8cgq0rqfj";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6bbbf89b71364720dd39e2cf902271108151b5ca/recipes/lang-refactor-perl";
           sha256 = "02fv25d76rvxqzxs48j4lkrifdhqayyb1in05ryyz2pk9x5hbax9";
-          name = "lang-refactor-perl";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -42505,8 +52999,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    langdoc = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    langdoc = callPackage ({ cl-lib ? null
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "langdoc";
         version = "20150217.2245";
         src = fetchFromGitHub {
@@ -42515,10 +53013,10 @@
           rev = "2c7223bacb116992d700ecb19a60df5c09c63424";
           sha256 = "0svci7xs4iysv8ysf93g382arip0xpgi0fllw8xx2vrd70sz7lff";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/defe78f12dbd7137bed7b1a309caa579e220f7dc/recipes/langdoc";
           sha256 = "19i6ys58wswl5ckf33swl6lsfzg4znx850br4icik15yrry65yj7";
-          name = "langdoc";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -42526,8 +53024,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    langtool = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    langtool = callPackage ({ cl-lib ? null
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "langtool";
         version = "20180409.316";
         src = fetchFromGitHub {
@@ -42536,10 +53038,10 @@
           rev = "d93286722cff3fecf8641a4a6c3b0691f30362fe";
           sha256 = "17xa055705n4jb7nafqvqgl0a6fdaxp3b3q8q0gsv5vzycsc74ga";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/503845e79e67c921f1fde31447f3dd4da2b6f993/recipes/langtool";
           sha256 = "1xq70jyhzg0qmvialy015crbdk9rdibhwpl36khab9hi2999wxyw";
-          name = "langtool";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -42547,20 +53049,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    language-detection = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    language-detection = callPackage ({ cl-lib ? null
+                                      , emacs
+                                      , fetchFromGitHub
+                                      , fetchurl
+                                      , lib
+                                      , melpaBuild }:
+      melpaBuild {
         pname = "language-detection";
         version = "20161123.1013";
         src = fetchFromGitHub {
           owner = "andreasjansson";
           repo = "language-detection.el";
-          rev = "54a6ecf55304fba7d215ef38a4ec96daff2f35a4";
-          sha256 = "0p8kim8idh7hg9398kpgjawkxq9hb6fraxpamdkflg8gjk0h5ppa";
+          rev = "38f5d294870678efc6ccf94ce6e8175a58f93025";
+          sha256 = "0jm3ybi353kjffvgy489b5x1yd8vi2vxdmn32z4c42zrnmg5a6lv";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ed2b68d0a11e5db0e7f2f5cbb2eb93c298bcb765/recipes/language-detection";
           sha256 = "1c613dj6j05idqyjd6ix7llw04d0327aicac04cicrb006km3r51";
-          name = "language-detection";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -42568,8 +53075,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    lastpass = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }:
-    melpaBuild {
+    lastpass = callPackage ({ cl-lib ? null
+                            , emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild
+                            , seq }:
+      melpaBuild {
         pname = "lastpass";
         version = "20171208.216";
         src = fetchFromGitHub {
@@ -42578,10 +53091,10 @@
           rev = "a4529ce70b8187ed9ac4972997df152af58ef2eb";
           sha256 = "1h4h7swww2is7qblqi5r1vh26a9lfl52c0yq7rgwd1pqclffgc8m";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/46e5e8735baab7728bddce2693cea6bcee0e6360/recipes/lastpass";
           sha256 = "0x4c9c110nqv3v6kzcxdg9a9zcg7yn1hj6ffgrbsd8c3wbrdxrlj";
-          name = "lastpass";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs seq ];
         meta = {
@@ -42589,8 +53102,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    latex-extra = callPackage ({ auctex, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    latex-extra = callPackage ({ auctex
+                               , cl-lib ? null
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "latex-extra";
         version = "20170816.1847";
         src = fetchFromGitHub {
@@ -42599,10 +53117,10 @@
           rev = "82d99b8b0c2db20e5270749582e03bcc2443ffb5";
           sha256 = "15m7zvdhg5z7d8alrw66p703wdp5r57lxrgq3zz7xc4hscwghlb1";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/latex-extra";
           sha256 = "1w98ngxymafigjpfalybhs12jcf4916wk4nlxflfjcx8ryd9wjcj";
-          name = "latex-extra";
+          name = "recipe";
         };
         packageRequires = [ auctex cl-lib ];
         meta = {
@@ -42610,8 +53128,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    latex-math-preview = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    latex-math-preview = callPackage ({ fetchFromGitLab
+                                      , fetchurl
+                                      , lib
+                                      , melpaBuild }:
+      melpaBuild {
         pname = "latex-math-preview";
         version = "20170522.1455";
         src = fetchFromGitLab {
@@ -42620,10 +53141,10 @@
           rev = "775887a89447dd19541b121161cc02e9799d0d3a";
           sha256 = "1mp6bpl8992pi40vs6b86q922h4z8879mrjalldv5dyz57ym5fsq";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9e413b7684e9199510b00035825aa861d670e072/recipes/latex-math-preview";
           sha256 = "14bn0q5czrrkb1vjdkwx6f2x4zwjkxgrc0bcncv23l13qls1gkmr";
-          name = "latex-math-preview";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -42631,8 +53152,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    latex-pretty-symbols = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    latex-pretty-symbols = callPackage ({ fetchhg
+                                        , fetchurl
+                                        , lib
+                                        , melpaBuild }:
+      melpaBuild {
         pname = "latex-pretty-symbols";
         version = "20151112.244";
         src = fetchhg {
@@ -42640,10 +53164,10 @@
           rev = "ef4ea64c09ea";
           sha256 = "0h9hncf2ghfkd3i3342ajj1niykhfr0aais3j6sjg1vkm16xbr3b";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/latex-pretty-symbols";
           sha256 = "1f2s2f64bmsx89a3crm4skhdi4pq9w18z9skxw3i3ydaj15s8jgl";
-          name = "latex-pretty-symbols";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -42651,8 +53175,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    latex-preview-pane = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    latex-preview-pane = callPackage ({ fetchFromGitHub
+                                      , fetchurl
+                                      , lib
+                                      , melpaBuild }:
+      melpaBuild {
         pname = "latex-preview-pane";
         version = "20180222.951";
         src = fetchFromGitHub {
@@ -42661,10 +53188,10 @@
           rev = "e7dbe0df3ca938128ab394cdf04f3e40eb5b139e";
           sha256 = "1i8mc2qdyyg04rm946vqmmw021c4v8aq7yvxsgl53mfbx9snm3dv";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bb3227f2e35d701915a8d3479d20581dcbe3a778/recipes/latex-preview-pane";
           sha256 = "1id1l473azmc9hm5vq5wba8gad9np7sv38x94qd2zkf8b78pzkbw";
-          name = "latex-preview-pane";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -42672,8 +53199,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    latex-unicode-math-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    latex-unicode-math-mode = callPackage ({ fetchFromGitHub
+                                           , fetchurl
+                                           , lib
+                                           , melpaBuild }:
+      melpaBuild {
         pname = "latex-unicode-math-mode";
         version = "20170123.1016";
         src = fetchFromGitHub {
@@ -42682,10 +53212,10 @@
           rev = "e8931e68214ca94e6a04080ebc629693d5881884";
           sha256 = "049lpqnyjz0x2dp7rzk9gwbf5s28s33vxxk5lfhax6kaizlxkaq8";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9c021dfad8928c1a352e0ef5526eefa6c0a9cb37/recipes/latex-unicode-math-mode";
           sha256 = "1p9gpp28vylibv1s95bzfgscznw146ybgk6f3qdbbnafrcrmifcr";
-          name = "latex-unicode-math-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -42693,20 +53223,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    latexdiff = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    latexdiff = callPackage ({ emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "latexdiff";
-        version = "20171225.1623";
+        version = "20180521.1532";
         src = fetchFromGitHub {
           owner = "galaunay";
           repo = "latexdiff.el";
-          rev = "665aa65707d0e8c5778de70f38a42be4ba1def5d";
-          sha256 = "1ppxmcbkscsdsnm5vf7lmhzq1y0vkkg8dpp4gh0hmsvqvh7d67bp";
+          rev = "024ee7a4fd235695dacd9f53594fef3d79bee88b";
+          sha256 = "17xpkbrwfck0m6zp5d1b9b4slkgyvm8d92nzilb4s1rf9nqf9mvw";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d164cf118a2c928c04e4d5cbfd47ac732e626fe0/recipes/latexdiff";
           sha256 = "002frvk31q3plrqa6lldadchck51bch4n126y5l33fyfs0ipspfa";
-          name = "latexdiff";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -42714,8 +53248,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    launch = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    launch = callPackage ({ fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "launch";
         version = "20130619.1504";
         src = fetchFromGitHub {
@@ -42724,10 +53261,10 @@
           rev = "e7c3b573fc05fe4d3d322389079909311542e799";
           sha256 = "0ciycsqzyj6ld60c7sfqjq59ln3jvk3w9vy606kqzpcvj01ihmv1";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8e46ed1761fa2e69f0dc2f58e422ea1de8a8cb49/recipes/launch";
           sha256 = "043gwz583pa1wv84fl634p1v86lcsldsw7qkjbm6y678q5mms0m6";
-          name = "launch";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -42735,8 +53272,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    launch-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    launch-mode = callPackage ({ emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "launch-mode";
         version = "20170105.2112";
         src = fetchFromGitHub {
@@ -42745,10 +53286,10 @@
           rev = "25ebd4ba77afcbe729901eb74923dbe9ae81c313";
           sha256 = "1pjb4gwzkk6djzyfqqxf6y5xvrsh4bi5ijg60zrdlnhivggnfbvn";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/876755fff14914b10a26d15f0c7ff32be7c51aa3/recipes/launch-mode";
           sha256 = "1za0h16z84ls7da17qzqady0simzy5pk1mlw3mb0nhlg2cfmn060";
-          name = "launch-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -42756,20 +53297,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    launchctl = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    launchctl = callPackage ({ emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "launchctl";
         version = "20150518.609";
         src = fetchFromGitHub {
           owner = "pekingduck";
           repo = "launchctl-el";
-          rev = "73f8f52a5aa9a0be9bdcf68c29ad0fa2b4a115a4";
-          sha256 = "154z7bhb7qagvl3dlgrlsxdg4chz2863ijglg47xs3yhjp5ypanj";
+          rev = "79842d30134a2f8838ffb909e87f6200ea148428";
+          sha256 = "18fmgvfhv3kz1bpf9icipsmq9ifahhplv9q1b3rw8bbjcl5jrnb5";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/66d0d8c6f7cb66e56328a9cfe9cdef6dffc3c1be/recipes/launchctl";
           sha256 = "07fq445cjpv4ndi7hnjmsrmskm2rlp6ghq0k3bcbjxl21smd9vs9";
-          name = "launchctl";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -42777,8 +53322,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    lavender-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    lavender-theme = callPackage ({ emacs
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "lavender-theme";
         version = "20170808.613";
         src = fetchFromGitHub {
@@ -42787,10 +53336,10 @@
           rev = "ef5e959b95d7fb8152137bc186c4c24e986c1e3c";
           sha256 = "0pbpns387fmalkakbdl2q7d2y720m7ai7mnydsinjwlkdrshvj4g";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/641d1959bd31598fcdacd39a3d1bb077dcccfa5c/recipes/lavender-theme";
           sha256 = "1x7mk3dpk44fkzll6xmh2dw270cgb3a9qs3h8bmiq2dw0wrcwcd1";
-          name = "lavender-theme";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -42798,20 +53347,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    lcb-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    lcb-mode = callPackage ({ emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "lcb-mode";
         version = "20160815.2240";
         src = fetchFromGitHub {
           owner = "peter-b";
           repo = "lcb-mode";
-          rev = "be0768e9aa6f9b8e76f2230f4f7f4d152a766b9a";
-          sha256 = "0mgcqqhjadm8ckp6x37f9j4xcs61g73m9v8qr4zbw115yci2d0xk";
+          rev = "e5b0b6ca6c5feeb2502d66a760ddf5bb590d04c4";
+          sha256 = "0i58qz4l5rzwp9kx4r9f818ly21ys71zh1zjxppp220p3yydljfq";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fd1380a9ba363f62f297e3ab2995341258b51fd1/recipes/lcb-mode";
           sha256 = "184vd5ll0ms2lspzv8zz2zbairsr8i9p3gs28hrnnwm6mrpx4n18";
-          name = "lcb-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -42819,8 +53372,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    lcr = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    lcr = callPackage ({ dash
+                       , emacs
+                       , fetchFromGitHub
+                       , fetchurl
+                       , lib
+                       , melpaBuild }:
+      melpaBuild {
         pname = "lcr";
         version = "20180414.1256";
         src = fetchFromGitHub {
@@ -42829,10 +53387,10 @@
           rev = "49a59d80a4b55cc421cb55430ff8258887382c3d";
           sha256 = "1fds0s0if9m155v5hk5l0ihc6wr331qif5bc013w04hrlkn4v5jh";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/29374d3da932675b7b3e28ab8906690dad9c9cbe/recipes/lcr";
           sha256 = "07syirjlrw8g95zk273953mnmg9x4bv8jpyvvzghhin4saiiiw3k";
-          name = "lcr";
+          name = "recipe";
         };
         packageRequires = [ dash emacs ];
         meta = {
@@ -42840,20 +53398,29 @@
           license = lib.licenses.free;
         };
       }) {};
-    lean-mode = callPackage ({ dash, dash-functional, emacs, f, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, s }:
-    melpaBuild {
+    lean-mode = callPackage ({ dash
+                             , dash-functional
+                             , emacs
+                             , f
+                             , fetchFromGitHub
+                             , fetchurl
+                             , flycheck
+                             , lib
+                             , melpaBuild
+                             , s }:
+      melpaBuild {
         pname = "lean-mode";
-        version = "20180123.413";
+        version = "20180712.57";
         src = fetchFromGitHub {
           owner = "leanprover";
           repo = "lean-mode";
-          rev = "ae90bd280588c96d540892d0f42247db5a126f51";
-          sha256 = "06d5f577rv82g72m719w8z9w7m63amxjsdppcyvg2i6icymlhnqa";
+          rev = "529b8fa535cfa090a6b62566794161556ffade80";
+          sha256 = "0gqwc65m42kkal390a7qx1r5b9ixsbg6avn8s35n5r1qf2w0qx5p";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/42f4d6438c8aeb94ebc1782f2f5e2abd17f0ffde/recipes/lean-mode";
           sha256 = "0rdraxsirkrzbinjwg4qam15iy3qiixqgwsckngzw8d9a4s9l6sj";
-          name = "lean-mode";
+          name = "recipe";
         };
         packageRequires = [ dash dash-functional emacs f flycheck s ];
         meta = {
@@ -42861,8 +53428,18 @@
           license = lib.licenses.free;
         };
       }) {};
-    leanote = callPackage ({ async, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pcache, request, s }:
-    melpaBuild {
+    leanote = callPackage ({ async
+                           , cl-lib ? null
+                           , emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , let-alist
+                           , lib
+                           , melpaBuild
+                           , pcache
+                           , request
+                           , s }:
+      melpaBuild {
         pname = "leanote";
         version = "20161222.1739";
         src = fetchFromGitHub {
@@ -42871,10 +53448,10 @@
           rev = "d499e7b59bb1f1a2fabc0e4c26fb101ed62ebc7b";
           sha256 = "1lg4zml26q97bx9jrmjikhnm3d74b12q2li5h8gpxx9m35wc360c";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b00b806ae4562ca5a74f41c12ef35bfa597bcfa8/recipes/leanote";
           sha256 = "1xnfv7bpkw3ir402962zbp856d56nas098nkf7bamnsnax6kkqw7";
-          name = "leanote";
+          name = "recipe";
         };
         packageRequires = [ async cl-lib emacs let-alist pcache request s ];
         meta = {
@@ -42882,20 +53459,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    ledger-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ledger-mode = callPackage ({ emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "ledger-mode";
-        version = "20180416.105";
+        version = "20180705.138";
         src = fetchFromGitHub {
           owner = "ledger";
           repo = "ledger-mode";
-          rev = "fa09a3bdd25a532b8ee1335e22b7427eb0d231e9";
-          sha256 = "0hp7p6nmxp4ass17vnlx0r73k9gc4z8aknsmpwpyw1radx26vy1k";
+          rev = "ac93ac5c36dd66fc97417697d92688c5e2570024";
+          sha256 = "0yhr1d40wk2h514p6rjpnhvdxwjdbmr3bkh1wnc6pafpcryhydi1";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1549048b6f57fbe9d1f7fcda74b78a7294327b7b/recipes/ledger-mode";
           sha256 = "10asbcb5syv3b75bngsab3c84dp2xmc0q7s29im6kf4mzv5zcfcf";
-          name = "ledger-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -42903,8 +53484,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    leerzeichen = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    leerzeichen = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "leerzeichen";
         version = "20170422.613";
         src = fetchFromGitHub {
@@ -42913,10 +53497,10 @@
           rev = "5acf9855ecb2b2cd5da4402bb48df149e7525cc5";
           sha256 = "1bx4pv51a9x8f51pjrms8jkfrpa3glwkh308svz05gnyi2g0r8hw";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5de7033e75bc28de6e50b2146511cdaac4542ad6/recipes/leerzeichen";
           sha256 = "0h7zpskcgkswr110vckfdbxggz5b3g9grk1j1cbd98pmrpgfqrvp";
-          name = "leerzeichen";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -42924,8 +53508,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    legalese = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    legalese = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "legalese";
         version = "20150820.1024";
         src = fetchFromGitHub {
@@ -42934,10 +53521,10 @@
           rev = "ec23e69d18329456beed9546a1d6c72f96db91cf";
           sha256 = "05zpc8b2pyjz76fvmgr7zkl56g6nf6hi4nmxdg6gkw8fx6p8i19f";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0fda2b54a0ff0b6fc3bd6d20cfcbbf63cae5380f/recipes/legalese";
           sha256 = "18rkvfknaqwkmhsjpgrf2hknrb2zj61aw8rb4907gsbs9rciqpdd";
-          name = "legalese";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -42945,8 +53532,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    lemon-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    lemon-mode = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "lemon-mode";
         version = "20130216.504";
         src = fetchFromGitHub {
@@ -42955,10 +53545,10 @@
           rev = "155bfced6c9afc8072a0133d3d1baa54c6d67430";
           sha256 = "0n6jrm5ilm5wzfrh7yjxn3sr5m10hwdm55b179ild32lh4795zj7";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6163d4cf36031349480039b82de8cdc75c2db169/recipes/lemon-mode";
           sha256 = "0jdf3556kmv55jh85ljqh2gdx0jl2b8zgvpz9a4kf53xifk3lqz5";
-          name = "lemon-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -42966,20 +53556,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    lenlen-theme = callPackage ({ color-theme-solarized, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    lenlen-theme = callPackage ({ color-theme-solarized
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "lenlen-theme";
         version = "20170328.1945";
         src = fetchFromGitHub {
           owner = "zk-phi";
           repo = "lenlen-theme";
-          rev = "b8a6412c81633b10fb98ba0930f55b25071c084a";
-          sha256 = "177fqqhd498v2h6wki6pgg982rp4jxhn4wrzajcqppjz4nidb1b7";
+          rev = "3af764f0b381bdbf04b1a9064695abbe7916bbc3";
+          sha256 = "1zlgb3s7gdh0ypsjw4ck7ai6hqf54cakd1walj8qqhia23g76mxq";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/47d5b3c931cdbc2351e01d15e2b98c78081c9506/recipes/lenlen-theme";
           sha256 = "1bddkcl9kzj3v071qpzmxzjwywqfj5j6cldz240qgp5mx685r0a9";
-          name = "lenlen-theme";
+          name = "recipe";
         };
         packageRequires = [ color-theme-solarized ];
         meta = {
@@ -42987,20 +53581,28 @@
           license = lib.licenses.free;
         };
       }) {};
-    lentic = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, m-buffer, melpaBuild, s }:
-    melpaBuild {
+    lentic = callPackage ({ dash
+                          , emacs
+                          , f
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , m-buffer
+                          , melpaBuild
+                          , s }:
+      melpaBuild {
         pname = "lentic";
         version = "20161202.1352";
         src = fetchFromGitHub {
           owner = "phillord";
           repo = "lentic";
-          rev = "678db9327209a1e6200c9272f4080595dc68f8a5";
-          sha256 = "1wziqwclrkrz6bs66mj2rqcgavyf11l7iaz8vksv7vw6fh18bpbs";
+          rev = "c744f3d3be20ce2a9f25890db2b4500438dfa547";
+          sha256 = "1rvjmn70ncrsv6rzxhjiplibf0ypkg0qlg21ra53bhvy6vlizdsi";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cbb6f9cc3c1040b80fbf3f2df2ac2c3c8d18b6b1/recipes/lentic";
           sha256 = "0y94y1qwj23kqp491b1fzqsrjak96k1dmmzmakbl7q8vc9bncl5m";
-          name = "lentic";
+          name = "recipe";
         };
         packageRequires = [ dash emacs f m-buffer s ];
         meta = {
@@ -43008,8 +53610,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    lentic-server = callPackage ({ fetchFromGitHub, fetchurl, lentic, lib, melpaBuild, web-server }:
-    melpaBuild {
+    lentic-server = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lentic
+                                 , lib
+                                 , melpaBuild
+                                 , web-server }:
+      melpaBuild {
         pname = "lentic-server";
         version = "20160717.1352";
         src = fetchFromGitHub {
@@ -43018,10 +53625,10 @@
           rev = "8e809fafbb27a98f815b544d9d9ee15843eb6a36";
           sha256 = "1wc1c6hqhbb5x4fi7lp30bsrfww9g12c41lphswy92qzlij4zbww";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/10b8cc0b4612d7d02be3a74c21b762cbf7613bd6/recipes/lentic-server";
           sha256 = "1y9idhf9qcsw3dbdj7rwa7bdrn1q0m3bg3r2jzwdnvkq8aas1w56";
-          name = "lentic-server";
+          name = "recipe";
         };
         packageRequires = [ lentic web-server ];
         meta = {
@@ -43029,20 +53636,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    less-css-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    less-css-mode = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "less-css-mode";
         version = "20160930.2153";
         src = fetchFromGitHub {
           owner = "purcell";
           repo = "less-css-mode";
-          rev = "2c3f69640c3c98457255f601db98f520dee2e7b6";
-          sha256 = "01cxa7p299k3kgcv2x4lcri154fij7p02v1kl3fx4vnc88nr9jwd";
+          rev = "59bf174c4e9f053ec2a7ef8c8a8198490390f6fb";
+          sha256 = "1rkjamdy2a80w439vb2hhr7vqjj47wi2azlr7yq2xdz9851xsx9f";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/less-css-mode";
           sha256 = "188iplnwwhawq3dby3388kimy0jh1k9r8v9nxz52hy9rhh9hykf8";
-          name = "less-css-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -43050,8 +53660,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    letcheck = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    letcheck = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "letcheck";
         version = "20160202.1148";
         src = fetchFromGitHub {
@@ -43060,10 +53673,10 @@
           rev = "edf188ca2f85349e971b83f164c6484264e79426";
           sha256 = "06hggcbz98qhfbvp0fxn89j98d0mmki4wc4k8kfzp5fhg071chbi";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d6a0937f704e33bbb9ea8f101cd87c44e8050afb/recipes/letcheck";
           sha256 = "1sjwi1ldg6b1qvj9cvfwxq3qlkfas6pm8zasf43baljmnz38mxh2";
-          name = "letcheck";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -43071,8 +53684,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    letterbox-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    letterbox-mode = callPackage ({ emacs
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "letterbox-mode";
         version = "20170701.1825";
         src = fetchFromGitHub {
@@ -43081,10 +53698,10 @@
           rev = "88c67a51d67216d569a28e8423200883fde096dd";
           sha256 = "1xzzfr525pn2mj7x6xnvccxhls79bfpi5mqhl9ivisnlgj1bvdjw";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1512e20962ea354e4311c0a2696a22576a099ba9/recipes/letterbox-mode";
           sha256 = "117dj5xzf6givwjyqsciz6axhlcj7xbx0zj91ximm81kb5fswgda";
-          name = "letterbox-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -43092,8 +53709,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    leuven-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    leuven-theme = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "leuven-theme";
         version = "20170919.252";
         src = fetchFromGitHub {
@@ -43102,10 +53722,10 @@
           rev = "9d31a9d4ed763d6309e9d44985cd8b4a5a2fb500";
           sha256 = "0vr535a32cgkna0h1z8ac9cb4al3jb01bybn956rz51qdbzm2d1h";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b09451f4eb2be820e94d3fecbf4ec7cecd2cabdc/recipes/leuven-theme";
           sha256 = "0pm5majr9cmj6g4zr7vb55ypk9fmfbvxx78mgmgignknbasq9g9a";
-          name = "leuven-theme";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -43113,8 +53733,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    levenshtein = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    levenshtein = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "levenshtein";
         version = "20090830.340";
         src = fetchFromGitHub {
@@ -43123,10 +53746,10 @@
           rev = "070925197ebf6b704e6e00c4f2d2ec783f3df38c";
           sha256 = "1w6rhp723kn1ns7r0gcblp5q8bvncicnjjsgdangbib1a4l2xw79";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ae489be43b1aee93614e40f492ebdf0b98a3fbc1/recipes/levenshtein";
           sha256 = "1vdbgzs7gfy89a1dzf6z5l3f5jmly1i8lb2fqi2d08qyl5rhb8bl";
-          name = "levenshtein";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -43134,8 +53757,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    lexbind-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    lexbind-mode = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "lexbind-mode";
         version = "20141027.729";
         src = fetchFromGitHub {
@@ -43144,10 +53770,10 @@
           rev = "fa0a6848c1cfd3fbf45db43dc2deef16377d887d";
           sha256 = "167ayfl1k8dnajw173hh67nbwbk4frmjc4fzc515q67m9d7m5932";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f3a493e642cc90bbe1c70a2d918793f0734464c9/recipes/lexbind-mode";
           sha256 = "1hs9wg45mwp3fwi827rc4g0gjx4fk87zlibq3id9fcqic8q7nrnl";
-          name = "lexbind-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -43155,20 +53781,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    lfe-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    lfe-mode = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "lfe-mode";
         version = "20170121.454";
         src = fetchFromGitHub {
           owner = "rvirding";
           repo = "lfe";
-          rev = "5faa7106419263689bfc0bc08a7451ccb1fba718";
-          sha256 = "010l1xz9wa6wm7fnajxcdxjl1nmbkwxxwszd4h14xmhj830560ph";
+          rev = "70579b69e44147f1b74f619dd9dbaed572d8f9d6";
+          sha256 = "1p9a3d1jqm0kqn074f3fh1v4xp1f1jzwihv395bk6yxlhagk9anb";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c44bdb00707c9ef90160e0a44f7148b480635132/recipes/lfe-mode";
           sha256 = "0smncyby53ipm8yqslz88sqjafk0x6r8d0qwk4wzk0pbgfyklhgs";
-          name = "lfe-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -43176,8 +53805,62 @@
           license = lib.licenses.free;
         };
       }) {};
-    libmpdee = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    libelcouch = callPackage ({ emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild
+                              , request }:
+      melpaBuild {
+        pname = "libelcouch";
+        version = "20180604.53";
+        src = fetchFromGitHub {
+          owner = "DamienCassou";
+          repo = "libelcouch";
+          rev = "1396144ebbb9790d4c744db0d4aacc0211b8e8e6";
+          sha256 = "1r0wrqiqar3jw5xbp1qv7kj7m1fdzciyy9690hwiq99dcm8nlri3";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/209d5c507cfe42b152c21a4534c3ba549186420f/recipes/libelcouch";
+          sha256 = "1zfjyfyjd59z0ns32v2b0r5g9ypjxrlmkx3djmxsmzd4an8ciq3p";
+          name = "recipe";
+        };
+        packageRequires = [ emacs request ];
+        meta = {
+          homepage = "https://melpa.org/#/libelcouch";
+          license = lib.licenses.free;
+        };
+      }) {};
+    libgit = callPackage ({ emacs
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
+        pname = "libgit";
+        version = "20180624.2359";
+        src = fetchFromGitHub {
+          owner = "magit";
+          repo = "libegit2";
+          rev = "5e8dedb8275d394ce423a73ce39934302fa84f50";
+          sha256 = "1nr9h8qkkjv1r5jzyydxqmq02kxays1yqxlqd7s9968gqacyqkyv";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/993a5abe3a9e8b160f0d68283eeca6af033abc79/recipes/libgit";
+          sha256 = "05yys8cjli2zhmhdh9w5qz287ibzplqabx5vyyjv9rpk6wgzkzik";
+          name = "recipe";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/libgit";
+          license = lib.licenses.free;
+        };
+      }) {};
+    libmpdee = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "libmpdee";
         version = "20160117.1501";
         src = fetchFromGitHub {
@@ -43186,10 +53869,10 @@
           rev = "a6ca3b7d6687f3ba60996b9b5044ad1d3b228290";
           sha256 = "039awlam3nrgkxrarcapfyc2myvc77aw7whrkcsjjybzylpzv0pr";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fc91db6f80463a1baea9759f9863b551ae21e180/recipes/libmpdee";
           sha256 = "0z4d8y8jlsjw20b31akkaikh5xl0c05lj77d2i1xbgzam4iixma0";
-          name = "libmpdee";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -43197,20 +53880,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    libmpdel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    libmpdel = callPackage ({ emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "libmpdel";
-        version = "20180403.816";
+        version = "20180606.453";
         src = fetchFromGitHub {
           owner = "mpdel";
           repo = "libmpdel";
-          rev = "6e9b1bd6c3439c8e15be0f85eff94f95d1e987f6";
-          sha256 = "03qcr2nc8x8h3cgb7fzk7r69b5fqpq63a3x8vd4fr6nps8bsb8gd";
+          rev = "fcc719c2f23df4b5838eab76a40fef11055203de";
+          sha256 = "0qw6rrb16bbhwg1gci4ymn2nshzf21lcf2nyphxbn4vcv400cw4k";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bb25443752e18e47afc63d5497cc5052c388a607/recipes/libmpdel";
           sha256 = "0qi9g3czwzi9hhp7gjczpzjx9vgzz52xi91332l0sxcxmwbawjp1";
-          name = "libmpdel";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -43218,8 +53905,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    lice = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    lice = callPackage ({ fetchFromGitHub
+                        , fetchurl
+                        , lib
+                        , melpaBuild }:
+      melpaBuild {
         pname = "lice";
         version = "20170220.143";
         src = fetchFromGitHub {
@@ -43228,10 +53918,10 @@
           rev = "4339929927c62bd636f89bb39ea999d18d269250";
           sha256 = "0879z761b7gajkhq176ps745xpdrivch349crransv8fnsc759yb";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2508699ebfc846742940c5e4356b095b540e2405/recipes/lice";
           sha256 = "1hv2hz3153x0gk7f2js18dbx5pyprfdf2pfxb658fj16vxpp7y6x";
-          name = "lice";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -43239,8 +53929,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    light-soap-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    light-soap-theme = callPackage ({ emacs
+                                    , fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "light-soap-theme";
         version = "20150607.745";
         src = fetchFromGitHub {
@@ -43249,10 +53943,10 @@
           rev = "76a787bd40c6b567ae68ced7f5d9f9f10725e00d";
           sha256 = "04dik8z2mg6qr4d3fkd26kg29b4c5crvbnc1lfsrzyrik7ipvsi8";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/053be1123bb934d80b4d6db0e7e39b59771be035/recipes/light-soap-theme";
           sha256 = "09p4w51d5szhi81a6a3l0r4zd4ixkrkzxldr938bcmj0qmj62iyk";
-          name = "light-soap-theme";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -43260,20 +53954,49 @@
           license = lib.licenses.free;
         };
       }) {};
-    line-up-words = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    line-reminder = callPackage ({ cl-lib ? null
+                                 , emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
+        pname = "line-reminder";
+        version = "20180602.2252";
+        src = fetchFromGitHub {
+          owner = "jcs090218";
+          repo = "line-reminder";
+          rev = "0db41599b7663c4c8257aaf733323e84e95ef042";
+          sha256 = "09pzynms4m4m54fk2ci1wizkgrqkgh4mqyrj9wzpwpkdik7zvr7b";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/456f760f7f7d4151e18f08b2f1154c5880423b21/recipes/line-reminder";
+          sha256 = "0kvqilg5fnr3qb7nwjf4j5ydm1lp4m06ss81i0bq2c6bv74zfcf1";
+          name = "recipe";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/line-reminder";
+          license = lib.licenses.free;
+        };
+      }) {};
+    line-up-words = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "line-up-words";
         version = "20180219.224";
         src = fetchFromGitHub {
           owner = "janestreet";
           repo = "line-up-words";
-          rev = "bbefa954510801725070be50a7e13de6dc38f49a";
-          sha256 = "165sg8j69lxqjfx9avbcclsw6n57x4qrkhd74zbmzs35xnji9w5q";
+          rev = "2c236f5772e18d0e50d7ca2eee7eebbe356d9b60";
+          sha256 = "0sazx4a6hn0z7318mdc80z87n5ix4hhyyh4p4f37pv5p9q6y8sd2";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/28ac7764a19fee2e1e2a89d95569815f1940c5e4/recipes/line-up-words";
           sha256 = "0agsrrkwwfmbiy4z3g4hkrpfr3nqgd5lwfn18qrdxynijd5rqs79";
-          name = "line-up-words";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -43281,8 +54004,36 @@
           license = lib.licenses.free;
         };
       }) {};
-    lingr = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    lines-at-once = callPackage ({ emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
+        pname = "lines-at-once";
+        version = "20180421.1947";
+        src = fetchFromGitHub {
+          owner = "jiahaowork";
+          repo = "lines-at-once.el";
+          rev = "a018ba90549384d52ec58c2685fd14a0f65252be";
+          sha256 = "0bwc4d2gnfhaqzn455nzrvd9lys7z7ay2v1hxgwp99ndqq93ws6i";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/513d0f0c6976f685fc0df6b6bb0da3162f58f537/recipes/lines-at-once";
+          sha256 = "1hiij6i47i9px82ll87dvx5pgp5jzz8qis7hdm8n6hd3c9rnabma";
+          name = "recipe";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/lines-at-once";
+          license = lib.licenses.free;
+        };
+      }) {};
+    lingr = callPackage ({ fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "lingr";
         version = "20100807.1031";
         src = fetchFromGitHub {
@@ -43291,10 +54042,10 @@
           rev = "4215a8704492d3c860097cbe2649936c22c196df";
           sha256 = "0rkx0hk3y79rwhjqs3wvgxhg1rj83mxbqkhhm3jfawp8c1av4f40";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bf5d29710ab17b1a98f9b559344e4dd40a2b9c08/recipes/lingr";
           sha256 = "1445bxiirsxl9kgm0j86xc9d0pbaa5f07c1i66pw2vl40bvhrjff";
-          name = "lingr";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -43302,20 +54053,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    link = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    link = callPackage ({ fetchFromGitHub
+                        , fetchurl
+                        , lib
+                        , melpaBuild }:
+      melpaBuild {
         pname = "link";
         version = "20140717.2029";
         src = fetchFromGitHub {
           owner = "myrkr";
           repo = "dictionary-el";
-          rev = "a23b8f4a422d0de69a006ed010eff5795319db98";
-          sha256 = "0gz03hji6mcrzvxd74qim63g159sc8ggb6hq3x42x5l01g980fbm";
+          rev = "a5619fb275520d699eaae214e41ebcfde23c17f3";
+          sha256 = "176w46j3m343vlkjn9jyaaz3ikzdzxffrvhalgc76ydw9wyivbf8";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5b08ed7b90e3283e177eff57cb02b12a093dc258/recipes/link";
           sha256 = "17jpsg3f2954b740vyj37ikygrg5gmp0bjhbid8bh8vbz7xx9zy8";
-          name = "link";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -43323,20 +54077,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    link-hint = callPackage ({ avy, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    link-hint = callPackage ({ avy
+                             , cl-lib ? null
+                             , emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "link-hint";
-        version = "20180407.1440";
+        version = "20180519.1430";
         src = fetchFromGitHub {
           owner = "noctuid";
           repo = "link-hint.el";
-          rev = "b350015ec4ebea9e84f73dcac808dd79b2882966";
-          sha256 = "10gqpqq1xgjji7plljjkqzi0p63q65avjya0fsalrwvakzsx6xlv";
+          rev = "23df5fa36ab182452be6b772475eab67b846dd92";
+          sha256 = "0b7i2jasc5bsphix9fhvmi3ddj42f5n5liczrrfv4p9k14px3b10";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d24b48fe0bc127ae6ac4084be8059aacb8445afd/recipes/link-hint";
           sha256 = "12fb2zm9jnh92fc2nzmzmwjlhi64rhakwbh9lsydx9svsvkgcs89";
-          name = "link-hint";
+          name = "recipe";
         };
         packageRequires = [ avy cl-lib emacs ];
         meta = {
@@ -43344,8 +54104,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    linphone = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    linphone = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "linphone";
         version = "20130524.409";
         src = fetchFromGitHub {
@@ -43354,10 +54117,10 @@
           rev = "99af3db941b7f4e5272bb48bff96c1ce4ceac302";
           sha256 = "01yv6239z90hvncwmm9g5nh4xvyxv2ig3h4hsmxdn4kacfxvc84n";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c0ea68b186c813faceb6fc663633cb81df666f0e/recipes/linphone";
           sha256 = "0q7mw1npxq24szhwswc93qz5h6magcxw63ymba7hwhif6my65zx7";
-          name = "linphone";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -43365,20 +54128,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    linum-off = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    linum-off = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "linum-off";
         version = "20160217.1337";
         src = fetchFromGitHub {
           owner = "mattfidler";
           repo = "linum-off";
-          rev = "116e66ac259b183e0763b85616888316ab196822";
-          sha256 = "1pvgp76n2qnm01l5f9mkb9yqwfxag9x23wwqbsna66rmvsag69w0";
+          rev = "3e37baaad27d27e405f8dfe01d4ab9cd5b591353";
+          sha256 = "1hyy6d9ybdv9r6bibiylw66a8w4dmlvsj5gfkp37vsp5xj66f2iz";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c3774ed0cf6fb8c6d08553dc709c7e76a745b2e0/recipes/linum-off";
           sha256 = "1yilsdsyxlzmh64dpzirzga9c7lhp1phps9cdgp2898zpnzaclay";
-          name = "linum-off";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -43386,8 +54152,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    linum-relative = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    linum-relative = callPackage ({ fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "linum-relative";
         version = "20180124.247";
         src = fetchFromGitHub {
@@ -43396,10 +54165,10 @@
           rev = "c74a6981b688a5e1e6b8e0809363963ff558ce4d";
           sha256 = "0svxi1l3s4rg1k1apfw25gzi127rsks56b5yfg79a48b5rf1xmkh";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/97ae01be4892a7c35aa0f82213433a2944041d87/recipes/linum-relative";
           sha256 = "0s1lc3lppazv0481dxknm6qrxhvkv0r9hw8xmdrpjc282l91whkj";
-          name = "linum-relative";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -43407,8 +54176,18 @@
           license = lib.licenses.free;
         };
       }) {};
-    liquid-types = callPackage ({ button-lock, dash, emacs, fetchFromGitHub, fetchurl, flycheck, flycheck-liquidhs, lib, melpaBuild, popup, pos-tip }:
-    melpaBuild {
+    liquid-types = callPackage ({ button-lock
+                                , dash
+                                , emacs
+                                , fetchFromGitHub
+                                , fetchurl
+                                , flycheck
+                                , flycheck-liquidhs
+                                , lib
+                                , melpaBuild
+                                , popup
+                                , pos-tip }:
+      melpaBuild {
         pname = "liquid-types";
         version = "20151201.2335";
         src = fetchFromGitHub {
@@ -43417,10 +54196,10 @@
           rev = "cc4bacbbf204ef9cf0756f78dfebee2c6ae14d7b";
           sha256 = "06rnma2xj2vnbvy1bnls59cagk6qsf862bj1zp6xbmpr1a5l9m4z";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d5921fde4068ff1bb288f6f9e2fe03f4a7fdbbda/recipes/liquid-types";
           sha256 = "1g7zyak69l4lcsq952j2jy692xxnill9nqb1xfa17yzp547cgvf2";
-          name = "liquid-types";
+          name = "recipe";
         };
         packageRequires = [
           button-lock
@@ -43436,8 +54215,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    liso-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    liso-theme = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "liso-theme";
         version = "20160410.1329";
         src = fetchFromGitHub {
@@ -43446,10 +54228,10 @@
           rev = "844688245eb860d23043455e165ee24503454c81";
           sha256 = "01ycjy3amzbplp3zf0x5fahsja92gyg2252xhzcyiazmhaz7gkrd";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/27b849f3a41a5ae3d497cef02a95c92fd479b93b/recipes/liso-theme";
           sha256 = "014a71dnhnr0dr36sl2h8ffp6il9nasij31ahqz0bjgn4r16s5gy";
-          name = "liso-theme";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -43457,8 +54239,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    lisp-extra-font-lock = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    lisp-extra-font-lock = callPackage ({ fetchFromGitHub
+                                        , fetchurl
+                                        , lib
+                                        , melpaBuild }:
+      melpaBuild {
         pname = "lisp-extra-font-lock";
         version = "20160930.1227";
         src = fetchFromGitHub {
@@ -43467,10 +54252,10 @@
           rev = "092f5a6e75ddfc8051b252f10e182723a17980e4";
           sha256 = "0cdjgnh2hzwpim4vl2siykfsfni1z5h45vn5dcm52yx8p10s7mzd";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/13e01d4faf9ecb4dde8b6eb4acdb0e48e3e5b6ea/recipes/lisp-extra-font-lock";
           sha256 = "1xchqwhav9x7b02787ghka567fihdc14aamx92jg549c6d14qpwk";
-          name = "lisp-extra-font-lock";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -43478,8 +54263,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    lispxmp = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    lispxmp = callPackage ({ fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "lispxmp";
         version = "20170925.1723";
         src = fetchFromGitHub {
@@ -43488,10 +54276,10 @@
           rev = "7ad077b4ee91ce8a42f84eeddb9fc7ea4eac7814";
           sha256 = "1156jynii783v9sjj3a7s20ysa26mqaq22zk5nbia949hwbibx16";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ad10a684b4b2f01bc65883374f36fef156ff55d2/recipes/lispxmp";
           sha256 = "1a641v5cx4wy2v8a2swxzn1y9cz4g2bp4mn9q290n3ifpn5356dl";
-          name = "lispxmp";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -43499,20 +54287,29 @@
           license = lib.licenses.free;
         };
       }) {};
-    lispy = callPackage ({ ace-window, emacs, fetchFromGitHub, fetchurl, hydra, iedit, lib, melpaBuild, swiper, zoutline }:
-    melpaBuild {
+    lispy = callPackage ({ ace-window
+                         , emacs
+                         , fetchFromGitHub
+                         , fetchurl
+                         , hydra
+                         , iedit
+                         , lib
+                         , melpaBuild
+                         , swiper
+                         , zoutline }:
+      melpaBuild {
         pname = "lispy";
-        version = "20180415.1117";
+        version = "20180712.807";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "lispy";
-          rev = "582c9994688fcbbda454207e4112ad4a0cd80970";
-          sha256 = "02frf3r2m0hfz3xf3vvcccxi4gvkl9fz5asrgrc0f6v45850mdv2";
+          rev = "591d0d616c31b937ef2d44bc517f53ed83934a64";
+          sha256 = "0s2a38h42g4mrv2l5k99n3iqy1llkgmjq6nw648pizvhnm27f5br";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e23c062ff32d7aeae486c01e29c56a74727dcf1d/recipes/lispy";
           sha256 = "12qk2gpwzz7chfz7x3wds39r4iiipvcw2rjqncir46b6zzlb1q0g";
-          name = "lispy";
+          name = "recipe";
         };
         packageRequires = [ ace-window emacs hydra iedit swiper zoutline ];
         meta = {
@@ -43520,8 +54317,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    lispyscript-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    lispyscript-mode = callPackage ({ fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "lispyscript-mode";
         version = "20170720.1217";
         src = fetchFromGitHub {
@@ -43530,10 +54330,10 @@
           rev = "def632e3335b0c481fbcf5a17f18b0a8c58dd12f";
           sha256 = "042nndsrv7kyq20v3lahrpr0x89xyayvhx59i0hx6pvkc9wgk5b6";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bf912fa20edc9cff12645381b303e37f2de14976/recipes/lispyscript-mode";
           sha256 = "02biai45l5xl2m9l1drphrlj6r01msmadhyg774ijdk1x4gm5nhr";
-          name = "lispyscript-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -43541,20 +54341,27 @@
           license = lib.licenses.free;
         };
       }) {};
-    lispyville = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, lib, lispy, melpaBuild }:
-    melpaBuild {
+    lispyville = callPackage ({ cl-lib ? null
+                              , emacs
+                              , evil
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , lispy
+                              , melpaBuild }:
+      melpaBuild {
         pname = "lispyville";
-        version = "20180414.1952";
+        version = "20180704.458";
         src = fetchFromGitHub {
           owner = "noctuid";
           repo = "lispyville";
-          rev = "d2491462647fc6cffcc8f40c2a518a4948f2afcb";
-          sha256 = "029jg6nggk5qvrskvlgb52ymgbakd56cnva1mgb10invr0wpswqq";
+          rev = "aea9df65cc0916789e20c0eb7575624a19388bee";
+          sha256 = "05maf5aacjfiap7fyl7mnx1chbs6k30cl1k5af6ar45lhvg7srva";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b5d96d3603dc328467fcce29d3ac1b0a02833d51/recipes/lispyville";
           sha256 = "1pj41pd51x399gmy0j3qn9hr3ayw31pcg0h9pzbviqpnwmv2in6b";
-          name = "lispyville";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs evil lispy ];
         meta = {
@@ -43562,8 +54369,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    list-environment = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    list-environment = callPackage ({ fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "list-environment";
         version = "20151226.1856";
         src = fetchFromGitHub {
@@ -43572,10 +54382,10 @@
           rev = "b7ca30b05905047be2e55199a6475f8d98ce318b";
           sha256 = "1szbs16jlxfj71986dbg0d3j5raaxcwz0xq5ar352731r5mdcqw4";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/696cd1647731eb1a22afb95f558c96a1b4aa5121/recipes/list-environment";
           sha256 = "1zdhrlp8vk8knjwh56pws6dyn003r6avjzvhghlkgnw9nfrdk57h";
-          name = "list-environment";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -43583,8 +54393,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    list-packages-ext = callPackage ({ fetchFromGitHub, fetchurl, ht, lib, melpaBuild, persistent-soft, s }:
-    melpaBuild {
+    list-packages-ext = callPackage ({ fetchFromGitHub
+                                     , fetchurl
+                                     , ht
+                                     , lib
+                                     , melpaBuild
+                                     , persistent-soft
+                                     , s }:
+      melpaBuild {
         pname = "list-packages-ext";
         version = "20151115.916";
         src = fetchFromGitHub {
@@ -43593,10 +54409,10 @@
           rev = "b4dd644e4369c9aa66f5bb8895ea49ebbfd0a27a";
           sha256 = "02l7q5376ydz6a8i9x74bsx5bbxz8xkasmv1lzvf79d3jbg28l1s";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/71c217d98c6967d979f57f89ca26200304b0fc37/recipes/list-packages-ext";
           sha256 = "15m4888fm5xv697y7jspghg1ra49fyrny4y2x7h8ivcbslvpglvk";
-          name = "list-packages-ext";
+          name = "recipe";
         };
         packageRequires = [ ht persistent-soft s ];
         meta = {
@@ -43604,20 +54420,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    list-unicode-display = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    list-unicode-display = callPackage ({ cl-lib ? null
+                                        , fetchFromGitHub
+                                        , fetchurl
+                                        , lib
+                                        , melpaBuild }:
+      melpaBuild {
         pname = "list-unicode-display";
         version = "20150219.101";
         src = fetchFromGitHub {
           owner = "purcell";
           repo = "list-unicode-display";
-          rev = "222c21c68ccc930b2843ea919c960de9be3b55c2";
-          sha256 = "15gz7iw8k4xlj1ik216qw4q1j7nxihlnqgr983ic4k1n2r29fys7";
+          rev = "59770cf3572bd36c3e9ba044846dc420c0dca09b";
+          sha256 = "05nn4db8s8h4mn3fxhwsa111ayvlq1raf6bifh7jciyw7a2c3aww";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0c8e2a974a56665b97d7622b0428994edadc88a0/recipes/list-unicode-display";
           sha256 = "01x9i5k5vhjscmkx0l6r27w1cdp9n6xk1pdjf98z3y88dnsmyfha";
-          name = "list-unicode-display";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -43625,8 +54445,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    list-utils = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    list-utils = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "list-utils";
         version = "20160414.702";
         src = fetchFromGitHub {
@@ -43635,10 +54458,10 @@
           rev = "acf18aca1131a90f8d673974673e3c5d8fdc6a86";
           sha256 = "0ql159v7sxs33yh2l080kchrj52vk34knz50cvqi3ykpb7djg3sz";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f9fcd716cbb9f5a4de82a49e57bcb20c483d05f6/recipes/list-utils";
           sha256 = "0bknprr4jb1d20i9lj2aa17vpg1kqwdyzzwmy1kfydnkpf5scnr3";
-          name = "list-utils";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -43646,20 +54469,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    lit-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    lit-mode = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "lit-mode";
         version = "20141123.936";
         src = fetchFromGitHub {
           owner = "HectorAE";
           repo = "lit-mode";
-          rev = "c61c403afc8333a5649c5421ab1a6341dc1c7d92";
-          sha256 = "0mr0king5dj20vdycpszxnfs9ch808fhcz3q7svxfngj3d3671wd";
+          rev = "bfecbe898223393f34340ca379977be753ee497a";
+          sha256 = "1sjyb5v3s9z128ifjqx7a1dsgds2iz185y82581qxakl7ylmn15k";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7a6a1c79c9bba7b17c150ea0663bc61936f15d83/recipes/lit-mode";
           sha256 = "05rf7ki060nqnvircn0dkpdrg7xbh7phb8bqgsab89ycc7l9vv59";
-          name = "lit-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -43667,20 +54493,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    litable = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    litable = callPackage ({ dash
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "litable";
         version = "20160922.859";
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "litable";
-          rev = "90a2dca14a6da9b24fe332a65cff899ab4a90810";
-          sha256 = "1xaixgjfpnqnsdkhfia107fq5xaq2l0gdb0zp730z97958136mm3";
+          rev = "4a57d7aeddca76448e4df2a46b42d49253e5e625";
+          sha256 = "1zryrc0d2avb27w6a6yzqcc73rsr2rp795vi10qhb04ixda4a8w4";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/74f2190b653907985e49a96ded986ab11b4946d7/recipes/litable";
           sha256 = "073yw3ivkl093xxppn5vqyh69jhfc97al505mnyn34fwdj5v8fji";
-          name = "litable";
+          name = "recipe";
         };
         packageRequires = [ dash ];
         meta = {
@@ -43688,8 +54518,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    litecoin-ticker = callPackage ({ fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }:
-    melpaBuild {
+    litecoin-ticker = callPackage ({ fetchFromGitHub
+                                   , fetchurl
+                                   , json ? null
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "litecoin-ticker";
         version = "20160611.1711";
         src = fetchFromGitHub {
@@ -43698,10 +54532,10 @@
           rev = "3d8047c736e4ee0b8638953f8cc63eaefad34106";
           sha256 = "03iggfi3r5xjh9yhhpr1pgyayriycyybf8qnrhqkqcamh77kq21f";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/litecoin-ticker";
           sha256 = "14pjizgdckqhm31ihbz35j8g95jdpmf1rd4l5zz38fyx12zbcpx5";
-          name = "litecoin-ticker";
+          name = "recipe";
         };
         packageRequires = [ json ];
         meta = {
@@ -43709,8 +54543,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    literal-string = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, markdown-mode, melpaBuild }:
-    melpaBuild {
+    literal-string = callPackage ({ emacs
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , markdown-mode
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "literal-string";
         version = "20170301.730";
         src = fetchFromGitHub {
@@ -43719,10 +54558,10 @@
           rev = "2ca4fc08b8e19e6183b1f1db747bb0a4aa4f98eb";
           sha256 = "0wcz0lid05gnlmxpxm4ckw07cnxwjkyw6960nq7pylbjpg76g5ng";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6519bb53f409eeb0d557809b338849e473c193c4/recipes/literal-string";
           sha256 = "0ylv9dpw17w272f92vn5cldklyz1d8daihi1fsh5ylvxqpinyrkn";
-          name = "literal-string";
+          name = "recipe";
         };
         packageRequires = [ emacs markdown-mode ];
         meta = {
@@ -43730,20 +54569,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    literate-coffee-mode = callPackage ({ coffee-mode, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    literate-coffee-mode = callPackage ({ coffee-mode
+                                        , fetchFromGitHub
+                                        , fetchurl
+                                        , lib
+                                        , melpaBuild }:
+      melpaBuild {
         pname = "literate-coffee-mode";
         version = "20170211.715";
         src = fetchFromGitHub {
           owner = "syohex";
           repo = "emacs-literate-coffee-mode";
-          rev = "55ce0305495f4a38c8063c4bd63deb1e1252373d";
-          sha256 = "1gm89azjgsdg0c7z9yprpjbph211c5jnqv11pkf1i1r1wzx0wanj";
+          rev = "ef34c3a5b813ef078d44c29887761950ab6821c7";
+          sha256 = "1bkpwl4fpyrxs941pp68pfk30ffi9v09h5dsamaqmlm43vchcspi";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/literate-coffee-mode";
           sha256 = "18fdgay7xfgza75z3xma666f414m9dn7d50w94wzzmv7ja74sp64";
-          name = "literate-coffee-mode";
+          name = "recipe";
         };
         packageRequires = [ coffee-mode ];
         meta = {
@@ -43751,8 +54594,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    literate-starter-kit = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    literate-starter-kit = callPackage ({ emacs
+                                        , fetchFromGitHub
+                                        , fetchurl
+                                        , lib
+                                        , melpaBuild }:
+      melpaBuild {
         pname = "literate-starter-kit";
         version = "20150730.1154";
         src = fetchFromGitHub {
@@ -43761,10 +54608,10 @@
           rev = "6dce1d01781966c14558aa553cfc85008c06e115";
           sha256 = "1v37bii372w2g3pl09n5dcrk6y7glhpg8qiv17zsk9jy3ps2xm1b";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/812860589cd92759fd2ae02d27f287de88f26863/recipes/literate-starter-kit";
           sha256 = "1n2njf007fmrmsb8zrgxbz1cpxmr5nsp8w41yxa934iqc7qygkjy";
-          name = "literate-starter-kit";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -43772,8 +54619,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    live-code-talks = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, narrowed-page-navigation }:
-    melpaBuild {
+    live-code-talks = callPackage ({ cl-lib ? null
+                                   , emacs
+                                   , fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild
+                                   , narrowed-page-navigation }:
+      melpaBuild {
         pname = "live-code-talks";
         version = "20150115.1423";
         src = fetchFromGitHub {
@@ -43782,10 +54635,10 @@
           rev = "fece58108939a53104f88d348298c9e122f25b75";
           sha256 = "1j0qa96vlsqybhp0082a466qb1hd2b0621306brl9pfl5srf5jsj";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/live-code-talks";
           sha256 = "1ji4lww71dqxnn5c9inix8xqcmgc76wbps0ylxhhgs44ki4hlyrm";
-          name = "live-code-talks";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs narrowed-page-navigation ];
         meta = {
@@ -43793,8 +54646,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    live-py-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    live-py-mode = callPackage ({ emacs
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "live-py-mode";
         version = "20180330.1758";
         src = fetchFromGitHub {
@@ -43803,10 +54660,10 @@
           rev = "ab2f9bea32dbad11a6464a4880e5487645a0f65a";
           sha256 = "0w3kpszsrh0gj0a62iqhnhm3flmmgq0pl0d6w5r61mvlq9wck5dv";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c7615237e80b46b5c50cb51a3ed5b07d92566fb7/recipes/live-py-mode";
           sha256 = "0yn1a0gf9yn068xifpv8p77d917mnalc56pll800zlpsdk8ljicq";
-          name = "live-py-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -43814,8 +54671,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    lively = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    lively = callPackage ({ fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "lively";
         version = "20171005.54";
         src = fetchFromGitHub {
@@ -43824,10 +54684,10 @@
           rev = "348675828c6a81bfa1ac311ca465aad813542c1b";
           sha256 = "1j8w63hhk1wcxcfqz0wimqijp7p1m8a2n947gwqv8nk1wm40aqg3";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3e4b01286dbc84f01b43955b693ca08e675ffa07/recipes/lively";
           sha256 = "1q8cbl3sr3dpvzk57985giy4xmz4lvg94jcw7shbhz1v9q05dr5g";
-          name = "lively";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -43835,8 +54695,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    livereload = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, websocket }:
-    melpaBuild {
+    livereload = callPackage ({ emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild
+                              , websocket }:
+      melpaBuild {
         pname = "livereload";
         version = "20170628.2350";
         src = fetchFromGitHub {
@@ -43845,10 +54710,10 @@
           rev = "1e501d7e46dbd476c2c7cc9d20b5ac9d41fb1955";
           sha256 = "1z1v2panxrqpam5ysnilx83y6b4dwxmxqhmbgjwfyd1bdmr4iya4";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/330731804c442226fa2faaa3da408e9253a1c051/recipes/livereload";
           sha256 = "1z0dbg82l6znz1b03v19a8fnq6b1smikpvaplpxlgny82xrs9als";
-          name = "livereload";
+          name = "recipe";
         };
         packageRequires = [ emacs websocket ];
         meta = {
@@ -43856,8 +54721,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    livescript-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    livescript-mode = callPackage ({ fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "livescript-mode";
         version = "20140612.2121";
         src = fetchFromGitHub {
@@ -43866,10 +54734,10 @@
           rev = "90a918d9686e256e6d4d439cc20f24dad8d3b804";
           sha256 = "0kqjz0i0zapyhh8z57cvc8ifiizngix3ca01mjnvyq3zxg1bqrsg";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1727cd154c841219b1dff1c8714cb09692e2730f/recipes/livescript-mode";
           sha256 = "1fdfhp39zr2mhy5rd6mwqv5fwd8xaypdqig7v3ksv77m5zq7cmmj";
-          name = "livescript-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -43877,8 +54745,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    livid-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s, skewer-mode }:
-    melpaBuild {
+    livid-mode = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild
+                              , s
+                              , skewer-mode }:
+      melpaBuild {
         pname = "livid-mode";
         version = "20131116.544";
         src = fetchFromGitHub {
@@ -43887,10 +54760,10 @@
           rev = "dfe5212fa64738bc4138bfebf349fbc8bc237c26";
           sha256 = "178ldzpk8a9m9abn8xlplxn5jgcca71dpkp82bs5g7bsccp3rx6p";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b14068485afbd888bf0d124aea089fe5fbd5038c/recipes/livid-mode";
           sha256 = "0jy16m6injqznx4gmxzvhys480pclw9g07z4qll2dna37177ww9d";
-          name = "livid-mode";
+          name = "recipe";
         };
         packageRequires = [ s skewer-mode ];
         meta = {
@@ -43898,8 +54771,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    lms = callPackage ({ emacs, fetchhg, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    lms = callPackage ({ emacs
+                       , fetchhg
+                       , fetchurl
+                       , lib
+                       , melpaBuild }:
+      melpaBuild {
         pname = "lms";
         version = "20170804.922";
         src = fetchhg {
@@ -43907,10 +54784,10 @@
           rev = "f07ac3678e27";
           sha256 = "15l3nfrddblfzqxgvf0dmmsk4h5l80l6r2kgxcfk8s01msjka3sl";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b8be8497494b8543a8257c9ea92444baf7674951/recipes/lms";
           sha256 = "1ckrh6qbh5y2y3yzl2iyq8nqlpy4qp6vzc72ijcgayvcflb01vr1";
-          name = "lms";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -43918,8 +54795,36 @@
           license = lib.licenses.free;
         };
       }) {};
-    load-relative = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    load-env-vars = callPackage ({ emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
+        pname = "load-env-vars";
+        version = "20180511.1510";
+        src = fetchFromGitHub {
+          owner = "diasjorge";
+          repo = "emacs-load-env-vars";
+          rev = "5da97fabb4d36a00a29c40375fce9c16d8005ab3";
+          sha256 = "16xvcb0pq0a6c331grcdak7h8xmns752cz1dbvssm44xfv2cqjqi";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/93835267005c49095a02fc1688b2b449f5acfb86/recipes/load-env-vars";
+          sha256 = "0yc05qqhbva2zn2rrl4spp38jxblk4gh64q9fd7mgl7i50f2kk00";
+          name = "recipe";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/load-env-vars";
+          license = lib.licenses.free;
+        };
+      }) {};
+    load-relative = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "load-relative";
         version = "20170526.310";
         src = fetchFromGitHub {
@@ -43928,10 +54833,10 @@
           rev = "738896e3da491b35399178ed2c6bc92cc728d119";
           sha256 = "1rpy5mfncncl6gqgg53d3g25g1700g4b9bivd4c0cfcv5dbxhp73";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f052f201f7c308325c27cc2423e85cf6b9b67b4e/recipes/load-relative";
           sha256 = "0j8ybbjzhzgjx47pqqdbsqi8n6pzqcf6zqc38x7cf1kkklgc87ay";
-          name = "load-relative";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -43939,20 +54844,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    load-theme-buffer-local = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    load-theme-buffer-local = callPackage ({ fetchFromGitHub
+                                           , fetchurl
+                                           , lib
+                                           , melpaBuild }:
+      melpaBuild {
         pname = "load-theme-buffer-local";
         version = "20120702.1336";
         src = fetchFromGitHub {
           owner = "vic";
           repo = "color-theme-buffer-local";
-          rev = "e606dec66f16a06140b9aad625a4fd52bca4f936";
-          sha256 = "0c04fy3hc8wc0aabilqx9mcipmd41rmshqjxc3z8m1w0bm4288g1";
+          rev = "bc221a88aefec5bdc137b5d5e449e1f1e55ce901";
+          sha256 = "0yhydmzllwygv6l9vyv23jr5rf2mx1fm7y1jv92dn43ys53bv3sb";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ca7bf43ef8893bf04e9658390e306ef69e80a156/recipes/load-theme-buffer-local";
           sha256 = "13829yrh36qac7gpxanizlk4n7av99ngvv06y6mmi5rq06a4hjx4";
-          name = "load-theme-buffer-local";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -43960,8 +54868,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    loc-changes = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    loc-changes = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "loc-changes";
         version = "20160801.1008";
         src = fetchFromGitHub {
@@ -43970,10 +54881,10 @@
           rev = "4d1dcdf7631c23b1259ad4f72bf9686cf95fb46c";
           sha256 = "0a81933l3rrsbi9vkvfb1g94vkhl5n3fkffpy4icis97q7qh08mc";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5ce68d573d19f26ecfd190f8e6cd1f384ca3e8a/recipes/loc-changes";
           sha256 = "1akgij61b2ixpkchrriabwvx68cg4v5r5w9ncjrjh91hskjprfxh";
-          name = "loc-changes";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -43981,8 +54892,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    loccur = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    loccur = callPackage ({ emacs
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "loccur";
         version = "20161227.251";
         src = fetchFromGitHub {
@@ -43991,10 +54906,10 @@
           rev = "650d91dda0d313c8f445a0803c07809d857dee0f";
           sha256 = "09xc2207dhlbw0x9pks2gay09adzijzcabdwg55iszrs7pxjjfa0";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/72550b043794331e85bc4b124f6d8ab70d969eff/recipes/loccur";
           sha256 = "06pv2i05yzjzal4q21krbnp9rp4bsainxcwvpc98020vsmms0z8h";
-          name = "loccur";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -44002,20 +54917,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    lockfile-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    lockfile-mode = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "lockfile-mode";
         version = "20170624.2207";
         src = fetchFromGitHub {
           owner = "preetpalS";
           repo = "emacs-lockfile-mode";
-          rev = "fcfef88460cb3cd67c4d83a1801d0326d282feac";
-          sha256 = "1dh41a8dj8h3lrhjajaz886vsimflshk6bc08w71rwvjyy2k8xil";
+          rev = "496b6035716df0582f879f9488f296947cabead2";
+          sha256 = "0sm73w2in65kdb68m9w3jrr5pa392x75bv063r8cdhy868031l49";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/12a383eb6c29acb007dae9dc777ace3ba84edac9/recipes/lockfile-mode";
           sha256 = "13nr983xldja8m02a1rdnyqxc8g045hxjh6649wmqmqk4mk0m310";
-          name = "lockfile-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -44023,8 +54941,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    lodgeit = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    lodgeit = callPackage ({ fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "lodgeit";
         version = "20150312.649";
         src = fetchFromGitHub {
@@ -44033,10 +54954,10 @@
           rev = "ec9b8e5cbb17bcf8ac4bdddd1d361cb60e59384c";
           sha256 = "1cdnm270kzixa0kpis0xw2ybkw8lqh7kykc7blxkxjrr9yjvbawl";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c82e72535aefade20e23e38931ca573e3459401e/recipes/lodgeit";
           sha256 = "1ax2w5yxscycjz90g4jdbhd64g9sipzxpfjs7gq3na77s5dcjzsq";
-          name = "lodgeit";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -44044,8 +54965,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    log4e = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    log4e = callPackage ({ fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "log4e";
         version = "20170401.604";
         src = fetchFromGitHub {
@@ -44054,10 +54978,10 @@
           rev = "34309972ad02abcebbcff6b1682731978aef030c";
           sha256 = "12zk40gqrh86m50y777kprkwz75vbcm0q1a9narzcs2lnpwc8g4z";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/90d0e451c5a8eb25db95990b058964a9acea4b89/recipes/log4e";
           sha256 = "1klj59dv8k4r0hily489dp12ra5hq1jnsdc0wcakh6zirmakhs34";
-          name = "log4e";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -44065,19 +54989,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    log4j-mode = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    log4j-mode = callPackage ({ fetchgit
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "log4j-mode";
         version = "20160108.1118";
         src = fetchgit {
           url = "https://git.code.sf.net/p/log4j-mode/code";
-          rev = "26171b1e723502055e085393b0ecdcb6db406010";
-          sha256 = "15x6368pk4bbvhbd6cqnazcxfdz0b3f70029x0884a5797janln5";
+          rev = "a278948ea07ef8f4fdb6d389345a68b50de14fae";
+          sha256 = "0fa2k0c0pp55crz358aw6b26q3mgw6lik498vy8p95vmcy6lb9v3";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/log4j-mode";
           sha256 = "0311jb47fjji8dqy98anr487f7vnvi85p4mn5ymqvxs5c6972gms";
-          name = "log4j-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -44085,8 +55012,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    logalimacs = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, popup, popwin, stem }:
-    melpaBuild {
+    logalimacs = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild
+                              , popup
+                              , popwin
+                              , stem }:
+      melpaBuild {
         pname = "logalimacs";
         version = "20131021.1129";
         src = fetchFromGitHub {
@@ -44095,10 +55028,10 @@
           rev = "8286e39502250fc6c3c6656a7f46a8eee8e9a713";
           sha256 = "0lj3i9i3mg17xws13gzx8myc6d7djgsj47yx4kaq5hycgkni1p7q";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ef9833a5ca4d455f1d33b9367860e2051d60662f/recipes/logalimacs";
           sha256 = "0ai7a01bdi3a0amgi63pwgdp8wgcgx10an4nhc627wgb1cqxb7p6";
-          name = "logalimacs";
+          name = "recipe";
         };
         packageRequires = [ popup popwin stem ];
         meta = {
@@ -44106,8 +55039,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    logito = callPackage ({ eieio ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    logito = callPackage ({ eieio ? null
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "logito";
         version = "20120225.1255";
         src = fetchFromGitHub {
@@ -44116,10 +55053,10 @@
           rev = "824acb89d2cc18cb47281a4fbddd81ad244a2052";
           sha256 = "0jpyd2f33pk984kg0q9hxdl4615jb7sxsggnb30mpz7a2ws479xr";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/logito";
           sha256 = "0xi7zbxpialsn4pknj8aqmkbiwwsbapwynrrjb8avhli2hd4s3fl";
-          name = "logito";
+          name = "recipe";
         };
         packageRequires = [ eieio ];
         meta = {
@@ -44127,19 +55064,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    lognav-mode = callPackage ({ emacs, fetchhg, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    lognav-mode = callPackage ({ emacs
+                               , fetchhg
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "lognav-mode";
-        version = "20171230.1052";
+        version = "20180708.322";
         src = fetchhg {
           url = "https://bitbucket.com/ellisvelo/lognav-mode";
-          rev = "a9b53f2da040";
-          sha256 = "0ka92x63zfgraby5ycypn3ri2s3s2b1m2j7fpb4r37bk9xkf90v4";
+          rev = "73aba5c1b9c6";
+          sha256 = "0bshlkxzb1wbvm5fpsmqd51z4y1nfqkh802ddd8pfs5k22lv21sk";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ad86b93f4982a0c6291c771e12c8f42ace3b88f9/recipes/lognav-mode";
           sha256 = "1941scifg3nn7gmnki3sa9zvwsbb84w5lw2xjmdx0sh8rbxaw8gb";
-          name = "lognav-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -44147,8 +55088,34 @@
           license = lib.licenses.free;
         };
       }) {};
-    logstash-conf = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    logpad = callPackage ({ fetchhg
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
+        pname = "logpad";
+        version = "20180607.1215";
+        src = fetchhg {
+          url = "https://bitbucket.com/tux_/logpad.el";
+          rev = "506ace0e996f";
+          sha256 = "0z9dq37hsrzjkd3pynqmm8gbiv1sbqnjxlqkyq6lpps5fd9n5vsz";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/5148207367bf236223e952a1e4fd600f90571b5e/recipes/logpad";
+          sha256 = "1r688z3y98wnr15fg6zzcs4c4yw0l6ygah07gjhblj8b7q7i2qgg";
+          name = "recipe";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/logpad";
+          license = lib.licenses.free;
+        };
+      }) {};
+    logstash-conf = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "logstash-conf";
         version = "20170524.1229";
         src = fetchFromGitHub {
@@ -44157,10 +55124,10 @@
           rev = "4e127f9aec190786613445aa88efa307ff7c6748";
           sha256 = "119yb1wk1n5ycfzgpffcwy7yx8ar8k1gza0gvbq3r61ha5a9qijs";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/logstash-conf";
           sha256 = "0djf2kl6jypxlfss4x8ij670v733vid1vbyg6yd96pc9781v3zrm";
-          name = "logstash-conf";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -44168,20 +55135,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    logview = callPackage ({ datetime, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    logview = callPackage ({ datetime
+                           , emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "logview";
-        version = "20180216.1445";
+        version = "20180522.1054";
         src = fetchFromGitHub {
           owner = "doublep";
           repo = "logview";
-          rev = "9ec279d933923dab2d8d1f140adc43073dab6433";
-          sha256 = "1qhzs75pxnaksbhczmpdcy2zmrqavlzkzss7ik5nv2wf9vs0sn02";
+          rev = "902c881f5e1ca802761b856b3945bd418847dd79";
+          sha256 = "1df41wabldg1ahcbqi5szwml5hqdjm6p3hj5b8ajkkagykrnh8xg";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1df3c11ed7738f32e6ae457647e62847701c8b19/recipes/logview";
           sha256 = "0gks3j5avx8k3427a36lv7gr95id3cylaamgn5qwbg14s54y0vsh";
-          name = "logview";
+          name = "recipe";
         };
         packageRequires = [ datetime emacs ];
         meta = {
@@ -44189,20 +55161,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    lolcode-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    lolcode-mode = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "lolcode-mode";
         version = "20111002.147";
         src = fetchFromGitHub {
           owner = "bodil";
           repo = "lolcode-mode";
-          rev = "1914f1ba87587ecf5f175eeb2144c28e9f039317";
-          sha256 = "0pyfgywmmnlz1arvdxwyw96gr6xcg2sp3bqjli8xfcl8i0nww4kb";
+          rev = "280a47e0bf02ee3abc7c5b6b14345056f41981f9";
+          sha256 = "1j51h2j0n6mkglalrp1mirpc1v7mgrfxfd1k43rhzg800rb4ahhr";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/572d31a0bd8627d8b5f6bab021c953a1fee31d2c/recipes/lolcode-mode";
           sha256 = "0dxdqr3z5bw0vcfxhhhc1499vrfk1xqwxshr0kvlhdalpf59rqiw";
-          name = "lolcode-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -44210,8 +55185,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    look-dired = callPackage ({ fetchFromGitHub, fetchurl, lib, look-mode, melpaBuild }:
-    melpaBuild {
+    look-dired = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , look-mode
+                              , melpaBuild }:
+      melpaBuild {
         pname = "look-dired";
         version = "20160729.1623";
         src = fetchFromGitHub {
@@ -44220,10 +55199,10 @@
           rev = "9bfa4e5e6f3810705b6426c88493ea0bf6b15640";
           sha256 = "1yagp35ylznrh3a5ahpzrrxi6ma69ppwqsab3cwss54bi4f02ihn";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ef66b97b2e9034cb0c62dd1e37b2577ffef60834/recipes/look-dired";
           sha256 = "0dddx5nxr519wqdgrbglh0pqjl3alg4ddmank42g4llzycy61wsd";
-          name = "look-dired";
+          name = "recipe";
         };
         packageRequires = [ look-mode ];
         meta = {
@@ -44231,8 +55210,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    look-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    look-mode = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "look-mode";
         version = "20151211.1026";
         src = fetchFromGitHub {
@@ -44241,10 +55223,10 @@
           rev = "d65f75e8ea24eff2ac31c53b4835b45127eedd56";
           sha256 = "1adzlviy928wsqx9fvxi71rwv89zyydqmf5g0wrlx66r0ksw3793";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ae489be43b1aee93614e40f492ebdf0b98a3fbc1/recipes/look-mode";
           sha256 = "0nhhz5s423g4kqqh0vy8k0696r0myhjfv84p2vciliky9gv1wkig";
-          name = "look-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -44252,20 +55234,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    loop = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    loop = callPackage ({ fetchFromGitHub
+                        , fetchurl
+                        , lib
+                        , melpaBuild }:
+      melpaBuild {
         pname = "loop";
         version = "20160813.707";
         src = fetchFromGitHub {
           owner = "Wilfred";
           repo = "loop.el";
-          rev = "e22807f83a0890dc8a904c51ee0742c34efccc6c";
-          sha256 = "1c89hsi0h783s96d322mvqwlf00ndm2qnrc165wpxrdbns38kbbv";
+          rev = "0ce77271d56b0fcdba4b3b38fed526081cd1f674";
+          sha256 = "0l0k2plgmfnqcy1ilk20755n5xk480p15mzqc247ipr0ldr9ajxr";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ba481ca96469b3bd518e4fd8f24947338c8af014/recipes/loop";
           sha256 = "0pav16kinzljmzx84vfz63fvi39af4628vk1jw79jk0pyg9rjbar";
-          name = "loop";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -44273,20 +55258,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    lorem-ipsum = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    lorem-ipsum = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "lorem-ipsum";
         version = "20140911.1408";
         src = fetchFromGitHub {
           owner = "jschaf";
           repo = "emacs-lorem-ipsum";
-          rev = "4b39f6fed455d67f635b3837cf5668bf74d0f6cd";
-          sha256 = "0a3b18p3vdjci89prsgdzjnfxsl8p67vjhf8ai4qdng7zvh50lir";
+          rev = "893a27505734a1497b79bc26e0736a78221b35d9";
+          sha256 = "0grzl4kqpc1x6569yfh9xdzzbgmhcskxwk6f7scjpl32acr88cmx";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0c09f9b82430992d119d9148314c758f067832cd/recipes/lorem-ipsum";
           sha256 = "0p62yifbrknjn8z0613wy2aaknj44liyrgbknhpa0qn0d4fcrp4h";
-          name = "lorem-ipsum";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -44294,8 +55282,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    love-minor-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, lua-mode, melpaBuild }:
-    melpaBuild {
+    love-minor-mode = callPackage ({ fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , lua-mode
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "love-minor-mode";
         version = "20170726.2236";
         src = fetchFromGitHub {
@@ -44304,10 +55296,10 @@
           rev = "3ca8f3405338f2d6f4fbcdd5e89342a46378543a";
           sha256 = "1hwm7yxbwvb27pa35cgcxyjfjdjhk2a33i417q2akc7vppdbcmzh";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0f224c4c7519b3668b1270c957227e486896b7b6/recipes/love-minor-mode";
           sha256 = "1skg039h2hn8dh47ww6n9l776s2yda8ariab4v9f56kb21bncr4m";
-          name = "love-minor-mode";
+          name = "recipe";
         };
         packageRequires = [ lua-mode ];
         meta = {
@@ -44315,20 +55307,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    lsp-go = callPackage ({ fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild }:
-    melpaBuild {
+    lsp-go = callPackage ({ fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , lsp-mode
+                          , melpaBuild }:
+      melpaBuild {
         pname = "lsp-go";
-        version = "20180330.255";
+        version = "20180630.1101";
         src = fetchFromGitHub {
           owner = "emacs-lsp";
           repo = "lsp-go";
-          rev = "00cbaac9419efc641fbe9e27ad0315d2c9a3ecb5";
-          sha256 = "1n08vr2rkasz1w1bc43fi6zqg11vg7fa2a4sgp2cdrsn5hcp8nnh";
+          rev = "0d354e1682fe1db074a924d7812f6ea62048d73d";
+          sha256 = "0rk1brvy9hmjwykzf3pgli7h5gp3m6ra4yspv0rknbd2drzw4r94";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-go";
           sha256 = "1yg21qqlf8ma734vaz6xrfym2058gvx7llsqy94fbbg1fg61c32c";
-          name = "lsp-go";
+          name = "recipe";
         };
         packageRequires = [ lsp-mode ];
         meta = {
@@ -44336,20 +55332,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    lsp-hack = callPackage ({ fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild }:
-    melpaBuild {
+    lsp-hack = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , lsp-mode
+                            , melpaBuild }:
+      melpaBuild {
         pname = "lsp-hack";
-        version = "20171128.1238";
+        version = "20180703.1837";
         src = fetchFromGitHub {
           owner = "jra3";
           repo = "lsp-hack";
-          rev = "f299555ad5206f13d7cfe75a3c76607b1f0d6da5";
-          sha256 = "1z3cca395v5kv7h1w7vnb7c42sq2aczv7sznx9nc2gjjabmrd8vy";
+          rev = "a3b6725dc7b16246d71a7d4ddbddd0fec1a009eb";
+          sha256 = "1amkdlc0dpxv953f8v7l5i3a54gm6nxrdmrizkgc28plbvcpqdqy";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a70d8442c653554d28dc87425913424ab42ab5c8/recipes/lsp-hack";
           sha256 = "1xfvk4hqs748b9dm8dirb2mdpnhq9mybgsbcj258yydr57d9zijs";
-          name = "lsp-hack";
+          name = "recipe";
         };
         packageRequires = [ lsp-mode ];
         meta = {
@@ -44357,20 +55357,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    lsp-haskell = callPackage ({ fetchFromGitHub, fetchurl, haskell-mode, lib, lsp-mode, melpaBuild }:
-    melpaBuild {
+    lsp-haskell = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , haskell-mode
+                               , lib
+                               , lsp-mode
+                               , melpaBuild }:
+      melpaBuild {
         pname = "lsp-haskell";
         version = "20180131.459";
         src = fetchFromGitHub {
           owner = "emacs-lsp";
           repo = "lsp-haskell";
-          rev = "aa421f9702056a89cd4e63c0dcf5543acb62840f";
-          sha256 = "1m0diap909jn9w54j9462zg972xhwxivcda59jmb6isgjpyi1yyb";
+          rev = "bd7d0a4c3b54dbaa4c89b80f4f0268d717b4dd6f";
+          sha256 = "13dp655kdi6z6s9is0q1qf6yvmfxzv7bjjlhp2f7bjiv2jh5yzyv";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-haskell";
           sha256 = "0pdcxnfp8ng24bfk695wpx5wcdqnjrjsfpks0xicih3mcdm1x9l8";
-          name = "lsp-haskell";
+          name = "recipe";
         };
         packageRequires = [ haskell-mode lsp-mode ];
         meta = {
@@ -44378,20 +55383,76 @@
           license = lib.licenses.free;
         };
       }) {};
-    lsp-java = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild }:
-    melpaBuild {
+    lsp-html = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , lsp-mode
+                            , melpaBuild }:
+      melpaBuild {
+        pname = "lsp-html";
+        version = "20180629.25";
+        src = fetchFromGitHub {
+          owner = "emacs-lsp";
+          repo = "lsp-html";
+          rev = "478927767c3c2bd06b052807126e5d48be53755a";
+          sha256 = "0833mrmbhfzm2xhf91wl7bp4h54h2qaxy4lidy05ngm407wbjypd";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/204acff0d1a8c6dc79ef34cc464435a1504d7c15/recipes/lsp-html";
+          sha256 = "0fd53k8spfm2s618gvchr0jsbc0a0varklc05cdjvjxyxk04ssmc";
+          name = "recipe";
+        };
+        packageRequires = [ lsp-mode ];
+        meta = {
+          homepage = "https://melpa.org/#/lsp-html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    lsp-intellij = callPackage ({ emacs
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , lsp-mode
+                                , melpaBuild }:
+      melpaBuild {
+        pname = "lsp-intellij";
+        version = "20180621.1131";
+        src = fetchFromGitHub {
+          owner = "Ruin0x11";
+          repo = "lsp-intellij";
+          rev = "0911f703ac50164a702b6ee213173e763eda3094";
+          sha256 = "1nc4bi6annxd4i94wznh28di3pvq73yvz3g4nhs1l95jczl13rpj";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/9d72cbb85fe4e0c6bea9a704dc1545f88efa56d2/recipes/lsp-intellij";
+          sha256 = "0l2ffxqsdzvddypdl3w9rd7qxy2kzw2iwfkr2w7czglyfbnyyg2b";
+          name = "recipe";
+        };
+        packageRequires = [ emacs lsp-mode ];
+        meta = {
+          homepage = "https://melpa.org/#/lsp-intellij";
+          license = lib.licenses.free;
+        };
+      }) {};
+    lsp-java = callPackage ({ emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , lsp-mode
+                            , melpaBuild }:
+      melpaBuild {
         pname = "lsp-java";
-        version = "20180330.30";
+        version = "20180701.111";
         src = fetchFromGitHub {
           owner = "emacs-lsp";
           repo = "lsp-java";
-          rev = "35ad849fdd445be127f8df59ef1bb68effd0b7ff";
-          sha256 = "0id9rjjzwybcyfa9ns3fm1py3zsm0z1l88dwlfh8pgkfjy7zkc34";
+          rev = "b3d671ccc264b32492e30f48b4d5a52f6b88145d";
+          sha256 = "17dqz2fmsczl46vq6id9918hxy5b332lncgwzrzjbbpqi3ysa1s3";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-java";
           sha256 = "1y5wxggkr7v4a2a3h2n01911gd1xv047dikbvyy1gappf05fdngj";
-          name = "lsp-java";
+          name = "recipe";
         };
         packageRequires = [ emacs lsp-mode ];
         meta = {
@@ -44399,20 +55460,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    lsp-javacomp = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild, s }:
-    melpaBuild {
+    lsp-javacomp = callPackage ({ emacs
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , lsp-mode
+                                , melpaBuild
+                                , s }:
+      melpaBuild {
         pname = "lsp-javacomp";
         version = "20180218.2334";
         src = fetchFromGitHub {
           owner = "tigersoldier";
           repo = "lsp-javacomp";
-          rev = "cb080824e1fc08e2724d6ecde7034f1acfd565f0";
-          sha256 = "0ihb4bld8pzw2mxfwygxldsv2hclvmzkr7cp8nimzjam1nlgjhic";
+          rev = "4423fc41974e25ddf4a46fb13bd64680d52b420a";
+          sha256 = "1k66h5l52al3glsz261j2lcfl8pddxh55m8slr9p1kaxzr67fl6a";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6b8a1c034554579a7e271409fa72020cfe441f68/recipes/lsp-javacomp";
           sha256 = "1gp8dlcpik2lmpicccq2kya498pmw9m8vz9m1fbd725p7wk58fhi";
-          name = "lsp-javacomp";
+          name = "recipe";
         };
         packageRequires = [ emacs lsp-mode s ];
         meta = {
@@ -44420,41 +55487,77 @@
           license = lib.licenses.free;
         };
       }) {};
-    lsp-javascript-typescript = callPackage ({ fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild }:
-    melpaBuild {
+    lsp-javascript-flow = callPackage ({ emacs
+                                       , fetchFromGitHub
+                                       , fetchurl
+                                       , lib
+                                       , lsp-mode
+                                       , melpaBuild }:
+      melpaBuild {
+        pname = "lsp-javascript-flow";
+        version = "20180612.2208";
+        src = fetchFromGitHub {
+          owner = "emacs-lsp";
+          repo = "lsp-javascript";
+          rev = "b9873765270ac5c76013efe6fae0beb60f55f85c";
+          sha256 = "1cpwivz6cy9rs5s3723j0y3wf6bhr4avazdyl1f2gv3xiwr0gbns";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/f9a28de5ce89080ba224e07734b3ba0b0992acd6/recipes/lsp-javascript-flow";
+          sha256 = "1bydgcmgzbx2pqna19h1avrlrlfv6gvsii1n839q4bhiwn3452f7";
+          name = "recipe";
+        };
+        packageRequires = [ emacs lsp-mode ];
+        meta = {
+          homepage = "https://melpa.org/#/lsp-javascript-flow";
+          license = lib.licenses.free;
+        };
+      }) {};
+    lsp-javascript-typescript = callPackage ({ emacs
+                                             , fetchFromGitHub
+                                             , fetchurl
+                                             , lib
+                                             , lsp-mode
+                                             , melpaBuild
+                                             , typescript-mode }:
+      melpaBuild {
         pname = "lsp-javascript-typescript";
-        version = "20180403.743";
+        version = "20180614.1311";
         src = fetchFromGitHub {
           owner = "emacs-lsp";
           repo = "lsp-javascript";
-          rev = "2c1f2f4cb24c30fcefb2d07dad3f40b058c90c1f";
-          sha256 = "0pjzywlg981pvg4015w11b1dzrvqm1h3fjdl6qp6pv7iq2x9hxdp";
+          rev = "7e7c5f66b02321f402712841064347cb872c41e4";
+          sha256 = "1ilhnbdvfjanv0cjwk289dq1whpf69qzw0hh9ak37gbi4pqvsbdv";
         };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/999a4b0cd84e821c7e785ae4e487f32cff5c346b/recipes/lsp-javascript-typescript";
-          sha256 = "0pml7f7874c5xx94qpq7w5sz5hcail8s5nm5sy5vgax1j742r5y1";
-          name = "lsp-javascript-typescript";
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/97b6ddeb34297aacfefdd4c227ad520b70a12bc6/recipes/lsp-javascript-typescript";
+          sha256 = "01i6dimwz5s143cbcfi2rflfgkj569avx103wnlbcfd87apj7813";
+          name = "recipe";
         };
-        packageRequires = [ lsp-mode ];
+        packageRequires = [ emacs lsp-mode typescript-mode ];
         meta = {
           homepage = "https://melpa.org/#/lsp-javascript-typescript";
           license = lib.licenses.free;
         };
       }) {};
-    lsp-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    lsp-mode = callPackage ({ emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "lsp-mode";
-        version = "20180416.622";
+        version = "20180708.1914";
         src = fetchFromGitHub {
           owner = "emacs-lsp";
           repo = "lsp-mode";
-          rev = "34a669b76ac0aa45b4917f882687ca7577814249";
-          sha256 = "091ph46y6mb9rf0saar0vb230z1kf8w74f3dkcm7hs7b1k7khj3f";
+          rev = "5ea5c6398a923e24c4fedf6d782004b4dc4cb254";
+          sha256 = "1pn9lnd8r4zl35hqwi00qcsb6v6aj533hbm7faj1d3nndlf2qmbh";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-mode";
           sha256 = "0cklwllqxzsvs4wvvvsc1pqpmp9w99m8wimpby6v6wlijfg6y1m9";
-          name = "lsp-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -44462,20 +55565,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    lsp-ocaml = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild }:
-    melpaBuild {
+    lsp-ocaml = callPackage ({ emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , lsp-mode
+                             , melpaBuild }:
+      melpaBuild {
         pname = "lsp-ocaml";
-        version = "20171111.1352";
+        version = "20180610.1154";
         src = fetchFromGitHub {
           owner = "emacs-lsp";
           repo = "lsp-ocaml";
-          rev = "1aef50ceb2794a2f2234fb0f13410b7f1e3b5c16";
-          sha256 = "0naxdkc0y45wjqbvb61vgiyrajyf5clg1wypf7g3ljny7791xz3l";
+          rev = "5a8c776b6d75b502703243b3d628fccd813481b0";
+          sha256 = "1431f8r8c4h8jbghggk1s2bwqr1qlxys3d52xsvf35bbk1gki5an";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7be2d7a7af3d744c531e5e018d791bf2566df428/recipes/lsp-ocaml";
           sha256 = "17334qcgqrz4jd5npizyq20fmxy07z2p3pq98s5np2kc4h9ara33";
-          name = "lsp-ocaml";
+          name = "recipe";
         };
         packageRequires = [ emacs lsp-mode ];
         meta = {
@@ -44483,20 +55591,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    lsp-php = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild }:
-    melpaBuild {
+    lsp-php = callPackage ({ emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , lsp-mode
+                           , melpaBuild }:
+      melpaBuild {
         pname = "lsp-php";
-        version = "20180214.624";
+        version = "20180331.944";
         src = fetchFromGitHub {
-          owner = "tszg";
+          owner = "emacs-lsp";
           repo = "lsp-php";
-          rev = "ff5f5ba417342aa05869a1a9c6a0fc2d42c8acc3";
-          sha256 = "05rq7sqb6chymzfqvk5xk9bgi7nsdf1ldimams8df9ml6242zjsg";
+          rev = "3189a13c605e1615b7ce2cd12f09c1ed92a88178";
+          sha256 = "1kv708yrx57j0cvz9vcam4rwfincgbbr7rdbxdmnfmwnx4ylgckg";
         };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/be00893ec6db70624acf1b4527cca05486d6b090/recipes/lsp-php";
-          sha256 = "1fpmg8mbp0r8krlbp4j0bk6kslmm88lrpki0w961s4gqrqxw287c";
-          name = "lsp-php";
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/9fda03716433077e440c0fb8357207f7a348552c/recipes/lsp-php";
+          sha256 = "0ds3hivkb7zxkz6crn6h9apvavvm899vwq4mkav4cbijsl4q33l0";
+          name = "recipe";
         };
         packageRequires = [ emacs lsp-mode ];
         meta = {
@@ -44504,20 +55617,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    lsp-python = callPackage ({ fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild }:
-    melpaBuild {
+    lsp-python = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , lsp-mode
+                              , melpaBuild }:
+      melpaBuild {
         pname = "lsp-python";
-        version = "20180404.819";
+        version = "20180609.16";
         src = fetchFromGitHub {
           owner = "emacs-lsp";
           repo = "lsp-python";
-          rev = "e2fb53d191344dd73e26ffaaa4ac95cd6686dbd9";
-          sha256 = "0s0w6sx7k7ys9i1w8zcf3hp9v3qzmcm4gl5pdnwr08ln73d3as9g";
+          rev = "28a3ad4e98af5ede860ef4c2fe47048ce676559b";
+          sha256 = "0y8cglfmjn4j1apyjr66vpqln3rzqdkada3ggxlap4iirgb5iqgf";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-python";
           sha256 = "0x8cyvkwp4znliiwf3qfrhnk80h8n1jfyyq0n5yfccsgk7gpm8qx";
-          name = "lsp-python";
+          name = "recipe";
         };
         packageRequires = [ lsp-mode ];
         meta = {
@@ -44525,8 +55642,16 @@
           license = lib.licenses.free;
         };
       }) {};
-    lsp-rust = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, lsp-mode, markdown-mode, melpaBuild, rust-mode }:
-    melpaBuild {
+    lsp-rust = callPackage ({ dash
+                            , emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , lsp-mode
+                            , markdown-mode
+                            , melpaBuild
+                            , rust-mode }:
+      melpaBuild {
         pname = "lsp-rust";
         version = "20180305.508";
         src = fetchFromGitHub {
@@ -44535,10 +55660,10 @@
           rev = "ecc889cc8735b280e0e6e84d2f4526b0048148b3";
           sha256 = "0wmci5lij5721xpfsj3mnvr3z1j8b9s0w76dhzd0lnyaknvyv1rs";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-rust";
           sha256 = "0p86223pfpi4hh8m66ccksxgl0yi7zrigd1gmbz0bzqa6yjgbp28";
-          name = "lsp-rust";
+          name = "recipe";
         };
         packageRequires = [ dash emacs lsp-mode markdown-mode rust-mode ];
         meta = {
@@ -44546,20 +55671,56 @@
           license = lib.licenses.free;
         };
       }) {};
-    lsp-ui = callPackage ({ dash, dash-functional, emacs, fetchFromGitHub, fetchurl, flycheck, lib, lsp-mode, markdown-mode, melpaBuild }:
-    melpaBuild {
+    lsp-typescript = callPackage ({ emacs
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , lsp-mode
+                                  , melpaBuild
+                                  , typescript-mode }:
+      melpaBuild {
+        pname = "lsp-typescript";
+        version = "20180614.1311";
+        src = fetchFromGitHub {
+          owner = "emacs-lsp";
+          repo = "lsp-javascript";
+          rev = "7e7c5f66b02321f402712841064347cb872c41e4";
+          sha256 = "1ilhnbdvfjanv0cjwk289dq1whpf69qzw0hh9ak37gbi4pqvsbdv";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e7903d6b51132c0d8ad209f13ffe915c1bc5a76d/recipes/lsp-typescript";
+          sha256 = "1d1yrcgg1bdsikcb2j8cayhlh9hdnna3rc1pphq0kn81gk0rgbrq";
+          name = "recipe";
+        };
+        packageRequires = [ emacs lsp-mode typescript-mode ];
+        meta = {
+          homepage = "https://melpa.org/#/lsp-typescript";
+          license = lib.licenses.free;
+        };
+      }) {};
+    lsp-ui = callPackage ({ dash
+                          , dash-functional
+                          , emacs
+                          , fetchFromGitHub
+                          , fetchurl
+                          , flycheck
+                          , lib
+                          , lsp-mode
+                          , markdown-mode
+                          , melpaBuild }:
+      melpaBuild {
         pname = "lsp-ui";
-        version = "20180412.1807";
+        version = "20180618.1951";
         src = fetchFromGitHub {
           owner = "emacs-lsp";
           repo = "lsp-ui";
-          rev = "146efa7414a91090c494e24fac364011bc884f31";
-          sha256 = "0076kjv1wpw079mbv35v0j609xhis7xrvx6jg54hnb7y5h5rkqqz";
+          rev = "bd5970edae874338bd01d0bc50c4671ea4cae390";
+          sha256 = "0s5an922wfias2n0h5jqa2n4mxvrfg6sav470him4dbwqqrgx5ck";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1e4fa7cdf71f49f6998b26d81de9522248bc58e6/recipes/lsp-ui";
           sha256 = "00y5i44yd79z0v00a9lvgixb4mrx9nq5vcgmib70h41ffffaq42j";
-          name = "lsp-ui";
+          name = "recipe";
         };
         packageRequires = [
           dash
@@ -44574,20 +55735,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    lsp-vue = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild }:
-    melpaBuild {
+    lsp-vue = callPackage ({ emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , lsp-mode
+                           , melpaBuild }:
+      melpaBuild {
         pname = "lsp-vue";
-        version = "20180129.1805";
+        version = "20180628.15";
         src = fetchFromGitHub {
           owner = "emacs-lsp";
           repo = "lsp-vue";
-          rev = "faf976ee9b333919653b4b98e2886b488707e866";
-          sha256 = "1d6sw5jsjhwd5bbl2p8k6hdwpg1pmnsmvbq8g33h80qlg05fwj60";
+          rev = "3c3f364f70d300101a37a239a6bf8c382176f238";
+          sha256 = "0m5bi99y02jvjv25jpm5sj50x4k75md9p6qqq5bzsdj3b07d2gxx";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0d9eb7699630fd7e11f38b4ba278a497633c9733/recipes/lsp-vue";
           sha256 = "1df3dva31livffy9bzassgqpps3bf9nbqmhngzh8bnhjvvrbj5ic";
-          name = "lsp-vue";
+          name = "recipe";
         };
         packageRequires = [ emacs lsp-mode ];
         meta = {
@@ -44595,8 +55761,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    lua-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    lua-mode = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "lua-mode";
         version = "20180323.321";
         src = fetchFromGitHub {
@@ -44605,10 +55774,10 @@
           rev = "99312b8d6c500ba3067da6d81efcfbbea05a1cbd";
           sha256 = "04m9njcpdmar3njjz4x2qq26xk0k6qprcfzx8whlmvapqf8w19iz";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ca7bf43ef8893bf04e9658390e306ef69e80a156/recipes/lua-mode";
           sha256 = "0gyi7w2h192h3pmrhq39lxwlwd9qyqs303lnp2655pikdzk9js94";
-          name = "lua-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -44616,8 +55785,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    luarocks = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    luarocks = callPackage ({ cl-lib ? null
+                            , emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "luarocks";
         version = "20170430.1605";
         src = fetchFromGitHub {
@@ -44626,10 +55800,10 @@
           rev = "cee27ba0716edf338077387969883226dd2b7484";
           sha256 = "0rdsjmmi95agb859997qdhbk0dns2jyx2mlg8rync58wna70nmbn";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d5abd2b52a071ab206d40057dc85c891183204ea/recipes/luarocks";
           sha256 = "05srrk9gmv1vhq7m5bjhh2hl2siis04j15b31x0sgknxh3ybr33x";
-          name = "luarocks";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -44637,20 +55811,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    lush-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    lush-theme = callPackage ({ emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "lush-theme";
         version = "20141107.806";
         src = fetchFromGitHub {
           owner = "andre-richter";
           repo = "emacs-lush-theme";
-          rev = "3b80004f33cdce9f4db69e9ccf2041561e98985d";
-          sha256 = "0mv73s89n59m44szc37086wq55py5sx0lc0jxncfybawhsqyd0ar";
+          rev = "fd69cf6e254b329d7997acd37fe04c17139f3435";
+          sha256 = "0gcyxvkpfi1vsa7gyx13rb29x86j2i2nnqldli1sna4v87jw288g";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8b29b2f36852e711ce3520d71e83921a1dcb9ccf/recipes/lush-theme";
           sha256 = "03kqws8dzm0ay5k86f4v7g2g2ygwk4fzmz2vyzhzhbsj8hrniq9p";
-          name = "lush-theme";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -44658,20 +55836,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    lusty-explorer = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    lusty-explorer = callPackage ({ fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "lusty-explorer";
-        version = "20180127.1443";
+        version = "20180628.646";
         src = fetchFromGitHub {
           owner = "sjbach";
           repo = "lusty-emacs";
-          rev = "3df794ed4829e353ee3c1e3c6686440f9e868ef6";
-          sha256 = "1z2nzjlmmcnin3h0713kqaaikyc0h4iiazv50lsvrp0agjbmhcqp";
+          rev = "fc4b2f0f8a07db107234490fdfbf72f8b76a6643";
+          sha256 = "014fivh9shi7p3x31bl22x48agrgygp0pf2lgzzflrxcynmprbnp";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/efedaa3b1de5f6406c7dcd842eee42eefaf8ab50/recipes/lusty-explorer";
           sha256 = "0xqanmmkyvzcg2g4zvascq5j004bqz7vmz1a19c25g9cs3rdh0ps";
-          name = "lusty-explorer";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -44679,8 +55860,35 @@
           license = lib.licenses.free;
         };
       }) {};
-    lxc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    lv = callPackage ({ fetchFromGitHub
+                      , fetchurl
+                      , lib
+                      , melpaBuild }:
+      melpaBuild {
+        pname = "lv";
+        version = "20160912.756";
+        src = fetchFromGitHub {
+          owner = "abo-abo";
+          repo = "hydra";
+          rev = "a07b92a8755dfb064701210b634e2dc4839552ac";
+          sha256 = "11k0ifmr90vdinibhyqqyqrmpxbn9c5pjpzhr4p66wv6249s540w";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/5114349617617673d5055fe28cb8f8c86cf41f83/recipes/lv";
+          sha256 = "1lkm40rwpj9hmckng9bz5g4jbx9g9i3wlqgl6rq0m6i14syr69v4";
+          name = "recipe";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/lv";
+          license = lib.licenses.free;
+        };
+      }) {};
+    lxc = callPackage ({ fetchFromGitHub
+                       , fetchurl
+                       , lib
+                       , melpaBuild }:
+      melpaBuild {
         pname = "lxc";
         version = "20140410.1322";
         src = fetchFromGitHub {
@@ -44689,10 +55897,10 @@
           rev = "88bed56c954d1edd9ff5ce0ced2c02dcf9f71835";
           sha256 = "090gk0il4yyypzjbh2qrjdaldwf90fi30impmh4zcfl73bic5q9q";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7c16c08c388e3280f617d0768bc1cd75c5897768/recipes/lxc";
           sha256 = "1rv1ybmbjx7n3cavx21nzmvckw63q3jmjsfdr2pcgavrr2ck6lka";
-          name = "lxc";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -44700,8 +55908,39 @@
           license = lib.licenses.free;
         };
       }) {};
-    lyrics = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }:
-    melpaBuild {
+    lxc-tramp = callPackage ({ cl-lib ? null
+                             , emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
+        pname = "lxc-tramp";
+        version = "20180523.1324";
+        src = fetchFromGitHub {
+          owner = "montag451";
+          repo = "lxc-tramp";
+          rev = "1aab85fef50df2067902bff13e1bac5e6366908b";
+          sha256 = "066qwyk38r42xriifg1ik2f0am0m57wlfrk5278sycr8vbag6fc9";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/2464020a5b3d89bddcd122cad81fed84ded9b117/recipes/lxc-tramp";
+          sha256 = "0rksh7k30kh3i23c98qinffz2zj6h1bshaw994hwy8qwgm38vx61";
+          name = "recipe";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/lxc-tramp";
+          license = lib.licenses.free;
+        };
+      }) {};
+    lyrics = callPackage ({ emacs
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild
+                          , seq }:
+      melpaBuild {
         pname = "lyrics";
         version = "20180123.2004";
         src = fetchFromGitHub {
@@ -44710,10 +55949,10 @@
           rev = "fb35b387796f64f48b4daa5a163f4a576210f200";
           sha256 = "17al49f633h3fsa6aq9v5c1r8dp2gj97f46z1fhmgxbijmpfzs0w";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b04c8f3dfa9fc07cc0ff3df5c4069f864b6db92e/recipes/lyrics";
           sha256 = "0kj8v8cg4yqnz0v1nhq41jxjgd4ivqd6lsr1v5cqhg4m0r7f2nzc";
-          name = "lyrics";
+          name = "recipe";
         };
         packageRequires = [ emacs seq ];
         meta = {
@@ -44721,20 +55960,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    m-buffer = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, seq }:
-    melpaBuild {
+    m-buffer = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild
+                            , seq }:
+      melpaBuild {
         pname = "m-buffer";
         version = "20170407.1441";
         src = fetchFromGitHub {
           owner = "phillord";
           repo = "m-buffer-el";
-          rev = "8681342aaffa187e5c54945ab91b812965a96d19";
-          sha256 = "040g7l0r4bxz4ynp4zxy80jsa6x2f48z8rylc41fqxiblasmh0af";
+          rev = "6eb1d2535a82707a83733173bc400a0d8e520c80";
+          sha256 = "1sx76i59razwccvn6x7rx5a124bfyjw9fcbxf4gj7nsg33qiq809";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c34d02682e87c9978a3583bd903dcac5da5b41d5/recipes/m-buffer";
           sha256 = "17smq7wlidsls870hla5b94xq2pwk24b88jvrbbcqw6f5z3ypf94";
-          name = "m-buffer";
+          name = "recipe";
         };
         packageRequires = [ seq ];
         meta = {
@@ -44742,8 +55985,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    mac-pseudo-daemon = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    mac-pseudo-daemon = callPackage ({ cl-lib ? null
+                                     , fetchFromGitHub
+                                     , fetchurl
+                                     , lib
+                                     , melpaBuild }:
+      melpaBuild {
         pname = "mac-pseudo-daemon";
         version = "20170728.1240";
         src = fetchFromGitHub {
@@ -44752,10 +55999,10 @@
           rev = "d235680a72677f11925b912428ad1a57b664e3e8";
           sha256 = "0gqknrwhfzr7cf5pgs33a5xh79y0yzxghs6wsvavvqkmf4cvck40";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6104efc035bcf469d133ab9a2caf42c9d4482334/recipes/mac-pseudo-daemon";
           sha256 = "12fwrcnwzsfms42rzv4wif5yzx3gnsz8yzdcgkpl37kkx85iy8v0";
-          name = "mac-pseudo-daemon";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -44763,20 +56010,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    maces-game = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    maces-game = callPackage ({ cl-lib ? null
+                              , dash
+                              , emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "maces-game";
         version = "20170903.851";
         src = fetchFromGitHub {
           owner = "pawelbx";
           repo = "maces-game";
-          rev = "c0fb795f5642467ea528d2f04d904547e8a77ecd";
-          sha256 = "1sf1h5660fd3mfcca3h1fqk3xssgigkil26wz1kp1kvxfx9lm31m";
+          rev = "6a067422d305ac51612842930ed6686dc615ffec";
+          sha256 = "07pl2y4qlpcn9ap2vp1gpvdqh4l05gb7pp11c1krlaxybhwdcqjb";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2c9f33b926ecec48a43ba4f0484c687a7349ce50/recipes/maces-game";
           sha256 = "0wz91dsa0w4xlkl5lbdr8k4pgkgalsqcy27sd0i8xswq3wwiy0ip";
-          name = "maces-game";
+          name = "recipe";
         };
         packageRequires = [ cl-lib dash emacs ];
         meta = {
@@ -44784,8 +56037,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    macro-math = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    macro-math = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "macro-math";
         version = "20130328.904";
         src = fetchFromGitHub {
@@ -44794,10 +56050,10 @@
           rev = "216e59371e9ee39c34117ba79b9acd78bb415750";
           sha256 = "119c77s3qp1vqc5m2yf7m4s81aphkhsvsnwqmpq6xl08r3592zxz";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/macro-math";
           sha256 = "072ycszl4cjc9nvv4axsgyfzz9djpgh4y1xqfr1nxi41nsdfc9kn";
-          name = "macro-math";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -44805,8 +56061,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    macrostep = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    macrostep = callPackage ({ cl-lib ? null
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "macrostep";
         version = "20161120.1306";
         src = fetchFromGitHub {
@@ -44815,10 +56075,10 @@
           rev = "424e3734a1ee526a1bd7b5c3cd1d3ef19d184267";
           sha256 = "1fm40mxdn289cyzgw992223dgrjmwxn4q8svyyxfaxjrpb38jhjz";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/macrostep";
           sha256 = "1h1gag21x05a14j0wbg0lg502fq2hbqfhjlg05kysw9f870whfq2";
-          name = "macrostep";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -44826,8 +56086,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    madhat2r-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    madhat2r-theme = callPackage ({ emacs
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "madhat2r-theme";
         version = "20170202.1630";
         src = fetchFromGitHub {
@@ -44836,10 +56100,10 @@
           rev = "6b387f09de055cfcc15d74981cd4f32f8f9a7323";
           sha256 = "1nnjdqqbarzv62ic3ddc2z9wmh93zjia4nvfjmji8213dngrrf88";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/44a382a388821908306c0b8350fba91218515e1b/recipes/madhat2r-theme";
           sha256 = "0y588skd6c2ykyp54d38ibwrqglnaanr15d45d51cvcvp9k7x508";
-          name = "madhat2r-theme";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -44847,8 +56111,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    mag-menu = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, splitter }:
-    melpaBuild {
+    mag-menu = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild
+                            , splitter }:
+      melpaBuild {
         pname = "mag-menu";
         version = "20150505.1150";
         src = fetchFromGitHub {
@@ -44857,10 +56125,10 @@
           rev = "9b9277021cd09fb1dba64b1d2a00705d20914bd6";
           sha256 = "1flamyk7z3r723cczqra0f4yabc6kmgwjaw2bvs3kisppqmmz72g";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/00043412ffa4e434de9679204b9b3d2602e76ae0/recipes/mag-menu";
           sha256 = "1r1yisjnqxl9llpf91rwqp4q47jc4qp32xnkl8wzsgr0r2qf5yk2";
-          name = "mag-menu";
+          name = "recipe";
         };
         packageRequires = [ splitter ];
         meta = {
@@ -44868,8 +56136,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    magic-filetype = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    magic-filetype = callPackage ({ emacs
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild
+                                  , s }:
+      melpaBuild {
         pname = "magic-filetype";
         version = "20180219.752";
         src = fetchFromGitHub {
@@ -44878,10 +56151,10 @@
           rev = "019494add5ff02dd36cb3f500142fc51125522cc";
           sha256 = "1hw77d4wgqrms8rvkv3xd50v4y9qjvm7cpz5rkgmvizs34pjqy22";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/eb13cb0dba1696cc51132cd1ff723fa17f892a7c/recipes/magic-filetype";
           sha256 = "0f0j8fgh2gpkarz9308pns0d89wc2dchyim6hbixkdpqzg9gskc3";
-          name = "magic-filetype";
+          name = "recipe";
         };
         packageRequires = [ emacs s ];
         meta = {
@@ -44889,20 +56162,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    magic-latex-buffer = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    magic-latex-buffer = callPackage ({ cl-lib ? null
+                                      , emacs
+                                      , fetchFromGitHub
+                                      , fetchurl
+                                      , lib
+                                      , melpaBuild }:
+      melpaBuild {
         pname = "magic-latex-buffer";
         version = "20170530.1705";
         src = fetchFromGitHub {
           owner = "zk-phi";
           repo = "magic-latex-buffer";
-          rev = "c03277d5619d9adcd871f3e6480a1a27985810cb";
-          sha256 = "065xfj6asw7px4xmh5isbfs0y6m6818lrds1ca45rhkyfw98d2sb";
+          rev = "f1172ea243ff74b2013215b906eb8c0066497384";
+          sha256 = "0rsq79sbf24cvdib283ddc2vg37sjyh3h0d1siki86psyg1mgaz1";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/07e240ebe71d389d314c4a27bbcfe1f88b215c3b/recipes/magic-latex-buffer";
           sha256 = "0xm4vk4aggyfw96cgya5cp97jzx5ha0xwpf2yfh7c3m8d9cca4y8";
-          name = "magic-latex-buffer";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -44910,20 +56188,30 @@
           license = lib.licenses.free;
         };
       }) {};
-    magit = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, ghub, git-commit, let-alist, lib, magit-popup, melpaBuild, with-editor }:
-    melpaBuild {
+    magit = callPackage ({ async
+                         , dash
+                         , emacs
+                         , fetchFromGitHub
+                         , fetchurl
+                         , ghub
+                         , git-commit
+                         , lib
+                         , magit-popup
+                         , melpaBuild
+                         , with-editor }:
+      melpaBuild {
         pname = "magit";
-        version = "20180416.852";
+        version = "20180714.1858";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "16785d7962cf84df12cf1e498b2c96519e84d235";
-          sha256 = "0ifzqqsyqk5x3d8zvq0yspcfhlndl7ppv6yxzz8w27pgb4h0jqwn";
+          rev = "9b948af9f5a2bbfddd48ba0eda79359e63ff9ef4";
+          sha256 = "16llfy8nvhxfh4wffnmvad4px5jbi426m1gr423igy2a8brgib0a";
         };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/b0a9a6277974a7a38c0c46d9921b54747a85501a/recipes/magit";
-          sha256 = "1wbqz2s1ips0kbhy6jv0mm4vh110m5r65rx0ik11dsqv1fv3hwga";
-          name = "magit";
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/ac8feccfa0f4eb5bda2ef561a6be66ba145c00e0/recipes/magit";
+          sha256 = "03iv74rgng5fcy3qfr76hiy0hj6x2z0pis1yj8wm1naq5rc55hjn";
+          name = "recipe";
         };
         packageRequires = [
           async
@@ -44931,7 +56219,6 @@
           emacs
           ghub
           git-commit
-          let-alist
           magit-popup
           with-editor
         ];
@@ -44940,20 +56227,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    magit-annex = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }:
-    melpaBuild {
+    magit-annex = callPackage ({ cl-lib ? null
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , magit
+                               , melpaBuild }:
+      melpaBuild {
         pname = "magit-annex";
-        version = "20180120.1534";
+        version = "20180710.1954";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit-annex";
-          rev = "44eaef7d55647d5d4bd466742b738d7a9563d07f";
-          sha256 = "1wka4aj9jv4i8a8aj1wffg8aba23qgg02636fx7ky919jr97f3za";
+          rev = "57c3cb6f3ec86979084233be69eb87e3dcd21845";
+          sha256 = "0219hncp4vz3lvswy6c1cd8mpakrnbzcwzywjciv37ngph772mc5";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-annex";
           sha256 = "1ri58s1ly416ksmb7mql6vnmx7hq59lmhi7qijknjarw7qs3bqys";
-          name = "magit-annex";
+          name = "recipe";
         };
         packageRequires = [ cl-lib magit ];
         meta = {
@@ -44961,8 +56253,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    magit-filenotify = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }:
-    melpaBuild {
+    magit-filenotify = callPackage ({ emacs
+                                    , fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , magit
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "magit-filenotify";
         version = "20151116.1540";
         src = fetchFromGitHub {
@@ -44971,10 +56268,10 @@
           rev = "c0865b3c41af20b6cd89de23d3b0beb54c8401a4";
           sha256 = "0nkxxhxkhy314jv1l3hza84vigl8q7fc8hjjvrx58gfgsfgifx6r";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ca5541d2ce3553e9ade2c1ec1c0d78103dfd0c4d/recipes/magit-filenotify";
           sha256 = "1ihk5yi6psqkccpi2bq2h70kn7k874zl7wcinjaq21lirk4z7bvn";
-          name = "magit-filenotify";
+          name = "recipe";
         };
         packageRequires = [ emacs magit ];
         meta = {
@@ -44982,20 +56279,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    magit-find-file = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }:
-    melpaBuild {
+    magit-find-file = callPackage ({ dash
+                                   , fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , magit
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "magit-find-file";
         version = "20150702.130";
         src = fetchFromGitHub {
           owner = "bradwright";
           repo = "magit-find-file.el";
-          rev = "c3ea91bab37d10a814a829728ec972811f728d60";
-          sha256 = "1j3jsrp0qpaa2xd98d1g9z0zc4b93knwajrlnlsc7l6g0vlfsddb";
+          rev = "035da838b1a19e7a5ee135b4ca8475f4e235b61e";
+          sha256 = "1jlww053s580d7rlvmr1dl79wxasa0hhh2jnwb1ra353d6h3a73w";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/magit-find-file";
           sha256 = "1y66nsq1hbv1sb4n71gdxv7p1rz37vd9lkf7zl7avy0dchs499ik";
-          name = "magit-find-file";
+          name = "recipe";
         };
         packageRequires = [ dash magit ];
         meta = {
@@ -45003,8 +56305,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    magit-gerrit = callPackage ({ fetchFromGitHub, fetchurl, lib, magit, melpaBuild }:
-    melpaBuild {
+    magit-gerrit = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , magit
+                                , melpaBuild }:
+      melpaBuild {
         pname = "magit-gerrit";
         version = "20160226.130";
         src = fetchFromGitHub {
@@ -45013,10 +56319,10 @@
           rev = "ece6f369694aca17f3ac166ed2801b432acfe20d";
           sha256 = "0mms0gxv9a3ns8lk5k2wjibm3088y1cmpr3axjdh6ppv7r5wdvii";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f7cc000debed666ad6800e31c114eedb7384317c/recipes/magit-gerrit";
           sha256 = "1iwvg10ly6dlf8llz9f8d4qfdbvd3s28wf48qgn1wjlxpka6zrd4";
-          name = "magit-gerrit";
+          name = "recipe";
         };
         packageRequires = [ magit ];
         meta = {
@@ -45024,8 +56330,16 @@
           license = lib.licenses.free;
         };
       }) {};
-    magit-gh-pulls = callPackage ({ emacs, fetchFromGitHub, fetchurl, gh, lib, magit, melpaBuild, pcache, s }:
-    melpaBuild {
+    magit-gh-pulls = callPackage ({ emacs
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , gh
+                                  , lib
+                                  , magit
+                                  , melpaBuild
+                                  , pcache
+                                  , s }:
+      melpaBuild {
         pname = "magit-gh-pulls";
         version = "20171117.226";
         src = fetchFromGitHub {
@@ -45034,10 +56348,10 @@
           rev = "d526f4c9ee1709c79f8a4630699ce1f25ae054e7";
           sha256 = "11fd3c7wnqy08khj6za8spbsm3k1rqqih21lbax2iwvxl8jv4dv0";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9b54fe4f51820c2f707e1f5d8a1128fff19a319c/recipes/magit-gh-pulls";
           sha256 = "0qn9vjxi33pya9s8v3g95scmhwrn2yf5pjm7d24frq766wigjv8d";
-          name = "magit-gh-pulls";
+          name = "recipe";
         };
         packageRequires = [ emacs gh magit pcache s ];
         meta = {
@@ -45045,8 +56359,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    magit-gitflow = callPackage ({ fetchFromGitHub, fetchurl, lib, magit, magit-popup, melpaBuild }:
-    melpaBuild {
+    magit-gitflow = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , magit
+                                 , magit-popup
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "magit-gitflow";
         version = "20170929.124";
         src = fetchFromGitHub {
@@ -45055,10 +56374,10 @@
           rev = "cc41b561ec6eea947fe9a176349fb4f771ed865b";
           sha256 = "0jz69wrrzvqadaphmjrr146nzvmphsbl7rmc3ccnpw1gw6gnz81f";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/dfaeb33dec2c75d21733b6e51d063664c6544e4d/recipes/magit-gitflow";
           sha256 = "0wsqq3xpqqfak4aqwsh5sxjb1m62z3z0ysgdmnrch3qsh480r8vf";
-          name = "magit-gitflow";
+          name = "recipe";
         };
         packageRequires = [ magit magit-popup ];
         meta = {
@@ -45066,20 +56385,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    magit-imerge = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }:
-    melpaBuild {
+    magit-imerge = callPackage ({ emacs
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , magit
+                                , melpaBuild }:
+      melpaBuild {
         pname = "magit-imerge";
-        version = "20180329.1950";
+        version = "20180609.858";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit-imerge";
-          rev = "f337f178a1b4d2e4c1199fa02338febe216ab902";
-          sha256 = "1x0714qxryj3fg9qwnsxrksdja1q98vvjpdwn8h9anifxa0wknh6";
+          rev = "6f64cd84f1cfed9ee976a9059494128c9b52bdf4";
+          sha256 = "0adgkqp4s70qph73xrgxr56c2vrfmmqn0c4llzvxp0yp7linnr8d";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e78a5c27eedfc9b1d79e37e8d333c5d253f31a3c/recipes/magit-imerge";
           sha256 = "0rycmbsi2s7rjqfpcv794vhkybav7d8ikzdaxai36szxpg9pzhj4";
-          name = "magit-imerge";
+          name = "recipe";
         };
         packageRequires = [ emacs magit ];
         meta = {
@@ -45087,20 +56411,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    magit-lfs = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }:
-    melpaBuild {
+    magit-lfs = callPackage ({ dash
+                             , emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , magit
+                             , melpaBuild }:
+      melpaBuild {
         pname = "magit-lfs";
         version = "20170312.1524";
         src = fetchFromGitHub {
           owner = "ailrun";
           repo = "magit-lfs";
-          rev = "799282fce73b668d2cf6e4fa87f889fec8e25333";
-          sha256 = "11wv3j8b377sbfj1qhcr6rn05ns728ifrigjk7r60rd34lwyc8c4";
+          rev = "9897c59109ce34755cbd35eff689680351c45fba";
+          sha256 = "05cy0pw5lcyzcqxycvwbw39l88405lc92x0w1lvhlbwwylpbhw2s";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1a92f0963d8df3e299a999948828173dac38a612/recipes/magit-lfs";
           sha256 = "1im9skj74jdi7jh0fnyyk8a4g4sk48clgn107ggf69lnfpxh8xxa";
-          name = "magit-lfs";
+          name = "recipe";
         };
         packageRequires = [ dash emacs magit ];
         meta = {
@@ -45108,20 +56438,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    magit-org-todos = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }:
-    melpaBuild {
+    magit-org-todos = callPackage ({ emacs
+                                   , fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , magit
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "magit-org-todos";
-        version = "20180412.1542";
+        version = "20180709.1250";
         src = fetchFromGitHub {
           owner = "danielma";
           repo = "magit-org-todos.el";
-          rev = "0bfa36bbc50e62de0a3406031cb93e2f57dcdc55";
-          sha256 = "07r5x256k1fjjxs1yfg41kc94nwvnjlk2vvknkra3j8v9p0j88m7";
+          rev = "9ffa3efb098434d837cab4bacd1601fdfc6fe999";
+          sha256 = "0kxz5q8q5np4zm1ls4hx1h53vlnhj0mnmbq12p5nzk5zcxycbcpz";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/84480cad490cab2f087a484ed7b9d3d3064bbd29/recipes/magit-org-todos";
           sha256 = "0yywgzm2jzvsccm9h0a0s1q8fag9dfajnznwk6iqz5pywq5mxijr";
-          name = "magit-org-todos";
+          name = "recipe";
         };
         packageRequires = [ emacs magit ];
         meta = {
@@ -45129,20 +56464,27 @@
           license = lib.licenses.free;
         };
       }) {};
-    magit-p4 = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, magit, magit-popup, melpaBuild, p4 }:
-    melpaBuild {
+    magit-p4 = callPackage ({ cl-lib ? null
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , magit
+                            , magit-popup
+                            , melpaBuild
+                            , p4 }:
+      melpaBuild {
         pname = "magit-p4";
         version = "20170414.546";
         src = fetchFromGitHub {
           owner = "qoocku";
           repo = "magit-p4";
-          rev = "c87de6d3f10fd35415a0c56e63747eb14ed5a113";
-          sha256 = "03gn9xl9mqxb7ways9n9rcl0hc3h41j2nq42q10b0jw5zrzmr9ra";
+          rev = "ef23e89dc504970e78ac9b158731a3eda7d6d7ee";
+          sha256 = "1gld0x4y4jshyfr0q8k5icjpgmfrbcfir13sysgzqjz9ssyn2bi5";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/440d47ca465845eaa601ca8a6e4b15fc197e522b/recipes/magit-p4";
           sha256 = "19p7h3a21jjr2h52ika14lyczdv6z36gl7hk1v17bffffac8q069";
-          name = "magit-p4";
+          name = "recipe";
         };
         packageRequires = [ cl-lib magit magit-popup p4 ];
         meta = {
@@ -45150,20 +56492,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    magit-popup = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    magit-popup = callPackage ({ async
+                               , dash
+                               , emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "magit-popup";
-        version = "20180329.1302";
+        version = "20180618.1602";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit-popup";
-          rev = "a0b22e30d135d4f83a9227b3fa13b1377f9be0df";
-          sha256 = "0sn9gi0qm3q6c63f1jd67pkc54r2gqk8bzh21x48n2x2v4f84s63";
+          rev = "e2060ccb3105555f55992a995587221820341b24";
+          sha256 = "1z1xi6mkz1h0vxbhwp1ypn5jpa0a859b296k4ds2j1i18h1lvgad";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0263ca6aea7bf6eae26a637454affbda6bd106df/recipes/magit-popup";
           sha256 = "1pv5slspcfmi10bnnw6acpijn7vkn2h9iqww3w641v41d3p37jmv";
-          name = "magit-popup";
+          name = "recipe";
         };
         packageRequires = [ async dash emacs ];
         meta = {
@@ -45171,20 +56519,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    magit-stgit = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }:
-    melpaBuild {
+    magit-stgit = callPackage ({ emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , magit
+                               , melpaBuild }:
+      melpaBuild {
         pname = "magit-stgit";
-        version = "20171115.754";
+        version = "20180522.542";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit-stgit";
-          rev = "0e44df69d7c0c793808a5278bed35b2c6ec39f7f";
-          sha256 = "1zr3ir9426yg5vrsi3k56vzdhajddn5c0p2ygw587gscnr7fgv5b";
+          rev = "186e60489f5449d87d94aca24b9d65e2f26a3bc5";
+          sha256 = "134555zdc7abrfl9hlyy3l3raljzn3kk4zfcmr70xkx2qjjdl9a2";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-stgit";
           sha256 = "12wg1ig2jzy2np76brpwxdix9pwv75chviq3c24qyv4y80pd11sv";
-          name = "magit-stgit";
+          name = "recipe";
         };
         packageRequires = [ emacs magit ];
         meta = {
@@ -45192,8 +56545,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    magit-svn = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }:
-    melpaBuild {
+    magit-svn = callPackage ({ emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , magit
+                             , melpaBuild }:
+      melpaBuild {
         pname = "magit-svn";
         version = "20170213.433";
         src = fetchFromGitHub {
@@ -45202,10 +56560,10 @@
           rev = "c833903732a14478f5c4cfc561bae7c50671b36c";
           sha256 = "01kcsc53q3mbhgjssjpby7ypnhqsr48rkl1xz3ahaypmlp929gl9";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-svn";
           sha256 = "02n732z06f0bhxqkxzlvm36bpqr40pas09zbzpfdk4pb6f9f80s0";
-          name = "magit-svn";
+          name = "recipe";
         };
         packageRequires = [ emacs magit ];
         meta = {
@@ -45213,20 +56571,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    magit-tbdiff = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }:
-    melpaBuild {
+    magit-tbdiff = callPackage ({ emacs
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , magit
+                                , melpaBuild }:
+      melpaBuild {
         pname = "magit-tbdiff";
-        version = "20180120.1553";
+        version = "20180527.652";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit-tbdiff";
-          rev = "aaa040037c38f13c0e6bbce83e38959ef30c1925";
-          sha256 = "1hc2mkmd4cni0sgkypp32xlsn749c6i2lz8l3crmgk48q6qx2i18";
+          rev = "15af196860defda2554aa16ddc172a55ccf03a0d";
+          sha256 = "0d24y9sj2qzcm5an37yd7s0gxbq5q8p9xlgxyzz60ln30hwnx107";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ad97eea866c8732e3adc17551d37a6d1ae511e6c/recipes/magit-tbdiff";
           sha256 = "1wydmw4f1072k8frk8mi8aaky7dndinq8n7kn10q583bjlxgw80r";
-          name = "magit-tbdiff";
+          name = "recipe";
         };
         packageRequires = [ emacs magit ];
         meta = {
@@ -45234,20 +56597,70 @@
           license = lib.licenses.free;
         };
       }) {};
-    magit-topgit = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }:
-    melpaBuild {
+    magit-todos = callPackage ({ a
+                               , anaphora
+                               , async
+                               , dash
+                               , emacs
+                               , f
+                               , fetchFromGitHub
+                               , fetchurl
+                               , hl-todo
+                               , lib
+                               , magit
+                               , melpaBuild
+                               , pcre2el
+                               , s }:
+      melpaBuild {
+        pname = "magit-todos";
+        version = "20180714.1242";
+        src = fetchFromGitHub {
+          owner = "alphapapa";
+          repo = "magit-todos";
+          rev = "204e163d941dcc3b89db8a462d73e3c69e8e83bc";
+          sha256 = "1v78rzgk9s3ww97smqryyr3f2np5zwxx0j7v79rwmy49ck2n3cvq";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/b4544ab55d2c8b8c3b7eb739b9fb90ebb246d68b/recipes/magit-todos";
+          sha256 = "0vqmbw0qj8a5wf4ig9hgc0v3l1agdkvgprzjv178hs00297br2s8";
+          name = "recipe";
+        };
+        packageRequires = [
+          a
+          anaphora
+          async
+          dash
+          emacs
+          f
+          hl-todo
+          magit
+          pcre2el
+          s
+        ];
+        meta = {
+          homepage = "https://melpa.org/#/magit-todos";
+          license = lib.licenses.free;
+        };
+      }) {};
+    magit-topgit = callPackage ({ emacs
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , magit
+                                , melpaBuild }:
+      melpaBuild {
         pname = "magit-topgit";
         version = "20160313.1254";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit-topgit";
-          rev = "11489ea798bc88d0ea5244bbf725285eedfefbef";
-          sha256 = "1y7ss475ibjx354m73jn5dxd98g33jcijx48b30p45rbm6ha3i8q";
+          rev = "243fdfa7ce62dce4efd01b6b818a2791868db2f0";
+          sha256 = "06fbjv3zd92lvg4xjsp9l4jkxx2glhng3ys3s9jmvy5y49pymwb2";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-topgit";
           sha256 = "1ngrgf40n1g6ncd5nqgr0zgxwlkmv9k4fik96dgzysgwincx683i";
-          name = "magit-topgit";
+          name = "recipe";
         };
         packageRequires = [ emacs magit ];
         meta = {
@@ -45255,20 +56668,29 @@
           license = lib.licenses.free;
         };
       }) {};
-    magithub = callPackage ({ emacs, fetchFromGitHub, fetchurl, ghub-plus, git-commit, lib, magit, markdown-mode, melpaBuild, s }:
-    melpaBuild {
+    magithub = callPackage ({ emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , ghub-plus
+                            , git-commit
+                            , lib
+                            , magit
+                            , markdown-mode
+                            , melpaBuild
+                            , s }:
+      melpaBuild {
         pname = "magithub";
-        version = "20180410.1351";
+        version = "20180625.2104";
         src = fetchFromGitHub {
           owner = "vermiculus";
           repo = "magithub";
-          rev = "76b0156323c9953a8c6f36ff483a2d528d8df9bc";
-          sha256 = "0xg0284ca7w1clfyrd7lhiick6izj00bi9zn0hdq01h9lifardxw";
+          rev = "bc318ec9953b919195fbaa980b6873b6af7bed81";
+          sha256 = "1c8sfrahxk8q7jarvxmrwsgdy8xcjhky14vc268jbrrz197yp006";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/magithub";
           sha256 = "11par5rncsa866gazdw98d4902rvyjnnwbiwpndlyh06ak0lryab";
-          name = "magithub";
+          name = "recipe";
         };
         packageRequires = [ emacs ghub-plus git-commit magit markdown-mode s ];
         meta = {
@@ -45276,20 +56698,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    magma-mode = callPackage ({ cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    magma-mode = callPackage ({ cl-lib ? null
+                              , dash
+                              , f
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "magma-mode";
         version = "20180413.727";
         src = fetchFromGitHub {
           owner = "ThibautVerron";
           repo = "magma-mode";
-          rev = "d8e41b3c0bc7d37be78fdbcabf6c13c9e182dfaa";
-          sha256 = "1wlwgbj3hslfxl21nz5s7g0p4kdpc5ph58jp7mrz0dws5cw3sj02";
+          rev = "db5bff33611027418ba387c7e223d5de82dd9e94";
+          sha256 = "0k973dwk2frcdjdpxv26v584ldyhprny001l48wwwiyc2mf08bzk";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/59764a0aab7c3f32b5a872a3d10a7e144f273a7e/recipes/magma-mode";
           sha256 = "1gq6yi51h1h7ivrm1xr6nfrpabx8ylbk0waaw04gnw3bb54dmmvc";
-          name = "magma-mode";
+          name = "recipe";
         };
         packageRequires = [ cl-lib dash f ];
         meta = {
@@ -45297,8 +56725,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    magnatune = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    magnatune = callPackage ({ dash
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild
+                             , s }:
+      melpaBuild {
         pname = "magnatune";
         version = "20151030.1235";
         src = fetchFromGitHub {
@@ -45307,10 +56740,10 @@
           rev = "605b01505ba30589c77ebb4c96834b5072ccbdd4";
           sha256 = "1hqz26zm4bdz5wavna4j9yia3ns4z19dnszl7k0lcpgbgmb0wh8y";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6dfd5ae62718a32f8c5af4048af06cb53961d7df/recipes/magnatune";
           sha256 = "0fmxlrq5ls6fpbk5fv67aan8gg1c61i1chfw5lhf496pwqzq901d";
-          name = "magnatune";
+          name = "recipe";
         };
         packageRequires = [ dash s ];
         meta = {
@@ -45318,8 +56751,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    majapahit-theme = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    majapahit-theme = callPackage ({ fetchFromGitLab
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "majapahit-theme";
         version = "20160817.1148";
         src = fetchFromGitLab {
@@ -45328,10 +56764,10 @@
           rev = "77c96df7619666b2102d90d452eeadf04adc89a6";
           sha256 = "0wnhfdk2zwxqfh8d74xmszqgibcgxiq825pq8381zg4nkz5cckfb";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c9b793878de4107bb646652d09d8799aef8b97e8/recipes/majapahit-theme";
           sha256 = "04k2smrya27rrjlzvnl3a6llg8vj8x4mm9qyk4kwrmckhd6jd68s";
-          name = "majapahit-theme";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -45339,8 +56775,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    major-mode-icons = callPackage ({ all-the-icons, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, powerline }:
-    melpaBuild {
+    major-mode-icons = callPackage ({ all-the-icons
+                                    , emacs
+                                    , fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild
+                                    , powerline }:
+      melpaBuild {
         pname = "major-mode-icons";
         version = "20170228.2314";
         src = fetchFromGitHub {
@@ -45349,10 +56791,10 @@
           rev = "e6117a236b2ad52e948576550b183053321dfc91";
           sha256 = "0gpp9x23qz7ll8d7hlbvynv891hw907k38i7v0b08s8zh1ilvnwa";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c8f551bec8bdc5dee4b31edea0c2f92b3c77ec56/recipes/major-mode-icons";
           sha256 = "02p5h9q2j7z3wcmvkbqbbzzk3lyfdq43psppy9x9ypic9fij8j95";
-          name = "major-mode-icons";
+          name = "recipe";
         };
         packageRequires = [ all-the-icons emacs powerline ];
         meta = {
@@ -45360,20 +56802,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    make-color = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    make-color = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "make-color";
         version = "20140625.450";
         src = fetchFromGitHub {
           owner = "alezost";
           repo = "make-color.el";
-          rev = "5ca1383ca9228bca82120b238bdc119f302b75c0";
-          sha256 = "1wmpy1d966zzxwar2ng825zlch5fwsslsi1706ss9v7zl7i9wggd";
+          rev = "a1b34e95ccd3ebee4fba1489ab613d0b3078026d";
+          sha256 = "1ky3scyjb69wi76xg6a8qx4ja6lr6mk530bv5gmhj7fxbq8b3x5c";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bb765469c65589ae9d7dbc420a8edcf44c3be5d1/recipes/make-color";
           sha256 = "0mrv8b67lpid5m8rfbhcik76bvnjlw4xmcrd2c2iinyl02y07r5k";
-          name = "make-color";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -45381,8 +56826,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    make-it-so = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }:
-    melpaBuild {
+    make-it-so = callPackage ({ emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild
+                              , swiper }:
+      melpaBuild {
         pname = "make-it-so";
         version = "20180128.1307";
         src = fetchFromGitHub {
@@ -45391,10 +56841,10 @@
           rev = "bc3b01d6b9ed6ff66ebbd524234f9d6df60dd4be";
           sha256 = "0833bzlscpnkvjnrg3g54yr246afbjwri8n5wxk8drnsq6acvd8z";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/aad592089ed2200e2f8c5191e8adeac1db4bce54/recipes/make-it-so";
           sha256 = "0a8abz54mb60mfr0bl9ry8yawq99vx9hjl4fm2sivns58qjgfy73";
-          name = "make-it-so";
+          name = "recipe";
         };
         packageRequires = [ emacs swiper ];
         meta = {
@@ -45402,8 +56852,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    makefile-executor = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    makefile-executor = callPackage ({ dash
+                                     , emacs
+                                     , f
+                                     , fetchFromGitHub
+                                     , fetchurl
+                                     , lib
+                                     , melpaBuild
+                                     , s }:
+      melpaBuild {
         pname = "makefile-executor";
         version = "20180410.30";
         src = fetchFromGitHub {
@@ -45412,10 +56869,10 @@
           rev = "054c5460616d1903499d49190ac79074e9bd1c52";
           sha256 = "0axqm8hd2hz1a4qh02p7kyvrb0mab8iswpypij3q05s5yxidv1vv";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/08f8b4d680e4907dbd8ea46a75d98aa0e93c2bb9/recipes/makefile-executor";
           sha256 = "0889rq2a7ks2ynyq91xsa2kpzgd72kzbjxx0b34w8faknpj3b6hi";
-          name = "makefile-executor";
+          name = "recipe";
         };
         packageRequires = [ dash emacs f s ];
         meta = {
@@ -45423,8 +56880,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    makey = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    makey = callPackage ({ cl-lib ? null
+                         , fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "makey";
         version = "20131231.630";
         src = fetchFromGitHub {
@@ -45433,10 +56894,10 @@
           rev = "a61781e69d3b451551e269446e1c5f624ab81137";
           sha256 = "1rr7vpm3xxzcaam3m8xni3ajy8ycyljix07n2jzczayri9sd8csy";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/688e32e98758aa6fd31218e98608bd54a76c3e83/recipes/makey";
           sha256 = "06xgrlkqvg288yd4lyhx4vi80jlfarhblxk5m5zzs5as7n08cvk4";
-          name = "makey";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -45444,20 +56905,29 @@
           license = lib.licenses.free;
         };
       }) {};
-    malinka = callPackage ({ cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile, rtags, s }:
-    melpaBuild {
+    malinka = callPackage ({ cl-lib ? null
+                           , dash
+                           , f
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild
+                           , projectile
+                           , rtags
+                           , s }:
+      melpaBuild {
         pname = "malinka";
         version = "20171202.221";
         src = fetchFromGitHub {
           owner = "LefterisJP";
           repo = "malinka";
-          rev = "d4aa517c7a9022eae16c758c7efdb3a0403542d7";
-          sha256 = "1rnzvx1nc01sw9fklm36lyllqm6dizj64gnlqbs4nammx7z0spi1";
+          rev = "e3dc5b0703a5954057110b82cb397a990ace23e6";
+          sha256 = "0ljv6p1ln4mji4xh2q8w9rah6das4wvvp0pmaj2a2156lx2q3q54";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/malinka";
           sha256 = "1zmnlgy9k1s1s2wgkhlwfsnknmhggy0rx3l495a5x1kqsx6i0c9y";
-          name = "malinka";
+          name = "recipe";
         };
         packageRequires = [ cl-lib dash f projectile rtags s ];
         meta = {
@@ -45465,20 +56935,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    mallard-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    mallard-mode = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "mallard-mode";
         version = "20131203.2025";
         src = fetchFromGitHub {
           owner = "jhradilek";
           repo = "emacs-mallard-mode";
-          rev = "c48170c1ace4959abcc5fb1df0d4cb149cff44c1";
-          sha256 = "18x3cssfn81k8hg4frj7dhzphg784321z51wbbvn3bjhq7s6j3a2";
+          rev = "0a4cfede57bc31134495804ce513cc106de8de3c";
+          sha256 = "1dxhn9m2d5zjcpsqn004z9g7sw5pzgh18aik53y6hqsnvc2ph8r8";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/19c5543664ca685a70e53baa1357842e83cbf8f7/recipes/mallard-mode";
           sha256 = "0y2ikjgy107kb85pz50vv7ywslqgbrrkcfsrd8gsk1jky4qn8izd";
-          name = "mallard-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -45486,20 +56959,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    mallard-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, mallard-mode, melpaBuild, yasnippet }:
-    melpaBuild {
+    mallard-snippets = callPackage ({ fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , mallard-mode
+                                    , melpaBuild
+                                    , yasnippet }:
+      melpaBuild {
         pname = "mallard-snippets";
         version = "20131023.1151";
         src = fetchFromGitHub {
           owner = "jhradilek";
           repo = "emacs-mallard-snippets";
-          rev = "70c5293f10722f2ace73bdf74d9a18f95b040edc";
-          sha256 = "0qk7i47nmyp4llwp6x0i1i5dk82ck26iyz1sjvvlihaw8a5akny2";
+          rev = "35b7d0558da14fcffd51863f623806216a0093ce";
+          sha256 = "0b4g1h2kw00arpm816j7aa3cx10k9rwf5pxy57icjybj4b30irqa";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/57a31a6ac93a864cb5212c925fdfb0961d36b24a/recipes/mallard-snippets";
           sha256 = "0437qd7q9i32pmhxaz3vi2dnfpj4nddmzgnqpwsgl28slhjw2hv8";
-          name = "mallard-snippets";
+          name = "recipe";
         };
         packageRequires = [ mallard-mode yasnippet ];
         meta = {
@@ -45507,8 +56985,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    malyon = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    malyon = callPackage ({ cl-lib ? null
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "malyon";
         version = "20161208.1325";
         src = fetchFromGitHub {
@@ -45517,10 +56999,10 @@
           rev = "0d9882650720b4a791556f5e2d917388965d6fc0";
           sha256 = "0an1yvp0p624rxd8n5phiwvznw35ripqhlwzwyv2bw7lc1rscllr";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/54b3785cfcdb3b54307f60ee634a101e8bcd9989/recipes/malyon";
           sha256 = "050kj4c1vp9f3fiskf8hld7w46092n4jipdga226x97igx575g3r";
-          name = "malyon";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -45528,8 +57010,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    man-commands = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    man-commands = callPackage ({ cl-lib ? null
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "man-commands";
         version = "20151221.1421";
         src = fetchFromGitHub {
@@ -45538,10 +57024,10 @@
           rev = "f4ba0c3790855d7544dff92d470d212f24de1d9d";
           sha256 = "1lfq4hsq2n33l58ja5kzy6bwk9jxbcdsg6y8gqlk71lcslzqldrk";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cefd80c8f65e1577ba36ea665b36c3a3d4032b4b/recipes/man-commands";
           sha256 = "1yl7y0k24gydldfs406v1n523q46m9x6in6pgljgjnjravc67wnq";
-          name = "man-commands";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -45549,20 +57035,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    manage-minor-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    manage-minor-mode = callPackage ({ emacs
+                                     , fetchFromGitHub
+                                     , fetchurl
+                                     , lib
+                                     , melpaBuild }:
+      melpaBuild {
         pname = "manage-minor-mode";
         version = "20140310.900";
         src = fetchFromGitHub {
           owner = "ShingoFukuyama";
           repo = "manage-minor-mode";
-          rev = "1bed33b0752380b548b822fe72e6858c5fe70c8e";
-          sha256 = "10wl7kc76dyijrmdlcl5cx821jg7clsj35r22955mbbgh7zl1x07";
+          rev = "a62d044455a022a12749a33e70dff7b2ec8e3561";
+          sha256 = "0iq573daxcfpgw6mjhb7ayn95g5p8ayyqs9r1rljdzff35jyfkpw";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/manage-minor-mode";
           sha256 = "0ljdca9b08dw0kx679jmq0wc484xcpbmzwx8zkncw642pnbj9q0j";
-          name = "manage-minor-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -45570,8 +57060,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    mandm-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    mandm-theme = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "mandm-theme";
         version = "20170925.321";
         src = fetchFromGitHub {
@@ -45580,10 +57073,10 @@
           rev = "078d6d6f11bd48193c5de590cfb0e3d0d687ffc9";
           sha256 = "070280438388q57lpzvd5wdk16abmxixiq01n68hdskfcipdkn2d";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/mandm-theme";
           sha256 = "0mvzn29ljd3az6axyqq88vkkf1vpcvslc1svlnbyrpdfinphd0mx";
-          name = "mandm-theme";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -45591,20 +57084,27 @@
           license = lib.licenses.free;
         };
       }) {};
-    mandoku = callPackage ({ fetchFromGitHub, fetchurl, git, github-clone, lib, magit, melpaBuild, org }:
-    melpaBuild {
+    mandoku = callPackage ({ fetchFromGitHub
+                           , fetchurl
+                           , git
+                           , github-clone
+                           , lib
+                           , magit
+                           , melpaBuild
+                           , org }:
+      melpaBuild {
         pname = "mandoku";
         version = "20180403.406";
         src = fetchFromGitHub {
           owner = "mandoku";
           repo = "mandoku";
-          rev = "f230c871de8aab1be7b7a9718cd930548a90baa8";
-          sha256 = "1zqshxwbsyz60bag6dcabmx8a49nmnpad5kvpy1c6gvqhjr8axvw";
+          rev = "e3b7678762e9824861b1ce775a94b05b096164f5";
+          sha256 = "119q1f3xv024q9inw20c3xb194mgn11igs3x7pqdfapyinrzz6p0";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1aac4ae2c908de2c44624fb22a3f5ccf0b7a4912/recipes/mandoku";
           sha256 = "1pg7ir3y6yk92kfs5agbxapcxf7gy60m353rjv8g3kfkx5zyh3mv";
-          name = "mandoku";
+          name = "recipe";
         };
         packageRequires = [ git github-clone magit org ];
         meta = {
@@ -45612,8 +57112,18 @@
           license = lib.licenses.free;
         };
       }) {};
-    mandoku-tls = callPackage ({ emacs, fetchFromGitHub, fetchurl, github-clone, helm, helm-charinfo, hydra, lib, mandoku, melpaBuild, org }:
-    melpaBuild {
+    mandoku-tls = callPackage ({ emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , github-clone
+                               , helm
+                               , helm-charinfo
+                               , hydra
+                               , lib
+                               , mandoku
+                               , melpaBuild
+                               , org }:
+      melpaBuild {
         pname = "mandoku-tls";
         version = "20171117.1840";
         src = fetchFromGitHub {
@@ -45622,10 +57132,10 @@
           rev = "ffeebf5bd451ac1806ddfe1744fbbd036a56f902";
           sha256 = "16399qifjj4hnfw4a62jwxfwnc7k8lmiy3bz8iwzlc91jjic7zdc";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c97d3f653057eab35c612109792884334be556fe/recipes/mandoku-tls";
           sha256 = "0zny1l548rvjsbbzj47wysz6gk1sqxvpj215r3w84vw5dyrn78bz";
-          name = "mandoku-tls";
+          name = "recipe";
         };
         packageRequires = [
           emacs
@@ -45641,8 +57151,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    map-progress = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    map-progress = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "map-progress";
         version = "20140310.1432";
         src = fetchFromGitHub {
@@ -45651,10 +57164,10 @@
           rev = "3167eb218510953fb97e7d50948a625eaa3f0005";
           sha256 = "0pd6bh7wrrh59blp86a2jl2vi4qkzx49z0hy7dkc71ccg0wjsgz1";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5ed3335eaf0be7368059bcdb52c46f5e47c0c1a5/recipes/map-progress";
           sha256 = "0zc5vii72gbfwbb35w8m30c8r9zck971hwgcn1a4wjczgn4vkln7";
-          name = "map-progress";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -45662,8 +57175,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    map-regexp = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    map-regexp = callPackage ({ cl-lib ? null
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "map-regexp";
         version = "20130522.1403";
         src = fetchFromGitHub {
@@ -45672,10 +57189,10 @@
           rev = "b8e06284ec1c593d7d2bda5f35597a63de46333f";
           sha256 = "0kk1sk3cr4dbmgq4wzml8kdf14dn9jbyq4bwmvk0i7dic9vwn21c";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/927314443ecc00d94e7125de669e82832c5a125c/recipes/map-regexp";
           sha256 = "0yiif0033lhaqggywzfizfia3siggwcz7yv4z7przhnr04akdmbj";
-          name = "map-regexp";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -45683,20 +57200,27 @@
           license = lib.licenses.free;
         };
       }) {};
-    marcopolo = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, request, s }:
-    melpaBuild {
+    marcopolo = callPackage ({ dash
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild
+                             , pkg-info
+                             , request
+                             , s }:
+      melpaBuild {
         pname = "marcopolo";
         version = "20160421.304";
         src = fetchFromGitHub {
           owner = "nlamirault";
           repo = "marcopolo";
-          rev = "9193aabdf12223087b5ed58f1507d5d8a24a4381";
-          sha256 = "1yc0sgzh1qprhdrzjqc88d6g4xvw80fblcvjl6yn6kihv1ymz091";
+          rev = "85db828f2bb4346a811b3326349b1c6d0aae4601";
+          sha256 = "1qf724y1zq3z6fzm23qhwjl2knhs49nbz0vizwf8g9s51bk6bny2";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/936a1cff601594575c5b550c5eb16e7dafc8a5ab/recipes/marcopolo";
           sha256 = "1nbck1m7lhync7n474578d2g1zc72c841hi236xjbdd2lnxz3zz0";
-          name = "marcopolo";
+          name = "recipe";
         };
         packageRequires = [ dash pkg-info request s ];
         meta = {
@@ -45704,8 +57228,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    mark-multiple = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    mark-multiple = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "mark-multiple";
         version = "20121118.754";
         src = fetchFromGitHub {
@@ -45714,10 +57241,10 @@
           rev = "f6a53c7c5283d640ae718f4548b0fda78877a375";
           sha256 = "1x3anvy3hlmydxyfzr1rhaiy502yi1yz3v54sg8wc1w7jrvwaj29";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7efe1814aa552d44c3db2cd7304569f2aae66287/recipes/mark-multiple";
           sha256 = "179wd9g0smm76k92n7j2vgg8gz5wn9lczrns5ggq2yhbc77j0gn4";
-          name = "mark-multiple";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -45725,8 +57252,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    mark-tools = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    mark-tools = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "mark-tools";
         version = "20130614.325";
         src = fetchFromGitHub {
@@ -45735,10 +57265,10 @@
           rev = "a11b61effa90bd0abc876d12573674d36fc17f0c";
           sha256 = "0k4zvbs09mkr8vdffv18s55rn9cyxldzav9vw04lm7v296k94ivz";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9ca36020392807aca9658d13481868d8b6c23d51/recipes/mark-tools";
           sha256 = "1688y7lnzhwdva2ildjabzi10i87klfsgvs947i7gfgxl7jwhisq";
-          name = "mark-tools";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -45746,20 +57276,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    markdown-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    markdown-mode = callPackage ({ cl-lib ? null
+                                 , emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "markdown-mode";
-        version = "20180124.138";
+        version = "20180707.555";
         src = fetchFromGitHub {
           owner = "jrblevin";
           repo = "markdown-mode";
-          rev = "668de4a965980d618637a3b5754e721b54c51e83";
-          sha256 = "00biiz0s5mwq092qxdh9943f6qf6k6n7dhrrj7nvj2b8iciid9as";
+          rev = "b92f00d10e2582028d4306d3be8730add58e9fa1";
+          sha256 = "0cwfc4l7rqwa9hgxz73lzm6czjqnif39dkcmacxb2gi9gpxwlxjn";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/74610ec93d4478e835f8b3b446279efc0c71d644/recipes/markdown-mode";
           sha256 = "0gfb3hp87kpcrvxax3m5hsaclwwk1qmxc73cg26smzd1kjfwgz14";
-          name = "markdown-mode";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -45767,8 +57302,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    markdown-mode-plus = callPackage ({ fetchFromGitHub, fetchurl, lib, markdown-mode, melpaBuild }:
-    melpaBuild {
+    markdown-mode-plus = callPackage ({ fetchFromGitHub
+                                      , fetchurl
+                                      , lib
+                                      , markdown-mode
+                                      , melpaBuild }:
+      melpaBuild {
         pname = "markdown-mode-plus";
         version = "20170320.1404";
         src = fetchFromGitHub {
@@ -45777,10 +57316,10 @@
           rev = "411d079f4430a33c34ec0bbcb1535fe1145a2509";
           sha256 = "0427cxvykmz8kz1gnn27yc9c4z8djyy6m9qz6wbd4np1cgqlmly2";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ca7bf43ef8893bf04e9658390e306ef69e80a156/recipes/markdown-mode+";
           sha256 = "1535kcj9nmcgmk2448jxc0jmnqy7f50cw2ngffjq5w8bfhgf7q00";
-          name = "markdown-mode-plus";
+          name = "recipe";
         };
         packageRequires = [ markdown-mode ];
         meta = {
@@ -45788,8 +57327,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    markdown-preview-eww = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    markdown-preview-eww = callPackage ({ emacs
+                                        , fetchFromGitHub
+                                        , fetchurl
+                                        , lib
+                                        , melpaBuild }:
+      melpaBuild {
         pname = "markdown-preview-eww";
         version = "20160111.702";
         src = fetchFromGitHub {
@@ -45798,10 +57341,10 @@
           rev = "5853f836425c877c8a956501f0adda137ef1d3b7";
           sha256 = "1i5gr3j9dq41p2zl4bfyvzv6i5z7hgrxzrycmbdc3s7nja36k9z4";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d9b3ad97a193c41068ca184b4835fa7a7a0ebc9c/recipes/markdown-preview-eww";
           sha256 = "0j6924f84is41dspib68y5lnz1f8nm7pqyhv47alxra50cjrpxnx";
-          name = "markdown-preview-eww";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -45809,8 +57352,17 @@
           license = lib.licenses.free;
         };
       }) {};
-    markdown-preview-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, markdown-mode, melpaBuild, uuidgen, web-server, websocket }:
-    melpaBuild {
+    markdown-preview-mode = callPackage ({ cl-lib ? null
+                                         , emacs
+                                         , fetchFromGitHub
+                                         , fetchurl
+                                         , lib
+                                         , markdown-mode
+                                         , melpaBuild
+                                         , uuidgen
+                                         , web-server
+                                         , websocket }:
+      melpaBuild {
         pname = "markdown-preview-mode";
         version = "20171121.2323";
         src = fetchFromGitHub {
@@ -45819,10 +57371,10 @@
           rev = "4ec15183fc9fadb9368902c9b77a2d0e1196d1c6";
           sha256 = "1zvpcnn0lafd6pvp5d42rid20dqi7zrpyai1q0kagpv3grbbyzc8";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d3c5d222cf0d7eca6a4e3eb914907f8ca58e40f0/recipes/markdown-preview-mode";
           sha256 = "1cam5wfxca91q3i1kl0qbdvnfy62hr5ksargi4430kgaz34bcbyn";
-          name = "markdown-preview-mode";
+          name = "recipe";
         };
         packageRequires = [
           cl-lib
@@ -45837,8 +57389,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    markdown-toc = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, markdown-mode, melpaBuild, s }:
-    melpaBuild {
+    markdown-toc = callPackage ({ dash
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , markdown-mode
+                                , melpaBuild
+                                , s }:
+      melpaBuild {
         pname = "markdown-toc";
         version = "20170711.1249";
         src = fetchFromGitHub {
@@ -45847,10 +57405,10 @@
           rev = "7038f4f6d5c2bc7e4aea89699a607ac2b7dd16a8";
           sha256 = "1kvf30ib1kxp29k1xwixkq6l4jjr3q3g1wpvh9yfzk5ld97zmry1";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4db1e90be8e34d5ad0c898be10dfa5cd95ccb921/recipes/markdown-toc";
           sha256 = "0slky735yzmbfi4ld264vw64b4a4nllhywp19ya0sljbsfycbihv";
-          name = "markdown-toc";
+          name = "recipe";
         };
         packageRequires = [ dash markdown-mode s ];
         meta = {
@@ -45858,20 +57416,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    markdownfmt = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    markdownfmt = callPackage ({ emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "markdownfmt";
         version = "20160609.541";
         src = fetchFromGitHub {
           owner = "nlamirault";
           repo = "emacs-markdownfmt";
-          rev = "187a74eb4fd9e8520ce08da42d1d292b9af7f2b7";
-          sha256 = "01rxl997rb7f71mbvygavsxaq2vr17f2nnpbg7i551lg82xrsbb4";
+          rev = "af83cd00fafcaa837ffdb50d1fa2b0ac952f16c0";
+          sha256 = "1alkjvs21wlai742qgcm0bgf3z3c0f10xgalz48gi4vmwn6in7r7";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/16cee5fe003e3afc7daf6858ed83843b52e44901/recipes/markdownfmt";
           sha256 = "1wzsw90z988bm94cw4jw5gzjcicgiz4qgn1nsdm8nim9rp43bj17";
-          name = "markdownfmt";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -45879,8 +57441,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    markup = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    markup = callPackage ({ cl-lib ? null
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "markup";
         version = "20170420.429";
         src = fetchFromGitHub {
@@ -45889,10 +57455,10 @@
           rev = "876da2d3f23473475bb0fd0a1480ae11d2671291";
           sha256 = "0rggadka5aqgrik3qky6s75s5yb5bfj6fcpxjz1iyrwi0fka0akd";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a75c955ad6b2f68b8933329e545625d948f6f8f4/recipes/markup";
           sha256 = "0yw4b42nc2n7nanqvj596hwjf0p4qc7x6g2d9g5cwi7975iak8pf";
-          name = "markup";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -45900,8 +57466,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    markup-faces = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    markup-faces = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "markup-faces";
         version = "20141110.17";
         src = fetchFromGitHub {
@@ -45910,10 +57479,10 @@
           rev = "98a807ed82473eb41c6a201ed7ef816d6bcd67b0";
           sha256 = "1w6i1m7xdr9cijnmdj35cl99r12vl83qws0qlfhrgvisilshnr27";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/markup-faces";
           sha256 = "06fawlv4ih2lsmk7x6h9p5rppl8vw2w3nvlss95kb8fj5fwf7mw9";
-          name = "markup-faces";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -45921,8 +57490,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    marmalade-client = callPackage ({ fetchFromGitHub, fetchurl, gh, kv, lib, melpaBuild, web }:
-    melpaBuild {
+    marmalade-client = callPackage ({ fetchFromGitHub
+                                    , fetchurl
+                                    , gh
+                                    , kv
+                                    , lib
+                                    , melpaBuild
+                                    , web }:
+      melpaBuild {
         pname = "marmalade-client";
         version = "20141231.1207";
         src = fetchFromGitHub {
@@ -45931,10 +57506,10 @@
           rev = "f315dea57e4fbebd9ee0668c0bafd4c45c7b754a";
           sha256 = "017k109nfif5mzkj547py8pdnzlr4sxb74yqqsl944znflq67blr";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/834d6d8444169e1e9b66c963a4c2e03ff658e154/recipes/marmalade-client";
           sha256 = "0llwqwwxrf7qdkpdb03ij0iinll0vc9qr557zyr3bn5zb4fad1sq";
-          name = "marmalade-client";
+          name = "recipe";
         };
         packageRequires = [ gh kv web ];
         meta = {
@@ -45942,8 +57517,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    marshal = callPackage ({ eieio ? null, fetchFromGitHub, fetchurl, ht, json ? null, lib, melpaBuild }:
-    melpaBuild {
+    marshal = callPackage ({ eieio ? null
+                           , fetchFromGitHub
+                           , fetchurl
+                           , ht
+                           , json ? null
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "marshal";
         version = "20180124.439";
         src = fetchFromGitHub {
@@ -45952,10 +57533,10 @@
           rev = "f038689cbd5b3680b80b44edd0c7a63ca3038e26";
           sha256 = "1n79im1r7h1ilvppn9alqwl96zhyxbm5hk7kbmqh022dggw0cx15";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/203f2061c5c7d4aefab3175de5e0538f12158ee3/recipes/marshal";
           sha256 = "17ikd8f1k42f28d4v5dn83zb44bsx7g336db60q068w6z8d4jbgl";
-          name = "marshal";
+          name = "recipe";
         };
         packageRequires = [ eieio ht json ];
         meta = {
@@ -45963,8 +57544,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    maruo-macro-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    maruo-macro-mode = callPackage ({ emacs
+                                    , fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "maruo-macro-mode";
         version = "20160616.649";
         src = fetchFromGitHub {
@@ -45973,10 +57558,10 @@
           rev = "8fc9a38ad051eafa8eb94038711acc52c5d1d8d5";
           sha256 = "0r005yap50jf6b5jc7314ds17g1nn2irn1agidi74fbrwfbndxgm";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d0c17243b6c62e179aefc25d5f2ca43e5f6c66c1/recipes/maruo-macro-mode";
           sha256 = "1h7pclpqkkgi8z9yp5n79ffna809yf336bz6082l541xc06pmvcv";
-          name = "maruo-macro-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -45984,8 +57569,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    mastodon = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    mastodon = callPackage ({ emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "mastodon";
         version = "20180305.1909";
         src = fetchFromGitHub {
@@ -45994,10 +57583,10 @@
           rev = "ae8dabda04e377a6ac22cb854e4844f68073f533";
           sha256 = "1avf2wkzd14dj27i9skm3mn3ipkr1zp93yrwxrk2q5kphj1qji2j";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/809d963b69b154325faaf61e54ca87b94c1c9a90/recipes/mastodon";
           sha256 = "1bsyf4j6zs9gin0k7p22yv5gaqd6m3vdc2fiagfbs7gxsmhb6p4i";
-          name = "mastodon";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -46005,20 +57594,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    material-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    material-theme = callPackage ({ emacs
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "material-theme";
         version = "20171123.1040";
         src = fetchFromGitHub {
           owner = "cpaulik";
           repo = "emacs-material-theme";
-          rev = "b66838d220ad380a16da1d8878936974b26f815d";
-          sha256 = "128zn4078b2av3vs8vrqa73fb53vrm64lqg0ks6kymnnmyvcz8v2";
+          rev = "c59b4874914b5b28068be25292690325f19739dd";
+          sha256 = "1sp2h2n0ihp0r6q7c1861awg7rqh6bcxz4hgnny1gj5vjz9h7rch";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d31ababaa50061e767605c979a3f327a654e564b/recipes/material-theme";
           sha256 = "1d259avldc5fq121xrqv53h8s4f4bp6b89nz2rvjhygz7f8hargq";
-          name = "material-theme";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -46026,8 +57619,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    math-symbol-lists = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    math-symbol-lists = callPackage ({ fetchFromGitHub
+                                     , fetchurl
+                                     , lib
+                                     , melpaBuild }:
+      melpaBuild {
         pname = "math-symbol-lists";
         version = "20170221.553";
         src = fetchFromGitHub {
@@ -46036,10 +57632,10 @@
           rev = "1af8fdcab7941a62287c2d04b8876e1538f39c60";
           sha256 = "1kj9r2mvmvnj6m2bwhbj8fspqiq8fdrhkaj0ir43f7qmd4imblsj";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fadff01600d57f5b9ea9c0c47ed109e058114998/recipes/math-symbol-lists";
           sha256 = "01j11k29acj0b1pcapmgi2d2s3p50bkms21i2qcj0cbqgz8h6s27";
-          name = "math-symbol-lists";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -46047,8 +57643,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    math-symbols = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
-    melpaBuild {
+    math-symbols = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , helm
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "math-symbols";
         version = "20170818.759";
         src = fetchFromGitHub {
@@ -46057,10 +57657,10 @@
           rev = "3f8b466f002e1b28ddbe9a6f236c9a1352adb17d";
           sha256 = "0r63acgicb43p05gsiz98m7077sj72c1miz18fi8qbzi02p9qjr7";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d7b0799bddbbbecd12bc1589b56a6250acf76407/recipes/math-symbols";
           sha256 = "0sx9cgyk56npjd6z78y9cldbvjl5ipl7k1nc1sylg1iggkbwxnqx";
-          name = "math-symbols";
+          name = "recipe";
         };
         packageRequires = [ helm ];
         meta = {
@@ -46068,8 +57668,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    matlab-mode = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    matlab-mode = callPackage ({ fetchgit
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "matlab-mode";
         version = "20180125.1010";
         src = fetchgit {
@@ -46077,10 +57680,10 @@
           rev = "50266ff812607e55bddacd71a46d1b96e36fb0bd";
           sha256 = "1spyfnkw6j0v947m6yj6mv6ni1za0a9m9iycpjycpcb42q7d9rlg";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6f78cff288077e04f8c9e4c2e5be9f3c33d8ff49/recipes/matlab-mode";
           sha256 = "1q3sdmahf915ix4lrv65cxsfh6hrs91c8pmyixbqmbhifqi33d0q";
-          name = "matlab-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -46088,8 +57691,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    maude-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    maude-mode = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "maude-mode";
         version = "20160222.807";
         src = fetchFromGitHub {
@@ -46098,10 +57704,10 @@
           rev = "c9543bb8a172fa77af592388e7f520a4a6d38987";
           sha256 = "1sn9bdaq3mf2vss5gzmxhnp9fz43cakxh36qjdgqrvx302nlnv52";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9c33b8bd62391767a63f57786750e38cbc262bda/recipes/maude-mode";
           sha256 = "1w5v3r905xkwchkm2gzvzpswba5p2m7hqpyg9fzq2ldlr8kk7ah3";
-          name = "maude-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -46109,8 +57715,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    maven-test-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    maven-test-mode = callPackage ({ emacs
+                                   , fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild
+                                   , s }:
+      melpaBuild {
         pname = "maven-test-mode";
         version = "20141219.2157";
         src = fetchFromGitHub {
@@ -46119,10 +57730,10 @@
           rev = "a19151861df2ad8ae4880a2e7c86ddf848cb569a";
           sha256 = "1xn2yyr8mr90cynbxgv0h5v180pzf0ydnjr9spg34mrdicqlki6c";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bdc7f677c53431542cb8d7c95666d021dead2b98/recipes/maven-test-mode";
           sha256 = "1k9w51rh003p67yalzq1w8am40nnr2khyyb5y4bwxgpms8z391fm";
-          name = "maven-test-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs s ];
         meta = {
@@ -46130,8 +57741,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    maxframe = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    maxframe = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "maxframe";
         version = "20170120.905";
         src = fetchFromGitHub {
@@ -46140,10 +57754,10 @@
           rev = "13bda6dd9f1d96aa4b9dd9957a26cefd399a7772";
           sha256 = "0kh8yk1py9zg62zfl289hszhq3kl3mqmjk6z5vqkw3mcik4lm69g";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/maxframe";
           sha256 = "1lxj60qcvv8vakdq79k1brzv3ki74kajrx8620dzx76bnfkryxk8";
-          name = "maxframe";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -46151,8 +57765,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    mb-url = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    mb-url = callPackage ({ cl-lib ? null
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "mb-url";
         version = "20161224.1806";
         src = fetchFromGitHub {
@@ -46161,10 +57779,10 @@
           rev = "129a0bb6a684be76fb9f09010e710065d0e5baaa";
           sha256 = "1apy7abjhdbgh8001rzv41q40bfl444rcz62lvgdwj3lg45zb8xc";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/dd9a8ff6e094b061a7b9d790df1fd4086c5d0a9d/recipes/mb-url";
           sha256 = "1nf8ssan00qsn3d4dc6h6qzdwqzh977qb5d2m33kiwi6qb98988h";
-          name = "mb-url";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -46172,8 +57790,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    mbe = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    mbe = callPackage ({ cl-lib ? null
+                       , emacs
+                       , fetchFromGitHub
+                       , fetchurl
+                       , lib
+                       , melpaBuild }:
+      melpaBuild {
         pname = "mbe";
         version = "20151126.334";
         src = fetchFromGitHub {
@@ -46182,10 +57805,10 @@
           rev = "bb10aa8f26bb7e9b1d5746934c94edb00402940c";
           sha256 = "1zywygdgnp2zr8fxqhl0cbrgbl43931k936b9imhqi96p6622pb6";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0a8a16e485d608dbd59151d77e252048a49f9d25/recipes/mbe";
           sha256 = "0h18mbcjy8nh4gl12kg2v8x6ps320yk7sbgq5alqnx2shp80kri3";
-          name = "mbe";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -46193,8 +57816,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    mbo70s-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    mbo70s-theme = callPackage ({ emacs
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "mbo70s-theme";
         version = "20170808.615";
         src = fetchFromGitHub {
@@ -46203,10 +57830,10 @@
           rev = "bed3db8965708ed4e9482b224a9b084765c052f2";
           sha256 = "19hha9xwfqvdgsws69x0mcm93yfllp44hdl1xw9zlhj8f4ihizh5";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b8d0c1050b3319e136fe75903ae3612a52790189/recipes/mbo70s-theme";
           sha256 = "1abx2rw09xxp122ff7i9sry5djd4l6vn4lfzxs92rknjzkyc40pb";
-          name = "mbo70s-theme";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -46214,20 +57841,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    mbsync = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    mbsync = callPackage ({ fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "mbsync";
-        version = "20171130.335";
+        version = "20180530.33";
         src = fetchFromGitHub {
           owner = "dimitri";
           repo = "mbsync-el";
-          rev = "911d9ac255e8f7fb4bd21c0e816e44abfeb59128";
-          sha256 = "05qqb7399bmjdkfr5gdkf7fpg6xziyd9345x00vz5cbq859p128p";
+          rev = "bca442138f24f20479b89bd5d77b012ab06f4232";
+          sha256 = "1wb3wasfcqcwdlvhgr6y334mgjdkis1s6lf1bbypw9dzi1xmkj21";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3ef6ffa53bb0ce2ba796555e39f59534fc134aa5/recipes/mbsync";
           sha256 = "1q5g76mspi24zwbs7h4m8bmkhab4drskha4d9b516w1f1cyg6hb6";
-          name = "mbsync";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -46235,20 +57865,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    mc-extras = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, multiple-cursors }:
-    melpaBuild {
+    mc-extras = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild
+                             , multiple-cursors }:
+      melpaBuild {
         pname = "mc-extras";
-        version = "20170824.2239";
+        version = "20180519.2139";
         src = fetchFromGitHub {
           owner = "knu";
           repo = "mc-extras.el";
-          rev = "f0ba639e9b18cc56e80ae45bbb2b694dbad9171a";
-          sha256 = "0d6ncj6zd0lfsdpffbh3l25ycjw5hn0rwi5znp5hpl06b1ycyk4s";
+          rev = "fac7e42d03078b4ca0fa72f191995c727143a0d1";
+          sha256 = "097rzzd3r43f406axpvf4xfc5fxpb3v2dcrlxk5axpvr0m31b0d1";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/12747bb8603ebc09ce0873f3317a99e34d818313/recipes/mc-extras";
           sha256 = "0b110x6ygc95v5pb9lk1i731x5s6dagl5afzv37l1qchys36xrym";
-          name = "mc-extras";
+          name = "recipe";
         };
         packageRequires = [ multiple-cursors ];
         meta = {
@@ -46256,8 +57890,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    md-readme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    md-readme = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "md-readme";
         version = "20160811.946";
         src = fetchFromGitHub {
@@ -46266,10 +57903,10 @@
           rev = "bf818dd847c8b06b3b5100c5d3cf24cf96662528";
           sha256 = "0gyjadkv572v3zilxivbiz28pvqh0jmi5bh5la1hyim0qnxymli8";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5408d7c12c189d2b5ab9fbb02276de334851e3c8/recipes/md-readme";
           sha256 = "1krq0f79jjrlihr2aqq87pxdqixv2zdjw4hm732sz79g996yxyw3";
-          name = "md-readme";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -46277,20 +57914,30 @@
           license = lib.licenses.free;
         };
       }) {};
-    md4rd = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, hierarchy, lib, melpaBuild, request, s, tree-mode }:
-    melpaBuild {
+    md4rd = callPackage ({ cl-lib ? null
+                         , dash
+                         , emacs
+                         , fetchFromGitHub
+                         , fetchurl
+                         , hierarchy
+                         , lib
+                         , melpaBuild
+                         , request
+                         , s
+                         , tree-mode }:
+      melpaBuild {
         pname = "md4rd";
-        version = "20180123.1244";
+        version = "20180625.2236";
         src = fetchFromGitHub {
           owner = "ahungry";
           repo = "md4rd";
-          rev = "be0fc4951b2d1f5194ffa1fcaac706dbac560500";
-          sha256 = "1i93shx5x192gd7cl2r6gvcvhhwyi1k08abi5w3izv1hn3pmksgq";
+          rev = "3a6c5055330f1cad455cbeb6ad6f9eb4751a8309";
+          sha256 = "1c0g6f6myllqz6mymqxbpi392fg1hvzas0ah2wmyw5ycmaafpz3d";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/48d4a3b3337e16e68631409d1de0ce67ae22b837/recipes/md4rd";
           sha256 = "0ayr5qw0cz7bd46djfhm8slr2kfgssi5bsnzqcasr8n4lyg9jvfc";
-          name = "md4rd";
+          name = "recipe";
         };
         packageRequires = [ cl-lib dash emacs hierarchy request s tree-mode ];
         meta = {
@@ -46298,8 +57945,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    mediawiki = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    mediawiki = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "mediawiki";
         version = "20170812.2255";
         src = fetchFromGitHub {
@@ -46308,10 +57958,10 @@
           rev = "8473e12d1839f5287a4227586bf117dad820f867";
           sha256 = "03rpj3yrk3i1l9yjnamnx38idn6y4zi9zg53bc83sx3g2b4m5v04";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/865e0ba1dbace58784181d214000d090478173bd/recipes/mediawiki";
           sha256 = "17cbrzfdp6jbbf74mn2fi1cwv7d1hvdbw9j84p43jzscnaa5ikx6";
-          name = "mediawiki";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -46319,20 +57969,27 @@
           license = lib.licenses.free;
         };
       }) {};
-    meghanada = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, yasnippet }:
-    melpaBuild {
+    meghanada = callPackage ({ company
+                             , emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , flycheck
+                             , lib
+                             , melpaBuild
+                             , yasnippet }:
+      melpaBuild {
         pname = "meghanada";
-        version = "20180405.1845";
+        version = "20180620.1649";
         src = fetchFromGitHub {
           owner = "mopemope";
           repo = "meghanada-emacs";
-          rev = "5479b42efe3ed504e3a0824e039e8365ebc0b788";
-          sha256 = "1jn4cpd6y310c8kkk7w0lpchac0rd3f8ri3lmy369gi1sb2xsk94";
+          rev = "f55a237e10fac1f06b50a41c54236ed9fc197530";
+          sha256 = "17shp56xg47sfp9l1iak5dscr62yj9i55xwnfn380x24pxrsfp88";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4c75c69b2f00be9a93144f632738272c1e375785/recipes/meghanada";
           sha256 = "10f1fxma3lqcyv78i0p9mjpi79jfjd5lq5q60ylpxqp18nrql1s4";
-          name = "meghanada";
+          name = "recipe";
         };
         packageRequires = [ company emacs flycheck yasnippet ];
         meta = {
@@ -46340,8 +57997,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    melancholy-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    melancholy-theme = callPackage ({ fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "melancholy-theme";
         version = "20170220.1248";
         src = fetchFromGitHub {
@@ -46350,10 +58010,10 @@
           rev = "a9e13ca7051731b3a2c2aece9f3e3033b9a5e41d";
           sha256 = "13wgh3w9wh1y1ynsbz4zi2vj14h8z1kj5vhq4w6szs0y0zzjb9zj";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8b8f708d1300d401697c099709718fcb70d5db1f/recipes/melancholy-theme";
           sha256 = "1wihbv44234lwsgp5w4hmmi3pgxbcfjvs1nclv0yg600z9s8sn8w";
-          name = "melancholy-theme";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -46361,8 +58021,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    mellow-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    mellow-theme = callPackage ({ emacs
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "mellow-theme";
         version = "20170808.617";
         src = fetchFromGitHub {
@@ -46371,10 +58035,10 @@
           rev = "2bdf18f05f5212b6f269d9a94afe2cf201766891";
           sha256 = "0cj9lkqgiaq1s2k9ky93jgv5pfbmjznsd54r3iqkiy1zshpkir68";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/641d1959bd31598fcdacd39a3d1bb077dcccfa5c/recipes/mellow-theme";
           sha256 = "0kl1psykx7akxwabszk4amszh3zil8ia4bfbjjvr6h9phgx66pb0";
-          name = "mellow-theme";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -46382,8 +58046,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    melpa-upstream-visit = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    melpa-upstream-visit = callPackage ({ fetchFromGitHub
+                                        , fetchurl
+                                        , lib
+                                        , melpaBuild
+                                        , s }:
+      melpaBuild {
         pname = "melpa-upstream-visit";
         version = "20130720.333";
         src = fetchFromGitHub {
@@ -46392,10 +58060,10 @@
           rev = "7310c74fdead3c0f86ad6eff76cf989e63f70f66";
           sha256 = "12cp56ppmwpdgf5afx7hd2qb8d1qq8z27191fbbf5zqw8cq5zkpd";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c110538a1ae2419505ea8f144ef7de2d67cad568/recipes/melpa-upstream-visit";
           sha256 = "0j4afy9ipzr7pwkij8ab207mabd7srganlyyif9h1hvclj9svdmf";
-          name = "melpa-upstream-visit";
+          name = "recipe";
         };
         packageRequires = [ s ];
         meta = {
@@ -46403,20 +58071,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    memoize = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    memoize = callPackage ({ fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "memoize";
-        version = "20170720.1802";
+        version = "20180614.1230";
         src = fetchFromGitHub {
           owner = "skeeto";
           repo = "emacs-memoize";
-          rev = "636defefa9168f90bce6fc27431352ac7d01a890";
-          sha256 = "04qgnlg4x6va7x364dhj1wbjmz8p5iq2vk36mn9198k2vxmijwzk";
+          rev = "9a561268ffb550b257a08710489a95cd087998b6";
+          sha256 = "1hsw7pjdy3mksg343v400068b6x7s45gzg0l74h5i4nq8bacv8km";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6cc9be5bbcff04de5e6d3bb8c47d202fd350989b/recipes/memoize";
           sha256 = "0mzz3hghnbkmxf9wgjqv3sbyxyqqzvvscazq9ybb0b41qrzm73s6";
-          name = "memoize";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -46424,8 +58095,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    memolist = callPackage ({ ag, fetchFromGitHub, fetchurl, lib, markdown-mode, melpaBuild }:
-    melpaBuild {
+    memolist = callPackage ({ ag
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , markdown-mode
+                            , melpaBuild }:
+      melpaBuild {
         pname = "memolist";
         version = "20150804.1021";
         src = fetchFromGitHub {
@@ -46434,10 +58110,10 @@
           rev = "60c296e202a71e9dcf1c3936d47b5c4b95c5839f";
           sha256 = "1jd4rjv812iv7kp4wyxdz8sk7j0442m8x2ypk6hiqis0braxnspm";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/memolist";
           sha256 = "0nvp38qbzcl6dcayjndw32d3r9h8vf2n29i678s1yr280ll8xw6w";
-          name = "memolist";
+          name = "recipe";
         };
         packageRequires = [ ag markdown-mode ];
         meta = {
@@ -46445,8 +58121,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    mentor = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, seq, xml-rpc }:
-    melpaBuild {
+    mentor = callPackage ({ cl-lib ? null
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild
+                          , seq
+                          , xml-rpc }:
+      melpaBuild {
         pname = "mentor";
         version = "20170105.221";
         src = fetchFromGitHub {
@@ -46455,10 +58137,10 @@
           rev = "9a160d718b02a95b1bb24072cca87b4348e1e261";
           sha256 = "16n5dd00ajr2qqwm51v1whf2kmyr27mx30n3xlydf9np3f34hlax";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/083de4bd25b6b013a31b9d5ecdffad139a4ba91e/recipes/mentor";
           sha256 = "0nkf7f90m2qf11l97zwvb114yrpbqk1xxr2bh2nvbx8m1c8nad9s";
-          name = "mentor";
+          name = "recipe";
         };
         packageRequires = [ cl-lib seq xml-rpc ];
         meta = {
@@ -46466,20 +58148,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    merlin = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    merlin = callPackage ({ fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "merlin";
-        version = "20170917.430";
+        version = "20180214.242";
         src = fetchFromGitHub {
           owner = "the-lambda-church";
           repo = "merlin";
-          rev = "a5dbf8e321ff162476555e62264468dd6f55c279";
-          sha256 = "0mq4ddr3g64dd4bhq812hb5xvlkswfmib1nw34f3m8sghmaxcd5z";
+          rev = "0a14a7df44cd8f5cea7928f3097b5bb5257cb61d";
+          sha256 = "145r8bhvkar0fwajsg4msyg40na8ii0xbrwbi9b81cx1g17k5c7k";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b1b9bfd3164e62758dc0a3362d85c6627ed7cbf8/recipes/merlin";
           sha256 = "177cy9xcrjckxv8gvi1zhg2ndfr8cmsr37inyvpi5dxqy6d6alhp";
-          name = "merlin";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -46487,8 +58172,38 @@
           license = lib.licenses.free;
         };
       }) {};
-    meson-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    merlin-eldoc = callPackage ({ emacs
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild
+                                , merlin }:
+      melpaBuild {
+        pname = "merlin-eldoc";
+        version = "20180630.1026";
+        src = fetchFromGitHub {
+          owner = "khady";
+          repo = "merlin-eldoc";
+          rev = "6e1626d755a8bee0a03f89a951bdf69eaf4db5f9";
+          sha256 = "1xa8dfdi7w8ip7m6n0cqz28p9zvqsshd76zg27g4pmhgv1n3fnkc";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/a7130ec893175323775e887babbcec7a1e324c01/recipes/merlin-eldoc";
+          sha256 = "0r4997813yz81zvmdgvr0xcp9c321h55z39lajpj1plmrs3c7bry";
+          name = "recipe";
+        };
+        packageRequires = [ emacs merlin ];
+        meta = {
+          homepage = "https://melpa.org/#/merlin-eldoc";
+          license = lib.licenses.free;
+        };
+      }) {};
+    meson-mode = callPackage ({ emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "meson-mode";
         version = "20170901.1135";
         src = fetchFromGitHub {
@@ -46497,10 +58212,10 @@
           rev = "212d9f38a08074f1cb6e914e12b60bc52dcb8bee";
           sha256 = "1kv7413y5530frs1nrp0nl40h9j0idwp7vlg761r260200m8sl3v";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4702a31ffd6b9c34f96d151f2611a1bfb25baa88/recipes/meson-mode";
           sha256 = "16yg217ghx6pvlxha2swznkg12c2a9hhyi0hnsbqdj2ijcdzca80";
-          name = "meson-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -46508,20 +58223,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    messages-are-flowing = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    messages-are-flowing = callPackage ({ fetchFromGitHub
+                                        , fetchurl
+                                        , lib
+                                        , melpaBuild }:
+      melpaBuild {
         pname = "messages-are-flowing";
         version = "20170218.1720";
         src = fetchFromGitHub {
           owner = "legoscia";
           repo = "messages-are-flowing";
-          rev = "ef879726957c850c3a5afd7f1118604991e37e32";
-          sha256 = "1mryk48z92r4j8f3qg0j0q5iygv7vnk1k0wgza5pq6bhrl5w13hq";
+          rev = "649061753b67b24c54a2eaadc8b3218cafae7376";
+          sha256 = "01y9cx5d5sqgvg97dzrnyi7m3yp0q3hm2yqcgknkp111afcgiwm7";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/messages-are-flowing";
           sha256 = "0v74b7cjj87kncndxfpfs6dcc4jcl18wpbirffl7dw6mac2anw6m";
-          name = "messages-are-flowing";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -46529,20 +58247,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    meta-presenter = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    meta-presenter = callPackage ({ fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "meta-presenter";
         version = "20170425.1934";
         src = fetchFromGitHub {
           owner = "myTerminal";
           repo = "meta-presenter";
-          rev = "4e7aae56e5abf6deaadbda84fd5ec4e3e19c22be";
-          sha256 = "0nb64i9ikkcbb6s21rzc2d5i84dpy0zvqk7f3zynlprzaqy11b7n";
+          rev = "7ba8d30e36ce6de6e563c7f3a41a24d288787c48";
+          sha256 = "0m23qsbai8j0bx0px7v3ipw92i4y8maxibna6zqrw3msv1j3s7cw";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b73e9424515b3ddea220b786e91c57ee22bed87f/recipes/meta-presenter";
           sha256 = "0f70cfa91wavchlx8d9hdlgq90cmnylhbg2dbw603rzjkyvslp5d";
-          name = "meta-presenter";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -46550,8 +58271,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    metalheart-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    metalheart-theme = callPackage ({ emacs
+                                    , fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "metalheart-theme";
         version = "20160709.2341";
         src = fetchFromGitHub {
@@ -46560,10 +58285,10 @@
           rev = "ec98ea2c11dc1213dae8cbe1fe0cee73ca138bb2";
           sha256 = "0pc86qh74i6vr0ap2j2sn4nl2c0vv15m4m1myyjmggfxx2f27nnc";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/204dd67b24bf4f2305a14efb925c8fe004026694/recipes/metalheart-theme";
           sha256 = "1xqql1mcwp52plm1gp6q4m9zij2w360y15lnjsz9xgjqvslr7gy5";
-          name = "metalheart-theme";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -46571,8 +58296,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    metascript-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    metascript-mode = callPackage ({ emacs
+                                   , fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "metascript-mode";
         version = "20150708.1757";
         src = fetchFromGitHub {
@@ -46581,10 +58310,10 @@
           rev = "edb361c7b0e5de231e5334a17b90652fb1df78f9";
           sha256 = "1rascpmv17dksyn9y0llmjb8r4484x5ax54w6r83k1x7ha1iacx5";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/90c03167b5fb4f4edc8a76240b3668203261bc58/recipes/metascript-mode";
           sha256 = "1kgs4ki0s6bxx2ri6zxmsy2b2w56gnr9hjkr6302wcmp3qy7clwn";
-          name = "metascript-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -46592,8 +58321,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    metaweblog = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, xml-rpc }:
-    melpaBuild {
+    metaweblog = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild
+                              , xml-rpc }:
+      melpaBuild {
         pname = "metaweblog";
         version = "20171216.1840";
         src = fetchFromGitHub {
@@ -46602,10 +58335,10 @@
           rev = "aa14380eb7e7b879a0c16c96866b20a987cd3f2a";
           sha256 = "146w9laysdqbikpzr2gc9vnjrdsa87d8i13f2swlh1kvq2dn3rz5";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/metaweblog";
           sha256 = "10kwqnfafby4ap0572mfkkdssr13y9p2gl9z3nmxqjjy04fkfi8b";
-          name = "metaweblog";
+          name = "recipe";
         };
         packageRequires = [ xml-rpc ];
         meta = {
@@ -46613,20 +58346,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    mew = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    mew = callPackage ({ fetchFromGitHub
+                       , fetchurl
+                       , lib
+                       , melpaBuild }:
+      melpaBuild {
         pname = "mew";
-        version = "20180329.2022";
+        version = "20180709.1817";
         src = fetchFromGitHub {
           owner = "kazu-yamamoto";
           repo = "Mew";
-          rev = "abe7f589adc5eef0d53e1eeaba9ab28d01c91231";
-          sha256 = "1bn78w2mslsh02m6rzrqdm70cfgx1kgw10ifnrcslc1vn6lwvd0z";
+          rev = "d4eac40c09ef349e09f0169bc2725d050dc8c7ad";
+          sha256 = "03k2nw8v9xzani2sk37x4abbmljm5h2ixxpczhv8njpqfmy8rm8x";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/362dfc4d0fdb3e5cb39564160de62c3440ce182e/recipes/mew";
           sha256 = "0423xxn3cw6jmsd7vrw30hx9phga5chxzi6x7cvpswg1mhcyn9fk";
-          name = "mew";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -46634,8 +58370,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    mexican-holidays = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    mexican-holidays = callPackage ({ fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "mexican-holidays";
         version = "20160109.1342";
         src = fetchFromGitHub {
@@ -46644,10 +58383,10 @@
           rev = "43ced1f9e40a04be6927d1a1be64060f9be4f5c5";
           sha256 = "0bhllmyk1r9y63jw5gx10v09791w33lc54qs31gcxbnss094l6py";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/17cf468b17eead32f38e0386e8ec60ecfe11b767/recipes/mexican-holidays";
           sha256 = "0awf4vv6mbp1xr92nsgdn513g4adqhp21k12q4fbm85b2l3jlspb";
-          name = "mexican-holidays";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -46655,20 +58394,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    mgmtconfig-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    mgmtconfig-mode = callPackage ({ emacs
+                                   , fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "mgmtconfig-mode";
         version = "20180222.1257";
         src = fetchFromGitHub {
           owner = "purpleidea";
           repo = "mgmt";
-          rev = "754480a9b6f2d62093fb7a264a5c4ac42fc57997";
-          sha256 = "1z7gaij17yxk3ikxljlb54cvdcz0lhnm8wl0bpzpiycpnfkqxcy4";
+          rev = "f01eea33e9b396f1e7501944216271d0d9b8df6f";
+          sha256 = "19grypbx6kxgdlqnj1h7rz2clvrwk98z5sk9dar0077ncp2k1f80";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4cf3dd70ae73c2b049e201a3547bbeb9bb117983/recipes/mgmtconfig-mode";
           sha256 = "0bdjaqfk68av4lfc4cpacrl2mxvimplfkbadi9l6wb65vlqz6sil";
-          name = "mgmtconfig-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -46676,20 +58419,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    mhc = callPackage ({ calfw, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    mhc = callPackage ({ calfw
+                       , fetchFromGitHub
+                       , fetchurl
+                       , lib
+                       , melpaBuild }:
+      melpaBuild {
         pname = "mhc";
-        version = "20180314.3";
+        version = "20180519.2027";
         src = fetchFromGitHub {
           owner = "yoshinari-nomura";
           repo = "mhc";
-          rev = "f7bce7f5504093737071e2fc79ae6bc95dd37af5";
-          sha256 = "0sash77j2k1gpi35miyaf96g0zfx3d5hjqag8vcwc692lx1sf06c";
+          rev = "63031a79b5ad759c6e4e2c30288dce1caa12f7e5";
+          sha256 = "0g4na6zwpj0p94v5fv1yca57i2hmx1lg5p6ps22qj58jrxffvnms";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d8d3efa0fcd6cd4af94bc99b35614ef6402cbdba/recipes/mhc";
           sha256 = "02ikn9hx0kcfc2xrx4f38zpkfi6vgz7chcxk6q5d0vcsp93b4lql";
-          name = "mhc";
+          name = "recipe";
         };
         packageRequires = [ calfw ];
         meta = {
@@ -46697,8 +58444,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    mic-paren = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    mic-paren = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "mic-paren";
         version = "20170731.1207";
         src = fetchFromGitHub {
@@ -46707,10 +58457,10 @@
           rev = "d0410c7d805c9aaf51a1bcefaaef092bed5824c4";
           sha256 = "0f24ibzgra94bwal8b0dpjxa11n42gkmanqswfnjhlvx052v9dxr";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6f0e54eac31fbbce9a778fb654f07e11aaaa46ca/recipes/mic-paren";
           sha256 = "17j0b8jyr0zx6zds2dz5fzvarm2wh8l5hxds2s90kh5z0kk23r07";
-          name = "mic-paren";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -46718,20 +58468,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    micgoline = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, powerline }:
-    melpaBuild {
+    micgoline = callPackage ({ emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild
+                             , powerline }:
+      melpaBuild {
         pname = "micgoline";
         version = "20160414.2026";
         src = fetchFromGitHub {
           owner = "yzprofile";
           repo = "micgoline";
-          rev = "837504263bb1711203b0f7efecd6b7b5f272fae0";
-          sha256 = "0r6l6iqn5z9wp4w58flnls7kk6300qlxyy04fw0np00nvwsy4qvp";
+          rev = "e3e2effe4846175a3b52b4092c0c134ced5978d8";
+          sha256 = "1cmpvg4x812hsl764zaq96y8jvjp99nljp552bbx52lbbnb1w5nr";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2219768cf62b52bcbe73cec291eb74c3fedcc862/recipes/micgoline";
           sha256 = "0xixcy006my2s0wn0isiag0b4rm38kswa5m0xnhg5n30qjjfzf4i";
-          name = "micgoline";
+          name = "recipe";
         };
         packageRequires = [ emacs powerline ];
         meta = {
@@ -46739,8 +58494,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    midje-mode = callPackage ({ cider, clojure-mode, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    midje-mode = callPackage ({ cider
+                              , clojure-mode
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "midje-mode";
         version = "20170808.2103";
         src = fetchFromGitHub {
@@ -46749,10 +58509,10 @@
           rev = "10ad5b6084cd03d5cd268b486a7c3c246d85535f";
           sha256 = "0nag9ks7qbg40h9z954v42x8zi65wbgfhviwvxvb2bmbzv4m4pbs";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/midje-mode";
           sha256 = "16g57mwkm3ypnyqniy1lj9nfn5wj7cyndb5fhl3fym773ywn6hip";
-          name = "midje-mode";
+          name = "recipe";
         };
         packageRequires = [ cider clojure-mode ];
         meta = {
@@ -46760,8 +58520,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    migemo = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    migemo = callPackage ({ cl-lib ? null
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "migemo";
         version = "20160924.741";
         src = fetchFromGitHub {
@@ -46770,10 +58534,10 @@
           rev = "e4744efae1b2fdea2bbd2ceaff0f6ea0bb739f5a";
           sha256 = "12p50kg2h78qi8892jj4g3wa4fjm7gjiqf6qw52zyx3kvgwxgxwa";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2424b0328a0198a03359455abdb3024a8067c857/recipes/migemo";
           sha256 = "0y49imdwygv5zd7cyh9ngda4gyb2mld2a4s7zh4yzlh7z5ha9qkr";
-          name = "migemo";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -46781,8 +58545,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    milkode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    milkode = callPackage ({ fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "milkode";
         version = "20140926.2229";
         src = fetchFromGitHub {
@@ -46791,10 +58558,10 @@
           rev = "ba97e2aeefa1d9d0b3835bf08edd0de248b0c513";
           sha256 = "1qg64mxsm2cswk52mlj7sx7k6gfnrsdwnf68i7cachri0i8aq4ap";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/29fffbec2d3067c046c456602779af8c04bf898f/recipes/milkode";
           sha256 = "07v6xgalx7vcw5sghckwvz584746cba05ql8flv8n556glm7hibh";
-          name = "milkode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -46802,8 +58569,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    minesweeper = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    minesweeper = callPackage ({ fetchhg
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "minesweeper";
         version = "20150413.2222";
         src = fetchhg {
@@ -46811,10 +58581,10 @@
           rev = "d29af12fc611";
           sha256 = "1b2kn4c90hl07lzdg10wamd4lq8f24wmaj4zvr728pwyga99b2av";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/minesweeper";
           sha256 = "1n6r3a3rl09pv4jvb7ald1gaipqylfchggza973qv9rgh5g90nag";
-          name = "minesweeper";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -46822,20 +58592,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    mingus = callPackage ({ fetchFromGitHub, fetchurl, lib, libmpdee, melpaBuild }:
-    melpaBuild {
+    mingus = callPackage ({ fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , libmpdee
+                          , melpaBuild }:
+      melpaBuild {
         pname = "mingus";
-        version = "20171124.238";
+        version = "20180712.2336";
         src = fetchFromGitHub {
           owner = "pft";
           repo = "mingus";
-          rev = "93827f564145a598838d3c3232202a60d681bd49";
-          sha256 = "09aj6h2zfww95h9ym5pw2p6p7hz57l7zlx4v492ga2vkcsjis7gy";
+          rev = "686d383f48b196c916c5fcb6ddc3bcff8a0c4b14";
+          sha256 = "0vv6aqalbpshr0fadh248lirqa6a0dcixccby2kbvdsf79s7xzx8";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6699927f1ded5c97f2ce1861f8e54a5453264cca/recipes/mingus";
           sha256 = "0vw09qk56l792706vvp465f40shf678mcmdh7iw8wsjix4401bzi";
-          name = "mingus";
+          name = "recipe";
         };
         packageRequires = [ libmpdee ];
         meta = {
@@ -46843,8 +58617,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    mini-header-line = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    mini-header-line = callPackage ({ emacs
+                                    , fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "mini-header-line";
         version = "20170621.521";
         src = fetchFromGitHub {
@@ -46853,10 +58631,10 @@
           rev = "73b6724e0a26c4528d93768191c8aa59e6bce2e5";
           sha256 = "187xynmpgkx498an246ywrqdhyyp2ag1l7yxnm0x0rbfgw67q5j1";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/122db5436ff9061713c0d3d8f44c47494067843e/recipes/mini-header-line";
           sha256 = "1yg8i7gsmiv8zwl1wqvgrh2xl2hm5nn3q11rz4hpyxw26355i817";
-          name = "mini-header-line";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -46864,8 +58642,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    minibuf-isearch = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    minibuf-isearch = callPackage ({ fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "minibuf-isearch";
         version = "20151226.1143";
         src = fetchFromGitHub {
@@ -46874,10 +58655,10 @@
           rev = "2846c6ac369ee623dad4cd3c8a7a6d9078965516";
           sha256 = "1n4b039448826w2jcsv4r2iw3v2vlrsxw8dbci8wcfigmkbfc879";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ebfd2f3f6a2dbd251c321738a4efaacc2200164b/recipes/minibuf-isearch";
           sha256 = "0n36d152lc53zj9jy38b0c7hlww0z6hx94y3x2njy6cmh3p5g8nh";
-          name = "minibuf-isearch";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -46885,8 +58666,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    minibuffer-complete-cycle = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    minibuffer-complete-cycle = callPackage ({ fetchFromGitHub
+                                             , fetchurl
+                                             , lib
+                                             , melpaBuild }:
+      melpaBuild {
         pname = "minibuffer-complete-cycle";
         version = "20130813.945";
         src = fetchFromGitHub {
@@ -46895,10 +58679,10 @@
           rev = "3df80135887d0169e02294a948711f6dfeca4a6f";
           sha256 = "1zyb6c3xwdzk7dpn7xi0mvbcjdfxvzz1a0zlbs053pfar8iim5fk";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/afac2cf41fe57efa8d313fdbab0b0b795ec144e4/recipes/minibuffer-complete-cycle";
           sha256 = "0y1mxs6q9a8lzprrlb22qff6x5mvkw4gp2l6p2js2r0j9jzyffq2";
-          name = "minibuffer-complete-cycle";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -46906,8 +58690,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    minibuffer-cua = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    minibuffer-cua = callPackage ({ fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "minibuffer-cua";
         version = "20130906.434";
         src = fetchFromGitHub {
@@ -46916,10 +58703,10 @@
           rev = "adc4979a64f8b36e05960e9afa0746dfa9e2e4c7";
           sha256 = "011kg76zr4hfhi2gngnc7jlmp0l0nvhmlgyc0y9bir2jbjf4yyvz";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f3b0f1f260b02c14da4d584b6af08b2fa3adf39c/recipes/minibuffer-cua";
           sha256 = "1ragvr73ykbvpgynnq3z0z4yzrlfhfqlwc1vbxclb8x2xmxq7pzw";
-          name = "minibuffer-cua";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -46927,8 +58714,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    miniedit = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    miniedit = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "miniedit";
         version = "20100419.1045";
         src = fetchFromGitHub {
@@ -46937,10 +58727,10 @@
           rev = "e12bf659c3eb92dd8a4cb77642dc0865c54667a3";
           sha256 = "1850z96gly0jnr50472idqz1drzqarr0n23bbasslrc501xkg0bq";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5f2a50f62475639af011c99c6cc38928b74b3b0a/recipes/miniedit";
           sha256 = "10s407q7igdi2hsaaahbw8vckalrl7z3s6l9cflf51q16xh2ih87";
-          name = "miniedit";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -46948,20 +58738,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    minimal-session-saver = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    minimal-session-saver = callPackage ({ fetchFromGitHub
+                                         , fetchurl
+                                         , lib
+                                         , melpaBuild }:
+      melpaBuild {
         pname = "minimal-session-saver";
         version = "20140508.1341";
         src = fetchFromGitHub {
           owner = "rolandwalker";
           repo = "minimal-session-saver";
-          rev = "cf654ac549850746dc21091746e4bcc1aef7668e";
-          sha256 = "1sj5sq932w079y3vy55q5b6wybwrzz30y092iq1mpfg5xvl42sbm";
+          rev = "ac42b6835f777a8a7e04599d8f20ec650997ba96";
+          sha256 = "0n2drkqnd02d7n5f4qlxlzlh4gkdi33w4hprndpw15gyny2i8x29";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c9db386ab3910940addae6e925b2ac17e64e0f87/recipes/minimal-session-saver";
           sha256 = "1ay7wvriga28bdmarpfwagqzmmk93ri9f3idhr6z6iivwggwyy2i";
-          name = "minimal-session-saver";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -46969,8 +58762,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    minimal-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    minimal-theme = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "minimal-theme";
         version = "20160608.322";
         src = fetchFromGitHub {
@@ -46979,10 +58775,10 @@
           rev = "430e0d3fc2044c16aa9f10961841febbd60df285";
           sha256 = "1rmcvdydgwppma1v2yajz6yzhns8bh3gdb09338jlk0nkp1akpfj";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6f26b8281f9bd05e3c8f2ef21838275711e622c9/recipes/minimal-theme";
           sha256 = "01dar95l7wjjqhbsknvsfbpvv41ka7iqd1fssckz18lgfqpb54bs";
-          name = "minimal-theme";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -46990,20 +58786,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    minions = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    minions = callPackage ({ dash
+                           , emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "minions";
-        version = "20180321.749";
+        version = "20180709.1012";
         src = fetchFromGitHub {
           owner = "tarsius";
           repo = "minions";
-          rev = "acac7fb0b04ffdf243775231690956d163474177";
-          sha256 = "1065asbg1h2chd34cbja2pir93r5y8gp3wv3jv6sf5csa6yqk6c7";
+          rev = "2f5e73e15d0021e7ba26cf09f1cd2734b018fb69";
+          sha256 = "12acfjmk6n40k5mb2hy1izbk483y83bc3d54r76l750sbm3kpdar";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/769a2167d7f6dfdbbfda058ddea036f80b97d230/recipes/minions";
           sha256 = "0ximlj93yp6646bh99r2vnayk15ky26sibrmrqqysfw1pzs4a940";
-          name = "minions";
+          name = "recipe";
         };
         packageRequires = [ dash emacs ];
         meta = {
@@ -47011,20 +58812,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    minitest = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    minitest = callPackage ({ dash
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "minitest";
         version = "20160628.1120";
         src = fetchFromGitHub {
           owner = "arthurnn";
           repo = "minitest-emacs";
-          rev = "1aadb7865c1dc69c201cecee275751ecec33a182";
-          sha256 = "1l18zqpdzbnqj2qawq8hj7z7pl8hr8z9d8ihy8jaiqma915hmhj1";
+          rev = "2997ba81456f2a0f3e25b6555b491586865ebb61";
+          sha256 = "10f1caszcas39g8kz0hfx1gq1jbpcnb5wwd1c262l9lwvla85nyl";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/41b2e55c0fe48267dc4f55924c782c6f934d8ca4/recipes/minitest";
           sha256 = "0x6nd4kkhiw8hh79r69861pf41j8p1y39kzf2rl61zlmyjz9zpmw";
-          name = "minitest";
+          name = "recipe";
         };
         packageRequires = [ dash ];
         meta = {
@@ -47032,8 +58837,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    minizinc-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    minizinc-mode = callPackage ({ emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "minizinc-mode";
         version = "20180201.650";
         src = fetchFromGitHub {
@@ -47042,10 +58851,10 @@
           rev = "2512521ba7f8e263a06db88df663fc6b3cca7e16";
           sha256 = "1yrawvvn3ndzzrllh408v4a5n0y0n5p1jczdm9r8pbxqgyknbk1n";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fc86b4ba54fca6f1ebf1ae3557fe564e05c1e382/recipes/minizinc-mode";
           sha256 = "1blb6mbyqvmdvwp477p1ggs3n6rzi9sdfvi0v1wfzmd7k749b10c";
-          name = "minizinc-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -47053,20 +58862,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    minor-mode-hack = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    minor-mode-hack = callPackage ({ fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "minor-mode-hack";
         version = "20170925.1734";
         src = fetchFromGitHub {
           owner = "rubikitch";
           repo = "minor-mode-hack";
-          rev = "9688994e23ccb2de568225ef125b41c46e5667c3";
-          sha256 = "0f6kafr7zqgdlw914bxh2390a1bjz5zy3h30yrfpavz283ycvrrw";
+          rev = "c3aa957602c924c01fe07d48d191b8616fb3696a";
+          sha256 = "0lmcf7mv2sk33ajngxasc7kmf5qf17fccijllm3yr0lqdnxbx0pa";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ad10a684b4b2f01bc65883374f36fef156ff55d2/recipes/minor-mode-hack";
           sha256 = "07ga48xvbi641i053bykv9v4wxhka6jhhg76b1ll24rys02az526";
-          name = "minor-mode-hack";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -47074,20 +58886,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    mip-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    mip-mode = callPackage ({ fetchFromGitLab
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "mip-mode";
         version = "20151126.2217";
-        src = fetchFromGitHub {
+        src = fetchFromGitLab {
           owner = "gaudecker";
           repo = "mip-mode";
           rev = "7c88c383b4c7ed0a4c1dc397735f365c1fcb461c";
           sha256 = "12k9ii4090dn03xvgqisl4zl4qi33054zxyfkqzzpa9wv72h4knc";
         };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/815ce14f7788edd3cf0504946bf3a25a7c7b3074/recipes/mip-mode";
-          sha256 = "1wx5zg4kimd29vqipbzm4vjphn0mldri12g6b18kc290nhgj22ar";
-          name = "mip-mode";
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/cbfefacda071c0f5ee698a4c345a2d6fea6a0d24/recipes/mip-mode";
+          sha256 = "0jr8lzs1qzp2ki7xmm5vrdc6vmzagy8zsil0217vyl89pdfmxnyr";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -47095,20 +58910,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    mips-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    mips-mode = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "mips-mode";
-        version = "20180321.211";
+        version = "20180502.757";
         src = fetchFromGitHub {
           owner = "hlissner";
           repo = "emacs-mips-mode";
-          rev = "e6c25201a3325b555e64388908d584f3f81d9e32";
-          sha256 = "0ai4ff6hinajvnp8r86s5pv0rrv8h68ncdz4k98kka1ws2f79zdf";
+          rev = "75152fc78baa762af4f83602f6cb3c8b9bcebca3";
+          sha256 = "1bk1jfqwwrq3jr6zasyjaz16rjjqbihrn7kakgfk3szv6grvsd7p";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/024a76b83efce47271bcb0ce3bde01b88349f391/recipes/mips-mode";
           sha256 = "0gg18v80lbndi2yyr5nl37mz0zpamwv9ha4clajkf0bc0vplxkj7";
-          name = "mips-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -47116,20 +58934,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    mixed-pitch = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    mixed-pitch = callPackage ({ emacs
+                               , fetchFromGitLab
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "mixed-pitch";
         version = "20180410.917";
-        src = fetchFromGitHub {
+        src = fetchFromGitLab {
           owner = "jabranham";
           repo = "mixed-pitch";
           rev = "b6b1601c7a3eb9ab23e33192bc479bccc4dd5e7b";
           sha256 = "0g3mcbsjgcwg196ygj21i454ifyf0898r0xlkar1fqdl8lckb8zj";
         };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/20e85b11dc864500d44b25e36c5e7c4c67c1ebe2/recipes/mixed-pitch";
-          sha256 = "1910x5mssxmzzdmllmbqd3ihx0x8s50qf5dx86wal7aja9rris1z";
-          name = "mixed-pitch";
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/7d3c7af03e0bca3f834c32827cbcca29e29ef4db/recipes/mixed-pitch";
+          sha256 = "1gda4jl946qlbf8rqm0mk493kwy8yqldr21cr583l6b6gl1nb4qf";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -47137,8 +58959,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    mkdown = callPackage ({ fetchFromGitHub, fetchurl, lib, markdown-mode, melpaBuild }:
-    melpaBuild {
+    mkdown = callPackage ({ fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , markdown-mode
+                          , melpaBuild }:
+      melpaBuild {
         pname = "mkdown";
         version = "20140517.718";
         src = fetchFromGitHub {
@@ -47147,10 +58973,10 @@
           rev = "8e23de82719af6c5b53b52b3308a02b3a1fb872e";
           sha256 = "1d08i2cfn1q446nyyji0hi9vlw7bzkpxhn6653jz2k77vd2y0wmk";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/mkdown";
           sha256 = "034bwwgh0w1dwawdx2nwn4d6wj65i58aqlvi60kflijfn8l3inr3";
-          name = "mkdown";
+          name = "recipe";
         };
         packageRequires = [ markdown-mode ];
         meta = {
@@ -47158,8 +58984,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    mmm-jinja2 = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, mmm-mode }:
-    melpaBuild {
+    mmm-jinja2 = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild
+                              , mmm-mode }:
+      melpaBuild {
         pname = "mmm-jinja2";
         version = "20170313.720";
         src = fetchFromGitHub {
@@ -47168,10 +58998,10 @@
           rev = "c8cb763174fa2fb61b9a0e5e0ff8cb0210f8492f";
           sha256 = "0big2i3bg4cm14f68ncaiz2h6dk6zqiisrz4l0bv10q9kaa9q2sj";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/721b9a6f16fb8efd4d339ac7953cc07d7a234b53/recipes/mmm-jinja2";
           sha256 = "0zg4psrgikb8644x3vmsns0id71ni9fcpm591zn16b4j64llvgsi";
-          name = "mmm-jinja2";
+          name = "recipe";
         };
         packageRequires = [ mmm-mode ];
         meta = {
@@ -47179,8 +59009,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    mmm-mako = callPackage ({ fetchhg, fetchurl, lib, melpaBuild, mmm-mode }:
-    melpaBuild {
+    mmm-mako = callPackage ({ fetchhg
+                            , fetchurl
+                            , lib
+                            , melpaBuild
+                            , mmm-mode }:
+      melpaBuild {
         pname = "mmm-mako";
         version = "20121019.2351";
         src = fetchhg {
@@ -47188,10 +59022,10 @@
           rev = "5c9ff92137b5";
           sha256 = "0rpp748ym79sxccp9pyrwri14m7624zzb80srfgjfdpysrrs0jrr";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/mmm-mako";
           sha256 = "0a4af5q9wxafrid8visp30cz6073ig0c961b78vmmgqrwvvxd3kn";
-          name = "mmm-mako";
+          name = "recipe";
         };
         packageRequires = [ mmm-mode ];
         meta = {
@@ -47199,20 +59033,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    mmt = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    mmt = callPackage ({ cl-lib ? null
+                       , emacs
+                       , fetchFromGitHub
+                       , fetchurl
+                       , lib
+                       , melpaBuild }:
+      melpaBuild {
         pname = "mmt";
         version = "20171231.2219";
         src = fetchFromGitHub {
           owner = "mrkkrp";
           repo = "mmt";
-          rev = "e860009ce531ee05d2902309db5f804326596b45";
-          sha256 = "1l0jh657ndypi9n7dxac8hqc61fxp9c10li3w23c1r9pad4zisy5";
+          rev = "b8cc8d29e185c15a1e43ecc2a78e36a6d2f86b8f";
+          sha256 = "17v26116g05py2yd24a5rjlr2lbdacahglxar10k5291v9i4msdw";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d1137bb53ecd92b1a8537abcd2635602c5ab3277/recipes/mmt";
           sha256 = "0hal3qcw6x9658xpdaw6q9l2rr2z107pvg5bdzshf67p1b3lf9dq";
-          name = "mmt";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -47220,8 +59059,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    mo-git-blame = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    mo-git-blame = callPackage ({ fetchFromGitLab
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "mo-git-blame";
         version = "20160129.959";
         src = fetchFromGitLab {
@@ -47230,10 +59072,10 @@
           rev = "254a675eb794cdbbdef9fa2b4b7bb510b70089c0";
           sha256 = "1dh92hzpicfvrlg6swrw4igwb771xbsmsf7hxp1a4iry4w8dk398";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a784f931849ca836557390999b179ef9f6e775f3/recipes/mo-git-blame";
           sha256 = "14ngwwgzrnnysq1k1k681b5i06ad8r3phhgpvn5alp2fj3il03l3";
-          name = "mo-git-blame";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -47241,20 +59083,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    mo-vi-ment-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    mo-vi-ment-mode = callPackage ({ fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "mo-vi-ment-mode";
         version = "20131028.2333";
         src = fetchFromGitHub {
           owner = "AjayMT";
           repo = "mo-vi-ment";
-          rev = "f45b014261f8fab19254920bd1d92f3a83263411";
-          sha256 = "0k0scl9z35d8x4ikxm2db1frpbx151p2m181fa1armxbd9lbfvnn";
+          rev = "6386db71640ed9415bbfa5f42296335f5da7d454";
+          sha256 = "0rkjkr5ak75s2h8293ifgvq063xb1lsf0z0679bmvymq6li8gz6h";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/85487df36bab0a4d2ea034dbe01c8f095a7efddc/recipes/mo-vi-ment-mode";
           sha256 = "1pg889mgpv0waccm135mlvag7q13gzfkzchv2532jngwrn6amqc7";
-          name = "mo-vi-ment-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -47262,8 +59107,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    mobdebug-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, lua-mode, melpaBuild }:
-    melpaBuild {
+    mobdebug-mode = callPackage ({ emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , lua-mode
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "mobdebug-mode";
         version = "20140109.1946";
         src = fetchFromGitHub {
@@ -47272,10 +59122,10 @@
           rev = "e1d483bc4e341c762bc5c0a8c52306a8d01ea0da";
           sha256 = "04hbd7mv29v3fv4ld0b3skrir0wp9dix2n5nbqp63fj6n5i4cyyz";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/25a48680d9f0d2b86ee64cc2415626a5283136a8/recipes/mobdebug-mode";
           sha256 = "19k0c7igqsqvib6hx0nssig4l5f959dlr4wijd1hp5h1hmcb5vv8";
-          name = "mobdebug-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs lua-mode ];
         meta = {
@@ -47283,8 +59133,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    mocha = callPackage ({ f, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild }:
-    melpaBuild {
+    mocha = callPackage ({ f
+                         , fetchFromGitHub
+                         , fetchurl
+                         , js2-mode
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "mocha";
         version = "20180321.1622";
         src = fetchFromGitHub {
@@ -47293,10 +59148,10 @@
           rev = "33e1b521a8a8d0225df353b51f1e8a4588ee32d0";
           sha256 = "1ln6wz452sfxy7ii211ha9p0n3pygxyzyk0raczfla3ln8dh989q";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/39c26134ba95f277a4e9400e506433d96a695aa4/recipes/mocha";
           sha256 = "0kjgrl5iy7cd3b9csgpjg3y0wp0q6c7c8cvf0mx8gdbsj7296kyx";
-          name = "mocha";
+          name = "recipe";
         };
         packageRequires = [ f js2-mode ];
         meta = {
@@ -47304,8 +59159,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    mocha-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
-    melpaBuild {
+    mocha-snippets = callPackage ({ fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild
+                                  , yasnippet }:
+      melpaBuild {
         pname = "mocha-snippets";
         version = "20170103.2127";
         src = fetchFromGitHub {
@@ -47314,10 +59173,10 @@
           rev = "e054137bd78f0d236e983874da1f345d30a71816";
           sha256 = "0lxc5zhb03jpy48ql4mn2l35qhsdwav4dkxyqim72b7c75cy1cml";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/93c472e3d7f318373342907ca7253253ef12dab8/recipes/mocha-snippets";
           sha256 = "0dbsdk4jpzxv2sxx0nia9zhd0a0wmkz1qcqmbd15m1909ccdwxds";
-          name = "mocha-snippets";
+          name = "recipe";
         };
         packageRequires = [ yasnippet ];
         meta = {
@@ -47325,20 +59184,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    mocker = callPackage ({ eieio ? null, el-x, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    mocker = callPackage ({ eieio ? null
+                          , el-x
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "mocker";
         version = "20150916.1854";
         src = fetchFromGitHub {
           owner = "sigma";
           repo = "mocker.el";
-          rev = "6a1d7c9189bd721debd1a60707526e43a733f537";
-          sha256 = "0i96fn5ji1z78in4nr316sgfp2mc8lmxijslw3k9q1v50j91bcya";
+          rev = "55b078b53ea49e48bd1821d96f0fb86f794fdc6c";
+          sha256 = "1lav7am41v63xgavq8pr88y828jmd1cxd4prjq7jlbxm6nvrwxh2";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/16a4fe34a6f354d396c24ff13e15157510202259/recipes/mocker";
           sha256 = "1g90jp1czrrzrmn7n4linby3q4fb4gcflzv2amjv0sdimw1ln1w3";
-          name = "mocker";
+          name = "recipe";
         };
         packageRequires = [ eieio el-x ];
         meta = {
@@ -47346,20 +59210,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    modalka = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    modalka = callPackage ({ emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "modalka";
         version = "20171231.2213";
         src = fetchFromGitHub {
           owner = "mrkkrp";
           repo = "modalka";
-          rev = "297d5e66628bbd788f8673656ab5f2da29f7c40b";
-          sha256 = "1agb500fc3cmhfq423bii7mz83hwnfas5xs6c1qjv3d89v7wxp69";
+          rev = "e69ec8fa01e86cb789f7f2b27b6d5a47e1ca3069";
+          sha256 = "10yn56vamcfblilsnfqfagssr4060gr7qbpnqa2fjqv1l8fg6jrf";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fa0a02da851a603b81e183f461da55bf4c71f0e9/recipes/modalka";
           sha256 = "0bkjykvl6sw797h7j76dzn1viy598asly98gcl5wrq13n4w1md4c";
-          name = "modalka";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -47367,20 +59235,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    mode-icons = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    mode-icons = callPackage ({ cl-lib ? null
+                              , emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "mode-icons";
         version = "20170216.620";
         src = fetchFromGitHub {
           owner = "ryuslash";
           repo = "mode-icons";
-          rev = "2d47c03ee33c53d069fd64409f7212a2e1ed3f18";
-          sha256 = "1cdjrd9jap56wna89v48lc45vycd225ly1wpii31s8sbikxfna2v";
+          rev = "dd0a161272823294f2b9afb8b919fd11323ef6b4";
+          sha256 = "1d1rhqi0adac8jgz977jrnbnf9kan8cwr1fghlxb2q7p33kp1d29";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0fda2b54a0ff0b6fc3bd6d20cfcbbf63cae5380f/recipes/mode-icons";
           sha256 = "1dqcry27rz7afyvjg7345wysp6wmh8fpj32ysk5iw5i7v5scf6kf";
-          name = "mode-icons";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -47388,20 +59261,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    mode-line-bell = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    mode-line-bell = callPackage ({ fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "mode-line-bell";
         version = "20171231.1939";
         src = fetchFromGitHub {
           owner = "purcell";
           repo = "mode-line-bell";
-          rev = "dcfad0929a606af0e836d93e78be989a8ac16f87";
-          sha256 = "0vpi3x60izvwwcck6scdm4386bc67693nqwwll0mbzf8n9args4v";
+          rev = "dd5c6d85079a25015704cc1132be3dc5388bf48b";
+          sha256 = "152qaibhkiw9cij1k4m27mlsvnsvpdk113nsrf6d37czynfly6b3";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/26f19808655b0242a1e9e5e5d41f7f794542e243/recipes/mode-line-bell";
           sha256 = "1ri771hb91b7hd203f8zp83h5hcndh8ccc1y8shhqmak6a6l04wk";
-          name = "mode-line-bell";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -47409,8 +59285,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    mode-line-debug = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    mode-line-debug = callPackage ({ fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "mode-line-debug";
         version = "20180318.1525";
         src = fetchFromGitHub {
@@ -47419,10 +59298,10 @@
           rev = "a0fcc394b07d2414bd6f722da10f1c7567333f6b";
           sha256 = "04vsb0lniy90bhnqb590dap9y4wac64xz0lc2rlfczic0nrqd1aa";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b0080ab9ef1eca5dd19b3fd9af536d8aa17773a2/recipes/mode-line-debug";
           sha256 = "0ppj14bm3rx3xgg4mfxa5zcm2r129jgmsx817wq3h7akjngcbfkd";
-          name = "mode-line-debug";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -47430,8 +59309,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    modern-cpp-font-lock = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    modern-cpp-font-lock = callPackage ({ fetchFromGitHub
+                                        , fetchurl
+                                        , lib
+                                        , melpaBuild }:
+      melpaBuild {
         pname = "modern-cpp-font-lock";
         version = "20180110.1231";
         src = fetchFromGitHub {
@@ -47440,10 +59322,10 @@
           rev = "9b10e1831bac34685be89e32e83ed969c4bac683";
           sha256 = "0csaky9k24hd3qjhb3kyraycvlsdkjhmw6bbd36z0q0ac56sd2sg";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4bfc2386049adfe7a8e20da9b69fb73d6cb71387/recipes/modern-cpp-font-lock";
           sha256 = "0h43icb5rqbkc5699kdy2mrjs5448phl18jch45ylp2wy2r8c2qj";
-          name = "modern-cpp-font-lock";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -47451,8 +59333,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    modtime-skip-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    modtime-skip-mode = callPackage ({ fetchFromGitHub
+                                     , fetchurl
+                                     , lib
+                                     , melpaBuild }:
+      melpaBuild {
         pname = "modtime-skip-mode";
         version = "20140128.1401";
         src = fetchFromGitHub {
@@ -47461,10 +59346,10 @@
           rev = "c0e49523aa26b2263a8693691ac775988015f592";
           sha256 = "0ri841cwx2mx8ri50lhvifmxnysdc022421mlmklql0252kn775l";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/486a675ca4898f99133bc18202e123fb58af54c0/recipes/modtime-skip-mode";
           sha256 = "1drafwf4kqp83jp47j2ddl2n4a92zf1589fnp6c72hmjqcxv3l28";
-          name = "modtime-skip-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -47472,20 +59357,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    moe-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    moe-theme = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "moe-theme";
-        version = "20180314.2108";
+        version = "20180616.1900";
         src = fetchFromGitHub {
           owner = "kuanyui";
           repo = "moe-theme.el";
-          rev = "c3ec67b02d55b5072ef4d32ff412019e5940d988";
-          sha256 = "1kjyv8mypcpqhhrmbnzjfrf4i40zws9sysaar8f7i08cr79idjj1";
+          rev = "ee6d7a1c84ac7a11fcc82dfc3b174eee1c8461fa";
+          sha256 = "1g0hzivvqxijbmnnw8ivdlr1z90brnfp555hg6h7hhsh0b6v0arl";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4efefd7edacf90620436ad4ef9ceb470618a8018/recipes/moe-theme";
           sha256 = "1nqvj8spvffgjvqlf25rcm3dc6w1axb6qlwwsjhq401a6xhw67f6";
-          name = "moe-theme";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -47493,19 +59381,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    molecule = callPackage ({ emacs, fetchgit, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    molecule = callPackage ({ emacs
+                            , fetchgit
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "molecule";
-        version = "20180120.1514";
+        version = "20180527.43";
         src = fetchgit {
           url = "https://git.daemons.it/drymer/molecule.el/";
-          rev = "f3a1b19d2e0312bbb9ada00146994df84576abd2";
-          sha256 = "0didxv3v3qnn3szxfnm1cmgpx0bhmjccdja3fhbhhdmp948904cy";
+          rev = "2ef72b81d9aa24ea782b71a061a3abdad6cae162";
+          sha256 = "0fn16jlpdfy35mz0n27bzdiwgvv8l9nfxf8j4pypgpqarnxzpsgc";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7421b67dc51abf13bb028e467bb4c83f857a342e/recipes/molecule";
           sha256 = "0kdwmn4gb382igy979y7x2fdqcnfxlb4dvqvm6w7ghs564grzgj4";
-          name = "molecule";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -47513,8 +59405,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    molokai-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    molokai-theme = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "molokai-theme";
         version = "20151016.845";
         src = fetchFromGitHub {
@@ -47523,10 +59418,10 @@
           rev = "04a44f21184b6a26caae4f2c92db9019d883309c";
           sha256 = "1hqa59pdrnwfykyl58lr8pfbh2f13sygvmrh707hbwc2aii0jjv2";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b1fdc89f0c52231f238096a1d42c2c330cb50d2c/recipes/molokai-theme";
           sha256 = "0srdh3yx7j6xs7rgpzmsyzz6ds00kq887rs2sfa0nvk0j0ga6baf";
-          name = "molokai-theme";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -47534,8 +59429,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    mongo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    mongo = callPackage ({ fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "mongo";
         version = "20150315.519";
         src = fetchFromGitHub {
@@ -47544,10 +59442,10 @@
           rev = "595529ddd70ecb9fab8b11daad2c3929941099d6";
           sha256 = "0z8mcfhj425hb91fkj1pyg3apw1kf4mgy8lx6n1sc8zmib38py0x";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/mongo";
           sha256 = "0jb5m611m7w26wgfwijgy0dn65s7p1y6fdcfpfgpxa7j5vrcxasc";
-          name = "mongo";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -47555,8 +59453,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    monitor = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    monitor = callPackage ({ dash
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "monitor";
         version = "20161018.444";
         src = fetchFromGitHub {
@@ -47565,10 +59467,10 @@
           rev = "63f4643a0ee81616dbb692b8b03bae21df2283e2";
           sha256 = "1hl7nzxvjwv9kknyjikkbxw1gbi5kx4hkkq7sw6jnj06192n93yg";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b9df614e8e7b9dfdbd7eec552a2b13e0f5acfc22/recipes/monitor";
           sha256 = "11n4nv6vkjw434yrwqjw20229m2sxqxxdp7sg99gzrd5gjyab643";
-          name = "monitor";
+          name = "recipe";
         };
         packageRequires = [ dash ];
         meta = {
@@ -47576,20 +59478,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    monky = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    monky = callPackage ({ fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "monky";
-        version = "20170224.921";
+        version = "20180627.831";
         src = fetchFromGitHub {
           owner = "ananthakumaran";
           repo = "monky";
-          rev = "62fc907cb541aef1c253d6bcd60447156e6f064c";
-          sha256 = "1qxykx8ccm4k95ncnzy8pspqgmz29pvqha5dg8al4zq20bms98s5";
+          rev = "141e8a8098d94039cdce8900469866b307cee5bf";
+          sha256 = "0zpmbbifb8mapagzwmhni4hdf3zcv93lav60i0rnk7vq20h66ps2";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9b33d35e3004f3cc8a5c17aa1ee07dd21d2d46dc/recipes/monky";
           sha256 = "1m7hy3ijwgxqjk3vjvqkxqj8b5bqnd201bmf302k45n0dpjmhshz";
-          name = "monky";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -47597,20 +59502,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    monochrome-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    monochrome-theme = callPackage ({ fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "monochrome-theme";
         version = "20140326.350";
         src = fetchFromGitHub {
           owner = "fxn";
           repo = "monochrome-theme.el";
-          rev = "bfca67fe7365310bc47ae9ca96c417caada54896";
-          sha256 = "0jvsss38rgry37dnshxbqxcj7qh1q6iyza58kix47h5wbnrpvszn";
+          rev = "9cf993670c9e8d198f41d840216e13280585b3e1";
+          sha256 = "0x6k0lxhp6y32ws54fgb71j3vfkn864iswhxs0ygg7n1nrkz1ipq";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d00b78ead693e844e35c760fe2c39b8ed6cb0d81/recipes/monochrome-theme";
           sha256 = "0cq2clliwcwnn1spz1w6y5qw1lgqznw212rcc4q6f1kslq0jyk5x";
-          name = "monochrome-theme";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -47618,8 +59526,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    monokai-alt-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    monokai-alt-theme = callPackage ({ emacs
+                                     , fetchFromGitHub
+                                     , fetchurl
+                                     , lib
+                                     , melpaBuild }:
+      melpaBuild {
         pname = "monokai-alt-theme";
         version = "20170630.1348";
         src = fetchFromGitHub {
@@ -47628,10 +59540,10 @@
           rev = "f342b6afc31f929be0626eca2d696ee9fab78011";
           sha256 = "1lgsqrwf21b0rh4x8nmj08a46ld7dkq4jhwxi1fi7a9xhmi2yd4i";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6ff05515c2f3bd80cb8d7de9afc8fd983e62ad91/recipes/monokai-alt-theme";
           sha256 = "135bli9vhgl898526q6znjvck356bja1ylsfi95d9445jd136c4v";
-          name = "monokai-alt-theme";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -47639,8 +59551,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    monokai-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    monokai-theme = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "monokai-theme";
         version = "20180402.221";
         src = fetchFromGitHub {
@@ -47649,10 +59564,10 @@
           rev = "1143c072f5153ae1a69807e5e8af163069b947d2";
           sha256 = "0dy8c3349j7fmp8052hbgvk0b7ldlv5jqpg0paq1i0hlypivd30i";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2bc9ce95a02fc4bcf7bc7547849c1c15d6db5089/recipes/monokai-theme";
           sha256 = "13mv4vgsmdbf3v748lqi7b42hvr3yp86n97rb6792bcgd3kbdx7a";
-          name = "monokai-theme";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -47660,8 +59575,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    monotropic-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    monotropic-theme = callPackage ({ emacs
+                                    , fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "monotropic-theme";
         version = "20180218.357";
         src = fetchFromGitHub {
@@ -47670,10 +59589,10 @@
           rev = "b46e94a712e01cebe69a6f7d950e91d7c7dd1b66";
           sha256 = "0lmyfqi6c5f2cr9ha1l2qnc4ayigb1zj9gz8xi5xxadhad3zymwh";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/38222d109ece0030b0bfafb242aa100694b2bfcf/recipes/monotropic-theme";
           sha256 = "129yqjh4gaab1kjijzkzbw50alzdiwmpv9cl3lsy04m8zk02shl8";
-          name = "monotropic-theme";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -47681,20 +59600,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    monroe = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    monroe = callPackage ({ fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "monroe";
-        version = "20180116.817";
+        version = "20180703.1046";
         src = fetchFromGitHub {
           owner = "sanel";
           repo = "monroe";
-          rev = "609dfd82897c14324a99206ebf450377e5c6257e";
-          sha256 = "07qyxc7mjly0j2x7aqbpnn7nd5fp2pck02ks25m62gn4a1sq4v3z";
+          rev = "36fd5b250de51f8bfa62bbe6ce35e8690e0ad120";
+          sha256 = "1aw823a5llv196rzqhqvh7bk2npwzy1fgaj24xv0x2g5fk9n85hv";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/590e5e784c5a1c12a241d90c9a0794d2737a61ef/recipes/monroe";
           sha256 = "04rhninxppvilk7s90g0wwa0g9vfcg7mk8mrb2m2c7cb9vj6wyig";
-          name = "monroe";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -47702,8 +59624,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    moody = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    moody = callPackage ({ emacs
+                         , fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "moody";
         version = "20180403.549";
         src = fetchFromGitHub {
@@ -47712,10 +59638,10 @@
           rev = "adf652f35cba1bb3d0f254e1905e2deeeb0fbdba";
           sha256 = "1zspq29n60r0kd9fy7d50zdypljigwcjb0qa5gkwiipnhpcnf9bp";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/63521fe6a1e540544a07231cc94144439e8caea7/recipes/moody";
           sha256 = "095241sjw330fb5lk48aa4zx8xbzk8s4ml22n6a8bzr99nkhn5jy";
-          name = "moody";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -47723,8 +59649,38 @@
           license = lib.licenses.free;
         };
       }) {};
-    moonscript = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    moom = callPackage ({ emacs
+                        , fetchFromGitHub
+                        , fetchurl
+                        , lib
+                        , melpaBuild }:
+      melpaBuild {
+        pname = "moom";
+        version = "20180618.1245";
+        src = fetchFromGitHub {
+          owner = "takaxp";
+          repo = "moom";
+          rev = "54b50eac555c9195ad39060e31fd4aac5662b5fd";
+          sha256 = "1xxxwy67fcgll6m0wiypv3r85vg45g8f6fkhx5m52cs3w8iav7il";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/c55081230ee02346ed02e0ab19ee2302e7b9ffa7/recipes/moom";
+          sha256 = "11l4yc8fhxsrsjfksqj4cxr13jln0khhd2dn09i94n71dx7lybh1";
+          name = "recipe";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/moom";
+          license = lib.licenses.free;
+        };
+      }) {};
+    moonscript = callPackage ({ cl-lib ? null
+                              , emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "moonscript";
         version = "20170831.1526";
         src = fetchFromGitHub {
@@ -47733,10 +59689,10 @@
           rev = "56f90471e2ced2b0a177aed4d8c2f854797e9cc7";
           sha256 = "1v2phdpfngrb01x4qygpfgxdzpgvbprki2kbmpc83vlqxlmkvvjk";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3046afee95277024830d7d372f2f1c84a0adcb00/recipes/moonscript";
           sha256 = "1fi4hg5gk5zpfkrk0hqghghkzbbi33v48piq2i085i4nc6m3imp0";
-          name = "moonscript";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -47744,20 +59700,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    morganey-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    morganey-mode = callPackage ({ emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "morganey-mode";
         version = "20170118.134";
         src = fetchFromGitHub {
           owner = "morganey-lang";
           repo = "morganey-mode";
-          rev = "5cf3870432a2aeb69d373abe63b3be1f325f6d21";
-          sha256 = "04xv4v2n03axjlpm9pg3j4zjapqjb7is3anx6laa90zbw3z2iv9z";
+          rev = "7e33f1be486f58dfcf02adcbf82ccac47f69bd9b";
+          sha256 = "1ic3m71ilclrvshc6lasbb1s7ifhjp10iwy0zbjbhfy27n05g3z1";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/morganey-mode";
           sha256 = "18cbmx8lnypgxkisxa3lrh88v8l9k0q8fnai5ps8ngvfgz42rlqp";
-          name = "morganey-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -47765,20 +59725,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    morlock = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    morlock = callPackage ({ fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "morlock";
         version = "20180318.1323";
         src = fetchFromGitHub {
           owner = "tarsius";
           repo = "morlock";
-          rev = "b883d48024ddfffebe2d0dd69f5ed54c617f8834";
-          sha256 = "0xns4f39x012n7piiv6kgb45n932wxs5fp4yyq44p1mnr0m8v4y8";
+          rev = "5fd655ba3050981ab8059bcddf5b19c21f9ceea1";
+          sha256 = "0bgrqydh9bb059j6b6y86xn6qdq85y0radsi1zq20p5xmrsgivbn";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b6ef53bbc80edda12a90a8a9705fe14415972833/recipes/morlock";
           sha256 = "0693jr1k8mzd7hwp52azkl62c1g1p5yinarjcmdksfyqblqq5jna";
-          name = "morlock";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -47786,20 +59749,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    mosey = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    mosey = callPackage ({ emacs
+                         , fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "mosey";
-        version = "20161015.319";
+        version = "20180614.949";
         src = fetchFromGitHub {
           owner = "alphapapa";
           repo = "mosey.el";
-          rev = "eb0ae6ec10f1d9828a2665476f6d6811df9b0bfa";
-          sha256 = "1cpa38ay4y7cffi9h34s8lw308qggpf342hzqzgbsqy7rl9wr10k";
+          rev = "2e3ac9d334fa2937ed5267193dfd25d8e1f14dc2";
+          sha256 = "1yxy6m5igvsy37vn93ijs0b479v50vsnsyp8zi548iy2ribr0qr5";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/76a9a43eea68db9f82c07677235c481a6f243aa2/recipes/mosey";
           sha256 = "0zprzr5aqv77kmg1ki9w6fw1nc2ap6yqjl4ak05a1i9cq8g6nf3m";
-          name = "mosey";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -47807,8 +59774,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    mote-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, ruby-mode ? null }:
-    melpaBuild {
+    mote-mode = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild
+                             , ruby-mode ? null }:
+      melpaBuild {
         pname = "mote-mode";
         version = "20160122.1629";
         src = fetchFromGitHub {
@@ -47817,10 +59788,10 @@
           rev = "666c6641addbd3b337a7aa01fd2742ded2f41b83";
           sha256 = "10mf96r75558scn71pri71aa8nhp6hmnb5rwjxlh5dlf80r5dfd7";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/mote-mode";
           sha256 = "0ccsyl0wvf0nbsw57sxad7w0c0i5al5s5mjrjjq8bnfh4dyj2x0y";
-          name = "mote-mode";
+          name = "recipe";
         };
         packageRequires = [ ruby-mode ];
         meta = {
@@ -47828,8 +59799,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    motion-mode = callPackage ({ fetchFromGitHub, fetchurl, flymake-cursor, flymake-easy, lib, melpaBuild }:
-    melpaBuild {
+    motion-mode = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , flymake-cursor
+                               , flymake-easy
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "motion-mode";
         version = "20140919.1856";
         src = fetchFromGitHub {
@@ -47838,10 +59814,10 @@
           rev = "4c94180e3ecea611a61240a0c0cd48f1032c4a55";
           sha256 = "17570labnwdnwca2cg4ga0mrrm00n0h3wlxry823k5yn3k93rnj1";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c1e3a2091a73c7d725c929313290566f5ca19404/recipes/motion-mode";
           sha256 = "1lfsc8ayiz2v3dfn8c0mmfch8vpzqyddxw8kscan2lzl2lcj50h0";
-          name = "motion-mode";
+          name = "recipe";
         };
         packageRequires = [ flymake-cursor flymake-easy ];
         meta = {
@@ -47849,8 +59825,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    mouse-slider-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    mouse-slider-mode = callPackage ({ cl-lib ? null
+                                     , emacs
+                                     , fetchFromGitHub
+                                     , fetchurl
+                                     , lib
+                                     , melpaBuild }:
+      melpaBuild {
         pname = "mouse-slider-mode";
         version = "20161021.1214";
         src = fetchFromGitHub {
@@ -47859,10 +59840,10 @@
           rev = "b3c19cd231edecce76787c5a9bbe5e4046d91f88";
           sha256 = "1qkbrwicp3gaknnmfrajf1qdyhj5s0c09cx62869rp2721p8rqaw";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8fa747999bb928c3836400a43d8ab63939381673/recipes/mouse-slider-mode";
           sha256 = "0aqxjm78k7i8c59w6mw9wsfw3rail1pg40ac1dbcjkm62fjbh5hy";
-          name = "mouse-slider-mode";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -47870,20 +59851,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    move-dup = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    move-dup = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "move-dup";
-        version = "20170513.1911";
+        version = "20180531.537";
         src = fetchFromGitHub {
           owner = "wyuenho";
           repo = "move-dup";
-          rev = "dae61de7aa5e2bf56a7bab1fa36fa3a39520a3c0";
-          sha256 = "1mrrxx2slxi1qgf483nnxv3y8scfsc844sfnzn4b7hjpfpali0r8";
+          rev = "24e5b6d7222cbe2437c602f1af37d5807569961a";
+          sha256 = "0i78cv3xdchzak8xxm7xm1fw4z6ww3v402cl2rwyg4363fx00f7y";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3ea1f7f015a366192492981ff75672fc363c6c18/recipes/move-dup";
           sha256 = "0b0lmiisl9yckblwf7619if88qsmbka3bl4qiaqam7fka7psxs7f";
-          name = "move-dup";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -47891,20 +59875,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    move-text = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    move-text = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "move-text";
         version = "20170908.2030";
         src = fetchFromGitHub {
           owner = "emacsfodder";
           repo = "move-text";
-          rev = "7cbc941a9150468609010a93c429117da2523903";
-          sha256 = "1irrcbqi1m6pcsjkbd3nqri158qhl0bcynciwwxdfqb45i67a1m9";
+          rev = "daaa5c3e01d1b88f4eea8e1421acd2453c2df350";
+          sha256 = "1hm2j28vf7zh5h552wszawxsp2c4jwpc33017ld1vc9qcccp3895";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/82bfd0f41e42eed1d4c2361ec1d1685edebbac1b/recipes/move-text";
           sha256 = "04bfrkanafmbrdyw06ciw9kiyn7h3kpikxk3clx2gc04jl67hzgy";
-          name = "move-text";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -47912,20 +59899,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    mowedline = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    mowedline = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "mowedline";
         version = "20161121.1835";
         src = fetchFromGitHub {
           owner = "retroj";
           repo = "mowedline";
-          rev = "6121b7d4aacd18f7b24da226e61dbae054e50a7c";
-          sha256 = "16j3y4hffnv2rg97p49hqz3x1icp7qkpcjxhalny5l4gysx9mfqg";
+          rev = "bde4de0a4e1404127b0a48897d8cd1d1cb8a263d";
+          sha256 = "0wwl9f01b9sgs8n19a4i7h08xaf6zdljf2plbdpyy4gzi2iiqcc4";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/86f7df6b8df3398ef476c0ed31722b03f16b2fec/recipes/mowedline";
           sha256 = "0c2hvvwa7s5iyz517jaskshdcq9zs15zr6xsvrcb3biahrh4bmfb";
-          name = "mowedline";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -47933,20 +59923,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    moz = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    moz = callPackage ({ fetchFromGitHub
+                       , fetchurl
+                       , lib
+                       , melpaBuild }:
+      melpaBuild {
         pname = "moz";
         version = "20150805.1006";
         src = fetchFromGitHub {
           owner = "bard";
           repo = "mozrepl";
-          rev = "ab3e79914445039ceb62f7f2dc342358fec3492e";
-          sha256 = "1c7dsip5wmlf7x2hziwil5n3igvpnh17d7yg8lsg001y5sjl3mjv";
+          rev = "2209e126b509b9a4d0800b1c7f9623e8d2b4345b";
+          sha256 = "18b214667b4hr76dd09kbjb3acsnr9n5aik49ji1v50k78aaswvv";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6839c5e52364fb32f6d8a351e5c2f21fbd6669a1/recipes/moz";
           sha256 = "0ar2xgsi7csjj6fgiamrjwjc58j942dm32j3f3lz21yn2c4pnyxi";
-          name = "moz";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -47954,8 +59947,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    moz-controller = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, moz }:
-    melpaBuild {
+    moz-controller = callPackage ({ fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild
+                                  , moz }:
+      melpaBuild {
         pname = "moz-controller";
         version = "20151208.1806";
         src = fetchFromGitHub {
@@ -47964,10 +59961,10 @@
           rev = "46f665c03574fa922de767fc29795e0db4a7c5c6";
           sha256 = "0fssn33ld6xhjlwg1dbrjg8sa0pjmglq0dw792yrmvm4fj0zjph8";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fcc20337594a76a547f696adece121ae592c6917/recipes/moz-controller";
           sha256 = "18gca1csl9dfi9995mky8cbgi3xzf1if8pzdjiz5404gzcqk0rfd";
-          name = "moz-controller";
+          name = "recipe";
         };
         packageRequires = [ moz ];
         meta = {
@@ -47975,20 +59972,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    mozc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    mozc = callPackage ({ fetchFromGitHub
+                        , fetchurl
+                        , lib
+                        , melpaBuild }:
+      melpaBuild {
         pname = "mozc";
         version = "20180101.0";
         src = fetchFromGitHub {
           owner = "google";
           repo = "mozc";
-          rev = "afb03ddfe72dde4cf2409863a3bfea160f7a66d8";
-          sha256 = "0w2dy2j9x5nc7x3g95j17r3m60vbfyn5j617h7js9xryv33yzpgx";
+          rev = "f5ddd0e06f5d94ecc626b38797c982e8598d18e0";
+          sha256 = "03ccc2v80033av5a5gq7w90rpk851idfg28979hjq8qfzsizx7x6";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/30fef77e1d7194ee3c3c1d4775c349a4a9f6af2c/recipes/mozc";
           sha256 = "0nslh4xyqpvzdxcgrd1bzaqcdz77bghizh6n2w6wk46cflir8xba";
-          name = "mozc";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -47996,8 +59996,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    mozc-im = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, mozc }:
-    melpaBuild {
+    mozc-im = callPackage ({ fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild
+                           , mozc }:
+      melpaBuild {
         pname = "mozc-im";
         version = "20160411.1722";
         src = fetchFromGitHub {
@@ -48006,10 +60010,10 @@
           rev = "df614a1076c28a11551fb3e822868bae47e855a5";
           sha256 = "0cpcldizgyr125j7lzkl8l6jw1hc3fb12cwgkpjrl6pjpr80vb15";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4b651b7f1c15b44577b3c2b7493264ed802cf073/recipes/mozc-im";
           sha256 = "1gqzmm712npj36qfi506zgl0ycd6k7l5m46c7zz2z2lb6jpssw10";
-          name = "mozc-im";
+          name = "recipe";
         };
         packageRequires = [ mozc ];
         meta = {
@@ -48017,8 +60021,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    mozc-popup = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, mozc, popup }:
-    melpaBuild {
+    mozc-popup = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild
+                              , mozc
+                              , popup }:
+      melpaBuild {
         pname = "mozc-popup";
         version = "20150223.1634";
         src = fetchFromGitHub {
@@ -48027,10 +60036,10 @@
           rev = "f0684b875a7427ec08f8df13939a486e5d5cf420";
           sha256 = "1mbpkjc6sk7qqmgsmr5a5l2ycwnqp8bkwgikdavgs6hnal10bkmn";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/49bdcf035b9f885a689b9dc21817aecdcd09768b/recipes/mozc-popup";
           sha256 = "1n43lwflxzzyskxgzg19rg3hiqqkf5l7vfgaydryf4sk8480x687";
-          name = "mozc-popup";
+          name = "recipe";
         };
         packageRequires = [ mozc popup ];
         meta = {
@@ -48038,20 +60047,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    mozc-temp = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, mozc }:
-    melpaBuild {
+    mozc-temp = callPackage ({ dash
+                             , emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild
+                             , mozc }:
+      melpaBuild {
         pname = "mozc-temp";
         version = "20160228.40";
         src = fetchFromGitHub {
           owner = "HKey";
           repo = "mozc-temp";
-          rev = "9d6b645eff901ea79dbc43a55d5a97ead3f4bad7";
-          sha256 = "1vwciy6hcbcyid41bykibx6ii1y9ln7kdxn7cjwfjrgd3kl9wg19";
+          rev = "7f5dd5fc8ceeca9b1822f7e056a4be67e2e74959";
+          sha256 = "1gdi2pz8450h11aknz3hbgjlx09w6c4l8d8sz0zv3pb1z8cqkgqv";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e0c77275d759bf73df11fa151b4e737d7cb15adf/recipes/mozc-temp";
           sha256 = "0x1bsa1py0kn73hzbsb4ijl0bqng8nib191vgn6xq8f5cx55044d";
-          name = "mozc-temp";
+          name = "recipe";
         };
         packageRequires = [ dash emacs mozc ];
         meta = {
@@ -48059,8 +60074,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    mpages = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    mpages = callPackage ({ fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "mpages";
         version = "20150710.704";
         src = fetchFromGitHub {
@@ -48069,10 +60087,10 @@
           rev = "39a72a0931ab1cdbfdf0ab9f412dc12d43a3829f";
           sha256 = "11c8pr3s77aq34ic32lnsialwh8bw3m78kj838xl2aab2pgrlny2";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b535c2862c4fad568324466883f23ba9f39e787f/recipes/mpages";
           sha256 = "11scjjwwrpgaz6i4jq9y7m864nfak46vnbfb0w15625znz926jcs";
-          name = "mpages";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -48080,20 +60098,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    mpdel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, libmpdel, melpaBuild }:
-    melpaBuild {
+    mpdel = callPackage ({ emacs
+                         , fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , libmpdel
+                         , melpaBuild }:
+      melpaBuild {
         pname = "mpdel";
-        version = "20180405.148";
+        version = "20180606.512";
         src = fetchFromGitHub {
           owner = "mpdel";
           repo = "mpdel";
-          rev = "82f98b94d0bfcb48b8ed9985ef8bf9202c8917f7";
-          sha256 = "1fhcf1mm7pjjy9nyjr3lkqhn0xsp8bpykzk2pxdzfkidb1ca47bf";
+          rev = "a1e05828e3bc03679530b4cfff1306706171cb78";
+          sha256 = "1avfhkklhkkazy1b0ymcmc0walrs29ak36vbvaxs480r5s16dkjd";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bb25443752e18e47afc63d5497cc5052c388a607/recipes/mpdel";
           sha256 = "1py6zk16yl7pyql2qxzd770clzszw7c769hw70n963kns1qmpif8";
-          name = "mpdel";
+          name = "recipe";
         };
         packageRequires = [ emacs libmpdel ];
         meta = {
@@ -48101,8 +60124,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    mpmc-queue = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, queue }:
-    melpaBuild {
+    mpmc-queue = callPackage ({ emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild
+                              , queue }:
+      melpaBuild {
         pname = "mpmc-queue";
         version = "20180303.1229";
         src = fetchFromGitHub {
@@ -48111,10 +60139,10 @@
           rev = "df07d6bef7468edb1d73ef73b8331b94d0e5d0ca";
           sha256 = "17817l3afghg9z8jxkj61yg85plmr74ki3wf4hz685llx8fr69w0";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/30511f1e5eaf45b5f43fbacdd6c7254cb39b1d2c/recipes/mpmc-queue";
           sha256 = "08jcmhfl87nsg6zgv582yfs152bqihbcssh085gxxqn2x99li354";
-          name = "mpmc-queue";
+          name = "recipe";
         };
         packageRequires = [ emacs queue ];
         meta = {
@@ -48122,29 +60150,94 @@
           license = lib.licenses.free;
         };
       }) {};
-    mpv = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild, names, org }:
-    melpaBuild {
+    mpv = callPackage ({ cl-lib ? null
+                       , emacs
+                       , fetchFromGitHub
+                       , fetchurl
+                       , json ? null
+                       , lib
+                       , melpaBuild
+                       , org }:
+      melpaBuild {
         pname = "mpv";
-        version = "20150218.118";
+        version = "20180602.314";
         src = fetchFromGitHub {
           owner = "kljohann";
           repo = "mpv.el";
-          rev = "3021c55fa5723a806dde5fb2a630b115e2c53d06";
-          sha256 = "193j90sgn1zgl00mji86wll4djj57vk5arhwbmhhf5b1qx3wpbhm";
+          rev = "9dedf3b7c1bfd778284df7f394207ce0447ea7aa";
+          sha256 = "15z62wi47pwvkbh4qgvz06yk4cyy570pjz1276sd9frdwgd4kc19";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2392c1d1042ac6a42bbf9aa7e394c03e178829d0/recipes/mpv";
           sha256 = "1vq308ac6jj1h8qa2b2sypisb38hbvwjimqndhpfir06fghkw94l";
-          name = "mpv";
+          name = "recipe";
         };
-        packageRequires = [ cl-lib emacs json names org ];
+        packageRequires = [ cl-lib emacs json org ];
         meta = {
           homepage = "https://melpa.org/#/mpv";
           license = lib.licenses.free;
         };
       }) {};
-    msvc = callPackage ({ ac-clang, cedet ? null, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    mqr = callPackage ({ emacs
+                       , fetchFromGitHub
+                       , fetchurl
+                       , lib
+                       , melpaBuild }:
+      melpaBuild {
+        pname = "mqr";
+        version = "20180527.504";
+        src = fetchFromGitHub {
+          owner = "calancha";
+          repo = "multi-replace";
+          rev = "4ade19d4620b8b61340290bf63fa56d5e493859f";
+          sha256 = "0pkxmv0rla9f2ly9fq3i3mrsa2q8rsrs4pk6w7wpi3v5fbj1jmd6";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0023747e8173fab8e88143ee95a31540a079c6bf/recipes/mqr";
+          sha256 = "1nw713sha29q1zgsxxfrkggkrk6q8vvk9sdi1s539r8h35bc3jx0";
+          name = "recipe";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/mqr";
+          license = lib.licenses.free;
+        };
+      }) {};
+    mqtt-mode = callPackage ({ dash
+                             , emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
+        pname = "mqtt-mode";
+        version = "20180605.1031";
+        src = fetchFromGitHub {
+          owner = "andrmuel";
+          repo = "mqtt-mode";
+          rev = "36d1d4296d79e17b8f35e8e14f2708980eb502db";
+          sha256 = "1116xvwpavg7icm263s0clgxhw3qqm4aqiw4ky94w9a8ydazx51l";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/b85c84ff9523026620e5b3cf864bbc7b9f81d57a/recipes/mqtt-mode";
+          sha256 = "1zbnhd65c9wz9yr29j37c8z7vz3axpfwkzx0z8xjplp40mafpz1z";
+          name = "recipe";
+        };
+        packageRequires = [ dash emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/mqtt-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    msvc = callPackage ({ ac-clang
+                        , cedet ? null
+                        , cl-lib ? null
+                        , emacs
+                        , fetchFromGitHub
+                        , fetchurl
+                        , lib
+                        , melpaBuild }:
+      melpaBuild {
         pname = "msvc";
         version = "20171225.738";
         src = fetchFromGitHub {
@@ -48153,10 +60246,10 @@
           rev = "dfc529aa6da8b46b0a0c7db9a0e5e9bc33ab1fb3";
           sha256 = "19n9an0nznwqw3ml022i6vidqbrgxf4yff0nbvvcb91ppc1saf40";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/69939b85353a23f374cab996ede879ab315a323b/recipes/msvc";
           sha256 = "04gq2klana557qvsi3bv6416l0319jsqb6bdfs7y6729qd94hlq3";
-          name = "msvc";
+          name = "recipe";
         };
         packageRequires = [ ac-clang cedet cl-lib emacs ];
         meta = {
@@ -48164,20 +60257,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    mtg-deck-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    mtg-deck-mode = callPackage ({ emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "mtg-deck-mode";
-        version = "20180129.1637";
+        version = "20180613.1310";
         src = fetchFromGitHub {
           owner = "mattiasb";
           repo = "mtg-deck-mode";
-          rev = "4eeb1a5115d60d064dcd79b9e0dd48619cd2ee4c";
-          sha256 = "16qmqqq7297idr2x4fr22ihhx6z91484x0hpmskbh6fn05bvls2y";
+          rev = "8265b8ed17fcd4406760c19aa6ee9c76068b1ab0";
+          sha256 = "04qdcqpkic2nhqy6nf15j3zp5hmrfzs2kndvmg5v4vjac2vfmzfb";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/425fa66cffe7bfda71de4ff2b49e951456bdeae1/recipes/mtg-deck-mode";
           sha256 = "07hszf33nawhp218f90qr4s713yyjdd7zzkq0s8q0fb6aai5iiih";
-          name = "mtg-deck-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -48185,8 +60282,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    mu-cite = callPackage ({ fetchFromGitHub, fetchurl, flim, lib, melpaBuild }:
-    melpaBuild {
+    mu-cite = callPackage ({ fetchFromGitHub
+                           , fetchurl
+                           , flim
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "mu-cite";
         version = "20160130.300";
         src = fetchFromGitHub {
@@ -48195,10 +60296,10 @@
           rev = "aea3c2d01eb3284d5e0124059d368e8c6b6ffddc";
           sha256 = "1gxspy50gh7j4sysvr17fvvp8p417ww39ii5dy0fxncfwczdsa19";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a80bc6e626f4bc6edfe6560833d12d31ecfd7a51/recipes/mu-cite";
           sha256 = "0ap21sw4r2x774q2np6rhrxh2m2rf3f6ak3k71iar159chx32y6q";
-          name = "mu-cite";
+          name = "recipe";
         };
         packageRequires = [ flim ];
         meta = {
@@ -48206,8 +60307,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    mu4e-alert = callPackage ({ alert, emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, s }:
-    melpaBuild {
+    mu4e-alert = callPackage ({ alert
+                              , emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , ht
+                              , lib
+                              , melpaBuild
+                              , s }:
+      melpaBuild {
         pname = "mu4e-alert";
         version = "20180304.2246";
         src = fetchFromGitHub {
@@ -48216,10 +60324,10 @@
           rev = "96a293b28646f4620e257f24748becc4a06843cd";
           sha256 = "01rgsd958shph01ialk0lp3snxqydvjkiik170jshfls1jric1di";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/mu4e-alert";
           sha256 = "0b74ky51nx75vcrrbabr5cj2cx4yax5kgaq479hjp5yc5mq2q46r";
-          name = "mu4e-alert";
+          name = "recipe";
         };
         packageRequires = [ alert emacs ht s ];
         meta = {
@@ -48227,20 +60335,50 @@
           license = lib.licenses.free;
         };
       }) {};
-    mu4e-jump-to-list = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    mu4e-conversation = callPackage ({ emacs
+                                     , fetchFromGitLab
+                                     , fetchurl
+                                     , lib
+                                     , melpaBuild }:
+      melpaBuild {
+        pname = "mu4e-conversation";
+        version = "20180711.251";
+        src = fetchFromGitLab {
+          owner = "ambrevar";
+          repo = "mu4e-conversation";
+          rev = "6690d730aaf912b7a2f17caa1e18513c5ee3560e";
+          sha256 = "1nx9q0d1fk14hfwim456sb1gidmarislf1vlwdkp8mgh5rywxk1q";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/7638aecc7a2cd4b1646c6e32fe83e18ef212bbaa/recipes/mu4e-conversation";
+          sha256 = "16vhjaxjhshw7ch9ihk35r99549xlbmvybwjx0p9mzyqi30dn3s6";
+          name = "recipe";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/mu4e-conversation";
+          license = lib.licenses.free;
+        };
+      }) {};
+    mu4e-jump-to-list = callPackage ({ cl-lib ? null
+                                     , emacs
+                                     , fetchFromGitLab
+                                     , fetchurl
+                                     , lib
+                                     , melpaBuild }:
+      melpaBuild {
         pname = "mu4e-jump-to-list";
-        version = "20171104.1248";
-        src = fetchFromGitHub {
+        version = "20180425.1132";
+        src = fetchFromGitLab {
           owner = "wavexx";
           repo = "mu4e-jump-to-list.el";
-          rev = "2aa995ddedc7634292b459a3ea2718eea39695cf";
-          sha256 = "0l4fnnmdb5xf99klviabyqkh3ywkwvphhf8darj42ygrhbs086pd";
+          rev = "e336ffe84b55edaaf4e48040d4d9156a9f4c881e";
+          sha256 = "0ff7a64vk0kd1sl52ncwj2xf3sh0kb0yln1cmdxdz0hyfsnc8d1h";
         };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/ca51179f5584c0eac626da7cda896b247d33fcae/recipes/mu4e-jump-to-list";
-          sha256 = "1k4ic476f6xzh6f1a9jaqy0248zz2q4xjygdvrsyrp1sxjbrwxvm";
-          name = "mu4e-jump-to-list";
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/c1cf98dff029d494007fe25d29bd8bcfecc5b8e6/recipes/mu4e-jump-to-list";
+          sha256 = "0yl1vi62pjgklwa7ifvr35fciiqqc5zkrc0m4yxjiv0c0dn50b7n";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -48248,20 +60386,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    mu4e-maildirs-extension = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    mu4e-maildirs-extension = callPackage ({ dash
+                                           , fetchFromGitHub
+                                           , fetchurl
+                                           , lib
+                                           , melpaBuild }:
+      melpaBuild {
         pname = "mu4e-maildirs-extension";
-        version = "20171119.1125";
+        version = "20180606.112";
         src = fetchFromGitHub {
           owner = "agpchil";
           repo = "mu4e-maildirs-extension";
-          rev = "c3ebeedd5c12e190949aed53c3040d51d21de58f";
-          sha256 = "19a95f0sp5psq00mgnbw3azn9c3db3gafax3svih1qk1ff4yf3hp";
+          rev = "3ef4c48516be66e73d24fe764aadbcfc126b7964";
+          sha256 = "04nf947sxkir3gni67jc5djhywkmay1l8cqkicayimrh3vd5cy05";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/mu4e-maildirs-extension";
           sha256 = "0bisxm0rph5q1p3zjr7vyyr0jqr3ihs6ihiwyfr8d3dvba1zhffc";
-          name = "mu4e-maildirs-extension";
+          name = "recipe";
         };
         packageRequires = [ dash ];
         meta = {
@@ -48269,20 +60411,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    mu4e-query-fragments = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    mu4e-query-fragments = callPackage ({ emacs
+                                        , fetchFromGitLab
+                                        , fetchurl
+                                        , lib
+                                        , melpaBuild }:
+      melpaBuild {
         pname = "mu4e-query-fragments";
         version = "20170923.622";
-        src = fetchFromGitHub {
+        src = fetchFromGitLab {
           owner = "wavexx";
           repo = "mu4e-query-fragments.el";
-          rev = "34ddad4e6785f575333efcc66153d892daa1c884";
-          sha256 = "0l5i3a88j9il2y0jq2sfzwi9q3czc1wi8n9nvgdysj5db5m4xsw6";
+          rev = "5f2b195dad2d74f38ff35b93edea5dd133112012";
+          sha256 = "0frq485lghpzpzcrpw7f4vmc39nx1ph1dp0i0l8hb6h8rl1n4r7n";
         };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/21277a79a211b4d101809314bdb9963130a3d533/recipes/mu4e-query-fragments";
-          sha256 = "0h8rapfz9snvr722vr65gqa0xhgig81b2gvswjlzljwd2m98yzzn";
-          name = "mu4e-query-fragments";
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/c1cf98dff029d494007fe25d29bd8bcfecc5b8e6/recipes/mu4e-query-fragments";
+          sha256 = "1gckwfgw7jvr6dbikcmy07i07wjhlvq66swhac2laaj6w567vc7w";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -48290,20 +60436,49 @@
           license = lib.licenses.free;
         };
       }) {};
-    multi = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    muban = callPackage ({ emacs
+                         , fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
+        pname = "muban";
+        version = "20180415.519";
+        src = fetchFromGitHub {
+          owner = "jiahaowork";
+          repo = "muban.el";
+          rev = "c134c46e60be1fb3e9a08dba3d07346855e0fcc2";
+          sha256 = "1xlkzvfbzhhpmzz008ad4l9sxdvda2cxhq6grn84pcfh5g2ccn2c";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/3576c6b7d79ce6d4df40ce83400fa2468f8fbcdf/recipes/muban";
+          sha256 = "1njphxx6sgw952p7v2qkbjwa8sb2mwrxrzv35bzp0d4c84ny2sa0";
+          name = "recipe";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/muban";
+          license = lib.licenses.free;
+        };
+      }) {};
+    multi = callPackage ({ emacs
+                         , fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "multi";
         version = "20131013.844";
         src = fetchFromGitHub {
           owner = "kurisuwhyte";
           repo = "emacs-multi";
-          rev = "0987ab71692717ed457cb3984de184db9185806d";
-          sha256 = "0f5hc6mgq0hg1wwnvqd4fp7ck58lcavvgqjggz9zlhrjgkmynjxx";
+          rev = "884203b11fdac8374ec644cca975469aab263404";
+          sha256 = "11zabs7qpdhri6n90ck7pgwcbz46d813nyl73h5m1i8jvz1wzx7v";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c9fea5cf529bcdf412af2926e55b8d77edc07eca/recipes/multi";
           sha256 = "1c240d1c1g8wb2ld944344zklnv86d9rycmya4z53b2ai10642ig";
-          name = "multi";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -48311,8 +60486,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    multi-compile = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    multi-compile = callPackage ({ dash
+                                 , emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "multi-compile";
         version = "20160306.1423";
         src = fetchFromGitHub {
@@ -48321,10 +60501,10 @@
           rev = "bd0331854774e7a269ce8a7dd49580cd397c0ec2";
           sha256 = "1aswpv1m02n26620hgkcfd38f06bzmmijlr9rs5krv6snq5gdb8g";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b312434c6c8e23ded2b74bf8f144ad0b3170adae/recipes/multi-compile";
           sha256 = "16fv0hpwcjw1771zlbgznph0fix9fbm6yqj2rcz1f9l26iih6apz";
-          name = "multi-compile";
+          name = "recipe";
         };
         packageRequires = [ dash emacs ];
         meta = {
@@ -48332,8 +60512,16 @@
           license = lib.licenses.free;
         };
       }) {};
-    multi-line = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, shut-up }:
-    melpaBuild {
+    multi-line = callPackage ({ cl-lib ? null
+                              , dash
+                              , emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild
+                              , s
+                              , shut-up }:
+      melpaBuild {
         pname = "multi-line";
         version = "20170821.1926";
         src = fetchFromGitHub {
@@ -48342,10 +60530,10 @@
           rev = "d3ce76b6aec62f96ef2c0409d8262fd39e67dccc";
           sha256 = "0kysz7l18z3fkzygpdnqf2ancixrwyzh6n49jgk0c50lhhqj324x";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0f8eee6798a0ba71d437a1cbf82e360a5b60eafb/recipes/multi-line";
           sha256 = "1aadmijnjr029s1qq4gk8xyl9m8xb5x5774b8i3jyfixyjqvhvwp";
-          name = "multi-line";
+          name = "recipe";
         };
         packageRequires = [ cl-lib dash emacs s shut-up ];
         meta = {
@@ -48353,8 +60541,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    multi-project = callPackage ({ emacs, fetchhg, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    multi-project = callPackage ({ emacs
+                                 , fetchhg
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "multi-project";
         version = "20171217.1211";
         src = fetchhg {
@@ -48362,10 +60554,10 @@
           rev = "a6e7c1542c0b";
           sha256 = "1wh7xlas6chdliya847092j5rkngxxg1m9a98y2r782ywgyl7xv6";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/multi-project";
           sha256 = "19dy2wl5ad1xldiznlw2vjvr9ja8h9wiv6igcggixq56fhngp40x";
-          name = "multi-project";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -48373,20 +60565,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    multi-run = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, window-layout }:
-    melpaBuild {
+    multi-run = callPackage ({ emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild
+                             , window-layout }:
+      melpaBuild {
         pname = "multi-run";
         version = "20180122.709";
         src = fetchFromGitHub {
           owner = "sagarjha";
           repo = "multi-run";
-          rev = "3c5e44afd69aac2e0a5be118cf6249b757e2889a";
-          sha256 = "0jknx6b973wlhmg01nymncqr2809kmjhchv75v92fas5yvn1pb3w";
+          rev = "87d9eed414999fd94685148d39e5308c099e65ca";
+          sha256 = "0m4wk6sf01b7bq5agmyfcm9kpmwmd90wbvh7fkhs61mrs86s2zw8";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e05ad99477bb97343232ded7083fddb810ae1781/recipes/multi-run";
           sha256 = "1iv4a49czdjl0slp8590f1ya0vm8g2ycnkwrdpqi3b55haaqp91h";
-          name = "multi-run";
+          name = "recipe";
         };
         packageRequires = [ emacs window-layout ];
         meta = {
@@ -48394,8 +60591,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    multi-term = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    multi-term = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "multi-term";
         version = "20160619.233";
         src = fetchFromGitHub {
@@ -48404,10 +60604,10 @@
           rev = "f954e4e18b0a035151d34852387e724d87a3316f";
           sha256 = "00cz3q654vpmijbqxp8c6nkxqj9zx1hjr3552l0adk3fbg6qpmcq";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ae489be43b1aee93614e40f492ebdf0b98a3fbc1/recipes/multi-term";
           sha256 = "16idk4nd7qpyrvyspbrdl8gdfaclng6ny0xigk6fqdv352djalal";
-          name = "multi-term";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -48415,8 +60615,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    multi-web-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    multi-web-mode = callPackage ({ fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "multi-web-mode";
         version = "20130823.2054";
         src = fetchFromGitHub {
@@ -48425,10 +60628,10 @@
           rev = "ad1c8d1c870334052d244c7ae3636cb7b9357b7c";
           sha256 = "0mc4kkgwnwfk27wwc21nw5ly7qcsl7y5bd8wf2y8r6pxhvwran4n";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/multi-web-mode";
           sha256 = "0vi4yvahr10aqpcz4127c8pcqpr5srwc1yhgipnbnm86qnh34ql5";
-          name = "multi-web-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -48436,8 +60639,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    multicolumn = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    multicolumn = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "multicolumn";
         version = "20150202.1451";
         src = fetchFromGitHub {
@@ -48446,10 +60652,10 @@
           rev = "c7a3afecd470859b2e60aa7c554d6e4d436df7fa";
           sha256 = "1ispa0wxpkydm0cyj4scyyacfrbilrip5v8bsrcqfc6qs597z8rf";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f37a999b0583a0ebc842c2f9fad8d08cb6c9dabf/recipes/multicolumn";
           sha256 = "1ylnc3s4ixvnqn7g2p6nzz8x29ggqc703waci430f1rp1lsd3q09";
-          name = "multicolumn";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -48457,8 +60663,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    multifiles = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    multifiles = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "multifiles";
         version = "20130615.1433";
         src = fetchFromGitHub {
@@ -48467,10 +60676,10 @@
           rev = "dddfe64b8e1c1cd1f9ccc1f03405477fc0d53897";
           sha256 = "065l04ylplng1vgykkbn2vnkcs3sn1k2cikx1ha2q8wmgx6bkvai";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8b528544841995045fb1f8344aaaa38946bb3915/recipes/multifiles";
           sha256 = "0m0pi2qjis9p6z9cd8hlxm1r88ynwmd2ks8wg65sffffwsdbg4kz";
-          name = "multifiles";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -48478,20 +60687,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    multiple-cursors = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    multiple-cursors = callPackage ({ cl-lib ? null
+                                    , fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "multiple-cursors";
-        version = "20180406.1350";
+        version = "20180615.518";
         src = fetchFromGitHub {
           owner = "magnars";
           repo = "multiple-cursors.el";
-          rev = "75dd6bf83af4eff83dc22e278c47264c1a41cd66";
-          sha256 = "0cw6xcc1m4r0gdqrlj5w6kbyjwqbhhpvrrr7p4b1mhd4c2a7lhiv";
+          rev = "9c49874fa444a4e7255ec05f62c01daed31c7b09";
+          sha256 = "176jyz5sfxn9sp94ymd8ksimmribhdrw2fr7wpwyf4wi17ksvxq4";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5f015e6b88be2a5ded363bd882a558e94d1f391/recipes/multiple-cursors";
           sha256 = "0mky5p9wpd3270wr5vfna8rkk2ff81wk7vicyxli39195m0qgg0x";
-          name = "multiple-cursors";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -48499,8 +60712,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    multitran = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    multitran = callPackage ({ cl-lib ? null
+                             , emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "multitran";
         version = "20180320.956";
         src = fetchFromGitHub {
@@ -48509,10 +60727,10 @@
           rev = "d826eff6ada28799a9ff6c8a4c2884b2ef1e36fb";
           sha256 = "0rk8fidq8fp9k4m21wvkld3w8g13nbfpxnj10g35c16n5wa0ydkb";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d665759fa6491b77103920a75c18a561f6800c1c/recipes/multitran";
           sha256 = "0nxrzzlinl5310zfrb4z5j0553cmg11m9y2gaf990j61afaw8f32";
-          name = "multitran";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -48520,8 +60738,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    mustache = callPackage ({ dash, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, s }:
-    melpaBuild {
+    mustache = callPackage ({ dash
+                            , fetchFromGitHub
+                            , fetchurl
+                            , ht
+                            , lib
+                            , melpaBuild
+                            , s }:
+      melpaBuild {
         pname = "mustache";
         version = "20170923.533";
         src = fetchFromGitHub {
@@ -48530,10 +60754,10 @@
           rev = "5e39654b933a18131146a0f3b3e3dc55c5058124";
           sha256 = "0ilsdrvqy9zn0yb1c8zh1zidag32rfb9xhm43qpfcg6n5w6c7r82";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d1bcf9599ca6d2c29333071a80f96808d4ab52e2/recipes/mustache";
           sha256 = "1pjr00xx77mlfw1myxaz6i3y2gbivhbiq5hyjxxbjlfrkm1vxc8g";
-          name = "mustache";
+          name = "recipe";
         };
         packageRequires = [ dash ht s ];
         meta = {
@@ -48541,8 +60765,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    mustache-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    mustache-mode = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "mustache-mode";
         version = "20141024.732";
         src = fetchFromGitHub {
@@ -48551,10 +60778,10 @@
           rev = "bf9897eb287ca47ced65d7d4e07ea61ea0aec39f";
           sha256 = "15gw4d0hp15rglsj8hzd290li4p0kadj2dsz0dgfcxld7hnimihk";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/mustache-mode";
           sha256 = "1xmqh663r5i42a586xn0wzw6h1jkvhbnw5iwvjv96w452slhkr36";
-          name = "mustache-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -48562,8 +60789,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    mustang-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    mustang-theme = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "mustang-theme";
         version = "20170719.246";
         src = fetchFromGitHub {
@@ -48572,10 +60802,10 @@
           rev = "dda6d04803f1c9b196b620ef564e7768fee15de2";
           sha256 = "0pg3iay0iinf361v4ay8kizdxs5rm23ir556cwwgz3m3gbs0mgsh";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2ed3691edd1cba6abc0c30d2aab732e2ba51bf00/recipes/mustang-theme";
           sha256 = "0771l3x6109ki914nwpfz3fj7pbvpcg9vf485mrccq2wlxymr5dr";
-          name = "mustang-theme";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -48583,8 +60813,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    mustard-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    mustard-theme = callPackage ({ emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "mustard-theme";
         version = "20170808.619";
         src = fetchFromGitHub {
@@ -48593,10 +60827,10 @@
           rev = "3b15d992c79590d7ea2503004e2a863b57e274b5";
           sha256 = "01ak4ayk46jqawlbb9cqliiqhnn68cq27kryamibdpds8sq0ch83";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/641d1959bd31598fcdacd39a3d1bb077dcccfa5c/recipes/mustard-theme";
           sha256 = "0izxhivhmv49dja4wy9n0ipd41xdzdza2ql7pfa7ny35ji5hskik";
-          name = "mustard-theme";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -48604,20 +60838,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    mutant = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    mutant = callPackage ({ dash
+                          , emacs
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "mutant";
         version = "20160124.553";
         src = fetchFromGitHub {
           owner = "p-lambert";
           repo = "mutant.el";
-          rev = "de9cdefe48c880128a8f62c6699d7416e9c8ced1";
-          sha256 = "0w9blrm3596hmip8jg2hlz9sl31ci89b90jglmg4ipldgrgj3ly6";
+          rev = "aff50603a70a110f4ecd7142963ef719e8c11c06";
+          sha256 = "1faqbkff0v6pigsnnq2dxnzdra8q62cvlxigscwalwxd27bbz548";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0fc72d1f18eba7501a040d450a85d8dee4e3070f/recipes/mutant";
           sha256 = "0m5l5r37zb0ig96757ldyl9hbb01lknzqf08ap6dsmdwr1zayvp1";
-          name = "mutant";
+          name = "recipe";
         };
         packageRequires = [ dash emacs ];
         meta = {
@@ -48625,8 +60864,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    mvn = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    mvn = callPackage ({ fetchFromGitHub
+                       , fetchurl
+                       , lib
+                       , melpaBuild }:
+      melpaBuild {
         pname = "mvn";
         version = "20160211.743";
         src = fetchFromGitHub {
@@ -48635,10 +60877,10 @@
           rev = "8a65b4eb88c9801aa3bff1921b600c72dfb8791a";
           sha256 = "1jg3xrk44lspxli0zr02jcsl8phj0ns7ly3dkd7rx2wgsk69ari3";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/mvn";
           sha256 = "0bpg9zpyfdyn9xvrbmq4gb10hd701mc49np8arlmnilphb3fdgzs";
-          name = "mvn";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -48646,8 +60888,36 @@
           license = lib.licenses.free;
         };
       }) {};
-    mwim = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    mw-thesaurus = callPackage ({ emacs
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
+        pname = "mw-thesaurus";
+        version = "20180628.2225";
+        src = fetchFromGitHub {
+          owner = "agzam";
+          repo = "mw-thesaurus.el";
+          rev = "b3f8c3aae2b68a4e6cc054c6c99d3b3135e781d1";
+          sha256 = "01ljvhx2g4i5vgzwibdgp5jl37s01m0j4sfaw7bbsm8nag0h4aw5";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/53e4a552b8a7527433b11c377e1257fabceb8049/recipes/mw-thesaurus";
+          sha256 = "10v3a09sz31ndj0ldpz0c3s45s62gyvdw0iq0c0dkg4da2rvicww";
+          name = "recipe";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/mw-thesaurus";
+          license = lib.licenses.free;
+        };
+      }) {};
+    mwim = callPackage ({ fetchFromGitHub
+                        , fetchurl
+                        , lib
+                        , melpaBuild }:
+      melpaBuild {
         pname = "mwim";
         version = "20180227.852";
         src = fetchFromGitHub {
@@ -48656,10 +60926,10 @@
           rev = "462207227b98a6a4356d51419f5ad5ba9356e5cf";
           sha256 = "06lw6064i82daasgm87gm58d142pypqc1q3cnx1cm35hyj4skd32";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b7e1aa2fa1294b27ed7b6c5bdd5844fa5c37df72/recipes/mwim";
           sha256 = "0bsibwplvyv96y5i5svm2b0jwzs5a7jr2aara7v7xnpj0nqaxm8k";
-          name = "mwim";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -48667,8 +60937,36 @@
           license = lib.licenses.free;
         };
       }) {};
-    myanmar-input-methods = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    mxf-view = callPackage ({ emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
+        pname = "mxf-view";
+        version = "20180501.40";
+        src = fetchFromGitHub {
+          owner = "t-suwa";
+          repo = "mxf-view";
+          rev = "c4825f35fad81c4624a2fcaea95cc605addf5cbc";
+          sha256 = "0ci1kdc7qs04yny6sxhbncb3d4gzcsdhk2w51phpb8m2rilm0xgl";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/08911f0409c238d009c22051ede04a8d4cdcafa9/recipes/mxf-view";
+          sha256 = "08xyfi74pja2cyfmhigq83yxwfhf9k1797wfz7hrxx9zw6kqa840";
+          name = "recipe";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/mxf-view";
+          license = lib.licenses.free;
+        };
+      }) {};
+    myanmar-input-methods = callPackage ({ fetchFromGitHub
+                                         , fetchurl
+                                         , lib
+                                         , melpaBuild }:
+      melpaBuild {
         pname = "myanmar-input-methods";
         version = "20160106.737";
         src = fetchFromGitHub {
@@ -48677,10 +60975,10 @@
           rev = "9d4e0d6358c61bde7a2274e430ef71683faea32e";
           sha256 = "0cf0c9g9k2lk1ifi2dlw7c601sh1ycxf3fgl2hy5wliyd6l9rf86";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/76093af2bba82159784994ec9e17a69cd22bf868/recipes/myanmar-input-methods";
           sha256 = "1yg8zy2z18pbyr507ms2b162c0819rna1ilwyp6hb3iv2zjw45sd";
-          name = "myanmar-input-methods";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -48688,20 +60986,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    mykie = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    mykie = callPackage ({ cl-lib ? null
+                         , emacs
+                         , fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "mykie";
         version = "20150808.1505";
         src = fetchFromGitHub {
           owner = "yuutayamada";
           repo = "mykie-el";
-          rev = "7676f0e883af1d1054e404e97691f3c13aba196f";
-          sha256 = "0a9a6hmv8vjmp6h9mnzin9vc0sncg79v5z72pasvbrplfxijzan0";
+          rev = "91f222b4f2b2b4285b0bc306905eb960826a67ed";
+          sha256 = "0x8pvcai8gvxwp2r2x4szh2xzk1mxjsh3698pc4l1cm7d8yrvwk0";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e10504a19e052c080be2ccc9b1b8fd2e73a852e0/recipes/mykie";
           sha256 = "12ram39fp3m9ar6q184rsnpkxb14y0ajibng7ia2ck54ck7n36cj";
-          name = "mykie";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -48709,8 +61012,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    mynt-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, virtualenvwrapper }:
-    melpaBuild {
+    mynt-mode = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild
+                             , virtualenvwrapper }:
+      melpaBuild {
         pname = "mynt-mode";
         version = "20150512.1349";
         src = fetchFromGitHub {
@@ -48719,10 +61026,10 @@
           rev = "23d4489167bfa899634548cb41ed32fdeb3600c9";
           sha256 = "18ml0qz3iipm9w36zvwz77cbbrg885jgvzk6z4a33xcfp524xhma";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/22eaeb5041155d56483d2ac6b32098456411442b/recipes/mynt-mode";
           sha256 = "17s0wdwgh2dcpww6h3qszc9dcs7ki00xkyisvsfn4xqajrmmp75b";
-          name = "mynt-mode";
+          name = "recipe";
         };
         packageRequires = [ virtualenvwrapper ];
         meta = {
@@ -48730,8 +61037,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    mysql-to-org = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    mysql-to-org = callPackage ({ emacs
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild
+                                , s }:
+      melpaBuild {
         pname = "mysql-to-org";
         version = "20180123.714";
         src = fetchFromGitHub {
@@ -48740,10 +61052,10 @@
           rev = "2526205ad484ad3fa38d41e7d537ace38c27645c";
           sha256 = "1yinix08mzr7v2jm3yx1j3h15cw7i202wi100nmnmvqrylpd9zr2";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/mysql-to-org";
           sha256 = "0jjdv6ywdn1618l36bw3xa3mdgg3rc8r0rdv9xdqx8mmg648a7gj";
-          name = "mysql-to-org";
+          name = "recipe";
         };
         packageRequires = [ emacs s ];
         meta = {
@@ -48751,8 +61063,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    mysql2sqlite = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    mysql2sqlite = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "mysql2sqlite";
         version = "20170725.1516";
         src = fetchFromGitHub {
@@ -48761,10 +61076,10 @@
           rev = "8e6e74451c942e2e92f90dc13222b95a7dbb285e";
           sha256 = "18jriaj391n4wr0qiva68jf482yx9v9l4xagbzl9vw125lszkngb";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9841d3cfd1ee954eb0ab9b2ca3a3f605eb0fd22a/recipes/mysql2sqlite";
           sha256 = "1jblrbw4rq2jwpb8d1dyna0fiv52b9va3sj881cb17rqx200y3nd";
-          name = "mysql2sqlite";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -48772,20 +61087,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    myterminal-controls = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    myterminal-controls = callPackage ({ cl-lib ? null
+                                       , emacs
+                                       , fetchFromGitHub
+                                       , fetchurl
+                                       , lib
+                                       , melpaBuild }:
+      melpaBuild {
         pname = "myterminal-controls";
         version = "20170425.1936";
         src = fetchFromGitHub {
           owner = "myTerminal";
           repo = "myterminal-controls";
-          rev = "aae4f50f9f22d374eaaac2ce95e522f13dcc8fc0";
-          sha256 = "08xgzrpp5l5d43j1b8ai3d41jzk9i70r2pqdcj53h79ml56bicgp";
+          rev = "59ff3a02e34969a2ac608906937cb65cb514f9f1";
+          sha256 = "11b0m09n1qqhjbdmcilb1g1408k17700qn37m3wavjrcjvdhnd5n";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4a82a45d9fcafea0795f832bce1bdd7bc83667e2/recipes/myterminal-controls";
           sha256 = "0ipk5s2whf3l68q0dydm1j6rcb6jhk61hgjwxygdphifvih7c5y2";
-          name = "myterminal-controls";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -48793,8 +61113,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    n4js = callPackage ({ cypher-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    n4js = callPackage ({ cypher-mode
+                        , emacs
+                        , fetchFromGitHub
+                        , fetchurl
+                        , lib
+                        , melpaBuild }:
+      melpaBuild {
         pname = "n4js";
         version = "20150713.1931";
         src = fetchFromGitHub {
@@ -48803,10 +61128,10 @@
           rev = "3991ed8975151d5e8d568e952362df810f7ffab7";
           sha256 = "1pd6c0jc1zxx3i3nk4qdx7gdf1qn8sc9jgqd72pkkpzvdwv998cp";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/82157dfd975635c49ef75eae83e2bdf5fe4ae5c2/recipes/n4js";
           sha256 = "0x7smxs91ffriyxx2df61fh1abpl39gqy4m62k77h7xb6fg7af6m";
-          name = "n4js";
+          name = "recipe";
         };
         packageRequires = [ cypher-mode emacs ];
         meta = {
@@ -48814,8 +61139,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    name-this-color = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    name-this-color = callPackage ({ cl-lib ? null
+                                   , dash
+                                   , emacs
+                                   , fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "name-this-color";
         version = "20151014.1330";
         src = fetchFromGitHub {
@@ -48824,10 +61155,10 @@
           rev = "e37cd1291d5d68d4c8d6386eab9cb9d94fd3bcfa";
           sha256 = "0amhw630hgc0j8wr8m6aav399ixi3vbwrck79hhlr3pmyh91vv7n";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/name-this-color";
           sha256 = "15x3dp135p45gv4qn4ll3pd6zqi4glcpv6fzvjxnx0dcval9z4d8";
-          name = "name-this-color";
+          name = "recipe";
         };
         packageRequires = [ cl-lib dash emacs ];
         meta = {
@@ -48835,8 +61166,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    nameframe = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    nameframe = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "nameframe";
         version = "20171106.1656";
         src = fetchFromGitHub {
@@ -48845,10 +61179,10 @@
           rev = "aafb8c5c5fbe0510e2f5d5b6b6b5dd0b73abe5d8";
           sha256 = "1ivklkz3j722wg038bh3hmycp9j64zjrig49vl42mkj6d3ggwilg";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bd314150b3f8ce529a2ae39a71e03bebedfdc6b9/recipes/nameframe";
           sha256 = "0iq8cfii39ha8sxn9w7kyfvys8kwyax8g4l0pkl05q0a0s95padp";
-          name = "nameframe";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -48856,20 +61190,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    nameframe-perspective = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, nameframe, perspective }:
-    melpaBuild {
+    nameframe-perspective = callPackage ({ fetchFromGitHub
+                                         , fetchurl
+                                         , lib
+                                         , melpaBuild
+                                         , nameframe
+                                         , perspective }:
+      melpaBuild {
         pname = "nameframe-perspective";
         version = "20170405.1819";
         src = fetchFromGitHub {
           owner = "john2x";
           repo = "nameframe";
-          rev = "aafb8c5c5fbe0510e2f5d5b6b6b5dd0b73abe5d8";
-          sha256 = "1ivklkz3j722wg038bh3hmycp9j64zjrig49vl42mkj6d3ggwilg";
+          rev = "d14186e99fa800d293e8e3072ba26f383c6624c6";
+          sha256 = "0aibzwp39lxafag0vpa36xp8md7nhvgibj1nklzhga2d9nq9l4km";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2543af5579d37a3eb52e6fea41da315f5590331e/recipes/nameframe-perspective";
           sha256 = "0wgr90m2pazc514slgdl1lin4mr3xxizasc82k7qinvdvdja515x";
-          name = "nameframe-perspective";
+          name = "recipe";
         };
         packageRequires = [ nameframe perspective ];
         meta = {
@@ -48877,20 +61216,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    nameframe-projectile = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, nameframe, projectile }:
-    melpaBuild {
+    nameframe-projectile = callPackage ({ fetchFromGitHub
+                                        , fetchurl
+                                        , lib
+                                        , melpaBuild
+                                        , nameframe
+                                        , projectile }:
+      melpaBuild {
         pname = "nameframe-projectile";
         version = "20160927.2103";
         src = fetchFromGitHub {
           owner = "john2x";
           repo = "nameframe";
-          rev = "aafb8c5c5fbe0510e2f5d5b6b6b5dd0b73abe5d8";
-          sha256 = "1ivklkz3j722wg038bh3hmycp9j64zjrig49vl42mkj6d3ggwilg";
+          rev = "696223c61ca8e8f5cc557d2c198801a2f3c32ad3";
+          sha256 = "14zrxv0x7p7rfrwdk02kzgvg8n594ij47yrr0c8q7b6vckhrz4gw";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bc17af8ff1694120d12a0cdbfccec78834810acd/recipes/nameframe-projectile";
           sha256 = "11z64wy8mnnrjmgfs2sjbv3mh136aki8r5f89myx861nfx18hc3k";
-          name = "nameframe-projectile";
+          name = "recipe";
         };
         packageRequires = [ nameframe projectile ];
         meta = {
@@ -48898,8 +61242,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    nameless = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    nameless = callPackage ({ emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "nameless";
         version = "20180215.1421";
         src = fetchFromGitHub {
@@ -48908,10 +61256,10 @@
           rev = "79d7ba8e9b8f3093e93172bdb4c5a4d31b0fa3e0";
           sha256 = "11xghz03csj5w3qfbjyr48liaxr08gl6gy73hmmrq2bl57six5n0";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8e4ee4dae5f32a8d445dc0cc2455c1f7075c9b3d/recipes/nameless";
           sha256 = "14agx54h2vqfb0656n12z761ywyxsdskd6xa1ccar70l9vwj85vq";
-          name = "nameless";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -48919,8 +61267,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    names = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    names = callPackage ({ cl-lib ? null
+                         , emacs
+                         , fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "names";
         version = "20180321.455";
         src = fetchFromGitHub {
@@ -48929,10 +61282,10 @@
           rev = "d8baba5360e5253938a25d3e005455b6d2d86971";
           sha256 = "11wyha2q8y7bzqq3jrzix8n97ywvsibvddrahqcps1a1yqk4hzfz";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/names";
           sha256 = "1q784606jlakw1z6sx2g2x8hz8c8arywrm2r626wj0v105v510vg";
-          name = "names";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -48940,8 +61293,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    namespaces = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    namespaces = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "namespaces";
         version = "20130326.1550";
         src = fetchFromGitHub {
@@ -48950,10 +61306,10 @@
           rev = "3d02525d9b9a5ae6e7be3adefd880121436e6270";
           sha256 = "157hhb253m6a9l5wy6x8w5ar3x0qz1326l7a0npxif6pma0dd140";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/de404e9ad3d1e27af24e868e84218d872d5fc795/recipes/namespaces";
           sha256 = "02pb7762khxpah4q6xg8r7dmlv1kwyzinffi7pcaps6ycj29q2fr";
-          name = "namespaces";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -48961,20 +61317,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    nand2tetris = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    nand2tetris = callPackage ({ emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "nand2tetris";
         version = "20171201.1013";
         src = fetchFromGitHub {
           owner = "CestDiego";
           repo = "nand2tetris.el";
-          rev = "33acee34d24b1c6a87db833b7d23449cf858f64f";
-          sha256 = "0sfa674g1qm280s0pc3n6qiiphj5i9ibknckx5capkrkxb5cwpkw";
+          rev = "fe37ee41367ceff6f7d7a472a5f80cf1285e1e01";
+          sha256 = "0g1gwayas7claa9cn3mv8dnlz46n78014qxb2ix25428dnsrridy";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/90421372b3f60b59762279ac805c61a984606d11/recipes/nand2tetris";
           sha256 = "1zg9xx7mj8334m2v2zqqfkr5vkj4dzqbj8y13qk6xhzb7qkppyqd";
-          name = "nand2tetris";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -48982,20 +61342,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    nand2tetris-assembler = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, nand2tetris }:
-    melpaBuild {
+    nand2tetris-assembler = callPackage ({ fetchFromGitHub
+                                         , fetchurl
+                                         , lib
+                                         , melpaBuild
+                                         , nand2tetris }:
+      melpaBuild {
         pname = "nand2tetris-assembler";
         version = "20171201.1013";
         src = fetchFromGitHub {
           owner = "CestDiego";
           repo = "nand2tetris.el";
-          rev = "33acee34d24b1c6a87db833b7d23449cf858f64f";
-          sha256 = "0sfa674g1qm280s0pc3n6qiiphj5i9ibknckx5capkrkxb5cwpkw";
+          rev = "fe37ee41367ceff6f7d7a472a5f80cf1285e1e01";
+          sha256 = "0g1gwayas7claa9cn3mv8dnlz46n78014qxb2ix25428dnsrridy";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/90421372b3f60b59762279ac805c61a984606d11/recipes/nand2tetris-assembler";
           sha256 = "1761kgrflipxba8894cnx90ks7f3ba4nj6ci515zzxcx9s45mfyy";
-          name = "nand2tetris-assembler";
+          name = "recipe";
         };
         packageRequires = [ nand2tetris ];
         meta = {
@@ -49003,8 +61367,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    nanowrimo = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    nanowrimo = callPackage ({ fetchhg
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "nanowrimo";
         version = "20151104.1828";
         src = fetchhg {
@@ -49012,10 +61379,10 @@
           rev = "25e2ca20ed34";
           sha256 = "1nzkamy53kl1g4y1jm7j5zgpkdsyg5ykp8zp1f0bg5mhy8mmf75w";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/nanowrimo";
           sha256 = "1nhyj38qyn1x6a5rbrwhcxwfwzyqqjm3dvksdnmam6vfwn3s2r31";
-          name = "nanowrimo";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -49023,8 +61390,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    naquadah-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    naquadah-theme = callPackage ({ fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "naquadah-theme";
         version = "20180212.440";
         src = fetchFromGitHub {
@@ -49033,10 +61403,10 @@
           rev = "999056526db5095ce600c83672fc80cb744bd93e";
           sha256 = "1f10598m4vcpr4md6hpdvv46zi6159rajxyzrrlkiz0g94v8y6rl";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/671afe0ff3889ae8c4b2d7b8617a3a25c16f3f0f/recipes/naquadah-theme";
           sha256 = "1aml1f2lgn530i86218nrc1pk3zw5n3qd2gw4gylwi7g75i0cqn1";
-          name = "naquadah-theme";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -49044,8 +61414,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    narrow-reindent = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    narrow-reindent = callPackage ({ emacs
+                                   , fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "narrow-reindent";
         version = "20150722.1206";
         src = fetchFromGitHub {
@@ -49054,10 +61428,10 @@
           rev = "87466aac4dbeb79597124dd077bf5c704872fd3d";
           sha256 = "10yn215xb4s6kshk108y75im1xbdp0vwc9kah5bbaflp9234i0zh";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/73c7f01a009dc7ac1b9da8ce41859695a97b7878/recipes/narrow-reindent";
           sha256 = "0fybal70kk62zlra63x4jb72694m0mzv4cx746prx9anvq1ss2i0";
-          name = "narrow-reindent";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -49065,8 +61439,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    narrowed-page-navigation = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    narrowed-page-navigation = callPackage ({ cl-lib ? null
+                                            , emacs
+                                            , fetchFromGitHub
+                                            , fetchurl
+                                            , lib
+                                            , melpaBuild }:
+      melpaBuild {
         pname = "narrowed-page-navigation";
         version = "20150108.2119";
         src = fetchFromGitHub {
@@ -49075,10 +61454,10 @@
           rev = "b215adbac4873f56fbab65772062f0f5be8058a1";
           sha256 = "0ydxj6dc10knambma2hpimqrhfz216nbj96w1dcwgjixs4cd4nax";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e37e993fec280428f094b6c8ec418fe5ba8c6d49/recipes/narrowed-page-navigation";
           sha256 = "1yrmih60dd69qnin505jlmfidm2svzpdrz46286r7nm6pk7s4pb7";
-          name = "narrowed-page-navigation";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -49086,20 +61465,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    nash-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    nash-mode = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "nash-mode";
         version = "20160830.512";
         src = fetchFromGitHub {
           owner = "tiago4orion";
           repo = "nash-mode.el";
-          rev = "2cd96535eb7d669a94306183e95ee37333872c1a";
-          sha256 = "0wdkl56pgm6qlgqjs4kqjglnxzjsfjd0y4fiffhxc893gm0psrpg";
+          rev = "bb7ae728a16812a0ef506483b877f6221c92ca9c";
+          sha256 = "1n4dxbd388ibghismc5d1nkvxwxdi4r415prsaa3qad8l9s4ivwh";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c8bd080c81b163a6ddcfffc710316b9711935b4a/recipes/nash-mode";
           sha256 = "1d6nfxn7fc2qv78bf5277sdwfqflag2gihgic8vxrbjlpnizxn1p";
-          name = "nash-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -49107,20 +61489,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    nasm-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    nasm-mode = callPackage ({ emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "nasm-mode";
-        version = "20161216.736";
+        version = "20180711.1209";
         src = fetchFromGitHub {
           owner = "skeeto";
           repo = "nasm-mode";
-          rev = "d990ed94d902b74a5c834fb567e03307607cee45";
-          sha256 = "1dyc50a1zskx9fqxl2iy2x74f3bkb2ccz908v0aj13rqfqqnns9j";
+          rev = "1d4871ef184fc5da792bccbae1ea189f876706fc";
+          sha256 = "1pyawg7axx6rzcal3v0cya2jpdnsndd4af8vy60kjpwxa1sq7h2m";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a1a832b3bd7c2f2d3cee8bcfb5421d22acf5523e/recipes/nasm-mode";
           sha256 = "1626yf9mmqlsw8w01vzqsyb5ipa56259d4kl6w871k7rvhxwff17";
-          name = "nasm-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -49128,8 +61514,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    nav = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    nav = callPackage ({ fetchFromGitHub
+                       , fetchurl
+                       , lib
+                       , melpaBuild }:
+      melpaBuild {
         pname = "nav";
         version = "20120507.7";
         src = fetchFromGitHub {
@@ -49138,10 +61527,10 @@
           rev = "c5eb234c063f435dbdcd1f8bdc46cfc68c973ebe";
           sha256 = "0kfqpji6z3ra8sc951vmm1bzyhkws7vb5q6djvl45wlf1wrgkc4p";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0fda2b54a0ff0b6fc3bd6d20cfcbbf63cae5380f/recipes/nav";
           sha256 = "0ly1fk4ak1p8gkz3qmmxyslcjgicnfm8bpqqgndvwcznp8pvpjml";
-          name = "nav";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -49149,20 +61538,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    nav-flash = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    nav-flash = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "nav-flash";
         version = "20140508.1341";
         src = fetchFromGitHub {
           owner = "rolandwalker";
           repo = "nav-flash";
-          rev = "53f5bc59e3f32c1192d15637d3979732dacb2c35";
-          sha256 = "07wjicbvzg7cz983hv0p2qw1qlln07djigkmbqfpwvg3fk50fdyg";
+          rev = "26b8c0d23e2d460f3ce06cb5df8a5e219c20da8b";
+          sha256 = "0xnvl851h1g1d4h0qa218a4a23bpadbiwx6lgx94gvwcylnbl722";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c9db386ab3910940addae6e925b2ac17e64e0f87/recipes/nav-flash";
           sha256 = "0936kr0s6zxxmjwaqm7ywdw2im4dxai1xb7j6xa2gp7c70qvvsx3";
-          name = "nav-flash";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -49170,20 +61562,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    navi-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, outorg, outshine }:
-    melpaBuild {
+    navi-mode = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild
+                             , outorg
+                             , outshine }:
+      melpaBuild {
         pname = "navi-mode";
-        version = "20170414.1228";
+        version = "20180515.1948";
         src = fetchFromGitHub {
           owner = "alphapapa";
           repo = "navi";
-          rev = "c1d38e8237f4e14af020a0b7d4f118ea198ab674";
-          sha256 = "0jj5spk14hgb7zb1cd2n8whcw4k1kd5zb6llwj96v178yaws7l8k";
+          rev = "7c3fd1a9b520300abfdb1b7c3de21403e81a95bf";
+          sha256 = "1k5g3ij6rq20jllb7w21sp068lvcc2cjrxm2yq76bjaajbfsa501";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8edf78a0ecd2ff8e6e066b80751a31e11a068c3f/recipes/navi-mode";
           sha256 = "0pc52iq8lng2g0vpnrhdfxmibc1dx9ksmrjg0303as1yv41fnc69";
-          name = "navi-mode";
+          name = "recipe";
         };
         packageRequires = [ outorg outshine ];
         meta = {
@@ -49191,20 +61588,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    navi2ch = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    navi2ch = callPackage ({ fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "navi2ch";
         version = "20150329.1916";
         src = fetchFromGitHub {
           owner = "naota";
           repo = "navi2ch";
-          rev = "f39d93c32acd5b9c3a7fb1a9fe14c5e1c4b5288e";
-          sha256 = "0i0icyaa2zzzl0cr9n1zv44pg2lric8gic58dkjxjv8yyk6y01cn";
+          rev = "faebfd15184de9df6903eae436dafb52c38ee86e";
+          sha256 = "15l2zmm8bp4ip8m1hfxkvswfwa29pg72kisfya2n5v900r184a4m";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/36bea1eca58de15d6106cbd293d941d12ee3d21c/recipes/navi2ch";
           sha256 = "13xwvyy27dz1abjkkazm3s1p6cw32l2klr1bnln02w0azkbdy7x3";
-          name = "navi2ch";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -49212,8 +61612,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    navorski = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, multi-term, s }:
-    melpaBuild {
+    navorski = callPackage ({ dash
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild
+                            , multi-term
+                            , s }:
+      melpaBuild {
         pname = "navorski";
         version = "20141203.1024";
         src = fetchFromGitHub {
@@ -49222,10 +61628,10 @@
           rev = "698c1c62da70164aebe9a7a5d034778fbc30ea5b";
           sha256 = "0g7rmvfm0ldv0d2x7f8k761mgmi47siyspfi1ns40ijhkpc15x8l";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9246cef94029d2da2211345c076ed55deb91e8fa/recipes/navorski";
           sha256 = "0dnzpsm0ya8rbcik5wp378hc9k7gjb3gwmkqqj889c38q5cdwsx7";
-          name = "navorski";
+          name = "recipe";
         };
         packageRequires = [ dash multi-term s ];
         meta = {
@@ -49233,8 +61639,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    ncl-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ncl-mode = callPackage ({ emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "ncl-mode";
         version = "20180128.2303";
         src = fetchFromGitHub {
@@ -49243,10 +61653,10 @@
           rev = "602292712a9e6b7e7c25155978999e77d06b7338";
           sha256 = "0sv44hn2ylick7ywpcbij8h2vxdj06zridjdmcfgpv5d090dbl9n";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2eea3936b8a3a7546450d1d7399e0f86d855fefd/recipes/ncl-mode";
           sha256 = "1niy0w24q6q6j7s0l9fcaqai7zz2gg1qlk2s9sxb8j79jc41y47k";
-          name = "ncl-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -49254,8 +61664,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    nclip = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    nclip = callPackage ({ fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "nclip";
         version = "20130617.1315";
         src = fetchFromGitHub {
@@ -49264,10 +61677,10 @@
           rev = "af88e38b1f04be02bf2e57affc662dbd0f828e67";
           sha256 = "178gjv7kq97p9i4naxql7xabvmchw5x8idkpyjqqky3b24v5wkis";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f03f254afbe561e0a6dd6c287dcc137da05376cd/recipes/nclip";
           sha256 = "016jp1rqrf1baxlxbi3476m88a0l3r405dh6pmly519wm2k8pipw";
-          name = "nclip";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -49275,8 +61688,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    neato-graph-bar = callPackage ({ emacs, fetchFromGitLab, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    neato-graph-bar = callPackage ({ emacs
+                                   , fetchFromGitLab
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "neato-graph-bar";
         version = "20171230.1753";
         src = fetchFromGitLab {
@@ -49285,10 +61702,10 @@
           rev = "c59f15ed9a40aecc174aa22c4bbfa7978e182705";
           sha256 = "0bdgsxdlwpkd3hjnw1jmj30slakzmj2pinj3pyr5qqba9apxnvri";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/49c5bd4e1506a28ada9856e5f70e520890123d16/recipes/neato-graph-bar";
           sha256 = "1p4jmla75ny443cv7djk3nvl3ikchllnsivxx9yds14ynk4jxhgb";
-          name = "neato-graph-bar";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -49296,20 +61713,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    nemerle = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    nemerle = callPackage ({ fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "nemerle";
         version = "20161029.1323";
         src = fetchFromGitHub {
           owner = "rsdn";
           repo = "nemerle";
-          rev = "59b28607968a9bee060b42eac55c69c37d1c0e69";
-          sha256 = "1anbzlm7ccgd9ss6fqfq1gyvnpnjsxi9y9q3fk6c6cwd11dyq16g";
+          rev = "8818c5af5598e16ea59189e1e3245f0a3d7c78f0";
+          sha256 = "1ky63jyxdz1m6fcz3phi87mwc0ha6bn2fpg4lcdzp0w8cp8rc8ad";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/nemerle";
           sha256 = "1rbalq3s2inwz9cf6bfmnxgqd9ylba3crflfjs6b4mnp33z4swny";
-          name = "nemerle";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -49317,8 +61737,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    neon-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    neon-mode = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "neon-mode";
         version = "20180406.456";
         src = fetchFromGitHub {
@@ -49327,10 +61750,10 @@
           rev = "99d15e46beaf1e7d71e39a00cce810df1f33229d";
           sha256 = "07vsi07m5q070fvkqhz32qa2y7dgnyi1kggairimbiwbn98bh642";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c6b2a4898bf21413c4d9e6714af129bbb0a23e1a/recipes/neon-mode";
           sha256 = "0kgyc0rkxvvks5ykizfv82f2cx7ck17sk63plj7bld6khlcgv0y6";
-          name = "neon-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -49338,20 +61761,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    neotree = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    neotree = callPackage ({ cl-lib ? null
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "neotree";
-        version = "20170522.758";
+        version = "20180616.903";
         src = fetchFromGitHub {
           owner = "jaypei";
           repo = "emacs-neotree";
-          rev = "bc98dfb44c106375efa4f26848f3790ee264da97";
-          sha256 = "1m30ldbprz3f62szyi1alzjy337ryczljxy1z5lf6smb03ymns2s";
+          rev = "4f8d80fd51c712df7b11ae8491be3527db46f612";
+          sha256 = "04w784pln671nmji7hwyka1vaj20114gfxyh513glhn78by2y5s1";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9caf2e12762d334563496d2c75fae6c74cfe5c1c/recipes/neotree";
           sha256 = "05smm1xsn866lsrak0inn2qw6dvzy24lz6h7rvinlhk5w27xva06";
-          name = "neotree";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -49359,8 +61786,62 @@
           license = lib.licenses.free;
         };
       }) {};
-    netherlands-holidays = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    nerdtab = callPackage ({ emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
+        pname = "nerdtab";
+        version = "20180527.408";
+        src = fetchFromGitHub {
+          owner = "casouri";
+          repo = "nerdtab";
+          rev = "7af72c3d798ec3a44e6bc8cec18200198192ad9a";
+          sha256 = "0n8av79pdq7as45pfd81pffrpg1wrd3ppdk7zd0i85rmyknnix7r";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/59bc273db1d34997ea5d51cc6adc33ec785bc7f3/recipes/nerdtab";
+          sha256 = "0q7dyqxq058195pgb1pjy27gcrr96096xcvvrapkarym7jsa2wy3";
+          name = "recipe";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/nerdtab";
+          license = lib.licenses.free;
+        };
+      }) {};
+    netease-music = callPackage ({ emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild
+                                 , names }:
+      melpaBuild {
+        pname = "netease-music";
+        version = "20180429.1822";
+        src = fetchFromGitHub {
+          owner = "nicehiro";
+          repo = "netease-music";
+          rev = "aecf451fd69f9faa9f86232550ebf8ced5a48254";
+          sha256 = "0cb5adrnprlhrpcw06wi84fiva3mwac92rxfi5pgcw9ga213qhy8";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/ca3d4a8f8d9080e26a8fe2c38c0001d5cfc3c88c/recipes/netease-music";
+          sha256 = "1vb81f1l45v6rny91rcqvnhzqh5ybdr0r39yrcaih8zhvamk685z";
+          name = "recipe";
+        };
+        packageRequires = [ emacs names ];
+        meta = {
+          homepage = "https://melpa.org/#/netease-music";
+          license = lib.licenses.free;
+        };
+      }) {};
+    netherlands-holidays = callPackage ({ fetchFromGitHub
+                                        , fetchurl
+                                        , lib
+                                        , melpaBuild }:
+      melpaBuild {
         pname = "netherlands-holidays";
         version = "20150202.817";
         src = fetchFromGitHub {
@@ -49369,10 +61850,10 @@
           rev = "26236178cdd650df9958bf5a086e184096559f00";
           sha256 = "1kkflj2qnrn6kzh1l6bjl5n5507qilb22pqj3h0f2m6hfyn0sw5z";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/abdbce47cb5c623696b5d6fcb3bef2d995d90195/recipes/netherlands-holidays";
           sha256 = "181linsbg5wrx1z7zbj3in2d3d4zd2v7drspkj0b6l0c5yfxwayf";
-          name = "netherlands-holidays";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -49380,8 +61861,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    netrunner = callPackage ({ company, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, popup }:
-    melpaBuild {
+    netrunner = callPackage ({ company
+                             , fetchFromGitHub
+                             , fetchurl
+                             , helm
+                             , lib
+                             , melpaBuild
+                             , popup }:
+      melpaBuild {
         pname = "netrunner";
         version = "20160910.1632";
         src = fetchFromGitHub {
@@ -49390,10 +61877,10 @@
           rev = "c64672992175c8c1073c0f56c2e471839db71a0f";
           sha256 = "1jj8qsq4xa93h3srskhw1l6igzf9jhwl8hfa73zvqr8dhqhp149k";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a8b1d8c31383b6ec3788ad6c9adf0117190484c9/recipes/netrunner";
           sha256 = "1lk5acbv1fw7q9jwpk0l5hqb9wnscg2kj3qn6b4pwn9ggf8axkpv";
-          name = "netrunner";
+          name = "recipe";
         };
         packageRequires = [ company helm popup ];
         meta = {
@@ -49401,20 +61888,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    network-watch = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    network-watch = callPackage ({ emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "network-watch";
         version = "20171123.346";
         src = fetchFromGitHub {
           owner = "jamiguet";
           repo = "network-watch";
-          rev = "958dd0d419e4f9402648a86b754091ba346e01b8";
-          sha256 = "1xqp7aghc8xd1733azl27mjf57qvm0036qbkqmaks2ip8s8c6arj";
+          rev = "d80b38dbec79f813c3949a8df8fb5f58d48b60ee";
+          sha256 = "1c8qbigdj61dqzkf03y6fzywykqgim6zpfmva8631q5ygnhsrnp2";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e129679b3e2074af3e3de1b2ccce53a2fa5e9f65/recipes/network-watch";
           sha256 = "0y3vjrh9vlfg44c01ylkszisliwfy5zb8c5z3qrmf3yj4q096f42";
-          name = "network-watch";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -49422,20 +61913,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    never-comment = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    never-comment = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "never-comment";
         version = "20140104.1407";
         src = fetchFromGitHub {
           owner = "To1ne";
           repo = "never-comment";
-          rev = "74ded8f1e7f23240f5f6032d0451fb0a51733bc4";
-          sha256 = "0p00mmid04pfsna4ify3cy0b9lx431q1r5h772hihsg4f1rs2ppy";
+          rev = "1996d003cad6bccf1475f7845d79efacbc7cd673";
+          sha256 = "16q90lbgdh9iz3njakgip20mhc8dmd0zjsvk02zsc5q5n9c7rs8i";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ef3f8e712c10d63fea009951d7916fe376267cbe/recipes/never-comment";
           sha256 = "0sn8y57895bfpgiynnj4m9b3x3dbb9v5fwkcwmf9jr39dbf98v6s";
-          name = "never-comment";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -49443,8 +61937,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    newlisp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    newlisp-mode = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "newlisp-mode";
         version = "20160226.745";
         src = fetchFromGitHub {
@@ -49453,10 +61950,10 @@
           rev = "ac23be40c81a360988ab803d365f1510733f6db4";
           sha256 = "1zzsfyqwj1k4zh30gl491ipavr9pp9djwjq3zz2q3xh7jys68w8r";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e5c79c56bddfeb498d28f2575184434fbb93465d/recipes/newlisp-mode";
           sha256 = "0i2d2gyzzvpr5qm2cqzbn9my21lfb66315hg9fj86ac5pkc25zrd";
-          name = "newlisp-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -49464,8 +61961,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    nexus = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    nexus = callPackage ({ fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "nexus";
         version = "20140114.505";
         src = fetchFromGitHub {
@@ -49474,10 +61974,10 @@
           rev = "c46f499951b90839aa8683779fe43d8f01672a60";
           sha256 = "1xnx6v49i6abzbhq4fl4bp9d0pp9gby40splpcj211xsb8yiry27";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/80d3665e9a31aa3098df456dbeb07043054e42f5/recipes/nexus";
           sha256 = "1mdphgsqg6n4hryr53rk42z58vfv0g5wkar5ipanr4h4iclkf5vd";
-          name = "nexus";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -49485,20 +61985,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    ng2-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, typescript-mode }:
-    melpaBuild {
+    ng2-mode = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild
+                            , typescript-mode }:
+      melpaBuild {
         pname = "ng2-mode";
-        version = "20180216.743";
+        version = "20180520.1731";
         src = fetchFromGitHub {
           owner = "AdamNiederer";
           repo = "ng2-mode";
-          rev = "d41ed14f276f1f08fb7eaacc863f471654e2c2fa";
-          sha256 = "0rys2gnbw9d32i1gqqf46mbf36x2s9lz7v144yw901b2i8p6c5ja";
+          rev = "177248bca3787fabab70f3026ccf390395171f0d";
+          sha256 = "1s6nvjby3vxh0sfmxg4c43vj9fkr8358v8plqvczpnjk3jxk4xvm";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a856ecd8aca2d9232bb20fa7019de9e1dbbb19f4/recipes/ng2-mode";
           sha256 = "0sr4yh5nkgqb1qciq9mzzhr64350bi2wjm6z9d616nkjw72saz1r";
-          name = "ng2-mode";
+          name = "recipe";
         };
         packageRequires = [ typescript-mode ];
         meta = {
@@ -49506,8 +62010,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    nginx-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    nginx-mode = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "nginx-mode";
         version = "20170611.2137";
         src = fetchFromGitHub {
@@ -49516,10 +62023,10 @@
           rev = "a2bab83c2eb233d57d76b236e7c141c2ccc97005";
           sha256 = "17dh5pr3gh6adrbqx588gimxbb2fr7iv2qrxv6r48w2727l344xs";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a6da3640b72496e2b32e6ed21aa39df87af9f7f3/recipes/nginx-mode";
           sha256 = "07k17m64zhv6gik8v4n73d8l1k6fsp4qp8cl94r384ny0187y65c";
-          name = "nginx-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -49527,20 +62034,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    niceify-info = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    niceify-info = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "niceify-info";
         version = "20160416.544";
         src = fetchFromGitHub {
           owner = "aaron-em";
           repo = "niceify-info.el";
-          rev = "38df5062bc3b99d1074cab3e788b5ed66732111c";
-          sha256 = "0hgrf628ris94pmvmgibkq6zmwrqkv9q70c5a2gsbdpqmfikj8m1";
+          rev = "66b45916f1994e16ee023d29fa7cf8fec48078f1";
+          sha256 = "0dzcaa88l7yjc7fhyhkvbzs7bmhi6bb6rx41wsnnidlnpzbgdrk7";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0b2a923da7363d904eb848eb335736974e05dba1/recipes/niceify-info";
           sha256 = "1s9c8yxbab9zl5jx38alwa2hpp4zj5cb9a5gfm3x09jf3iw768bl";
-          name = "niceify-info";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -49548,8 +62058,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    niconama = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }:
-    melpaBuild {
+    niconama = callPackage ({ cl-lib ? null
+                            , emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild
+                            , request }:
+      melpaBuild {
         pname = "niconama";
         version = "20170910.801";
         src = fetchFromGitHub {
@@ -49558,10 +62074,10 @@
           rev = "96e7553e50e6bf7b58aac50f52c9b0b8edb41c56";
           sha256 = "1gihjzwl6309vgav5z7jzi8jb7is8vx8lr23kb6h373gwws4bi10";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ad8e7189e9c4c5d86cef268f45be0dda2d702805/recipes/niconama";
           sha256 = "1v4cvcxrl254jhfl1q5ld0gn4598fcvv0pfhilh2jy76w5acqx81";
-          name = "niconama";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs request ];
         meta = {
@@ -49569,8 +62085,38 @@
           license = lib.licenses.free;
         };
       }) {};
-    nikola = callPackage ({ async, emacs, fetchgit, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    night-owl-theme = callPackage ({ emacs
+                                   , fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
+        pname = "night-owl-theme";
+        version = "20180630.1431";
+        src = fetchFromGitHub {
+          owner = "aaronjensen";
+          repo = "night-owl-emacs";
+          rev = "deecfd6f47f0802ed760e0b5843fb3cc6f723fd1";
+          sha256 = "1mr0dr5yba6nkaki914yiaxa7b1yqw1p0dm9a75mvkzwra6fcljh";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/77fe194a0e58bdb9789c85f3c50895eb886b4016/recipes/night-owl-theme";
+          sha256 = "121jc59ry60h1ml1vxx4a6l4a6jcxk7fc4wz32fqv5pr03rzgs7h";
+          name = "recipe";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/night-owl-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    nikola = callPackage ({ async
+                          , emacs
+                          , fetchgit
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "nikola";
         version = "20170703.1321";
         src = fetchgit {
@@ -49578,10 +62124,10 @@
           rev = "964715ac30943c9d6976999cad208dc60d09def0";
           sha256 = "0b0bpw9r2xi1avzq76pl58bbk1shb57d3bmzd9d53d07gj5c9399";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8ef4f7c2f1c48edd7b4a6fdcda51908d216c631c/recipes/nikola";
           sha256 = "1d0a80y910klayb9jf0ahn5lj9l6xdhwcp2in3ridmqislavrcnv";
-          name = "nikola";
+          name = "recipe";
         };
         packageRequires = [ async emacs ];
         meta = {
@@ -49589,20 +62135,28 @@
           license = lib.licenses.free;
         };
       }) {};
-    nim-mode = callPackage ({ commenter, emacs, epc, fetchFromGitHub, fetchurl, flycheck-nimsuggest, let-alist, lib, melpaBuild }:
-    melpaBuild {
+    nim-mode = callPackage ({ commenter
+                            , emacs
+                            , epc
+                            , fetchFromGitHub
+                            , fetchurl
+                            , flycheck-nimsuggest
+                            , let-alist
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "nim-mode";
-        version = "20180212.1040";
+        version = "20180516.1309";
         src = fetchFromGitHub {
           owner = "nim-lang";
           repo = "nim-mode";
-          rev = "bff7065f6d2419ec517d247f0f3aaf935820064e";
-          sha256 = "0iqsm843msw41jxhfi7dbsj6x4qanvd84xhg2j6wl6ncabdmwnjm";
+          rev = "35f4b2cb2d4c142f6f7f0e3ffb06c87b81bb8c26";
+          sha256 = "1c4gl09sm8hiwa308xifj4vnnhiv3hvqs7zk0cz245k8pba612ih";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/dc2ccb5f24b9d55c77eaa7952a9e6a2e0ed7be24/recipes/nim-mode";
           sha256 = "1kzn3kkkj7jzs7fqhvib196sl3vp7kbhb4icqzmvvmv366lkaib6";
-          name = "nim-mode";
+          name = "recipe";
         };
         packageRequires = [ commenter emacs epc flycheck-nimsuggest let-alist ];
         meta = {
@@ -49610,20 +62164,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    nimbus-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    nimbus-theme = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "nimbus-theme";
-        version = "20180410.307";
+        version = "20180606.1936";
         src = fetchFromGitHub {
           owner = "m-cat";
           repo = "nimbus-theme";
-          rev = "6b0c1ef6e6cec93b0d17a714406830edab8cb995";
-          sha256 = "1h5c5fsg610mqi7m0ddnkvc0l4952hdjic3hpbnmjaicnhszdgfw";
+          rev = "d4adcf0e821648aef066f9b97808a3c691615749";
+          sha256 = "0hvyvc5pvv0n4dv4y1h09vq84gzbf2xjavpiryfxb100hcjicjss";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fc0e6b456b76e2379c64a86ad844362c58146dc6/recipes/nimbus-theme";
           sha256 = "1hy4rc1v5wg7n6nazdq09gadirb0qvn887mmdavwjnnac45xyi18";
-          name = "nimbus-theme";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -49631,20 +62188,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    ninja-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ninja-mode = callPackage ({ emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "ninja-mode";
         version = "20141203.2159";
         src = fetchFromGitHub {
           owner = "martine";
           repo = "ninja";
-          rev = "ca041d88f4d610332aa48c801342edfafb622ccb";
-          sha256 = "05wipm7cvhyf1fsd5awi44yzndllfsmg0i3xzdmml545ypdimk3m";
+          rev = "d3238428c6ed77eb08dfc57854325634401481e2";
+          sha256 = "05scnv74g9m70dfj1y71iw0dw38zbb77h2s7kciicr9pdrvdg8d4";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/aed2f32a02cb38c49163d90b1b503362e2e4a480/recipes/ninja-mode";
           sha256 = "1m7f25sbkz8k343giczrnw2ah5i3mk4c7csi8kk9x5y16030asik";
-          name = "ninja-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -49652,8 +62213,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    nix-buffer = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    nix-buffer = callPackage ({ emacs
+                              , f
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "nix-buffer";
         version = "20180212.718";
         src = fetchFromGitHub {
@@ -49662,10 +62228,10 @@
           rev = "db57cda36e7477bdc7ef5a136357b971b1d4d099";
           sha256 = "0b01b4l9c70sad5r5py5hvg7s6k6idwwp0pv3rn8rj0fq5wlyixj";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/08b978724ff26b3ea7a134d307d888c80e2a92a9/recipes/nix-buffer";
           sha256 = "1fjkf88345v9l2v2mk8a057mw0p0rckf6rjf00y5464dyhh58vcd";
-          name = "nix-buffer";
+          name = "recipe";
         };
         packageRequires = [ emacs f ];
         meta = {
@@ -49673,20 +62239,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    nix-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    nix-mode = callPackage ({ emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "nix-mode";
-        version = "20180403.1741";
+        version = "20180629.1501";
         src = fetchFromGitHub {
           owner = "NixOS";
           repo = "nix-mode";
-          rev = "cc23fd6a0e394aeeed603e2bfeb4a5ebc63db660";
-          sha256 = "1vz3s2jx14nzy53f04d821n4f2s22ys5h9s7af6cnpynkwawyhhq";
+          rev = "57ac40d53b4f4fe0d61fcabb41f8f3992384048e";
+          sha256 = "0l5m5p3rsrjf7ghik3z1bglf255cwliglgr3hiv6qpp121k4p0ga";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e1870d786dbfac3b14386c8030e06f2d13ab9da6/recipes/nix-mode";
           sha256 = "10f3ly4860lkxzykw4fbvhn3i0c2hgj77jfjbhlk2c1jz9x4yyy5";
-          name = "nix-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -49694,8 +62264,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    nix-sandbox = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    nix-sandbox = callPackage ({ dash
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild
+                               , s }:
+      melpaBuild {
         pname = "nix-sandbox";
         version = "20171004.1006";
         src = fetchFromGitHub {
@@ -49704,10 +62279,10 @@
           rev = "7007363e773a419203a69798fb0e0731b2eb0f73";
           sha256 = "00hv8fhyahkdh1vfy1qkahqvsik6d81c7mqh4gjiqxrmb2l1vbcb";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/66be755a6566e8c0cfb5aafa50de29b434023c7a/recipes/nix-sandbox";
           sha256 = "13zr0jbc6if2wvyiplay2gkd5548imfm38x1qy1dw6m2vhbzwp0k";
-          name = "nix-sandbox";
+          name = "recipe";
         };
         packageRequires = [ dash s ];
         meta = {
@@ -49715,20 +62290,49 @@
           license = lib.licenses.free;
         };
       }) {};
-    nixos-options = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    nix-update = callPackage ({ emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
+        pname = "nix-update";
+        version = "20180424.1748";
+        src = fetchFromGitHub {
+          owner = "jwiegley";
+          repo = "nix-update-el";
+          rev = "d92b2c190dbaeb16751be724fe381f8a796c424c";
+          sha256 = "0lqhc7nnw96pz9alq75w6zmjb6carmaak1g2cf4csslqbihnbriz";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/c59e828d4cad3d75344b34b9666349250e53b6ea/recipes/nix-update";
+          sha256 = "0if83pvjvr0347301j553bsxrrxniyykq20457cdkzlvva52c0b3";
+          name = "recipe";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/nix-update";
+          license = lib.licenses.free;
+        };
+      }) {};
+    nixos-options = callPackage ({ emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "nixos-options";
         version = "20160209.1041";
         src = fetchFromGitHub {
           owner = "travisbhartwell";
           repo = "nix-emacs";
-          rev = "7007363e773a419203a69798fb0e0731b2eb0f73";
-          sha256 = "00hv8fhyahkdh1vfy1qkahqvsik6d81c7mqh4gjiqxrmb2l1vbcb";
+          rev = "045825c2e1cf0a4fb0a472e72c1dae8f55202cef";
+          sha256 = "12zwaiyr1n37zwrmyr3m8kn2302abyagj5dzmbr1wvbf3ihkxmxd";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6846c7d86e70a9dd8300b89b61435aa7e146be96/recipes/nixos-options";
           sha256 = "1m3jipidk10zj68rzjbacgjlal31jf80gqjxlgj4qs8lm671gxmm";
-          name = "nixos-options";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -49736,20 +62340,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    nlinum-hl = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, nlinum }:
-    melpaBuild {
+    nlinum-hl = callPackage ({ cl-lib ? null
+                             , emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild
+                             , nlinum }:
+      melpaBuild {
         pname = "nlinum-hl";
         version = "20170613.1748";
         src = fetchFromGitHub {
           owner = "hlissner";
           repo = "emacs-nlinum-hl";
-          rev = "d5ca1490e0cde0605e34a6a17de8cc236c9810da";
-          sha256 = "0rj2ay2x7mqnj2vpnndfzr47sldx7i6zxj4nn81yamrdxgv19ajd";
+          rev = "46e26d1e3d5bfe9a3f79a5cce21f3c442ac10da8";
+          sha256 = "1yi3rg6j8r0c7a70dghj838vfslwdvjcy6w7735pfbdb073mpzfs";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b13a886535a5c33fe389a6b616988b7377249625/recipes/nlinum-hl";
           sha256 = "17lcp1ira7yhch9npg9sf3npwg06yh9zyhg0lnb22xg09lbndj0x";
-          name = "nlinum-hl";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs nlinum ];
         meta = {
@@ -49757,8 +62367,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    nlinum-relative = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, nlinum }:
-    melpaBuild {
+    nlinum-relative = callPackage ({ emacs
+                                   , fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild
+                                   , nlinum }:
+      melpaBuild {
         pname = "nlinum-relative";
         version = "20160526.8";
         src = fetchFromGitHub {
@@ -49767,10 +62382,10 @@
           rev = "5b9950c97ba79a6f0683e38b13da23f39e01031c";
           sha256 = "0h00ghr5sipayfxz7ykzy7bg1p1vkbwxl5xch3x0h8j2cp1dqc3d";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/eb418a464b112f9bb1bbd050e9602b60c0fcce1c/recipes/nlinum-relative";
           sha256 = "15ifh5bfsarkifx6m7d5rhx6hqlnm231plkf623885kar7i85ia4";
-          name = "nlinum-relative";
+          name = "recipe";
         };
         packageRequires = [ emacs nlinum ];
         meta = {
@@ -49778,8 +62393,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    nm = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, notmuch, peg }:
-    melpaBuild {
+    nm = callPackage ({ company
+                      , emacs
+                      , fetchFromGitHub
+                      , fetchurl
+                      , lib
+                      , melpaBuild
+                      , notmuch
+                      , peg }:
+      melpaBuild {
         pname = "nm";
         version = "20151110.1110";
         src = fetchFromGitHub {
@@ -49788,10 +62410,10 @@
           rev = "5a3f29174b3a4b2b2e7a700a862f3b16a942687e";
           sha256 = "1skbjmyikzyiic470sngskggs05r35m8vzm69wbmrjapczginnak";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cdad6565e83dd79db538d3b6a45e932864246da2/recipes/nm";
           sha256 = "004rjbrkc7jalbd8ih170sy97w2g16k3whqrqwywh09pzrzb05kw";
-          name = "nm";
+          name = "recipe";
         };
         packageRequires = [ company emacs notmuch peg ];
         meta = {
@@ -49799,20 +62421,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    nnir-est = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    nnir-est = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "nnir-est";
-        version = "20170818.746";
+        version = "20180710.1403";
         src = fetchFromGitHub {
           owner = "kawabata";
           repo = "nnir-est";
-          rev = "dc1fee4757725b8171b755313d7bafbf1364f49a";
-          sha256 = "054mzb1h7smvvpzkg59pb4fd5rnig9j937wwvdr9s9222akyvkma";
+          rev = "6d0d5c8e33f4e4ccbc22350324c0990d2676fb5a";
+          sha256 = "1xmv2mddhvcvnyndpyv42gl8zn5dx7lvd03pl43bjp38srn4aj6g";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ca17de8cdd53bb32a9d3faaeb38f19f92b18ee38/recipes/nnir-est";
           sha256 = "04ih47pipph8sl84nv6ka4xlpd8vhnpwhs5cchgk5k1zv3l5scxv";
-          name = "nnir-est";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -49820,20 +62445,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    no-emoji = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    no-emoji = callPackage ({ emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "no-emoji";
-        version = "20171214.2310";
+        version = "20180515.1137";
         src = fetchFromGitHub {
           owner = "ecraven";
           repo = "no-emoji";
-          rev = "329b4093bf38f3f4b0e4760c70270d3b45ee554e";
-          sha256 = "1799wh6qy2yaadkdvnvp37320wxkhal8vlnj47d32a1bv8l8s91q";
+          rev = "ebceeab50dbfe4d60235180a57633745dbc18c77";
+          sha256 = "19wni50073dwspppx0xlryagg2fgg0jiz5kqf1b1wmaq8xn5b8r9";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/af6b04c1f95468254f2cf361964df9fd25d23586/recipes/no-emoji";
           sha256 = "1lr6bzjxwn3yzw0mq36h2k2h8bqb1ngin42swhv022yx6a022zn2";
-          name = "no-emoji";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -49841,20 +62470,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    no-littering = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    no-littering = callPackage ({ cl-lib ? null
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "no-littering";
-        version = "20180414.503";
+        version = "20180620.600";
         src = fetchFromGitHub {
           owner = "emacscollective";
           repo = "no-littering";
-          rev = "9bffebc0f4858a06ba374f1d48a7dffd3537b93e";
-          sha256 = "02dhplz597r5qp1mljy1npx2kzg07l938d2xivwy9cd6jlkj35ya";
+          rev = "f1ac5274ba49e3533c356c4cd6d5f8ebed0ec517";
+          sha256 = "07w2x6s29332m3q1cy1igbjqpsyfq3l9x9gk0chn4n0c93wa0174";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/57a2fb9524df3fdfdc54c403112e12bd70888b23/recipes/no-littering";
           sha256 = "15w784ir48v8biiaar8ip19s9y3wn5831m815kcw02mgzy3bfjmh";
-          name = "no-littering";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -49862,20 +62495,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    noaa = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }:
-    melpaBuild {
+    noaa = callPackage ({ cl-lib ? null
+                        , emacs
+                        , fetchFromGitHub
+                        , fetchurl
+                        , lib
+                        , melpaBuild
+                        , request }:
+      melpaBuild {
         pname = "noaa";
-        version = "20170719.1136";
+        version = "20180419.1133";
         src = fetchFromGitHub {
           owner = "thomp";
           repo = "noaa";
-          rev = "a4ec583275450d718334238d2813579420229f65";
-          sha256 = "0ah6b31x9f4lc6q984nilj4g0aqzam5rhb3s61jgx9k4x7jmdks1";
+          rev = "e99f7702512de49f93138dce6e0a7cfe2bc5eed3";
+          sha256 = "1fhq6bly76qj67dbkbdlhl0icqpl4h1k3lip9ig64d8fqykpi8al";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1272203f85375e50d951451bd5fd3baffd57bbfa/recipes/noaa";
           sha256 = "11hzpmgapmf6dc5imvj5jvzcy7hfddyz74lqmrq8128i72q1sj0v";
-          name = "noaa";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs request ];
         meta = {
@@ -49883,20 +62522,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    noccur = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    noccur = callPackage ({ fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "noccur";
         version = "20150514.1420";
         src = fetchFromGitHub {
           owner = "NicolasPetton";
           repo = "noccur.el";
-          rev = "6cc02ce07178a61ae38a849f80472c01969272bc";
-          sha256 = "0wk86gm0by9c8mfbvydz5va07qd30n6wx067inqfa7wjffaq0xr7";
+          rev = "ff2a76883c43b283a08680733ec3ad403a1b1827";
+          sha256 = "0y18hpwgzvm1i9yb3b6fxpbh3fmzkmyldq4as65i5s8n66i7mr6j";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/41f15b8298390310e95cbe137ea1516c0be10b94/recipes/noccur";
           sha256 = "0a8l50v09bgap7rsls808k9wyjpjbcxaffsvz7hh9rw9s7m5fz5g";
-          name = "noccur";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -49904,8 +62546,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    nocomments-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    nocomments-mode = callPackage ({ fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "nocomments-mode";
         version = "20170213.1237";
         src = fetchFromGitHub {
@@ -49914,10 +62559,10 @@
           rev = "5a41a20cc44dfe4a9ea584354ed6dbc15dd92f46";
           sha256 = "0jwwnypa0lx812p3dqqn9c05g27qavnvr23pzphydx9i15nz80g0";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d88074771b581d21f48b707f93949f7224a28633/recipes/nocomments-mode";
           sha256 = "1qhalhs29fb3kv5ckk8ny9fbqn2c4r4lwnc566j3bb1caqf2j7g0";
-          name = "nocomments-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -49925,8 +62570,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    noctilux-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    noctilux-theme = callPackage ({ emacs
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "noctilux-theme";
         version = "20161113.642";
         src = fetchFromGitHub {
@@ -49935,10 +62584,10 @@
           rev = "a3265a1be7f4d73f44acce6d968ca6f7add1f2ca";
           sha256 = "12xx0v8d97kjvlkj0ii78vxxvzgmcfc4hzv4yvxymg50rsy0zzqi";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c0a18df34c105da8c5710643cd8027402bb07c95/recipes/noctilux-theme";
           sha256 = "15ymyv3rq0n31d8h0ry0l4w4r5a8as0q63ajm9wb6yrxxjl1imfp";
-          name = "noctilux-theme";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -49946,8 +62595,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    node-resolver = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    node-resolver = callPackage ({ cl-lib ? null
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "node-resolver";
         version = "20140930.1023";
         src = fetchFromGitHub {
@@ -49956,10 +62609,10 @@
           rev = "ef9d0486907a746a80b02ffc6208a09c168a9f7c";
           sha256 = "1cgmq00ackabwcl4h0n2bb8y08wz0ir5rzca2q3sk4asly6d02m7";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/60537705dc922bd50220d378a2992cf36464eb0c/recipes/node-resolver";
           sha256 = "1ng4rgm8f745fajqnbjhi2rshvn6icwdpbh5dzpzhim1w9kb3bhh";
-          name = "node-resolver";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -49967,8 +62620,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    nodejs-repl = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    nodejs-repl = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "nodejs-repl";
         version = "20170722.443";
         src = fetchFromGitHub {
@@ -49977,10 +62633,10 @@
           rev = "4a4104dbf2cd314e90f35d200f28bd93c34708d0";
           sha256 = "1hcvi4nhgfrjalq8nw20kjjpcf4xmjid70qpqdv8dsgfann5i3wl";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/14f22f97416111fcb02e299ff2b20c44fb75f049/recipes/nodejs-repl";
           sha256 = "0rvhhrsw87kfrwdhm8glq6b3nr0v90ivm7fcc0da4yc2jmcyk907";
-          name = "nodejs-repl";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -49988,8 +62644,36 @@
           license = lib.licenses.free;
         };
       }) {};
-    noflet = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    nodemcu-mode = callPackage ({ emacs
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
+        pname = "nodemcu-mode";
+        version = "20180501.1525";
+        src = fetchFromGitHub {
+          owner = "andrmuel";
+          repo = "nodemcu-mode";
+          rev = "8effd9f3df40b6b92a2f05e4d54750b624afc4a7";
+          sha256 = "1s19sshsm4cdx8kj5prmsq8ryz4843xcqmdayvlfl99jxsp9j4pm";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/a414f8b30954a50d74e4ae42abcf436cfca8d2b4/recipes/nodemcu-mode";
+          sha256 = "0xx5dys8vifgaf3hb4q762xhhn1jybc4xwajqj98iban4nrakb3a";
+          name = "recipe";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/nodemcu-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    noflet = callPackage ({ fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "noflet";
         version = "20141102.654";
         src = fetchFromGitHub {
@@ -49998,10 +62682,10 @@
           rev = "7ae84dc3257637af7334101456dafe1759c6b68a";
           sha256 = "0g70gnmfi8n24jzfci9nrj0n9bn1qig7b8f9f325rin8h7x32ypf";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/df33a7230e0e4a67ce75e5cce6a436e2a0d205e8/recipes/noflet";
           sha256 = "0vzamqb52n330mi6rydrd4ls8nbwh5s42fc2gs5y15zakp6mvhr3";
-          name = "noflet";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -50009,20 +62693,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    nofrils-acme-theme = callPackage ({ emacs, fetchFromGitLab, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    nofrils-acme-theme = callPackage ({ emacs
+                                      , fetchFromGitLab
+                                      , fetchurl
+                                      , lib
+                                      , melpaBuild }:
+      melpaBuild {
         pname = "nofrils-acme-theme";
-        version = "20180227.1353";
+        version = "20180620.548";
         src = fetchFromGitLab {
           owner = "esessoms";
           repo = "nofrils-theme";
-          rev = "0bb6f199ace1488613884075fe588f02000bb0ab";
-          sha256 = "1aslhxk5mp6khf66ac4c441vywhiqpb4kyajagb8b1p10z8hrqva";
+          rev = "98ad7bfaff1d85b33dc162645670285b067c6f92";
+          sha256 = "0f8s7mhcs1ym4an8d4dabfvhin30xs2d0c5gv875hsgz8p3asgxs";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c59ddaa5e41d3c25c446b1ed1905d7f88b448e0a/recipes/nofrils-acme-theme";
           sha256 = "01xqsn8whczv34lfa9vbm5rpvrvsrlpav8pzng10jvax1a9wdp3a";
-          name = "nofrils-acme-theme";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -50030,8 +62718,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    nord-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    nord-theme = callPackage ({ emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "nord-theme";
         version = "20180102.1001";
         src = fetchFromGitHub {
@@ -50040,10 +62732,10 @@
           rev = "b5c1dc762fe3acaa88a0ce9640085d45d0109c43";
           sha256 = "0j1cbwlh646gkjp70maqbq7izchgc23wdax50ykgkw3mxhjrlsf2";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/31cb60069825abe3998c8b43bc9177b39a7f3659/recipes/nord-theme";
           sha256 = "0p4fqg4i2ayimd8kxsqnb1xkapzhhxf7szxi1skva4dcym3z67cc";
-          name = "nord-theme";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -50051,20 +62743,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    nordless-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    nordless-theme = callPackage ({ fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "nordless-theme";
-        version = "20180328.516";
+        version = "20180613.50";
         src = fetchFromGitHub {
           owner = "lthms";
           repo = "nordless-theme.el";
-          rev = "31cf52bfa81cf312421533ccc4a26f79b03b6976";
-          sha256 = "120d5wajjcimfzdmqn1kxav5l6ylpggg9rjhv0n65nmh829f1msm";
+          rev = "e4da9d2465a123ea28e33a507cc7ab69692cde86";
+          sha256 = "172ww1amlvd17f9qr69a17ksk0i8zpfma0arkygmf8n951zkqv8d";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3de9da6cb8c1a75ff1d41a69e156c21be00713b6/recipes/nordless-theme";
           sha256 = "1ylvqh5hf7asdx2mn57fsaa7ncfgfzq1ss50k9665k32zvv3zksx";
-          name = "nordless-theme";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -50072,7 +62767,36 @@
           license = lib.licenses.free;
         };
       }) {};
-    nose = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild {
+    northcode-theme = callPackage ({ emacs
+                                   , fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
+        pname = "northcode-theme";
+        version = "20180423.949";
+        src = fetchFromGitHub {
+          owner = "Northcode";
+          repo = "northcode-theme.el";
+          rev = "4d3750461ba25ec45321318b5f1af4e8fdf16147";
+          sha256 = "1yin5i38jdp47k6b7mc0jkv9ihl8nk5rpqin4qmwbhb871zxn7ma";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/25dcd4dd8189ad0fbf6c31874daa618bf1957863/recipes/northcode-theme";
+          sha256 = "0x4dryx174kcjzm11z9q5qqlzr1c9zr0p32zwgbvgypgnvjy6i4g";
+          name = "recipe";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/northcode-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    nose = callPackage ({ fetchhg
+                        , fetchurl
+                        , lib
+                        , melpaBuild }:
+      melpaBuild {
         pname = "nose";
         version = "20140520.948";
         src = fetchhg {
@@ -50080,10 +62804,10 @@
           rev = "194d7789bf79";
           sha256 = "07bhzddaxdjd591xmg59yd657a1is0q515291jd83mjsmgq258bm";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/nose";
           sha256 = "1xdqsxq06x2m9rcfn1qh89g0mz1rvzl246d3sfmciwcyl932x682";
-          name = "nose";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -50091,18 +62815,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    notmuch = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
+    notmuch = callPackage ({ fetchgit
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "notmuch";
-        version = "20180324.1609";
+        version = "20180503.1659";
         src = fetchgit {
           url = "https://git.notmuchmail.org/git/notmuch";
-          rev = "5d510221d17862a252955d98046508bebcd14573";
-          sha256 = "1pls4wny8f5pdfgmdg4c3cpsdy046hwmlaqlf90x5x9hp2jyibnz";
+          rev = "c20a5eb80520a11cb697a45b0d9553c68e2199c8";
+          sha256 = "13gpsgx5k26x8r38q56y01mfz2r1haxw76hc52mq8vypfl1gpw3x";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d05fbde3aabfec4efdd19a33fd2b1297905acb5a/recipes/notmuch";
           sha256 = "0pznpl0aqybdg4b2qypq6k4jac64sssqhgz6rvk9g2nkqhkds1x7";
-          name = "notmuch";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -50110,8 +62838,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    notmuch-labeler = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, notmuch }:
-    melpaBuild {
+    notmuch-labeler = callPackage ({ fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild
+                                   , notmuch }:
+      melpaBuild {
         pname = "notmuch-labeler";
         version = "20131230.919";
         src = fetchFromGitHub {
@@ -50120,10 +62852,10 @@
           rev = "d65d1129555d368243df4770ecc1e7ccb88efc58";
           sha256 = "1ss87vlp7625lnn2iah3rc1xfxcbpx4kmiww9n16jx073fs2rj18";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2e9940e66bbf70ec868dbdaaeaa1fbd4f076a2e1/recipes/notmuch-labeler";
           sha256 = "1c0cbkk5k8ps01xl63a0xa2adkqaj0znw8qs8ca4ai8v1420bpl0";
-          name = "notmuch-labeler";
+          name = "recipe";
         };
         packageRequires = [ notmuch ];
         meta = {
@@ -50131,20 +62863,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    nov = callPackage ({ dash, emacs, esxml, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    nov = callPackage ({ dash
+                       , emacs
+                       , esxml
+                       , fetchFromGitHub
+                       , fetchurl
+                       , lib
+                       , melpaBuild }:
+      melpaBuild {
         pname = "nov";
-        version = "20180317.345";
+        version = "20180617.1444";
         src = fetchFromGitHub {
           owner = "wasamasa";
           repo = "nov.el";
-          rev = "b4959103619d94a7a1d5fe1d9a15887fc2b12b8f";
-          sha256 = "18kqw9c2a6si1q55r7w8mmwhqfnajdxvrv9dckwxkc4pbgpjkk8j";
+          rev = "3be6e8cd1a6311b0782ca2aa3d9961bec6183632";
+          sha256 = "1i7caa7s0c2qmf8bf9bi6sp7yavpnxlck6gm9fc0lkywrjfq0ixs";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cf543955ba2d5d0074fa2a5ba176f9415f6e006d/recipes/nov";
           sha256 = "0hlcncpdazi4rn5yxd0zq85v7gpjhw7a6dl2i99zf4ymsan97lhq";
-          name = "nov";
+          name = "recipe";
         };
         packageRequires = [ dash emacs esxml ];
         meta = {
@@ -50152,8 +62890,36 @@
           license = lib.licenses.free;
         };
       }) {};
-    noxml-fold = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    nova-theme = callPackage ({ emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
+        pname = "nova-theme";
+        version = "20180530.801";
+        src = fetchFromGitHub {
+          owner = "muirmanders";
+          repo = "emacs-nova-theme";
+          rev = "2f41855ac250d822d2e8cec4610c8645718bd7e3";
+          sha256 = "0gc4jw9mdv2kmhwwf1avxr0magrdhpqlxakd29dxjq9md8qybrvj";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/16457166c17fb1cc074a34c61e52ebc285c0eacc/recipes/nova-theme";
+          sha256 = "1d2271qd5z48x71pxjg4lngsc5ddw5iqh496p04f63sm08cgaky4";
+          name = "recipe";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/nova-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    noxml-fold = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "noxml-fold";
         version = "20170823.657";
         src = fetchFromGitHub {
@@ -50162,10 +62928,10 @@
           rev = "46c7f6a008672213238a9f8d7a416ce80916aa62";
           sha256 = "0axr7n4wdrd009lz6sg4y9ggf4f5svgrsclwhs0hyn2ld34rvrax";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/13d2af88b292293cb5ab50819c63acfe936630c8/recipes/noxml-fold";
           sha256 = "11dninxxwhflf2qrmvwmrryspd9j6m95kdlmyx59ykqvw8j0siqc";
-          name = "noxml-fold";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -50173,8 +62939,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    npm-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    npm-mode = callPackage ({ emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "npm-mode";
         version = "20171103.1135";
         src = fetchFromGitHub {
@@ -50183,10 +62953,10 @@
           rev = "91b8a5ad9301a368e1ce051e625450d7fe3884a4";
           sha256 = "1zzx9956mfrh91d84dpl4ij9b62iza4mflr9qjlh69b8allajngn";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/22dd6b2f8a94f56a61f4b70bd7e44b1bcf96eb18/recipes/npm-mode";
           sha256 = "1aym4jfr6im6hdc5d7995q6myhgig286fk9hpaxdf418h1s17rqr";
-          name = "npm-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -50194,8 +62964,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    nrepl-eval-sexp-fu = callPackage ({ fetchFromGitHub, fetchurl, highlight, lib, melpaBuild, smartparens, thingatpt ? null }:
-    melpaBuild {
+    nrepl-eval-sexp-fu = callPackage ({ fetchFromGitHub
+                                      , fetchurl
+                                      , highlight
+                                      , lib
+                                      , melpaBuild
+                                      , smartparens
+                                      , thingatpt ? null }:
+      melpaBuild {
         pname = "nrepl-eval-sexp-fu";
         version = "20140311.341";
         src = fetchFromGitHub {
@@ -50204,10 +62980,10 @@
           rev = "3a24b7d4bca13e87c987a4ddd212da914ff59191";
           sha256 = "1nwj1ax2qmmlab4lik0b7japhqd424d0rb995dfv89p99gp8vmvc";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/nrepl-eval-sexp-fu";
           sha256 = "1mz7a6aa4x23khlfqhhn9ycs3yxg44h5cckg4v4rc6lbif1jzzf8";
-          name = "nrepl-eval-sexp-fu";
+          name = "recipe";
         };
         packageRequires = [ highlight smartparens thingatpt ];
         meta = {
@@ -50215,20 +62991,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    nrepl-sync = callPackage ({ cider, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    nrepl-sync = callPackage ({ cider
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "nrepl-sync";
         version = "20140807.854";
         src = fetchFromGitHub {
           owner = "phillord";
           repo = "lein-sync";
-          rev = "bab53a2361526d63a24cda176d07a1247bf5b399";
-          sha256 = "1129r3rzmfbl8nxjz71xnlyaszhhldawj467zbl36brdadp014n1";
+          rev = "9506238562c2e0c0df744e0d81edff4c74322a7d";
+          sha256 = "1si5pfczk3iypdx2ydhirznx2hvp6r7sq2hy64gn3mn4r68svlfi";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2059ab6f2a3adc5af4f0876546e344e806e22ee5/recipes/nrepl-sync";
           sha256 = "01b504b4d8rrhlf3sfq3kk9i222fch6jd5jbm02kqw20fgv6q3jd";
-          name = "nrepl-sync";
+          name = "recipe";
         };
         packageRequires = [ cider ];
         meta = {
@@ -50236,20 +63016,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    nsis-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    nsis-mode = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "nsis-mode";
-        version = "20150914.546";
+        version = "20180523.649";
         src = fetchFromGitHub {
           owner = "mattfidler";
           repo = "nsis-mode";
-          rev = "5ea767c326bbe180e42be723605c0b03b16fdb06";
-          sha256 = "1w80mbwlvmpd5ff7vy84z61b27klzh9z4wa6m2g7cy674fw4r1xp";
+          rev = "4e4b6add79cd9a1d8dbe30a4f29de5e96b1170f2";
+          sha256 = "105drr8baa41z7g4smzjimg1hml98rrafifcwb1dhfx32ww9ijsw";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e9b169a80c7afdeb0c6e17cd289114b5d3d97266/recipes/nsis-mode";
           sha256 = "0pc047ryw906sz5mv0awvl67kh20prsgx6fbh0j1qm0cali2792l";
-          name = "nsis-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -50257,20 +63040,28 @@
           license = lib.licenses.free;
         };
       }) {};
-    nu-mode = callPackage ({ ace-window, avy, fetchFromGitHub, fetchurl, lib, melpaBuild, transpose-frame, undo-tree, which-key }:
-    melpaBuild {
+    nu-mode = callPackage ({ ace-window
+                           , avy
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild
+                           , transpose-frame
+                           , undo-tree
+                           , which-key }:
+      melpaBuild {
         pname = "nu-mode";
-        version = "20180220.1315";
+        version = "20180619.1428";
         src = fetchFromGitHub {
           owner = "pyluyten";
           repo = "emacs-nu";
-          rev = "9c9fcb1395a3bd317cb5433c6c4defaa9bb3c7dd";
-          sha256 = "0snynh8mk1ivdphrrpznh16szw2jcagxl7w056wv7j2zmb17agcx";
+          rev = "22cf474e70c4e72045bfb1630814ef03e3b76096";
+          sha256 = "0hfrf92kf3p91d5yn3b4i8x24j20v42rph4dvspmbmkfcyh9qinh";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/230d5f8fdd965a24b8ff3cc94acf378d04815fca/recipes/nu-mode";
           sha256 = "0nzv3p62k8yyyww6idlxyi94q4d07nis7ydypar8d01jfqlrybkn";
-          name = "nu-mode";
+          name = "recipe";
         };
         packageRequires = [
           ace-window
@@ -50284,20 +63075,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    nubox = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    nubox = callPackage ({ fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "nubox";
         version = "20170619.210";
         src = fetchFromGitHub {
           owner = "martijnat";
           repo = "nubox";
-          rev = "1ccb8035ae42727ba6bdd5c1106fbceddeeed370";
-          sha256 = "02yh99rcgxdq6jn4xs8782nl6bjccmal8j78qslvpkrzrrxjajx6";
+          rev = "84aa965f0cb4bde293237e4cc586643d1f662f83";
+          sha256 = "0i1x0sd61c8k4q9ijgxyz21gvj1gah273990qfjzj9a25r4hzvlj";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/725948568b8a067762b63475bc400f089f478a36/recipes/nubox";
           sha256 = "0snzfsd765i363ykdhqkn65lqy97c79d20lalszrwcl2snm96n1f";
-          name = "nubox";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -50305,8 +63099,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    number = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    number = callPackage ({ fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "number";
         version = "20170901.612";
         src = fetchFromGitHub {
@@ -50315,10 +63112,10 @@
           rev = "bbc278d34dbcca83e70e3be855ec98b23debfb99";
           sha256 = "0a1r352zs58mdwkq58561qxrz3m5rwk3xqcaaqhkxc0h9jqs4a9r";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/49d56b297ab729695249143dd65d3c67543cfcc6/recipes/number";
           sha256 = "1nwcdv5ibirxx3sqadh6mnpj40ni3wna7wnjh343mx38dk2dzncf";
-          name = "number";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -50326,20 +63123,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    number-lock = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    number-lock = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "number-lock";
         version = "20160829.1900";
         src = fetchFromGitHub {
           owner = "Liu233w";
           repo = "number-lock.el";
-          rev = "74417b1238953bf485961a0dd7d20f5c36ae25ea";
-          sha256 = "0xmd4q2k0psd53cg71vsyc54iiq0wp9bs00ch68561lrnbjg043w";
+          rev = "1ac1b1a269128ddac820df7d45a8d0c703e9c05c";
+          sha256 = "11pqm2f8bx3m9mnvpjbvq8vd8sym7zpq7n0y4lbkybiyxswjrv5q";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3c107adabe2e4c5b35ebb6b21db076cdea0e9c24/recipes/number-lock";
           sha256 = "13xqn4bcjm01zl0rgbwzad58x35230lm2qiipbyqkh2ma0a9pqn4";
-          name = "number-lock";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -50347,8 +63147,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    numbers = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    numbers = callPackage ({ emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "numbers";
         version = "20170802.434";
         src = fetchFromGitHub {
@@ -50357,10 +63161,10 @@
           rev = "dd02508b788a13b7d4dbcc4923fa23134b783ab3";
           sha256 = "0bgha85j5f9lpk1h3siiw28v5sy6z52n7d7xi3m301r9hdlccc39";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5c77353d3a2b0d360bb28e528ef2707227081c72/recipes/numbers";
           sha256 = "02cx19fi34yvc0icajnwrmb8lr2g8y08kis08v9xxalfxz06kb3h";
-          name = "numbers";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -50368,20 +63172,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    nummm-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    nummm-mode = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "nummm-mode";
         version = "20131117.214";
         src = fetchFromGitHub {
           owner = "agpchil";
           repo = "nummm-mode";
-          rev = "81951e12032274543c5f7a585b29bd93961e94e4";
-          sha256 = "1i0yymsx8kin28bkrgwkk9ngsmjh0gh5j4hb0k03bq4fy799f2xx";
+          rev = "73b1aa8643d86197c82cd28acdaefcb48a1e0abe";
+          sha256 = "1022dchkh0hbhsqds6zncfayjgq5zg2x2r5gklr0nyx8j2qd8g7j";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/nummm-mode";
           sha256 = "1gdq00f3x0rxxj917x9381v2x7cl9yabj7559zr5vj1clwza8jn4";
-          name = "nummm-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -50389,20 +63196,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    nv-delete-back = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    nv-delete-back = callPackage ({ emacs
+                                  , fetchFromGitLab
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "nv-delete-back";
         version = "20170224.449";
-        src = fetchFromGitHub {
+        src = fetchFromGitLab {
           owner = "nivaca";
           repo = "nv-delete-back";
           rev = "44d506105989873dc1725e0cfc675925b35c9c98";
           sha256 = "0lgz0sknnrxmc7iy4lniday1nwpz4q841c3w2hm72aiwn5z21h22";
         };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/a7bdc83e14be56f5848d3066686f5d24c2ed4a3c/recipes/nv-delete-back";
-          sha256 = "0gq119zqcpckm0d6w08mphrssgbvxvschl7xn5y4vdn880vfm7q1";
-          name = "nv-delete-back";
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/7542fa39060b507a6f455225367e45e89d3e2f92/recipes/nv-delete-back";
+          sha256 = "13izzym4alda05k7ra67lyjx6dx23fjqz2dqk7mrzhik9x552hsr";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -50410,8 +63221,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    nvm = callPackage ({ dash, dash-functional, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    nvm = callPackage ({ dash
+                       , dash-functional
+                       , f
+                       , fetchFromGitHub
+                       , fetchurl
+                       , lib
+                       , melpaBuild
+                       , s }:
+      melpaBuild {
         pname = "nvm";
         version = "20171217.836";
         src = fetchFromGitHub {
@@ -50420,10 +63238,10 @@
           rev = "bc0a33257ec16e9f575bb6914b5949199897ada9";
           sha256 = "07fb6xxnij3nyhvf1yfv58zglawijfr0apmgx22qgaray53rp3nw";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/nvm";
           sha256 = "0md1ybc2r2fxykwk21acjhdzy2kw326bdwa1d15c6f48lknzvg4w";
-          name = "nvm";
+          name = "recipe";
         };
         packageRequires = [ dash dash-functional f s ];
         meta = {
@@ -50431,20 +63249,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    nyan-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    nyan-mode = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "nyan-mode";
         version = "20170423.40";
         src = fetchFromGitHub {
           owner = "TeMPOraL";
           repo = "nyan-mode";
-          rev = "3447aa114575230cb230862ac0ac9b065f789ecd";
-          sha256 = "1nlsgkll6gagn4bs092ad1glkcihlcac9ai4cbj63l8x9x346yqg";
+          rev = "4195cd368aca8f05a71cbff4e60cfa9dde10319a";
+          sha256 = "1bnfxw6cnhsqill3n32j9bc6adl437ia9ivbwvwjpz1ay928yxm7";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4d8c3000df5f2ee2493a54dee6f9b65008add753/recipes/nyan-mode";
           sha256 = "1z2wnsbjllqa533g1ab5cgbv3d9hjix7fsd7z9c45nqh5cmadmyv";
-          name = "nyan-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -50452,8 +63273,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    nyx-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    nyx-theme = callPackage ({ emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "nyx-theme";
         version = "20170910.607";
         src = fetchFromGitHub {
@@ -50462,10 +63287,10 @@
           rev = "afe2b8c3b5421b4c292d182dcf77079b278e93d8";
           sha256 = "1qamw4x3yrygy8qkicy6smxksnsfkkp76hlnivswh7dm3fr23v6m";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3440905a20bc91bb2637a87c04ff8410379f150d/recipes/nyx-theme";
           sha256 = "17ajpsbwbal1rwgd38kckh1kvnd412h6fkvj2x4j5rqvjr9nhgr6";
-          name = "nyx-theme";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -50473,8 +63298,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    o-blog = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    o-blog = callPackage ({ fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "o-blog";
         version = "20151202.1539";
         src = fetchFromGitHub {
@@ -50483,10 +63311,10 @@
           rev = "e466c59478feddc8126c43c1b98550474af484c0";
           sha256 = "0xs6787a4v7djgd2zz2v1pk14x27mg2ganz30j9f0gdiai7da6ch";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d5f24e70260f46445b119817bc1326f29b367c4b/recipes/o-blog";
           sha256 = "08grkyvg27wd5232q3y8p0v7higfq7bmsdzmvhja96v6qy2xsbja";
-          name = "o-blog";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -50494,8 +63322,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    oauth = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    oauth = callPackage ({ fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "oauth";
         version = "20130127.1751";
         src = fetchFromGitHub {
@@ -50504,10 +63335,10 @@
           rev = "ee4744ad76a1560281b0c4944575a3bd598c6458";
           sha256 = "058dyk1c3iw0ip8n8rfpskvqiriqilpclkzc18x73msp5svrh3lj";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/oauth";
           sha256 = "0vgxvscb9cr07g3lzpi269kamgzhpac6dir1rlr4qd2wdv0nifl9";
-          name = "oauth";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -50515,20 +63346,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    ob-applescript = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ob-applescript = callPackage ({ fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "ob-applescript";
         version = "20160914.1327";
         src = fetchFromGitHub {
           owner = "stig";
           repo = "ob-applescript.el";
-          rev = "bc708af6cf45707d4e8d8f00ea59a7e413bfaca7";
-          sha256 = "08q0kglajvgpjvzij89z9xiz65r15ddxz16bjk2b59p0vzzy51ij";
+          rev = "b5c2966b3bab37a3b1f4e9c663d11da8ef9956ec";
+          sha256 = "0asab7zppxj9dm20f8i273lr8z19lcrjri7v9gmw1jjn0cshfgjm";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/23b075774be913539c3f057dcb7f24fbc05c37a4/recipes/ob-applescript";
           sha256 = "1gk8cgscj9wbl5k8ahh1a61p271xpk5vk2w64a8y3njnwrwxm9jc";
-          name = "ob-applescript";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -50536,40 +63370,52 @@
           license = lib.licenses.free;
         };
       }) {};
-    ob-async = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
-    melpaBuild {
+    ob-async = callPackage ({ async
+                            , dash
+                            , emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild
+                            , org }:
+      melpaBuild {
         pname = "ob-async";
-        version = "20180410.2058";
+        version = "20180624.1553";
         src = fetchFromGitHub {
           owner = "astahlman";
           repo = "ob-async";
-          rev = "703159f106ba918ccd4e3c053eb887840aea8e5f";
-          sha256 = "06aax8k3p9h49sdy47v73a851b6xwkvz97xgcrplhrpi2w77p7ll";
+          rev = "2333106205fd3fa244ccdfbd95fcabf29eb81116";
+          sha256 = "0lqazlzqsqhhkag7k82ar2clbhhm17mv4bdw0fh8nh4bkpph7p5a";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ob-async";
           sha256 = "0k7kv71nnibp53lav774c61w9pzhq8qvch9rvpyyrwbyd67ninl8";
-          name = "ob-async";
+          name = "recipe";
         };
-        packageRequires = [ async emacs org ];
+        packageRequires = [ async dash emacs org ];
         meta = {
           homepage = "https://melpa.org/#/ob-async";
           license = lib.licenses.free;
         };
       }) {};
-    ob-axiom = callPackage ({ axiom-environment, emacs, fetchgit, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ob-axiom = callPackage ({ axiom-environment
+                            , emacs
+                            , fetchgit
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "ob-axiom";
         version = "20171103.1548";
         src = fetchgit {
           url = "https://bitbucket.org/pdo/axiom-environment";
-          rev = "6842fb7f85df839acde395093647e2f91cf62fdd";
-          sha256 = "1ag5isg0bvarf86978zd2zq1mbs3ysy29ywvgapls6115ws5k9k8";
+          rev = "38cea35e98997e0baf25ab6a1d70ac6daa83a73a";
+          sha256 = "1g1br2va3qz4r0pxmg4254vyscwal6kl2vh0nzlgjpck7x19id5i";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8b4c6b03c5ff78ce327dcf66b175e266bbc53dbf/recipes/ob-axiom";
           sha256 = "17qh4hsr3aw4d0p81px3qcbax6dv2zjhyn5n9pxqwcp2skm5vff5";
-          name = "ob-axiom";
+          name = "recipe";
         };
         packageRequires = [ axiom-environment emacs ];
         meta = {
@@ -50577,8 +63423,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    ob-blockdiag = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ob-blockdiag = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "ob-blockdiag";
         version = "20170727.1801";
         src = fetchFromGitHub {
@@ -50587,10 +63436,10 @@
           rev = "634fcf64a4ae735afe7001d865b03f5d71e23046";
           sha256 = "0xr3bv4wxz13b1grfyl2qnrszzab3n9735za837nf4lxh527ksaj";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/261b77a3fd07644d1c250b16857de70cc1bbf478/recipes/ob-blockdiag";
           sha256 = "1lmawbgrlp6qd7p664jcl98y1xd2yqw9np6j52bh9i6s3cz6628g";
-          name = "ob-blockdiag";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -50598,8 +63447,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    ob-browser = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
-    melpaBuild {
+    ob-browser = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild
+                              , org }:
+      melpaBuild {
         pname = "ob-browser";
         version = "20170720.1218";
         src = fetchFromGitHub {
@@ -50608,10 +63461,10 @@
           rev = "a347d9df1c87b7eb660be8723982c7ad2563631a";
           sha256 = "0q2amf2kh2gkn65132q9nvn87pws5mmnr3wm1ajk23c01kcjf29c";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c51529213c15d42a7a7b76771f07dd73c036a51f/recipes/ob-browser";
           sha256 = "1yqbzmmazamgf8fi8ipq14ffm8h1pp5d2lkflbxjsagdq61hirxm";
-          name = "ob-browser";
+          name = "recipe";
         };
         packageRequires = [ org ];
         meta = {
@@ -50619,20 +63472,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    ob-cfengine3 = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ob-cfengine3 = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "ob-cfengine3";
         version = "20180102.1012";
         src = fetchFromGitHub {
           owner = "nickanderson";
           repo = "ob-cfengine3";
-          rev = "93ebcfceec3734f4bd187ae123686187d66fd401";
-          sha256 = "0cyjdg8vzaf31gqsgmz5znw7v2p36jiz3sj1jvw7vhr8s4iar81i";
+          rev = "2d15491e91ba84f5242610fdffafe31d4d68dc4a";
+          sha256 = "1fp9ll4kp3qjyj0ai1fygrwzja7yblq7si8h7hsgwfmcr261d15v";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d068233c438e76cbcc6e9a97cbec9b2550a18ed6/recipes/ob-cfengine3";
           sha256 = "1pp3mykc5k629qlqixpl2900m1j604xpp6agrngwagsvf7qkhnvl";
-          name = "ob-cfengine3";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -50640,8 +63496,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    ob-clojurescript = callPackage ({ emacs, fetchFromGitLab, fetchurl, lib, melpaBuild, org }:
-    melpaBuild {
+    ob-clojurescript = callPackage ({ emacs
+                                    , fetchFromGitLab
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild
+                                    , org }:
+      melpaBuild {
         pname = "ob-clojurescript";
         version = "20180406.1128";
         src = fetchFromGitLab {
@@ -50650,10 +63511,10 @@
           rev = "17ee1558aa94c7b0246fd03f684884122806cfe7";
           sha256 = "1an4m7mpr345xw4fanyf2vznxm1dxbv35987caq1wq9039mzfaxr";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0c9ccc0d2d034944cb9688d5e184fa5df95f6b31/recipes/ob-clojurescript";
           sha256 = "0h4qjz65k8m1ms7adrm5ypmjcjxx1nws1jmda88c4jjwjyz40jjf";
-          name = "ob-clojurescript";
+          name = "recipe";
         };
         packageRequires = [ emacs org ];
         meta = {
@@ -50661,8 +63522,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    ob-coffee = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
-    melpaBuild {
+    ob-coffee = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild
+                             , org }:
+      melpaBuild {
         pname = "ob-coffee";
         version = "20170725.724";
         src = fetchFromGitHub {
@@ -50671,10 +63536,10 @@
           rev = "7f0b330273e8af7777de87a75fe52a89798e4548";
           sha256 = "1w3fw3ka46d7vcsdq03l0wlviwsk52asfjiy9zfk4qabhpqwj9mz";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e23d7f1d021b07053acb57e2668ece0eaed0f817/recipes/ob-coffee";
           sha256 = "16k8r9rqz4mayxl85pjdfsrz43k2hwcf8k7aff8wnic0ldzp6ivf";
-          name = "ob-coffee";
+          name = "recipe";
         };
         packageRequires = [ org ];
         meta = {
@@ -50682,8 +63547,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    ob-coffeescript = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ob-coffeescript = callPackage ({ emacs
+                                   , fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "ob-coffeescript";
         version = "20180125.2319";
         src = fetchFromGitHub {
@@ -50692,10 +63561,10 @@
           rev = "5a5bb04aea9c2a6eab5b05f90f5c7cb6de7b4261";
           sha256 = "0yy20w1127xmz0mx2swbr294vg0jh8g0ibj5bpdf55xwdnv6im2l";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ba1a808c77653bac1948d6c44bd1db09301ffeff/recipes/ob-coffeescript";
           sha256 = "05q1wnabw52kd3fpcpinpxs9z6xmi4n1p19jbcz0bgjpnw05s27p";
-          name = "ob-coffeescript";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -50703,20 +63572,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    ob-crystal = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ob-crystal = callPackage ({ emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "ob-crystal";
         version = "20180125.2318";
         src = fetchFromGitHub {
           owner = "brantou";
           repo = "ob-crystal";
-          rev = "d84c1adee4b269cdba06a97caedb8071561a09af";
-          sha256 = "1fny4fj4407lcp4k3379gbixk3wd171snw49p1kny2mvxrliz22h";
+          rev = "b3bb27a21a4cefef3f5aeef52718b694bd51245b";
+          sha256 = "0clrvk2vz1ag93rlmsc0dd0pgxb4x22935v51jqjkp2gw3n50kxx";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b9a7d43199a83ab6f672aaa69ef4e158c868f180/recipes/ob-crystal";
           sha256 = "11mk2spwlddbrvcimhzw43b6d3gxzmi8br58bily1x4qkvl6zy4n";
-          name = "ob-crystal";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -50724,8 +63597,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    ob-cypher = callPackage ({ cypher-mode, dash, dash-functional, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    ob-cypher = callPackage ({ cypher-mode
+                             , dash
+                             , dash-functional
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild
+                             , s }:
+      melpaBuild {
         pname = "ob-cypher";
         version = "20170725.720";
         src = fetchFromGitHub {
@@ -50734,10 +63614,10 @@
           rev = "114bdf6db20ee0ade060bb5df379ddee48ff4f26";
           sha256 = "142d91jvf7nr7q2sj61njy5hv6ljhsq2qkvkdbkfqj07rgpwfgn3";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/dc05c833f64e7974cf5a2ad60a053a04267251cb/recipes/ob-cypher";
           sha256 = "1ygmx0rjvxjl8hifkkwrkk9gpsmdsk6ndb6pg7y78p8hfp5jpyq3";
-          name = "ob-cypher";
+          name = "recipe";
         };
         packageRequires = [ cypher-mode dash dash-functional s ];
         meta = {
@@ -50745,20 +63625,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    ob-dao = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
-    melpaBuild {
+    ob-dao = callPackage ({ fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild
+                          , org }:
+      melpaBuild {
         pname = "ob-dao";
         version = "20170816.858";
         src = fetchFromGitHub {
           owner = "xuchunyang";
           repo = "ob-dao";
-          rev = "fa92f62a63c684d689f57e790e5dd614c5bba270";
-          sha256 = "18i2qwxcn5p1hj32svl54n0dv2j551n3nmgb4h8gbvs39rl49qkq";
+          rev = "8c62bd800b1f572860e30be4b72c71fa415a2e31";
+          sha256 = "12pxn04qn24grinbybaj03qimg6vc1n2cbs9bh94s9zcyg2wv982";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6284c73f1d0797fa2ed4d9a11d3198076cc5fff9/recipes/ob-dao";
           sha256 = "0nj1qyac0lj5ljrqfqi9g2z0d7z5yihajkvjhlx5kg9zs3lgs5rs";
-          name = "ob-dao";
+          name = "recipe";
         };
         packageRequires = [ org ];
         meta = {
@@ -50766,20 +63650,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    ob-dart = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ob-dart = callPackage ({ fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "ob-dart";
         version = "20170106.824";
         src = fetchFromGitHub {
           owner = "mzimmerm";
           repo = "ob-dart";
-          rev = "04d63b922a5469506560ca0c00678e57131e0269";
-          sha256 = "1r0r0dqsr44kcbj2w96rbx8alvkkfzc98ac35zb4ncy1bf71jhfb";
+          rev = "2e463d83a3fe1c9c86f2040e0d22c06dfa49ecbf";
+          sha256 = "0qkyyrrgs0yyqzq6ks1xcb8iwm1qfxwan1n8ichmrsbhwsc05jd3";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bb3219b9623587365f56e9eeb4bd97f3dc449a11/recipes/ob-dart";
           sha256 = "1lqi4pazkjcxvmm2bdpd9vcakmdclkamb69xwxdl44p68wsq2gn8";
-          name = "ob-dart";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -50787,20 +63674,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    ob-diagrams = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ob-diagrams = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "ob-diagrams";
         version = "20160407.537";
         src = fetchFromGitHub {
           owner = "bergey";
           repo = "org-babel-diagrams";
-          rev = "ed6649616325ca5b2d2109f74aded8bcb8aa5186";
+          rev = "be45815f5596d181592fae709096b7b5f4a71992";
           sha256 = "0kx95lvkvg6h6lhs9knlp8rwi05y8y0i8w8vs7mwm378syls0qk0";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fbb31def39fef108ecf7be105a901abfa6845f76/recipes/ob-diagrams";
           sha256 = "1r1p9l61az1jb5m4k2dwnkp9j8xlcb588gq4mcg796vnbdscfcy2";
-          name = "ob-diagrams";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -50808,8 +63698,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    ob-elixir = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
-    melpaBuild {
+    ob-elixir = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild
+                             , org }:
+      melpaBuild {
         pname = "ob-elixir";
         version = "20170725.719";
         src = fetchFromGitHub {
@@ -50818,10 +63712,10 @@
           rev = "8990a8178b2f7bd93504a9ab136622aab6e82e32";
           sha256 = "19awvfbjsnd5la14ad8cfd20pdwwlf3d2wxmz7kz6x6rf48x38za";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/287e4758f6f1df0152d68577abd91478c4a3f4ab/recipes/ob-elixir";
           sha256 = "1l5b9hww2vmqnjlsd6lbjpz9walck82ngang1amfnk4xn6d0gdhi";
-          name = "ob-elixir";
+          name = "recipe";
         };
         packageRequires = [ org ];
         meta = {
@@ -50829,20 +63723,49 @@
           license = lib.licenses.free;
         };
       }) {};
-    ob-fsharp = callPackage ({ emacs, fetchFromGitHub, fetchurl, fsharp-mode, lib, melpaBuild }:
-    melpaBuild {
+    ob-elvish = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
+        pname = "ob-elvish";
+        version = "20180427.1200";
+        src = fetchFromGitHub {
+          owner = "zzamboni";
+          repo = "ob-elvish";
+          rev = "369181ceae1190bf971c71aebf9fc6133bd98c39";
+          sha256 = "170bw9qryhzjzmyi84qc1jkzy1y7i8sjz6vmvyfc264ia4j51m9w";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/90e979025f56061bc960f630945b09320a3dd28e/recipes/ob-elvish";
+          sha256 = "1rpn3dabwgray1w55jib4ixr3l1afz9j7nyn0ha2r602hs02x1ya";
+          name = "recipe";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/ob-elvish";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ob-fsharp = callPackage ({ emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , fsharp-mode
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "ob-fsharp";
         version = "20170618.729";
         src = fetchFromGitHub {
           owner = "juergenhoetzel";
           repo = "ob-fsharp";
-          rev = "0b2fdd9bb4f38af8b5cf4914627af52f5b43d9f7";
-          sha256 = "1z1m2dqnvyyv9ff289p8x1hajnz9n0mmfkrkyl1zvipaqd9mgljw";
+          rev = "65ec2b626ac55313d8a04e746940370f615fed1e";
+          sha256 = "12k6z3zsh8av3avhl2a62v475bpxpcdy56v8i248bv1wgd3ma2mi";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/89bc8c5fe6db0573109e82b3d1350d33d6d8aff5/recipes/ob-fsharp";
           sha256 = "1b9052lvr03vyizkjz3qsa8cw3pjml4kb3yy13jwh09jz5q87qbf";
-          name = "ob-fsharp";
+          name = "recipe";
         };
         packageRequires = [ emacs fsharp-mode ];
         meta = {
@@ -50850,8 +63773,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    ob-go = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ob-go = callPackage ({ fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "ob-go";
         version = "20170731.1057";
         src = fetchFromGitHub {
@@ -50860,10 +63786,10 @@
           rev = "28a0250cd969974936e44dfdccb0265632d25f84";
           sha256 = "1g595miqn7wdmphvgi06ijqzjy801nal226kbghk9p002s3xzzn0";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3afb687d6d3d1e52336ca9a7343278a9f37c3d54/recipes/ob-go";
           sha256 = "09d8jrzijf8gr08615rdmf366zgip43dxvyihy0yzhk7j0p3iahj";
-          name = "ob-go";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -50871,20 +63797,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    ob-http = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    ob-http = callPackage ({ cl-lib ? null
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild
+                           , s }:
+      melpaBuild {
         pname = "ob-http";
-        version = "20180416.822";
+        version = "20180707.748";
         src = fetchFromGitHub {
           owner = "zweifisch";
           repo = "ob-http";
-          rev = "b68a0187e4f67e57891a3faae384d650a1cf31fc";
-          sha256 = "0107xn1z2im8672lwsw4r7blza1gamgihy9aahxyf27jc0a2zvfx";
+          rev = "b1428ea2a63bcb510e7382a1bf5fe82b19c104a7";
+          sha256 = "11fx9c94xxhl09nj9z5b5v6sm0xwkqawgjnnm7bg56vvj495n6h7";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/950b02f76a04f453992b8720032e8c4cec9a039a/recipes/ob-http";
           sha256 = "0b7ghz9pqbyn3b52cpmnwa2wnd4svj23p6gc48ybwzwiid42wiss";
-          name = "ob-http";
+          name = "recipe";
         };
         packageRequires = [ cl-lib s ];
         meta = {
@@ -50892,20 +63823,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    ob-hy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ob-hy = callPackage ({ emacs
+                         , fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "ob-hy";
-        version = "20180125.2316";
+        version = "20180701.2240";
         src = fetchFromGitHub {
           owner = "brantou";
           repo = "ob-hy";
-          rev = "44b1afb42c8a72febdbe68b6816134bc5957e5ba";
-          sha256 = "0j34fsyqz28qjpggibbaqfwja10f06d9gh3pndlj6ghfx8i0plrh";
+          rev = "a42ecaf440adc03e279afe43ee5ef6093ddd542a";
+          sha256 = "0kv92r6j0dcqcg1s0g4iq1xvanscg6crwniysbrq6ifvmc4lvfdj";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/12a7a7dba169010a3a047f961010236a203c16c2/recipes/ob-hy";
           sha256 = "18a8fpda0f28wxmjprhd9dmz7bpk1j3iayl20lqffrcal6m4f1h7";
-          name = "ob-hy";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -50913,8 +63848,16 @@
           license = lib.licenses.free;
         };
       }) {};
-    ob-ipython = callPackage ({ dash, dash-functional, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    ob-ipython = callPackage ({ dash
+                              , dash-functional
+                              , emacs
+                              , f
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild
+                              , s }:
+      melpaBuild {
         pname = "ob-ipython";
         version = "20180224.153";
         src = fetchFromGitHub {
@@ -50923,10 +63866,10 @@
           rev = "7147455230841744fb5b95dcbe03320313a77124";
           sha256 = "1a10fc2jk37ni5sjjvf87s5nyaz2a6h2mlj5dxh4dhv5sd3bb85p";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/557c36e86844c211f2d2ee097ce51ee9db92ea8b/recipes/ob-ipython";
           sha256 = "06llf365k8m81ljmlajqvxlh84qg6h0flp3m6gb0zx71xilvw186";
-          name = "ob-ipython";
+          name = "recipe";
         };
         packageRequires = [ dash dash-functional emacs f s ];
         meta = {
@@ -50934,8 +63877,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    ob-kotlin = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
-    melpaBuild {
+    ob-kotlin = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild
+                             , org }:
+      melpaBuild {
         pname = "ob-kotlin";
         version = "20170725.718";
         src = fetchFromGitHub {
@@ -50944,10 +63891,10 @@
           rev = "3b2f57e9944cfc36f2714dc550db42159904929a";
           sha256 = "1fgfl4j0jgz56a1w8h2mvnzisz123c1xz7ga380bg1hmy44dbv5j";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7aa74d349eb55aafddfc4327b6160ae2da80d689/recipes/ob-kotlin";
           sha256 = "19g4s9dnipg9aa360mp0affmnslm6h7byg595rnaz6rz25a3qdpx";
-          name = "ob-kotlin";
+          name = "recipe";
         };
         packageRequires = [ org ];
         meta = {
@@ -50955,8 +63902,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    ob-lfe = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
-    melpaBuild {
+    ob-lfe = callPackage ({ fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild
+                          , org }:
+      melpaBuild {
         pname = "ob-lfe";
         version = "20170725.720";
         src = fetchFromGitHub {
@@ -50965,10 +63916,10 @@
           rev = "f7780f58e650b4d29dfd834c662b1d354b620a8e";
           sha256 = "1ricvb2wxsmsd4jr0301pk30mswx41msy07fjgwhsq8dimxzmngp";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d595d3b93e6b25ece1cdffc9d1502e8a868eb538/recipes/ob-lfe";
           sha256 = "11cpaxk9wb27b9zhyns75dqpds4gh3cbjcvia4p2bnvmbm8lz4y8";
-          name = "ob-lfe";
+          name = "recipe";
         };
         packageRequires = [ org ];
         meta = {
@@ -50976,8 +63927,35 @@
           license = lib.licenses.free;
         };
       }) {};
-    ob-ml-marklogic = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ob-mermaid = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
+        pname = "ob-mermaid";
+        version = "20180522.959";
+        src = fetchFromGitHub {
+          owner = "arnm";
+          repo = "ob-mermaid";
+          rev = "7f7fb533babc0b783c20e82527ddc7f0ebfbb629";
+          sha256 = "0cllrjbbcqgr8qm9n8w7bmvgh2xvrrl3gqjmws3rsn0k7biq3kz5";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4df483806a4caaeb99fdac42f83bfe648d2e4165/recipes/ob-mermaid";
+          sha256 = "0fp57m80ksnb6zs1gndwsqhrphkv9lfysq0h7h8g3parizh2idzs";
+          name = "recipe";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/ob-mermaid";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ob-ml-marklogic = callPackage ({ fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "ob-ml-marklogic";
         version = "20170622.1133";
         src = fetchFromGitHub {
@@ -50986,10 +63964,10 @@
           rev = "f678af0f440b3030e311ed6fbc444200be04da91";
           sha256 = "1fszg6bn927bi1dx4zgiq0wr7zxrjv8sjrwgn9mansbljszbmccm";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/edce412552d4798450493e0a3dbe768f38f77cc7/recipes/ob-ml-marklogic";
           sha256 = "1y5cgba7gzlmhdrs0k7clgrxixdl4najj5271x1m023jch7bz7xl";
-          name = "ob-ml-marklogic";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -50997,8 +63975,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    ob-mongo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
-    melpaBuild {
+    ob-mongo = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild
+                            , org }:
+      melpaBuild {
         pname = "ob-mongo";
         version = "20170720.1219";
         src = fetchFromGitHub {
@@ -51007,10 +63989,10 @@
           rev = "371bf19c7c10eab2f86424f8db8ab685997eb5aa";
           sha256 = "02k4gvh1nqhn0h36h77vvms7xwwak8rdddibbidsrwwspbr4qr1s";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e020ea3ef89a3787d498c2f698c82c5073c9ee32/recipes/ob-mongo";
           sha256 = "1cgmqsl5dzi8xy3sh5xsfkczl555fpd4q6kgsh9xkn74sz227907";
-          name = "ob-mongo";
+          name = "recipe";
         };
         packageRequires = [ org ];
         meta = {
@@ -51018,20 +64000,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    ob-nim = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ob-nim = callPackage ({ cl-lib ? null
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "ob-nim";
         version = "20170809.1130";
         src = fetchFromGitHub {
           owner = "lompik";
           repo = "ob-nim";
-          rev = "bf1642cb93f0a898804dc13fd9408d2964403bd2";
-          sha256 = "1xgi863wn1pvlsajmldd706k1dk7d7pa6b9nbgsh34kzchvhd75s";
+          rev = "742b6b1fccdb245807b540f41f7f422b27f36230";
+          sha256 = "0qnx9b40y1vxb7wsznnn29chl80fwlh42g2gm9l1p8jvli3jm2wp";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7263ebadeabe36359c14ffb36deda2bc75f2ca61/recipes/ob-nim";
           sha256 = "07i9n9z9xswbisq4rvgg7vbqj28c6j1xk96kpdbk8ffdvgybcpfz";
-          name = "ob-nim";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -51039,8 +64025,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    ob-prolog = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ob-prolog = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "ob-prolog";
         version = "20180328.1034";
         src = fetchFromGitHub {
@@ -51049,10 +64038,10 @@
           rev = "8e34b273730423f267138e9f9a0abe7718f3a5fa";
           sha256 = "0kn4dph1wfigh9l8r8ghxgnixjxawfh335kh4ypab1hb528pdq2n";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fb87868cd74325f0a4a38c5542c264501000951d/recipes/ob-prolog";
           sha256 = "0ki8yd20yk5xwn0zpk06zjxzgrsf8paydif9n98svb9s2l9wrh1s";
-          name = "ob-prolog";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -51060,20 +64049,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    ob-restclient = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, restclient }:
-    melpaBuild {
+    ob-restclient = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild
+                                 , restclient }:
+      melpaBuild {
         pname = "ob-restclient";
-        version = "20160323.2305";
+        version = "20180703.902";
         src = fetchFromGitHub {
           owner = "alf";
           repo = "ob-restclient.el";
-          rev = "08b82b9ea668631968ae4fb531fd74494630f840";
-          sha256 = "09zxf158sspwv7j0kjjxzlymxi9ax7xpk5d5fry2jljskgn17csv";
+          rev = "3af542c0895d7b4fabe84275ac5c7a214340c8ec";
+          sha256 = "0khrvpn92kxpfndzybk9h2and5a7rzazvj598lpwllfs1y8fbsas";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/28c1d3af3f8b2f598b80b03b64de5d15cbb3f13d/recipes/ob-restclient";
           sha256 = "0nv2wsqmpschym6ch8fr4a79hlnpz31jc8y2flsygaqj0annjkfk";
-          name = "ob-restclient";
+          name = "recipe";
         };
         packageRequires = [ restclient ];
         meta = {
@@ -51081,20 +64074,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    ob-rust = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ob-rust = callPackage ({ fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "ob-rust";
-        version = "20170730.759";
+        version = "20180606.1646";
         src = fetchFromGitHub {
           owner = "micanzhang";
           repo = "ob-rust";
-          rev = "f23d93725c21ab95a44cb4d2c0c4ab0489bd55d9";
-          sha256 = "0indljqh6idfwza286gi9dkqwrndbnny4a5f7csz8gssmn0x3i30";
+          rev = "a0e3c62ac3d4d44ae73746b5a45c04322c908bd3";
+          sha256 = "1hjn27k9jnykipb9lbk2py83abaawvsm503pkzmggd4zzpf6f9qq";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/843affc2fd481647c5377bf9a96b636b39718034/recipes/ob-rust";
           sha256 = "1syzwh399wcwqhg1f3fvl12978dr574wji7cknqvll3hyh0zwd65";
-          name = "ob-rust";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -51102,20 +64098,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    ob-sagemath = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, sage-shell-mode }:
-    melpaBuild {
+    ob-sagemath = callPackage ({ emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild
+                               , s
+                               , sage-shell-mode }:
+      melpaBuild {
         pname = "ob-sagemath";
         version = "20170130.1833";
         src = fetchFromGitHub {
           owner = "stakemori";
           repo = "ob-sagemath";
-          rev = "68d3e516c712bc7aa5042f305f3eb5bbb6d656c2";
-          sha256 = "1yr7d3ayrdnycapnhc08zyf6b9gp7xw0pngz90h75s6j33pisx30";
+          rev = "1d99614509624d7bfd457325ca52f3bf1059f4d5";
+          sha256 = "11qsh0lfb1kqiz0cfx7acfpyw0a90bh7r86a4h31d4xl1xfq94sx";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/dc074af316a09906a26ad957a56e3dc272cd813b/recipes/ob-sagemath";
           sha256 = "02ispac1y4g7p7iyscf5p8lvp92ncrn6281jm9igyiny1w6hivy7";
-          name = "ob-sagemath";
+          name = "recipe";
         };
         packageRequires = [ emacs s sage-shell-mode ];
         meta = {
@@ -51123,8 +64125,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    ob-sml = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, sml-mode }:
-    melpaBuild {
+    ob-sml = callPackage ({ fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild
+                          , sml-mode }:
+      melpaBuild {
         pname = "ob-sml";
         version = "20130829.1143";
         src = fetchFromGitHub {
@@ -51133,10 +64139,10 @@
           rev = "958165c92b6cff6cada5c85c8ae5887806b8451b";
           sha256 = "0gymna48igcixrapjmg842pnlsshhw8zplxwyyn0x2yrma9fjyyg";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d1b0fbe1198fa624771c2f61249db502de57942a/recipes/ob-sml";
           sha256 = "04qvzhwjr8ipvq3znnhn0wbl4pbb1rwxi90iidavzk3phbkpaskn";
-          name = "ob-sml";
+          name = "recipe";
         };
         packageRequires = [ sml-mode ];
         meta = {
@@ -51144,20 +64150,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    ob-sql-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ob-sql-mode = callPackage ({ emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "ob-sql-mode";
-        version = "20170213.1056";
+        version = "20180426.1211";
         src = fetchFromGitHub {
           owner = "nikclayton";
           repo = "ob-sql-mode";
-          rev = "778232af7c87b6a32ecb3668a9e5a2763d6a4830";
-          sha256 = "04npsn7awdp1n7fgwidaza58mjbmm3jsv2d992h2vzslfcyx2hnl";
+          rev = "8d36d312bec4a742bec8890373948a888cac18de";
+          sha256 = "1q69acl5lrnac14r8mddvdphvfl4wphqilfgm8l2f5nzhi9cmn02";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ob-sql-mode";
           sha256 = "143agagkmwqwdqc0mbdsqp6v02y12q437v4x6dlh81yihif56rdk";
-          name = "ob-sql-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -51165,8 +64175,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    ob-swift = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
-    melpaBuild {
+    ob-swift = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild
+                            , org }:
+      melpaBuild {
         pname = "ob-swift";
         version = "20170921.625";
         src = fetchFromGitHub {
@@ -51175,10 +64189,10 @@
           rev = "ed478ddbbe41ce5373efde06b4dd0c3663c9055f";
           sha256 = "1vwg10d33mwb32bpdbpghfihy3ryiqbc4yydpb5hfv3v5k83vs0x";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b401383966398d3223032c59baa920ce594e5fef/recipes/ob-swift";
           sha256 = "19mcjfmijbajldm3jz8ij1x2p7d164mbq2ln6yb6iihxmdqnn2q4";
-          name = "ob-swift";
+          name = "recipe";
         };
         packageRequires = [ org ];
         meta = {
@@ -51186,8 +64200,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    ob-translate = callPackage ({ fetchFromGitHub, fetchurl, google-translate, lib, melpaBuild, org }:
-    melpaBuild {
+    ob-translate = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , google-translate
+                                , lib
+                                , melpaBuild
+                                , org }:
+      melpaBuild {
         pname = "ob-translate";
         version = "20170720.1219";
         src = fetchFromGitHub {
@@ -51196,10 +64215,10 @@
           rev = "9d9054a51bafd5a29a8135964069b4fa3a80b169";
           sha256 = "143dq3wp3h1zzk8ihj8yjw9ydqnf48q7y8yxxa0ly7f2v1li84bc";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4d89e4006afc51bd44e23f87a1d1ef1140489ab3/recipes/ob-translate";
           sha256 = "1hi0rxbyxvk9sbk2fy3kqw7l4lgri921vya1mn4i1q2i1979r2gz";
-          name = "ob-translate";
+          name = "recipe";
         };
         packageRequires = [ google-translate org ];
         meta = {
@@ -51207,8 +64226,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    ob-typescript = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
-    melpaBuild {
+    ob-typescript = callPackage ({ emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild
+                                 , org }:
+      melpaBuild {
         pname = "ob-typescript";
         version = "20150804.530";
         src = fetchFromGitHub {
@@ -51217,10 +64241,10 @@
           rev = "9dcbd226cbfb75e790dd9de91d9401dde85a889a";
           sha256 = "1ycqdjqn5361pcnc95hxhjqd3y96cjjnaylrnzwhmacl38jm3vai";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/11733cd33add89b541dcc1f90a732833861b10d9/recipes/ob-typescript";
           sha256 = "1wpy928ndvc076jzi14f6k5fsw8had0pz7f1yjdqql4icszhqa0p";
-          name = "ob-typescript";
+          name = "recipe";
         };
         packageRequires = [ emacs org ];
         meta = {
@@ -51228,8 +64252,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    ob-uart = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ob-uart = callPackage ({ fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "ob-uart";
         version = "20170521.158";
         src = fetchFromGitHub {
@@ -51238,10 +64265,10 @@
           rev = "90daeac90a9e75c20cdcf71234c67b812110c50e";
           sha256 = "1syxxq411izmyfrhlywasax7n5c3yjy487mvfdjzjg8csmmk0m9v";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5334f1a48b8ea6b7a660db27910769093c76113d/recipes/ob-uart";
           sha256 = "1dkbyk8da0zw784dgwi8njnz304s54341dyfzvlb0lhcn41dmkz7";
-          name = "ob-uart";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -51249,8 +64276,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    oberon = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    oberon = callPackage ({ fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "oberon";
         version = "20120715.209";
         src = fetchFromGitHub {
@@ -51259,10 +64289,10 @@
           rev = "fb57d18ce13835a8a69b6bafecdd9193ca9a59a3";
           sha256 = "16462cgq91jg7i97h440zss5vw2qkxgdy7gm148ns4djr2fchnf6";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5f2a50f62475639af011c99c6cc38928b74b3b0a/recipes/oberon";
           sha256 = "1wna7ld670r6ljdg5yx0ga0grbq1ma8q92gkari0d5czr7s9lggv";
-          name = "oberon";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -51270,8 +64300,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    obfusurl = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    obfusurl = callPackage ({ cl-lib ? null
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "obfusurl";
         version = "20170809.824";
         src = fetchFromGitHub {
@@ -51280,10 +64314,10 @@
           rev = "7a5a41905000ce2ec1fd72509a5567e5fd9f47e5";
           sha256 = "0jbrxlpx0cxg8jzqrssk3y3ab7v62ymi6ys24542a8vpk522vqxk";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/201fe11682cb06b26775a52c81b6a1258b74b4d0/recipes/obfusurl";
           sha256 = "0xx2zsjbkd17iy7xzqc66f9xgc97f9js3nz656yhmmxakjk2krra";
-          name = "obfusurl";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -51291,8 +64325,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    objc-font-lock = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    objc-font-lock = callPackage ({ fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "objc-font-lock";
         version = "20141021.1122";
         src = fetchFromGitHub {
@@ -51301,10 +64338,10 @@
           rev = "34b457d577f97ca94b8792d025f9a909c7610612";
           sha256 = "138c1nm579vr37dqprqsakfkhs2awm3klzyyd6bv9rhkrysrpbqk";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f6f93d328e137d2ca069328932b60c3bf60b0a4e/recipes/objc-font-lock";
           sha256 = "0njslpgdcph3p3gamrbd6pc04szks07yv4ij3p1l7p5dc2p06rs6";
-          name = "objc-font-lock";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -51312,8 +64349,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    obsidian-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    obsidian-theme = callPackage ({ fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "obsidian-theme";
         version = "20170719.248";
         src = fetchFromGitHub {
@@ -51322,10 +64362,10 @@
           rev = "f45efb2ebe9942466c1db6abbe2d0e6847b785ea";
           sha256 = "1d36mdq8b1q1x84a2nb93bwnzlpdldiafh7q7qfjjm9dsgbij73b";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e90227252eb69d3eac81f5a6bd5e3a582d33f335/recipes/obsidian-theme";
           sha256 = "17ckshimdma6fqiis4kxczxkbrsfpm2a0b41m5f3qz3qlhcw2xgr";
-          name = "obsidian-theme";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -51333,8 +64373,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    occidental-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    occidental-theme = callPackage ({ fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "occidental-theme";
         version = "20130312.1258";
         src = fetchFromGitHub {
@@ -51343,10 +64386,10 @@
           rev = "fd2db7256d4f78c43d99c3cddb1c39106d479816";
           sha256 = "0pnliw02crqw8hbg088klz54z6s1ih8q2lcn9mq5f12xi752hxm8";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/736fd0b7865cc800800fa6467019a365ddf1c412/recipes/occidental-theme";
           sha256 = "1ra5p8k96wvb04v69xm87jl4jlgi57v4jw2xxzkwbwxbydncnv0b";
-          name = "occidental-theme";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -51354,8 +64397,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    occur-context-resize = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    occur-context-resize = callPackage ({ fetchFromGitHub
+                                        , fetchurl
+                                        , lib
+                                        , melpaBuild }:
+      melpaBuild {
         pname = "occur-context-resize";
         version = "20170904.1609";
         src = fetchFromGitHub {
@@ -51364,10 +64410,10 @@
           rev = "cdee5a631ceed9337579d4090e0acf8140747f80";
           sha256 = "0h7ypw45h5rcbwx4c4mn2ps9hp84dpjp3iay2nc9zaavv05n7ysa";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a2425d82b365784b17ab56af5f77c6095664c784/recipes/occur-context-resize";
           sha256 = "0sp5v4rwqgqdj26gdkrmjvkmbp4g6jq4lrn2c3zm8s2gq0s3l6ri";
-          name = "occur-context-resize";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -51375,8 +64421,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    occur-x = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    occur-x = callPackage ({ fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "occur-x";
         version = "20130610.643";
         src = fetchFromGitHub {
@@ -51385,10 +64434,10 @@
           rev = "352f5fab207d8a1d3dd048073ff127a83e97c82b";
           sha256 = "1zj0xhvl5qx42injv0av4lyzd3jsjls1m368dqd2qnswhfw8wfn6";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/occur-x";
           sha256 = "04nydxp4syd0chfnfrz8v1vkx2qasfh86b98qv8719cily1jw76p";
-          name = "occur-x";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -51396,20 +64445,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    oceanic-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    oceanic-theme = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "oceanic-theme";
         version = "20161015.119";
         src = fetchFromGitHub {
           owner = "terry3";
           repo = "oceanic-theme";
-          rev = "a92ee9b470843c923e6cdcafdd65106ff994d04d";
-          sha256 = "1bj4l88546gmlfmwyg1zsqfz9g2l87hsa9jlrf8s4c907di736ir";
+          rev = "00288f6a5245eb001dc123e36af1820eb3cbe985";
+          sha256 = "00qij2h9kha557b3d69a8z3a3jsl8h4iwygxmr4h3i1w63nvy165";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b9d85588df4e2057ef1c822ff177572054ed979b/recipes/oceanic-theme";
           sha256 = "1i69dy9hfqwfyiykvnqzkqim0lv1p5z5fjsdk84068si4b029gzv";
-          name = "oceanic-theme";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -51417,20 +64469,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    ocodo-svg-modelines = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, svg-mode-line-themes }:
-    melpaBuild {
+    ocodo-svg-modelines = callPackage ({ fetchFromGitHub
+                                       , fetchurl
+                                       , lib
+                                       , melpaBuild
+                                       , svg-mode-line-themes }:
+      melpaBuild {
         pname = "ocodo-svg-modelines";
         version = "20150516.719";
         src = fetchFromGitHub {
           owner = "ocodo";
           repo = "ocodo-svg-modelines";
-          rev = "c7b0789a177219f117c4de5659ecfa8622958c40";
-          sha256 = "155gmls6cz3zf4lcj89kzb96y7k0glx0f659jg5z0skgxq79hf48";
+          rev = "a6c5b9a7536c7a8fa3bd9d9dafdebc8d99903018";
+          sha256 = "05ay599nc6jdw2fjss4izz1ynv2wc4svff932n8j9hvrhygipb2w";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5b9651865f4f8009c9b31fa1e5561de97a5ad8de/recipes/ocodo-svg-modelines";
           sha256 = "0fa88ns70wsr9i9gf4zx3fvmn1a32mrjsda105n0cx6c965kfmay";
-          name = "ocodo-svg-modelines";
+          name = "recipe";
         };
         packageRequires = [ svg-mode-line-themes ];
         meta = {
@@ -51438,20 +64494,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    ocp-indent = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ocp-indent = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "ocp-indent";
-        version = "20170803.222";
+        version = "20180417.849";
         src = fetchFromGitHub {
           owner = "OCamlPro";
           repo = "ocp-indent";
-          rev = "9bbd079199ef7308d4fa3cf0fafd2d7d8b4bf2d4";
-          sha256 = "117xwqxnmg2f2np1zqyc8hhnxmrrd2gcixqclb5lkwk68kisjmi5";
+          rev = "b15fd7585b42f89d745fad69ed1f2b70ecb8757d";
+          sha256 = "0aszx9kxfbrlg0amsl3j3kdwn6n0a5fl33kvl8rgyv543p2jcx8f";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e1af061328b15360ed25a232cc6b8fbce4a7b098/recipes/ocp-indent";
           sha256 = "0wc4z9dsnnyr24n3vg1npvc3rm53av8bpbvrl8kldxxdiwgnbkjw";
-          name = "ocp-indent";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -51459,20 +64518,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    octicons = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    octicons = callPackage ({ cl-lib ? null
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "octicons";
         version = "20151031.2040";
         src = fetchFromGitHub {
           owner = "syohex";
           repo = "emacs-octicons";
-          rev = "a61e561966ffd8faa3b48ce5b3a4eec10c59708b";
-          sha256 = "0w98ii2ny57al94a4h927xx1hn99df5if543v2gh36zqdlwc7xci";
+          rev = "229286a6166dba8ddabc8c4d338798c6cd3cf67d";
+          sha256 = "0dp7dhmgrq078rjhpm1cr993qjqz7qgy2z4sn73qw6j55va7d9kw";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c62867eae1a254eb5fe820d4387dd4e8a0ff9be2/recipes/octicons";
           sha256 = "02f37bvnc5qvkvfbyx5wp54nz71bqm747mq1p5361sx091lllkxk";
-          name = "octicons";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -51480,20 +64543,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    octo-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    octo-mode = callPackage ({ emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "octo-mode";
         version = "20161008.529";
         src = fetchFromGitHub {
           owner = "cryon";
           repo = "octo-mode";
-          rev = "bd4db7e5e3275b24c74e6a23c11d04f54e9feca5";
-          sha256 = "1blr664h8bq8bs1wr82nhhb9y7ggrlxp6x203i5bv542zm4a5rba";
+          rev = "4b2ed4a61674f73a6ccd390b5ae123474bd0c977";
+          sha256 = "1jkmf3j7wmv3b3ngi9fky1d94h4501lz5jcbn6xa3cb477j5nzj8";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/899ec190515d33f706e5279c8e3628514f733a12/recipes/octo-mode";
           sha256 = "1xvpykdrkmxlk302kbqycasrq89f72xvhqlm14qrcd2lqnwhbi07";
-          name = "octo-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -51501,8 +64568,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    octopress = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    octopress = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "octopress";
         version = "20170813.615";
         src = fetchFromGitHub {
@@ -51511,10 +64581,10 @@
           rev = "b4c25df9e3ccf49ac27c0a152daa4e27d1247d56";
           sha256 = "0zidh929sc1wi695ibzglbybfvxz2rj1365mij97088wwdk5dyz8";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7205d3d43797755077f19f57f531b4b39e77bae3/recipes/octopress";
           sha256 = "0zsir6chjvn5i1irmf5aj6mmb401c553r5wykq796sz7jnjhrjg0";
-          name = "octopress";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -51522,8 +64592,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    offlineimap = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    offlineimap = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "offlineimap";
         version = "20150916.458";
         src = fetchFromGitHub {
@@ -51532,10 +64605,10 @@
           rev = "cc3e067e6237a1eb7b21c575a41683b1febb47f1";
           sha256 = "1bjrgj8klg7ly63vx90jpaih9virn02bhqi16p6z0mw36q1q7ysq";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/671afe0ff3889ae8c4b2d7b8617a3a25c16f3f0f/recipes/offlineimap";
           sha256 = "0nza7lrz7cn06njcblwh9hy3050j8ja4awbxx7jzv6nazjg7201b";
-          name = "offlineimap";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -51543,8 +64616,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    old-norse-input = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    old-norse-input = callPackage ({ emacs
+                                   , fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "old-norse-input";
         version = "20170816.1142";
         src = fetchFromGitHub {
@@ -51553,10 +64630,10 @@
           rev = "c2e21ee72c3768e9152aff6baf12a19cde1d0c53";
           sha256 = "0zybr1v91884p4ncrpr962pr02qsns6hf7kc4c5gyad8sg4pbvxh";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/84780a6ebd1b2294b86ae8c6df5bd6521cf4e85a/recipes/old-norse-input";
           sha256 = "1g00h6ykf61ckr6f3r17j72w3h04p5q65aa3rhr5llk3jk1wv331";
-          name = "old-norse-input";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -51564,20 +64641,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    oldlace-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    oldlace-theme = callPackage ({ emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "oldlace-theme";
         version = "20150705.600";
         src = fetchFromGitHub {
           owner = "mswift42";
           repo = "oldlace-theme";
-          rev = "5c6f437203b0783b36a7aff4a578de4a0c8c4ee6";
-          sha256 = "0y9fxrsxp1158fyjp4f69r7g2s7b6nbxlsmsb8clwqc8pmmg2z82";
+          rev = "9ecbef999b63021c967846a3c80b3fbfc81f1290";
+          sha256 = "1kn25kamsb0s0cdg8mggi8rc7qgz4x6m3w6s42jvqybv41zhv50x";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b6b11187b012744771380dfabab607cf7e073c45/recipes/oldlace-theme";
           sha256 = "1pxiqqh5x4wsayqgwplzvsbalbj44zvby7x0pijdvwcnsh74znj8";
-          name = "oldlace-theme";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -51585,20 +64666,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    olivetti = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    olivetti = callPackage ({ emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "olivetti";
-        version = "20180308.638";
+        version = "20180531.37";
         src = fetchFromGitHub {
           owner = "rnkn";
           repo = "olivetti";
-          rev = "b1759abbb2be27107c0c09beae10ca5e4c556b56";
-          sha256 = "0zdxvd3xh5p9j8si2kfmavzdjwpz9352nr6i0c550m10lrnixnv4";
+          rev = "02272654f1d920ea2da5a4b553acd5e5cc096ab1";
+          sha256 = "0f7i2f42mlr27d9wa9h2zvz0k0xyqvwndzgz81x8gsm0w1iv15k9";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/697334ca3cdb9630572ae267811bd5c2a67d2a95/recipes/olivetti";
           sha256 = "0fkvw2y8r4ww2ar9505xls44j0rcrxc884p5srf1q47011v69mhd";
-          name = "olivetti";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -51606,20 +64691,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    om-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    om-mode = callPackage ({ fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "om-mode";
         version = "20140915.1410";
         src = fetchFromGitHub {
           owner = "danielsz";
           repo = "om-mode";
-          rev = "cdc0c2912321f8438b0f3449ba8aca50ec150bba";
-          sha256 = "03szb2i2xk3nq578cz1drsddsbld03ryvykdfzmfvwcmlpaknvzb";
+          rev = "5a6b380f8d1293a865d8a37aa4816d7412c512ce";
+          sha256 = "1wbnmg2lfv5xqgwj3axgwkccxmx0i202nf2nnfglg10hffy67rcm";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/om-mode";
           sha256 = "0bnlnxmzch9j39l8sf85npi89xlnkcnkmy4fihmwhrm86mnmayrb";
-          name = "om-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -51627,8 +64715,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    omni-kill = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    omni-kill = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "omni-kill";
         version = "20171016.1440";
         src = fetchFromGitHub {
@@ -51637,10 +64728,10 @@
           rev = "904549c8fd6ac3cf22b5d7111ca8944e179cffea";
           sha256 = "1mlnh5pdqdv1qb8jvi0wvkgbpy74zq807gmp04bp6cpxdns9j63f";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c24df34d2fa5d908223379e909148423ba327ae2/recipes/omni-kill";
           sha256 = "03kydl16rd9mnc1rnan2byqa6f70891fhcj16wkavl2r68rfj75k";
-          name = "omni-kill";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -51648,20 +64739,27 @@
           license = lib.licenses.free;
         };
       }) {};
-    omni-log = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, s }:
-    melpaBuild {
+    omni-log = callPackage ({ dash
+                            , emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , ht
+                            , lib
+                            , melpaBuild
+                            , s }:
+      melpaBuild {
         pname = "omni-log";
         version = "20170930.535";
         src = fetchFromGitHub {
           owner = "AdrieanKhisbe";
           repo = "omni-log.el";
-          rev = "11e959473c1bd9415d0cda785940c36ba6ad44ab";
-          sha256 = "081vq3wzl8w9yz1356np6h27d7yi5j8i3va9sc2flfwylmw1y9gr";
+          rev = "e32bee893359476da9771871e342b70d6a03c671";
+          sha256 = "1dzg3sb2zb7cwjl6lyxmh3j4s64dld987p9vw86hfisp2ccxxk2v";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/47bb19bb7b4713c3fd82c1035a2fe66588c069e3/recipes/omni-log";
           sha256 = "0c29243zq8r89ax4rxlmb8imag12icnldcb0q0xsnhjccw8lyw1r";
-          name = "omni-log";
+          name = "recipe";
         };
         packageRequires = [ dash emacs ht s ];
         meta = {
@@ -51669,8 +64767,16 @@
           license = lib.licenses.free;
         };
       }) {};
-    omni-quotes = callPackage ({ dash, f, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, omni-log, s }:
-    melpaBuild {
+    omni-quotes = callPackage ({ dash
+                               , f
+                               , fetchFromGitHub
+                               , fetchurl
+                               , ht
+                               , lib
+                               , melpaBuild
+                               , omni-log
+                               , s }:
+      melpaBuild {
         pname = "omni-quotes";
         version = "20170425.1132";
         src = fetchFromGitHub {
@@ -51679,10 +64785,10 @@
           rev = "454116c1dd6581baaeefd6b9310b1b6b7a5c36d0";
           sha256 = "1h8lrpi5wizi5vncdz83cxlx7c71xw3sw89sfg462zfbz2sq8afl";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3402524f79381c99fdeb81a6a5a9241c918811be/recipes/omni-quotes";
           sha256 = "0dqki0ibabs9cpcjvnh8lc2114x46i1xmnyjc6qqblfxa3ggdygs";
-          name = "omni-quotes";
+          name = "recipe";
         };
         packageRequires = [ dash f ht omni-log s ];
         meta = {
@@ -51690,20 +64796,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    omni-scratch = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    omni-scratch = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "omni-scratch";
         version = "20171009.1451";
         src = fetchFromGitHub {
           owner = "AdrieanKhisbe";
           repo = "omni-scratch.el";
-          rev = "9eee3161e5cb6df58618548a2173f4da7d194814";
-          sha256 = "1cppy9p5k8737jjgjlmfqqfdx048kpjn5cx7iw0dxal180y3i39g";
+          rev = "636374c59c7d33c2f72c97ad8ba9fb4854f2324d";
+          sha256 = "0w62bk2m0gs4b605s691z4iap9baz1z6c8z4v9vb05917qlsx5xb";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6ba3e128a7fe4476d82266506b18ba9984c37944/recipes/omni-scratch";
           sha256 = "190dkqcw8xywzrq8a99w4rqi0y1h2aj23s84g2ln1sf7jaf6d6n9";
-          name = "omni-scratch";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -51711,8 +64820,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    omni-tags = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, pcre2el }:
-    melpaBuild {
+    omni-tags = callPackage ({ cl-lib ? null
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild
+                             , pcre2el }:
+      melpaBuild {
         pname = "omni-tags";
         version = "20170426.1409";
         src = fetchFromGitHub {
@@ -51721,10 +64835,10 @@
           rev = "8f0f6c302fab900b7681e5c039f90850cbbabd33";
           sha256 = "0cqj4h4bdhmb0r6f2xx9g6cs3599m4j3snkrvsgddaq8c6mg47w0";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c77e57f41484c08cae9f47c4379d1752ccf43ce2/recipes/omni-tags";
           sha256 = "133ww1jf14jbw02ssbx2a46mp52j18a2wwzb6x77azb0akmf1lzl";
-          name = "omni-tags";
+          name = "recipe";
         };
         packageRequires = [ cl-lib pcre2el ];
         meta = {
@@ -51732,20 +64846,60 @@
           license = lib.licenses.free;
         };
       }) {};
-    omnisharp = callPackage ({ auto-complete, cl-lib ? null, csharp-mode, dash, emacs, f, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, popup, s, shut-up }:
-    melpaBuild {
+    omnibox = callPackage ({ dash
+                           , emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , frame-local
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
+        pname = "omnibox";
+        version = "20180422.1749";
+        src = fetchFromGitHub {
+          owner = "sebastiencs";
+          repo = "omnibox";
+          rev = "8ee75c71c20c438ebc43ba24ef6f543633d118f3";
+          sha256 = "19d7djf942dagxsz0c0lnfra4fk09qm6grkc0nihpsw4afjbj01a";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/bf274ff47f167edd214e667249356de281522802/recipes/omnibox";
+          sha256 = "05jc9hhr3gnjfyjpdx79ij9b5qwfrsmdf8h2s5ldxbw82q8a0z02";
+          name = "recipe";
+        };
+        packageRequires = [ dash emacs frame-local ];
+        meta = {
+          homepage = "https://melpa.org/#/omnibox";
+          license = lib.licenses.free;
+        };
+      }) {};
+    omnisharp = callPackage ({ auto-complete
+                             , cl-lib ? null
+                             , csharp-mode
+                             , dash
+                             , emacs
+                             , f
+                             , fetchFromGitHub
+                             , fetchurl
+                             , flycheck
+                             , lib
+                             , melpaBuild
+                             , popup
+                             , s
+                             , shut-up }:
+      melpaBuild {
         pname = "omnisharp";
-        version = "20180121.702";
+        version = "20180606.318";
         src = fetchFromGitHub {
           owner = "OmniSharp";
           repo = "omnisharp-emacs";
-          rev = "c00a3a9157432c578fffb79169232e4a81d4ad31";
-          sha256 = "0ghwqf1wbiywzdx0qlgs4y94z4ivlgac8rpg1bimlb8xfx62sia0";
+          rev = "ef369f79f5e65077b640b0d7525a1c9a3739713f";
+          sha256 = "19awri250vya7c4pjmkwwxxnsimw0rjy75gary0g1hzr492zibdb";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e327c483be04de32638b420c5b4e043d12a2cd01/recipes/omnisharp";
           sha256 = "0gh0wwdpdx2cjf95pcagj52inf7mrmiq7x8p0x5c7lvl4pfzhh87";
-          name = "omnisharp";
+          name = "recipe";
         };
         packageRequires = [
           auto-complete
@@ -51764,8 +64918,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    omtose-phellack-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    omtose-phellack-theme = callPackage ({ fetchFromGitHub
+                                         , fetchurl
+                                         , lib
+                                         , melpaBuild }:
+      melpaBuild {
         pname = "omtose-phellack-theme";
         version = "20161111.1320";
         src = fetchFromGitHub {
@@ -51774,10 +64931,10 @@
           rev = "66f99633e199e65bd28641626435e8e59246529a";
           sha256 = "0imf2pcf93srm473nvaksw5pw5i4caqxb6aqfbq6xww8gdbqfazy";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/478b1e07ed9010408c12598640ec8d154f9eb18d/recipes/omtose-phellack-theme";
           sha256 = "0aj0sw611w13xryn762ws63dfalczxixa5rv3skglmfy9axg3v3b";
-          name = "omtose-phellack-theme";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -51785,8 +64942,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    on-parens = callPackage ({ dash, emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild, smartparens }:
-    melpaBuild {
+    on-parens = callPackage ({ dash
+                             , emacs
+                             , evil
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild
+                             , smartparens }:
+      melpaBuild {
         pname = "on-parens";
         version = "20180202.1441";
         src = fetchFromGitHub {
@@ -51795,10 +64959,10 @@
           rev = "7a41bc02bcffd265f8a69ed4b4e0df3c3009aaa4";
           sha256 = "0pkc05plbjqfxrw54amlm6pzg9gcsz0nvqzprplr6rhh7ss419zn";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2ea1eb5eb5a40e95ba06b0a4ac89ad8843c9cc2c/recipes/on-parens";
           sha256 = "19kyzpkgfl0ipbcgnl8fbfbapnfdxr8w9i7prfkm6rjp6amxyqab";
-          name = "on-parens";
+          name = "recipe";
         };
         packageRequires = [ dash emacs evil smartparens ];
         meta = {
@@ -51806,8 +64970,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    on-screen = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    on-screen = callPackage ({ cl-lib ? null
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "on-screen";
         version = "20160302.150";
         src = fetchFromGitHub {
@@ -51816,10 +64984,10 @@
           rev = "206468aa4de299ad26c2db12b757f5ad7290912f";
           sha256 = "1rrby3mbh24qd43nsb3ymcrjxh1cz6iasf1gv0a8fmivmb4f7dyz";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/628f43fdfdb41174800fb8171e71134c27730f6f/recipes/on-screen";
           sha256 = "104jisc2bckzrajxlvj1cfx1drnjj7jhqjblvm89ry32xdnjxmqb";
-          name = "on-screen";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -51827,8 +64995,36 @@
           license = lib.licenses.free;
         };
       }) {};
-    one-time-pad-encrypt = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    one-themes = callPackage ({ emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
+        pname = "one-themes";
+        version = "20180507.1008";
+        src = fetchFromGitHub {
+          owner = "balajisivaraman";
+          repo = "emacs-one-themes";
+          rev = "fb633009a173dee56cf581198d9c26871189edf8";
+          sha256 = "0920g4mvqf97v6akw4fc1aq8aq2mnm8ah2xlkcgsc4a78bhk7aq1";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/504fb2fa2fe17eb008f7e9b8f7fb394f4a3ebd28/recipes/one-themes";
+          sha256 = "11c6py5vani2cv4qjvizlzz9xvr5v57qxy1chcxy2lq3jlz1q5w0";
+          name = "recipe";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/one-themes";
+          license = lib.licenses.free;
+        };
+      }) {};
+    one-time-pad-encrypt = callPackage ({ fetchFromGitHub
+                                        , fetchurl
+                                        , lib
+                                        , melpaBuild }:
+      melpaBuild {
         pname = "one-time-pad-encrypt";
         version = "20160329.813";
         src = fetchFromGitHub {
@@ -51837,10 +65033,10 @@
           rev = "87cc1f124024ce3d277299ca0ac703f182937d9f";
           sha256 = "0g2hvpnmgyy1k393prv97nqwlqc58nqf71hkrmaijw0cyy9q03nz";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/one-time-pad-encrypt";
           sha256 = "0xl74vxq9dzl84b6wsw8flykxcsxggpd4s47a2ph3irr64mbbgq5";
-          name = "one-time-pad-encrypt";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -51848,8 +65044,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    opam = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    opam = callPackage ({ emacs
+                        , fetchFromGitHub
+                        , fetchurl
+                        , lib
+                        , melpaBuild }:
+      melpaBuild {
         pname = "opam";
         version = "20150719.520";
         src = fetchFromGitHub {
@@ -51858,10 +65058,10 @@
           rev = "4d589de5765728f56af7078fae328b6792de8600";
           sha256 = "1yqrp9icci5snp1485wb6y8mr2hjp9006ahch58lvmnq98bn7j45";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fc4e2076ebaefe7e241607ff6920fe243d10ccd0/recipes/opam";
           sha256 = "004r93nn1ranvxkcc0y5m3p8gh4axgghgnsvim38nc1sqda5h6xa";
-          name = "opam";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -51869,8 +65069,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    open-in-msvs = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    open-in-msvs = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "open-in-msvs";
         version = "20170123.1428";
         src = fetchFromGitHub {
@@ -51879,10 +65082,10 @@
           rev = "e0d071c83188ad5db8f3297d6ce784b4ed554a04";
           sha256 = "0aiccdcll5zjy11fandd9bvld8p8srmhrh3waqc33yp4x8pjkjpd";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/09a462fac31a7ceda4ee84a8550ff1db6d11140f/recipes/open-in-msvs";
           sha256 = "0cng0brxjdriyhwsbn85pfrgqg56chzk24lvkx91rzgz15fbpnv5";
-          name = "open-in-msvs";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -51890,8 +65093,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    open-junk-file = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    open-junk-file = callPackage ({ fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "open-junk-file";
         version = "20161210.314";
         src = fetchFromGitHub {
@@ -51900,10 +65106,10 @@
           rev = "558bec7372b0fed4c4cb6074ab906535fae615bd";
           sha256 = "0kcgkxn5v9bsbkcvpjxjqhj1w3c29bfb33bmiw32gzbfphmrvhh1";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f8e4328cae9b4759a75da0b26ea8b68821bc71af/recipes/open-junk-file";
           sha256 = "0r1v9m8a5blv70fzq5miv5i57jx0bm1p0jxh0lwklam0m99znmcj";
-          name = "open-junk-file";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -51911,20 +65117,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    opencc = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    opencc = callPackage ({ emacs
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "opencc";
         version = "20170722.116";
         src = fetchFromGitHub {
           owner = "xuchunyang";
           repo = "emacs-opencc";
-          rev = "8c539f72669ba9a99d8b5198db5ea930897ad1b9";
-          sha256 = "140s88z0rsiylm8g1mzgc50ai38x79j004advin6lil5zcggxq3i";
+          rev = "959d9ffbae095752182026e3bd9b8fd61178c39f";
+          sha256 = "0qym9xxjsn4ally7qlfffin7rybdz3w5z4gw1cw2j6ragwcm6w8a";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/71bc5476b3670a9f5c3d3682c2e7852fc6c5fe60/recipes/opencc";
           sha256 = "1dd62x0h3imil4g3psndxykp45jf83fm4afxcvvyayj45z099f4r";
-          name = "opencc";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -51932,8 +65142,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    opencl-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    opencl-mode = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "opencl-mode";
         version = "20170816.549";
         src = fetchFromGitHub {
@@ -51942,10 +65155,10 @@
           rev = "6e69434d0fa6e11a542acad370611bba18d3bc5c";
           sha256 = "00vhmbfh51mncx5xnzv96kbb5r6r27xw6xwvi7gf454zbvcibrws";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d97575fdae88d55b55686aa6814f858813cad171/recipes/opencl-mode";
           sha256 = "1g351wiaycwmg1bnf4s2mdnc3lb2ml5l54g19184xqssfqlx7y79";
-          name = "opencl-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -51953,20 +65166,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    opener = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }:
-    melpaBuild {
+    opener = callPackage ({ cl-lib ? null
+                          , emacs
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild
+                          , request }:
+      melpaBuild {
         pname = "opener";
         version = "20161207.1010";
         src = fetchFromGitHub {
           owner = "0robustus1";
           repo = "opener.el";
-          rev = "c384f67278046fdcd220275fdd212ab85672cbeb";
-          sha256 = "0gci909a2rbx5i8dyzyrcddwdic7nvpk6y6djvn521yaag4sq87h";
+          rev = "ab75048b1073fb1b1452dabae94ab55e0cfb57c4";
+          sha256 = "00kh8m23jzwb0wipwjdm2wad08xqrlcg00vzc4vzijgrapz0da3h";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c5a448f1936f46176bc2462eb03955a0c19efb9e/recipes/opener";
           sha256 = "0fhny4m7x19wnlnr19s4rkl04dkx95yppd51jzrkr96xiznw97s7";
-          name = "opener";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs request ];
         meta = {
@@ -51974,20 +65193,27 @@
           license = lib.licenses.free;
         };
       }) {};
-    opensource = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, request, s }:
-    melpaBuild {
+    opensource = callPackage ({ dash
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild
+                              , pkg-info
+                              , request
+                              , s }:
+      melpaBuild {
         pname = "opensource";
         version = "20160926.916";
         src = fetchFromGitHub {
           owner = "OpenSourceOrg";
           repo = "el-opensourceorg";
-          rev = "13499b7ae602c735e40c1c494bda6252a2f1c98f";
-          sha256 = "14vb47y5cq3j80aah8fjjf5aw343p9p7bhlxnpz5fr8r9a883dka";
+          rev = "42742d5f1b9590acff7f05ee0094e3a80f4f7171";
+          sha256 = "0z92l9d3q12qlf18v7w8qjiw0ciha9l1nvxr0zmik5ck87qk4vmn";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ec4255a403e912a14a7013ea96f554d3588dfc30/recipes/opensource";
           sha256 = "17gi20s2vi7m75qqaff907x1g8ja5ny90klldpqmj258m2j6a6my";
-          name = "opensource";
+          name = "recipe";
         };
         packageRequires = [ dash pkg-info request s ];
         meta = {
@@ -51995,8 +65221,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    openstack-cgit-browse-file = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    openstack-cgit-browse-file = callPackage ({ fetchFromGitHub
+                                              , fetchurl
+                                              , lib
+                                              , melpaBuild }:
+      melpaBuild {
         pname = "openstack-cgit-browse-file";
         version = "20130819.227";
         src = fetchFromGitHub {
@@ -52005,10 +65234,10 @@
           rev = "244219288b9aef41155044697bb114b7af83ab8f";
           sha256 = "0086pfk4pq6xmknk7a42fihcjgzkcplqqc1rk9fhwmn9j7djbq70";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bd7035e1ea63d7d8378f8bfda6a5402a5b6bb9e4/recipes/openstack-cgit-browse-file";
           sha256 = "05dl28a4npnnzzipypfcqb21sdww715lwji2xnsabx3fb1h1w5jl";
-          name = "openstack-cgit-browse-file";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -52016,7 +65245,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    openwith = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild {
+    openwith = callPackage ({ fetchhg
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "openwith";
         version = "20120531.1436";
         src = fetchhg {
@@ -52024,10 +65257,10 @@
           rev = "aeb78782ec87";
           sha256 = "1wl6gnxsyhaad4cl9bxjc0qbc5jzvlwbwjbajs0n1s6qr07d6r01";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/openwith";
           sha256 = "0l3grbnn349cv26ap2phlmp2h94s68gqznh5zdqwc2cp7lf699sx";
-          name = "openwith";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -52035,8 +65268,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    operate-on-number = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    operate-on-number = callPackage ({ fetchFromGitHub
+                                     , fetchurl
+                                     , lib
+                                     , melpaBuild }:
+      melpaBuild {
         pname = "operate-on-number";
         version = "20150706.2323";
         src = fetchFromGitHub {
@@ -52045,10 +65281,10 @@
           rev = "ceb3be565a29326c1098244fac0c50606723a56e";
           sha256 = "0iw3c8sn702ziki59mvd5gxm484i7f0bwsy8fz95y08s9gknjjf9";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/aec74eff8ca3d5e381d7a6d61c73f1a0716f1c60/recipes/operate-on-number";
           sha256 = "1rw3fqbzfizgcbz3yaf99rr2546msna4z7dyfa8dbi8h7yzl4fhk";
-          name = "operate-on-number";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -52056,8 +65292,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    orca = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    orca = callPackage ({ emacs
+                        , fetchFromGitHub
+                        , fetchurl
+                        , lib
+                        , melpaBuild }:
+      melpaBuild {
         pname = "orca";
         version = "20171030.1216";
         src = fetchFromGitHub {
@@ -52066,10 +65306,10 @@
           rev = "5e1744afb793dda744ddc6fe342144b5e90bea08";
           sha256 = "0gqgs3rmdzm5vqk8azgzwannxjifvrf5fj40n543d0066c2dfsfi";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f4d9cf89c58a9b36b7c2a42de2aecb3b60001908/recipes/orca";
           sha256 = "012ndbrgm58r09snhvi476rw0lq4m913y0slc0cxb688p9wgz5w3";
-          name = "orca";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -52077,8 +65317,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-ac = callPackage ({ auto-complete-pcmp, fetchFromGitHub, fetchurl, lib, log4e, melpaBuild, yaxception }:
-    melpaBuild {
+    org-ac = callPackage ({ auto-complete-pcmp
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , log4e
+                          , melpaBuild
+                          , yaxception }:
+      melpaBuild {
         pname = "org-ac";
         version = "20170401.607";
         src = fetchFromGitHub {
@@ -52087,10 +65333,10 @@
           rev = "41e3ef8e4039619d0370c23c66730b3b2e9e32ed";
           sha256 = "1l3fn8vjdqq7rrn1b7l2i238bhjni13mg9v25dydin0sfb697abk";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/adf598f8dae69ff286ae78d353a2a5d4363b4480/recipes/org-ac";
           sha256 = "059jr3v3558cgw626zbqfwmwwv5f4637ai26h7b6psqh0x9sf3mr";
-          name = "org-ac";
+          name = "recipe";
         };
         packageRequires = [ auto-complete-pcmp log4e yaxception ];
         meta = {
@@ -52098,20 +65344,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-agenda-property = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    org-agenda-property = callPackage ({ emacs
+                                       , fetchFromGitHub
+                                       , fetchurl
+                                       , lib
+                                       , melpaBuild }:
+      melpaBuild {
         pname = "org-agenda-property";
         version = "20140626.1416";
         src = fetchFromGitHub {
           owner = "Malabarba";
           repo = "org-agenda-property";
-          rev = "3b469f3e93de0036547f3631cd0366d53f7584c8";
-          sha256 = "15xgkm5p30qfghyhkjivh5n4770794qf4pza462vb0xl5v6kffbm";
+          rev = "01afb36072eb27846eb09310dfca7991dbae831e";
+          sha256 = "1f98adm1vgc43q2k63ggddsbz4329h4m5zpnzkv9lqszbjwdaq5c";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/org-agenda-property";
           sha256 = "0zsjzjw52asl609q7a2s4jcsm478p4cxzhnd3azyr9ypxydjf6qk";
-          name = "org-agenda-property";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -52119,20 +65369,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-alert = callPackage ({ alert, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    org-alert = callPackage ({ alert
+                             , dash
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild
+                             , s }:
+      melpaBuild {
         pname = "org-alert";
-        version = "20180413.2111";
+        version = "20180523.1833";
         src = fetchFromGitHub {
           owner = "groksteve";
           repo = "org-alert";
-          rev = "85fd01f5bde7cb3adb167a8e37e52865d49c9579";
-          sha256 = "1isb6ym8c22f9y2wph6zy90x9nl4g51fal68vfklg8bq1pywzj7a";
+          rev = "f87bff4acbd839acb4d2245b56b2c3d21f950911";
+          sha256 = "05xhp1ggpcgd48vcrxf9l43aasxfjw1ypgzpq3gp7031x83m9rr6";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2976b7f9271bc46679a5774ff5f388b81a9f0cf8/recipes/org-alert";
           sha256 = "0n5a24iv8cj395xr0gfgi0hs237dd98zm2fws05k47vy3ygni152";
-          name = "org-alert";
+          name = "recipe";
         };
         packageRequires = [ alert dash s ];
         meta = {
@@ -52140,20 +65396,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-attach-screenshot = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    org-attach-screenshot = callPackage ({ fetchFromGitHub
+                                         , fetchurl
+                                         , lib
+                                         , melpaBuild }:
+      melpaBuild {
         pname = "org-attach-screenshot";
-        version = "20180330.1139";
+        version = "20180419.2225";
         src = fetchFromGitHub {
           owner = "dfeich";
           repo = "org-screenshot";
-          rev = "5eeb2eef690a02b95dfe171d38ec66c954719d65";
-          sha256 = "10mzlqk7in6gjh6x9q0gc5slx536hc2dz2kndm77f8qaf9z7hw79";
+          rev = "6b1edbd2384191122a30788ac72f2233c2df0294";
+          sha256 = "0vyxpc28b9b0cn02a9p48q6iy61qw7gj7gzk37ijdmzg8dzy6hxv";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f545cd8d1da39e7fbd61020e178de30053ba774b/recipes/org-attach-screenshot";
           sha256 = "0108kahyd499q87wzvirv5d6p7jrb7ckz8r96pwqzgflj3njbnmn";
-          name = "org-attach-screenshot";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -52161,8 +65420,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-autolist = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    org-autolist = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "org-autolist";
         version = "20170924.1201";
         src = fetchFromGitHub {
@@ -52171,10 +65433,10 @@
           rev = "c82d1e83e982b5f0c106b8800e5b0cfd5f73fdc1";
           sha256 = "0ykiafbdjb2iy0s1gr6l51gddjbk08iwj4v13hgm8b675bl0cw56";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ca8e2cdb282674b20881bf6b4fc49af42a5d09a7/recipes/org-autolist";
           sha256 = "1jvspxhxlvd7h1srk9dbk1v5dykmf8jsjaqicpll7ial6i0qgikj";
-          name = "org-autolist";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -52182,8 +65444,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-babel-eval-in-repl = callPackage ({ emacs, ess, eval-in-repl, fetchFromGitHub, fetchurl, lib, matlab-mode, melpaBuild }:
-    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 = "20170511.514";
         src = fetchFromGitHub {
@@ -52192,10 +65461,10 @@
           rev = "bfa72c582ac1531ad42aba23e2b1267ab68e31f6";
           sha256 = "1jm56zxa99s163jv02vhfrshmykvld7girq7gmj1x60g3wjzhn5k";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/org-babel-eval-in-repl";
           sha256 = "0brqp0w9s28ibws4idlm1rw09lsfa98l5wbpwm64rvlixhs6zlnx";
-          name = "org-babel-eval-in-repl";
+          name = "recipe";
         };
         packageRequires = [ emacs ess eval-in-repl matlab-mode ];
         meta = {
@@ -52203,8 +65472,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-beautify-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    org-beautify-theme = callPackage ({ fetchFromGitHub
+                                      , fetchurl
+                                      , lib
+                                      , melpaBuild }:
+      melpaBuild {
         pname = "org-beautify-theme";
         version = "20170908.1518";
         src = fetchFromGitHub {
@@ -52213,10 +65485,10 @@
           rev = "df6a1114fda313e1689363e196c8284fbe2a2738";
           sha256 = "1lkz7736swimad12khwbbqc4gxjydgr1k45p4mx03s25pv1w920y";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f55f1ee9890f720e058401a052e14c7411252967/recipes/org-beautify-theme";
           sha256 = "0rrlyn61xh3szw8aihxpbmg809xx5ac66xqzj895dn1raz129h2w";
-          name = "org-beautify-theme";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -52224,20 +65496,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-board = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    org-board = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "org-board";
-        version = "20180226.1136";
+        version = "20180530.1120";
         src = fetchFromGitHub {
           owner = "scallywag";
           repo = "org-board";
-          rev = "eef4cd47ea221dcdc352b5af578007bcde5f3e6a";
-          sha256 = "1sj5n2gynwc14kl6cjmdg8mvs0nc187nfj4czd3rbz4yqq818l3b";
+          rev = "8899d8f8c1977df2397793a54868317463120553";
+          sha256 = "190rf8hi1233rjmr78cqy03m1vspcsdbzcf64xs8n4vckyb18vl4";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d8063ee17586d9b1e7415f7b924239826b81ab08/recipes/org-board";
           sha256 = "00jsrxc8f85cvrh7364n7337frdj12yknlfp28fhdgk2ph6d7bp4";
-          name = "org-board";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -52245,20 +65520,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-bookmark-heading = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    org-bookmark-heading = callPackage ({ emacs
+                                        , fetchFromGitHub
+                                        , fetchurl
+                                        , lib
+                                        , melpaBuild }:
+      melpaBuild {
         pname = "org-bookmark-heading";
         version = "20170510.1008";
         src = fetchFromGitHub {
           owner = "alphapapa";
           repo = "org-bookmark-heading";
-          rev = "c535fd9b430d2cc50b54a1ab550d64e20ebd5bd6";
-          sha256 = "0v2321lzivxd35174xgsnc95g49dlcgj8lzb6nlid1ri38fhqwyl";
+          rev = "8e184f1ab1ef68417db9f12c7dce4d221fe6d496";
+          sha256 = "1bhkfn2x02vpd0rxdgwz6lyycdnak2hxplna0hizim1k804gkxwn";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/eaadbd149399c6e3c48ac5cbeedeb29a3f5791f1/recipes/org-bookmark-heading";
           sha256 = "1q92rg9d945ypcpb7kig2r0cr7nb7avsylaa7nxjib25advx80n9";
-          name = "org-bookmark-heading";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -52266,20 +65545,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-brain = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
-    melpaBuild {
+    org-brain = callPackage ({ emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild
+                             , org }:
+      melpaBuild {
         pname = "org-brain";
-        version = "20180411.1157";
+        version = "20180712.1410";
         src = fetchFromGitHub {
           owner = "Kungsgeten";
           repo = "org-brain";
-          rev = "6857c9dcf11135eef40b8f1f86d10a71cecc86ac";
-          sha256 = "092rl3vfkbj7vcn49bibc1s3m0479l0isbhb2w7xb06dh8k8j9ih";
+          rev = "d8dc1c4914c6200eaf44e36bf51a3cf02ef88fb9";
+          sha256 = "1lygmnxyqgp0pm7gjy38vlkycyipqwhmyhmwqs3xr2hxgb9rlfd3";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/47480fbae06e4110d50bc89db7df05fa80afc7d3/recipes/org-brain";
           sha256 = "0c05c6lbr740nnjp9p34padrbrc3q1x2pgylkyhsxadm4mfsvj0c";
-          name = "org-brain";
+          name = "recipe";
         };
         packageRequires = [ emacs org ];
         meta = {
@@ -52287,8 +65571,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-bullets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    org-bullets = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "org-bullets";
         version = "20171127.526";
         src = fetchFromGitHub {
@@ -52297,10 +65584,10 @@
           rev = "5b096148bc37306f73b27da838dca751d5b1936f";
           sha256 = "1yxikvbsbrqv9kjh1dc55w3xm44x4s7gamxq4f6jm045p8abfqrr";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fe60fc3c60d87b5fd7aa24e858c79753d5f7d2f6/recipes/org-bullets";
           sha256 = "0yrfgd6r71rng3qipp3y9i5mpm6510k4xsfgyidcn25v27fysk3v";
-          name = "org-bullets";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -52308,8 +65595,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-caldav = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
-    melpaBuild {
+    org-caldav = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild
+                              , org }:
+      melpaBuild {
         pname = "org-caldav";
         version = "20180403.1336";
         src = fetchFromGitHub {
@@ -52318,10 +65609,10 @@
           rev = "8d3492c27a09f437d2d94f2736c56d7652e87aa0";
           sha256 = "19q83xgbdabkidx26xvff1x7kixk2wllplnwfsy7kggdj9wqpm9l";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/org-caldav";
           sha256 = "1wzb5garpxg8p7zaqp6z5q0l2x8n9m7fjg5xy3vg9878njnqr9kc";
-          name = "org-caldav";
+          name = "recipe";
         };
         packageRequires = [ org ];
         meta = {
@@ -52329,8 +65620,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-capture-pop-frame = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    org-capture-pop-frame = callPackage ({ emacs
+                                         , fetchFromGitHub
+                                         , fetchurl
+                                         , lib
+                                         , melpaBuild }:
+      melpaBuild {
         pname = "org-capture-pop-frame";
         version = "20160518.308";
         src = fetchFromGitHub {
@@ -52339,10 +65634,10 @@
           rev = "b16fd712de62cf0d1f9befd03be6ab5983cb3301";
           sha256 = "01ffkk79wz2qkh9h9cjl59j34wvbiqzzxbbc9a06lh2rc946wgis";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b20edd229469b33ea87c40cfd06aa0bf95d149de/recipes/org-capture-pop-frame";
           sha256 = "0g0b3vifwg39rb0fmad7y955dcqccnm01c6m27cv2x4xfib8ik3w";
-          name = "org-capture-pop-frame";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -52350,20 +65645,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-category-capture = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
-    melpaBuild {
+    org-category-capture = callPackage ({ emacs
+                                        , fetchFromGitHub
+                                        , fetchurl
+                                        , lib
+                                        , melpaBuild
+                                        , org }:
+      melpaBuild {
         pname = "org-category-capture";
-        version = "20170819.1047";
+        version = "20180531.1942";
         src = fetchFromGitHub {
           owner = "IvanMalison";
           repo = "org-projectile";
-          rev = "53c193a209d663b33de71fe7d35eb40c0d0e15b6";
-          sha256 = "0kcbcj1nz2asi1v1nbqa2lp1qjg90nbdz2913m8c6dnwhff8rr0j";
+          rev = "e57023c0e33e4a0f848fcfec1902e13e6a92f711";
+          sha256 = "03svxxx6jh0c5517yvp7g5lfvjn3n4r169j589iii0fcjp4qri3n";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6760daac1ef9d9d7ba07e2fc9668873020f901f1/recipes/org-category-capture";
           sha256 = "0l5n71h9lc8q9k0sb5ghzwb81lah4l1ykc06shfl9zw5lqqvahav";
-          name = "org-category-capture";
+          name = "recipe";
         };
         packageRequires = [ emacs org ];
         meta = {
@@ -52371,20 +65671,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-chef = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
-    melpaBuild {
+    org-chef = callPackage ({ emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild
+                            , org }:
+      melpaBuild {
         pname = "org-chef";
-        version = "20180325.628";
+        version = "20180706.1835";
         src = fetchFromGitHub {
           owner = "Chobbes";
           repo = "org-chef";
-          rev = "36fc59b4181456d7bd4c8227c34edbad600b08f3";
-          sha256 = "0yvrxl24a0q4wbhmx2azsylwapih0xf6a5rhch3ppzhy4vyrdjcf";
+          rev = "6b004af05d05c981b9cf9d24a525242e36129b46";
+          sha256 = "1jb2s3q02z8rjzcdxmnk91p4f75illdfjmmz93yv0izp5irhm9s7";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/23b9e64887a290fca7c7ab2718f627f8d728575f/recipes/org-chef";
           sha256 = "1xzbdrv5z31lxnzzgbp50l10lzlvx6j7kc7ssg76fma49wfpnra5";
-          name = "org-chef";
+          name = "recipe";
         };
         packageRequires = [ emacs org ];
         meta = {
@@ -52392,20 +65697,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-cliplink = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    org-cliplink = callPackage ({ emacs
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "org-cliplink";
-        version = "20170724.413";
+        version = "20180526.738";
         src = fetchFromGitHub {
           owner = "rexim";
           repo = "org-cliplink";
-          rev = "16c2cad9c3bafb71fea70f70c1e584307a6dee01";
-          sha256 = "1k3vcr4fr290pg00gvb9q9wpvq1fk6pzgw95x12fdrig5lp48hih";
+          rev = "e6b4a481d0c2d7734c01d5d80cce6c4348925524";
+          sha256 = "09fm8iihzzr706yfnjfswkp52rhdalkvc5yf2hnk3376jlcvpxnx";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7ddb13c59441fdf4eb1ba3816e147279dea7d429/recipes/org-cliplink";
           sha256 = "19l3k9w9csgvdr7n824bzg7jja0f28dmz6caldxh43vankpmlg3p";
-          name = "org-cliplink";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -52413,20 +65722,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-clock-convenience = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
-    melpaBuild {
+    org-clock-convenience = callPackage ({ cl-lib ? null
+                                         , emacs
+                                         , fetchFromGitHub
+                                         , fetchurl
+                                         , lib
+                                         , melpaBuild
+                                         , org }:
+      melpaBuild {
         pname = "org-clock-convenience";
         version = "20160830.1156";
         src = fetchFromGitHub {
           owner = "dfeich";
           repo = "org-clock-convenience";
-          rev = "2d3fab0991ef7fa8d94c46a63a66abd289c79d9e";
-          sha256 = "0dm8mzjy2hldn9lqblrfcq5w4d2byrgggg6wcs9rhdnpx96cvz74";
+          rev = "d4f98e95d75d78822ddfab6b67bc971516f9773c";
+          sha256 = "0s69jqadrgsmlv74386i900gr6xr3kgr5x1n75gqf4rsdmhx4s5d";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a80ed929181cdd28886ca598a0c387a31d239b2e/recipes/org-clock-convenience";
           sha256 = "1zis0fp7q253qfxypm7a69zb3w8jb4cbrbj2rk34d1jisvnn4irw";
-          name = "org-clock-convenience";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs org ];
         meta = {
@@ -52434,8 +65749,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-clock-csv = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org, s }:
-    melpaBuild {
+    org-clock-csv = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild
+                                 , org
+                                 , s }:
+      melpaBuild {
         pname = "org-clock-csv";
         version = "20180313.1957";
         src = fetchFromGitHub {
@@ -52444,10 +65764,10 @@
           rev = "4a6e9e4895799afa0b994f4a908c1e3c2043451f";
           sha256 = "1f7xvarimv82xwiw5cavnak7av0yi4afn94nhhp60pyfh8azls50";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e023cb898699f76f6c3d9ffe8162aacfc6a8c34f/recipes/org-clock-csv";
           sha256 = "02spjrzdf1kmvyvqkzg7nnmq9kqv75zwxn5ifqmg0f7a1gw28f0l";
-          name = "org-clock-csv";
+          name = "recipe";
         };
         packageRequires = [ org s ];
         meta = {
@@ -52455,8 +65775,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-clock-today = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    org-clock-today = callPackage ({ emacs
+                                   , fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "org-clock-today";
         version = "20161014.220";
         src = fetchFromGitHub {
@@ -52465,10 +65789,10 @@
           rev = "02b8fd541a01040405a9a1400c46dcb68b7c2a3a";
           sha256 = "1gbkrgbpsrwkjd199giffim8jvx1n4dqrsyk53sz1swj9dlhxgp9";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/org-clock-today";
           sha256 = "1x9hplz9w2kpa239rz6y02hsl4fgzxlkwr9hhwjy12x1f88x0k73";
-          name = "org-clock-today";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -52476,8 +65800,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-commentary = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
-    melpaBuild {
+    org-commentary = callPackage ({ dash
+                                  , emacs
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild
+                                  , org }:
+      melpaBuild {
         pname = "org-commentary";
         version = "20160801.2337";
         src = fetchFromGitHub {
@@ -52486,10 +65816,10 @@
           rev = "821ccb994811359c42f4e3d459e0e88849d42b75";
           sha256 = "0ixhyn8s7l2caq0qpv9zlq9fzm3z8b81755c3yffnk5camnij6py";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3e0a40d9ea5849b9c22378a84ac8122e4eb2737d/recipes/org-commentary";
           sha256 = "0ym1rq2zhyhc6hkk40wsa9jni2h1z5dkaisldqzg8ggl7iv3v4fx";
-          name = "org-commentary";
+          name = "recipe";
         };
         packageRequires = [ dash emacs org ];
         meta = {
@@ -52497,8 +65827,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-context = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    org-context = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "org-context";
         version = "20170107.537";
         src = fetchFromGitHub {
@@ -52507,10 +65840,10 @@
           rev = "a3b4a4ce6d15e3c2d45eb5dcb78bea81913f3e21";
           sha256 = "18swz38q8z1nga6l8f1l27b7ba3y5y3ikk0baplmich3hxav58xj";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f33b6157eb172719a56c3e86233708b1e545e451/recipes/org-context";
           sha256 = "19y8aln7wix9p506ajvfkl641147c5mdmjm98jnq68cx2r4wp6zz";
-          name = "org-context";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -52518,8 +65851,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-cua-dwim = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    org-cua-dwim = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "org-cua-dwim";
         version = "20120202.2134";
         src = fetchFromGitHub {
@@ -52528,10 +65864,10 @@
           rev = "a55d6c7009fc0b22f1110c07de629acc955c85e4";
           sha256 = "0nrfvmqb70phnq0k4wbdj6z666wq6xvabg4pgv8qn62rbrw4yyhm";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/org-cua-dwim";
           sha256 = "0ib3m41b4lh0p0xxhsmfv42qs00xm2cfwwl2cgfdjjp1s57p19xy";
-          name = "org-cua-dwim";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -52539,8 +65875,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-dashboard = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    org-dashboard = callPackage ({ cl-lib ? null
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "org-dashboard";
         version = "20171223.1124";
         src = fetchFromGitHub {
@@ -52549,10 +65889,10 @@
           rev = "02c0699771d199075a286e4502340ca6e7c9e831";
           sha256 = "0zi23xgv5fq827dljhzp6m2v7ggr3pdw3fpgq8515gs9q4f12v1r";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/11ce0ba772672d9cbae5713ebaf3798eec5fdb3c/recipes/org-dashboard";
           sha256 = "1hvhhbmyx12wsf2n1hd0hg5cy05zyspd82xxcdh04g4s9r3ikqj5";
-          name = "org-dashboard";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -52560,20 +65900,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-doing = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    org-doing = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "org-doing";
         version = "20161017.920";
         src = fetchFromGitHub {
           owner = "omouse";
           repo = "org-doing";
-          rev = "07ddbfc238cba31e4990c9b52e9a2757b39111da";
-          sha256 = "1d9gf6wf3jp07bn2h6bbc75iy0wwdvzdlj9n4nwbc46nf3k154pa";
+          rev = "4819e75c827c2115bd28f3b3148d846aa64ccd9b";
+          sha256 = "0pb7ljysh8ap572f9y813js6lvvac4kjky2a5r39hv28px33hmx5";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4c497b87e14ab614c963f4b2f041bc0111b6e936/recipes/org-doing";
           sha256 = "17w49z78fvbz182sxv9mnryj124gm9jbdmbybppjqz4rk6wvnm2j";
-          name = "org-doing";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -52581,8 +65924,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-dotemacs = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
-    melpaBuild {
+    org-dotemacs = callPackage ({ cl-lib ? null
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild
+                                , org }:
+      melpaBuild {
         pname = "org-dotemacs";
         version = "20151119.1022";
         src = fetchFromGitHub {
@@ -52591,10 +65939,10 @@
           rev = "99a066508fedf8c80a3bfef08e015e612499d417";
           sha256 = "15zrnd168n4pwa1bj5fz79hcrgw61braf0b095rsfhjh5w2sasy7";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4c1847184312c8c95e7e81e5b3b73e5621cc2509/recipes/org-dotemacs";
           sha256 = "1vc391fdkdqd4g0piq66zhrlgqx5s2ijv7qd1rc3a235sjb9i2n4";
-          name = "org-dotemacs";
+          name = "recipe";
         };
         packageRequires = [ cl-lib org ];
         meta = {
@@ -52602,20 +65950,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-download = callPackage ({ async, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    org-download = callPackage ({ async
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "org-download";
-        version = "20180327.1429";
+        version = "20180625.842";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "org-download";
-          rev = "a57beffd0f09b218a9487d1750960878c1d5b12c";
-          sha256 = "1disqqfwjl366kv6xgc28w7zbc4xl9a0jmdj7w27mb00sxzfk3vb";
+          rev = "434447251343164e3aacd9db17e67dd2a10b6e65";
+          sha256 = "1ckkwdyvxiwhlxl00fd96v01vb71bdnzb3xyl04pxwjsydcbsai0";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/edab283bc9ca736499207518b4c9f5e71e822bd9/recipes/org-download";
           sha256 = "19yjx0qqpmrdwagp3d6lwwv7dcb745m9ccq3m29sin74f5p4svsi";
-          name = "org-download";
+          name = "recipe";
         };
         packageRequires = [ async ];
         meta = {
@@ -52623,8 +65975,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-dp = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    org-dp = callPackage ({ cl-lib ? null
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "org-dp";
         version = "20180311.123";
         src = fetchFromGitHub {
@@ -52633,10 +65989,10 @@
           rev = "334fefd06eb925c86b1642787b2a088aa0932bab";
           sha256 = "0cjx9428ypadvrlbfnfj6zwnfhdcay82q2f9x8v5gaffa6wrr7j3";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7f337375082da316ed07b8ce9c775b484b8cdbf6/recipes/org-dp";
           sha256 = "0fnrzpgw8l0g862j20yy4mw1wfcm2i04r6dxi4yd7yay8bw2i4yq";
-          name = "org-dp";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -52644,20 +66000,28 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-drill-table = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org, s }:
-    melpaBuild {
+    org-drill-table = callPackage ({ cl-lib ? null
+                                   , dash
+                                   , emacs
+                                   , fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild
+                                   , org
+                                   , s }:
+      melpaBuild {
         pname = "org-drill-table";
         version = "20180115.209";
         src = fetchFromGitHub {
           owner = "chrisbarrett";
           repo = "org-drill-table";
-          rev = "096387d929bcf3eb479e0a9d5da9cf32c756a759";
-          sha256 = "1a8ygrcag8i9hdpy2vsn0sh8lwhl9b56rv91j3rddy1jv5qx1ipb";
+          rev = "e4c4c1b0a17f51cb8de67eafe06a6bffc754f525";
+          sha256 = "1nzn890z30l062flbnww9f3nq7wm5x5146rh76az8h7jm6vigvca";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3347da186765877826b224e1f5d1b585ebd3692c/recipes/org-drill-table";
           sha256 = "1gb5b4hj4xr8nv8bxfar145i38zcic6c34gk98wpshvwzvb43r69";
-          name = "org-drill-table";
+          name = "recipe";
         };
         packageRequires = [ cl-lib dash emacs org s ];
         meta = {
@@ -52665,20 +66029,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-dropbox = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, names }:
-    melpaBuild {
+    org-dropbox = callPackage ({ dash
+                               , emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild
+                               , names }:
+      melpaBuild {
         pname = "org-dropbox";
         version = "20150113.2109";
         src = fetchFromGitHub {
           owner = "heikkil";
           repo = "org-dropbox";
-          rev = "75dab6d6f0438a7a8a18ccf3a5d55f50bf531f6e";
-          sha256 = "0jjdsng7fm4wbhvd9naqzdfsmkvj1sf1d9rikprg1pd58azv6idx";
+          rev = "2dc677a770c9e82f928ad8e97a7707eb368e58ed";
+          sha256 = "1ldyxxlgfm2zskjr06b5kppq560cy75ic2dh9si09hrsw3qj0m4s";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cd613fbe42c41b125a25dfa0206666446dc5fa40/recipes/org-dropbox";
           sha256 = "0qfvdz13ncqn7qaz03lwabzsnk62z6wqzlxlvdqv5xyllcy9m6ln";
-          name = "org-dropbox";
+          name = "recipe";
         };
         packageRequires = [ dash emacs names ];
         meta = {
@@ -52686,20 +66056,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-easy-img-insert = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    org-easy-img-insert = callPackage ({ emacs
+                                       , fetchFromGitHub
+                                       , fetchurl
+                                       , lib
+                                       , melpaBuild }:
+      melpaBuild {
         pname = "org-easy-img-insert";
         version = "20160915.1308";
         src = fetchFromGitHub {
           owner = "tashrifsanil";
           repo = "org-easy-img-insert";
-          rev = "9f8aaa7f68ff1f0d8d7b1e9b618abb15002f971e";
-          sha256 = "1p0hzfzlcdmd8d01a4xqg27n7qcnv7a03n8wiicv0dnicx179952";
+          rev = "3efb4d70e5a39bfbf7ee4c4033cc61afa89430dd";
+          sha256 = "1nijybb8dc251n187ljwffw3hxppb7nhb0lhc7jx4fyymg3r27l3";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/512db70609fc451972405acb4b186a9b3c6944fa/recipes/org-easy-img-insert";
           sha256 = "0gpb9f66gn8dbhwrlw7z2a5rpphbh1fv845wz8yy4v7nv2j3sf54";
-          name = "org-easy-img-insert";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -52707,20 +66081,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-edit-latex = callPackage ({ auctex, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    org-edit-latex = callPackage ({ auctex
+                                  , emacs
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "org-edit-latex";
         version = "20170908.822";
         src = fetchFromGitHub {
           owner = "et2010";
           repo = "org-edit-latex";
-          rev = "1f228310ef2f3f2959a527f6d99e42ce977384c8";
-          sha256 = "1zfimgnmn7nqaq8aglyly55k5dr548467masr2g4x3m0z1by1z6b";
+          rev = "ecd91601cb6f3aa79d055bde99bfec6d2b335952";
+          sha256 = "0m2smwn18zvq5sg5p6j15vf6s1y9lzzrl088ziv9725wil5jwkly";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/org-edit-latex";
           sha256 = "0nkiz4682qgk5dy4if3gij98738482ys8zwm8yx834za38xxbwry";
-          name = "org-edit-latex";
+          name = "recipe";
         };
         packageRequires = [ auctex emacs ];
         meta = {
@@ -52728,8 +66107,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-ehtml = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, web-server }:
-    melpaBuild {
+    org-ehtml = callPackage ({ emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild
+                             , web-server }:
+      melpaBuild {
         pname = "org-ehtml";
         version = "20150506.1658";
         src = fetchFromGitHub {
@@ -52738,10 +66122,10 @@
           rev = "9df85de1a0fe1e7b2d6c000777c1a0c0217f92d0";
           sha256 = "0kqvwqmwnwg2h7r38fpjg6qlkcj9v8011df8nmsgs1w1mfdvnjsq";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7f68028b3f4d2455da6d657e90abcab6181db284/recipes/org-ehtml";
           sha256 = "0n82fbd7aircqg2c9m138qfv8csrv0amhya3xlwswdkqn51vn3gw";
-          name = "org-ehtml";
+          name = "recipe";
         };
         packageRequires = [ emacs web-server ];
         meta = {
@@ -52749,8 +66133,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-elisp-help = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
-    melpaBuild {
+    org-elisp-help = callPackage ({ cl-lib ? null
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild
+                                  , org }:
+      melpaBuild {
         pname = "org-elisp-help";
         version = "20161121.1655";
         src = fetchFromGitHub {
@@ -52759,10 +66148,10 @@
           rev = "3e33ab1a2933dd7f2782ef91d667a37f12d633ab";
           sha256 = "088pbafz1x4z7qi70cjbrvfrcdrjp4zy0yl115klbidshqhxycmj";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b0a9bf5046a4c3be8a83004d506bd258a6f7ff15/recipes/org-elisp-help";
           sha256 = "0a4wvz52hkcw5nrml3h1yp8w97vg5jw22wnpfbb827zh7iwb259h";
-          name = "org-elisp-help";
+          name = "recipe";
         };
         packageRequires = [ cl-lib org ];
         meta = {
@@ -52770,20 +66159,27 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-evil = callPackage ({ dash, evil, fetchFromGitHub, fetchurl, lib, melpaBuild, monitor, org }:
-    melpaBuild {
+    org-evil = callPackage ({ dash
+                            , evil
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild
+                            , monitor
+                            , org }:
+      melpaBuild {
         pname = "org-evil";
-        version = "20180416.953";
+        version = "20180620.817";
         src = fetchFromGitHub {
           owner = "GuiltyDolphin";
           repo = "org-evil";
-          rev = "4e1f949a6fb225e79e69cb8684c0629671b6b8e3";
-          sha256 = "1nrcwjl50nycyraac2zwlx3346az7521icf1h718hqqw4r799ggk";
+          rev = "3b4620edc606412ef75c0b5aa637af22486eb126";
+          sha256 = "0aqya9l9s55h5wd728iz15f53p5xajrfk8pn9gjxnw0i8m4d09sd";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/17a4772d409aa5dbda5fb84d86c237fd2653c70b/recipes/org-evil";
           sha256 = "0wvd201k9b9ghg39rwbah6rw8b7hyyd27vvqjynjwbk3v8rp5zyn";
-          name = "org-evil";
+          name = "recipe";
         };
         packageRequires = [ dash evil monitor org ];
         meta = {
@@ -52791,20 +66187,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-fancy-priorities = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    org-fancy-priorities = callPackage ({ fetchFromGitHub
+                                        , fetchurl
+                                        , lib
+                                        , melpaBuild }:
+      melpaBuild {
         pname = "org-fancy-priorities";
         version = "20180328.1631";
         src = fetchFromGitHub {
           owner = "harrybournis";
           repo = "org-fancy-priorities";
-          rev = "819bb993b71e7253cefef7047306ab4e0f9d0a86";
-          sha256 = "13cyzlx0415i953prq6ch7r5iy23c1pz116bdxi5yqags4igh4wv";
+          rev = "fc09edc9b139e82395982d08db2825702045cb85";
+          sha256 = "0pzqbszjm24c8gfcczcmn242ipprsqi7pmys65bqgz63iypfxpcw";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/712902ae1cf967ceb2052266ed3244e92998f8a7/recipes/org-fancy-priorities";
           sha256 = "13rljgi5fbzlc16cxqj49yg47a5qpyxzj0lswhdyhgzncp1fyq7p";
-          name = "org-fancy-priorities";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -52812,20 +66211,28 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-gcal = callPackage ({ alert, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org, request-deferred }:
-    melpaBuild {
+    org-gcal = callPackage ({ alert
+                            , cl-lib ? null
+                            , emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild
+                            , org
+                            , request-deferred }:
+      melpaBuild {
         pname = "org-gcal";
         version = "20170420.1401";
         src = fetchFromGitHub {
           owner = "myuhe";
           repo = "org-gcal.el";
-          rev = "bdc704842da000a1cffb8f155ef3887c5e1d0446";
-          sha256 = "0nbwxmc2arssy1ll416i6chb0rx239jh2fm1lcylhdg3af25rsbj";
+          rev = "270ae5d94a5d2e22cdd1fc4063534483a0dfef87";
+          sha256 = "0j6i05qczv14k1rw5bry6ys66ykh46dx9837lyswfl0mwrgl3i04";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1c2d5bd8d8f2616dae19b9232d9442fe423d6e5e/recipes/org-gcal";
           sha256 = "1mp6cm0rhd4r9pfvsjjp86sdqxjbbg7gk41zx0zf0s772smddy3q";
-          name = "org-gcal";
+          name = "recipe";
         };
         packageRequires = [ alert cl-lib emacs org request-deferred ];
         meta = {
@@ -52833,20 +66240,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-gnome = callPackage ({ alert, fetchFromGitHub, fetchurl, gnome-calendar, lib, melpaBuild, telepathy }:
-    melpaBuild {
+    org-gnome = callPackage ({ alert
+                             , fetchFromGitHub
+                             , fetchurl
+                             , gnome-calendar
+                             , lib
+                             , melpaBuild
+                             , telepathy }:
+      melpaBuild {
         pname = "org-gnome";
         version = "20150614.757";
         src = fetchFromGitHub {
           owner = "NicolasPetton";
           repo = "org-gnome.el";
-          rev = "122e14cf6f8104150a65246a9a7c10e1d7939862";
-          sha256 = "0jd5zwykc6fkkaj8qhg7wgmrjn47054x242b5s03w8ylyczqbcg3";
+          rev = "1012d47886cfd30eed25b73d9f18e475e0155f88";
+          sha256 = "0b57ik05iax2h3nrj96kysbk4hxmxlaabd0n6lv1xsayrlli3sj1";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4f7ebd2d2312954d098fe4afd07c3d02b4df475d/recipes/org-gnome";
           sha256 = "0c37gfs6xs0jbvg6ypd4z5ip1khm26wr5lxgmv1dzcc383ynzg0v";
-          name = "org-gnome";
+          name = "recipe";
         };
         packageRequires = [ alert gnome-calendar telepathy ];
         meta = {
@@ -52854,8 +66267,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-grep = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    org-grep = callPackage ({ cl-lib ? null
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "org-grep";
         version = "20151202.429";
         src = fetchFromGitHub {
@@ -52864,10 +66281,10 @@
           rev = "5bdd04c0f53b8a3d656f36ea17bba3df7f0cb684";
           sha256 = "10jwqzs431mnwz717qdmcn0v8raklw41sbxbnkb36yrgznk8c09c";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5ed0682fb9130a62e628d4e64747bb9c70456681/recipes/org-grep";
           sha256 = "0kpgizy0zxnlmyh0prwdll62ri2c1l4sb0yrkl7yw17cr4gxmkkz";
-          name = "org-grep";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -52875,8 +66292,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-if = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    org-if = callPackage ({ fetchFromGitLab
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "org-if";
         version = "20150920.813";
         src = fetchFromGitLab {
@@ -52885,10 +66305,10 @@
           rev = "fab602cc1bbee7a4e99c0083e129219d3f9ed2e8";
           sha256 = "1iyqv34b7q2k73srshcnpvfzcadq47w4rzkqp6m1d3ajk8x2vypq";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/09df84b60c46678ad40d8dabc08fcfe518f5ad79/recipes/org-if";
           sha256 = "0h0jdyawz2j4mp33w85z8q77l37qid8palvw5n4z379qa0wr5h96";
-          name = "org-if";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -52896,20 +66316,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-index = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    org-index = callPackage ({ emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "org-index";
-        version = "20180414.208";
+        version = "20180519.725";
         src = fetchFromGitHub {
           owner = "marcihm";
           repo = "org-index";
-          rev = "0dfe0a67979279345378ca006ab4f727df378aca";
-          sha256 = "16wjzskq000grkanaw9zca2qbw9yzpndhfd2g0b0if2mf1g31mkv";
+          rev = "cc0039eae6986a416cc4b6702e82254718cf54ee";
+          sha256 = "1b042qs3hffy4ssnk3gpypz490k80ry5cjyfa4k4xpj72nqhsl6d";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/54946e733901986304f7a7a5139b2818ebf97eb3/recipes/org-index";
           sha256 = "1dp52xqrhby2xyi6p2d0ggp5irqsqwicp62ndg5wszyd33clxab5";
-          name = "org-index";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -52917,8 +66341,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-iv = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, impatient-mode, lib, melpaBuild, org }:
-    melpaBuild {
+    org-iv = callPackage ({ cl-lib ? null
+                          , fetchFromGitHub
+                          , fetchurl
+                          , impatient-mode
+                          , lib
+                          , melpaBuild
+                          , org }:
+      melpaBuild {
         pname = "org-iv";
         version = "20171001.322";
         src = fetchFromGitHub {
@@ -52927,10 +66357,10 @@
           rev = "7f2bb1b32647655fd9d6684f6f09dcc66b61b0cd";
           sha256 = "0s3fi8sk7jm5vr0fz20fbygm4alhpirv0j20jfi1pab14yhhf34h";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e7db0c34f0f6fb9c3b9e581a74304cc9a26ed342/recipes/org-iv";
           sha256 = "1akhabp6mdw1h7zms6ahlfvwizl07fwsizwxpdzi4viggfccsfwx";
-          name = "org-iv";
+          name = "recipe";
         };
         packageRequires = [ cl-lib impatient-mode org ];
         meta = {
@@ -52938,20 +66368,27 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-jira = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request, s }:
-    melpaBuild {
+    org-jira = callPackage ({ cl-lib ? null
+                            , emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild
+                            , request
+                            , s }:
+      melpaBuild {
         pname = "org-jira";
-        version = "20180103.1813";
+        version = "20180625.2111";
         src = fetchFromGitHub {
           owner = "ahungry";
           repo = "org-jira";
-          rev = "51a1b2248ec421aecdd38aaf5c2876a036b08bb7";
-          sha256 = "0zyh5nn9hgiz0ic67ypahaah5f3vjmall7z0ffn4gl0fy22sar6h";
+          rev = "03d6ebcf177db7b208c6a99386695e839f314314";
+          sha256 = "07hy37by9ics7rc1sgkpg8qk2xzp67ny4i4rkd7q7j4abqdr131v";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/730a585e5c9216a2428a134c09abcc20bc7c631d/recipes/org-jira";
           sha256 = "0dvh9k0i75jxyy3v01c4cfyws8ij6718hsivi2xyrgig7pwp16ib";
-          name = "org-jira";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs request s ];
         meta = {
@@ -52959,20 +66396,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-journal = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    org-journal = callPackage ({ emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "org-journal";
-        version = "20180402.536";
+        version = "20180603.102";
         src = fetchFromGitHub {
           owner = "bastibe";
           repo = "org-journal";
-          rev = "f24d6c5e71954fd1a748e719b9b4b51f77879800";
-          sha256 = "10cqri6k3lvsngwg060nj4n15ip54h3ldlyxgnknmp6wl0vjsjr3";
+          rev = "2395db4deb255c05d0d3a75c95f53263b74939c9";
+          sha256 = "018wjn7v8a1z4z1sycz7b01rdck73ap13cr3lvfqvp9mms94qq71";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/org-journal";
           sha256 = "1npzqxn1ssigq7k1nrxz3xymxaazby0ddgxq6lgw2a1zjmjm4h2b";
-          name = "org-journal";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -52980,29 +66421,39 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-kanban = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    org-kanban = callPackage ({ dash
+                              , emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild
+                              , org }:
+      melpaBuild {
         pname = "org-kanban";
-        version = "20180410.1258";
+        version = "20180715.1023";
         src = fetchFromGitHub {
           owner = "gizmomogwai";
           repo = "org-kanban";
-          rev = "d5f6c82c1f4072f5800b01b724ee980ea0373d0a";
-          sha256 = "1xqx3iqv627wkpyz8b3frxgdm2y2zicfd5ansxw9yg2q7dxs6bff";
+          rev = "9d147cfbfd378aecafaa6622eadcffde8a9f5970";
+          sha256 = "163xc1gvvg3n4vw732ybv2pclg7vij4cwhzdya38gcdmybbz7hxv";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a9f3a10c126fa43a6fa60ee7f8e50c7a9661dbc1/recipes/org-kanban";
           sha256 = "1flgqa2pwzw6b2zm3j09i9bvz1i8k03mbwj6l75yrk29lh4njq41";
-          name = "org-kanban";
+          name = "recipe";
         };
-        packageRequires = [ dash emacs ];
+        packageRequires = [ dash emacs org ];
         meta = {
           homepage = "https://melpa.org/#/org-kanban";
           license = lib.licenses.free;
         };
       }) {};
-    org-link-minor-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
-    melpaBuild {
+    org-link-minor-mode = callPackage ({ fetchFromGitHub
+                                       , fetchurl
+                                       , lib
+                                       , melpaBuild
+                                       , org }:
+      melpaBuild {
         pname = "org-link-minor-mode";
         version = "20170805.1152";
         src = fetchFromGitHub {
@@ -53011,10 +66462,10 @@
           rev = "7b92df60f3fee7f609d649d80ef243b45771ebea";
           sha256 = "1lz7qj57s391ssawmccvhgxv1w99fj1m9rg3g4pymdl3sgdcz4g4";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b1d2add7baf96c9a18671766d61c8aa028756796/recipes/org-link-minor-mode";
           sha256 = "1akb670mzzhmldw2202x3k6b7vwfcn0rs55znpxsrc4iqihdgka3";
-          name = "org-link-minor-mode";
+          name = "recipe";
         };
         packageRequires = [ org ];
         meta = {
@@ -53022,8 +66473,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-link-travis = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
-    melpaBuild {
+    org-link-travis = callPackage ({ fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild
+                                   , org }:
+      melpaBuild {
         pname = "org-link-travis";
         version = "20140405.1627";
         src = fetchFromGitHub {
@@ -53032,10 +66487,10 @@
           rev = "596615ad8373d9090bd4138da683524f0ad0bda5";
           sha256 = "1797pd264zn19zk93nifyw6pwk2a7wrpfir373qclk601yv2g5h8";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/52c7f9539630e5ac7748fe36fd27c3486649ab74/recipes/org-link-travis";
           sha256 = "0hj4x7cw7a3ry8xislkz9bnavy77z4cpmnvns02yi3gnib53mlfs";
-          name = "org-link-travis";
+          name = "recipe";
         };
         packageRequires = [ org ];
         meta = {
@@ -53043,8 +66498,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-linkany = callPackage ({ fetchFromGitHub, fetchurl, lib, log4e, melpaBuild, yaxception }:
-    melpaBuild {
+    org-linkany = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , log4e
+                               , melpaBuild
+                               , yaxception }:
+      melpaBuild {
         pname = "org-linkany";
         version = "20160206.2011";
         src = fetchFromGitHub {
@@ -53053,10 +66513,10 @@
           rev = "8cfe2f1a46e6654a79f56505349d1396263cecb3";
           sha256 = "0lqxzmjxs80z3z90f66f3zfrdajiamdcwpvfv5j2w40js9xz4x37";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/df82cf95e34775b22da0a8bb29750f603c58f259/recipes/org-linkany";
           sha256 = "0arjj3c23yqm1ljvbnl7v9cqvd9lbz4381g8f3jyqbafs25bdc3c";
-          name = "org-linkany";
+          name = "recipe";
         };
         packageRequires = [ log4e yaxception ];
         meta = {
@@ -53064,20 +66524,80 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-mime = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    org-listcruncher = callPackage ({ cl-lib ? null
+                                    , emacs
+                                    , fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild
+                                    , seq }:
+      melpaBuild {
+        pname = "org-listcruncher";
+        version = "20180630.1326";
+        src = fetchFromGitHub {
+          owner = "dfeich";
+          repo = "org-listcruncher";
+          rev = "6fb86f740f8b9fb283049132e108863d1918a893";
+          sha256 = "04nykrcmsx5pqhyk305n0xh828fmdng2pqhhnylisnwds1v13cbp";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/5bed5078a3e56a825be61d158ca8321763b92f7c/recipes/org-listcruncher";
+          sha256 = "05vi7a03gj1waaqcjnkgpij4r45r2087xg7kgfs6ki8zhsyws23q";
+          name = "recipe";
+        };
+        packageRequires = [ cl-lib emacs seq ];
+        meta = {
+          homepage = "https://melpa.org/#/org-listcruncher";
+          license = lib.licenses.free;
+        };
+      }) {};
+    org-make-toc = callPackage ({ dash
+                                , emacs
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild
+                                , org
+                                , s }:
+      melpaBuild {
+        pname = "org-make-toc";
+        version = "20180614.1959";
+        src = fetchFromGitHub {
+          owner = "alphapapa";
+          repo = "org-make-toc";
+          rev = "c27e3600473100daa3007fb134cd3fe13e821d90";
+          sha256 = "0078qpimkx6ps1cnyb1kaxiz4k93ppm7axsbrm18qic6mvp6i2nc";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/df87749128bcfd27ca93a65084a2e88cd9ed5c3f/recipes/org-make-toc";
+          sha256 = "0xaw3d1axvln4pr7p0jnqf0j6fd1g6cra1gykvf6y12zx02xkchh";
+          name = "recipe";
+        };
+        packageRequires = [ dash emacs org s ];
+        meta = {
+          homepage = "https://melpa.org/#/org-make-toc";
+          license = lib.licenses.free;
+        };
+      }) {};
+    org-mime = callPackage ({ cl-lib ? null
+                            , emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "org-mime";
-        version = "20180407.1820";
+        version = "20180607.2350";
         src = fetchFromGitHub {
           owner = "org-mime";
           repo = "org-mime";
-          rev = "41ea9818b4e35555fac5d287a3f8bbf84c694005";
-          sha256 = "148mw7wik58756k072p3frlb0hdy6sc2jsqgjzhp5pqsmd1chg7w";
+          rev = "895a7c31bb6aa0913b902ece414d0ad29dc8cf1f";
+          sha256 = "1s0z2zljbk2nsd8rrpknrydi3b7rzfrc21bq396pxhfz11irz3pb";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/521678fa13884dae69c2b4b7a2af718b2eea4b28/recipes/org-mime";
           sha256 = "14154pajl2bbawdd8iqfwgc67pcjp2lxl6f92c62nwq12wkcnny6";
-          name = "org-mime";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -53085,20 +66605,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-mind-map = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
-    melpaBuild {
+    org-mind-map = callPackage ({ dash
+                                , emacs
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild
+                                , org }:
+      melpaBuild {
         pname = "org-mind-map";
-        version = "20171206.645";
+        version = "20180614.1352";
         src = fetchFromGitHub {
           owner = "theodorewiles";
           repo = "org-mind-map";
-          rev = "d7854dbd30d565d3087d2810d6a77cc882988eae";
-          sha256 = "0jkm6ar07m399hqanjpw6y7bxdr59j72skmi9ncgjyb81ch70g36";
+          rev = "c0578ee519ad54451e758e401acae2914f52c47a";
+          sha256 = "1z43c3vwmd8h8nnncp6fya0l73rfqmb6ij01mp027pxpazq3skhc";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3c8683ee547a6a99f8d258561c3ae157b1f427f2/recipes/org-mind-map";
           sha256 = "07wffzf4dzfj8bplwhr9yscm6l9wbz8y01j0jc8cw943z5b8pdgs";
-          name = "org-mind-map";
+          name = "recipe";
         };
         packageRequires = [ dash emacs org ];
         meta = {
@@ -53106,20 +66632,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-mobile-sync = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
-    melpaBuild {
+    org-mobile-sync = callPackage ({ emacs
+                                   , fetchgit
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild
+                                   , org }:
+      melpaBuild {
         pname = "org-mobile-sync";
-        version = "20160629.1307";
-        src = fetchFromGitHub {
-          owner = "steckerhalter";
-          repo = "org-mobile-sync";
-          rev = "442bcfe93f4f2cab02e2dd2c3634fbffcda9a17d";
-          sha256 = "0vzafaqkrwjg22yf4lcqrg02xv4nqwgpphbrdmh90c4d3rlhrck1";
+        version = "20180605.2224";
+        src = fetchgit {
+          url = "https://framagit.org/steckerhalter/org-mobile-sync.git";
+          rev = "06764b943a528827df1e2acc6bc7806cc2c1351f";
+          sha256 = "0qdgs965ppihsz2ihyykdinr4n7nbb89d384z7kn985b17263lvn";
         };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/24335fa800ba6c18ca6690464fbb0232bb697c7a/recipes/org-mobile-sync";
-          sha256 = "1cj0pxcjngiipmyl0w1p0g4wrxgm2y98a8862x1lcbali9lqbrwj";
-          name = "org-mobile-sync";
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/f0a8eb0eefe88b4ea683a4743c0f8393506e014b/recipes/org-mobile-sync";
+          sha256 = "152mswykbz3m9w1grpsvb6wi9rg1vf3clnrl8qy6v911c0hy1s9c";
+          name = "recipe";
         };
         packageRequires = [ emacs org ];
         meta = {
@@ -53127,20 +66657,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-mru-clock = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    org-mru-clock = callPackage ({ emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "org-mru-clock";
-        version = "20180219.359";
+        version = "20180419.606";
         src = fetchFromGitHub {
           owner = "unhammer";
           repo = "org-mru-clock";
-          rev = "18301b6ffe1149e373dc07d5047b67b9e1faec64";
-          sha256 = "13x25fk2wnddzgx11rmkrhpvaava0knaqhlhk36c6pyldbhbhbxy";
+          rev = "0e2dcb7799fb82bbe55c8aa9930192871e8b6109";
+          sha256 = "08z6jc7qhj7zmzf1sag1n4nqh77k1dis2ijc6s2pzqlaxm3rhxyw";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b36bf1c1faa4d7e38254416a293e56af96214136/recipes/org-mru-clock";
           sha256 = "1arww5x6vdyyn1bwxry91w88phbr9l6nk8xxrw40iqmmbhggahgm";
-          name = "org-mru-clock";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -53148,8 +66682,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-multiple-keymap = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
-    melpaBuild {
+    org-multiple-keymap = callPackage ({ cl-lib ? null
+                                       , emacs
+                                       , fetchFromGitHub
+                                       , fetchurl
+                                       , lib
+                                       , melpaBuild
+                                       , org }:
+      melpaBuild {
         pname = "org-multiple-keymap";
         version = "20150328.1806";
         src = fetchFromGitHub {
@@ -53158,10 +66698,10 @@
           rev = "8ebc532df7f0dd6e6c3aa7c380a51d4166c668e8";
           sha256 = "0zbpzm9lni6z180s7n52x8s5by5zkq2nlhx82l2h9i7in9y4r6c3";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0a22beed723d149282e70e3411b79e8ce9f5ab2b/recipes/org-multiple-keymap";
           sha256 = "16iv5575634asvn1b2k535ml8g4lqgy8z5w6ykma5f9phq5idb9f";
-          name = "org-multiple-keymap";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs org ];
         meta = {
@@ -53169,20 +66709,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-notebook = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
-    melpaBuild {
+    org-notebook = callPackage ({ cl-lib ? null
+                                , emacs
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild
+                                , org }:
+      melpaBuild {
         pname = "org-notebook";
         version = "20170321.2152";
         src = fetchFromGitHub {
           owner = "Rahi374";
           repo = "org-notebook";
-          rev = "86042d866bf441e2c9bb51f995e5994141b78517";
-          sha256 = "0znxn6zzc9645m3wmkryf4xwjskf7gwylrg6z2kmr1wpjlpfwb01";
+          rev = "d90c4aeca2442161e6dd89de175561af85aace03";
+          sha256 = "15hf0x0v4fz6gxj8qx9pfm6xic7qni33nn4ga6cxbdgpwgyr61wz";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/04149b1f158e857ea824fe120372ac52a000adcf/recipes/org-notebook";
           sha256 = "045xqmrik1s83chl7l7fnlav2p76xrfj21kacpjj215saz1f8nld";
-          name = "org-notebook";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs org ];
         meta = {
@@ -53190,20 +66736,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-noter = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
-    melpaBuild {
+    org-noter = callPackage ({ cl-lib ? null
+                             , emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild
+                             , org }:
+      melpaBuild {
         pname = "org-noter";
-        version = "20180331.1231";
+        version = "20180708.1429";
         src = fetchFromGitHub {
           owner = "weirdNox";
           repo = "org-noter";
-          rev = "32cdf41079ca67c5906a10215eb7fbaefebab994";
-          sha256 = "11hhw8fk1qn63hwdx49h9h58p2hmxhmni6qdazd0ipk68finmy8f";
+          rev = "8f86583bd573cb0f146aae5d2394e615efb0cafe";
+          sha256 = "0fgmn7gqh146zrmvc1p7dik93sjajay0n8i8qdd4sbdzw64shzl1";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4a2bc0d95dc2744277d6acbba1f7483b4c14d75c/recipes/org-noter";
           sha256 = "0vsc2b1yz9lw0zv1vnm722pl35kxpwhcdi7h6mijhnw8vv7rhixf";
-          name = "org-noter";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs org ];
         meta = {
@@ -53211,8 +66763,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-octopress = callPackage ({ ctable, fetchFromGitHub, fetchurl, lib, melpaBuild, org, orglue }:
-    melpaBuild {
+    org-octopress = callPackage ({ ctable
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild
+                                 , org
+                                 , orglue }:
+      melpaBuild {
         pname = "org-octopress";
         version = "20170820.2115";
         src = fetchFromGitHub {
@@ -53221,10 +66779,10 @@
           rev = "38598ef98d04076a8eb78d549907ddfde8d3a652";
           sha256 = "0bmj5wkwidj1v3b8ipligr0nkfdaxm82717nz8fqidz967q4xbk6";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fba6c3c645ba903f636814b5a2bb1baca0b5283b/recipes/org-octopress";
           sha256 = "0r6ms9j4xxsrik4206g7gz4wz41wr4ylpal6yfqs4hhz88yhxrhw";
-          name = "org-octopress";
+          name = "recipe";
         };
         packageRequires = [ ctable org orglue ];
         meta = {
@@ -53232,8 +66790,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-onenote = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, oauth2, org, request }:
-    melpaBuild {
+    org-onenote = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild
+                               , oauth2
+                               , org
+                               , request }:
+      melpaBuild {
         pname = "org-onenote";
         version = "20171007.2200";
         src = fetchFromGitHub {
@@ -53242,10 +66806,10 @@
           rev = "5ce5cf4edb143180e0b185ac26826d39ae5bc929";
           sha256 = "1jlnnb04ichcl155lklvjw91l8j1dvg77bv1815chak226aq4xqj";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7705ee9a8733733664b6214bf4eec15d640c6895/recipes/org-onenote";
           sha256 = "0qgmizzryb6747yd80d3nic3546f4h8vjd6c30jr99vv2ildjsfk";
-          name = "org-onenote";
+          name = "recipe";
         };
         packageRequires = [ oauth2 org request ];
         meta = {
@@ -53253,8 +66817,39 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-outlook = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    org-outline-numbering = callPackage ({ cl-lib ? null
+                                         , emacs
+                                         , fetchFromGitLab
+                                         , fetchurl
+                                         , lib
+                                         , melpaBuild
+                                         , org
+                                         , ov }:
+      melpaBuild {
+        pname = "org-outline-numbering";
+        version = "20180705.801";
+        src = fetchFromGitLab {
+          owner = "andersjohansson";
+          repo = "org-outline-numbering";
+          rev = "b95b6a7ed9289637cb512232470633b330ca9713";
+          sha256 = "03x3n2ywgk2x7slpzy26bw3l9l000pd964z0yifvf9fqhpbk5d0r";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/6dbd71c2176c1160e8418631d69f4bcba75845fd/recipes/org-outline-numbering";
+          sha256 = "131cpvfsiv92bbicq5n7dlr6k643sk7xw31xs0lwmw4pxq44m8sg";
+          name = "recipe";
+        };
+        packageRequires = [ cl-lib emacs org ov ];
+        meta = {
+          homepage = "https://melpa.org/#/org-outline-numbering";
+          license = lib.licenses.free;
+        };
+      }) {};
+    org-outlook = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "org-outlook";
         version = "20160705.638";
         src = fetchFromGitHub {
@@ -53263,10 +66858,10 @@
           rev = "ec32d8d9d8ffd17e6de4de0b52fc3f5ad9b4cc0d";
           sha256 = "1la7g9qzn8wbfzc2zd6gddi1zl145b35311l66sjyffidmhgfw8d";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/804a4b6802d2cf53e5415d956f0b4772853f4c69/recipes/org-outlook";
           sha256 = "0cn8h6yy67jr5h1yxsfqmr8q7ii4f99pgghfp821m01pj55qyjx9";
-          name = "org-outlook";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -53274,8 +66869,19 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-page = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, git, ht, htmlize, lib, melpaBuild, mustache, org, simple-httpd }:
-    melpaBuild {
+    org-page = callPackage ({ cl-lib ? null
+                            , dash
+                            , fetchFromGitHub
+                            , fetchurl
+                            , git
+                            , ht
+                            , htmlize
+                            , lib
+                            , melpaBuild
+                            , mustache
+                            , org
+                            , simple-httpd }:
+      melpaBuild {
         pname = "org-page";
         version = "20170806.1924";
         src = fetchFromGitHub {
@@ -53284,10 +66890,10 @@
           rev = "50430ababf73a2d090881a952e9770badaf7478b";
           sha256 = "1xph0pdcbzlxfnbhhad2jgkznrl2vs76yl3jd29ny4xsl0n3gglw";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/872f163d4da58760009001472e2240f00d4d2d89/recipes/org-page";
           sha256 = "1326m3w7vz22zk7rx40z28fddsccy5fl1qhbb7clci8l69blcc2v";
-          name = "org-page";
+          name = "recipe";
         };
         packageRequires = [
           cl-lib
@@ -53304,8 +66910,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-parser = callPackage ({ dash, emacs, fetchhg, fetchurl, ht, lib, melpaBuild }:
-    melpaBuild {
+    org-parser = callPackage ({ dash
+                              , emacs
+                              , fetchhg
+                              , fetchurl
+                              , ht
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "org-parser";
         version = "20171002.2136";
         src = fetchhg {
@@ -53313,10 +66925,10 @@
           rev = "105050acee08";
           sha256 = "1y1ikk950awxhvx4d930ymqa8ds6a0wlywzx09jvrnkvbisd4l63";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/28d55005cbce276cda21021a8d9368568cb4bcc6/recipes/org-parser";
           sha256 = "06yb78mf486b986dhvqg3avflfyi271vykyars465qpk0v8ahq8h";
-          name = "org-parser";
+          name = "recipe";
         };
         packageRequires = [ dash emacs ht ];
         meta = {
@@ -53324,19 +66936,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-password-manager = callPackage ({ dash, fetchgit, fetchurl, lib, melpaBuild, org, s }:
-    melpaBuild {
+    org-password-manager = callPackage ({ dash
+                                        , fetchgit
+                                        , fetchurl
+                                        , lib
+                                        , melpaBuild
+                                        , org
+                                        , s }:
+      melpaBuild {
         pname = "org-password-manager";
         version = "20180227.1010";
         src = fetchgit {
-          url = "https://git.leafac.com/org-password-manager";
+          url = "https://github.com/leafac/org-password-manager";
           rev = "4b30a36e71182553a02e4dd415369290d98ec03a";
           sha256 = "1a6i3g032c5xzsnaf7rprn22kk68y1ay3w21p3q52p3lvlzhnfis";
         };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/02ef86ffe6923921cc1246e51ad8db87faa00ecb/recipes/org-password-manager";
-          sha256 = "0n07k2nng3zkrcif85f1r2g2l4vha78lmrdnj590axn7l5q5fidm";
-          name = "org-password-manager";
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fba84d698f7d16ffc0dc16618efcd1cdc0b39d79/recipes/org-password-manager";
+          sha256 = "0wxvl6ypgn6ky1z3dh33ya3rh73znkh5f8qhqwfmwp7hy2mbl4la";
+          name = "recipe";
         };
         packageRequires = [ dash org s ];
         meta = {
@@ -53344,8 +66962,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-pdfview = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org, pdf-tools }:
-    melpaBuild {
+    org-pdfview = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild
+                               , org
+                               , pdf-tools }:
+      melpaBuild {
         pname = "org-pdfview";
         version = "20180225.206";
         src = fetchFromGitHub {
@@ -53354,10 +66977,10 @@
           rev = "09ef4bf8ff8319c1ac78046c7e6b89f6a0beb82c";
           sha256 = "15zxdq6f6w3l8pzg3b58cj37z61dx106jwslpqni71m8wczdqkz1";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/org-pdfview";
           sha256 = "1qhlmzf2ffcrjnx4yghv7n6rsry8bcwnkw489spgraq9vxvqklah";
-          name = "org-pdfview";
+          name = "recipe";
         };
         packageRequires = [ org pdf-tools ];
         meta = {
@@ -53365,8 +66988,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-pomodoro = callPackage ({ alert, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    org-pomodoro = callPackage ({ alert
+                                , cl-lib ? null
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "org-pomodoro";
         version = "20171108.1314";
         src = fetchFromGitHub {
@@ -53375,10 +67003,10 @@
           rev = "3deed1c26dcbda4d5231b9085ddf68e302b0f9dc";
           sha256 = "0mpcqqrz8mrqn1gbvffyw5d0qgpg3cpljxqk028s9snj4vy6xpz5";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e54e77c5619b56e9b488b3fe8761188b6b3b4198/recipes/org-pomodoro";
           sha256 = "1vdi07hrhniyhhvg0hcr5mlixy6bjynvwm89z2lvfyvnnxpx0r27";
-          name = "org-pomodoro";
+          name = "recipe";
         };
         packageRequires = [ alert cl-lib ];
         meta = {
@@ -53386,8 +67014,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-present = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
-    melpaBuild {
+    org-present = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild
+                               , org }:
+      melpaBuild {
         pname = "org-present";
         version = "20180303.1530";
         src = fetchFromGitHub {
@@ -53396,10 +67028,10 @@
           rev = "d13acd70eff6a1608bc991920232146a0de76b21";
           sha256 = "0jz8xiny3rv9ql0p623byz32pip1b82j2c2nyfz2wd114kiabb6q";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/aba18f15fbaab115456e6afc9433074558a379f5/recipes/org-present";
           sha256 = "09h0cjqjwhqychyrdv1hmiyak677vgf1b94392sdsq3ns70zyjk7";
-          name = "org-present";
+          name = "recipe";
         };
         packageRequires = [ org ];
         meta = {
@@ -53407,20 +67039,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-preview-html = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
-    melpaBuild {
+    org-preview-html = callPackage ({ emacs
+                                    , fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild
+                                    , org }:
+      melpaBuild {
         pname = "org-preview-html";
-        version = "20160913.526";
+        version = "20180624.2319";
         src = fetchFromGitHub {
           owner = "lujun9972";
           repo = "org-preview-html";
-          rev = "2b6afbaf1fcf781bcd53074ee62895f15f5282e5";
-          sha256 = "1cr68gn093q7vvkald2gwcxns2ypqxhc5vavjj1j81ijrh1y1h2w";
+          rev = "8ba7ecd7ac624f33b3e2395f477bbff4f1ec4efe";
+          sha256 = "1h46v0ckhfzv3fixcfxk7pkmh56c5lana8kpwiknm447q1wmlbx4";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/org-preview-html";
           sha256 = "1dnr046mk5ngmic2yqcmrnn7pzrrx3sg22rk2pc3vgdxs8bhvhf9";
-          name = "org-preview-html";
+          name = "recipe";
         };
         packageRequires = [ emacs org ];
         meta = {
@@ -53428,20 +67065,28 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-projectile = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org-category-capture, projectile, s }:
-    melpaBuild {
+    org-projectile = callPackage ({ dash
+                                  , emacs
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild
+                                  , org-category-capture
+                                  , projectile
+                                  , s }:
+      melpaBuild {
         pname = "org-projectile";
-        version = "20171022.950";
+        version = "20180531.1942";
         src = fetchFromGitHub {
           owner = "IvanMalison";
           repo = "org-projectile";
-          rev = "53c193a209d663b33de71fe7d35eb40c0d0e15b6";
-          sha256 = "0kcbcj1nz2asi1v1nbqa2lp1qjg90nbdz2913m8c6dnwhff8rr0j";
+          rev = "e57023c0e33e4a0f848fcfec1902e13e6a92f711";
+          sha256 = "03svxxx6jh0c5517yvp7g5lfvjn3n4r169j589iii0fcjp4qri3n";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9d7a7ab98f364d3d5e93f83f0cb3d80a95f28689/recipes/org-projectile";
           sha256 = "0xdkd5pkyi6yfqi4przgp5mpklyxfxv0cww285zdlh00rzl935cw";
-          name = "org-projectile";
+          name = "recipe";
         };
         packageRequires = [ dash emacs org-category-capture projectile s ];
         meta = {
@@ -53449,20 +67094,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-projectile-helm = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, org-projectile }:
-    melpaBuild {
+    org-projectile-helm = callPackage ({ emacs
+                                       , fetchFromGitHub
+                                       , fetchurl
+                                       , helm
+                                       , lib
+                                       , melpaBuild
+                                       , org-projectile }:
+      melpaBuild {
         pname = "org-projectile-helm";
-        version = "20170819.826";
+        version = "20180601.1122";
         src = fetchFromGitHub {
           owner = "IvanMalison";
           repo = "org-projectile";
-          rev = "53c193a209d663b33de71fe7d35eb40c0d0e15b6";
-          sha256 = "0kcbcj1nz2asi1v1nbqa2lp1qjg90nbdz2913m8c6dnwhff8rr0j";
+          rev = "674e3cdda4a3ea4bdcc369dae032d49dfb5c5765";
+          sha256 = "02ia5i8aal9gck248v6kqzffsp09mmf4cispdbhqkp83mz96bxdn";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6760daac1ef9d9d7ba07e2fc9668873020f901f1/recipes/org-projectile-helm";
           sha256 = "0x79j5yr9wsgzjf1dpp7d4xiji8hgyhr79vb973an5z2r02vnaf4";
-          name = "org-projectile-helm";
+          name = "recipe";
         };
         packageRequires = [ emacs helm org-projectile ];
         meta = {
@@ -53470,8 +67121,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-protocol-jekyll = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    org-protocol-jekyll = callPackage ({ cl-lib ? null
+                                       , fetchFromGitHub
+                                       , fetchurl
+                                       , lib
+                                       , melpaBuild }:
+      melpaBuild {
         pname = "org-protocol-jekyll";
         version = "20170328.939";
         src = fetchFromGitHub {
@@ -53480,10 +67135,10 @@
           rev = "dec064a42d6dfe81dfde7ba59ece5ca103ac6334";
           sha256 = "1pgc0lfbz6q2x8b5qkk766i5qylql4p0ng732rcqr7rzg6j31gm7";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6d1ee7c75da91fcf303ea89d148a05ac1e58e23e/recipes/org-protocol-jekyll";
           sha256 = "18wg489n2d1sx9jk00ki6p2rxkqz67kqwnmy2kb1ga1rmb6x9wfs";
-          name = "org-protocol-jekyll";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -53491,20 +67146,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-radiobutton = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    org-radiobutton = callPackage ({ dash
+                                   , emacs
+                                   , fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "org-radiobutton";
-        version = "20180321.1535";
+        version = "20180612.328";
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "org-radiobutton";
-          rev = "15777e9b389cd93eab6c3c2f967e64a5b7f247b0";
-          sha256 = "1mysrs3m9bmw66r4hrh2bssfhgp56rbhnkcc4rm4d5slsbak10fz";
+          rev = "4182aafbe5ae1bdfb0b07efa435bdba8bbd7199d";
+          sha256 = "0jm5ijs4pjzvlzpqk3k9qqcvaza2lmz2c0fcxf1g357v643bmaj4";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/105043d8cfcb62ed89ddf9870f615519e6f415e7/recipes/org-radiobutton";
           sha256 = "16ly42iyfh7d34yz4bvdpj3zrlwkw3kmh82gwr25a05mlsdc1d93";
-          name = "org-radiobutton";
+          name = "recipe";
         };
         packageRequires = [ dash emacs ];
         meta = {
@@ -53512,8 +67172,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-random-todo = callPackage ({ alert, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    org-random-todo = callPackage ({ alert
+                                   , emacs
+                                   , fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "org-random-todo";
         version = "20180312.104";
         src = fetchFromGitHub {
@@ -53522,10 +67187,10 @@
           rev = "8357350a66bbc4e0e5cb590acc104d39870cf736";
           sha256 = "1cl1abgflbnnmvakb1z69rpr2gsm3hyg20iggwl6pn2fl0pf5wf5";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/80fad6244ea3e5bdf7f448c9f62374fae45bae78/recipes/org-random-todo";
           sha256 = "0yflppdbkfn2phd21zkjdlidzasfm846mzniay83v3akz0qx31lr";
-          name = "org-random-todo";
+          name = "recipe";
         };
         packageRequires = [ alert emacs ];
         meta = {
@@ -53533,20 +67198,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-randomnote = callPackage ({ dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    org-randomnote = callPackage ({ dash
+                                  , f
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "org-randomnote";
         version = "20171210.557";
         src = fetchFromGitHub {
           owner = "mwfogleman";
           repo = "org-randomnote";
-          rev = "c89eb4cf625ea7e7624b6a2d3d5676ce25ab03d7";
-          sha256 = "05ap1kbq5cwak70jlm3m0pvbax75kg3281qxs5flz3qbkfsbg3h2";
+          rev = "c544202d6cba1c1618ed39b2a45fa0ffc5f83e60";
+          sha256 = "1ny7qq3av43kbzd9q2rsqi04sg7n9snaqss3nazr80mpswx906dx";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d92cb392b23701948176ba12516df5ae6608e950/recipes/org-randomnote";
           sha256 = "06i42ig7icap1i1mqzv5cqwhnmsrzpjmjbjjn49nv26ljr3mjw0b";
-          name = "org-randomnote";
+          name = "recipe";
         };
         packageRequires = [ dash f ];
         meta = {
@@ -53554,8 +67224,16 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-readme = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, header2, http-post-simple, lib, lib-requires, melpaBuild, yaoddmuse }:
-    melpaBuild {
+    org-readme = callPackage ({ cl-lib ? null
+                              , fetchFromGitHub
+                              , fetchurl
+                              , header2
+                              , http-post-simple
+                              , lib
+                              , lib-requires
+                              , melpaBuild
+                              , yaoddmuse }:
+      melpaBuild {
         pname = "org-readme";
         version = "20151204.417";
         src = fetchFromGitHub {
@@ -53564,10 +67242,10 @@
           rev = "4cb9f768d282a2835b4510b6504ff9ede487007d";
           sha256 = "1q3s12s0ll7jhrnd3adkaxv7ff69ppprv0pyl5f6gy8y51y63k8d";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/317318e6071b174e0ec6302ea4f526976d837db4/recipes/org-readme";
           sha256 = "1qqbsgspd006gy0kc614w7bg6na0ygmflvqkmw47899pbgj81hxh";
-          name = "org-readme";
+          name = "recipe";
         };
         packageRequires = [
           cl-lib
@@ -53581,8 +67259,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-recent-headings = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, frecency, lib, melpaBuild, org }:
-    melpaBuild {
+    org-recent-headings = callPackage ({ dash
+                                       , emacs
+                                       , fetchFromGitHub
+                                       , fetchurl
+                                       , frecency
+                                       , lib
+                                       , melpaBuild
+                                       , org }:
+      melpaBuild {
         pname = "org-recent-headings";
         version = "20170907.2129";
         src = fetchFromGitHub {
@@ -53591,10 +67276,10 @@
           rev = "a09c2670c400c7a4fbbf0ac05d2d9226aa10e8f4";
           sha256 = "1m0v94zaz30c5p4k1s213dpg0kjs6nd92bph2zlbm37wq8znizmn";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/668b79c179cbdb77c4049e7c620433255f63d808/recipes/org-recent-headings";
           sha256 = "0b51pyxdk8fdbksx7h1c88sw1liwng8wkjfb1q7w7lglw6f8sjsa";
-          name = "org-recent-headings";
+          name = "recipe";
         };
         packageRequires = [ dash emacs frecency org ];
         meta = {
@@ -53602,20 +67287,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-redmine = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    org-redmine = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "org-redmine";
         version = "20160711.414";
         src = fetchFromGitHub {
           owner = "gongo";
           repo = "org-redmine";
-          rev = "e77d013bc3784947c46a5c53f03cd7d3c68552fc";
-          sha256 = "06miv3mf2a39vkf6mmm5ssc47inqh7dq82khsyc03anz4d4lj822";
+          rev = "a526c3ac802634486bf10de9c2283ccb1a30ec8d";
+          sha256 = "04lfnyq6d86wa3acvjd4w2wvh538z9crsgsg4rgpyahklc5vm01f";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/017a9dd8029d083ca0c1307f2b83be187c7615e5/recipes/org-redmine";
           sha256 = "0y2pm18nnyzm9wjc0j15v46nf3xi7a0wvspfzi360qv08i54skqv";
-          name = "org-redmine";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -53623,20 +67311,34 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-ref = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, helm-bibtex, htmlize, hydra, ivy, key-chord, lib, melpaBuild, pdf-tools, s }:
-    melpaBuild {
+    org-ref = callPackage ({ dash
+                           , emacs
+                           , f
+                           , fetchFromGitHub
+                           , fetchurl
+                           , helm
+                           , helm-bibtex
+                           , htmlize
+                           , hydra
+                           , ivy
+                           , key-chord
+                           , lib
+                           , melpaBuild
+                           , pdf-tools
+                           , s }:
+      melpaBuild {
         pname = "org-ref";
-        version = "20180409.813";
+        version = "20180706.614";
         src = fetchFromGitHub {
           owner = "jkitchin";
           repo = "org-ref";
-          rev = "57e14a9e1c91c47fc46eb63b51e0b6585dfec977";
-          sha256 = "129g1yzx5qkmy4s44czmmdk5ffvv9kdn0kpxcky56ndsyvnkz35p";
+          rev = "0f951f8b59adc1ad4e82f514eaf1e3487b9a036e";
+          sha256 = "1d4f89ssy6wgsyl4w1linns73k22lkmcvhq5rc8sg9vdsb8inw6k";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/550e4dcef2f74fbd96474561c1cb6c4fd80091fe/recipes/org-ref";
           sha256 = "087isxf3z8cgmmniaxr3lpq9jg3sriw88dwp4f0ky286hlvgzw08";
-          name = "org-ref";
+          name = "recipe";
         };
         packageRequires = [
           dash
@@ -53656,8 +67358,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-repo-todo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    org-repo-todo = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "org-repo-todo";
         version = "20171227.1719";
         src = fetchFromGitHub {
@@ -53666,10 +67371,10 @@
           rev = "f73ebd91399c5760ad52c6ad9033de1066042003";
           sha256 = "0c74zwmac8x1y8jimdx473v0falpky2kfig8pnaxavz415gb315q";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d17b602004628e17dae0f46f2b33be0afb05f729/recipes/org-repo-todo";
           sha256 = "0l5ns1hs3i4dhrpmvzl34zc9zysgjkfa7j8apbda59n9jdvml5v1";
-          name = "org-repo-todo";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -53677,20 +67382,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-review = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    org-review = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "org-review";
         version = "20160906.2237";
         src = fetchFromGitHub {
           owner = "brabalan";
           repo = "org-review";
-          rev = "058e75b7f28d2ad2390290fe17a63d98ef5ab763";
-          sha256 = "1j917zblg5ncls9lbvpzhqal55mx27d3kpvhzvjw2h7x47ji6iym";
+          rev = "44773bbd9868bb3ddca27cd35d2fc54139a70ab5";
+          sha256 = "1iqcxdni680pgl9azi7khx2ns3mh8sgpbq1mcc4ivxkbwrb93crb";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/org-review";
           sha256 = "1v7p7pmrjjyj0my9xw55gsn9vvr9aq5x53x13nmspvqg47z6bd98";
-          name = "org-review";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -53698,20 +67406,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-rich-yank = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    org-rich-yank = callPackage ({ emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "org-rich-yank";
-        version = "20180325.1218";
+        version = "20180430.644";
         src = fetchFromGitHub {
           owner = "unhammer";
           repo = "org-rich-yank";
-          rev = "ba7eb7ba8d25dbf053b1f746061a4442375da437";
-          sha256 = "0c6prl8wk9cf9rnr9ymwj50zv0gahbrwqjdqn0a46sflsaycb07i";
+          rev = "b29bd06f295424fc15b3b8c1b3f78f501d67db47";
+          sha256 = "0c4ywznxwf7hdc4x434d90hp440rplc4nsih4aswjkb7lx38lp9a";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1261823d88459b6ac42d6c55c157a326173663df/recipes/org-rich-yank";
           sha256 = "1v0sc90g5sl6b9ylxbk2y8s3pvxkf4v7k2rkzpgpbp4nrq0miy4y";
-          name = "org-rich-yank";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -53719,8 +67431,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-rtm = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, rtm }:
-    melpaBuild {
+    org-rtm = callPackage ({ fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild
+                           , rtm }:
+      melpaBuild {
         pname = "org-rtm";
         version = "20160214.436";
         src = fetchFromGitHub {
@@ -53729,10 +67445,10 @@
           rev = "adc42ad1fbe92ab447ccc9553780f4456f2508d2";
           sha256 = "1hn8y9933x5x6lxpijcqx97p3hln69ahabqdsl2bmzda3mxm4bn2";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/org-rtm";
           sha256 = "1hdcwmiv2qivdr2g78xz9fl38wn45vj0bn55dbsdj3qx7k7wgfx6";
-          name = "org-rtm";
+          name = "recipe";
         };
         packageRequires = [ rtm ];
         meta = {
@@ -53740,8 +67456,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-seek = callPackage ({ ag, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    org-seek = callPackage ({ ag
+                            , emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "org-seek";
         version = "20161216.2102";
         src = fetchFromGitHub {
@@ -53750,10 +67471,10 @@
           rev = "1f51e6634e3b9a6a29d335d0d14370a6ffef2265";
           sha256 = "0aq3af6fd16lm9iirzya6hmc8g48kfp8pc4dx51mgb5d6jjiizkv";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/org-seek";
           sha256 = "04ay4abm03kn15cn45ldrzh2rw6gr6ia3qrj7hn5crd75ppwvln7";
-          name = "org-seek";
+          name = "recipe";
         };
         packageRequires = [ ag emacs ];
         meta = {
@@ -53761,8 +67482,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-send-ebook = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }:
-    melpaBuild {
+    org-send-ebook = callPackage ({ cl-lib ? null
+                                  , emacs
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild
+                                  , seq }:
+      melpaBuild {
         pname = "org-send-ebook";
         version = "20180401.1015";
         src = fetchFromGitHub {
@@ -53771,10 +67498,10 @@
           rev = "efa80f3c1a26347097a16eca4dda2610627fcdf0";
           sha256 = "097cpr9v0c03117z76cy0b9faq3zjvi45anvgrw4bkbgs5mh9x2l";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/646106cf43649544056285aef8c4035b6e5bbbdb/recipes/org-send-ebook";
           sha256 = "0gvnrl4rfqn3zd0wmj4bhd63zkjk68lwwcgmsqrfw7af22wlfv3d";
-          name = "org-send-ebook";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs seq ];
         meta = {
@@ -53782,20 +67509,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-static-blog = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    org-static-blog = callPackage ({ emacs
+                                   , fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "org-static-blog";
-        version = "20180402.237";
+        version = "20180527.2348";
         src = fetchFromGitHub {
           owner = "bastibe";
           repo = "org-static-blog";
-          rev = "0ce09a3c27f6ea862b6dd121cb16a192cee0e9c4";
-          sha256 = "07hx4d8a2m7kj151zjc0920l6h0c0d7jgvravp2n5rgcb76yrlnp";
+          rev = "f69d2fd6671fb250fbd87df5efa898a7bf5b9bda";
+          sha256 = "1h9c96rbxxk1jypib5f9pfi5zkimkvhxi61j0sps6r39435dd3w7";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e0768d41a3de625c04ac8644ef2e05f17ee99908/recipes/org-static-blog";
           sha256 = "07vh2k7cj0cs1yzfmrrz9p03x5mbfh0bigbl93s72h1wf7i05rkw";
-          name = "org-static-blog";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -53803,20 +67534,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-sticky-header = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
-    melpaBuild {
+    org-sticky-header = callPackage ({ emacs
+                                     , fetchFromGitHub
+                                     , fetchurl
+                                     , lib
+                                     , melpaBuild
+                                     , org }:
+      melpaBuild {
         pname = "org-sticky-header";
         version = "20170422.2135";
         src = fetchFromGitHub {
           owner = "alphapapa";
           repo = "org-sticky-header";
-          rev = "aae8dbc7f3b33c4dd35dc38d83791d7c23757060";
-          sha256 = "1vdaqi0054hgf70i1g4lxxr3ry6k855ndjysq9c8ip4x2dfzyrv4";
+          rev = "a435bffa3d155bdc2ad536f4da869f884e38773e";
+          sha256 = "1gq0xcb1824kgjcfy868sf0a6xv4qmnzl4pmv8zlp8jb5d1ghlic";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bc9a600bd156eb766ba5ce37e16f3e8253f37ee8/recipes/org-sticky-header";
           sha256 = "0ign3vjckmxp7n3625wb53qlch07c3s4l67jsvk38dhhcsg1rhnj";
-          name = "org-sticky-header";
+          name = "recipe";
         };
         packageRequires = [ emacs org ];
         meta = {
@@ -53824,20 +67560,28 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-super-agenda = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, org, s }:
-    melpaBuild {
+    org-super-agenda = callPackage ({ dash
+                                    , emacs
+                                    , fetchFromGitHub
+                                    , fetchurl
+                                    , ht
+                                    , lib
+                                    , melpaBuild
+                                    , org
+                                    , s }:
+      melpaBuild {
         pname = "org-super-agenda";
-        version = "20170904.1516";
+        version = "20180714.1348";
         src = fetchFromGitHub {
           owner = "alphapapa";
           repo = "org-super-agenda";
-          rev = "d06bfb021bee575ce750b36ee9bfc2d8fc8fd635";
-          sha256 = "1lh4ggpc948cs7i4h3hxj4qq4msr9wqi97h6skflvgvs5ihlgq41";
+          rev = "3b5e8faeec1333aca3cafbbaa350dacc95412086";
+          sha256 = "1l19c1pbxgyrc19jv8zp8mv60xhwf50g8fc7jmc24p73ckvff7w4";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fd27b2df7594a867529de4b84c8107f82dabe2e9/recipes/org-super-agenda";
           sha256 = "1h3kqvpjq2w0n8qiqwb8wcpdy2g4ac7j6kin0943g7p5gm5yf0ra";
-          name = "org-super-agenda";
+          name = "recipe";
         };
         packageRequires = [ dash emacs ht org s ];
         meta = {
@@ -53845,20 +67589,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-sync = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
-    melpaBuild {
+    org-sync = callPackage ({ cl-lib ? null
+                            , emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild
+                            , org }:
+      melpaBuild {
         pname = "org-sync";
         version = "20180221.1127";
         src = fetchFromGitHub {
           owner = "arbox";
           repo = "org-sync";
-          rev = "095335063b306871970f981898a220f62ad0ae4e";
-          sha256 = "0p4xmlhv9xsa111yrgmfl5laznmj9ijpsifqcxmplrf5ckzqbdkn";
+          rev = "fedddd20384de9919ba8e0b08344ff9356508805";
+          sha256 = "0hkr5m795srmx8vzqaa4rhrnnm7qyxnadj5wlkdgsa8c3vcjl5gc";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/923ddbaf1a158caac5e666a396a8dc66969d204a/recipes/org-sync";
           sha256 = "0n8fz2d1vg9r8dszgasbnb6pgaxr2i8mqrp953prf1nhmfpjpxad";
-          name = "org-sync";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs org ];
         meta = {
@@ -53866,8 +67616,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-sync-snippets = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
-    melpaBuild {
+    org-sync-snippets = callPackage ({ emacs
+                                     , f
+                                     , fetchFromGitHub
+                                     , fetchurl
+                                     , lib
+                                     , melpaBuild
+                                     , org }:
+      melpaBuild {
         pname = "org-sync-snippets";
         version = "20170824.1128";
         src = fetchFromGitHub {
@@ -53876,10 +67632,10 @@
           rev = "0f264a032d371d7dbb4a7cbaf0ea2f91b5a629ca";
           sha256 = "0j680cla1zlxkwnslxwnxd5h6v1vvwr9byi1aawm9gxvz11x7vsj";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/96aff3f39adfa0c68aca8ff8d3b11fbfd889327e/recipes/org-sync-snippets";
           sha256 = "0kv15zqva2cgx7jscp02x9gx20b5ckf525h546hyca86vfaakfbp";
-          name = "org-sync-snippets";
+          name = "recipe";
         };
         packageRequires = [ emacs f org ];
         meta = {
@@ -53887,8 +67643,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-table-comment = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    org-table-comment = callPackage ({ fetchFromGitHub
+                                     , fetchurl
+                                     , lib
+                                     , melpaBuild }:
+      melpaBuild {
         pname = "org-table-comment";
         version = "20120209.1051";
         src = fetchFromGitHub {
@@ -53897,10 +67656,10 @@
           rev = "33b9966c33ecbc3e27cca67c2f2cdea04364d74e";
           sha256 = "1qx3kd02sxs9k7adlvdlbmyhkc5kr7ni5lw4gxjw3nphnc536bkb";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2c1f08c41969bc8a7104fb914564b4f6cab667e2/recipes/org-table-comment";
           sha256 = "1d40vl8aa1x27z4gwnkzxgrqp7vd3ln2pc445ijjxp1wr8bjxvdz";
-          name = "org-table-comment";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -53908,8 +67667,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-table-sticky-header = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
-    melpaBuild {
+    org-table-sticky-header = callPackage ({ emacs
+                                           , fetchFromGitHub
+                                           , fetchurl
+                                           , lib
+                                           , melpaBuild
+                                           , org }:
+      melpaBuild {
         pname = "org-table-sticky-header";
         version = "20170408.1814";
         src = fetchFromGitHub {
@@ -53918,10 +67682,10 @@
           rev = "93dc69efc00ac9fd3cc2ece5100f51df33ec7d8b";
           sha256 = "0d9d9sxak6kvqbb91h65ahw272d7dfxpgjw6zbs472xb6di1r6pm";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5dd0e18bf4c3f3263eff8aff6d7c743a554243b5/recipes/org-table-sticky-header";
           sha256 = "1rk41279rcsdma39zpr1ka5p47gh1d0969wahd0jbm5xlmx5gz2m";
-          name = "org-table-sticky-header";
+          name = "recipe";
         };
         packageRequires = [ emacs org ];
         meta = {
@@ -53929,8 +67693,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-tfl = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
-    melpaBuild {
+    org-tfl = callPackage ({ cl-lib ? null
+                           , emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild
+                           , org }:
+      melpaBuild {
         pname = "org-tfl";
         version = "20170923.518";
         src = fetchFromGitHub {
@@ -53939,10 +67709,10 @@
           rev = "f0d7d39106a1de5457f5160cddd98ab892b61066";
           sha256 = "1rwdibiq0w4nzccmvdkpwnmfga70y35lfg2xlkqxd02x7bfl7j3m";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d9e97f2fee577c7e3fb42e4ca9d4f422c8907faf/recipes/org-tfl";
           sha256 = "1rqmmw0222vbxfn5wxq9ni2j813x92lpv99jjszqjvgnf2rkhjhf";
-          name = "org-tfl";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs org ];
         meta = {
@@ -53950,8 +67720,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-themis = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    org-themis = callPackage ({ cl-lib ? null
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "org-themis";
         version = "20160121.2004";
         src = fetchFromGitHub {
@@ -53960,10 +67734,10 @@
           rev = "78aadbbe22b1993be5c4accd0d3f91a4e85c9a3c";
           sha256 = "1apd5yyr12skagma7xpzrh22rhplmhhv0pma4zf5b0i6nkxy06j2";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/60e0efe4f201ed96e90c437e3e7205e0344d4676/recipes/org-themis";
           sha256 = "08rajz5y7h88fh94s2ad0f66va4vi31k9hwdv8p212bs276rp7ln";
-          name = "org-themis";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -53971,20 +67745,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-time-budgets = callPackage ({ alert, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    org-time-budgets = callPackage ({ alert
+                                    , cl-lib ? null
+                                    , fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "org-time-budgets";
         version = "20151111.1";
         src = fetchFromGitHub {
           owner = "leoc";
           repo = "org-time-budgets";
-          rev = "baa1ce6333157fed3b3799a80e6cf8c73c9e2c18";
-          sha256 = "04adkz950vvwyzy3da468nnqsknpr5kw5369w2yqhnph16cwwfxb";
+          rev = "530dd4ce72f94a86db28b3e19c164e64df2a29ab";
+          sha256 = "09iw2jffb2qrx5r07zd1j8sk5wafamjkc2khqyfwc5kx6xyp1f46";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/776b58b433ab7dde5870300d288c3e6734fc32c0/recipes/org-time-budgets";
           sha256 = "0r8km586n6xdnjha7xnzlh03nw1dp066hydaz8kxfmhvygl9cpah";
-          name = "org-time-budgets";
+          name = "recipe";
         };
         packageRequires = [ alert cl-lib ];
         meta = {
@@ -53992,20 +67771,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-toodledo = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request-deferred }:
-    melpaBuild {
+    org-toodledo = callPackage ({ cl-lib ? null
+                                , emacs
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild
+                                , request-deferred }:
+      melpaBuild {
         pname = "org-toodledo";
         version = "20150301.313";
         src = fetchFromGitHub {
           owner = "myuhe";
           repo = "org-toodledo";
-          rev = "2c91a92bd07ae4a546771b018a6faa0e06399968";
-          sha256 = "014337wimvzy0rxh2p2c647ly215zcyhgym2hcljkdriv15cafna";
+          rev = "01b53b637f304b89cd3bf2d29009b5ed6ad9466d";
+          sha256 = "1c6kc79f6qkg7dl40mzmhcjph29i8frcfvfcvz4b155ilxwzr0z4";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4956fb6c5f1076a02f07d0f953e846fee39bfaa6/recipes/org-toodledo";
           sha256 = "0c7qr0jsc4iyrwkc22xp9nmk6984v7q1k0rvpd62m07lb5gvbiq3";
-          name = "org-toodledo";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs request-deferred ];
         meta = {
@@ -54013,8 +67798,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-tracktable = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    org-tracktable = callPackage ({ cl-lib ? null
+                                  , emacs
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "org-tracktable";
         version = "20161118.529";
         src = fetchFromGitHub {
@@ -54023,10 +67813,10 @@
           rev = "8e0e60a582a034bd66d5efb72d513140b7d4d90a";
           sha256 = "1aq7qv5jyc2x2a4iphnzmmsvak6dbi7nwdcf3m8nly8w75vrl5lj";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/57263d996e321f842d0741898370390146606c63/recipes/org-tracktable";
           sha256 = "0mngf9q2ffxq32cgng0xl30661mj15wmr9y4hr3xddj626kxrp00";
-          name = "org-tracktable";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -54034,8 +67824,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-transform-tree-table = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    org-transform-tree-table = callPackage ({ dash
+                                            , fetchFromGitHub
+                                            , fetchurl
+                                            , lib
+                                            , melpaBuild
+                                            , s }:
+      melpaBuild {
         pname = "org-transform-tree-table";
         version = "20150110.633";
         src = fetchFromGitHub {
@@ -54044,10 +67839,10 @@
           rev = "0a9bf07f01bc5fc3b349aff64e83999a8de83b52";
           sha256 = "1h15fr16kgbyrxambmk4hsmha6hx4c4yqkccb82g3wlvzmnqj5x3";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/afca0e652a993848610606866609edbf2f5f76ae/recipes/org-transform-tree-table";
           sha256 = "0n68cw769nk90ms6w1w6cc1nxjwn1navkz56mf11bsiqvsk3km7r";
-          name = "org-transform-tree-table";
+          name = "recipe";
         };
         packageRequires = [ dash s ];
         meta = {
@@ -54055,20 +67850,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-tree-slide = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    org-tree-slide = callPackage ({ fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "org-tree-slide";
-        version = "20171129.2238";
+        version = "20180424.1636";
         src = fetchFromGitHub {
           owner = "takaxp";
           repo = "org-tree-slide";
-          rev = "9f1b898223f3dafd15a384e0d06da8f09bd55cb0";
-          sha256 = "097p6wyx8fabwmsg8nvv8zlmk6fr8wgbckn5pz8vdzjwp0kbi3s5";
+          rev = "6608f8d43bf40acbddeb4434715283e5884c8a02";
+          sha256 = "0cp1pbpvb8dyg5milrhlarsygdfyzpy44yhf7xhrbfmk96v8073w";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6160c259bc4bbcf3b98c220222430f798ee6463f/recipes/org-tree-slide";
           sha256 = "0v857zplv0wdbg4li667v2p5pn5zcf9fgbqcwa75x8babilkl6jn";
-          name = "org-tree-slide";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -54076,8 +67874,16 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-trello = callPackage ({ dash, dash-functional, deferred, fetchFromGitHub, fetchurl, lib, melpaBuild, request-deferred, s }:
-    melpaBuild {
+    org-trello = callPackage ({ dash
+                              , dash-functional
+                              , deferred
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild
+                              , request-deferred
+                              , s }:
+      melpaBuild {
         pname = "org-trello";
         version = "20180330.2331";
         src = fetchFromGitHub {
@@ -54086,10 +67892,10 @@
           rev = "e2e8a3d45057645e4caae7d46a79d2d9be2894bd";
           sha256 = "12yw54hg1lhfxw6mvxjsvbiv7cg1zwm3ccsl7g127vbf0yp2dhrl";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/188ed8dc1ce2704838f7a2883c41243598150a46/recipes/org-trello";
           sha256 = "14lq8nn1x6qb3jx518zaaz5582m4npd593w056igqhahkfm0qp8i";
-          name = "org-trello";
+          name = "recipe";
         };
         packageRequires = [ dash dash-functional deferred request-deferred s ];
         meta = {
@@ -54097,8 +67903,36 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-vcard = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    org-variable-pitch = callPackage ({ emacs
+                                      , fetchFromGitHub
+                                      , fetchurl
+                                      , lib
+                                      , melpaBuild }:
+      melpaBuild {
+        pname = "org-variable-pitch";
+        version = "20180429.1515";
+        src = fetchFromGitHub {
+          owner = "cadadr";
+          repo = "elisp";
+          rev = "ffe03506694c94de0444995f973a925deccc400a";
+          sha256 = "02wcvka96zdlq3myfar7dqywfil2b77bc6ydmgcphwn3as3kl08r";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/9632b7e98772b584d6420f8d0f9652d67118e05e/recipes/org-variable-pitch";
+          sha256 = "1xci5zq1bpwnm3adlcsxzpskxywzalb1n3n14lvf787f77ib602c";
+          name = "recipe";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/org-variable-pitch";
+          license = lib.licenses.free;
+        };
+      }) {};
+    org-vcard = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "org-vcard";
         version = "20170929.410";
         src = fetchFromGitHub {
@@ -54107,10 +67941,10 @@
           rev = "dbe266b79df4fb31f1766010322bf4e383ce1c03";
           sha256 = "1rcqcgxvjshbz3n1p376h618xapj03n6m7b3cxgv9gnryviyr6ax";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/df860814a09c376c9a6a2c5e7f528bbae29810b2/recipes/org-vcard";
           sha256 = "0l6azshvzl1wws582njqr3qx4h73gwrdqwa3jcic1qbs9hg2l4yl";
-          name = "org-vcard";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -54118,20 +67952,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-wc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    org-wc = callPackage ({ fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "org-wc";
-        version = "20180415.2219";
+        version = "20180609.1953";
         src = fetchFromGitHub {
           owner = "tesujimath";
           repo = "org-wc";
-          rev = "d22b4cff3e1157ca468b186eb789ca62b9214abd";
-          sha256 = "0ysnydpm6lviak3mrqifim4zs2lffbjiv9nvb33qs8mi1dq2igji";
+          rev = "0716c1e8276f6953e139e357e97566e792c8be19";
+          sha256 = "0wx4z6y3wn6948bz2pgrpffd4jzwgplvjkh0rnra4gihrapg1bv8";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/852e0a5cee285cc9b5e2cd9e18061fc0fe91d5a6/recipes/org-wc";
           sha256 = "1yk2py4bzm2yr8vw6rbgl2hfpd21hf4fga0d5q6y779631klp6wl";
-          name = "org-wc";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -54139,20 +67976,28 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-web-tools = callPackage ({ dash, emacs, esxml, fetchFromGitHub, fetchurl, lib, melpaBuild, org, s }:
-    melpaBuild {
+    org-web-tools = callPackage ({ dash
+                                 , emacs
+                                 , esxml
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild
+                                 , org
+                                 , s }:
+      melpaBuild {
         pname = "org-web-tools";
-        version = "20180117.1915";
+        version = "20180531.1808";
         src = fetchFromGitHub {
           owner = "alphapapa";
           repo = "org-web-tools";
-          rev = "8d2e7556947f6647f55e41ed3ad3710878631fb3";
-          sha256 = "1wx85ah89x2fg69kn2ilk950dnz5asmq205kar95c3rrxymf4yia";
+          rev = "58c37ab50e99775cf4ed3d6884aa9c3f45d855de";
+          sha256 = "18kwlwv85qdaahp71r43h2hv1pn078jkfqfpmb7vvsks23i4vvh2";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f082bfb480649d21f586b7eb331c19d57e7a84cf/recipes/org-web-tools";
           sha256 = "19zpspap85fjqg5a20ps34rcigb0ws986pj6dzd7xik8s6ia29s7";
-          name = "org-web-tools";
+          name = "recipe";
         };
         packageRequires = [ dash emacs esxml org s ];
         meta = {
@@ -54160,8 +68005,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-wild-notifier = callPackage ({ alert, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    org-wild-notifier = callPackage ({ alert
+                                     , dash
+                                     , emacs
+                                     , fetchFromGitHub
+                                     , fetchurl
+                                     , lib
+                                     , melpaBuild }:
+      melpaBuild {
         pname = "org-wild-notifier";
         version = "20180221.2025";
         src = fetchFromGitHub {
@@ -54170,10 +68021,10 @@
           rev = "d0df145d9bbb72b2c315b7d8007cb6a59fea2095";
           sha256 = "1xcnb5x539776b6ljd9qyl9jadp2r4qg805m4m8yfz9sk00dv7yl";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/114552a24f73f13b253e3db4885039b680f6ef33/recipes/org-wild-notifier";
           sha256 = "1lmpa614jnkpmfg3m1d2wjn9w0zig3gwd02n3dyjn23n71fiyhkp";
-          name = "org-wild-notifier";
+          name = "recipe";
         };
         packageRequires = [ alert dash emacs ];
         meta = {
@@ -54181,20 +68032,29 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-wunderlist = callPackage ({ alert, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org, request-deferred, s }:
-    melpaBuild {
+    org-wunderlist = callPackage ({ alert
+                                  , cl-lib ? null
+                                  , emacs
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild
+                                  , org
+                                  , request-deferred
+                                  , s }:
+      melpaBuild {
         pname = "org-wunderlist";
         version = "20150817.1913";
         src = fetchFromGitHub {
           owner = "myuhe";
           repo = "org-wunderlist.el";
-          rev = "f7f1ca73661356b9fa072efd73431592ff1182e1";
-          sha256 = "169wzfjc9bbk2ydgq1zghrwkfp2fjwsrnwsw86npslj4c4bz41mm";
+          rev = "18565a018364db123dd0785c3c459a33ac458a2c";
+          sha256 = "1yyhh9ys67cg3y64vwi5nsl4vz793lkl4gpbv6jar8j5ryfg0z5w";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/44019e5d9e3d0f3e2cf76fa5828e1f953fd5e60b/recipes/org-wunderlist";
           sha256 = "08zg3wgr80rp89c53ffqzz22ws9bp62a1m74xvxa74x6nq9i4xl0";
-          name = "org-wunderlist";
+          name = "recipe";
         };
         packageRequires = [ alert cl-lib emacs org request-deferred s ];
         meta = {
@@ -54202,20 +68062,27 @@
           license = lib.licenses.free;
         };
       }) {};
-    org2blog = callPackage ({ fetchFromGitHub, fetchurl, htmlize, lib, melpaBuild, metaweblog, org, xml-rpc }:
-    melpaBuild {
+    org2blog = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , htmlize
+                            , lib
+                            , melpaBuild
+                            , metaweblog
+                            , org
+                            , xml-rpc }:
+      melpaBuild {
         pname = "org2blog";
         version = "20171218.1911";
         src = fetchFromGitHub {
           owner = "punchagan";
           repo = "org2blog";
-          rev = "aa7a5730f4a58a53c41370dcde7bec43d5c1a2cd";
-          sha256 = "1ivf156186myr84rqbd8rn6wa8qjrip7la6sgc8k6ggg6lzvkqac";
+          rev = "04ea7e80497ab7f7bc0d097f1807d3a085074812";
+          sha256 = "1qpw5bs5qjlpw3hphbf2jg0h8bdrcgrb8xavdsx8viwjl013d4ps";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/org2blog";
           sha256 = "1xa03k9z8fq74w0w3vfkigz24i6c8s4vib077l16vqik7wg4yh40";
-          name = "org2blog";
+          name = "recipe";
         };
         packageRequires = [ htmlize metaweblog org xml-rpc ];
         meta = {
@@ -54223,8 +68090,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    org2ctex = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    org2ctex = callPackage ({ emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "org2ctex";
         version = "20171016.2343";
         src = fetchFromGitHub {
@@ -54233,10 +68104,10 @@
           rev = "1b74aa9cf45de224ffd6aa9b93f0debddc2b48bc";
           sha256 = "17qkz3ja87hhq41hvlxvdzqipmi1gn38khd00dshsxhk5hg7i99a";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8f77fe537ca8ee2ddb6e3efe71f3b3c560c52c7d/recipes/org2ctex";
           sha256 = "0049zf3ls7vbbcz1hdwai57ih9gppk2j0gzwijzwkb23ccwaf64a";
-          name = "org2ctex";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -54244,8 +68115,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    org2elcomment = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
-    melpaBuild {
+    org2elcomment = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild
+                                 , org }:
+      melpaBuild {
         pname = "org2elcomment";
         version = "20170324.245";
         src = fetchFromGitHub {
@@ -54254,10 +68129,10 @@
           rev = "c88a75d9587c484ead18f7adf08592b09c1cceb0";
           sha256 = "19r7rxnd2cl0vc8bbf86mh5b779pl5z917657ymlc74bqq140m3x";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8af13650de8b4a814832638d4182bf8ce576244c/recipes/org2elcomment";
           sha256 = "0jv8sskw55rzxw578l6nm4arsycrw1si80ds7gr8i0x352fdydyp";
-          name = "org2elcomment";
+          name = "recipe";
         };
         packageRequires = [ org ];
         meta = {
@@ -54265,8 +68140,16 @@
           license = lib.licenses.free;
         };
       }) {};
-    org2issue = callPackage ({ emacs, fetchFromGitHub, fetchurl, gh, lib, melpaBuild, org, ox-gfm, s }:
-    melpaBuild {
+    org2issue = callPackage ({ emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , gh
+                             , lib
+                             , melpaBuild
+                             , org
+                             , ox-gfm
+                             , s }:
+      melpaBuild {
         pname = "org2issue";
         version = "20160426.1818";
         src = fetchFromGitHub {
@@ -54275,10 +68158,10 @@
           rev = "0f7f13463e389f2d8d7d830a928042d0cf1c71eb";
           sha256 = "1lvwkvzqgy9nlz7zmqfl9j8cairjfv3vknpzcqp6rzp6hkq04zk5";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ad1759854c3bd302aa353dea92cf462e981aff2f/recipes/org2issue";
           sha256 = "1qd5l9ga26smgp1gkc8r9ja2n974kq1jf2z876s5v0489ipa59bz";
-          name = "org2issue";
+          name = "recipe";
         };
         packageRequires = [ emacs gh org ox-gfm s ];
         meta = {
@@ -54286,8 +68169,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    org2jekyll = callPackage ({ dash-functional, deferred, fetchFromGitHub, fetchurl, kv, lib, melpaBuild, s }:
-    melpaBuild {
+    org2jekyll = callPackage ({ dash-functional
+                              , deferred
+                              , fetchFromGitHub
+                              , fetchurl
+                              , kv
+                              , lib
+                              , melpaBuild
+                              , s }:
+      melpaBuild {
         pname = "org2jekyll";
         version = "20170225.115";
         src = fetchFromGitHub {
@@ -54296,10 +68186,10 @@
           rev = "52a19a5d372116262b9d613f4ec8490a3b49e329";
           sha256 = "14ld8ip487282if2sil96lfg5wx7632kg71sxhafygphbdl9vxd4";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/48a1e5bd5e338bd3593f004f95b6fbb12595bfb7/recipes/org2jekyll";
           sha256 = "1j9d6xf5nsakifxwd4zmjc29lbj46ffn3z109k2y2yhz7q3r9hzv";
-          name = "org2jekyll";
+          name = "recipe";
         };
         packageRequires = [ dash-functional deferred kv s ];
         meta = {
@@ -54307,8 +68197,19 @@
           license = lib.licenses.free;
         };
       }) {};
-    org2web = callPackage ({ cl-lib ? null, dash, el2org, fetchFromGitHub, fetchurl, ht, htmlize, lib, melpaBuild, mustache, org, simple-httpd }:
-    melpaBuild {
+    org2web = callPackage ({ cl-lib ? null
+                           , dash
+                           , el2org
+                           , fetchFromGitHub
+                           , fetchurl
+                           , ht
+                           , htmlize
+                           , lib
+                           , melpaBuild
+                           , mustache
+                           , org
+                           , simple-httpd }:
+      melpaBuild {
         pname = "org2web";
         version = "20171005.1617";
         src = fetchFromGitHub {
@@ -54317,10 +68218,10 @@
           rev = "5243b399927a4c474bb3b8d1c8a00799df1f27d7";
           sha256 = "0wsvfn409a2ivbich8b8zqza78sprirg4bl7igx536ydqclmi0n7";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2864959163442165b9b1cd5471dc2649508decde/recipes/org2web";
           sha256 = "0lcqf0pgkd7jilasw1485fy45k269jxvyl7hl7qrcs94s6fy2vaf";
-          name = "org2web";
+          name = "recipe";
         };
         packageRequires = [
           cl-lib
@@ -54337,20 +68238,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    organic-green-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    organic-green-theme = callPackage ({ fetchFromGitHub
+                                       , fetchurl
+                                       , lib
+                                       , melpaBuild }:
+      melpaBuild {
         pname = "organic-green-theme";
-        version = "20170720.1111";
+        version = "20180522.920";
         src = fetchFromGitHub {
           owner = "kostafey";
           repo = "organic-green-theme";
-          rev = "eea6b77b7ee26310fd6741b9affc3f2c43be2820";
-          sha256 = "1zaxvc1j6lfdg8wi80pfjywr6nfr7qc27j4ahzz59giba3bb7azp";
+          rev = "200ac4a636eeb6faf1793d1937e62a343debc437";
+          sha256 = "18a04grh4k9npf566xki9fiivy5qvpvv5v8mpj66wfx919fwa44c";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9383ef5f0372724b34f4bb9173ef8ccbb773e19e/recipes/organic-green-theme";
           sha256 = "1fdj3dpcdqx0db5q8dlxag6pr2qn4yiz1hmg3c7dkmh51n85ssw2";
-          name = "organic-green-theme";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -54358,20 +68262,53 @@
           license = lib.licenses.free;
         };
       }) {};
-    orgbox = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
-    melpaBuild {
+    organize-imports-java = callPackage ({ cl-lib ? null
+                                         , emacs
+                                         , f
+                                         , fetchFromGitHub
+                                         , fetchurl
+                                         , lib
+                                         , melpaBuild
+                                         , s }:
+      melpaBuild {
+        pname = "organize-imports-java";
+        version = "20180623.1209";
+        src = fetchFromGitHub {
+          owner = "jcs090218";
+          repo = "organize-imports-java";
+          rev = "cd21c23f903384ffe0eca5e6511bdf893457ab19";
+          sha256 = "196rwbj8ayccrm7qz72fxk5lngpi00vg9hn4v05krwfhg496yp0k";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/ad0242f941ff44b4897c94d336bc0af498582dd7/recipes/organize-imports-java";
+          sha256 = "1k8s7pm268w42fm0lqlqg77mib8mbccw11ppf99r574510a1bni3";
+          name = "recipe";
+        };
+        packageRequires = [ cl-lib emacs f s ];
+        meta = {
+          homepage = "https://melpa.org/#/organize-imports-java";
+          license = lib.licenses.free;
+        };
+      }) {};
+    orgbox = callPackage ({ cl-lib ? null
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild
+                          , org }:
+      melpaBuild {
         pname = "orgbox";
         version = "20140528.1826";
         src = fetchFromGitHub {
           owner = "yasuhito";
           repo = "orgbox";
-          rev = "72373b09768cc2200d143af38e25a0c082e8375d";
-          sha256 = "0hwmr67nky9xp5xlrkp54nw6b72d29lmna28dnbgqs2i5rccbk55";
+          rev = "612dd2250dbae01c85342923223f9063aae535c5";
+          sha256 = "02mxp17p7bj4xamg0m6zk832hmpqcgzc7bjbjcnvbvrawhc255hy";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b1948eca5a18f35b61b9a0baf532753fd105ba3a/recipes/orgbox";
           sha256 = "12wfqlpjh9nr7zgqs4h8kmfsk825n68qcbn8z2fw2mpshg3nj7l8";
-          name = "orgbox";
+          name = "recipe";
         };
         packageRequires = [ cl-lib org ];
         meta = {
@@ -54379,8 +68316,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    orgit = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild, org }:
-    melpaBuild {
+    orgit = callPackage ({ dash
+                         , emacs
+                         , fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , magit
+                         , melpaBuild
+                         , org }:
+      melpaBuild {
         pname = "orgit";
         version = "20180318.1301";
         src = fetchFromGitHub {
@@ -54389,10 +68333,10 @@
           rev = "d909f92d3b1b42184143fd5e6d4c6a2762477ab7";
           sha256 = "1jdc874bxkpbfpllak3vmfsn82p930s565bzff341vzv7aw2528c";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/73b5f7c44c90540e4cbdc003d9881f0ac22cc7bc/recipes/orgit";
           sha256 = "0askccb3h98v8gmylwxaph3gbyv5b1sp4slws76aqz1kq9x0jy7w";
-          name = "orgit";
+          name = "recipe";
         };
         packageRequires = [ dash emacs magit org ];
         meta = {
@@ -54400,20 +68344,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    orglink = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
-    melpaBuild {
+    orglink = callPackage ({ dash
+                           , emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild
+                           , org }:
+      melpaBuild {
         pname = "orglink";
         version = "20180318.1323";
         src = fetchFromGitHub {
           owner = "tarsius";
           repo = "orglink";
-          rev = "e9e90e16ddaceaf99c9b251a215d6338b9762b4d";
-          sha256 = "0vqyidi54rbpqwqi6iv1xaqkr9gfr0pfhr1msxckh8jy6avgy319";
+          rev = "82ea67b7f1bf10627759044acb74828f66a85a83";
+          sha256 = "0zqbz1idj73wz3kljkkzl7mvalk73j7xpl3di6mb16ylscg9sraw";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/be9b8e97cda6af91d54d402887f225e3a0caf055/recipes/orglink";
           sha256 = "0ldrvvqs3hlazj0dch162gsbnbxcg6fgrxid8p7w9gj19vbcl52b";
-          name = "orglink";
+          name = "recipe";
         };
         packageRequires = [ dash emacs org ];
         meta = {
@@ -54421,8 +68371,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    orglue = callPackage ({ epic, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
-    melpaBuild {
+    orglue = callPackage ({ epic
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild
+                          , org }:
+      melpaBuild {
         pname = "orglue";
         version = "20171220.426";
         src = fetchFromGitHub {
@@ -54431,10 +68386,10 @@
           rev = "ae2a45c19b52e45db7891093a3ff17ba2e51c507";
           sha256 = "0h3b37wz4hlk022c0sq7c9p5z3v4n6cljhy8g1qjhnxac8y7mkr0";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/orglue";
           sha256 = "1kj62y3cf3as2d5s207s6kg5alm09jmw0aag1z6lblrjlzbi1p2j";
-          name = "orglue";
+          name = "recipe";
         };
         packageRequires = [ epic org ];
         meta = {
@@ -54442,8 +68397,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    orgnav = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }:
-    melpaBuild {
+    orgnav = callPackage ({ dash
+                          , emacs
+                          , fetchFromGitHub
+                          , fetchurl
+                          , helm
+                          , lib
+                          , melpaBuild
+                          , s }:
+      melpaBuild {
         pname = "orgnav";
         version = "20170608.1013";
         src = fetchFromGitHub {
@@ -54452,10 +68414,10 @@
           rev = "9e2cac9c1a67af5f0080e60022e821bf7b70312d";
           sha256 = "0764dg3dcsdy4i6syv9aqqmr47civn9dl3638g4lsqdikghw7lvv";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a41436df126d7ef2c0a8b56d90afb942fe47dc59/recipes/orgnav";
           sha256 = "0z04n5rzv5c0lvn658nrfj6rg3a31n369h5rjgi5bap06qm427ix";
-          name = "orgnav";
+          name = "recipe";
         };
         packageRequires = [ dash emacs helm s ];
         meta = {
@@ -54463,20 +68425,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    orgtbl-aggregate = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    orgtbl-aggregate = callPackage ({ fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "orgtbl-aggregate";
-        version = "20160421.726";
+        version = "20180620.1043";
         src = fetchFromGitHub {
           owner = "tbanel";
           repo = "orgaggregate";
-          rev = "a33a02ba70639cadaef5f6ea028c2fe73f76cf14";
-          sha256 = "0zh8n8jb479ilmz88kj0q5wx8a9zqkfqds0rr8jbk2rqmj6j72v3";
+          rev = "10996132229aff46a46d37b4983d8afb54446b07";
+          sha256 = "19f4gwixhr9v669ggbriyd4rnq43bz8qzqllxzfdbygm39vm2ira";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bf64b53c9d49718a8ffc39b14c90539b36840280/recipes/orgtbl-aggregate";
           sha256 = "0gnyjwn6jshs8bzdssm2xppg2s9p2x3rrhp523q39aydskc6ggc9";
-          name = "orgtbl-aggregate";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -54484,8 +68449,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    orgtbl-ascii-plot = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    orgtbl-ascii-plot = callPackage ({ fetchFromGitHub
+                                     , fetchurl
+                                     , lib
+                                     , melpaBuild }:
+      melpaBuild {
         pname = "orgtbl-ascii-plot";
         version = "20151215.1351";
         src = fetchFromGitHub {
@@ -54494,10 +68462,10 @@
           rev = "cd91f6ae26a7402e192a1f4fd6248f5797edf19e";
           sha256 = "1vbnp37xz0nrpyi0hah345928zsb1xw915mdb0wybq1fzn93mp1z";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/21b02596ac4b48e592ebe966475b164866bb9d6e/recipes/orgtbl-ascii-plot";
           sha256 = "1ssjbdprbn34nsfx1xjc382l2195rbh8mybpn31d4kcjx6fqf78h";
-          name = "orgtbl-ascii-plot";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -54505,20 +68473,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    orgtbl-join = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    orgtbl-join = callPackage ({ cl-lib ? null
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "orgtbl-join";
         version = "20150121.1446";
         src = fetchFromGitHub {
           owner = "tbanel";
           repo = "orgtbljoin";
-          rev = "ccf5e0d96e053dc289da39a048715fcf36835ff2";
-          sha256 = "06nc82wiha11i79izqil53dkd95fl55nb5m739gyyzvx3sksb0dg";
+          rev = "863f0bde0aa226ecc6d000d9bcb1424be407dfb0";
+          sha256 = "0issbnl13lkfg3w0ia42mrjyvl8sl2blnmv2kazyd0lzkcfy1kap";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e43ae8aaa54113f53b51aea3fb2656d608d1032c/recipes/orgtbl-join";
           sha256 = "1kq2h0lb521z8q2xb9bsi37xzzdsa0hw4mm3qkzidi5j9fi3apf1";
-          name = "orgtbl-join";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -54526,20 +68498,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    orgtbl-show-header = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    orgtbl-show-header = callPackage ({ fetchFromGitHub
+                                      , fetchurl
+                                      , lib
+                                      , melpaBuild }:
+      melpaBuild {
         pname = "orgtbl-show-header";
         version = "20141023.137";
         src = fetchFromGitHub {
           owner = "DamienCassou";
           repo = "orgtbl-show-header";
-          rev = "112d54a44682f065318ed0c9c89a8f5b8907342a";
-          sha256 = "1s2bgsm4s33w5275qghw1axdpmz6bbyhki53jr2giyk4f90822gi";
+          rev = "2f13391f56cf94f8fe1dc79d6eccb662198f9b69";
+          sha256 = "0s3pf18n7vh67am1pjaa22gh645088dbz2rgxixr9avpfyalaycj";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9c5ea906b1d642405ca532d89dbb32cf79f53582/recipes/orgtbl-show-header";
           sha256 = "1xgqjg3lmcczdblxaka47cc1ad8p8jhyb2nqwq0qnbqw46fqjp3k";
-          name = "orgtbl-show-header";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -54547,8 +68522,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    origami = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    origami = callPackage ({ cl-lib ? null
+                           , dash
+                           , emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild
+                           , s }:
+      melpaBuild {
         pname = "origami";
         version = "20180101.753";
         src = fetchFromGitHub {
@@ -54557,10 +68539,10 @@
           rev = "1f38085c8f9af7842765ed63f7d6dfe4dab59366";
           sha256 = "0ha1qsz2p36pqa0sa2sp83lspbgx5lr7930qxnwd585liajzdd9x";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b816be227dfc7330292a50346c4bb37394d3e998/recipes/origami";
           sha256 = "0rkb55zcvsgxzp190vrnbzdfbcjd8zi6vhbhwpqxi0qmyq6a08pr";
-          name = "origami";
+          name = "recipe";
         };
         packageRequires = [ cl-lib dash emacs s ];
         meta = {
@@ -54568,20 +68550,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    osx-browse = callPackage ({ browse-url-dwim, fetchFromGitHub, fetchurl, lib, melpaBuild, string-utils }:
-    melpaBuild {
+    osx-browse = callPackage ({ browse-url-dwim
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild
+                              , string-utils }:
+      melpaBuild {
         pname = "osx-browse";
         version = "20140508.1341";
         src = fetchFromGitHub {
           owner = "rolandwalker";
           repo = "osx-browse";
-          rev = "44ded7cc3a7ee426c1c3257fae534c121f7e752e";
-          sha256 = "1iybrhp607a5rb3ynlaf8w2x9wdgdbril702z44dgcg3wxih2zy1";
+          rev = "838b81625853e04919fbb56fd21f387762b2e3f5";
+          sha256 = "0c1jh9396bwgs3n7yh9lvyj464x66r4b40c8zm9sv73c6g80m77q";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/081aa3e1d50c2c9e5a9b9ce0716258a93279f605/recipes/osx-browse";
           sha256 = "06rfzq2hxhzg6jh2zs28r7ffxwlq40nz954j13ly8403c7rmbrfm";
-          name = "osx-browse";
+          name = "recipe";
         };
         packageRequires = [ browse-url-dwim string-utils ];
         meta = {
@@ -54589,8 +68576,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    osx-clipboard = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    osx-clipboard = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "osx-clipboard";
         version = "20141012.17";
         src = fetchFromGitHub {
@@ -54599,10 +68589,10 @@
           rev = "e46dd31327a3f92f77b013b4c9b1e5fdd0e5c73d";
           sha256 = "1ykn48src7qhx9cmpjkaqsz7h36p75kkq1h9wlcpv5fhaky2d4n4";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/71b85cd2b2122a2742f919d10bfcb054b681e61e/recipes/osx-clipboard";
           sha256 = "0gjgr451v6rlyarz96v6h8kfbvkk7npvhgvkgwdi0bjighrhlv4f";
-          name = "osx-clipboard";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -54610,8 +68600,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    osx-dictionary = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    osx-dictionary = callPackage ({ cl-lib ? null
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "osx-dictionary";
         version = "20171026.34";
         src = fetchFromGitHub {
@@ -54620,10 +68614,10 @@
           rev = "b16630ecf69f87ac873486d8b9c8c03e6c9ea7fa";
           sha256 = "06qsg8hlw1b725pzpsg5f194pxqcg1pjncsi8j0815yrlzfcg6sp";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ae4467ad646d663f0266f39a76f9764004903424/recipes/osx-dictionary";
           sha256 = "13033fxc5vjd1f7mm6znmprcp3mwxbvblb2d25shr8d4imqqhv82";
-          name = "osx-dictionary";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -54631,8 +68625,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    osx-lib = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    osx-lib = callPackage ({ emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "osx-lib";
         version = "20160919.1700";
         src = fetchFromGitHub {
@@ -54641,10 +68639,10 @@
           rev = "fdbbb41e07ba64d6a09b54bd142a7c7b83bfd09f";
           sha256 = "0n03yca62znrri1pg0cl4xzm4lkmdqyf1p9sm1vfjwlwxk552z5x";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b42ae666e3511752f5138927e7bf7965bd9f7ee5/recipes/osx-lib";
           sha256 = "12wvki8jhzqsanxv5yqzjmfx6ifwz9ab9zh6r8nss86bk8864ix4";
-          name = "osx-lib";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -54652,20 +68650,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    osx-location = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    osx-location = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "osx-location";
         version = "20150613.217";
         src = fetchFromGitHub {
           owner = "purcell";
           repo = "osx-location";
-          rev = "8bb3a94cc9f04b922d2d730fe08596cc6ee12bf2";
-          sha256 = "09hjcpmh0fxhsx63vcaz05w94xcc8q35vgffggjqaybs7hyzlx69";
+          rev = "110aee945b53ea550e4debe69bf3c077d940ec8c";
+          sha256 = "1csnxpsfnv9lv07kgvc60qx5c33sshmnz60p3qjz7ym7rnjy9b5x";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8673dafb02a8d70c278bfd2c063f40992defe3a3/recipes/osx-location";
           sha256 = "1p12mmrw70p3b04zlprkdxdfnb7m3vkm6gci3fwhr5zyfvwxvn0c";
-          name = "osx-location";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -54673,8 +68674,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    osx-org-clock-menubar = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    osx-org-clock-menubar = callPackage ({ fetchFromGitHub
+                                         , fetchurl
+                                         , lib
+                                         , melpaBuild }:
+      melpaBuild {
         pname = "osx-org-clock-menubar";
         version = "20150205.1311";
         src = fetchFromGitHub {
@@ -54683,10 +68687,10 @@
           rev = "9964d2a97cc2fb6570dc4116da44f73bd8eb7cb3";
           sha256 = "1rgykby1ysbapq53lnk9yy04r9q4qirnzs2abgvz7g2qjq5fyzag";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cade09308a6b8c998800f2ad2592ad6ea79f65ca/recipes/osx-org-clock-menubar";
           sha256 = "1y5qxslxl0d93f387nyj8zngz5nh1p4rzdfx0lnbvya6shfaxaf6";
-          name = "osx-org-clock-menubar";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -54694,20 +68698,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    osx-pseudo-daemon = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    osx-pseudo-daemon = callPackage ({ fetchFromGitHub
+                                     , fetchurl
+                                     , lib
+                                     , melpaBuild }:
+      melpaBuild {
         pname = "osx-pseudo-daemon";
         version = "20170721.2307";
         src = fetchFromGitHub {
           owner = "DarwinAwardWinner";
           repo = "mac-pseudo-daemon";
-          rev = "d235680a72677f11925b912428ad1a57b664e3e8";
-          sha256 = "0gqknrwhfzr7cf5pgs33a5xh79y0yzxghs6wsvavvqkmf4cvck40";
+          rev = "0358b3acd932082082971c489012bf139f5860dc";
+          sha256 = "1scdqy8g8dx3qzii70p3m2gddqqy7dkv63p8nfkp7vw1y5m19426";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6104efc035bcf469d133ab9a2caf42c9d4482334/recipes/osx-pseudo-daemon";
           sha256 = "1sch7bb8hl96fji2ayw2ah5cjgsga08wj44vddjxskyway8ykf0z";
-          name = "osx-pseudo-daemon";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -54715,8 +68722,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    osx-trash = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    osx-trash = callPackage ({ emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "osx-trash";
         version = "20160520.600";
         src = fetchFromGitHub {
@@ -54725,10 +68736,10 @@
           rev = "0f1dc052d0a750b8c75f14530a4897f5d4324b4e";
           sha256 = "0f4md49175iyrgzv4pijf7qbxyddcm2yscrrlh91pg410la7fysk";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1f4c86e5b86df6c5c2c484f041fa3e434bbfbbb1/recipes/osx-trash";
           sha256 = "1f6pi53mhp2pvrfjm8544lqqj36gzpzxq245lzvv91lvqkxr9ysj";
-          name = "osx-trash";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -54736,20 +68747,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    otama = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    otama = callPackage ({ fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "otama";
         version = "20160404.332";
         src = fetchFromGitHub {
           owner = "yoshinari-nomura";
           repo = "otama";
-          rev = "c114fd8006762f891bc120a7c0ea213872e7ab31";
-          sha256 = "1jzyfvc25ls0l4kpxg6857ccynl1pzgxfif7bppz2nfmf99z4534";
+          rev = "b69e0740846ace7885b0c0717f7abe8d0419eefd";
+          sha256 = "0javkbzsc4bbx121awbn35fb6lyvhskkkh9jb0byd51gpvg74g1r";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/53b1eaef5c8b408eb8fff838af1e0249c4fe9444/recipes/otama";
           sha256 = "04ffyscldb2sn2n26ixrnc07ybvl7iclv2hi1kmhr5hdgxwpyjq9";
-          name = "otama";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -54757,8 +68771,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    other-emacs-eval = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    other-emacs-eval = callPackage ({ async
+                                    , emacs
+                                    , fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "other-emacs-eval";
         version = "20180408.648";
         src = fetchFromGitHub {
@@ -54767,10 +68786,10 @@
           rev = "8ace5acafef65daabf0c6619eff60733d7f5d792";
           sha256 = "1pry1xw2p01b18ks5n0xs895qqqci7v2nrwjiil2vr3m1ys92ymc";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/75b6391726b0d5069e036930c2c5fa177c4e3422/recipes/other-emacs-eval";
           sha256 = "07sr5bb6x9w450cvfg32darg6jlwg11n7c1qhhk0ijcrnlsm09n7";
-          name = "other-emacs-eval";
+          name = "recipe";
         };
         packageRequires = [ async emacs ];
         meta = {
@@ -54778,20 +68797,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    outline-magic = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    outline-magic = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "outline-magic";
-        version = "20150209.1426";
+        version = "20180619.1119";
         src = fetchFromGitHub {
           owner = "tj64";
           repo = "outline-magic";
-          rev = "5689436cd67edc86066e51be77fa4e1fe21de507";
-          sha256 = "116cwlhn7s47rhivz6113lh8lvaz3bjb3ynjlbx9hyf7gq3nfnxn";
+          rev = "2a5f07417b696cf7541d435c43bafcc64817636b";
+          sha256 = "1iyslhk2zvhn4ip27apkjzkqw56lfakp2jzwz106jm45f3kllpc8";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a98ad2ef680eef541ee82e8a65ed73e524df98a1/recipes/outline-magic";
           sha256 = "085yayzph3y7fh6pd5sdjdkhdcvwfzcyqd6y3xlbz7wni5ac6b5f";
-          name = "outline-magic";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -54799,8 +68821,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    outline-toc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    outline-toc = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "outline-toc";
         version = "20170730.430";
         src = fetchFromGitHub {
@@ -54809,10 +68834,10 @@
           rev = "31f04bea19cfcfb01a94d1fd2b72391cb02b7463";
           sha256 = "1pqz2ynw51n3f7d9hknz80d42017lccsggkg13zqmn51wkjpc48j";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/64b07ee55e87c4a1125ce18a8ae0a44661380ffe/recipes/outline-toc";
           sha256 = "13hy9ahla68qcbfbm7b5d0yy774qfc3byb6pn9c66k2wg4xh6pxb";
-          name = "outline-toc";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -54820,8 +68845,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    outlined-elisp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    outlined-elisp-mode = callPackage ({ fetchFromGitHub
+                                       , fetchurl
+                                       , lib
+                                       , melpaBuild }:
+      melpaBuild {
         pname = "outlined-elisp-mode";
         version = "20131108.327";
         src = fetchFromGitHub {
@@ -54830,10 +68858,10 @@
           rev = "c16cb02b540448919ad148f2be6a41523ee5489c";
           sha256 = "0d9hfr4kb6rkhwacdn70bkfchgam26gj92zfyaqw77a2sgwcmwwv";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ae918c301e1c0ae39574ae76d70059718724293b/recipes/outlined-elisp-mode";
           sha256 = "165sivmv5h4nvh08ampq95x6b0bkzxgrdjbxjxlq6rv00vaidn7v";
-          name = "outlined-elisp-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -54841,20 +68869,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    outlook = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    outlook = callPackage ({ emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "outlook";
-        version = "20180330.458";
+        version = "20180428.730";
         src = fetchFromGitHub {
           owner = "asavonic";
           repo = "outlook.el";
-          rev = "77f5199f573a67700cb8d4f736cea5b6bda8ab0c";
-          sha256 = "0rhivgwqnfdvcl5vh9lmg6yaz36bhkvfmj590qxcq18zj1529mfh";
+          rev = "b6a7a06b996d84647e8024412876e9e76ca884e4";
+          sha256 = "0qyrpki1m4j0m32iadg58rjfy589lpig0547bhxzh51x4smkazhx";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c5ce3e6800213b117578a1022f25407f2ec1604f/recipes/outlook";
           sha256 = "0yq9zl7dr8kkm4rps5np4dwvjfhzsxq9wd1af7zwcmms4l3qry6k";
-          name = "outlook";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -54862,8 +68894,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    outorg = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    outorg = callPackage ({ emacs
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "outorg";
         version = "20170414.1215";
         src = fetchFromGitHub {
@@ -54872,10 +68908,10 @@
           rev = "78b0695121fb974bc4e971eb4ef7f8afd6d89d64";
           sha256 = "03aclh4m3f7rb821gr9pwvnqkkl91px3qxdcarpf3ypa1x4fxvlj";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8edf78a0ecd2ff8e6e066b80751a31e11a068c3f/recipes/outorg";
           sha256 = "10jh64d1nalfig69nnsib46915jinv37lvmxa0aj91zymq2szdm9";
-          name = "outorg";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -54883,20 +68919,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    outrespace = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    outrespace = callPackage ({ emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "outrespace";
-        version = "20180126.857";
+        version = "20180711.732";
         src = fetchFromGitHub {
           owner = "articuluxe";
           repo = "outrespace";
-          rev = "5c3e036e0d72889b5084c67eeac317e88b1bf2f6";
-          sha256 = "025lgvy8m70m72zxzdsdxgsayi3hr0hfp076mf0b97zfcw6h87c3";
+          rev = "7dafed7e1cabf4a0bb55e5c6465e83796e3fdabe";
+          sha256 = "0xdaaxvamjjghidxir1hpagrglxws646avl4d196g4z9y479wdyg";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2659a78181b8fe98ca4a80c75ec8c9b6dff44bb5/recipes/outrespace";
           sha256 = "13xasp9vjb3n0smdhrh9pq1yhhrg3p6z14fmlvf6xqip52rx89hl";
-          name = "outrespace";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -54904,20 +68944,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    outshine = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, outorg }:
-    melpaBuild {
+    outshine = callPackage ({ cl-lib ? null
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild
+                            , outorg }:
+      melpaBuild {
         pname = "outshine";
-        version = "20171108.441";
+        version = "20180625.1259";
         src = fetchFromGitHub {
           owner = "alphapapa";
           repo = "outshine";
-          rev = "5f1a6b70231d2811c522e4e5e8c89ff461b311d6";
-          sha256 = "1l9v1dfhgg7il11ifbhvcvrg3acfjk9sdxlc3lja1k54d7dp60jv";
+          rev = "8712df02b97a148e11de2761f3e707623db6f9c2";
+          sha256 = "18xpc0wa2xwb9f3lkmrvfd6wh42ca2msx5rwcwy9sra0x7qqiacf";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8edf78a0ecd2ff8e6e066b80751a31e11a068c3f/recipes/outshine";
           sha256 = "1qqmvs17hq5s047nqplg4sa09xg5ck6zwqyg91xmbh71bx80v28v";
-          name = "outshine";
+          name = "recipe";
         };
         packageRequires = [ cl-lib outorg ];
         meta = {
@@ -54925,20 +68970,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    ov = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ov = callPackage ({ emacs
+                      , fetchFromGitHub
+                      , fetchurl
+                      , lib
+                      , melpaBuild }:
+      melpaBuild {
         pname = "ov";
         version = "20150311.2228";
         src = fetchFromGitHub {
           owner = "ShingoFukuyama";
           repo = "ov.el";
-          rev = "fae7215b3dedba2a9ced145284332e4609bfdc38";
-          sha256 = "1rk5pzm5wmdq68d99hhhbq8pq37bnph0dip5j2jnfj6zsw70whr2";
+          rev = "4e1c254d74bc1773c92f1613c3865cdcb4bc7095";
+          sha256 = "0qxk2rf84j86syxi8xknsq252irwg7sz396v3bb4wqz4prpj0kzc";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/18d8a10ba3018cb61924af3a1682b82f543f2d98/recipes/ov";
           sha256 = "0d71mpv74cfxcnwixbrl90nr22cw4kv5sdgpny5wycvh6cgmd6qb";
-          name = "ov";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -54946,20 +68995,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    overcast-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    overcast-theme = callPackage ({ emacs
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "overcast-theme";
         version = "20180315.1243";
         src = fetchFromGitHub {
           owner = "myTerminal";
           repo = "overcast-theme";
-          rev = "009257956522dedf07d9e136ee41ac0b1b0b3518";
-          sha256 = "1g3s44n839s7fw3spkph31m0a5walilj151v0jyp302mjfn396nh";
+          rev = "faafe7c19106cb4db29ba716d117fbb6ebdda3f4";
+          sha256 = "1kjvx2wjb9ksdr7w0c4xnvqa4sbplj6rwlh85lbmcg8lwkb1s2sy";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d86691c61fc880954a05502a6474cc2fa0d0a43b/recipes/overcast-theme";
           sha256 = "1v8hdnvc4pfmadkvdm6b8z0cy20pminvhjdlr13q5m9immr88a4r";
-          name = "overcast-theme";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -54967,8 +69020,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    overseer = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }:
-    melpaBuild {
+    overseer = callPackage ({ dash
+                            , emacs
+                            , f
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild
+                            , pkg-info }:
+      melpaBuild {
         pname = "overseer";
         version = "20180225.2219";
         src = fetchFromGitHub {
@@ -54977,10 +69037,10 @@
           rev = "02d49f582e80e36b4334c9187801c5ecfb027789";
           sha256 = "0q4ai7ividy8xv09s342y49s97ismhfdfsjk70zif60fp0ajfzfn";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/overseer";
           sha256 = "0zbh0j21h6wsqnqvnzai6y6rpccdciksb7g64qw7fx0cpg5x2ms8";
-          name = "overseer";
+          name = "recipe";
         };
         packageRequires = [ dash emacs f pkg-info ];
         meta = {
@@ -54988,8 +69048,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    owdriver = callPackage ({ fetchFromGitHub, fetchurl, lib, log4e, melpaBuild, smartrep, yaxception }:
-    melpaBuild {
+    owdriver = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , log4e
+                            , melpaBuild
+                            , smartrep
+                            , yaxception }:
+      melpaBuild {
         pname = "owdriver";
         version = "20170401.612";
         src = fetchFromGitHub {
@@ -54998,10 +69064,10 @@
           rev = "d934f182bafe29aa16c173440eff3fef08b0ec10";
           sha256 = "0yy5sah7vcjxcik3sp2cxp9gvcryyzw799h8zf4wbvjxv74kd17c";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f3f9c1bb19345c6027a945e7f265632da1a391cb/recipes/owdriver";
           sha256 = "0j8z7ynan0zj581x50gsi9lljkbi6bwmzpfyha3i6q8ch5qkdxfd";
-          name = "owdriver";
+          name = "recipe";
         };
         packageRequires = [ log4e smartrep yaxception ];
         meta = {
@@ -55009,8 +69075,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    ox-asciidoc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
-    melpaBuild {
+    ox-asciidoc = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild
+                               , org }:
+      melpaBuild {
         pname = "ox-asciidoc";
         version = "20171111.354";
         src = fetchFromGitHub {
@@ -55019,10 +69089,10 @@
           rev = "e75d9565dd07dc59d11fa92d392ab47cecb3c902";
           sha256 = "1irv8k8l99kk5qqgapj1bfg9ppnd4fkkagm96mgxf0bxax0pblhn";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3b268064f09ae5c3d15064b7d197c7af767fb278/recipes/ox-asciidoc";
           sha256 = "07b549dqyh1gk226d7zbls1mw6q4mas7kbfwkansmyykax0r2zyr";
-          name = "ox-asciidoc";
+          name = "recipe";
         };
         packageRequires = [ org ];
         meta = {
@@ -55030,8 +69100,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    ox-bibtex-chinese = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ox-bibtex-chinese = callPackage ({ emacs
+                                     , fetchFromGitHub
+                                     , fetchurl
+                                     , lib
+                                     , melpaBuild }:
+      melpaBuild {
         pname = "ox-bibtex-chinese";
         version = "20170722.2009";
         src = fetchFromGitHub {
@@ -55040,10 +69114,10 @@
           rev = "2ad2364399229144110db7ef6365ad0461d6a38c";
           sha256 = "06lp56na1fv87296hhaxgb6gfnzln39p4v245gfxhk0k27589vxj";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6c09c708c4372451502923cd3cb756f4f98ba97b/recipes/ox-bibtex-chinese";
           sha256 = "0f3xigrkhc86vv23f76fdd4rjsspsd2ck5c65biq2ds247f4gm61";
-          name = "ox-bibtex-chinese";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -55051,8 +69125,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    ox-clip = callPackage ({ fetchFromGitHub, fetchurl, htmlize, lib, melpaBuild, org }:
-    melpaBuild {
+    ox-clip = callPackage ({ fetchFromGitHub
+                           , fetchurl
+                           , htmlize
+                           , lib
+                           , melpaBuild
+                           , org }:
+      melpaBuild {
         pname = "ox-clip";
         version = "20180305.1940";
         src = fetchFromGitHub {
@@ -55061,10 +69140,10 @@
           rev = "594c90953a91948505bb394350adf110e041f19a";
           sha256 = "1alm6hh7qg8sv50cm5p03icx47za2g7b2nvbwzx6kxkrgmgqfq6c";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6d9ae1e58a1f214a9b88627a2d3254ce7de50740/recipes/ox-clip";
           sha256 = "1sm0ivd8rypnl0z901anjsnbfjwhxqcaagqav82ybdb1z6x1qicv";
-          name = "ox-clip";
+          name = "recipe";
         };
         packageRequires = [ htmlize org ];
         meta = {
@@ -55072,20 +69151,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    ox-epub = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
-    melpaBuild {
+    ox-epub = callPackage ({ emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild
+                           , org }:
+      melpaBuild {
         pname = "ox-epub";
         version = "20171202.1713";
         src = fetchFromGitHub {
           owner = "ofosos";
           repo = "ox-epub";
-          rev = "3d958203e169cbfb2204c43cb4c5543befec0b9d";
-          sha256 = "057sqmvm8hwkhcg3yd4i8zz2xlqsqrpyiklyiw750s3i5mxdn0k7";
+          rev = "7991155e4b80bafee616108014be5281c22bae83";
+          sha256 = "09di3qq0nc9m3dnqik392vbdps829wlkxdsjlcpdm0dfms9wq10v";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c3ac31dfef00e83fa6b716ea006f35afb5dc6cd5/recipes/ox-epub";
           sha256 = "15q6vsmgv76c0qfdxa3prqvgmr6n7k4rd4bpi05574ibi23y0ynh";
-          name = "ox-epub";
+          name = "recipe";
         };
         packageRequires = [ emacs org ];
         meta = {
@@ -55093,8 +69177,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    ox-gfm = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ox-gfm = callPackage ({ fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "ox-gfm";
         version = "20170628.1402";
         src = fetchFromGitHub {
@@ -55103,10 +69190,10 @@
           rev = "99f93011b069e02b37c9660b8fcb45dab086a07f";
           sha256 = "0drdypmgxk3238hmkqw9s3cw9wv94cyfqar5ar0bv0k69s92pxj8";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/10e90430f29ce213fe57c507f06371ea0b29b66b/recipes/ox-gfm";
           sha256 = "065ngmzfd3g2h8n903hc4d363hz4z5rrdgizh2xpz03kf3plca6q";
-          name = "ox-gfm";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -55114,8 +69201,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    ox-html5slide = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
-    melpaBuild {
+    ox-html5slide = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild
+                                 , org }:
+      melpaBuild {
         pname = "ox-html5slide";
         version = "20131227.2206";
         src = fetchFromGitHub {
@@ -55124,10 +69215,10 @@
           rev = "4703dfbd9d79161509def673d2c1e118d722a58f";
           sha256 = "19h3w3fcas60jv02v7hxjmh05804sb7bif70jssq3qwisj0j09xm";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a7a7fd72c9bbb5d90e0e096b791971f2b64b8463/recipes/ox-html5slide";
           sha256 = "0nqk6chg0ky98ap2higa74786prj7dbwx2a3l67m0llmdajw76qn";
-          name = "ox-html5slide";
+          name = "recipe";
         };
         packageRequires = [ org ];
         meta = {
@@ -55135,20 +69226,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    ox-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
-    melpaBuild {
+    ox-hugo = callPackage ({ emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild
+                           , org }:
+      melpaBuild {
         pname = "ox-hugo";
-        version = "20180403.1111";
+        version = "20180710.755";
         src = fetchFromGitHub {
           owner = "kaushalmodi";
           repo = "ox-hugo";
-          rev = "15a6df059f5eac0964c075c1386ce1c83cfe979d";
-          sha256 = "11vndvwq64s7kc8a706favp7x7jc59sqwgs00sknfzznmpyy0xki";
+          rev = "41710e542ad2062b4dac346a2535f04115d0dd82";
+          sha256 = "11b9xcy16hd9bmaqcp6vyv29cdl3bl1jyg54ws29x6qk6i2lc5v9";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1e1240bb7b5bb8773f804b987901566a20e3e8a9/recipes/ox-hugo";
           sha256 = "1niarxj2y4a14lrv2nqcc36msw7k61h8fbjpcdrfbaw3n0kchd40";
-          name = "ox-hugo";
+          name = "recipe";
         };
         packageRequires = [ emacs org ];
         meta = {
@@ -55156,8 +69252,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    ox-impress-js = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
-    melpaBuild {
+    ox-impress-js = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild
+                                 , org }:
+      melpaBuild {
         pname = "ox-impress-js";
         version = "20150412.1016";
         src = fetchFromGitHub {
@@ -55166,10 +69266,10 @@
           rev = "91c6d2af6af308ade352a03355c4fb551b238c6b";
           sha256 = "1kf2si2lyy0xc971bx5zd2j9mnz1smc9s8l0dwc6iksh2v9q8cy9";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e5e79b4b897daca80f26440107abaddf0a480db9/recipes/ox-impress-js";
           sha256 = "0p0cc51lmxgl0xv951ybdg5n8gbzv8qf0chfgigijizzjypxc21l";
-          name = "ox-impress-js";
+          name = "recipe";
         };
         packageRequires = [ org ];
         meta = {
@@ -55177,8 +69277,16 @@
           license = lib.licenses.free;
         };
       }) {};
-    ox-ioslide = callPackage ({ cl-lib ? null, emacs, f, fetchFromGitHub, fetchurl, lib, makey, melpaBuild, org }:
-    melpaBuild {
+    ox-ioslide = callPackage ({ cl-lib ? null
+                              , emacs
+                              , f
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , makey
+                              , melpaBuild
+                              , org }:
+      melpaBuild {
         pname = "ox-ioslide";
         version = "20161015.638";
         src = fetchFromGitHub {
@@ -55187,10 +69295,10 @@
           rev = "6555680be5364c8ddd2bf446865cb1a82adb6b9e";
           sha256 = "05d1bykgj454g0vq2k2sd36pd9hmcwr9a8033dagkqc625h7wj4h";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b960abca4d642c47e640300876eefee1851e6b86/recipes/ox-ioslide";
           sha256 = "0z0qnvpw64wxbgz8203rphswlh9hd2i11pz2mlay8l3bzz4gx4vc";
-          name = "ox-ioslide";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs f makey org ];
         meta = {
@@ -55198,20 +69306,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    ox-jira = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
-    melpaBuild {
+    ox-jira = callPackage ({ fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild
+                           , org }:
+      melpaBuild {
         pname = "ox-jira";
         version = "20171001.216";
         src = fetchFromGitHub {
           owner = "stig";
           repo = "ox-jira.el";
-          rev = "db2ec528f46c9e611624ba28611c440a99bff255";
-          sha256 = "04zz6359xkn4w7jmmadxyvjd8pw21gw12mqwch1l9yxc4m9q474l";
+          rev = "23565783ca66e2aafc2aa03796e09dde4ae11c1a";
+          sha256 = "169v87xmdr41f0wyjpq4wzmr1kfb8gf6x67c24v9dbb7bldynl2g";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e8a77d9c903acd6d7fdcb53f63384144e85589c9/recipes/ox-jira";
           sha256 = "088ks14d7slgs2qsqp1kkxvqzzhdkwphdvpg27ix686dz1krxxib";
-          name = "ox-jira";
+          name = "recipe";
         };
         packageRequires = [ org ];
         meta = {
@@ -55219,8 +69331,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    ox-mediawiki = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    ox-mediawiki = callPackage ({ cl-lib ? null
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild
+                                , s }:
+      melpaBuild {
         pname = "ox-mediawiki";
         version = "20180105.1354";
         src = fetchFromGitHub {
@@ -55229,10 +69346,10 @@
           rev = "a9327150293e370e500ba55bddfe5fc435c6bf9b";
           sha256 = "0dsq86hli24imdkgsf45asx23kriw9di3d0cf5z8axfpkcbkn770";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/24244d146306ce965df382c8958c7574c74313f2/recipes/ox-mediawiki";
           sha256 = "0lijj2n4saw0xd3jaghbvx9v6a4ldl5gd8wy7s7hfcm30wb75cdb";
-          name = "ox-mediawiki";
+          name = "recipe";
         };
         packageRequires = [ cl-lib s ];
         meta = {
@@ -55240,8 +69357,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    ox-minutes = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ox-minutes = callPackage ({ emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "ox-minutes";
         version = "20180202.934";
         src = fetchFromGitHub {
@@ -55250,10 +69371,10 @@
           rev = "27c29f3fdb9181322ae56f8bace8d95e621230e5";
           sha256 = "10rw12gmg3d6fvkqijmjnk5bdpigvm8fy34435mwg7raw0gmlq75";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/162d0dacbb7252508147edb52fe33b1927a6bd69/recipes/ox-minutes";
           sha256 = "13rwcp0k9h7l5g8xw2s2r1xhsmkibhfqyq6hlicvddv232g724sj";
-          name = "ox-minutes";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -55261,8 +69382,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    ox-nikola = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org, ox-rst }:
-    melpaBuild {
+    ox-nikola = callPackage ({ emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild
+                             , org
+                             , ox-rst }:
+      melpaBuild {
         pname = "ox-nikola";
         version = "20151114.316";
         src = fetchFromGitHub {
@@ -55271,10 +69398,10 @@
           rev = "5bcbc1a38f6619f62294194f13ca0cd4ca14dd48";
           sha256 = "0cc14p6c3d4djfmrkac0abb2jq128vlmayv2a8cyvnyjffyvjbk7";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4e3fa1b0728ad3058376800ec5e2e9e3847c1d2f/recipes/ox-nikola";
           sha256 = "13k5wggz8bhnfgpsc09jnisk7xdb226d6imp7v6vmd1ax9m2xb0w";
-          name = "ox-nikola";
+          name = "recipe";
         };
         packageRequires = [ emacs org ox-rst ];
         meta = {
@@ -55282,20 +69409,28 @@
           license = lib.licenses.free;
         };
       }) {};
-    ox-pandoc = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, org }:
-    melpaBuild {
+    ox-pandoc = callPackage ({ cl-lib ? null
+                             , dash
+                             , emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , ht
+                             , lib
+                             , melpaBuild
+                             , org }:
+      melpaBuild {
         pname = "ox-pandoc";
-        version = "20171107.341";
+        version = "20180510.638";
         src = fetchFromGitHub {
           owner = "kawabata";
           repo = "ox-pandoc";
-          rev = "cd3c59f6c0ea49e0cac31d8392a5bbac02886d8f";
-          sha256 = "04wppfxjm43bc5c8i5l5kbpln7rhifgqrmbjbxdbqd3vl4lpcnzh";
+          rev = "aa37dc7e94213d4ebedb85c384c1ba35007da18e";
+          sha256 = "0iibxplgdp34bpq1yll2gmqjd8d8lnqn4mqjvx6cdf0y438yr4jz";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ca17de8cdd53bb32a9d3faaeb38f19f92b18ee38/recipes/ox-pandoc";
           sha256 = "0wy6yvwd4vyq6xalkrshnfjjxlh1p24y52z49894nz5fl63b74xc";
-          name = "ox-pandoc";
+          name = "recipe";
         };
         packageRequires = [ cl-lib dash emacs ht org ];
         meta = {
@@ -55303,20 +69438,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    ox-pukiwiki = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
-    melpaBuild {
+    ox-pukiwiki = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild
+                               , org }:
+      melpaBuild {
         pname = "ox-pukiwiki";
         version = "20150124.916";
         src = fetchFromGitHub {
           owner = "yashi";
           repo = "org-pukiwiki";
-          rev = "bdbde2c294f5d3de11f08a3fe19f01175d2e011a";
-          sha256 = "0adj6gm39qw4ivb7csfh21qqqipcnw1sgm1xdqvrk86kbs9k1b2g";
+          rev = "b53920abf698fa6682623d671108393e92c68bd7";
+          sha256 = "031xl8wry4frbc3d5d0nq7bca6y4plij9v8v8p8rg5ms3sh2fhjq";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cd4043336e54c6ae3976068a1af5cfe58713e408/recipes/ox-pukiwiki";
           sha256 = "10sfbri5hv5hyx9jc1bzlk4qmzfmpfgfy8wkjkpv7lv2x0axqd8a";
-          name = "ox-pukiwiki";
+          name = "recipe";
         };
         packageRequires = [ org ];
         meta = {
@@ -55324,8 +69463,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    ox-qmd = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
-    melpaBuild {
+    ox-qmd = callPackage ({ fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild
+                          , org }:
+      melpaBuild {
         pname = "ox-qmd";
         version = "20170402.957";
         src = fetchFromGitHub {
@@ -55334,10 +69477,10 @@
           rev = "3a24c7a0b3ec80e494b977e14a3dfb94c9f1d8ec";
           sha256 = "030nay81c49ings96akzzy108a6agg91rvpmg0pf05qmjysfysmf";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e71826e8a8c30b0eb535cce7a379740011b79534/recipes/ox-qmd";
           sha256 = "1i2kdpp6prgphc1l42nz7q6vdfsbcn2vvlf10s7dfhhr8jzcyyy7";
-          name = "ox-qmd";
+          name = "recipe";
         };
         packageRequires = [ org ];
         meta = {
@@ -55345,20 +69488,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    ox-reveal = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
-    melpaBuild {
+    ox-reveal = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild
+                             , org }:
+      melpaBuild {
         pname = "ox-reveal";
         version = "20161027.226";
         src = fetchFromGitHub {
           owner = "yjwen";
           repo = "org-reveal";
-          rev = "001567cc12d50ba07612edd1718b86a12e8c2547";
-          sha256 = "18rma8smjrskbjyna076zhvx79zs5r5vinb537h8mw13pfxd6cm8";
+          rev = "d7ffc3fd1b095ed81e0af005ecbb0b42427d13b0";
+          sha256 = "0y8cnpm7hw8s3d09j8imdpaddqq914nfy3skjm7i10g9xacrp294";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8bb4024eef5dc4cc3674bbbed9d92f074d533f35/recipes/ox-reveal";
           sha256 = "092swxkkisvj2y18ynal8dn7wcfi7h4y6n0dlzqq28bfflarbwik";
-          name = "ox-reveal";
+          name = "recipe";
         };
         packageRequires = [ org ];
         meta = {
@@ -55366,8 +69513,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    ox-rst = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
-    melpaBuild {
+    ox-rst = callPackage ({ emacs
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild
+                          , org }:
+      melpaBuild {
         pname = "ox-rst";
         version = "20180314.1713";
         src = fetchFromGitHub {
@@ -55376,10 +69528,10 @@
           rev = "a74b60883b0d844c80efb364dac1560b85f2548f";
           sha256 = "0smgz2q7bjj2svx1gdr187m58yxq1hs878bciz9h6jcp03a9sb61";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/85770d6e235217e98dda9d8b9f027a4ba3ebba96/recipes/ox-rst";
           sha256 = "0447q0gvasii57rp391la9prz0w228jnzgi59s785vzswdryww0n";
-          name = "ox-rst";
+          name = "recipe";
         };
         packageRequires = [ emacs org ];
         meta = {
@@ -55387,20 +69539,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    ox-textile = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
-    melpaBuild {
+    ox-textile = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild
+                              , org }:
+      melpaBuild {
         pname = "ox-textile";
-        version = "20180110.516";
+        version = "20180502.247";
         src = fetchFromGitHub {
           owner = "yashi";
           repo = "org-textile";
-          rev = "0af57d17c93049bf7533061863f711d13fbed891";
-          sha256 = "17jgb5bn3c4q4gasb2xas5bs3mrd1drnizgbqpnc50c8jfmcr4kd";
+          rev = "b179abaa6616604c6efe32cb509e62ad46e7374e";
+          sha256 = "1hwrnnrhrdp5cjn81wipzi5j8zr82kpwlvr6hna2cj2zr3r7a6m8";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/02a68a7a99ecce8f1afa03e72ff1f636edaf5868/recipes/ox-textile";
           sha256 = "01kri7vh16xhy8x5qd6s5z08xr0q964rk6xrligdb3i6x78wfvi4";
-          name = "ox-textile";
+          name = "recipe";
         };
         packageRequires = [ org ];
         meta = {
@@ -55408,20 +69564,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    ox-tiddly = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
-    melpaBuild {
+    ox-tiddly = callPackage ({ cl-lib ? null
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild
+                             , org }:
+      melpaBuild {
         pname = "ox-tiddly";
-        version = "20151206.240";
+        version = "20180626.1352";
         src = fetchFromGitHub {
           owner = "dfeich";
           repo = "org8-wikiexporters";
-          rev = "970bb8ed0e4c4426c37a929b1fe08f944c1cf74f";
-          sha256 = "14k9jsz7vkjqxn2xpj71qg54w0laqr99178bzsmbapkfp5yxrib5";
+          rev = "21317d7e963f79e7b883962ca097eab049115799";
+          sha256 = "1s5s2h3kpsx5cn1lqzsn9h2w7zlcgh51d679lyy45f9szm26hn3y";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ox-tiddly";
           sha256 = "1rpbnz152af588r8kafqpg9aq3ngwjfkrsjqk6w90l5rh280yi39";
-          name = "ox-tiddly";
+          name = "recipe";
         };
         packageRequires = [ cl-lib org ];
         meta = {
@@ -55429,20 +69590,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    ox-trac = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
-    melpaBuild {
+    ox-trac = callPackage ({ fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild
+                           , org }:
+      melpaBuild {
         pname = "ox-trac";
         version = "20171026.1123";
         src = fetchFromGitHub {
           owner = "JalapenoGremlin";
           repo = "ox-trac";
-          rev = "03cc31efb1aa06991918f1071e250a9d58f96cfb";
-          sha256 = "0knrmq0sc8s9c6j0967jmrp2hq8jcwg281qqk89y8j9rpbmhbaj6";
+          rev = "5ac6c81bbc18db6c17e267d6399778c3fb5bf1ee";
+          sha256 = "1bg8bis4ykyq3iy6x93wksyigwg7jyzphlhfvvvqk093sp15fgd9";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4b73753ef9229d0fdfbe237acc63126f1786a494/recipes/ox-trac";
           sha256 = "0f8b3i83vzxzfa91p4ahlqz6njql18xy5nk265sjxpy9zr898rsa";
-          name = "ox-trac";
+          name = "recipe";
         };
         packageRequires = [ org ];
         meta = {
@@ -55450,20 +69615,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    ox-tufte = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
-    melpaBuild {
+    ox-tufte = callPackage ({ emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild
+                            , org }:
+      melpaBuild {
         pname = "ox-tufte";
         version = "20160926.907";
         src = fetchFromGitHub {
           owner = "dakrone";
           repo = "ox-tufte";
-          rev = "49d7ea78fde063b407ce6fa57739f90c83500682";
-          sha256 = "1hb5s8m8r5nbz2kii1g975m3p4lnfkwraxhd71zhfvagf13wfkxd";
+          rev = "ca1b16eb91b25bb4f05e58e9b6692e8486c8c619";
+          sha256 = "0vyb1ilkywdhjx0j8hq1h993jh6ylwshmqiaa04fq4kbk9yqvspf";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0e1592b788ef7218cfb4b3da8599b6cd23eef357/recipes/ox-tufte";
           sha256 = "15b7aml9nl1kh8gbc086nb155f5mzlh8dmq41zi9frn6gskzjnfk";
-          name = "ox-tufte";
+          name = "recipe";
         };
         packageRequires = [ emacs org ];
         meta = {
@@ -55471,8 +69641,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    ox-twbs = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ox-twbs = callPackage ({ fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "ox-twbs";
         version = "20161103.1316";
         src = fetchFromGitHub {
@@ -55481,10 +69654,10 @@
           rev = "2414e6b1de7deb6dd2ae79a7be633fdccb9c2f28";
           sha256 = "0kd45p8y7ykadmai4jn1x1pgpafyqggwb1ccbjzalxw4k9wmd45f";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ox-twbs";
           sha256 = "050rv270jlkc1v7wp47cv9cwr9pz3n840dd4jxxhfs6s47b9ln73";
-          name = "ox-twbs";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -55492,8 +69665,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    ox-twiki = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
-    melpaBuild {
+    ox-twiki = callPackage ({ cl-lib ? null
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild
+                            , org }:
+      melpaBuild {
         pname = "ox-twiki";
         version = "20170803.1339";
         src = fetchFromGitHub {
@@ -55502,10 +69680,10 @@
           rev = "970bb8ed0e4c4426c37a929b1fe08f944c1cf74f";
           sha256 = "14k9jsz7vkjqxn2xpj71qg54w0laqr99178bzsmbapkfp5yxrib5";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/084da2cc725cc23b02657e7adb14ec31532ad25a/recipes/ox-twiki";
           sha256 = "1p1k0yg5fxcjgwpq2ix9ckh2kn69m7d5rnz76h14hw9p72cb54r0";
-          name = "ox-twiki";
+          name = "recipe";
         };
         packageRequires = [ cl-lib org ];
         meta = {
@@ -55513,8 +69691,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    p4 = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    p4 = callPackage ({ fetchFromGitHub
+                      , fetchurl
+                      , lib
+                      , melpaBuild }:
+      melpaBuild {
         pname = "p4";
         version = "20150721.1237";
         src = fetchFromGitHub {
@@ -55523,10 +69704,10 @@
           rev = "eff047caa75dbe4965defca9d1212454cdb755d5";
           sha256 = "12jsnfppif4l548wymvakx0f2zlm63xs6kfrb49hicmk668cq4ra";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a7e2fa7af647e0dbf5ade5c32d1984b133156b6f/recipes/p4";
           sha256 = "0215li17gn35wmvd84gnp4hkwa2jd81wz4frb1cba2b5j33rlprc";
-          name = "p4";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -55534,8 +69715,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    pabbrev = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    pabbrev = callPackage ({ fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "pabbrev";
         version = "20160320.1401";
         src = fetchFromGitHub {
@@ -55544,10 +69728,10 @@
           rev = "56400d5d256b42ffe45c229ea9827f026b650cf5";
           sha256 = "09bn19ydyz1hncmvyyh87gczp3lmlczpm352p0107z1gw6xmpjil";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c032b0d126e0196b4526ee04f5103582610681ea/recipes/pabbrev";
           sha256 = "1mbfa40pbzbi00sp155zm43sj6nw221mcayc2rk3ppin9ps95hx3";
-          name = "pabbrev";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -55555,20 +69739,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    package-build = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    package-build = callPackage ({ cl-lib ? null
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "package-build";
-        version = "20180414.938";
+        version = "20180628.2221";
         src = fetchFromGitHub {
           owner = "melpa";
           repo = "package-build";
-          rev = "cf202c0a93bd5aabea59d16ad7ddf8c292c05990";
-          sha256 = "18icx58yqig4c7zdvjz8jrhilbv5ygdyl56473mz1zyhvb3q42xy";
+          rev = "befbd7fcb9d1c7143e3ce432eaae69160112e96d";
+          sha256 = "04mfnmcxrcd4kg5wcwkcnqk4ixr2mxhpc4aj3xgm5j1b3slma7zf";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/948fb86b710aafe6bc71f95554655dfdfcab0cca/recipes/package-build";
           sha256 = "0kr82j9rbvmapsph0jdxy24p0b8mcnj01sg1myywf428nf30cgbh";
-          name = "package-build";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -55576,20 +69764,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    package-filter = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    package-filter = callPackage ({ fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "package-filter";
         version = "20161121.2319";
         src = fetchFromGitHub {
           owner = "milkypostman";
           repo = "package-filter";
-          rev = "bc73b41aea1d65ca44ef1593ca13126df9bbb39e";
-          sha256 = "0fq31zcz5j0n29p3zmx2k2w0xvay24zs34mbq8nb0y0jr7ycm184";
+          rev = "c8e2531227c02c4c5e9d593f2cdb6a4ab4a6849b";
+          sha256 = "001h92jchz6x6pm8bj90law0yzc5xd84f703z7fcwan4k0g1iwl7";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/89312eaf69f3d7ac46647255c847fcb45415e78d/recipes/package-filter";
           sha256 = "0am73zch2fy1hfjwzk8kg0j3lgbcz3hzxjrdf0j0a9w0myp0mmjm";
-          name = "package-filter";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -55597,20 +69788,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    package-lint = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    package-lint = callPackage ({ cl-lib ? null
+                                , emacs
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "package-lint";
-        version = "20180416.100";
+        version = "20180608.2119";
         src = fetchFromGitHub {
           owner = "purcell";
           repo = "package-lint";
-          rev = "6929545b6c116bd3eb12d3481a78f381c759e6fc";
-          sha256 = "19fj94i4ai1gzj2y2b2klw7xdsh4aki8zr4840lffn4a0f16nc7n";
+          rev = "318a608ff94229dfd2e953e4fd6f37bab27adfaa";
+          sha256 = "1ib41dp1dafnkmjga2imhgpgxmwrn4rsi72ylwhh6y9s7a55i8zp";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9744d8521b4ac5aeb1f28229c0897af7260c6f78/recipes/package-lint";
           sha256 = "0w7nkj4yz5yqmhr3mr7kxa6aqqfs75m3l2578s39940a5sdzirwy";
-          name = "package-lint";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -55618,20 +69814,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    package-plus = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    package-plus = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "package-plus";
         version = "20170815.1956";
         src = fetchFromGitHub {
           owner = "zenspider";
           repo = "package";
-          rev = "9213f6134eabc2cff5826779ced437714324c066";
-          sha256 = "0b20mxr5xvkydxn9gv246xls52is3jyhm5ckmrhkb2dp9qc4hfa4";
+          rev = "09f37a21256223a770d3b6a6174cb7da427720c3";
+          sha256 = "149ba7nq380azi4rypvk0xqdv3bin2sqvab9q1kcwg3kidhspx8a";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/49cfbbc4535aa7e175aa819d67b8aa52a6f94384/recipes/package+";
           sha256 = "1mbsxr4llz8ny7n7w3lykld9yvbaywlfqnvr9l0aiv9rvmdv03bn";
-          name = "package-plus";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -55639,8 +69838,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    package-safe-delete = callPackage ({ emacs, epl, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    package-safe-delete = callPackage ({ emacs
+                                       , epl
+                                       , fetchFromGitHub
+                                       , fetchurl
+                                       , lib
+                                       , melpaBuild }:
+      melpaBuild {
         pname = "package-safe-delete";
         version = "20150116.807";
         src = fetchFromGitHub {
@@ -55649,10 +69853,10 @@
           rev = "138171e4fc03c0ef05a8260cbb5cd2e114c1c194";
           sha256 = "1pdv6d6bm5jmpgjqf9ycvzasxz1205zdi0zjrmkr33c03azwz7rd";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/61b961211276bd95655b6a0967eda5037a3d240b/recipes/package-safe-delete";
           sha256 = "12ss5yjhnyxsif4vlbgxamn5jfa0wxkkphffxnv6drhvmpq226jw";
-          name = "package-safe-delete";
+          name = "recipe";
         };
         packageRequires = [ emacs epl ];
         meta = {
@@ -55660,20 +69864,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    package-utils = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, restart-emacs }:
-    melpaBuild {
+    package-utils = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild
+                                 , restart-emacs }:
+      melpaBuild {
         pname = "package-utils";
-        version = "20180317.1134";
+        version = "20180514.715";
         src = fetchFromGitHub {
           owner = "Silex";
           repo = "package-utils";
-          rev = "652531caf1a1df916d2185e7f47085bd0509c940";
-          sha256 = "0lmz4szrfs2445q8nyqnh9hgm69bwdf7q78sfqyxiw1fqaj205si";
+          rev = "5621b95c56b55499f0463fd8b29501da25d861bd";
+          sha256 = "1mhsf0l0253d9b7n3c68mw5kwnsk7wf217y7m2fiybh51bdgjfnd";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a1bb884a0299408daa716eba42cb39f79622766c/recipes/package-utils";
           sha256 = "02hgh7wg68ysfhw5hckrpshzv4vm1vnm395d34x6vpgl4ccx7v9r";
-          name = "package-utils";
+          name = "recipe";
         };
         packageRequires = [ restart-emacs ];
         meta = {
@@ -55681,20 +69889,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    packed = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    packed = callPackage ({ emacs
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "packed";
         version = "20180318.1029";
         src = fetchFromGitHub {
           owner = "emacscollective";
           repo = "packed";
-          rev = "c41c3dfda86ae33832ffc146923e2a4675cbacfa";
-          sha256 = "1272xmb3l8ddfijqzci3x0kxwibqb0sbkci4rbcv9ba9hpxp4d1v";
+          rev = "788ea94bff319d6a776954c32cff1de8b400f051";
+          sha256 = "1sga68hf6zf5j8sb56zqy35p5gn6x7c12m6h8q1gzazfy7xz57p0";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/57a2fb9524df3fdfdc54c403112e12bd70888b23/recipes/packed";
           sha256 = "103z6fas2fkvlhvwbv1rl6jcij5pfsv5vlqqsb4dkq1b0s7k11jd";
-          name = "packed";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -55702,8 +69914,16 @@
           license = lib.licenses.free;
         };
       }) {};
-    pacmacs = callPackage ({ cl-lib ? null, dash, dash-functional, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    pacmacs = callPackage ({ cl-lib ? null
+                           , dash
+                           , dash-functional
+                           , emacs
+                           , f
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "pacmacs";
         version = "20160131.32";
         src = fetchFromGitHub {
@@ -55712,10 +69932,10 @@
           rev = "d813e9c62c2540fe619234824fc60e128c786442";
           sha256 = "0zx72qbqy2n1r6mjylw67zb6nnchp2b49vsdyl0k5bdaq2xyqv6i";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/52ce427e046267655dd9f836e57176d59f23e601/recipes/pacmacs";
           sha256 = "0w0r6z365jrglpbifb94w6c22wqi9x93qgkss9pn820hrndqbqxy";
-          name = "pacmacs";
+          name = "recipe";
         };
         packageRequires = [ cl-lib dash dash-functional emacs f ];
         meta = {
@@ -55723,20 +69943,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    paganini-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    paganini-theme = callPackage ({ emacs
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "paganini-theme";
-        version = "20160612.337";
+        version = "20180710.821";
         src = fetchFromGitHub {
           owner = "onurtemizkan";
           repo = "paganini";
-          rev = "44e3ae4c451f3b380956fea8aef8cca75279746b";
-          sha256 = "0p5sml4djwr92s36nx4hd0pjwkfws4px01g0dzip34zabkm3dx4b";
+          rev = "c7474dd275dca81e77542987c459b4baba1fe190";
+          sha256 = "0pvrsv3a94rp7g2p9is3f3mqkqlnd7kcpspdfn7wry3ighc0gqzq";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d6fbb609b411df4fe6f66a7afe27eda7d297f140/recipes/paganini-theme";
           sha256 = "1kypkf52hjlfj75pcmjf2a60m6iwj0y1dspjwqynzz3l48i6ippm";
-          name = "paganini-theme";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -55744,8 +69968,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    page-break-lines = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    page-break-lines = callPackage ({ emacs
+                                    , fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "page-break-lines";
         version = "20171210.31";
         src = fetchFromGitHub {
@@ -55754,10 +69982,10 @@
           rev = "fd3b7e38ad8747cd009ead7ef1bb150849ccc693";
           sha256 = "0ik5v2kd0l5a6sznld5ncdb4lsyqbbw7axs0qwxc968b540k9zq5";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/page-break-lines";
           sha256 = "0i5kx191wnq9763jyqxbyh33hvdaqbd98a1rhgqd97zhvg0hslz1";
-          name = "page-break-lines";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -55765,8 +69993,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    pager = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    pager = callPackage ({ fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "pager";
         version = "20151201.1720";
         src = fetchFromGitHub {
@@ -55775,10 +70006,10 @@
           rev = "5c791ed23f1136e04040d6f4bc9b4ca5b6dc919f";
           sha256 = "198zlh7zrql1185b9qjim44a09kbbgs9zyahak9nhv1gxqn7mrdf";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5f2a50f62475639af011c99c6cc38928b74b3b0a/recipes/pager";
           sha256 = "0s5zwimkbsivbwlyd7g8dpnjyzqcfc5plg53ij4sljiipgjh5brl";
-          name = "pager";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -55786,8 +70017,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    pager-default-keybindings = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, pager }:
-    melpaBuild {
+    pager-default-keybindings = callPackage ({ fetchFromGitHub
+                                             , fetchurl
+                                             , lib
+                                             , melpaBuild
+                                             , pager }:
+      melpaBuild {
         pname = "pager-default-keybindings";
         version = "20130719.1357";
         src = fetchFromGitHub {
@@ -55796,10 +70031,10 @@
           rev = "dbbd49c2ac5906d1dabf9e9c832bfebc1ab405b3";
           sha256 = "11msqs8v9wn8sj45dw1fl0ldi3sw33v0xclynbxgmawyabfq3bqm";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/87faee8c9820dd47feccdfbce7fd57dbe2800405/recipes/pager-default-keybindings";
           sha256 = "0vqb3s1fxkl1fxxspq89344s55sfcplz26z0pbh347l1681h3pci";
-          name = "pager-default-keybindings";
+          name = "recipe";
         };
         packageRequires = [ pager ];
         meta = {
@@ -55807,20 +70042,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    palimpsest = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    palimpsest = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "palimpsest";
         version = "20170119.1232";
         src = fetchFromGitHub {
           owner = "danielsz";
           repo = "Palimpsest";
-          rev = "e6d5944393c260ceb724462c84046cc62c9ae916";
-          sha256 = "0vw3lv02rf8f9vm379zff4l85psjwxsrvba4xcpdkqi1w4rbsnxr";
+          rev = "168839453e25f8ff7f1b28170909e5428c8fe5f8";
+          sha256 = "0j6cn0bc4vxvviawmkgkzdrmf3j5rbl8f7dkzvv6k1hislzhzpsb";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/14f6d011a0314637a2f4c1b00efa4912e67b7fa4/recipes/palimpsest";
           sha256 = "18kklfdlcg982pdrslh0xqa42h28f91bdm7q2zn890d6dcivp6bk";
-          name = "palimpsest";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -55828,20 +70066,27 @@
           license = lib.licenses.free;
         };
       }) {};
-    pallet = callPackage ({ cask, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    pallet = callPackage ({ cask
+                          , dash
+                          , f
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild
+                          , s }:
+      melpaBuild {
         pname = "pallet";
         version = "20150512.2";
         src = fetchFromGitHub {
           owner = "rdallasgray";
           repo = "pallet";
-          rev = "b8d0df1883224a371ac0a3bc9b9c1c4dc61e6ac0";
-          sha256 = "0j87yq8rycklk8df4rlwx0bp2n94pyhaz4yv8vacbqrzchpa1bb0";
+          rev = "0e1ae11e1ebfe644cbf832df62ac2dbf6ecd0501";
+          sha256 = "03mlg6dmpjw8fq2s3c4gpqj20kjhzldz3m51bf6s0mxq9bclx2xw";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bf977287e9bd668efbd972c9937906384ee832c6/recipes/pallet";
           sha256 = "0q50cdwnn2w1n5h4bappncjjyi5yaixxannwgy23fngdrz1mxwd7";
-          name = "pallet";
+          name = "recipe";
         };
         packageRequires = [ cask dash f s ];
         meta = {
@@ -55849,8 +70094,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    pamparam = callPackage ({ emacs, fetchFromGitHub, fetchurl, hydra, lib, lispy, melpaBuild, worf }:
-    melpaBuild {
+    pamparam = callPackage ({ emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , hydra
+                            , lib
+                            , lispy
+                            , melpaBuild
+                            , worf }:
+      melpaBuild {
         pname = "pamparam";
         version = "20180415.48";
         src = fetchFromGitHub {
@@ -55859,10 +70111,10 @@
           rev = "8fa25d06fb2ae6d992e738a10d8b2150e109d9bf";
           sha256 = "0p50cfmwgwahb1czqvgx2kvnd3k46zl0pybvxlyf45y4c4kr8wjp";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/067b5e3594641447478db8c1ffcb36d63018b1b2/recipes/pamparam";
           sha256 = "0xwz1il9ldkfprin3rva407m4wm7c48blwfn4mgaxmqafy4p0g9f";
-          name = "pamparam";
+          name = "recipe";
         };
         packageRequires = [ emacs hydra lispy worf ];
         meta = {
@@ -55870,20 +70122,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    panda-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    panda-theme = callPackage ({ emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "panda-theme";
         version = "20180203.2318";
         src = fetchFromGitHub {
           owner = "jamiecollinson";
           repo = "emacs-panda-theme";
-          rev = "f93ad6ded20d71cab9bf29a0c7040e07e1ba4f05";
-          sha256 = "1y9yppkprbnqf59p94kkpxsma2s7z8cp195na05mdgcs0pmbs6l7";
+          rev = "548b06f3e37f017fa3996015016fb0e565b84d93";
+          sha256 = "1f2kzmk03vkq5jdkad6hg2rqjll1l91g48dh2piwdqrkjjbkwsvy";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a90ca1275ceab8e1ea4fdfa9049fbd24a5fd0bf5/recipes/panda-theme";
           sha256 = "1q3zp331hz8l54p8ym9jrs4f36aj15r8aka6bqqnalnk237xqxl7";
-          name = "panda-theme";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -55891,8 +70147,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    pandoc = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    pandoc = callPackage ({ emacs
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "pandoc";
         version = "20161128.357";
         src = fetchFromGitHub {
@@ -55901,10 +70161,10 @@
           rev = "198d262d09e30448f1672338b0b5a81cf75e1eaa";
           sha256 = "0njc6xlwa8hihyqrk0hs12sb6rs7jma2wpjfr8xsj9p8jld4y359";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d6c21ff09d67fad2658e0de08bc2edb7588c504a/recipes/pandoc";
           sha256 = "0x81anxam7agr2v2zqgc331zs5s5zxcw54kzpanndda23n51h5cc";
-          name = "pandoc";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -55912,20 +70172,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    pandoc-mode = callPackage ({ dash, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild }:
-    melpaBuild {
+    pandoc-mode = callPackage ({ dash
+                               , fetchFromGitHub
+                               , fetchurl
+                               , hydra
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "pandoc-mode";
-        version = "20180122.108";
+        version = "20180710.746";
         src = fetchFromGitHub {
           owner = "joostkremers";
           repo = "pandoc-mode";
-          rev = "883e131c53a6351a239c422f05027aa526181ddb";
-          sha256 = "1qb50m4zyk57hs8siwiz21q5qymhl585crmhgqnvkspk6dg0063s";
+          rev = "f1fa01d3fd079a82c0561e6227b5e984910ec458";
+          sha256 = "0yy7h87zykdc8mrvam7rqjfibzbvci2phxzipq0cfq1mcq7ypdlm";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/pandoc-mode";
           sha256 = "0qvc6cf87h1jqf590kd68jfg25snxaxayfds634wj4z6gp70l781";
-          name = "pandoc-mode";
+          name = "recipe";
         };
         packageRequires = [ dash hydra ];
         meta = {
@@ -55933,8 +70198,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    pangu-spacing = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    pangu-spacing = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "pangu-spacing";
         version = "20170317.157";
         src = fetchFromGitHub {
@@ -55943,10 +70211,10 @@
           rev = "a4463dbb74abdeddb6c1c132a1f8fcf67ed87498";
           sha256 = "143ywxgaf5y52ynd4wcqp40c5pgy61ng431y77l46iix10vasslq";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c0b00eda1d20ff2cbffe3ac606e5fd60d915a5d6/recipes/pangu-spacing";
           sha256 = "082qh26vlk7kifz1800lyai17yvngwjygrfrsh1dsd8dxhk6l9j8";
-          name = "pangu-spacing";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -55954,20 +70222,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    paper-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    paper-theme = callPackage ({ emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "paper-theme";
-        version = "20180125.926";
+        version = "20180429.1515";
         src = fetchFromGitHub {
           owner = "cadadr";
           repo = "elisp";
-          rev = "35424f7360f5110833b7a9f4f53907b9e222be85";
-          sha256 = "1xi56c8f2wcmldr76ylrcqsy0wf75pv74b0455ki84fq1fk4n08s";
+          rev = "ffe03506694c94de0444995f973a925deccc400a";
+          sha256 = "02wcvka96zdlq3myfar7dqywfil2b77bc6ydmgcphwn3as3kl08r";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a7ea18a56370348715dec91f75adc162c800dd10/recipes/paper-theme";
           sha256 = "1ph6c6g907cnxzl74byc754119qia8rs8y7wvaj8i6q3fz2658zr";
-          name = "paper-theme";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -55975,20 +70247,27 @@
           license = lib.licenses.free;
         };
       }) {};
-    paperless = callPackage ({ cl-lib ? null, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    paperless = callPackage ({ cl-lib ? null
+                             , emacs
+                             , f
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild
+                             , s }:
+      melpaBuild {
         pname = "paperless";
         version = "20180224.445";
         src = fetchFromGitHub {
           owner = "atgreen";
           repo = "paperless";
-          rev = "b3b6c05da393f6b1292a3d5937bc4499baabd0b6";
-          sha256 = "1b2gm823qd6bllgp9qg2vgskzg4rpdvh8bgic8708hkq6lwpdv70";
+          rev = "04d98b13f591206429a9192c1804b7a2fd6287cb";
+          sha256 = "1vk20vdcfjng3p3srf140k85lm8pqp41mfnwnahxm32bi0dx6hl3";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/500be17952ffb6b8d1e524b5b3d316878202fabc/recipes/paperless";
           sha256 = "182arnx2fz0dww6bvg6m70a1picqd3czmzwv92x0rb4ghwrnq2dq";
-          name = "paperless";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs f s ];
         meta = {
@@ -55996,8 +70275,16 @@
           license = lib.licenses.free;
         };
       }) {};
-    paradox = callPackage ({ emacs, fetchFromGitHub, fetchurl, hydra, let-alist, lib, melpaBuild, seq, spinner }:
-    melpaBuild {
+    paradox = callPackage ({ emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , hydra
+                           , let-alist
+                           , lib
+                           , melpaBuild
+                           , seq
+                           , spinner }:
+      melpaBuild {
         pname = "paradox";
         version = "20180216.334";
         src = fetchFromGitHub {
@@ -56006,10 +70293,10 @@
           rev = "e5dd26f67ba8fa8ab1631a00ddea4117805b3fd0";
           sha256 = "09x8glw949hivbzikki5blgjkzyws69hck501ym99663k4irdir1";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/paradox";
           sha256 = "1xq14nfvprsq18464qr4mhphq7cl1f570lji5n8z6j9vpfm9a4p2";
-          name = "paradox";
+          name = "recipe";
         };
         packageRequires = [ emacs hydra let-alist seq spinner ];
         meta = {
@@ -56017,7 +70304,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    paredit = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
+    paredit = callPackage ({ fetchgit
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "paredit";
         version = "20171126.1805";
         src = fetchgit {
@@ -56025,10 +70316,10 @@
           rev = "acbe10fdd85d2e91831adf70b6a828bc7e900da0";
           sha256 = "1c7ag0cvd6rl5fsj3dpfcjpyb8xjd26d864z98a74cirn8pc8f7l";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/paredit";
           sha256 = "01qh8kfb5hyfi0jfl1kq3inkyzr0rf3wncmzgxlkfdc8zlq4v653";
-          name = "paredit";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -56036,20 +70327,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    paredit-everywhere = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, paredit }:
-    melpaBuild {
+    paredit-everywhere = callPackage ({ fetchFromGitHub
+                                      , fetchurl
+                                      , lib
+                                      , melpaBuild
+                                      , paredit }:
+      melpaBuild {
         pname = "paredit-everywhere";
-        version = "20150821.2144";
+        version = "20180506.149";
         src = fetchFromGitHub {
           owner = "purcell";
           repo = "paredit-everywhere";
-          rev = "94c92095c2096713fb3e2f7662ddd994f4b694c6";
-          sha256 = "120m6vs6bb9cav88wpv97kd7s8vvmg6pry6pmf7jk6i7l1wj0iaw";
+          rev = "653d7a58fb370d5f7df367464d8d05e23a70b29d";
+          sha256 = "0q6a3cvanjh3j0kdpqa812yql2axgga45g6nljvxijm8i9ba2hqf";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/593890222d074c6a308eb1b809077c6861e1af30/recipes/paredit-everywhere";
           sha256 = "0gbkwk8mrbjr2l8pz3q4y6j8q4m12zmzl31c88ngs1k5d86wav36";
-          name = "paredit-everywhere";
+          name = "recipe";
         };
         packageRequires = [ paredit ];
         meta = {
@@ -56057,8 +70352,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    paredit-menu = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, paredit }:
-    melpaBuild {
+    paredit-menu = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild
+                                , paredit }:
+      melpaBuild {
         pname = "paredit-menu";
         version = "20160128.933";
         src = fetchFromGitHub {
@@ -56067,10 +70366,10 @@
           rev = "cc0ae85bd819f9ebfa4f2a419ab3b2d70e39c9c8";
           sha256 = "15xkanrwxh3qqay3vkfqvhzs88g7nnfv9bqk509qflyhqnvc9sxr";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8a6379588b373fca2769b8761de4ba13545c082c/recipes/paredit-menu";
           sha256 = "05jp4cc548x5f07k096dgizhivdpaajxq38hin831sm0p9cibm4p";
-          name = "paredit-menu";
+          name = "recipe";
         };
         packageRequires = [ paredit ];
         meta = {
@@ -56078,8 +70377,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    paren-completer = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    paren-completer = callPackage ({ emacs
+                                   , fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "paren-completer";
         version = "20160501.352";
         src = fetchFromGitHub {
@@ -56088,10 +70391,10 @@
           rev = "74183a8e13fa1266271bdcbcb4bfb29a4f915f0a";
           sha256 = "1il0gbyjnlxhk04z3lgxmvlmlhgc94rmxdf8nl5sk3gblqmr8v3b";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/paren-completer";
           sha256 = "1k71nmsf155b4pvzcsymsc1bn42h9apypapkvc1kxyr6zm29zcr4";
-          name = "paren-completer";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -56099,20 +70402,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    paren-face = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    paren-face = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "paren-face";
         version = "20180318.1325";
         src = fetchFromGitHub {
           owner = "tarsius";
           repo = "paren-face";
-          rev = "a45d111153a76c481fa0b36d6172ac90e073dfc4";
-          sha256 = "1cr0vnm57lxs48z17ddcv7qlfvks7wdsp01zsw0c7i3h5ajl8myp";
+          rev = "42b2141b5427bc78d640229821b2b8053e6743d2";
+          sha256 = "1f1srk4100rsc7i6257q460g4ykmqx4fwrpgb57dlp83d3342c6h";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d398398d1d5838dc4985a06515ee668f0f566aab/recipes/paren-face";
           sha256 = "0dmzk66m3rd8x0rb925pyrfpc2qsvayks4kmhpb2ccdrx68pg8gf";
-          name = "paren-face";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -56120,8 +70426,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    parent-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    parent-mode = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "parent-mode";
         version = "20150824.1600";
         src = fetchFromGitHub {
@@ -56130,10 +70439,10 @@
           rev = "db692cf08deff2f0e973e6e86e26662b44813d1b";
           sha256 = "0i5bc7lyyrx6swqlrp9l5x72yzwi53qn6ldrfs99gh08b3yvsnni";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9736d8f6c3065c46b8c4e0056e9d592d3ec973e9/recipes/parent-mode";
           sha256 = "1ndn6m6aasmk9yrml9xqj8141100nw7qi1bhnlsss3v8b6njwwig";
-          name = "parent-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -56141,20 +70450,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    parinfer = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    parinfer = callPackage ({ cl-lib ? null
+                            , dash
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "parinfer";
-        version = "20180226.2134";
+        version = "20180712.443";
         src = fetchFromGitHub {
           owner = "DogLooksGood";
           repo = "parinfer-mode";
-          rev = "5bfc915c4a91da740f3216798327b5676d227569";
-          sha256 = "0zz4l7k2blbxcg1ni3amfys58szw51fvrjk7dbjxp7vsgpp7x3ji";
+          rev = "42c6df279e167957438d1c7d7530bdf1cc5214c1";
+          sha256 = "0rilia0nr99ngpd7bp48314mnb4353x32lxy3h0jf35slk9430vf";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/470ab2b5cceef23692523b4668b15a0775a0a5ba/recipes/parinfer";
           sha256 = "05w4w7j6xyj19dm63073amd4n7fw4zm3qnn4x02fk2011iw8fq7i";
-          name = "parinfer";
+          name = "recipe";
         };
         packageRequires = [ cl-lib dash ];
         meta = {
@@ -56162,8 +70476,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    parse-csv = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    parse-csv = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "parse-csv";
         version = "20160512.1023";
         src = fetchFromGitHub {
@@ -56172,10 +70489,10 @@
           rev = "96bef1ffbc89ea12d13311c9fa239c5c3e864890";
           sha256 = "06xg6f74697zmn042wg259qlik2l21k4al08a06xz4gv9a83nsx6";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/010a182f7424928036231774c2fe17b857e3ca40/recipes/parse-csv";
           sha256 = "0khpfxbarw0plx8kka357d8wl1vvdih5797xlld9adc0g3cng0zz";
-          name = "parse-csv";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -56183,8 +70500,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    parsebib = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    parsebib = callPackage ({ emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "parsebib";
         version = "20180116.627";
         src = fetchFromGitHub {
@@ -56193,10 +70514,10 @@
           rev = "683c970a6fb51591bc88ee80e295fedee876e044";
           sha256 = "0mpgyy9qfb5x4fvlmb274hgayjbwf0bgk65dxyx31zikjwpcd56p";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c39633957475dcd6a033760ba20a957716cce59c/recipes/parsebib";
           sha256 = "07br2x68scsxykdk2ajc4mfqhdb7vjkcfgz3vnpy91sirxzgfjdd";
-          name = "parsebib";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -56204,20 +70525,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    parsec = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    parsec = callPackage ({ cl-lib ? null
+                          , emacs
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "parsec";
         version = "20171202.2031";
         src = fetchFromGitHub {
           owner = "cute-jumper";
           repo = "parsec.el";
-          rev = "72c1897a42b3b0b59505b3562e8f46c6354faec1";
-          sha256 = "0yg35fs9gr07j6x7xi4f3v11xdanmkhr5sr9lqim0m10aglv7vwf";
+          rev = "212f848d95c2614a86f135c1bf3de15ef0e09805";
+          sha256 = "11qr9i55530pzmiwilfazaqxcjw8sx1iry19jvzdqsffjqvx2mnl";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/248aaf5ff9c98cd3e439d0a26611cdefe6b6c32a/recipes/parsec";
           sha256 = "1p3364sv5r868xjj1411xqj4acxqmbzcdl900sd03585ql5wbypj";
-          name = "parsec";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -56225,20 +70551,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    parseclj = callPackage ({ a, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    parseclj = callPackage ({ a
+                            , emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "parseclj";
-        version = "20180225.2233";
+        version = "20180602.1306";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "parseclj";
-          rev = "af6102c4a80693cc3b40c4eb5c340358ab4b9696";
-          sha256 = "1m1yvskgvm4np6r36c5gjg5whi1dyg6c1xd0nfqgc0cw9awwxp6b";
+          rev = "dc0d165b0a8633f5b11ed9175a6e421c52f4d314";
+          sha256 = "1ra1z9xp8v4qsw00dzr3w7a9qznj2laarc3s09n1wnr8xbp6nwxk";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e2a977779a7ee49f57b849b14e581210a7f47d61/recipes/parseclj";
           sha256 = "077qigx0qyjyvm3437ffnv05rmnpqxvpxf69yyfdgnay1xclv172";
-          name = "parseclj";
+          name = "recipe";
         };
         packageRequires = [ a emacs ];
         meta = {
@@ -56246,8 +70577,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    pasp-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    pasp-mode = callPackage ({ emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "pasp-mode";
         version = "20180404.1000";
         src = fetchFromGitHub {
@@ -56256,10 +70591,10 @@
           rev = "59385eb0e8ebcfc8c11dd811fb145d4b0fa3cc92";
           sha256 = "1ar4vws3izzmir7m870mccci620ns3c5j26dcmwaxavhgw45wcmf";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f3c1bbfc6b3a60f8bb4f0ee77ec4108e9d3f458b/recipes/pasp-mode";
           sha256 = "0aix8siyd5yhgxq94k1sl64a9q2xlfrz6cj9y5mcqhb6qjgmrnva";
-          name = "pasp-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -56267,8 +70602,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    pass = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, password-store, password-store-otp }:
-    melpaBuild {
+    pass = callPackage ({ emacs
+                        , f
+                        , fetchFromGitHub
+                        , fetchurl
+                        , lib
+                        , melpaBuild
+                        , password-store
+                        , password-store-otp }:
+      melpaBuild {
         pname = "pass";
         version = "20180201.451";
         src = fetchFromGitHub {
@@ -56277,10 +70619,10 @@
           rev = "da08fed8dbe1bac980088d47b01f90154dbb8d8b";
           sha256 = "1j5fdcqmqw62zvmwd80bjvkrr5vg59l5k6673hvvhjx77c8nvidv";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/428c2d53db69bed8938ec3486dfcf7fc048cd4e8/recipes/pass";
           sha256 = "1vvyvnqf6k7wm0p45scwi6ny86slkrcbr36lnxdlkf96cqyrqzfr";
-          name = "pass";
+          name = "recipe";
         };
         packageRequires = [ emacs f password-store password-store-otp ];
         meta = {
@@ -56288,41 +70630,50 @@
           license = lib.licenses.free;
         };
       }) {};
-    passmm = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    passmm = callPackage ({ emacs
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild
+                          , password-store }:
+      melpaBuild {
         pname = "passmm";
-        version = "20170113.837";
+        version = "20180622.1626";
         src = fetchFromGitHub {
           owner = "pjones";
           repo = "passmm";
-          rev = "076df7221f9450b96855c36684ae4a7481e0bb71";
-          sha256 = "0nap42jhjh3nq57a5hpv6wd8gli6i9g6n5rbjza685sifqn27dbf";
+          rev = "f6130373b84a2d7180a04f6bd533148aa778d8fc";
+          sha256 = "19sszl0vjsy0wk0bysm938c3sj458faj4dhw8fqb2nhm6l5v194r";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8ae2a1e10375f9cd55d19502c9740b2737eba209/recipes/passmm";
           sha256 = "0p6qps9ww7s6w5x7p6ha26xj540pk4bjkr629lcicrvnfr5jsg4b";
-          name = "passmm";
+          name = "recipe";
         };
-        packageRequires = [ emacs ];
+        packageRequires = [ emacs password-store ];
         meta = {
           homepage = "https://melpa.org/#/passmm";
           license = lib.licenses.free;
         };
       }) {};
-    passthword = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    passthword = callPackage ({ cl-lib ? null
+                              , fetchFromGitLab
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "passthword";
         version = "20141201.123";
-        src = fetchFromGitHub {
+        src = fetchFromGitLab {
           owner = "pidu";
           repo = "passthword";
           rev = "30bace842eaaa6b48cb2251fb84868ebca0467d6";
           sha256 = "0yckh61v9a798gpyk8x2z9990h3b61lwsw0kish571pygfyqhjkq";
         };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/399bb6d6e36ca4c1e54566e66d7065fe1011f99c/recipes/passthword";
-          sha256 = "076jayziipjx260yk3p37pf5k0qsagalidah3y6hiflrlq4sfgjn";
-          name = "passthword";
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/a52b516b7b10bdada2f64499c8f43f85a236f254/recipes/passthword";
+          sha256 = "19zv80kidb6a3985n3zij507hvffcxhcvlfxd01gwx64wvfc0c3c";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -56330,8 +70681,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    password-generator = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    password-generator = callPackage ({ fetchFromGitHub
+                                      , fetchurl
+                                      , lib
+                                      , melpaBuild }:
+      melpaBuild {
         pname = "password-generator";
         version = "20150222.1240";
         src = fetchFromGitHub {
@@ -56340,10 +70694,10 @@
           rev = "c8193d5e963bda0a2f8e51fd4a94dcf37c76f282";
           sha256 = "1pw401ar114wpayibphv3n6m0gz68zjmiwz60r4lbar45bmxvihx";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/password-generator";
           sha256 = "1ziiz4x4slfadlm7fjpmwvq4a9fi3ird74b6v5na499ylqnzrl59";
-          name = "password-generator";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -56351,8 +70705,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    password-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    password-mode = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "password-mode";
         version = "20170411.2329";
         src = fetchFromGitHub {
@@ -56361,10 +70718,10 @@
           rev = "ed764a4ec1011526457c71b7c37fa9a659a866ab";
           sha256 = "102zydbkr2zrr7w0j11n7pivnsdmq3c6lykf3qc84jifp7j58pgr";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/28dafa392a378e7de2c6992fe17b33f6379dc6b8/recipes/password-mode";
           sha256 = "1rxh6jg99qxagc6i2xgvswvw93h4ma7j8lhjr4ln44vbgyhzph11";
-          name = "password-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -56372,20 +70729,27 @@
           license = lib.licenses.free;
         };
       }) {};
-    password-store = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s, with-editor }:
-    melpaBuild {
+    password-store = callPackage ({ emacs
+                                  , f
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild
+                                  , s
+                                  , with-editor }:
+      melpaBuild {
         pname = "password-store";
         version = "20170829.1633";
         src = fetchFromGitHub {
           owner = "zx2c4";
           repo = "password-store";
-          rev = "fab65bda88ea979dbbc49f3d856a1d14ee4f1296";
-          sha256 = "0yicj227h21lqa97kcaa1pw4xyaakjqh9ynr2pynixkafalfkxhl";
+          rev = "65cead8c0fdb07ce3821f6b97bdcb32684d0c3f7";
+          sha256 = "0rm364l9mg2gl16ng5zd02gkfq8592mhrp81sk1v0wwh8wlyrzrh";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/207f8ec84572176749d328cb2bbc4e87c36f202c/recipes/password-store";
           sha256 = "03r8j14l12yc42b51fzvn1jh8j85nyl1rg6c80r0a7ihwkj27jv6";
-          name = "password-store";
+          name = "recipe";
         };
         packageRequires = [ emacs f s with-editor ];
         meta = {
@@ -56393,8 +70757,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    password-store-otp = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, password-store, s }:
-    melpaBuild {
+    password-store-otp = callPackage ({ emacs
+                                      , fetchFromGitHub
+                                      , fetchurl
+                                      , lib
+                                      , melpaBuild
+                                      , password-store
+                                      , s }:
+      melpaBuild {
         pname = "password-store-otp";
         version = "20170928.18";
         src = fetchFromGitHub {
@@ -56403,10 +70773,10 @@
           rev = "a39a64a91de36e87b852339635bd3c5fb0e32441";
           sha256 = "0gb48blvnn6ci2wl45z81p41ny7vbgl610hqy6b2hyr2171qjd60";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fc89d02554a6ff150ad42634879073892f3e88be/recipes/password-store-otp";
           sha256 = "0m3n4gjf6hmcs2kg80h1whzbl74zsj79ihliyqfcdfc4v31m32sg";
-          name = "password-store-otp";
+          name = "recipe";
         };
         packageRequires = [ emacs password-store s ];
         meta = {
@@ -56414,8 +70784,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    password-vault = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    password-vault = callPackage ({ cl-lib ? null
+                                  , emacs
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "password-vault";
         version = "20160126.1020";
         src = fetchFromGitHub {
@@ -56424,10 +70799,10 @@
           rev = "dc56e6c2f5da66f1ab63736cecf08fb2c6c2b30f";
           sha256 = "0921xwg3d3345hiqz4c1iyqwvfyg8rv0wggcnig7xh9qivspag4c";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/71ad3fa96afa18b5002faf9272732c7d09826493/recipes/password-vault";
           sha256 = "17i556xwq6yaxv9v18l1abcpbaz6hygsa4vf4b68fc98vcy7396a";
-          name = "password-vault";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -56435,8 +70810,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    paste-of-code = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }:
-    melpaBuild {
+    paste-of-code = callPackage ({ emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild
+                                 , request }:
+      melpaBuild {
         pname = "paste-of-code";
         version = "20170709.1655";
         src = fetchFromGitHub {
@@ -56445,10 +70825,10 @@
           rev = "92d258e8ec98598d847ecab82903f9224c7c2050";
           sha256 = "1bf2d0i726psjwnqdp0w4h0qk7fnwcbwf1a66q7p8vczavqygfan";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b29a5101bb6fc01b8b6e1b798ce6f73bc6d34944/recipes/paste-of-code";
           sha256 = "0wjcchpp1689arfz6s7gfq4bxn0svz6qj5azvjwwsyzais1bicdi";
-          name = "paste-of-code";
+          name = "recipe";
         };
         packageRequires = [ emacs request ];
         meta = {
@@ -56456,8 +70836,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    pastebin = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    pastebin = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "pastebin";
         version = "20101125.1202";
         src = fetchFromGitHub {
@@ -56466,10 +70849,10 @@
           rev = "8e9a829298ce0f747ab80758aa26caeb2af6cb30";
           sha256 = "1hjzpza8zmzb83sacmqcnh9a52m4x5d8xbwvcqvld1ajglv4y124";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0fda2b54a0ff0b6fc3bd6d20cfcbbf63cae5380f/recipes/pastebin";
           sha256 = "0ff01vzslgdmsj1jp1m2lvnan6immd4l7vz466g1glb5nkb7qfcr";
-          name = "pastebin";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -56477,20 +70860,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    pastehub = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    pastehub = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "pastehub";
         version = "20140614.2320";
         src = fetchFromGitHub {
           owner = "kiyoka";
           repo = "pastehub";
-          rev = "37b045c67659c078f1517d0fbd5282dab58dca23";
-          sha256 = "0m6qjsq6qfwwszm95lj8c58l75vbmx9r5hm9bfywyympfgy0fa1n";
+          rev = "3cc5dcb87104f3b4320a6d7fa20fa7340e6b7026";
+          sha256 = "0wbb5689n9k351gf3s9mqr3bi00lpajk0h1k9gx1b2mdbb7lq7xd";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bb8645a9880c586ef2ad16f3a4e61ba76176c224/recipes/pastehub";
           sha256 = "1slvqn5ay6gkbi0ai1gy1wmc02h4g3n6srrh4fqn72y7b9nv5i0v";
-          name = "pastehub";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -56498,8 +70884,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    pastelmac-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    pastelmac-theme = callPackage ({ emacs
+                                   , fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "pastelmac-theme";
         version = "20151030.1936";
         src = fetchFromGitHub {
@@ -56508,10 +70898,10 @@
           rev = "bead21741e3f46f6506e8aef4469d4240a819389";
           sha256 = "1v5mpjb8kavbqhvg4rizwg8cypgmi6ngdiy8qp9pimmkb56y42ly";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a7151773de39fe570e3e9b351daad89db9dd267f/recipes/pastelmac-theme";
           sha256 = "168zzqhp2dbfcnknwfqxk68rgmibfw71ksghvi6h2j2c1m08l23f";
-          name = "pastelmac-theme";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -56519,8 +70909,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    pastery = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }:
-    melpaBuild {
+    pastery = callPackage ({ emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild
+                           , request }:
+      melpaBuild {
         pname = "pastery";
         version = "20171113.1949";
         src = fetchFromGitHub {
@@ -56529,10 +70924,10 @@
           rev = "4493be98b743b4d062cb4e00760125e394a55022";
           sha256 = "0bmm18d84lrkclg4md46k1ma03w7a97s10hrvjcm9yj8xbrjqqsc";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6058218450071db0af9a5b8ce8ec09a735c4ab66/recipes/pastery";
           sha256 = "006qawjc86spbbs2pxvhg9w94rcsxap577cndqwaiw1k0cc8vkhp";
-          name = "pastery";
+          name = "recipe";
         };
         packageRequires = [ emacs request ];
         meta = {
@@ -56540,8 +70935,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    path-headerline-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    path-headerline-mode = callPackage ({ fetchFromGitHub
+                                        , fetchurl
+                                        , lib
+                                        , melpaBuild }:
+      melpaBuild {
         pname = "path-headerline-mode";
         version = "20140423.632";
         src = fetchFromGitHub {
@@ -56550,10 +70948,10 @@
           rev = "b5b2725c6a8b1cb592fc242b7dbbd54b4dff2e69";
           sha256 = "1ffnkw8djs8kvfjd1crnaqram1vl4w3g1zhsqp74ds0mccsd6830";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/path-headerline-mode";
           sha256 = "0yw2i3cp20v8nd2wj1rs1qad8abghzzasf2sjyla90q06wlna98w";
-          name = "path-headerline-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -56561,20 +70959,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    pathify = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    pathify = callPackage ({ fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "pathify";
         version = "20160423.146";
         src = fetchFromGitHub {
           owner = "alezost";
           repo = "pathify.el";
-          rev = "401b184c743694a60b3bc4273fc43de05cd5ac4b";
-          sha256 = "0wsq11qffw1lx9x79law7jrz0sxm6km83gh891ic9ak2y6j5shxf";
+          rev = "335332a900717ae01bde5ccb8f3dc97a5350f123";
+          sha256 = "1brdyrp2sz1pszdfr6f4w94qxk5lrd6kphc1xa5pywfns14c9386";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/459460c977b9cf033e22937899ad380e01efcf11/recipes/pathify";
           sha256 = "1z970xnzbhmfikj1rkfx24jvwc7f1xxw6hk7kmahxvphjxrvgc2f";
-          name = "pathify";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -56582,20 +70983,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    paxedit = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, paredit }:
-    melpaBuild {
+    paxedit = callPackage ({ cl-lib ? null
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild
+                           , paredit }:
+      melpaBuild {
         pname = "paxedit";
         version = "20160730.1027";
         src = fetchFromGitHub {
           owner = "promethial";
           repo = "paxedit";
-          rev = "09f3d5aeb108937a801e77ef413e29eaa4ecc4be";
-          sha256 = "1yd5wh8fsxh3v2fgpxm2cd7h9xz9zfj2d8g4bh4gzqjwrmn5rlgl";
+          rev = "48df0a26285f68cd20ea64368e7bf2a5fbf13135";
+          sha256 = "0z32lb2s943vk9fincsifdrjqmk7ks2skpzr6g4s3gd40sz5imfz";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/106b272c2f0741d21d31a0ddfa4f521c575559c1/recipes/paxedit";
           sha256 = "06ymilr0zrwfpyzql7dcpg48lhkx73f2jlaw3caxgsjaz7x3n4ic";
-          name = "paxedit";
+          name = "recipe";
         };
         packageRequires = [ cl-lib paredit ];
         meta = {
@@ -56603,8 +71009,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    pbcopy = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    pbcopy = callPackage ({ fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "pbcopy";
         version = "20150224.2059";
         src = fetchFromGitHub {
@@ -56613,10 +71022,10 @@
           rev = "338f7245746b5de1bb96c5cc2b32bfd9b5d83272";
           sha256 = "138w0dlp3msjmr2x09kfcnxwhdldbz9xjfy7l6lig1x9ima0z5w6";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2bbde7950ad5b3b801ca6a2a27c0f5294c8b7746/recipes/pbcopy";
           sha256 = "1989pkhaha6s2rmgyswnzps92x9hhzymjz4ng4a5jda1b9snp60q";
-          name = "pbcopy";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -56624,8 +71033,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    pc-bufsw = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    pc-bufsw = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "pc-bufsw";
         version = "20180107.1040";
         src = fetchFromGitHub {
@@ -56634,10 +71046,10 @@
           rev = "b99ba484e18ebf2b88654704146746490bb7625f";
           sha256 = "184nnkfh7n6vbbmvykvklr1dn3dcwjj3w800irdg55bbnkxxzkj4";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5f2bbd34d673935846c286e73a1e2efaa00ab01a/recipes/pc-bufsw";
           sha256 = "01d7735ininlsjkql7dy57irgwgk4k9br8bl18wq51vgkg90i5k5";
-          name = "pc-bufsw";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -56645,20 +71057,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    pcache = callPackage ({ eieio ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    pcache = callPackage ({ eieio ? null
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "pcache";
         version = "20170105.1414";
         src = fetchFromGitHub {
           owner = "sigma";
           repo = "pcache";
-          rev = "1f8086077d770e524492e6fa59b07856e85a6fea";
-          sha256 = "09z5295f8051ag13ndq8rhxgg2m0gim45yfpjv4xkbmdcfkfinc2";
+          rev = "025ef2411fa1bf82a9ac61dfdb7bd4cedaf2d740";
+          sha256 = "1jkdyacpcvbsm1g2rjpnk6hfr01r3j5ibgh09441scz41v6xk248";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/pcache";
           sha256 = "0wwx20x6gzlli3hh4zd9pfv2cmqfm38xbl9p4vsgy08q1rm5agva";
-          name = "pcache";
+          name = "recipe";
         };
         packageRequires = [ eieio ];
         meta = {
@@ -56666,8 +71082,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    pcap-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    pcap-mode = callPackage ({ emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "pcap-mode";
         version = "20161025.748";
         src = fetchFromGitHub {
@@ -56676,10 +71096,10 @@
           rev = "52780669af0ade136f84d73f21b4dbb7ab655416";
           sha256 = "1v218cjs0qy3ac0rbzm22y1x388nxnf0pslh9jrvlymkn227pjs8";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/44f4cb526556a4b58b7e67314002e73413a59a76/recipes/pcap-mode";
           sha256 = "1p6lnr7yr8i3yp63xc8r1hnx8a4v0mz1s7q89zxx7aprk7i9kpv6";
-          name = "pcap-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -56687,8 +71107,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    pcmpl-args = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    pcmpl-args = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "pcmpl-args";
         version = "20120911.2224";
         src = fetchFromGitHub {
@@ -56697,10 +71120,10 @@
           rev = "2ba03b3125ada8037585e545b88bd85b79da5c37";
           sha256 = "0pwx1nbgciy28rivvrgka46zihmag9ljrs40bvscgd9rkragm4zy";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/pcmpl-args";
           sha256 = "10mgci1rk6sr7wk46mnp5l37v3qxdc6yy5zfvy9mzwzh3va1pw31";
-          name = "pcmpl-args";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -56708,8 +71131,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    pcmpl-git = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    pcmpl-git = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "pcmpl-git";
         version = "20170120.1659";
         src = fetchFromGitHub {
@@ -56718,10 +71144,10 @@
           rev = "9472ac70baeda025ef7becd1cf141d72aec93f32";
           sha256 = "17y3rdp7fgyg4i9hwyzgpv1d19i5c6rqdf1gm5bdm2csk12vfg9n";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6a51c16bed8d0a2fecad0ae9580d58cd44cc8930/recipes/pcmpl-git";
           sha256 = "12y9pg1g4i1ghnjvgfdpa6p84h4bcqrr23y9bazwl9n6aj20cmxk";
-          name = "pcmpl-git";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -56729,8 +71155,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    pcmpl-homebrew = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    pcmpl-homebrew = callPackage ({ fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "pcmpl-homebrew";
         version = "20170110.1609";
         src = fetchFromGitHub {
@@ -56739,10 +71168,10 @@
           rev = "d001520fec4715c9a4c73f02fd948bac371cc50a";
           sha256 = "0mw8w2jd9qgyhxdbnvjays5q6c83i0sb3diizrkq23axprfg6d70";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/pcmpl-homebrew";
           sha256 = "11yd18s79iszp8gas97hqpa0b0whgh7dvlyci3nd4z28467p83v8";
-          name = "pcmpl-homebrew";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -56750,8 +71179,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    pcmpl-pip = callPackage ({ f, fetchFromGitHub, fetchurl, lib, melpaBuild, s, seq }:
-    melpaBuild {
+    pcmpl-pip = callPackage ({ f
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild
+                             , s
+                             , seq }:
+      melpaBuild {
         pname = "pcmpl-pip";
         version = "20171201.33";
         src = fetchFromGitHub {
@@ -56760,10 +71195,10 @@
           rev = "8b001b579fc015f80ee0e4f3211058b830bf7c47";
           sha256 = "0f8s2gn82dhyrnv0j688697xy0ig2yhn5m94gwhcllxq5a3yhbdg";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/pcmpl-pip";
           sha256 = "19a3np5swpqvrx133yvziqnr2pvj8zi0b725j8kxhp2bj1g1c6hr";
-          name = "pcmpl-pip";
+          name = "recipe";
         };
         packageRequires = [ f s seq ];
         meta = {
@@ -56771,20 +71206,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    pcomplete-extension = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    pcomplete-extension = callPackage ({ cl-lib ? null
+                                       , emacs
+                                       , fetchFromGitHub
+                                       , fetchurl
+                                       , lib
+                                       , melpaBuild }:
+      melpaBuild {
         pname = "pcomplete-extension";
-        version = "20180322.28";
+        version = "20180706.2155";
         src = fetchFromGitHub {
           owner = "thierryvolpiatto";
           repo = "pcomplete-extension";
-          rev = "3d7dac3de9e81604e4ed93c344cf4d44ebae3bf7";
-          sha256 = "1qrlp066rbcafn67mmbg48fkxw7ai6ni8b3asmm8w623xhd63v1g";
+          rev = "bb941272b54f49f780819f7ce4fd2c802de9a0da";
+          sha256 = "0bwbxnnw760i6mi7h9pyx3gaasrcja7dj3bfrlia07gw8jgl81ad";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6cb8a938418f84a5b0ede92e84a516f38e4b1011/recipes/pcomplete-extension";
           sha256 = "0m0c9ir44p21rj93fkisvpvi08936717ljmzsr4qdf69b3i54cwc";
-          name = "pcomplete-extension";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -56792,8 +71232,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    pcre2el = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    pcre2el = callPackage ({ cl-lib ? null
+                           , emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "pcre2el";
         version = "20161120.1303";
         src = fetchFromGitHub {
@@ -56802,10 +71247,10 @@
           rev = "0b5b2a2c173aab3fd14aac6cf5e90ad3bf58fa7d";
           sha256 = "14br6ad138qx1z822wqssswqiihxiynz1k69p6mcdisr2q8yyi1z";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f04a25e467cc4c7d9a263330a7a1a53d67c6eb9b/recipes/pcre2el";
           sha256 = "1l72hv9843qk5p8gi9ibr15wczm804j3ws2v1x7nx4dr7pc5c7l3";
-          name = "pcre2el";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -56813,8 +71258,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    pcsv = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    pcsv = callPackage ({ fetchFromGitHub
+                        , fetchurl
+                        , lib
+                        , melpaBuild }:
+      melpaBuild {
         pname = "pcsv";
         version = "20150220.331";
         src = fetchFromGitHub {
@@ -56823,10 +71271,10 @@
           rev = "798e0933f8d0818beb17aebf3b1056bbf74e03d0";
           sha256 = "0aaprjczjf3al5vcypw1fsnz5a0xnnlhmvy0lc83i9aqbsa2y8af";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/80ffaf99b2a4566a3f9d0309cd7b63f563f3826e/recipes/pcsv";
           sha256 = "1zphndkbva59g1fd319a240yvq8fjk315b1fyrb8zvmqpgk9n0dl";
-          name = "pcsv";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -56834,8 +71282,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    pdb-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    pdb-mode = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "pdb-mode";
         version = "20150128.951";
         src = fetchFromGitHub {
@@ -56844,10 +71295,10 @@
           rev = "855fb18ebb73b5df30c8d7677c2bcd0f361b138a";
           sha256 = "1xkkyz7y08jr71rzdacb9v7gk95qsxlsshkdsxq8jp70irq51099";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6aee132aa24322fe1ac88ae17ee6e77ae1ec8d11/recipes/pdb-mode";
           sha256 = "1ihkxd15kx5m5xb9yxwz8wqbmyk9iaskry9szzdz1j4gjlczb6hy";
-          name = "pdb-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -56855,20 +71306,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    pdf-tools = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, tablist }:
-    melpaBuild {
+    pdf-tools = callPackage ({ emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , let-alist
+                             , lib
+                             , melpaBuild
+                             , tablist }:
+      melpaBuild {
         pname = "pdf-tools";
-        version = "20180109.1234";
+        version = "20180428.827";
         src = fetchFromGitHub {
           owner = "politza";
           repo = "pdf-tools";
-          rev = "9241a79bbf159ba0b079ebdbfa8ad1b3e69cf8c0";
-          sha256 = "00v2rqrh3z93s651j1i1z9i6chr0lxw1kbnkpr56pqrh5rbvy0q5";
+          rev = "5209f620c85e6c7c23e96768ebae6b5c6f79f3e1";
+          sha256 = "0dv3phzjp6z2f5bbl6m7ll073p81w1fkq543mp44g2cqb9dvq24s";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8e3d53913f4e8a618e125fa9c1efb3787fbf002d/recipes/pdf-tools";
           sha256 = "1hnc8cci00mw78h7d7gs8smzrgihqz871sdc9hfvamb7iglmdlxw";
-          name = "pdf-tools";
+          name = "recipe";
         };
         packageRequires = [ emacs let-alist tablist ];
         meta = {
@@ -56876,8 +71333,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    peacock-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    peacock-theme = callPackage ({ emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "peacock-theme";
         version = "20170808.620";
         src = fetchFromGitHub {
@@ -56886,10 +71347,10 @@
           rev = "9e46fbfb562b6e26c6e3d6d618b044b3694da4c8";
           sha256 = "0w4dzdsv2cdldss5jwmdbjb5a62k5j1szwdim4gv8ldifhj7fy22";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/641d1959bd31598fcdacd39a3d1bb077dcccfa5c/recipes/peacock-theme";
           sha256 = "0jpdq090r37d07bm52yx3x9y3gsip6fyxxq1ax1k5k0r0js45kq9";
-          name = "peacock-theme";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -56897,8 +71358,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    peek-mode = callPackage ({ elnode, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    peek-mode = callPackage ({ elnode
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "peek-mode";
         version = "20130620.1246";
         src = fetchFromGitHub {
@@ -56907,10 +71372,10 @@
           rev = "55a7dd011375330c7d57322257a5167516702c71";
           sha256 = "11nv6pll0zj9dkgzlzgav39a6x3sfi7kvfhwm96fa3iy4v8bixrb";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/08384964d8c1f5f60c84c044d26a79105973ab21/recipes/peek-mode";
           sha256 = "07wcnh3jmp2gi9xhd3d8i2n0pr2g9kav497nnz94i85awhzf8fi4";
-          name = "peek-mode";
+          name = "recipe";
         };
         packageRequires = [ elnode ];
         meta = {
@@ -56918,20 +71383,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    peep-dired = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    peep-dired = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "peep-dired";
         version = "20160321.1537";
         src = fetchFromGitHub {
           owner = "asok";
           repo = "peep-dired";
-          rev = "c88a9a3050197840edfe145f11e0bb9488de32f4";
-          sha256 = "1wy5qpnfri1gha2cnl6q20qar8dbl2mimpb43bnhmm2g3wgjyad6";
+          rev = "12d7e52cd5ae29fd828db0bf1fbf648020077145";
+          sha256 = "159yc9fcpywqhy92kn7i7aid30j3bzybfdz9kxb643026v30nhxq";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e8e06a916ac18053e34821673d1cf7936b15c2ac/recipes/peep-dired";
           sha256 = "16k5y3h2ip96k071vhx83avg4r4nplnd973b1271vvxbx2bly735";
-          name = "peep-dired";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -56939,8 +71407,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    peg = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    peg = callPackage ({ fetchFromGitHub
+                       , fetchurl
+                       , lib
+                       , melpaBuild }:
+      melpaBuild {
         pname = "peg";
         version = "20150707.2341";
         src = fetchFromGitHub {
@@ -56949,10 +71420,10 @@
           rev = "081efeca91d790c7fbc90871ac22c40935f4833b";
           sha256 = "0kjz7ch4bn0m4v9zgqyqcrsasnqc5c5drv2hp22j7rnbb7ny0q3n";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9b9b55a02e903ae7e75f8b636fdb1cf907c5db7c/recipes/peg";
           sha256 = "0nxy9xn99myz0p36m4jflfj48qxhhn1sspbfx8d90030xg3cc2gm";
-          name = "peg";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -56960,19 +71431,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    pelican-mode = callPackage ({ emacs, fetchgit, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    pelican-mode = callPackage ({ emacs
+                                , fetchgit
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "pelican-mode";
-        version = "20180401.148";
+        version = "20180604.1507";
         src = fetchgit {
           url = "https://git.korewanetadesu.com/pelican-mode.git";
-          rev = "c48bd6c3b7369787a09923c53b452d9ec460399c";
-          sha256 = "0b5sizmbf05kiwrq0n45scg95jg33qar70gi2vsqp4aaqryipccs";
+          rev = "209ad24318e1f28675da430aa10ef3467694b9ac";
+          sha256 = "1hiyl2iy2pa38bfr0z4axxmq3b79c31djyxqchx5mwzl9427dfsr";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/aede5994c2e76c7fd860661c1e3252fb741f9228/recipes/pelican-mode";
           sha256 = "0z6w5j3qwb58pndqbmpsvy1l77w9jv90bss9qq9hicil8nlk4pvi";
-          name = "pelican-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -56980,8 +71455,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    per-buffer-theme = callPackage ({ cl-lib ? null, fetchhg, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    per-buffer-theme = callPackage ({ cl-lib ? null
+                                    , fetchhg
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "per-buffer-theme";
         version = "20160318.1501";
         src = fetchhg {
@@ -56989,10 +71468,10 @@
           rev = "9e6200da91b3";
           sha256 = "0w02l91x624cgzdg33a9spgcwy12m607dsfnr1xbc1fi08np4sd1";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/per-buffer-theme";
           sha256 = "1czcaybpfmx4mwff7hs07iayyvgvlhifkickccap6kpd0cp4n6hn";
-          name = "per-buffer-theme";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -57000,20 +71479,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    perl6-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }:
-    melpaBuild {
+    perl6-mode = callPackage ({ emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild
+                              , pkg-info }:
+      melpaBuild {
         pname = "perl6-mode";
-        version = "20161228.430";
+        version = "20180619.459";
         src = fetchFromGitHub {
           owner = "perl6";
           repo = "perl6-mode";
-          rev = "4867c6d268545f5356111d72c4ae77917d34cb21";
-          sha256 = "1bpq2wa27rlmyx13vg0ig2nzzivzxzh9hdmhyw285dcn8agashnp";
+          rev = "4ad9987e2576ab2f17cc7090ce35d347167449bb";
+          sha256 = "0578mgy1pdiz19kam7n6cp98kbq8vmn2q6xc8qsjvzma3rfdsmgv";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4e912dccdee12f745272d26ea10d5f106a27cabc/recipes/perl6-mode";
           sha256 = "0r5q2nggb9kbjcdfv81d7sm41jqz040j9z52fnck4b9mlz2dy6d0";
-          name = "perl6-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs pkg-info ];
         meta = {
@@ -57021,8 +71505,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    perlbrew = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    perlbrew = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "perlbrew";
         version = "20161108.2309";
         src = fetchFromGitHub {
@@ -57031,10 +71518,10 @@
           rev = "3a3406c3307c92aa30f9400d430925c434a3b6f0";
           sha256 = "0kxz8ljc7w69ywp0bb15010sgrr13i1p05hcvhfr9c35l0n62r6p";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/24bd9c2cd848f5003a244a7127e8fc5ef46bdca4/recipes/perlbrew";
           sha256 = "1qadwkcic2qckqy8hgrnj08ajhxayknhpyxkc6ir15vfqjk5crr8";
-          name = "perlbrew";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -57042,8 +71529,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    persistent-overlays = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    persistent-overlays = callPackage ({ fetchFromGitHub
+                                       , fetchurl
+                                       , lib
+                                       , melpaBuild }:
+      melpaBuild {
         pname = "persistent-overlays";
         version = "20161127.2300";
         src = fetchFromGitHub {
@@ -57052,10 +71542,10 @@
           rev = "f563c8b966edc78c9d806661c4eb80e4781c4eab";
           sha256 = "0csllpkpjf4csw3zfaw8k05jg078najfmjz6pz1jcl6b4sxjdfqa";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d3673c87c5ca883b4f713efeae912c3ad991c667/recipes/persistent-overlays";
           sha256 = "136acbxqykvsw8a5il1zgpxr7llxmc3347847vf0jnmbzb1b472a";
-          name = "persistent-overlays";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -57063,20 +71553,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    persistent-scratch = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    persistent-scratch = callPackage ({ emacs
+                                      , fetchFromGitHub
+                                      , fetchurl
+                                      , lib
+                                      , melpaBuild }:
+      melpaBuild {
         pname = "persistent-scratch";
-        version = "20180414.1044";
+        version = "20180425.1811";
         src = fetchFromGitHub {
           owner = "Fanael";
           repo = "persistent-scratch";
-          rev = "85d753a27c198cc3611845ca144150d3baf4e3d8";
-          sha256 = "08iypb0pbscbqcvg6p81rmazr5b7kdavjg2z9l37jha4vcb3nbcj";
+          rev = "0bfd717d28ce9e262741b06341c61306602c7711";
+          sha256 = "1fq3m3p81rrvv1yp0cxfznphx7gava11sn09x706lmm1js62jnip";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f1e32702bfa15490b692d5db59e22d2c07b292d1/recipes/persistent-scratch";
           sha256 = "0iai65lsg3zxj07hdb9201w3rwrvdb3wffr6k2jdl8hzg5idghn1";
-          name = "persistent-scratch";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -57084,8 +71578,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    persistent-soft = callPackage ({ fetchFromGitHub, fetchurl, lib, list-utils, melpaBuild, pcache }:
-    melpaBuild {
+    persistent-soft = callPackage ({ fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , list-utils
+                                   , melpaBuild
+                                   , pcache }:
+      melpaBuild {
         pname = "persistent-soft";
         version = "20150223.1053";
         src = fetchFromGitHub {
@@ -57094,10 +71593,10 @@
           rev = "a1e0ddf2a12a6f18cab565dee250f070384cbe02";
           sha256 = "14p20br8vzxs39d4hswzrrkgwql5nnmn5j17cpbabzjvck42rixc";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c9db386ab3910940addae6e925b2ac17e64e0f87/recipes/persistent-soft";
           sha256 = "0a4xiwpgyyynjf69s8p183mqd3z53absv544ggvhb2gkpm6jravc";
-          name = "persistent-soft";
+          name = "recipe";
         };
         packageRequires = [ list-utils pcache ];
         meta = {
@@ -57105,8 +71604,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    persp-fr = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, persp-mode }:
-    melpaBuild {
+    persp-fr = callPackage ({ dash
+                            , emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild
+                            , persp-mode }:
+      melpaBuild {
         pname = "persp-fr";
         version = "20180103.642";
         src = fetchFromGitHub {
@@ -57115,10 +71620,10 @@
           rev = "aeb3b5de6135269091bb9aa0396973766c27fc88";
           sha256 = "0l6hlgn54iw2f6ry0gw79rsbz1r4svxf2xwffi580vi68wrcnvf2";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8e09213dddf003a1275eafb767431a507ecf7639/recipes/persp-fr";
           sha256 = "0p4379yr1b32l8ghq1axyb8qhp28gnq5qxxvbk3mdzgbwwj8y4b2";
-          name = "persp-fr";
+          name = "recipe";
         };
         packageRequires = [ dash emacs persp-mode ];
         meta = {
@@ -57126,20 +71631,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    persp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    persp-mode = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "persp-mode";
-        version = "20180104.843";
+        version = "20180604.1018";
         src = fetchFromGitHub {
           owner = "Bad-ptr";
           repo = "persp-mode.el";
-          rev = "eef754ce06159e220a9f3c99db3809925f41b8f1";
-          sha256 = "1x4s1nlnvab3sgzm0glkazfpc7lkh64af5nc4jjz1jzin8v0m055";
+          rev = "cc1d16aeb17f45d7141fcdc45f8bbffa03b3127f";
+          sha256 = "1qjnzdrx5a5nv742wvcv50jgjis6a44xwl29gj4k9ix5phgc2n9l";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/caad63d14f770f07d09b6174b7b40c5ab06a1083/recipes/persp-mode";
           sha256 = "1bgni7y5xsn4a21494npr90w3320snfzw1hvql30xrr57pw3765w";
-          name = "persp-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -57147,8 +71655,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    persp-mode-projectile-bridge = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, persp-mode, projectile }:
-    melpaBuild {
+    persp-mode-projectile-bridge = callPackage ({ cl-lib ? null
+                                                , fetchFromGitHub
+                                                , fetchurl
+                                                , lib
+                                                , melpaBuild
+                                                , persp-mode
+                                                , projectile }:
+      melpaBuild {
         pname = "persp-mode-projectile-bridge";
         version = "20170315.420";
         src = fetchFromGitHub {
@@ -57157,10 +71671,10 @@
           rev = "f6453cd7b8b4352c06e771706f2c5b7e2cdff1ce";
           sha256 = "1gyfn2fhx3bqzr9m1r4b8nyak8pmpcgj7yz2bagnjs21vfngr18c";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2c049b0067b70577511114dc8abac0a00a9e0588/recipes/persp-mode-projectile-bridge";
           sha256 = "169mpikixa33ljmh2n9sm186yibrik3f5p8m1hcisnzdsc3wgxmp";
-          name = "persp-mode-projectile-bridge";
+          name = "recipe";
         };
         packageRequires = [ cl-lib persp-mode projectile ];
         meta = {
@@ -57168,20 +71682,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    persp-projectile = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, perspective, projectile }:
-    melpaBuild {
+    persp-projectile = callPackage ({ cl-lib ? null
+                                    , fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild
+                                    , perspective
+                                    , projectile }:
+      melpaBuild {
         pname = "persp-projectile";
-        version = "20160709.2317";
+        version = "20180616.1244";
         src = fetchFromGitHub {
           owner = "bbatsov";
           repo = "persp-projectile";
-          rev = "7686633acf44402fa90429759cca6a155e4df2b9";
-          sha256 = "0rqyzsmg32sdr4k9i2lf3jfyr9bskkl7gfb5ndl16iip9py7403z";
+          rev = "3a79cb26e290b478e83aa7795146fb1759092d14";
+          sha256 = "17i1srw1k771i3a5wlydbyasyd9z39ryf48mxfs0dsbx1zjbj0pg";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8bc4e3a5af7ba86d277c73a1966a91c87d3d855a/recipes/persp-projectile";
           sha256 = "10l2kqjyigg98qbbpf3qf4d5bm63kkk4vp7ip8fibgj1p9gqmnxm";
-          name = "persp-projectile";
+          name = "recipe";
         };
         packageRequires = [ cl-lib perspective projectile ];
         meta = {
@@ -57189,20 +71709,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    perspective = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    perspective = callPackage ({ cl-lib ? null
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "perspective";
-        version = "20160609.1444";
+        version = "20180614.1533";
         src = fetchFromGitHub {
           owner = "nex3";
           repo = "perspective-el";
-          rev = "89a8ef5e8297b113e4f732bb94336608b76e13fd";
-          sha256 = "1bdywz241kyvlxn107l2jg6vyhvvw5j4pywrarzx3pdymh9qk645";
+          rev = "ca2a3b51a8411853b9adef2a9fe38011f84b91d9";
+          sha256 = "14sa0imfwhfbsm10dzack6wn4y4hdlgfr9a0gvh2hk0fd790w9v2";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/perspective";
           sha256 = "021ax1c2ys82dcjs5jl7b4nb83n6gax2imnpm030rcbihjl1lzm7";
-          name = "perspective";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -57210,8 +71734,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    perspeen = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, powerline }:
-    melpaBuild {
+    perspeen = callPackage ({ emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild
+                            , powerline }:
+      melpaBuild {
         pname = "perspeen";
         version = "20171203.221";
         src = fetchFromGitHub {
@@ -57220,10 +71749,10 @@
           rev = "edb70c530bda50ff3d1756e32a703d5fef5e5480";
           sha256 = "12h0kj96s4h8z4kqalp7hccnlnqn5lrax3df75gz16pskx2dwxqr";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/perspeen";
           sha256 = "0kwmllas9vnppsfaviy58d0nk4hmlqp566mfr4l53x46sybv1y04";
-          name = "perspeen";
+          name = "recipe";
         };
         packageRequires = [ emacs powerline ];
         meta = {
@@ -57231,20 +71760,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    pfuture = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    pfuture = callPackage ({ emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "pfuture";
-        version = "20171116.812";
+        version = "20180715.524";
         src = fetchFromGitHub {
           owner = "Alexander-Miller";
           repo = "pfuture";
-          rev = "d55a764b5beee803e489974be2408dbe236fc482";
-          sha256 = "1p6prnjh9pnz6q7fmlb5wjm2jzdm2jikkp6qfll8v7m3l19xwrmw";
+          rev = "e39d0d2953a5db7d9f567596865239012e506ac4";
+          sha256 = "0nd1asv8a0iqjvgaaxy4pyyfxcyk3rlyxndia78rzskkl53dqrc6";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5fb70c9f56a58b5c7a2e8b69b191aa2fc7c9bcc8/recipes/pfuture";
           sha256 = "15fr9wkpv8v1p22wz7hsyihq7f807ck105c2crfs8y7capfvs53s";
-          name = "pfuture";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -57252,8 +71785,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    pg = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    pg = callPackage ({ fetchFromGitHub
+                      , fetchurl
+                      , lib
+                      , melpaBuild }:
+      melpaBuild {
         pname = "pg";
         version = "20130731.1442";
         src = fetchFromGitHub {
@@ -57262,10 +71798,10 @@
           rev = "4f6516ec3946d95dcef49abb6703cc89ecb5183d";
           sha256 = "1zh7v4nnpzvbi8yj1ynlqlawk5bmlxi6s80b5f2y7hkdqb5q26k0";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5c4d1bb21948da2b283a3a9d89d9e3aed11afa13/recipes/pg";
           sha256 = "0n0187ndvwza1nis9a12h584qdqkwqfzhdw21kz5d1i6c43g7gji";
-          name = "pg";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -57273,8 +71809,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    pgdevenv = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    pgdevenv = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "pgdevenv";
         version = "20150105.1436";
         src = fetchFromGitHub {
@@ -57283,10 +71822,10 @@
           rev = "7f1d5bc734750aca98cf67a9491cdbd5615fd132";
           sha256 = "0c9d4c24ic67y07y74bv5b7vc56b6l0lbh2fbzm870r1dl5zbzcj";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/73ae474fc4792b2c322a0d2b5fd5b7cfe8c2fd05/recipes/pgdevenv";
           sha256 = "0za35sdwwav81wpk4jjqh56icaswwxxyg3bqqp0qiz24llb5ln1w";
-          name = "pgdevenv";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -57294,20 +71833,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    ph = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ph = callPackage ({ emacs
+                      , fetchFromGitHub
+                      , fetchurl
+                      , lib
+                      , melpaBuild }:
+      melpaBuild {
         pname = "ph";
         version = "20161029.822";
         src = fetchFromGitHub {
           owner = "gromnitsky";
           repo = "ph";
-          rev = "ed80dad9211583ed0db633448b3624c99b7fac23";
-          sha256 = "1pgz64zv9a0r16i958x53g7wnk0q7ngcd6z1maf7lxhlp57v015d";
+          rev = "a66e38637d1898b2ec31ee611033ac3f295fd97f";
+          sha256 = "10xznvjszn0smn6wf84rykkkiqyzv7xf7fjjyklhll7zphg714mw";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f62ca074ca2df780ab32aac50b2b828ee6a9934c/recipes/ph";
           sha256 = "0azx4cpfdn01yrqyn0q1gg9z7w0h0rn7zl39v3dx6yidd76ysh0l";
-          name = "ph";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -57315,8 +71858,16 @@
           license = lib.licenses.free;
         };
       }) {};
-    phabricator = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile, s }:
-    melpaBuild {
+    phabricator = callPackage ({ dash
+                               , emacs
+                               , f
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild
+                               , projectile
+                               , s }:
+      melpaBuild {
         pname = "phabricator";
         version = "20160510.725";
         src = fetchFromGitHub {
@@ -57325,10 +71876,10 @@
           rev = "d09d6f059aea92d3b11c68664a5e80c901182ab8";
           sha256 = "0cmfb5ns335nq27iw94qxvrldpwjga0hw40da9kpdcfg0in4ya0c";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/829010a578f34f0f2dfb36a0de01547c2950bb65/recipes/phabricator";
           sha256 = "07988f2xyp76xjs25b3rdblhmijs2piriz4p0q92jw69bdvkl14c";
-          name = "phabricator";
+          name = "recipe";
         };
         packageRequires = [ dash emacs f projectile s ];
         meta = {
@@ -57336,20 +71887,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    phan = callPackage ({ composer, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    phan = callPackage ({ composer
+                        , emacs
+                        , f
+                        , fetchFromGitHub
+                        , fetchurl
+                        , lib
+                        , melpaBuild }:
+      melpaBuild {
         pname = "phan";
-        version = "20171017.2045";
+        version = "20180527.2039";
         src = fetchFromGitHub {
           owner = "emacs-php";
           repo = "phan.el";
-          rev = "17b44a62580272bcf5ee91fb58098292e9de6f83";
-          sha256 = "002qak8jlim6pjj3ckikzzcc6n40mcqd5qvzakazi1q01z1ffsnd";
+          rev = "6b077b3421a0b2c0b98a6906b8ab0d14d9d7bf50";
+          sha256 = "1af4pam149dgxqzwqkjklxxqq2n8fg3l1b9w6bmaw24lx1pdxcyv";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/eb13cb0dba1696cc51132cd1ff723fa17f892a7c/recipes/phan";
           sha256 = "17ar6nxy0plx5li49kgf4f0h99wwmnnp5kwmpf34jg9ygyhaglvb";
-          name = "phan";
+          name = "recipe";
         };
         packageRequires = [ composer emacs f ];
         meta = {
@@ -57357,8 +71914,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    phi-autopair = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, paredit }:
-    melpaBuild {
+    phi-autopair = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild
+                                , paredit }:
+      melpaBuild {
         pname = "phi-autopair";
         version = "20170216.1953";
         src = fetchFromGitHub {
@@ -57367,10 +71928,10 @@
           rev = "3c7556779c3a53b045f5df33ae2a0c67469cbf60";
           sha256 = "16gh2r1mhmirbq20kklym4l60rfcfn8dsj0vv3hx3fj8q81h8qc9";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f26b586c0126699f3de65bf38dfbf9c4c0149c15/recipes/phi-autopair";
           sha256 = "1ya1bvh28qgz1zg9kdh2lzbsf0w0lx4xr42mdrjwaz3bbfa9asg4";
-          name = "phi-autopair";
+          name = "recipe";
         };
         packageRequires = [ paredit ];
         meta = {
@@ -57378,8 +71939,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    phi-grep = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    phi-grep = callPackage ({ cl-lib ? null
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "phi-grep";
         version = "20170606.107";
         src = fetchFromGitHub {
@@ -57388,10 +71953,10 @@
           rev = "ab9bd8d25e751a9cbfa108b49839293230b6e8b5";
           sha256 = "0p1i07dgaic0jnwdsnvsnib2913r9w8j98d1p5rx8db2nabjmzc0";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/992655fa4bd209abdf1149572e95f853e595125e/recipes/phi-grep";
           sha256 = "1y5lq6lq9qdydbypb1pjnxryh94a295nnqqh2x27whiwdiysirjj";
-          name = "phi-grep";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -57399,8 +71964,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    phi-rectangle = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    phi-rectangle = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "phi-rectangle";
         version = "20151207.2254";
         src = fetchFromGitHub {
@@ -57409,10 +71977,10 @@
           rev = "0c12716afc71d803d1f39417469521dc465762d9";
           sha256 = "0d2c579rg8wdfmn94nzaix9332jch4wlr939jszls330s38d0iv4";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/phi-rectangle";
           sha256 = "111fqqa7h5cajq92sbiqhavm25l5bcapxhfh38y7irq4mv08xifw";
-          name = "phi-rectangle";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -57420,8 +71988,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    phi-search = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    phi-search = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "phi-search";
         version = "20180321.1829";
         src = fetchFromGitHub {
@@ -57430,10 +72001,10 @@
           rev = "9a089b8271cb1cff9640848850298c9ec855286c";
           sha256 = "1gr5plcbrfdc4pglfj905s89hf8x0kc083h30wcnd81bnw9jwz1x";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2f0274300c33f19ca6f868e1d570ffee513dbdf7/recipes/phi-search";
           sha256 = "0nj06ixl76dd80zg83q4bi8k224mcwb612mr4gd1xppj5k8xl03g";
-          name = "phi-search";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -57441,8 +72012,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    phi-search-dired = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, phi-search }:
-    melpaBuild {
+    phi-search-dired = callPackage ({ fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild
+                                    , phi-search }:
+      melpaBuild {
         pname = "phi-search-dired";
         version = "20150405.14";
         src = fetchFromGitHub {
@@ -57451,10 +72026,10 @@
           rev = "162a5e4507c72512affae22744bb606a906d4193";
           sha256 = "1b44947hncw4q42fxxrz6fm21habzp4pyp0569xdwysrx2rca2fn";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/57c6dd518648f23927c5e6424210c157ed3cfd95/recipes/phi-search-dired";
           sha256 = "1gf3vs3vrp5kbq4ixnj7adazmnqixi63qswgc2512p10gf7inf8p";
-          name = "phi-search-dired";
+          name = "recipe";
         };
         packageRequires = [ phi-search ];
         meta = {
@@ -57462,8 +72037,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    phi-search-mc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, multiple-cursors, phi-search }:
-    melpaBuild {
+    phi-search-mc = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild
+                                 , multiple-cursors
+                                 , phi-search }:
+      melpaBuild {
         pname = "phi-search-mc";
         version = "20160324.803";
         src = fetchFromGitHub {
@@ -57472,10 +72052,10 @@
           rev = "7aa671910f766437089aec26c3aa7814222d1356";
           sha256 = "0wr86ad0yl52im6b9z0b9pzmhcn39qg5m9878yfv1nbxliw40lcd";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/83cf3fa3736eb2583dcf6bca16b9acb89e3408a3/recipes/phi-search-mc";
           sha256 = "07hd80rbyzr5n3yd7hv1j51nl6pvcxmln20g6xvw8gh5yfl9k0m8";
-          name = "phi-search-mc";
+          name = "recipe";
         };
         packageRequires = [ multiple-cursors phi-search ];
         meta = {
@@ -57483,20 +72063,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    phi-search-migemo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, migemo, phi-search }:
-    melpaBuild {
+    phi-search-migemo = callPackage ({ fetchFromGitHub
+                                     , fetchurl
+                                     , lib
+                                     , melpaBuild
+                                     , migemo
+                                     , phi-search }:
+      melpaBuild {
         pname = "phi-search-migemo";
         version = "20170618.221";
         src = fetchFromGitHub {
           owner = "zk-phi";
           repo = "phi-search-migemo";
-          rev = "308909ebfc8003d16673f97ca9eb26a667b72969";
-          sha256 = "07pi72jnd6k5xj9ypmxa0pbb03r07safpgf8vlp1m0xda5ixl0wf";
+          rev = "723b584d386639d59298d872ad7a035d3f8008b0";
+          sha256 = "01j3fpn44vgj8fq4smay1qd3wnh321v5pkgm9vkhpryj1v1g7am1";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b78e07146a4e954e050349a1798ac46ecba10bab/recipes/phi-search-migemo";
           sha256 = "0qk73s09sasm438w29j5z2bmlb60p1mgbv2ch43rgq8c6kjzg6h6";
-          name = "phi-search-migemo";
+          name = "recipe";
         };
         packageRequires = [ migemo phi-search ];
         meta = {
@@ -57504,8 +72089,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    phoenix-dark-mono-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    phoenix-dark-mono-theme = callPackage ({ fetchFromGitHub
+                                           , fetchurl
+                                           , lib
+                                           , melpaBuild }:
+      melpaBuild {
         pname = "phoenix-dark-mono-theme";
         version = "20170729.706";
         src = fetchFromGitHub {
@@ -57514,10 +72102,10 @@
           rev = "a54f515d162148bcb38676980bc2316adb3d7b8b";
           sha256 = "1zr334qsjrajd2vrrlc1rfm4b4kdw15jfh5d102vj5bp7z7ajhb4";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/87e3b036fbcc96b047bbb141345a7b51f19d6951/recipes/phoenix-dark-mono-theme";
           sha256 = "15in299j170n0wxmkg3cx1zzx1n7r1ifraqqzfqhcnk8i8lmc939";
-          name = "phoenix-dark-mono-theme";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -57525,8 +72113,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    phoenix-dark-pink-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    phoenix-dark-pink-theme = callPackage ({ fetchFromGitHub
+                                           , fetchurl
+                                           , lib
+                                           , melpaBuild }:
+      melpaBuild {
         pname = "phoenix-dark-pink-theme";
         version = "20170729.703";
         src = fetchFromGitHub {
@@ -57535,10 +72126,10 @@
           rev = "4defbb76b00c1a29f060813898578152d6be623d";
           sha256 = "03d7ak4ia3fifp0c8fm4qdydizsfsxvcvbzwfxlsk66s28p5wglc";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/87e3b036fbcc96b047bbb141345a7b51f19d6951/recipes/phoenix-dark-pink-theme";
           sha256 = "0bz6iw73d85bi12qqx6fdw3paqknrxvn0asbwjmgdcrlqrfczjlr";
-          name = "phoenix-dark-pink-theme";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -57546,20 +72137,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    php-auto-yasnippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, php-mode, yasnippet }:
-    melpaBuild {
+    php-auto-yasnippets = callPackage ({ fetchFromGitHub
+                                       , fetchurl
+                                       , lib
+                                       , melpaBuild
+                                       , php-mode
+                                       , yasnippet }:
+      melpaBuild {
         pname = "php-auto-yasnippets";
         version = "20170330.1814";
         src = fetchFromGitHub {
-          owner = "ejmr";
+          owner = "emacs-php";
           repo = "php-auto-yasnippets";
           rev = "03e1f0899c081813901ac15c2f7a675a37cca9f5";
           sha256 = "0d7y6njsd1s2r5df2k8wvvwgxpwwyaqkhdd2b3p1php8rrbj3mg8";
         };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/d47ca8cd5900a80a2ede1b354547addf9b2bbbac/recipes/php-auto-yasnippets";
-          sha256 = "1hhddvpc80b6wvjpbpibsf24rp5a5p45m0bg7m0c8mx181h9mqgn";
-          name = "php-auto-yasnippets";
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/28b2d8802f98e339ff01ecf9733b71b6c631123e/recipes/php-auto-yasnippets";
+          sha256 = "047i51ks2nn7ydrx2hjx9qvsh3lxnyxp8a6c3h3nb1acy84f5bd1";
+          name = "recipe";
         };
         packageRequires = [ php-mode yasnippet ];
         meta = {
@@ -57567,20 +72163,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    php-boris = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    php-boris = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "php-boris";
         version = "20130527.121";
         src = fetchFromGitHub {
           owner = "tomterl";
           repo = "php-boris";
-          rev = "f2faebf610c917f7091f7ec0cd97645629c4f819";
-          sha256 = "07lcibr55pk3sab9bbq2r4phadl5p28n63wkq5rkhkkjc7s9rayc";
+          rev = "4bb7e4d34d9906ddce688205eb24cafe634c6d06";
+          sha256 = "1pya68rbn3bs67nn0mprjx2w759byqmixylcvl25v8f645nmxd0r";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/php-boris";
           sha256 = "0kklwk8b98czsg567vgzzdfnv76yn1id3ah2q2qqdhaky1yzw7ak";
-          name = "php-boris";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -57588,20 +72187,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    php-boris-minor-mode = callPackage ({ fetchFromGitHub, fetchurl, highlight, lib, melpaBuild, php-boris }:
-    melpaBuild {
+    php-boris-minor-mode = callPackage ({ fetchgit
+                                        , fetchurl
+                                        , highlight
+                                        , lib
+                                        , melpaBuild
+                                        , php-boris }:
+      melpaBuild {
         pname = "php-boris-minor-mode";
         version = "20140209.1035";
-        src = fetchFromGitHub {
-          owner = "steckerhalter";
-          repo = "php-boris-minor-mode";
-          rev = "c70e176dd6545f2d42ca3427e87b469635616d8a";
-          sha256 = "1wk7vq80v97psxfg0pwy4mc6kdc61gm6h1vgl9p71ii6g6zvzcqg";
+        src = fetchgit {
+          url = "https://framagit.org/steckerhalter/php-boris-minor-mode.git";
+          rev = "8648eba604e4ff82ef6594a2c5ee4cb4825e6235";
+          sha256 = "00lmvsmh053zhdv56vkcxc4dpzrlx6jyck87vq8vjbj8q9nmkf23";
         };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/38006c8029c8891d660c423e79db0d45bf3d4428/recipes/php-boris-minor-mode";
-          sha256 = "1cmpd303chldss7kylpinv8qc3c78srz02a9cp9x79c8arq7apwl";
-          name = "php-boris-minor-mode";
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/f0a8eb0eefe88b4ea683a4743c0f8393506e014b/recipes/php-boris-minor-mode";
+          sha256 = "06nzdvzjp6ywq0jf0v0cmcv77wj1vyas2r10kmxd45rzw12hqjd9";
+          name = "recipe";
         };
         packageRequires = [ highlight php-boris ];
         meta = {
@@ -57609,20 +72212,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    php-cs-fixer = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    php-cs-fixer = callPackage ({ cl-lib ? null
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "php-cs-fixer";
         version = "20170506.1133";
         src = fetchFromGitHub {
           owner = "OVYA";
           repo = "php-cs-fixer";
-          rev = "ca2c075a22ad156c336d2aa093fb6394c9f6c112";
-          sha256 = "1axjfsfasg7xyq5ax2bx7rh2mgf8caw5bh858hhp1gk9xvi21qhx";
+          rev = "2e28b82d192c6f420ecb8cbef04256f3c9c47c4b";
+          sha256 = "1lh37z4z09nz4wfp8ly94dwrmjsqpg6phw5r8y4gjhfnfbgpq4b9";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a3631c4b81c1784995ae9e74d832e301d79214e2/recipes/php-cs-fixer";
           sha256 = "1xvz6v1fwngi2rizrx5sf0wrs4cy8rb13467r26k8hb7z8h1rqmf";
-          name = "php-cs-fixer";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -57630,8 +72237,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    php-eldoc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    php-eldoc = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "php-eldoc";
         version = "20140202.1141";
         src = fetchFromGitHub {
@@ -57640,10 +72250,10 @@
           rev = "df05064146b884d9081e10657e32dc480f070cfe";
           sha256 = "0hm6myvf91f4d2yfc7fs2xky9m8hfnimx1gkfzmn9f5pcc2l2p0i";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7af452f42847a947e87edd6aa559f807d08920c1/recipes/php-eldoc";
           sha256 = "1q5fkl8crqrgxik2mxbkqv10qnqhqrazd66rgfw797s3jcchv58j";
-          name = "php-eldoc";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -57651,20 +72261,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    php-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    php-mode = callPackage ({ cl-lib ? null
+                            , emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "php-mode";
-        version = "20180412.1002";
+        version = "20180608.250";
         src = fetchFromGitHub {
           owner = "ejmr";
           repo = "php-mode";
-          rev = "ef69a8b63f70a89694087ab0f97545d103ad952c";
-          sha256 = "0njhhlpv93rkskhzj6wyxyvvx839saix6d96x0ipairxv1arcj3j";
+          rev = "cf1907be2ddca079146ef258ba95d525f17787e3";
+          sha256 = "1dpyid4qp8lak6pvhjh1p5nwbgz67nq1yhwir54k4wk39r1g6i08";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7cdbc35fee67b87b87ec72aa00e6dca77aef17c4/recipes/php-mode";
           sha256 = "1lc4d3fgxhanqr3b8zr99z0la6cpzs2rksj806lnsfw38klvi89y";
-          name = "php-mode";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -57672,20 +72287,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    php-refactor-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    php-refactor-mode = callPackage ({ fetchFromGitHub
+                                     , fetchurl
+                                     , lib
+                                     , melpaBuild }:
+      melpaBuild {
         pname = "php-refactor-mode";
         version = "20171123.2235";
         src = fetchFromGitHub {
           owner = "keelerm84";
           repo = "php-refactor-mode.el";
-          rev = "7a794b0618df2882b1bd586fdd698dba0bc5130d";
-          sha256 = "12kjyzmicay7y37znk0znpn81lszmnydq5fkl5pk57bxblwwiivg";
+          rev = "d06dabd9ca743a04067e02282b69d7b7467fb4b7";
+          sha256 = "1mdbv079xj0a506hcq99bd8cdpwgq6anhqfkfwm56b3cn7g54qkr";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ad4a9bb43e131e2eb0d8b09b13245bc268c524a5/recipes/php-refactor-mode";
           sha256 = "0gj0nv6ii7pya0hcxs8haz5pahj0sa12c2ls53c3j85in645zb3s";
-          name = "php-refactor-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -57693,8 +72311,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    php-runtime = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    php-runtime = callPackage ({ cl-lib ? null
+                               , emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "php-runtime";
         version = "20180110.934";
         src = fetchFromGitHub {
@@ -57703,10 +72326,10 @@
           rev = "fa4312863245511462b75cb31df2f8558288f4df";
           sha256 = "1glwy0cgnn0z4rnd45pqy0bmyaddhxfjlj778hz7ghy40h9kqbdn";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/615c9ac208d8c20082a8ac83e49e93d99e2cbc89/recipes/php-runtime";
           sha256 = "0dvnwajrjsgyqzglzpkx9vwx3f55mrag6dsbdjqc9vvpvxhmgfwb";
-          name = "php-runtime";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -57714,8 +72337,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    php-scratch = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, php-mode, s }:
-    melpaBuild {
+    php-scratch = callPackage ({ emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild
+                               , php-mode
+                               , s }:
+      melpaBuild {
         pname = "php-scratch";
         version = "20161103.1517";
         src = fetchFromGitHub {
@@ -57724,10 +72353,10 @@
           rev = "3aa66d1d53b84b779374edff7a7e6b5f2cd7575d";
           sha256 = "0iyb4y0wrd1yqm56p37riw6nwvrlcgxj1x0nhw8304p8hv76mzdi";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/php-scratch";
           sha256 = "0sl9cccp4xjsidiyjf3sca8wlch3zd23zyac21xys11xm3rjxh9r";
-          name = "php-scratch";
+          name = "recipe";
         };
         packageRequires = [ emacs php-mode s ];
         meta = {
@@ -57735,20 +72364,51 @@
           license = lib.licenses.free;
         };
       }) {};
-    phpcbf = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    phpactor = callPackage ({ cl-lib ? null
+                            , emacs
+                            , f
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
+        pname = "phpactor";
+        version = "20180602.554";
+        src = fetchFromGitHub {
+          owner = "emacs-php";
+          repo = "phpactor.el";
+          rev = "f3b0e3d1e162b4f4fcdfe512bbab793c4808b358";
+          sha256 = "1nfnj022ixy68bznh3ms7d1h53qa65jdcnlf8bv6fbd41hqfvyvg";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/d67b98ecd541c227c011615f67d7a0890f5e1af3/recipes/phpactor";
+          sha256 = "0w2iszi74y3s6rcn6p2ic545cg319y4jpy83npbh5m98y8jma84m";
+          name = "recipe";
+        };
+        packageRequires = [ cl-lib emacs f ];
+        meta = {
+          homepage = "https://melpa.org/#/phpactor";
+          license = lib.licenses.free;
+        };
+      }) {};
+    phpcbf = callPackage ({ fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild
+                          , s }:
+      melpaBuild {
         pname = "phpcbf";
-        version = "20150302.528";
+        version = "20180519.138";
         src = fetchFromGitHub {
           owner = "nishimaki10";
           repo = "emacs-phpcbf";
-          rev = "b556b548ceb061b002389d6165d2cc63d8bddb5d";
-          sha256 = "09rinyx0621d7613xmbyvrrlav6d4ia332wkgg0m9dn265g3h56z";
+          rev = "a31020fc4c5add7339e009faea66894dc02a77f1";
+          sha256 = "04iw5is9h6a0i650mymyxq32z02rzl6k7pvwmv849rka16xhw1aq";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/77ef54e3fb2715a081786dc54f99ae74def5c77c/recipes/phpcbf";
           sha256 = "1hf88ys4grffpqgavrbc72dn3m7crafgid2ygzx9c5j55syh8mfv";
-          name = "phpcbf";
+          name = "recipe";
         };
         packageRequires = [ s ];
         meta = {
@@ -57756,8 +72416,41 @@
           license = lib.licenses.free;
         };
       }) {};
-    phpunit = callPackage ({ cl-lib ? null, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, s }:
-    melpaBuild {
+    phpstan = callPackage ({ emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
+        pname = "phpstan";
+        version = "20180502.2006";
+        src = fetchFromGitHub {
+          owner = "emacs-php";
+          repo = "phpstan.el";
+          rev = "97f643518714ba3e76b5b64f72c938800b4dc43b";
+          sha256 = "02k99s6l4pppvjb089xbj7jgc983ia3jy2fj80mjpqmpbpnlakq2";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/5a2b6cc39957e6d7185bd2bdfa3755e5b1f474a6/recipes/phpstan";
+          sha256 = "0j3xb3h6fqgk0nv5mlfz7lgfkcy0z04an9qy8nq5y473hdj87qzm";
+          name = "recipe";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/phpstan";
+          license = lib.licenses.free;
+        };
+      }) {};
+    phpunit = callPackage ({ cl-lib ? null
+                           , emacs
+                           , f
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild
+                           , pkg-info
+                           , s }:
+      melpaBuild {
         pname = "phpunit";
         version = "20171127.301";
         src = fetchFromGitHub {
@@ -57766,10 +72459,10 @@
           rev = "a13706733f98be3639c47311fc820b3b50f4bc33";
           sha256 = "0vfvybjinj0knim4ax0xspz7zr3n2y9ap1lvwqx1gwydr06w4jrl";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0670b42c0c998daa7bf01080757976ac3589ec06/recipes/phpunit";
           sha256 = "0nj8ss1yjkcqnbnn4jgbp0403ljjk2xhipzikdrl3dbxlf14i4f8";
-          name = "phpunit";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs f pkg-info s ];
         meta = {
@@ -57777,20 +72470,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    pianobar = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    pianobar = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "pianobar";
-        version = "20180409.1906";
+        version = "20180416.1804";
         src = fetchFromGitHub {
           owner = "agrif";
           repo = "pianobar.el";
-          rev = "9eb9b7fcb4790b11726302cbcec1b7951fbc8b0e";
-          sha256 = "0y41hfml5l28i40fk279m6yngylkwrlv5wldhq3y1sp4ryahwl6p";
+          rev = "3154c4cb7401017fd441fcd6a7a0b669a4406882";
+          sha256 = "0dy51pi85i8ag47zmnhppllsbmxd0bp704azffddkg36pjh4inxk";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b5659b4c7be20572aabe75caba866301393db012/recipes/pianobar";
           sha256 = "16vsf2cig9qjbh9s58zb5byjmyghxbsxpzpm5hyyrv251jap1jjn";
-          name = "pianobar";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -57798,20 +72494,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    pickle = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    pickle = callPackage ({ cl-lib ? null
+                          , emacs
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "pickle";
-        version = "20180218.1840";
+        version = "20180627.1937";
         src = fetchFromGitHub {
           owner = "ahungry";
           repo = "pickle-mode";
-          rev = "d672186129a19581c908bae3063e09baa815869c";
-          sha256 = "10jl9xinljzb8nra59r6wyrmsr8sbbl40yahpzn4558nmmdckcnb";
+          rev = "568570b7d376026fbcb7c3df1ad8f605bd14c820";
+          sha256 = "0dg44js5l1p93h73x7zh4znr0iwgmms7qr4v4594ab6sg7cc54jm";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4cb71882f074d3fef1f5a7b504dafcb6adff8ed4/recipes/pickle";
           sha256 = "0fryzmrs6bn6r590qp08jyzx9g6jakf1pahxhcfglsv9k3jbfp13";
-          name = "pickle";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -57819,8 +72520,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    picolisp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    picolisp-mode = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "picolisp-mode";
         version = "20150516.155";
         src = fetchFromGitHub {
@@ -57829,10 +72533,10 @@
           rev = "1a537b14090813f46cbba54636d40365e1a8067e";
           sha256 = "0p91ysyjksbravnw3l78mshay6swgb5k1zi5bbppppk8zkmdp115";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fe116998dadeef6e61c0791efb396f9b8befa5d6/recipes/picolisp-mode";
           sha256 = "1n56knbapyfs8n23arzlz27y0q4846r64krwlwh8agfqkcdw9dp5";
-          name = "picolisp-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -57840,20 +72544,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    picpocket = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    picpocket = callPackage ({ emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "picpocket";
-        version = "20170905.1133";
+        version = "20180610.359";
         src = fetchFromGitHub {
           owner = "johanclaesson";
           repo = "picpocket";
-          rev = "e0ca0f1fc03b4166ce2eab9d7532b9b29989e5bd";
-          sha256 = "0ldiwfysfwz6mr54j7rl1jccfx9lq31a4v9r6cm55js75mamhbw1";
+          rev = "ce4b6ed088384f2414af82e8e4eae5b92c2874bf";
+          sha256 = "15vpbcv83mc4j1pvrk7xic0klh2bl9gzg2xxs7c2lmnix52hy8mv";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e88dc89311d4bfe82dc15f22b84c4b76abb3fd69/recipes/picpocket";
           sha256 = "0p2mrjcd8ig0h7dk0zvyfma4nnfk2ic6gp2dwfqyqq6irb010f45";
-          name = "picpocket";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -57861,20 +72569,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    pig-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    pig-mode = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "pig-mode";
-        version = "20140617.1058";
+        version = "20180520.700";
         src = fetchFromGitHub {
           owner = "motus";
           repo = "pig-mode";
-          rev = "af4200c88a50264b63fa162a02860f3f54c8755b";
-          sha256 = "1yg9n265ljdjlh6a3jrjwyvj3f76wp68x25bl0p8dxrrsyr9kvfx";
+          rev = "4c6c6e1b1bb719d8adc6c47cc24665f6fe558959";
+          sha256 = "1vwnybyrzk8nw2cs27yrsipxb6hmx7cs5d60yf00h0wiv3l6v3rr";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a0d7c07d28e2f229b281201a781ebaceed6465ed/recipes/pig-mode";
           sha256 = "0gmvc4rrqkn0cx8fk1sxk6phfbpf8dcba3k6i24k3idcx8rxsw3x";
-          name = "pig-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -57882,20 +72593,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    pig-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
-    melpaBuild {
+    pig-snippets = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild
+                                , yasnippet }:
+      melpaBuild {
         pname = "pig-snippets";
         version = "20130912.2324";
         src = fetchFromGitHub {
           owner = "motus";
           repo = "pig-mode";
-          rev = "af4200c88a50264b63fa162a02860f3f54c8755b";
-          sha256 = "1yg9n265ljdjlh6a3jrjwyvj3f76wp68x25bl0p8dxrrsyr9kvfx";
+          rev = "69ca24cb756dd516828e284e33274145eba21183";
+          sha256 = "1b1wibla851f7mra0jf13xhil1xw4s0m2l53f1s2h36468wb24y1";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a0d7c07d28e2f229b281201a781ebaceed6465ed/recipes/pig-snippets";
           sha256 = "1sqi0a2dsqgmabkrncxiyrhibyryyy25d11b15ybhlngd05wqbx2";
-          name = "pig-snippets";
+          name = "recipe";
         };
         packageRequires = [ yasnippet ];
         meta = {
@@ -57903,8 +72618,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    pillar = callPackage ({ fetchFromGitHub, fetchurl, lib, makey, melpaBuild }:
-    melpaBuild {
+    pillar = callPackage ({ fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , makey
+                          , melpaBuild }:
+      melpaBuild {
         pname = "pillar";
         version = "20141112.1011";
         src = fetchFromGitHub {
@@ -57913,10 +72632,10 @@
           rev = "13a7f676544cc66005ccd8e6fc1c25e4ccd6f909";
           sha256 = "19i8hgzr7kdj4skf0cnv6vlsklq9qcyxcv3p33k9vgq7y4f9mah8";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bff55f1182f3bd0bc8a8773921f703168d87de21/recipes/pillar";
           sha256 = "1lklky3shyvm1iygp621hbldpx37m0a9vd5l6mxs4y60ksj6z0js";
-          name = "pillar";
+          name = "recipe";
         };
         packageRequires = [ makey ];
         meta = {
@@ -57924,8 +72643,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    pinboard-api = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    pinboard-api = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "pinboard-api";
         version = "20140324.448";
         src = fetchFromGitHub {
@@ -57934,10 +72656,10 @@
           rev = "b7b5214d0c35178f8dca08cf22d6ef3c21f0fce4";
           sha256 = "0wy9c37g6m5khchlp8qvfnjgkwq4r38659adcm5prvzjgzqhlfja";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7a13787abe600b6f6355a475af573efa0064bf6f/recipes/pinboard-api";
           sha256 = "0yzvgnpkj2fhl01id36nc5pj8vyb05bllraiz3lwwcc66y98h9n0";
-          name = "pinboard-api";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -57945,8 +72667,36 @@
           license = lib.licenses.free;
         };
       }) {};
-    pinot = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    pinboard-popular = callPackage ({ fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , loop
+                                    , melpaBuild }:
+      melpaBuild {
+        pname = "pinboard-popular";
+        version = "20180511.1026";
+        src = fetchFromGitHub {
+          owner = "asimpson";
+          repo = "pinboard-popular";
+          rev = "c0bc76cd35f8ecf34723c64a702b82eec2751318";
+          sha256 = "1msvb5r6ixd886plpbss62q2nwrrsb6271bi922vlhr817lhsain";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/094f63e451622571aac832b14221a0d5a96de9c5/recipes/pinboard-popular";
+          sha256 = "0d9ng4mclnb9yfzh8wzz03fbhfxayns0dg31bdixkwvy2vk00rkf";
+          name = "recipe";
+        };
+        packageRequires = [ loop ];
+        meta = {
+          homepage = "https://melpa.org/#/pinboard-popular";
+          license = lib.licenses.free;
+        };
+      }) {};
+    pinot = callPackage ({ fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "pinot";
         version = "20140211.1226";
         src = fetchFromGitHub {
@@ -57955,10 +72705,10 @@
           rev = "67fda555a155b22bb2ce44ba618b4bd6fc5f144a";
           sha256 = "1wc31r5fpcia4n4vbpg7vv3rzrnjzh18yygi3kp4wvl2wzx2azqh";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f75cd89811b4bb668c1e7a93246b93fbcf5d9c47/recipes/pinot";
           sha256 = "1kjzq02pddnkia637xz2mnjjyglyh6qzragnf7nnxbw9ayiim58i";
-          name = "pinot";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -57966,8 +72716,38 @@
           license = lib.licenses.free;
         };
       }) {};
-    pinyin-search = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, pinyinlib }:
-    melpaBuild {
+    pinyin = callPackage ({ cl-lib ? null
+                          , emacs
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
+        pname = "pinyin";
+        version = "20180620.541";
+        src = fetchFromGitHub {
+          owner = "xuchunyang";
+          repo = "pinyin.el";
+          rev = "80b588cbf97973973fce4d720df3cf41306df2e4";
+          sha256 = "1crd90f1b603k5k9qsdbi2zdkyhqcim8xk5mqw5w20mxrf39y36n";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/b16f0f7f86021bb0bece6c90878b0dba1657107f/recipes/pinyin";
+          sha256 = "1afgz62zpar6d65q4h12s7ijhhl2r2vlrnk79vsjrl560jh7hgfm";
+          name = "recipe";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/pinyin";
+          license = lib.licenses.free;
+        };
+      }) {};
+    pinyin-search = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild
+                                 , pinyinlib }:
+      melpaBuild {
         pname = "pinyin-search";
         version = "20160514.2058";
         src = fetchFromGitHub {
@@ -57976,10 +72756,10 @@
           rev = "2e877a76851009d41bde66eb33182a03a7f04262";
           sha256 = "0bp4raxqv34jyg3yvdcsh9lav28x376gngm9nn8vjgmq9wggzf3i";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/03da6f02778f7fae77a00cdc420cfbafead6dec4/recipes/pinyin-search";
           sha256 = "1si693nmmxgg0kp5mxvj5nq946kfc5cv3wfsl4znbqzps8qb2b7z";
-          name = "pinyin-search";
+          name = "recipe";
         };
         packageRequires = [ pinyinlib ];
         meta = {
@@ -57987,8 +72767,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    pinyinlib = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    pinyinlib = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "pinyinlib";
         version = "20170827.1442";
         src = fetchFromGitHub {
@@ -57997,10 +72780,10 @@
           rev = "45f05d3dbb4fe957f7ab332ca6f94675848b6aa3";
           sha256 = "0pmgb4y06dbffs4442aa92vn8ydwl45zqwzxzwhk6md1318fppvd";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f4aa27985dcfaf24f1863667b89e13df4710546f/recipes/pinyinlib";
           sha256 = "0kv67qa3825fw64qimkph2b65pilrsx5730y4c7f7c1f8giz5vxr";
-          name = "pinyinlib";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -58008,20 +72791,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    pip-requirements = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    pip-requirements = callPackage ({ dash
+                                    , fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "pip-requirements";
-        version = "20180306.1522";
+        version = "20180602.1034";
         src = fetchFromGitHub {
           owner = "Wilfred";
           repo = "pip-requirements.el";
-          rev = "88c764ad5d988a3ed0d2b6f0b7dd22308b03a058";
-          sha256 = "01gl4nzqpmczprsdg13yvcj8d1p49wdwskmkm8nzssrshir6xdxl";
+          rev = "4eff2953317272e145649effb1956081a31645ee";
+          sha256 = "1hnkfbcsrf69pz71pka4hp8dv4qvq431x5ahind4iwz9lzsfhhwq";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5eaf6987f92070ccc33d3e28c6bb2b96f72ba1aa/recipes/pip-requirements";
           sha256 = "1wsjfyqga7pzp8gsm5x53qrkn40srairbjpifyrqbi2fpzmwhrnz";
-          name = "pip-requirements";
+          name = "recipe";
         };
         packageRequires = [ dash ];
         meta = {
@@ -58029,20 +72816,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    pipenv = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    pipenv = callPackage ({ emacs
+                          , f
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild
+                          , s }:
+      melpaBuild {
         pname = "pipenv";
-        version = "20180402.2127";
+        version = "20180626.2323";
         src = fetchFromGitHub {
           owner = "pwalsh";
           repo = "pipenv.el";
-          rev = "7f1fb3dd1704e535e67860c58080e55fc89e07f4";
-          sha256 = "1z1hdh6m10gam86zyhdfjksj2jxjrichdcz8qs3290lxy59f7agq";
+          rev = "822150b56c1ab481d0c4e7e87a9a189539259ed8";
+          sha256 = "0qci4mrlvvssmis3rksawm8ki2hv550qimyk6i4shif4xvm63ys0";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d46738976f5dfaf899ee778b1ba6dcee455fd271/recipes/pipenv";
           sha256 = "110ddg6yjglp49rgn1ck41rl97q92nm6zx86mxjmcqq35cxmc6g1";
-          name = "pipenv";
+          name = "recipe";
         };
         packageRequires = [ emacs f s ];
         meta = {
@@ -58050,20 +72843,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    pippel = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    pippel = callPackage ({ dash
+                          , emacs
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild
+                          , s }:
+      melpaBuild {
         pname = "pippel";
-        version = "20170730.623";
+        version = "20180710.156";
         src = fetchFromGitHub {
           owner = "brotzeit";
           repo = "pippel";
-          rev = "3737d5934665b5059c1e858feeb4270262b37e53";
-          sha256 = "0k94y305c6abhxgq6birfvnrplsx5gadwsqwn8m87sh8ldsjnmgi";
+          rev = "21a5200e8e5ccaa1911abb4ebf090b76ca839756";
+          sha256 = "1amqjm6kn1xda058kdwq3xgk7raz6y9iw0mzrac78sgf57qaczyb";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6d1796688ed0d6957557d960ca28e450f9bcb6cf/recipes/pippel";
           sha256 = "1li4h0dff1n7njy2lk3d50ndrlw84fphmdg16j0srkbgy7xz90yn";
-          name = "pippel";
+          name = "recipe";
         };
         packageRequires = [ dash emacs s ];
         meta = {
@@ -58071,8 +72870,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    pivotal-tracker = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    pivotal-tracker = callPackage ({ fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "pivotal-tracker";
         version = "20170720.816";
         src = fetchFromGitHub {
@@ -58081,10 +72883,10 @@
           rev = "0311d117037c74512149a4a78b269c2e46d7dfba";
           sha256 = "0g3xzh8jr9lbg6h2hk81cdyxkxx3l79qhxrp4g34rc0dml79rzf9";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/pivotal-tracker";
           sha256 = "0yiyz11sd25ybgr2qmg62qqmcz96va1pq3q866cqmpl38xn7znpj";
-          name = "pivotal-tracker";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -58092,20 +72894,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    pixie-mode = callPackage ({ clojure-mode, fetchFromGitHub, fetchurl, inf-clojure, lib, melpaBuild }:
-    melpaBuild {
+    pixie-mode = callPackage ({ clojure-mode
+                              , fetchFromGitHub
+                              , fetchurl
+                              , inf-clojure
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "pixie-mode";
-        version = "20150121.2124";
+        version = "20180625.2241";
         src = fetchFromGitHub {
           owner = "johnwalker";
           repo = "pixie-mode";
-          rev = "f32d5d812c7b5b72d7ff7bad52b41035f9ef6e96";
-          sha256 = "0nnvf2p593gn8sbyrvczyll030xgnkxn900a2hy7ia7xh0wmvddp";
+          rev = "a40c2632cfbe948852a5cdcfd44e6a65db11834d";
+          sha256 = "11c5gv88chh7sg2i0rzisbad0mkq1zc7dyi5md8hdi5gqm68704g";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a57300bfdae57c9996db0411d56a5fc7b35778c3/recipes/pixie-mode";
           sha256 = "16z15yh78837k548xk5widdmy6fv03vym6q54i40knmgf5cllsl8";
-          name = "pixie-mode";
+          name = "recipe";
         };
         packageRequires = [ clojure-mode inf-clojure ];
         meta = {
@@ -58113,8 +72920,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    pixiv-novel-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    pixiv-novel-mode = callPackage ({ fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "pixiv-novel-mode";
         version = "20160220.621";
         src = fetchFromGitHub {
@@ -58123,10 +72933,10 @@
           rev = "0d1ca524d92b91f20a7105402a773bc21779b434";
           sha256 = "18rvnvm097ca4yc1nfswdv7dfqg36insnif5kfj19aa60m9qxl09";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/92092c1c13c37520f98b952d40745aa062f062c1/recipes/pixiv-novel-mode";
           sha256 = "0f1rxvf9nrw984122i6dzsgik9axfjv6yscmg203s065n9lz17px";
-          name = "pixiv-novel-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -58134,20 +72944,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    pkg-info = callPackage ({ epl, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    pkg-info = callPackage ({ epl
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "pkg-info";
         version = "20150517.443";
         src = fetchFromGitHub {
           owner = "lunaryorn";
           repo = "pkg-info.el";
-          rev = "76ba7415480687d05a4353b27fea2ae02b8d9d61";
-          sha256 = "150xhsv695cchs5jc2hwk9gjgs0k8wkm966crvxxs6xvj5fg69xq";
+          rev = "4dbe328c9eced79e0004e3fdcd7bfb997a928be5";
+          sha256 = "1xkdbyhz9mgdz5zmjm4hh050klsl12w5lkckw2l77ihcxv0vjnf2";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/pkg-info";
           sha256 = "1k23hmpcq534060qcxbrv4g6bw9nzcbjg192mbdp20kwidw7p81n";
-          name = "pkg-info";
+          name = "recipe";
         };
         packageRequires = [ epl ];
         meta = {
@@ -58155,41 +72969,49 @@
           license = lib.licenses.free;
         };
       }) {};
-    pkgbuild-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    pkgbuild-mode = callPackage ({ emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "pkgbuild-mode";
-        version = "20151010.736";
+        version = "20180609.931";
         src = fetchFromGitHub {
           owner = "juergenhoetzel";
           repo = "pkgbuild-mode";
-          rev = "7369ab3c6b59cfdf2ecd2b32ad96ce006e766fa0";
-          sha256 = "077vp3fxwxj7b98ydw6iyi391w3acp73qwk6615yqdylpp66m750";
+          rev = "b19759d8c4fcb27ac3455d277ad8b81886f0ad97";
+          sha256 = "038xgic6ngvgsbn3ss3nvhdy3bhq425sas5lgg8z1nql8f4rz2kb";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ca7bf43ef8893bf04e9658390e306ef69e80a156/recipes/pkgbuild-mode";
           sha256 = "1lp7frjahcpr4xnzxz77qj5hbpxbxm2g28apkixrnc1xjha66v3x";
-          name = "pkgbuild-mode";
+          name = "recipe";
         };
-        packageRequires = [];
+        packageRequires = [ emacs ];
         meta = {
           homepage = "https://melpa.org/#/pkgbuild-mode";
           license = lib.licenses.free;
         };
       }) {};
-    plain-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    plain-theme = callPackage ({ emacs
+                               , fetchFromGitLab
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "plain-theme";
         version = "20171123.2010";
-        src = fetchFromGitHub {
+        src = fetchFromGitLab {
           owner = "yegortimoshenko";
           repo = "plain-theme";
           rev = "2609a811335d58cfb73a65d6307c156fe09037d3";
           sha256 = "0g5vl4xigdm2pn2mnkwgj1kxdjr66w7ynr77bchy3ij6qvzdzkqd";
         };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/d7ad3737f081f101500317f7e183be6b1e7e8122/recipes/plain-theme";
-          sha256 = "0igncivhnzzirglmz451czx69cwshjkigqvqddj0a77b1cwszfw8";
-          name = "plain-theme";
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/b147fb05a1b4296e1b85d31ba018d132a5bb5ed2/recipes/plain-theme";
+          sha256 = "10qq7cy6hqh6c8qi796y9lk4wyyjbhdn1pvkcw3g29cfh857x50m";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -58197,20 +73019,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    plan9-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    plan9-theme = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "plan9-theme";
-        version = "20180102.1852";
+        version = "20180606.2035";
         src = fetchFromGitHub {
           owner = "john2x";
           repo = "plan9-theme.el";
-          rev = "2a31fb9251922667692337c867612947d2139696";
-          sha256 = "0g01a34q3dsn23s7s94xxmrvqalmvzi3hdz2hgh4swn4hrp4bzqf";
+          rev = "4c9455033e877b7ce464bc99de32f310cf0bcda9";
+          sha256 = "0arbhpms38i75a9dpqn9krv64bx47jaiccanqdgzf4slcb8kvk6z";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cdc4c2bafaa09e38edd485a9091db689fbda2fe6/recipes/plan9-theme";
           sha256 = "0bvr877mc79s1shr82b33ipspz09jzc3809c6pkbw0jqpfid44cc";
-          name = "plan9-theme";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -58218,8 +73043,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    planet-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    planet-theme = callPackage ({ emacs
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "planet-theme";
         version = "20161030.1917";
         src = fetchFromGitHub {
@@ -58228,10 +73057,10 @@
           rev = "b0a310ff36565fe22224c407cf59569986698a32";
           sha256 = "1xdj59skmldq5dnarirhwq4qycipas86nbyqwl8zsv0bh20nl1rs";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/planet-theme";
           sha256 = "1hr5m08qn51r9804jd0k95ryz3frzkk1dp6wpybil6bf67a2l5lr";
-          name = "planet-theme";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -58239,20 +73068,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    plantuml-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    plantuml-mode = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "plantuml-mode";
         version = "20170819.1033";
         src = fetchFromGitHub {
           owner = "skuro";
           repo = "plantuml-mode";
-          rev = "cfb408fc840dae80a7d05d5648d27c18f04c00a9";
-          sha256 = "1w2f953glxqfg8ilv537qznxj4kv4ddi011wyhkn27sv4wnky82c";
+          rev = "5a2e8d0dd2ba9286fc3c82d8689d25050290f68d";
+          sha256 = "1gcv5gmps371wd2sjbq4g5p2yj2ip8lpn81lypwb5xavqa7gjhlv";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/38e74bb9923044323f34473a5b13867fe39bed25/recipes/plantuml-mode";
           sha256 = "03srbg34512vxcqn95q4r7h2aqbqq0sd5c9ffnbx2a75vsblqc6h";
-          name = "plantuml-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -58260,20 +73092,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    plaster = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    plaster = callPackage ({ emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "plaster";
         version = "20180127.1250";
         src = fetchFromGitHub {
           owner = "Shirakumo";
           repo = "plaster";
-          rev = "c6c9c223d634041411d111b4397574f65e140585";
-          sha256 = "0pzdw9jb1p1bi5zc59sjvwxzczg8laz5vlsrs73ah1pk9jckqwf5";
+          rev = "11eb23920410818fe444887b97ad4c8722d66c85";
+          sha256 = "0lqz8m8a2ahvgm0i9cz0j4bisi34czc4s29z70p5p6rdg4g21fk1";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7e363cffa021e649c052f38cedb7cc01dbe9e24a/recipes/plaster";
           sha256 = "0vfixc0f5n4flsmdf1iqlbx03yv28w3nqm1ycz2fx6p5jvhkvfqk";
-          name = "plaster";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -58281,8 +73117,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    platformio-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }:
-    melpaBuild {
+    platformio-mode = callPackage ({ fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild
+                                   , projectile }:
+      melpaBuild {
         pname = "platformio-mode";
         version = "20161210.539";
         src = fetchFromGitHub {
@@ -58291,10 +73131,10 @@
           rev = "1466aed132a77f48fcb31938d64abb1a1e58ec42";
           sha256 = "1lfkp7df8as9gspynkyhz4dbm95kbngyba1ymg6ql67adyv79v1i";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/platformio-mode";
           sha256 = "1v1pp3365wj19a5wmsxyyy5n548z3lmcbm2pwl914wip3ca7546f";
-          name = "platformio-mode";
+          name = "recipe";
         };
         packageRequires = [ projectile ];
         meta = {
@@ -58302,20 +73142,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    play-crystal = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }:
-    melpaBuild {
+    play-crystal = callPackage ({ dash
+                                , emacs
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild
+                                , request }:
+      melpaBuild {
         pname = "play-crystal";
         version = "20180114.224";
         src = fetchFromGitHub {
           owner = "veelenga";
           repo = "play-crystal.el";
-          rev = "0b4810a9025213bd11dbcbfd38b3ca928829e0a5";
-          sha256 = "15gqr11paz5qmx43qb0f95wc87nn2snr7my22b0n6jwbk5djf402";
+          rev = "86b54346e7c832c14f8e5654a462f6490a6b11d7";
+          sha256 = "0kvkr24f8r21pahm2lsvbr9bg53770wxwpdfmmjljs2zmgxf2c40";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/92715977136afa731e85e894542dc88b664b3304/recipes/play-crystal";
           sha256 = "1jqf36b1mhyf4j7fs386g6isy09q7k8zwdc4rb34mhjg1a56gcnf";
-          name = "play-crystal";
+          name = "recipe";
         };
         packageRequires = [ dash emacs request ];
         meta = {
@@ -58323,20 +73169,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    play-routes-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    play-routes-mode = callPackage ({ fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "play-routes-mode";
         version = "20170426.33";
         src = fetchFromGitHub {
           owner = "brocode";
           repo = "play-routes-mode";
-          rev = "22d7b87e0eaf0330f2b2283872f8dc08a3258771";
-          sha256 = "0j61adh2lsh2zgz1v9i2jzh56ngnrpvsblipvc472k5dxa5qdxin";
+          rev = "ef8230932f7bb96643febbd6872c522932f9571a";
+          sha256 = "1wv4wnkcdlq5qvxr55wgs6dc64m69r0niz0r5h2ch9d5nclmvbkh";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/740cef8687232eb0e2186e8df956c2d4f39575cf/recipes/play-routes-mode";
           sha256 = "17phqil2zf5rfvhs5v743dh4lix4v2azbf33z9n97ahs7j66y2gz";
-          name = "play-routes-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -58344,20 +73193,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    playerctl = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    playerctl = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "playerctl";
         version = "20180301.554";
         src = fetchFromGitHub {
           owner = "thomasluquet";
           repo = "playerctl.el";
-          rev = "3eee541423c2e5eb9f23a26fa9aa88c9c5a19ad1";
-          sha256 = "16qvn1mss5j8vpf1qpq4lwl4hwng64caw3c3shixsncfmgw25z6f";
+          rev = "c75358240a9bc234f31fc3e652929b103b1238b9";
+          sha256 = "1yf66kw967xminfwzzdfzimh1313m3lm946bmcdl1zb8db0fcrdc";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6db0d82c2eef7c5bef5f9f2c15969da4c404b62d/recipes/playerctl";
           sha256 = "1pix3hcsg6ymzajiixwcq4v3clvadpkl0rhplkhachv6wmci327x";
-          name = "playerctl";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -58365,20 +73217,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    playground = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    playground = callPackage ({ emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "playground";
-        version = "20180319.243";
+        version = "20180623.2026";
         src = fetchFromGitHub {
           owner = "akirak";
           repo = "emacs-playground";
-          rev = "f1b87ba65d8be28c4a8fc0fd8480d2da00e52406";
-          sha256 = "0fqja170pbdrj1lz8dfpi53l07bf4vk18maa1kzcd2nyd569xxvi";
+          rev = "85ab8ce4b574254eead623a3553082a9e6e655af";
+          sha256 = "0m780v6h3mjib5hmmv3afjnmh562v5c13l6vam4nnhj4qrq33ri8";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f062a74fe1746129879ad19c1735621f58509d33/recipes/playground";
           sha256 = "1xjmxkl8h4l87fvv1sr478r6mkmy9gkzw2fxmzqn5fcsahzkyg4d";
-          name = "playground";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -58386,8 +73242,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    plenv = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    plenv = callPackage ({ fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "plenv";
         version = "20130706.2316";
         src = fetchFromGitHub {
@@ -58396,10 +73255,10 @@
           rev = "ee937d0f3a1a7ba2d035f45be896d3ed8fefaee2";
           sha256 = "11cbpgjsnw8fiqf1s12hbm9qxgjcw6y2zxx7wz4wg7idmi7m0b7g";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a0819979b9567ac5fab9ed6821eba8fe7ee6a299/recipes/plenv";
           sha256 = "0dw9fy5wd9wm76ag6yyw3f9jnlj7rcdcxgdjm30h514qfi9hxbw4";
-          name = "plenv";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -58407,20 +73266,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    plim-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    plim-mode = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "plim-mode";
         version = "20140812.1713";
         src = fetchFromGitHub {
           owner = "dongweiming";
           repo = "plim-mode";
-          rev = "92e39190286f172567ceb02c80e1df3b81abfa2d";
-          sha256 = "07hspp4bkb3f5dm0l1arm0w1m04cq4glg81x4a9kf7bl601wzki2";
+          rev = "98cd6d11b7ff3ee7b6cb8845f143b5a692a3e6e8";
+          sha256 = "1mcd6c3kgq9a5mv9c9di042vqicjp16nm9i6kz0p8ij3hk2ib22i";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/plim-mode";
           sha256 = "1nrqw5dvb3j5x3wkpsjbpv1d2s367icq9j4h1xv1cahfsn8nn4m9";
-          name = "plim-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -58428,8 +73290,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    plsense = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, lib, log4e, melpaBuild, yaxception }:
-    melpaBuild {
+    plsense = callPackage ({ auto-complete
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , log4e
+                           , melpaBuild
+                           , yaxception }:
+      melpaBuild {
         pname = "plsense";
         version = "20151104.645";
         src = fetchFromGitHub {
@@ -58438,10 +73306,10 @@
           rev = "d50f9dccc98f42bdb42f1d1c8142246e03879218";
           sha256 = "1r2yxa7gqr0z9fwhx38siwjpg73a93rdmnhr4h6nm6lr32vviyxm";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fb1025f146514e9c142cd96cac9f2989d6d1a8c5/recipes/plsense";
           sha256 = "1ka06r4ashhjkfyzql9mfvs3gj7n684h4gaycj29w4nfqrhcw9va";
-          name = "plsense";
+          name = "recipe";
         };
         packageRequires = [ auto-complete log4e yaxception ];
         meta = {
@@ -58449,8 +73317,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    plsense-direx = callPackage ({ direx, fetchFromGitHub, fetchurl, lib, log4e, melpaBuild, plsense, yaxception }:
-    melpaBuild {
+    plsense-direx = callPackage ({ direx
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , log4e
+                                 , melpaBuild
+                                 , plsense
+                                 , yaxception }:
+      melpaBuild {
         pname = "plsense-direx";
         version = "20140520.1308";
         src = fetchFromGitHub {
@@ -58459,10 +73334,10 @@
           rev = "8a2f465264c74e04524cc789cdad0190ace43f6c";
           sha256 = "0s34nbqqy6aqi113xj452pbmqp43046wfbfbbfv1xwhybgq0c1j1";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/65fb1d8b4ed12f097958842d1b00dcdf3660b184/recipes/plsense-direx";
           sha256 = "0qd4b7gkmn5ydadhp70995rap3643s1aa8gfi5izgllzhg0i864j";
-          name = "plsense-direx";
+          name = "recipe";
         };
         packageRequires = [ direx log4e plsense yaxception ];
         meta = {
@@ -58470,8 +73345,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    plur = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    plur = callPackage ({ emacs
+                        , fetchFromGitHub
+                        , fetchurl
+                        , lib
+                        , melpaBuild }:
+      melpaBuild {
         pname = "plur";
         version = "20160504.224";
         src = fetchFromGitHub {
@@ -58480,10 +73359,10 @@
           rev = "5bdd3b9a2f0624414bd596e798644713cd1545f0";
           sha256 = "0qlxj19hj96l4lw81xh5r14ppf6kp63clikk060s9yw00q7gnl6a";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/38f6f53fcd1186efd5e6752166da4e23b712cdb1/recipes/plur";
           sha256 = "0nf1dc7xf2zp316rssnz8sv374akcr54hp0rb219qvgyck9bdqiv";
-          name = "plur";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -58491,7 +73370,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    pmdm = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild {
+    pmdm = callPackage ({ fetchhg
+                        , fetchurl
+                        , lib
+                        , melpaBuild }:
+      melpaBuild {
         pname = "pmdm";
         version = "20151109.1036";
         src = fetchhg {
@@ -58499,10 +73382,10 @@
           rev = "f50a54774156";
           sha256 = "0x3s9fj41n6a21la762qm1si9ysv3zj5bbp6ykfskr73sxq6s9ff";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/pmdm";
           sha256 = "1zmy6cbnqhsbwc5vx30mx45xn88d2186hgrl75ws7vvbl197j03b";
-          name = "pmdm";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -58510,18 +73393,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    po-mode = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
+    po-mode = callPackage ({ fetchgit
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "po-mode";
-        version = "20170419.303";
+        version = "20180505.415";
         src = fetchgit {
           url = "https://git.savannah.gnu.org/git/gettext.git";
-          rev = "071d155f83e2c9c917db43f5452822a6dc30250a";
-          sha256 = "1whbjblizl478gc7yc2yj0spwskzq8d9inpxian441a6jj9biah3";
+          rev = "a57ffdb2f17d040a737e84114544fcd748fa87fa";
+          sha256 = "19qg3l6w2lapjv73yvjiy5mj6j8kv7ch1gjpx2b86y2y5mqrqii7";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/po-mode";
           sha256 = "0km19n87iqd6m6n23h46b6225zyvava9jbx6b8frna3sjwb4ls7w";
-          name = "po-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -58529,8 +73416,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    pocket-api = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }:
-    melpaBuild {
+    pocket-api = callPackage ({ emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild
+                              , request }:
+      melpaBuild {
         pname = "pocket-api";
         version = "20180402.1809";
         src = fetchFromGitHub {
@@ -58539,10 +73431,10 @@
           rev = "3eb9430b9db90bc02e736e433eb86389f7655189";
           sha256 = "0k6a9zzdi02g677cc699llk04i06yb7ddnlnmxndap5jszfyqwfi";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/04e3be76aef4d1b6d5bb3eda533b5deffcc8a5bc/recipes/pocket-api";
           sha256 = "1f5j491wbqgbx6zlb0zdajca5il0628vr9a38y0n3x0h69wm0cx5";
-          name = "pocket-api";
+          name = "recipe";
         };
         packageRequires = [ emacs request ];
         meta = {
@@ -58550,20 +73442,28 @@
           license = lib.licenses.free;
         };
       }) {};
-    pocket-lib = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, kv, lib, melpaBuild, request, s }:
-    melpaBuild {
+    pocket-lib = callPackage ({ dash
+                              , emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , kv
+                              , lib
+                              , melpaBuild
+                              , request
+                              , s }:
+      melpaBuild {
         pname = "pocket-lib";
-        version = "20171108.421";
+        version = "20180711.1723";
         src = fetchFromGitHub {
           owner = "alphapapa";
           repo = "pocket-lib.el";
-          rev = "c860dc2f67398d837de2be17e85894a1303e7b49";
-          sha256 = "1cpwzpicqad3xn7714z9z2v26i3zyqldm78xnnkac3dwar29zjvb";
+          rev = "8dd89153472d2e49bf9a3b3507b93c2acf0b44ac";
+          sha256 = "05wyi3mj8mhswdajyng10r0z6ai2y9gh888x8bskdvxdnd772glk";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/71f17ce28f4fc8c2c100848be8aec15526ef8697/recipes/pocket-lib";
           sha256 = "0v619blifmvm36dr773wjf35fjji4dj3pyck9nkz0m8zmpz0fg78";
-          name = "pocket-lib";
+          name = "recipe";
         };
         packageRequires = [ dash emacs kv request s ];
         meta = {
@@ -58571,8 +73471,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    pocket-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pocket-api }:
-    melpaBuild {
+    pocket-mode = callPackage ({ emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild
+                               , pocket-api }:
+      melpaBuild {
         pname = "pocket-mode";
         version = "20171201.515";
         src = fetchFromGitHub {
@@ -58581,10 +73486,10 @@
           rev = "229de7d35b7e5605797591c46aa8200d7efc363c";
           sha256 = "0j3axac4lp7p00a7mf7frryqg1y3jwqaw0s475gz606642vg9l45";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6aa3d04058bfc0bc1da3393d17429d517275e97c/recipes/pocket-mode";
           sha256 = "04zxll5yg021m13vr54w2pnrmqb87ykdbpa8nx2wn9myg2rywh0v";
-          name = "pocket-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs pocket-api ];
         meta = {
@@ -58592,20 +73497,32 @@
           license = lib.licenses.free;
         };
       }) {};
-    pocket-reader = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, ht, kv, lib, melpaBuild, org-web-tools, ov, pocket-lib, rainbow-identifiers, s }:
-    melpaBuild {
+    pocket-reader = callPackage ({ dash
+                                 , emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , ht
+                                 , kv
+                                 , lib
+                                 , melpaBuild
+                                 , org-web-tools
+                                 , ov
+                                 , pocket-lib
+                                 , rainbow-identifiers
+                                 , s }:
+      melpaBuild {
         pname = "pocket-reader";
-        version = "20171127.335";
+        version = "20180709.130";
         src = fetchFromGitHub {
           owner = "alphapapa";
           repo = "pocket-reader.el";
-          rev = "6a35d531f2425e2e187f5107047f3dc7625f3623";
-          sha256 = "0pankd0wvmfaws6xm9yvaddf592nj5hphqfq5dmwvzcp5ywx62n4";
+          rev = "78ab8dac82824965ac47c5d2cc00fcd2e64f8705";
+          sha256 = "10kw7n9ghqxdf1h00i61m68c0dav2zpmzln1ph1fgizc41x7j4aa";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/835a7bf2f72987183e9d15ada7ae747fb5715c11/recipes/pocket-reader";
           sha256 = "0gcgmz4mhjgvqbh2gmv8v09sy80cnfccjym455m0fbl31b8dczhf";
-          name = "pocket-reader";
+          name = "recipe";
         };
         packageRequires = [
           dash
@@ -58623,8 +73540,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    podcaster = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    podcaster = callPackage ({ cl-lib ? null
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "podcaster";
         version = "20161020.835";
         src = fetchFromGitHub {
@@ -58633,10 +73554,10 @@
           rev = "9854517025deb5d556168a68955fb7b662239f5c";
           sha256 = "06ag0idz7cf6i9kg7kqr03js9b6cw6my1jzd1x3wkgazx5slqk4q";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2649dc294f40d00f3bf1b1cf09879c2ef0d3e43b/recipes/podcaster";
           sha256 = "1kzac0mhg8dk2vfk29ns36jl8vwg6ghbdb3n6kqfzci5ygn96yib";
-          name = "podcaster";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -58644,20 +73565,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    poet-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    poet-theme = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "poet-theme";
-        version = "20180415.2212";
+        version = "20180603.1523";
         src = fetchFromGitHub {
           owner = "kunalb";
           repo = "poet";
-          rev = "70b514373ea32c20ce4e46809b3336af1a69d2c8";
-          sha256 = "0jsgd4fgz6xliyfq46xn3ky7hr5ma4577h8kgshsbdidzwmp6xrr";
+          rev = "fddb662bfc55c535e5b13b3368e430916d8be70c";
+          sha256 = "1dicjjh68rs1mzzgy81s1phjbdc5mirwxb3ym8y1yirpb2hj4bal";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/40bbe29dee56f7989d8e87c03f4842e2b191acc3/recipes/poet-theme";
           sha256 = "0pllyp4spj30g6ihzc91hzvnrvcg2zb49adj8wcmbzvq3hxnvls1";
-          name = "poet-theme";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -58665,20 +73589,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    point-pos = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    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";
+          rev = "f4126b64567a81e7f22058f09d56c63b2ff06632";
+          sha256 = "1sbwz9kxvnd5r24q9x6bhcjajjnm2z8q6khgqs4gl4ycs60kn0s6";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/23a1e835155fba51f595c10c46487a4c269f43ff/recipes/point-pos";
           sha256 = "1zv6hx8i8jwq52j4la1ff0ar0bpbs2pb4gcsh9hypghba11gnync";
-          name = "point-pos";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -58686,8 +73613,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    point-stack = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    point-stack = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "point-stack";
         version = "20170808.958";
         src = fetchFromGitHub {
@@ -58696,10 +73626,10 @@
           rev = "76e17311e3a810314c7d31ac46dc55450ff30fa2";
           sha256 = "1sp3djnyg3f5ci43m4pi0f6clblrz5lrnzc415r87csbavqqgv2z";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bb3c9e6b3c583f098f75462b4d48cd137a1bcb76/recipes/point-stack";
           sha256 = "0201gka1izqgxyivan60jbg9x1mmsw5dscxacasg97ffsciwbfr9";
-          name = "point-stack";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -58707,8 +73637,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    pointback = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    pointback = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "pointback";
         version = "20100210.752";
         src = fetchFromGitHub {
@@ -58717,10 +73650,10 @@
           rev = "e3a02c1784d81b5a1d2477338d049af581ed19f8";
           sha256 = "016cjy5pnnqccjqb0njqc9jq6kf6p165nlki83b8c0sj75yxghav";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5f2a50f62475639af011c99c6cc38928b74b3b0a/recipes/pointback";
           sha256 = "198q511hixvzc13b3ih89xs9g47rdvbiixn5baqakpmpx3a12hz4";
-          name = "pointback";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -58728,8 +73661,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    pollen-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    pollen-mode = callPackage ({ cl-lib ? null
+                               , emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "pollen-mode";
         version = "20180404.612";
         src = fetchFromGitHub {
@@ -58738,10 +73676,10 @@
           rev = "df4eab5b490cb478a092e6bab6b07f9e2f9c6fad";
           sha256 = "0x8bnf0n109ard5zdmma04w0wv5jb1r7qh5smsa1kjvws98gnp57";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/97bda0616abe3bb632fc4231e5317d9472dfd14f/recipes/pollen-mode";
           sha256 = "1kskvdh6rczlki724h5xym8s4iychqzm0i82qdj87x1cg1kx9i85";
-          name = "pollen-mode";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -58749,8 +73687,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    poly-ruby = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, polymode }:
-    melpaBuild {
+    poly-ruby = callPackage ({ emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild
+                             , polymode }:
+      melpaBuild {
         pname = "poly-ruby";
         version = "20170802.648";
         src = fetchFromGitHub {
@@ -58759,10 +73702,10 @@
           rev = "e6f50a92d29a5ff567d70cafa6621c4f89056d11";
           sha256 = "1pdimvcrjq0k6a9kijcl6zmsmmvssdqsdkgcz14qs4444qly4l9b";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/68213703359324d09553a2164f1f6ecca7c16854/recipes/poly-ruby";
           sha256 = "0d8s6bl5ynx0r5cwvfkd52rksiq5kdyrgbxds56r8ls6cfkwqngg";
-          name = "poly-ruby";
+          name = "recipe";
         };
         packageRequires = [ emacs polymode ];
         meta = {
@@ -58770,8 +73713,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    polymode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    polymode = callPackage ({ emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "polymode";
         version = "20170307.322";
         src = fetchFromGitHub {
@@ -58780,10 +73727,10 @@
           rev = "0340f5e7e55235832e59673f027cc79a23cbdcd6";
           sha256 = "057cybkq3cy07n5s332k071sjiky3mziy003lza4rh75mgqkwhmh";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/polymode";
           sha256 = "0md02l7vhghvzplxa04sphimhphmksvmz079zykxajcvpm2rgwc8";
-          name = "polymode";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -58791,20 +73738,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    pomidor = callPackage ({ alert, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    pomidor = callPackage ({ alert
+                           , emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "pomidor";
-        version = "20180320.1252";
+        version = "20180614.128";
         src = fetchFromGitHub {
           owner = "TatriX";
           repo = "pomidor";
-          rev = "30004b21714b53d22041514d905e1876c5cedd4b";
-          sha256 = "0nis9dx73y90lqnh24j5ywrdmjf7aa1jrdgwxm53wjl4sfmk85r1";
+          rev = "8859aecdb48b76a36c5e251793da0f108b2dfeb4";
+          sha256 = "07amyi7i6jb8byv4gmyhadiyyqwpd9d64aayr826x7pnzx5gcg5s";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4e0d4f313081594df23f357c40feb456847d8bd0/recipes/pomidor";
           sha256 = "0pdzipyza98dhnz6am8lrmz8fh3p1c21v2mhs56fb9lwyvcgv8fi";
-          name = "pomidor";
+          name = "recipe";
         };
         packageRequires = [ alert emacs ];
         meta = {
@@ -58812,8 +73764,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    pomodoro = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    pomodoro = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "pomodoro";
         version = "20150716.1046";
         src = fetchFromGitHub {
@@ -58822,10 +73777,10 @@
           rev = "4a299b8f5e6623010224dcb3e524ff288c6a082c";
           sha256 = "1dlk0ypw8316vgvb7z2p7fvaiz1wcy1l8crixypaya1zdsnh9v1z";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0b5c2c50eb87952d01c1b338b7d3e4b3a4546555/recipes/pomodoro";
           sha256 = "075sbypas8xlhsw8wg3mgi3fn5yf7xb3klyjgyy8wfkgdz0269f8";
-          name = "pomodoro";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -58833,8 +73788,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    pony-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    pony-mode = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "pony-mode";
         version = "20170807.822";
         src = fetchFromGitHub {
@@ -58843,10 +73801,10 @@
           rev = "760684d30b6c234d1b88c9a4673a808f36f7f341";
           sha256 = "1y4gxn25i2nszdhqq8jxf9h65mqfgcwbypx5p4wkan5i1v2i3yr1";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a1fd64317610fb6ef5b14e8bf15e727680d5ff09/recipes/pony-mode";
           sha256 = "1hgiryhpxv30bjlgv9pywzqn2ypimwzdhx03znqvn56zrwn1frnl";
-          name = "pony-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -58854,8 +73812,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    pony-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
-    melpaBuild {
+    pony-snippets = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild
+                                 , yasnippet }:
+      melpaBuild {
         pname = "pony-snippets";
         version = "20160204.2011";
         src = fetchFromGitHub {
@@ -58864,10 +73826,10 @@
           rev = "a6615ab0693f17fc47ec45753202010238157810";
           sha256 = "002jhj47b9aqrfjy8b31ccbqhah5sn9wn7dmrhm1wbbgj9rfyw6s";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/pony-snippets";
           sha256 = "12ygvpfkzldq6s4mwbrxs4x9927i7pa7ywn7lf1r3gg4h29ar9gn";
-          name = "pony-snippets";
+          name = "recipe";
         };
         packageRequires = [ yasnippet ];
         meta = {
@@ -58875,8 +73837,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    ponylang-mode = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ponylang-mode = callPackage ({ dash
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "ponylang-mode";
         version = "20171028.1356";
         src = fetchFromGitHub {
@@ -58885,10 +73851,10 @@
           rev = "5e23459dc395eb77fa4c6cfa3d6c08b1b185a6df";
           sha256 = "0iwdnv56200w53ba4f66vih7gha2nb36ajnvbqixc0byibwcsnc9";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7d51adec3c6519d6ffe9b3f7f8a86b4dbc2c9817/recipes/ponylang-mode";
           sha256 = "02fq0qp7f4bzmynzszrwskfs78nzsmf413qjxqndrh3hamixzpi1";
-          name = "ponylang-mode";
+          name = "recipe";
         };
         packageRequires = [ dash ];
         meta = {
@@ -58896,8 +73862,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    pophint = callPackage ({ fetchFromGitHub, fetchurl, lib, log4e, melpaBuild, yaxception }:
-    melpaBuild {
+    pophint = callPackage ({ fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , log4e
+                           , melpaBuild
+                           , yaxception }:
+      melpaBuild {
         pname = "pophint";
         version = "20170917.1948";
         src = fetchFromGitHub {
@@ -58906,10 +73877,10 @@
           rev = "909025c5a871ca4b9ec7aed7f1a27c819a94dba1";
           sha256 = "0qbb36qijkzbzxlmqsvvddm7x2gk9rkafnyjbkxsl76rz1ajy6nz";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0055c2887acbbd8a2803bf3f81ac2cc444cc805a/recipes/pophint";
           sha256 = "1chq2j79hg095jxw5z3pz4qicqrccw0gj4sxrin0a55hnprzzp72";
-          name = "pophint";
+          name = "recipe";
         };
         packageRequires = [ log4e yaxception ];
         meta = {
@@ -58917,8 +73888,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    poporg = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    poporg = callPackage ({ fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "poporg";
         version = "20170403.51";
         src = fetchFromGitHub {
@@ -58927,10 +73901,10 @@
           rev = "2c58d68c81ecca4140bf179f19ed153ec804b65a";
           sha256 = "1ymqhy0sqd54z154s3cm6q1m4xnr9wkx9dl5f93845k11ay3kvln";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/63502ec265a66d3f72ef93a2f6e7c2e517ff98a3/recipes/poporg";
           sha256 = "08s42689kd78h2fmw230ja5dd3c3b4lx5mzadncwq0lj91y86kd8";
-          name = "poporg";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -58938,20 +73912,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    popup = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    popup = callPackage ({ cl-lib ? null
+                         , fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "popup";
         version = "20160709.729";
         src = fetchFromGitHub {
           owner = "auto-complete";
           repo = "popup-el";
-          rev = "80829dd46381754639fb764da11c67235fe63282";
-          sha256 = "05j7m6mqp6hr6225blsipnp2qcncwl09f52niya5334ibqzbvvlk";
+          rev = "e452399db8bb0a8906c627f598eb8f0dcfca5572";
+          sha256 = "07jcpdjk33nw82wx872fp2dph025kb0szfnbgc2xs56i11141371";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/083fb071191bccd6feb3fb84569373a597440fb1/recipes/popup";
           sha256 = "151g00h9rkid76qf6c53n8bncsfaikmhj8fqcb3r3a6mbngcd5k2";
-          name = "popup";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -58959,20 +73937,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    popup-complete = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, popup }:
-    melpaBuild {
+    popup-complete = callPackage ({ fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild
+                                  , popup }:
+      melpaBuild {
         pname = "popup-complete";
         version = "20141108.1908";
         src = fetchFromGitHub {
           owner = "syohex";
           repo = "emacs-popup-complete";
-          rev = "caa655a6d8472e9a4bfa1311126d90d7d1b07fca";
-          sha256 = "1q9zajv6g7mi6k98kzq3498nhmdkp1z9d2b8vgzbk7745d39gm9b";
+          rev = "e362d4a005b36646ffbaa6be604e9e31bc406ca9";
+          sha256 = "084hb3zn1aiabbyxgaalszb2qjf9z64z960ks5fvz8nh7n6y7ny4";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b43b85f90c476a3b88f94927a7db90bdc72cd171/recipes/popup-complete";
           sha256 = "04bpm31zx87j390r2xi1yl4kyqgalmyqc48xarsm67zfww9fw9c1";
-          name = "popup-complete";
+          name = "recipe";
         };
         packageRequires = [ popup ];
         meta = {
@@ -58980,8 +73962,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    popup-edit-menu = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    popup-edit-menu = callPackage ({ emacs
+                                   , fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "popup-edit-menu";
         version = "20170404.725";
         src = fetchFromGitHub {
@@ -58990,10 +73976,10 @@
           rev = "925600a6e29183841199e866cf55e566a6a1b002";
           sha256 = "1dd0ss7cjdjs3c7vkq8p874408iysih80brc8vlfh1f43cnc5v92";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e824ae5bd9214f8de210059f8145f13a4e62e8a1/recipes/popup-edit-menu";
           sha256 = "1mqni09l1xfxv4g64hskpsla41r5d2xfbw81ncbszwqzlln6k5bf";
-          name = "popup-edit-menu";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -59001,8 +73987,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    popup-imenu = callPackage ({ dash, fetchFromGitHub, fetchurl, flx-ido, lib, melpaBuild, popup }:
-    melpaBuild {
+    popup-imenu = callPackage ({ dash
+                               , fetchFromGitHub
+                               , fetchurl
+                               , flx-ido
+                               , lib
+                               , melpaBuild
+                               , popup }:
+      melpaBuild {
         pname = "popup-imenu";
         version = "20170326.340";
         src = fetchFromGitHub {
@@ -59011,10 +74003,10 @@
           rev = "c5e2e69adbd3a630e4cb750965a1aee8c10c1f09";
           sha256 = "0vn0jli0ya7xnapifkgzynbnh3rpnzb82j5k9bla2j4miqfc6cg8";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5ca5d65d6a9c7ef3fa2684271fe087dc132d3a61/recipes/popup-imenu";
           sha256 = "0lxwfaa9vhdn55dj3idp8c3fg1g26qsqq46y5bimfd0s89bjbaxn";
-          name = "popup-imenu";
+          name = "recipe";
         };
         packageRequires = [ dash flx-ido popup ];
         meta = {
@@ -59022,20 +74014,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    popup-kill-ring = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, popup, pos-tip }:
-    melpaBuild {
+    popup-kill-ring = callPackage ({ fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild
+                                   , popup
+                                   , pos-tip }:
+      melpaBuild {
         pname = "popup-kill-ring";
         version = "20131020.1154";
         src = fetchFromGitHub {
           owner = "waymondo";
           repo = "popup-kill-ring";
-          rev = "5773dfadc104a906c088a3ec62e8cdd3e01e57fa";
-          sha256 = "1zdwlmk3vr0mq0dxrnkqjncalnbmvpxc0lma2sv3a4czl8yv0inn";
+          rev = "dc50b62ae8b7c2675dde96bb410d9bf0e8643f6a";
+          sha256 = "0bpnsc4agy6mcnc79d9a6gi79jiiqrhf3a55pw0p4z16m86vwyqr";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0b745b067e5d68467b89e0dbade7a9a76de2946c/recipes/popup-kill-ring";
           sha256 = "1jfw669xi2983jj3hiw5lyhc0rc0318qrmqx03f7m4ylg70dgxip";
-          name = "popup-kill-ring";
+          name = "recipe";
         };
         packageRequires = [ popup pos-tip ];
         meta = {
@@ -59043,8 +74040,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    popup-switcher = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, popup }:
-    melpaBuild {
+    popup-switcher = callPackage ({ cl-lib ? null
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild
+                                  , popup }:
+      melpaBuild {
         pname = "popup-switcher";
         version = "20171205.51";
         src = fetchFromGitHub {
@@ -59053,10 +74055,10 @@
           rev = "f5788a31918e37bb5c04139048c667bcec9f1b62";
           sha256 = "0gfi8dlgynciv3q5a208c7gd66g2r99b3zn0i31ibpppjqy2vcsk";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7d1897c4c4a6f4b4527279e6dad976219d7b78/recipes/popup-switcher";
           sha256 = "1888xiqhrn7fcpjnr3smchmmqwfayfbbyvdkdb79c6drzjcvidp1";
-          name = "popup-switcher";
+          name = "recipe";
         };
         packageRequires = [ cl-lib popup ];
         meta = {
@@ -59064,8 +74066,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    popwin = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    popwin = callPackage ({ fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "popwin";
         version = "20150315.600";
         src = fetchFromGitHub {
@@ -59074,10 +74079,10 @@
           rev = "95dea14c60019d6cccf9a3b33e0dec4e1f22c304";
           sha256 = "0nips9npm4zmz3f37vvb4s0g1ci0p9cl6w0z4sc6agg4rybjhpdp";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2b3d6a8b734e0820fd904c215a83fe5519496dc3/recipes/popwin";
           sha256 = "1zp54nv8rh0b3g8y5aj4793miiw2r1ijwbzq31lkwmbdr09mixmf";
-          name = "popwin";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -59085,8 +74090,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    portage-navi = callPackage ({ concurrent, ctable, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    portage-navi = callPackage ({ concurrent
+                                , ctable
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "portage-navi";
         version = "20141208.555";
         src = fetchFromGitHub {
@@ -59095,10 +74105,10 @@
           rev = "8016c3e99fe6cef101d479a3d69185796b22ca2f";
           sha256 = "1pm4x74pw67m2izr9dir201dn5g9icgk6h2j8rqvasgx8v8krv3i";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0a467702b3ac3c8bdc723262e6919f67fd71d524/recipes/portage-navi";
           sha256 = "1wjkh8xj5120v9fz1nrpkd6x4f22ni8h2lfkd82df7kjz6bzdfwg";
-          name = "portage-navi";
+          name = "recipe";
         };
         packageRequires = [ concurrent ctable ];
         meta = {
@@ -59106,8 +74116,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    pos-tip = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    pos-tip = callPackage ({ fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "pos-tip";
         version = "20150318.813";
         src = fetchFromGitHub {
@@ -59116,10 +74129,10 @@
           rev = "051e08fec5cf30b7574bdf439f79fef7d42d689d";
           sha256 = "168hl76rhj6f5ncmrij4rd3z55228h6kb23384h2phsjw0avgf23";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/306e9978d2a071548cc9d8c531a1ce6c6c6b99aa/recipes/pos-tip";
           sha256 = "13qjz112qlrnq34lr70087gshzq8m44knfl6694hfprzjgix84vh";
-          name = "pos-tip";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -59127,20 +74140,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    posframe = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    posframe = callPackage ({ emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "posframe";
-        version = "20180308.1627";
+        version = "20180708.702";
         src = fetchFromGitHub {
           owner = "tumashu";
           repo = "posframe";
-          rev = "c29228eb2100503a0fda39252d4f11c1eb5acc56";
-          sha256 = "1k92gzzy6ys2f86jzggqlz3x6v665hwkafj3frj4mgmxp7yxsiw0";
+          rev = "945761dc70c62a04747c4c892bdf5fc38670e50e";
+          sha256 = "051gr067ac0bd59nzs4jqjqc27kbb6gl8whs106jwn39z0b0ndri";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fa3488f2ede1201faf4a147313456ed90271f050/recipes/posframe";
           sha256 = "02chwkc7gn7fxaaxsz9msmrhrd62bji5hhb71kdm019x8d84z06w";
-          name = "posframe";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -59148,8 +74165,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    postcss-sorting = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    postcss-sorting = callPackage ({ emacs
+                                   , fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "postcss-sorting";
         version = "20180211.156";
         src = fetchFromGitHub {
@@ -59158,10 +74179,10 @@
           rev = "deb0c935d2904c11a965758a9aee5a0e905f21fc";
           sha256 = "03kng7i09px5vizvmmrar7rj3bk27y43bi8hlzxax0ja27k0c66c";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9fae97430f211786f615f7450936f823e2a04ec4/recipes/postcss-sorting";
           sha256 = "0730b2wddal15yi4k6wzhv9xv1k40iwrn3mivg9bkxabh3mgrl10";
-          name = "postcss-sorting";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -59169,8 +74190,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    pov-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    pov-mode = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "pov-mode";
         version = "20161114.2343";
         src = fetchFromGitHub {
@@ -59179,10 +74203,10 @@
           rev = "9fc1db3aab7c27155674dd1a87ec62606035d074";
           sha256 = "1399fxivy15y2k4vp7vqqgsi8l1mzxc8aa2mf2x1hksgiyq60acp";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/89d6b4a3d7a5f3cc93e9d13d4c174b5d7de7bad1/recipes/pov-mode";
           sha256 = "1xzdmlfi5ixdh08v0ca80zkh9n3gfn4ql5pnl3jh745wbj9azxp9";
-          name = "pov-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -59190,20 +74214,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    pow = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    pow = callPackage ({ cl-lib ? null
+                       , emacs
+                       , fetchFromGitHub
+                       , fetchurl
+                       , lib
+                       , melpaBuild }:
+      melpaBuild {
         pname = "pow";
         version = "20140420.106";
         src = fetchFromGitHub {
           owner = "yukihr";
           repo = "emacs-pow";
-          rev = "ea83986b8ca8e27cb996290d6463b111ec0966ce";
-          sha256 = "112s6qb80sn44b1cxggqfci89wymxvvwkwl7nknfnr2dzd58lzzy";
+          rev = "782532d5d3582fe8fd67014507b20077f3f2d292";
+          sha256 = "0d87h67qk7jw4fpq3kzzsh5v1k2nhrz6yfl1hzi7hqm5mdvnbfc9";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/pow";
           sha256 = "13f3pk52f9lkkl3zi6448j9b39kn6ny9vmnlsvhwa6s0vaz8f220";
-          name = "pow";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -59211,8 +74240,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    powerline = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    powerline = callPackage ({ cl-lib ? null
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "powerline";
         version = "20180321.1948";
         src = fetchFromGitHub {
@@ -59221,10 +74254,10 @@
           rev = "af5ef31a33c3589a9be0b2a55a2741582e605efd";
           sha256 = "0zynj4pl9717xbj8g1mac3haiybdndb034bnqk03bb42iyrwy767";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f805053cd4dd9ed53ee0df17ad69429bc62325bb/recipes/powerline";
           sha256 = "0gsffr6ilmckrzifsmhwd42vr85vs42pc26f1205pbxb7ma34dhx";
-          name = "powerline";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -59232,8 +74265,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    powerline-evil = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild, powerline }:
-    melpaBuild {
+    powerline-evil = callPackage ({ evil
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild
+                                  , powerline }:
+      melpaBuild {
         pname = "powerline-evil";
         version = "20151112.710";
         src = fetchFromGitHub {
@@ -59242,10 +74280,10 @@
           rev = "98b3a102b6dba6632aa0755a7257300c9b164309";
           sha256 = "1c8y4r7zdr6764kzs5bc64idv2pfjvi78lg2f1d2hp1595ia8y5r";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a44108579409ab2aab3e75ccabffb207843ec1ee/recipes/powerline-evil";
           sha256 = "0cdnmq9f06lzkj0hs948a7j5sgg6fl5f36bfnyaxgss23akbfjhr";
-          name = "powerline-evil";
+          name = "recipe";
         };
         packageRequires = [ evil powerline ];
         meta = {
@@ -59253,20 +74291,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    powershell = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    powershell = callPackage ({ emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "powershell";
-        version = "20161103.2354";
+        version = "20180616.2328";
         src = fetchFromGitHub {
           owner = "jschaf";
           repo = "powershell.el";
-          rev = "3c09e1b87064bedc065e45346fd4c3e051eeb0f0";
-          sha256 = "19cq6n8dhvr2vw8nx3f4dkybqs9dqa6ss3z2ycql8rdmc5wg6jpn";
+          rev = "4e215e4cd683c727315301d1b61bef4f9773abec";
+          sha256 = "0dhl3cn2szvrj4084ly1f4fiwgixasvwi6skdchfvzbpx9q05dlv";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7002c50f2734675134791916aa9d8b82b4582fcb/recipes/powershell";
           sha256 = "162k8y9k2n48whaq93sqk86zy3p9qvsfxgyfv9n1nvk4l5wn70wk";
-          name = "powershell";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -59274,8 +74316,40 @@
           license = lib.licenses.free;
         };
       }) {};
-    ppd-sr-speedbar = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, project-persist-drawer, sr-speedbar }:
-    melpaBuild {
+    powerthesaurus = callPackage ({ emacs
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild
+                                  , request
+                                  , s }:
+      melpaBuild {
+        pname = "powerthesaurus";
+        version = "20180612.447";
+        src = fetchFromGitHub {
+          owner = "SavchenkoValeriy";
+          repo = "emacs-powerthesaurus";
+          rev = "98741b99d12cef707fa8d6581d1de4aee6212de8";
+          sha256 = "1rr0mv7adrn6qmfqixgfpamz31sq9nbvyi2raxhkrmj072mf5535";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/04a7e6d2292e933e0318296107774e1248888f3c/recipes/powerthesaurus";
+          sha256 = "011kl3n1hfmz844w198gvh5anjyqj0m4pvryahslc0r1zavik7ni";
+          name = "recipe";
+        };
+        packageRequires = [ emacs request s ];
+        meta = {
+          homepage = "https://melpa.org/#/powerthesaurus";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ppd-sr-speedbar = callPackage ({ fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild
+                                   , project-persist-drawer
+                                   , sr-speedbar }:
+      melpaBuild {
         pname = "ppd-sr-speedbar";
         version = "20151108.424";
         src = fetchFromGitHub {
@@ -59284,10 +74358,10 @@
           rev = "19d3e924407f40a6bb38c8fe427a159af755adce";
           sha256 = "0pv671j8g09pn61kkfb3pa9axfa9zd2jdrkgr81rm2gqb2vh1hsq";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f930f54048d06f6a97824b66fbb74649eed40b54/recipes/ppd-sr-speedbar";
           sha256 = "1m2918hqvb9c6rgb5szs95ds99gdjdxggcbdfqzmbb5sz2936av8";
-          name = "ppd-sr-speedbar";
+          name = "recipe";
         };
         packageRequires = [ project-persist-drawer sr-speedbar ];
         meta = {
@@ -59295,20 +74369,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    prassee-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    prassee-theme = callPackage ({ emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "prassee-theme";
-        version = "20180105.1644";
+        version = "20180709.304";
         src = fetchFromGitHub {
           owner = "prassee";
           repo = "prassee-emacs-theme";
-          rev = "b68d13f929364b9bb087f8f587798144218f7dc6";
-          sha256 = "08r22xsrlycl0lyqg5qi5wv5w4zhdawmi8ikdgvn5776qaixb6r7";
+          rev = "81126f69cdbaab836c00ae7a49aaf89d4229fde1";
+          sha256 = "18yqsl8jsi3zxfcigvm6fjcx84hzb8b3j7ihiyzqmdhmvma3i08y";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/15425b576045af1c508912e2091daf475b80b429/recipes/prassee-theme";
           sha256 = "1j0817hxxri6mq9pplgwf5jp2dagk6hay7g1a1lgz4qgkf5jnshs";
-          name = "prassee-theme";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -59316,8 +74394,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    preproc-font-lock = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    preproc-font-lock = callPackage ({ fetchFromGitHub
+                                     , fetchurl
+                                     , lib
+                                     , melpaBuild }:
+      melpaBuild {
         pname = "preproc-font-lock";
         version = "20151107.1218";
         src = fetchFromGitHub {
@@ -59326,10 +74407,10 @@
           rev = "565fda9f5fdeb0598986174a07e9fb09f7604397";
           sha256 = "0yrfd9qaz16nqcvjyjm9qci526qgkv6k51q5752h3iyqkxnss1pd";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/582692267795c91bb7f2ec3bffc2b9c2be9f2a32/recipes/preproc-font-lock";
           sha256 = "1ra0lgjv6713zym2h8pblf2ryf0f658l1khbxbwnxl023gkyj9v4";
-          name = "preproc-font-lock";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -59337,8 +74418,36 @@
           license = lib.licenses.free;
         };
       }) {};
-    preseed-generic-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    prescient = callPackage ({ emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
+        pname = "prescient";
+        version = "20180702.1140";
+        src = fetchFromGitHub {
+          owner = "raxod502";
+          repo = "prescient.el";
+          rev = "18ddbe85e040dcf6fa9aeba8c8ce9d143921423a";
+          sha256 = "1jaw3awjs1w65nclas891gramr2ib3svy8sph989wjbmlbg377zh";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/ec02349e31531c347e4a43fbde56ae4386898cc6/recipes/prescient";
+          sha256 = "04js3hblavfrc6kqp942x5yjdl3ndazf3n64p83423ldsmhbip6s";
+          name = "recipe";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/prescient";
+          license = lib.licenses.free;
+        };
+      }) {};
+    preseed-generic-mode = callPackage ({ fetchFromGitHub
+                                        , fetchurl
+                                        , lib
+                                        , melpaBuild }:
+      melpaBuild {
         pname = "preseed-generic-mode";
         version = "20180209.2100";
         src = fetchFromGitHub {
@@ -59347,10 +74456,10 @@
           rev = "3aa8806c4a659064baa01751400c53fbaf847f66";
           sha256 = "02yb5xkgwqxpwghhjmxf2gx0faifi04w2jd8cvfsiwzwqmqyhmv7";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/preseed-generic-mode";
           sha256 = "14vbx6y7h4vqc5kkgj4mbr9zj6gqf6ib3hh2917m203s8y87lsfl";
-          name = "preseed-generic-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -59358,20 +74467,49 @@
           license = lib.licenses.free;
         };
       }) {};
-    prettier-js = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    presentation = callPackage ({ cl-lib ? null
+                                , emacs
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
+        pname = "presentation";
+        version = "20180426.1924";
+        src = fetchFromGitHub {
+          owner = "zonuexe";
+          repo = "emacs-presentation-mode";
+          rev = "b1948e6d8b37b6df9290d77d181e1b1d58dd33c0";
+          sha256 = "0wm7rg7gvyngps3b7agpyhhbi2r7z0n5x8wxzahl8l1bm820y8jk";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/747afd0339215528bf104f778a13edacbac510b7/recipes/presentation";
+          sha256 = "0zdpfvg6kbvi6b4lb7vbdjrkgk0j1q6gzyd0s2b0603fnyy4sqdg";
+          name = "recipe";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/presentation";
+          license = lib.licenses.free;
+        };
+      }) {};
+    prettier-js = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "prettier-js";
         version = "20180108.2326";
         src = fetchFromGitHub {
           owner = "prettier";
           repo = "prettier-emacs";
-          rev = "fac9dd29720f8417bd8cd5dd8ab5138c6dd7d701";
-          sha256 = "00bgwzvha2i2sfi05jdzgpxvbjfpjhj5gv2vn3bnalgd1z3cz89r";
+          rev = "0e8b95c4e5898a03e85dbc555c37b4f968292aec";
+          sha256 = "0l8i0fbwwyhllkpk8xd6w5gcv65z4ja1ygf6slh5sd1g0ixh29md";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/968ac7bb98b385f8542dc150486982c0ded73187/recipes/prettier-js";
           sha256 = "0mf66sdsdbhf76pwkjkfjsnh26g4j3zb4y1qrbxc9jcvymccb3yq";
-          name = "prettier-js";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -59379,8 +74517,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    prettify-greek = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    prettify-greek = callPackage ({ fetchFromGitLab
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "prettify-greek";
         version = "20160603.208";
         src = fetchFromGitLab {
@@ -59389,10 +74530,10 @@
           rev = "698d07a6ffe85f6fb53f3bfec4f49380c25cfd90";
           sha256 = "0g2bxa7mwfkc8navbi2w28rd4f4zqphxi13kwmd2p83g3wavd99v";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/23c8f10205187babb17e3abc3dc40eb1938e6640/recipes/prettify-greek";
           sha256 = "1izl6r6i3zbhd7r7lz2k42yyz6qcng11wfmb7lx4883dj00flsl7";
-          name = "prettify-greek";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -59400,8 +74541,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    pretty-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    pretty-mode = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "pretty-mode";
         version = "20160614.1146";
         src = fetchFromGitHub {
@@ -59410,10 +74554,10 @@
           rev = "500085206e25b98d00b9ec996f91c87ba569c4ce";
           sha256 = "0m7ii971zxlz8a9yx2ljf9fmd8k6hc9w1q8mi5xi32v9viccjabs";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4a2fe9feae4c1f007e51272a97917a63dcf6bbe5/recipes/pretty-mode";
           sha256 = "1zxi4nj7vnchiiz1ndx17b719a1wipiqniykzn4pa1w7dsnqg21f";
-          name = "pretty-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -59421,20 +74565,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    pretty-sha-path = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    pretty-sha-path = callPackage ({ fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "pretty-sha-path";
         version = "20141105.1026";
         src = fetchFromGitHub {
           owner = "alezost";
           repo = "pretty-sha-path.el";
-          rev = "a2b43dd9de423a38d67cda2e3bd9412f7d363257";
-          sha256 = "1n0594msgy53ia58gjfkm3z3cnmq52wrq5992fm28s4jgazbgdfd";
+          rev = "beea38bdf34ed27059d6484e1e2a337a27e1f7ce";
+          sha256 = "1hfk3j69r0xva1c7v72vc2hhksdjia7vmxfx82j6j0jfpn6163f1";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6520d692662aaf92023623273597d966ca3cba9d/recipes/pretty-sha-path";
           sha256 = "0qqsg383391dnsk46xm8plq7xmdmnis3iv7h7dmchpzd99bkm9lq";
-          name = "pretty-sha-path";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -59442,20 +74589,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    pretty-symbols = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    pretty-symbols = callPackage ({ fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "pretty-symbols";
         version = "20140814.259";
         src = fetchFromGitHub {
           owner = "drothlis";
           repo = "pretty-symbols";
-          rev = "582cbe51ecfe1cc0a5b185bc06113c8a661e3956";
-          sha256 = "1f00l9f6an1mh8yhf629mw0p37m4jcpl8giz47xbdyw1k6bqn830";
+          rev = "ab82b3fba129fae14e4031eb7fd648c1a92d0e71";
+          sha256 = "12ny0lpqhj7g1hmj3y6012zz7145xx6ivgg381d4lc8791j35djd";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ed01ef6333e4558877b0e357ff8bf601fb88b757/recipes/pretty-symbols";
           sha256 = "0d1ad2x4md0n3fad3s2355wm8hl311qdhih1gkdqwdaj4i1d6gvb";
-          name = "pretty-symbols";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -59463,20 +74613,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    private = callPackage ({ aes, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    private = callPackage ({ aes
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "private";
         version = "20150121.1757";
         src = fetchFromGitHub {
           owner = "cheunghy";
           repo = "private";
-          rev = "9266d01c095895cc3ee9de95bc20511e88353755";
-          sha256 = "0zng64f5vwnpkf9fk59yv1ndc646q608a6awr1y9qk0mhzbfzhqm";
+          rev = "f57f1c2f6bfe900bd40b252688df4c6ed6a5f44b";
+          sha256 = "0720vrb9nwy4c069fk7adw5f50g9dji1wra9s3jwazr8jn45k0mn";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6c4195e20f942f7c9499731f51d3eba14eefd650/recipes/private";
           sha256 = "1glpcwcyndyn683q9mg99hr0h3l8pz7rrhbnfak01v826d5cnk9g";
-          name = "private";
+          name = "recipe";
         };
         packageRequires = [ aes ];
         meta = {
@@ -59484,20 +74638,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    private-diary = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    private-diary = callPackage ({ emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "private-diary";
         version = "20151216.857";
         src = fetchFromGitHub {
           owner = "cacology";
           repo = "private-diary";
-          rev = "0c86fb6150ad8ed14f94def3504f5a68f4147283";
-          sha256 = "1pxr5a9ik09k0f58lawhxiv179n5j8q24zhrs9vjk93yskl1ydwn";
+          rev = "5b1aeb22f22447fd35e1c107b6db44a7b27b8a42";
+          sha256 = "14g1hi9m91lb23jf4475pcdnb97fxrm52zblxag628nik3gp7qpb";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ef39950941c522e64ea991c9eeecfb5f6f18f6a2/recipes/private-diary";
           sha256 = "0dgnf375c00nlkp66kbkzsf469063l03b9miiplbhd63zshlv1i1";
-          name = "private-diary";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -59505,20 +74663,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    proc-net = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    proc-net = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "proc-net";
         version = "20130321.1712";
         src = fetchFromGitHub {
           owner = "nicferrier";
           repo = "emacs-proc-net";
-          rev = "10861112a1f3994c8e6374d6c5bb5d734cfeaf73";
-          sha256 = "0nly5h0d6w8dc08ifb2fiqcn4cqcn9crkh2wn0jzlz4zd2x75qrb";
+          rev = "00bfc92a381787ec387974ed17070118ced6d9ad";
+          sha256 = "1df4kpr298hkii3rhx341qqnc9g4nq5vna6w687knzibbm0iixga";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4a518f37260084fa7e9221e9189aedc09a951f6d/recipes/proc-net";
           sha256 = "0562x2s3kk9vlaavak4lya1nlmn4mwlzlc7nw1l3687q023z4hmv";
-          name = "proc-net";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -59526,8 +74687,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    processing-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    processing-mode = callPackage ({ fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "processing-mode";
         version = "20171022.1602";
         src = fetchFromGitHub {
@@ -59536,10 +74700,10 @@
           rev = "448aba82970c98322629eaf2746e73be6c30c98e";
           sha256 = "1fv74k37yyrh6jzasgqj88lrbq152gs9gpbjpxn7fz424c38gq2q";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ba59561e8a2f259fde170a79844af5e1ef5ed34f/recipes/processing-mode";
           sha256 = "184yg9z14ighz9djg53ji5dgnb98dnxkkwx55m8f0f879x31i89m";
-          name = "processing-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -59547,20 +74711,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    processing-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
-    melpaBuild {
+    processing-snippets = callPackage ({ fetchFromGitHub
+                                       , fetchurl
+                                       , lib
+                                       , melpaBuild
+                                       , yasnippet }:
+      melpaBuild {
         pname = "processing-snippets";
         version = "20140426.728";
         src = fetchFromGitHub {
           owner = "ptrv";
           repo = "processing2-emacs";
-          rev = "448aba82970c98322629eaf2746e73be6c30c98e";
-          sha256 = "1fv74k37yyrh6jzasgqj88lrbq152gs9gpbjpxn7fz424c38gq2q";
+          rev = "6175b8eef76369c4b1b8608b8df9a37f14b1be5c";
+          sha256 = "1mjzn8mynagck6fcw499gxzs1xm7gfqamlmgyqiy58wjni2xllr6";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ba59561e8a2f259fde170a79844af5e1ef5ed34f/recipes/processing-snippets";
           sha256 = "09vkm9asmjz1in0f63s7bf4amifspsqf5w9pxiy5y0qvmn28fr2r";
-          name = "processing-snippets";
+          name = "recipe";
         };
         packageRequires = [ yasnippet ];
         meta = {
@@ -59568,20 +74736,27 @@
           license = lib.licenses.free;
         };
       }) {};
-    prodigy = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    prodigy = callPackage ({ dash
+                           , emacs
+                           , f
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild
+                           , s }:
+      melpaBuild {
         pname = "prodigy";
-        version = "20180329.1357";
+        version = "20180511.238";
         src = fetchFromGitHub {
           owner = "rejeep";
           repo = "prodigy.el";
-          rev = "a07c611862ae6dad6cdf9186a7813e701dc6e072";
-          sha256 = "1addcwmgd2i9jp327ccsw5vgiixw6k1jks2fwg328llln0gv18ll";
+          rev = "701dccaa56de9e6a330c05bde33bce4f3b3d6a97";
+          sha256 = "1vyvxawlayp2nra0q83146q2nzv8qwn5a4nj0sx1jc90a0a83vgj";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/prodigy";
           sha256 = "0lfxb80jqjnzssjs6l511jcsmhkpzb5rh5czrb16dkqcz0cl5b2p";
-          name = "prodigy";
+          name = "recipe";
         };
         packageRequires = [ dash emacs f s ];
         meta = {
@@ -59589,8 +74764,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    professional-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    professional-theme = callPackage ({ fetchFromGitHub
+                                      , fetchurl
+                                      , lib
+                                      , melpaBuild }:
+      melpaBuild {
         pname = "professional-theme";
         version = "20150315.400";
         src = fetchFromGitHub {
@@ -59599,10 +74777,10 @@
           rev = "0927d1474049a193f9f366bde5eb1887b9ba20ed";
           sha256 = "0hx7rxa3smdippcpj4j63k0r5l4wflllb0vpnwwknc9j93r7042b";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bb79514b2afada80da82762890242de5ad88d8de/recipes/professional-theme";
           sha256 = "1l8nisn2c124cpylyahr76hfpdim2125zrns2897p466l5wcxcx5";
-          name = "professional-theme";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -59610,20 +74788,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    prog-fill = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    prog-fill = callPackage ({ cl-lib ? null
+                             , emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "prog-fill";
-        version = "20180128.2019";
+        version = "20180606.1832";
         src = fetchFromGitHub {
           owner = "ahungry";
           repo = "prog-fill";
-          rev = "ad38e2f6a45a8dd7eb08c407506256dd2e045de1";
-          sha256 = "13dsihqs0wc2bjxgyiqb5xbav9va432qqkpl84a0rdrwndpc7lpc";
+          rev = "3fbf7da6dd826e95c9077d659566ee29814a31d8";
+          sha256 = "167is1hbv3nsskz26g9q3zdndqsw9d3rwhbasj0r7a3wabpr8j4r";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/90d680ed481688c9899adb28fbd9a22a17fa8943/recipes/prog-fill";
           sha256 = "0wnqzkzhaywcyw93z86pngpycsrd1mi79psmck6qbhms1aia79p3";
-          name = "prog-fill";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -59631,8 +74814,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    prognth = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    prognth = callPackage ({ fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "prognth";
         version = "20130920.1059";
         src = fetchFromGitHub {
@@ -59641,10 +74827,10 @@
           rev = "2f1ca4d34b1fd581163e1df122c85418137e8e62";
           sha256 = "1szxsbk470fg3jp70r20va9hnnf4jj0mb7kxdkn6rd7ky6w34lwm";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/db6d52b92317aa5ad5024131b62edb5f91f50033/recipes/prognth";
           sha256 = "0hr5a3s0ij4hvn424v885z7pcs62yqm9mamw5b096hgjxgjf6ylm";
-          name = "prognth";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -59652,20 +74838,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    programmer-dvorak = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    programmer-dvorak = callPackage ({ fetchFromGitHub
+                                     , fetchurl
+                                     , lib
+                                     , melpaBuild }:
+      melpaBuild {
         pname = "programmer-dvorak";
         version = "20150426.1837";
         src = fetchFromGitHub {
           owner = "yangchenyun";
           repo = "programmer-dvorak";
-          rev = "3288a8f058eca4cab390a564babbbcb17cfa0350";
-          sha256 = "1yklm43d0ppyf4simhqab6m892z4mmxs2145lzw6kpizixavcv00";
+          rev = "c35d5e3b8b53c1e9341957b5d5db40387ba0c8ee";
+          sha256 = "1y2n11d1kbpgb4jivvgd1j4gz409jfrg0kxfa04nx1b0nx4f3gd6";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/89b0f4b5838aa3d4572ca91fe60cf28664368cb6/recipes/programmer-dvorak";
           sha256 = "1w8r35hkl6qy9a89l0m74x9q2vcc4h2hvmi3r2hqcy2ypkn5l5bv";
-          name = "programmer-dvorak";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -59673,8 +74862,40 @@
           license = lib.licenses.free;
         };
       }) {};
-    project-explorer = callPackage ({ cl-lib ? null, emacs, es-lib, es-windows, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    project-abbrev = callPackage ({ emacs
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
+        pname = "project-abbrev";
+        version = "20180705.1954";
+        src = fetchFromGitHub {
+          owner = "jcs090218";
+          repo = "project-abbrev";
+          rev = "ca4bddd72a73d43332c5b262e6a104a341882af5";
+          sha256 = "15nbfdc0z4wp8hakrc5m6bqn6klv22xxs3c3z6c49sdrlhqr9jvy";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/11580720cfbbbaeed9d914abb8a48705c195b159/recipes/project-abbrev";
+          sha256 = "0771r4a652r3sqb601q5j6348kx1741s7svzxyfr2a4lspfffvqb";
+          name = "recipe";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/project-abbrev";
+          license = lib.licenses.free;
+        };
+      }) {};
+    project-explorer = callPackage ({ cl-lib ? null
+                                    , emacs
+                                    , es-lib
+                                    , es-windows
+                                    , fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "project-explorer";
         version = "20150503.1714";
         src = fetchFromGitHub {
@@ -59683,10 +74904,10 @@
           rev = "589a09008706f5f4ef91393dc4306eede0d15ca9";
           sha256 = "04l4m3kxbwvyw9xy6cwakrdxxdswrrs7sya8zn6m738aawbr1mcd";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c2e5d686b8a18c7a17965ff6c5af8f5817b7ab31/recipes/project-explorer";
           sha256 = "076lzmyi1n7yrgdgyh9qinq271qk6k64x0msbzarihr3p4psrn8m";
-          name = "project-explorer";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs es-lib es-windows ];
         meta = {
@@ -59694,20 +74915,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    project-persist = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    project-persist = callPackage ({ fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "project-persist";
         version = "20150519.1324";
         src = fetchFromGitHub {
           owner = "rdallasgray";
           repo = "project-persist";
-          rev = "8da45c80b23b1d7499eac11a258fd7382312a304";
-          sha256 = "1fvjap0bsyw5q92q50wk8c81yv4g8nqb6jdlnarf80glwk50avrs";
+          rev = "a4e5de1833edb60656d8a04357c527d34e81d27c";
+          sha256 = "1x7hwda1w59b8hvzxyk996wdz6phs6rchh3f1ydf0ab6x7m7xvjr";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bd81d1f8a30ed951ed94b9a4db13a2f7735ea878/recipes/project-persist";
           sha256 = "0csjwj0qaw0hz2qrj8kxgxlixh2hi3aqib98vm19sr3f1b8qab24";
-          name = "project-persist";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -59715,8 +74939,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    project-persist-drawer = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, project-persist }:
-    melpaBuild {
+    project-persist-drawer = callPackage ({ fetchFromGitHub
+                                          , fetchurl
+                                          , lib
+                                          , melpaBuild
+                                          , project-persist }:
+      melpaBuild {
         pname = "project-persist-drawer";
         version = "20151108.422";
         src = fetchFromGitHub {
@@ -59725,10 +74953,10 @@
           rev = "35bbe132a4fab6a0fec15ce6c0fd2fe6a4aa9626";
           sha256 = "1nq320ph8fs9a197ji4mnw2xa24dld0r1nka476yvkg4azmcc9x8";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/23084af52d2243016eee73a5ee0cd3e945eec71d/recipes/project-persist-drawer";
           sha256 = "1jv2y2hcqakyvfibclzm7g4diw0bvsv3a8fa43yf19wb64jm8hdb";
-          name = "project-persist-drawer";
+          name = "recipe";
         };
         packageRequires = [ project-persist ];
         meta = {
@@ -59736,8 +74964,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    project-root = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    project-root = callPackage ({ fetchhg
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "project-root";
         version = "20110206.1230";
         src = fetchhg {
@@ -59745,10 +74976,10 @@
           rev = "843ca1f4ab2b";
           sha256 = "0nw02f5lmbqdfnw93d3383sdxx1d31szk23zvjlrmmdwv2124281";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/project-root";
           sha256 = "0xjir204zk254y2x70k9vqwirx2ljmrikpsgn5kn170d1bxvhwmb";
-          name = "project-root";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -59756,8 +74987,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    project-shells = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }:
-    melpaBuild {
+    project-shells = callPackage ({ emacs
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild
+                                  , seq }:
+      melpaBuild {
         pname = "project-shells";
         version = "20171107.51";
         src = fetchFromGitHub {
@@ -59766,10 +75002,10 @@
           rev = "d9401de750e444697c2eb9de1ff79f2a2eba4af8";
           sha256 = "1x16l0gijirmj667s8l87nizsiww2wzjka9ydl4yxzchl7a486cp";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/becf54de5ae9582d7c76382dff16d40b04b1a464/recipes/project-shells";
           sha256 = "0mhifxcpgsfwrhbs7axg6ja4klgzzy9pc0nqa7w3qg45xgi9s4m8";
-          name = "project-shells";
+          name = "recipe";
         };
         packageRequires = [ emacs seq ];
         meta = {
@@ -59777,20 +75013,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    projectile = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }:
-    melpaBuild {
+    projectile = callPackage ({ emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild
+                              , pkg-info }:
+      melpaBuild {
         pname = "projectile";
-        version = "20180324.2226";
+        version = "20180711.102";
         src = fetchFromGitHub {
           owner = "bbatsov";
           repo = "projectile";
-          rev = "fba757dcee67479e579c164ec0f4f930793de6cd";
-          sha256 = "1c3lvq9n501dcvxa8xz9cg4hm7bazbamb5rbfxlqjk9b4gbf8hby";
+          rev = "10aefe821c03c430d10e1408966938c066bbf49b";
+          sha256 = "1haxwsgsi98mfwyxg4v3rkz4i5k50swinrq0cfgfkgc1hkx39m8c";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ca7bf43ef8893bf04e9658390e306ef69e80a156/recipes/projectile";
           sha256 = "1kf8hql59nwiy13q0p6p6rf5agjvah43f0sflflfqsrxbihshvdn";
-          name = "projectile";
+          name = "recipe";
         };
         packageRequires = [ emacs pkg-info ];
         meta = {
@@ -59798,20 +75039,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    projectile-codesearch = callPackage ({ codesearch, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }:
-    melpaBuild {
+    projectile-codesearch = callPackage ({ codesearch
+                                         , fetchFromGitHub
+                                         , fetchurl
+                                         , lib
+                                         , melpaBuild
+                                         , projectile }:
+      melpaBuild {
         pname = "projectile-codesearch";
-        version = "20171129.600";
+        version = "20180508.822";
         src = fetchFromGitHub {
           owner = "abingham";
           repo = "emacs-codesearch";
-          rev = "4e6a2382c26d1218a4a007d31de2bab8ef9d2e7c";
-          sha256 = "030zbx1glr6m7sxy89c833iw1v3bgjkcg835c38hlazra1vq783p";
+          rev = "e40efc62e9333db0593bd81b5c78d08b19bfb193";
+          sha256 = "04xivg6f19mlpsv77jwasg4ii9vlv8amblm03siwhx53ib9wlcyc";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6b1b1d3e356c6b9bffdcf98848918efe2fdfa8c7/recipes/projectile-codesearch";
           sha256 = "1457dhmpgrq1qafr3v4ccw26ix10m60c5vlrpyqsfz8vh8lv0bb8";
-          name = "projectile-codesearch";
+          name = "recipe";
         };
         packageRequires = [ codesearch projectile ];
         meta = {
@@ -59819,20 +75065,27 @@
           license = lib.licenses.free;
         };
       }) {};
-    projectile-direnv = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile, s }:
-    melpaBuild {
+    projectile-direnv = callPackage ({ dash
+                                     , emacs
+                                     , fetchFromGitHub
+                                     , fetchurl
+                                     , lib
+                                     , melpaBuild
+                                     , projectile
+                                     , s }:
+      melpaBuild {
         pname = "projectile-direnv";
         version = "20160305.1738";
         src = fetchFromGitHub {
           owner = "christianromney";
           repo = "projectile-direnv";
-          rev = "d5d29e5228f840b7a25358a2fd50353ef2dc9b16";
-          sha256 = "1bq47a6lckgin93cqy5wj277rlrw2cgfywgmbdpxvmbhygpg5hqr";
+          rev = "250a902585acb611e10cf0f0248a84416df01522";
+          sha256 = "1yzq7zsm76p6gcgq3hz9bg3pgdj709gxx6jzp24mszkfb87jiw79";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/602485c251bc573e855dfd33e4e94052afbab93f/recipes/projectile-direnv";
           sha256 = "1s5dapdcblcbcqyv8df26v8wxl8bhrs9ybl5h5qbzz49gigd8nqh";
-          name = "projectile-direnv";
+          name = "recipe";
         };
         packageRequires = [ dash emacs projectile s ];
         meta = {
@@ -59840,20 +75093,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    projectile-git-autofetch = callPackage ({ alert, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }:
-    melpaBuild {
+    projectile-git-autofetch = callPackage ({ alert
+                                            , fetchFromGitHub
+                                            , fetchurl
+                                            , lib
+                                            , melpaBuild
+                                            , projectile }:
+      melpaBuild {
         pname = "projectile-git-autofetch";
-        version = "20171129.1447";
+        version = "20180418.1636";
         src = fetchFromGitHub {
           owner = "andrmuel";
           repo = "projectile-git-autofetch";
-          rev = "da02069d906e6e7f28ea1dd6a9196529315a5cba";
-          sha256 = "106kj49rxsrdh6awvql3zyr3ramdcn0aaq4rmbmd45hz9ij7x1wh";
+          rev = "55855886bccb5a22fbeb2b1c86ef2e9ff4de9067";
+          sha256 = "11h6ix7j145azg69kha46g2ggrmqff178p1krp12wv07iv3sijj6";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fdfdeb69fd78fc1bb2c62392f860a8c434f1762/recipes/projectile-git-autofetch";
           sha256 = "0m0raddsw5yvjrw2v6bdaswffmva8y9hxksdgf9axpvrd3rzlk9n";
-          name = "projectile-git-autofetch";
+          name = "recipe";
         };
         packageRequires = [ alert projectile ];
         meta = {
@@ -59861,20 +75119,27 @@
           license = lib.licenses.free;
         };
       }) {};
-    projectile-hanami = callPackage ({ emacs, fetchFromGitHub, fetchurl, inf-ruby, lib, melpaBuild, projectile, rake }:
-    melpaBuild {
+    projectile-hanami = callPackage ({ emacs
+                                     , fetchFromGitHub
+                                     , fetchurl
+                                     , inf-ruby
+                                     , lib
+                                     , melpaBuild
+                                     , projectile
+                                     , rake }:
+      melpaBuild {
         pname = "projectile-hanami";
         version = "20160505.611";
         src = fetchFromGitHub {
           owner = "avdgaag";
           repo = "projectile-hanami";
-          rev = "c4b8e7d4dfec789ef8493a7c5d4ce0cf7937e579";
-          sha256 = "1pqmyfz0vil30x739r18zpw9n76297ckisimq2g0xl1irhynsvbk";
+          rev = "b1da03d14b96972b6d369ed6dde40f65b4a2ca41";
+          sha256 = "1jsp2ca07w1y0v7zrx47yj0apqmkzx5577labp3ndd751x21bvnj";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9c0123322baee1e96afd055de3f44827574d2b5f/recipes/projectile-hanami";
           sha256 = "0qi9i4wdggrmihf1j42fqrf38psmb33rlafg3y6da5r7lpn03j1a";
-          name = "projectile-hanami";
+          name = "recipe";
         };
         packageRequires = [ emacs inf-ruby projectile rake ];
         meta = {
@@ -59882,20 +75147,29 @@
           license = lib.licenses.free;
         };
       }) {};
-    projectile-rails = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, inf-ruby, inflections, lib, melpaBuild, projectile, rake }:
-    melpaBuild {
+    projectile-rails = callPackage ({ emacs
+                                    , f
+                                    , fetchFromGitHub
+                                    , fetchurl
+                                    , inf-ruby
+                                    , inflections
+                                    , lib
+                                    , melpaBuild
+                                    , projectile
+                                    , rake }:
+      melpaBuild {
         pname = "projectile-rails";
-        version = "20180327.433";
+        version = "20180618.804";
         src = fetchFromGitHub {
           owner = "asok";
           repo = "projectile-rails";
-          rev = "b5e516ef6a336bde32e4594408be15fd96b07e1b";
-          sha256 = "06qwhf04wy67ils5wn9hyc1z2j1pq0kb1mvxkxzqglwdnaca00l7";
+          rev = "ab97a5ceb06d6028ccdc74b97c1c22d3eb874921";
+          sha256 = "01liqmhcjp3mkj41i6b00s2164xlqymvddm7m7gmhnmd2ivhsvzv";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b16532bb8d08f7385bca4b83ab4e030d7b453524/recipes/projectile-rails";
           sha256 = "0fgvignqdqh0ma91z9385782l89mvwfn77rp1gmy8cbkwi3b7fkq";
-          name = "projectile-rails";
+          name = "recipe";
         };
         packageRequires = [ emacs f inf-ruby inflections projectile rake ];
         meta = {
@@ -59903,20 +75177,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    projectile-ripgrep = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, projectile, ripgrep }:
-    melpaBuild {
+    projectile-ripgrep = callPackage ({ fetchFromGitHub
+                                      , fetchurl
+                                      , lib
+                                      , melpaBuild
+                                      , projectile
+                                      , ripgrep }:
+      melpaBuild {
         pname = "projectile-ripgrep";
         version = "20180301.651";
         src = fetchFromGitHub {
           owner = "nlamirault";
           repo = "ripgrep.el";
-          rev = "a1f8f030bf5daea92dd13b953720a6c13dd3557c";
-          sha256 = "0mpysjcbw9qxy1lcwsd2rqf72xahpdpn88xcq0cnk1y2jam8gjkf";
+          rev = "1f4338eeeb4bb3084a4b43762fa69a2c93ddff85";
+          sha256 = "0im6l8gn3msl5jks3qif0jmi358kj46a50p2lirpjh6rnilmnanq";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/195f340855b403128645b59c8adce1b45e90cd18/recipes/projectile-ripgrep";
           sha256 = "1iczizyayql40wcljvpc1mvfvn9r28b1dkrkcmdxif732gd01jjg";
-          name = "projectile-ripgrep";
+          name = "recipe";
         };
         packageRequires = [ projectile ripgrep ];
         meta = {
@@ -59924,20 +75203,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    projectile-sift = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, projectile, sift }:
-    melpaBuild {
+    projectile-sift = callPackage ({ fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild
+                                   , projectile
+                                   , sift }:
+      melpaBuild {
         pname = "projectile-sift";
         version = "20160107.215";
         src = fetchFromGitHub {
           owner = "nlamirault";
           repo = "sift.el";
-          rev = "4ce8878a0fc396ded7521ce38852d93e1d863065";
-          sha256 = "1x78i6svi4cwah9xw85imhpncvxsx4xim4fzykpnd328mxkk07h6";
+          rev = "8c3f3d14a351a2394027d72ee0599aa73b9f0d13";
+          sha256 = "1ma6djvhvjai07v1g9a36lfa3nw8zsy6x5vliwcdnkf44gs287ra";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a730e1331b0486c4bd2d309b85d2f8810489eb47/recipes/projectile-sift";
           sha256 = "1wbgpwq9yy3v7hqidaczrvvsw5ajj7m3n4gsy3b169xv5h673a0i";
-          name = "projectile-sift";
+          name = "recipe";
         };
         packageRequires = [ projectile sift ];
         meta = {
@@ -59945,8 +75229,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    projectile-speedbar = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, projectile, sr-speedbar }:
-    melpaBuild {
+    projectile-speedbar = callPackage ({ fetchFromGitHub
+                                       , fetchurl
+                                       , lib
+                                       , melpaBuild
+                                       , projectile
+                                       , sr-speedbar }:
+      melpaBuild {
         pname = "projectile-speedbar";
         version = "20170516.1943";
         src = fetchFromGitHub {
@@ -59955,10 +75244,10 @@
           rev = "dcab13db72c2084edbebe808e35f1126fe0b3bcd";
           sha256 = "106a4y5r1adjpbnjn734s7d910r6akhjlyjpd6bnczjhp357wyc7";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/eda8cb5a175258404c347ffa30fca002504467a0/recipes/projectile-speedbar";
           sha256 = "0dli4gzsiycivh8dwa00lfpbimyg42qygfachzrhi8qy5413pwlp";
-          name = "projectile-speedbar";
+          name = "recipe";
         };
         packageRequires = [ projectile sr-speedbar ];
         meta = {
@@ -59966,20 +75255,29 @@
           license = lib.licenses.free;
         };
       }) {};
-    projectile-trailblazer = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, inf-ruby, inflections, lib, melpaBuild, projectile, rake }:
-    melpaBuild {
+    projectile-trailblazer = callPackage ({ emacs
+                                          , f
+                                          , fetchFromGitHub
+                                          , fetchurl
+                                          , inf-ruby
+                                          , inflections
+                                          , lib
+                                          , melpaBuild
+                                          , projectile
+                                          , rake }:
+      melpaBuild {
         pname = "projectile-trailblazer";
         version = "20170928.924";
         src = fetchFromGitHub {
           owner = "micdahl";
           repo = "projectile-trailblazer";
-          rev = "a37a4f7b7f727d98e4c74c0256e059e84263553d";
-          sha256 = "1njs2aps4mlbnnfjkfwrb8vy8lg6lyxzxkxpscv91la7yf3wpc3g";
+          rev = "79299498d74876f2ac3fe8075716b39a5bdd04cd";
+          sha256 = "1lkj9jdr3g7nl80fxvic6g5cn7vbkyxys7m3kcmd6xa9mq7nvci4";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f9c6f2f92ff99e7a3241003dc396f978f3916c8a/recipes/projectile-trailblazer";
           sha256 = "18cijb5c1ym5kn2g2apbijbfd3aqhrraki8vv9bk8rvi7wmm6qj4";
-          name = "projectile-trailblazer";
+          name = "recipe";
         };
         packageRequires = [ emacs f inf-ruby inflections projectile rake ];
         meta = {
@@ -59987,8 +75285,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    projectile-variable = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    projectile-variable = callPackage ({ cl-lib ? null
+                                       , emacs
+                                       , fetchFromGitHub
+                                       , fetchurl
+                                       , lib
+                                       , melpaBuild }:
+      melpaBuild {
         pname = "projectile-variable";
         version = "20170208.918";
         src = fetchFromGitHub {
@@ -59997,10 +75300,10 @@
           rev = "8d348ac70bdd6dc320c13a12941b32b38140e264";
           sha256 = "0l38nldx6lwjb7mxixykiyj10xwb35249dxfg0k2wkmb2vy1fkxs";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/eb13cb0dba1696cc51132cd1ff723fa17f892a7c/recipes/projectile-variable";
           sha256 = "15qc5n91nxyfvb100iyihfmrdr57qgw6098yv3nfqgw3zx1qchdw";
-          name = "projectile-variable";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -60008,20 +75311,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    projector = callPackage ({ alert, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }:
-    melpaBuild {
+    projector = callPackage ({ alert
+                             , cl-lib ? null
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild
+                             , projectile }:
+      melpaBuild {
         pname = "projector";
-        version = "20171006.1258";
+        version = "20180712.1549";
         src = fetchFromGitHub {
           owner = "waymondo";
           repo = "projector.el";
-          rev = "03751fca880c95cf47e560c78cfc2aaa056cd455";
-          sha256 = "1yg9pcs6pbwd7a35q0jqjwnqwjqz4v5jd24msr51xh0v8kbs2v61";
+          rev = "aeecd317b3031834569d2cd51171e377eacd0685";
+          sha256 = "1nnggqrla6w58ll19fh01fndhssqx7l1blw21r8j9rv1vvjmvf3p";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/420ffea4549f59677a16c1ee89c77b866487e302/recipes/projector";
           sha256 = "0hrinplk607wcc2ibn05pl8ghikv9f3zvymncp6nz95jw9brdapf";
-          name = "projector";
+          name = "recipe";
         };
         packageRequires = [ alert cl-lib projectile ];
         meta = {
@@ -60029,8 +75338,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    projekt = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    projekt = callPackage ({ emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "projekt";
         version = "20150324.148";
         src = fetchFromGitHub {
@@ -60039,10 +75352,10 @@
           rev = "a65e554e5d8b0def08c5d06f3fe34fec40bebd83";
           sha256 = "0hvvlh24157qjxz82sbg22d4cbrf95xyx202cybp0n1vyxsmjcmw";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e2a854ed4fef114861bcc7814cd064c16d3c074c/recipes/projekt";
           sha256 = "1bhb24701flihl54w8xrj6yxhynpq4dk0fp5ciac7k28n4930lw8";
-          name = "projekt";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -60050,8 +75363,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    projmake-mode = callPackage ({ dash, fetchFromGitHub, fetchurl, indicators, lib, melpaBuild }:
-    melpaBuild {
+    projmake-mode = callPackage ({ dash
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , indicators
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "projmake-mode";
         version = "20161031.1015";
         src = fetchFromGitHub {
@@ -60060,10 +75378,10 @@
           rev = "a897701f7e8f8cc11459ed44eb0e454db2a460c1";
           sha256 = "0las0xl4af6sn5pbllq16abw2hj1kswwpkyi6lf31sbwr5wnq4qb";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/df23138073d2416fa6522beca86b7a62eb4d42e3/recipes/projmake-mode";
           sha256 = "192gvmhcz1anl80hpmcjwwd08dljyrap9sk6qj0y85mcnaafm882";
-          name = "projmake-mode";
+          name = "recipe";
         };
         packageRequires = [ dash indicators ];
         meta = {
@@ -60071,8 +75389,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    promise = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    promise = callPackage ({ async
+                           , emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "promise";
         version = "20180409.252";
         src = fetchFromGitHub {
@@ -60081,10 +75404,10 @@
           rev = "f623fa7466983fd1ba7034371f599434c03da723";
           sha256 = "1ffk5scab9whn27xz4wyik5vl235ngvhx30fd05abq97d6l7hndl";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3eaf5ac668008759677b9cc6f11406abd573012a/recipes/promise";
           sha256 = "1y1v3ikcmh9yp5fdwagcjg755bgkyqk714lb6s1hb2606m3ia03s";
-          name = "promise";
+          name = "recipe";
         };
         packageRequires = [ async emacs ];
         meta = {
@@ -60092,20 +75415,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    prompt-text = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    prompt-text = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "prompt-text";
         version = "20160106.609";
         src = fetchFromGitHub {
           owner = "10sr";
           repo = "prompt-text-el";
-          rev = "bb9265ebfada42d0e3c67c809665e1e5d980691e";
-          sha256 = "1hq8426i8rpb3qzkd5akv3i08pa4jsp9lwsskn38bfgp71pwild2";
+          rev = "3cc486c070b7a7c806c8d6002f9ba4979f56107d";
+          sha256 = "1hv4p1x5sli5lplm8hl6frxmwvbc1vmamgj9m2ryk17ykqmr05r5";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/17d2bc3e53865fe8c98aabb6ef0ad1d10fcb1061/recipes/prompt-text";
           sha256 = "1b9sj9kzx5ydq2zsfmkwsx78pzg0vsvrn92397js6b2cm24vrwwc";
-          name = "prompt-text";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -60113,8 +75439,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    prompts = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    prompts = callPackage ({ dash
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "prompts";
         version = "20160916.341";
         src = fetchFromGitHub {
@@ -60123,10 +75453,10 @@
           rev = "1cd5e732ff2a86b47836eb7252e5b59cd4b6ab26";
           sha256 = "10y8x54p64zs1jlq4nf1kixpb42078n2gdf9s62b1siyb1vhl581";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2395402e72d9b0f7ce2ca5fcb4497919f90a8fe2/recipes/prompts";
           sha256 = "1fz5sbc45jiq64y89lm8nj6lsanq3lzyjzahxzrgqvr7655pphzm";
-          name = "prompts";
+          name = "recipe";
         };
         packageRequires = [ dash ];
         meta = {
@@ -60134,8 +75464,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    prop-menu = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    prop-menu = callPackage ({ cl-lib ? null
+                             , emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "prop-menu";
         version = "20150728.418";
         src = fetchFromGitHub {
@@ -60144,10 +75479,10 @@
           rev = "50b102c1c0935fd3e0c465feed7f27d66b21cdf3";
           sha256 = "18ap2liz5r5a8ja2zz9182fnfm47jnsbyblpq859zks356k37iwc";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3d3a013cc9c489987fe689c8d73bbaa3445bdeb3/recipes/prop-menu";
           sha256 = "0dhy52fxxpa058mhhx0slw3sly3dlxm9vkax6fd1sap6f6v00p5i";
-          name = "prop-menu";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -60155,8 +75490,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    propfont-mixed = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    propfont-mixed = callPackage ({ cl-lib ? null
+                                  , emacs
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "propfont-mixed";
         version = "20150113.1411";
         src = fetchFromGitHub {
@@ -60165,10 +75505,10 @@
           rev = "0b461ef4754a469610dba71874a34b6da42176bf";
           sha256 = "0lch20njy248w7bnvgs7jz0zqasskf5dakmykxwpb48llm6kx95v";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3ccb401b60cb1128ba50a5afecd97feca6d00d7a/recipes/propfont-mixed";
           sha256 = "19k0ydpkiviznsngwcqwn4k30r6j8w34pchgpjlsfwq1bndaai9y";
-          name = "propfont-mixed";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -60176,8 +75516,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    proportional = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    proportional = callPackage ({ emacs
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "proportional";
         version = "20171025.1637";
         src = fetchFromGitHub {
@@ -60186,10 +75530,10 @@
           rev = "f671ffe8fd803e2fc462e2e1844aeeab1a13918e";
           sha256 = "02sbrcb9c27djk64xv41vii6pbw83b6iljrd66w4ad9hgz2pkxzk";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9e0a7f061df4cce44e5fe98f6e1c31bec4a7338f/recipes/proportional";
           sha256 = "022lhbslzd67wyah8r0gl73vzxgjjwia08l3ssdd08jj3p56m3wx";
-          name = "proportional";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -60197,8 +75541,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    prosjekt = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    prosjekt = callPackage ({ dash
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "prosjekt";
         version = "20151127.616";
         src = fetchFromGitHub {
@@ -60207,10 +75555,10 @@
           rev = "a864a8be5842223043702395f311e3350c28e9db";
           sha256 = "1m8zvrv5aws7b0dffk8y6b5mncdk2c4k90mx69jys10fs0gc5hb3";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6d359ec827573dd8c871c4f23df5d1737f1830e7/recipes/prosjekt";
           sha256 = "1fn7ii1bq7bjkz27hihclpvx0aabgwy3kv47r9qibjl2jin97rck";
-          name = "prosjekt";
+          name = "recipe";
         };
         packageRequires = [ dash ];
         meta = {
@@ -60218,20 +75566,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    protobuf-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    protobuf-mode = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "protobuf-mode";
         version = "20170526.950";
         src = fetchFromGitHub {
           owner = "google";
           repo = "protobuf";
-          rev = "320d56c833f835f40c56bdaf2a375768cdd1b334";
-          sha256 = "0waqwqcwwv99rl0ays9maqv0y6l06vx6k8ygap21i69dn7mrj5nl";
+          rev = "4674cc7c073f1b8d5efd2a42ffcf3ca30a907bfe";
+          sha256 = "0sspwvwxyqq9aibf3piv6cp5vb28w2fnfk6x7wkmaiy7a4gcklcv";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/protobuf-mode";
           sha256 = "1hh0w93fg6mfwsbb9wvp335ry8kflj50k8hybchpjcn6f4x39xsj";
-          name = "protobuf-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -60239,8 +75590,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    protocols = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    protocols = callPackage ({ cl-lib ? null
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "protocols";
         version = "20170802.432";
         src = fetchFromGitHub {
@@ -60249,10 +75604,10 @@
           rev = "d0f7c4acb05465f1a0d4be54363bbd2802647e77";
           sha256 = "1xg3pwsnzn795bz299x273ral2jrz2v3p9r6gjm4dcx5pm3348mj";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9c9a75671a00e9196d00b08911232aac87fd8c83/recipes/protocols";
           sha256 = "1wg3qh8a1ms82lkzz4i1bk787147a8agcj8rszj1zfvwg0ckqq1a";
-          name = "protocols";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -60260,20 +75615,57 @@
           license = lib.licenses.free;
         };
       }) {};
-    psc-ide = callPackage ({ cl-lib ? null, company, dash, dash-functional, emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild, s, seq }:
-    melpaBuild {
+    proxy-mode = callPackage ({ emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
+        pname = "proxy-mode";
+        version = "20180520.2030";
+        src = fetchFromGitHub {
+          owner = "stardiviner";
+          repo = "proxy-mode";
+          rev = "1cf689c2408945081215550589936a7eaab14987";
+          sha256 = "0xvc33xwrdh71kmv1g85gb28ba7yx8cz6257dgh6sx7ligz7cmvd";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/25224d3bcdb625314e931d5acc22f60c7192a84b/recipes/proxy-mode";
+          sha256 = "0ldjfmxn8k8bzvdrlsfpijsmgn754aza54by5d59k7a1xn6d37mp";
+          name = "recipe";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/proxy-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    psc-ide = callPackage ({ cl-lib ? null
+                           , company
+                           , dash
+                           , dash-functional
+                           , emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , flycheck
+                           , let-alist
+                           , lib
+                           , melpaBuild
+                           , s
+                           , seq }:
+      melpaBuild {
         pname = "psc-ide";
-        version = "20180404.215";
+        version = "20180605.302";
         src = fetchFromGitHub {
           owner = "epost";
           repo = "psc-ide-emacs";
-          rev = "de22a50eb031d11c4771e62f8c705298bc5636d6";
-          sha256 = "1sn2lw37382kl5d69c8wdghcr10cwwx7g5dgxgnmmfhspbkz6v95";
+          rev = "f71120b0c0d3192f79488ab000b9a689e5145ce4";
+          sha256 = "1lg3bqspjmcdmfyjpnx5l9zy0lmicgnszcdbysjmf4q5jxqd3lhd";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/384ffc463cc6edb4806f8da68bd251e662718e65/recipes/psc-ide";
           sha256 = "1f8bphrbksz7si9flyhz54brb7w1lcz19pmn92hjwx7kd4nl18i9";
-          name = "psc-ide";
+          name = "recipe";
         };
         packageRequires = [
           cl-lib
@@ -60291,20 +75683,27 @@
           license = lib.licenses.free;
         };
       }) {};
-    psci = callPackage ({ dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, purescript-mode, s }:
-    melpaBuild {
+    psci = callPackage ({ dash
+                        , f
+                        , fetchFromGitHub
+                        , fetchurl
+                        , lib
+                        , melpaBuild
+                        , purescript-mode
+                        , s }:
+      melpaBuild {
         pname = "psci";
-        version = "20171011.50";
+        version = "20180418.533";
         src = fetchFromGitHub {
           owner = "purescript-emacs";
           repo = "emacs-psci";
-          rev = "5360b244c588ed2f2a5bb86180cb5d4deb2216de";
-          sha256 = "0m9lpwwm29h0pms1rnwnh67ff1n1dmf25yy429g438zq98l94x9s";
+          rev = "3f5ef1141a97c4b5507204d48e8aeccd553e4591";
+          sha256 = "1g06hqr23mg8457azkjp7wjsqavj48c0mjck0igi6mc2rh310930";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3451719ce5096383db082917716a5ed8346fc186/recipes/psci";
           sha256 = "1iwkr58b910vrwwxyk00psy74vp201vmm3b0cm4k5fh3glr31vp9";
-          name = "psci";
+          name = "recipe";
         };
         packageRequires = [ dash f purescript-mode s ];
         meta = {
@@ -60312,20 +75711,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    psession = callPackage ({ async, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    psession = callPackage ({ async
+                            , cl-lib ? null
+                            , emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "psession";
-        version = "20180409.1056";
+        version = "20180423.2159";
         src = fetchFromGitHub {
           owner = "thierryvolpiatto";
           repo = "psession";
-          rev = "faea8e5b3873a4c62a03c76a057cd0fd6fb0434e";
-          sha256 = "1i1rjk72cwvfgxvqsiw2sqfwhsc8n4q89p94c96f3wm10rvlv7k2";
+          rev = "702d20897c0839568201bc6921d5f0f80b8778c0";
+          sha256 = "0ynd69fyjpgs6rs3kkznpx19kmdmd25wb46bj9zq61gj138b6p33";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/669342d2b3e6cb622f196571d776a98ec8f3b1d3/recipes/psession";
           sha256 = "18va6kvpia5an74vkzccs72z02vg4vq9mjzr5ih7xbcqxna7yv3a";
-          name = "psession";
+          name = "recipe";
         };
         packageRequires = [ async cl-lib emacs ];
         meta = {
@@ -60333,8 +75738,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    psysh = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    psysh = callPackage ({ emacs
+                         , f
+                         , fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild
+                         , s }:
+      melpaBuild {
         pname = "psysh";
         version = "20171022.2229";
         src = fetchFromGitHub {
@@ -60343,10 +75754,10 @@
           rev = "926af4ae0c068ed699fc939f4b3e642aaa6f7c9e";
           sha256 = "0k6kb4xbfxcvd7dm3kb600mq56xyy086zi7nal04jkv9lc59bwn7";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/eb13cb0dba1696cc51132cd1ff723fa17f892a7c/recipes/psysh";
           sha256 = "00rzfw8nlbcmfbjnzbfl08136dhgvrrn9g1s9l623xgpbcay63sg";
-          name = "psysh";
+          name = "recipe";
         };
         packageRequires = [ emacs f s ];
         meta = {
@@ -60354,8 +75765,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    pt = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    pt = callPackage ({ fetchFromGitHub
+                      , fetchurl
+                      , lib
+                      , melpaBuild }:
+      melpaBuild {
         pname = "pt";
         version = "20161226.1159";
         src = fetchFromGitHub {
@@ -60364,10 +75778,10 @@
           rev = "6d99b2aaded3ece3db19a20f4b8f1d4abe382622";
           sha256 = "1vi97hgwrf7n8vsbkvvhn398m20755jnbbbz4kxgqfmcgpimc8nc";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/34c51783af154f203489f5f7df7012ca61932caa/recipes/pt";
           sha256 = "0zmz1hcr4ajc2ydvpdxhy1dlhp7hvlkv6y6w1b79ffvq6acdd5mj";
-          name = "pt";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -60375,20 +75789,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    pug-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    pug-mode = callPackage ({ cl-lib ? null
+                            , emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "pug-mode";
-        version = "20171208.2029";
+        version = "20180513.1426";
         src = fetchFromGitHub {
           owner = "hlissner";
           repo = "emacs-pug-mode";
-          rev = "894a86d0ae4e855ae6044af6d7e106f8996c97c2";
-          sha256 = "0phf9y5rcahhavbvnsh6hfm3ig7vr3fs7m503zv1sac9is5zxypi";
+          rev = "8739fe5b5ff83a53cfb233263e85346562e58f1d";
+          sha256 = "16whqy3plqarlvmifakgc7a8fjp4gv7hchzgspnvgjadqk3h0ik0";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b3710aac9f3df3a23238af1f969c462b3692f260/recipes/pug-mode";
           sha256 = "1njhr95y2rx7inpl9phxxz580844p2iadqlga1kj7xzvjz698x85";
-          name = "pug-mode";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -60396,20 +75815,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    pulseaudio-control = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    pulseaudio-control = callPackage ({ fetchFromGitHub
+                                      , fetchurl
+                                      , lib
+                                      , melpaBuild }:
+      melpaBuild {
         pname = "pulseaudio-control";
-        version = "20171024.2339";
+        version = "20180627.450";
         src = fetchFromGitHub {
           owner = "flexibeast";
           repo = "pulseaudio-control";
-          rev = "08c59e1dc45ec96edb62f34036e82cf5f14c0e8b";
-          sha256 = "10cgg1r00kz2fsnnryvzay5pf8s1pwb1dzlds1fbjdnyfvdgammv";
+          rev = "1da372ec79f5d2fb901d1f9f0679fee8848fd011";
+          sha256 = "02xrsms2pjqdk6327midi61i5vg2h9cq5jwaxv43ldm68wl7hi6k";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7964f226e12c3a27ff856e28f4b030ebf304aea2/recipes/pulseaudio-control";
           sha256 = "1vdhg85lbdx7sj1xg2vhhfmhrrp5q2x560agnsb0gxi2akp6z9r0";
-          name = "pulseaudio-control";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -60417,20 +75839,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    punctuality-logger = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    punctuality-logger = callPackage ({ fetchFromGitLab
+                                      , fetchurl
+                                      , lib
+                                      , melpaBuild }:
+      melpaBuild {
         pname = "punctuality-logger";
         version = "20141120.1231";
         src = fetchFromGitLab {
           owner = "elzair";
           repo = "punctuality-logger";
-          rev = "e09e5dd37bc92289fa2f7dc44aed51a7b5e04bb0";
-          sha256 = "1bkkgs2agy00wivilljkj3a9fsb2ba935icjmhbk46zjc6yf3y6q";
+          rev = "d76c5d5589a4f8a94cc5537686d9a3b46ea7cc59";
+          sha256 = "03872n1v5qqqblviq9sf2ml6ibs50mcjrh0i35sb0m7l202nh52b";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/76ac7178ee5381e08ae881f3fc6061106eeb1c1d/recipes/punctuality-logger";
           sha256 = "0q9s74hkfqvcx67xpq9rlvh38nyjnz230bll6ks7y5yzxvl4qhcm";
-          name = "punctuality-logger";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -60438,20 +75863,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    pungi = callPackage ({ fetchFromGitHub, fetchurl, jedi, lib, melpaBuild, pyvenv }:
-    melpaBuild {
+    pungi = callPackage ({ fetchFromGitHub
+                         , fetchurl
+                         , jedi
+                         , lib
+                         , melpaBuild
+                         , pyvenv }:
+      melpaBuild {
         pname = "pungi";
         version = "20150222.446";
         src = fetchFromGitHub {
           owner = "mgrbyte";
           repo = "pungi";
-          rev = "a2d4d439ea371be0b064a12248288903b8a521a0";
-          sha256 = "1viw95y6fha782n1jw7snr7xc00iyf94r4whsm1a2q11vm2d1h21";
+          rev = "41c9f8b7795e083bfd63ba0d06c789c250998723";
+          sha256 = "012lv7hrwlhvins81vw3yjkhdwbpi6g1dx55i101qyrpzv5ifngm";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d504c6028c029268d380c0eac25b1c4886aa6e98/recipes/pungi";
           sha256 = "1v9fsd764z5wdcips63z53rcipdz7bha4q6s4pnn114jn3a93ls1";
-          name = "pungi";
+          name = "recipe";
         };
         packageRequires = [ jedi pyvenv ];
         meta = {
@@ -60459,8 +75889,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    punpun-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    punpun-theme = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "punpun-theme";
         version = "20161103.147";
         src = fetchFromGitHub {
@@ -60469,10 +75902,10 @@
           rev = "cce8b10b2df6f9187a9eaa0c3f21ff0dda175968";
           sha256 = "1iz1qc9bphl2y2z7abc33fvyaccj733drkl7nzbr1jlpbknkmk2k";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/77a9edbb36dc9474adb23d356e6c596789aab2a2/recipes/punpun-theme";
           sha256 = "1l7nphh8v7w5w790cwmnp6nw5rciwhgzkvynkrvpiv9chhacx0xg";
-          name = "punpun-theme";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -60480,8 +75913,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    puppet-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }:
-    melpaBuild {
+    puppet-mode = callPackage ({ emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild
+                               , pkg-info }:
+      melpaBuild {
         pname = "puppet-mode";
         version = "20171220.2249";
         src = fetchFromGitHub {
@@ -60490,10 +75928,10 @@
           rev = "b3ed5057166a4f49dfa9be638523a348b55a2fd2";
           sha256 = "0sgws5cl4vc8707l66lq0zi1p6pxik0474ihg9jczh2xxnq4clsk";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1de94f0ab39ab18dfd0b050e337f502d894fb3ad/recipes/puppet-mode";
           sha256 = "1qn71j6fkwnrsq1s6fhfcxhic3rbspg5cy9n7jv451ji7ywyhakf";
-          name = "puppet-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs pkg-info ];
         meta = {
@@ -60501,8 +75939,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    purescript-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    purescript-mode = callPackage ({ fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "purescript-mode";
         version = "20180120.709";
         src = fetchFromGitHub {
@@ -60511,10 +75952,10 @@
           rev = "b76c7f37f1a3527e8ace66bbd584851e1f803cc8";
           sha256 = "0nnrfs1siz4wwn56razlig6cvi8fqgcgk5wv5b0iyizq8a8wwia7";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/77175fa470e517fa134751fbb38e144eb5b979ff/recipes/purescript-mode";
           sha256 = "00gz752mh7144nsaka5q3q4681jp845kc5vcy2nbfnqp9b24l55m";
-          name = "purescript-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -60522,8 +75963,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    purple-haze-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    purple-haze-theme = callPackage ({ emacs
+                                     , fetchFromGitHub
+                                     , fetchurl
+                                     , lib
+                                     , melpaBuild }:
+      melpaBuild {
         pname = "purple-haze-theme";
         version = "20141014.1929";
         src = fetchFromGitHub {
@@ -60532,10 +75977,10 @@
           rev = "3e245cbef7cd09e6b3ee124963e372a04e9a6485";
           sha256 = "15myw5rkbnnpgzpiipm5xl4cyzymv8hh66x9al4aalb5nf52dckc";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6f26b8281f9bd05e3c8f2ef21838275711e622c9/recipes/purple-haze-theme";
           sha256 = "1rvfpm3zkhdv3ikc8pqqngf9pi0niwyi52pg8dq8i056nwc5bk9z";
-          name = "purple-haze-theme";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -60543,20 +75988,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    purty-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    purty-mode = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "purty-mode";
         version = "20131004.1559";
         src = fetchFromGitHub {
           owner = "jcatw";
           repo = "purty-mode";
-          rev = "8eef77317a3bab07ade212353a50fbd3f20f365a";
-          sha256 = "0qm2xv762cz196aqs445crqrmsks8hpwzpaykzn0chlvdk0m5cv1";
+          rev = "ad48149bfd0c765796a728b22d679e03fc124328";
+          sha256 = "1gx2c94bq34d2zjdr9mbnafq6alzz8vrlj5pskm15p225s85a2q3";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/purty-mode";
           sha256 = "0gbbwl5kg74jf1i1zsr40zg3gw43qmz1l87k0r578v1xvyqmhm1i";
-          name = "purty-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -60564,8 +76012,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    pushbullet = callPackage ({ fetchFromGitHub, fetchurl, grapnel, json ? null, lib, melpaBuild }:
-    melpaBuild {
+    pushbullet = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , grapnel
+                              , json ? null
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "pushbullet";
         version = "20140809.532";
         src = fetchFromGitHub {
@@ -60574,10 +76027,10 @@
           rev = "73c59a0f1dc04875b3e5a2c8afbc26c32128e445";
           sha256 = "03ivg3ddhy5zh410wgwxa17m98wywqhk62jgijhjd00b6l8i4aym";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a2649d60dd1ed3b3171ff1448b89967c5f7759a0/recipes/pushbullet";
           sha256 = "1swzl25rcw7anl7q099qh14yhnwlbn3m20ib9kis0l1rv59kkarl";
-          name = "pushbullet";
+          name = "recipe";
         };
         packageRequires = [ grapnel json ];
         meta = {
@@ -60585,8 +76038,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    pushover = callPackage ({ cl-lib ? null, fetchgit, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    pushover = callPackage ({ cl-lib ? null
+                            , fetchgit
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "pushover";
         version = "20170818.1403";
         src = fetchgit {
@@ -60594,10 +76051,10 @@
           rev = "bbe3ac8df3c532a72da4552615af960b8a577588";
           sha256 = "187bisngi37n66ik2dq7rg4hy4nlxl9pifqgqq08kf9238y8hd11";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e9553cd029bc0733c89d2c790cb173d9668a9eba/recipes/pushover";
           sha256 = "0im5bf2r69s2jb6scm8xdk63y1xi5zm4kg9ghfixlvyvipfli4kl";
-          name = "pushover";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -60605,8 +76062,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    px = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    px = callPackage ({ fetchFromGitHub
+                      , fetchurl
+                      , lib
+                      , melpaBuild }:
+      melpaBuild {
         pname = "px";
         version = "20170317.1630";
         src = fetchFromGitHub {
@@ -60615,10 +76075,10 @@
           rev = "0c52f7933eab3ca1642ab0df151db9950430c9e2";
           sha256 = "0f741a2gpc2mdl85ivbiskga620b6ci2x0dwjs7m8c1vk6xrxbpi";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/326fc9b057a5016248ac36ca166e9a38f13babf6/recipes/px";
           sha256 = "0xjmz18m2dslh6yq5z32r43zq3svfxn8mhrfbmihglyv2mkwxw44";
-          name = "px";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -60626,8 +76086,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    py-autopep8 = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    py-autopep8 = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "py-autopep8";
         version = "20160925.352";
         src = fetchFromGitHub {
@@ -60636,10 +76099,10 @@
           rev = "68e12d8788c91c7ec53a68acf1d23adb2ffa4788";
           sha256 = "16fmym6hvi2lx0mmbrrhld1vzki5iqfqx2m0xa9021gjjzb33lw6";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c400e0f3cfe70821e621fe85d239b4f6596d5171/recipes/py-autopep8";
           sha256 = "1argjdmh0x9c90zkb6cr4z3zkpgjp2mkpsw0dr4v6gg83jcggfpp";
-          name = "py-autopep8";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -60647,8 +76110,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    py-gnitset = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    py-gnitset = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "py-gnitset";
         version = "20170821.1032";
         src = fetchFromGitHub {
@@ -60657,10 +76123,10 @@
           rev = "1e993cc29cbc31e06fe1e335dec198e21972fa55";
           sha256 = "1hslq2bdk95cgza9qbskxf942ckhjb4bqi6nrhbmlnm9agmjqm59";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d00b78ead693e844e35c760fe2c39b8ed6cb0d81/recipes/py-gnitset";
           sha256 = "0f6ivq4ignb4gfxw2q8qvigvv3fbvvyr87x25wcaz6yipg1lr18r";
-          name = "py-gnitset";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -60668,20 +76134,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    py-import-check = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    py-import-check = callPackage ({ fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "py-import-check";
         version = "20130802.411";
         src = fetchFromGitHub {
           owner = "psibi";
           repo = "emacs-py-import-check";
-          rev = "9787f87745a4234cd9bed711860b707902bc8ae4";
-          sha256 = "1416hbc64gwn9c8g9lxfx58w60ysi0x8rbps6mfxalavdhbs20sv";
+          rev = "38ad91e67047bd37231497d11d409d064d510f98";
+          sha256 = "1irdc740za4vb1ixnp2j33m8xwknybdg5szj1pgy28r72w4lipfy";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/abe81fe96790ceebcf0951595644ea6a82613890/recipes/py-import-check";
           sha256 = "1261dki0q44sw9h0g1305i2fj1dg9xgwzry50jbn2idcrqg4xf7k";
-          name = "py-import-check";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -60689,8 +76158,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    py-isort = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    py-isort = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "py-isort";
         version = "20160925.318";
         src = fetchFromGitHub {
@@ -60699,10 +76171,10 @@
           rev = "e67306f459c47c53a65604e4eea88a3914596560";
           sha256 = "08i55gv392wc12x8v3dca0dmz8a8p9ljsqhyajsb6qv1k120wqhx";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/44377d11da07b49c8dc6887c948cc5ddfc065bd2/recipes/py-isort";
           sha256 = "0k5gn3bjn5pv6dn6p0m9xghn0sx3m29bj3pfrmyh6gd5ic0l00yb";
-          name = "py-isort";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -60710,8 +76182,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    py-smart-operator = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    py-smart-operator = callPackage ({ fetchFromGitHub
+                                     , fetchurl
+                                     , lib
+                                     , melpaBuild
+                                     , s }:
+      melpaBuild {
         pname = "py-smart-operator";
         version = "20170531.509";
         src = fetchFromGitHub {
@@ -60720,10 +76196,10 @@
           rev = "0c8a66faca4b35158d0b5885472cb75286039167";
           sha256 = "09pmkp24s7nwh6p4pzsjp1z65ksi9n3n2xv7d3igpa86l8qgcm2d";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a7491a1825b7aaa5f76aafadb8f04721ab1b1cfe/recipes/py-smart-operator";
           sha256 = "1n0bdr9z2s1ikhmfz642k94gjzb88anwlb61mh27ay8wqdgm74c4";
-          name = "py-smart-operator";
+          name = "recipe";
         };
         packageRequires = [ s ];
         meta = {
@@ -60731,8 +76207,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    py-test = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    py-test = callPackage ({ dash
+                           , emacs
+                           , f
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "py-test";
         version = "20151116.2222";
         src = fetchFromGitHub {
@@ -60741,10 +76223,10 @@
           rev = "3b2a0bdaacb54df6f2bee8317423e5c0d159d5cf";
           sha256 = "1s39407z3rxz10r5sshv2vj7s23ylkhg59ixasgnpjk82gl4igpf";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/84690ba6b033027772c20bf20432427b32d3231a/recipes/py-test";
           sha256 = "1mbwbzg606winf5af7qkg6a1hg79lc7k2miq4d3mwih496l5sinb";
-          name = "py-test";
+          name = "recipe";
         };
         packageRequires = [ dash emacs f ];
         meta = {
@@ -60752,8 +76234,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    py-yapf = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    py-yapf = callPackage ({ fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "py-yapf";
         version = "20160925.422";
         src = fetchFromGitHub {
@@ -60762,10 +76247,10 @@
           rev = "a878304202ad827a1f3de3dce1badd9ca8731146";
           sha256 = "1mmzqdigxx46my0h9497l25cjydy3vykg6slxkch4dzvhhlbap48";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3306c6906d4b21868b9407de27fbebdaed3d00d5/recipes/py-yapf";
           sha256 = "1381x0ffpllxwgkr2d8xxbv1nd4k475m1aff8l5qijw7d1fqga2f";
-          name = "py-yapf";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -60773,20 +76258,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    pycarddavel = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
-    melpaBuild {
+    pycarddavel = callPackage ({ emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , helm
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "pycarddavel";
         version = "20150831.516";
         src = fetchFromGitHub {
           owner = "DamienCassou";
           repo = "pycarddavel";
-          rev = "a6d81ee4eb8309cd82f6082aeca68c5a015702a3";
-          sha256 = "09glwrb9q65qdm4yd0mbi5hwdy2434zm8699ywhs6hqpjacadlmi";
+          rev = "6ead921066fa0156f20155b7126e5875ce11c328";
+          sha256 = "0qg1kjzsv2mcvlsivqy8ys3djbs5yala37r9h2zcxdicl88q0l11";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9b3d2cd943f26dcff322efb16d55dd3bd71dea07/recipes/pycarddavel";
           sha256 = "12k2mnzkd8yv17csfhclsnd479vcabawmac23yw6dsw7ic53jf1a";
-          name = "pycarddavel";
+          name = "recipe";
         };
         packageRequires = [ emacs helm ];
         meta = {
@@ -60794,20 +76284,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    pycoverage = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    pycoverage = callPackage ({ emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "pycoverage";
         version = "20160324.1812";
         src = fetchFromGitHub {
           owner = "mattharrison";
           repo = "pycoverage.el";
-          rev = "4f5451f4d6e1e2ddd5878fc7d18f5fc4fc92a83d";
-          sha256 = "0xhkzskxnj4lmf4152c3n1vp68l1xgwa277f3yg8sslg6ixkd2p0";
+          rev = "dbc152a807efcaac4e50bedb64c026674009a279";
+          sha256 = "0qap6iz865l43mixga7541c2z9kdx8zkkdcgdlgn6n8pyv8iz7qs";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/eb0310bbe8427abdcba2b30414ec26475b0b7440/recipes/pycoverage";
           sha256 = "1jaanmpnawk0r6zfzx18crqml7lv412l2l0iabp345xvfvsh8h1m";
-          name = "pycoverage";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -60815,20 +76309,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    pydoc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    pydoc = callPackage ({ fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "pydoc";
-        version = "20180302.2041";
+        version = "20180509.1519";
         src = fetchFromGitHub {
           owner = "statmobile";
           repo = "pydoc";
-          rev = "146a006493f5284fdf23b42ef90454f1be25d0c1";
-          sha256 = "1wk9zkwqi7vf0jpsf5y7hz0z198x4k9xp2fpqggkqfbv007ks1qq";
+          rev = "253a95571fa80548e2174c89fa965e689030f09c";
+          sha256 = "1linfl31i6wpbhyrrjw3xxxxi5d2747ng3bn3fk87ihd9zlbx6wz";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5c4988a66040ddf659492bdb0ae2b9617c342c69/recipes/pydoc";
           sha256 = "0sf52cb80yiridsl1pffdr3wpbgxrn2l8vnq03l70djckild477n";
-          name = "pydoc";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -60836,8 +76333,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    pydoc-info = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    pydoc-info = callPackage ({ fetchhg
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "pydoc-info";
         version = "20110301.34";
         src = fetchhg {
@@ -60845,10 +76345,10 @@
           rev = "151d877c8fb8";
           sha256 = "1mzyr6yznkyv99x9q8zx2f270ngjh8s94zvnhcbhidi57inpd1nh";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/pydoc-info";
           sha256 = "0l80g0rzkk3a1wrw2riiywz9wdyxwr5i64jb2h5r8alp9qq1k7mf";
-          name = "pydoc-info";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -60856,20 +76356,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    pyenv-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, pythonic }:
-    melpaBuild {
+    pyenv-mode = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild
+                              , pythonic }:
+      melpaBuild {
         pname = "pyenv-mode";
         version = "20170801.1648";
         src = fetchFromGitHub {
           owner = "proofit404";
           repo = "pyenv-mode";
-          rev = "eabb1c66f9e0c0500fef4d089508aad246d81dc0";
-          sha256 = "1zmgm24d6s56jc4ix61058p1k0h95vdvdllr7fh1k3bq4mw22qn3";
+          rev = "215b7f0ed3847e0c844adbff7d9b19057aa7c820";
+          sha256 = "0wb9xgpp9bc045kkw0jg14qnxa1y7ydsv1zw4nmy0mw7acxpcjgn";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/acc9b816796b9f142c53f90593952b43c962d2d8/recipes/pyenv-mode";
           sha256 = "00yqrk92knv9gq1m9xcg78gavv70jsjlwzkllzxl63iva9qrch59";
-          name = "pyenv-mode";
+          name = "recipe";
         };
         packageRequires = [ pythonic ];
         meta = {
@@ -60877,20 +76381,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    pyenv-mode-auto = callPackage ({ f, fetchFromGitHub, fetchurl, lib, melpaBuild, pyenv-mode, s }:
-    melpaBuild {
+    pyenv-mode-auto = callPackage ({ f
+                                   , fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild
+                                   , pyenv-mode
+                                   , s }:
+      melpaBuild {
         pname = "pyenv-mode-auto";
-        version = "20180216.2352";
+        version = "20180620.552";
         src = fetchFromGitHub {
           owner = "ssbb";
           repo = "pyenv-mode-auto";
-          rev = "08f319efbc31571f391e032379169ab90fa71418";
-          sha256 = "089n0s0vhwysgrkpjidy7gsl6skmzz2lg011mgiskfvqwijj2vyx";
+          rev = "b6eef88ad89865a7e0ec8bae8c6ce8239cb649c6";
+          sha256 = "1gz7145jnjcky1751pqrlhh3pq02ybsmz49ngx4ip2589nry7iyv";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f3fcb707356bd16fd0b573c176023534cd69d0d7/recipes/pyenv-mode-auto";
           sha256 = "1l7h4fas1vshkh4skxzpw7v2a11s1hwnb20n6a81yh701pbikqnd";
-          name = "pyenv-mode-auto";
+          name = "recipe";
         };
         packageRequires = [ f pyenv-mode s ];
         meta = {
@@ -60898,20 +76408,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    pyfmt = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    pyfmt = callPackage ({ fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "pyfmt";
         version = "20150521.1356";
         src = fetchFromGitHub {
           owner = "aheaume";
           repo = "pyfmt.el";
-          rev = "cb92be2cf0804cc53142dc5edb36f8e0ef5cec32";
-          sha256 = "1rp8zchvclh29rl9a1i82pcqghnhpaqnppaydxc2qx23y9pdgz9i";
+          rev = "3022283c1ae7da1b6a983fedc90179670725f8d0";
+          sha256 = "0p0hjac9qk809ygmg566avv4fkljfnrn7rk1pxh61dsj7al6kzzp";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/68d477025ae5af50bf8f7b37f2adfa9159502e13/recipes/pyfmt";
           sha256 = "112kjsp763c2plhqlhydpngrabhc58ya7cszvi4119xqw2s699g6";
-          name = "pyfmt";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -60919,20 +76432,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    pygen = callPackage ({ dash, elpy, fetchFromGitHub, fetchurl, lib, melpaBuild, python-mode }:
-    melpaBuild {
+    pygen = callPackage ({ dash
+                         , elpy
+                         , fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild
+                         , python-mode }:
+      melpaBuild {
         pname = "pygen";
         version = "20161120.2106";
         src = fetchFromGitHub {
           owner = "JackCrawley";
           repo = "pygen";
-          rev = "9019ff44ba49d7295b1476530feab91fdadb084b";
-          sha256 = "01gmggjv36jc8660xfpfy70cydabhymd17q3z16cjqvsxapbj7nf";
+          rev = "3a5d1d1a0640865b15be05cd1eeb33bb4793b622";
+          sha256 = "0fzpvdwb7hhmfmjxzvap8413bc81lrx8r3ij3yasqaxyqw3a6vy1";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e761724e52de6fa4d92950751953645dd439d340/recipes/pygen";
           sha256 = "1ivg7a1ghg0bvz3idz7dzy5yb0ln3b2j7dfizg2g0fi4iwvc4czz";
-          name = "pygen";
+          name = "recipe";
         };
         packageRequires = [ dash elpy python-mode ];
         meta = {
@@ -60940,20 +76459,27 @@
           license = lib.licenses.free;
         };
       }) {};
-    pyim = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, pyim-basedict }:
-    melpaBuild {
+    pyim = callPackage ({ async
+                        , emacs
+                        , fetchFromGitHub
+                        , fetchurl
+                        , lib
+                        , melpaBuild
+                        , popup
+                        , pyim-basedict }:
+      melpaBuild {
         pname = "pyim";
-        version = "20180324.2310";
+        version = "20180712.640";
         src = fetchFromGitHub {
           owner = "tumashu";
           repo = "pyim";
-          rev = "78fe2db87d38fc64879621802e2fcf8b54b8acb7";
-          sha256 = "1w5qswz1ybfzk1g5w8qlid836n6nsd5zpblfkijmss4nlkwxczgs";
+          rev = "b0ad82aa86124d74f9dfbdcad24199e111e5445c";
+          sha256 = "03dq9mnz5mdbk3q9id0i4wf41r9ap3p5avihd0f4m77sspjfn9ix";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/151a0af91a58e27f724854d85d5dd9668229fe8d/recipes/pyim";
           sha256 = "1ly4xhfr3irlrwvv20j3kyz98g7barridi9n8jppc0brh2dlv98j";
-          name = "pyim";
+          name = "recipe";
         };
         packageRequires = [ async emacs popup pyim-basedict ];
         meta = {
@@ -60961,8 +76487,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    pyim-basedict = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    pyim-basedict = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "pyim-basedict";
         version = "20170726.1959";
         src = fetchFromGitHub {
@@ -60971,10 +76500,10 @@
           rev = "3196cb210e056702c5a4ea1dac1d8e1e27740fab";
           sha256 = "03jbjc5a1h22vpcybg0gmbyibaa85w2ml1pjk646qb28ljywd5aw";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/151a0af91a58e27f724854d85d5dd9668229fe8d/recipes/pyim-basedict";
           sha256 = "1y8cmccli3im5bvws2h582z7k4nj6p8brgypl8h09y3na6yjy2z9";
-          name = "pyim-basedict";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -60982,8 +76511,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    pyim-cangjie5dict = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, pyim }:
-    melpaBuild {
+    pyim-cangjie5dict = callPackage ({ fetchFromGitHub
+                                     , fetchurl
+                                     , lib
+                                     , melpaBuild
+                                     , pyim }:
+      melpaBuild {
         pname = "pyim-cangjie5dict";
         version = "20170729.1946";
         src = fetchFromGitHub {
@@ -60992,10 +76525,10 @@
           rev = "c8618590780b818db1a67a29bc47c5d25903517a";
           sha256 = "0p49h2kn8wy3b51zahzyc1cy24h3b44cg5yjpmv4w23dhsr4zlz8";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/27a58729115b038abe813601bf16bba1524cdb2c/recipes/pyim-cangjie5dict";
           sha256 = "0k2nxdlrj3m09javv599ajwd8cd5mjz0hj1j51zpv4y0l1n801bn";
-          name = "pyim-cangjie5dict";
+          name = "recipe";
         };
         packageRequires = [ pyim ];
         meta = {
@@ -61003,8 +76536,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    pyim-wbdict = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, pyim }:
-    melpaBuild {
+    pyim-wbdict = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild
+                               , pyim }:
+      melpaBuild {
         pname = "pyim-wbdict";
         version = "20170724.1527";
         src = fetchFromGitHub {
@@ -61013,10 +76550,10 @@
           rev = "114489ed97e825ae11a8d09da6e873820cf23106";
           sha256 = "187wx418pj4h8p8baf4943v9dsb6mfbn0n19r8xiil1z2cmm4ygc";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ab1cb8bc623d1f12f78fa42ce8b16514e5b07c51/recipes/pyim-wbdict";
           sha256 = "1s0i9xcnpy8kxqhsv7rqxabv5vnxsciyng398mn32mknib03315i";
-          name = "pyim-wbdict";
+          name = "recipe";
         };
         packageRequires = [ pyim ];
         meta = {
@@ -61024,8 +76561,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    pyimport = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s, shut-up }:
-    melpaBuild {
+    pyimport = callPackage ({ dash
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild
+                            , s
+                            , shut-up }:
+      melpaBuild {
         pname = "pyimport";
         version = "20180308.952";
         src = fetchFromGitHub {
@@ -61034,10 +76577,10 @@
           rev = "a6f63cf7ed93f0c0f7c207e6595813966f8852b9";
           sha256 = "1q5gqhvh4zq5dy8vns694warcz48j1hdnxg16sjck4gsi9xivbvs";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/71bc39b06cee37814960ef31c6a2056261b802fb/recipes/pyimport";
           sha256 = "1qwigplawknykw1kbm5babyyknzn43ddhbdpahvzh4wy3kycn6n8";
-          name = "pyimport";
+          name = "recipe";
         };
         packageRequires = [ dash s shut-up ];
         meta = {
@@ -61045,8 +76588,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    pyimpsort = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    pyimpsort = callPackage ({ emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "pyimpsort";
         version = "20160129.2053";
         src = fetchFromGitHub {
@@ -61055,10 +76602,10 @@
           rev = "d5c61d70896b642646dfd3c809c06174ae086c1a";
           sha256 = "05qx1p19dw3nr264shihfn33k579hd0wf4cxki5cqrxi7xzpjgrc";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/97eb7c0934298d393910419fd55d7d5f1b0cfc38/recipes/pyimpsort";
           sha256 = "0kdk3bmryfzvwf8vshfszbih8mwncf4xlb0n0n0yjn0p1n98q99k";
-          name = "pyimpsort";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -61066,20 +76613,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    pylint = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    pylint = callPackage ({ fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "pylint";
         version = "20170402.555";
         src = fetchFromGitHub {
           owner = "PyCQA";
           repo = "pylint";
-          rev = "56b5da6efd3a7ac934adbadf4d85abfc1d324d71";
-          sha256 = "09c14bsfglvlbz0y7sx0di50p1iw033g5y8f3qxbwrxba3213pkv";
+          rev = "c812c59b31ba0b3f45c4bef6d4d93f561f79949d";
+          sha256 = "1234ms5brqvx468hqpslzg4nsj42g9vjza2rp5msn15nj7cdhbxj";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a073c91d6f4d31b82f6bfee785044c4e3ae96d3f/recipes/pylint";
           sha256 = "1138a8dn9y4ypbphs1zfvr8gr4vdjcy0adsl4xfbgsls4kcdwpxx";
-          name = "pylint";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -61087,20 +76637,27 @@
           license = lib.licenses.free;
         };
       }) {};
-    pynt = callPackage ({ deferred, ein, emacs, epc, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    pynt = callPackage ({ deferred
+                        , ein
+                        , emacs
+                        , epc
+                        , fetchFromGitHub
+                        , fetchurl
+                        , lib
+                        , melpaBuild }:
+      melpaBuild {
         pname = "pynt";
-        version = "20180410.1715";
+        version = "20180710.26";
         src = fetchFromGitHub {
           owner = "ebanner";
           repo = "pynt";
-          rev = "313dd24248f26ee1257b8b20885c593d8fb19d58";
-          sha256 = "05ik3807pv6g8rc66wyybwgnscjwgl2dn9yssn35rvb95cavqq77";
+          rev = "963c43cfdb5deea7daedc269aafa79192d853154";
+          sha256 = "167hw8flq5fgxf4wzsdx07a1jgp8qg11lraj7g09ds2wrlh9awid";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fdb297084188a957a46dcd036e65d9d893044bea/recipes/pynt";
           sha256 = "07c0zc68r3pskn3bac3a8x5nrsykl90a1h22865g3i5vil76vvg3";
-          name = "pynt";
+          name = "recipe";
         };
         packageRequires = [ deferred ein emacs epc ];
         meta = {
@@ -61108,8 +76665,39 @@
           license = lib.licenses.free;
         };
       }) {};
-    pytest = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    pyramid = callPackage ({ emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild
+                           , pythonic
+                           , tablist }:
+      melpaBuild {
+        pname = "pyramid";
+        version = "20180630.1446";
+        src = fetchFromGitHub {
+          owner = "dakra";
+          repo = "pyramid.el";
+          rev = "869eb7cbb0505f62ff5e9784061b7a7d7a54ecfb";
+          sha256 = "18a7dcf7aw66fxajr1h19vgwybdwdral69v1k83fy8xvf3rm6lla";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/f786a47c2a6243c693163680146606c71502d0be/recipes/pyramid";
+          sha256 = "149p9k6wjlgamm3vrkkcdj4fqhdfsskv1jqflp1bccfkgqpi5096";
+          name = "recipe";
+        };
+        packageRequires = [ emacs pythonic tablist ];
+        meta = {
+          homepage = "https://melpa.org/#/pyramid";
+          license = lib.licenses.free;
+        };
+      }) {};
+    pytest = callPackage ({ fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild
+                          , s }:
+      melpaBuild {
         pname = "pytest";
         version = "20170614.745";
         src = fetchFromGitHub {
@@ -61118,10 +76706,10 @@
           rev = "013fccd684fc8f2092d6e1ec4203ec574e12051d";
           sha256 = "0yjnq2lyh6jr5xz29n6xxmp4lcy28wrcmw05j0zgcjdshri1pd43";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/33a854a27adbaf57d344340199f90d52747b8450/recipes/pytest";
           sha256 = "0ssib65wa20h8r6156f392l481vns5fcax6w70hcawmn84nficdh";
-          name = "pytest";
+          name = "recipe";
         };
         packageRequires = [ s ];
         meta = {
@@ -61129,8 +76717,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    python-cell = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    python-cell = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "python-cell";
         version = "20131029.1616";
         src = fetchFromGitHub {
@@ -61139,10 +76730,10 @@
           rev = "ccacd91a19be784860d687eb1e8ce88fddaacaf6";
           sha256 = "1cnjdgw3x6yb5k06z57xifywlg0kdx9ai4f1ajc0wx9aax8r5gav";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0549866c5e96f673ec9dec298e7ff9d5779d443b/recipes/python-cell";
           sha256 = "07i3vyci52jvslq28djwkgx1r157wvxd99rvqlxnmmsl5yj4k1jf";
-          name = "python-cell";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -61150,8 +76741,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    python-django = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    python-django = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "python-django";
         version = "20150821.2104";
         src = fetchFromGitHub {
@@ -61160,10 +76754,10 @@
           rev = "fc54ad74f0309670359b939f64d0f1fff68aeac4";
           sha256 = "1qckn5bi1ib54hgqbym5qqwzvbv70ria1w3c2x543xlr0l7zga6h";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/29b2cd21e7b504222aed92ec062402f3e2a818fc/recipes/python-django";
           sha256 = "02whx8g8r02mzng7d7bnbkz5n7gyzp5hcnmvd6a3lq106c0h7w9k";
-          name = "python-django";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -61171,8 +76765,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    python-docstring = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    python-docstring = callPackage ({ fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "python-docstring";
         version = "20170508.156";
         src = fetchFromGitHub {
@@ -61181,10 +76778,10 @@
           rev = "d35d2e0fbe468743c19a870fec7b28a7e725790d";
           sha256 = "11y208svg5nxw8k7cbgd2iydng40gwpr85bdnxkywd910sac5p7b";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e159e59ba0b60326cca0e1ea68fac4b85d54cd24/recipes/python-docstring";
           sha256 = "1vi30y71vflsbprp5j4phbp7x1j24vxn9d6sifaddari0g0zxpfw";
-          name = "python-docstring";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -61192,8 +76789,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    python-environment = callPackage ({ deferred, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    python-environment = callPackage ({ deferred
+                                      , fetchFromGitHub
+                                      , fetchurl
+                                      , lib
+                                      , melpaBuild }:
+      melpaBuild {
         pname = "python-environment";
         version = "20150310.153";
         src = fetchFromGitHub {
@@ -61202,10 +76803,10 @@
           rev = "401006584e32864a10c69d29f14414828909362e";
           sha256 = "0q6bib9nr6xiq6npzbngyfcjk87yyvwzq1zirr3z1h5wadm34lsk";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/283155ad56cd8eda416c83a9b7f8d43d4d1570c2/recipes/python-environment";
           sha256 = "1pq16rddw76ic5d02j5bswl9qcydi47hqmhs7r06jk46vsfzxpl7";
-          name = "python-environment";
+          name = "recipe";
         };
         packageRequires = [ deferred ];
         meta = {
@@ -61213,8 +76814,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    python-info = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    python-info = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "python-info";
         version = "20151228.1052";
         src = fetchFromGitHub {
@@ -61223,10 +76827,10 @@
           rev = "306f15441b54b25757cdfd3b327b84024ea21ed7";
           sha256 = "0zk6014dzfrb3y3nhs890x082xf044w0a8nmy6rlrj375lvhfn99";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2a30746451ec5ffab250e160c1d5bd29b8dc6b54/recipes/python-info";
           sha256 = "0kvpz1r2si94rs1iajn1ffmx7a5bgyjnzri36ajdgd5gcgh41dhy";
-          name = "python-info";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -61234,20 +76838,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    python-mode = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    python-mode = callPackage ({ fetchFromGitLab
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "python-mode";
-        version = "20180319.344";
+        version = "20180713.32";
         src = fetchFromGitLab {
           owner = "python-mode-devs";
           repo = "python-mode";
-          rev = "85b61649b5f66e966d55ffbaf90160c2b60ff410";
-          sha256 = "173i3k0nvjri1g1mkgkc2i9c9mpnsvxf1ldmm12yhadl5gl2ah07";
+          rev = "8f8ae070ac98e508e0ca0a98eeb05a77bda0156e";
+          sha256 = "0r02gi9ddbsbs41fvp93a0ng8a6a2m35x2m5fmkdx7bqpv3i4255";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/82861e1ab114451af5e1106d53195afd3605448a/recipes/python-mode";
           sha256 = "1m7c6c97xpr5mrbyzhcl2cy7ykdz5yjj90mrakd4lknnsbcq205k";
-          name = "python-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -61255,20 +76862,29 @@
           license = lib.licenses.free;
         };
       }) {};
-    python-pytest = callPackage ({ dash, dash-functional, emacs, fetchFromGitHub, fetchurl, lib, magit-popup, melpaBuild, projectile, s }:
-    melpaBuild {
+    python-pytest = callPackage ({ dash
+                                 , dash-functional
+                                 , emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , magit-popup
+                                 , melpaBuild
+                                 , projectile
+                                 , s }:
+      melpaBuild {
         pname = "python-pytest";
-        version = "20180307.844";
+        version = "20180614.253";
         src = fetchFromGitHub {
           owner = "wbolster";
           repo = "emacs-python-pytest";
-          rev = "6772ecfaa86f0f4a1a66bfd3a454c9b11956de70";
-          sha256 = "086jjygzdrcjfp7j70xs8jh8nq0xv496kza6iap7lyc3qf16b4kk";
+          rev = "1ddb1ec183872dbcf383a4cc60b60944aaba7727";
+          sha256 = "190ccqvdnxdsslsdn7c2b3a2377jrrpi4gj8rdbbksmjyr20gbf2";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d95442748827911e082a55f4fd7c348a3757e274/recipes/python-pytest";
           sha256 = "0n97akqq7dss7rsww311ljh9w1hyc4j64wjmpxjlc9lg5aqwjbh4";
-          name = "python-pytest";
+          name = "recipe";
         };
         packageRequires = [
           dash
@@ -61283,8 +76899,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    python-switch-quotes = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    python-switch-quotes = callPackage ({ emacs
+                                        , fetchFromGitHub
+                                        , fetchurl
+                                        , lib
+                                        , melpaBuild }:
+      melpaBuild {
         pname = "python-switch-quotes";
         version = "20161228.9";
         src = fetchFromGitHub {
@@ -61293,10 +76913,10 @@
           rev = "93f1e9b40e061a6cea480139e8b1362b6404abd0";
           sha256 = "1x04hnf3m8cgqp0i566q4n7kh59cayzfxka3g07kv0h543xbys4n";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d99fbd3d0c486bf89c9c0937e2ebf378be39293f/recipes/python-switch-quotes";
           sha256 = "1wc27q9ac8p7c5mfk3kznbmdd5ds4ray0csgba79n19g152y5jjc";
-          name = "python-switch-quotes";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -61304,8 +76924,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    python-test = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    python-test = callPackage ({ emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "python-test";
         version = "20171112.2137";
         src = fetchFromGitHub {
@@ -61314,10 +76938,10 @@
           rev = "f00b9de14647b15b6f36ceee77d7e9e08dd074a4";
           sha256 = "1ba3r79afd5za36g09imp546bbvx2v9j58hl1bhjahx992wywrch";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0ea68b3aa9c057e81a3e90a359a38ac16cb26c2f/recipes/python-test";
           sha256 = "16grx9xzl48dcwflfmv64wigyxlw495a6q01b1ynkqj5sjdl3fkn";
-          name = "python-test";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -61325,20 +76949,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    python-x = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, folding, lib, melpaBuild, python ? null }:
-    melpaBuild {
+    python-x = callPackage ({ cl-lib ? null
+                            , fetchFromGitLab
+                            , fetchurl
+                            , folding
+                            , lib
+                            , melpaBuild
+                            , python ? null }:
+      melpaBuild {
         pname = "python-x";
         version = "20180218.1447";
-        src = fetchFromGitHub {
+        src = fetchFromGitLab {
           owner = "wavexx";
           repo = "python-x.el";
           rev = "35d6719953e809a07c0bb8f770deb5fa712d00e5";
           sha256 = "1s24a9ji549nhlanm13gq7ghnz0zj6mwpbbmbqk8igsw3arx2nvr";
         };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/87ed5ea4868945df1bf92d1eae5d3ebb83ece117/recipes/python-x";
-          sha256 = "115mvhqfa0fa8kdk64biba7ri4xjk74qqi6vm1a5z3psam9mjcmn";
-          name = "python-x";
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/c1cf98dff029d494007fe25d29bd8bcfecc5b8e6/recipes/python-x";
+          sha256 = "03px1z27yhvc9084h9j2p0khvhkwmfxdskf0ndvz79ywp6nl7mb6";
+          name = "recipe";
         };
         packageRequires = [ cl-lib folding python ];
         meta = {
@@ -61346,41 +76976,50 @@
           license = lib.licenses.free;
         };
       }) {};
-    pythonic = callPackage ({ cl-lib ? null, dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    pythonic = callPackage ({ emacs
+                            , f
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild
+                            , s }:
+      melpaBuild {
         pname = "pythonic";
-        version = "20180208.214";
+        version = "20180624.2212";
         src = fetchFromGitHub {
           owner = "proofit404";
           repo = "pythonic";
-          rev = "e8102636cdd44a65638e3752fac9834a4ea87504";
-          sha256 = "1v8qq9g9hdyia2hjkwwhsaikz528xkcirqpkgv6m9glbd3831h21";
+          rev = "838eaf47c23628c5e88a59796bbe4653c57bf5c0";
+          sha256 = "11gq0crq9ng6wy15kpv3zgahczyzv8clakwal1mvb6b5jq6ndmb5";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5589c55d459f15717914061d0f0f4caa32caa13c/recipes/pythonic";
           sha256 = "1hq0r3vg8vmgw89wfjdqknwm76pimlk0dy56wmh9vffh06gqsb51";
-          name = "pythonic";
+          name = "recipe";
         };
-        packageRequires = [ cl-lib dash emacs f s ];
+        packageRequires = [ emacs f s ];
         meta = {
           homepage = "https://melpa.org/#/pythonic";
           license = lib.licenses.free;
         };
       }) {};
-    pyvenv = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    pyvenv = callPackage ({ fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "pyvenv";
-        version = "20180415.614";
+        version = "20180629.514";
         src = fetchFromGitHub {
           owner = "jorgenschaefer";
           repo = "pyvenv";
-          rev = "d7f89bd4fd3d3be7f6ef82caed51b4e7d1d754fa";
-          sha256 = "1dmj4yfbwlp9259is8av9ggsx08dfhqj2jd18hvvpxbhfqcybi8j";
+          rev = "c1123def7e0d9da57d034d3a6bd3044a738aa8db";
+          sha256 = "0mi86m5z3hig65yd0k224wx6x9i0nz9fcv91njy0ypifxh5hcd8v";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e37236b89b9705ba7a9d134b1fb2c3c003953a9b/recipes/pyvenv";
           sha256 = "0gai9idss1wvryxyqk3pv854mc2xg9hd0r55r2blql8n5rd2yv8v";
-          name = "pyvenv";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -61388,20 +77027,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    qiita = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, markdown-mode, melpaBuild }:
-    melpaBuild {
+    qiita = callPackage ({ fetchFromGitHub
+                         , fetchurl
+                         , helm
+                         , lib
+                         , markdown-mode
+                         , melpaBuild }:
+      melpaBuild {
         pname = "qiita";
         version = "20140118.44";
         src = fetchFromGitHub {
           owner = "gongo";
           repo = "qiita-el";
-          rev = "93c697b97d540fd1601a13a3d9889fb939b19878";
-          sha256 = "0ggivlaj29rbbhkjpf3bf7vr96xjzffas0sf5m54qh6nyz6nnha5";
+          rev = "d38988863a17a6fa8af617349b033c53b7634a83";
+          sha256 = "0m3sr3csab80y408y5rm2ph379n5g5sv08wr32arfh815x3ql0wk";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d8065a58e297c50c031de97d2d80bce5857bd803/recipes/qiita";
           sha256 = "1kzk7pc68ks9gxm2l2d28al23gxh56z0cmkl80qwg7sh4gsmhyxl";
-          name = "qiita";
+          name = "recipe";
         };
         packageRequires = [ helm markdown-mode ];
         meta = {
@@ -61409,20 +77053,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    ql = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ql = callPackage ({ emacs
+                      , fetchFromGitHub
+                      , fetchurl
+                      , lib
+                      , melpaBuild }:
+      melpaBuild {
         pname = "ql";
-        version = "20180404.943";
+        version = "20180418.1320";
         src = fetchFromGitHub {
           owner = "ieure";
           repo = "ql-el";
-          rev = "c885d125d8972374b408f6eddf031e44dc6fa0c6";
-          sha256 = "1l1jdvz1913m03ikcf9g3dsraaajqac1kzfy9c9xhzx8w7bbl80c";
+          rev = "d976414ba6aa576ad524b5ee5bfa620efd072258";
+          sha256 = "138h4ndnzpphsmi4b8yw53mxc3rnqrj1c3jp8njx5pkmiqkp1q00";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/475bd8fd66c6d5b5c7e74aa2c4e094d313cc8303/recipes/ql";
           sha256 = "0wxjblqacs5nx2hyh7r6rlv1yngbhn6phn5rni4dw2dms98zj34z";
-          name = "ql";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -61430,8 +77078,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    qml-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    qml-mode = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "qml-mode";
         version = "20161015.1731";
         src = fetchFromGitHub {
@@ -61440,10 +77091,10 @@
           rev = "6c5f33ba88ae010bf201a80ee8095e20a724558c";
           sha256 = "1sncsvzjfgmhp4m8w5jd4y51k24n2jfpgvrkd64wlhhzbj3wb947";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f3abc88ddbb6b8ecafa45e75ceba9a1294ad88d4/recipes/qml-mode";
           sha256 = "123mlibviplzra558x87da4zx0kpbhsgfigjjgjgp3mdg897084n";
-          name = "qml-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -61451,20 +77102,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    qt-pro-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    qt-pro-mode = callPackage ({ emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "qt-pro-mode";
         version = "20170604.1141";
         src = fetchFromGitHub {
           owner = "EricCrosson";
           repo = "qt-pro-mode";
-          rev = "66601441cc728a609765b149ee0d7dcfb74dc8bf";
-          sha256 = "0azx8a7kwgn5byijgwar2rib9xv2p9w7w3yyb5bk19g3id2f8gdw";
+          rev = "1e0052fcfb89c15cb47714c1546d4e8ec6e01ae6";
+          sha256 = "11bwxq4nwfbnlk4clg0m8jh2xz0ldv4ggyaw645sy7hprvwkp8y4";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e9af710be77ccde8ffa5f22168d2c8a06b73dd6a/recipes/qt-pro-mode";
           sha256 = "1k3ph9bqvvg6i6n623qrwdpsffs8w9rv9nihmlggb4w30dwqc9nf";
-          name = "qt-pro-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -61472,20 +77127,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    quasi-monochrome-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    quasi-monochrome-theme = callPackage ({ fetchFromGitHub
+                                          , fetchurl
+                                          , lib
+                                          , melpaBuild }:
+      melpaBuild {
         pname = "quasi-monochrome-theme";
-        version = "20180307.458";
+        version = "20180516.813";
         src = fetchFromGitHub {
           owner = "lbolla";
           repo = "emacs-quasi-monochrome";
-          rev = "7c1217521616f568a1c9aba76cc87a7381b833a4";
-          sha256 = "1yg3dg6ldlpxgsxxd15qgpda0jivj4g4cyy631hakdrp5skvpmk6";
+          rev = "e803bc0c2e38f350feb8297a092812e5204781c7";
+          sha256 = "0s1pqyxahkz5rrczk8m7xiqm41rjhxsyfdl2klp2l8ih13zlwf6i";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a9c8498e4bcca19c4c24b2fd0db035c3da477e2a/recipes/quasi-monochrome-theme";
           sha256 = "0h5pqrklyga40jg8qc47lwmf8khn0vcs5jx2sdycl2ipy0ikmfs0";
-          name = "quasi-monochrome-theme";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -61493,20 +77151,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    quelpa = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    quelpa = callPackage ({ emacs
+                          , fetchgit
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "quelpa";
-        version = "20180325.1338";
-        src = fetchFromGitHub {
-          owner = "quelpa";
-          repo = "quelpa";
-          rev = "1e57420158c158275c5a098951aca25651a41bc7";
-          sha256 = "1lnvzl9a7pa0v1jzcf6n4qik4swmsm99y7bz9cscmy6i1hcd35b5";
+        version = "20180711.1338";
+        src = fetchgit {
+          url = "https://framagit.org/steckerhalter/quelpa.git";
+          rev = "66c760b43eb6158f520df4e514f1d9c8e4ddee71";
+          sha256 = "0qz5zfj24cmaw903xszf8zg4hmas6q8k6bx5c10vq45rwqkdcgva";
         };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/7dc3ba4f3efbf66142bf946d9cd31ff0c7a0b60e/recipes/quelpa";
-          sha256 = "1g53fcy837hpyn9lnmmri0h4c5va61vszhblz4caadqq265hknvs";
-          name = "quelpa";
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/a496196d405c152600d44ef4aa28557f489c542c/recipes/quelpa";
+          sha256 = "0qm4dxwlvaka6j8ismb4lhar4dzlhpvjsx6524w15ilcbdbyqqjl";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -61514,20 +77175,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    quelpa-use-package = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, quelpa, use-package }:
-    melpaBuild {
+    quelpa-use-package = callPackage ({ emacs
+                                      , fetchgit
+                                      , fetchurl
+                                      , lib
+                                      , melpaBuild
+                                      , quelpa
+                                      , use-package }:
+      melpaBuild {
         pname = "quelpa-use-package";
-        version = "20161212.1038";
-        src = fetchFromGitHub {
-          owner = "quelpa";
-          repo = "quelpa-use-package";
-          rev = "cd4820a34819516f26df0fe2e4d416bdea468e89";
-          sha256 = "0wbmf0ihxldgrx43c3wiaapssn8qimcyaa3hg2x2j1q05c2qlgcg";
+        version = "20180617.2356";
+        src = fetchgit {
+          url = "https://framagit.org/steckerhalter/quelpa-use-package.git";
+          rev = "54ebc63607647fe4f26b56519d81e18f0e70a689";
+          sha256 = "1f007lkjb42rlfsnwkj61fdqyncw4587x8a9qbhq583bfh2d3p5c";
         };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/b581e411ef5ea3954acc2cd997c87b3b86777333/recipes/quelpa-use-package";
-          sha256 = "0p09w419kldgl913hgqfzyv2pck27vqq2i1xsx7g29biwgnp9hl9";
-          name = "quelpa-use-package";
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/a496196d405c152600d44ef4aa28557f489c542c/recipes/quelpa-use-package";
+          sha256 = "1rdhnv7iz9clcy68j1gqv8cwq70ip4w12179v553lyikk9icrpp8";
+          name = "recipe";
         };
         packageRequires = [ emacs quelpa use-package ];
         meta = {
@@ -61535,8 +77201,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    quick-buffer-switch = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    quick-buffer-switch = callPackage ({ fetchFromGitHub
+                                       , fetchurl
+                                       , lib
+                                       , melpaBuild }:
+      melpaBuild {
         pname = "quick-buffer-switch";
         version = "20151007.1508";
         src = fetchFromGitHub {
@@ -61545,10 +77214,10 @@
           rev = "d5fdd67b4c9f04b7a7122da2215e4ae076a03b1b";
           sha256 = "0kh63nzdzwxksn2ar2i1ds7n96jga2dhhc9gg27p1g2ca66fs6h5";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/30f167afc241f3ec24c092f2f06dbabd4dd11bcc/recipes/quick-buffer-switch";
           sha256 = "1fsnha3x3pgq582libb3dmxb93aagv1avnc0rigpfd7hv6bagj40";
-          name = "quick-buffer-switch";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -61556,20 +77225,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    quick-peek = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    quick-peek = callPackage ({ emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "quick-peek";
-        version = "20170327.27";
+        version = "20180525.711";
         src = fetchFromGitHub {
           owner = "cpitclaudel";
           repo = "quick-peek";
-          rev = "6a006fbf1a41b04c0e7522d50c942ec89c3637fc";
-          sha256 = "06rww4a6j7wc32hvay83xcjl16aykm8hwlsh764fx9hfxxfa1fka";
+          rev = "3cc57cc12f4b5f27a18cc5fb0c32c3a943c16158";
+          sha256 = "0wrgdny402z95234kn86k17qn1v3sg8bfdn48y9mg52dk7wnsxvf";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/68f59a3048ec6196b138b6584a22ce70baa38284/recipes/quick-peek";
           sha256 = "0ivg6v9c535bw2bv636wmkd4sy037j55054bfm31wvvxk99bndwq";
-          name = "quick-peek";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -61577,8 +77250,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    quick-preview = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    quick-preview = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "quick-preview";
         version = "20150828.2139";
         src = fetchFromGitHub {
@@ -61587,10 +77263,10 @@
           rev = "29c884c6ab385ef67d9aa656ebb7c94cabeb5c35";
           sha256 = "1cp3z05qjy7qvjjv105ws1j9qykx8sl4s13xff0ijwvjza6ga44c";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/98270840568fa1fca2d92f26108444fb24609e83/recipes/quick-preview";
           sha256 = "18janbmhbwb6a46fgc1sxl9ww591v60y3wgh2wqh62vdy4ix3bd9";
-          name = "quick-preview";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -61598,8 +77274,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    quick-shell-keybind = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    quick-shell-keybind = callPackage ({ emacs
+                                       , fetchFromGitHub
+                                       , fetchurl
+                                       , lib
+                                       , melpaBuild }:
+      melpaBuild {
         pname = "quick-shell-keybind";
         version = "20171022.2313";
         src = fetchFromGitHub {
@@ -61608,10 +77288,10 @@
           rev = "5f4541a5a5554d108bf16b5fd1713e962161ca1b";
           sha256 = "19hqywwf80q6ay886xmcjjpr4pghkw78hzdg0mrpkpkqn2vj06gk";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e9bf4d78da24d88476545f97b2af0527dde73600/recipes/quick-shell-keybind";
           sha256 = "1f66wk2m0yykcbq6qbalgscpq8s53qshyyqdnimlmdi0g0glif1b";
-          name = "quick-shell-keybind";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -61619,8 +77299,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    quickref = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    quickref = callPackage ({ dash
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild
+                            , s }:
+      melpaBuild {
         pname = "quickref";
         version = "20170817.532";
         src = fetchFromGitHub {
@@ -61629,10 +77314,10 @@
           rev = "f368c8b8219bb90498c5ab84e26f00eedaa234cf";
           sha256 = "0nalnfb816qk1dfxjk9j8r5lvzv2k4jf747xdjbj2mcvv07g2jd2";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/acc9b816796b9f142c53f90593952b43c962d2d8/recipes/quickref";
           sha256 = "0jahi84ra9g7h0cvz3c02zkbkknrzgv48zq32n72lkxl958swqn1";
-          name = "quickref";
+          name = "recipe";
         };
         packageRequires = [ dash s ];
         meta = {
@@ -61640,8 +77325,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    quickrun = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    quickrun = callPackage ({ emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "quickrun";
         version = "20170222.1715";
         src = fetchFromGitHub {
@@ -61650,10 +77339,10 @@
           rev = "55bbe5d54b80206ea5a60bf2f58eb6368b2c8201";
           sha256 = "1skbd5q99d9rwfi954r9p7b7nhwcfijq30z0fpdhbi1iiabf7vqz";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/81f0f525680fea98e804f39dbde1dada887e8821/recipes/quickrun";
           sha256 = "0f989d6niw6ghf9mq454kqyp0gy7gj34vx5l6krwc52agckyfacy";
-          name = "quickrun";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -61661,8 +77350,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    quiet = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    quiet = callPackage ({ fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "quiet";
         version = "20160508.556";
         src = fetchFromGitHub {
@@ -61671,10 +77363,10 @@
           rev = "6f20309f99e26fcae2601d1544b342f044e54baf";
           sha256 = "14q7x341gqcxn3bq72wmfxipqmj2dh35kxcrwjkyghbsbd43rv8n";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/443425d9e4412a1e3e8117f97c255c8420223542/recipes/quiet";
           sha256 = "1jq65jpx0rlkc0dzy55gs37ybpjzvcv06ahwiw1lk2n92g4pi96a";
-          name = "quiet";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -61682,20 +77374,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    quiz = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    quiz = callPackage ({ cl-lib ? null
+                        , emacs
+                        , fetchFromGitHub
+                        , fetchurl
+                        , lib
+                        , melpaBuild }:
+      melpaBuild {
         pname = "quiz";
         version = "20170818.415";
         src = fetchFromGitHub {
           owner = "davep";
           repo = "quiz.el";
-          rev = "c43151212ead2330e7ec8e5ac6914c617a12e4f8";
-          sha256 = "09r3p6gw17xrsm0pk6yv4lg8i3yf03yx2mlj4mi9i0r765m01c27";
+          rev = "b7c8fc14ebad50ca170c40e4ecb07b7f49f054ba";
+          sha256 = "1kxivd572ww5c6m7d3183ikiyrgvmvhbs8kkyhpc9y3y8ziaid1x";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/23d547c0d69d8f5d1e9983e3669a63dffaede2b3/recipes/quiz";
           sha256 = "0pcjfhk109ifi834jw8lndwhpfcv764wym1dhiqhp5qd2vf431kg";
-          name = "quiz";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -61703,20 +77400,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    r-autoyas = callPackage ({ ess, fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
-    melpaBuild {
+    r-autoyas = callPackage ({ ess
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild
+                             , yasnippet }:
+      melpaBuild {
         pname = "r-autoyas";
         version = "20140101.710";
         src = fetchFromGitHub {
           owner = "mattfidler";
           repo = "r-autoyas.el";
-          rev = "b4020ee7f5f895e0065b8b26da8a49c51432d530";
-          sha256 = "0dhljmdlg4p832w9s7rp8vznkpjkwpg8k9hj95cn2h76c0afwz3j";
+          rev = "d321a7da0ef2e94668d53e0807277da7b70ea678";
+          sha256 = "1m4iwza0dvwzqfapwpsrbphgnxbv5vhw8ar332pj8i16vh3h0fry";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3a095d3a687055c6ac43a4338826542d14a25127/recipes/r-autoyas";
           sha256 = "18zifadsgbwnga205jvpx61wa2dvjxmxs5v7cjqhny45a524nbv4";
-          name = "r-autoyas";
+          name = "recipe";
         };
         packageRequires = [ ess yasnippet ];
         meta = {
@@ -61724,20 +77426,29 @@
           license = lib.licenses.free;
         };
       }) {};
-    racer = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pos-tip, rust-mode, s }:
-    melpaBuild {
+    racer = callPackage ({ dash
+                         , emacs
+                         , f
+                         , fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild
+                         , pos-tip
+                         , rust-mode
+                         , s }:
+      melpaBuild {
         pname = "racer";
-        version = "20171211.1548";
+        version = "20180708.2325";
         src = fetchFromGitHub {
           owner = "racer-rust";
           repo = "emacs-racer";
-          rev = "cb74060bbaff8e505ba36e20e4a3a763ee7dd4c8";
-          sha256 = "1azhvwm42sracyg9vj51k72pq3mm2gfimdvrbz50p5ijmirmllja";
+          rev = "dd7f179efbab6597eb7eb1d66883f168b3dc5573";
+          sha256 = "0drawn72lg6xxzg85909gfgrckh641m70gzqzrabcdqizfcxm5pk";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/97b97037c19655a3ddffee9a86359961f26c155c/recipes/racer";
           sha256 = "1091y5pisbf73i6zg5d7yny2d5yckkjg0z6fpjpmz5qjs3xcm9wi";
-          name = "racer";
+          name = "recipe";
         };
         packageRequires = [ dash emacs f pos-tip rust-mode s ];
         meta = {
@@ -61745,20 +77456,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    racket-mode = callPackage ({ emacs, faceup, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    racket-mode = callPackage ({ emacs
+                               , faceup
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild
+                               , s }:
+      melpaBuild {
         pname = "racket-mode";
-        version = "20180401.1803";
+        version = "20180629.1144";
         src = fetchFromGitHub {
           owner = "greghendershott";
           repo = "racket-mode";
-          rev = "aea74aceddf112cdfb918aa5ddb9842f0d56c744";
-          sha256 = "0cqzj8qjcqwakikklx0yb193gyqvj5fvcr2acmlqzy8xwr0v65jd";
+          rev = "ee11689a50c72aabd59ab2cabeac2d803d16417d";
+          sha256 = "1h0gn5bypcq6h5p22grqmh4zv8dzg4apjafpnxbhyd7fb10rbd0a";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7ad88d92cf02e718c9318d197dd458a2ecfc0f46/recipes/racket-mode";
           sha256 = "04sr55zrgwyi48sj4ssm4rmm327yxs7hvjhxclnkhaaigrmrv7jb";
-          name = "racket-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs faceup s ];
         meta = {
@@ -61766,8 +77483,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    rails-log-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    rails-log-mode = callPackage ({ fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "rails-log-mode";
         version = "20140407.2125";
         src = fetchFromGitHub {
@@ -61776,10 +77496,10 @@
           rev = "ff440003ad7d47cb0ac3300f2a632f4cfd36a446";
           sha256 = "1fh8wsb0pa2isr1kgh3v9zmmxq1nlmqwqk4z34dw5wpaiyihmk84";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7ebbf4364759c8e38d550e66fd0ce193f4214e15/recipes/rails-log-mode";
           sha256 = "0h7gfg0c5pwfh18qzg1mx7an9p958ygdfqb54s85mbkv8x3rh1a0";
-          name = "rails-log-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -61787,8 +77507,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    railscasts-reloaded-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    railscasts-reloaded-theme = callPackage ({ fetchFromGitHub
+                                             , fetchurl
+                                             , lib
+                                             , melpaBuild }:
+      melpaBuild {
         pname = "railscasts-reloaded-theme";
         version = "20180131.2246";
         src = fetchFromGitHub {
@@ -61797,10 +77520,10 @@
           rev = "6312f01470dcc73537dbdaaccabd59c4d18d23a9";
           sha256 = "1fqpqgkpn36kj3fb4na0w4cjwln05rvy6w1q5czas8z37rk2bs33";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9817851bd06cbae30fb8f429401f1bbc0dc7be09/recipes/railscasts-reloaded-theme";
           sha256 = "1iy30mnm3s7p7qigrm3lvv7xjgwvinwg6yg0hry2aifwn88cnwmz";
-          name = "railscasts-reloaded-theme";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -61808,8 +77531,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    railscasts-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    railscasts-theme = callPackage ({ fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "railscasts-theme";
         version = "20150219.725";
         src = fetchFromGitHub {
@@ -61818,10 +77544,10 @@
           rev = "1340c3f6c2717761cab95617cf8dcbd962b1095b";
           sha256 = "021x1l5kzsbm0qj5a3bngxa7ickm4lbwsdz81a2ks9pi1ivmw205";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a0366a9844f6c28dfc3d5ba26201865921981574/recipes/railscasts-theme";
           sha256 = "1z5m8ccx2k18gbzqvg0051mp2myy2qncf4xvv47k80f83pk2hw6r";
-          name = "railscasts-theme";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -61829,8 +77555,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    rainbow-blocks = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    rainbow-blocks = callPackage ({ fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "rainbow-blocks";
         version = "20171025.738";
         src = fetchFromGitHub {
@@ -61839,10 +77568,10 @@
           rev = "dd435d7bb34ff6f162a5f315df308b90b7e9f842";
           sha256 = "06yfb3i7wzvqrhkb61zib9xvpb5i00s4frizkzff66im05k0n795";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/rainbow-blocks";
           sha256 = "1zf1z1hnp8q0s9za7nnpq83isbpmz26l8hxafz0h0b5dz1w2vlvs";
-          name = "rainbow-blocks";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -61850,8 +77579,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    rainbow-delimiters = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    rainbow-delimiters = callPackage ({ fetchFromGitHub
+                                      , fetchurl
+                                      , lib
+                                      , melpaBuild }:
+      melpaBuild {
         pname = "rainbow-delimiters";
         version = "20170929.432";
         src = fetchFromGitHub {
@@ -61860,10 +77592,10 @@
           rev = "19b93892afa0494ba749c2ca9c154e04447ad778";
           sha256 = "0c2a8pbhzzy0bxx8gxz320r106k69hvwkn43j06i6sidbgjwh786";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d2cf11dbff76f0e3581b865f48bb44a307aa7f23/recipes/rainbow-delimiters";
           sha256 = "132nslbnszvbgkl0819z811yar3lms1hp5na4ybi9gkmnb7bg4rg";
-          name = "rainbow-delimiters";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -61871,8 +77603,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    rainbow-identifiers = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    rainbow-identifiers = callPackage ({ emacs
+                                       , fetchFromGitHub
+                                       , fetchurl
+                                       , lib
+                                       , melpaBuild }:
+      melpaBuild {
         pname = "rainbow-identifiers";
         version = "20141102.726";
         src = fetchFromGitHub {
@@ -61881,10 +77617,10 @@
           rev = "19fbfded1baa98d12335f26f6d7b20e5ae44ce2e";
           sha256 = "05i0jpmxzsj2lsj48cafn3v93z37l7k5kaza2ik3yirdpjdibyrh";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/975aadd9fe1faf9ad617ba6200ca77185b87e7c0/recipes/rainbow-identifiers";
           sha256 = "0lw790ymrgpyh0sxwmzinl2ik5vl5vggbg14cd0cx5yagkw5y3mp";
-          name = "rainbow-identifiers";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -61892,8 +77628,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    rake = callPackage ({ cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    rake = callPackage ({ cl-lib ? null
+                        , dash
+                        , f
+                        , fetchFromGitHub
+                        , fetchurl
+                        , lib
+                        , melpaBuild }:
+      melpaBuild {
         pname = "rake";
         version = "20180212.208";
         src = fetchFromGitHub {
@@ -61902,10 +77644,10 @@
           rev = "9c204334b03b4e899fadae6e59c20cf105404128";
           sha256 = "09k2fqkmqr6g19rvqr5x2kpj1cn3wkncxg50hz02vmsrbgmzmnja";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bf0f84698dda02a5b84a244ee29a23a6faa9de68/recipes/rake";
           sha256 = "0cw47g6cjnkh3z4hbwwq1f8f5vrvs84spn06k53bx898brqdh8ns";
-          name = "rake";
+          name = "recipe";
         };
         packageRequires = [ cl-lib dash f ];
         meta = {
@@ -61913,8 +77655,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    rally-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, popwin }:
-    melpaBuild {
+    rally-mode = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild
+                              , popwin }:
+      melpaBuild {
         pname = "rally-mode";
         version = "20161113.1954";
         src = fetchFromGitHub {
@@ -61923,10 +77669,10 @@
           rev = "0f5e09a6abe2de7613f174b4f54863df93343134";
           sha256 = "1vrsv8ph1v853ii0i3q889xlwxnjdqz4bs3ipi502rjx6g7y5gdz";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0914825c6d5ad26d2a8035fc33ad98df42df3c53/recipes/rally-mode";
           sha256 = "1vzsh5855bzln3p3235yccl2azpndpc4rh95zrx6p1k62h2kv0y1";
-          name = "rally-mode";
+          name = "recipe";
         };
         packageRequires = [ popwin ];
         meta = {
@@ -61934,8 +77680,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    rand-theme = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    rand-theme = callPackage ({ cl-lib ? null
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "rand-theme";
         version = "20151219.1535";
         src = fetchFromGitHub {
@@ -61944,10 +77694,10 @@
           rev = "65a00e5c5150f857aa96803b68f50bc8da0215b7";
           sha256 = "0fmajgqf9j21qn7h35sky5di8cnma432g0ki9d5m41byxp9y1bdl";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/rand-theme";
           sha256 = "0c2xs99jgrhk6f1s6pls8pigg6qwcr4imnwdlngwzr0jz8jhqvxa";
-          name = "rand-theme";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -61955,20 +77705,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    random-splash-image = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    random-splash-image = callPackage ({ fetchFromGitHub
+                                       , fetchurl
+                                       , lib
+                                       , melpaBuild }:
+      melpaBuild {
         pname = "random-splash-image";
         version = "20151002.1830";
         src = fetchFromGitHub {
           owner = "kakakaya";
           repo = "random-splash-image";
-          rev = "53a39ebfd8ac6be066a652a508a717870f94218a";
-          sha256 = "1mky9xhghzz34sswqm2v3jhfc25fdrjx4hh4a1hs4h45g1v58lm9";
+          rev = "907e2db5ceff781ac7f4dbdd65fe71736c36aa22";
+          sha256 = "1z25xmz8pl3rsfahw6ay8wx5wbnlxabnzr2dq20m0i5jyci8lqll";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2bfbfe83143299b86f867c4d7faf6a0d7a070e1e/recipes/random-splash-image";
           sha256 = "1j454jy4ia2wrgi3fxzjfdqi3z8x13hq8kh62lnb84whs7a1nhik";
-          name = "random-splash-image";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -61976,8 +77729,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    ranger = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ranger = callPackage ({ emacs
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "ranger";
         version = "20170817.857";
         src = fetchFromGitHub {
@@ -61986,10 +77743,10 @@
           rev = "6bbff5df2e55f56047fca5058d9ca93ba4963aef";
           sha256 = "000dqqy5fbic8rwyndchj5pjmzad2yfa7z3xzi84dla6vhv15q6p";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0207e754f424823fb48e9c065c3ed9112a0c445b/recipes/ranger";
           sha256 = "14g4r4iaz0nzfsklslrswsik670pvfd0605xfjghvpngn2a8ych4";
-          name = "ranger";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -61997,8 +77754,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    rase = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    rase = callPackage ({ fetchFromGitHub
+                        , fetchurl
+                        , lib
+                        , melpaBuild }:
+      melpaBuild {
         pname = "rase";
         version = "20120928.1345";
         src = fetchFromGitHub {
@@ -62007,10 +77767,10 @@
           rev = "59b5f7e8102570b65040e8d55781c7ea28de7338";
           sha256 = "1i16361klpdsxphcjdpxqswab3ing69j1wb9nygws7ghil85h0bx";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/334419debe065c34665bb0207574d1d4dfb9e8ae/recipes/rase";
           sha256 = "1g7v2z7l4csl5by64hc3zg4kgrkvv81iq30mfqq4nvy1jc0xa6j0";
-          name = "rase";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -62018,8 +77778,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    rats = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild, s }:
-    melpaBuild {
+    rats = callPackage ({ cl-lib ? null
+                        , fetchFromGitHub
+                        , fetchurl
+                        , go-mode
+                        , lib
+                        , melpaBuild
+                        , s }:
+      melpaBuild {
         pname = "rats";
         version = "20170818.313";
         src = fetchFromGitHub {
@@ -62028,10 +77794,10 @@
           rev = "a6d55aebcc54f669c6c6ffedf84364c4097903cc";
           sha256 = "0cskw05jb7wckhfs2qs9pn5icxa93ay2mw2i1brsmdd0igz34lg3";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a62cbae1b2d9af2322bb6a27949de8c8bfddc2b7/recipes/rats";
           sha256 = "0jhwiq9yzwpyqhk3c32vqx8nryingzh58psxbzjl3812b7xdqphr";
-          name = "rats";
+          name = "recipe";
         };
         packageRequires = [ cl-lib go-mode s ];
         meta = {
@@ -62039,8 +77805,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    rbenv = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    rbenv = callPackage ({ fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "rbenv";
         version = "20141119.2349";
         src = fetchFromGitHub {
@@ -62049,10 +77818,10 @@
           rev = "2ea1a5bdc1266caef1dd77700f2c8f42429b03f1";
           sha256 = "0yd0rs6fnc6lsfi7pivw5sivh698055r8ifj9vrxb82dcx2y6v2h";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/rbenv";
           sha256 = "1skh1v8dgwl1f9m3pmy2s3rnzp8n3cydi3579fgjv4mzi81k3d5q";
-          name = "rbenv";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -62060,8 +77829,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    rbt = callPackage ({ fetchFromGitHub, fetchurl, lib, magit, melpaBuild, popup }:
-    melpaBuild {
+    rbt = callPackage ({ fetchFromGitHub
+                       , fetchurl
+                       , lib
+                       , magit
+                       , melpaBuild
+                       , popup }:
+      melpaBuild {
         pname = "rbt";
         version = "20170202.1502";
         src = fetchFromGitHub {
@@ -62070,10 +77844,10 @@
           rev = "32bfba9062a014e375451cf4203c29535b5efc1e";
           sha256 = "0jzhyf42m9gqcnsz9gxc9wk8bbb9a7fj78swwyj0wqn9jm8jxbra";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ca7241985be1e8a26a454b8136a537040b7ae801/recipes/rbt";
           sha256 = "1mrb6v8zybvhh242vvq0kdvg6cvws7gabfhcydrw5g2njhyqkygm";
-          name = "rbt";
+          name = "recipe";
         };
         packageRequires = [ magit popup ];
         meta = {
@@ -62081,8 +77855,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    rc-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    rc-mode = callPackage ({ fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "rc-mode";
         version = "20160913.1218";
         src = fetchFromGitHub {
@@ -62091,10 +77868,10 @@
           rev = "fe2e0570bf9c19a292e16b18fd4b0a256df5d93f";
           sha256 = "0skjg3l3ss8nlrpnpjjflmf7wjib4jfarkmx4438nc6vm6553fmn";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d8062b2e5b2744a6e614b389cca7e7f21b582f6f/recipes/rc-mode";
           sha256 = "0p77mckw8jyxcwspj1ffm8mz0k01ddm67hh9j8rw812wddwnj7qf";
-          name = "rc-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -62102,8 +77879,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    rcirc-alert = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    rcirc-alert = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "rcirc-alert";
         version = "20141127.247";
         src = fetchFromGitHub {
@@ -62112,10 +77892,10 @@
           rev = "0adf8ff9c47023fec578f678424be62b0f49057f";
           sha256 = "0xdyrp0zs2v2glpfwlajmj97wygwi0y492zbp6rp3caa5bj3j4z2";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/735aa2256660efffdaf6ecbd61a3e2818a48327f/recipes/rcirc-alert";
           sha256 = "0lyd3gz1sflp93xb7xbvk1gh69w468ync1p144avyh2pybl40q4a";
-          name = "rcirc-alert";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -62123,8 +77903,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    rcirc-alertify = callPackage ({ alert, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    rcirc-alertify = callPackage ({ alert
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "rcirc-alertify";
         version = "20140406.1819";
         src = fetchFromGitHub {
@@ -62133,10 +77917,10 @@
           rev = "ea5cafc55893f375eccbe013d12dbaa94bf6e259";
           sha256 = "1mpk5rzsil298q3ppv5v9jrn274v71jffyz0jihrksh1wbjzwhlx";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d1559b0e19e571c83c25ac7104e269ebc42d8f14/recipes/rcirc-alertify";
           sha256 = "13448bykmy0jqcajhn2gjiar3m8cingyr8394vxybp2m1zvv0pws";
-          name = "rcirc-alertify";
+          name = "recipe";
         };
         packageRequires = [ alert ];
         meta = {
@@ -62144,8 +77928,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    rcirc-groups = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    rcirc-groups = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "rcirc-groups";
         version = "20170731.1401";
         src = fetchFromGitHub {
@@ -62154,10 +77941,10 @@
           rev = "b68ece9d219b909244d4e3c0d8bf6a746d6fead7";
           sha256 = "196x3qg22rhh917diml1q0hszqrqwg0klzp96q1c7c744mlq82fx";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/35b9c9e877c686df0ac9f96855d733a240063829/recipes/rcirc-groups";
           sha256 = "1iws3f8vkwrflcj6ni8nmf1wcw1jrlnssm76kzzhag77ry3iswgx";
-          name = "rcirc-groups";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -62165,8 +77952,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    rcirc-notify = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    rcirc-notify = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "rcirc-notify";
         version = "20150219.1404";
         src = fetchFromGitHub {
@@ -62175,10 +77965,10 @@
           rev = "841a7b5a6cdb0c11a812df924d2c6a7d364fd455";
           sha256 = "1k4knsrca626pikgaalqbqwy7im4wz1vrmzzhdrdb4lhdz6sq3q3";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/009e2db47c9fe730fff1dc807e52c86b3ab26446/recipes/rcirc-notify";
           sha256 = "0mwhzkbzhpq4jws05p7qp0kbay8kcblb9xikznm0i8drpdyc617v";
-          name = "rcirc-notify";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -62186,8 +77976,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    rcirc-styles = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    rcirc-styles = callPackage ({ cl-lib ? null
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "rcirc-styles";
         version = "20160206.1850";
         src = fetchFromGitHub {
@@ -62196,10 +77990,10 @@
           rev = "f313bf6a7470bed314b27c7a40558cb787d7bc67";
           sha256 = "1kwn33rxaqik5jls66c2indvswhwmxdmd60n7a1h9siqm5qhy9d6";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/10771a996c8a9dc1eb211cddff53db7b2b01e00b/recipes/rcirc-styles";
           sha256 = "01dxhnzsnljig769dk9axdi970b3lw2s6p1z3ljf29qlb5j4548r";
-          name = "rcirc-styles";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -62207,8 +78001,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    rdf-prefix = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    rdf-prefix = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "rdf-prefix";
         version = "20180127.1006";
         src = fetchFromGitHub {
@@ -62217,10 +78014,10 @@
           rev = "164136d05505275d42d1ca3a390f55fcc89694b8";
           sha256 = "18jp3yynnk2248mzwf8h62awfw8fh25m5ah5di0dg62xw56l9nig";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5f083bd629697038ea6391c7a4eeedc909a5231/recipes/rdf-prefix";
           sha256 = "1vxgn5f2kws17ndfdv1vj5p9ks3rp6sikzpc258j07bhsfpjz5qm";
-          name = "rdf-prefix";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -62228,8 +78025,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    rdp = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    rdp = callPackage ({ fetchFromGitHub
+                       , fetchurl
+                       , lib
+                       , melpaBuild }:
+      melpaBuild {
         pname = "rdp";
         version = "20120928.1854";
         src = fetchFromGitHub {
@@ -62238,10 +78038,10 @@
           rev = "b620192afada04aec33b38cc130fef0765f41ca9";
           sha256 = "08l96bhghmnckar4i6afj9csqglasmpmby1r7j38ic9bp37z2yqd";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e2dd8ef80d344c9801f7d0a26b0e3ea33a53bf89/recipes/rdp";
           sha256 = "0lj3idwv4fxz8pi8mnxkbhwhzaa1gs6ib4nzly3fc6yiix9ampkz";
-          name = "rdp";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -62249,8 +78049,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    rdxmk = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    rdxmk = callPackage ({ fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "rdxmk";
         version = "20170629.1834";
         src = fetchFromGitHub {
@@ -62259,10 +78062,10 @@
           rev = "e78749fb29738365ffa4d863ffabeb969ebb0bcf";
           sha256 = "0gwlqjk84ih89c2ckx0rrw07jgwd32wfwj4mibchdrn0ai891md0";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/db54339795e0519f154328e54d47a7a0c80afc71/recipes/rdxmk";
           sha256 = "14iavsgqp28y2ykgly8x69sny34r32dl4bpb47m921vk5n4y6zky";
-          name = "rdxmk";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -62270,8 +78073,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    react-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
-    melpaBuild {
+    react-snippets = callPackage ({ fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild
+                                  , yasnippet }:
+      melpaBuild {
         pname = "react-snippets";
         version = "20170803.1550";
         src = fetchFromGitHub {
@@ -62280,10 +78087,10 @@
           rev = "bfc4b68b81374a6a080240592641091a7e8a6d61";
           sha256 = "1wna4v8l3j0ppjv4nj72lhp0yh6vbka6bvl1paqqfvay300kiqjb";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3720192fdfa45f9b83259ab39356f469c5ac85b4/recipes/react-snippets";
           sha256 = "0chs0h41nb2fdz02hdsaynz7ma8fg66a8m1q1np0464skrsdaj73";
-          name = "react-snippets";
+          name = "recipe";
         };
         packageRequires = [ yasnippet ];
         meta = {
@@ -62291,20 +78098,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    read-aloud = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    read-aloud = callPackage ({ emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "read-aloud";
         version = "20160922.2200";
         src = fetchFromGitHub {
           owner = "gromnitsky";
           repo = "read-aloud.el";
-          rev = "c662366226abfb07204ab442b4f853ed85438d8a";
-          sha256 = "0wmfjbk3s45wj8j6xwfdldxwkrxsfcby2a242r2p88y3f8pp30i1";
+          rev = "d5f80ab72054a957aed25224639c1779cae5f4d1";
+          sha256 = "1hbb6diz96jabajxrnancjfpyd9div8vzbwys1f5bddi9z8l2jyy";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/20452bf3112276a7e1c880bfab259150fc70b47a/recipes/read-aloud";
           sha256 = "01fd87k50x71w8qypbi7llgyc1xnmyxifxh4ni9pgbx2ryn72lzv";
-          name = "read-aloud";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -62312,20 +78123,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    readability = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, oauth, ov }:
-    melpaBuild {
+    readability = callPackage ({ emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild
+                               , oauth
+                               , ov }:
+      melpaBuild {
         pname = "readability";
         version = "20140715.1727";
         src = fetchFromGitHub {
           owner = "ShingoFukuyama";
           repo = "emacs-readability";
-          rev = "6c220ab8e0ca63946574ed892add5c8fd14002ce";
-          sha256 = "0kg18ybgwcxhv5fiya5d3wn5w9si4914q946gjannk67d6jcq08g";
+          rev = "3329d7c77d010c8fa92215cd2b7cd891eb2f68c7";
+          sha256 = "0s226fqhc9y1s49l5y01mlxxz3ah4k3payy4jdgnd8r03rb3gia7";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/eed9bcb1aa238746c9a9f6ecba9dd61b83d8b612/recipes/readability";
           sha256 = "0kg91ma9k3p5ps467jjz2lw13rv1l8ivwc3zpg6c1rl474ds0qqv";
-          name = "readability";
+          name = "recipe";
         };
         packageRequires = [ emacs oauth ov ];
         meta = {
@@ -62333,8 +78150,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    readline-complete = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    readline-complete = callPackage ({ fetchFromGitHub
+                                     , fetchurl
+                                     , lib
+                                     , melpaBuild }:
+      melpaBuild {
         pname = "readline-complete";
         version = "20150708.737";
         src = fetchFromGitHub {
@@ -62343,10 +78163,10 @@
           rev = "30c020c37b2741160cc37e656e13c85d826a0ebf";
           sha256 = "1j5b5xapflwzh8a297gva0l12ralwa9vl5z3bb75c9ksjkhi4nm6";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0cf3b56dae7669b34df9d2abe2d78164cbf064c9/recipes/readline-complete";
           sha256 = "1qymk5ypv6ljk8x49z4jcifz7c2dqcg5181f4hqh67g1byvj2277";
-          name = "readline-complete";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -62354,8 +78174,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    real-auto-save = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    real-auto-save = callPackage ({ fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "real-auto-save";
         version = "20180107.1850";
         src = fetchFromGitHub {
@@ -62364,10 +78187,10 @@
           rev = "d813632c1e754539cc92953ac4c3609105f9af58";
           sha256 = "0gz0w7zxl865shz9mf5xv8xi5mjq969600jqh4laazvhyk32skmg";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/525039a3dc29190829bf50d608ef09bc4a8557af/recipes/real-auto-save";
           sha256 = "03dbbizpyg62v6zbq8hd16ikrifz8m2bdlbb3g67f2834xqmxha8";
-          name = "real-auto-save";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -62375,20 +78198,28 @@
           license = lib.licenses.free;
         };
       }) {};
-    realgud = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, load-relative, loc-changes, melpaBuild, test-simple }:
-    melpaBuild {
+    realgud = callPackage ({ cl-lib ? null
+                           , emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , load-relative
+                           , loc-changes
+                           , melpaBuild
+                           , test-simple }:
+      melpaBuild {
         pname = "realgud";
-        version = "20180327.1634";
+        version = "20180710.1953";
         src = fetchFromGitHub {
           owner = "rocky";
           repo = "emacs-dbgr";
-          rev = "096bd8732ea0661f10d7f7c1c91ad1ca4cf51207";
-          sha256 = "1mjbhnzq4j7pfapmxqhy6lx3f6py2wbj2xrri16npmn1qqmkmbjp";
+          rev = "da2a74b50a770a2c1166656a05ba9d132a2a5c73";
+          sha256 = "0w5lbwjaraw11sj36a9hsywa187g97hnvksrd6wbf8prbfwhghlx";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7ca56f05df6c8430a5cbdc55caac58ba79ed6ce5/recipes/realgud";
           sha256 = "0qmvd35ng1aqclwj3pskn58c0fi98kvx9666wp3smgj3n88vgy15";
-          name = "realgud";
+          name = "recipe";
         };
         packageRequires = [
           cl-lib
@@ -62402,8 +78233,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    realgud-byebug = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, realgud }:
-    melpaBuild {
+    realgud-byebug = callPackage ({ cl-lib ? null
+                                  , emacs
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild
+                                  , realgud }:
+      melpaBuild {
         pname = "realgud-byebug";
         version = "20180308.1923";
         src = fetchFromGitHub {
@@ -62412,10 +78249,10 @@
           rev = "de603d58aa9ef72a2619247a0234fccf6bc2cc9a";
           sha256 = "1hk2z7axy1v5yvx4xgkisfk00varq5rf8j88f0l63ywylyw1fwhl";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7ca56f05df6c8430a5cbdc55caac58ba79ed6ce5/recipes/realgud-byebug";
           sha256 = "1m4pqnvnnfzq7b9bv5fkz70pifklddwqrwbwnrfyiawx9vdgrpz9";
-          name = "realgud-byebug";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs realgud ];
         meta = {
@@ -62423,8 +78260,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    realgud-old-debuggers = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, realgud }:
-    melpaBuild {
+    realgud-old-debuggers = callPackage ({ cl-lib ? null
+                                         , emacs
+                                         , fetchFromGitHub
+                                         , fetchurl
+                                         , lib
+                                         , melpaBuild
+                                         , realgud }:
+      melpaBuild {
         pname = "realgud-old-debuggers";
         version = "20170316.31";
         src = fetchFromGitHub {
@@ -62433,10 +78276,10 @@
           rev = "1e1d573a6ba731afbe68c1309a316457ca3fbb94";
           sha256 = "1gk8k9lqbvqq4ngw0ffp3sqhkaj23n54m3ndh2ba9gvlmx7mxm7g";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/260b4d5a85c380dda0f7bb0370e3ffa8cc3c0275/recipes/realgud-old-debuggers";
           sha256 = "0iwi1byfwcpviaizdw9wzdcjlbk35ql4wfzj0ynh331g0hmibhs9";
-          name = "realgud-old-debuggers";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs realgud ];
         meta = {
@@ -62444,20 +78287,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    realgud-pry = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, realgud }:
-    melpaBuild {
+    realgud-pry = callPackage ({ cl-lib ? null
+                               , emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild
+                               , realgud }:
+      melpaBuild {
         pname = "realgud-pry";
         version = "20160805.745";
         src = fetchFromGitHub {
           owner = "rocky";
           repo = "realgud-pry";
-          rev = "9b3834048fcbc16827c55af38f8cfef0cf6533da";
-          sha256 = "1kpy2ym29mnr89c7im27hhbpww7dgblw6w731ayrlg8rlvqzh7ln";
+          rev = "fca36075a223f6a4a643764199babe3d1dfde2ac";
+          sha256 = "08jnav5v5q1mwgk9x100magm3jcprzfhmx8z6x8vcmp7xf79n1pp";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7ca56f05df6c8430a5cbdc55caac58ba79ed6ce5/recipes/realgud-pry";
           sha256 = "1p5ijig5rczndcykllq0vy6w4askwl0yd8b5fqg7yl5yx45r8xgs";
-          name = "realgud-pry";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs realgud ];
         meta = {
@@ -62465,20 +78314,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    realgud-rdb2 = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, realgud }:
-    melpaBuild {
+    realgud-rdb2 = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild
+                                , realgud }:
+      melpaBuild {
         pname = "realgud-rdb2";
         version = "20160303.43";
         src = fetchFromGitHub {
           owner = "rocky";
           repo = "realgud-ruby-debugger2";
-          rev = "b394bee61e75b7c6a5fa565594aa79b74887f5df";
-          sha256 = "17lspprzaxv6lmwxgqr0vazkvh6dm2cpqs5yildczlr843k90vv5";
+          rev = "e63eeed131517a9e8225f972c9f6c975c8121e41";
+          sha256 = "0skaw5fzvqk56mfk3ciy9n85vznq1sxv6w575v3jd80w2dns4yay";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7ca56f05df6c8430a5cbdc55caac58ba79ed6ce5/recipes/realgud-rdb2";
           sha256 = "0wqvgb3h2b0ys76sq2z462cjv0fajqc41f7wqvf53wfcs2zw4l9y";
-          name = "realgud-rdb2";
+          name = "recipe";
         };
         packageRequires = [ realgud ];
         meta = {
@@ -62486,20 +78339,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    reason-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    reason-mode = callPackage ({ emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "reason-mode";
-        version = "20171027.2235";
+        version = "20180505.1330";
         src = fetchFromGitHub {
           owner = "reasonml-editor";
           repo = "reason-mode";
-          rev = "a9de59cced37b44db72ee248107021a660561d11";
-          sha256 = "04g3598ykczxkmj5gjd4airfl41b821agy6r4h2bnq5fcfdj0jnx";
+          rev = "b4365012d7ca220a66e2138d0e1e65360cd80759";
+          sha256 = "1ms9j84r000nysgr7hbxzzgpqvmwjiy2ip156hmfl3rxnsba94n7";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f9f1a18c13601f3a4fd7b1bbfe7d5da07746e492/recipes/reason-mode";
           sha256 = "07sirgj8bs9yv7pbx1lahwslvjd2aadkzkz7lsyw6xflj5fxpggr";
-          name = "reason-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -62507,20 +78364,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    rebecca-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    rebecca-theme = callPackage ({ emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "rebecca-theme";
         version = "20180324.121";
         src = fetchFromGitHub {
           owner = "vic";
           repo = "rebecca-theme";
-          rev = "9ac0c71c2858b76dc5499f62c7c7fb7f9e8f16bc";
-          sha256 = "0a0qf118gj2fag3j57zmli47939rn1jayvs2fwa4l280ipfvp2m7";
+          rev = "1fe3662d1b02caea96e9a780252b2c45f7a49b1d";
+          sha256 = "0qcfnc9slhm4y2bpld0ckbv3wijr9y7h6555sy23z3dlmz7xs1wm";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/19f40f30113c7dabd76a2d0e52898e6d6be69a35/recipes/rebecca-theme";
           sha256 = "1m72jqyqx18i1vpj07v3vkbi0di9dks5sz46wb2h0f23xqyx00md";
-          name = "rebecca-theme";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -62528,8 +78389,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    rebox2 = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    rebox2 = callPackage ({ fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "rebox2";
         version = "20121113.500";
         src = fetchFromGitHub {
@@ -62538,10 +78402,10 @@
           rev = "00634eca420cc48657b81e40e599ff8548083985";
           sha256 = "1xh9nxqfg9abcl41ni69rnwjfgyfr0pbl55dzyxsbh6sb36r3h8z";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fc9132290886694bd551681e32af26e9f4ebae57/recipes/rebox2";
           sha256 = "06ra50afjqac9ck1s9gaxy0sqxcb612wzd28s4q4imicqpgfxzjw";
-          name = "rebox2";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -62549,8 +78413,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    recentf-ext = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    recentf-ext = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "recentf-ext";
         version = "20170925.1735";
         src = fetchFromGitHub {
@@ -62559,10 +78426,10 @@
           rev = "450de5f8544ed6414e88d4924d7daa5caa55b7fe";
           sha256 = "1jylpqgngbl594a1qvd305m9lda48cib4dsasimdqxp20d4c56iy";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ad10a684b4b2f01bc65883374f36fef156ff55d2/recipes/recentf-ext";
           sha256 = "122kns45l75cdwxbfjznks3kvm5jc89ik714ij2qx14qyik0xmni";
-          name = "recentf-ext";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -62570,8 +78437,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    recentf-remove-sudo-tramp-prefix = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    recentf-remove-sudo-tramp-prefix = callPackage ({ emacs
+                                                    , fetchFromGitHub
+                                                    , fetchurl
+                                                    , lib
+                                                    , melpaBuild }:
+      melpaBuild {
         pname = "recentf-remove-sudo-tramp-prefix";
         version = "20180204.2156";
         src = fetchFromGitHub {
@@ -62580,10 +78451,10 @@
           rev = "6d23ebc3f52b0a66236c171c45cc77a4d3aba541";
           sha256 = "0rzs9fmy1iqips6px0v57wnplbxmm3sbnk6xcszwhkwwp563hk32";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0bf1761715ee4917ba0823adbda03859d5b8131a/recipes/recentf-remove-sudo-tramp-prefix";
           sha256 = "01kdpx7kqd39a5hjym5plcj5d8szzghigq9mq186mggayg8q44cr";
-          name = "recentf-remove-sudo-tramp-prefix";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -62591,8 +78462,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    recompile-on-save = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    recompile-on-save = callPackage ({ cl-lib ? null
+                                     , dash
+                                     , fetchFromGitHub
+                                     , fetchurl
+                                     , lib
+                                     , melpaBuild }:
+      melpaBuild {
         pname = "recompile-on-save";
         version = "20151126.646";
         src = fetchFromGitHub {
@@ -62601,10 +78477,10 @@
           rev = "92e11446869d878803d4f3dec5d2101380c12bb2";
           sha256 = "0wk28blnfks987iby0p3qpd4nxnz6sqn4fx8g59gyddjhav51lri";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/77805a854da76b105bd7589fd0960b1ef8868b8b/recipes/recompile-on-save";
           sha256 = "0bg2p7pk4jlpqc7lg48mxd6zkwnx15r0r7lmsxgx9dv1ilfwrmgn";
-          name = "recompile-on-save";
+          name = "recipe";
         };
         packageRequires = [ cl-lib dash ];
         meta = {
@@ -62612,8 +78488,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    recover-buffers = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    recover-buffers = callPackage ({ fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "recover-buffers";
         version = "20171008.2137";
         src = fetchFromGitHub {
@@ -62622,10 +78501,10 @@
           rev = "81a5cb53099955ebc2a411a44cba5a394ee3f2d1";
           sha256 = "07dfdvz5rn5l13xdycd7h75zaq0pw2afb9n1yiq01fqk6gvrhc5b";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/43b33cfb794c35de78fde6eabb71ffe01049d23d/recipes/recover-buffers";
           sha256 = "0g40d7440hzlc9b45v63ng0anvmgip4dhbd9wcm2sn8qjfr4w11b";
-          name = "recover-buffers";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -62633,8 +78512,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    rect-plus = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    rect-plus = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "rect-plus";
         version = "20150620.1744";
         src = fetchFromGitHub {
@@ -62643,10 +78525,10 @@
           rev = "299b742faa0bc4448e0d5fe9cb98ab1eb93b8dcc";
           sha256 = "1vpsihrl03hkd6n6b7mrjccm0a023qf3154a8rw4chihikxw27pj";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c8c1cd81f0e764a7cfc2f3f96574898ff414beb4/recipes/rect+";
           sha256 = "0vk0jwpl6yp2md9nh0ghp2qn883a8lr3cq8c9mgq0g552dwdiv5m";
-          name = "rect-plus";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -62654,8 +78536,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    rectangle-utils = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    rectangle-utils = callPackage ({ cl-lib ? null
+                                   , emacs
+                                   , fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "rectangle-utils";
         version = "20160914.2108";
         src = fetchFromGitHub {
@@ -62664,10 +78551,10 @@
           rev = "6fe38fdd48ef5305a908b94a043a966ac3f2053a";
           sha256 = "08n3ah40gfgkbriwj2z3y0751vpvgz86qjdn6dxs4mghjrwr2545";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1852b75c82822e97c39b7c7caeb2a32246171be4/recipes/rectangle-utils";
           sha256 = "1w5z2gykydsfp30ahqjihpvq04c5v0cfslbrrg429hycys8apws7";
-          name = "rectangle-utils";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -62675,8 +78562,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    recursive-narrow = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    recursive-narrow = callPackage ({ fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "recursive-narrow";
         version = "20140902.1027";
         src = fetchFromGitHub {
@@ -62685,10 +78575,10 @@
           rev = "bc0cab88234ca92640d4b8da0d83e132c1897922";
           sha256 = "1mj7lyadzn3bwig3f9zariq5z4fg6liqnjvfd34yx88xc52nwf33";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/recursive-narrow";
           sha256 = "15pzwxzyc3dl81v27gk7a4866cxbhzpmmcmfi9n4vrrxmf61h905";
-          name = "recursive-narrow";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -62696,8 +78586,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    redis = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    redis = callPackage ({ cl-lib ? null
+                         , emacs
+                         , fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "redis";
         version = "20150531.1248";
         src = fetchFromGitHub {
@@ -62706,10 +78601,10 @@
           rev = "2c33f3397bc14e7a8192867b55920492d4eead8c";
           sha256 = "1rjpf23a8rggjmmxvm1997d3xz03kz84xams486b9ky0n2v02d57";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/10fbb970956ee19d812c17900f3c01c5fee0c3f2/recipes/redis";
           sha256 = "1awnilb8bk0izp6yw0187ybh9slf1hc51014xvvmj90darxby79a";
-          name = "redis";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -62717,8 +78612,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    redpen-paragraph = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }:
-    melpaBuild {
+    redpen-paragraph = callPackage ({ cl-lib ? null
+                                    , emacs
+                                    , fetchFromGitHub
+                                    , fetchurl
+                                    , json ? null
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "redpen-paragraph";
         version = "20160625.350";
         src = fetchFromGitHub {
@@ -62727,10 +78628,10 @@
           rev = "770ffb34b04bfa0ea8484fa1506e96c530168e13";
           sha256 = "0cqln3d8yp9fdam984bwnngjl0hjnwi7yhcggdkjwribhr79cxhl";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7e6b187bfc14f3affbe2d8d1cb854abe69deb15b/recipes/redpen-paragraph";
           sha256 = "0jr707ik6fhznq0q421l986w85ah0n9b4is91zrgbk1v6miqrhca";
-          name = "redpen-paragraph";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs json ];
         meta = {
@@ -62738,20 +78639,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    redprl = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    redprl = callPackage ({ emacs
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "redprl";
-        version = "20180320.1312";
+        version = "20180418.734";
         src = fetchFromGitHub {
           owner = "RedPRL";
           repo = "sml-redprl";
-          rev = "8b9309f6344cddf9b5ef4b9c1fde9d910672e913";
-          sha256 = "04n4nhxh3v8wjav67i1wl0qi626s2xpi001bn8qbxqipnfpidk9y";
+          rev = "4abdbdeda4604ff30ce19c0df3f43e34faf60bd7";
+          sha256 = "0m6ck4x16b9qnd33dcw5zvygwgcqzwqydrvcw0gfyfypfcw13qwb";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06e7371d703ffdc5b6ea555f2ed289e57e71e377/recipes/redprl";
           sha256 = "1zinzs3vzf2alsnxf5k71i7lp90fm26wv4y20ci52n0hnh5nz861";
-          name = "redprl";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -62759,8 +78664,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    redshank = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, paredit }:
-    melpaBuild {
+    redshank = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild
+                            , paredit }:
+      melpaBuild {
         pname = "redshank";
         version = "20180128.1348";
         src = fetchFromGitHub {
@@ -62769,10 +78678,10 @@
           rev = "f3eef7d4891570e6bcb74eb52c73edb765a639b8";
           sha256 = "00mihmjd0amr9wzb3qsz69bp7y5iqx9vvh1hg77i57zlm88x6ma6";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2677a5cf74ebace6510517f47eaa43b35f736683/recipes/redshank";
           sha256 = "0p18rkn09qb4ssr6jix13kqc3jld407qr2z2k8z78i3xy4bfzr5f";
-          name = "redshank";
+          name = "recipe";
         };
         packageRequires = [ paredit ];
         meta = {
@@ -62780,20 +78689,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    redtick = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    redtick = callPackage ({ emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "redtick";
-        version = "20170129.1428";
+        version = "20180424.1436";
         src = fetchFromGitHub {
           owner = "ferfebles";
           repo = "redtick";
-          rev = "e6d2e9b69ec666f460f9158dd31cdf035eeb1080";
-          sha256 = "03l36ik7a4a7ibgxh22hk8p43wkj6nb5x8mmlyjhh4phzc9i0kav";
+          rev = "0faa6b7b479fae39f5d4632f0cbbef0f2917780e";
+          sha256 = "12wsczhz03vjfvck20jg9xi2mgiihq2d4cnkj6r95jkja0ds7brh";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3187bd436541e2a5c2b28de67c62f5d5165af737/recipes/redtick";
           sha256 = "1a9rviz0hg6vlh2jc04g6vslyf9n89xglcz9cb79vf10hhr6igrb";
-          name = "redtick";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -62801,8 +78714,16 @@
           license = lib.licenses.free;
         };
       }) {};
-    refine = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, list-utils, loop, melpaBuild, s }:
-    melpaBuild {
+    refine = callPackage ({ dash
+                          , emacs
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , list-utils
+                          , loop
+                          , melpaBuild
+                          , s }:
+      melpaBuild {
         pname = "refine";
         version = "20180315.1528";
         src = fetchFromGitHub {
@@ -62811,10 +78732,10 @@
           rev = "0a99439a0b4ed6f79b9a240ea1270140a9e328bc";
           sha256 = "1scw449mbmr70kb0r2ymhph9j0s5ym77ijp5fpwph9bri46cad3g";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b111879ea0685cda88c758b270304d9e913c1391/recipes/refine";
           sha256 = "1sk6rsd92pix7k8snnqm3hsimjzaihzjgac0g5h3a2zm9dabf4py";
-          name = "refine";
+          name = "recipe";
         };
         packageRequires = [ dash emacs list-utils loop s ];
         meta = {
@@ -62822,20 +78743,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    regex-dsl = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    regex-dsl = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "regex-dsl";
         version = "20100124.228";
         src = fetchFromGitHub {
           owner = "alk";
           repo = "elisp-regex-dsl";
-          rev = "ac89ab8b7691a165ef3007cb84417125cfc0632e";
-          sha256 = "1d34jd7is979vfgdy56zkd1m15ng3waiabfpak6dv6ak3cdh5fgx";
+          rev = "c9d9ce30669e3c4ccfa6030eb4a080083451ac71";
+          sha256 = "11lrgygmwgc93av33md601alqr7ffh5ga0r60lvkl3rgwgnxz7iw";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/regex-dsl";
           sha256 = "0c9mxsvmx6mgpq838qnjjr7ra4hafikv7hq4nfab7zw9mxrcr2f9";
-          name = "regex-dsl";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -62843,8 +78767,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    regex-tool = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    regex-tool = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "regex-tool";
         version = "20170104.1118";
         src = fetchFromGitHub {
@@ -62853,10 +78780,10 @@
           rev = "0b4a0111143c88ef94bec56624cb2e00c1a054e6";
           sha256 = "03qm8s7nqsj0pjnnb0p84gk7hvad4bywn3rhr3ibzj6hxqvppbqj";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/regex-tool";
           sha256 = "1s4clmy5r7w6aj2bh2vf2fmbcwnainzidj28mf3kc34x3qhybngq";
-          name = "regex-tool";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -62864,8 +78791,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    region-bindings-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    region-bindings-mode = callPackage ({ fetchFromGitHub
+                                        , fetchurl
+                                        , lib
+                                        , melpaBuild }:
+      melpaBuild {
         pname = "region-bindings-mode";
         version = "20140407.1514";
         src = fetchFromGitHub {
@@ -62874,10 +78804,10 @@
           rev = "3fa5dbdbd7c000bebff6d9d14a4be326ec24b6fc";
           sha256 = "02kfi3c6ydnr7xw611ck66kfjyl5w86dr9vfjv3wjl6ad9jya4zy";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/faba50ed3e8c22991bcb8968880f79fad1748705/recipes/region-bindings-mode";
           sha256 = "141q4x6rilidpnsm9s78qks9i1v6ng0ydhbzqi39xcaccfyyjb69";
-          name = "region-bindings-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -62885,20 +78815,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    region-convert = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    region-convert = callPackage ({ fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "region-convert";
         version = "20161118.1859";
         src = fetchFromGitHub {
           owner = "zonuexe";
           repo = "right-click-context";
-          rev = "2f8195fb81b8d27aeb42bdc4055ebce37c09717b";
-          sha256 = "05fr1gg5xfwp4rmyyn181vxn2mhmb3aca1g1rp2nk36v7lfzgpxv";
+          rev = "32f572b4f9ff6f9a062a914b4f8ba66f43e7ee8a";
+          sha256 = "1lsr7ljzvfs84jnlk2igg8h0ki09gzw2ihgl2p6wdn27d47blcwd";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ddcf4612cccb9a53425c5f0324206d70549d9d9e/recipes/region-convert";
           sha256 = "0daghvxc6gxgric1aa1gw036gbpbzilqz72gr1inqy92hz7xrxfm";
-          name = "region-convert";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -62906,8 +78839,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    region-state = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    region-state = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "region-state";
         version = "20151128.238";
         src = fetchFromGitHub {
@@ -62916,10 +78852,10 @@
           rev = "07ffb7d9ada2fcd204f3447f078c265d25f36f60";
           sha256 = "0gsh0x1rqxvzrszdyna9d8b8w22mqnd9yqcwzay2prc6rpl26g1f";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/716e82eb4ca0845f59a743556b37be8a1ecb29af/recipes/region-state";
           sha256 = "1iq2x1w8lqjjiwjja7r3qki6drvydnk171k9fj9g6rk7wslknz8x";
-          name = "region-state";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -62927,8 +78863,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    register-channel = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    register-channel = callPackage ({ fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "register-channel";
         version = "20150513.2059";
         src = fetchFromGitHub {
@@ -62937,10 +78876,10 @@
           rev = "f62f9a62ebd2537d4a8c8f2e358562c67d2aefc1";
           sha256 = "01k3v4yiilz1k6drv7b2x6zbjx6dlz7cch8rq63mwc7v8kvdnqmi";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ad44618ac36e96d04f5c44c77637ea6229e61b4c/recipes/register-channel";
           sha256 = "037i2fgxxsfb85vd6xk17wyh7ny6fqfixvb0a18lf8m1hib1gyhr";
-          name = "register-channel";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -62948,8 +78887,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    related = callPackage ({ cl-lib ? null, fetchgit, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    related = callPackage ({ cl-lib ? null
+                           , fetchgit
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "related";
         version = "20161002.2310";
         src = fetchgit {
@@ -62957,10 +78900,10 @@
           rev = "0065a2e16eeaa9bface49f7f0815b9cf9719f441";
           sha256 = "0gaj1mqv77dahw6zfqlf8q624b2ba589chgaa22vy4vg3lz6qzks";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6248cbbb6c977c9c9332a34b449eb090dd9322b3/recipes/related";
           sha256 = "0nm2dnmz4a5z187mzggsj8xrdy1x84lxx79rmwcrkh1d7jzjhi6f";
-          name = "related";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -62968,20 +78911,27 @@
           license = lib.licenses.free;
         };
       }) {};
-    relative-buffers = callPackage ({ cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    relative-buffers = callPackage ({ cl-lib ? null
+                                    , dash
+                                    , f
+                                    , fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild
+                                    , s }:
+      melpaBuild {
         pname = "relative-buffers";
         version = "20160221.1123";
         src = fetchFromGitHub {
           owner = "proofit404";
           repo = "relative-buffers";
-          rev = "2547475084244d266b507e563c9b4034705cfeca";
-          sha256 = "16m4qyjg0ca1j944ra1qhhg9ks3sk0rv5ax59rqga20l8wf6k0jq";
+          rev = "88c24259ed62b85adff6850e34bbbe844caddccf";
+          sha256 = "0100maanb1v0hl4pj8ykzlqpr3cvs6ldak5japndm5yngzp6m8ks";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ab22cea99fbee937bbd6e8fbc8bd27967aeaa8a5/recipes/relative-buffers";
           sha256 = "131182yb0pr0d6jibqd8aag4w8hywdyi87ldp77b95gw4bqhr96i";
-          name = "relative-buffers";
+          name = "recipe";
         };
         packageRequires = [ cl-lib dash f s ];
         meta = {
@@ -62989,8 +78939,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    relax = callPackage ({ fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }:
-    melpaBuild {
+    relax = callPackage ({ fetchFromGitHub
+                         , fetchurl
+                         , json ? null
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "relax";
         version = "20131029.1434";
         src = fetchFromGitHub {
@@ -62999,10 +78953,10 @@
           rev = "6e33892623ab87833082262321dc8e1977209626";
           sha256 = "0lqbhwi1f8b4sv9p1rf0gyjllk0l7g6v6mlws496079wxx1n5j66";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/67247451b39461db4a5fcff3827a09f53f9fc8ec/recipes/relax";
           sha256 = "0gfr4ym6aakawhkfz40ar2n0rfz503hq428yj6rbf7jmq3ajaysk";
-          name = "relax";
+          name = "recipe";
         };
         packageRequires = [ json ];
         meta = {
@@ -63010,8 +78964,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    remark-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, markdown-mode, melpaBuild }:
-    melpaBuild {
+    remark-mode = callPackage ({ emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , markdown-mode
+                               , melpaBuild }:
+      melpaBuild {
         pname = "remark-mode";
         version = "20171217.2356";
         src = fetchFromGitHub {
@@ -63020,10 +78979,10 @@
           rev = "e8a95f25d865d6165a7fdb1cadf5e6f0bb5ee73b";
           sha256 = "01qdaby7mn5d8y95wcbqzwzcbjmf2329g6yjbvmdd1gn6s7qzs0b";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/161a45835a153c6ac81b99311482f5dd36507da1/recipes/remark-mode";
           sha256 = "1zl8k3h4acbgb3hmjs2b4a14g0s0vl3xamrqxrr742zmqpr1h0w0";
-          name = "remark-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs markdown-mode ];
         meta = {
@@ -63031,20 +78990,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    remember-last-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    remember-last-theme = callPackage ({ emacs
+                                       , fetchFromGitHub
+                                       , fetchurl
+                                       , lib
+                                       , melpaBuild }:
+      melpaBuild {
         pname = "remember-last-theme";
         version = "20170619.1433";
         src = fetchFromGitHub {
           owner = "anler";
           repo = "remember-last-theme";
-          rev = "0973f1aa6b96355fa376fffe8b45733b6e963c51";
-          sha256 = "11kcqpw1wrhghbw2dx3pqndmq9a1rbqir3k71ggaj1x2y2arzvm7";
+          rev = "57e8e2a475ea89316dbb5c4d2ea047f56a2cbcdf";
+          sha256 = "0sb110rb6pnjnvyqn0kji19bhbn8mk4x32yps00aq2g2v9pc1jzr";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/26edcdddaf8dc8c9a18d6b007e0d49d04fe4ccca/recipes/remember-last-theme";
           sha256 = "0pw36f9mchkl1qhaii39zd0vwrydjlijzanv706ai2bl8r7l0ppy";
-          name = "remember-last-theme";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -63052,20 +79015,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    repeatable-motion = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    repeatable-motion = callPackage ({ emacs
+                                     , fetchFromGitHub
+                                     , fetchurl
+                                     , lib
+                                     , melpaBuild }:
+      melpaBuild {
         pname = "repeatable-motion";
         version = "20170620.1148";
         src = fetchFromGitHub {
           owner = "willghatch";
           repo = "emacs-repeatable-motion";
-          rev = "f29effdc4121c2dc7e3fec9b3a62debce29cda9d";
-          sha256 = "11s7r5g0djj0yc8ll7jfw5v3m9kyvaiscndnfnvvjw5lwgfyh0v3";
+          rev = "77aa35b27c8a76dc8deef87c9f71ef7e6fd289ee";
+          sha256 = "0pm9z0w402430j66167s1az37jxw89sck1b7lm9gjnc3gslh0lpm";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0dd56ebaea098715b9c201f07e6196c38977f8e3/recipes/repeatable-motion";
           sha256 = "12z4z8apd8ksf6dfvqm54l71mx68j0yg4hrjypa9p77fpcd6p0zw";
-          name = "repeatable-motion";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -63073,20 +79040,49 @@
           license = lib.licenses.free;
         };
       }) {};
-    repl-toggle = callPackage ({ fetchFromGitHub, fetchurl, fullframe, lib, melpaBuild }:
-    melpaBuild {
+    repeater = callPackage ({ emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
+        pname = "repeater";
+        version = "20180418.512";
+        src = fetchFromGitHub {
+          owner = "xuchunyang";
+          repo = "repeater";
+          rev = "854b874542b186b2408cbc58ad0591fe8eb70b6c";
+          sha256 = "0cx6b8l9ssf56fz8xjsmbyhy8mdcj8l0rvsdx37qk86xq4nlz74p";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/10e6c57937b7540f1fbf920765a63292784433ed/recipes/repeater";
+          sha256 = "07fq3d6w5ns5ryv4vd23iww2bz34f62syzbg8y643kdd0kp1m772";
+          name = "recipe";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/repeater";
+          license = lib.licenses.free;
+        };
+      }) {};
+    repl-toggle = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , fullframe
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "repl-toggle";
-        version = "20161203.414";
+        version = "20180501.328";
         src = fetchFromGitHub {
           owner = "tomterl";
           repo = "repl-toggle";
-          rev = "50044030969d68e9f78a6db4e0a9229f5f3eaec3";
-          sha256 = "0gi4pdfgyhl2lss5p71p0jxifni6zl0fv7n4cj42hbalgfyxfv79";
+          rev = "934f59478a5c5577795f9507e945d564be368510";
+          sha256 = "13pgfqijfp0ad9h1rpcf0blppq3jv31wdgvpjndgi213vwrkk79j";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/repl-toggle";
           sha256 = "16k9fk1nl2llk9qli52kiirlx9rlz8yhjh3cy6v5y2b3k0y1cf0b";
-          name = "repl-toggle";
+          name = "recipe";
         };
         packageRequires = [ fullframe ];
         meta = {
@@ -63094,8 +79090,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    replace-from-region = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    replace-from-region = callPackage ({ fetchFromGitHub
+                                       , fetchurl
+                                       , lib
+                                       , melpaBuild }:
+      melpaBuild {
         pname = "replace-from-region";
         version = "20170227.1516";
         src = fetchFromGitHub {
@@ -63104,10 +79103,10 @@
           rev = "dc9318b9b2822da7b00ecc34d1dc965c8f96c9bb";
           sha256 = "05l0wn1gqw2sbl65s1m7afmg3b1ps2qgqqrjkl9r2i26p95kqlq3";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f8e4328cae9b4759a75da0b26ea8b68821bc71af/recipes/replace-from-region";
           sha256 = "1p77sajghqkjd7k83nma4qpz682la3zg716jdsnpcwcw0qk9ybcb";
-          name = "replace-from-region";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -63115,20 +79114,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    replace-pairs = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    replace-pairs = callPackage ({ emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "replace-pairs";
         version = "20160207.451";
         src = fetchFromGitHub {
           owner = "davidshepherd7";
           repo = "replace-pairs";
-          rev = "1e49071e2ef46a458a28f77681e313a63db5663c";
-          sha256 = "1nl1g6fi7mkr0h3p4xa6czqpihnzdwpj9hg7d6qvlvih001hcc16";
+          rev = "ef6f2719aab7714f6cb209fd3dd6d2e720681b3c";
+          sha256 = "169p85rmgashm0g26apkxynmypqk9ndh76kvh572db5kqb8ix0c6";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2c578f574bc13edf45330a2836c02dece163688d/recipes/replace-pairs";
           sha256 = "0l9674rba25wh6fskvfwkhv99lwlszb177hsfzx39s6b4hshvlsb";
-          name = "replace-pairs";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -63136,8 +79139,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    replace-symbol = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    replace-symbol = callPackage ({ fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "replace-symbol";
         version = "20160517.1712";
         src = fetchFromGitHub {
@@ -63146,10 +79152,10 @@
           rev = "baf949e528aee1881f455f9c84e67718bedcb3f6";
           sha256 = "178y1cmpdb2r72igx8j4l7pyhs1idw56j6hg5h8r9a2p99lkgjjc";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/377b6ff2b785f6d87adf1e23a5b0ce02881fc5c9/recipes/replace-symbol";
           sha256 = "07ljmw6aw9hsqffhwmiq2pvhry27acg6f4vgxgi91vjr8jj3r4ng";
-          name = "replace-symbol";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -63157,8 +79163,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    replace-with-inflections = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, inflections, lib, melpaBuild, string-inflection }:
-    melpaBuild {
+    replace-with-inflections = callPackage ({ cl-lib ? null
+                                            , fetchFromGitHub
+                                            , fetchurl
+                                            , inflections
+                                            , lib
+                                            , melpaBuild
+                                            , string-inflection }:
+      melpaBuild {
         pname = "replace-with-inflections";
         version = "20170911.245";
         src = fetchFromGitHub {
@@ -63167,10 +79179,10 @@
           rev = "e286036a5d1dbac06a72a1e831b2a8d9cad27238";
           sha256 = "1szbps1k3na3w9djkqxm3s1anm12505ajr7ay9j7pmd00qf75379";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7892eb506b8f4260bde4be2805bf3b2d594ab640/recipes/replace-with-inflections";
           sha256 = "1pqpin5ipm3g74zjh1kh6s1gh0aan6202p0y2q00d4ywbz9kn5s0";
-          name = "replace-with-inflections";
+          name = "recipe";
         };
         packageRequires = [ cl-lib inflections string-inflection ];
         meta = {
@@ -63178,20 +79190,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    repo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    repo = callPackage ({ emacs
+                        , fetchFromGitHub
+                        , fetchurl
+                        , lib
+                        , melpaBuild }:
+      melpaBuild {
         pname = "repo";
         version = "20170213.139";
         src = fetchFromGitHub {
           owner = "canatella";
           repo = "repo-el";
-          rev = "d7b87cd515bad8a67d3a892a46a23f5fe81e08de";
-          sha256 = "0rbvcvm7bfr6ncji7cllfxyyr6x7n9fx863byp243phsj3n93adz";
+          rev = "9f03c0d90c9036b96e531c17d529f3855364d47a";
+          sha256 = "1ggxs40mbk50aqhqqfdcz6izvlvsz53s93dj3ndxvgdxkpkxr6yn";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1729d4ea9498549fff3594b971fcde5f81592f84/recipes/repo";
           sha256 = "0z4lcswh0c6xnsxlv33bsxh0nh26ydzfl8sv8xabdp5a2gk6bhpb";
-          name = "repo";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -63199,20 +79215,27 @@
           license = lib.licenses.free;
         };
       }) {};
-    req-package = callPackage ({ dash, fetchFromGitHub, fetchurl, ht, lib, log4e, melpaBuild, use-package }:
-    melpaBuild {
+    req-package = callPackage ({ dash
+                               , fetchFromGitHub
+                               , fetchurl
+                               , ht
+                               , lib
+                               , log4e
+                               , melpaBuild
+                               , use-package }:
+      melpaBuild {
         pname = "req-package";
-        version = "20180121.2100";
+        version = "20180506.2350";
         src = fetchFromGitHub {
           owner = "edvorg";
           repo = "req-package";
-          rev = "699d5aa9204c07905db4574406f771c69aa5752c";
-          sha256 = "15q8lsld2k8yd8wqrn0hsnj8xvmwj9zgpbrqzjda452jdqsznfcm";
+          rev = "f97d7531a3e7526f2d7b008868eb647c80d0de5d";
+          sha256 = "1yl1ap5jlrkvhw47c1xyb9q4khqqnz38y5rvbvw4zib1ik9vwhmc";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f58a801f0791566d0c39493a5f82ff0d15d7ab41/recipes/req-package";
           sha256 = "1438f60dnmc3a2dh6hd0wslrh25nd3af797aif70kv6qc71h87vf";
-          name = "req-package";
+          name = "recipe";
         };
         packageRequires = [ dash ht log4e use-package ];
         meta = {
@@ -63220,8 +79243,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    request = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    request = callPackage ({ emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "request";
         version = "20170131.1747";
         src = fetchFromGitHub {
@@ -63230,10 +79257,10 @@
           rev = "a3d080e57eb8be606fbf39d1baff94e1b16e1fb8";
           sha256 = "0wyxqbb35yqf6ci47531lk32d6fppamx9d8826kdz983vm87him7";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8d113615dde757a60ce91e156f0714a1394c4bfc/recipes/request";
           sha256 = "0h4jqg98px9dqqvjp08vi2z1lhmk0ca59lnrcl96bi7gkkj3jiji";
-          name = "request";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -63241,20 +79268,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    request-deferred = callPackage ({ deferred, fetchFromGitHub, fetchurl, lib, melpaBuild, request }:
-    melpaBuild {
+    request-deferred = callPackage ({ deferred
+                                    , fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild
+                                    , request }:
+      melpaBuild {
         pname = "request-deferred";
         version = "20160419.1605";
         src = fetchFromGitHub {
           owner = "tkf";
           repo = "emacs-request";
-          rev = "a3d080e57eb8be606fbf39d1baff94e1b16e1fb8";
-          sha256 = "0wyxqbb35yqf6ci47531lk32d6fppamx9d8826kdz983vm87him7";
+          rev = "aeae9028de5c489b07a5f5df29682eff47f80f6b";
+          sha256 = "002blp30bvi8l9b9mzjk8ib6xv3fps3j8cqrvbdj6dw2yvrcfl1g";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8d113615dde757a60ce91e156f0714a1394c4bfc/recipes/request-deferred";
           sha256 = "1dcxqnzmvddk61dzmfx8vjbzd8m44lscr3pjdp3r7211zhwfk40n";
-          name = "request-deferred";
+          name = "recipe";
         };
         packageRequires = [ deferred request ];
         meta = {
@@ -63262,8 +79294,16 @@
           license = lib.licenses.free;
         };
       }) {};
-    requirejs = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, popup, s, yasnippet }:
-    melpaBuild {
+    requirejs = callPackage ({ cl-lib ? null
+                             , fetchFromGitHub
+                             , fetchurl
+                             , js2-mode
+                             , lib
+                             , melpaBuild
+                             , popup
+                             , s
+                             , yasnippet }:
+      melpaBuild {
         pname = "requirejs";
         version = "20151203.2319";
         src = fetchFromGitHub {
@@ -63272,10 +79312,10 @@
           rev = "4ea2a5fcbc76e4cbb6a7461e6f05f019b75865b1";
           sha256 = "1bfj2zjn3x41jal6c136wnwkgmag27bmrwbfwdylafc7qqk6dflv";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a6a710c0d5ab34c52498c4154deebb779052aa01/recipes/requirejs";
           sha256 = "09z6r9wcag3gj075wq215zcslyknl1izap595rn48xvizxi06c6k";
-          name = "requirejs";
+          name = "recipe";
         };
         packageRequires = [ cl-lib js2-mode popup s yasnippet ];
         meta = {
@@ -63283,20 +79323,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    requirejs-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    requirejs-mode = callPackage ({ fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "requirejs-mode";
         version = "20130215.1304";
         src = fetchFromGitHub {
           owner = "moricard";
           repo = "requirejs-mode";
-          rev = "bbb0c09f8eb2d6a33c17319be8137f68bb16bc92";
-          sha256 = "02wva5q8mvc0a5kms2wm1gyaag2x3zd6fkkpl4218nrbb0mbficv";
+          rev = "011849043098b6c4f27571625ae19071b53b8824";
+          sha256 = "1dhhwz3910lcyabmpm14ky61dhgj4hvdv87k2nnzm73iwxl876ih";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/requirejs-mode";
           sha256 = "00bl5dz56f77hl9wy3xvjhq81641mv9jbskcd8mcgcz9ycj9g5k2";
-          name = "requirejs-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -63304,20 +79347,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    resize-window = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    resize-window = callPackage ({ cl-lib ? null
+                                 , emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "resize-window";
         version = "20170704.2212";
         src = fetchFromGitHub {
           owner = "dpsutton";
           repo = "resize-window";
-          rev = "dcbbd30f4f4435070a66a22c5a169b752ca9f904";
-          sha256 = "0x2kkf7bdj9s3993kdz74igi80rqma0w3hi7aggf0zwllqdcnzvk";
+          rev = "e281aca5a1b371aff20d7bfc6abc456de22e19dd";
+          sha256 = "1d8jzhwif80bgj5pxa36hbavjrlmjg12yzxypl40d1wrjamq854c";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/601a8d8f9046db6c4d50af983a11fa2501304028/recipes/resize-window";
           sha256 = "0h1hlj50hc97wxqpnmvg6w3qhdd9nbnb8r8v39ylv87zqjcmlp8l";
-          name = "resize-window";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -63325,20 +79373,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    restart-emacs = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    restart-emacs = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "restart-emacs";
-        version = "20170609.905";
+        version = "20180601.331";
         src = fetchFromGitHub {
           owner = "iqbalansari";
           repo = "restart-emacs";
-          rev = "98aa4efd2caeaf0f42ca385c24fa14a843b271b7";
-          sha256 = "00qh17m4q6a1d2ck1309hp4hcw528nzp60zp8vy6x6qx7shsibrm";
+          rev = "9aa90d3df9e08bc420e1c9845ee3ff568e911bd9";
+          sha256 = "02x1a85k7r95z8091zgjiaj9nf0zvx1jy4xvl3hr12qbnrx1wfav";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b9faeb6d910d686cbcafe7d12e0bcf62a85689bd/recipes/restart-emacs";
           sha256 = "03aabz7fmy99nwimvjn7qz6pvc94i470hfgiwmjz3348cw02k0n6";
-          name = "restart-emacs";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -63346,8 +79397,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    restclient = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    restclient = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "restclient";
         version = "20180316.851";
         src = fetchFromGitHub {
@@ -63356,10 +79410,10 @@
           rev = "859d944796ce298b5779d9d256bd8d271d57e221";
           sha256 = "18grh9pislyr1mnj05nd2wj2ns8wy2irsxi7y203qkhkhqaamdgn";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/59303304fe1f724596245556dd90f6afffba425d/recipes/restclient";
           sha256 = "0wzp8i89a4hwm7qyxvdk10frknbqcni0isnp8k63nhq7c30s7md4";
-          name = "restclient";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -63367,20 +79421,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    restclient-helm = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild, restclient }:
-    melpaBuild {
+    restclient-helm = callPackage ({ fetchFromGitHub
+                                   , fetchurl
+                                   , helm
+                                   , lib
+                                   , melpaBuild
+                                   , restclient }:
+      melpaBuild {
         pname = "restclient-helm";
         version = "20170314.854";
         src = fetchFromGitHub {
           owner = "pashky";
           repo = "restclient.el";
-          rev = "859d944796ce298b5779d9d256bd8d271d57e221";
-          sha256 = "18grh9pislyr1mnj05nd2wj2ns8wy2irsxi7y203qkhkhqaamdgn";
+          rev = "af7420085dd67ed08d199a2402e8ff3e996c3029";
+          sha256 = "04c1b0xvhrsxb4r98qvvasn1nbkl4ddinip2rplilacywjy26rsz";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/59303304fe1f724596245556dd90f6afffba425d/recipes/restclient-helm";
           sha256 = "0cpf02ippfr9w6kiw3kng8smabv256ff388322hhn8a8icyjl24j";
-          name = "restclient-helm";
+          name = "recipe";
         };
         packageRequires = [ helm restclient ];
         meta = {
@@ -63388,8 +79447,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    restclient-test = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, restclient }:
-    melpaBuild {
+    restclient-test = callPackage ({ emacs
+                                   , fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild
+                                   , restclient }:
+      melpaBuild {
         pname = "restclient-test";
         version = "20180106.1246";
         src = fetchFromGitHub {
@@ -63398,10 +79462,10 @@
           rev = "4518561bc9661fedacb6fb352e9677207f45c418";
           sha256 = "0hbilpn77w0vykga9p4dkwaygipyna7mwn24y2kwfcahcr39pqjb";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/82e3078fc1f96d276fd288c3d7b91df5df4717a6/recipes/restclient-test";
           sha256 = "0g26z5p9fq7fm6bgrwaszya5xmhsgzcn1p7zqr83w74fbw6bcl39";
-          name = "restclient-test";
+          name = "recipe";
         };
         packageRequires = [ emacs restclient ];
         meta = {
@@ -63409,8 +79473,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    reveal-in-osx-finder = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    reveal-in-osx-finder = callPackage ({ fetchFromGitHub
+                                        , fetchurl
+                                        , lib
+                                        , melpaBuild }:
+      melpaBuild {
         pname = "reveal-in-osx-finder";
         version = "20150802.957";
         src = fetchFromGitHub {
@@ -63419,10 +79486,10 @@
           rev = "5710e5936e47139a610ec9a06899f72e77ddc7bc";
           sha256 = "1q13cgpz4wzhnqv84ablawy3y2wgdwy46sp7454mmfx9m77jzb2v";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2bf40285279b761b0efd6bc8542ae9aad4b329e1/recipes/reveal-in-osx-finder";
           sha256 = "00jgrmh5s3vlpj1jjf8l3c3h4hjk5x781m95sidw6chimizvfmfc";
-          name = "reveal-in-osx-finder";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -63430,8 +79497,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    reverse-im = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    reverse-im = callPackage ({ emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "reverse-im";
         version = "20180213.525";
         src = fetchFromGitHub {
@@ -63440,10 +79511,10 @@
           rev = "16931909115a922b1cf3846b1f60509b6590001f";
           sha256 = "0ccpnd1n9z18wpf8m9xyx5gps2xh5kxv8s1q2zan2zs9f46sz9pc";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f282ebbed8ad01b63b0e708ab273db51bf65fdbb/recipes/reverse-im";
           sha256 = "0c0dxxpa2s6gvhi14zfb0rnb4i7jaqw627a7ngm5fzyh0r9himcf";
-          name = "reverse-im";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -63451,20 +79522,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    reverse-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    reverse-theme = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "reverse-theme";
         version = "20141204.1745";
         src = fetchFromGitHub {
           owner = "syohex";
           repo = "emacs-reverse-theme";
-          rev = "8319d0d5342890a3530ffa4daafdb7c35feda1ca";
-          sha256 = "002ywhjms8ybk7cma2p2i11z3fz6kb0w8mlafysm911rvcq2hg5f";
+          rev = "13d0821a4ec5ece7e6a81f50d2a1a7e7ad21394d";
+          sha256 = "1sfl0rm4sxjkcjki0hmkkcicr24qr2q7gmficg9bi5q6vlrid1pn";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/81f0f525680fea98e804f39dbde1dada887e8821/recipes/reverse-theme";
           sha256 = "163kk5qnz9bk3l2fam79n264s764jfxbwqbiwgid8kw9cmk0v776";
-          name = "reverse-theme";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -63472,8 +79546,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    review-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    review-mode = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "review-mode";
         version = "20180312.535";
         src = fetchFromGitHub {
@@ -63482,10 +79559,10 @@
           rev = "bf38b0ce8be2eef1cf810ac6f3664d2190bb9ef7";
           sha256 = "0vmv19qvpba715xqx18dmlxq9kgkzvkf6jfd03bdcj2lh804y3pb";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f2f9e2667389577d0703874ca69ebe4800ae3e01/recipes/review-mode";
           sha256 = "0wapicggkngpdzi0yxc0b24s526fs819rc2d6miv6ix3gnw11n0n";
-          name = "review-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -63493,20 +79570,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    reykjavik-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    reykjavik-theme = callPackage ({ emacs
+                                   , fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "reykjavik-theme";
         version = "20160109.0";
         src = fetchFromGitHub {
           owner = "mswift42";
           repo = "reykjavik-theme";
-          rev = "d9bb783d6cf3c3b52cf377d9207484fba54657fd";
-          sha256 = "0zmby92mjszh77r5wh8sccqv3a5bb9sfhac8g55nasavw8hfplvj";
+          rev = "0d04f21a8d4c98accd278a1ba360ea3fa7cac812";
+          sha256 = "07gcz2zmz1hhrailad9jfjflkyf1lkm8cdyvnd752064dkdja7y7";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/10bf153e2b84050304ba2532f5eb41c7a4e7632f/recipes/reykjavik-theme";
           sha256 = "1f0q2gfzkmpd374jryrd1lgg8xj6rwdq181jhppj3rfjizgw4l35";
-          name = "reykjavik-theme";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -63514,20 +79595,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    rg = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    rg = callPackage ({ cl-lib ? null
+                      , emacs
+                      , fetchFromGitHub
+                      , fetchurl
+                      , lib
+                      , melpaBuild
+                      , s }:
+      melpaBuild {
         pname = "rg";
-        version = "20180404.315";
+        version = "20180626.1041";
         src = fetchFromGitHub {
           owner = "dajva";
           repo = "rg.el";
-          rev = "d50bd106275f3ef7f77d0147857412fb065eef47";
-          sha256 = "0zjhak534j1n03z6p9wjmgc48yy40icrp2x8y9vbvg4hgx8xh9lm";
+          rev = "ca5afceb3dd84590ffadd525a9643befbae0959f";
+          sha256 = "03f13vcknlwdbq4997q82z6gl718mv83k88rnynh1m4v4hcpwv09";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9ce1f721867383a841957370946f283f996fa76f/recipes/rg";
           sha256 = "0i78qvqdznh1z3b0mnzihv07j8b9r86dc1lsa1qlzacv6a2i9sbm";
-          name = "rg";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs s ];
         meta = {
@@ -63535,8 +79622,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    rhtml-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    rhtml-mode = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "rhtml-mode";
         version = "20130422.611";
         src = fetchFromGitHub {
@@ -63545,10 +79635,10 @@
           rev = "a6d71b38a3db867ccf82999c99805db1a3a33c33";
           sha256 = "1qlpv5lzj4yfyjgdykhm6q9izg6g0z5pf5nmynj42vsx7v8bhy1x";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f9e14e9d8df9c2ce13e290a5f3d3bf9b247037f4/recipes/rhtml-mode";
           sha256 = "038j5jkcckmhlq3vz4h07s5y2scljh1fdn9r614hiyxwgk48lc35";
-          name = "rhtml-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -63556,8 +79646,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    rib-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    rib-mode = callPackage ({ emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "rib-mode";
         version = "20170726.748";
         src = fetchFromGitHub {
@@ -63566,10 +79660,10 @@
           rev = "97470158784c3c212e22e2c20b8471ee65ba59af";
           sha256 = "0hln0hympmxmsci82ivc2rw289j1bmgdxns96m1ng1bl668bwag7";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c38c18f3eb75d559752fcd9956464fef890be728/recipes/rib-mode";
           sha256 = "0qgbzrwbbgg4mzjb7yw85qs83b6hpldazip1cigywr46w7f81587";
-          name = "rib-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -63577,20 +79671,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    rich-minority = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    rich-minority = callPackage ({ cl-lib ? null
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "rich-minority";
         version = "20170813.622";
         src = fetchFromGitHub {
           owner = "Malabarba";
           repo = "rich-minority";
-          rev = "a50d9b2fd059f6a0e5b22063a5375851a087f61a";
-          sha256 = "126slgxa786rcbxdnazyn7svkwk31hy1c2ab7kzswf8f0k81fqk8";
+          rev = "333e4669f76a0fb68b433117d377711e418a525e";
+          sha256 = "0ms42fnfis6y2h717cqhngzv7ysgf8340rsfm2i7rx2gbdynr1ic";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/rich-minority";
           sha256 = "11xd76w5k3b3q5bxqjb55vi6dsal9drvyc1nh7z83awm59hvgczc";
-          name = "rich-minority";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -63598,20 +79696,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    rigid-tabs = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    rigid-tabs = callPackage ({ emacs
+                              , fetchFromGitLab
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "rigid-tabs";
         version = "20170903.859";
-        src = fetchFromGitHub {
+        src = fetchFromGitLab {
           owner = "wavexx";
           repo = "rigid-tabs.el";
-          rev = "eba84ceaba2e57e76ad2dfbb7a7154238a25d956";
-          sha256 = "18rba101m9vmjl4mf3x0k7wvbgn6qmay9la745vzpr3lx1f4nn98";
+          rev = "d48ba58acbe8934700cd23db2acb574b09306238";
+          sha256 = "03dmyn5lnw0mj4ymgyxz6gksl2byw31plxn61qcggkj6gk8g500d";
         };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/689b0060ee5db505fc0ed4603aca204b2d3c63a2/recipes/rigid-tabs";
-          sha256 = "06n0bcvc3nnp84pcq3lywwga7l92jz8hnkilhbq59kydf5zbjldp";
-          name = "rigid-tabs";
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/c1cf98dff029d494007fe25d29bd8bcfecc5b8e6/recipes/rigid-tabs";
+          sha256 = "0623hhhykrxq702871s5p4vddkvx7jpj6hg5q0c9jkbvflz9n9y8";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -63619,20 +79721,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    rimero-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    rimero-theme = callPackage ({ emacs
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "rimero-theme";
-        version = "20171001.821";
+        version = "20180630.515";
         src = fetchFromGitHub {
           owner = "yveszoundi";
           repo = "emacs-rimero-theme";
-          rev = "2c15da5a4d56f1b29db2fc178d387eb86e7abd39";
-          sha256 = "0pvykjz0a2jgq2dghhshc4w7852jrlk0vy35ppbn956yp7rq9sx3";
+          rev = "dc6917b7404d3f79044046c231a195c40c9d0a88";
+          sha256 = "0zjs76lp4mpds7hkxbks2lj77ifbnzgq74xdl6minfcxc3wjkbvi";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c6d07b0c021001195e6e0951c890566a5a784ce1/recipes/rimero-theme";
           sha256 = "0jbknrp9hc8s956cy2gqffxnx0fgnhmjqp2i4vyp0ywh45wrls5r";
-          name = "rimero-theme";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -63640,20 +79746,27 @@
           license = lib.licenses.free;
         };
       }) {};
-    rinari = callPackage ({ fetchFromGitHub, fetchurl, inf-ruby, jump, lib, melpaBuild, ruby-compilation, ruby-mode ? null }:
-    melpaBuild {
+    rinari = callPackage ({ fetchFromGitHub
+                          , fetchurl
+                          , inf-ruby
+                          , jump
+                          , lib
+                          , melpaBuild
+                          , ruby-compilation
+                          , ruby-mode ? null }:
+      melpaBuild {
         pname = "rinari";
         version = "20150708.2340";
         src = fetchFromGitHub {
           owner = "eschulte";
           repo = "rinari";
-          rev = "134438af8fbdfa9c8077267c768d273a9792b484";
-          sha256 = "0ndrqj7qsf9rky4v928803ib66p37vyhxgyc42vshx86q73v4cyg";
+          rev = "be07b0f42aefa24c5d36c441d1f3f72e64fffaa4";
+          sha256 = "1kg83z10jw4ik0aapv9cjqlvqy31rln2am8vh3f77zh61qha37hx";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4b243a909faa71e14ee7ca4f307df8e8136e5d7c/recipes/rinari";
           sha256 = "0qknicg3vzl7zbkwsdvp10hrvlng6mbi8hgslx4ir522dflrf9p0";
-          name = "rinari";
+          name = "recipe";
         };
         packageRequires = [ inf-ruby jump ruby-compilation ruby-mode ];
         meta = {
@@ -63661,8 +79774,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    rings = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    rings = callPackage ({ fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "rings";
         version = "20160531.1327";
         src = fetchFromGitHub {
@@ -63671,10 +79787,10 @@
           rev = "3590b222eb80652cbd27866f066bd3571d86edfc";
           sha256 = "01mfiyq4cr2qdmvaxid8a094p20w97n2nsiy9vyng77vcmv36sd5";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/113118947e33ab0c8004dbe9b188eba2ea282356/recipes/rings";
           sha256 = "1ncsb4jip07hbrf1l4j9yzn3l0kb63ylhzzsb4bb2yx6as4a66k7";
-          name = "rings";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -63682,8 +79798,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    ripgrep = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ripgrep = callPackage ({ fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "ripgrep";
         version = "20180323.920";
         src = fetchFromGitHub {
@@ -63692,10 +79811,10 @@
           rev = "a1f8f030bf5daea92dd13b953720a6c13dd3557c";
           sha256 = "0mpysjcbw9qxy1lcwsd2rqf72xahpdpn88xcq0cnk1y2jam8gjkf";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e8d789818876e959a1a59690f1dd7d4efa6d608b/recipes/ripgrep";
           sha256 = "1j9c3mhcyhs4xf44z6fnlvmb81pps25bp43gdqvp0954i068mgah";
-          name = "ripgrep";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -63703,8 +79822,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    riscv-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    riscv-mode = callPackage ({ emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "riscv-mode";
         version = "20170804.821";
         src = fetchFromGitHub {
@@ -63713,10 +79836,10 @@
           rev = "99febf97d1fa9441e8dada94fe30c2aa439c9749";
           sha256 = "119p926ypz525xdh82m2d1saky1qh5va224fxyqisfbwfrc17arh";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0853b4b678be7d1906a2f7946bfa1072590faf72/recipes/riscv-mode";
           sha256 = "0496b7xwshmk3gv6s5hggbm9qd60a05racj3xcsxwqzak359lk2b";
-          name = "riscv-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -63724,20 +79847,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    rjsx-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild }:
-    melpaBuild {
+    rjsx-mode = callPackage ({ emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , js2-mode
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "rjsx-mode";
-        version = "20180409.902";
+        version = "20180624.1758";
         src = fetchFromGitHub {
           owner = "felipeochoa";
           repo = "rjsx-mode";
-          rev = "a0231e76808e94eb842c502fc9e10b53d3307ea8";
-          sha256 = "0i6yzxfwyvbmfy1x5pymmjdli91ya6jgfq6wdjnwyrknbf6p76w7";
+          rev = "8bdb234f2b66a2ce0563b676447ebb8db37d593f";
+          sha256 = "047mfmj6rklxiqg43ji4gb5qr86z8q1717imsjffrkbjq3iqlw6j";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b83be7efdef2457e1320fe3dec46484fbd20263c/recipes/rjsx-mode";
           sha256 = "0w3ij8k8058pfw443chm1kn30ia0f5rfbg03w9ddw86xb3wa2q0b";
-          name = "rjsx-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs js2-mode ];
         meta = {
@@ -63745,8 +79873,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    robe = callPackage ({ emacs, fetchFromGitHub, fetchurl, inf-ruby, lib, melpaBuild }:
-    melpaBuild {
+    robe = callPackage ({ emacs
+                        , fetchFromGitHub
+                        , fetchurl
+                        , inf-ruby
+                        , lib
+                        , melpaBuild }:
+      melpaBuild {
         pname = "robe";
         version = "20171116.1249";
         src = fetchFromGitHub {
@@ -63755,10 +79888,10 @@
           rev = "7829f4fdda41eee0add8868646ab86e6b17de4b4";
           sha256 = "1h526m21g0yqpry8dh42aj8nv4lp74dc1cmcyfb16sx5rrk0vx27";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/673f920d02fe761bc080b73db7d37dbf5b6d86d8/recipes/robe";
           sha256 = "19py2lwi7maya90kh1mgwqb16j72f7gm05dwla6xrzq1aks18wrk";
-          name = "robe";
+          name = "recipe";
         };
         packageRequires = [ emacs inf-ruby ];
         meta = {
@@ -63766,8 +79899,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    robots-txt-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    robots-txt-mode = callPackage ({ fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "robots-txt-mode";
         version = "20170908.642";
         src = fetchFromGitHub {
@@ -63776,10 +79912,10 @@
           rev = "4a77674ab2963b829d3b751741c4ce1169e87f6b";
           sha256 = "1ynmb9gpryfrml80kkv71k11j7r91mgyzh1q8xx52s0b4mkd33zc";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/eb13cb0dba1696cc51132cd1ff723fa17f892a7c/recipes/robots-txt-mode";
           sha256 = "00hxz4mygcxg7d8m2i4cm0bl82v3hw8wb4m8vv7g7fqkjp32c9qc";
-          name = "robots-txt-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -63787,8 +79923,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    roguel-ike = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, popup }:
-    melpaBuild {
+    roguel-ike = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild
+                              , popup }:
+      melpaBuild {
         pname = "roguel-ike";
         version = "20160119.1902";
         src = fetchFromGitHub {
@@ -63797,10 +79937,10 @@
           rev = "706dcb0687e8016d7d776f9d9e5ace9fdbbca43c";
           sha256 = "0rgv4y9aa5cc2ddz3y5z8d22xmr8kf5c60h0r3g8h91jmcw3rb4z";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2db1979e039e466268ca7c264988792d3046e19a/recipes/roguel-ike";
           sha256 = "1a7sa6nhgi0s4gjh55bhk5cg6q6s7564fk008ibmrm05gfq9wlg8";
-          name = "roguel-ike";
+          name = "recipe";
         };
         packageRequires = [ popup ];
         meta = {
@@ -63808,8 +79948,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    rope-read-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    rope-read-mode = callPackage ({ fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "rope-read-mode";
         version = "20171003.719";
         src = fetchFromGitHub {
@@ -63818,10 +79961,10 @@
           rev = "77b183a6f5450138388509f54a6a2ce442766e50";
           sha256 = "0ddm7gwr51ip8mc79jxkvp52sxhlvs0kyy59v7r7pf5mbadbpsbz";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/14a674559aa485e92357a8b941304ae8167b9c3e/recipes/rope-read-mode";
           sha256 = "0grnn5k6rbck0hz4c6cadgj3a4dv62habyingznisg2kx9i3m0dw";
-          name = "rope-read-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -63829,20 +79972,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    rotate = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    rotate = callPackage ({ fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "rotate";
         version = "20160909.136";
         src = fetchFromGitHub {
           owner = "daichirata";
           repo = "emacs-rotate";
-          rev = "091b5ac4fc310773253efb317e3dbe8e46959ba6";
-          sha256 = "0msjn7ays71mcw6qmdk0mpjp1rvd7fwz917vmvlcd7cpmvkyfbds";
+          rev = "eb177ec2aba1a358aa757720a9a4c8d8ce4856e8";
+          sha256 = "1v8m08hrj3g1vcyhjmkh6wsiczrvjq0v90nqb5y3hy3l40pkag5x";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7d92e66cad586d4dc6b1de12d1b41b818b5232c2/recipes/rotate";
           sha256 = "11a0svvfq29cb4630jq0hz19xk9jfhfjnssm7vg0dnlzpxqi3vif";
-          name = "rotate";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -63850,20 +79996,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    roy-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    roy-mode = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "roy-mode";
         version = "20121208.358";
         src = fetchFromGitHub {
           owner = "folone";
           repo = "roy-mode";
-          rev = "0416f561edbc6b4a29fced8be84d2527a9613d65";
-          sha256 = "04jbnm9is2cis75h40znqzjvyjq27ncr2vfank6zglzi4fhxsl0r";
+          rev = "e1a4fb5ec0f46e82f569865ca47042ba5934e425";
+          sha256 = "1m19hjgh9s21qknb1278pf6gw77a747siy04qdznj4519j12wjjg";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/roy-mode";
           sha256 = "1r49c1v0xjkrpxmq0k2l2nrx95n06b7hbpmr1n7nkil2bxdq275i";
-          name = "roy-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -63871,8 +80020,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    rpm-spec-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    rpm-spec-mode = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "rpm-spec-mode";
         version = "20160710.436";
         src = fetchFromGitHub {
@@ -63881,10 +80033,10 @@
           rev = "c1c38050c48ea330c7cea632b8785d66daeefb2b";
           sha256 = "0427kcvf2ljhzwxskn3jzk0ncrl3f9zcz2sm83d9pmhh5jax2gch";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bb7e188fffda3d4e42690511775e5e32a11e1b34/recipes/rpm-spec-mode";
           sha256 = "1ygk0pdhq1hvgzd173h79lxb04b9lmvq4hi70qf9244bqbm0m182";
-          name = "rpm-spec-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -63892,8 +80044,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    rpn-calc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, popup }:
-    melpaBuild {
+    rpn-calc = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild
+                            , popup }:
+      melpaBuild {
         pname = "rpn-calc";
         version = "20170522.1842";
         src = fetchFromGitHub {
@@ -63902,10 +80058,10 @@
           rev = "66fcb64dbfddfc23823356b6213215bd7ab5efc6";
           sha256 = "1lgabs97x6h4yrgwln8hsxi47wgl46jzhf162wa1almdbqbp9100";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/47d5b3c931cdbc2351e01d15e2b98c78081c9506/recipes/rpn-calc";
           sha256 = "04dj2r4035k0c3x6iyjydshzmq381d60pmscp2hg5m7sp7bqn5xs";
-          name = "rpn-calc";
+          name = "recipe";
         };
         packageRequires = [ popup ];
         meta = {
@@ -63913,20 +80069,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    rsense = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    rsense = callPackage ({ fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "rsense";
         version = "20100510.2105";
         src = fetchFromGitHub {
           owner = "m2ym";
           repo = "rsense";
-          rev = "8b5ee58318747ca1dde84ee41d48c4f50175cf35";
-          sha256 = "0xkr1qn8fm3kv5c11janq5acp1q02abvxc463zijvm2qk735yl4d";
+          rev = "fbcfc00402742b0d8744a9bfd1bcdd869f4fb923";
+          sha256 = "178rnmhj3987dscsjkg5qcsw92s3b5rv51s0j7qcavx254h7xdf0";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e2149ce3baef9ac01d5b2e8b1a933a3e1206015f/recipes/rsense";
           sha256 = "1901xqlpc8fg4sl9j58jn40i2djs8s0cdcqcrzrq02lvk8ssfdf5";
-          name = "rsense";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -63934,20 +80093,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    rspec-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, ruby-mode ? null }:
-    melpaBuild {
+    rspec-mode = callPackage ({ cl-lib ? null
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild
+                              , ruby-mode ? null }:
+      melpaBuild {
         pname = "rspec-mode";
-        version = "20171025.1606";
+        version = "20180614.448";
         src = fetchFromGitHub {
           owner = "pezra";
           repo = "rspec-mode";
-          rev = "94a04f148922852b591957b0b3b22de5c4237448";
-          sha256 = "04qcicaklj9fhl0wbb8axi8zvd0az43cnrhf53vhgwsgnf7rjya2";
+          rev = "dda1ece81bd2802c4097e5c963fac33a444659cb";
+          sha256 = "1d8i2y9r1im346df3ishsx16g5264pfq930whbj9hipfml6s8ddy";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cd83e61b10da20198de990aa081b47d3b0b44d43/recipes/rspec-mode";
           sha256 = "0nyib9rx9w9cbsgkcjx9n8fp77xkzxg923z0rdm3f9kc7njcn0zx";
-          name = "rspec-mode";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ruby-mode ];
         meta = {
@@ -63955,20 +80119,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    rtags = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    rtags = callPackage ({ fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "rtags";
-        version = "20180224.1658";
+        version = "20180619.823";
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "4747d5b695bee40c3b0a2e3591ac8897571edd66";
-          sha256 = "1qy71bx8nki73mqslw54hq5bn1asz5qg1b2848nrsj8zb2yd85x5";
+          rev = "015cde3b77d9971e890f25b54cccfdb2582970fa";
+          sha256 = "00fs8181nrgnx9bcsc479rhgvxx7hh8byxnzi9g6kl4ak1cmc7jx";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/rtags";
           sha256 = "0s5m4zjvnc1k4gkkizbs4ysvzzbfh45717pksg9bnyzwx5lcw5yd";
-          name = "rtags";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -63976,8 +80143,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    rtm = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    rtm = callPackage ({ cl-lib ? null
+                       , fetchFromGitHub
+                       , fetchurl
+                       , lib
+                       , melpaBuild }:
+      melpaBuild {
         pname = "rtm";
         version = "20180329.808";
         src = fetchFromGitHub {
@@ -63986,10 +80157,10 @@
           rev = "3e3d09387cb84801343ecca8fb02e82f213e7bbe";
           sha256 = "0cc07lhh27i1ra4alrwb6w322ddi6hw0498nkzf388arhn10h3wv";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/rtm";
           sha256 = "1bwbaps76pawz73fs7nzkvbii9d57zmfdccpm18dwn6phaqxbhyc";
-          name = "rtm";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -63997,8 +80168,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    rubik = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    rubik = callPackage ({ cl-lib ? null
+                         , emacs
+                         , fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "rubik";
         version = "20180222.1214";
         src = fetchFromGitHub {
@@ -64007,10 +80183,10 @@
           rev = "c8dab1726463dbc9042a0b00186e4a8df02eb868";
           sha256 = "13razzmk70h5sd69ms0a3ljr285zcad0wnrqkfxbgi5rnppqlkh1";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/00946ed21b0f05b753c792863f6bcc99c26c32a3/recipes/rubik";
           sha256 = "07bbh5vjw3jdxf06lxqm45y8ijcai391mf97xw5c29z33vhqs267";
-          name = "rubik";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -64018,8 +80194,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    rubocop = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    rubocop = callPackage ({ emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "rubocop";
         version = "20170311.2211";
         src = fetchFromGitHub {
@@ -64028,10 +80208,10 @@
           rev = "980bedb455e3551d35a212fae515c054888907c1";
           sha256 = "152ara2p59imry2ymfnk5mycbc07rblcmfmqjgm5fijb2x94xv8p";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/00f2cf3e8e28bce5c26c86aba54390ffff48d7da/recipes/rubocop";
           sha256 = "114azl0fasmnq0fxxyiif3363mpg8qz3ynx91in5acqzh902fa3q";
-          name = "rubocop";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -64039,20 +80219,50 @@
           license = lib.licenses.free;
         };
       }) {};
-    ruby-additional = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, ruby-mode ? null }:
-    melpaBuild {
+    rubocopfmt = callPackage ({ cl-lib ? null
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
+        pname = "rubocopfmt";
+        version = "20180519.748";
+        src = fetchFromGitHub {
+          owner = "jimeh";
+          repo = "rubocopfmt.el";
+          rev = "34c69c9c923d0da223f7569a6ecc842095adcf85";
+          sha256 = "0aa683r16gvpv07i0gzbil81kgxbgk4pjn510xgalan3fk20nal4";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/ac01edffceea771d8fe41326e28dd9881f1661ab/recipes/rubocopfmt";
+          sha256 = "06ficv1r3axzi7q659pk1m3gbpf44nd2ir2ikmi8mr8rq44sqps0";
+          name = "recipe";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "https://melpa.org/#/rubocopfmt";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ruby-additional = callPackage ({ emacs
+                                   , fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild
+                                   , ruby-mode ? null }:
+      melpaBuild {
         pname = "ruby-additional";
-        version = "20171001.2106";
+        version = "20180316.1937";
         src = fetchFromGitHub {
           owner = "emacsorphanage";
           repo = "ruby-additional";
-          rev = "14f380893cb7c1d9ddbb4ed1a2fc280999c82fde";
-          sha256 = "07mbjnph72l52f0bgz6qn5pbnfiyjx5p1ranq5g4csbfpx9jcc3s";
+          rev = "97998d908e3720c7cb45a80aeda4b55f3b8ea0f0";
+          sha256 = "1jmnz1y2q5994x7j6gfqrbpjyd2rsnrjis8xlx14hplmfgm2scd5";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/30de78c9cf83de30093a5647976eeaf552d4b2cb/recipes/ruby-additional";
           sha256 = "1ivxn787k64q5jl0dxmxbj240ykcyvfhfam5fdvrwvc3yysk2dx7";
-          name = "ruby-additional";
+          name = "recipe";
         };
         packageRequires = [ emacs ruby-mode ];
         meta = {
@@ -64060,20 +80270,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    ruby-compilation = callPackage ({ fetchFromGitHub, fetchurl, inf-ruby, lib, melpaBuild }:
-    melpaBuild {
+    ruby-compilation = callPackage ({ fetchFromGitHub
+                                    , fetchurl
+                                    , inf-ruby
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "ruby-compilation";
         version = "20150708.2340";
         src = fetchFromGitHub {
           owner = "eschulte";
           repo = "rinari";
-          rev = "134438af8fbdfa9c8077267c768d273a9792b484";
-          sha256 = "0ndrqj7qsf9rky4v928803ib66p37vyhxgyc42vshx86q73v4cyg";
+          rev = "be07b0f42aefa24c5d36c441d1f3f72e64fffaa4";
+          sha256 = "1kg83z10jw4ik0aapv9cjqlvqy31rln2am8vh3f77zh61qha37hx";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ca7bf43ef8893bf04e9658390e306ef69e80a156/recipes/ruby-compilation";
           sha256 = "1x1vpkjpx95sfcjhkx4cafypj0nkbd1i0mzxx3lmcrsmg8iv0rjc";
-          name = "ruby-compilation";
+          name = "recipe";
         };
         packageRequires = [ inf-ruby ];
         meta = {
@@ -64081,8 +80295,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    ruby-electric = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ruby-electric = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "ruby-electric";
         version = "20170810.430";
         src = fetchFromGitHub {
@@ -64091,10 +80308,10 @@
           rev = "3553448a780a1ea5c3b0e9becd820d4762876593";
           sha256 = "0h47lfgxjcyyl8gb1w7l8j8h65s3lp1hsq742sl7a1gf5y6bbm3v";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5fd5fa797a813e02a6433ecbe2bca1270a383753/recipes/ruby-electric";
           sha256 = "02xskivi917l8xyhrij084dmzwjq3knjcn65l2iwz34s767fbwl2";
-          name = "ruby-electric";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -64102,20 +80319,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    ruby-end = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ruby-end = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "ruby-end";
         version = "20141215.423";
         src = fetchFromGitHub {
           owner = "rejeep";
           repo = "ruby-end.el";
-          rev = "a136f75abb6d5577ce40d61dfeb778c2e9bb09c0";
-          sha256 = "1f530gaiy010qln51g83m1llazhyfi8ws0lvsb982fhi4dh1xfk5";
+          rev = "648b81af136a581bcef387744d93c011d9cdf54b";
+          sha256 = "1cpz9vkp57nk682c5xm20g7bfj5g2aq5ahpk4nhgx7pvd3xvr1ds";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/ruby-end";
           sha256 = "1cnmdlkhm8xsifbjs6ymvi92gdnxiaghb04h10qg41phj6v7m9mg";
-          name = "ruby-end";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -64123,8 +80343,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    ruby-extra-highlight = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ruby-extra-highlight = callPackage ({ fetchFromGitHub
+                                        , fetchurl
+                                        , lib
+                                        , melpaBuild }:
+      melpaBuild {
         pname = "ruby-extra-highlight";
         version = "20171106.1133";
         src = fetchFromGitHub {
@@ -64133,10 +80356,10 @@
           rev = "83942d18eae361998d24c1c523b308eea821f048";
           sha256 = "18mq0ap7f0b22cdp2wdj0y2fqsahm2ngf7fvdy0mkkfs3818awlp";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/73488b0aea4eb470a1f235fece0753797bfd7e35/recipes/ruby-extra-highlight";
           sha256 = "0dybf39yv0yzy8bsz9k5s64033id6hq4v268m11la4bp5fbv5r37";
-          name = "ruby-extra-highlight";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -64144,8 +80367,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    ruby-factory = callPackage ({ fetchFromGitHub, fetchurl, inflections, lib, melpaBuild }:
-    melpaBuild {
+    ruby-factory = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , inflections
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "ruby-factory";
         version = "20160101.2321";
         src = fetchFromGitHub {
@@ -64154,10 +80381,10 @@
           rev = "2bb7ccc2fccb5257376a989aa395bc7b9eb1d55d";
           sha256 = "15b2rs6m4d511qqkc2gc8k15mbqzrgv6s3hpypajl8nvqa79xnyd";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3ce422ccc34eb325ce432284e44af48607251da2/recipes/ruby-factory";
           sha256 = "0v8009pad0l41zh9r1wzcx1h6vpzhr5rgpq6rb002prxz2lcbd37";
-          name = "ruby-factory";
+          name = "recipe";
         };
         packageRequires = [ inflections ];
         meta = {
@@ -64165,8 +80392,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    ruby-hash-syntax = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ruby-hash-syntax = callPackage ({ fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "ruby-hash-syntax";
         version = "20180323.1909";
         src = fetchFromGitHub {
@@ -64175,10 +80405,10 @@
           rev = "89fc364a837d7a78ecce34380f09c073a83e30e0";
           sha256 = "1nwf3681fa6lfqr14n9wihckpi220hvamv1ppzmrhn4k49vxljy8";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c7d21a43a4bf267507bdc746ec9d0fd82049c0af/recipes/ruby-hash-syntax";
           sha256 = "0bvwyagfh7mn457iibrpv1ay75089gp8pg608gbm24m0ix82xvb5";
-          name = "ruby-hash-syntax";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -64186,8 +80416,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    ruby-interpolation = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ruby-interpolation = callPackage ({ fetchFromGitHub
+                                      , fetchurl
+                                      , lib
+                                      , melpaBuild }:
+      melpaBuild {
         pname = "ruby-interpolation";
         version = "20131112.852";
         src = fetchFromGitHub {
@@ -64196,10 +80429,10 @@
           rev = "1978e337601222cedf00e117bf4b5cac15d1f203";
           sha256 = "1r2f5jxi6wnkmr1ssvqgshi97gjvxvf3qqc0njg1s33cy39wpqq5";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ca7bf43ef8893bf04e9658390e306ef69e80a156/recipes/ruby-interpolation";
           sha256 = "07idndxw8vgfrk5zfmjjhmixza35mqxwjhsrbjrq5yy72i5ivznp";
-          name = "ruby-interpolation";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -64207,8 +80440,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    ruby-refactor = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, ruby-mode ? null }:
-    melpaBuild {
+    ruby-refactor = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild
+                                 , ruby-mode ? null }:
+      melpaBuild {
         pname = "ruby-refactor";
         version = "20160214.850";
         src = fetchFromGitHub {
@@ -64217,10 +80454,10 @@
           rev = "e6b7125878a08518bffec6942df0c606f748e9ee";
           sha256 = "13008ih4hwa80bn2dbgj551knbvgpriz5sb241rkf7mifmlfzgsi";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8d223ef5b9e51265c510f1cf7888b621e47bfdcf/recipes/ruby-refactor";
           sha256 = "0nwinnnhy72h1ihjlnjl8k8z3yf4nl2z7hfv085gwiacr6nn2rby";
-          name = "ruby-refactor";
+          name = "recipe";
         };
         packageRequires = [ ruby-mode ];
         meta = {
@@ -64228,8 +80465,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    ruby-test-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, pcre2el, ruby-mode ? null }:
-    melpaBuild {
+    ruby-test-mode = callPackage ({ fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild
+                                  , pcre2el
+                                  , ruby-mode ? null }:
+      melpaBuild {
         pname = "ruby-test-mode";
         version = "20171016.931";
         src = fetchFromGitHub {
@@ -64238,10 +80480,10 @@
           rev = "87f6d770f8d2326c8d36099aeee5d577f3e2af69";
           sha256 = "0qiwc2h5hyh6np16a2gfcchbnyh7v5wnzd8idr64cmd9blg3jh8d";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ruby-test-mode";
           sha256 = "06j1q9m08jkwlnkccppf2qlcs48nr8ic9sjdv90rnixc18bw7bpk";
-          name = "ruby-test-mode";
+          name = "recipe";
         };
         packageRequires = [ pcre2el ruby-mode ];
         meta = {
@@ -64249,8 +80491,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    ruby-tools = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ruby-tools = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "ruby-tools";
         version = "20151209.815";
         src = fetchFromGitHub {
@@ -64259,10 +80504,10 @@
           rev = "6b97066b58a4f82eb2ecea6434a0a7e981aa4c18";
           sha256 = "0jd9acycpbdd90hallrl0k5055rypp502qv4c6i286p7f9is4kvq";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/ruby-tools";
           sha256 = "0zpk55rkrqyangyyljxzf0n1icgqnpdzycwack5rji556h5grvjy";
-          name = "ruby-tools";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -64270,8 +80515,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    rufo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    rufo = callPackage ({ emacs
+                        , fetchFromGitHub
+                        , fetchurl
+                        , lib
+                        , melpaBuild }:
+      melpaBuild {
         pname = "rufo";
         version = "20170718.716";
         src = fetchFromGitHub {
@@ -64280,10 +80529,10 @@
           rev = "85a6d80fb05fef396a8029b8f944c92a53faf8fe";
           sha256 = "11klircrdc9z9jfksd6rjgwbb775mziss67mw74673b8iva8n1y7";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/123b89e06a44ef45150ca7243afc41302dfb6c6e/recipes/rufo";
           sha256 = "0pxsifcxic3q54rqj0jbj20hq7f2s4icl57lligf9g0w23qzj239";
-          name = "rufo";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -64291,20 +80540,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    rum-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    rum-mode = callPackage ({ emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "rum-mode";
         version = "20180126.1622";
         src = fetchFromGitHub {
           owner = "rumlang";
           repo = "rum-mode";
-          rev = "893b1a26244ef6ea82833a9afbc13cb82c0cfb53";
-          sha256 = "0lgahv25a9b2dfgkcm9ipyziiqnr3sb9l2dvzm35khwf3m8dwxgq";
+          rev = "161471e6476d232d479f9767535918920811d7bf";
+          sha256 = "12fh1fmfnfpkgsya5asxqywimdb5361cvw1cqfmhrm1z5pyjgbd7";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0c9f8ce2dee376f1f34e89e9642c472a148fca77/recipes/rum-mode";
           sha256 = "1838w8rk5pgp1hn7a0m83mfw9jin4qv5mkyl68hl3gj7g9lhn7sd";
-          name = "rum-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -64312,8 +80565,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    run-stuff = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    run-stuff = callPackage ({ emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "run-stuff";
         version = "20180208.2348";
         src = fetchFromGitHub {
@@ -64322,10 +80579,10 @@
           rev = "ed42a7bc9a197ccf1ca87f9937bf98f0a9ed3f92";
           sha256 = "1w49v868n3723q6887y4bc5q8spd7xync5d581vvxdpi75qgvr0z";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0d6e9ce2acd859b887f7e161f4b9969be1a0b8ef/recipes/run-stuff";
           sha256 = "0zx96m6cval5g4p0lhy9kpyycp2jygaq3y2njhkpij9gl4nb2ll2";
-          name = "run-stuff";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -64333,20 +80590,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    runner = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    runner = callPackage ({ fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "runner";
         version = "20160524.43";
         src = fetchFromGitHub {
           owner = "thamer";
           repo = "runner";
-          rev = "a211d57ddc600410d07a8b534920ba905b093d87";
-          sha256 = "1ddf5jydpc43wgvw4a669wifij71b4r8zfazcqfdpyfh1j4m591b";
+          rev = "e7394d7c9e886788a656a7085b4cf963d6fc318f";
+          sha256 = "0gpfszp6bqr3vdr32vr6l0nq9hnic31vnins68hc5hknli91bpsq";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f3a4e051ab45b8036b91aa0c50bd3f93cd85e9d0/recipes/runner";
           sha256 = "09apmk22swj05z77ziij31jj6b3g221qv3mw3mymffzxn5ap2rbx";
-          name = "runner";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -64354,8 +80614,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    runtests = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    runtests = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "runtests";
         version = "20150807.131";
         src = fetchFromGitHub {
@@ -64364,10 +80627,10 @@
           rev = "ed90249f24cc48290018df48b9b9b7172440be3e";
           sha256 = "18w6gkpxp0g7rzvnrk8vvr267y768dfik447ssq8jpz3jlr5jnq6";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/95c49160919d310256501d7c71102f8367aae5aa/recipes/runtests";
           sha256 = "0m9rqjb5c0yqr2wv5dsdiba21knr63b5pxsqgbkbybi15zgxcicb";
-          name = "runtests";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -64375,8 +80638,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    russian-holidays = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    russian-holidays = callPackage ({ fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "russian-holidays";
         version = "20170109.1340";
         src = fetchFromGitHub {
@@ -64385,10 +80651,10 @@
           rev = "b285a30f29d85c48e3ea4eb93972d34a090c167b";
           sha256 = "1mz842gvrscklg2w2r2q2wbj92qr31h895k700j3axqx6k30ni0h";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d4830900e371e7036225ea434c52204f4d2481a7/recipes/russian-holidays";
           sha256 = "0lawjwz296grbvb4a1mm1j754q7mpcanyfln1gqxr339kqx2aqd8";
-          name = "russian-holidays";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -64396,20 +80662,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    rust-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    rust-mode = callPackage ({ emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "rust-mode";
-        version = "20180322.127";
+        version = "20180626.1512";
         src = fetchFromGitHub {
           owner = "rust-lang";
           repo = "rust-mode";
-          rev = "07e16c6364bf0362f76c6aa46604453dec3ac640";
-          sha256 = "0xjbv9q3mz7chjaz889hyji4xaff8ql2wmk0wir6bnyg6g2k58d1";
+          rev = "106aeab800fb3404baf231845d3e3549ec235afa";
+          sha256 = "0bcrklyicxh032rrp585rl5mxd26nb61dp6r5bl935rlcmxzsczh";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8f6e5d990d699d571dccbdeb13327b33389bb113/recipes/rust-mode";
           sha256 = "1i1mw1v99nyikscg2s1m216b0h8svbzmf5kjvjgk9zjiba4cbqzc";
-          name = "rust-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -64417,20 +80687,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    rust-playground = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, rust-mode }:
-    melpaBuild {
+    rust-playground = callPackage ({ emacs
+                                   , fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild
+                                   , rust-mode }:
+      melpaBuild {
         pname = "rust-playground";
-        version = "20180317.1434";
+        version = "20180507.1032";
         src = fetchFromGitHub {
           owner = "grafov";
           repo = "rust-playground";
-          rev = "cbb8a32c5f69b5acd5e04519f55465b2b241c0a0";
-          sha256 = "0791msvihb99ghknkvmmbjkp1zcvn39463y3qg6xj049h2xl9skk";
+          rev = "2f22ec74e4158984e0e70cf0bf728bbd42eb661b";
+          sha256 = "1p80zghdk3hsfj36z30sfkllqr3b4yi279zkg0la9kfg6785x2cg";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/rust-playground";
           sha256 = "0ml0zr9vz2vjd9wr0v706w4v4qqfzpa56rdzfak2kb5llx53j89v";
-          name = "rust-playground";
+          name = "recipe";
         };
         packageRequires = [ emacs rust-mode ];
         meta = {
@@ -64438,20 +80713,52 @@
           license = lib.licenses.free;
         };
       }) {};
-    rvm = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    rustic = callPackage ({ dash
+                          , emacs
+                          , f
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild
+                          , s
+                          , xterm-color }:
+      melpaBuild {
+        pname = "rustic";
+        version = "20180704.526";
+        src = fetchFromGitHub {
+          owner = "brotzeit";
+          repo = "rustic";
+          rev = "9f663fe0b7182fd2a55bdbf9969b5d06b97f097d";
+          sha256 = "0b0n5yy81wz3azsyzb20p4kf5vaz1snjgxrag8cc6kg6qrqpfv19";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/716c14a2ed8f5817c09c1ff530a4980c17b44bb3/recipes/rustic";
+          sha256 = "13bwrdqmm6xb34k8r72c0r3b9aym5dwsalp63bkfh9k9kq9hic0n";
+          name = "recipe";
+        };
+        packageRequires = [ dash emacs f s xterm-color ];
+        meta = {
+          homepage = "https://melpa.org/#/rustic";
+          license = lib.licenses.free;
+        };
+      }) {};
+    rvm = callPackage ({ fetchFromGitHub
+                       , fetchurl
+                       , lib
+                       , melpaBuild }:
+      melpaBuild {
         pname = "rvm";
         version = "20150402.742";
         src = fetchFromGitHub {
           owner = "senny";
           repo = "rvm.el";
-          rev = "134497bc460990c71ab8fa75431156e62c17da2d";
-          sha256 = "1z5psj8mfp0fw8fx6v1sibf8cxhz30yyiwjw17w80f9c24g0j4ii";
+          rev = "8e45a9bad8e317ff195f384dab14d3402497dc79";
+          sha256 = "0iblk0vagjcg3c8q9hlpwk7426ms7aq0s80izgvascfmyqycv6qm";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/rvm";
           sha256 = "08i7cmav2cz73jp88ww0ay2yjhk9dj8146836q4sij1bl1slbaf8";
-          name = "rvm";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -64459,8 +80766,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    ryo-modal = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ryo-modal = callPackage ({ emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "ryo-modal";
         version = "20180331.118";
         src = fetchFromGitHub {
@@ -64469,10 +80780,10 @@
           rev = "42f874467dfdce59b511f883496ce2624b133dd7";
           sha256 = "0k9nmi014vb9c8rymy3w8xbnj1q85xlslpblacz78iqn1kr6wy1z";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ryo-modal";
           sha256 = "06pm6grsdcldi1khbjfjp7lpi6f6x3pa5ikspp0xdwijnmi0xrrf";
-          name = "ryo-modal";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -64480,8 +80791,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    s = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    s = callPackage ({ fetchFromGitHub
+                     , fetchurl
+                     , lib
+                     , melpaBuild }:
+      melpaBuild {
         pname = "s";
         version = "20180406.108";
         src = fetchFromGitHub {
@@ -64490,10 +80804,10 @@
           rev = "03410e6a7a2b11e47e1fea3b7d9899c7df26435e";
           sha256 = "074ny8y68fhnknkjxvrijrk534xzdiwip8wkifxfbwv3va315x83";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/s";
           sha256 = "0dars9212z0yv97mj4615h23vd22vy8b6cw2n433z9jhif3aybqa";
-          name = "s";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -64501,8 +80815,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    s-buffer = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, noflet, s }:
-    melpaBuild {
+    s-buffer = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild
+                            , noflet
+                            , s }:
+      melpaBuild {
         pname = "s-buffer";
         version = "20130605.1424";
         src = fetchFromGitHub {
@@ -64511,10 +80830,10 @@
           rev = "f95d234282377f00a2c3a9846681080cb95bb1df";
           sha256 = "06ng960fj2ivnwb0hrn0qic5x8hb0sswjzph01zmwhbfnwykhr85";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f1bf91527219e7afc8e113134a958f3adb862a5a/recipes/s-buffer";
           sha256 = "07kivgzv24psjq1240gwj9wkndq4bhvjh38x552k90m9v6jz8l6m";
-          name = "s-buffer";
+          name = "recipe";
         };
         packageRequires = [ noflet s ];
         meta = {
@@ -64522,8 +80841,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    s12cpuv2-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    s12cpuv2-mode = callPackage ({ emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "s12cpuv2-mode";
         version = "20171013.1351";
         src = fetchFromGitHub {
@@ -64532,10 +80855,10 @@
           rev = "b17d4cf848dec1e20e66458e5c7ff77a2c051a8c";
           sha256 = "1fc132gv48xwrxiw139kc9f5wkhjgsgqdfm6b7v97xj5025zg6hr";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6c1b9bbdc4deb17636270c7f2be0b43b647c695a/recipes/s12cpuv2-mode";
           sha256 = "0mrcf5s7vmkyrsdka7qd2vfcmdy8hzf6a6g14la88rxrv4chv29s";
-          name = "s12cpuv2-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -64543,20 +80866,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    s3ed = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }:
-    melpaBuild {
+    s3ed = callPackage ({ dash
+                        , emacs
+                        , fetchFromGitHub
+                        , fetchurl
+                        , lib
+                        , melpaBuild
+                        , seq }:
+      melpaBuild {
         pname = "s3ed";
         version = "20180204.549";
         src = fetchFromGitHub {
           owner = "mattusifer";
           repo = "s3ed";
-          rev = "13503cb057bed29cb00a14dffe4472b5cb7748ad";
-          sha256 = "1ak5nmay12s4ipmvm1a36kyny05xhzmj7wp6dry391db9n7g2wy0";
+          rev = "55b03717caa672b7aebf528b686455fe1d39888c";
+          sha256 = "1qh9hy220pzbzandpcxc2p8knl674gyym0qmqi63scx7s8hn8nmh";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/32ba78167bd6908b49f340f6da48643ac38f25f2/recipes/s3ed";
           sha256 = "08scv3aqnidz28rad5npz7b4pz9dx05rs72qkp3ybkk2vhqf2qwa";
-          name = "s3ed";
+          name = "recipe";
         };
         packageRequires = [ dash emacs seq ];
         meta = {
@@ -64564,8 +80893,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    sackspace = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    sackspace = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "sackspace";
         version = "20130719.256";
         src = fetchFromGitHub {
@@ -64574,10 +80906,10 @@
           rev = "fd0480eaaf6d3d11fd30ac5feb2da2f4f7572708";
           sha256 = "06gqqbkn85l2p05whmr4wkg9axqyzb7r7sgm3r8wfshm99kgpxvl";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/073e92e05c4bd6197a5ad24f470b21a97f5bb7b8/recipes/sackspace";
           sha256 = "1m10iw83k6m7v7sg2dxzdy83zxq6svk8h9fh4ankyn3baqrdxg5z";
-          name = "sackspace";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -64585,8 +80917,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    sage-shell-mode = callPackage ({ cl-lib ? null, deferred, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }:
-    melpaBuild {
+    sage-shell-mode = callPackage ({ cl-lib ? null
+                                   , deferred
+                                   , emacs
+                                   , fetchFromGitHub
+                                   , fetchurl
+                                   , let-alist
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "sage-shell-mode";
         version = "20180215.35";
         src = fetchFromGitHub {
@@ -64595,10 +80934,10 @@
           rev = "9f07ff835e8d19afe571dbe414afb690c7b1cb5c";
           sha256 = "07al41ir1ab0z2m2acvx63scr33bfp3asshjl05shs4j9d4bkmdp";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/eb875c50c2f97919fd0027869c5d9970e1eaf373/recipes/sage-shell-mode";
           sha256 = "0ivqiigmp9cf88j4xapzanjpbx692r70wb4i25mnppqsi3jlwxdv";
-          name = "sage-shell-mode";
+          name = "recipe";
         };
         packageRequires = [ cl-lib deferred emacs let-alist ];
         meta = {
@@ -64606,8 +80945,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    sailfish-scratchbox = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    sailfish-scratchbox = callPackage ({ fetchFromGitHub
+                                       , fetchurl
+                                       , lib
+                                       , melpaBuild }:
+      melpaBuild {
         pname = "sailfish-scratchbox";
         version = "20171202.532";
         src = fetchFromGitHub {
@@ -64616,10 +80958,10 @@
           rev = "bb5ed0f0b0cd72f2eb1af065b7587ec81866b089";
           sha256 = "1b53mdqgcmjay3i3fnxnycv8crqi20yvyv57ybgs2ikfl3v282h2";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e76261e7dffcb607839440843b085709c2c90b26/recipes/sailfish-scratchbox";
           sha256 = "1s0glsi4fm6is7fv9vy1h14frq8a4bgahkc8w08vqfnpiin2r567";
-          name = "sailfish-scratchbox";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -64627,8 +80969,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    salesforce-utils = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    salesforce-utils = callPackage ({ cl-lib ? null
+                                    , fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "salesforce-utils";
         version = "20160813.1854";
         src = fetchFromGitHub {
@@ -64637,10 +80983,10 @@
           rev = "73328baf0fb94ac0d0de645a8f6d42e5ae27f773";
           sha256 = "1zsznz9pn9dj672jii6wcvs47yqyxv3dsm5qy1dax1d6gvvbf4zq";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/salesforce-utils";
           sha256 = "0b70w92zghid6n0ba28dh5r3pckr8jsd1743qyi8vj04ih1dns5i";
-          name = "salesforce-utils";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -64648,8 +80994,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    salt-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, mmm-jinja2, mmm-mode, yaml-mode }:
-    melpaBuild {
+    salt-mode = callPackage ({ emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild
+                             , mmm-jinja2
+                             , mmm-mode
+                             , yaml-mode }:
+      melpaBuild {
         pname = "salt-mode";
         version = "20180118.1754";
         src = fetchFromGitHub {
@@ -64658,10 +81011,10 @@
           rev = "e46c28ef77663391519646c79641c9d177f70d35";
           sha256 = "13zk20bif05qgpqsx9hf6ri7qkxqq7nicp2lb84dg7id24md22x9";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9dcf1a93a06fc42581521c88cfd988b03bedc000/recipes/salt-mode";
           sha256 = "1n7i9d6qpjsdcgbzmbf63y4c7ggxh5wsim8fd0casnrq9bl7ssym";
-          name = "salt-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs mmm-jinja2 mmm-mode yaml-mode ];
         meta = {
@@ -64669,20 +81022,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    sane-term = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    sane-term = callPackage ({ emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "sane-term";
         version = "20160620.647";
         src = fetchFromGitHub {
           owner = "adamrt";
           repo = "sane-term";
-          rev = "ef6fd08078f49f2bb3be60855d2d002bb6a5e0d2";
-          sha256 = "0aazzq1yqn5mal75hxa6ifx2hnyv0lh800klqvzn26xd7i8xcfrd";
+          rev = "034033141b2eb467e2d0b79c8ce1da1f8ff2f013";
+          sha256 = "0nhs916h52hxbp479ma01p6i0zfap26n4fvyx83822pisbcd3krb";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/sane-term";
           sha256 = "08b8zlr8qzxfrpg9lqiyam3sb8a8rzak79ra4r6ljjppyj4zmwi7";
-          name = "sane-term";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -64690,8 +81047,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    sass-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, haml-mode, lib, melpaBuild }:
-    melpaBuild {
+    sass-mode = callPackage ({ cl-lib ? null
+                             , fetchFromGitHub
+                             , fetchurl
+                             , haml-mode
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "sass-mode";
         version = "20161006.2326";
         src = fetchFromGitHub {
@@ -64700,10 +81062,10 @@
           rev = "37105f46f6ea3592039f2ea7d0463ae7f042616e";
           sha256 = "0gd0n5mh2f1gr2aq65d94zmvc2d04z2yb1baw24m0c11fai4y710";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/sass-mode";
           sha256 = "1byjk5zpzjlyiwkp780c4kh7s9l56y686sxji89wc59d19rp8800";
-          name = "sass-mode";
+          name = "recipe";
         };
         packageRequires = [ cl-lib haml-mode ];
         meta = {
@@ -64711,8 +81073,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    sauron = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    sauron = callPackage ({ fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "sauron";
         version = "20171105.247";
         src = fetchFromGitHub {
@@ -64721,10 +81086,10 @@
           rev = "50f09bfc6f5bf79e72a1223e345ee720b507e56a";
           sha256 = "1k80vzgky4fcakxs3h0yb7g3zpn4382p8zz730kk1ibfd7i56a68";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9d30dcc4715422133e1bb00ad7a8e25b060387e4/recipes/sauron";
           sha256 = "01fk1xfh7r16fb1xg5ibbs7gci9dja49msdlf7964hiq7pnnhxgb";
-          name = "sauron";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -64732,8 +81097,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    save-load-path = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    save-load-path = callPackage ({ fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "save-load-path";
         version = "20140206.414";
         src = fetchFromGitHub {
@@ -64742,10 +81110,10 @@
           rev = "6cb763a37e2b8af505bff2bcd11fd49c9ea04d66";
           sha256 = "0rxcg60lxaabdx9gjj17sfxnr09694viphlhhk355dcc4v5ngbdm";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f8e4328cae9b4759a75da0b26ea8b68821bc71af/recipes/save-load-path";
           sha256 = "1cl9kkv996m2irm9i5n7f020zqzvrsv9dyscc16ca9jsn16msww2";
-          name = "save-load-path";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -64753,8 +81121,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    save-visited-files = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    save-visited-files = callPackage ({ fetchFromGitHub
+                                      , fetchurl
+                                      , lib
+                                      , melpaBuild }:
+      melpaBuild {
         pname = "save-visited-files";
         version = "20170228.2250";
         src = fetchFromGitHub {
@@ -64763,10 +81134,10 @@
           rev = "33e8d223f622001f5792c52d8b36661e46b5834c";
           sha256 = "1lf03fhmgjz1pixfahdm3cbqs5vbp6bk4qgm2xkm51vzmp39hfim";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3f5979e2c2dbfc4e8e3b4d2881cf860c26f63db5/recipes/save-visited-files";
           sha256 = "1pmjz27dlp5yrihgsy8q1bwbhkkj3sn7d79ccvljvzxg5jn1grkd";
-          name = "save-visited-files";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -64774,8 +81145,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    savekill = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    savekill = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "savekill";
         version = "20140417.1929";
         src = fetchFromGitHub {
@@ -64784,10 +81158,10 @@
           rev = "67fc94e3d8fe8ce3ca16f90518f6a46479b63e34";
           sha256 = "0h8bl28p5xrs9daapcjkslm066a4hqlb764i5nz1db0lwrvr0csm";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f8e4328cae9b4759a75da0b26ea8b68821bc71af/recipes/savekill";
           sha256 = "14hfqia7d2v1dn1wdwsphrrkq9hc57721irms9s9vinign0pqx7h";
-          name = "savekill";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -64795,8 +81169,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    say-what-im-doing = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    say-what-im-doing = callPackage ({ fetchFromGitHub
+                                     , fetchurl
+                                     , lib
+                                     , melpaBuild }:
+      melpaBuild {
         pname = "say-what-im-doing";
         version = "20160706.1231";
         src = fetchFromGitHub {
@@ -64805,10 +81182,10 @@
           rev = "5b2ce6783b02805bcac1107a149bfba3852cd9d5";
           sha256 = "0wy4hrc44ajl88krp6qy40szl2kl2wc3xjz3y4n250d1v81k25xi";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4d22ddcd4ad9514fe0c36f299e7463a4b7e771d7/recipes/say-what-im-doing";
           sha256 = "1hgh842f7gs2sxy7s6zq57nsqy4jjlnjcga6hwzcx0kw3albgz7x";
-          name = "say-what-im-doing";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -64816,8 +81193,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    sayid = callPackage ({ cider, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    sayid = callPackage ({ cider
+                         , fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "sayid";
         version = "20180404.1139";
         src = fetchFromGitHub {
@@ -64826,10 +81207,10 @@
           rev = "8ea70573e6eb1a0d1a450fd501f38c2cf26ce27f";
           sha256 = "02yp3h16yzys27lxcxn7qzb23z95vjdaxhinz0swdixgr5qwwc77";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2bd2e05f9c9328d8f9ae434c86697a4a04af8b0d/recipes/sayid";
           sha256 = "0chz46wmwmsn4ys59pn7lqs4assqy2hv43rvka7kq61jdl4g6fgs";
-          name = "sayid";
+          name = "recipe";
         };
         packageRequires = [ cider ];
         meta = {
@@ -64837,20 +81218,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    sbt-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    sbt-mode = callPackage ({ emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "sbt-mode";
-        version = "20180314.1511";
+        version = "20180511.922";
         src = fetchFromGitHub {
           owner = "ensime";
           repo = "emacs-sbt-mode";
-          rev = "aebea880b3d3de606d8d8c8d65bc6a5040f52d1f";
-          sha256 = "1iqbigqdv1g12q2bg0f6j7xl0z1ra7vy4k8h1wfqxvlb9fqfqr1y";
+          rev = "e658af140547cbef495c33535c7f694a501d318c";
+          sha256 = "0lv9ridzk9x6rkf7lj21srnszypyq04vqg05vl10zhpz1yqlnbjd";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/364abdc3829fc12e19f00b534565227dbc30baad/recipes/sbt-mode";
           sha256 = "0v0n70czgkdijnw5jd4na41vlrmqcshvr8gdpv0bv55ilqhiihc8";
-          name = "sbt-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -64858,20 +81243,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    scad-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    scad-mode = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "scad-mode";
         version = "20180108.1809";
         src = fetchFromGitHub {
           owner = "openscad";
           repo = "openscad";
-          rev = "9bd8e87da64ffbdb1a41763a92e7feaf78652010";
-          sha256 = "1sasl3r7fx3vy8w636sx7ahih7w6ihwzhnczi2vyxf5hyf478js9";
+          rev = "2de6815c7c2ade42e53e86751b9584ac4a5e1ef9";
+          sha256 = "188wbnhdgk0820izing6hb7fca1d42hw9bnn405kms157kvcgqsi";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2d27782b9ac8474fbd4f51535351207c9c84984c/recipes/scad-mode";
           sha256 = "04b4y9jks8sslgmkx54fds8fba9xv54z0cfab52dy99v1301ms3k";
-          name = "scad-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -64879,8 +81267,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    scad-preview = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, scad-mode }:
-    melpaBuild {
+    scad-preview = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild
+                                , scad-mode }:
+      melpaBuild {
         pname = "scad-preview";
         version = "20160206.536";
         src = fetchFromGitHub {
@@ -64889,10 +81281,10 @@
           rev = "fee011589671cc8f1296cb6aa81553e5bb699819";
           sha256 = "13x00dls59zshz69260pnqmx6ydrjg8p2jdjn1rzgf5dsmwfy3sc";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/18a043064223906510adbb837f1be329252dbd50/recipes/scad-preview";
           sha256 = "0wcd2r60ibbc2mzpq8fvyfc1fy172rf9kzdj51p4jyl51r76i86z";
-          name = "scad-preview";
+          name = "recipe";
         };
         packageRequires = [ scad-mode ];
         meta = {
@@ -64900,8 +81292,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    scala-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    scala-mode = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "scala-mode";
         version = "20170802.432";
         src = fetchFromGitHub {
@@ -64910,10 +81305,10 @@
           rev = "56cba2903cf6e12c715dbb5c99b34c97b2679379";
           sha256 = "13miqdn426cw9y1wqaz5smmf0wi3bzls95z6shcxzdz8cg50zmpg";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/564aa1637485192a97803af46b3a1f8e0d042c9a/recipes/scala-mode";
           sha256 = "12x377iw085fbkjb034dmcsbi7hma17zkkmbgrhkvfkz8pbgaic8";
-          name = "scala-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -64921,8 +81316,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    scf-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    scf-mode = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "scf-mode";
         version = "20151121.1848";
         src = fetchFromGitHub {
@@ -64931,10 +81329,10 @@
           rev = "dbfcdcd89034f208d65e181af58e0d73ad09f8b2";
           sha256 = "0m7hanpc2skmsz783m0212xd10y31gkj5n6w8gx9s989l1y4i1b8";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/376be7f8903dbea69643600ae14e934ee5e2a11b/recipes/scf-mode";
           sha256 = "0acbrw94q6cr9b29mz1wcbwi1g90pbm7ly2xbaqb2g8081r5rgg0";
-          name = "scf-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -64942,8 +81340,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    scheme-complete = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    scheme-complete = callPackage ({ fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "scheme-complete";
         version = "20170824.713";
         src = fetchFromGitHub {
@@ -64952,10 +81353,10 @@
           rev = "4c77038048cbcf34b5907f0439c93058a71a2d2b";
           sha256 = "14b1bajgvim48j7y4pss73lyxqfyazjnxn1dgvvmkvngm3k1a4y8";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0fda2b54a0ff0b6fc3bd6d20cfcbbf63cae5380f/recipes/scheme-complete";
           sha256 = "1mp9gssd2fx3ra2bjd7w311hwmflhybr5x574qb12603gjkgrp1h";
-          name = "scheme-complete";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -64963,20 +81364,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    scheme-here = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    scheme-here = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "scheme-here";
         version = "20141028.18";
         src = fetchFromGitHub {
           owner = "hiddenlotus";
           repo = "scheme-here";
-          rev = "430ba017cc530865218de23a8f7985095a58343f";
-          sha256 = "09cvrphrnbj8avnlqqv6scjz17cn6zm6mzghjn3vxfr4hql66rir";
+          rev = "fccf668bb8f1d481be6e70fffa2b52ea681e32a5";
+          sha256 = "1m5aqcm4pd0m0rz3r09i52q55nlx3ga7hca9xlzf0gwcyyn8xzyg";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/scheme-here";
           sha256 = "04lmkf3zc396anlp9s9irdkqavsc0lzlpzprswd4r2kp4xp7kcks";
-          name = "scheme-here";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -64984,8 +81388,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    schrute = callPackage ({ emacs, fetchgit, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    schrute = callPackage ({ emacs
+                           , fetchgit
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "schrute";
         version = "20170521.1140";
         src = fetchgit {
@@ -64993,10 +81401,10 @@
           rev = "59faa6c4232ae183cea93237301acad8c0763997";
           sha256 = "1w5l1vf4cn4psrxgnq5n6j3zw644s70inpa17vsvng3sk5r8crcb";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/505fc4d26049d4e2973a54b24117ccaf4f2fb7e7/recipes/schrute";
           sha256 = "1sr49wr3738sqfzix7v9rj6bvv7q2a46qdkimn9z7rnsjys9i7zy";
-          name = "schrute";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -65004,8 +81412,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    scion = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    scion = callPackage ({ fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "scion";
         version = "20130315.555";
         src = fetchFromGitHub {
@@ -65014,10 +81425,10 @@
           rev = "99b4589175665687181a932cd836850205625f71";
           sha256 = "0ark720g0nrdqri5bjdpss6kn6k3hz3w3zdvy334wws05mkb17y4";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/faf180d15c3847fc6f832866338494dd99b6654d/recipes/scion";
           sha256 = "17qmc7fpvbamqkzyk8jspp2i0nw93iya4iwddvas7vdpjy7mk81d";
-          name = "scion";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -65025,8 +81436,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    sclang-extensions = callPackage ({ auto-complete, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    sclang-extensions = callPackage ({ auto-complete
+                                     , dash
+                                     , emacs
+                                     , fetchFromGitHub
+                                     , fetchurl
+                                     , lib
+                                     , melpaBuild
+                                     , s }:
+      melpaBuild {
         pname = "sclang-extensions";
         version = "20160508.2038";
         src = fetchFromGitHub {
@@ -65035,10 +81453,10 @@
           rev = "e9cc79732f16fdb582129303110c163dcc0d6da0";
           sha256 = "164dn5615bxvya4n58lly9r739va1xzm00wyfg4shcwgnwm3byqb";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f2095549944ca28d6a2d6a90d5ab3ba9c27997a8/recipes/sclang-extensions";
           sha256 = "00nirxawsngvlx7bmf5hqg2wk0l1v5pi09r6phzd0q8gyq3kmbbn";
-          name = "sclang-extensions";
+          name = "recipe";
         };
         packageRequires = [ auto-complete dash emacs s ];
         meta = {
@@ -65046,8 +81464,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    sclang-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
-    melpaBuild {
+    sclang-snippets = callPackage ({ fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild
+                                   , yasnippet }:
+      melpaBuild {
         pname = "sclang-snippets";
         version = "20130513.51";
         src = fetchFromGitHub {
@@ -65056,10 +81478,10 @@
           rev = "c840a416b96f83bdd70491e3d1fbe2f1ae8b3f58";
           sha256 = "0vbcghgapwdf3jgjnjdla17dhf5mkmwapz4a8fmlr7sw1wqvj857";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/680e5757e074c16efd31084a7dc5dcea339597f5/recipes/sclang-snippets";
           sha256 = "0q1bh316v737a0hm9afijk1spvg144cgrf45jm0bpd60zhiv7bb2";
-          name = "sclang-snippets";
+          name = "recipe";
         };
         packageRequires = [ yasnippet ];
         meta = {
@@ -65067,20 +81489,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    scp = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    scp = callPackage ({ cl-lib ? null
+                       , emacs
+                       , fetchFromGitHub
+                       , fetchurl
+                       , lib
+                       , melpaBuild }:
+      melpaBuild {
         pname = "scp";
         version = "20171203.1851";
         src = fetchFromGitHub {
           owner = "tszg";
           repo = "emacs-scp";
-          rev = "447305db246d9c9240678dd9c734ed920300463a";
-          sha256 = "0f8dv17rjknlkw32dd4xmdxbkwby5dn8mychaqwlk8vanhm74n7w";
+          rev = "3f437ee9f52df7d9f4c57275a8cfb7f06c3c26ff";
+          sha256 = "013i4152irybladx0lyi1kriaxpn6dnpnc9bqdxngmgycmwsrn4r";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/62f5c9284de51373a4015cf053d66977cf00d175/recipes/scp";
           sha256 = "1q7v2cr89syw682zqxhavaggv6aqi69rl94vm8bmn745a868gliw";
-          name = "scp";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -65088,8 +81515,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    scpaste = callPackage ({ fetchFromGitHub, fetchurl, htmlize, lib, melpaBuild }:
-    melpaBuild {
+    scpaste = callPackage ({ fetchFromGitHub
+                           , fetchurl
+                           , htmlize
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "scpaste";
         version = "20171101.922";
         src = fetchFromGitHub {
@@ -65098,10 +81529,10 @@
           rev = "10559d6b0feb34dc60f039a237052adcca77b5d9";
           sha256 = "10z8jpi6f3mhq8ymxcv1lc291sqr2kzvgwx8mlmck0bmlys12pqc";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9007fb32097bc63731c3615dae9342fcef2558a2/recipes/scpaste";
           sha256 = "02dqmx6v3jxdn5yz1z74624sc6sz2bm4qjyi78w9akhp2jplwlk1";
-          name = "scpaste";
+          name = "recipe";
         };
         packageRequires = [ htmlize ];
         meta = {
@@ -65109,8 +81540,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    scratch = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    scratch = callPackage ({ fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "scratch";
         version = "20170614.1401";
         src = fetchFromGitHub {
@@ -65119,10 +81553,10 @@
           rev = "2cdf2b841ce7a0987093f65b0cc431947549f897";
           sha256 = "0wscsndynjmnliajqaz28r1ww81j8wh84zwaaswx51abhwgl0idf";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b46813f928eadfa08a1d4bf94ceeb96dbc2a7c72/recipes/scratch";
           sha256 = "1an30pr64fz13s6lghlcb36b7hn3961vv0yipfp9s140ccygdvh7";
-          name = "scratch";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -65130,8 +81564,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    scratch-ext = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    scratch-ext = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "scratch-ext";
         version = "20140103.2116";
         src = fetchFromGitHub {
@@ -65140,10 +81577,10 @@
           rev = "388c53cddd0466b451264894667ed64a6947ad67";
           sha256 = "0ng0by647r49mia7vmjqc97gwlwgs8kmaz0lw2y54jdz8m0bbngp";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a142d336a57d075dfd5caf44fa1c1254b83ac728/recipes/scratch-ext";
           sha256 = "031wxz10k1q4bi5hywhcw1vzi41d5pv5hc09x8jk9s5nzyssvc0y";
-          name = "scratch-ext";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -65151,8 +81588,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    scratch-log = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    scratch-log = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "scratch-log";
         version = "20141114.2343";
         src = fetchFromGitHub {
@@ -65161,10 +81601,10 @@
           rev = "1168f7f16d36ca0f4ddf2bb98881f8db62cc5dc0";
           sha256 = "030mcq0cmamizvra8jh2x76f71g5apiavwb10c28j62rl0r5bisk";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bec9692973db8853f9d329aebc0cc9e81bb34003/recipes/scratch-log";
           sha256 = "1yp3p0dzhmqrd0krqii3x79k4zc3p59148cijhk6my4n1xqnhs69";
-          name = "scratch-log";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -65172,8 +81612,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    scratch-message = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    scratch-message = callPackage ({ fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "scratch-message";
         version = "20170107.536";
         src = fetchFromGitHub {
@@ -65182,10 +81625,10 @@
           rev = "3ecc7f5e3b8a597ebd1492fd426d3720a7f34302";
           sha256 = "1kb664r3gbhv2ja8jyyzfw22db99ini8qbgzcy9xsl56lha4x4xi";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/24c5ff6b643de9fb79334eff57b702281b20bc10/recipes/scratch-message";
           sha256 = "1dl9d4gvicwnb662ir9azywjmmm7xv4d0sz42z7mmwy8hl9hi91b";
-          name = "scratch-message";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -65193,8 +81636,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    scratch-palette = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, popwin }:
-    melpaBuild {
+    scratch-palette = callPackage ({ fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild
+                                   , popwin }:
+      melpaBuild {
         pname = "scratch-palette";
         version = "20150225.42";
         src = fetchFromGitHub {
@@ -65203,10 +81650,10 @@
           rev = "f6803b448079f4a81cc699cec7442ef543cd5818";
           sha256 = "00b4r8bqlxc29k18vig0164d5c9fp5bp5q26d28lwr4f0s4a71d2";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b737bd93008e10ff446b347f405541a6f4127716/recipes/scratch-palette";
           sha256 = "0m6hc2amwnnii4y189kkridhapl9jipkmadvrmwvspgy3lxhlafs";
-          name = "scratch-palette";
+          name = "recipe";
         };
         packageRequires = [ popwin ];
         meta = {
@@ -65214,8 +81661,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    scratch-pop = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, popwin }:
-    melpaBuild {
+    scratch-pop = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild
+                               , popwin }:
+      melpaBuild {
         pname = "scratch-pop";
         version = "20170510.758";
         src = fetchFromGitHub {
@@ -65224,10 +81675,10 @@
           rev = "7f4172c792b10bd38898dd8963cf0ade91921869";
           sha256 = "0mwjq7z0cpaqhqygzhfcpfqyx8376jsc1g2874np6ff49389bj4d";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/420fb3408b64f1a3e42316262016728c483bf0c1/recipes/scratch-pop";
           sha256 = "0s7g1fbnc5hgz8gqmp1lynj5g7vvxisj7scxx5wil9qpn2zyggq1";
-          name = "scratch-pop";
+          name = "recipe";
         };
         packageRequires = [ popwin ];
         meta = {
@@ -65235,8 +81686,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    scratches = callPackage ({ dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    scratches = callPackage ({ dash
+                             , f
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "scratches";
         version = "20151005.2116";
         src = fetchFromGitHub {
@@ -65245,10 +81701,10 @@
           rev = "9441afe6396ca38f08029123fab5d87429cbf315";
           sha256 = "10hmy0p4pkrzvvyisk4rjc6hqqyk2sir1rszqgmkhrdywl010vlc";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3691aaaed27d0cf67af417f75fbb693ab856bd47/recipes/scratches";
           sha256 = "0409v1wi10q48rrh8iib6dw9icmswfrpjx9x7xcma994z080d2fy";
-          name = "scratches";
+          name = "recipe";
         };
         packageRequires = [ dash f ];
         meta = {
@@ -65256,20 +81712,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    scribble-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    scribble-mode = callPackage ({ emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "scribble-mode";
         version = "20160124.1528";
         src = fetchFromGitHub {
           owner = "emacs-pe";
           repo = "scribble-mode";
-          rev = "34e9e5edb921813b6483e0fefa848efb6ee4b314";
-          sha256 = "0598byqpz2q6yi2q4dwd77jj9z3n99z34d3an51s9m2za0nh1qvp";
+          rev = "7e83ddf30b7089607c1653eced3edef459d4ad16";
+          sha256 = "14bpdn89ry1im84zcx3jq64q2gl0jxfz9x7fy0szdas7ycrhjghz";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6469c2b389d757003da69da727905228eb564d50/recipes/scribble-mode";
           sha256 = "0idagikxhr86h2k6fb45zdzg73wpmpiszx0gi6d8jx7s1xqd6s50";
-          name = "scribble-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -65277,29 +81737,39 @@
           license = lib.licenses.free;
         };
       }) {};
-    scrooge = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, thrift }:
-    melpaBuild {
+    scrooge = callPackage ({ cl-lib ? null
+                           , dash
+                           , emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild
+                           , thrift }:
+      melpaBuild {
         pname = "scrooge";
-        version = "20170728.1106";
+        version = "20180630.322";
         src = fetchFromGitHub {
           owner = "cosmicexplorer";
           repo = "emacs-scrooge";
-          rev = "fb55c64eb2ae4db57b14bc99d2e411d81b2c5c2a";
-          sha256 = "1hhbm7jmngv69l81vaj0fhpzkvw4sf7q5mdf9mm27mwd2jk70prl";
+          rev = "0a8c58e9e6708abe4ef7e415bc1e0472318bb1b0";
+          sha256 = "1my5yz9ppr7d90ad94mkqzkp20c8bym6mdi7jwab2yisbzykmwzc";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7e3623181fa771dc94a7026eb58ac81fe9d9fc68/recipes/scrooge";
           sha256 = "1gisyfzawrgg55jbwrbnri314f6zd38di19iwy0b2dim8in4sjpg";
-          name = "scrooge";
+          name = "recipe";
         };
-        packageRequires = [ emacs thrift ];
+        packageRequires = [ cl-lib dash emacs thrift ];
         meta = {
           homepage = "https://melpa.org/#/scrooge";
           license = lib.licenses.free;
         };
       }) {};
-    scss-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    scss-mode = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "scss-mode";
         version = "20180123.908";
         src = fetchFromGitHub {
@@ -65308,10 +81778,10 @@
           rev = "cf58dbec5394280503eb5502938f3b5445d1b53d";
           sha256 = "0raja19l0igwr0pn0ghr1pj1d8i9k3m3764ma4r8nwzxcj9qw4ja";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/scss-mode";
           sha256 = "1g27xnp6bjaicxjlb9m0njc6fg962j3hlvvzmxvmyk7gsdgcgpkv";
-          name = "scss-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -65319,20 +81789,28 @@
           license = lib.licenses.free;
         };
       }) {};
-    sdcv = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, pos-tip, showtip }:
-    melpaBuild {
+    sdcv = callPackage ({ cl-lib ? null
+                        , emacs
+                        , fetchFromGitHub
+                        , fetchurl
+                        , lib
+                        , melpaBuild
+                        , popup
+                        , pos-tip
+                        , showtip }:
+      melpaBuild {
         pname = "sdcv";
         version = "20180211.833";
         src = fetchFromGitHub {
           owner = "stardiviner";
           repo = "sdcv.el";
-          rev = "7cb1f8ec0fa4bb25669534d62bff58df38a992a8";
+          rev = "50ac95be1369fe8cf98d6254e05d6ac343dad421";
           sha256 = "09i7zsizwq5k79wi5sgcfqdlbx0nazrnw3nd6hkn2vfrcffb7pf1";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/173e233b2dacaaf54d92f3bcc06e54d068520dd4/recipes/sdcv";
           sha256 = "1bj3b17sjd9fha686g6w191l4p8a1p8sb9br65xf54n6nd9bmv7a";
-          name = "sdcv";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs popup pos-tip showtip ];
         meta = {
@@ -65340,8 +81818,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    sdlang-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    sdlang-mode = callPackage ({ emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "sdlang-mode";
         version = "20161130.2311";
         src = fetchFromGitHub {
@@ -65350,10 +81832,10 @@
           rev = "d42a6eedefeb44919fbacf58d302b6df18f05bbc";
           sha256 = "0r6sm7b15scmjcpdcqvm55hdsvyw5d2g7mrfhsx2hs8sqz64gkwc";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/691af79137015f15a3d383439e534e255ba4b36d/recipes/sdlang-mode";
           sha256 = "1z6n374z55dr2c6xdwgvmpznd5gk9y23k136zmy29b68j2kswj6l";
-          name = "sdlang-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -65361,8 +81843,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    search-web = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    search-web = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "search-web";
         version = "20150312.403";
         src = fetchFromGitHub {
@@ -65371,10 +81856,10 @@
           rev = "c4ae86ac1acfc572b81f3d78764bd9a54034c331";
           sha256 = "08yc67a4ji7z8s0zh500wiscziqsxi92i1d33fjla2mcr8sxxn0i";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1f1a3697649ccf69c8eb177c31ec4246b98f503b/recipes/search-web";
           sha256 = "0qqx9l8dn1as4gqpq80jfacn6lz0132m91pjzxv0fx6al2iz0m36";
-          name = "search-web";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -65382,8 +81867,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    searchq = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    searchq = callPackage ({ emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "searchq";
         version = "20150829.511";
         src = fetchFromGitHub {
@@ -65392,10 +81881,10 @@
           rev = "dd510d55ad66a82c6ef022cfe7c4a73ad5365f82";
           sha256 = "0zs08vxmjb3y4dnfq6djnrhmkgyhhwd5zylrjisrd4y7f089fyh4";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9738c1be0511540bfd8f324334518c72c9c38c94/recipes/searchq";
           sha256 = "0flsc07v887pm62mslrv7zqnhl62l6348nkm77mizm1592q3kjgr";
-          name = "searchq";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -65403,8 +81892,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    seclusion-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    seclusion-mode = callPackage ({ fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "seclusion-mode";
         version = "20121118.1553";
         src = fetchFromGitHub {
@@ -65413,10 +81905,10 @@
           rev = "9634e76c52bfb7200ff0f9f01404f743429e9ef0";
           sha256 = "15cjhwjiwmrfzmr74hbw5s92si2qdb8i97nmkbsgkj3444rxg239";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b087d151b00f5251b15ebb071896995874afb274/recipes/seclusion-mode";
           sha256 = "0ff10x6yr37vpp6ffbk1nb027lgmrydwjrb332fskwlf3xmy6v0m";
-          name = "seclusion-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -65424,8 +81916,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    secretaria = callPackage ({ alert, emacs, f, fetchgit, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    secretaria = callPackage ({ alert
+                              , emacs
+                              , f
+                              , fetchgit
+                              , fetchurl
+                              , lib
+                              , melpaBuild
+                              , s }:
+      melpaBuild {
         pname = "secretaria";
         version = "20180104.720";
         src = fetchgit {
@@ -65433,10 +81932,10 @@
           rev = "e9d59d264ba30f8055a1ee1576fe9296d5b41055";
           sha256 = "10ijr9babki05j3wlhwsym85q868kirivsml7jlmi1csnn2y3c6b";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7b4c9ccbf2eeaa290f3b9d1e5eaaeb5b5547b365/recipes/secretaria";
           sha256 = "1a8jf91wplzazssh0s8ld0g8rp57gdfvxlsyn643w3mbp3ny8ybv";
-          name = "secretaria";
+          name = "recipe";
         };
         packageRequires = [ alert emacs f s ];
         meta = {
@@ -65444,8 +81943,37 @@
           license = lib.licenses.free;
         };
       }) {};
-    seeing-is-believing = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    see-mode = callPackage ({ emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , language-detection
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
+        pname = "see-mode";
+        version = "20180510.1741";
+        src = fetchFromGitHub {
+          owner = "marcelino-m";
+          repo = "see-mode";
+          rev = "db9e4324f9dcc14d5125cb6a79d6c9fad5b14626";
+          sha256 = "0w595mpdd999j7m9dsy18fy7pr9nq4dm666lvjvlzzgdgwwf0zvc";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/6ee64e846c471926194fcecc4824a06effc0aa5b/recipes/see-mode";
+          sha256 = "1124x11vxci9mvx3zn56v5h9dhmy7bzd5pilqdgzp3hzjmyydnfi";
+          name = "recipe";
+        };
+        packageRequires = [ emacs language-detection ];
+        meta = {
+          homepage = "https://melpa.org/#/see-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    seeing-is-believing = callPackage ({ fetchFromGitHub
+                                       , fetchurl
+                                       , lib
+                                       , melpaBuild }:
+      melpaBuild {
         pname = "seeing-is-believing";
         version = "20170214.520";
         src = fetchFromGitHub {
@@ -65454,10 +81982,10 @@
           rev = "fbbe246c0fda87bb26227bb826eebadb418a220f";
           sha256 = "1h1b48s2iirswdlvfz41jbflm4x09ksc2lycrc1awzlwd6r8hdhg";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/14bb6de5c051a68284ee1a7e25ecb2c7c19ffd3b/recipes/seeing-is-believing";
           sha256 = "05aja5xycb3kpmxyi234l50h98f5m1fil6ll4f2xkpxwv31ba5rb";
-          name = "seeing-is-believing";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -65465,8 +81993,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    seethru = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, shadchen }:
-    melpaBuild {
+    seethru = callPackage ({ fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild
+                           , shadchen }:
+      melpaBuild {
         pname = "seethru";
         version = "20150218.1029";
         src = fetchFromGitHub {
@@ -65475,10 +82007,10 @@
           rev = "d87e231f99313bea75b1e69e48c0f32968c82060";
           sha256 = "0qd462qbqdx53xh3ddf76chiljxf6s43r28v2ix85gsig7nm5pgr";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7945732d9789143b386603dd7c96ef14ba68ddaf/recipes/seethru";
           sha256 = "1lcwslkki9s15xr2dmh2iic4ax8ia0j20hjnjmkv612wv04b806v";
-          name = "seethru";
+          name = "recipe";
         };
         packageRequires = [ shadchen ];
         meta = {
@@ -65486,20 +82018,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    sekka = callPackage ({ cl-lib ? null, concurrent, fetchFromGitHub, fetchurl, lib, melpaBuild, popup }:
-    melpaBuild {
+    sekka = callPackage ({ cl-lib ? null
+                         , concurrent
+                         , fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild
+                         , popup }:
+      melpaBuild {
         pname = "sekka";
         version = "20170803.547";
         src = fetchFromGitHub {
           owner = "kiyoka";
           repo = "sekka";
-          rev = "61840b57d9ae32bf8e297b175942590a1319c7e7";
-          sha256 = "05vj12l88s29wnkpvgzlbypv9hkmy1hqgv9hvav6v4kmdykl5w1b";
+          rev = "d1fd5d47aacba723631d5d374169a45ff2051c41";
+          sha256 = "035rx863cj3hs1lhayff0810cpp6kv8nwc1c0y54gvdk1bb333x0";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/350bbb5761b5ba69aeb4acf6d7cdf2256dba95a6/recipes/sekka";
           sha256 = "1jj4ly9p7m3xvb31nfn171lbpm9y70y8cbf8p24w0fhv665dx0cp";
-          name = "sekka";
+          name = "recipe";
         };
         packageRequires = [ cl-lib concurrent popup ];
         meta = {
@@ -65507,8 +82045,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    select-themes = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    select-themes = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "select-themes";
         version = "20160220.1706";
         src = fetchFromGitHub {
@@ -65517,10 +82058,10 @@
           rev = "236f54287519a3ea6dd7b3992d053e4f4ff5d0fe";
           sha256 = "1c9yv1kjcd0jrzgw99q9p4kzj980f261mjcsggbcw806wb0iw1xn";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e4e7d01da10a1a1f7fe563031af5d3f9694cea33/recipes/select-themes";
           sha256 = "18ydv7240vcqppg1i7n8sy18hy0lhpxz17947kxs7mvj4rl4wd84";
-          name = "select-themes";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -65528,8 +82069,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    selected = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    selected = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "selected";
         version = "20170222.34";
         src = fetchFromGitHub {
@@ -65538,10 +82082,10 @@
           rev = "03edaeac90bc6000d263f03be3d889b4685e1bf7";
           sha256 = "1d72vw1dcxnyir7vymr3cfxal5dndm1pmm192aa9bcyrcg7aq39g";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/selected";
           sha256 = "1zk9jvsiw30zqh68xjx2zcc71php68ryiwqmws52ghqiaifj50gf";
-          name = "selected";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -65549,8 +82093,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    selectric-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    selectric-mode = callPackage ({ fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "selectric-mode";
         version = "20170216.311";
         src = fetchFromGitHub {
@@ -65559,10 +82106,10 @@
           rev = "a35cb3815caceaf273ad7d16ac3b2dd3c7a3003e";
           sha256 = "04bj71080wqybznyx63dawhppq6x3p88x1j56gvl8kvxv2hwzgzf";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/08922071b9854142eab726302e75f1db2d326ec5/recipes/selectric-mode";
           sha256 = "1k4l0lr68rqyi37wvqp1cnfci6jfkz0gvrd1hwbgx04cjgmz56n4";
-          name = "selectric-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -65570,8 +82117,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    semi = callPackage ({ fetchFromGitHub, fetchurl, flim, lib, melpaBuild }:
-    melpaBuild {
+    semi = callPackage ({ fetchFromGitHub
+                        , fetchurl
+                        , flim
+                        , lib
+                        , melpaBuild }:
+      melpaBuild {
         pname = "semi";
         version = "20180204.1448";
         src = fetchFromGitHub {
@@ -65580,10 +82131,10 @@
           rev = "44aa82ecf78273d8ff4c84f2121b885fb7149f41";
           sha256 = "1wl12gsz9pn4wzgbffv3ymr49kcxjggc2jx19kxqyjmwdnw004yf";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e78849c2d1df187b7f0ef4c34985a341e640ad3e/recipes/semi";
           sha256 = "01wk3lgln5lac65hp6v83d292bdk7544z23xa1v6a756nhybwv25";
-          name = "semi";
+          name = "recipe";
         };
         packageRequires = [ flim ];
         meta = {
@@ -65591,8 +82142,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    sendto = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    sendto = callPackage ({ emacs
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "sendto";
         version = "20160425.550";
         src = fetchFromGitHub {
@@ -65601,10 +82156,10 @@
           rev = "076b81d7a53f75b0a59b0ef3448f35570567054c";
           sha256 = "13qqprxz87cv3sjlq5hj0jp0qcfm3djfgasga8cc84ykrcc47p9f";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/31f7c2f97dd186cb77dc8a106baf5e087792c6ab/recipes/sendto";
           sha256 = "00ifasqpmggr4bhdyymzr215840y0ayfnfp0mh7wj99mr6f3zfq0";
-          name = "sendto";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -65612,8 +82167,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    sensitive = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, sequences }:
-    melpaBuild {
+    sensitive = callPackage ({ emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild
+                             , sequences }:
+      melpaBuild {
         pname = "sensitive";
         version = "20170818.551";
         src = fetchFromGitHub {
@@ -65622,10 +82182,10 @@
           rev = "69dd6125a41d8b55f4b6ba61daa4d1aa1f716fa8";
           sha256 = "0nj71ds4frfi16hsfswmp89rfxkvvdvhdlsqizzi9cbvr49s0l1f";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5e5468ce136fabe59e1434f8a7f265f41c5e64c1/recipes/sensitive";
           sha256 = "0v988k0x3mdp7ank2ihghphh8sanvv96s4sg6pnszg5hczak1vr3";
-          name = "sensitive";
+          name = "recipe";
         };
         packageRequires = [ emacs sequences ];
         meta = {
@@ -65633,8 +82193,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    sentence-navigation = callPackage ({ ample-regexps, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    sentence-navigation = callPackage ({ ample-regexps
+                                       , cl-lib ? null
+                                       , emacs
+                                       , fetchFromGitHub
+                                       , fetchurl
+                                       , lib
+                                       , melpaBuild }:
+      melpaBuild {
         pname = "sentence-navigation";
         version = "20180408.919";
         src = fetchFromGitHub {
@@ -65643,10 +82209,10 @@
           rev = "7c5d2edeaed01196aec25031782e89adeaa089f0";
           sha256 = "15za4fg7c8fsih86wz1npyx6gdmw0xhizklfsyfh84416dsmgswp";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3d097cf9b6c9c1606505d3988a2afdd7b066abc8/recipes/sentence-navigation";
           sha256 = "1p3ch1ab06v038h130fsxpbq45d1yadl67i2ih4l4fh3xah5997m";
-          name = "sentence-navigation";
+          name = "recipe";
         };
         packageRequires = [ ample-regexps cl-lib emacs ];
         meta = {
@@ -65654,20 +82220,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    seoul256-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    seoul256-theme = callPackage ({ emacs
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "seoul256-theme";
-        version = "20180412.1643";
+        version = "20180505.57";
         src = fetchFromGitHub {
           owner = "anandpiyer";
           repo = "seoul256-emacs";
-          rev = "fb7dd994f9fed518693475b2b6de67d518417783";
-          sha256 = "0arg66j25ixvmbhlgdjw12gzwsa5wmif7qw1mzfzd0sghgdbmj0v";
+          rev = "8e76d0207489964ef780420723d49e409f68f7d1";
+          sha256 = "1fcnq2jh330va1xvpfh6nnd9gbjjisv0ham44zwi5lh0j7424jkj";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/seoul256-theme";
           sha256 = "1nvhnyfvmpqg0a54nq73lhz3h9g94zkbix13bbzv9bp1lg8v6w1x";
-          name = "seoul256-theme";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -65675,8 +82245,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    sequences = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    sequences = callPackage ({ emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "sequences";
         version = "20170818.552";
         src = fetchFromGitHub {
@@ -65685,10 +82259,10 @@
           rev = "564ebbd93b0beea4e75acfbf824350e90b5d5738";
           sha256 = "0ym2bl9dpsglz35is0iwxfw5w7zs9398bkln8lgv28nr6kw0ym4s";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4cf716df68fb2d6a41fe75fac0b41e356bddcf30/recipes/sequences";
           sha256 = "12wnkywkmxfk2sx40h90k53d5qmc8hiky5vhlyf0ws3n39zvhplh";
-          name = "sequences";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -65696,8 +82270,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    sequential-command = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    sequential-command = callPackage ({ fetchFromGitHub
+                                      , fetchurl
+                                      , lib
+                                      , melpaBuild }:
+      melpaBuild {
         pname = "sequential-command";
         version = "20170925.1740";
         src = fetchFromGitHub {
@@ -65706,10 +82283,10 @@
           rev = "a48cbcbe273b33edd3ae56e68f44b4100fa3a48a";
           sha256 = "1f05amz22klvs2yqyw7n5bmivgdn5zc7vkv5x6bgc9b5k977lggj";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ad10a684b4b2f01bc65883374f36fef156ff55d2/recipes/sequential-command";
           sha256 = "0qhrpwcgn89sqdj8yhgax0qk81ycdanlgwx25cxy8wnxkqqcvh9m";
-          name = "sequential-command";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -65717,8 +82294,19 @@
           license = lib.licenses.free;
         };
       }) {};
-    servant = callPackage ({ ansi, commander, dash, epl, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s, shut-up, web-server }:
-    melpaBuild {
+    servant = callPackage ({ ansi
+                           , commander
+                           , dash
+                           , epl
+                           , f
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild
+                           , s
+                           , shut-up
+                           , web-server }:
+      melpaBuild {
         pname = "servant";
         version = "20140216.419";
         src = fetchFromGitHub {
@@ -65727,10 +82315,10 @@
           rev = "4d2aa8250b54b28e6e7ee4cd5ebd98a33db2c134";
           sha256 = "15lx6qvmq3vp84ys8dzbx1nzxcnzlq41whawc2yhrnd1dbq4mv2d";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/servant";
           sha256 = "0h8xsg37cvc5r8vkclf7d3gbf6gh4k5pmbiyhwpkbrxwjyl1sl21";
-          name = "servant";
+          name = "recipe";
         };
         packageRequires = [ ansi commander dash epl f s shut-up web-server ];
         meta = {
@@ -65738,8 +82326,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    serverspec = callPackage ({ dash, f, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }:
-    melpaBuild {
+    serverspec = callPackage ({ dash
+                              , f
+                              , fetchFromGitHub
+                              , fetchurl
+                              , helm
+                              , lib
+                              , melpaBuild
+                              , s }:
+      melpaBuild {
         pname = "serverspec";
         version = "20150623.455";
         src = fetchFromGitHub {
@@ -65748,10 +82343,10 @@
           rev = "b6dfe82af9869438de5e5d860ced196641f372c0";
           sha256 = "1h58q41wixjlapia1ggf83jxcllq7492k55mc0fq7hbx3hw1q1y2";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5a4f4757d8886d178a85d4bc8ac9399a99d8c4d4/recipes/serverspec";
           sha256 = "001d57yd0wmz4d7qmhnanac8g29wls0sqw194003hrgirakg82id";
-          name = "serverspec";
+          name = "recipe";
         };
         packageRequires = [ dash f helm s ];
         meta = {
@@ -65759,8 +82354,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    services = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    services = callPackage ({ cl-lib ? null
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "services";
         version = "20170802.430";
         src = fetchFromGitHub {
@@ -65769,10 +82368,10 @@
           rev = "04c7986041a33dfa0b0ae57c7d6fbd600548c596";
           sha256 = "0ycfkskkdlmc0l75z5a8f66wq5mvb24c4kz19a6kqs8rwm2ygz35";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/beb91b4397f6e35a1d5c73a127d8cd7fc9201935/recipes/services";
           sha256 = "02lgmpbw52ps6z4p9gwzvh9iaxisq5mb0n9aml9ajxac1473vpcd";
-          name = "services";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -65780,8 +82379,36 @@
           license = lib.licenses.free;
         };
       }) {};
-    session = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    sesman = callPackage ({ emacs
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
+        pname = "sesman";
+        version = "20180628.659";
+        src = fetchFromGitHub {
+          owner = "vspinu";
+          repo = "sesman";
+          rev = "0d3d016732b42163f78243488f54e10a802796f3";
+          sha256 = "1i5drx6qiq8kzg45qwzrwq2zx01ibmn9pgmpqy0w5kljb17jchkl";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/31110e9bd82ad9c817e6cb597fa9c26c4cdc93ed/recipes/sesman";
+          sha256 = "106jcdsp7rhkr4bbyprcld5fxcnimfcyx0cwcpzhd0b4vh3v3qvg";
+          name = "recipe";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/sesman";
+          license = lib.licenses.free;
+        };
+      }) {};
+    session = callPackage ({ fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "session";
         version = "20120510.1700";
         src = fetchFromGitHub {
@@ -65790,10 +82417,10 @@
           rev = "19ea0806873daac3539a4b956e15655e99e3dd6c";
           sha256 = "0sp952abz7dkq8b8kkzzmnwnkq5w15zsx5dr3h8lzxb92lnank9v";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5f2a50f62475639af011c99c6cc38928b74b3b0a/recipes/session";
           sha256 = "0fghxbnf1d5iyrx1q8xd0lbw9nvkdgg2v2f89j6apnawisrsbhwx";
-          name = "session";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -65801,8 +82428,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    seti-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    seti-theme = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "seti-theme";
         version = "20161208.836";
         src = fetchFromGitHub {
@@ -65811,10 +82441,10 @@
           rev = "cbfef2fc15d19ce4c8326e65fafdd61737077132";
           sha256 = "191mvz6d6j764q1sj2496i6lq0q42b5qh5zfdvf0yl39pzbwx8jx";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/088924b78575359996cf30745497b287cfb11f37/recipes/seti-theme";
           sha256 = "1mwkx3hynabwr0a2rm1bh91h7xf38a11h1fb6ys8s3mnr68csd9z";
-          name = "seti-theme";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -65822,8 +82452,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    sexp-move = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    sexp-move = callPackage ({ fetchFromGitLab
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "sexp-move";
         version = "20150915.1030";
         src = fetchFromGitLab {
@@ -65832,10 +82465,10 @@
           rev = "117f7a91ab7c25e438413753e916570122011ce7";
           sha256 = "11h5z2gmwq07c4gqzj2c9apksvqk3k8kpbb9kg78bbif2xfajr3m";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/sexp-move";
           sha256 = "0sdm3kr4594fy9hk8yljj2iwa40bgs8nqpwwl2a60r060spz54z9";
-          name = "sexp-move";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -65843,20 +82476,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    sexy-monochrome-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    sexy-monochrome-theme = callPackage ({ fetchFromGitHub
+                                         , fetchurl
+                                         , lib
+                                         , melpaBuild }:
+      melpaBuild {
         pname = "sexy-monochrome-theme";
-        version = "20171125.1212";
+        version = "20180526.108";
         src = fetchFromGitHub {
           owner = "voloyev";
           repo = "sexy-monochrome-theme";
-          rev = "529a1c75196391d7f2f1f42cf9d9f4a52c7d9007";
-          sha256 = "0myrdmp5r2lr1n54cmrn8p0xi4kjizx8nclxaqxn99bc7g6wlcf1";
+          rev = "bf4b6ccd63b9dfbe14035963a80057e1f56ad1e7";
+          sha256 = "0m2m4ini1dzk7hzjy7zqn90vih9n6kiz1amgv4gyhzarbwj7zyw6";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/dfd5ae9a93e036d11899c7adffdf6b63c2b21381/recipes/sexy-monochrome-theme";
           sha256 = "0rlx4029zxrnzzqspn8zrp3q6w0n46q24qk7za46hvxdsmgdpxbq";
-          name = "sexy-monochrome-theme";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -65864,8 +82500,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    shackle = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    shackle = callPackage ({ cl-lib ? null
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "shackle";
         version = "20171209.1401";
         src = fetchFromGitHub {
@@ -65874,10 +82514,10 @@
           rev = "4189c1c773aab533969b587f7801ffbcd1d7d613";
           sha256 = "1gh30sryh884mpwxpkf0ngkcvixjrxxf4bgq4nqm9n969sr5bhsq";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/806e7d00f763f3fc4e3b8ebd483070ac6c5d0f21/recipes/shackle";
           sha256 = "159z0cwg7afrmym0xk902d8z093sqv39jig25ds7z4a224yrv5w6";
-          name = "shackle";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -65885,8 +82525,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    shadchen = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    shadchen = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "shadchen";
         version = "20141102.1039";
         src = fetchFromGitHub {
@@ -65895,10 +82538,10 @@
           rev = "35f2b9c304eec990c16efbd557198289dc7cbb1f";
           sha256 = "0phivbhjdw76gzrx35rp0zybqfb0fdy2hjllf72qf1r0r5gxahl8";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8a2a36fbfcf457eab05c1ff31cb9c2f68686094e/recipes/shadchen";
           sha256 = "1r1mfmv4cdlc8kzjiqz81kpqdrwbnyciwdgg6n5x0yi4apwpvnl4";
-          name = "shadchen";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -65906,20 +82549,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    shader-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    shader-mode = callPackage ({ emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "shader-mode";
-        version = "20180105.1500";
+        version = "20180518.457";
         src = fetchFromGitHub {
           owner = "midnightSuyama";
           repo = "shader-mode";
-          rev = "c141841feeee48299cff6651ed2e201a052e0570";
-          sha256 = "177kn9zrnzsayx9n9ym9k9a1rrbn8sycv1v67knpca05wkxg53zi";
+          rev = "d7dc8d0d6fe8914e8b6d5cf2081ad61e6952359c";
+          sha256 = "13scj6w3vsdcgmq7zak3pflqpq295wgzsng72rcafgkkr7r12rar";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4396f3c10a38f91d5f98684efbeb02812e479209/recipes/shader-mode";
           sha256 = "12y84fa1wc82js53rpadaysmbshhqf6wb97889qkksx19n3xmb9g";
-          name = "shader-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -65927,20 +82574,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    shakespeare-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    shakespeare-mode = callPackage ({ fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "shakespeare-mode";
-        version = "20160908.1511";
+        version = "20180704.1438";
         src = fetchFromGitHub {
           owner = "CodyReichert";
           repo = "shakespeare-mode";
-          rev = "0406a5ac4c98fcd171f0539c5cd88050aa351ea8";
-          sha256 = "04p6132121cv9z20mpp3dw5b4s4k8wcknscq97a7z072cabph3ji";
+          rev = "c442eeea9d585e1b1fbb8813e33d47feec348a57";
+          sha256 = "1ba9xy5jwn8ni8fi2k144j669jp95k2qf9ip77r16rsiy7divl0y";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/shakespeare-mode";
           sha256 = "1sg8n4ifpi36zmf6b6s0swq7k3r038cmj8kxjm7hpgxq6f9qnk9x";
-          name = "shakespeare-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -65948,8 +82598,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    shampoo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    shampoo = callPackage ({ fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "shampoo";
         version = "20131230.219";
         src = fetchFromGitHub {
@@ -65958,10 +82611,10 @@
           rev = "bc193c39636c30182159c5c91c37a9a4cb50fedf";
           sha256 = "15a8gs4lrqxn0jyfw16rc6vm7z1i10pzzlnp30x6nly9a7xra47x";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/19f145113a0698466e706a6a4c55d63cec512706/recipes/shampoo";
           sha256 = "01ssgw4cnnx8d86g3r1d5hqcib4qyhmpqvcvx47xs7zh0jscps61";
-          name = "shampoo";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -65969,8 +82622,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    shell-command = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    shell-command = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "shell-command";
         version = "20090830.340";
         src = fetchFromGitHub {
@@ -65979,10 +82635,10 @@
           rev = "7e22125f746ce9ffbe9b0282d62f4b4bbbe672bd";
           sha256 = "1my2i26a03z8xyyacsnl5wdylnbhhvazn23bpy639d3l4x4l7jzw";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ae489be43b1aee93614e40f492ebdf0b98a3fbc1/recipes/shell-command";
           sha256 = "01nviashfr64wm78zi3vrqrqdqgsamp76d9kasxv0b7fqmfx7yjk";
-          name = "shell-command";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -65990,8 +82646,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    shell-current-directory = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    shell-current-directory = callPackage ({ fetchFromGitHub
+                                           , fetchurl
+                                           , lib
+                                           , melpaBuild }:
+      melpaBuild {
         pname = "shell-current-directory";
         version = "20140101.1554";
         src = fetchFromGitHub {
@@ -66000,10 +82659,10 @@
           rev = "bf843771bf9a4aa05e054ade799eb8862f3be89a";
           sha256 = "1w42j5cdddr0riz1xjq3wiz5i9f71i9jdzd1l92ir0mlj05wjyic";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/edcb78c3491a5999b39a40087b7f991c2b737e30/recipes/shell-current-directory";
           sha256 = "0bj2gs96ivm5x8l7gwvfckyalr1amh4cb1v2dbl323zmrqddhgkd";
-          name = "shell-current-directory";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -66011,8 +82670,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    shell-here = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    shell-here = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "shell-here";
         version = "20150728.1004";
         src = fetchFromGitHub {
@@ -66021,10 +82683,10 @@
           rev = "251309141e18978d2b8014345acc6f5afcd4d509";
           sha256 = "0z04z07r7p5p05zhaka37s48y82hg2dbk0ynap4inph3frn4yyfl";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/88df6e04614547a59aefbeae88c301f3b8394039/recipes/shell-here";
           sha256 = "0csi70v89bqdpbsizji6c5z0jmkx4x4vk1zfclkpap4dalmxxcsh";
-          name = "shell-here";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -66032,8 +82694,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    shell-history = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    shell-history = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "shell-history";
         version = "20100505.139";
         src = fetchFromGitHub {
@@ -66042,10 +82707,10 @@
           rev = "ee371a81f2d2bf5a308344078329ca1e9b5ed38c";
           sha256 = "0jyz31j5a07shcf2ym5gnn16xk5r3s84ls8kxk5myvxi3wkpgdd4";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ae489be43b1aee93614e40f492ebdf0b98a3fbc1/recipes/shell-history";
           sha256 = "1cmk8rymnj7dscxjq0p23jgwc16yvzw1804ya5wsg95v239gz1hy";
-          name = "shell-history";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -66053,8 +82718,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    shell-pop = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    shell-pop = callPackage ({ cl-lib ? null
+                             , emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "shell-pop";
         version = "20170304.616";
         src = fetchFromGitHub {
@@ -66063,10 +82733,10 @@
           rev = "4a3a9d093ad1add792bba764c601aa28de302b34";
           sha256 = "1ybvg048jvijcg9jjfrbllf59pswmp0fd5zwq5x6nwg5wmggplzd";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/44150bddc9b276ab9fb2ab6a92a11383a3ed03b0/recipes/shell-pop";
           sha256 = "02s17ln0hbi9gy3di8fksp3mqc7d8ahhf5vwyz4vrc1bg77glxw8";
-          name = "shell-pop";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -66074,8 +82744,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    shell-split-string = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    shell-split-string = callPackage ({ fetchFromGitHub
+                                      , fetchurl
+                                      , lib
+                                      , melpaBuild }:
+      melpaBuild {
         pname = "shell-split-string";
         version = "20151224.208";
         src = fetchFromGitHub {
@@ -66084,10 +82757,10 @@
           rev = "19f6f999c33cc66a4c91bacdcc3697c25d97bf5a";
           sha256 = "16srngml5xmpaxb0wzhx91jil0r0dmn673bwai3lzxrkmjnl748l";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/84e20f4d02c69f8caf39cd20a581be3b9fa79931/recipes/shell-split-string";
           sha256 = "1yj1h7za4ylxh2nikj7s1qqlilpsk05x9571a2fymfyznm3iq77m";
-          name = "shell-split-string";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -66095,8 +82768,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    shell-switcher = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    shell-switcher = callPackage ({ emacs
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "shell-switcher";
         version = "20161028.2252";
         src = fetchFromGitHub {
@@ -66105,10 +82782,10 @@
           rev = "28a7f753dd7addd2933510526f52620cb5a22048";
           sha256 = "1x7rrf56hjasciim8rj29vfngwis4pr3mhclvxd4sbmhz9y66wm0";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a16194f6ddc05350b9875f4e0a3a0383c79e650e/recipes/shell-switcher";
           sha256 = "07g9naiv2jk9jxwjywrbb05dy0pbfdx6g8pkra38rn3vqrjzvhyx";
-          name = "shell-switcher";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -66116,8 +82793,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    shell-toggle = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    shell-toggle = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "shell-toggle";
         version = "20150226.611";
         src = fetchFromGitHub {
@@ -66126,10 +82806,10 @@
           rev = "0d01bd9a780fdb7fe6609c552523f4498649a3b9";
           sha256 = "0ssaccdacabpja9nqzhr8x8ggfwmlian7y4p0fa6gvr7qsvjpgr9";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/95873d90886d2db5cc1d83d4bcb8dd5c2e65bc3e/recipes/shell-toggle";
           sha256 = "1ai0ks7smr8b221j9hmsikswpxqraa9b13fpwv4wwagavnlah446";
-          name = "shell-toggle";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -66137,20 +82817,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    shelldoc = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    shelldoc = callPackage ({ cl-lib ? null
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild
+                            , s }:
+      melpaBuild {
         pname = "shelldoc";
         version = "20151114.1925";
         src = fetchFromGitHub {
           owner = "mhayashi1120";
           repo = "Emacs-shelldoc";
-          rev = "5df2264eb60e45066f3633df4f34834751667346";
-          sha256 = "1mc7y79h5p9cxqwsl40b1j5la5bm8b70n6fn4rx9wr4bi7rwph5i";
+          rev = "20eb889f3d3d9bd01aafdc699e712a75db42d8f3";
+          sha256 = "0i6xp6g3ggs4fkr410blxa4mkb1y05pcygkdbvb7y3gh878q5b5k";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/551623175e55629be6cfe44a595f25f09bd889e8/recipes/shelldoc";
           sha256 = "1xlp03aaidp7dp8349v8drzhl4lcngvxgdrwwn9cahfqlrvvbbbx";
-          name = "shelldoc";
+          name = "recipe";
         };
         packageRequires = [ cl-lib s ];
         meta = {
@@ -66158,20 +82843,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    shelltest-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    shelltest-mode = callPackage ({ fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "shelltest-mode";
-        version = "20141227.248";
+        version = "20180430.1841";
         src = fetchFromGitHub {
           owner = "rtrn";
           repo = "shelltest-mode";
-          rev = "b4bdd547bcdac427561aa1452f2aeb65e3a3c9f5";
-          sha256 = "0f45q8j9m0ic3l69i7qjhf0l19cprn56fxw61al4xd3wxv4pr9gy";
+          rev = "5fea8c9394380e822971a171905b6b5ab9be812d";
+          sha256 = "1np65a92n4y9i0nr8wymzn6md9xqmi9qyggya7sz0q4nzsh45wqg";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/af6dcd4fc0663a255bd85b247bbdf57d425efdb7/recipes/shelltest-mode";
           sha256 = "1inb0vq34fbwkr0jg4dv2lljag8djggi8kyssrzhfawri50m81nh";
-          name = "shelltest-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -66179,8 +82867,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    shen-elisp = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    shen-elisp = callPackage ({ emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "shen-elisp";
         version = "20170427.1502";
         src = fetchFromGitHub {
@@ -66189,10 +82881,10 @@
           rev = "ffe17dee05f75539cf5e4c59395e4c7400ececaa";
           sha256 = "10dq3qj1q8i6f604zws97xrvjxwrdcjj3ygh6xpna00cvf40llc2";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/shen-elisp";
           sha256 = "045nawzyqaxd3g5f56fxfy680pl18x67w0wi28nrq4l4681w9xyq";
-          name = "shen-elisp";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -66200,20 +82892,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    shift-number = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    shift-number = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "shift-number";
         version = "20170301.659";
         src = fetchFromGitHub {
           owner = "alezost";
           repo = "shift-number.el";
-          rev = "cd099a5582fc996b800ac7607f6c38a004ce9740";
-          sha256 = "131by7z6303m81kjhy8rnfvwyzfbxglc19xb90jdks4vgczqkcah";
+          rev = "94c3713cc11283a831f66d5205d112762edc186b";
+          sha256 = "17a5aifj37pv3jm6k7ilc3s4vwhiy2dwyjjy9dxy3qqc8w9h4rr1";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b06be6b25078ddfabc1ef1145c817552f679c41c/recipes/shift-number";
           sha256 = "1sbzkmd336d0dcdpk29pzk2b5bhlahrn083x62l6m150n2xzxn4p";
-          name = "shift-number";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -66221,8 +82916,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    shift-text = callPackage ({ cl-lib ? null, es-lib, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    shift-text = callPackage ({ cl-lib ? null
+                              , es-lib
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "shift-text";
         version = "20130831.955";
         src = fetchFromGitHub {
@@ -66231,10 +82931,10 @@
           rev = "1be9cbf994000022172ceb746fe1d597f57ea8ba";
           sha256 = "13zsws8gq9a8nfk4yzlvfsvqjh9zbnanmw68rcna93yc5nc634nr";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2ad2ea105b895cb958ce0ab2bf2fad2b40d41b2f/recipes/shift-text";
           sha256 = "1v9zk7ycc8k1qk1cfs2y1knygl686msmlilqy5a7mh0w0z9f3a2i";
-          name = "shift-text";
+          name = "recipe";
         };
         packageRequires = [ cl-lib es-lib ];
         meta = {
@@ -66242,20 +82942,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    shimbun = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    shimbun = callPackage ({ fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "shimbun";
-        version = "20180201.2145";
+        version = "20180325.2048";
         src = fetchFromGitHub {
           owner = "emacsorphanage";
           repo = "w3m";
-          rev = "4b9664bab3794379af42d549d9540735c16b5a25";
-          sha256 = "16wics5k7w7b23zayh9j6jbh6dflk6r8wq75p9bnpw1n36gmm8ig";
+          rev = "59339a69a069fecf7b15148cbc141a6c1811edd6";
+          sha256 = "1al8kjmp2jm2ssla8vhalrvpclragh999mgby5524cppwlzz592b";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/30de78c9cf83de30093a5647976eeaf552d4b2cb/recipes/shimbun";
           sha256 = "1rjykr0y5jfd6r3shm8x23yyra6qjsb55jrfc45rhpb89klyg1nk";
-          name = "shimbun";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -66263,8 +82966,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    shm = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    shm = callPackage ({ fetchFromGitHub
+                       , fetchurl
+                       , lib
+                       , melpaBuild }:
+      melpaBuild {
         pname = "shm";
         version = "20180326.1757";
         src = fetchFromGitHub {
@@ -66273,10 +82979,10 @@
           rev = "7f9df73f45d107017c18ce4835bbc190dfe6782e";
           sha256 = "1jcc30048j369jgsbbmkb63whs4wb37bq21jrm3r6ry22izndsqa";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/68a2fddb7e000487f022b3827a7de9808ae73e2a/recipes/shm";
           sha256 = "1qmp8cc83dcz25xbyqd4987i0d8ywvh16wq2wfs4km3ia8a2vi3c";
-          name = "shm";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -66284,20 +82990,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    shoulda = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    shoulda = callPackage ({ cl-lib ? null
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "shoulda";
         version = "20140616.1133";
         src = fetchFromGitHub {
           owner = "marcwebbie";
           repo = "shoulda.el";
-          rev = "fbe8eb8efc6cfcca1713283a290882cfcdc8725e";
-          sha256 = "19p47a4hwl6h2w5ay09hjhl4kf7cydwqp8s2iyrx2i0k58az8i8i";
+          rev = "24dc6b6138a06edde9c8d13a6aaa1654d1d7de54";
+          sha256 = "18p0z5d8vhdhmw6x5rys2kfk93pb7mzdagls9ml0mjcixsyy7qsc";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/41497a876c80d81d9562ea4b2cc2a83dba98ae8a/recipes/shoulda";
           sha256 = "0lmlhx34nwvn636y2wvw3sprhhh6q3mdg7dzgpjj7ybibvhp1lzk";
-          name = "shoulda";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -66305,8 +83015,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    show-css = callPackage ({ doom, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    show-css = callPackage ({ doom
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild
+                            , s }:
+      melpaBuild {
         pname = "show-css";
         version = "20160210.608";
         src = fetchFromGitHub {
@@ -66315,10 +83030,10 @@
           rev = "771daeddd4df7a7c10f66419a837145649bab63b";
           sha256 = "11kzjm12hbcdzrshq20r20l29k3555np1sva7afqrhgvd239fdq1";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/show-css";
           sha256 = "0sq15l58macy2affdgbimnchn491fnrqr3bbgn30k3l3xkvkmc7k";
-          name = "show-css";
+          name = "recipe";
         };
         packageRequires = [ doom s ];
         meta = {
@@ -66326,29 +83041,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    show-marks = callPackage ({ fetchFromGitHub, fetchurl, fm, lib, melpaBuild }:
-    melpaBuild {
-        pname = "show-marks";
-        version = "20130805.749";
-        src = fetchFromGitHub {
-          owner = "vapniks";
-          repo = "show-marks";
-          rev = "97609566582e65eed0d0a854efa5c312f209115d";
-          sha256 = "15vkk7lnnfwgzkiwpqz1l1qpnz2d10l82m10m0prbw03k1zx22c7";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/f2007ab49d123e324c8d7c09bca9de33468d98ab/recipes/show-marks";
-          sha256 = "1jgxdclj88ca106vcvf1k8zbf7iwamy80c2ad8b3myz0f4zscjzb";
-          name = "show-marks";
-        };
-        packageRequires = [ fm ];
-        meta = {
-          homepage = "https://melpa.org/#/show-marks";
-          license = lib.licenses.free;
-        };
-      }) {};
-    showtip = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    showtip = callPackage ({ fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "showtip";
         version = "20090830.340";
         src = fetchFromGitHub {
@@ -66357,10 +83054,10 @@
           rev = "930da302809a4257e8d69425455b29e1cc91949b";
           sha256 = "01zak0zhha6dp7a2hm28d065gjnc462iwpsfyxhbxgfzcdlicqc7";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ae489be43b1aee93614e40f492ebdf0b98a3fbc1/recipes/showtip";
           sha256 = "1d5ckka2z0ffwyk9g3h91n3waijj2v7n8kvdks35gcr2yl3yk780";
-          name = "showtip";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -66368,20 +83065,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    shpec-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    shpec-mode = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "shpec-mode";
         version = "20150530.222";
         src = fetchFromGitHub {
           owner = "shpec";
           repo = "shpec-mode";
-          rev = "146adc8281d0f115df39a3a3f982ac59ab61b754";
-          sha256 = "1mizhbwvnsxxjz6m94qziibvhghhp8v8db3wxrq3z9gsaqqkcndn";
+          rev = "76bccd63e3b70233a6c9ca0798dd03550952cc76";
+          sha256 = "09454mcjd8n1090pjc5mk1dc6bn3bgh60ddpnv9hkajkzpcjxx4h";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/dd1bfe85b430c3bbb5a7baf11bb9699dad417f60/recipes/shpec-mode";
           sha256 = "155hc1nym3fsvflps8d3ixaqw1cafqp97zcaywdppp47n7vj8zjl";
-          name = "shpec-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -66389,8 +83089,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    shr-tag-pre-highlight = callPackage ({ emacs, fetchFromGitHub, fetchurl, language-detection, lib, melpaBuild }:
-    melpaBuild {
+    shr-tag-pre-highlight = callPackage ({ emacs
+                                         , fetchFromGitHub
+                                         , fetchurl
+                                         , language-detection
+                                         , lib
+                                         , melpaBuild }:
+      melpaBuild {
         pname = "shr-tag-pre-highlight";
         version = "20171113.114";
         src = fetchFromGitHub {
@@ -66399,10 +83104,10 @@
           rev = "6182f43a36b0f82ba6edcf6e423b5f69a46a814e";
           sha256 = "0916bpzi6sw5gyn5xgi9czf35zrvl04w10wz6fvz0lc57giihil1";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7be3c139bee02e8bd9a9830026cbfdd17629ac4d/recipes/shr-tag-pre-highlight";
           sha256 = "1v8fqx8bd5504r2mflq6x8xs3k0py3bgsnadz3bjs68yhaxacj3v";
-          name = "shr-tag-pre-highlight";
+          name = "recipe";
         };
         packageRequires = [ emacs language-detection ];
         meta = {
@@ -66410,20 +83115,27 @@
           license = lib.licenses.free;
         };
       }) {};
-    shrink-path = callPackage ({ dash, emacs, f, fetchFromGitLab, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    shrink-path = callPackage ({ dash
+                               , emacs
+                               , f
+                               , fetchFromGitLab
+                               , fetchurl
+                               , lib
+                               , melpaBuild
+                               , s }:
+      melpaBuild {
         pname = "shrink-path";
         version = "20170812.1947";
         src = fetchFromGitLab {
           owner = "bennya";
           repo = "shrink-path.el";
-          rev = "9d06c453d1537df46a4b703a29213cc7f7857aa0";
-          sha256 = "021bpgpzysag1s11m9pyq2bk6a0mf9ayx10yxhf5cw56x3d0jj1b";
+          rev = "a94c80743280fe317cf56cd4d4cd6385ce9e3dfb";
+          sha256 = "1s5ax71qi8pl8jsc49yaqrhfvxmc4z4hjzmy1fhfr1qjmxl5d08i";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/86b0d105e8a57d5f0bcde779441dc80b85e170ea/recipes/shrink-path";
           sha256 = "0fq13c6g7qbq6f2ry9dzdyg1f6p41wimkjcdaj177rnilz77alzb";
-          name = "shrink-path";
+          name = "recipe";
         };
         packageRequires = [ dash emacs f s ];
         meta = {
@@ -66431,8 +83143,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    shrink-whitespace = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    shrink-whitespace = callPackage ({ fetchFromGitHub
+                                     , fetchurl
+                                     , lib
+                                     , melpaBuild }:
+      melpaBuild {
         pname = "shrink-whitespace";
         version = "20150916.1215";
         src = fetchFromGitHub {
@@ -66441,10 +83156,10 @@
           rev = "8d4263d974fbe66417c0bb9edc155ecc2f48e4b7";
           sha256 = "07zzyfibs2c7w4gpvdh9003frznbg7zdnrx0nv8bvn0b68d3yz0m";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/shrink-whitespace";
           sha256 = "0baqv4wr1wi4wd7cfhqf4y24qkpd72lax596z5lj934ihwf3gggw";
-          name = "shrink-whitespace";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -66452,20 +83167,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    shut-up = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    shut-up = callPackage ({ cl-lib ? null
+                           , emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "shut-up";
-        version = "20150423.522";
+        version = "20180628.1130";
         src = fetchFromGitHub {
           owner = "cask";
           repo = "shut-up";
-          rev = "a4fd18f37e20ae991c0dbba821b2c8e6f1679c39";
-          sha256 = "00c11s664hwj1l1hw7qshygy3wb6wbd0hn6qqnyq1xr0r87nnhjs";
+          rev = "081d6b01e3ba0e60326558e545c4019219e046ce";
+          sha256 = "1bnmrwrhra6cpc3jjgwwzrydj5ps7q2dlkh2ag4j7rkyv4dlk351";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/297d3d88a1dad694d5903072adb679f2194ce444/recipes/shut-up";
           sha256 = "1bcqrnnafnimfcg1s7vrgq4cb4rxi5sgpd92jj7xywvkalr3kh26";
-          name = "shut-up";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -66473,20 +83193,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    shx = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    shx = callPackage ({ emacs
+                       , fetchFromGitHub
+                       , fetchurl
+                       , lib
+                       , melpaBuild }:
+      melpaBuild {
         pname = "shx";
-        version = "20180310.1748";
+        version = "20180528.1408";
         src = fetchFromGitHub {
           owner = "riscy";
           repo = "shx-for-emacs";
-          rev = "b33b23097ad34177e4179e9d3731ec5db30c6391";
-          sha256 = "0vlgm1aix074ifi9gvp4c0ygdmzplydj4gdsl46173qbd8lfi2rj";
+          rev = "207e6cd292a26fb1162072e2e20df9aa5efd61ef";
+          sha256 = "1hnjmnnmg6axgw4z57rmc8h8wpnbi2rwyr4bv2sdrkk12d3i2kp5";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7a2ff78ae3c4289ebf9e06cdfd8f8082c395a16f/recipes/shx";
           sha256 = "0h5ldglx4y85lm0pfilasnch2k82mlr7rb20qvarzwd41hb1az1k";
-          name = "shx";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -66494,20 +83218,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    sibilant-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    sibilant-mode = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "sibilant-mode";
         version = "20151119.1345";
         src = fetchFromGitHub {
           owner = "jbr";
           repo = "sibilant-mode";
-          rev = "bc1b5d8cd597918bafc9b2880ee49024740e54ab";
-          sha256 = "0cjqh6qbbmgxd6zgqnikw6bh8wpjydydkkqs5wcmblpi5awqmnb6";
+          rev = "5baf8c3e80ee0736c7298a2a17fb615ba5ac0d2d";
+          sha256 = "0lpr3pcmwn51wl732kb9a2cagrkxjsgk384z2b7cq9zs79mdh616";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/de12c8a37d6d42103f437e6bd974a94924242e8f/recipes/sibilant-mode";
           sha256 = "0jd6dsk93nvwi5yia3623hfc4v6zz4s2n8m1wx9bw8x6kv3h3qbq";
-          name = "sibilant-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -66515,8 +83242,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    sicp = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    sicp = callPackage ({ fetchFromGitHub
+                        , fetchurl
+                        , lib
+                        , melpaBuild }:
+      melpaBuild {
         pname = "sicp";
         version = "20171028.1523";
         src = fetchFromGitHub {
@@ -66525,10 +83255,10 @@
           rev = "8e13f7ff4695a05471486d37a6c5f979a5b965fb";
           sha256 = "15krfnj2qz4j2ns4a05a4wwaknhx77m4jhazg7zvz9xm4b4j1qm8";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1363d7b6e95375ac63f07eed2b3947f4f81bc9ba/recipes/sicp";
           sha256 = "1q7pbhjk8qgwvj27ianrdbmj98pwf3xv10gmpchh7bypmbyir4wz";
-          name = "sicp";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -66536,20 +83266,48 @@
           license = lib.licenses.free;
         };
       }) {};
-    sift = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    side-notes = callPackage ({ emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
+        pname = "side-notes";
+        version = "20180523.2328";
+        src = fetchFromGitHub {
+          owner = "rnkn";
+          repo = "side-notes";
+          rev = "981ac308b9b5d58e2af20485377e693d2a6e15aa";
+          sha256 = "1hjj6pkl83b9fldzf2bixdny85l5mn81a9kf25kyp0cc6apvwsqr";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/24a71c493adfb79bcd5172d65aa0751e9a6ab556/recipes/side-notes";
+          sha256 = "07hrrplgvp3fvl10fsmxifnim8wz34w7fhzzzkxpdj1zlwls6h83";
+          name = "recipe";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/side-notes";
+          license = lib.licenses.free;
+        };
+      }) {};
+    sift = callPackage ({ fetchFromGitHub
+                        , fetchurl
+                        , lib
+                        , melpaBuild }:
+      melpaBuild {
         pname = "sift";
         version = "20160107.215";
         src = fetchFromGitHub {
           owner = "nlamirault";
           repo = "sift.el";
-          rev = "4ce8878a0fc396ded7521ce38852d93e1d863065";
-          sha256 = "1x78i6svi4cwah9xw85imhpncvxsx4xim4fzykpnd328mxkk07h6";
+          rev = "8c3f3d14a351a2394027d72ee0599aa73b9f0d13";
+          sha256 = "1ma6djvhvjai07v1g9a36lfa3nw8zsy6x5vliwcdnkf44gs287ra";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/sift";
           sha256 = "1kr5rxza5li3zrkfvs91y7dxmn213z0zf836rkwkmwg2b9rmqxvj";
-          name = "sift";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -66557,8 +83315,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    signal = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    signal = callPackage ({ cl-lib ? null
+                          , emacs
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "signal";
         version = "20160816.738";
         src = fetchFromGitHub {
@@ -66567,10 +83330,10 @@
           rev = "aa58327e2297df921d72a0370468b48663efd438";
           sha256 = "1gzfdk3ks56h8q4xk69aaxkhkg9jhs55iqdicyvq7x9wmjn6b7xw";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/signal";
           sha256 = "0y4crwpnmwm8bi9jazrph4yj0nnva2i1js8h3bw3sizy20a4yf00";
-          name = "signal";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -66578,20 +83341,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    signature = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    signature = callPackage ({ fetchFromGitLab
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "signature";
         version = "20140730.1249";
-        src = fetchFromGitHub {
+        src = fetchFromGitLab {
           owner = "pidu";
           repo = "signature";
           rev = "c47df2e1189a84505f9224aa78e87b6c65d13d37";
           sha256 = "1g4rr7hpy9r3y4vdpv48xpmy8kqvs4j64kvnhnj2rw2wv1grw78j";
         };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/2191b1b46868f9f3b7a98f47411498dd42839347/recipes/signature";
-          sha256 = "11n3id1iiip99lj8c0iffbrf59s2yvmwlhqbf8xzxkhws7vwdl5q";
-          name = "signature";
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/a52b516b7b10bdada2f64499c8f43f85a236f254/recipes/signature";
+          sha256 = "0y5xspcsjap662n1gp882kjripiz90wwbhsq27c0qwl1zcx5rrkj";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -66599,8 +83365,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    silkworm-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    silkworm-theme = callPackage ({ emacs
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "silkworm-theme";
         version = "20180301.637";
         src = fetchFromGitHub {
@@ -66609,10 +83379,10 @@
           rev = "4a297f952401cfe894dcb24174f6eda05e00fada";
           sha256 = "00kjibpn3ry7j1s6kqmakybialpcx4919344lxks7wij5l6qqxx0";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9451d247693c3e991f79315868c73808c0a664d4/recipes/silkworm-theme";
           sha256 = "1zbrjqmhf80qs3i910sixirrv42rxkqdrg2z03gnz1g885gpcn13";
-          name = "silkworm-theme";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -66620,20 +83390,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    simp = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    simp = callPackage ({ fetchFromGitHub
+                        , fetchurl
+                        , lib
+                        , melpaBuild }:
+      melpaBuild {
         pname = "simp";
-        version = "20161206.2151";
+        version = "20180606.1954";
         src = fetchFromGitHub {
           owner = "re5et";
           repo = "simp";
-          rev = "13959cabdc7a10d8878592ef4333b3e6df2f1483";
-          sha256 = "1wph7r7r9s867wr6j17fqch8hmj20fksrhl80bw2k4vyscaj0f22";
+          rev = "d4d4b8547055347828bedccbeffdb4fd2d5a5d34";
+          sha256 = "1a60vk46haibzrm6zgssdw085wpssmmqc66bipvkq6xnp2cvchkc";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/45ff5b788e12218f8e2df7e53444796ca4b929fc/recipes/simp";
           sha256 = "0x4lssjkj3fk9fw603f0sggvcj25iw0zbzsm5c949lhl4a3wvc9c";
-          name = "simp";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -66641,20 +83414,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    simple-bookmarks = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    simple-bookmarks = callPackage ({ cl-lib ? null
+                                    , fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "simple-bookmarks";
         version = "20160804.701";
         src = fetchFromGitHub {
           owner = "jtkDvlp";
           repo = "simple-bookmarks";
-          rev = "6c58337f2b7dbe9e58b5e097b1567f046a01d071";
-          sha256 = "05071n96d91q3jz9dwp1qkqwq56k0d7cd1pnjj4jvjx4kb852waj";
+          rev = "e89e8163a0705e28e9346320a1ee13c1aae249af";
+          sha256 = "0bx8inaihfs48rzi01nlr3wp2iw0bnk318hhgpd4zg64ap3sgdsv";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a60dd50c388a75ce21a5aec9acf938835d7afdbc/recipes/simple-bookmarks";
           sha256 = "0jn5wzm9y4054mr9czd3224s5kbrqpcpcfmj6fi62yhy3p1ys9rb";
-          name = "simple-bookmarks";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -66662,8 +83439,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    simple-call-tree = callPackage ({ anaphora, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    simple-call-tree = callPackage ({ anaphora
+                                    , emacs
+                                    , fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "simple-call-tree";
         version = "20180224.1256";
         src = fetchFromGitHub {
@@ -66672,10 +83454,10 @@
           rev = "20059eb5549408def76aeb03d0d20839903dedef";
           sha256 = "0gvhn2r7h6jz7a3i3a8gwlmghv1xfzj0sdib25kz645iylazji4h";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/316a5ffcb3080abd623bbe3065077809e6cbfb74/recipes/simple-call-tree";
           sha256 = "1cbv4frsrwd8d3rg8r4sylwnc1hl3hgh595qwbpx0zd3dp5na2yl";
-          name = "simple-call-tree";
+          name = "recipe";
         };
         packageRequires = [ anaphora emacs ];
         meta = {
@@ -66683,20 +83465,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    simple-httpd = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    simple-httpd = callPackage ({ cl-lib ? null
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "simple-httpd";
-        version = "20180218.538";
+        version = "20180528.903";
         src = fetchFromGitHub {
           owner = "skeeto";
           repo = "emacs-web-server";
-          rev = "868ec06abdc23c69597bc3a12da7aa2e5c0ad9c5";
-          sha256 = "1grq5a74arng2nn5q1xjm7gl5gk55a1js2r22wsahm8gd0fn0jdv";
+          rev = "a5eb49a6567e33586fba15dd649d63ca6e964314";
+          sha256 = "0dpn92rg813c4pq7a1vzj3znyxzp2lmvxqz6pzcqi0l2xn5r3wvb";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/simple-httpd";
           sha256 = "1g9m8dx62pql6dqz490pifcli96i5pv6sar18w4lwrfgpfisfz8c";
-          name = "simple-httpd";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -66704,20 +83490,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    simple-mpc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    simple-mpc = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild
+                              , s }:
+      melpaBuild {
         pname = "simple-mpc";
         version = "20180224.1801";
         src = fetchFromGitHub {
           owner = "jorenvo";
           repo = "simple-mpc";
-          rev = "ad74cb621e04838f8725ab7dc8716f0f38c90413";
-          sha256 = "1g3pb0n5j0s4q85zgjqnw1idvpvq3kwrakv8d6if7xb066v21ng9";
+          rev = "6aa491936e3529e8c2a42d4d7ee16ba54191d27e";
+          sha256 = "0dwshc88mhv2z490jfa0q5qfkirj1js1k0wk5pnp9l5mvagnxcdd";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/62d762308c1ec0c1d8f7b4755b7deb285cbac018/recipes/simple-mpc";
           sha256 = "05x2xyys5mf6k7ndh0l6ykyiygaznb4f8bx3npbhvihrsz9ilf8r";
-          name = "simple-mpc";
+          name = "recipe";
         };
         packageRequires = [ s ];
         meta = {
@@ -66725,20 +83515,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    simple-paren = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    simple-paren = callPackage ({ cl-lib ? null
+                                , emacs
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "simple-paren";
-        version = "20180205.1141";
+        version = "20180427.218";
         src = fetchFromGitHub {
           owner = "andreas-roehler";
           repo = "simple-paren";
-          rev = "f5cc9b4325a07efe92379a11a1a61035c9a1e8c4";
-          sha256 = "1p931vqdnh6agrrzxf55x34ikb1x53mz1a17kskzlqchlzfmc3da";
+          rev = "8d735905306c587851eff1445898499c01c530ca";
+          sha256 = "0fv8s9h9sdiahi49al7zp0ldrlxi0dj46i2il75y7ay70l29wza2";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5e8886feb4a034fddd40d7381508b09db79f608f/recipes/simple-paren";
           sha256 = "0bmw8pkh9864gymy36r3w5yw08pq894gb1n80wfqls4a78zyvkm3";
-          name = "simple-paren";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -66746,20 +83541,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    simple-rtm = callPackage ({ dash, fetchFromGitLab, fetchurl, lib, melpaBuild, rtm }:
-    melpaBuild {
+    simple-rtm = callPackage ({ dash
+                              , fetchFromGitLab
+                              , fetchurl
+                              , lib
+                              , melpaBuild
+                              , rtm }:
+      melpaBuild {
         pname = "simple-rtm";
         version = "20160222.734";
         src = fetchFromGitLab {
           owner = "mbunkus";
           repo = "simple-rtm";
-          rev = "8c7cd96cf66ef112be5c363e3378e304f8f83999";
-          sha256 = "1kkhnsxr8zrb21k4ckyg69nsndwy4zdkvfw2drk4v1vnbgx8144f";
+          rev = "37c5feffea7c9b571279b6f549d06cf9c0720273";
+          sha256 = "0rwvlhwg66ny0rm972wjfz41ck9kqmbax49wkagrkimm1cdrjfia";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a784f931849ca836557390999b179ef9f6e775f3/recipes/simple-rtm";
           sha256 = "0v5f0vr8sh62yvb7znx00wgybb83dfnkvgl8afyk3ry8n9xkhf5b";
-          name = "simple-rtm";
+          name = "recipe";
         };
         packageRequires = [ dash rtm ];
         meta = {
@@ -66767,8 +83567,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    simple-screen = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    simple-screen = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "simple-screen";
         version = "20161009.220";
         src = fetchFromGitHub {
@@ -66777,10 +83580,10 @@
           rev = "596e3a451d9af24730ab31a8fe15c91a4264d09d";
           sha256 = "0mqlwrkipgf977s0gx57fv5xrqli67hixprvra6q64isapr86yh1";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/02db9a649002ed9dec03661a518f74f3c7a176d9/recipes/simple-screen";
           sha256 = "16zvsmqn882w320h26hjjz5lcyl9y0x4amkf2zfps77xxmkmi5n0";
-          name = "simple-screen";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -66788,8 +83591,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    simpleclip = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    simpleclip = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "simpleclip";
         version = "20170803.540";
         src = fetchFromGitHub {
@@ -66798,10 +83604,10 @@
           rev = "d461c462c237cd896553adb468cd77499d0d26ad";
           sha256 = "1dfa1sa7rbadj36nbzyxbpbvkdlh1s5n0mx6hxn52psqin1ra6yn";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7c921e27d6aafc1b82d37f6beb8407840034377a/recipes/simpleclip";
           sha256 = "07qkfwlg8vw5kb097qbsv082hxir047q2bcvc8scbak2dr6pl12s";
-          name = "simpleclip";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -66809,20 +83615,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    simplenote = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    simplenote = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "simplenote";
         version = "20141118.640";
         src = fetchFromGitHub {
           owner = "dotemacs";
           repo = "simplenote.el";
-          rev = "e836fcdb5a6497a9ffd6bceddd19b4bc52189078";
-          sha256 = "0xq4vy3ggdjiycd3aa62k94kd43zcpm8bfdgi8grwkb1lpvwq9i9";
+          rev = "734603e877b2d642162ca45f799d2f7b956d2ea0";
+          sha256 = "1cqdnnj8pshcxzwb0vivvk8zywbw7a3vibcs88kd9zxkxmdwg0fz";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8c1c3189da03541e3bee44847ac5d02c2a56ef98/recipes/simplenote";
           sha256 = "0rnvm3q2spfj15kx2c8ic1p8hxg7rwiqgf3x2zg34j1xxayn3h2j";
-          name = "simplenote";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -66830,8 +83639,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    simplenote2 = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, request-deferred }:
-    melpaBuild {
+    simplenote2 = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild
+                               , request-deferred }:
+      melpaBuild {
         pname = "simplenote2";
         version = "20171201.1806";
         src = fetchFromGitHub {
@@ -66840,10 +83653,10 @@
           rev = "0fd6dbd0566af29964078e4b74baf69c2f52381a";
           sha256 = "0qlwmxrz2kngri7ywy64bja0najq9m6asq2gr53ns0mkq1ngf0l8";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1ac16abd2ce075a8bed4b7b52aed71cb12b38518/recipes/simplenote2";
           sha256 = "1qdzbwhzmsga65wmrd0mb3rbs71nlyqqb6f4v7kvfxzyis50cswm";
-          name = "simplenote2";
+          name = "recipe";
         };
         packageRequires = [ request-deferred ];
         meta = {
@@ -66851,20 +83664,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    simplezen = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    simplezen = callPackage ({ dash
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild
+                             , s }:
+      melpaBuild {
         pname = "simplezen";
         version = "20130421.300";
         src = fetchFromGitHub {
           owner = "magnars";
           repo = "simplezen.el";
-          rev = "119fdf2c6890a0c56045ae72cf4fce0071a81481";
-          sha256 = "0108q2b5h73rjxg9k2kmc8z6la9kgqdnz9z1x7rn61v3vbxlzqvn";
+          rev = "9f91554a3f7f4e9b2b5ec009effafbf12b091973";
+          sha256 = "04hg5c7pc7ms8kizjzd8s8a70gpkmazkhp8722fxcl0khbv6r3ix";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/eddd3de86e14f56b59fa6f9a08fc89288e0bdbc1/recipes/simplezen";
           sha256 = "13f2anhfsxmx1vdd209gxkhpywsi3nn6pazhc6bkswmn27yiig7j";
-          name = "simplezen";
+          name = "recipe";
         };
         packageRequires = [ dash s ];
         meta = {
@@ -66872,8 +83690,17 @@
           license = lib.licenses.free;
         };
       }) {};
-    skeletor = callPackage ({ cl-lib ? null, dash, emacs, f, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, s }:
-    melpaBuild {
+    skeletor = callPackage ({ cl-lib ? null
+                            , dash
+                            , emacs
+                            , f
+                            , fetchFromGitHub
+                            , fetchurl
+                            , let-alist
+                            , lib
+                            , melpaBuild
+                            , s }:
+      melpaBuild {
         pname = "skeletor";
         version = "20170616.1746";
         src = fetchFromGitHub {
@@ -66882,10 +83709,10 @@
           rev = "01c330ec115fc29bba5d9bdf6c15beb4a44e2281";
           sha256 = "0i3axni8y4s5n2s7qbqzz3sadcfhr3369q7qn8psk29qbicjw5wv";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1e63aefc869900c2af6f958dc138f9c72c63e2b8/recipes/skeletor";
           sha256 = "1vfvg5l12dzksr24dxwc6ngawsqzpxjs97drw48qav9dy1vyl10v";
-          name = "skeletor";
+          name = "recipe";
         };
         packageRequires = [ cl-lib dash emacs f let-alist s ];
         meta = {
@@ -66893,20 +83720,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    skewer-less = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, skewer-mode }:
-    melpaBuild {
+    skewer-less = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild
+                               , skewer-mode }:
+      melpaBuild {
         pname = "skewer-less";
         version = "20160828.1321";
         src = fetchFromGitHub {
           owner = "purcell";
           repo = "skewer-less";
-          rev = "927d6848a1ea9428d4cc995f76bd42f7b8da6bc8";
-          sha256 = "11zaq1p04igg0hbmazsf5c0xz7aigx120rwg5iq7niaz2277j1k1";
+          rev = "cc1a8e8fe0b62a08da89c4639fb942f5165454b4";
+          sha256 = "0mqrxhy03dwm590shshz63nr2nfn19n6f0p37ybkjwqn0w7b834w";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fb63f7417f39bd718972f54e57360708eb48b977/recipes/skewer-less";
           sha256 = "0fhv5cnp5bgw3krfmb0jl18kw2hzx2p81falj57lg3p8rn23dryl";
-          name = "skewer-less";
+          name = "recipe";
         };
         packageRequires = [ skewer-mode ];
         meta = {
@@ -66914,20 +83745,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    skewer-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, simple-httpd }:
-    melpaBuild {
+    skewer-mode = callPackage ({ emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , js2-mode
+                               , lib
+                               , melpaBuild
+                               , simple-httpd }:
+      melpaBuild {
         pname = "skewer-mode";
-        version = "20170730.1241";
+        version = "20180706.1107";
         src = fetchFromGitHub {
           owner = "skeeto";
           repo = "skewer-mode";
-          rev = "c8fc64300cbe85896f6e0719ef2c91bfba9c4fcd";
-          sha256 = "1rl5rmvq0qgdr8zrzbdvahf8rxsdajj7zbyzxyqfmyqr83c9yrz5";
+          rev = "a381049acc4fa2087615b4b3b26c0865841386bd";
+          sha256 = "12fsp7mwmjxh5mhshriyxw8mlghzn3gfswf6hkz1hcb0yfd56d53";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/10fba4f7935c78c4fc5eee7dbb161173dea884ba/recipes/skewer-mode";
           sha256 = "1zp4myi9f7pw6zkgc0xg12585iihn7khcsf20pvqyc0vn4ajdwqm";
-          name = "skewer-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs js2-mode simple-httpd ];
         meta = {
@@ -66935,20 +83772,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    skewer-reload-stylesheets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, skewer-mode }:
-    melpaBuild {
+    skewer-reload-stylesheets = callPackage ({ fetchFromGitHub
+                                             , fetchurl
+                                             , lib
+                                             , melpaBuild
+                                             , skewer-mode }:
+      melpaBuild {
         pname = "skewer-reload-stylesheets";
         version = "20160725.520";
         src = fetchFromGitHub {
           owner = "NateEag";
           repo = "skewer-reload-stylesheets";
-          rev = "b9cc5635230ac3c0603a6da690c6e632d0a7490a";
-          sha256 = "0c8dpbl0z45w1brllcysibmpbnk8yqjgi3iywmqnhrycb7lrda4g";
+          rev = "3207abca9551660407a6b009cb40fb32bbb550da";
+          sha256 = "0fgxil70yrf6annrbvza4lqaagrn65c7pmayg6pr16hy5w8wcgsk";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/aeaa2c89b995f1ab0b0f96493db0cda44cc851ee/recipes/skewer-reload-stylesheets";
           sha256 = "1hcz8q7rs5g7gbj6w72g8prry4niqjmyxvvc0ala83qw76x4cm7k";
-          name = "skewer-reload-stylesheets";
+          name = "recipe";
         };
         packageRequires = [ skewer-mode ];
         meta = {
@@ -66956,8 +83797,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    skype = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    skype = callPackage ({ fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "skype";
         version = "20160711.124";
         src = fetchFromGitHub {
@@ -66966,10 +83810,10 @@
           rev = "8e3b33e620ed355522aa36434ff41e3ced080629";
           sha256 = "078gjgknsrm1n2f0diian9l056kqh1fj2w0y6ildsvzjipygdz1y";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d3448698a35c9d5d25639f62024f89cac03d5830/recipes/skype";
           sha256 = "06p5s5agajbm9vg9xxpzv817xmjw2kmcahiw4iypn5yzwhv1aykl";
-          name = "skype";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -66977,8 +83821,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    sl = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    sl = callPackage ({ cl-lib ? null
+                      , fetchFromGitHub
+                      , fetchurl
+                      , lib
+                      , melpaBuild }:
+      melpaBuild {
         pname = "sl";
         version = "20161217.604";
         src = fetchFromGitHub {
@@ -66987,10 +83835,10 @@
           rev = "0882117728be91276b815e18c2a66106bf9d69d3";
           sha256 = "1cr3ilf96d8kkyc48nasd4iy2q84kkxjssmvlclanss1hj95nj2l";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7188a93d33e38f360930b5090c6ef872116f8a7c/recipes/sl";
           sha256 = "0h90ajikr6kclsy73vs9f50jg8z3d6kqbpanm9ryh2pw3sd4rnii";
-          name = "sl";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -66998,20 +83846,29 @@
           license = lib.licenses.free;
         };
       }) {};
-    slack = callPackage ({ alert, circe, emojify, fetchFromGitHub, fetchurl, lib, melpaBuild, oauth2, request, websocket }:
-    melpaBuild {
+    slack = callPackage ({ alert
+                         , circe
+                         , emojify
+                         , fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild
+                         , oauth2
+                         , request
+                         , websocket }:
+      melpaBuild {
         pname = "slack";
-        version = "20180410.2035";
+        version = "20180712.2222";
         src = fetchFromGitHub {
           owner = "yuya373";
           repo = "emacs-slack";
-          rev = "411b1ec8385c431d2ad1a56525a981d8d63e1700";
-          sha256 = "0ghnhcr9z7av9iwhdq1ww3fc0i11637xrri8l4w69dx3j435virg";
+          rev = "cec90237ed46443f8f67886a2188d518b0f3c7dc";
+          sha256 = "0npim0rrq0jkw8vj5d8iwfi64nz3mqnciamjs9hamzkiv6z9yxkw";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f0258cc41de809b67811a5dde3d475c429df0695/recipes/slack";
           sha256 = "0mybjx08yskk9vi06ayiknl5ddyd8h0mnr8c0a3zr61p1x4s6anp";
-          name = "slack";
+          name = "recipe";
         };
         packageRequires = [ alert circe emojify oauth2 request websocket ];
         meta = {
@@ -67019,8 +83876,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    slideview = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    slideview = callPackage ({ cl-lib ? null
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "slideview";
         version = "20150324.1540";
         src = fetchFromGitHub {
@@ -67029,10 +83890,10 @@
           rev = "b6d170bda139aedf81b47dc55cbd1a3af512fb4c";
           sha256 = "11p1pghx55a4gcn45cadw7c594134b21cdim723k2h99z14f89az";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b250f977f44a08346ee9715b416c9706375227a1/recipes/slideview";
           sha256 = "0zr08yrnrz49zds1651ysmgjqgbnhfdcqbg90sbsb086iw89rxl1";
-          name = "slideview";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -67040,8 +83901,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    slim-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    slim-mode = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "slim-mode";
         version = "20170728.648";
         src = fetchFromGitHub {
@@ -67050,10 +83914,10 @@
           rev = "3636d18ab1c8b316eea71c4732eb44743e2ded87";
           sha256 = "1sqylm6ipmlh9249mmwfb16b4pv94cvzdwvi3zakdpz713phyjw5";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6a3b59bdbc53d7c0b4c4d6434689f7aab2546678/recipes/slim-mode";
           sha256 = "1hip0r22irr9sah3b65ky71ic508bhqvj9hj95a81qvy1zi9rcac";
-          name = "slim-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -67061,20 +83925,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    slime = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, macrostep, melpaBuild }:
-    melpaBuild {
+    slime = callPackage ({ cl-lib ? null
+                         , fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , macrostep
+                         , melpaBuild }:
+      melpaBuild {
         pname = "slime";
-        version = "20180413.1720";
+        version = "20180701.1344";
         src = fetchFromGitHub {
           owner = "slime";
           repo = "slime";
-          rev = "26695c66162dcbb9dfd083c6e3b329c468e14ed9";
-          sha256 = "1fj096yhvxnj47qvc0b3pw3vf7icxv2jdfa3nvap9aksj453xndb";
+          rev = "b05315a838c2720f2585d3f890f3b5cb66b13d69";
+          sha256 = "1jlph9k2isk61kzljs593hlzipwvlvx3vi41rrvmfnfzalyrgjgd";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/14c60acbfde13d5e9256cea83d4d0d33e037d4b9/recipes/slime";
           sha256 = "04zcvjg0bbx5mdbsk9yn7rlprakl89dq6jmnq5v2g0n6q0mh6ign";
-          name = "slime";
+          name = "recipe";
         };
         packageRequires = [ cl-lib macrostep ];
         meta = {
@@ -67082,8 +83951,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    slime-company = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, slime }:
-    melpaBuild {
+    slime-company = callPackage ({ company
+                                 , emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild
+                                 , slime }:
+      melpaBuild {
         pname = "slime-company";
         version = "20180119.1043";
         src = fetchFromGitHub {
@@ -67092,10 +83967,10 @@
           rev = "4c2e2805540dea700130607fa235018a87e4a070";
           sha256 = "0ihwchp6hc1rxmahrhaly1cnhqs6k6ks32iiywwsyw7fjc34alc4";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/abe5036c6de996a723bc800e0f031314e1188660/recipes/slime-company";
           sha256 = "195s5fi2dl3h2jyy4d45q22jac35sciz81n13b4lgw94mkxx4rq2";
-          name = "slime-company";
+          name = "recipe";
         };
         packageRequires = [ company emacs slime ];
         meta = {
@@ -67103,8 +83978,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    slime-docker = callPackage ({ cl-lib ? null, docker-tramp, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, slime }:
-    melpaBuild {
+    slime-docker = callPackage ({ cl-lib ? null
+                                , docker-tramp
+                                , emacs
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild
+                                , slime }:
+      melpaBuild {
         pname = "slime-docker";
         version = "20171004.1151";
         src = fetchFromGitHub {
@@ -67113,10 +83995,10 @@
           rev = "13fa8be2fca516f3ff5fb70fa79dd8404bf86439";
           sha256 = "005zkypg2hkyzpkcv1rzfrmg8amg1bp0534y13xjqq3rz1p602bx";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/15ec3f7208287161571c8fc3b29369ceabb44e5f/recipes/slime-docker";
           sha256 = "13zkkrpww51ndsblpyz2msiwrjnaz6yrk61jbzrwp0r7a2v0djsa";
-          name = "slime-docker";
+          name = "recipe";
         };
         packageRequires = [ cl-lib docker-tramp emacs slime ];
         meta = {
@@ -67124,8 +84006,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    slime-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    slime-theme = callPackage ({ emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "slime-theme";
         version = "20170808.622";
         src = fetchFromGitHub {
@@ -67134,10 +84020,10 @@
           rev = "8e5880ac69e0b6a079103001cc3a90bdb688998f";
           sha256 = "0g90ypwyvpdzilvhj0rgfrp78a5gflply3rix2wx8rncw569qb6g";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/641d1959bd31598fcdacd39a3d1bb077dcccfa5c/recipes/slime-theme";
           sha256 = "1b709cplxip48a6qjdnzcn5qcgsy0jq1m05d7vc8p5ywgr1f9a00";
-          name = "slime-theme";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -67145,8 +84031,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    slime-volleyball = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    slime-volleyball = callPackage ({ fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "slime-volleyball";
         version = "20140717.2141";
         src = fetchFromGitHub {
@@ -67155,10 +84044,10 @@
           rev = "159b5c0f40b109e3854e94b89ec5383854c46ae3";
           sha256 = "00v4mh04affd8kkw4rn51djpyga2rb8f63mgy86napglqnkz40r3";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/853f47f469e372bdbae40f3cea60d9598e966fab/recipes/slime-volleyball";
           sha256 = "1dzvj8z3l5l9ixjl3nc3c7zzi23zc2300r7jzw2l3bvg64cfbdg7";
-          name = "slime-volleyball";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -67166,8 +84055,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    slirm = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    slirm = callPackage ({ emacs
+                         , fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "slirm";
         version = "20160201.625";
         src = fetchFromGitHub {
@@ -67176,10 +84069,10 @@
           rev = "9adfbe1fc67580e7d0d90f7e927a25d63a797464";
           sha256 = "0srj0zcvzr0sjcs37zz11xz8w0yv94m69av9ny7mx8ssf4qp0pxa";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6407db0f265c49fdddaa6e8f85f295e2b90a077b/recipes/slirm";
           sha256 = "061xjj3vjdkkvd979fhp7bc12g5zkxqxywvcz3z9dlkgdks41ld7";
-          name = "slirm";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -67187,8 +84080,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    slovak-holidays = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    slovak-holidays = callPackage ({ fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "slovak-holidays";
         version = "20150418.155";
         src = fetchFromGitHub {
@@ -67197,10 +84093,10 @@
           rev = "effb16dfcd14797bf7448f5113085479db339c02";
           sha256 = "1y1gay1h91c0690gly4qibx1my0l1zpb6s3x58lks8m21jdwfw28";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d5c6b2208ef209dfe57c2c137a88ce08a4eae475/recipes/slovak-holidays";
           sha256 = "1dcw8pa3r9b7n7dc8fgzijz7ywwxb3nlfg7n0by8dnvpjq2c30bg";
-          name = "slovak-holidays";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -67208,8 +84104,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    slstats = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    slstats = callPackage ({ cl-lib ? null
+                           , emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "slstats";
         version = "20170823.149";
         src = fetchFromGitHub {
@@ -67218,10 +84119,10 @@
           rev = "e9696066abf3f2b7b818a57c062530dfd9377033";
           sha256 = "1mjzr6lqcyx3clp3bxq77k2rpkaglnq407xdk05xkaqissirpc83";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fe7c8c241cc6920bbedb6711db63ea28ed633327/recipes/slstats";
           sha256 = "0z5y2fmb3v16g5gf87c9gll04wbjp3d1cf7gm5cxi4w3y1kw4r7q";
-          name = "slstats";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -67229,20 +84130,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    sly = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    sly = callPackage ({ emacs
+                       , fetchFromGitHub
+                       , fetchurl
+                       , lib
+                       , melpaBuild }:
+      melpaBuild {
         pname = "sly";
-        version = "20180412.355";
+        version = "20180715.603";
         src = fetchFromGitHub {
           owner = "capitaomorte";
           repo = "sly";
-          rev = "7d12c47bc573c5497487cfba60ccb30bd66514d7";
-          sha256 = "15wkra725r1sqzgpqgjs6shw5njlv116xinw4di9b41ih9qg98k1";
+          rev = "30c7fc9cbc1cfd69022d106e1b667a26ad05ea03";
+          sha256 = "0lq2s2vj5dp64010vwjyg5zy6mjw28rc399vmyysl7mkambslf8s";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/79e7213183df892c5058a766b5805a1854bfbaec/recipes/sly";
           sha256 = "1pmyqjk8fdlzwvrlx8h6fq0savksfny78fhmr8r7b07pi20y6n9l";
-          name = "sly";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -67250,29 +84155,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    sly-company = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, sly }:
-    melpaBuild {
-        pname = "sly-company";
-        version = "20180212.1653";
-        src = fetchFromGitHub {
-          owner = "capitaomorte";
-          repo = "sly-company";
-          rev = "dfe18218e4b2ee9874394b50f82f5172f41c462c";
-          sha256 = "1bj8w2wfq944cnhsk5xx41mfrjv89scrg4w98kqgda5drkpdf8a7";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/sly-company";
-          sha256 = "1n8bx0qis2bs49c589cbh59xcv06r8sx6y4lxprc9pfpycx7h6v2";
-          name = "sly-company";
-        };
-        packageRequires = [ company emacs sly ];
-        meta = {
-          homepage = "https://melpa.org/#/sly-company";
-          license = lib.licenses.free;
-        };
-      }) {};
-    sly-hello-world = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, sly }:
-    melpaBuild {
+    sly-hello-world = callPackage ({ fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild
+                                   , sly }:
+      melpaBuild {
         pname = "sly-hello-world";
         version = "20160119.636";
         src = fetchFromGitHub {
@@ -67281,10 +84169,10 @@
           rev = "1bfcca692b6ec0670ed309ffe29eb9384397c183";
           sha256 = "1fxsv83fcv5l7cndsysd8salvfwsabvd84sm7zli2ksf678774gp";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d52ef4b249a42432eed6a260a758e26b50bc31d6/recipes/sly-hello-world";
           sha256 = "03ybjgczp6ssk4hmwd486vshlk7ql27k1lyhmvk26gmrf554z90n";
-          name = "sly-hello-world";
+          name = "recipe";
         };
         packageRequires = [ sly ];
         meta = {
@@ -67292,20 +84180,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    sly-macrostep = callPackage ({ fetchFromGitHub, fetchurl, lib, macrostep, melpaBuild, sly }:
-    melpaBuild {
+    sly-macrostep = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , macrostep
+                                 , melpaBuild
+                                 , sly }:
+      melpaBuild {
         pname = "sly-macrostep";
         version = "20160119.434";
         src = fetchFromGitHub {
           owner = "capitaomorte";
           repo = "sly-macrostep";
-          rev = "eb16778d104413a3e2a8d5537437c4ad76c2954b";
+          rev = "b0830871e2bd96ed58876aed6b49f1328d78a3cb";
           sha256 = "00lw6hkxs71abjyi7nhzi8j6n55jyhzsp81ycn6f2liyp4rmqgi7";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/74a0acfc6261d1c9e62ece0397f6b4d873ef5bb7/recipes/sly-macrostep";
           sha256 = "1i004mb0bg13j3zhdsjz1795dh0ry8winzvdghr1wardc9np60h7";
-          name = "sly-macrostep";
+          name = "recipe";
         };
         packageRequires = [ macrostep sly ];
         meta = {
@@ -67313,20 +84206,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    sly-named-readtables = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, sly }:
-    melpaBuild {
+    sly-named-readtables = callPackage ({ fetchFromGitHub
+                                        , fetchurl
+                                        , lib
+                                        , melpaBuild
+                                        , sly }:
+      melpaBuild {
         pname = "sly-named-readtables";
         version = "20150817.816";
         src = fetchFromGitHub {
           owner = "capitaomorte";
           repo = "sly-named-readtables";
-          rev = "df4ed79064cf85275804e201899b677bef4ab3f5";
-          sha256 = "1xi625pn3mg77mjvr94v6a5pjyvgjavpkdbbh1lqjx1halaa2qb7";
+          rev = "f3c28a2e636bd1776b6c7dbc563ef5080bed9f5c";
+          sha256 = "1yw1fg1vc6l85v7d6bg16lknxpg7ns1gfw0bxyzyb698zmwzsv60";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7e5a29c194bb7fc1a82131b7a9bd4c465660a2bd/recipes/sly-named-readtables";
           sha256 = "11ymzbj1ji7avfjqafj9p5zx0m4y1jfjcmyanpjq1frdcz639ir9";
-          name = "sly-named-readtables";
+          name = "recipe";
         };
         packageRequires = [ sly ];
         meta = {
@@ -67334,8 +84231,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    sly-quicklisp = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, sly }:
-    melpaBuild {
+    sly-quicklisp = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild
+                                 , sly }:
+      melpaBuild {
         pname = "sly-quicklisp";
         version = "20170112.135";
         src = fetchFromGitHub {
@@ -67344,10 +84245,10 @@
           rev = "8a9e3c0c07c6861ec33b338cc46ac12e7ce6a477";
           sha256 = "17xx79s2nx8prmg0xhfs9i8sdprbysaajc8k4131lnahj65v159l";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/330d04e4e79eee221bcffb8be3e46e097306b175/recipes/sly-quicklisp";
           sha256 = "1hpcz84g9c6g0x8qal02xgjj02gxqz3bysyz0l59jxiga0m634v8";
-          name = "sly-quicklisp";
+          name = "recipe";
         };
         packageRequires = [ sly ];
         meta = {
@@ -67355,8 +84256,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    sly-repl-ansi-color = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, sly }:
-    melpaBuild {
+    sly-repl-ansi-color = callPackage ({ cl-lib ? null
+                                       , fetchFromGitHub
+                                       , fetchurl
+                                       , lib
+                                       , melpaBuild
+                                       , sly }:
+      melpaBuild {
         pname = "sly-repl-ansi-color";
         version = "20171020.816";
         src = fetchFromGitHub {
@@ -67365,10 +84271,10 @@
           rev = "b9cd52d1cf927bf7e08582d46ab0bcf1d4fb5048";
           sha256 = "0fgcn6bwgz8yyjza07kfi86siargvpq4kp4j20hs6b67ckxjxx0x";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/981e01f562c40e02cb6d56dc1347e922fbad9c18/recipes/sly-repl-ansi-color";
           sha256 = "0wz24kfjl6rp4qss0iq2ilav0mkg2spy2ziikypy7v0iqbssmssi";
-          name = "sly-repl-ansi-color";
+          name = "recipe";
         };
         packageRequires = [ cl-lib sly ];
         meta = {
@@ -67376,20 +84282,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    smart-backspace = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    smart-backspace = callPackage ({ fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "smart-backspace";
         version = "20171013.2226";
         src = fetchFromGitHub {
           owner = "itome";
           repo = "smart-backspace";
-          rev = "a10ec44ff325ec8c4c98b1a6e44e89e60a9aa4ac";
-          sha256 = "0p19qikalmvs9y1lws08mxvh2k8s219mpm3nyi9aqq62ryyfwf1n";
+          rev = "acb390628a181a993aa0d137624f2e5283efa6d9";
+          sha256 = "08r2821skwvi9gbkj3l8zzvrizbfs3wapzxppgd0ks2mfhcnsqsl";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/88cd95cd623fb00d1bc6800c1dd3c665a0cce349/recipes/smart-backspace";
           sha256 = "152xdxzrr91qiyq25ghvjlbpc627cw4s120axmz2p2d48pinwir9";
-          name = "smart-backspace";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -67397,20 +84306,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    smart-comment = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    smart-comment = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "smart-comment";
         version = "20160322.1139";
         src = fetchFromGitHub {
           owner = "paldepind";
           repo = "smart-comment";
-          rev = "17ddbd83205818763e6d68aa7a1aa9aaf414cbd4";
-          sha256 = "0r181rdnymr96kj74c73212n6157cfiq1d6hk2lfc54yl6h76zf4";
+          rev = "ad4e0de29115dc010733b9060d3dab02836b15e1";
+          sha256 = "0hg0mabh06ggqcfhcjxbw5hsbrk85bk21hafqlvpd0xizwqq0w0a";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/798c3b42e568bea63edc0c1d3ce2c2d913e3440e/recipes/smart-comment";
           sha256 = "0lbrasdrkyj7zybz0f3xick8p0bvci5bhb2kg6pqzz9pw2iaxw12";
-          name = "smart-comment";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -67418,8 +84330,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    smart-compile = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    smart-compile = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "smart-compile";
         version = "20180315.2030";
         src = fetchFromGitHub {
@@ -67428,10 +84343,10 @@
           rev = "16ebc3c570f1949b8198fcc8663d6d26df32717a";
           sha256 = "0i5g7inbr90l3n1rsf4152ax4wkbw2q41ks9j3x6a956zxn8q92w";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/93562afd7b62d7535b8010179ba6ac7e8e6280d0/recipes/smart-compile";
           sha256 = "1w3vyb6wz786ydrywkjmazyvgfl0qxamn0fgnqpn17d2c5jr9c4g";
-          name = "smart-compile";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -67439,20 +84354,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    smart-cursor-color = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    smart-cursor-color = callPackage ({ fetchFromGitHub
+                                      , fetchurl
+                                      , lib
+                                      , melpaBuild }:
+      melpaBuild {
         pname = "smart-cursor-color";
         version = "20141124.919";
         src = fetchFromGitHub {
           owner = "7696122";
           repo = "smart-cursor-color";
-          rev = "1d190f49ca77734b55ac58f1b6276e42ada967b0";
-          sha256 = "1xbd42q60pmg0hw4bn2fndjwgrfgj6ggm757fyp8m08jqh0zkarn";
+          rev = "fda3510b23a118f152ece09af88c727065ba016a";
+          sha256 = "0f6f7vw6kcifl4f9mwxrb6h90r6vmrcf0ayk37g3ymz6k5blj3q4";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/smart-cursor-color";
           sha256 = "19ah55514ashkm4f49nlbnrpwxpwlfn6x3fbi4dv0x2b8v1828ss";
-          name = "smart-cursor-color";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -67460,8 +84378,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    smart-dash = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    smart-dash = callPackage ({ fetchhg
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "smart-dash";
         version = "20110130.1916";
         src = fetchhg {
@@ -67469,10 +84390,10 @@
           rev = "f8f23121ecb1";
           sha256 = "069jwi74qh9hy152k19c7avdgb89zym989v92kgghbaaiyinng22";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/98a2cf93cc41cb2bba14f91a83b6949267623198/recipes/smart-dash";
           sha256 = "1n3lh0ximwrqawdg8q9ls6aabidrawqca5w67f8vsfmrvyfx48n4";
-          name = "smart-dash";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -67480,8 +84401,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    smart-forward = callPackage ({ expand-region, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    smart-forward = callPackage ({ expand-region
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "smart-forward";
         version = "20140430.13";
         src = fetchFromGitHub {
@@ -67490,10 +84415,10 @@
           rev = "7b6dbfdbd4b646376a567c70e1a161545431b72b";
           sha256 = "19l47xqzjhhm9j3izik0imssip5ygg3lnflb9ixsz1js571aaxha";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/smart-forward";
           sha256 = "032yc45c19fl886jmi5q04r6q47xz5rphb040wjvpd4fnb06hr8c";
-          name = "smart-forward";
+          name = "recipe";
         };
         packageRequires = [ expand-region ];
         meta = {
@@ -67501,20 +84426,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    smart-hungry-delete = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    smart-hungry-delete = callPackage ({ emacs
+                                       , fetchFromGitHub
+                                       , fetchurl
+                                       , lib
+                                       , melpaBuild }:
+      melpaBuild {
         pname = "smart-hungry-delete";
         version = "20170412.643";
         src = fetchFromGitHub {
           owner = "hrehfeld";
           repo = "emacs-smart-hungry-delete";
-          rev = "7c1d56a92481594e14d40b5fdf6c48657a0108a0";
-          sha256 = "0mxaslx5823s68a8ggbbnmfk1jiswjvip5s4sg7ihfagnci72wni";
+          rev = "bae1bdf9647dfe0f92cb138fbadf7ee0f842453d";
+          sha256 = "120sg7wfq3nly0qwbchhmwjrg8cdra0g3y08fk5zfngc3ddh3gk7";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/abbf52a856b95ab88cde1fdeeebebb81f7c61fa9/recipes/smart-hungry-delete";
           sha256 = "03hw5p055dbayw5z43c1ippf2lnjgs77l7q969ng3fffqkazjq9b";
-          name = "smart-hungry-delete";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -67522,8 +84451,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    smart-indent-rigidly = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    smart-indent-rigidly = callPackage ({ fetchFromGitHub
+                                        , fetchurl
+                                        , lib
+                                        , melpaBuild }:
+      melpaBuild {
         pname = "smart-indent-rigidly";
         version = "20141205.1615";
         src = fetchFromGitHub {
@@ -67532,10 +84464,10 @@
           rev = "323d1fe4d0b81e598249aad01bc44adb180ece0e";
           sha256 = "0q5hxg265ad9gpclv2kzikg6jvbf3zzb1mrykxn0n7mnvdfdlhsi";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3083f497180d2f7d93bb9a4b98af6ae1bcbe57b9/recipes/smart-indent-rigidly";
           sha256 = "12qggg1m28mlvkdn52dig8bwv58pvipkvn1mlc4r7w569arar44x";
-          name = "smart-indent-rigidly";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -67543,20 +84475,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    smart-jump = callPackage ({ dumb-jump, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    smart-jump = callPackage ({ dumb-jump
+                              , emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "smart-jump";
-        version = "20180121.2252";
+        version = "20180709.2205";
         src = fetchFromGitHub {
           owner = "jojojames";
           repo = "smart-jump";
-          rev = "5431fcd2052918d85507ac31c40256adb67eb77e";
-          sha256 = "12224rfgb9193dmjgshcaxac70fprfl7r0m64p4aw0f6cxfr0pqp";
+          rev = "1b216416a977dc94a6f3b5e40adde7b502d97c2f";
+          sha256 = "1rrd4x2pcy473gbha2dysawzqywlfp8yhl6xq6z8s2ggp9c825dn";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/52f29e14e61b28cd1637ca5d6bd878d91a71251f/recipes/smart-jump";
           sha256 = "14c7p6xqasd0fgn70zj1jlpwjxldzqx44bcdqdk6nmjihw0rk632";
-          name = "smart-jump";
+          name = "recipe";
         };
         packageRequires = [ dumb-jump emacs ];
         meta = {
@@ -67564,20 +84501,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    smart-mark = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    smart-mark = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "smart-mark";
         version = "20150911.1910";
         src = fetchFromGitHub {
           owner = "cheunghy";
           repo = "smart-mark";
-          rev = "04b522a23e3aae8381c6a976fc978532fcb2e7d0";
-          sha256 = "0sqvm7iwdjk057fwid4kz6wj71igiqhdarj59s17pzy6xz34afhg";
+          rev = "d179cdc3f53001a5ce99d5095f493cdf3a792567";
+          sha256 = "0kd3rh6idlaqand9i6sc44s1iahg5jdhqs9jpvivxlycj6z9p7m8";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7a0a35a06aedbfe6f66d9d8498d325540367d3ea/recipes/smart-mark";
           sha256 = "1vv65sa0pwl407mbxcp653kycgx8jz87n6wshias1dp9lv21pj6v";
-          name = "smart-mark";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -67585,20 +84525,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    smart-mode-line = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, rich-minority }:
-    melpaBuild {
+    smart-mode-line = callPackage ({ emacs
+                                   , fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild
+                                   , rich-minority }:
+      melpaBuild {
         pname = "smart-mode-line";
-        version = "20180323.648";
+        version = "20180422.1459";
         src = fetchFromGitHub {
           owner = "Malabarba";
           repo = "smart-mode-line";
-          rev = "9e261a2bb6ade7f8a4428bc6cb27789878b2844c";
-          sha256 = "1hfngb60n3nbfx1p662p76kz7v4mjcppf0ygbqlhrlbv6a9n8ll5";
+          rev = "96e7ea0caba37fec485ea8b683afb4aed46d1d24";
+          sha256 = "0rrb1mgnj1hw92hl0m9ybvilrd070n6a44lb6jj42hk8ybb0cxh2";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/smart-mode-line";
           sha256 = "0qmhzlkc6mfqyaw4jaw6195b8sw0wg9pfjcijb4p0mlywf5mh5q6";
-          name = "smart-mode-line";
+          name = "recipe";
         };
         packageRequires = [ emacs rich-minority ];
         meta = {
@@ -67606,20 +84551,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    smart-mode-line-powerline-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, powerline, smart-mode-line }:
-    melpaBuild {
+    smart-mode-line-powerline-theme = callPackage ({ emacs
+                                                   , fetchFromGitHub
+                                                   , fetchurl
+                                                   , lib
+                                                   , melpaBuild
+                                                   , powerline
+                                                   , smart-mode-line }:
+      melpaBuild {
         pname = "smart-mode-line-powerline-theme";
         version = "20160705.1738";
         src = fetchFromGitHub {
           owner = "Malabarba";
           repo = "smart-mode-line";
-          rev = "9e261a2bb6ade7f8a4428bc6cb27789878b2844c";
-          sha256 = "1hfngb60n3nbfx1p662p76kz7v4mjcppf0ygbqlhrlbv6a9n8ll5";
+          rev = "558251e200cc555df137e60326295f2bd640fd6a";
+          sha256 = "1xh1qcxw0r3j8hx8k8hsx0cl82wps5x755j4kbn01m7srzv6v167";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/60072b183151e519d141ec559b4902d20c87904c/recipes/smart-mode-line-powerline-theme";
           sha256 = "0hv3mx39m3l35xhz351zp98321ilr6qq9wzwn1f0ziiv814khcn4";
-          name = "smart-mode-line-powerline-theme";
+          name = "recipe";
         };
         packageRequires = [ emacs powerline smart-mode-line ];
         meta = {
@@ -67627,20 +84578,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    smart-newline = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    smart-newline = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "smart-newline";
         version = "20131207.1940";
         src = fetchFromGitHub {
           owner = "ainame";
           repo = "smart-newline.el";
-          rev = "0553a9e4be7188352de1a28f2eddfd28e7436f94";
-          sha256 = "0w0v3gzfg3cphz701g30sf7l92v3npsd7028pjp5g7rgv3pwkgsd";
+          rev = "c50ab035839b307c66d439083b6761cb7db5e972";
+          sha256 = "1k853hngjrhp7n1bj18p2pk30adzk7j03knhl9i3889lfmd5p4yi";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3f729926f82d6b61f07f5c8a5e19d46afdcad568/recipes/smart-newline";
           sha256 = "1kyk865vkgh05vzlggs3ii81v86fcbcxybfkv5rkyl3fyqpkza1w";
-          name = "smart-newline";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -67648,8 +84602,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    smart-region = callPackage ({ cl-lib ? null, emacs, expand-region, fetchFromGitHub, fetchurl, lib, melpaBuild, multiple-cursors }:
-    melpaBuild {
+    smart-region = callPackage ({ cl-lib ? null
+                                , emacs
+                                , expand-region
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild
+                                , multiple-cursors }:
+      melpaBuild {
         pname = "smart-region";
         version = "20150903.703";
         src = fetchFromGitHub {
@@ -67658,10 +84619,10 @@
           rev = "5a8017fd8e8dc3483865951c4942cab3f96f69f6";
           sha256 = "0h559cdyln5f4ignx1r86ryi7wizys0gj03dj7lfzaxr7wkd0jaf";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cf011493ee3ebc38290ee0349c8475b0588ac928/recipes/smart-region";
           sha256 = "1bcvxf62bfi5lmhprma9rh670kka9p9ygbkgmv6dg6ajjfsplgwc";
-          name = "smart-region";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs expand-region multiple-cursors ];
         meta = {
@@ -67669,20 +84630,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    smart-semicolon = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    smart-semicolon = callPackage ({ emacs
+                                   , fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "smart-semicolon";
         version = "20171007.1833";
         src = fetchFromGitHub {
           owner = "iquiw";
           repo = "smart-semicolon";
-          rev = "c11096679dbed3875c37413337ee490ee7951b63";
-          sha256 = "1v6z3a1f6nxc62n7595qnji39ywdsz7xy5bkl2218v3y7gkbc518";
+          rev = "94cf665aed45c5882e94afe465704fed6326e92e";
+          sha256 = "16nkxf8phxi240fd9ksazxmjs91j0xplny6890a06kx4r8s61p9f";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fe339b95636b02ceb157294055d2f5f4c4b0b8cf/recipes/smart-semicolon";
           sha256 = "1vq6l3vc615w0p640wy226z5i7dky666sgzczkngv07kag0iwqp0";
-          name = "smart-semicolon";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -67690,8 +84655,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    smart-shift = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    smart-shift = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "smart-shift";
         version = "20150202.2325";
         src = fetchFromGitHub {
@@ -67700,10 +84668,10 @@
           rev = "a26ab2b240137e62ec4bce1698ed9c5f7b6d13ae";
           sha256 = "0azhfffm1bkgjx4i3p9f6x2gmw8kc3fafzqj4vxxdibhn0nizqk8";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/79726ff0fbfa24a44d303cc9719f5962638b47e0/recipes/smart-shift";
           sha256 = "0azahlflnh6sk081k5dcqal6nmwkjnj4dq8pv8ckwf8684zp23d3";
-          name = "smart-shift";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -67711,8 +84679,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    smart-tab = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    smart-tab = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "smart-tab";
         version = "20170902.1407";
         src = fetchFromGitHub {
@@ -67721,10 +84692,10 @@
           rev = "76a8ec13384975d39aa1b25e5384a02558dba574";
           sha256 = "02mj2is05adq5v64aahivbkx2kzrxmmg2va650hsvl4izj3dr2x3";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/smart-tab";
           sha256 = "0qi8jph2c9fdsv2mqgxd7wb3q4dax3g5x2hc53kbgkjxylagjvp5";
-          name = "smart-tab";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -67732,20 +84703,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    smart-tabs-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    smart-tabs-mode = callPackage ({ fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "smart-tabs-mode";
         version = "20160629.752";
         src = fetchFromGitHub {
           owner = "jcsalomon";
           repo = "smarttabs";
-          rev = "9cc2594b82b03e7d68645a4878f9359f8b8c34c5";
-          sha256 = "0bjl3j047jh674vyfmh9izwak2yic8f7aqv832hn1inhnavsl3xx";
+          rev = "1b2f34cc33335486f2b08b864a8037092c1a2956";
+          sha256 = "07zc2iw5ijyn822z29g5xb6hhhdmg9b98pfrdwrm0kw86pypxyxk";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d712f0fb9538945713faf773772bb359fe6f509f/recipes/smart-tabs-mode";
           sha256 = "1fmbi0ypzhsizzb1vm92hfaq23swiyiqvg0pmibavzqyc9lczhhl";
-          name = "smart-tabs-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -67753,8 +84727,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    smart-window = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    smart-window = callPackage ({ cl-lib ? null
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "smart-window";
         version = "20160716.1830";
         src = fetchFromGitHub {
@@ -67763,10 +84741,10 @@
           rev = "5996461b7cbc5ab4509ac48537916eb29a8e4c16";
           sha256 = "0p1cqpdsp2vdx85i22shyzfhz22zwf1k1dxkqcmlgh3y7f4qq8ir";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/smart-window";
           sha256 = "0w24v7v0477yl5zchyk6713yqp8lyfz600myvv4dp3kgppxpgd3f";
-          name = "smart-window";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -67774,20 +84752,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    smartparens = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    smartparens = callPackage ({ cl-lib ? null
+                               , dash
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "smartparens";
-        version = "20180325.438";
+        version = "20180705.801";
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "smartparens";
-          rev = "6eea872207c331c3df70caac49577b01926be45a";
-          sha256 = "02qx8clgwwaggm2xmrsr0bxcapiipryyb5d4csm05xpbm19q7xv1";
+          rev = "6329f779792441b7d1157dfc8646a8b3e49b3a33";
+          sha256 = "0489yfrxi0k5b4qa6mdkgmwzv9cacvnxqq984nsr92bws2b9ng9r";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bd98f85461ef7134502d4f2aa8ce1bc764f3bda3/recipes/smartparens";
           sha256 = "025nfrfw0992024i219jzm4phwf29smc5hib45s6h1s67942mqh6";
-          name = "smartparens";
+          name = "recipe";
         };
         packageRequires = [ cl-lib dash ];
         meta = {
@@ -67795,8 +84778,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    smartrep = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    smartrep = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "smartrep";
         version = "20150508.1930";
         src = fetchFromGitHub {
@@ -67805,10 +84791,10 @@
           rev = "f0ff5a6d7b8603603598ae3045c98b011e58d86e";
           sha256 = "1sjwqi8w83qxihqmcm7z0vwmrz1az0y266qgj2nwfv39bri6y4i6";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/81cb649dc49767c21f79668d6bee950567b05aa0/recipes/smartrep";
           sha256 = "1ypls52d51lcqhz737rqg73c6jwl6q8b3bwb29z51swyamf37rbn";
-          name = "smartrep";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -67816,8 +84802,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    smartscan = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    smartscan = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "smartscan";
         version = "20170211.1233";
         src = fetchFromGitHub {
@@ -67826,10 +84815,10 @@
           rev = "234e077145710a174c20742de792b97ed2f965f6";
           sha256 = "1nzkgfr1w30yi88h4kwgiwq4lcd0fpm1cd50gy0csjcpbnyq6ykf";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/smartscan";
           sha256 = "1q0lqms16g7avln1pbxzb49z3w96kv1r7lbh61ijlnz3jips098w";
-          name = "smartscan";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -67837,8 +84826,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    smarty-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    smarty-mode = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "smarty-mode";
         version = "20100703.458";
         src = fetchFromGitHub {
@@ -67847,10 +84839,10 @@
           rev = "3dfdfe1571f5e9ef55a29c51e5a80046d4cb7568";
           sha256 = "1vl3nx0y2skb8sibqxvmc3wrmmd6z88hknbry348d0ik3cbr0ijx";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5f2a50f62475639af011c99c6cc38928b74b3b0a/recipes/smarty-mode";
           sha256 = "06cyr2330asy2dlx81g3h9gq0yhd4pbnmzfvmla7amh4pfnjg14v";
-          name = "smarty-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -67858,8 +84850,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    smbc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    smbc = callPackage ({ fetchFromGitHub
+                        , fetchurl
+                        , lib
+                        , melpaBuild }:
+      melpaBuild {
         pname = "smbc";
         version = "20171229.1008";
         src = fetchFromGitHub {
@@ -67868,10 +84863,10 @@
           rev = "10538e3d575ba6ef3c94d555af2744b42dfd36c7";
           sha256 = "0b2fndvp9kzlr65b0gr0z5hmapa4y96a6zvc2nrlijffkgyk05nn";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/05b4f16cd8028edc758ada842432df11c8276fd3/recipes/smbc";
           sha256 = "0aviqa8mk8dxxnddfskq9jgz3knqhf0frj7gq7nk6ckxkrxrgqn4";
-          name = "smbc";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -67879,8 +84874,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    smblog = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    smblog = callPackage ({ emacs
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "smblog";
         version = "20170419.321";
         src = fetchFromGitHub {
@@ -67889,10 +84888,10 @@
           rev = "5245e7aeac20915121946f59bba30899305d950b";
           sha256 = "0i5q29b3hk644dnc0d98d613l065p0k846ljg13vgawpiic6ld6b";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6469537a11972509fa2bfb10eb3f8816cc98efed/recipes/smblog";
           sha256 = "1byalkpc1bcb6p4j4g1cwc4q2i7irxjcphb0hqh1b2k1zixrw5rr";
-          name = "smblog";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -67900,8 +84899,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    smeargle = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    smeargle = callPackage ({ emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "smeargle";
         version = "20161212.1558";
         src = fetchFromGitHub {
@@ -67910,10 +84913,10 @@
           rev = "0665b1ff5109731898bc4a0ca6d939933b804777";
           sha256 = "0p0kxmjdr02l9injlyyrnnzqdbb7mirz1xx79c3lw1rgpalf0jnf";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c5b985b24a23499454dc61bf071073df325de571/recipes/smeargle";
           sha256 = "1dy87ah1w21csvrkq5icnx7g7g7nxqkcyggxyazqwwxvh2silibd";
-          name = "smeargle";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -67921,8 +84924,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    smex = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    smex = callPackage ({ emacs
+                        , fetchFromGitHub
+                        , fetchurl
+                        , lib
+                        , melpaBuild }:
+      melpaBuild {
         pname = "smex";
         version = "20151212.1409";
         src = fetchFromGitHub {
@@ -67931,10 +84938,10 @@
           rev = "55aaebe3d793c2c990b39a302eb26c184281c42c";
           sha256 = "0xrbkpc3w7yadpjih169cpp75gilsnx4y9akgci5vfcggv4ffm26";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/smex";
           sha256 = "1rwyi7gdzswafkwpfqd6zkxka1mrf4xz17kld95d2ram6cxl6zda";
-          name = "smex";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -67942,8 +84949,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    smiles-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    smiles-mode = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "smiles-mode";
         version = "20160717.420";
         src = fetchFromGitHub {
@@ -67952,10 +84962,10 @@
           rev = "fbb381758adcb000a0c304be1b797f985f00e2de";
           sha256 = "07lzr1p58v95a4n6zad8y0dpj7chbxlcmb6s144pvcxx8kjwd4dr";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/smiles-mode";
           sha256 = "0wf02aj9bhl2m861342f5jfkx3xws1ggcyszfp9jphlykw6r0v9k";
-          name = "smiles-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -67963,8 +84973,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    sml-modeline = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    sml-modeline = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "sml-modeline";
         version = "20170614.1411";
         src = fetchFromGitHub {
@@ -67973,10 +84986,10 @@
           rev = "d2f9f70174c4cf68c67eb3bb8088235735e34d9a";
           sha256 = "18k2k213vgawxskp9m57r8qarg3pnza6nvbpyi6l03jnmf2kcw2b";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4728fce21f03c95bcc2b562648e99c537fb09cd8/recipes/sml-modeline";
           sha256 = "00kz03ixkfnm4id8dd8aij2rhakzd4arzd790jdac1y3yyd5pp3y";
-          name = "sml-modeline";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -67984,20 +84997,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    smmry = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    smmry = callPackage ({ fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "smmry";
         version = "20161024.201";
         src = fetchFromGitHub {
           owner = "microamp";
           repo = "smmry.el";
-          rev = "986a1b0aec8ab1ef17dbfb7886f47e5558cf738a";
-          sha256 = "1gq2066js1kf035217z0n6w0bf0dsyskykf56xycci5s1i7xv2vz";
+          rev = "b7ee765337fa627a6c59eb4f2a91df5d280ac6df";
+          sha256 = "0hzs8xi7n3bsqwm3nlm3vk8p2p33ydwxpwk9wp3325g03jl921in";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ba2d4be4dd4d6c378eabd833f05a944afa21817b/recipes/smmry";
           sha256 = "05ikcvyr74jy3digd0ad443h5kf11w29hgnmb71bclm3mfslh5wn";
-          name = "smmry";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -68005,8 +85021,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    smooth-scroll = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    smooth-scroll = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "smooth-scroll";
         version = "20130321.2114";
         src = fetchFromGitHub {
@@ -68015,10 +85034,10 @@
           rev = "02320f28abb5cae28b3a18f6b9ce93129bdbfc45";
           sha256 = "1kkg7qhb2lmwr4siiazqny9w2z9nk799lzl5i159lfivlxcgixmk";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4ad6411f76281232848c870e8f4f5bb78e6cf328/recipes/smooth-scroll";
           sha256 = "1b0mjpd4dqgk7ij37145ry2jqbn1msf8rrvymn7zyckbccg83zsf";
-          name = "smooth-scroll";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -68026,8 +85045,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    smooth-scrolling = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    smooth-scrolling = callPackage ({ fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "smooth-scrolling";
         version = "20161002.1249";
         src = fetchFromGitHub {
@@ -68036,10 +85058,10 @@
           rev = "2462c13640aa4c75ab3ddad443fedc29acf68f84";
           sha256 = "1h15gjq781i6fsz32qlh51knawdr8hcqvshsz6cszp752cibdcdg";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e156f146649a51f6ee636aef95214944a8079a27/recipes/smooth-scrolling";
           sha256 = "0zy2xsmr05l2narslfgril36d7qfb55f52qm2ki6fy1r18lfiyc6";
-          name = "smooth-scrolling";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -68047,8 +85069,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    smotitah = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    smotitah = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "smotitah";
         version = "20150218.230";
         src = fetchFromGitHub {
@@ -68057,10 +85082,10 @@
           rev = "f9ab562128a5460549d016913533778e8c94bcf3";
           sha256 = "1a097f1x9l0m4dizvnb742svlqsm6hlif73rk7qjar081sk1gjxx";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/326c213450fc515573b963e794584b7b5ac995fa/recipes/smotitah";
           sha256 = "1m5qjl3r96riljp48il8k4rb6rwys1xf1pl93d4qjhprwvz57mv2";
-          name = "smotitah";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -68068,8 +85093,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    smtpmail-multi = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    smtpmail-multi = callPackage ({ fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "smtpmail-multi";
         version = "20160218.1549";
         src = fetchFromGitHub {
@@ -68078,10 +85106,10 @@
           rev = "81eabfe56f620ee044ff9dd52fa8b6148d0a9f30";
           sha256 = "0zknryfpg4791l7d7xv9hn2fx00rmbqw3737lfm75484hr10lymz";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/835315ec2781ac90785824630510b9eae80c115a/recipes/smtpmail-multi";
           sha256 = "0nc3k8ly4nx7fm3b2apga3p4svz5c9sldnlk86pz2lzra5h3b4ss";
-          name = "smtpmail-multi";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -68089,8 +85117,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    smyx-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    smyx-theme = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "smyx-theme";
         version = "20141127.28";
         src = fetchFromGitHub {
@@ -68099,10 +85130,10 @@
           rev = "6263f6b401bbabaed388c8efcfc0be2e58c51401";
           sha256 = "1z2sdnf11wh5hz1rkrbg7fs4ha3zrbj9qnvfzq9005y89d7cs95x";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/40a1aeabb75438252ebea0332fe1deaf028c956d/recipes/smyx-theme";
           sha256 = "1r85yxr864df5akqknl3hsrmzikr4085bqr6ijrbdj27nz00vl61";
-          name = "smyx-theme";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -68110,20 +85141,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    snakemake-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, magit-popup, melpaBuild }:
-    melpaBuild {
+    snakemake-mode = callPackage ({ cl-lib ? null
+                                  , emacs
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , magit-popup
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "snakemake-mode";
-        version = "20180320.2029";
+        version = "20180519.1739";
         src = fetchFromGitHub {
           owner = "kyleam";
           repo = "snakemake-mode";
-          rev = "43a4b37b1374de50e2022885077968af6d0e30a5";
-          sha256 = "1xjhg3921gpgnxwr2grcrw9j9ar9faggppv030lyc4i7cx5qj357";
+          rev = "8bc919296755ce58f52fd800ee21863c7aefb430";
+          sha256 = "1zdiy0w95f9wm27czwjzxqyb5v16q61l1q8xrahh471x9pij632s";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c3a5b51fee1c9e6ce7e21555faa355d118d34b8d/recipes/snakemake-mode";
           sha256 = "1xxd3dms5vgvpn18a70wjprka5xvri2pj9cw8qz09s640f5jf3r4";
-          name = "snakemake-mode";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs magit-popup ];
         meta = {
@@ -68131,8 +85168,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    snapshot-timemachine = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    snapshot-timemachine = callPackage ({ emacs
+                                        , fetchFromGitHub
+                                        , fetchurl
+                                        , lib
+                                        , melpaBuild }:
+      melpaBuild {
         pname = "snapshot-timemachine";
         version = "20161221.129";
         src = fetchFromGitHub {
@@ -68141,10 +85182,10 @@
           rev = "99efcebab309b11ed512a8dc62555d3834df5efb";
           sha256 = "18qibcyqxjwpvphmpghppb8ky1xcch1dd4pz91qj5f4h42684ips";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/69376b802f0687227a78838877d89163b2893c5b/recipes/snapshot-timemachine";
           sha256 = "0pvh1ilzv0ambc5cridyhjcxs58wq92bxjkisqv42yar3h3z6f8p";
-          name = "snapshot-timemachine";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -68152,8 +85193,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    snapshot-timemachine-rsnapshot = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, seq, snapshot-timemachine }:
-    melpaBuild {
+    snapshot-timemachine-rsnapshot = callPackage ({ fetchFromGitHub
+                                                  , fetchurl
+                                                  , lib
+                                                  , melpaBuild
+                                                  , seq
+                                                  , snapshot-timemachine }:
+      melpaBuild {
         pname = "snapshot-timemachine-rsnapshot";
         version = "20170324.513";
         src = fetchFromGitHub {
@@ -68162,10 +85208,10 @@
           rev = "72b0b700d80f1a0442e62bbbb6a0c8c59182f97f";
           sha256 = "1bdy7p0bjfdlv6l6yih6fvvi7xpldal4rj8l2ajpc6sgby24h8bb";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/94358fb8d1486491903c331d9e90ba5198117aa8/recipes/snapshot-timemachine-rsnapshot";
           sha256 = "0fxijd94p961ab0p4ddmhja4bfrif2d87v32g4c41amc1klyf25r";
-          name = "snapshot-timemachine-rsnapshot";
+          name = "recipe";
         };
         packageRequires = [ seq snapshot-timemachine ];
         meta = {
@@ -68173,20 +85219,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    snazzy-theme = callPackage ({ base16-theme, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    snazzy-theme = callPackage ({ base16-theme
+                                , emacs
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "snazzy-theme";
         version = "20170823.1132";
         src = fetchFromGitHub {
           owner = "weijiangan";
           repo = "emacs-snazzy";
-          rev = "479351a34cd7f754375ee45f161f83a19d0fd29c";
-          sha256 = "0lxxg6x5kb6ibwlywci9gw1bcdw2i23s07qd7k2lm86j5ixlpjgw";
+          rev = "8729d10b5c1edf1053800170dab1ffd820b6fff2";
+          sha256 = "1c07yggr6cnbca2iag1rjjsp1hiaccix222wzybxrphb72fn93wq";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/18c89a612418e0f49b7e6ae29a678d2fc1ffaf3d/recipes/snazzy-theme";
           sha256 = "0srmhwhqrp1s01p1znhjzs254l3r2i6c91v7cnlwlvrls1sbh32k";
-          name = "snazzy-theme";
+          name = "recipe";
         };
         packageRequires = [ base16-theme emacs ];
         meta = {
@@ -68194,8 +85245,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    snippet = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    snippet = callPackage ({ fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "snippet";
         version = "20130210.1515";
         src = fetchFromGitHub {
@@ -68204,10 +85258,10 @@
           rev = "11d00dd803874b93836f2010b08bd2c97b0f3c63";
           sha256 = "1nyrfbjrg74wrqlh8229rf7ym07k2a0wscjm0kbg3sam9ryc546y";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/snippet";
           sha256 = "1yld7y1hsrqs0f0iq7zfwknil5zqv65npm67nh548hbyy3rhgd68";
-          name = "snippet";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -68215,8 +85269,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    snoopy = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    snoopy = callPackage ({ cl-lib ? null
+                          , emacs
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "snoopy";
         version = "20171008.1304";
         src = fetchFromGitHub {
@@ -68225,10 +85284,10 @@
           rev = "ec4123bdebfe0bb7bf4feaac2dc02b59caffe386";
           sha256 = "01l44lshw0zvykay9886s1vqryanagkd4ciw3ramchn0baqz11vl";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4a882cd92964ac195a09469006c9a44dc202f000/recipes/snoopy";
           sha256 = "1wa8jykqyj6rxqfhwbiyli6yh8s7n0pqv7fc9sfaymarda93zbgi";
-          name = "snoopy";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -68236,8 +85295,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    socyl = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, s }:
-    melpaBuild {
+    socyl = callPackage ({ cl-lib ? null
+                         , dash
+                         , fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild
+                         , pkg-info
+                         , s }:
+      melpaBuild {
         pname = "socyl";
         version = "20170211.2242";
         src = fetchFromGitHub {
@@ -68246,10 +85312,10 @@
           rev = "1ef2da42f66f3ab31a34131e51648f352416f0ba";
           sha256 = "0jks5dkxhhgh4gbli90p71s8354iywlwj2lq6n5fyqxbdxzk412d";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/774b3006f5b6b781594257f1d9819068becbbcc1/recipes/socyl";
           sha256 = "00b7x247cyjh4gci101fq1j6708vbcz1g9ls3845w863wjf6m5sz";
-          name = "socyl";
+          name = "recipe";
         };
         packageRequires = [ cl-lib dash pkg-info s ];
         meta = {
@@ -68257,8 +85323,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    soft-charcoal-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    soft-charcoal-theme = callPackage ({ fetchFromGitHub
+                                       , fetchurl
+                                       , lib
+                                       , melpaBuild }:
+      melpaBuild {
         pname = "soft-charcoal-theme";
         version = "20140420.943";
         src = fetchFromGitHub {
@@ -68267,10 +85336,10 @@
           rev = "5607ab977fae6638e78b1495e02da8955c9ba19f";
           sha256 = "07056pnjgsgw06c67776qp7jci96iqbzlprbavzz2l1j8ywz8cwm";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/soft-charcoal-theme";
           sha256 = "1j9yd4kfh7ih5ipmwvxh9qqq6wxv6qk8a9vb5jiyk90dn8a2d7g5";
-          name = "soft-charcoal-theme";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -68278,8 +85347,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    soft-morning-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    soft-morning-theme = callPackage ({ fetchFromGitHub
+                                      , fetchurl
+                                      , lib
+                                      , melpaBuild }:
+      melpaBuild {
         pname = "soft-morning-theme";
         version = "20150918.1341";
         src = fetchFromGitHub {
@@ -68288,10 +85360,10 @@
           rev = "c0f9c70c97ef2be2a093cf839c4bfe27740a111c";
           sha256 = "06q82v1hndvznsqg0r6jrxvgxhycg9m65kay4db4yy0gmc66v2xf";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/26f26cb5cd4ed288a042d37039da83b38b9923d0/recipes/soft-morning-theme";
           sha256 = "0lzg478ax6idzh6m5sf2ds4gbv096y0c0gn15dai19f58bs63xzr";
-          name = "soft-morning-theme";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -68299,8 +85371,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    soft-stone-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    soft-stone-theme = callPackage ({ emacs
+                                    , fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "soft-stone-theme";
         version = "20140614.135";
         src = fetchFromGitHub {
@@ -68309,10 +85385,10 @@
           rev = "fb475514cfb02cf30ce358a61c48e46614344d48";
           sha256 = "030mf8b0sf9mmzwhg85zh0ccvcg768kckwvbm0yzg7vmq1x46hjl";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e87cea74119e8239662607072a44e5314eeae7ea/recipes/soft-stone-theme";
           sha256 = "05jjw9z6hqln9yj8ya2xrmjnylp7psfdj9206n30m3lwnlwx399v";
-          name = "soft-stone-theme";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -68320,20 +85396,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    solaire-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    solaire-mode = callPackage ({ cl-lib ? null
+                                , emacs
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "solaire-mode";
-        version = "20180328.343";
+        version = "20180521.235";
         src = fetchFromGitHub {
           owner = "hlissner";
           repo = "emacs-solaire-mode";
-          rev = "9307486ceee18f4b622406b8d600360419e6d742";
-          sha256 = "0j8vl26vpzmsfbpx23wj5c9b7ia6fdyr8advnk6vcbkcwgj8r9q2";
+          rev = "abf2ce4da77d0877efb4a035687390ce921eda4f";
+          sha256 = "15wszz841vd9i59gq2xxh8rk7bh7agwglh2dwhxgs70m24hsp3p4";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/52c69070eef3003eb53e1436c538779c74670ce6/recipes/solaire-mode";
           sha256 = "0pvgip12xl16rwz4wqmqjd8nhh3a299aknfsghazmxigamlmlsl5";
-          name = "solaire-mode";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -68341,20 +85422,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    solarized-theme = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    solarized-theme = callPackage ({ cl-lib ? null
+                                   , dash
+                                   , emacs
+                                   , fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "solarized-theme";
-        version = "20180316.859";
+        version = "20180621.1407";
         src = fetchFromGitHub {
           owner = "bbatsov";
           repo = "solarized-emacs";
-          rev = "1a46af3ff988e656a12b93c503fff87324b7420b";
-          sha256 = "1w8rw2fqrf5xmy2i5pr7bxlr6n21vzfhcgd65jknbp2229nggkrh";
+          rev = "f829e99dd1508a1cdaf9146511012a33b0d4f68b";
+          sha256 = "1a83qsz41v208iasqwfnblgzhgjjwg1lkc0vgxndvq1kk2sj18dg";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/solarized-theme";
           sha256 = "15d8k32sj8i11806byvf7r57rivz391ljr0zb4dx8n8vjjkyja12";
-          name = "solarized-theme";
+          name = "recipe";
         };
         packageRequires = [ cl-lib dash emacs ];
         meta = {
@@ -68362,20 +85449,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    solidity-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    solidity-mode = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "solidity-mode";
-        version = "20180409.853";
+        version = "20180429.1111";
         src = fetchFromGitHub {
           owner = "ethereum";
           repo = "emacs-solidity";
-          rev = "051128d7b7f217263c1aee5cb602338803d44ecb";
-          sha256 = "1lfa1jbl5rfmvsk2cvsa5z4glvvg3qnhphksvkhinaha23369vhg";
+          rev = "3a0afdfda0dd6a2cfa6ca7a695e59cb19129294d";
+          sha256 = "1pfmi10ilzhfxqq9i5jnz36wlhwwanf7y8gzdmzff3qmdbws46y8";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bb9df5ec0692352b6494d435d11166f4ea26c99e/recipes/solidity-mode";
           sha256 = "1qdzdivrf5yaa80p61b9r1gryw112v5l2m2jkvkc7glhkhrcvwsx";
-          name = "solidity-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -68383,8 +85473,16 @@
           license = lib.licenses.free;
         };
       }) {};
-    sonic-pi = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, highlight, lib, melpaBuild, osc }:
-    melpaBuild {
+    sonic-pi = callPackage ({ cl-lib ? null
+                            , dash
+                            , emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , highlight
+                            , lib
+                            , melpaBuild
+                            , osc }:
+      melpaBuild {
         pname = "sonic-pi";
         version = "20171205.405";
         src = fetchFromGitHub {
@@ -68393,10 +85491,10 @@
           rev = "3cf101b3b299735ed91658c7791ea4f04164e076";
           sha256 = "1x2w7qcx9xcvagb47hlc5vsf5aj5mr0mzvnazyd7ajjilbzn48yr";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/sonic-pi";
           sha256 = "0j6n1qgdrma6vvi6f7xiy66qwsl8710pca4ga9i7srhxv0r47x68";
-          name = "sonic-pi";
+          name = "recipe";
         };
         packageRequires = [ cl-lib dash emacs highlight osc ];
         meta = {
@@ -68404,20 +85502,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    soothe-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    soothe-theme = callPackage ({ emacs
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "soothe-theme";
         version = "20141027.741";
         src = fetchFromGitHub {
           owner = "emacsfodder";
           repo = "emacs-soothe-theme";
-          rev = "0786fe70c6c1b4ddcfb932fdc6862b9611cfc09b";
-          sha256 = "10gh1hvxq9gm29r6qzlnva7vjidd7n4kih4z2ihyvbvy9za20xqw";
+          rev = "0568a61eeec0b074d8911886359a6c5da13d14cb";
+          sha256 = "089ph9c6ggpfcd06166s2qgsghlfw5kvkbn8mqq6hjlyc5a9mvns";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6f26b8281f9bd05e3c8f2ef21838275711e622c9/recipes/soothe-theme";
           sha256 = "124akv3a4q4vrmprdcjmq7rq6x73mz4wqxvnlczglh9vjl39ndbk";
-          name = "soothe-theme";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -68425,8 +85527,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    sort-words = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    sort-words = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "sort-words";
         version = "20160929.635";
         src = fetchFromGitHub {
@@ -68435,10 +85540,10 @@
           rev = "7b6e108f80237363faf7ec28b2c58dec270b8601";
           sha256 = "18cwii9h2planb9bgrih4hkz2cqinbl8wq5sal4b8kwnaq07bbw7";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0a4bd566392d7cebe8a891d787439512e8d34cf9/recipes/sort-words";
           sha256 = "1hvbq09byjdbqzbyashw3y1h65wins44jnqcdic7vqzd1p1mzwka";
-          name = "sort-words";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -68446,20 +85551,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    sos = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
-    melpaBuild {
+    sos = callPackage ({ fetchFromGitHub
+                       , fetchurl
+                       , lib
+                       , melpaBuild
+                       , org }:
+      melpaBuild {
         pname = "sos";
         version = "20141214.2003";
         src = fetchFromGitHub {
           owner = "omouse";
           repo = "emacs-sos";
-          rev = "1573adca912b88b5010d99a25c83a5b2313bd39c";
-          sha256 = "19jwnny0v6ppakpaaxv9qhr6353mksh9kxiz61kp4h12n6sfrb7p";
+          rev = "2469bf1d7c47a55b0ffa8a6ceef0bb21252b3c3a";
+          sha256 = "0zhz1j389jmfcxmzvp3gj2bkg996nk1mcf0sxw04wbyivh38hnql";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/36e02223b4ff9c0be4662991d734ca4a4e756f4b/recipes/sos";
           sha256 = "1gkd0plx7152s3dj8a9lwlwh8bgs1m006s80l10agclx6aay8rvb";
-          name = "sos";
+          name = "recipe";
         };
         packageRequires = [ org ];
         meta = {
@@ -68467,20 +85576,27 @@
           license = lib.licenses.free;
         };
       }) {};
-    sotclojure = callPackage ({ cider, clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, sotlisp }:
-    melpaBuild {
+    sotclojure = callPackage ({ cider
+                              , clojure-mode
+                              , emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild
+                              , sotlisp }:
+      melpaBuild {
         pname = "sotclojure";
         version = "20170921.1708";
         src = fetchFromGitHub {
           owner = "Malabarba";
           repo = "speed-of-thought-clojure";
-          rev = "a480c887b53cb007b7b099c5ffcab89b9e59d7bc";
-          sha256 = "1gf5fsrjigzxabd9k47lb98y3wdjwpw02x9ldnjzrgxfjfbxgqm0";
+          rev = "ceac82aa691e8d98946471be6aaff9c9a4603c32";
+          sha256 = "1a6riq7ksk5m76dsgc75d8b992nyr50l48l8cpms9064m6b0r9jv";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3a2ccef8af91eada4449d9cd4bda6bd28272722e/recipes/sotclojure";
           sha256 = "12byqjzg0pffqyq958265qq8yxxmf3iyy4m7zib492qcj8ccy090";
-          name = "sotclojure";
+          name = "recipe";
         };
         packageRequires = [ cider clojure-mode emacs sotlisp ];
         meta = {
@@ -68488,20 +85604,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    sotlisp = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    sotlisp = callPackage ({ emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "sotlisp";
-        version = "20170429.1945";
+        version = "20180706.1049";
         src = fetchFromGitHub {
           owner = "Malabarba";
           repo = "speed-of-thought-lisp";
-          rev = "89dfed2b5d2e9a3b16bfc47f169412b583626059";
-          sha256 = "17g03bfaq98ncd95qwms18pdrn5jphq7g2g606pymf10qr62g3n2";
+          rev = "cc5730c0803a6e0f18e22d6027784b915d304318";
+          sha256 = "1s1l2lscjnv8f60ncynv82xrqg5npj1m77z28fxlx53calj6k0qk";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/sotlisp";
           sha256 = "0zjnn6hhwy6cjvc5rhvhxcq5pmrhcyil14a48fcgwvg4lv7fbljk";
-          name = "sotlisp";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -68509,8 +85629,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    sound-wav = callPackage ({ cl-lib ? null, deferred, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    sound-wav = callPackage ({ cl-lib ? null
+                             , deferred
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "sound-wav";
         version = "20160725.724";
         src = fetchFromGitHub {
@@ -68519,10 +85644,10 @@
           rev = "406868043761524118c27b1207be0f8bbda8798e";
           sha256 = "1vwszcxknkjq4q32vb4dab4rlyd7w0l3pl5rpl08haczmr2frl4d";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8333470e3d84d5433be489a23e065c876bed2ab2/recipes/sound-wav";
           sha256 = "1vrwzk6zqma7r0w5ivbx16shys6hsifj52fwlf5rxs6jg1gqdb4f";
-          name = "sound-wav";
+          name = "recipe";
         };
         packageRequires = [ cl-lib deferred ];
         meta = {
@@ -68530,8 +85655,17 @@
           license = lib.licenses.free;
         };
       }) {};
-    soundcloud = callPackage ({ deferred, emms, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild, request, request-deferred, string-utils }:
-    melpaBuild {
+    soundcloud = callPackage ({ deferred
+                              , emms
+                              , fetchFromGitHub
+                              , fetchurl
+                              , json ? null
+                              , lib
+                              , melpaBuild
+                              , request
+                              , request-deferred
+                              , string-utils }:
+      melpaBuild {
         pname = "soundcloud";
         version = "20150501.2026";
         src = fetchFromGitHub {
@@ -68540,10 +85674,10 @@
           rev = "f998d4276ea90258909c698f6a5a51fccb667c08";
           sha256 = "1m8wcm6y80gq5rrm4brd3f20kmk54s6ph26j4lz4cmilxk6gj56v";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/soundcloud";
           sha256 = "06cbr1h03k5ixam6lsr82lx3nh2kkp0416mlig0zfkd4b8a9mf8c";
-          name = "soundcloud";
+          name = "recipe";
         };
         packageRequires = [
           deferred
@@ -68558,8 +85692,18 @@
           license = lib.licenses.free;
         };
       }) {};
-    soundklaus = callPackage ({ cl-lib ? null, dash, emacs, emms, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, request, s }:
-    melpaBuild {
+    soundklaus = callPackage ({ cl-lib ? null
+                              , dash
+                              , emacs
+                              , emms
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild
+                              , pkg-info
+                              , request
+                              , s }:
+      melpaBuild {
         pname = "soundklaus";
         version = "20160314.531";
         src = fetchFromGitHub {
@@ -68568,10 +85712,10 @@
           rev = "09ec030843482594beae2664b8fe1e0ad1e66472";
           sha256 = "0w5ac515ymj43p5j19nhfqk0c3251c7x3i97r550g780niby1nc5";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/811d0f1d195a0c6533fd412f0e444100e0685f90/recipes/soundklaus";
           sha256 = "0b63sbgwp99ff94dxrqqp2p99j268fjkkzx0g42g726hv80d4fxb";
-          name = "soundklaus";
+          name = "recipe";
         };
         packageRequires = [ cl-lib dash emacs emms pkg-info request s ];
         meta = {
@@ -68579,8 +85723,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    sourcekit = callPackage ({ dash, dash-functional, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }:
-    melpaBuild {
+    sourcekit = callPackage ({ dash
+                             , dash-functional
+                             , emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild
+                             , request }:
+      melpaBuild {
         pname = "sourcekit";
         version = "20180101.34";
         src = fetchFromGitHub {
@@ -68589,10 +85740,10 @@
           rev = "abf9bc5a0102eb666d3aa6d6bf22f6efcc852781";
           sha256 = "1g8a4fgy2c5nqk8gysbnzn5jvfw6ynmfhc6j3hkrbswgf9188v5n";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/45969cd5cd936ea61fbef4722843b0b0092d7b72/recipes/sourcekit";
           sha256 = "1lvk3m86awlinivpg89h6zvrwrdqa5ljdp563k3i4h9384w82pks";
-          name = "sourcekit";
+          name = "recipe";
         };
         packageRequires = [ dash dash-functional emacs request ];
         meta = {
@@ -68600,8 +85751,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    sourcemap = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    sourcemap = callPackage ({ emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "sourcemap";
         version = "20161215.2140";
         src = fetchFromGitHub {
@@ -68610,10 +85765,10 @@
           rev = "64c89d296186f48d9135fb8aad501de19f64bceb";
           sha256 = "115g2mfpbfywp8xnag4gsb50klfvplqfh928a5mabb5s8v4a3582";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/557d18259543263932fccdbaf44c4e7986bd277b/recipes/sourcemap";
           sha256 = "0cjg90y6a0l59a9v7d7p12pgmr21gwd7x5msil3h6xkm15f0qcc5";
-          name = "sourcemap";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -68621,8 +85776,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    sourcerer-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    sourcerer-theme = callPackage ({ fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "sourcerer-theme";
         version = "20161014.925";
         src = fetchFromGitHub {
@@ -68631,10 +85789,10 @@
           rev = "c7f8e665d53bb48fb72f95f706710d53d24bd407";
           sha256 = "06bxsbjyrn4grp9i17p90cs4x50cmw62k6a2c6gapkw8f1xbv7xv";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8532e062b1830d8cf4e7f72518131a1f32762b37/recipes/sourcerer-theme";
           sha256 = "0xikcln8sz3cic5a77cdvq2aazy1csf1qfxgmcavpqz54ps14j1z";
-          name = "sourcerer-theme";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -68642,20 +85800,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    sourcetrail = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    sourcetrail = callPackage ({ emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "sourcetrail";
         version = "20170410.1437";
         src = fetchFromGitHub {
           owner = "CoatiSoftware";
           repo = "emacs-sourcetrail";
-          rev = "b8d5557aa565ae979622312576db20515f65f977";
-          sha256 = "1aqkkbf0xw4kqsy1jjn4xhs5vk2vcsqzs7f4p2sf1plnzsqxflw8";
+          rev = "2f4327b32360b1549d84fecfe06ef8a85cfdedb8";
+          sha256 = "0q9fipdn77mk8gpjrcmka3cxshnklksaa45v1b5qza0nlqcg3q1y";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9713bd8030657c8e867409a6aa8173219809173a/recipes/sourcetrail";
           sha256 = "0qa3iw82dbfc1b45505s39m99r0m2473312prws6hch0qhjyji7h";
-          name = "sourcetrail";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -68663,8 +85825,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    spacegray-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    spacegray-theme = callPackage ({ emacs
+                                   , fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "spacegray-theme";
         version = "20150719.1231";
         src = fetchFromGitHub {
@@ -68673,10 +85839,10 @@
           rev = "7f70ee36297e5ccf9bc90b1f81472024f5a7a749";
           sha256 = "1a8jp7m9zarvljg5d9c8ydir3qcmwx05c3frs696p9nwvapf6lsb";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fada130a1e2927d98526f4629cc1101d93e787c5/recipes/spacegray-theme";
           sha256 = "0khiddpsywpv9qvynpfdmybd80lbrhm68j3py6ranxlv7p79j9dx";
-          name = "spacegray-theme";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -68684,20 +85850,28 @@
           license = lib.licenses.free;
         };
       }) {};
-    spaceline = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, powerline, s }:
-    melpaBuild {
+    spaceline = callPackage ({ cl-lib ? null
+                             , dash
+                             , emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild
+                             , powerline
+                             , s }:
+      melpaBuild {
         pname = "spaceline";
-        version = "20180412.526";
+        version = "20180628.46";
         src = fetchFromGitHub {
           owner = "TheBB";
           repo = "spaceline";
-          rev = "ca85233b443216f8519c401c58af6807b6d31740";
-          sha256 = "1ssbvp8xc1i7bf51rb2n0pkbhqs741dq0i0akwc3qqjg2sblckk1";
+          rev = "29ced71ed0097cd5eba15d6bfdbafd9d18f5bd82";
+          sha256 = "1l929zlma30h4b3bkldzn0pp5wps4ws0pylzw141nj0l3r7b3lcg";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/46e4c876aeeb0bb0d0e81dcbb8363a5db9c3ff61/recipes/spaceline";
           sha256 = "0jpcj0i8ckdylrisx9b4l9kam6kkjzhhv1s7mwwi4b744rx942iw";
-          name = "spaceline";
+          name = "recipe";
         };
         packageRequires = [ cl-lib dash emacs powerline s ];
         meta = {
@@ -68705,8 +85879,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    spaceline-all-the-icons = callPackage ({ all-the-icons, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, memoize, spaceline }:
-    melpaBuild {
+    spaceline-all-the-icons = callPackage ({ all-the-icons
+                                           , emacs
+                                           , fetchFromGitHub
+                                           , fetchurl
+                                           , lib
+                                           , melpaBuild
+                                           , memoize
+                                           , spaceline }:
+      melpaBuild {
         pname = "spaceline-all-the-icons";
         version = "20170829.120";
         src = fetchFromGitHub {
@@ -68715,10 +85896,10 @@
           rev = "e2e195f64a541d72b6d0ba0451f1e3072234b820";
           sha256 = "0lrf62gsss19z2ca4hg5c08b3nbkqaa33fqrbfa126v2c98bj583";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d039e057c1d441592da8f54e6d524b395b030375/recipes/spaceline-all-the-icons";
           sha256 = "1h6clkr2f29k2vw0jcrmnfbjpphaxm7s3zai6pn6qag32bgm3jq6";
-          name = "spaceline-all-the-icons";
+          name = "recipe";
         };
         packageRequires = [ all-the-icons emacs memoize spaceline ];
         meta = {
@@ -68726,20 +85907,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    spacemacs-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    spacemacs-theme = callPackage ({ fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "spacemacs-theme";
-        version = "20180319.736";
+        version = "20180618.1129";
         src = fetchFromGitHub {
           owner = "nashamri";
           repo = "spacemacs-theme";
-          rev = "3c1a613a36e80d10ecd4a536d690dca672d41242";
-          sha256 = "0arg3sw1rrlkn12kag5zyx8jgn4xgfffj7ysxpyqag8as7i5mcwi";
+          rev = "af8a6093cd729c158da0532a8345612956553c8b";
+          sha256 = "0890cdqacm2zri0mj9fdyyd5zplvl2p4gl499073qk076840l21f";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6c8ac39214856c1598beca0bd609e011b562346f/recipes/spacemacs-theme";
           sha256 = "0riiim6qb6x9g5hz0k3qgdymgikynlb9l07mrbfmybkv4919p992";
-          name = "spacemacs-theme";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -68747,8 +85931,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    spaces = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    spaces = callPackage ({ fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "spaces";
         version = "20170809.1508";
         src = fetchFromGitHub {
@@ -68757,10 +85944,10 @@
           rev = "6bdb51e9a346907d60a9625f6180bddd06be6674";
           sha256 = "1wkyvfqmf24c8kb162pwi6wcm88bzf0x9mxljzkx0s8bq9aliny6";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fa5d57074f73cf11607f2f1610f92a0c77367f2a/recipes/spaces";
           sha256 = "152x7fzjnjjdk9d9h0hbixdp3haqn5vdx3bq1nfqfrkvzychyr06";
-          name = "spaces";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -68768,20 +85955,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    spark = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    spark = callPackage ({ emacs
+                         , fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "spark";
         version = "20160414.1901";
         src = fetchFromGitHub {
           owner = "alvinfrancis";
           repo = "spark";
-          rev = "0bf148c3ede3b31d56fd75f347cdd0b0eae60025";
-          sha256 = "1ykqr86j17mi95s08d9fp02d7ych1331b04dcqxzxnmpkhwngyj1";
+          rev = "eec8feae7dbc8547f878fac302f03e0ff7bc9803";
+          sha256 = "155ap3vcypcj0pxvjhi2p0a5a9a2rp63hqnsjczsbabmbz1mdsd5";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f4d1529ab86de7c033579b1a1d0084899c16f454/recipes/spark";
           sha256 = "0dv7ixv9gw6xxhw5zm4gmv2ll4lja8hmn2pdizlqxaizpm245rkn";
-          name = "spark";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -68789,8 +85980,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    sparkline = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    sparkline = callPackage ({ cl-lib ? null
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "sparkline";
         version = "20150101.519";
         src = fetchFromGitHub {
@@ -68799,10 +85994,10 @@
           rev = "a2b5d817d272d6363b67ed8f8cc75499a19fa8d2";
           sha256 = "1fqd3ycywxxmln2kzqwflc69xmqlvi9gwvmf7frn0rfv73w09cvp";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7278ca31ee3c035c8ec754af152127776f04792e/recipes/sparkline";
           sha256 = "081jzaxjb32nydvr1kmyafxqxi610n0yf8lwz9vldm84famf3g7y";
-          name = "sparkline";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -68810,8 +86005,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    sparql-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    sparql-mode = callPackage ({ cl-lib ? null
+                               , emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "sparql-mode";
         version = "20180320.1102";
         src = fetchFromGitHub {
@@ -68820,10 +86020,10 @@
           rev = "a00bb622c54086ac1ee96c265bf7fbef12c68089";
           sha256 = "0f919alnqbp5dnc4krgmnc9acqg84xs64fmzjc78gpbmfn0kyi0m";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c3d729130a41903bb01465d0f01c34fbc508b56e/recipes/sparql-mode";
           sha256 = "1xicrfmgxpb31lz30qj450w8v7dl4ipjp7b2wz54s4kn88nsfj7d";
-          name = "sparql-mode";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -68831,8 +86031,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    speech-tagger = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    speech-tagger = callPackage ({ cl-lib ? null
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "speech-tagger";
         version = "20170728.1129";
         src = fetchFromGitHub {
@@ -68841,10 +86045,10 @@
           rev = "61955b40d4e8b09e66a3e8033e82893f81657c06";
           sha256 = "07rgs1f9z2ayphv04jdjk9v1s2s47qvksf64z6qn1zss2alc0y0v";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/db80aa5d95846ee02a9d762aa68325ab5e37dcf7/recipes/speech-tagger";
           sha256 = "0sqil949ny9qjxq7kpb4zmjd7770r0qvq4sz80agw6a27mqnaajc";
-          name = "speech-tagger";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -68852,8 +86056,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    speechd-el = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    speechd-el = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "speechd-el";
         version = "20180105.1217";
         src = fetchFromGitHub {
@@ -68862,10 +86069,10 @@
           rev = "0b25d3eb7ae219d2af9a7e9df2f3334652156bf5";
           sha256 = "00b2851pgrzvcl828l48gxrmy779w8s1k4ngf8pf0sh1y9bd2715";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/96669a664122c2fb69acd4cad2d7bf75d3e8272d/recipes/speechd-el";
           sha256 = "0p8zih9s2x6l2xcfjbzriyhsicaiwxz54iq9h3c8szlzq708mayc";
-          name = "speechd-el";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -68873,8 +86080,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    speed-type = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    speed-type = callPackage ({ cl-lib ? null
+                              , emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "speed-type";
         version = "20171230.847";
         src = fetchFromGitHub {
@@ -68883,10 +86095,10 @@
           rev = "7a67fcd7bf825eee890097bd4a1b3c4f531a1135";
           sha256 = "0nlmqgf4rg5qmkhpsal7j18wr5h74971k6d0wzw7rmjmpnjqhzvc";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d6c33b5bd15875baea0fd2f24ee8ec9414a6f7aa/recipes/speed-type";
           sha256 = "0lsbi3b6v7fiwpvydgwcqx3y5i7bysfjammly22qpz3kcjmlvi06";
-          name = "speed-type";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -68894,20 +86106,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    speeddating = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    speeddating = callPackage ({ emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "speeddating";
         version = "20180319.23";
         src = fetchFromGitHub {
           owner = "xuchunyang";
           repo = "emacs-speeddating";
-          rev = "df69db0560f19636a66a74f3d88c793bbb18b21e";
-          sha256 = "0mhzjia900irv0ndiw6w2vzin1gvyaf48pghi16r562ci4lr963w";
+          rev = "eeaf90cd10e376bff5a295590a3d5f7fd1402523";
+          sha256 = "00ybvyr8sr73i7m10cffgpy9lngwp3v8fsa0nbidc6daky84vrdr";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/01e23a3e2a2495e86aba60302dbd06f3b25768b4/recipes/speeddating";
           sha256 = "0b5lcb1inkcx94grib5ssv1qkbzxqryzm115qizlgfs04k8cwz09";
-          name = "speeddating";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -68915,8 +86131,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    sphinx-doc = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    sphinx-doc = callPackage ({ cl-lib ? null
+                              , dash
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild
+                              , s }:
+      melpaBuild {
         pname = "sphinx-doc";
         version = "20160116.317";
         src = fetchFromGitHub {
@@ -68925,10 +86147,10 @@
           rev = "f39da2e6cae55d5d7c7ce887e69755b7529bcd67";
           sha256 = "1wif9wf8hwxk0q09cdnrmyas7zjg8l5b8jd6sjxd40ypn6dmz2ch";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a3b80d346ad4fb415970beddb5f02ae795fbf1b4/recipes/sphinx-doc";
           sha256 = "00h3wx2p5hzbw6sggggdrzv4jrn1wc051iqql5y2m1hsh772ic5z";
-          name = "sphinx-doc";
+          name = "recipe";
         };
         packageRequires = [ cl-lib dash s ];
         meta = {
@@ -68936,8 +86158,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    sphinx-frontend = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    sphinx-frontend = callPackage ({ fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "sphinx-frontend";
         version = "20161025.58";
         src = fetchFromGitHub {
@@ -68946,10 +86171,10 @@
           rev = "0cbb03361c245382d3e679dded30c4fc1713c252";
           sha256 = "1ksjgd995pcb4lvwip08i8ay0xpin8dcam3hcgnbjjqjg9hja1cf";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4cf72e71f159b9eaaa0834682d5dd4eb258616cf/recipes/sphinx-frontend";
           sha256 = "0hdn6zjnhzyka0lzdxqfzbj3lrj767ij406zha9zw8ibbkk7cmag";
-          name = "sphinx-frontend";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -68957,29 +86182,38 @@
           license = lib.licenses.free;
         };
       }) {};
-    sphinx-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    sphinx-mode = callPackage ({ dash
+                               , f
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "sphinx-mode";
-        version = "20180316.856";
+        version = "20180620.215";
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "sphinx-mode";
-          rev = "95a14a288b50db70ee10598f83e5b087ba693bfb";
-          sha256 = "0c8p65jwrbn9pmk6j87g99p6fqcahfrc6wngmx94zw5m2wvxca2j";
+          rev = "b5ac514e213459dcc57184086f10b5b6be3cecd8";
+          sha256 = "06r50n159g18fi03xyxzkv7zr6cvs29ly1yyrmyjl9m6dn97m9mc";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/sphinx-mode";
           sha256 = "0f5xkaqsmxc4bfz80njlc395dcw2dbvmzx6h9fw31mylshzbmrys";
-          name = "sphinx-mode";
+          name = "recipe";
         };
-        packageRequires = [];
+        packageRequires = [ dash f ];
         meta = {
           homepage = "https://melpa.org/#/sphinx-mode";
           license = lib.licenses.free;
         };
       }) {};
-    spice-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    spice-mode = callPackage ({ emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "spice-mode";
         version = "20171027.2343";
         src = fetchFromGitHub {
@@ -68988,10 +86222,10 @@
           rev = "702bf2d5c3561be44771ea77b476532d32068504";
           sha256 = "1wqcy9nmhpl3vyasvc79msgd25xbbzva9nbxkdrsbpg07p1is9ik";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/spice-mode";
           sha256 = "1my6dbdnf4scshjf299d4n7vsdq3cxhq9kmqvirs45y3qjm7pgpg";
-          name = "spice-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -68999,8 +86233,17 @@
           license = lib.licenses.free;
         };
       }) {};
-    spiral = callPackage ({ a, avy, clojure-mode, emacs, fetchFromGitHub, fetchurl, highlight, lib, melpaBuild, treepy }:
-    melpaBuild {
+    spiral = callPackage ({ a
+                          , avy
+                          , clojure-mode
+                          , emacs
+                          , fetchFromGitHub
+                          , fetchurl
+                          , highlight
+                          , lib
+                          , melpaBuild
+                          , treepy }:
+      melpaBuild {
         pname = "spiral";
         version = "20180223.340";
         src = fetchFromGitHub {
@@ -69009,10 +86252,10 @@
           rev = "907b9792467139a942ba7b07ca0276b90770baf9";
           sha256 = "1rggzzvya26abbzd8bc2kpv59kzgm75wqv1vwqnj9c8im1jvs1na";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/77609e10c836a26de43ddb304ecfa275e314da21/recipes/spiral";
           sha256 = "18rww2nfy5s22czabk71wqzrb53r0p2635872vr44b6kfwlb6qcw";
-          name = "spiral";
+          name = "recipe";
         };
         packageRequires = [ a avy clojure-mode emacs highlight treepy ];
         meta = {
@@ -69020,20 +86263,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    splitjoin = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    splitjoin = callPackage ({ cl-lib ? null
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "splitjoin";
         version = "20150505.732";
         src = fetchFromGitHub {
           owner = "syohex";
           repo = "emacs-splitjoin";
-          rev = "e2945ee269e6e90f0243d6f2a33e067bb0a2873c";
-          sha256 = "1qdy9nc2h7mwxh7zg2p1x7yg96hxkwxqimjp6zb1119jx0s8grjc";
+          rev = "39a77f1c6c7406e79095eb0385667097172a770c";
+          sha256 = "0zf03v067nh964ag1nwa8bk90h98lqwbrc25vckacp2gd919ifch";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/51e172f46045fbb71b6a13b3521b502339a4a02b/recipes/splitjoin";
           sha256 = "0l1x98fvvia8qx8g125h4d76slv0xnb3h1zxiq9xb5qh7a1h069l";
-          name = "splitjoin";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -69041,8 +86288,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    splitter = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    splitter = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "splitter";
         version = "20170809.1508";
         src = fetchFromGitHub {
@@ -69051,10 +86301,10 @@
           rev = "6bdb51e9a346907d60a9625f6180bddd06be6674";
           sha256 = "1wkyvfqmf24c8kb162pwi6wcm88bzf0x9mxljzkx0s8bq9aliny6";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/129f0d20616226c449bdaf672c43a06e8f281869/recipes/splitter";
           sha256 = "02vdhvipzwnh6mlj25lirzxkc0shfzqfs1p4gn3smkxqx6g7mdb2";
-          name = "splitter";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -69062,8 +86312,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    spotify = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    spotify = callPackage ({ cl-lib ? null
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "spotify";
         version = "20170302.2229";
         src = fetchFromGitHub {
@@ -69072,10 +86326,10 @@
           rev = "2825b5cac8406969405096660aeab6e5fef765eb";
           sha256 = "1270c4l7dxxsnzkifwa0ncgv078da9pzhlyxpdfbdbsj8w70plzm";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/spotify";
           sha256 = "07y6d3cz3nziasza3znysvcnx3kw156ab78kw5y0pdll45nw210x";
-          name = "spotify";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -69083,8 +86337,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    spotlight = callPackage ({ counsel, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }:
-    melpaBuild {
+    spotlight = callPackage ({ counsel
+                             , emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild
+                             , swiper }:
+      melpaBuild {
         pname = "spotlight";
         version = "20150929.55";
         src = fetchFromGitHub {
@@ -69093,10 +86353,10 @@
           rev = "ab902900f22e7d1ea2dd8169441d2da7155aaa68";
           sha256 = "05knlca2dvpyqp9lw8dc47fl5kh2jb04q57cygkzfjjkzvywdwq8";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/26e0eba715c869c5bd295afb8971d490e80f6e2b/recipes/spotlight";
           sha256 = "0mmr1spr21pi8sfy95dsgqcxn8qfsphdkfjm5w5q97lh7496z65p";
-          name = "spotlight";
+          name = "recipe";
         };
         packageRequires = [ counsel emacs swiper ];
         meta = {
@@ -69104,20 +86364,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    spray = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    spray = callPackage ({ fetchFromGitLab
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "spray";
         version = "20160304.1420";
         src = fetchFromGitLab {
           owner = "iankelling";
           repo = "spray";
-          rev = "00638bc916227f2f961013543d10e85a43a32e29";
-          sha256 = "1avbfr32dvff26kgvd5vgan99nb5c6al9kv5xbmy2rcls17py7r2";
+          rev = "69fe48e7bb079e3011476b9f4eb6ac9ae94d6d9b";
+          sha256 = "0anidv7w2vwsjv8rwkvhs3x51av3y8dp435456czy5yfq6i6vfbl";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e4f5053aa4e1af3f636febe9c3ce8c6ae20c090d/recipes/spray";
           sha256 = "1h8lngcqa343mlc091zs419frgsla65khfj93lv9fil3xbgrm7m9";
-          name = "spray";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -69125,8 +86388,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    springboard = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
-    melpaBuild {
+    springboard = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , helm
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "springboard";
         version = "20170105.2355";
         src = fetchFromGitHub {
@@ -69135,10 +86402,10 @@
           rev = "263a8cd4582c81bfc29d7db37d5267e2488b148c";
           sha256 = "14mbmkqnw2kkzcb8f9z1g3c8f8f9lca3zb6f3q8jk9dsyp9vh81z";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/138b8a589725ead2fc1de9ea76c55e3eb2473872/recipes/springboard";
           sha256 = "17rmsidsbb4p08vr07mfn25m17wnpadcwr4nxvp79glp5a0wyyib";
-          name = "springboard";
+          name = "recipe";
         };
         packageRequires = [ helm ];
         meta = {
@@ -69146,8 +86413,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    sprintly-mode = callPackage ({ fetchFromGitHub, fetchurl, furl, lib, melpaBuild }:
-    melpaBuild {
+    sprintly-mode = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , furl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "sprintly-mode";
         version = "20121005.2234";
         src = fetchFromGitHub {
@@ -69156,10 +86427,10 @@
           rev = "6695892bae5860b5268bf3ae62be990ee9b63c11";
           sha256 = "06rk07h92s5sljprs41y3q31q64cprx9kgs56c2j6v4c8cmsq5h6";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8730956d3f00e030e06ef54c3f2aecc10bb40f9d/recipes/sprintly-mode";
           sha256 = "15i3rrv27ccpn12wwj9raaxpj7nlnrrj3lsp8vdfwph6ydvnfza4";
-          name = "sprintly-mode";
+          name = "recipe";
         };
         packageRequires = [ furl ];
         meta = {
@@ -69167,20 +86438,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    sproto-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    sproto-mode = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "sproto-mode";
         version = "20151115.1005";
         src = fetchFromGitHub {
           owner = "m2q1n9";
           repo = "sproto-mode";
-          rev = "0583a88273204dccd884b7edaa3590cefd31e7f7";
-          sha256 = "11igl9n2zwwar1xg651g5v0r0w6xl0grm8xns9wg80351ijrci7x";
+          rev = "1753277d9f2163fb3bc58b983a9892831cf9874b";
+          sha256 = "1brxm6hs2gsnl8mj6ps0s9kj2qp9v388wwccsqmx7s3bi9zjf10c";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ac2b4207c4eaa3a048e245242489462a69b4af67/recipes/sproto-mode";
           sha256 = "19l6si3sx2i542r5lyr9axby9hblx76m77f17vnsjf32n3r0qgma";
-          name = "sproto-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -69188,8 +86462,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    sprunge = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, request }:
-    melpaBuild {
+    sprunge = callPackage ({ cl-lib ? null
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild
+                           , request }:
+      melpaBuild {
         pname = "sprunge";
         version = "20160229.1843";
         src = fetchFromGitHub {
@@ -69198,10 +86477,10 @@
           rev = "0fd386b8b29c4175022a04ad70ea5643185b6726";
           sha256 = "03wjzk1ljclfjgqzkg6m7v8saaajgavyd0xskd8fg8rdkx13ki0l";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f7b9f8cc2f2f8f8e1cf80b3e76c89b9f12cacf95/recipes/sprunge";
           sha256 = "199vfl6i881aks8fi9d9w4w7mnc7n443h79p3s4srcpmbyfg6g3w";
-          name = "sprunge";
+          name = "recipe";
         };
         packageRequires = [ cl-lib request ];
         meta = {
@@ -69209,8 +86488,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    spu = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, signal, timp }:
-    melpaBuild {
+    spu = callPackage ({ emacs
+                       , fetchFromGitHub
+                       , fetchurl
+                       , lib
+                       , melpaBuild
+                       , signal
+                       , timp }:
+      melpaBuild {
         pname = "spu";
         version = "20161213.1924";
         src = fetchFromGitHub {
@@ -69219,10 +86504,10 @@
           rev = "41eec86b595816e3852e8ad1a8e07e51a27fd065";
           sha256 = "1j77h761vf74y9sfjpidgaznail95hsg9akjs55sz1xiyy7hkgyw";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8f2ef1e83c924d5411b47a931432f129db95ff2c/recipes/spu";
           sha256 = "0g7j0rz6ga6x6akiijp4vg5iymvqx5d08d60cz6dccq120fi95v8";
-          name = "spu";
+          name = "recipe";
         };
         packageRequires = [ emacs signal timp ];
         meta = {
@@ -69230,20 +86515,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    sql-clickhouse = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    sql-clickhouse = callPackage ({ emacs
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "sql-clickhouse";
         version = "20180302.755";
         src = fetchFromGitHub {
           owner = "leethargo";
           repo = "sql-clickhouse";
-          rev = "2edccd94145c55a040a3a87193793f06cf01f64f";
-          sha256 = "0zajd35i02h869mg6n2pn2fnb80ddny6ss1kap21b75p2gw79lb7";
+          rev = "35308c9292622547a79c0cc2659db2fc9de42e93";
+          sha256 = "12j9facwvwnwc8ga3nj9yddx3xp3kp28mih6lg4s1b67zj28pccg";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a0ef23e6825924094eb69bd8526a95d8fab210c1/recipes/sql-clickhouse";
           sha256 = "083i9aaf69yk71mndl5x0pimn3bkkhp3mfppxvy0f5lzf2847q2j";
-          name = "sql-clickhouse";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -69251,20 +86540,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    sql-impala = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    sql-impala = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "sql-impala";
         version = "20160427.1658";
         src = fetchFromGitHub {
           owner = "jterk";
           repo = "sql-impala";
-          rev = "e7a2d79d60b0a6339d730fc39ca024c3d6c56de7";
-          sha256 = "0d1ksh1rslzn93b8g6p48ca27f3d0ls4kxjcadjmd700x4vzv88i";
+          rev = "68248e9851b153850542ed1f709298bb9ab59610";
+          sha256 = "12zyw8b8s3jga560wv141gc4yvlbldvfcmpibns8wrpx2w8aivfj";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/sql-impala";
           sha256 = "1mh36ycqgr07r0hknkr6vb4k0r5b2h8bqd7m5faz9p56qbisgvvh";
-          name = "sql-impala";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -69272,41 +86564,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    sql-indent = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
-        pname = "sql-indent";
-        version = "20170112.1507";
-        src = fetchFromGitHub {
-          owner = "bsvingen";
-          repo = "sql-indent";
-          rev = "761a5724d181b75f30e64040408b8836d41f9db9";
-          sha256 = "13xspvqn3y3hikacv6w6jf2x1gb33gxkva6chrz0fd8bkhwdf335";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/500ec53f14b8b0dca8ff80e8a2b1b60f4266562c/recipes/sql-indent";
-          sha256 = "13s38zdd9j127p6jxbcj4d4va8mkri5dx5zh39g465mnlzx7fp8g";
-          name = "sql-indent";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://melpa.org/#/sql-indent";
-          license = lib.licenses.free;
-        };
-      }) {};
-    sqlite = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    sqlite = callPackage ({ fetchFromGitLab
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "sqlite";
-        version = "20150416.2215";
-        src = fetchFromGitHub {
+        version = "20180708.1011";
+        src = fetchFromGitLab {
           owner = "cnngimenez";
           repo = "sqlite.el";
-          rev = "9a7fb5836a19bc0ea8b4c5a50177112524380986";
-          sha256 = "0zlrx8sk7gwwr6a23mc22d7iinwf8p9ff16r9krqp86fyzbhnq1d";
+          rev = "b8c22fdfed10d8554137ff1776b83cf2b4b9c5fd";
+          sha256 = "083fzfy9rmiam06ixxkg5djqdxg62ym0p2kpsij01fgi2vjvnhca";
         };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/e90b62bf61bcaf1596428ac1a40aa63a6403c161/recipes/sqlite";
-          sha256 = "1j23rqgq00as90nk6csi489ida6b83h1myl3icxivj2iw1iikgj1";
-          name = "sqlite";
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/949556b57cea0fbbfc98b95d894de95257dfe1e5/recipes/sqlite";
+          sha256 = "1c5dprdl8q09yd0kvpkm19z60m9rhkilj5zmj938wlj5bmdlydv8";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -69314,8 +86588,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    sqlup-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    sqlup-mode = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "sqlup-mode";
         version = "20170610.837";
         src = fetchFromGitHub {
@@ -69324,10 +86601,10 @@
           rev = "04970977b4abb4d44301651618bbf1cdb0b263dd";
           sha256 = "14s66xrabj269z7f94iynsla96bka7zac011psrbcfyy4m8mlamz";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/sqlup-mode";
           sha256 = "0ngs58iri3fwv5ny707kvb6xjq98x19pzak8c9nq4qnpw3nkr83b";
-          name = "sqlup-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -69335,8 +86612,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    sr-speedbar = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    sr-speedbar = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "sr-speedbar";
         version = "20161025.131";
         src = fetchFromGitHub {
@@ -69345,10 +86625,10 @@
           rev = "77a83fb50f763a465c021eca7343243f465b4a47";
           sha256 = "0sd12555hk7z721y00kv3crdybvcn1i08wmd148z5imayzibj153";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ae489be43b1aee93614e40f492ebdf0b98a3fbc1/recipes/sr-speedbar";
           sha256 = "1v90jbqdw39yrfcsnyqas8c5g09rcf1db65q2m2rw7rik8cgb052";
-          name = "sr-speedbar";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -69356,20 +86636,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    srcery-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    srcery-theme = callPackage ({ emacs
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "srcery-theme";
-        version = "20180414.636";
+        version = "20180623.619";
         src = fetchFromGitHub {
-          owner = "roosta";
-          repo = "emacs-srcery";
-          rev = "6eea761e039a9511cb49b2cd3967b498b06db979";
-          sha256 = "0gqh4vn8f9d1jy1z8qw6qq5lgmbqywb9nbg1c3jrffgxcn1r414b";
+          owner = "srcery-colors";
+          repo = "srcery-emacs";
+          rev = "b81c4ff3805e3857f77008982efe30f27b78e7e7";
+          sha256 = "1v7qlgdalff7m943zcgyg4da692g7sk18xj6l9zpwpnbxix8iirr";
         };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1df48441ecf6abd272ff154722b9ce0e2546c284/recipes/srcery-theme";
-          sha256 = "1r8srxhznli3sskwppk7fyapyx0qixagkwm0fllgsbm4nwkzq9pn";
-          name = "srcery-theme";
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/2654fc05f55c7fab7d550b7db1d187edc9ff0f42/recipes/srcery-theme";
+          sha256 = "1bnvf9v7g2mpx8519lh73fphhr4cqd33qlw22qyxnqiz5cz93lsp";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -69377,20 +86661,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    srefactor = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    srefactor = callPackage ({ emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "srefactor";
-        version = "20170223.540";
+        version = "20180703.1110";
         src = fetchFromGitHub {
           owner = "tuhdo";
           repo = "semantic-refactor";
-          rev = "531753fdc24570a1341c169f36b9fa0d4c09ff42";
-          sha256 = "1rn89sznfyzjn3gpk18h8qassc7d1cchk8b7lz7rhc9zrdl6qsha";
+          rev = "6f2c97d17fb70f4ca2112f5a2b99a8ec162004f5";
+          sha256 = "1lyz3zjkx2csh0xdy1zpx8s32qp1p3sig57mwi9xhgpqjyf0axmb";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e23115ab231ab108678608f2ad0a864f896cd0f2/recipes/srefactor";
           sha256 = "01cd40jm4h00c5q2ix7cskp7klbkcd3n5763y5lqfv59bjxwdqd2";
-          name = "srefactor";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -69398,20 +86686,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    ssass-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ssass-mode = callPackage ({ emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "ssass-mode";
-        version = "20180413.2303";
+        version = "20180428.1339";
         src = fetchFromGitHub {
           owner = "AdamNiederer";
           repo = "ssass-mode";
-          rev = "511fb0b7c41b5a479f9ea4b65f38b14454cb1401";
-          sha256 = "199v7n8l9784hv2iqhqwf2na9gw20l22bf9dmi22sjmfsk8l9s7l";
+          rev = "5f36a169a1ad497f1d7a465be386ffb5e1f80bcf";
+          sha256 = "1n1q26p52i6c6i8svkr0bn91hliqm540y1fcz3jci8w2ws0s5x11";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3137f98aaa871a52f477b63d9c3b7b63f7271344/recipes/ssass-mode";
           sha256 = "07aym4a7l70f1lb6yvwxkhsykrwbf0lcpwlwgcn5n44kavvdbzxm";
-          name = "ssass-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -69419,8 +86711,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    ssh = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ssh = callPackage ({ fetchFromGitHub
+                       , fetchurl
+                       , lib
+                       , melpaBuild }:
+      melpaBuild {
         pname = "ssh";
         version = "20120904.1342";
         src = fetchFromGitHub {
@@ -69429,10 +86724,10 @@
           rev = "c17cf5b43df8ac4662a0580f85898e1f078df0d1";
           sha256 = "1rdhdkwdhb727rj53xyxk6i00sjr58a48hfig14m12niy1k739vd";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ssh";
           sha256 = "1wlzagcg2fxqcbpd3z02wsil2n224kzmhcd54df80jypgq5fa6k3";
-          name = "ssh";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -69440,20 +86735,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    ssh-agency = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ssh-agency = callPackage ({ dash
+                              , emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "ssh-agency";
-        version = "20180403.1638";
+        version = "20180507.1726";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "ssh-agency";
-          rev = "bd4f655adce484bfceee4bb816429b96bc35113f";
-          sha256 = "0d3ppp4qs4n3rh0sla1x1kkrwl4fhlz1gvc9472vnlhva38ffxsn";
+          rev = "d9dbedd773ad3a831e02e162c47936d6814a850a";
+          sha256 = "0895n7bss4wdydic1gflr03f2cwdyqywl16gvb599lpn288jhwvz";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b9a9e4bd0205908bfb99762c7daaf3be276bb03a/recipes/ssh-agency";
           sha256 = "0lci3fhl2p9mwilvq1njzy13dkq5cp5ighymf3zs4gzm3w0ih3h8";
-          name = "ssh-agency";
+          name = "recipe";
         };
         packageRequires = [ dash emacs ];
         meta = {
@@ -69461,20 +86761,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    ssh-config-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ssh-config-mode = callPackage ({ fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "ssh-config-mode";
-        version = "20180224.251";
+        version = "20180609.251";
         src = fetchFromGitHub {
           owner = "jhgorrell";
           repo = "ssh-config-mode-el";
-          rev = "e4596accfc29f34388b701c1dd5ebffcb8c70154";
-          sha256 = "1jcfhxm2px19b9yy53napj4d22v8s1q76gy68c47yimkbabhmzir";
+          rev = "5429a02b8f7431c40e4a50e5d1ac2cd2d08c6511";
+          sha256 = "1fid0713f0m1pwwppwh49k5cyrr3akvksfj3g9p4lndpqgwc1rcd";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/750b16ee631b4c2014f2ebf767609bab4b8ee421/recipes/ssh-config-mode";
           sha256 = "1jlaf1bipmf51552jyp2ax6n4gwg38n2348kyxlwd7d8vwsibbpq";
-          name = "ssh-config-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -69482,20 +86785,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    ssh-deploy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ssh-deploy = callPackage ({ emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "ssh-deploy";
-        version = "20180411.2201";
+        version = "20180713.650";
         src = fetchFromGitHub {
           owner = "cjohansson";
           repo = "emacs-ssh-deploy";
-          rev = "d0be94676f44078fd29668c6e1a790cc0cc02f88";
-          sha256 = "0gc3pjzjgvznla5bl9n0yahsj8whs8jnicah5kv5zjgv99wslvb7";
+          rev = "b13ba60ea175798cfd1395ab833082789724073d";
+          sha256 = "0fgcxvs2ngv65chnkb9w5rrak187xkwxiwmpc25iqvrrnrfr43s6";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ssh-deploy";
           sha256 = "1ys3cc5fz8y4rsiq3daqgcpa14ssv1q4cw0pqbfscql6mps0mjdm";
-          name = "ssh-deploy";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -69503,20 +86810,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    ssh-tunnels = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ssh-tunnels = callPackage ({ cl-lib ? null
+                               , emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "ssh-tunnels";
-        version = "20141219.318";
+        version = "20180703.1327";
         src = fetchFromGitHub {
           owner = "death";
           repo = "ssh-tunnels";
-          rev = "b08ba7a560ba5b16aa95c3cc17ed6fea59529cc4";
-          sha256 = "10a5havjg4yjshpfzkhgjdwbrvl44narg09ddzynczmyzm4f01wh";
+          rev = "a6b6ae9a5d17afa9ea39ca8c071e889deefcf8a3";
+          sha256 = "01j0yvii46bd46miihkyggw1lkcr76j03wiw682ir5i1s6lli9k9";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b093a3a9a836bae8ce37a21188c64e9a878066e8/recipes/ssh-tunnels";
           sha256 = "0zlf22wg9adkhycsasv6bfim2h0cknsvihyi1q2l2l4pjdp9ypqj";
-          name = "ssh-tunnels";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -69524,20 +86836,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    stack-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lib, melpaBuild }:
-    melpaBuild {
+    stack-mode = callPackage ({ cl-lib ? null
+                              , fetchFromGitHub
+                              , fetchurl
+                              , flycheck
+                              , haskell-mode
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "stack-mode";
         version = "20150923.823";
         src = fetchFromGitHub {
           owner = "commercialhaskell";
           repo = "stack-ide";
-          rev = "f3481e239dde9817152ec00e32bfc3ebf5aaf2cb";
-          sha256 = "1f2dxlc3dsf9ay417h1l43fxjkrb0a4gg96zd3asx9v2alpzgcim";
+          rev = "7e93bd3e03502beafb4613b7bc690fb9f0db1314";
+          sha256 = "1zi2s97idylk5whzlv5ybac9ricqckl81vlwcm79rphk0v6xi3zj";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1328a676140e4b8d01af126c4043bcfa8d1b2a8c/recipes/stack-mode";
           sha256 = "0s0m2lj40php7bc2i3fy9ikd5rmx4v7zbxfkp9vadmlc5s7w25gf";
-          name = "stack-mode";
+          name = "recipe";
         };
         packageRequires = [ cl-lib flycheck haskell-mode ];
         meta = {
@@ -69545,8 +86863,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    stan-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    stan-mode = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "stan-mode";
         version = "20180110.1441";
         src = fetchFromGitHub {
@@ -69555,10 +86876,10 @@
           rev = "a8e88473ef996b455523dc3fbcf2d8520659652f";
           sha256 = "13qw6n26jpr208h2366pcfv10d11880wlfzr0kiadrsg219wjgsi";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/67a44a0abe675238b10decdd612b67e418caf34b/recipes/stan-mode";
           sha256 = "17ph5khwwrcpyl96xnp3rsbmnk7mpwmgskxka3cfgkm190qihfqy";
-          name = "stan-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -69566,20 +86887,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    stan-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, stan-mode, yasnippet }:
-    melpaBuild {
+    stan-snippets = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild
+                                 , stan-mode
+                                 , yasnippet }:
+      melpaBuild {
         pname = "stan-snippets";
         version = "20161023.1958";
         src = fetchFromGitHub {
           owner = "stan-dev";
           repo = "stan-mode";
-          rev = "a8e88473ef996b455523dc3fbcf2d8520659652f";
-          sha256 = "13qw6n26jpr208h2366pcfv10d11880wlfzr0kiadrsg219wjgsi";
+          rev = "45b8242611fe0437fcff48f5f4f7d8f0552531ac";
+          sha256 = "14yv57grsw3zyjcqasaanx8g2skix0i3w1f5r1fng3sgwclwbkdw";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/eda8539b7d8da3a458a38f7536ed03580f9088c3/recipes/stan-snippets";
           sha256 = "021skkvak645483s7haz1hsz98q3zd8hqi9k5zdzaqlabwdjwh85";
-          name = "stan-snippets";
+          name = "recipe";
         };
         packageRequires = [ stan-mode yasnippet ];
         meta = {
@@ -69587,8 +86913,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    standoff-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    standoff-mode = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "standoff-mode";
         version = "20171115.931";
         src = fetchFromGitHub {
@@ -69597,10 +86926,10 @@
           rev = "cf84b14066d63694d931395c6026fd0245d8a62b";
           sha256 = "0dbcaz3faw8knx91yjsrb988sn2d9k0i5byhs1bi1ww36y6hmgs6";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/98858a45f72c28eec552b119a66479ea99b60f93/recipes/standoff-mode";
           sha256 = "127bzpm1cz103f1pb860yqrh7mr0rdaivrm9p6ssd01kchl9nskp";
-          name = "standoff-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -69608,8 +86937,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    start-menu = callPackage ({ cl-lib ? null, config-parser, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    start-menu = callPackage ({ cl-lib ? null
+                              , config-parser
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "start-menu";
         version = "20160426.525";
         src = fetchFromGitHub {
@@ -69618,10 +86952,10 @@
           rev = "f7d33fed7ad2dc61156f1c1cff9e1805366fbd69";
           sha256 = "1w3l8ahal9hjisny382bcw9w1nh2swpb1jzf2djww5h0i4r2h36c";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/88d965f6789d3f5ba3856cbf10edbc46e37b12ae/recipes/start-menu";
           sha256 = "1k1lc9i9vcl2am9afq0ksrxwsy6kppl4i0v10h0w2fq5z374rdkv";
-          name = "start-menu";
+          name = "recipe";
         };
         packageRequires = [ cl-lib config-parser ];
         meta = {
@@ -69629,8 +86963,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    stash = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    stash = callPackage ({ fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "stash";
         version = "20151117.627";
         src = fetchFromGitHub {
@@ -69639,10 +86976,10 @@
           rev = "c2e494d20c752b80ebbdffbf66687b3cdfc425ad";
           sha256 = "0cl2y72iagmv87kg72a46a3kap2xigwnrbk2hjgvsbxv2ng5f9cr";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d3837ac3f1ac82e08a5ad7193766074a4d1bfa3d/recipes/stash";
           sha256 = "116k40ispv7sq3jskwc1lvmhmk3jjz4j967r732s07f5h11vk1z9";
-          name = "stash";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -69650,20 +86987,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    state = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    state = callPackage ({ emacs
+                         , fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "state";
-        version = "20170107.535";
+        version = "20180627.1256";
         src = fetchFromGitHub {
           owner = "thisirs";
           repo = "state";
-          rev = "ea6e2cf6f592cbcfc5800b68f0fc2462555cacce";
-          sha256 = "1bb2rrmvkxymqdyv3w4kr36qzszwgmadqck5h87j8pi82nh9j973";
+          rev = "99fb8e0a944d3b543d54769d332cbbfa92266b11";
+          sha256 = "173w874iyrbvcv2a8fdylcyxq2a9s5phbabqp3qp095qh6037klf";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/82e955112089569c775e11888d9811119f84a4f8/recipes/state";
           sha256 = "19y3n8wnbpgbpz4jxy2p7hjqxykg09arjp7s5v22yz7il3gn48l2";
-          name = "state";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -69671,8 +87012,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    status = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    status = callPackage ({ fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "status";
         version = "20151230.608";
         src = fetchFromGitHub {
@@ -69681,10 +87025,10 @@
           rev = "b62c74bf272566f82a68622f29fb9edafea0f241";
           sha256 = "0jpxmzfvg4k5q3h3gn6lrg891wjzlcps2kkij1jbdjk4jkgq386i";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/dca8976de7060fcfc37a1623280869e0cef7b0a2/recipes/status";
           sha256 = "0a9lqa7a5nki5711bjrmx214kah5ndqpwh3i240gdd08mcm07ps3";
-          name = "status";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -69692,8 +87036,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    steam = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    steam = callPackage ({ cl-lib ? null
+                         , fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "steam";
         version = "20171108.1613";
         src = fetchFromGitHub {
@@ -69702,10 +87050,10 @@
           rev = "d6ca2a828b0824da51978397e198bf91c51ce793";
           sha256 = "16cxws1b3iwm9aqbiip298zsjm6gwjihpvkia4p0zvzynwhflw8q";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/25a45eb6297168cd0ce4c4db5574362addad5c69/recipes/steam";
           sha256 = "10k408spgbxi266jk8x57zwav989is16nvwg41dknz91l76v63gw";
-          name = "steam";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -69713,20 +87061,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    stem = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    stem = callPackage ({ fetchFromGitHub
+                        , fetchurl
+                        , lib
+                        , melpaBuild }:
+      melpaBuild {
         pname = "stem";
         version = "20131102.409";
         src = fetchFromGitHub {
           owner = "yuutayamada";
           repo = "stem";
-          rev = "d74e6611d6ba5025e0276a2cc7c8a90f46bfa9ac";
-          sha256 = "1xc4v8a35c2vpfhza15j4f89x7vyg9bbgm7xnprij7814k8iy7p0";
+          rev = "dd704c3447bd5d3f5ac0a4840f8987d4f855d87e";
+          sha256 = "17x8zgml8sa5i828hg8bimfal84vvqzxlqdicjc7v7p8h0j57cgs";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8d9c38d0d4dac86848ad0fec0aeeced009c5eac7/recipes/stem";
           sha256 = "1625nbi2bmb7vzjz0s7y1cy7dp8lp83dayiib3nr2bfkv76fwkcq";
-          name = "stem";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -69734,8 +87085,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    stem-english = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    stem-english = callPackage ({ emacs
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "stem-english";
         version = "20180108.1958";
         src = fetchFromGitHub {
@@ -69744,10 +87099,10 @@
           rev = "c9fc4c6ed6bf82382e479dae80912f4ae17d31f4";
           sha256 = "1bkmgjfp7xir6d0yf782xkjvf595blrqhr3hack26jg5zl8qsrya";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5c8e97e70e7a86b9f5e55bdd2db492994e8abdd5/recipes/stem-english";
           sha256 = "15d13palwdwrki9p804cdls08ph7sxxzd44nl4bhfm3dxic4sw7x";
-          name = "stem-english";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -69755,20 +87110,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    stgit = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    stgit = callPackage ({ fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "stgit";
         version = "20171130.759";
         src = fetchFromGitHub {
           owner = "ctmarinas";
           repo = "stgit";
-          rev = "ffd7fb7a67b4c90b38f6caa7ce14448e11cbc86e";
-          sha256 = "01rxlg2qqqw1bvzdqdmhikag02sp9f6fira0zhwzxmrp5gsvbh3a";
+          rev = "a29fc8873fca30cb5b13d94743a9010de28e2610";
+          sha256 = "1xhxba0m78zx00m55y125bs1zxibyg7d9nw8xw9gqyshcncjffpg";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/726da64b7baea1735a916b826bdfb8f575860e21/recipes/stgit";
           sha256 = "1gbr0pvvig2vg94svy1r6zp57rhyg6n9yp7qvlkfal1z2lhzhs0g";
-          name = "stgit";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -69776,8 +87134,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    sticky = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    sticky = callPackage ({ fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "sticky";
         version = "20170925.1736";
         src = fetchFromGitHub {
@@ -69786,10 +87147,10 @@
           rev = "fec4e1af38f17f5cd80eca361d8e8ef8772db366";
           sha256 = "126zs059snzpg83q9mrb51y0pqawwrj9smr3y7rza4q4qkdp1nk0";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ad10a684b4b2f01bc65883374f36fef156ff55d2/recipes/sticky";
           sha256 = "0g98qagqchwq9j5nvdz315wak8fvdw1l972cfh0fr4yyg7gxi6xr";
-          name = "sticky";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -69797,8 +87158,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    stickyfunc-enhance = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    stickyfunc-enhance = callPackage ({ emacs
+                                      , fetchFromGitHub
+                                      , fetchurl
+                                      , lib
+                                      , melpaBuild }:
+      melpaBuild {
         pname = "stickyfunc-enhance";
         version = "20150429.1114";
         src = fetchFromGitHub {
@@ -69807,10 +87172,10 @@
           rev = "13bdba51fcd83ccbc3267959d23afc94d458dcb0";
           sha256 = "16dxjsr5nj20blww4xpd4jzgjprzzh1nwvb810ggdmp9paf4iy0g";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e24454febf90ec18a587b2c187a2bd2101e1b7b5/recipes/stickyfunc-enhance";
           sha256 = "13dh19c3bljs83l847syqlg07g33hz6sapg6j4s4xv4skix8zfks";
-          name = "stickyfunc-enhance";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -69818,20 +87183,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    stock-ticker = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, request, s }:
-    melpaBuild {
+    stock-ticker = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild
+                                , request
+                                , s }:
+      melpaBuild {
         pname = "stock-ticker";
         version = "20150204.252";
         src = fetchFromGitHub {
           owner = "hagleitn";
           repo = "stock-ticker";
-          rev = "f2e564142c9de84232839a5b01979cf95b04d6a9";
-          sha256 = "191sg32z1iagyxmbn49i1lpfihld9g9741cw2kj830s4vag4kinx";
+          rev = "74251cc810604af75f48333d51133326c053dd16";
+          sha256 = "09rpn1gbxd0ppb0258l6bcnbxj8r5jhcwkvjg335sgh52srgk3ir";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/75e654f7b3f785bdfead3c594fdc09730c5d33b9/recipes/stock-ticker";
           sha256 = "1slcjk2avybr4v9s7gglizmaxbb3yqg6s6gdbg12m3vvj3b72lfi";
-          name = "stock-ticker";
+          name = "recipe";
         };
         packageRequires = [ request s ];
         meta = {
@@ -69839,8 +87209,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    strace-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    strace-mode = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "strace-mode";
         version = "20171116.1239";
         src = fetchFromGitHub {
@@ -69849,10 +87222,10 @@
           rev = "2901baa968d5180ab985ac40ca22cc20914d01f5";
           sha256 = "1jd930nc2g562n4cqq1ppl2d8dq7bxkr3fh9f0gjms7bcm106kz9";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9b2003bee9992d9e79124d95d30b573c8a6bdbfe/recipes/strace-mode";
           sha256 = "16v350nqdxmmk1r4z25bssm436xcm4cvnaxm7f3wxwvmg9z0gx8d";
-          name = "strace-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -69860,8 +87233,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    strie = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    strie = callPackage ({ cl-lib ? null
+                         , fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "strie";
         version = "20160211.1422";
         src = fetchFromGitHub {
@@ -69870,10 +87247,10 @@
           rev = "eb7efb0cccc127c414f6a64db11454869d9c10a8";
           sha256 = "1kcbkf0wbmqy9slxfqg7wsyw5n2rsaz832ibrxszb642j0l8s7pr";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/strie";
           sha256 = "1ngvpbws7laqxk6mm023r5295msap12h8bh9zrsbr05yxfzhlx83";
-          name = "strie";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -69881,8 +87258,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    string-edit = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    string-edit = callPackage ({ dash
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "string-edit";
         version = "20160410.2356";
         src = fetchFromGitHub {
@@ -69891,10 +87272,10 @@
           rev = "c44b65b4c5e9f52be9c14d88ca2f402a18d9e1dd";
           sha256 = "1xm7bb3cp99ahr5jrwi0p0258qcvlbddy98wmbq00kk5pihqbzsg";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/20fd24f22ef734fe064c66692bf3e18eb896f1ac/recipes/string-edit";
           sha256 = "1l1hqsfyi6pp4x4g1rk4s7x9zjc03wfmhy16izia8nkjhzz88fi8";
-          name = "string-edit";
+          name = "recipe";
         };
         packageRequires = [ dash ];
         meta = {
@@ -69902,20 +87283,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    string-inflection = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    string-inflection = callPackage ({ fetchFromGitHub
+                                     , fetchurl
+                                     , lib
+                                     , melpaBuild }:
+      melpaBuild {
         pname = "string-inflection";
-        version = "20180102.643";
+        version = "20180518.1707";
         src = fetchFromGitHub {
           owner = "akicho8";
           repo = "string-inflection";
-          rev = "d506eeeac59ea71601a901c311a874949a25372f";
-          sha256 = "0mp9h42qrgdlk34m9ffdqmhyy65slna5vw71bpw1883aic4agq70";
+          rev = "a9de404b2ece932da9b1c9aa1c29dbf7cf506e76";
+          sha256 = "1km8xxb0zc3yll1yzlsrrz14ch3inblpq2nhglwp1wskqwdhwly5";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5c2e2b6dba8686236c2595475cfddac5fd700e60/recipes/string-inflection";
           sha256 = "1vrjcg1fa5adw16s4v9dq0fid0gfazxk15z9cawz0kmnpyzz3fg2";
-          name = "string-inflection";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -69923,20 +87307,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    string-utils = callPackage ({ fetchFromGitHub, fetchurl, lib, list-utils, melpaBuild }:
-    melpaBuild {
+    string-utils = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , list-utils
+                                , melpaBuild }:
+      melpaBuild {
         pname = "string-utils";
         version = "20140508.1341";
         src = fetchFromGitHub {
           owner = "rolandwalker";
           repo = "string-utils";
-          rev = "c2232d691617973ecf12a970c6008a161c21da14";
-          sha256 = "1frdspm1qgksa8cpx5gkj50xk9mgz8202pgp11lqir6l3yjcj3wq";
+          rev = "8b56e1f79d2de46d1e9b5e24d889e9f4c3cc85d4";
+          sha256 = "0c8msw48cmvd4i7cgh7gp0d26ipiqvyn84a2d4hqqci261s08b2y";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c9db386ab3910940addae6e925b2ac17e64e0f87/recipes/string-utils";
           sha256 = "1vsvxc06fd3wardldb83i5hjfibvmiqnxvcgdns7i5i8qlsrsx4v";
-          name = "string-utils";
+          name = "recipe";
         };
         packageRequires = [ list-utils ];
         meta = {
@@ -69944,8 +87332,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    stripe-buffer = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    stripe-buffer = callPackage ({ cl-lib ? null
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "stripe-buffer";
         version = "20141208.708";
         src = fetchFromGitHub {
@@ -69954,10 +87346,10 @@
           rev = "c252080f55cb78c951b19ebab9687f6d00237baf";
           sha256 = "0dxajh72wdcwdb9ydbcm19fmp0p1drmh1niq4r69jnbn8sah0zax";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/stripe-buffer";
           sha256 = "1kjib1kf9xqdirryr16wlvc95701hq8s4h8hz4dqzg3wzyb8287b";
-          name = "stripe-buffer";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -69965,19 +87357,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    stumpwm-mode = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    stumpwm-mode = callPackage ({ fetchgit
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "stumpwm-mode";
         version = "20140130.1816";
         src = fetchgit {
           url = "https://git.savannah.nongnu.org/git/stumpwm.git";
-          rev = "61a7cf27e49e0779a53c018b2342f5f1c5cc70b4";
-          sha256 = "03is0690p7aw77c30j4r2b5gi5rv5f70wvpixy5qhcchlaxhaw82";
+          rev = "a920d31bac148e7f6afa98c05f98920135de8b89";
+          sha256 = "0hg2dhgph1fz8z6c79ia2j36wnbqgi6a7fjiz3wngslhbwy28xq7";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/stumpwm-mode";
           sha256 = "11yk7xmmccgv7hin5qd1ibcsm1za01xfwsxa25q7vqwk6svnb0sf";
-          name = "stumpwm-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -69985,8 +87380,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    stupid-indent-mode = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    stupid-indent-mode = callPackage ({ fetchgit
+                                      , fetchurl
+                                      , lib
+                                      , melpaBuild }:
+      melpaBuild {
         pname = "stupid-indent-mode";
         version = "20170525.417";
         src = fetchgit {
@@ -69994,10 +87392,10 @@
           rev = "3295e7de5e2cfddc3bf0e462e852bf58972f5d70";
           sha256 = "00js2jkzvmvh1gbraijknv48y86pqyk9zv264a5n3l4sw5q6kcvk";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/68cd648bde8028a39849f7beae8deae78bfb877b/recipes/stupid-indent-mode";
           sha256 = "12y8qxxs04qzy09m734qg0857g4612qdswx2bh9jk7dp886fpd7p";
-          name = "stupid-indent-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -70005,8 +87403,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    stylefmt = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    stylefmt = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "stylefmt";
         version = "20161025.124";
         src = fetchFromGitHub {
@@ -70015,10 +87416,10 @@
           rev = "7a38f26bf8ff947215f34f0a064c7ca80575ccbc";
           sha256 = "0cx9llbmfjhaxb60mj483ihl78xb30ldvhd1hdldmc9d473xbvmz";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/stylefmt";
           sha256 = "14ap3xklmxyqz61p7z3fwgxbwjqrcbijcmvsmhfbm102x1spgbhz";
-          name = "stylefmt";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -70026,20 +87427,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    stylus-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, sws-mode }:
-    melpaBuild {
+    stylus-mode = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild
+                               , sws-mode }:
+      melpaBuild {
         pname = "stylus-mode";
         version = "20150313.812";
         src = fetchFromGitHub {
           owner = "brianc";
           repo = "jade-mode";
-          rev = "4dbde92542fc7ad61df38776980905a4721d642e";
-          sha256 = "0p6pfxbl98kkwa3lgx82h967w4p0wbd9s96gvs72d74ryan07ij1";
+          rev = "73893e8d8f1bcaf9f0252c6f020cdb3741d7125c";
+          sha256 = "0fiihkwq4s8lkqx5fp3csmnaf0blnm6kpl4hfkwsb8rywgvzh7lk";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/877b5a3e612e1b1d6d51e60c66b0b79f231abdb2/recipes/stylus-mode";
           sha256 = "152k74q6qn2xa38v2zyd5y7ya5n26nvai5v7z5fmq7jrcndp27r5";
-          name = "stylus-mode";
+          name = "recipe";
         };
         packageRequires = [ sws-mode ];
         meta = {
@@ -70047,8 +87452,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    subatomic-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    subatomic-theme = callPackage ({ fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "subatomic-theme";
         version = "20160126.738";
         src = fetchFromGitHub {
@@ -70057,10 +87465,10 @@
           rev = "6a4086af748b1ecb27f6ba2aa2614988db16d594";
           sha256 = "1j63rzxnrzzqizh7fpd99dcgsy5hd7w4d2lpwl5armmixlycl5m8";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/de7f6009bab3e9a5b14b7b96ab16557e81e7f078/recipes/subatomic-theme";
           sha256 = "0mqas67qms492n3hn74c5nrkjpsgf9b42lp02s2dh366c075dpqc";
-          name = "subatomic-theme";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -70068,8 +87476,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    subatomic256-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    subatomic256-theme = callPackage ({ fetchFromGitHub
+                                      , fetchurl
+                                      , lib
+                                      , melpaBuild }:
+      melpaBuild {
         pname = "subatomic256-theme";
         version = "20130620.1910";
         src = fetchFromGitHub {
@@ -70078,10 +87489,10 @@
           rev = "326177d6f99cd2b1d30df695e67ee3bc441cd96f";
           sha256 = "1w7mimyqc25phlww20l49wlafnxp6c7dwibvphg3vwl61g0llpq8";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06a6bdf12623847600d87a624c224b233fdf3536/recipes/subatomic256-theme";
           sha256 = "1whjlkpkkirpnvvjryhlpzwphr1syz5zfyg4pb66i0db03hxwwcy";
-          name = "subatomic256-theme";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -70089,8 +87500,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    subemacs = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    subemacs = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "subemacs";
         version = "20170401.234";
         src = fetchFromGitHub {
@@ -70099,10 +87513,10 @@
           rev = "18d53939fec8968c08dfc5aff7240ca07efb1aac";
           sha256 = "1k2lg7cxr98rq77sk0ypzlr3cyl20ld20jz8y21fdaa6ci8kdvdb";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/18714a6b5ca4dcc51fa509fee1dc9afb0595c707/recipes/subemacs";
           sha256 = "0sqh80jhh3v37l5af7w6k9lqvj39bd91pn6a9rwdlfk389hp90zm";
-          name = "subemacs";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -70110,8 +87524,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    sublime-themes = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    sublime-themes = callPackage ({ fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "sublime-themes";
         version = "20170606.1144";
         src = fetchFromGitHub {
@@ -70120,10 +87537,10 @@
           rev = "60ee40af82eb55b79d5ed4026f1911326311603f";
           sha256 = "17fcqvavgyl9cmv1hwcid2bw513vhawlsmac1w2adiz567594i6h";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/648d250c7d341b31581c839f77c1084ac29d3163/recipes/sublime-themes";
           sha256 = "1nahcfcy831c7w3c69i2na0r8jsdgprffgfdvh4c41cnk4rkgdqj";
-          name = "sublime-themes";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -70131,8 +87548,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    sublimity = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    sublimity = callPackage ({ cl-lib ? null
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "sublimity";
         version = "20170820.827";
         src = fetchFromGitHub {
@@ -70141,10 +87562,10 @@
           rev = "62b0c526c599a0178a16a75f16513fc1f93a0d53";
           sha256 = "0kncjm6133a84z9rvygn5dqnwdj036sw6cf1pi595rk3f9r2ccg5";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c1e78cd1e5366a9b6d04237e9bf6a7e73424be52/recipes/sublimity";
           sha256 = "1xwggaalad65cxcfvmy30f141bxhpzc3fgvwziwbzi8fygbdv4nw";
-          name = "sublimity";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -70152,8 +87573,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    sudden-death = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    sudden-death = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "sudden-death";
         version = "20180216.1623";
         src = fetchFromGitHub {
@@ -70162,10 +87586,10 @@
           rev = "791a63d3f4df192e71f4232a9a4c5588f4b43dfb";
           sha256 = "0z3adwd6ymapkdniny3ax2i3wzxp11g6in4bghbcr9bfdxcsf7ps";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3f20f389a2d7ddf49ca64d945b41584a7c120faf/recipes/sudden-death";
           sha256 = "1wrhb3d27j07i64hvjggyajm752w4mhrhq09lfvyhz6ykp1ly3fh";
-          name = "sudden-death";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -70173,20 +87597,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    sudo-edit = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    sudo-edit = callPackage ({ cl-lib ? null
+                             , emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "sudo-edit";
-        version = "20170803.2052";
+        version = "20180608.911";
         src = fetchFromGitHub {
           owner = "nflath";
           repo = "sudo-edit";
-          rev = "bcb12aaa0da0c56d851cfa2f1b3ea4afdd2a755b";
-          sha256 = "1k6sx8k304dw9dlidnxcln9ip9cj3b6i196z98g9n0kcd1js9f99";
+          rev = "185edd69729b2adc8dccd015266636dae2df83d3";
+          sha256 = "1rffxd2jjz40hjlsv7fh49pa24sym387d98sckkr95g3m9y1blvp";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3b08d4bbdb23b988db5ed7cb5a2a925b7c2e242e/recipes/sudo-edit";
           sha256 = "10vz7q8m0l2dyhiy9r9nj17qlwyv032glshzljzhm1n20w8y1fq4";
-          name = "sudo-edit";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -70194,8 +87623,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    sudo-ext = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    sudo-ext = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "sudo-ext";
         version = "20170126.414";
         src = fetchFromGitHub {
@@ -70204,10 +87636,10 @@
           rev = "9d4580f304121ce7b8104bd4bd3b64e4dfa3c9b3";
           sha256 = "1m9srlxavqg6yxmz6rz61saz1lj5hh029314dic8kh6g3bqdnh2w";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f8e4328cae9b4759a75da0b26ea8b68821bc71af/recipes/sudo-ext";
           sha256 = "1zlnz68kzdrc7p90qmzs7fsr9ry4rl259xpyv55jh5icry290z4x";
-          name = "sudo-ext";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -70215,8 +87647,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    sudoku = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    sudoku = callPackage ({ emacs
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "sudoku";
         version = "20161110.2306";
         src = fetchFromGitHub {
@@ -70225,10 +87661,10 @@
           rev = "77c11b5041b58fc943cf1668b44b40bae039cb5b";
           sha256 = "18nbs980y6cj6my208i80cb928rnkk5rn3zwc63prk5whjw4y77v";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f9861d5d4cf18466b17ac8e53f3874df5312d3f3/recipes/sudoku";
           sha256 = "14nbidjnsm9lwknmqgfr721b484z5156j723kr1wbfv70j8h9kys";
-          name = "sudoku";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -70236,20 +87672,28 @@
           license = lib.licenses.free;
         };
       }) {};
-    suggest = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, loop, melpaBuild, s }:
-    melpaBuild {
+    suggest = callPackage ({ dash
+                           , emacs
+                           , f
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , loop
+                           , melpaBuild
+                           , s }:
+      melpaBuild {
         pname = "suggest";
-        version = "20180214.1523";
+        version = "20180421.1243";
         src = fetchFromGitHub {
           owner = "Wilfred";
           repo = "suggest.el";
-          rev = "66051b2fd3d21a8e103928782a8c926ea434beba";
-          sha256 = "1xj3jzsh44ymah8nvjvm7i8g81vkq6wk7mcq2rm2qvaxin4l1bcp";
+          rev = "a56b1ec98063ed88295311b5c1dde4a701a4596e";
+          sha256 = "1vbjrjlki30wrgnw4bhxchx961d5rpqkx14cmpd63pd3nf11dphi";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b9fd27e812549587dc2ec26bb58974177ff263ff/recipes/suggest";
           sha256 = "12vvakqqzmmqq5yynpd4wf4lnb0yvcnz065kni996sy7rv7rh83q";
-          name = "suggest";
+          name = "recipe";
         };
         packageRequires = [ dash emacs f loop s ];
         meta = {
@@ -70257,8 +87701,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    suggestion-box = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, popup }:
-    melpaBuild {
+    suggestion-box = callPackage ({ emacs
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild
+                                  , popup }:
+      melpaBuild {
         pname = "suggestion-box";
         version = "20170830.107";
         src = fetchFromGitHub {
@@ -70267,10 +87716,10 @@
           rev = "50af0776c8caf3c79c4d37fd51cbf304ea34b68e";
           sha256 = "01lx20kzay5504xcq6m6yhvayyd7wpzaa1r6i67xqjnr25lqyajw";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5b59be8dc0a1850d3e245957fd170e1d01f4e284/recipes/suggestion-box";
           sha256 = "17yai0fh7rfjbp3wz5x5r4src8lxn6qrhf7brp2gjr6cgdv40iac";
-          name = "suggestion-box";
+          name = "recipe";
         };
         packageRequires = [ emacs popup ];
         meta = {
@@ -70278,20 +87727,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    sunburn-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    sunburn-theme = callPackage ({ emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "sunburn-theme";
-        version = "20180414.2312";
+        version = "20180602.1229";
         src = fetchFromGitHub {
           owner = "mvarela";
           repo = "Sunburn-Theme";
-          rev = "995b389b7aa18b511718e9dcc68d7e1d9a2891a9";
-          sha256 = "0skmxv4qmdncp79jd0kh5rsx7ff98r8kmzii9l9d0da3xmkvgx1d";
+          rev = "ddb01b6f1f4f823398f7f8e08900c2b4a7811d3b";
+          sha256 = "18qfcrr4xlwwhhaq7dwh31bbl84a53akgrw2c6lynnyyi4vk2wpq";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bfd68b90234222dbf5907a29d506b6c4e61a372b/recipes/sunburn-theme";
           sha256 = "09shmaaii0lfd52v49cazn91sj4jz2siqbanw682vi7zsl79jx9f";
-          name = "sunburn-theme";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -70299,8 +87752,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    sunny-day-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    sunny-day-theme = callPackage ({ fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "sunny-day-theme";
         version = "20140413.1425";
         src = fetchFromGitHub {
@@ -70309,10 +87765,10 @@
           rev = "420e0a6eb33fcc9b75c2c9e88ab60a975d782a00";
           sha256 = "0mhyhkjjwszwl5wzkys9pgvgx9sps9r46k1s1hpzzf4s3vi015mc";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/11642803ccc5c8dde839508c91dea2728b2b78de/recipes/sunny-day-theme";
           sha256 = "1wsfnmmbzzyggzip66vr38yyzy27blxp91wx97bafj7jpg5cyhzw";
-          name = "sunny-day-theme";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -70320,8 +87776,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    sunshine = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    sunshine = callPackage ({ cl-lib ? null
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "sunshine";
         version = "20180325.548";
         src = fetchFromGitHub {
@@ -70330,10 +87790,10 @@
           rev = "ecaccac91010f8d464646a0360b1676be71e6600";
           sha256 = "0n9ppy22ijc2cgs5xix8nks7abn0shvh0v0f2ir1j7v1ckjsklc5";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4a0ff9a4ef4bbe8de722a4f77f4a56a851497ff1/recipes/sunshine";
           sha256 = "1lxiqw7k8cpq0v6p5whgxgzqrbx3sd9174r0d4qlkrpn6rcp44vv";
-          name = "sunshine";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -70341,8 +87801,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    suomalainen-kalenteri = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    suomalainen-kalenteri = callPackage ({ fetchFromGitHub
+                                         , fetchurl
+                                         , lib
+                                         , melpaBuild }:
+      melpaBuild {
         pname = "suomalainen-kalenteri";
         version = "20170801.126";
         src = fetchFromGitHub {
@@ -70351,10 +87814,10 @@
           rev = "c702e33cb6e13cb28bd761844e95be112a3c04f3";
           sha256 = "13avc3ba6vhysmhrcxfpkamggfpal479gn7k9n7509dpwp06dv8h";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/181adf1b16253481674663fd28b195172231b7da/recipes/suomalainen-kalenteri";
           sha256 = "1wzijbgcr3jc47ccr7nrdkqha16s6gw0xiccnmdczi48cvnvvlkh";
-          name = "suomalainen-kalenteri";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -70362,8 +87825,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    super-save = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    super-save = callPackage ({ emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "super-save";
         version = "20171008.3";
         src = fetchFromGitHub {
@@ -70372,10 +87839,10 @@
           rev = "1c8fbd5e18277e4af0ada2678a854b1c9072db38";
           sha256 = "0mh7xp71l9xybbv17b1rsbpa60bwjw79ql9krj1kzy2c2pv9hmff";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9730b65787b26d3909952cf246a01bd349e5fbab/recipes/super-save";
           sha256 = "0ikfw7n2rvm3xcgnj1si92ly8w75x26071ki551ims7a8sawh52p";
-          name = "super-save";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -70383,8 +87850,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    supergenpass = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    supergenpass = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "supergenpass";
         version = "20130328.2248";
         src = fetchFromGitHub {
@@ -70393,10 +87863,10 @@
           rev = "549072ef7b5b82913cadd4758e8a0a9926f0a04a";
           sha256 = "0m02snzka243adhwwgriml133n4312lhdia3wdqjcq8y2mlp3331";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/supergenpass";
           sha256 = "0ldy6j6l6rf72w0hl195rdnrabml2a5k91200s186k0r5aja4b95";
-          name = "supergenpass";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -70404,20 +87874,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    suscolors-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    suscolors-theme = callPackage ({ fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "suscolors-theme";
         version = "20161109.1215";
         src = fetchFromGitHub {
           owner = "TheSuspiciousWombat";
           repo = "SusColors-emacs";
-          rev = "b946e7924aa02fa7441c970026898f17fe97601f";
-          sha256 = "0553fgiyjy2n3wa2agwzvadf6il85waf2vjpsy75ljj6lw8glhka";
+          rev = "8f5cdf8de5e58db838ef0e803b60b7d74fc2a889";
+          sha256 = "1wc4l7zvb8zmh48cgrl7bkbyfj0sflzq28sc8jssghkcl2735cbg";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6f26b8281f9bd05e3c8f2ef21838275711e622c9/recipes/suscolors-theme";
           sha256 = "0j8yfl3yglp9kfdpbmfj3jw7npc6nlqw48cchiczh4biry204lbw";
-          name = "suscolors-theme";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -70425,8 +87898,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    svg-mode-line-themes = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, xmlgen }:
-    melpaBuild {
+    svg-mode-line-themes = callPackage ({ fetchFromGitHub
+                                        , fetchurl
+                                        , lib
+                                        , melpaBuild
+                                        , xmlgen }:
+      melpaBuild {
         pname = "svg-mode-line-themes";
         version = "20150425.1306";
         src = fetchFromGitHub {
@@ -70435,10 +87912,10 @@
           rev = "80a0e01839cafbd66899202e7764c33231974259";
           sha256 = "14h40s0arc2i898r9yysn256z6l8jkrnmqvrdg7p7658c0klz5ic";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2ca54d78b5e87c3bb582b178e4892af2bf447d1e/recipes/svg-mode-line-themes";
           sha256 = "12lnszcb9bl32n9wir7vf8xiyyv7njw4xg21aj9x4dasmidyx506";
-          name = "svg-mode-line-themes";
+          name = "recipe";
         };
         packageRequires = [ xmlgen ];
         meta = {
@@ -70446,8 +87923,39 @@
           license = lib.licenses.free;
         };
       }) {};
-    swagger-to-org = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }:
-    melpaBuild {
+    svnwrapper = callPackage ({ e2ansi
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
+        pname = "svnwrapper";
+        version = "20180414.1143";
+        src = fetchFromGitHub {
+          owner = "Lindydancer";
+          repo = "svnwrapper";
+          rev = "de5069f5784e5d9e87a0af0159ba5f28a3716583";
+          sha256 = "08sg55cmjbk06622mzhv74f5b5dvbay7gb729zsckczxwrp1cayp";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/cb43431d7a7276cdf1ea741b2b218bc46c2722f9/recipes/svnwrapper";
+          sha256 = "06nb7dql7fbaa9khhpxdl8jj6zmypi24bak52sfsa0js77v51pf2";
+          name = "recipe";
+        };
+        packageRequires = [ e2ansi ];
+        meta = {
+          homepage = "https://melpa.org/#/svnwrapper";
+          license = lib.licenses.free;
+        };
+      }) {};
+    swagger-to-org = callPackage ({ cl-lib ? null
+                                  , emacs
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , json ? null
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "swagger-to-org";
         version = "20160610.1756";
         src = fetchFromGitHub {
@@ -70456,10 +87964,10 @@
           rev = "181357c71ea24bede263f5706d8781ad65e16877";
           sha256 = "0x1mxxvlhhs34j869cy68gy5pgmvpfliyl9vlrlwm3z8apbip9gp";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4d5a7f017593e73ea48c0e535ecf3809536bcde5/recipes/swagger-to-org";
           sha256 = "1m40f5njxcxmc2snaz2q43b4scwgp51y761kq6klixjvafi0pv86";
-          name = "swagger-to-org";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs json ];
         meta = {
@@ -70467,8 +87975,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    swap-buffers = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    swap-buffers = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "swap-buffers";
         version = "20150506.1439";
         src = fetchFromGitHub {
@@ -70477,10 +87988,10 @@
           rev = "46ab31359b70d935add6c6e9533443116dc51103";
           sha256 = "1kn70570r6x0h1xfs1vr8as27pjfanyhml140yms60gdjb4ssf9r";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2a0172aaebdf4e0b6f6dd3093482e3cf3eb796d4/recipes/swap-buffers";
           sha256 = "0ih5dhnqy3c9nlfz9m2zwy4q4jaam09ykbdqhsxx2hnwjk7p35bw";
-          name = "swap-buffers";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -70488,8 +87999,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    swap-regions = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    swap-regions = callPackage ({ emacs
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "swap-regions";
         version = "20180116.253";
         src = fetchFromGitHub {
@@ -70498,10 +88013,10 @@
           rev = "6e7a1bc68f11afe00809c8e27c13bca08393a91c";
           sha256 = "02z552qsc96big3davdj3yaz6f4fg72ljpn7nvzccp2wwchzfa1c";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6805c7710618ed1178ffd3488295d4d6b33e8ebe/recipes/swap-regions";
           sha256 = "0gl4vr7wjh5gjskrwbqypaqyfigpgh379bm4l2gvbsbhahsmbj67";
-          name = "swap-regions";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -70509,20 +88024,27 @@
           license = lib.licenses.free;
         };
       }) {};
-    sweetgreen = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, request }:
-    melpaBuild {
+    sweetgreen = callPackage ({ cl-lib ? null
+                              , dash
+                              , fetchFromGitHub
+                              , fetchurl
+                              , helm
+                              , lib
+                              , melpaBuild
+                              , request }:
+      melpaBuild {
         pname = "sweetgreen";
-        version = "20180401.1715";
+        version = "20180604.2035";
         src = fetchFromGitHub {
           owner = "CestDiego";
           repo = "sweetgreen.el";
-          rev = "ffd7a7497db05e64031eaaffe170741b40ed753a";
-          sha256 = "0whciwh6avhfb2qhpxfl63x3z097hcm7hwhypx8symydy3r4cbqz";
+          rev = "e933fe466b5ef0e976967e203f88bd7a012469d1";
+          sha256 = "1pd13v3xma78xa0smxql4i2iax72kxqh7iwp3k16jwzrklmsdiyr";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/63812707948e6dcc00e00ebc3c423469593e80fd/recipes/sweetgreen";
           sha256 = "1v75wk0gq5fkz8i1r8pl4gqnxbv1d80isyn48w2hxj2fmdn2xhpy";
-          name = "sweetgreen";
+          name = "recipe";
         };
         packageRequires = [ cl-lib dash helm request ];
         meta = {
@@ -70530,20 +88052,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    swift-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }:
-    melpaBuild {
+    swift-mode = callPackage ({ emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild
+                              , seq }:
+      melpaBuild {
         pname = "swift-mode";
-        version = "20180222.232";
+        version = "20180610.2154";
         src = fetchFromGitHub {
           owner = "chrisbarrett";
           repo = "swift-mode";
-          rev = "4e2227906c90631bfe5109df3e7f57bc1e70ac29";
-          sha256 = "02xpb453jdaqwx8rsc3zg2fnxzfv8fs993kw1bk45s4dja1f95p4";
+          rev = "7ea1d4e3b0430644b2e2b2e1025f442a10bfa523";
+          sha256 = "179wiwdxpkw7kbx2yss193l68cbmy93xdabw5sm35mv8px809j17";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/19cb133191cd6f9623e99e958d360113595e756a/recipes/swift-mode";
           sha256 = "1imr53f8agfza9zxs1h1mwyhg7yaywqqffd1lsvm1m84nvxvri2d";
-          name = "swift-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs seq ];
         meta = {
@@ -70551,20 +88078,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    swift3-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    swift3-mode = callPackage ({ emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "swift3-mode";
         version = "20160918.550";
         src = fetchFromGitHub {
           owner = "taku0";
           repo = "swift3-mode";
-          rev = "4e51265c6905e17d8910e35b0b37cf51e20ecdfe";
-          sha256 = "0wqwjzr3z9gzsjiyyr0ds4c5zvgifb9hbjadb7vkbbpzdy6qd9s1";
+          rev = "ea34d46bf9a4293e75ffdac9500d34989316d9e9";
+          sha256 = "1hwc3fxv87hmw0a0mgl8khfzf1p7yp2izkc02z8f1vbkaibmmawp";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0ca9071199230d3c4c1b2e3a501736df87095fd3/recipes/swift3-mode";
           sha256 = "14vm05p8ix09v73dkmf03i56yib8yk6h2r1zc9m4ym80fki4f520";
-          name = "swift3-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -70572,20 +88103,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    swiper = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
-    melpaBuild {
+    swiper = callPackage ({ emacs
+                          , fetchFromGitHub
+                          , fetchurl
+                          , ivy
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "swiper";
-        version = "20180402.1857";
+        version = "20180713.946";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "1181d0f7acb9e77a15fa7e62cb1027979185c853";
-          sha256 = "0vsl346axdlkcv96cxlciw7bmvxwl2ficjgw9nxrsvhsjsy7md02";
+          rev = "93d51d6188956da2592c1458b68d7cef48d967ae";
+          sha256 = "024kj37xa4s49z8klcmn3a30zy3yzk5n9j9damzqmzd4d8klawi6";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/swiper";
           sha256 = "0qaia5pgsjsmrfmcdj72jmj39zq82wg4i5l2mb2z6jlf1jpbk6y9";
-          name = "swiper";
+          name = "recipe";
         };
         packageRequires = [ emacs ivy ];
         meta = {
@@ -70593,8 +88129,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    swiper-helm = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, swiper }:
-    melpaBuild {
+    swiper-helm = callPackage ({ emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , helm
+                               , lib
+                               , melpaBuild
+                               , swiper }:
+      melpaBuild {
         pname = "swiper-helm";
         version = "20180131.944";
         src = fetchFromGitHub {
@@ -70603,10 +88145,10 @@
           rev = "93fb6db87bc6a5967898b5fd3286954cc72a0008";
           sha256 = "05n4h20lfyg1kis5rig72ajbz680ml5fmsy6l1w4g9jx2xybpll2";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/674c709490e13267e09417e08953ff76bfbaddb7/recipes/swiper-helm";
           sha256 = "011ln6vny7z5vw67cpzldxf5n6sk2hjdkllyf7v6sf4m62ws93ph";
-          name = "swiper-helm";
+          name = "recipe";
         };
         packageRequires = [ emacs helm swiper ];
         meta = {
@@ -70614,8 +88156,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    switch-buffer-functions = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    switch-buffer-functions = callPackage ({ fetchFromGitHub
+                                           , fetchurl
+                                           , lib
+                                           , melpaBuild }:
+      melpaBuild {
         pname = "switch-buffer-functions";
         version = "20171011.1004";
         src = fetchFromGitHub {
@@ -70624,10 +88169,10 @@
           rev = "651696ef9dec7affbe51c81d9318288376c35899";
           sha256 = "0xv57imh6w6kbh1i1ib9k9x2h01l4vdxs2i667a76ym6dmsjbx2x";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d37ebd28f4a2f770958bd9a2669cce86cc76cbe7/recipes/switch-buffer-functions";
           sha256 = "1b93p8q07zncqq3nw829gddc615rwaan1ds5vgfhdb1l7bh9f37l";
-          name = "switch-buffer-functions";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -70635,20 +88180,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    switch-window = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    switch-window = callPackage ({ emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "switch-window";
-        version = "20180222.1731";
+        version = "20180623.1115";
         src = fetchFromGitHub {
           owner = "dimitri";
           repo = "switch-window";
-          rev = "680182240012c2ad8fb35479f915e653315b4803";
-          sha256 = "0fkz29spgfbx7d1hi1xm71wa1glk448v7gidqgrdylsmbzwkj1y9";
+          rev = "a5dc9a9c68ba77d86d7170f183ba1e003569ad8e";
+          sha256 = "0466lk1spk6bl1fnc0v7gwr71msccc25a3j7jzd7h0zssc2l403c";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7d2204e3b53ade1e400e143ac219f3c7ab63a1e9/recipes/switch-window";
           sha256 = "02f0zjvlzms66w1ryhk1cbr4rqwklzvgcjfiicj0lcnqqx61m2k2";
-          name = "switch-window";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -70656,8 +88205,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    swoop = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, pcre2el }:
-    melpaBuild {
+    swoop = callPackage ({ async
+                         , emacs
+                         , fetchFromGitHub
+                         , fetchurl
+                         , ht
+                         , lib
+                         , melpaBuild
+                         , pcre2el }:
+      melpaBuild {
         pname = "swoop";
         version = "20160120.915";
         src = fetchFromGitHub {
@@ -70666,10 +88222,10 @@
           rev = "a5e475db7a9f5db02ba3d08cd3c1c3594e2e01d7";
           sha256 = "10ka6f86n07xlf0z7w35db0mzp2zk4xhr6jd19kjdrn2j0ynlcw5";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/swoop";
           sha256 = "0zcxasc0bpldvlp6032f9v1s4vm9r76pzd7sjgwa9dxbajw5h7fs";
-          name = "swoop";
+          name = "recipe";
         };
         packageRequires = [ async emacs ht pcre2el ];
         meta = {
@@ -70677,20 +88233,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    sws-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    sws-mode = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "sws-mode";
         version = "20150317.1245";
         src = fetchFromGitHub {
           owner = "brianc";
           repo = "jade-mode";
-          rev = "4dbde92542fc7ad61df38776980905a4721d642e";
-          sha256 = "0p6pfxbl98kkwa3lgx82h967w4p0wbd9s96gvs72d74ryan07ij1";
+          rev = "03486dce6990c96e85e53c18b8fcb35fbb8509f5";
+          sha256 = "10w73i4sh6mn108lcnm6sv4xr1w0avbfw05kid28c33583h80vpm";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/877b5a3e612e1b1d6d51e60c66b0b79f231abdb2/recipes/sws-mode";
           sha256 = "0b12dsad0piih1qygjj0n7rni0pl8cizbzwqm9h1dr8imy53ak4i";
-          name = "sws-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -70698,20 +88257,28 @@
           license = lib.licenses.free;
         };
       }) {};
-    sx = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, json ? null, let-alist, lib, markdown-mode, melpaBuild }:
-    melpaBuild {
+    sx = callPackage ({ cl-lib ? null
+                      , emacs
+                      , fetchFromGitHub
+                      , fetchurl
+                      , json ? null
+                      , let-alist
+                      , lib
+                      , markdown-mode
+                      , melpaBuild }:
+      melpaBuild {
         pname = "sx";
-        version = "20180212.1101";
+        version = "20180606.36";
         src = fetchFromGitHub {
           owner = "vermiculus";
           repo = "sx.el";
-          rev = "833435fbf90d1c9e927d165b155f3b1ef39271de";
-          sha256 = "1369xaxq1vy3d9yh862ddnhddikdpg2d0wv1ly00pnvdp9v4cqgd";
+          rev = "46d9498e8f501697920c79437909cdddc93d5ec6";
+          sha256 = "0z21f2v8464bj0jj6y9w7b5hpz1m2r761hanc4b802k8bxb8mxh0";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f16958a09820233fbe2abe403561fd9a012d0046/recipes/sx";
           sha256 = "1ml1rkhhk3hkd16ij2zwng591rxs2yppsfq9gwd4ppk02if4v517";
-          name = "sx";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs json let-alist markdown-mode ];
         meta = {
@@ -70719,8 +88286,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    symbol-overlay = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    symbol-overlay = callPackage ({ emacs
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "symbol-overlay";
         version = "20180412.339";
         src = fetchFromGitHub {
@@ -70729,10 +88300,10 @@
           rev = "b76f510037eb8e0ea018272495f356c71ff5b758";
           sha256 = "0dlb7rm4adm2ccqga5a1w6m2jvs4ics9ihf76hqyx4px9m9ca1ll";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c2a468ebe1a3e5a35ef40c59a62befbf8960bd7b/recipes/symbol-overlay";
           sha256 = "1al60x2mnjsv99jd10v5sd56zz185wsddiq7128phf1l35bkibis";
-          name = "symbol-overlay";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -70740,8 +88311,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    symbolword-mode = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    symbolword-mode = callPackage ({ emacs
+                                   , f
+                                   , fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "symbolword-mode";
         version = "20180401.727";
         src = fetchFromGitHub {
@@ -70750,10 +88326,10 @@
           rev = "3857c42696e20f49f274ff8bc45a6f3ee26884d4";
           sha256 = "0pk20glbf73lpfky0jz6dqvxzaqvig3m11xca0786ni0g1yc4g0g";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/be2018e0206c3f39c1b67e83000b030d70a72ceb/recipes/symbolword-mode";
           sha256 = "1fs1irnmlbrn76b4gdsy0v65nz8av85iqm0b7g9nm2rm8azcr050";
-          name = "symbolword-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs f ];
         meta = {
@@ -70761,20 +88337,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    symon = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    symon = callPackage ({ fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "symon";
         version = "20170224.33";
         src = fetchFromGitHub {
           owner = "zk-phi";
           repo = "symon";
-          rev = "8dd8b6df49b03cd7d31b85aedbe9dd08fb922335";
-          sha256 = "1bbblz9qzc84h08010y48mjyciavl6lnxk2m19mwbc6b5y58vwpg";
+          rev = "76461679dfe13a5dccd3c8735fb6f58b26b46733";
+          sha256 = "06s7q0zhqmvnhdkqikhfzl1rgm6xzqaxp461ndf8gp44rp1alkl4";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3f4bbc6b3d7b2e2a9fbe7ff7f1d47cda9c859cc0/recipes/symon";
           sha256 = "11llnvngyc3xz8nd6nj86ism0hhs8p54wkscvs4yycbakbyn61lz";
-          name = "symon";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -70782,8 +88361,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    symon-lingr = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, symon }:
-    melpaBuild {
+    symon-lingr = callPackage ({ cl-lib ? null
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild
+                               , symon }:
+      melpaBuild {
         pname = "symon-lingr";
         version = "20150719.642";
         src = fetchFromGitHub {
@@ -70792,10 +88376,10 @@
           rev = "056d1a473e36992ff5881e5ce6fdc331cead975f";
           sha256 = "030bglxnvrkf1f9grbhd8n11j4c6sxpabpjdr1ryx522v01fvx8j";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/936e9a83ed73d3b6090e5c401076b6cff5d9732d/recipes/symon-lingr";
           sha256 = "0kyhmw25cn10b4jv2yx7bvp8zkwcswiidpk4amyaisw25820gkv1";
-          name = "symon-lingr";
+          name = "recipe";
         };
         packageRequires = [ cl-lib symon ];
         meta = {
@@ -70803,8 +88387,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    sync-recentf = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    sync-recentf = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "sync-recentf";
         version = "20160326.1301";
         src = fetchFromGitHub {
@@ -70813,10 +88400,10 @@
           rev = "0052561d5c5b5c2684faedc3eead776aec06c3ed";
           sha256 = "006siydqxqds0qqds0zxn821dk4pw14wyymyp03n594wgqzw7m8q";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9858ea35f2a3faacab56b6ccba5672956560456b/recipes/sync-recentf";
           sha256 = "17aji2vcw6zfd823anzwj8pcgyxamxr87bnni085jvlz0vx6gh9c";
-          name = "sync-recentf";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -70824,8 +88411,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    syndicate = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    syndicate = callPackage ({ evil
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "syndicate";
         version = "20160603.823";
         src = fetchFromGitHub {
@@ -70834,10 +88425,10 @@
           rev = "90cee202a06f5bab48268ebf9f62c43334b69f50";
           sha256 = "1w0na1p9drdmbci7adj20amrabcpny9fb2v4bd967ils4f2wly75";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/626bda1691d9c7a97fcf549f7a3f0d41d832cfde/recipes/syndicate";
           sha256 = "06nmldcw5dy2shhpk6nyix7gs57gsr5s9ksj57xgg8y2j3j0da95";
-          name = "syndicate";
+          name = "recipe";
         };
         packageRequires = [ evil ];
         meta = {
@@ -70845,8 +88436,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    synonymous = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }:
-    melpaBuild {
+    synonymous = callPackage ({ cl-lib ? null
+                              , emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild
+                              , request }:
+      melpaBuild {
         pname = "synonymous";
         version = "20180325.1117";
         src = fetchFromGitHub {
@@ -70855,10 +88452,10 @@
           rev = "2cb9a674d84fddf3f1b00c9d6b13a853576acb87";
           sha256 = "1l0skavpj96x5gdrx9l8dqj4mrb7zcilv3jj335ak11p2i4ckcq2";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ecf2c44c63e9f41f1733849bdef0d0c301485580/recipes/synonymous";
           sha256 = "0vawa9qwvv6z1i7vzhkjdl1l9r1yham48yn5y8w8g1xyhxxp6rs5";
-          name = "synonymous";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs request ];
         meta = {
@@ -70866,20 +88463,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    synosaurus = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    synosaurus = callPackage ({ cl-lib ? null
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "synosaurus";
         version = "20180125.1034";
         src = fetchFromGitHub {
           owner = "hpdeifel";
           repo = "synosaurus";
-          rev = "8bf95b935976ec0a1964cf175ed57cc5f6f93bdb";
-          sha256 = "06dssdq0fwmr5fw56f17hysy4ysvljlvh6np4szv7lc8bhvykki0";
+          rev = "ceeb06e24d3af3643862ecfdb263590eec1f492f";
+          sha256 = "1qdppyx24zmz9dzm9kjvcx30g6znik602mg2h2s835cww9n97idm";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/synosaurus";
           sha256 = "06a48ajpickf4qr1bc14skfr8khnjjph7c35b7ajfy8jw2zwavpn";
-          name = "synosaurus";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -70887,8 +88488,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    synquid = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
-    melpaBuild {
+    synquid = callPackage ({ emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , flycheck
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "synquid";
         version = "20160930.850";
         src = fetchFromGitHub {
@@ -70897,10 +88503,10 @@
           rev = "28701ce1a15437202f53ab93a14bcba1de83fd2c";
           sha256 = "0c0pi5w8xvir9gnbjp80g1c4i3rhid65zwh4i4vkyivkh2s29f6i";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6ccd9f265d90a5f6a95942938532f556b223e4da/recipes/synquid";
           sha256 = "10kmd9g3qbfnyfl2bdf2s70f5sd3pyzalq18dpgq5ijkwqi019k7";
-          name = "synquid";
+          name = "recipe";
         };
         packageRequires = [ emacs flycheck ];
         meta = {
@@ -70908,20 +88514,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    syntactic-close = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    syntactic-close = callPackage ({ cl-lib ? null
+                                   , emacs
+                                   , fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "syntactic-close";
-        version = "20180211.538";
+        version = "20180417.2339";
         src = fetchFromGitHub {
           owner = "emacs-berlin";
           repo = "syntactic-close";
-          rev = "5ba592366b0b29b724b1cbda952cc8e25ef8b239";
-          sha256 = "0b4lhvd3dsg95hpdnjmyhxrcaqkmigg7k5n98f9fb9b8k6gfdsan";
+          rev = "815b01cb9d74db5d1671734fdfb9521616a4afb3";
+          sha256 = "1r6gac0n7pij1x7s27ifsbfmiqfbmynprcv1wicilhm90m6087iq";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f2c15c0c8ee37a1de042a974c6daddbfa7f33f1d/recipes/syntactic-close";
           sha256 = "19lrzxxyzdj1nrzdgzandjz3b8b4pw7akbv86yf0mdf023d9as1f";
-          name = "syntactic-close";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -70929,20 +88540,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    syntactic-sugar = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    syntactic-sugar = callPackage ({ fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "syntactic-sugar";
         version = "20140508.1341";
         src = fetchFromGitHub {
           owner = "rolandwalker";
           repo = "syntactic-sugar";
-          rev = "7ddc4502c831abe1c4ad4c7d1ca628a2c9e13968";
-          sha256 = "0zi11540wwcl93xcgd2yf6b72zv01zkaqbf1jfbksg82k9038m2d";
+          rev = "b6a49df4b6056e2619eea9ca554c105ae67e115f";
+          sha256 = "0zymxv4lz3phb2lmza0469ssw3fybribzd1w2fmp8ij1r18xy0xk";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b32b9b3b3e820e498d7531a1f82da36e5e8f4e74/recipes/syntactic-sugar";
           sha256 = "12b2vpvz5h4wzxrk8jrbgc8v0w6bzzvxcyfs083fi1791qq1rw7r";
-          name = "syntactic-sugar";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -70950,8 +88564,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    syntax-subword = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    syntax-subword = callPackage ({ fetchhg
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "syntax-subword";
         version = "20160519.1205";
         src = fetchhg {
@@ -70959,10 +88576,10 @@
           rev = "ad0db0fcb464";
           sha256 = "1wcgr6scvwwfmhhjbpq3riq0gmp4g08ffbl91fpgp72j8zrc1c6x";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/syntax-subword";
           sha256 = "1as89ffqz2h69fdwybgs5wibnrvskm7hd58vagfjkla9pjlpffpm";
-          name = "syntax-subword";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -70970,20 +88587,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    system-packages = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    system-packages = callPackage ({ emacs
+                                   , fetchFromGitLab
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "system-packages";
-        version = "20180415.2039";
-        src = fetchFromGitHub {
+        version = "20180516.1450";
+        src = fetchFromGitLab {
           owner = "jabranham";
           repo = "system-packages";
-          rev = "9e5532bbed819e6736922d2da2615a2fa4433cea";
-          sha256 = "1blncv4cdf3ayq9d5ymdiacavma23smrmwh46130pscbjb4iyppy";
+          rev = "7f59e325e8607aeb3036c7fb1590b0f8e2caa063";
+          sha256 = "0k7jflghql0sa7my1qfzz0prpwk54rmb244k6jwhbgsyfsspr12l";
         };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/8c423d8c1ff251bd34df20bdb8b425c2f55ae1b1/recipes/system-packages";
-          sha256 = "0cq1vb4m8phdmv3c0dj6m76fss5vp1a0hikn7a1q5l2mmns40wj1";
-          name = "system-packages";
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/7d3c7af03e0bca3f834c32827cbcca29e29ef4db/recipes/system-packages";
+          sha256 = "13nk3m8gw9kqjllk7hgkmpxsx9y5h03f0l7zydg388wc7cxsiy3l";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -70991,8 +88612,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    system-specific-settings = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    system-specific-settings = callPackage ({ fetchFromGitHub
+                                            , fetchurl
+                                            , lib
+                                            , melpaBuild }:
+      melpaBuild {
         pname = "system-specific-settings";
         version = "20140818.757";
         src = fetchFromGitHub {
@@ -71001,10 +88625,10 @@
           rev = "0050d85b2175095aa5ecf580a2fe43c069b0eef3";
           sha256 = "1hixilnnybv2v3p1wpn7a0ybwah17grawszs3jycsjgzahpgckv7";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3f52c584d7435c836ba3c95c598306ba0f5c06da/recipes/system-specific-settings";
           sha256 = "1ydmxi8aw2lf78wv4m39yswbqkmcadqg0wmzg9s8b5h9bxxwvppp";
-          name = "system-specific-settings";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -71012,20 +88636,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    systemd = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    systemd = callPackage ({ emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "systemd";
-        version = "20180414.1111";
+        version = "20180629.1406";
         src = fetchFromGitHub {
           owner = "holomorph";
           repo = "systemd-mode";
-          rev = "e97f78ee11f4d4738aaa646e48bb39565d88abd6";
-          sha256 = "16ffz0m964g8j6hi1drjvzaz2nxjm1z7r1y1j0g9bmn1dksz7vl8";
+          rev = "401d71c2dd24e424216ae5e4275c830f2a9c6b0c";
+          sha256 = "06b8j64fk711fay0p4ifypvpdv2l2kz80rx1hhm6g9991h0x33bj";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ca810e512c357d1d0130aeeb9b46b38c595e3351/recipes/systemd";
           sha256 = "1ykvm8mfi3fjvrkfcy9qn0sr9mhwm9x1svrmrd0gyqk418clk5i3";
-          name = "systemd";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -71033,20 +88661,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    systemtap-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    systemtap-mode = callPackage ({ fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "systemtap-mode";
         version = "20151122.1140";
         src = fetchFromGitHub {
           owner = "ruediger";
           repo = "systemtap-mode";
-          rev = "1a968c2b1f3a054bebf91ac49739d3a81ce050a9";
-          sha256 = "0343ss3y9i40y3i9rr7p7bb4k9dj950zyvdv44q1abw2xrfd2xwd";
+          rev = "8b5086d6b0050a12bb37e33c24c24d1f420afd3b";
+          sha256 = "14hrqz26h89sdgfpfyhwwxvqkv3j0zn67yy8wz0nbla9k2jjf6h8";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b1df01b4cccfb234971933d24de21a2b5648fd8c/recipes/systemtap-mode";
           sha256 = "1l2jx6mvph0q2pdlhq7p4vwfw72rfl8k1rwi504bbkr5n5xwhhhz";
-          name = "systemtap-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -71054,8 +88685,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    ta = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ta = callPackage ({ cl-lib ? null
+                      , emacs
+                      , fetchFromGitHub
+                      , fetchurl
+                      , lib
+                      , melpaBuild }:
+      melpaBuild {
         pname = "ta";
         version = "20160619.945";
         src = fetchFromGitHub {
@@ -71064,10 +88700,10 @@
           rev = "668ad41e71f374f8c32c8d0532f3d8485b355d35";
           sha256 = "1lk7hpdp6c74sdwkg2azfvj4qmbl1ghmhms3r0j4296dj8bl5k63";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/847693b5952e99597bd77223e1058536d1beeb5c/recipes/ta";
           sha256 = "0kn2k4n0xfwsrniaqb36v3rxj2pf2sai3bmjksbn1g2kf5g156ll";
-          name = "ta";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -71075,8 +88711,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    tab-group = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    tab-group = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "tab-group";
         version = "20140306.650";
         src = fetchFromGitHub {
@@ -71085,10 +88724,10 @@
           rev = "5a290ec2608e4100fb188fd60ecb77affcc3465b";
           sha256 = "0lfvgbgvsm61kv5mcjnhnfjcnr7fy1015y0hndkf9xvdlw4hahr4";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ad758d865bde8c97d27c0d57cabe1606f8b36974/recipes/tab-group";
           sha256 = "1i5lxpf3wmqnqj9mzgcn4gp1gjxp737awrzl1dml5wnarbbj4fs9";
-          name = "tab-group";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -71096,8 +88735,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    tab-jump-out = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    tab-jump-out = callPackage ({ dash
+                                , emacs
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "tab-jump-out";
         version = "20151005.1830";
         src = fetchFromGitHub {
@@ -71106,10 +88750,10 @@
           rev = "1c3fec1826d2891177ea78e4e7cce1dc67e83e51";
           sha256 = "0h7sfbca1nzcjylwl7zp25yj6wxnlx8g8a50zc6sg6jg4rggi2fm";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3691aaaed27d0cf67af417f75fbb693ab856bd47/recipes/tab-jump-out";
           sha256 = "0nlbyzym8l8g9w2xvykpcl5r449v30gal2k1dnz74rq4y8w4rh7n";
-          name = "tab-jump-out";
+          name = "recipe";
         };
         packageRequires = [ dash emacs ];
         meta = {
@@ -71117,8 +88761,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    tabbar = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    tabbar = callPackage ({ fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "tabbar";
         version = "20160524.1401";
         src = fetchFromGitHub {
@@ -71127,10 +88774,10 @@
           rev = "b6c285a7d59dcdb1f17716f0b60787922fa4be82";
           sha256 = "1akvwm4dqq4ihphlsdn8d1mm08q923y2iqh15lvc0cd0hxp3ni0q";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/806420d75561cbeffbc1b387345a56c21cc20179/recipes/tabbar";
           sha256 = "1y376nz1xmchwns4fz8dixbb7hbqh4mln78zvsh7y32il98wzvx9";
-          name = "tabbar";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -71138,8 +88785,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    tabbar-ruler = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, mode-icons, powerline, tabbar }:
-    melpaBuild {
+    tabbar-ruler = callPackage ({ cl-lib ? null
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild
+                                , mode-icons
+                                , powerline
+                                , tabbar }:
+      melpaBuild {
         pname = "tabbar-ruler";
         version = "20160801.2007";
         src = fetchFromGitHub {
@@ -71148,10 +88802,10 @@
           rev = "535568189aa12a3eff7f977d2783e57b6a65ab6a";
           sha256 = "1csj6qhwihdf4kfahcqhm163isiwac08w4nqid1hnca184bfk6xm";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1d69d1ef8dbab8394be01153cf9ebe8e49bf9912/recipes/tabbar-ruler";
           sha256 = "10dwjj6r74g9rzdd650wa1wxhqc0q6dmff4j0qbbhmjsxvsr3y0d";
-          name = "tabbar-ruler";
+          name = "recipe";
         };
         packageRequires = [ cl-lib mode-icons powerline tabbar ];
         meta = {
@@ -71159,8 +88813,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    tablist = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    tablist = callPackage ({ emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "tablist";
         version = "20170219.1935";
         src = fetchFromGitHub {
@@ -71169,10 +88827,10 @@
           rev = "c834a84efb6efa32497efe1e73160fade741b836";
           sha256 = "0nkrndgg0zrqxb7hilqbrywi8n1lcf3jxjjp1hfn5f0arxy64pcv";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5fc0c6c02d609fb22710560337bd577f4b1e0c8f/recipes/tablist";
           sha256 = "0c10g86xjhzpmc2sqjmzcmi393qskyw6d9bydqzjk3ffjzklm45p";
-          name = "tablist";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -71180,8 +88838,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    tabula-rasa = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    tabula-rasa = callPackage ({ emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "tabula-rasa";
         version = "20141215.2147";
         src = fetchFromGitHub {
@@ -71190,10 +88852,10 @@
           rev = "e85fff9de18dc31bc6a7aca726e34a95cc5459f5";
           sha256 = "1dbjfq9a7a5s9c18nrp4kcda64jkg5cp8na31kxw0hjcn98dgqa8";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/tabula-rasa";
           sha256 = "14j92inssmm61bn475gyn0dn0rv8kvfnqyl1zq3xliy7a0jn58zz";
-          name = "tabula-rasa";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -71201,8 +88863,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    tagedit = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    tagedit = callPackage ({ dash
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild
+                           , s }:
+      melpaBuild {
         pname = "tagedit";
         version = "20161121.55";
         src = fetchFromGitHub {
@@ -71211,10 +88878,10 @@
           rev = "b3a70101a0dcf85498c92b7fcfa7fdbac869746c";
           sha256 = "0xq9i3axlq9wgsr27nbhi5k9hxr1wahygkb73xkvxlgmvkmikcrw";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8968e2cd0bd49d54a5479b2467bd4f0a97d7a969/recipes/tagedit";
           sha256 = "0vfkbrxmrw4fwdz324s734zxdxm2nj3df6i8m6lgb9pizqyp2g6z";
-          name = "tagedit";
+          name = "recipe";
         };
         packageRequires = [ dash s ];
         meta = {
@@ -71222,8 +88889,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    take-off = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, web-server }:
-    melpaBuild {
+    take-off = callPackage ({ emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild
+                            , web-server }:
+      melpaBuild {
         pname = "take-off";
         version = "20140531.217";
         src = fetchFromGitHub {
@@ -71232,10 +88904,10 @@
           rev = "aa9ea45566fc74febbb6ee9c409ecc4b59246215";
           sha256 = "13zwlb5805cpv0pbr7fj5b4crlg7lb0ibslvcpszm0cz6rlifcvf";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3d129ad161d8538c9db022bbd4e90eacda998cf4/recipes/take-off";
           sha256 = "05vlajmirbp62rpbdwa2bimpzyl9xc331gg0lhn2rkivc0hma2ar";
-          name = "take-off";
+          name = "recipe";
         };
         packageRequires = [ emacs web-server ];
         meta = {
@@ -71243,8 +88915,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    tango-2-theme = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    tango-2-theme = callPackage ({ fetchgit
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "tango-2-theme";
         version = "20120312.1325";
         src = fetchgit {
@@ -71252,10 +88927,10 @@
           rev = "64e44c98e41ebbe3b827d54280e3b9615787daaa";
           sha256 = "1lqkazis9pfcfdsb2lar4l1n4pd085v60xmnlkdrdllwamqachkk";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ab432b0eac0bcf0d40c5b3c8a78475bc0fea47d2/recipes/tango-2-theme";
           sha256 = "1a9qmz99h99gpd0sxqb71c08wr8pm3bzsg3p4cvf3vcirvav9lq6";
-          name = "tango-2-theme";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -71263,8 +88938,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    tango-plus-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    tango-plus-theme = callPackage ({ fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "tango-plus-theme";
         version = "20170214.908";
         src = fetchFromGitHub {
@@ -71273,10 +88951,10 @@
           rev = "8ba8901397e3e9f1d53110487bfa0effc65015e7";
           sha256 = "025dca4yqpai45s74nk41y075v8pv59fdna11c0qqz3ihyrdhbrq";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/tango-plus-theme";
           sha256 = "1p1b48fvmk7a8m3bnddkx2pp7kz5agac0v1ii2r6iqapdqsl22ng";
-          name = "tango-plus-theme";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -71284,8 +88962,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    tangotango-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    tangotango-theme = callPackage ({ fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "tangotango-theme";
         version = "20170924.809";
         src = fetchFromGitHub {
@@ -71294,10 +88975,10 @@
           rev = "e2f2ea9c35f06dfc43a29c91c14cf0cdb19f2144";
           sha256 = "01gvsvha8z7pyr8c33gh3xmz47lh6b8g0nwf1gzdiw1gd0sfhs4z";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ebfcfa3ba4ca77443667a9478d59214810cd8cc2/recipes/tangotango-theme";
           sha256 = "05cnvyqmh5h5mqys7qs7d9knzxzmi2x0j1avp77x5l5njzzv59s2";
-          name = "tangotango-theme";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -71305,8 +88986,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    tao-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    tao-theme = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "tao-theme";
         version = "20171221.1001";
         src = fetchFromGitHub {
@@ -71315,10 +88999,10 @@
           rev = "a97df8c51d77696787aaf55c67207f19c803fabe";
           sha256 = "1djp4gbs6gr956a5hpkwh5laasc7pypqip32l7djd7405vx5ixp2";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/94b70f11655944080507744fd06464607727ecef/recipes/tao-theme";
           sha256 = "0gl6zzk5ha6vl2xxf5fcnv1k42cw4axdjdcirr1c4r8jwdq3nl3a";
-          name = "tao-theme";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -71326,20 +89010,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    taskpaper-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    taskpaper-mode = callPackage ({ fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "taskpaper-mode";
-        version = "20180416.754";
+        version = "20180710.158";
         src = fetchFromGitHub {
           owner = "saf-dmitry";
           repo = "taskpaper-mode";
-          rev = "0e4f11d3aa07ea1602df0566f28bb2dc172f70f5";
-          sha256 = "048hw8kbvdxihd9qsr16gzjlvjm3plvwlqb216mxbx60ig8vlhfx";
+          rev = "e822c44ebc5b15750ba68af67417ea5fe67641c0";
+          sha256 = "08ilrykg9ggksxwrkns0jkbjjvpzxb5w1l2s2krxnf4nj5d9x3qb";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f969b1cd58dfd22041a8a2b116db0f48e321e546/recipes/taskpaper-mode";
           sha256 = "0gayhzakiwlrkysmh24499pyzdfy3rmf8d68vamih7igxpl57gim";
-          name = "taskpaper-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -71347,20 +89034,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    tawny-mode = callPackage ({ cider, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    tawny-mode = callPackage ({ cider
+                              , emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "tawny-mode";
         version = "20170422.1502";
         src = fetchFromGitHub {
           owner = "phillord";
           repo = "tawny-owl";
-          rev = "3d353a435c7fcb0d9edae3094a9ece81914ba34e";
-          sha256 = "14kb6pzj23zrxwfkcxnra1j4fxzm94a3fym0nx1gf7bx362yqn5g";
+          rev = "9f11bb428a255a605c725dfbd23cc082c5d258af";
+          sha256 = "0l419pvvnj850c6byr7njnjki171mcsvlqj8g2d4qk16j504n34m";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ea9a114ff739f7d6f5d4c3167f5635ddf79bf60c/recipes/tawny-mode";
           sha256 = "1xaw1six1n6rw1283fdyl15xcf6m7ngvq6gqlz0xzpf232c4b0kr";
-          name = "tawny-mode";
+          name = "recipe";
         };
         packageRequires = [ cider emacs ];
         meta = {
@@ -71368,20 +89060,27 @@
           license = lib.licenses.free;
         };
       }) {};
-    tblui = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, magit-popup, melpaBuild, tablist }:
-    melpaBuild {
+    tblui = callPackage ({ cl-lib ? null
+                         , dash
+                         , fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , magit-popup
+                         , melpaBuild
+                         , tablist }:
+      melpaBuild {
         pname = "tblui";
         version = "20161007.1212";
         src = fetchFromGitHub {
           owner = "Yuki-Inoue";
           repo = "tblui.el";
-          rev = "bb29323bb3e27093d50cb42db3a9329a096b6e4d";
-          sha256 = "1pja9v4h3abqc2iydm7wwjxrg7ni1pn94yb4azrgjq5qc0fsgn7a";
+          rev = "e280e11b35a2fdbcadf9ce901a2b62684ac7a7a3";
+          sha256 = "0alb0gpdny1y90b2c5s25as56qbi3dy8rfnm9ba0k7ifwy0lmfq5";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f4dd6e9dcc73c57f93371ba16b15f2d98d805dae/recipes/tblui";
           sha256 = "1m0zhk5zyialklnil5az974yz6g1zksw02453cxc0xpn5pf0a3xa";
-          name = "tblui";
+          name = "recipe";
         };
         packageRequires = [ cl-lib dash magit-popup tablist ];
         meta = {
@@ -71389,8 +89088,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    tbx2org = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    tbx2org = callPackage ({ cl-lib ? null
+                           , dash
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild
+                           , s }:
+      melpaBuild {
         pname = "tbx2org";
         version = "20140224.759";
         src = fetchFromGitHub {
@@ -71399,10 +89104,10 @@
           rev = "08e9816ba6066f56936050b58d07ceb2187ae6f7";
           sha256 = "1jp80qywcphql1ngd4fr24lqdfwrw0bw6q9hgq5vmzgjwfxwxwd4";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d616cbf4ad7e49807afd2f7acf0a0fd2f2a0bac4/recipes/tbx2org";
           sha256 = "1yvkw65la4w12c4w6l9ai73lzng170wv4b8gry99m2bakw3wr8m8";
-          name = "tbx2org";
+          name = "recipe";
         };
         packageRequires = [ cl-lib dash s ];
         meta = {
@@ -71410,41 +89115,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    tc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
-        pname = "tc";
-        version = "20150113.1926";
-        src = fetchFromGitHub {
-          owner = "kozo2";
-          repo = "tc";
-          rev = "6aa9d27c475be8d009adf9cd417f2cdf348a91e8";
-          sha256 = "1xpkrlfqb0np9zyxk41f3pxfkw98ii4q0xh8whq4llv5bmfxynzk";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/55fa57c74237ec7afe651d162228fae595579fe5/recipes/tc";
-          sha256 = "13qdnfslnik4f97lz9bxayyhgcp1knh5gaqy00ps863j3vpzjb9s";
-          name = "tc";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://melpa.org/#/tc";
-          license = lib.licenses.free;
-        };
-      }) {};
-    tco = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    tco = callPackage ({ dash
+                       , emacs
+                       , fetchFromGitHub
+                       , fetchurl
+                       , lib
+                       , melpaBuild }:
+      melpaBuild {
         pname = "tco";
         version = "20160810.1712";
         src = fetchFromGitHub {
           owner = "Wilfred";
           repo = "tco.el";
-          rev = "97529ed7a0939c51ce0084c0aa8b12b313654735";
-          sha256 = "1s8lw38d43c06w6q88h1kf480zvxzjzxmb426zb9rral61m1f0dl";
+          rev = "5d3498c5f44d3a44c9aabbba71b590f6a2f85145";
+          sha256 = "0vzixcp6anxdxchafj7lzs4pxfnzkqhqlyz05dxasby71zx7g49v";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ca33f97f0394585c8ccb31cab0ee776d1655907c/recipes/tco";
           sha256 = "0hfrzwjlgynk3mydrpmic9mckak37r22fdglrfas6zdihgrg152f";
-          name = "tco";
+          name = "recipe";
         };
         packageRequires = [ dash emacs ];
         meta = {
@@ -71452,20 +89141,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    tdd-status-mode-line = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    tdd-status-mode-line = callPackage ({ fetchFromGitHub
+                                        , fetchurl
+                                        , lib
+                                        , melpaBuild }:
+      melpaBuild {
         pname = "tdd-status-mode-line";
         version = "20131123.916";
         src = fetchFromGitHub {
           owner = "algernon";
           repo = "tdd-status-mode-line";
-          rev = "4c082e62f4915b573338a97efcc6854d132323dc";
-          sha256 = "1jyz6z5bk1gvmknphcnvjvbl329zm8m40yl0a1hfaj8fvhwyzdw5";
+          rev = "9b3c35b0a972772640e9fee653eab6a76e06416a";
+          sha256 = "0bvxc926kaxvqnppaw4y6gp814qc0krvidn5qg761z4qwz023rax";
         };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/e2da68159ebd2301b42ac52235563a5eaaf6d2cc/recipes/tdd-status-mode-line";
-          sha256 = "0z1q1aw14xq72nfx7mmvz7pr2x4960l45z02jva35zxzvb1mvsgq";
-          name = "tdd-status-mode-line";
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/25b445a1dea5e8f1042bed6b5372471c25129fd8/recipes/tdd-status-mode-line";
+          sha256 = "1i0s7f4y4v8681mymcmjlcbq0jfghgmdzrs167c453mb5ssz8yxg";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -71473,8 +89165,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    tea-time = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    tea-time = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "tea-time";
         version = "20120331.120";
         src = fetchFromGitHub {
@@ -71483,10 +89178,10 @@
           rev = "1f6cf0bdd27c5eb3508989c5095427781f858eca";
           sha256 = "0b4cwkwkc4i8lc4j30xc9d6xskm3gqrc2dij60ya75h92aj0lj40";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/tea-time";
           sha256 = "0qypwf0pgsixq6c5avbwp81i3ayy9dd2fngzdvq14pax913q8pg1";
-          name = "tea-time";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -71494,8 +89189,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    telepathy = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    telepathy = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "telepathy";
         version = "20131209.458";
         src = fetchFromGitHub {
@@ -71504,10 +89202,10 @@
           rev = "211d785b02a29ddc254422fdcc3db45262582f8c";
           sha256 = "16kr1p4lzi1ysd5r2dh0mxk60zsm5fvwa9345nfyrgdic340yscc";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/485ef1745f07f29c45bf0d489eeb4fcdfda80b33/recipes/telepathy";
           sha256 = "0c3d6vk7d6vqzjndlym2kk7d2zm0b15ac4142ir03p6f19rqq9pr";
-          name = "telepathy";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -71515,20 +89213,27 @@
           license = lib.licenses.free;
         };
       }) {};
-    telephone-line = callPackage ({ cl-generic, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }:
-    melpaBuild {
+    telephone-line = callPackage ({ cl-generic
+                                  , cl-lib ? null
+                                  , emacs
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild
+                                  , seq }:
+      melpaBuild {
         pname = "telephone-line";
-        version = "20180404.1614";
+        version = "20180601.1943";
         src = fetchFromGitHub {
           owner = "dbordak";
           repo = "telephone-line";
-          rev = "c9aca6ce030fac893793558c74a957e7bd0e6034";
-          sha256 = "081mj24h301vljb0d8bn5d9ibrgm1im2r5slzadd699h4zyyldcc";
+          rev = "1cc28a7811245e6f24234b36fc1004a1357a3df3";
+          sha256 = "1qjlil6xy6jacz1lhwz76n5xqx1xw2bqlnkijrka04v9gws42jaj";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9c998b70365fb0a210c3b9639db84034c7d45097/recipes/telephone-line";
           sha256 = "0dyh9h1yk9y0217b6rxsm7m372n910vpfgw5w23lkkrwa8x8qpx3";
-          name = "telephone-line";
+          name = "recipe";
         };
         packageRequires = [ cl-generic cl-lib emacs seq ];
         meta = {
@@ -71536,20 +89241,53 @@
           license = lib.licenses.free;
         };
       }) {};
-    temporary-persistent = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, names, s }:
-    melpaBuild {
+    template-overlays = callPackage ({ emacs
+                                     , fetchFromGitHub
+                                     , fetchurl
+                                     , lib
+                                     , melpaBuild
+                                     , ov }:
+      melpaBuild {
+        pname = "template-overlays";
+        version = "20180706.432";
+        src = fetchFromGitHub {
+          owner = "mmontone";
+          repo = "template-overlays";
+          rev = "3cbc9a4882dcbbddf9b168883d119a6af0848784";
+          sha256 = "1lnrs6zphpk1qi8pg8km9srbv5n9i70f2jvyj5zvxhlpp0jb52l2";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/8856e67aae1f623714bc2a61a7b4773ed1fb2934/recipes/template-overlays";
+          sha256 = "0vmadkgzp4i0mh64la67k1anvmlmd4i7iibdlr9ly8z7i3cdsxqn";
+          name = "recipe";
+        };
+        packageRequires = [ emacs ov ];
+        meta = {
+          homepage = "https://melpa.org/#/template-overlays";
+          license = lib.licenses.free;
+        };
+      }) {};
+    temporary-persistent = callPackage ({ dash
+                                        , emacs
+                                        , fetchFromGitHub
+                                        , fetchurl
+                                        , lib
+                                        , melpaBuild
+                                        , names
+                                        , s }:
+      melpaBuild {
         pname = "temporary-persistent";
         version = "20161210.333";
         src = fetchFromGitHub {
           owner = "kostafey";
           repo = "temporary-persistent";
-          rev = "ac66f3054fc701d53f11ada9d2d9ab18ea481dc0";
-          sha256 = "15mjcr9gwf1ijppvcxwddnxj84y9idwz7s3lcqr910xb4d3ai8nb";
+          rev = "1132e940dc1fd27f205758495640cc4a42270cff";
+          sha256 = "155yyinh342k8fz8g4xzz0glqkxkjl6p6y2wym6p12phk7v2x3ic";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0f89e65ce7b302a0330f0110564320c724acc254/recipes/temporary-persistent";
           sha256 = "1q141cdnwchfra6gp6fs0nlkxv6fdf8rx5ry04kcpr9a1y56z362";
-          name = "temporary-persistent";
+          name = "recipe";
         };
         packageRequires = [ dash emacs names s ];
         meta = {
@@ -71557,8 +89295,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    ten-hundred-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ten-hundred-mode = callPackage ({ cl-lib ? null
+                                    , fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "ten-hundred-mode";
         version = "20161028.1536";
         src = fetchFromGitHub {
@@ -71567,10 +89309,10 @@
           rev = "bdcfda49b1819e82d61fe90947e50bb948cf7933";
           sha256 = "11nsh6dkd3i489lrqpd9xhr4c0ai51364rlrd6slm54720by9jql";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4a0534044ff9ce0740414bf5dc3b104bbdbdacce/recipes/ten-hundred-mode";
           sha256 = "17v38h33ka70ynq72mvma2chvlnm1k2amyvk62c65iv67rwilky3";
-          name = "ten-hundred-mode";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -71578,8 +89320,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    term-alert = callPackage ({ alert, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, term-cmd }:
-    melpaBuild {
+    term-alert = callPackage ({ alert
+                              , emacs
+                              , f
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild
+                              , term-cmd }:
+      melpaBuild {
         pname = "term-alert";
         version = "20161119.145";
         src = fetchFromGitHub {
@@ -71588,10 +89337,10 @@
           rev = "47af9e6fe483ef0d393098c145f499362a33292a";
           sha256 = "1nv8ma8x9xkgsl95z7yysy8q1lb3xr0pd8a5sb01nlx8ks3clad4";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0d77aee0b1b2eb7834436bdfa339f95cb97da140/recipes/term-alert";
           sha256 = "02qvfhklysfk1fd4ibdngf4crp9k5ab11zgg90hi1sp429a53f3m";
-          name = "term-alert";
+          name = "recipe";
         };
         packageRequires = [ alert emacs f term-cmd ];
         meta = {
@@ -71599,8 +89348,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    term-cmd = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    term-cmd = callPackage ({ dash
+                            , emacs
+                            , f
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "term-cmd";
         version = "20160517.345";
         src = fetchFromGitHub {
@@ -71609,10 +89364,10 @@
           rev = "6c9cbc659b70241d2ed1601eea34aeeca0646dac";
           sha256 = "08qiipjsqc9dfbha6r2yijjbrg2s4i2mkn6zn5616086550v3kpj";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e08ea89cf193414cce5073fc9c312f2b382bc842/recipes/term-cmd";
           sha256 = "0pbz9fy9rjfpzspwq78ggf1wcvjslwvj8fvc05w4g56ydza0gqi4";
-          name = "term-cmd";
+          name = "recipe";
         };
         packageRequires = [ dash emacs f ];
         meta = {
@@ -71620,8 +89375,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    term-manager = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    term-manager = callPackage ({ dash
+                                , emacs
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "term-manager";
         version = "20171020.141";
         src = fetchFromGitHub {
@@ -71630,10 +89390,10 @@
           rev = "13a0f1637a1f075d70211ccb8162e63a18a474da";
           sha256 = "0hvn60wk3w27fjb023drnaw0gmys6ancha8blpl0r4vc5k203kcf";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0b2f7d8c8fcbb535432f8e70729d69a572e49a1a/recipes/term-manager";
           sha256 = "0ab388ki7vr1wpz81bvbl2fskq9zz5bicdf5gqfg01qzv5l75iza";
-          name = "term-manager";
+          name = "recipe";
         };
         packageRequires = [ dash emacs ];
         meta = {
@@ -71641,8 +89401,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    term-plus = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    term-plus = callPackage ({ cl-lib ? null
+                             , emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "term-plus";
         version = "20170508.1717";
         src = fetchFromGitHub {
@@ -71651,10 +89416,10 @@
           rev = "c3c9239b339c127231860de43abfa08c44c0201a";
           sha256 = "1mpv9vvvl1sh35vsa5415rvdv57mmbfix8s435q676zvhz3nl8yx";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/term+";
           sha256 = "12lvfspqmyrapmbz3x997vf160927d325y50kxdx3s6p81r7n2n8";
-          name = "term-plus";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -71662,8 +89427,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    term-plus-key-intercept = callPackage ({ fetchFromGitHub, fetchurl, key-intercept, lib, melpaBuild, term-plus }:
-    melpaBuild {
+    term-plus-key-intercept = callPackage ({ fetchFromGitHub
+                                           , fetchurl
+                                           , key-intercept
+                                           , lib
+                                           , melpaBuild
+                                           , term-plus }:
+      melpaBuild {
         pname = "term-plus-key-intercept";
         version = "20140210.2350";
         src = fetchFromGitHub {
@@ -71672,10 +89442,10 @@
           rev = "fd0771fd66b8c7a909aaac972194485c79ba48c4";
           sha256 = "1dql2w8xkdw52zlrc2p9x391zn8wv4dj8a6293p4s08if7gg260w";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ad758d865bde8c97d27c0d57cabe1606f8b36974/recipes/term+key-intercept";
           sha256 = "1564a86950xdwsrwinrs118bjsfmbv8gicq0c2dfr827v5b6zrlb";
-          name = "term-plus-key-intercept";
+          name = "recipe";
         };
         packageRequires = [ key-intercept term-plus ];
         meta = {
@@ -71683,8 +89453,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    term-plus-mux = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, tab-group, term-plus }:
-    melpaBuild {
+    term-plus-mux = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild
+                                 , tab-group
+                                 , term-plus }:
+      melpaBuild {
         pname = "term-plus-mux";
         version = "20140210.2349";
         src = fetchFromGitHub {
@@ -71693,10 +89468,10 @@
           rev = "81b60e80cf008472bfd7fad9233af2ef722c208a";
           sha256 = "12gfvcf7hl29xhg231cx76q04ll7cvfpvhkb0qs3qn1sqb50fs2q";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ad758d865bde8c97d27c0d57cabe1606f8b36974/recipes/term+mux";
           sha256 = "129kzjpi5nzagqkjfikx9i7k6489dy7d3pd7ggn59p4cnh3r2rhh";
-          name = "term-plus-mux";
+          name = "recipe";
         };
         packageRequires = [ tab-group term-plus ];
         meta = {
@@ -71704,20 +89479,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    term-projectile = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile, term-manager }:
-    melpaBuild {
+    term-projectile = callPackage ({ emacs
+                                   , fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild
+                                   , projectile
+                                   , term-manager }:
+      melpaBuild {
         pname = "term-projectile";
         version = "20170421.105";
         src = fetchFromGitHub {
           owner = "IvanMalison";
           repo = "term-manager";
-          rev = "13a0f1637a1f075d70211ccb8162e63a18a474da";
-          sha256 = "0hvn60wk3w27fjb023drnaw0gmys6ancha8blpl0r4vc5k203kcf";
+          rev = "7180f09078f89aadb83061420ca8fd58d929b629";
+          sha256 = "1d1szcdpgmkp6r9qsvk7pv0swl626d5svna2xqr3lrpgqzmsjcnk";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5260876280148fae28a459f07932cebb059b560e/recipes/term-projectile";
           sha256 = "1mzyzjxkdfvf1kq9m3c1f6y6xzj1qq53rixawmnzmil5cmznvwag";
-          name = "term-projectile";
+          name = "recipe";
         };
         packageRequires = [ emacs projectile term-manager ];
         meta = {
@@ -71725,8 +89506,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    term-run = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    term-run = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "term-run";
         version = "20151228.105";
         src = fetchFromGitHub {
@@ -71735,10 +89519,10 @@
           rev = "54650dbbabb13cb2a6c0670ff6b24b29717a6a8b";
           sha256 = "149pl3zxg5kriydk5h6j95jyly6i23w4w4g4a99s4zi6ljiny6c6";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7cad6343104bfe5724e068660af79a6249010164/recipes/term-run";
           sha256 = "1bx3s68rgr9slsw9k01gfg7sxd4z7sarg4pi2ivril7108mhg2cs";
-          name = "term-run";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -71746,8 +89530,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    termbright-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    termbright-theme = callPackage ({ emacs
+                                    , fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "termbright-theme";
         version = "20151030.1935";
         src = fetchFromGitHub {
@@ -71756,10 +89544,10 @@
           rev = "bec6ab14336c0611e85f45486276004f16d20607";
           sha256 = "0gfsqpza8phvma5y3ck0n6p197x1i33w39m3c7jmja4ml121n73d";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a7151773de39fe570e3e9b351daad89db9dd267f/recipes/termbright-theme";
           sha256 = "14q88qdbnyzxr8sr8i5glj674sb4150b9y6nag0dqrxs629is6xj";
-          name = "termbright-theme";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -71767,20 +89555,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    terminal-here = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    terminal-here = callPackage ({ cl-lib ? null
+                                 , emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "terminal-here";
-        version = "20180208.944";
+        version = "20180513.133";
         src = fetchFromGitHub {
           owner = "davidshepherd7";
           repo = "terminal-here";
-          rev = "e769d3741d1023af4f965609f75e3567c89de6f0";
-          sha256 = "0g0y8haw1476jr0pd1s9jckf78da11aigdkd9akzlawsvvx8z864";
+          rev = "2b57dcfc7d78c6762eb74b37930067a75beb5ca4";
+          sha256 = "01zljgwp5r8vd913y4r9s3ysrsp8qf2s7sgxl6xvh5iry06d1wpr";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f8df6f7e23476eb52e7fdfbf9de277d3b44db978/recipes/terminal-here";
           sha256 = "1w64r3y88lspxxcqcqfwhakk8p9vl7q3z610dykfbqwqx61a6adj";
-          name = "terminal-here";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -71788,20 +89581,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    tern = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }:
-    melpaBuild {
+    tern = callPackage ({ cl-lib ? null
+                        , emacs
+                        , fetchFromGitHub
+                        , fetchurl
+                        , json ? null
+                        , lib
+                        , melpaBuild }:
+      melpaBuild {
         pname = "tern";
         version = "20170925.1333";
         src = fetchFromGitHub {
           owner = "ternjs";
           repo = "tern";
-          rev = "ae83725819286d3f134a6b9956f1117b341e1040";
-          sha256 = "049xbwnd7qswvpqka1nsgj0zchmwqvg5dx52xg3kl6mf223xd5n7";
+          rev = "5c395b5d696aad5a185724f56c74a7f83349f3bd";
+          sha256 = "11sp1jz0fn8gnc28qvyrmc7qxr1gn5r3vxv6gp46p7cmgg9mflri";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/eaecd67af24050c72c5df73c3a12e717f95d5059/recipes/tern";
           sha256 = "1am97ssslkyijpvgk4nldi67ws48g1kpj6gisqzajrrlw5q93wvd";
-          name = "tern";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs json ];
         meta = {
@@ -71809,20 +89608,27 @@
           license = lib.licenses.free;
         };
       }) {};
-    tern-auto-complete = callPackage ({ auto-complete, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, tern }:
-    melpaBuild {
+    tern-auto-complete = callPackage ({ auto-complete
+                                      , cl-lib ? null
+                                      , emacs
+                                      , fetchFromGitHub
+                                      , fetchurl
+                                      , lib
+                                      , melpaBuild
+                                      , tern }:
+      melpaBuild {
         pname = "tern-auto-complete";
         version = "20170521.1235";
         src = fetchFromGitHub {
           owner = "ternjs";
           repo = "tern";
-          rev = "ae83725819286d3f134a6b9956f1117b341e1040";
-          sha256 = "049xbwnd7qswvpqka1nsgj0zchmwqvg5dx52xg3kl6mf223xd5n7";
+          rev = "d545bbdd8482c231211f9521c688fc06632e745e";
+          sha256 = "0ribzvl5gs281chp2kqaqmjj9xji7k9l71hsblfw1vj2w9l7nw2m";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/eaecd67af24050c72c5df73c3a12e717f95d5059/recipes/tern-auto-complete";
           sha256 = "1i99b4awph50ygcqsnppm1h48hbf8cpq1ppd4swakrwgmcy2mn26";
-          name = "tern-auto-complete";
+          name = "recipe";
         };
         packageRequires = [ auto-complete cl-lib emacs tern ];
         meta = {
@@ -71830,20 +89636,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    tern-context-coloring = callPackage ({ context-coloring, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, tern }:
-    melpaBuild {
+    tern-context-coloring = callPackage ({ context-coloring
+                                         , emacs
+                                         , fetchFromGitHub
+                                         , fetchurl
+                                         , lib
+                                         , melpaBuild
+                                         , tern }:
+      melpaBuild {
         pname = "tern-context-coloring";
         version = "20161217.2347";
         src = fetchFromGitHub {
           owner = "jacksonrayhamilton";
           repo = "tern-context-coloring";
-          rev = "3a8e979d6cc83aabcb3dda3f5f31a6422532efba";
-          sha256 = "1rq5aqmsd7jqvwypafad9gmfcwjqjah00j7cws46k5f0dirjaa1y";
+          rev = "db0466c650ed4f7e6621a48dfdc53eaf5e127be9";
+          sha256 = "093mdq97gc0ljw6islhm7y1yl3yf7w4gf205s96bnsnb1v952n63";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/db2119d2c2d167d771ee02c2735b435d59991b93/recipes/tern-context-coloring";
           sha256 = "0wkb7gn2ma6mz495bgphcjs5p0c6a869zk4a8mnm0spq41xbw4gi";
-          name = "tern-context-coloring";
+          name = "recipe";
         };
         packageRequires = [ context-coloring emacs tern ];
         meta = {
@@ -71851,20 +89663,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    tern-django = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, tern }:
-    melpaBuild {
+    tern-django = callPackage ({ emacs
+                               , f
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild
+                               , tern }:
+      melpaBuild {
         pname = "tern-django";
         version = "20160221.1123";
         src = fetchFromGitHub {
           owner = "proofit404";
           repo = "tern-django";
-          rev = "46f2cd5e96bc804069f18455a828b8e4c5ec358a";
-          sha256 = "0b1279i05qmk85zgdd1qy0r823ajg7fxzi62qlhd7l03wivlbkc0";
+          rev = "856fc98dc5e7cb4c8bc200f99150cc6187c82861";
+          sha256 = "15jzqwfr1958s21qzimvv87kckqyq01bimqgawb51b6xi9ib3biv";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e9e128a795e4949e3d4c2f01db0161a34935f635/recipes/tern-django";
           sha256 = "1pjaaffadaw8h2n7yv01ks19gw59dmh8bp8vw51hx1082r3yfvv0";
-          name = "tern-django";
+          name = "recipe";
         };
         packageRequires = [ emacs f tern ];
         meta = {
@@ -71872,8 +89690,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    terraform-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, hcl-mode, lib, melpaBuild }:
-    melpaBuild {
+    terraform-mode = callPackage ({ emacs
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , hcl-mode
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "terraform-mode";
         version = "20170111.2117";
         src = fetchFromGitHub {
@@ -71882,10 +89705,10 @@
           rev = "6973d1acaba2835dfdf174f5a5e27de6366002e1";
           sha256 = "12ww36g7mz4p4nslajcsdcm8xk6blwjwqjwhyp0n10ym6ssbh820";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/93e06adf34bc613edf95feaca64c69a0a2a4b567/recipes/terraform-mode";
           sha256 = "1m3s390mn4pba7zk17xfk045dqr4rrpv5gw63jm18fyqipsi6scn";
-          name = "terraform-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs hcl-mode ];
         meta = {
@@ -71893,20 +89716,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    test-c = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    test-c = callPackage ({ emacs
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "test-c";
-        version = "20170316.1432";
+        version = "20180423.1020";
         src = fetchFromGitHub {
           owner = "aaptel";
           repo = "test-c";
-          rev = "5a8c22a0e5ae6e2b0157bf1c41f0fe798c562a21";
-          sha256 = "0g1xbb8n3006cqzb6awiqk7n0b6h54dlm7iz5r1n48zaf7mp6046";
+          rev = "761a576f62c7021ba941f178f153c51289df1553";
+          sha256 = "04dxgg4jz8cnw19wxybjwd36z8i9j6an15k9pz3zh3v7m72qzw7c";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ef915dc2d3bc09ef79eb8edde02101c89733c0b2/recipes/test-c";
           sha256 = "1gy5dxkd4fpzzm2sq9g7bmi1ylwvsgh6hlvjmc1c064wjkha9j9z";
-          name = "test-c";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -71914,20 +89741,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    test-case-mode = callPackage ({ fetchFromGitHub, fetchurl, fringe-helper, lib, melpaBuild }:
-    melpaBuild {
+    test-case-mode = callPackage ({ fetchFromGitHub
+                                  , fetchurl
+                                  , fringe-helper
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "test-case-mode";
         version = "20130525.734";
         src = fetchFromGitHub {
           owner = "ieure";
           repo = "test-case-mode";
-          rev = "6074df10ebc97ddfcc228c71c73db179e672dac3";
-          sha256 = "1r3fmb8cshgh9pppdvydfcrzlmb9cgz4m04rgv69c5xv8clwcmbr";
+          rev = "26e397c0f930b7eb0be413ef7dd257b1da052bec";
+          sha256 = "108csr1d7w0105rb6brzgbksb9wmq1p573vxbq0miv5k894j447f";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d2e0bf342713cbdf30cf98d0bbc7476b0abeb7f5/recipes/test-case-mode";
           sha256 = "1iba97yvbi5vr7gvc58gq2ah6jg2s7apc9ssq7mdzki823n8z2qi";
-          name = "test-case-mode";
+          name = "recipe";
         };
         packageRequires = [ fringe-helper ];
         meta = {
@@ -71935,8 +89766,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    test-kitchen = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    test-kitchen = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "test-kitchen";
         version = "20171129.1235";
         src = fetchFromGitHub {
@@ -71945,10 +89779,10 @@
           rev = "0fc0ca4808425f03fbeb8125246043723e2a179a";
           sha256 = "1pip15ysya8nsk1xgz6k6gcjm6g60922r0im2anq4j2gjzdja79k";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/420d18c76f593338fb28807fcbe3b884be5b1634/recipes/test-kitchen";
           sha256 = "1bl3yvj56dq147yplrcwphcxiwvmx5n97y4qpkm9imiv8cnjm1g0";
-          name = "test-kitchen";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -71956,8 +89790,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    test-simple = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    test-simple = callPackage ({ cl-lib ? null
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "test-simple";
         version = "20170527.832";
         src = fetchFromGitHub {
@@ -71966,10 +89804,10 @@
           rev = "b3b69f52207d3a8111421ad7ab9ed82abbe85316";
           sha256 = "0n400nmz3iyp50sdd4gz0bmfn1sfq5p6a69yv4zd09ypa9gkndws";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a4b76e053faee299f5b770a0e41aa615bf5fbf10/recipes/test-simple";
           sha256 = "1l6y77fqd0l0mh2my23psi66v5ya6pbr2hgvcbsaqjnpmfm90w3g";
-          name = "test-simple";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -71977,8 +89815,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    tex-smart-umlauts = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    tex-smart-umlauts = callPackage ({ fetchFromGitHub
+                                     , fetchurl
+                                     , lib
+                                     , melpaBuild }:
+      melpaBuild {
         pname = "tex-smart-umlauts";
         version = "20160427.58";
         src = fetchFromGitHub {
@@ -71987,10 +89828,10 @@
           rev = "5261b931443558f4252489a1e6616034848aff02";
           sha256 = "1rq1l52mgbasgwvjwpivjrfjf8l8r85wdkfpbw8213449qh9c9zh";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/30de78c9cf83de30093a5647976eeaf552d4b2cb/recipes/tex-smart-umlauts";
           sha256 = "05q5mzl0pya682hdmjyp09hh121dc5y4d5vgqjffx3yfd5kgsy5w";
-          name = "tex-smart-umlauts";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -71998,8 +89839,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    texfrag = callPackage ({ auctex, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    texfrag = callPackage ({ auctex
+                           , emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "texfrag";
         version = "20180318.1647";
         src = fetchFromGitHub {
@@ -72008,10 +89854,10 @@
           rev = "8bb74e2d38139d6497545581a3507c6f7b4fa5e2";
           sha256 = "03pqbx2mwz2lz7027da0aiyh12f2jifdfvxh0s83qshsnw6sipmk";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/756649bbe2dc6233c66c3d128a8096be12231078/recipes/texfrag";
           sha256 = "195vdpwqzypz35v8hc7ai9xpv1flrik60lgrk5m7xypnlp7mpr2x";
-          name = "texfrag";
+          name = "recipe";
         };
         packageRequires = [ auctex emacs ];
         meta = {
@@ -72019,8 +89865,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    textile-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    textile-mode = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "textile-mode";
         version = "20170304.916";
         src = fetchFromGitHub {
@@ -72029,10 +89878,10 @@
           rev = "c37aaab809503df008209390e31e19abf4e23630";
           sha256 = "16543im5iymc5hfcix1lglbvpq4v0441vb7sk58nbnffqba83yzy";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3ebe5e52bc9bb8875ca390b34ac32eb47f4e1252/recipes/textile-mode";
           sha256 = "0c1l7ml9b1zipk5fhmhirrh070h0qwwiagdk84i04yvdmmcjw2nf";
-          name = "textile-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -72040,8 +89889,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    textmate = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    textmate = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "textmate";
         version = "20110816.1446";
         src = fetchFromGitHub {
@@ -72050,10 +89902,10 @@
           rev = "350918b070148f0ace6d9d3cd4ebcaf15c1a8781";
           sha256 = "1b7xxz1i84azmbz8rqpxdn18avmnqlj87hfrpbngbf6pj5h9jqjh";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ad3923ac8948de75a159e916ecc22005a17458ad/recipes/textmate";
           sha256 = "119w944pwarpqzcr9vys17svy1rkfs9hiln8903q9ff4lnjkpf1v";
-          name = "textmate";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -72061,8 +89913,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    textmate-to-yas = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    textmate-to-yas = callPackage ({ fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "textmate-to-yas";
         version = "20160409.1008";
         src = fetchFromGitHub {
@@ -72071,10 +89926,10 @@
           rev = "be3a768b7ac4c2e24b9d4aa6e9ac1d916cdc5a73";
           sha256 = "1bz5ys36wd00clq9w3ahqpras368aj2b9d4bl32qc6dyp8jfknmz";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/487c461bf658d50135428d72fbfbb2573a00eb7d/recipes/textmate-to-yas";
           sha256 = "04agz4a41h0givfdw88qjd3c7pd418qyigsij4la5f37j5rh338l";
-          name = "textmate-to-yas";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -72082,8 +89937,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    textx-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    textx-mode = callPackage ({ emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "textx-mode";
         version = "20170516.211";
         src = fetchFromGitHub {
@@ -72092,10 +89951,10 @@
           rev = "72f9f0c5855b382024f0da8f56833c22a70a5cb3";
           sha256 = "1lr9v7dk0pnmpvdvs4m5d9yvxlii0xzr8b3akknm25gvbw1y1q8k";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/dada0378af342e0798c418032a8dcc7dfd80d600/recipes/textx-mode";
           sha256 = "10y95m6fskvdb2gh078ifa70nc48shkvw0223iyqbyjys35h53bn";
-          name = "textx-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -72103,20 +89962,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    tf2-conf-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    tf2-conf-mode = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "tf2-conf-mode";
         version = "20161209.820";
         src = fetchFromGitHub {
           owner = "wynro";
           repo = "emacs-tf2-conf-mode";
-          rev = "536950f64c071ffd8495fb2c7ac7c63a11e25f93";
-          sha256 = "0vga7kgzp9wiiji1w47llbb3gp9qgwk8v0f6s8b6jng2gmdg25bk";
+          rev = "94c971da4a78d55da2848d1e76d513e5e0a8f7eb";
+          sha256 = "0rg3ja6lc2bwq0nw50s0whsb690m7cs6p6an52hlb0qlfwd23mpv";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c43c53dca64cf0c7d59ffd0b17e9fe60f4aa90d3/recipes/tf2-conf-mode";
           sha256 = "09kvb3ya1dx5pc146a6r9386fg9n9nfpcxm5mmhmyf75h9c6a25g";
-          name = "tf2-conf-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -72124,8 +89986,37 @@
           license = lib.licenses.free;
         };
       }) {};
-    theme-changer = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    tfsmacs = callPackage ({ emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild
+                           , tablist }:
+      melpaBuild {
+        pname = "tfsmacs";
+        version = "20180629.1011";
+        src = fetchFromGitHub {
+          owner = "sebasmonia";
+          repo = "tfsmacs";
+          rev = "8eb5906aa7e1ec469f6347545afabca787b2b223";
+          sha256 = "0an6hz0kd5mvcx61xhdi62zw15x6yqqx8mmm7jsd008kifrk27d4";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/b449d004bdb498c2a1d155671070e0745c7d7598/recipes/tfsmacs";
+          sha256 = "0j9rkcjxvgkcdnw2lxgk6bwid3q460n0hjxsj4nklv13s5b1hlyk";
+          name = "recipe";
+        };
+        packageRequires = [ emacs tablist ];
+        meta = {
+          homepage = "https://melpa.org/#/tfsmacs";
+          license = lib.licenses.free;
+        };
+      }) {};
+    theme-changer = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "theme-changer";
         version = "20171221.1127";
         src = fetchFromGitHub {
@@ -72134,10 +90025,10 @@
           rev = "61945695a30d678e6a5d47cbe7c8aff59a8c30ea";
           sha256 = "14xc36jfgj8896pklrkpg394fgikir051rh9vm70v132n6i9j0cn";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d08b24a2aec1012751054c68f7d55bac1bd1fd11/recipes/theme-changer";
           sha256 = "1qbmsghkl5gs728q0gaalc7p8q7nzv3l045jc0jdxxnb7na3gc5w";
-          name = "theme-changer";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -72145,20 +90036,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    theme-looper = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    theme-looper = callPackage ({ cl-lib ? null
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "theme-looper";
         version = "20170425.606";
         src = fetchFromGitHub {
           owner = "myTerminal";
           repo = "theme-looper";
-          rev = "875c2cfc84b3c143d3b14a7aba38905e35559157";
-          sha256 = "145gbjizkkmdil1mmhsppmda22xg6blz81zqfsrd5aznwpiyw36q";
+          rev = "5e3a3ea7ad31d4b38efa2cc08f0063b230736da9";
+          sha256 = "06khrrjlhnzckr2zisdbx4pj6r8kmv7dbdzvzh74qz79x337lvzn";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/theme-looper";
           sha256 = "018bixcbzri3zsasy1pp2qfvgd679ylpi9gq26qv9iwlfhlrpwgf";
-          name = "theme-looper";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -72166,8 +90061,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    therapy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    therapy = callPackage ({ emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "therapy";
         version = "20151113.1153";
         src = fetchFromGitHub {
@@ -72176,10 +90075,10 @@
           rev = "775a92bb7b6b0fcc5b38c0b5198a9d0a1bef788a";
           sha256 = "12kz4alyf3y2i7lkvi26hcxy55v0blsrxv5srx9fv5jhxkdz1vq1";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/34e1bfdc684aaa7ebfbaa0ed60f8322c3de8a40d/recipes/therapy";
           sha256 = "0y040ghb0y6aq0nchqr09vapz6h6112rkwxkqsx0v7xmqrqfjvhh";
-          name = "therapy";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -72187,8 +90086,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    thingopt = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    thingopt = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "thingopt";
         version = "20160520.1618";
         src = fetchFromGitHub {
@@ -72197,10 +90099,10 @@
           rev = "5679815852652479f3b3c9f3a98affc927384b2c";
           sha256 = "12zpn0sy2yg37jjjx12h3kln56241b3z09bn5zavmjfdwnr9jd0a";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1b82d4102fa2c7622e76dae1154aaa8340b7f4b8/recipes/thingopt";
           sha256 = "0yvzq1z2nrldr8vhcvxqgzvh4gbrjjwfmprg59p4v5hlxvhxsb1y";
-          name = "thingopt";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -72208,20 +90110,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    thinks = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    thinks = callPackage ({ cl-lib ? null
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "thinks";
         version = "20170802.428";
         src = fetchFromGitHub {
           owner = "davep";
           repo = "thinks.el";
-          rev = "c02f236abc8c2025d9f01460b09b89ebdc96e28d";
-          sha256 = "0g4ls668kyqnh4xkvz1s1z9j6n0a1gkgrzgl98hys7hny6zrk7aa";
+          rev = "15e0437f5b635bdcf738ca092e26aa6d8ecdba36";
+          sha256 = "1i2i8c53z8n48407jaz641adszv13yjg8cvq4k3hijddp651k555";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/439957cabf379651dc243219a83c3c96bae6f8cf/recipes/thinks";
           sha256 = "11vj9mjfzmqwdmkq97aqns3fh8hkgx9scnki6c2iag5lj0av2vcq";
-          name = "thinks";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -72229,8 +90135,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    thread-dump = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    thread-dump = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "thread-dump";
         version = "20170816.1150";
         src = fetchFromGitHub {
@@ -72239,10 +90148,10 @@
           rev = "204c9600242756d4b514bb5ff6293e052bf4b49d";
           sha256 = "11qx194gwizqg7p2mqy7mdfii85bdayabxfd388dmrm916i4w47n";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/thread-dump";
           sha256 = "0dzr86jyf2j49gq40q6qd6lppa57n65n94xzpdjjbs182hxzavp2";
-          name = "thread-dump";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -72250,8 +90159,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    threes = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }:
-    melpaBuild {
+    threes = callPackage ({ emacs
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild
+                          , seq }:
+      melpaBuild {
         pname = "threes";
         version = "20160820.542";
         src = fetchFromGitHub {
@@ -72260,10 +90174,10 @@
           rev = "6981acb30b856c77cba6aba63fefbf102cbdfbb2";
           sha256 = "1a7zqq6kmqxgzbsg8yczlvipzv65n10c8j26mc507p4m47nlikgv";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bff7d9ffbca45629f310743aff776b762c8507cc/recipes/threes";
           sha256 = "03zwcaibdj88a6whccc5ysqsnfwi76yhsgjsfp3lxjcmlkwqzjbs";
-          name = "threes";
+          name = "recipe";
         };
         packageRequires = [ emacs seq ];
         meta = {
@@ -72271,20 +90185,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    thrift = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    thrift = callPackage ({ fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "thrift";
         version = "20140312.1348";
         src = fetchFromGitHub {
           owner = "apache";
           repo = "thrift";
-          rev = "c564651dd404d7e9ff6bf7e5b343f429b9e52082";
-          sha256 = "19i37mhyvg80d6j2zdxi5iljv28fbx5mjnayc6p14rqhk93xm856";
+          rev = "98bebac1520bcf1dd5392535e06a751d7b2af58e";
+          sha256 = "185hrigx5q15c2jimzbklmi4z6kzigsarqwr805llsmsmg9pp3wi";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/857ab7e3a5c290265d88ebacb9685b3faee586e5/recipes/thrift";
           sha256 = "0p1hxmm7gvhyigz8aylncgqbhk6cyf75rbcqis7x552g605mhiy9";
-          name = "thrift";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -72292,8 +90209,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    thumb-through = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    thumb-through = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "thumb-through";
         version = "20120118.2134";
         src = fetchFromGitHub {
@@ -72302,10 +90222,10 @@
           rev = "08d8fb720f93c6172653e035191a8fa9c3305e63";
           sha256 = "0nypcryqwwsdawqxi7hgsv6fp28zqslj9phw7zscqqxzc3svaywn";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/thumb-through";
           sha256 = "1544xw9lar199idk135z4d6i3n9w0v7g2bq7fnz0rjjw10kxvpcx";
-          name = "thumb-through";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -72313,8 +90233,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    tickscript-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    tickscript-mode = callPackage ({ emacs
+                                   , fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "tickscript-mode";
         version = "20171218.1803";
         src = fetchFromGitHub {
@@ -72323,10 +90247,10 @@
           rev = "f0579f38ff14954df5002ce30ae6d4a2c978d461";
           sha256 = "0b3rbsd978ch0hiv45sqg9g4zsxhjn557j5f72vjql8cx1h5d8s4";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c60ee1839f728c5041bde1fe4fa62c4d41c746ef/recipes/tickscript-mode";
           sha256 = "0wnck6j377idx7h7csmfdhp6napv3zs4sd24lknfclafhslllp54";
-          name = "tickscript-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -72334,20 +90258,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    tidal = callPackage ({ emacs, fetchFromGitHub, fetchurl, haskell-mode, lib, melpaBuild }:
-    melpaBuild {
+    tidal = callPackage ({ emacs
+                         , fetchFromGitHub
+                         , fetchurl
+                         , haskell-mode
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "tidal";
         version = "20180410.1245";
         src = fetchFromGitHub {
           owner = "tidalcycles";
           repo = "Tidal";
-          rev = "f8af7bdbda547ebd12cf5c0ee1327f33cd9aa93f";
-          sha256 = "0y7a4bxsgpbg1sbsi4xdp4k9x3l0vh7acm5i3k87acpcpfb9aq5y";
+          rev = "ef658d3df0604f3dec955a150509ec1cc68fbd98";
+          sha256 = "1ild1gnbcrw830b8d3byvqlmgm27609dgailmxgin6z7g1pg4r7z";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/16a26659a16199b5bb066be6e5c4a40419bda018/recipes/tidal";
           sha256 = "0im0qbavpykacrwww3y0mlbhf5yfx8afcyvsq5pmjjp0aw245w6a";
-          name = "tidal";
+          name = "recipe";
         };
         packageRequires = [ emacs haskell-mode ];
         meta = {
@@ -72355,20 +90284,28 @@
           license = lib.licenses.free;
         };
       }) {};
-    tide = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, s, typescript-mode }:
-    melpaBuild {
+    tide = callPackage ({ cl-lib ? null
+                        , dash
+                        , fetchFromGitHub
+                        , fetchurl
+                        , flycheck
+                        , lib
+                        , melpaBuild
+                        , s
+                        , typescript-mode }:
+      melpaBuild {
         pname = "tide";
-        version = "20180416.755";
+        version = "20180713.30";
         src = fetchFromGitHub {
           owner = "ananthakumaran";
           repo = "tide";
-          rev = "e9a19bf500ee9c1a31d420055c159da44ada92db";
-          sha256 = "0kfcllkkhknqx69h407v5v6b0p8g0xpd5ashh2smhz9zdnxwx1m8";
+          rev = "4aaa1b3d3a978a76d773f2fbee6143eda9085f23";
+          sha256 = "1vkgjy5gfiwqjnq5mbxbfh4c1f6kn2pbibki6hmq593wd4212lnn";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a21e063011ebbb03ac70bdcf0a379f9e383bdfab/recipes/tide";
           sha256 = "1z2xr25s23sz6nrzzw2xg1l2j8jvjhxi53qh7nvxmmq6n6jjpwg1";
-          name = "tide";
+          name = "recipe";
         };
         packageRequires = [ cl-lib dash flycheck s typescript-mode ];
         meta = {
@@ -72376,8 +90313,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    tile = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, stream }:
-    melpaBuild {
+    tile = callPackage ({ dash
+                        , emacs
+                        , fetchFromGitHub
+                        , fetchurl
+                        , lib
+                        , melpaBuild
+                        , s
+                        , stream }:
+      melpaBuild {
         pname = "tile";
         version = "20161224.1957";
         src = fetchFromGitHub {
@@ -72386,10 +90330,10 @@
           rev = "22660f21f6e95de5aba55cd5d293d4841e9a4661";
           sha256 = "1qxhrm852j93sqi1lznlrjn7s0vscsixm48g46ja70gl320chyzm";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/424cfd28378ef328721bb0dc3651808e64c01306/recipes/tile";
           sha256 = "1795048ilpg6y9pn0jj0js5446hwxhwm6qmk50hds0hpcb396vbv";
-          name = "tile";
+          name = "recipe";
         };
         packageRequires = [ dash emacs s stream ];
         meta = {
@@ -72397,8 +90341,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    time-ext = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    time-ext = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "time-ext";
         version = "20170126.415";
         src = fetchFromGitHub {
@@ -72407,10 +90354,10 @@
           rev = "d128becf660fe3f30178eb1b05cd266741f4784a";
           sha256 = "0ynxmik33hh0znmznrf7lkmsh5xggbrvbdhiqa61r0b7gs3jk5fd";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f8e4328cae9b4759a75da0b26ea8b68821bc71af/recipes/time-ext";
           sha256 = "133vd63p8258wam4fvblhfg37w2zqy4a5c5c5nafwx0cy90sngwz";
-          name = "time-ext";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -72418,20 +90365,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    timecop = callPackage ({ cl-lib ? null, datetime-format, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    timecop = callPackage ({ cl-lib ? null
+                           , datetime-format
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "timecop";
         version = "20160520.352";
         src = fetchFromGitHub {
           owner = "emacs-php";
           repo = "emacs-datetime";
-          rev = "e6427538b547cbe02e1bd6ed4b765c73620bdae8";
-          sha256 = "1573z8wq5m8qzbzmnsz2fmbwrj9c0ava0jjfchzmwm2b3jyvqh5r";
+          rev = "3a1871613facc928ff250ed8f12fbc7073e46b75";
+          sha256 = "0pabb260d3vcr57jqqxqk90vp2qnm63sky37rgvhv508zix2hbva";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/eb13cb0dba1696cc51132cd1ff723fa17f892a7c/recipes/timecop";
           sha256 = "1hnmxcc2hjx9a4jyavx2v9hxmqacmmg1xj86rxqx3ms32hgigji5";
-          name = "timecop";
+          name = "recipe";
         };
         packageRequires = [ cl-lib datetime-format ];
         meta = {
@@ -72439,8 +90391,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    timer-revert = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    timer-revert = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "timer-revert";
         version = "20150122.1232";
         src = fetchFromGitHub {
@@ -72449,10 +90404,10 @@
           rev = "615c91dec8b440d2b9b7c725dd733d7432564e45";
           sha256 = "1hidvbd1xzz9m0fc55wac1mpv4dpcf8qnw1myh3646bfvivj9c2q";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/991e68c59d1fbaef06ba2583f07499ecad05586d/recipes/timer-revert";
           sha256 = "0lvm2irfx9rb5psm1lf53fv2jjx745n1c172xmyqip5xwgmf6msy";
-          name = "timer-revert";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -72460,8 +90415,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    timesheet = callPackage ({ auctex, fetchFromGitHub, fetchurl, lib, melpaBuild, org, s }:
-    melpaBuild {
+    timesheet = callPackage ({ auctex
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild
+                             , org
+                             , s }:
+      melpaBuild {
         pname = "timesheet";
         version = "20160530.1445";
         src = fetchFromGitHub {
@@ -72470,10 +90431,10 @@
           rev = "2ed6fea9b508eb7eaff659d9a34a09ba064d4df8";
           sha256 = "028d1sn29idznzsc95w2c1sdz3rpmf3vgk2365li0vvs99s51hi2";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/40009ef2f6845c83242ca5d0a8c9c2c1e4ef8a9d/recipes/timesheet";
           sha256 = "1gy6bf4wqvp8cw2wjnrr9ijnzwav3p7j46m7qrn6l0517shwl506";
-          name = "timesheet";
+          name = "recipe";
         };
         packageRequires = [ auctex org s ];
         meta = {
@@ -72481,20 +90442,31 @@
           license = lib.licenses.free;
         };
       }) {};
-    timonier = callPackage ({ all-the-icons, dash, emacs, f, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild, pkg-info, request, s }:
-    melpaBuild {
+    timonier = callPackage ({ all-the-icons
+                            , dash
+                            , emacs
+                            , f
+                            , fetchFromGitHub
+                            , fetchurl
+                            , hydra
+                            , lib
+                            , melpaBuild
+                            , pkg-info
+                            , request
+                            , s }:
+      melpaBuild {
         pname = "timonier";
         version = "20170411.100";
         src = fetchFromGitHub {
           owner = "nlamirault";
           repo = "timonier";
-          rev = "0a150ea87bf695b43cf1740dfd7e553e0ae7601c";
-          sha256 = "18yls8zc8d5nhx8j3l5av5xvmxmjrrmbzzab59kc6zib0isgxlcz";
+          rev = "3460a878269424c8d19b7d5d8e04749d0a8bf203";
+          sha256 = "0hhjrmkz9xf5wazh52j2q6qqybjizk2jszvqjz9ywwg9milvqf50";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a31b0c177fd83bdeb1842a6ec3095de143bb4eae/recipes/timonier";
           sha256 = "0vb83kv2dkca2bq876icxs8iivv9qgkzmzrsxfpnvbv752b220b0";
-          name = "timonier";
+          name = "recipe";
         };
         packageRequires = [
           all-the-icons
@@ -72511,20 +90483,27 @@
           license = lib.licenses.free;
         };
       }) {};
-    timp = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, fifo-class, lib, melpaBuild, signal }:
-    melpaBuild {
+    timp = callPackage ({ cl-lib ? null
+                        , emacs
+                        , fetchFromGitHub
+                        , fetchurl
+                        , fifo-class
+                        , lib
+                        , melpaBuild
+                        , signal }:
+      melpaBuild {
         pname = "timp";
         version = "20160618.103";
         src = fetchFromGitHub {
           owner = "mola-T";
           repo = "timp";
-          rev = "66b21934b1eb8ee428c06dd64b3562ad44776a35";
-          sha256 = "1jbmc356cqmjann2wdjnikyb0l136lpjka6bjim0rjhipdnw2acn";
+          rev = "59657bf603904635d88c3fe4ff1ce45ee6572428";
+          sha256 = "13adchpry39fv3rz3mnc21hr66d176d52hbgmgh5p8p9ylay7xha";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/27896aeb813215a43aec07a5ddf0ab2176df38fb/recipes/timp";
           sha256 = "1vh2wsgd8bclkbzn59zqbzzfzs0xx6x82004l7vnma8z97swvhgs";
-          name = "timp";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs fifo-class signal ];
         meta = {
@@ -72532,8 +90511,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    tinkerer = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    tinkerer = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild
+                            , s }:
+      melpaBuild {
         pname = "tinkerer";
         version = "20170906.524";
         src = fetchFromGitHub {
@@ -72542,10 +90525,10 @@
           rev = "e34135555f3748b578c7f8706dfd0c888fb87581";
           sha256 = "0lzrarqh965ysd7w0z5rbisl45j11fbibyxmgivgy9parvhg59hk";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8a28e1dfe987287bac7c45f83ae6e754bc13e345/recipes/tinkerer";
           sha256 = "0qh6pzjn98jlpxcm9zf25ga0y3d3v53275a9zgswyhz33mafd7pd";
-          name = "tinkerer";
+          name = "recipe";
         };
         packageRequires = [ s ];
         meta = {
@@ -72553,20 +90536,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    tiny = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    tiny = callPackage ({ fetchFromGitHub
+                        , fetchurl
+                        , lib
+                        , melpaBuild }:
+      melpaBuild {
         pname = "tiny";
         version = "20170903.249";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "tiny";
-          rev = "012b2e7a67b9f067bbfa0292479861ffbaa201fa";
-          sha256 = "13hwzq5ip9pb6nmsg3377haz5f45nm96khrwdls07mzni6gay8az";
+          rev = "481d36e47e51f27e64c826633c01518459f17d1c";
+          sha256 = "1wdv017pc7ggxd3vwmhjckybxwkfkbk9inkkz6pnc58k0fflsp7l";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d3029dab001fff5d12e8a2bace6ddbf897842c26/recipes/tiny";
           sha256 = "183qczyb6c8zmdgmsjsj4hddmvnzzq4c7syslm861xcyxia94icy";
-          name = "tiny";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -72574,20 +90560,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    tiny-menu = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    tiny-menu = callPackage ({ emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "tiny-menu";
         version = "20161213.435";
         src = fetchFromGitHub {
           owner = "aaronbieber";
           repo = "tiny-menu.el";
-          rev = "05563b94537b6eb22aeddedef2a6e59e3f88d073";
-          sha256 = "0k0djq60mwhjiwy9dpy9m9bs507b9p19pdl3g2s8sd9i2fk53rfy";
+          rev = "f1fc844f514f57fd93602ff5e00c6125b0e93254";
+          sha256 = "125ckmfsvzacd5icsnldcbfl4rkxpfal6qfindy80i84vk0qw47g";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/82700c97ca40130e7508c151f60220d3f23bf23c/recipes/tiny-menu";
           sha256 = "1nngf6vsqfr9fx82mj8dl8zw0fpwf4kr74sflxxk7qxj4aw1jirk";
-          name = "tiny-menu";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -72595,8 +90585,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    tinysegmenter = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    tinysegmenter = callPackage ({ cl-lib ? null
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "tinysegmenter";
         version = "20141124.213";
         src = fetchFromGitHub {
@@ -72605,10 +90599,10 @@
           rev = "872134704bd25c13a4c59552433da4c6881b5230";
           sha256 = "1n8cn6mr26hgmsm2mkbj5gs6dv61d0pap8ija4g0n1vsibfhzd8j";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4f189290799f84282ff7cdecbb12a2a7cdfd1043/recipes/tinysegmenter";
           sha256 = "005yy2f8vghvwdcwakz5sr9n1gzk6cfyglm6d8b74y90d8fng0r6";
-          name = "tinysegmenter";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -72616,8 +90610,36 @@
           license = lib.licenses.free;
         };
       }) {};
-    tldr = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    tj3-mode = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
+        pname = "tj3-mode";
+        version = "20180519.528";
+        src = fetchFromGitHub {
+          owner = "csrhodes";
+          repo = "tj3-mode";
+          rev = "1d98eb23f1606392f34ef1b80517cfc940fb9950";
+          sha256 = "1gzi8pvdgj4s9c54m2a8hicvg8dzac6253kyd2h71bljm4ilwl0f";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/dcf0f535a543bf36df9fb2e59c7fb9dfc00820f7/recipes/tj3-mode";
+          sha256 = "06mhg0jc80cymplbri6axyzv18ayxppqz3vggywq9g2ba1vqj41h";
+          name = "recipe";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/tj3-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    tldr = callPackage ({ emacs
+                        , fetchFromGitHub
+                        , fetchurl
+                        , lib
+                        , melpaBuild }:
+      melpaBuild {
         pname = "tldr";
         version = "20180122.312";
         src = fetchFromGitHub {
@@ -72626,10 +90648,10 @@
           rev = "398b197c8d2238628b07e1b32d0f373876279f4c";
           sha256 = "0iq7qlis6c6r2qkdpncrhh5vsihkhvy5x4y1y8cjb7zxkh62w33f";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/45af2c5d1a36fcbf739812594c5cc878bf319a26/recipes/tldr";
           sha256 = "1f1xsmkbf4j1c876qqr9h8fgx3zxjgdfzvzf6capxlx2svhxzvc9";
-          name = "tldr";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -72637,8 +90659,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    tmmofl = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    tmmofl = callPackage ({ fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "tmmofl";
         version = "20121025.401";
         src = fetchFromGitHub {
@@ -72647,10 +90672,10 @@
           rev = "532aa6978e994e2b069ffe37aaf9a0011a07dadc";
           sha256 = "1ypbv9jbdnwv3xjsfzq8i3nmqdvziynv2rqsd6fm2r1xw0q06xd6";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8d29def44ae42dc4b60c1d254a57572bd09faf51/recipes/tmmofl";
           sha256 = "1idflc5ky8hwdkps1rihdqy3i6cmhrh83sxz3kgf2kqjh365yr8b";
-          name = "tmmofl";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -72658,20 +90683,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    toc-org = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    toc-org = callPackage ({ fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "toc-org";
-        version = "20171009.156";
+        version = "20180613.840";
         src = fetchFromGitHub {
           owner = "snosov1";
           repo = "toc-org";
-          rev = "4d259c9cea3f575e5210974c025ebe3d51cc317f";
-          sha256 = "04y7zib1wpxswkh7srxgh4bq25cpsybpi2aaynrwjms695ggh346";
+          rev = "e38e81af3f12633579c62f2ccf4bd0c8f18e2b88";
+          sha256 = "13jdz0b4jqpb5idfxszlsapfk7h488773m3ipj1ayfapxmly92gm";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1305d88eca984a66039444da1ea64f29f1950206/recipes/toc-org";
           sha256 = "06mx2b0zjck82vp3i4bwbqlrzn05i2rkf8080cn34nkizi59wlbs";
-          name = "toc-org";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -72679,20 +90707,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    todotxt = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    todotxt = callPackage ({ fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "todotxt";
-        version = "20170919.1141";
+        version = "20180626.1530";
         src = fetchFromGitHub {
           owner = "rpdillon";
           repo = "todotxt.el";
-          rev = "afa4079f15f705a4fa34ea8e14b122e73028f285";
-          sha256 = "07rhjxl8kvsjf23kxyl6xj51a2z1r66h4bsdsfj7nncavvybzqn3";
+          rev = "f13e404304c9d26c105de872f96b4601441b3875";
+          sha256 = "1yvy2pl2ncgkz1xz598qjvp2v3g66m57wz7nra2vira7m4kq4671";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/todotxt";
           sha256 = "1ravnkj6y2p027yhba2lan10079xzd2q7l8gyb8n6bwq14jif127";
-          name = "todotxt";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -72700,8 +90731,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    todotxt-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    todotxt-mode = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "todotxt-mode";
         version = "20150424.704";
         src = fetchFromGitHub {
@@ -72710,10 +90744,10 @@
           rev = "dc6ae151edee88f329ba7abc5d39b7440002232f";
           sha256 = "1k9ywi7cdgb6i600wr04r2l00423l6vr7k93qa7i7svv856nbbc7";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cdc1926c5de86749caba1ad2d1e75225a31a8558/recipes/todotxt-mode";
           sha256 = "1bs4air13ifx3xkhcfi80z29alsd63r436gnyvjyxlph2ip37v7k";
-          name = "todotxt-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -72721,20 +90755,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    togetherly = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    togetherly = callPackage ({ cl-lib ? null
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "togetherly";
         version = "20170425.2316";
         src = fetchFromGitHub {
           owner = "zk-phi";
           repo = "togetherly";
-          rev = "a6491bd5dd84f2aded0cd112ff06ae76ff78dfeb";
-          sha256 = "05x6ppfkpklxf1098acs6gpd3zm9k05vhywa7n01y2g6nhp697pw";
+          rev = "65072b1d5e04c7098c318ebf1af279f596039ef9";
+          sha256 = "1gjqwxpl1ysrjcmbs9w39hvim1avac7nm4rhmqhmrgwn84bxm2fl";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/05da36e2d57a57255423a24a34742cbac2f6c9a5/recipes/togetherly";
           sha256 = "01ks160dfmgh05lx0lmyg020hba8nw49mj51dp1afcsmx4dkis2f";
-          name = "togetherly";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -72742,8 +90780,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    toggle = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    toggle = callPackage ({ cl-lib ? null
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "toggle";
         version = "20180315.1703";
         src = fetchFromGitHub {
@@ -72752,10 +90794,10 @@
           rev = "ee8a9c3052446876057ff853369d136aea7831f5";
           sha256 = "15sla4n88003fclni5nhsrw3ib7bql11ks8pb7rgjyjddqrq274r";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bd02426ce7ab46361363c7a6c56b1575642003e0/recipes/toggle";
           sha256 = "08lk8h2dk5s8k93j5vmxdlgg453pif8wbcx2w3xkjlh43dw1vdfq";
-          name = "toggle";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -72763,8 +90805,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    toggle-quotes = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    toggle-quotes = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "toggle-quotes";
         version = "20140710.226";
         src = fetchFromGitHub {
@@ -72773,10 +90818,10 @@
           rev = "33abc221d6887f0518337851318065cd86c34b03";
           sha256 = "1w1lmqgzn9bp59h9y9plv80y53k6qhjgfmnnlqyyqfl45z3si7kg";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0f6e83e3184d336891f76c4740f64646d58ea980/recipes/toggle-quotes";
           sha256 = "16w453v4g7ww93bydim62p785x7w4vssp9l5liy0h3ppfmgvmxhp";
-          name = "toggle-quotes";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -72784,20 +90829,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    toggle-test = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    toggle-test = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "toggle-test";
         version = "20140722.2237";
         src = fetchFromGitHub {
           owner = "rags";
           repo = "toggle-test";
-          rev = "e969321f274903d705995a7d0345a257576ec5ff";
-          sha256 = "0sgaslqxj806byidh06h5pqmqz8jzjfz9ky8jvkif3cq3a479jby";
+          rev = "a0b64834101c2b8b24da365baea1d36e57b069b5";
+          sha256 = "1xx314cqi71iy7drd7nfia6hylyhwjd9jja1022l1p3imfmy2gyp";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8ea51a54b745d9978c5177182cd8501912aa2d01/recipes/toggle-test";
           sha256 = "0n8m325jcjhz8g75ysb9whsd12gpxw8598y5065j7c7gxjzv45l1";
-          name = "toggle-test";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -72805,8 +90853,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    toggle-window = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    toggle-window = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "toggle-window";
         version = "20141207.748";
         src = fetchFromGitHub {
@@ -72815,10 +90866,10 @@
           rev = "e82c60e543933880402ede11e9423e48a17dde53";
           sha256 = "0f86aij1glmvgpbhmfpi441zy0r37zblb0q3ycgq0dp92x8yny5r";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5505f778052353abce10f9ceef56ce95f5a5b662/recipes/toggle-window";
           sha256 = "1z080jywqj99xiwbvfclr6gjkc6spr3dqjb9kq1g4971vx4w8n9g";
-          name = "toggle-window";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -72826,20 +90877,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    tomatinho = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    tomatinho = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "tomatinho";
-        version = "20161023.1853";
+        version = "20180621.1048";
         src = fetchFromGitHub {
           owner = "konr";
           repo = "tomatinho";
-          rev = "7c301d343ecf7feac7348d1146075b2d9ba7d77a";
-          sha256 = "0kgd932857id83xdwpwf9x3ald1alx0s71dkkq84mj9yscxnz01p";
+          rev = "b53354b9b9f496c0388d6a573b06b7d6fc53d0bd";
+          sha256 = "0vf2b1c9raa723iy2gfdmxjv4q0ivixy1vbs1x5q09cibca8kp4x";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe20de5b2b5e5abe5be7468cea7c87f5b26b237/recipes/tomatinho";
           sha256 = "1ad3kr73v75vjrc09mdvb7a3ws834k5y5xha3v0ldah38cl1pmjz";
-          name = "tomatinho";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -72847,8 +90901,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    toml = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    toml = callPackage ({ fetchFromGitHub
+                        , fetchurl
+                        , lib
+                        , melpaBuild }:
+      melpaBuild {
         pname = "toml";
         version = "20130903.555";
         src = fetchFromGitHub {
@@ -72857,10 +90914,10 @@
           rev = "9633a6872928e737a2335aae1065768b23d8c3b3";
           sha256 = "1b3bkla6i5nvanifxchph6ab6ldrskdf240hy4d27dkmmnr3pban";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bab369a63ca0e7fcfacfcb9ac3847ac4e631b28c/recipes/toml";
           sha256 = "0kqv6zkywa7kqh8kg1dzcgkbi91lwx335przdakndm1lfai38i9b";
-          name = "toml";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -72868,8 +90925,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    toml-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    toml-mode = callPackage ({ cl-lib ? null
+                             , emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "toml-mode";
         version = "20161107.1000";
         src = fetchFromGitHub {
@@ -72878,10 +90940,10 @@
           rev = "f6c61817b00f9c4a3cab1bae9c309e0fc45cdd06";
           sha256 = "05b4ksay85c8y5ncax0qsvnmplwsfiw24z16a58gkarjz938hb57";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f8157d7d11f1e1848f0ba384249b4b8c6354830b/recipes/toml-mode";
           sha256 = "0yghf2ixl3dkcaxnkr4qzxfa9k1rrac7w5qpw1jx2bvic0cfs40l";
-          name = "toml-mode";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -72889,8 +90951,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    tommyh-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    tommyh-theme = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "tommyh-theme";
         version = "20131004.1630";
         src = fetchFromGitHub {
@@ -72899,10 +90964,10 @@
           rev = "46d1c69ee0a1ca7c67b569b891a2f28fed89e7d5";
           sha256 = "0pwbd5gzmpr6js20438870w605671930291070nhmhswvxfcdvay";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/da9b40184e1559c33edd5e6dac6447013710cb79/recipes/tommyh-theme";
           sha256 = "0nb9r407h08yxxdihxqx0c645bcz6qywbh2l654s3zfzdsqi1aj4";
-          name = "tommyh-theme";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -72910,8 +90975,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    tornado-template-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    tornado-template-mode = callPackage ({ fetchFromGitHub
+                                         , fetchurl
+                                         , lib
+                                         , melpaBuild }:
+      melpaBuild {
         pname = "tornado-template-mode";
         version = "20141128.208";
         src = fetchFromGitHub {
@@ -72920,10 +90988,10 @@
           rev = "667c0663dbbd279b6c345446b9f2bc50eb52b747";
           sha256 = "0wv49gn1daylnjmnallpqsqy7630ynrp45agpiwi6kwyyqk1kdvv";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f329baae028fd17618824128f312a49aa0a0807e/recipes/tornado-template-mode";
           sha256 = "1sdv9rlhnabydws2sppsjcgqr0lg6bjapv753ksq5aaq21qsps0h";
-          name = "tornado-template-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -72931,8 +90999,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    total-lines = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    total-lines = callPackage ({ emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "total-lines";
         version = "20171227.439";
         src = fetchFromGitHub {
@@ -72941,10 +91013,10 @@
           rev = "c762f08d039c8103f71c747e00304f209c2254f4";
           sha256 = "0ajbqrkg3v0yn8mj7dsv12w9zzcwjkabd776fabxamhcj6zbvza3";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1b6455dd89167a854477a00284f64737905b54d8/recipes/total-lines";
           sha256 = "0zpli7gsb56fc3pzb3b2bs7dzr9glkixbzgl4p2kc249vz3jqajh";
-          name = "total-lines";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -72952,20 +91024,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    totd = callPackage ({ cl-lib ? null, fetchFromGitLab, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    totd = callPackage ({ cl-lib ? null
+                        , fetchFromGitLab
+                        , fetchurl
+                        , lib
+                        , melpaBuild
+                        , s }:
+      melpaBuild {
         pname = "totd";
         version = "20150519.740";
         src = fetchFromGitLab {
           owner = "egh";
           repo = "emacs-totd";
-          rev = "ca47b618ea8290776cdb5b0f1c2c335691f69660";
-          sha256 = "188cdgic25wrb4jdgdcj070a0pxsh3m0rd9d2r6i1s1n1nalrs6g";
+          rev = "a715f7f2df416b8a6c827a9493ce7004180a3a4f";
+          sha256 = "08awv1vbqg0x0h7f036sh07vypm8lq6b5g36gq9dmyfaqci9ccw6";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9dc1e001585e1743047108ace180dfd7664ab8f1/recipes/totd";
           sha256 = "1bp07xl9yh9x6bi6cn8wz11x90jhv1rhxaig540iydjn5b0ny9m0";
-          name = "totd";
+          name = "recipe";
         };
         packageRequires = [ cl-lib s ];
         meta = {
@@ -72973,20 +91050,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    tox = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    tox = callPackage ({ fetchFromGitHub
+                       , fetchurl
+                       , lib
+                       , melpaBuild }:
+      melpaBuild {
         pname = "tox";
         version = "20160810.855";
         src = fetchFromGitHub {
           owner = "chmouel";
           repo = "tox.el";
-          rev = "7655eb254038d5e34433e8a9d66b3ffc9c72e40c";
-          sha256 = "1212b7s00kw9hk5gc2jx88hqd825rvkz1ss7phnxkrz833l062ki";
+          rev = "27a074b21238855ce3c33d22e42d69e2c2921205";
+          sha256 = "1m3f0i6vrkrncd7xsgz65m6595iv6yr4gbbzlis8p01kd98wbxfk";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/08a7433e16f2a9a2c04168600a9c99bc21c68ddf/recipes/tox";
           sha256 = "1z81x8fs5q6r19hpqphsilk8wdwwnfr8w78x5x298x74s9mcsywl";
-          name = "tox";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -72994,8 +91074,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    toxi-theme = callPackage ({ emacs, fetchhg, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    toxi-theme = callPackage ({ emacs
+                              , fetchhg
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "toxi-theme";
         version = "20160424.1426";
         src = fetchhg {
@@ -73003,10 +91087,10 @@
           rev = "b322fc7497a5";
           sha256 = "1pnsky541m8kzcv81w98jkv0hgajh04hxqlmgddc1y0wbvi849j0";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/toxi-theme";
           sha256 = "032m3qbxfd0qp81qwayd5g9k7vz55g4yhw0d35qkxzf4qf58x9sd";
-          name = "toxi-theme";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -73014,8 +91098,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    tql-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    tql-mode = callPackage ({ emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "tql-mode";
         version = "20170723.1954";
         src = fetchFromGitHub {
@@ -73024,10 +91112,10 @@
           rev = "488add79eb3fc8ec02aedaa997fe1ed9e5c3e638";
           sha256 = "09vkqr5n66w1q5f7m1vgiv0555v23wg6j46ri52lnnslsxpxhlyv";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6a7c3dec5d970a4e819c0166a4b9846d74484b08/recipes/tql-mode";
           sha256 = "0nrycix119vail6vk1kgqsli4l4cw8x49grc368n53w0xwngh0ns";
-          name = "tql-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -73035,24 +91123,35 @@
           license = lib.licenses.free;
         };
       }) {};
-    traad = callPackage ({ dash, deferred, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, request, request-deferred, virtualenvwrapper }:
-    melpaBuild {
+    traad = callPackage ({ dash
+                         , deferred
+                         , f
+                         , fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild
+                         , popup
+                         , request
+                         , request-deferred
+                         , virtualenvwrapper }:
+      melpaBuild {
         pname = "traad";
-        version = "20180104.2351";
+        version = "20180711.226";
         src = fetchFromGitHub {
           owner = "abingham";
           repo = "emacs-traad";
-          rev = "ad160e32f4cc9849aa570ed8e29269a0845921ae";
-          sha256 = "0rj8fg66rzrw1hv707p0dmf025c1dymp373z87ryy5sxs24vn3j5";
+          rev = "7f628c62933b8252682c8550aee353699bf22c80";
+          sha256 = "05x5856733bz4ik33rp3f852f8m790g5q955rhsm42r8gzybdwfz";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2b3eb31c077fcaff94b74b757c1ce17650333943/recipes/traad";
           sha256 = "08gxh5c01xfbbj9g4992jah494rw3d3bbs8j79r3mpqxllkp2znf";
-          name = "traad";
+          name = "recipe";
         };
         packageRequires = [
           dash
           deferred
+          f
           popup
           request
           request-deferred
@@ -73063,20 +91162,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    tracking = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    tracking = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "tracking";
         version = "20171210.1302";
         src = fetchFromGitHub {
           owner = "jorgenschaefer";
           repo = "circe";
-          rev = "9aaad726ea0b0cce4d911eec92ab8fd2a6455fe6";
-          sha256 = "1nyw9phrh1qpc7j6b8fkald18y3rldydb666r6ppphggly6lh4vd";
+          rev = "571853c1f5ece6777fe745489b34d3ad7c3cb0ba";
+          sha256 = "1l2zhszwg7cg96vlyi33bykk4mmig38xmasgpp02xypa4j4p11sw";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a2b295656d53fddc76cacc86b239e5648e49e3a4/recipes/tracking";
           sha256 = "096h5bl7jcwz5hpbm2139bf8a784hijfy40vzf42y1c9794al46z";
-          name = "tracking";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -73084,8 +91186,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    tracwiki-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, xml-rpc }:
-    melpaBuild {
+    tracwiki-mode = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild
+                                 , xml-rpc }:
+      melpaBuild {
         pname = "tracwiki-mode";
         version = "20150119.821";
         src = fetchFromGitHub {
@@ -73094,10 +91200,10 @@
           rev = "6a620444d59b438f42383b48cd4c19c03105dba6";
           sha256 = "1m25l1lyff4h0h4vjrcsziwbf8svqg2llvvgl8i2b4jbh7k7pk5f";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2e1e7315ee0e8d90df046e16948398f6f78aa3b2/recipes/tracwiki-mode";
           sha256 = "1k983f0lj42rxr5szpq9l9harykfn8jr13y3y6fav86zzd1fb8j0";
-          name = "tracwiki-mode";
+          name = "recipe";
         };
         packageRequires = [ xml-rpc ];
         meta = {
@@ -73105,20 +91211,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    tramp-hdfs = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    tramp-hdfs = callPackage ({ emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "tramp-hdfs";
         version = "20170821.620";
         src = fetchFromGitHub {
           owner = "raghavgautam";
           repo = "tramp-hdfs";
-          rev = "f8406f77bf83b66306ced693a5e4aaf606f46762";
-          sha256 = "15zr1fcmjk4mzjvmfbbkz5v9ryfgcjk0ag6rwxk8rp6wzwxcxvvl";
+          rev = "b64f24d0419a80dffaa2c4ecec317aa2bba56e35";
+          sha256 = "1bfqzwn19w6fs5npslw0sjqrwdswsv5m3wcdnk438pz1lp199wfy";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4c185553314a2a9fe18907fd9251077777b33538/recipes/tramp-hdfs";
           sha256 = "1l7s2z8yk3cbnffig9fds75jkjlkng76qglx5ankzva61dz1kf2b";
-          name = "tramp-hdfs";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -73126,8 +91236,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    tramp-term = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    tramp-term = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "tramp-term";
         version = "20180223.727";
         src = fetchFromGitHub {
@@ -73136,10 +91249,10 @@
           rev = "7c29f888de0385a676dbf9a4e17bac0111f5c10a";
           sha256 = "1ch9y632kggl3q6yx3g685j3dfbhy7yiwqh8cbxs3wja3rvml8xa";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5c84660c641f0bdf3cca8ad2a0f8f6e5d18b59c3/recipes/tramp-term";
           sha256 = "1vbdwj8q66j6h5ijqzxhyaqf8wf9rbs03x8ppfijxl5qd2bhc1dy";
-          name = "tramp-term";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -73147,20 +91260,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    transfer-sh = callPackage ({ async, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    transfer-sh = callPackage ({ async
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "transfer-sh";
-        version = "20180317.1022";
+        version = "20180603.731";
         src = fetchFromGitHub {
           owner = "Brillow";
           repo = "transfer-sh.el";
-          rev = "3f0344358081bcaa3c129b401ee18ecaeecda4d9";
-          sha256 = "0flsdkqhmrclnwwbxxqraawj4xv0240bwh5pbi4hgwdl5l9ihc4j";
+          rev = "55da85f963d347255a2b46568954923679331798";
+          sha256 = "0yv4i4ps379kz1q9qmjh4q3pk5ik77xw86faxmwpjx4yzp1wsz9v";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b4f74dd06d4d5249beaf67b2befec4251c8c18ed/recipes/transfer-sh";
           sha256 = "1gii2avqg9mdmdj2r562s9382fcmw53w9zsvprpnkcyhxhgfy8sy";
-          name = "transfer-sh";
+          name = "recipe";
         };
         packageRequires = [ async ];
         meta = {
@@ -73168,20 +91285,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    transmission = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }:
-    melpaBuild {
+    transmission = callPackage ({ emacs
+                                , fetchFromGitHub
+                                , fetchurl
+                                , let-alist
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "transmission";
-        version = "20180201.1506";
+        version = "20180610.1653";
         src = fetchFromGitHub {
           owner = "holomorph";
           repo = "transmission";
-          rev = "03a36853f141387654b7cb9217c7417db096a083";
-          sha256 = "0kvg2gawsgy440x1fsl2c4pkxwp3zirq9rzixanklk0ryijhd3ry";
+          rev = "7e8c3690bb54bd8c3ff89b89092ccaa94e116652";
+          sha256 = "0wwnd2fc4b8ir58vxb69nw4rcyri2yhdpaphsgrs8dw9ziixpmvx";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9ed7e414687c0bd82b140a1bd8044084d094d18f/recipes/transmission";
           sha256 = "0w0hlr4y4xpcrpvclqqqasggkgrwnzrdib51mhkh3f3mqyiw8gs9";
-          name = "transmission";
+          name = "recipe";
         };
         packageRequires = [ emacs let-alist ];
         meta = {
@@ -73189,8 +91311,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    transpose-frame = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    transpose-frame = callPackage ({ fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "transpose-frame";
         version = "20151126.626";
         src = fetchFromGitHub {
@@ -73199,10 +91324,10 @@
           rev = "011f420c3496b69fc22d789f64cb8091834feba7";
           sha256 = "1nhbinwv1ld13c0b0lxlvfm9s6bvxcz2vgfccqg45ncg9rx70rsw";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ae489be43b1aee93614e40f492ebdf0b98a3fbc1/recipes/transpose-frame";
           sha256 = "1ksdc4d9k05452hcq4xx0j5nfl9n01z8abbca6j7j66bdf3m4l1b";
-          name = "transpose-frame";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -73210,8 +91335,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    transpose-mark = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    transpose-mark = callPackage ({ fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "transpose-mark";
         version = "20150405.16";
         src = fetchFromGitHub {
@@ -73220,10 +91348,10 @@
           rev = "667327602004794de97214cf336ac61650ef75b7";
           sha256 = "03wc50vn1kmrgnzzhs06pwpap2p2rx84wwzxw0hawsg1f1l35m2x";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e997b356b009b3d2ab467fe49b79d728a8cfe24b/recipes/transpose-mark";
           sha256 = "1q1icp1szm1bxz9ywwyrfbsm1wmx0h4cvzywrh9q0fj1fq387qvv";
-          name = "transpose-mark";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -73231,20 +91359,27 @@
           license = lib.licenses.free;
         };
       }) {};
-    travis = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, request, s }:
-    melpaBuild {
+    travis = callPackage ({ dash
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild
+                          , pkg-info
+                          , request
+                          , s }:
+      melpaBuild {
         pname = "travis";
         version = "20150825.438";
         src = fetchFromGitHub {
           owner = "nlamirault";
           repo = "emacs-travis";
-          rev = "754ef07c17fed17ab03664ad11e2b0b2ef5e78ed";
-          sha256 = "1ciwf40ghlm4w9g4ynbc3d1a93gf6f3imm3m8z9kqfa7cnlsypb6";
+          rev = "c8769d3db10ed4604969049e3bd276afa0a0138e";
+          sha256 = "1jd7xsvs4m55fscp62a9lk59ip4sgifv4kazl55b7543nz1i31bz";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c064a0dc7922cbe4cff2ae65665c4f10e6dbff27/recipes/travis";
           sha256 = "1km496cq1vni9gy2d3z4c9524q62750ywz745rjz4r7178ip9mix";
-          name = "travis";
+          name = "recipe";
         };
         packageRequires = [ dash pkg-info request s ];
         meta = {
@@ -73252,8 +91387,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    tree-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    tree-mode = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "tree-mode";
         version = "20151104.531";
         src = fetchFromGitHub {
@@ -73262,10 +91400,10 @@
           rev = "b06078826d5875d74b0e7b7ac47b0d0917610534";
           sha256 = "13bbdhdmqg4x9yghanhr8fsbsxbnypzxdxgicz31sjjm675kpnix";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/84f836338818946a6bb31d35d6ae959571128ed5/recipes/tree-mode";
           sha256 = "1b15xgh96j4qas1kh4ghczcn7hb1ri86wnjgn9wz2d6bw3c6077b";
-          name = "tree-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -73273,20 +91411,32 @@
           license = lib.licenses.free;
         };
       }) {};
-    treemacs = callPackage ({ ace-window, cl-lib ? null, dash, emacs, f, fetchFromGitHub, fetchurl, ht, hydra, lib, melpaBuild, pfuture, s }:
-    melpaBuild {
+    treemacs = callPackage ({ ace-window
+                            , cl-lib ? null
+                            , dash
+                            , emacs
+                            , f
+                            , fetchFromGitHub
+                            , fetchurl
+                            , ht
+                            , hydra
+                            , lib
+                            , melpaBuild
+                            , pfuture
+                            , s }:
+      melpaBuild {
         pname = "treemacs";
-        version = "20180410.1230";
+        version = "20180715.543";
         src = fetchFromGitHub {
           owner = "Alexander-Miller";
           repo = "treemacs";
-          rev = "51f4aeccdae03885cb118ac5a4894550172abe79";
-          sha256 = "0kqd7zhhy0h52skvkyxjyrh23s2p4qrlf0bdgqi2xh8mqqxd4cq1";
+          rev = "94cd298929b0d6d7f3b2d7dc41a712f07c2cb0db";
+          sha256 = "1jnm9hiyj5hyi9mlfg51phvhjc15jz0p33vzl1w0y9xp9pwx14dp";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/91038c1ab2f463102263dcc3701c0fdaad55de4c/recipes/treemacs";
           sha256 = "1wcsn0kzrbawyyhxmsmrsxr1vp0llkxw6r7zx53pwyc82ia64nlv";
-          name = "treemacs";
+          name = "recipe";
         };
         packageRequires = [ ace-window cl-lib dash emacs f ht hydra pfuture s ];
         meta = {
@@ -73294,20 +91444,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    treemacs-evil = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild, treemacs }:
-    melpaBuild {
+    treemacs-evil = callPackage ({ evil
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild
+                                 , treemacs }:
+      melpaBuild {
         pname = "treemacs-evil";
-        version = "20180203.416";
+        version = "20180622.426";
         src = fetchFromGitHub {
           owner = "Alexander-Miller";
           repo = "treemacs";
-          rev = "51f4aeccdae03885cb118ac5a4894550172abe79";
-          sha256 = "0kqd7zhhy0h52skvkyxjyrh23s2p4qrlf0bdgqi2xh8mqqxd4cq1";
+          rev = "d0f874c90990400c02a8029d4efe815d3548ba5c";
+          sha256 = "0hclgsv96gr50z9cqj97rp45c5r50q2zb6hq5jcx3xmlw12k9pk7";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/91038c1ab2f463102263dcc3701c0fdaad55de4c/recipes/treemacs-evil";
           sha256 = "1i2mxqwnqb2jz775qg3z4lf7pk4mgi646fyyi2la5gdcnq6a46mg";
-          name = "treemacs-evil";
+          name = "recipe";
         };
         packageRequires = [ evil treemacs ];
         meta = {
@@ -73315,20 +91470,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    treemacs-projectile = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, projectile, treemacs }:
-    melpaBuild {
+    treemacs-projectile = callPackage ({ fetchFromGitHub
+                                       , fetchurl
+                                       , lib
+                                       , melpaBuild
+                                       , projectile
+                                       , treemacs }:
+      melpaBuild {
         pname = "treemacs-projectile";
-        version = "20180203.416";
+        version = "20180614.1021";
         src = fetchFromGitHub {
           owner = "Alexander-Miller";
           repo = "treemacs";
-          rev = "51f4aeccdae03885cb118ac5a4894550172abe79";
-          sha256 = "0kqd7zhhy0h52skvkyxjyrh23s2p4qrlf0bdgqi2xh8mqqxd4cq1";
+          rev = "cbc75759fd54a772fcb67bd8babacf1b2020ba88";
+          sha256 = "18aafgiircgb5max35zqzdfb0yjmgjqacax9sfy39ihh9x9z0vc1";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/91038c1ab2f463102263dcc3701c0fdaad55de4c/recipes/treemacs-projectile";
           sha256 = "1vyifik30673bwlfvbmw8pzz7f3wd4q6zzssvbj8d23zhk8kh8vc";
-          name = "treemacs-projectile";
+          name = "recipe";
         };
         packageRequires = [ projectile treemacs ];
         meta = {
@@ -73336,8 +91496,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    treepy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    treepy = callPackage ({ emacs
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "treepy";
         version = "20170722.355";
         src = fetchFromGitHub {
@@ -73346,10 +91510,10 @@
           rev = "282fbc94747fe2a00d36e2a74d147c8fa0ac4be7";
           sha256 = "0acw6c073h2a0fy8gx2xc2d1fw0yhaqikqrvs2iq53fqcqrrq81r";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/63c94a703841f8c11948200d86d98145bc62162c/recipes/treepy";
           sha256 = "0jfah4vywi1b6c86h7vh8fspmklhs790qzkl51i9p7yckfggwp72";
-          name = "treepy";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -73357,8 +91521,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    trident-mode = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, skewer-mode, slime }:
-    melpaBuild {
+    trident-mode = callPackage ({ dash
+                                , emacs
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild
+                                , skewer-mode
+                                , slime }:
+      melpaBuild {
         pname = "trident-mode";
         version = "20130726.1207";
         src = fetchFromGitHub {
@@ -73367,10 +91538,10 @@
           rev = "ad3201f47e114de35df189c3d80f0fdea9507ea9";
           sha256 = "08484fhc69rk16g52f9bzc1kzpif61ddfchxjbj1qqqammbx11ym";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/trident-mode";
           sha256 = "0l81hs7bp46jlk41b9fk1lkvlp17fqc5hcz8k8kkal7rh7ari1fd";
-          name = "trident-mode";
+          name = "recipe";
         };
         packageRequires = [ dash emacs skewer-mode slime ];
         meta = {
@@ -73378,8 +91549,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    trr = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    trr = callPackage ({ fetchFromGitHub
+                       , fetchurl
+                       , lib
+                       , melpaBuild }:
+      melpaBuild {
         pname = "trr";
         version = "20170221.42";
         src = fetchFromGitHub {
@@ -73388,10 +91562,10 @@
           rev = "83660d8343ef3367837354dc684dfdde2f95826a";
           sha256 = "0h12szq1cww3bpsk09m7d2bk9bfjxrmzlw9ccviwhnric40nh67k";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/56fa3c0b65e4e300f01804df7779ba6f1cb18cec/recipes/trr";
           sha256 = "068vqsyx8riqzfrmjk8wr81f68r2y2b6ymc2vvl6vka9rprvsfwr";
-          name = "trr";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -73399,20 +91573,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    truthy = callPackage ({ fetchFromGitHub, fetchurl, lib, list-utils, melpaBuild }:
-    melpaBuild {
+    truthy = callPackage ({ fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , list-utils
+                          , melpaBuild }:
+      melpaBuild {
         pname = "truthy";
         version = "20140508.1341";
         src = fetchFromGitHub {
           owner = "rolandwalker";
           repo = "truthy";
-          rev = "8ed8d07772aa8457554547eb17e264b5df2b4a69";
-          sha256 = "1mm6rrprsmx4hc622qmllm7c81yhwbqmdr0n6020krq92zmilmlm";
+          rev = "782cee08fbb13f9be71ce8e88d980ec14db24a0f";
+          sha256 = "0xbkq7hr14gd2nmsfkzvz4rgfi42h51m29cn2vaswr2s3prflhrh";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f7a7e319dbe17e2b31353e7d7cab51d557d86e9d/recipes/truthy";
           sha256 = "1a56zmqars9fd03bkqzwpvgblq5fvq19n4jw04c4hpga92sq8wqg";
-          name = "truthy";
+          name = "recipe";
         };
         packageRequires = [ list-utils ];
         meta = {
@@ -73420,8 +91598,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    try = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    try = callPackage ({ emacs
+                       , fetchFromGitHub
+                       , fetchurl
+                       , lib
+                       , melpaBuild }:
+      melpaBuild {
         pname = "try";
         version = "20170226.805";
         src = fetchFromGitHub {
@@ -73430,10 +91612,10 @@
           rev = "271b0a362cadf44d0694628b9e213f54516ef913";
           sha256 = "1fvpi02c6awyrwg2yqjapvcv4132qvmvd9bkbwpjmndxpicsann3";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/13c0ed40ad02fa0893cbf4dd9617dccb624f064b/recipes/try";
           sha256 = "0dv0i77agva215bf1gj1x1k7f7g3pvccyyd7vslapf9z8brccn7n";
-          name = "try";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -73441,8 +91623,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    ts-comint = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ts-comint = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "ts-comint";
         version = "20171105.2247";
         src = fetchFromGitHub {
@@ -73451,10 +91636,10 @@
           rev = "8817dc7b3a6eb78c3cad42e5677c2113274a1963";
           sha256 = "17cw9710ib80d626vv6bx6vdjdin78h6pja1lsr4r6mz8c5ihwxj";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/84e7004395083b66fce7ff4676af818bc798058a/recipes/ts-comint";
           sha256 = "18swvzkzcwn0wks58flsjpn9dddzcznij67xifyz6009l4fgdrzd";
-          name = "ts-comint";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -73462,8 +91647,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    tss = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, json-mode, lib, log4e, melpaBuild, yaxception }:
-    melpaBuild {
+    tss = callPackage ({ auto-complete
+                       , fetchFromGitHub
+                       , fetchurl
+                       , json-mode
+                       , lib
+                       , log4e
+                       , melpaBuild
+                       , yaxception }:
+      melpaBuild {
         pname = "tss";
         version = "20150913.708";
         src = fetchFromGitHub {
@@ -73472,10 +91664,10 @@
           rev = "81ac6351a2ae258fd0ebf916dae9bd5a179fefd0";
           sha256 = "1bk5v9dffs65qsay0dp336s2ly065nd0cg572zz058ikwxd44zd3";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d52e20f5ca38ed399d19f18f778b8601baf78460/recipes/tss";
           sha256 = "0d16x5r2xfy6mrwy0mqzpr9b3inqmyyxgawrxlfh83j1xb903dhm";
-          name = "tss";
+          name = "recipe";
         };
         packageRequires = [ auto-complete json-mode log4e yaxception ];
         meta = {
@@ -73483,8 +91675,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    tt-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    tt-mode = callPackage ({ fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "tt-mode";
         version = "20130804.410";
         src = fetchFromGitHub {
@@ -73493,10 +91688,10 @@
           rev = "85ed3832e7eef391f7879d9990d59c7a3493c15e";
           sha256 = "1gvqxk67cf779szyg907815i4m9jzrpmn5cnsmnwd62k3r3z4nxm";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/62959f554db7aa24b2565baded19766b01e61f62/recipes/tt-mode";
           sha256 = "02dzyycn5znbibbz50b243bh1kcccp8xwknjqwljk00gpf196vzf";
-          name = "tt-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -73504,7 +91699,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    ttl-mode = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild {
+    ttl-mode = callPackage ({ fetchhg
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "ttl-mode";
         version = "20160505.132";
         src = fetchhg {
@@ -73512,10 +91711,10 @@
           rev = "d790eb85ef4d";
           sha256 = "14kfnpp7fcd84ly9ng7hm5hzx2sdpn2x6d8frwbkdxfb0x81kmmf";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d56140a50abeab0953825d3646122d6e6ed19a7c/recipes/ttl-mode";
           sha256 = "1nnn2y0n9rj3a8r85y2vp6qja5rm4drcbnj9q793zzqfjl9akqd4";
-          name = "ttl-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -73523,20 +91722,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    tuareg = callPackage ({ caml, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    tuareg = callPackage ({ caml
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "tuareg";
-        version = "20180325.47";
+        version = "20180512.1306";
         src = fetchFromGitHub {
           owner = "ocaml";
           repo = "tuareg";
-          rev = "fcf578a6aa2af815bc93fb48f374b8c3798a3e9a";
-          sha256 = "0zmrmkcz019ny1cwqssyy327zmqpjmrn05xikcz4xqwy7ij8xifp";
+          rev = "faa976ac930d3fba42ec59881046929c90ffa8f3";
+          sha256 = "1f29bwivmdd6k7wblmrlwf7q43kdkrdadf5r3mk372p04d7c2nrx";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/01fb6435a1dfeebdf4e7fa3f4f5928bc75526809/recipes/tuareg";
           sha256 = "0wx723dmjlpm86xdabl9n8p22zbbxpapyfn6ifz0b0pvhh49ip7q";
-          name = "tuareg";
+          name = "recipe";
         };
         packageRequires = [ caml ];
         meta = {
@@ -73544,8 +91747,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    tumble = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, http-post-simple, lib, melpaBuild }:
-    melpaBuild {
+    tumble = callPackage ({ cl-lib ? null
+                          , fetchFromGitHub
+                          , fetchurl
+                          , http-post-simple
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "tumble";
         version = "20160111.2329";
         src = fetchFromGitHub {
@@ -73554,10 +91762,10 @@
           rev = "e8fd7643cccf2b6ea4170f0c5f1f87d007e7fa00";
           sha256 = "1xdkgvr1pnlg3nrjmma4ra80ysr8xbslvczg7cq1x1mqw6gn9xq5";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/579a441d153c4c7d9f8172be94983a632d6fab8f/recipes/tumble";
           sha256 = "1c9ybq0mb2a0pw15fmm13vfwcnr2h9fb1xsm5nrff1cg7913pgv9";
-          name = "tumble";
+          name = "recipe";
         };
         packageRequires = [ cl-lib http-post-simple ];
         meta = {
@@ -73565,20 +91773,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    tumblesocks = callPackage ({ fetchFromGitHub, fetchurl, htmlize, lib, markdown-mode, melpaBuild, oauth }:
-    melpaBuild {
+    tumblesocks = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , htmlize
+                               , lib
+                               , markdown-mode
+                               , melpaBuild
+                               , oauth }:
+      melpaBuild {
         pname = "tumblesocks";
         version = "20140215.1247";
         src = fetchFromGitHub {
           owner = "gcr";
           repo = "tumblesocks";
-          rev = "85a6cdc2db3390593fd886c474959b675460b310";
-          sha256 = "1g7y7czan7mcs5lwc5r6cllgksrj3b9lpn1bj7khwkd1ll391jc2";
+          rev = "9fd3dc5359d4e39a0f673546427935aa934cf339";
+          sha256 = "17kcprr4bhnh7h799wcxb79d54vvs226fl2rqj89gf10gr6bc3fr";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/tumblesocks";
           sha256 = "005w7vfzi4qpm59pxhq9nhp8hlwh4m1i7zj6l4knizcwm5xrm4ab";
-          name = "tumblesocks";
+          name = "recipe";
         };
         packageRequires = [ htmlize markdown-mode oauth ];
         meta = {
@@ -73586,20 +91800,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    tup-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    tup-mode = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "tup-mode";
         version = "20140410.914";
         src = fetchFromGitHub {
           owner = "ejmr";
           repo = "tup-mode";
-          rev = "bcc100c6485f1c81fdcd1215dfc6c41a81c215c8";
-          sha256 = "0y1b9zvwbw3vp41siyzj04bis939fgz3j27hc5ljjzy92kd39nzm";
+          rev = "945af9c8e6c402e10cd3bf8e28a9591174023d6d";
+          sha256 = "0asd024n5v23wdsg1959sszq568wg3a1bp4jrk0cllfji1z0n78y";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bda3260dad1c766c5b6ae9124f966bf441e24f2f/recipes/tup-mode";
           sha256 = "0pzpn1ljfcc2dl9fg7jc8lmjwz2baays4axjqk1qsbj0kqbc8j0l";
-          name = "tup-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -73607,20 +91824,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    turing-machine = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    turing-machine = callPackage ({ emacs
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "turing-machine";
         version = "20180221.2038";
         src = fetchFromGitHub {
           owner = "therockmandolinist";
           repo = "turing-machine";
-          rev = "fa60b76a5bac1f54b7a1b3dc55aae7602c7e385b";
-          sha256 = "0k1r0zkcr44kiki8cvdqwx09xpvpz7nkbq9w6i4gqy5h78zy5k79";
+          rev = "ad1dccc9c445f9e4465e1c67cbbfea9583153047";
+          sha256 = "0qaz4r5ahg2fxsfyxilb8c9956i5ra9vg80l82slm8vrnsinzll6";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a003b40a52a92b3ab4d1ffc003f570d4fa6bfbde/recipes/turing-machine";
           sha256 = "1ndy953q9hr1psqqkkqsffyvj800cnqdxcrixqiw0ls77f2kczcn";
-          name = "turing-machine";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -73628,8 +91849,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    turkish = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    turkish = callPackage ({ fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "turkish";
         version = "20170910.811";
         src = fetchFromGitHub {
@@ -73638,10 +91862,10 @@
           rev = "9831a316c176bb21a1b91226323ea4133163e00c";
           sha256 = "0nrxi845gd24d5vymbmxz696jwld4rn6nw2dz1gzmdaks7bbv87m";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/12cdbdf404fa859a48d1bb69f058321d7595d2a2/recipes/turkish";
           sha256 = "0pdapxjbpj3lg3hxvwjn9v51jqaiz7a8053z2bmk4485vzs34532";
-          name = "turkish";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -73649,8 +91873,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    turnip = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    turnip = callPackage ({ dash
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild
+                          , s }:
+      melpaBuild {
         pname = "turnip";
         version = "20150308.2329";
         src = fetchFromGitHub {
@@ -73659,10 +91888,10 @@
           rev = "2fd32562fc6fc1cda6d91aa939cfb29f9b16e9de";
           sha256 = "0khl4q22x6vdn87xdqqg5f535d4dqpnfbhk6qhlh187p1w7qaiq4";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/73c341fec986ed965a46954b898f92a4725fdee6/recipes/turnip";
           sha256 = "1vfqv71j47fn53klz3jl8r8hscywd01kkl4w96a308sac3lhbrps";
-          name = "turnip";
+          name = "recipe";
         };
         packageRequires = [ dash s ];
         meta = {
@@ -73670,20 +91899,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    twig-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    twig-mode = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "twig-mode";
         version = "20130220.1050";
         src = fetchFromGitHub {
           owner = "moljac024";
           repo = "twig-mode";
-          rev = "2849f273a4855d3314a9c0cc84134f5b28ad5ea6";
-          sha256 = "0wvmih2y3hy7casxx2y1w8csmzfnfgbb5ivpggr94sc86p6bg8sa";
+          rev = "51bcd41666a234119a855b9fd348d3dae7832de1";
+          sha256 = "068m06d0gf6608zd270c5nxkjczzfw55df58r2zfbpzgdi4cxm7j";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/400c75bf336b8d610f0a2c1732cc78beb502e1f3/recipes/twig-mode";
           sha256 = "1m3xjgmkqg8aj536wcg2f2hf4y6whscbsh7z7448hl4b5qjwii4n";
-          name = "twig-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -73691,8 +91923,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    twilight-anti-bright-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    twilight-anti-bright-theme = callPackage ({ fetchFromGitHub
+                                              , fetchurl
+                                              , lib
+                                              , melpaBuild }:
+      melpaBuild {
         pname = "twilight-anti-bright-theme";
         version = "20160622.148";
         src = fetchFromGitHub {
@@ -73701,10 +91936,10 @@
           rev = "523b95fcdbf4a6a6483af314ad05354a3d80f23f";
           sha256 = "0g6qqfgbg507r8lgq99zj2b5n3r9m23hpx19m36c3i55mh94dl2h";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/twilight-anti-bright-theme";
           sha256 = "1wfj570l5k0ygqi9dwjskc78rpnxw6080bkw1zd1a8kl3fa28n2k";
-          name = "twilight-anti-bright-theme";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -73712,20 +91947,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    twilight-bright-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    twilight-bright-theme = callPackage ({ fetchFromGitHub
+                                         , fetchurl
+                                         , lib
+                                         , melpaBuild }:
+      melpaBuild {
         pname = "twilight-bright-theme";
         version = "20130605.143";
         src = fetchFromGitHub {
           owner = "jimeh";
           repo = "twilight-bright-theme.el";
-          rev = "322157cb2f3bf7920ecd209dafc31bc1c7959f49";
-          sha256 = "1awqc4rvg8693myynb1d4y4dfdaxkd5blnixxs3mdv81l07zyn8c";
+          rev = "9859474333fee9f907474dbd8763f617e8bfd89c";
+          sha256 = "02hiyk5v41ki0rlchj6didg3b5a9fxaw50d9shrv1v861z4hrq24";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/twilight-bright-theme";
           sha256 = "039mg147cvb0pk59q3c1bpx7562bajgrs74xymylr89hvrxivxqh";
-          name = "twilight-bright-theme";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -73733,8 +91971,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    twilight-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    twilight-theme = callPackage ({ fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "twilight-theme";
         version = "20120412.603";
         src = fetchFromGitHub {
@@ -73743,10 +91984,10 @@
           rev = "77c4741cb3dcf16e53d06d6c2ffdc660c40afb5b";
           sha256 = "0d7vd1h0rwwgrh7f9kmdgy2ni0p20da9c8ylwlg33nsb26345wfs";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/twilight-theme";
           sha256 = "0g9bbb6m7q8x4zcw5gfmg7ljsfdmjh0335sq53b0lva0h3ra6kzx";
-          name = "twilight-theme";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -73754,20 +91995,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    twittering-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    twittering-mode = callPackage ({ fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "twittering-mode";
-        version = "20180107.412";
+        version = "20180507.721";
         src = fetchFromGitHub {
           owner = "hayamiz";
           repo = "twittering-mode";
-          rev = "c27d9b5b1dd20a1600e89909ac9c0ccd08af9bf9";
-          sha256 = "00vir1vfkprxm23if6cfjvliiwbza18n7gmh74bdnp1zkg2xy0hq";
+          rev = "6d10d1765a7b4de4c723395c8a2200a1649beeb0";
+          sha256 = "0pzj1yslggha5hh98ah634s03p7185wppzxfx53xws0mid6wsf85";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/twittering-mode";
           sha256 = "0v9ijxw5jazh2hc0qab48y71za2l9ryff0mpkxhr3f79irlqy0a1";
-          name = "twittering-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -73775,8 +92019,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    typed-clojure-mode = callPackage ({ cider, clojure-mode, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    typed-clojure-mode = callPackage ({ cider
+                                      , clojure-mode
+                                      , fetchFromGitHub
+                                      , fetchurl
+                                      , lib
+                                      , melpaBuild }:
+      melpaBuild {
         pname = "typed-clojure-mode";
         version = "20151003.1122";
         src = fetchFromGitHub {
@@ -73785,10 +92034,10 @@
           rev = "3abd53d8cc1ad77ffe76e02849d0ab7731fd8364";
           sha256 = "1i826xq77nh4s7qlj63r2iznbn319l1l3fzpbjb2nj0m00bwvxl6";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/961471c194b508a5025f00a5be02d316b26f330a/recipes/typed-clojure-mode";
           sha256 = "1579zkhk2lwl5ij7dm9n2drggs5fmhpljrshc4ghhvig7nlyqjy3";
-          name = "typed-clojure-mode";
+          name = "recipe";
         };
         packageRequires = [ cider clojure-mode ];
         meta = {
@@ -73796,20 +92045,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    typescript-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    typescript-mode = callPackage ({ fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "typescript-mode";
-        version = "20180409.422";
+        version = "20180708.1003";
         src = fetchFromGitHub {
           owner = "ananthakumaran";
           repo = "typescript.el";
-          rev = "5350c45aec10bcdffe16ec9273d04298e576f1e1";
-          sha256 = "0121gik1ksmwyx8lrr1pgpim0kyay189rg3cfa9l4hpwm425prp6";
+          rev = "f9cd0dd539d5d23f2b466de0cf20f9b0aef07258";
+          sha256 = "1f6j2xyws9ksv192si4hznyhglhqgk7v1i31wm2kf7m007yw2ibi";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d3f534a1e2cee4ad2e32e32802c5080207417b3d/recipes/typescript-mode";
           sha256 = "01jyqy44ir59n9c2f6gh4xzwfmzdpnys1lw4lnsy6kirqgbsq9ha";
-          name = "typescript-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -73817,8 +92069,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    typing = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    typing = callPackage ({ fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "typing";
         version = "20171115.2331";
         src = fetchFromGitHub {
@@ -73827,10 +92082,10 @@
           rev = "1ada06484695b8959f4a7c41cacf7f78c2aad998";
           sha256 = "0mh1y960zd7878j7nhrjijck6jxxqnbmxr579s095k7yk2ynpkkg";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e6e75695594ce17b618ad8786c8a04e283f68b11/recipes/typing";
           sha256 = "0k2lplqzq3323nn7rybcs377sr87kbww8ci99rrka3yyb5bh1fa1";
-          name = "typing";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -73838,8 +92093,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    typing-game = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    typing-game = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "typing-game";
         version = "20160426.520";
         src = fetchFromGitHub {
@@ -73848,10 +92106,10 @@
           rev = "616435a5270274f4c7b698697674dbb2039049a4";
           sha256 = "0dkrnn9fzqv793wvd3nc7dbslayj37q5na1w1g63g32z2s8aq09j";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e6ced22932f0462c77d121a631c494c01a0a4eaa/recipes/typing-game";
           sha256 = "0k85j9bcqp0gbzdh44q5a9wlkv5mc0g0m42ziq1bzmp6993wkmy2";
-          name = "typing-game";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -73859,8 +92117,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    typit = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, mmt }:
-    melpaBuild {
+    typit = callPackage ({ emacs
+                         , f
+                         , fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild
+                         , mmt }:
+      melpaBuild {
         pname = "typit";
         version = "20180317.107";
         src = fetchFromGitHub {
@@ -73869,10 +92133,10 @@
           rev = "4fe50d616fc60e77eb9b5a824c0a1ca4010b0746";
           sha256 = "0j5s86s9wb33fqw415mmkysdasyj3vdx9l8l6ca6f89ps6znr636";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d17d019155e19c156f123dcd702f18cfba488701/recipes/typit";
           sha256 = "05m7ymcq6fgbhh93ninrf3qi7csdnf2ahhf01mkm8gxxyaqq6m4n";
-          name = "typit";
+          name = "recipe";
         };
         packageRequires = [ emacs f mmt ];
         meta = {
@@ -73880,8 +92144,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    typo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    typo = callPackage ({ fetchFromGitHub
+                        , fetchurl
+                        , lib
+                        , melpaBuild }:
+      melpaBuild {
         pname = "typo";
         version = "20171209.223";
         src = fetchFromGitHub {
@@ -73890,10 +92157,10 @@
           rev = "9dad93b6f367f02f52c8d9bf15d446d922cec294";
           sha256 = "1xaikwl265v67b7hilrhjgwzr6bcha9idnp82f27msqzdfdzxf0f";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/typo";
           sha256 = "1p8is1n525lmzq588hj6vazmhl9wi6rairnfx1g1p6g6ijdycd4h";
-          name = "typo";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -73901,8 +92168,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    typoscript-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, use-package }:
-    melpaBuild {
+    typoscript-mode = callPackage ({ emacs
+                                   , fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild
+                                   , use-package }:
+      melpaBuild {
         pname = "typoscript-mode";
         version = "20170126.112";
         src = fetchFromGitHub {
@@ -73911,10 +92183,10 @@
           rev = "44e7567e921573c4f33c537b827f71fb1f565c32";
           sha256 = "0i7l9s3lhxnld32mqyrvasiv1hilhwnp2fwvpdv2cx9r902q6kc8";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/701de09cb97cbfa49a3a81aaeb9577817566efa2/recipes/typoscript-mode";
           sha256 = "18i2wwbn8vj5dbgxp2ds29n12v8ldvxjd1zb6h1g9lfh8iyrnjmx";
-          name = "typoscript-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs use-package ];
         meta = {
@@ -73922,8 +92194,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    ubuntu-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ubuntu-theme = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "ubuntu-theme";
         version = "20150805.806";
         src = fetchFromGitHub {
@@ -73932,10 +92207,10 @@
           rev = "88b0eefc75d4cbcde103057e1c5968d4c3052f69";
           sha256 = "1v8d1pc0vjc7wz0prr5w5vp2qb19f3gcyl6jx5130plajbvv23rc";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/ubuntu-theme";
           sha256 = "160z59aaxb2v6c24nki6bn7pjm9r4jl1mgxs4h4sivzxkaw811s2";
-          name = "ubuntu-theme";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -73943,8 +92218,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    ucs-utils = callPackage ({ fetchFromGitHub, fetchurl, lib, list-utils, melpaBuild, pcache, persistent-soft }:
-    melpaBuild {
+    ucs-utils = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , list-utils
+                             , melpaBuild
+                             , pcache
+                             , persistent-soft }:
+      melpaBuild {
         pname = "ucs-utils";
         version = "20150826.714";
         src = fetchFromGitHub {
@@ -73953,10 +92234,10 @@
           rev = "cbfd42f822bf5717934fa2d92060e6e24a813433";
           sha256 = "0qw9vwl1p0pjw1xmshxar1a8kn6gmin5rdvvnnly8b5z9hpkjf3m";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c9db386ab3910940addae6e925b2ac17e64e0f87/recipes/ucs-utils";
           sha256 = "111fwg2cqqzpa79rcqxidppb12c8g12zszppph2ydfvkgkryb6z2";
-          name = "ucs-utils";
+          name = "recipe";
         };
         packageRequires = [ list-utils pcache persistent-soft ];
         meta = {
@@ -73964,8 +92245,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    uimage = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    uimage = callPackage ({ fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "uimage";
         version = "20160901.521";
         src = fetchFromGitHub {
@@ -73974,10 +92258,10 @@
           rev = "9893d09160ef7e8c0ecdcd74fca99ffeb5f9d70d";
           sha256 = "1ri50nab778kpq49m54ra75z8dphagp9sz92is0636j4qy3sbih1";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/346cb25abdfdd539d121a9f34bce75b2fc5a16be/recipes/uimage";
           sha256 = "0i6qpk6v4pmpk3zswygdy0dd7rxy8kl7qn8a1xanpi4aqg7wlbmd";
-          name = "uimage";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -73985,8 +92269,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    ujelly-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ujelly-theme = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "ujelly-theme";
         version = "20180214.824";
         src = fetchFromGitHub {
@@ -73995,10 +92282,10 @@
           rev = "bf724ce7806a738d2043544061e5f9bbfc56e674";
           sha256 = "0pz26q5qfq4wiqcpfkq26f19q5gyiv8q71sq4k77hkss5a5b5fqg";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/ujelly-theme";
           sha256 = "0b7zgmpsdn5p3jx4kif7phxz8pb85snmmfr3yz98xf6p7h6w60gw";
-          name = "ujelly-theme";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -74006,8 +92293,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    ukrainian-holidays = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ukrainian-holidays = callPackage ({ fetchFromGitHub
+                                      , fetchurl
+                                      , lib
+                                      , melpaBuild }:
+      melpaBuild {
         pname = "ukrainian-holidays";
         version = "20130720.649";
         src = fetchFromGitHub {
@@ -74016,10 +92306,10 @@
           rev = "e52b0c92843e9f4d0415a7ba3b8559785497d23d";
           sha256 = "033v4ck979lhkpwblci5clacfc1xnkq03p5d1m566wff8dp5flwz";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8a8b5ec722600bcd5bf5fcc2b20262597a9e8c40/recipes/ukrainian-holidays";
           sha256 = "0kbfj2l1rcv74c88nabkwkcl7k9pkim835l24q61zv3i6wf9sykf";
-          name = "ukrainian-holidays";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -74027,20 +92317,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    uncrustify-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    uncrustify-mode = callPackage ({ fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "uncrustify-mode";
         version = "20130707.659";
         src = fetchFromGitHub {
           owner = "koko1000ban";
           repo = "emacs-uncrustify-mode";
-          rev = "73893d000361e95784911e5ec268ad0ab2a1473c";
-          sha256 = "0366h4jfi0c7yda9wcrz4zxgf2qqdd08b8z2dr8c1rkvkdd67iam";
+          rev = "2c00d5cf2d1868a5955347438746f4dd82b3b9fc";
+          sha256 = "1pzg49l982a0kajnix0jl3gk7g37d7pgqg9lx838i2sk3jfwayf9";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5327aa1a1143c2257e9454663ff140f2371d07e3/recipes/uncrustify-mode";
           sha256 = "0amdxdfc8i99zjrw4iqmxzb47h0airs60fwmc32bc8b0ds66c3kd";
-          name = "uncrustify-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -74048,8 +92341,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    undercover = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, shut-up }:
-    melpaBuild {
+    undercover = callPackage ({ dash
+                              , emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild
+                              , shut-up }:
+      melpaBuild {
         pname = "undercover";
         version = "20180403.752";
         src = fetchFromGitHub {
@@ -74058,10 +92357,10 @@
           rev = "3fc54ef92f0b4b7d26d962d6ed29a81d526a3a66";
           sha256 = "0iqj1a6nj1ka5ahcy4rrn7k427bs1ifv0v0i7gj79m7isjj15qc4";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d58ad9eb863494f609114e3c6af8c14c891b83a5/recipes/undercover";
           sha256 = "1s30c3i6y4r3mgrrs3lda3rrwmy9ff11ihdmshyziv9v5879sdjf";
-          name = "undercover";
+          name = "recipe";
         };
         packageRequires = [ dash emacs shut-up ];
         meta = {
@@ -74069,20 +92368,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    underline-with-char = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    underline-with-char = callPackage ({ emacs
+                                       , fetchFromGitHub
+                                       , fetchurl
+                                       , lib
+                                       , melpaBuild }:
+      melpaBuild {
         pname = "underline-with-char";
         version = "20170814.223";
         src = fetchFromGitHub {
           owner = "marcowahl";
           repo = "underline-with-char";
-          rev = "6daeba77e17dc11558ca3ccb0495524f5104d581";
-          sha256 = "1i6qgkzn8rlv44mjc4b9sksr4wpnj9a1b6p1y3g6fqpvhy5pmygg";
+          rev = "f7de7a968a16c12bef5a3ed9aebcde2dcadc08be";
+          sha256 = "188g8vzalkhdqjxkbypzq64vl9qmry8pq8vrbxhy28pzsljhrqxv";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e24888ccf61ac05eba5c30a47d35653f2badf019/recipes/underline-with-char";
           sha256 = "0la24nvyqinla40c2f3f4a63mjjsg58096hyw3pvp0mwiff7rxyd";
-          name = "underline-with-char";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -74090,20 +92393,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    underwater-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    underwater-theme = callPackage ({ fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "underwater-theme";
         version = "20131117.1602";
         src = fetchFromGitHub {
           owner = "jmdeldin";
           repo = "underwater-theme.el";
-          rev = "4eb9ef014f580adc135d91d1cd68d37a310640b6";
-          sha256 = "1ypxpv5vw2ls757iwrq3zld6k0s29q3kg3spcsl5ks4aqpnkxpva";
+          rev = "1fbd4ecd4538256c6c46f9638f883072c73ac927";
+          sha256 = "1g1ldyz42q3i2xlgvhd4s93cvkh0fm8m3l344zjcw8rvqaisyphj";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e7dccc77d082181629b8f0c45404ac5d8bd97590/recipes/underwater-theme";
           sha256 = "0ab2bcqfdi9ml3z9d511pbfwcbp8hkkd36xxp61k36gkyi3acvlr";
-          name = "underwater-theme";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -74111,8 +92417,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    undohist = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    undohist = callPackage ({ cl-lib ? null
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "undohist";
         version = "20150315.542";
         src = fetchFromGitHub {
@@ -74121,10 +92431,10 @@
           rev = "d2239a5f736724ceb9e3b6bcaa86f4064805cda0";
           sha256 = "1c0daw246ky7b1x5b8h55x79pl1pjqk1k348l487bdd8zdj4w9wx";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/aebd16ca1ac51d9982eae5437c6084a2a3946b88/recipes/undohist";
           sha256 = "0zzfzh8sf2dkz8h3kidv7zmwz2c2qq9n9qz2mab2lk0y44njzwhn";
-          name = "undohist";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -74132,20 +92442,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    unfill = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    unfill = callPackage ({ fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "unfill";
         version = "20170722.1846";
         src = fetchFromGitHub {
           owner = "purcell";
           repo = "unfill";
-          rev = "df0c4dee19a3874b11c7c7f04e8a2fba629fda9b";
-          sha256 = "0bdlr8kqzwzi7aggcn7cwwih19585wi6dd9lvwj4i966zr4w84yx";
+          rev = "d1056ec5ce7bb18abe8933c1e4d5932fb98fb78e";
+          sha256 = "0qbcm7qf33xlbj7wx3164q8m6b8qzgv6w13pk8568nrmb1f8qna8";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2ade389a20419b3e29a613409ac73a16b7c5bddb/recipes/unfill";
           sha256 = "0b21dk45vbz4vqdbdx0n6wx30rm38w1jjqbsxfj7b96p3i5shwqv";
-          name = "unfill";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -74153,20 +92466,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    unicode-emoticons = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    unicode-emoticons = callPackage ({ fetchFromGitHub
+                                     , fetchurl
+                                     , lib
+                                     , melpaBuild }:
+      melpaBuild {
         pname = "unicode-emoticons";
         version = "20150204.308";
         src = fetchFromGitHub {
           owner = "hagleitn";
           repo = "unicode-emoticons";
-          rev = "fb18631f342b0243cf77cf59ed2067c47aae5233";
-          sha256 = "015gjf8chd6h9azhyarmskk41cm0cmg981jif7q81hakl9av6rhh";
+          rev = "52a09955c2afc1807c0f37f1467ccfc1e1da690a";
+          sha256 = "0z7aaw5ib1q8whnrhvybzxa4cm18qsw5sg8gv31j3yxi638yvi89";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/unicode-emoticons";
           sha256 = "0sp4sb2yw9msyqxgp4q5z9pzfvqwhizd1sx8w63g1vis6n2h254r";
-          name = "unicode-emoticons";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -74174,20 +92490,28 @@
           license = lib.licenses.free;
         };
       }) {};
-    unicode-enbox = callPackage ({ fetchFromGitHub, fetchurl, lib, list-utils, melpaBuild, pcache, persistent-soft, string-utils, ucs-utils }:
-    melpaBuild {
+    unicode-enbox = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , list-utils
+                                 , melpaBuild
+                                 , pcache
+                                 , persistent-soft
+                                 , string-utils
+                                 , ucs-utils }:
+      melpaBuild {
         pname = "unicode-enbox";
         version = "20140508.1341";
         src = fetchFromGitHub {
           owner = "rolandwalker";
           repo = "unicode-enbox";
-          rev = "77074fac1994a4236f111d6a1d0cf79ea3fca151";
-          sha256 = "0936dqxyp72if9wvn2dcci670yp1gqrmpnll9xq00skp85yq9zs5";
+          rev = "4e8ac89b0460eaba6d6eaa8c463eb069660218fa";
+          sha256 = "1p63dk1fya0g08lr7cr1rydx9bqakg1nq30i0yma6zs0h7f5qvsi";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c9db386ab3910940addae6e925b2ac17e64e0f87/recipes/unicode-enbox";
           sha256 = "1phb2qq3pg6z6bl96kl9yfq4jxhgardjpaa4lhgqbxymmqdm7gzv";
-          name = "unicode-enbox";
+          name = "recipe";
         };
         packageRequires = [
           list-utils
@@ -74201,20 +92525,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    unicode-escape = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, names }:
-    melpaBuild {
+    unicode-escape = callPackage ({ dash
+                                  , emacs
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild
+                                  , names }:
+      melpaBuild {
         pname = "unicode-escape";
         version = "20160614.534";
         src = fetchFromGitHub {
           owner = "kosh04";
           repo = "unicode-escape.el";
-          rev = "fc69ec780d9e54c364a9252bd0cf1d2507f3fab7";
-          sha256 = "1bqknk6y7r0dqhmwhq3ac56cqf0albp18h222klnijv4bazjfcjw";
+          rev = "04c7f22f90c96e93f998f084089ab08dc7f4fdd6";
+          sha256 = "01i5cq7yan9z1kr6pvp4bwzsnxs0bpqsaglfbvy7v6jfp923bvdm";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b2ae00434b80357dc62cd0177dbd714b25fb3ac7/recipes/unicode-escape";
           sha256 = "0gcwkv7qbdnvak10jfzj9irb7nkfqsfxv2n5fi8vvrk90j1a2i2k";
-          name = "unicode-escape";
+          name = "recipe";
         };
         packageRequires = [ dash emacs names ];
         meta = {
@@ -74222,8 +92552,16 @@
           license = lib.licenses.free;
         };
       }) {};
-    unicode-fonts = callPackage ({ fetchFromGitHub, fetchurl, font-utils, lib, list-utils, melpaBuild, pcache, persistent-soft, ucs-utils }:
-    melpaBuild {
+    unicode-fonts = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , font-utils
+                                 , lib
+                                 , list-utils
+                                 , melpaBuild
+                                 , pcache
+                                 , persistent-soft
+                                 , ucs-utils }:
+      melpaBuild {
         pname = "unicode-fonts";
         version = "20150826.1532";
         src = fetchFromGitHub {
@@ -74232,10 +92570,10 @@
           rev = "a36597d83e0248bd0e6b2c1d5fb95bff72add527";
           sha256 = "0fbwncna6gxlynq9196djpkjhayzk8kxlsxg0gasdgqx1nyxl0mk";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/83459421dd2eb3d60ec668c3d5bb38d99ee64aff/recipes/unicode-fonts";
           sha256 = "0plipwb30qqay8691qzqdyg6smpbs9dsxxi49psb8sq0xnxl84q3";
-          name = "unicode-fonts";
+          name = "recipe";
         };
         packageRequires = [
           font-utils
@@ -74249,8 +92587,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    unicode-input = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    unicode-input = callPackage ({ fetchhg
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "unicode-input";
         version = "20141218.2320";
         src = fetchhg {
@@ -74258,10 +92599,10 @@
           rev = "e76ccb549e6a";
           sha256 = "0kzcg1wxi1z424jdn7pibk9zyfyi85kligav08sl1c2hdldzya4l";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/unicode-input";
           sha256 = "17sf3xnl8yyx4ln4mrjlrvfinb8dvabh81l3qyr9pkn5skpgqgj8";
-          name = "unicode-input";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -74269,20 +92610,28 @@
           license = lib.licenses.free;
         };
       }) {};
-    unicode-progress-reporter = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, list-utils, melpaBuild, pcache, persistent-soft, ucs-utils }:
-    melpaBuild {
+    unicode-progress-reporter = callPackage ({ emacs
+                                             , fetchFromGitHub
+                                             , fetchurl
+                                             , lib
+                                             , list-utils
+                                             , melpaBuild
+                                             , pcache
+                                             , persistent-soft
+                                             , ucs-utils }:
+      melpaBuild {
         pname = "unicode-progress-reporter";
         version = "20140508.1341";
         src = fetchFromGitHub {
           owner = "rolandwalker";
           repo = "unicode-progress-reporter";
-          rev = "5e66724fd7d15743213b082474d798117b194494";
-          sha256 = "16jgm70ldsngxldiagjkw3ragypalpiidnf82g5hss9ciybkd3j4";
+          rev = "17415a96144506e5ffa49377d4c814023e06f425";
+          sha256 = "1fdyngchr8s7gjqi50fdr1cx8zx5jd3l7ag9i15r9vmqanvr0zzf";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/83459421dd2eb3d60ec668c3d5bb38d99ee64aff/recipes/unicode-progress-reporter";
           sha256 = "03z7p27470fqy3gd356l9cpp44a35sfrxz94dxmx388rzlygk7y7";
-          name = "unicode-progress-reporter";
+          name = "recipe";
         };
         packageRequires = [ emacs list-utils pcache persistent-soft ucs-utils ];
         meta = {
@@ -74290,20 +92639,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    unicode-troll-stopper = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    unicode-troll-stopper = callPackage ({ fetchFromGitHub
+                                         , fetchurl
+                                         , lib
+                                         , melpaBuild }:
+      melpaBuild {
         pname = "unicode-troll-stopper";
         version = "20151023.1831";
         src = fetchFromGitHub {
           owner = "camsaul";
           repo = "emacs-unicode-troll-stopper";
-          rev = "15e4b57b78bf643bb56e5000078030cbb5c66e2a";
-          sha256 = "0ny260mr1h810fvqsfj2hpd3zql4g309m60qj4vk6kmd83p5b60f";
+          rev = "7d1331b17b29db56fbdaecec39e5fcac5b92e46f";
+          sha256 = "1zpqm309x73af2i6qch7qqwr1ibnkz0r0jyvw6py4imnank9hg83";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b463925a98b7dde78d85693c7681fd2346d90895/recipes/unicode-troll-stopper";
           sha256 = "0a10lq0xsfyp052iw4xjbhsdkbyg25x2gk68gys4k7p6l92la0k5";
-          name = "unicode-troll-stopper";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -74311,20 +92663,27 @@
           license = lib.licenses.free;
         };
       }) {};
-    unicode-whitespace = callPackage ({ fetchFromGitHub, fetchurl, lib, list-utils, melpaBuild, pcache, persistent-soft, ucs-utils }:
-    melpaBuild {
+    unicode-whitespace = callPackage ({ fetchFromGitHub
+                                      , fetchurl
+                                      , lib
+                                      , list-utils
+                                      , melpaBuild
+                                      , pcache
+                                      , persistent-soft
+                                      , ucs-utils }:
+      melpaBuild {
         pname = "unicode-whitespace";
         version = "20140508.1341";
         src = fetchFromGitHub {
           owner = "rolandwalker";
           repo = "unicode-whitespace";
-          rev = "a18c6b38d78b94f2eb1dcc4cb4fa91b6a17efabe";
-          sha256 = "1ayb15nd5vqr0xaghrnp55kqw7bblrjipmfrag6bqpn7jk9bvbdz";
+          rev = "b0cbfe4f9998a2c1eb4cba031efcb785ef518916";
+          sha256 = "1khpmmpbvi73cis7qx33v2npbmwg1cc9x4bafg9kfz7yfqkrdjws";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f9892a826f3ac335d12bd1a07202334e28a44f40/recipes/unicode-whitespace";
           sha256 = "1b3jgha8va42b89pdp41sab2w9wllp7dicqg4lxl67bg6wn147wy";
-          name = "unicode-whitespace";
+          name = "recipe";
         };
         packageRequires = [ list-utils pcache persistent-soft ucs-utils ];
         meta = {
@@ -74332,8 +92691,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    unidecode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    unidecode = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "unidecode";
         version = "20180312.1226";
         src = fetchFromGitHub {
@@ -74342,10 +92704,10 @@
           rev = "5502ada9287b4012eabb879f12f5b0a9df52c5b7";
           sha256 = "03x3nakbhmakwm977mwrf8jifvjnfwzpjv6wrwpizbqjnkgfchmn";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f9ba8e425e37e80a2236832c3f12568546d4c7c9/recipes/unidecode";
           sha256 = "0vhghnyj8a5mcqq5rzajrm1izzfry77pd1wxhmra5yp9ribw2sv5";
-          name = "unidecode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -74353,8 +92715,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    unify-opening = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    unify-opening = callPackage ({ emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "unify-opening";
         version = "20171122.1212";
         src = fetchFromGitHub {
@@ -74363,10 +92729,10 @@
           rev = "502469ddba6d8d52159f53976265f7d956b6b17c";
           sha256 = "0mni9vnbs50wvgnwfjwgzlwfff38h3wbrpr20nv84dmfh8ac0v61";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0a2faab13744262ef4d12750f70b300b3afd2835/recipes/unify-opening";
           sha256 = "1gpmklbdbmv8va8d3yr94r1ydkcyvdzcgxv56rp0bxwbcgmk0as8";
-          name = "unify-opening";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -74374,8 +92740,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    unipoint = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    unipoint = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "unipoint";
         version = "20140113.1424";
         src = fetchFromGitHub {
@@ -74384,10 +92753,10 @@
           rev = "5da04aebac35a5c9e1d8704f2231808d42f4b36a";
           sha256 = "1wl9rzys1zr2c41h5i57y6hxsavix1b26f453l2izmb6r0b1dvh0";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/unipoint";
           sha256 = "0fm7anwcmga9adyfwlri7x014rpvfl1r6nccyi6lrpx126wy008s";
-          name = "unipoint";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -74395,8 +92764,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    unison = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    unison = callPackage ({ emacs
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "unison";
         version = "20160704.40";
         src = fetchFromGitHub {
@@ -74405,10 +92778,10 @@
           rev = "a78a04c0d1398d00f75a1bd4799622a65bcb0f28";
           sha256 = "1jn23wlhpka5pv0caipxi8bg3cc6wj1fg09abibhydy4p3mb3bi5";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ee7ee1a68486f822c1627fb0bf066c4ae8bc0776/recipes/unison";
           sha256 = "03v10r6d4r6z66s9q7mg1iyxh53f3l6q7dij7pfbf32migqjgpir";
-          name = "unison";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -74416,8 +92789,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    unison-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    unison-mode = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "unison-mode";
         version = "20160513.801";
         src = fetchFromGitHub {
@@ -74426,10 +92802,10 @@
           rev = "0bd6a65c0d12f87fcf7bdff15fe54444959b93bf";
           sha256 = "1snbvhvx2csw1f314dbdwny8yvfq834plpkzx0vl4k3wddmr3a66";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bd5b5c16e504ee8e511bbc65acbc0ff65f99eaf4/recipes/unison-mode";
           sha256 = "03kyr1h5pm51vn4bykj13rm4ybln266rpnxh65y2ygw8f8md88gl";
-          name = "unison-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -74437,20 +92813,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    universal-emotions-emoticons = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    universal-emotions-emoticons = callPackage ({ emacs
+                                                , fetchFromGitHub
+                                                , fetchurl
+                                                , lib
+                                                , melpaBuild }:
+      melpaBuild {
         pname = "universal-emotions-emoticons";
         version = "20171209.1820";
         src = fetchFromGitHub {
           owner = "grettke";
           repo = "universal-emotions-emoticons";
-          rev = "c89063a4f8e00f8e9c4dc6c252474b6d4bfc4e01";
-          sha256 = "0wgff3bbjgskbm1c4cww6akia93hd5sqr9md5szkqm6iiqi3q95z";
+          rev = "9f249b39172bf9b8e148856ad941eee485161215";
+          sha256 = "1qn757pn1hcfik05i458bic32dm812xznsfz5vgxn2v8wxihjlf8";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/57f913112c98db2248cf69e44deb69fd09cee042/recipes/universal-emotions-emoticons";
           sha256 = "1aj3k3yrvasn3zmfwz5si046hlyhnjdmxh7i8li6rc0v0qwl7p86";
-          name = "universal-emotions-emoticons";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -74458,20 +92838,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    unkillable-scratch = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    unkillable-scratch = callPackage ({ fetchFromGitHub
+                                      , fetchurl
+                                      , lib
+                                      , melpaBuild }:
+      melpaBuild {
         pname = "unkillable-scratch";
         version = "20160504.1903";
         src = fetchFromGitHub {
           owner = "EricCrosson";
           repo = "unkillable-scratch";
-          rev = "676a5a97658830caece18fa65a23e3d113933151";
-          sha256 = "14k9ad542y0haz1yid9jy8f9zvpvac6cirnf0751g8rwjbdnvr85";
+          rev = "0e1d9e1574e497171a7ccfbcb8c994cb9c5880da";
+          sha256 = "0bhdqpxq6cly4b6v4ya1ksw0yfdb9g2f2ifbjn4gfcq6j4zszbdm";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/822ac5610f333e41b676a29ef45a6f8bfea3162e/recipes/unkillable-scratch";
           sha256 = "0ghbpa9pf7k6vd2mjxkpqg2qfl4sd40ir6mrk1rxr1rv8s0afkf7";
-          name = "unkillable-scratch";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -74479,20 +92862,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    untitled-new-buffer = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, magic-filetype, melpaBuild }:
-    melpaBuild {
+    untitled-new-buffer = callPackage ({ emacs
+                                       , fetchFromGitHub
+                                       , fetchurl
+                                       , lib
+                                       , magic-filetype
+                                       , melpaBuild }:
+      melpaBuild {
         pname = "untitled-new-buffer";
         version = "20161212.708";
         src = fetchFromGitHub {
           owner = "zonuexe";
           repo = "untitled-new-buffer.el";
-          rev = "4eabc6937b0e83062ffce9de0d42110224063a6c";
-          sha256 = "139gysva6hpsk006bcbm1689pzaj18smxs2ar5pv0yvkh60wjvlr";
+          rev = "e359ae63bc6310e315b7c25157858f9b9796ed3d";
+          sha256 = "0wgyc798pn9224ck3c4xndrrmsd4j12qdxhy6i7y7i27y1gw6ckj";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/de62e48115e1e5f9506e6d47a3b23c0420c1205b/recipes/untitled-new-buffer";
           sha256 = "1hpv7k7jhpif9csdrd2gpz71s3fp4svsvrd1nh8hbx7avjl66pjf";
-          name = "untitled-new-buffer";
+          name = "recipe";
         };
         packageRequires = [ emacs magic-filetype ];
         meta = {
@@ -74500,8 +92888,39 @@
           license = lib.licenses.free;
         };
       }) {};
-    uptimes = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    upbo = callPackage ({ dash
+                        , emacs
+                        , fetchFromGitHub
+                        , fetchurl
+                        , lib
+                        , melpaBuild }:
+      melpaBuild {
+        pname = "upbo";
+        version = "20180422.122";
+        src = fetchFromGitHub {
+          owner = "shiren";
+          repo = "upbo";
+          rev = "63514c484e70cd6eeae828f7e58216e1a3429184";
+          sha256 = "0dwff302v38hxxspfap49w1afx8g3scl4gm30ksybnfph1pa29l4";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e5232078b065dcca04388ccc76aa01a6159395d5/recipes/upbo";
+          sha256 = "15rqz9z49363anrhli08vk155wp21hq3j7xsvd98lkq9ip6aglns";
+          name = "recipe";
+        };
+        packageRequires = [ dash emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/upbo";
+          license = lib.licenses.free;
+        };
+      }) {};
+    uptimes = callPackage ({ cl-lib ? null
+                           , emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "uptimes";
         version = "20180416.623";
         src = fetchFromGitHub {
@@ -74510,10 +92929,10 @@
           rev = "5e81f8bb419836602819045e7d5a74b76ad3e69c";
           sha256 = "04l452k249s3ilfj0da0k7rrfyjnxxdsipa2al46xqjds8l3h2rn";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/72099e35ce3e34ec6afc6a3f87a4da07ec91499a/recipes/uptimes";
           sha256 = "0r8s5c2hdcb1ly7rnhzar4qzf1c9d49gd914ndnc3mg9yb9gyy5h";
-          name = "uptimes";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -74521,8 +92940,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    url-shortener = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    url-shortener = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "url-shortener";
         version = "20170804.1942";
         src = fetchFromGitHub {
@@ -74531,10 +92953,10 @@
           rev = "06db8270213b9e352d6c335b0663059a1353d05e";
           sha256 = "1ndcajgvfl46zw2iwgghvcldsy9p778pifkhlanivc6azajhpjhh";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/url-shortener";
           sha256 = "08zsirsndhr8xny2vkzznkvjs0b6490lzd915ws6crdwxp6mx5si";
-          name = "url-shortener";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -74542,8 +92964,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    urlenc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    urlenc = callPackage ({ fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "urlenc";
         version = "20140116.656";
         src = fetchFromGitHub {
@@ -74552,10 +92977,10 @@
           rev = "835a6dcb783bbe84714bae87a3464aa0b128bfac";
           sha256 = "0xwr0v4f64d7hi5ldig4r5yjn8h3f8by49g5820187lsp7ng2nw4";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5c36c416a13328ab762041dd62407b7b0696de93/recipes/urlenc";
           sha256 = "0n6shh95m11162zsnf62zy1ljswdjznjilxx2dbqyqdrn7qr2dgh";
-          name = "urlenc";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -74563,8 +92988,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    usage-memo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    usage-memo = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "usage-memo";
         version = "20170925.1737";
         src = fetchFromGitHub {
@@ -74573,10 +93001,10 @@
           rev = "88e15a9942a3e0a6e36e9c3e51e3edb746067b1a";
           sha256 = "1aalrgyk8pwsc07qmczqhgccjli6mcckkbgpass3kvrkcfxdl2zk";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ad10a684b4b2f01bc65883374f36fef156ff55d2/recipes/usage-memo";
           sha256 = "0fv96xd6gk12nv98zccwncr00qms0pmrp0cv7iipbz54s20g0745";
-          name = "usage-memo";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -74584,20 +93012,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    use-package = callPackage ({ bind-key, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    use-package = callPackage ({ bind-key
+                               , emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "use-package";
-        version = "20180314.1143";
+        version = "20180715.1101";
         src = fetchFromGitHub {
           owner = "jwiegley";
           repo = "use-package";
-          rev = "512aa50b025018cb8574498d868814f73c02bb9b";
-          sha256 = "0ncg9vbn2hjdv846v0ij6pf1cs76i73jkb17wbf08r3km7933xmw";
+          rev = "3fb8f39f5901a4c0ef7887283e56e60b541675ea";
+          sha256 = "0am5kh073x52lrh1225m5wl4r18wffznlvhrrmm1wbya6n406q9h";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/51a19a251c879a566d4ae451d94fcb35e38a478b/recipes/use-package";
           sha256 = "0d0zpgxhj6crsdi9sfy30fn3is036apm1kz8fhjg1yzdapf1jdyp";
-          name = "use-package";
+          name = "recipe";
         };
         packageRequires = [ bind-key emacs ];
         meta = {
@@ -74605,20 +93038,27 @@
           license = lib.licenses.free;
         };
       }) {};
-    use-package-chords = callPackage ({ bind-chord, bind-key, fetchFromGitHub, fetchurl, key-chord, lib, melpaBuild, use-package }:
-    melpaBuild {
+    use-package-chords = callPackage ({ bind-chord
+                                      , bind-key
+                                      , fetchFromGitHub
+                                      , fetchurl
+                                      , key-chord
+                                      , lib
+                                      , melpaBuild
+                                      , use-package }:
+      melpaBuild {
         pname = "use-package-chords";
-        version = "20180127.1413";
+        version = "20180703.1258";
         src = fetchFromGitHub {
           owner = "jwiegley";
           repo = "use-package";
-          rev = "512aa50b025018cb8574498d868814f73c02bb9b";
-          sha256 = "0ncg9vbn2hjdv846v0ij6pf1cs76i73jkb17wbf08r3km7933xmw";
+          rev = "4f0f5856798b8575d3d466fce2a3aed0ebf1acf1";
+          sha256 = "1j1wgyhb0lvj0znkq56q5vv3irfgb6w3mwpcrvxq0b0wkwr121gz";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6240afa625290187785e4b7535ee7b0d7aad8969/recipes/use-package-chords";
           sha256 = "1217l0gpxcp8532p0d3g1xd2015qpx2g5xm0kwsbxdmffqqdaar3";
-          name = "use-package-chords";
+          name = "recipe";
         };
         packageRequires = [ bind-chord bind-key key-chord use-package ];
         meta = {
@@ -74626,8 +93066,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    use-package-el-get = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, use-package }:
-    melpaBuild {
+    use-package-el-get = callPackage ({ fetchFromGitHub
+                                      , fetchurl
+                                      , lib
+                                      , melpaBuild
+                                      , use-package }:
+      melpaBuild {
         pname = "use-package-el-get";
         version = "20180130.2105";
         src = fetchFromGitHub {
@@ -74636,10 +93080,10 @@
           rev = "f33c448ed43ecb003b60ff601ee7ef9b08cff947";
           sha256 = "1wzn3h8k7aydj3hxxws64b0v4cr3b77cf7z128xh3v6xz2w62m4z";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ee4a96cf467bcab171a0adfd4ef754abec1a9971/recipes/use-package-el-get";
           sha256 = "0sg9ijkjax6w25p0q7rw5rjn8r2i83z5jfzjkvy8pxil5cg8zyh0";
-          name = "use-package-el-get";
+          name = "recipe";
         };
         packageRequires = [ use-package ];
         meta = {
@@ -74647,20 +93091,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    use-package-ensure-system-package = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, system-packages, use-package }:
-    melpaBuild {
+    use-package-ensure-system-package = callPackage ({ fetchFromGitHub
+                                                     , fetchurl
+                                                     , lib
+                                                     , melpaBuild
+                                                     , system-packages
+                                                     , use-package }:
+      melpaBuild {
         pname = "use-package-ensure-system-package";
-        version = "20180316.1307";
+        version = "20180710.29";
         src = fetchFromGitHub {
           owner = "jwiegley";
           repo = "use-package";
-          rev = "512aa50b025018cb8574498d868814f73c02bb9b";
-          sha256 = "0ncg9vbn2hjdv846v0ij6pf1cs76i73jkb17wbf08r3km7933xmw";
+          rev = "cfce01be52162d2eb4526bbb9b3bf721cca74202";
+          sha256 = "0wlyl0zya165kbf5f8swnkkbqnzxwggyc597xz0wy5wmiyr55v4l";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6240afa625290187785e4b7535ee7b0d7aad8969/recipes/use-package-ensure-system-package";
           sha256 = "1cl61nwgsz5dh3v9rdiww8mq2k1sbx27gr6izb4ij4pnzjp7aaj6";
-          name = "use-package-ensure-system-package";
+          name = "recipe";
         };
         packageRequires = [ system-packages use-package ];
         meta = {
@@ -74668,8 +93117,38 @@
           license = lib.licenses.free;
         };
       }) {};
-    usql = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    use-ttf = callPackage ({ emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild
+                           , s }:
+      melpaBuild {
+        pname = "use-ttf";
+        version = "20180608.2252";
+        src = fetchFromGitHub {
+          owner = "jcs090218";
+          repo = "use-ttf";
+          rev = "be1599e10ae5c095cd263a1d9be3e8270f770f55";
+          sha256 = "141gpnpj4gia7wyn60v24r0ysr0m2cx0p3sdh956hsk6bh29l78h";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/8af853b2db58300ba1685e3547a9f96c05b04df6/recipes/use-ttf";
+          sha256 = "08bylry03q1vy1dx8vcdc4drrn4c97hr45nsz5xc0369jmfvqavs";
+          name = "recipe";
+        };
+        packageRequires = [ emacs s ];
+        meta = {
+          homepage = "https://melpa.org/#/use-ttf";
+          license = lib.licenses.free;
+        };
+      }) {};
+    usql = callPackage ({ emacs
+                        , fetchFromGitHub
+                        , fetchurl
+                        , lib
+                        , melpaBuild }:
+      melpaBuild {
         pname = "usql";
         version = "20180305.1523";
         src = fetchFromGitHub {
@@ -74678,10 +93157,10 @@
           rev = "bfaf428b366a9a185eef84f0d645a98dc918fe3d";
           sha256 = "00b1g30l86abg65wc9f4vcn4ccqa2zmn2mi33vdjrq3phw17d2ks";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c8f6b968312a09d062fcc8f942d29c93df2a5a3c/recipes/usql";
           sha256 = "10ks164kcly5gkb2qmn700a51kph2sry4a64jwn60p5xl7w7af84";
-          name = "usql";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -74689,20 +93168,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    utop = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    utop = callPackage ({ emacs
+                        , fetchFromGitHub
+                        , fetchurl
+                        , lib
+                        , melpaBuild }:
+      melpaBuild {
         pname = "utop";
-        version = "20180228.305";
+        version = "20180706.1549";
         src = fetchFromGitHub {
           owner = "diml";
           repo = "utop";
-          rev = "1b4bd052c6513d38f6cc626c24665637d25fdc07";
-          sha256 = "05pv6nj88im1jf9nngv56z362wrp9pmkzrjn3nm846rdzbc5f21j";
+          rev = "48100fcf769bdaeb4a6c93bbb33c37b85c1dcb10";
+          sha256 = "1cr1i5ywn9abqbrl4iq1c82vdjwrbh43v67zv1a8i4fvh99yzlv1";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/30489fe52b4031184e54f994770aa3291257bc9d/recipes/utop";
           sha256 = "0lv16kl29gc9hdcpn04l85pf7x93vkl41s4mgqp678cllzyr0cq7";
-          name = "utop";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -74710,8 +93193,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    uuid = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    uuid = callPackage ({ fetchFromGitHub
+                        , fetchurl
+                        , lib
+                        , melpaBuild }:
+      melpaBuild {
         pname = "uuid";
         version = "20120910.151";
         src = fetchFromGitHub {
@@ -74720,10 +93206,10 @@
           rev = "1519bfeb0e31602b840bc8dd35d7c7e732c159fe";
           sha256 = "0r74gw8gcbrr62rvj4anz0c3n6kwi1xpb42d3pkzlh4igblhi5zj";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/uuid";
           sha256 = "0d69z9686gnd1bb17wa44v1rbbgccacn4kicwf9niwwp05nccfw6";
-          name = "uuid";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -74731,8 +93217,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    uuidgen = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    uuidgen = callPackage ({ fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "uuidgen";
         version = "20140918.1601";
         src = fetchFromGitHub {
@@ -74741,10 +93230,10 @@
           rev = "7eb96415484c3854a3f383d1a3e10b87ae674e22";
           sha256 = "19bf6vpc2b9hfjkjanji96fflvk1lbillasnpwcb6zzyq0cs47bw";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8bdeb5848d0b160a74e834ed918e83653d7342bf/recipes/uuidgen";
           sha256 = "1qaz7hg0wsdkl0jb7v7vrkjs554i2zgpxl8xq2f8q7m4bs2m5k48";
-          name = "uuidgen";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -74752,8 +93241,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    v2ex-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, request }:
-    melpaBuild {
+    v2ex-mode = callPackage ({ cl-lib ? null
+                             , fetchFromGitHub
+                             , fetchurl
+                             , let-alist
+                             , lib
+                             , melpaBuild
+                             , request }:
+      melpaBuild {
         pname = "v2ex-mode";
         version = "20160719.2045";
         src = fetchFromGitHub {
@@ -74762,10 +93257,10 @@
           rev = "b7d19bb594b43ea3824a6f215dd1e5d1d4c0e8ad";
           sha256 = "0hhj5xfm7mp3ajrbj9ai5p2d9akaqkj89rmqmg1vpyfp3x2f4h2k";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b27b7d777415aa350c8c30822e239b9a4c02e77d/recipes/v2ex-mode";
           sha256 = "04frd6jbnf9g7ak2fdbik9iji7b0903cpbg1hx7rai1853af7gh1";
-          name = "v2ex-mode";
+          name = "recipe";
         };
         packageRequires = [ cl-lib let-alist request ];
         meta = {
@@ -74773,8 +93268,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    vagrant = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    vagrant = callPackage ({ fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "vagrant";
         version = "20170301.1406";
         src = fetchFromGitHub {
@@ -74783,10 +93281,10 @@
           rev = "636ce2f9af32ea199170335a9cf1201b64873440";
           sha256 = "06zws69z327p00jw3zaf67niji2d4j339xmhbsrwbcr4w65dmz94";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/vagrant";
           sha256 = "0g6sqzsx3lixcn09fkxhhcfp45qnqgf1ms0l7nkzyljavb7151cf";
-          name = "vagrant";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -74794,8 +93292,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    vagrant-tramp = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    vagrant-tramp = callPackage ({ dash
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "vagrant-tramp";
         version = "20160427.1632";
         src = fetchFromGitHub {
@@ -74804,10 +93306,10 @@
           rev = "453ba605b28d2964bb4e10074f1e6891ebb4d2d6";
           sha256 = "138gw90wa2qyzyicig3cwhpb1xc5bh9g0vb87y91afjlykhzr6a5";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/baea9f16e245aec3f62e55471358c7208f61372d/recipes/vagrant-tramp";
           sha256 = "0ij7k27zj22sl7inx141l4dg0ymywnvyabjvaqzc0xjdj0cky5c5";
-          name = "vagrant-tramp";
+          name = "recipe";
         };
         packageRequires = [ dash ];
         meta = {
@@ -74815,8 +93317,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    vala-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    vala-mode = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "vala-mode";
         version = "20150324.1525";
         src = fetchFromGitHub {
@@ -74825,10 +93330,10 @@
           rev = "fb2871a4492d75d03d72e60474919ab89adb267b";
           sha256 = "10vs4d8csww781j1ps3f6dczy5zzza36z7a8zqk40fg4x57ikw44";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cea26fa67a524b7c14be2952cfbd4f657431415f/recipes/vala-mode";
           sha256 = "164dhlsiflhpdymk3q5x0bv8gpbwfp34lnkhm2x90kdakfzqf91p";
-          name = "vala-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -74836,8 +93341,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    vala-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
-    melpaBuild {
+    vala-snippets = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild
+                                 , yasnippet }:
+      melpaBuild {
         pname = "vala-snippets";
         version = "20150428.2052";
         src = fetchFromGitHub {
@@ -74846,10 +93355,10 @@
           rev = "671439501060449bd100b9fffd524a86064fbfbb";
           sha256 = "0iscaz8lm4fk6w13f68ysqk8ppng2wj9fkkkq1rfqz77ws66f8nq";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/70f130c5751f47c1ead5f8915680e817e0239a2a/recipes/vala-snippets";
           sha256 = "14hmmic0px3z38dm2dg0kis6cz1p3p1hj7xaqnqjmv02dkx2mmcy";
-          name = "vala-snippets";
+          name = "recipe";
         };
         packageRequires = [ yasnippet ];
         meta = {
@@ -74857,8 +93366,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    vbasense = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, lib, log4e, melpaBuild, yaxception }:
-    melpaBuild {
+    vbasense = callPackage ({ auto-complete
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , log4e
+                            , melpaBuild
+                            , yaxception }:
+      melpaBuild {
         pname = "vbasense";
         version = "20140221.1553";
         src = fetchFromGitHub {
@@ -74867,10 +93382,10 @@
           rev = "8c61a492d7c15218ae1a96e2aebfe6f78bfff6db";
           sha256 = "19j5q2f6pybvjq3ryjcyihzlw348hqyjhfcy3qflry6w786dqcgn";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8e7dd1e985d55149f48e4f93a31fb28ec01a4add/recipes/vbasense";
           sha256 = "1440q2bi4arpl5lbqh7zscg7v3884clqx54p2fdfcfkz47ky4z9n";
-          name = "vbasense";
+          name = "recipe";
         };
         packageRequires = [ auto-complete log4e yaxception ];
         meta = {
@@ -74878,8 +93393,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    vc-auto-commit = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    vc-auto-commit = callPackage ({ fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "vc-auto-commit";
         version = "20170107.533";
         src = fetchFromGitHub {
@@ -74888,10 +93406,10 @@
           rev = "446f664f4ec835532f4f18ba18b5fb731f6030aa";
           sha256 = "18jjl656ps75p7n3hf16mcjrgiagnjvb8m8dl4i261cbnq98qmav";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/770ab1e99fe63789726fc6c8c5d7e9a0287bc5fa/recipes/vc-auto-commit";
           sha256 = "1xpp7vbld3jgcr249m5h7il919kfg7d5ap3zs64i27axzdhv26zk";
-          name = "vc-auto-commit";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -74899,8 +93417,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    vc-check-status = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    vc-check-status = callPackage ({ fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "vc-check-status";
         version = "20170107.534";
         src = fetchFromGitHub {
@@ -74909,10 +93430,10 @@
           rev = "37734beb16bfd8633ea328059bf9a47eed826d5c";
           sha256 = "0mspksr2i6hkb7bhs38ydmn0d2mn7g1hjva60paq86kl7k76f7ra";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0387e08dd7ed69b291e896d85bd975c4f5dcbd09/recipes/vc-check-status";
           sha256 = "1kwnxa0ndfj8b211xy5d47sxkwmsay0kk8q7azfm5ag5dkg56zgi";
-          name = "vc-check-status";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -74920,8 +93441,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    vc-darcs = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    vc-darcs = callPackage ({ emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "vc-darcs";
         version = "20170904.2020";
         src = fetchFromGitHub {
@@ -74930,10 +93455,10 @@
           rev = "390fb1ebdda1ffac45b9be02626dde3b6d95ac11";
           sha256 = "1fcqkavc7hlbhswx5nnaqhash42cjsbr72ijznx5cplr582g3mfq";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/54f89c50ae45365e86bdadcf67b2411c0f4c5603/recipes/vc-darcs";
           sha256 = "1xskl9wjxkbdpi0fm769ymbvya70vssi944x5252w2d3layibm6m";
-          name = "vc-darcs";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -74941,8 +93466,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    vc-fossil = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    vc-fossil = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "vc-fossil";
         version = "20180215.835";
         src = fetchFromGitHub {
@@ -74951,10 +93479,10 @@
           rev = "7c5af95181213db38f81f5f9586f3334301a3ea0";
           sha256 = "1c18ywvs0l5w7ip2igksjy48awzas8mph7plpvp1v8c67a3a3m2m";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/31c5ee4b625b90c1af66d7d11a25af8e1aa307b1/recipes/vc-fossil";
           sha256 = "11ps2wrkjrjm1d984mf80wwj1hzskw5qrn0nv7md21lp75kxsvxb";
-          name = "vc-fossil";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -74962,20 +93490,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    vc-msg = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, popup }:
-    melpaBuild {
+    vc-msg = callPackage ({ emacs
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild
+                          , popup }:
+      melpaBuild {
         pname = "vc-msg";
-        version = "20171106.1747";
+        version = "20180604.1758";
         src = fetchFromGitHub {
           owner = "redguardtoo";
           repo = "vc-msg";
-          rev = "9d40d94c0a73f46047e2f6d40be795638e5c3ebc";
-          sha256 = "1fgkaa93hyszgp2r98rzr7c84f83q1kb9vr9xmj8g9sqak4y1dsr";
+          rev = "ffd8db482cbd9fb63dace0e5ddcc7207a9c99f5e";
+          sha256 = "1zq01k50d958prl8aaz8n2sv541lrq3s1dn8vnfal4drn3iffgv9";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/59ad4e80b49c78decd7b5794565313f65550384e/recipes/vc-msg";
           sha256 = "16pgx8pg3djhkmhf1fihgjk7c6nb2nsqj58888bwg7385mlwc7g9";
-          name = "vc-msg";
+          name = "recipe";
         };
         packageRequires = [ emacs popup ];
         meta = {
@@ -74983,8 +93516,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    vc-osc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    vc-osc = callPackage ({ fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "vc-osc";
         version = "20161119.1155";
         src = fetchFromGitHub {
@@ -74993,10 +93529,10 @@
           rev = "8c09a0d5f69237285101554261b77d76b546a24b";
           sha256 = "153zwhljkjl0dajd1l6p5icva0bnpa2rj8byjblb3xv8rq7p1fzc";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/70a1fa5fdfdfa9ec5607524be62eb44fe82e91b0/recipes/vc-osc";
           sha256 = "0rp33945xk5d986brganqnn55psmlkj6glbimxakhgv9a1r85sxz";
-          name = "vc-osc";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -75004,8 +93540,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    vcl-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    vcl-mode = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "vcl-mode";
         version = "20170119.1251";
         src = fetchFromGitHub {
@@ -75014,10 +93553,10 @@
           rev = "3d86c1352a7370d558d25f4c8f7be744e7d27332";
           sha256 = "1zp59p8pw65qy7s9y17a52y1pm35hajdfn3p1kfm1y3vmfxf9x3a";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bcbe3892fd20e624117de534ca92ba3fba1669a1/recipes/vcl-mode";
           sha256 = "1h0a1briinp9ka7ga3ipdhyf7yfinwvf7babv36myi720900wcq5";
-          name = "vcl-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -75025,8 +93564,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    vcomp = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    vcomp = callPackage ({ fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "vcomp";
         version = "20140906.1508";
         src = fetchFromGitHub {
@@ -75035,10 +93577,10 @@
           rev = "092ef48a78e950c0576269d889be6caf9f6e61c5";
           sha256 = "0fzz26c1pdaz3i58ndhzd2520mhny487daqs21yajxi9x2m00zrl";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/561442ea9f75ebe8444db1a0c40f7756fcbca482/recipes/vcomp";
           sha256 = "02cj2nlyxvgvl2rjfgacljvcsnfm9crmmkhcm2pznj9xw10y8pq0";
-          name = "vcomp";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -75046,20 +93588,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    vdiff = callPackage ({ emacs, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild }:
-    melpaBuild {
+    vdiff = callPackage ({ emacs
+                         , fetchFromGitHub
+                         , fetchurl
+                         , hydra
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "vdiff";
-        version = "20170525.1231";
+        version = "20180627.615";
         src = fetchFromGitHub {
           owner = "justbur";
           repo = "emacs-vdiff";
-          rev = "66ae1ac324d9ec7ef87abee38f260734f036cf3d";
-          sha256 = "0d8zam8p6qyzjr99n0jpmjav429qkjgg59gidmhgf0cbx2pyvy8s";
+          rev = "773e3ebde452cec9b37baa0d425ec4b51d9dc563";
+          sha256 = "1zwmcrmcixlpqyl0mnfgswv1h0g88mkph1ln3715fcv3xfd0vkrw";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e90f19c8fa4b0d267d269b76f117995e812e899c/recipes/vdiff";
           sha256 = "11gw0l63fssbiyhngqb7ykrp7m1vy55wlf27ybhh2dkwh1cpkr4l";
-          name = "vdiff";
+          name = "recipe";
         };
         packageRequires = [ emacs hydra ];
         meta = {
@@ -75067,8 +93614,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    vdiff-magit = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild, vdiff }:
-    melpaBuild {
+    vdiff-magit = callPackage ({ emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , magit
+                               , melpaBuild
+                               , vdiff }:
+      melpaBuild {
         pname = "vdiff-magit";
         version = "20170519.1407";
         src = fetchFromGitHub {
@@ -75077,10 +93630,10 @@
           rev = "1ccf0a8be5aad18648fd59c775a8dd6070398b74";
           sha256 = "1skcrpfgz2c9s9r2xvwanrvyczcqjgmjrwjm188d55l4pn8ylr83";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2159275fabde8ec8b297f6635546b1314d519b8b/recipes/vdiff-magit";
           sha256 = "1vjc1r5xfdg9bmscgppx1fps1w5bd0zpp6ab5z5dxlg2zx2vdldw";
-          name = "vdiff-magit";
+          name = "recipe";
         };
         packageRequires = [ emacs magit vdiff ];
         meta = {
@@ -75088,20 +93641,27 @@
           license = lib.licenses.free;
         };
       }) {};
-    vdirel = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, org-vcard, seq }:
-    melpaBuild {
+    vdirel = callPackage ({ emacs
+                          , fetchFromGitHub
+                          , fetchurl
+                          , helm
+                          , lib
+                          , melpaBuild
+                          , org-vcard
+                          , seq }:
+      melpaBuild {
         pname = "vdirel";
         version = "20170605.43";
         src = fetchFromGitHub {
           owner = "DamienCassou";
           repo = "vdirel";
-          rev = "72399f5e09f53aa25a068be8689cb711b8accf08";
-          sha256 = "1xlzm2c6wcmrjjwl61552yaijjsiazbs2lxn1y5p7xbj9x7jrkn9";
+          rev = "a1e6ea3ed5faaf70667c62bc5591dc810331cb1a";
+          sha256 = "1z8q3akm0hq7z7nqclra1wv7a6m0cbskhnd3ca4v9wf9dajiwnsb";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/72b5ea3f4444c3de73d986a28e1d12bf47c40246/recipes/vdirel";
           sha256 = "11cc7bw7x5h3bwnlsjyhw6k5fh2fk7wffarrcny562v4cmr013cj";
-          name = "vdirel";
+          name = "recipe";
         };
         packageRequires = [ emacs helm org-vcard seq ];
         meta = {
@@ -75109,20 +93669,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    vector-utils = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    vector-utils = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "vector-utils";
         version = "20140508.1341";
         src = fetchFromGitHub {
           owner = "rolandwalker";
           repo = "vector-utils";
-          rev = "c38ca1c6a23b2b51a6ac36c2c64e50e21cbe9d21";
-          sha256 = "1wa03gb98x650q798aqshm43kh6gfxaz1rlyrmvka5dxgf48whmf";
+          rev = "5f9ced3960a318d611c3d20ffdc9ca74054fa8b7";
+          sha256 = "11mqjymcgssahlpc83qflcavjs2lrk0rq4pq2nq9sxm2dgnvrz86";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/081aa3e1d50c2c9e5a9b9ce0716258a93279f605/recipes/vector-utils";
           sha256 = "07armr23pq5pd47lqhir6a59r86c84zikbc51d8vfcaw8y71yr5n";
-          name = "vector-utils";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -75130,8 +93693,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    verify-url = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    verify-url = callPackage ({ cl-lib ? null
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "verify-url";
         version = "20160426.528";
         src = fetchFromGitHub {
@@ -75140,10 +93707,10 @@
           rev = "d6f3623cda8cd526a2d198619b137059cb1ba1ab";
           sha256 = "1y6vjw5qzaxr37spg5d4nxffmhiipzsrd7mvh8bs3jcfrsg3080n";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2070f7b1901c83e59468f6498bd5f79077ccb79d/recipes/verify-url";
           sha256 = "1gd83rb1q0kywchd0345p5axqj1sv4f5kadympx5pbp4n5p1dqb2";
-          name = "verify-url";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -75151,8 +93718,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    vertica = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, sql ? null }:
-    melpaBuild {
+    vertica = callPackage ({ fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild
+                           , sql ? null }:
+      melpaBuild {
         pname = "vertica";
         version = "20131217.711";
         src = fetchFromGitHub {
@@ -75161,10 +93732,10 @@
           rev = "3c9647b425c5c13c30bf0cba483646af18196588";
           sha256 = "1mp71axs3vdrdwlhgywfldvnr6a1g2qbxiywmpfmcv59n5n58p1j";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f98a06b794ef0936db953f63679a63232295a849/recipes/vertica";
           sha256 = "1ljjk6zrbr2k0s0iaqd9iq3j45cavijcx0rqdidliswnfllav4ng";
-          name = "vertica";
+          name = "recipe";
         };
         packageRequires = [ sql ];
         meta = {
@@ -75172,8 +93743,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    vertica-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
-    melpaBuild {
+    vertica-snippets = callPackage ({ fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild
+                                    , yasnippet }:
+      melpaBuild {
         pname = "vertica-snippets";
         version = "20180208.154";
         src = fetchFromGitHub {
@@ -75182,10 +93757,10 @@
           rev = "5959d86c77d4b8f67383f65f7f6ca3e0db2a9529";
           sha256 = "0hmvd2kly7k51qfhkg6rzcq0a5ksskr1r0x07i0imz0idm77g29z";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d3c8cb5c0fdbb6820a08091d8936dd53a3c43c56/recipes/vertica-snippets";
           sha256 = "0044qcf6dyxp2h14ij6w19zs7ikx9xalfrz6jqbl8sy35wcihmhn";
-          name = "vertica-snippets";
+          name = "recipe";
         };
         packageRequires = [ yasnippet ];
         meta = {
@@ -75193,8 +93768,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    vertigo = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    vertigo = callPackage ({ dash
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "vertigo";
         version = "20180408.920";
         src = fetchFromGitHub {
@@ -75203,10 +93782,10 @@
           rev = "117450dfad5d5ad45d40995cdf9a626cf9c2b136";
           sha256 = "1bxf2kzdj4xmy6wmajwvn40msp2q4szp25ylah49biw92dwi2bzw";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f1957e7fa03b6b8eb2f3250bd814d707bce3cfa3/recipes/vertigo";
           sha256 = "0x0wy1z601sk1x96bl2xx18qm4avd77iybq1a3ss8x8ykwqlgf83";
-          name = "vertigo";
+          name = "recipe";
         };
         packageRequires = [ dash ];
         meta = {
@@ -75214,8 +93793,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    vhdl-capf = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    vhdl-capf = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "vhdl-capf";
         version = "20160221.934";
         src = fetchFromGitHub {
@@ -75224,10 +93806,10 @@
           rev = "290abe217050f33532bc9ccb04f894123402f414";
           sha256 = "185a7962h94122q783ih7s8r28xifm0bcrqvkd0g4p64mijlbh3d";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6192f5777bc8be6ddc5523f92ab641ed3af1a504/recipes/vhdl-capf";
           sha256 = "06dkw5ra9wnscpgrnx851vyfgr5797xd60qdimsr2v1bqd8si9km";
-          name = "vhdl-capf";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -75235,20 +93817,27 @@
           license = lib.licenses.free;
         };
       }) {};
-    vhdl-tools = callPackage ({ emacs, fetchFromGitHub, fetchurl, ggtags, helm, lib, melpaBuild, outshine }:
-    melpaBuild {
+    vhdl-tools = callPackage ({ emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , ggtags
+                              , helm
+                              , lib
+                              , melpaBuild
+                              , outshine }:
+      melpaBuild {
         pname = "vhdl-tools";
-        version = "20171111.930";
+        version = "20180610.958";
         src = fetchFromGitHub {
           owner = "csantosb";
           repo = "vhdl-tools";
-          rev = "6bbcbdfbff7154517178290371b0182a176c09b5";
-          sha256 = "16k2h8n85ldfjb4zh7f202q370zs0rmmjhgf2jr4xfrvbdmgr8pa";
+          rev = "4e9df06c3519be22f1f713d18c80d325a5b0c3d2";
+          sha256 = "0n6mmbg8g3ip3dkbc4kxqxsd4p1h7jry25n1cqvzm24x1adwlcfm";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/69fe2f8fb98ac1af1d3185f62ae1c89e646cfebf/recipes/vhdl-tools";
           sha256 = "006d9xv60a90xalagczkziiimwsr1np9nn25zvnc4nlbf8j3fbbw";
-          name = "vhdl-tools";
+          name = "recipe";
         };
         packageRequires = [ emacs ggtags helm outshine ];
         meta = {
@@ -75256,20 +93845,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    vi-tilde-fringe = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    vi-tilde-fringe = callPackage ({ emacs
+                                   , fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "vi-tilde-fringe";
         version = "20141027.1942";
         src = fetchFromGitHub {
           owner = "syl20bnr";
           repo = "vi-tilde-fringe";
-          rev = "f1597a8d54535bb1d84b442577b2024e6f910308";
-          sha256 = "0wdm8k49zl6i6wnh7vjkswdh5m9lix56jv37xvc90inipwgs402z";
+          rev = "e6e15638e8c45a5e68d0874d5d8c9a46c4f38a54";
+          sha256 = "08bsman85x2l94ighzcj3xkis1snjc96bmgc8yfk63vqlybv5pw9";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8b3359d57148f8205f8a863a21d92fe4912f31cc/recipes/vi-tilde-fringe";
           sha256 = "0jhwv46gjwjbs1ai65nm6k15y0q4yl9m5mawgp3n4f45dh02cawp";
-          name = "vi-tilde-fringe";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -75277,8 +93870,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    viewer = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    viewer = callPackage ({ fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "viewer";
         version = "20170106.1802";
         src = fetchFromGitHub {
@@ -75287,10 +93883,10 @@
           rev = "6c8db025bf4021428f7f2c3ef9d74fb13f5d267a";
           sha256 = "1sj4a9zwfv94m0ac503gan6hf9sl2658khab1fnj8szcq7hrdvq1";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f8e4328cae9b4759a75da0b26ea8b68821bc71af/recipes/viewer";
           sha256 = "10rw3b8akd2fl8gsqf1m24zi6q4n0z68lvvv1vx9c9b7ghqcqxw1";
-          name = "viewer";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -75298,8 +93894,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    viking-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    viking-mode = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "viking-mode";
         version = "20160705.1327";
         src = fetchFromGitHub {
@@ -75308,10 +93907,10 @@
           rev = "c76aa265d13ad91d6890d242e142d05e31f0340b";
           sha256 = "1944p3kbskzj4d9w9prbi7z59lrn087v3gphbhwjplz6mvwbl8g6";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5805575f353c14a62d00543a23eb4c638d9d52dc/recipes/viking-mode";
           sha256 = "13g6gw8yc4pgi1zjig6nlpnsh52dzmprisq95r6lx6hk0xbzrx16";
-          name = "viking-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -75319,20 +93918,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    vim-empty-lines-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    vim-empty-lines-mode = callPackage ({ emacs
+                                        , fetchFromGitHub
+                                        , fetchurl
+                                        , lib
+                                        , melpaBuild }:
+      melpaBuild {
         pname = "vim-empty-lines-mode";
         version = "20150110.2026";
         src = fetchFromGitHub {
           owner = "jmickelin";
           repo = "vim-empty-lines-mode";
-          rev = "d4a5034ca8ea0c962ad6e92c86c0fa2a74d2964b";
-          sha256 = "11qh6fpf6269j9syf06v5wnkgi65wnn7dbyjwb6yz72rvq7ihhcz";
+          rev = "442a29b0ba1635a3b352c9dd1faf9ce99656d048";
+          sha256 = "09x857vbx35rpyc5x1322ajby613gva090x4vawaczk22idq65h4";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e93a8dcd2ff159203288e71da6b8f28eab0d2006/recipes/vim-empty-lines-mode";
           sha256 = "17bl1g4ais73ws596mha0l8dgckfqhx9k2v9m9k0gw7kg7dcjhnb";
-          name = "vim-empty-lines-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -75340,8 +93943,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    vim-region = callPackage ({ expand-region, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    vim-region = callPackage ({ expand-region
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "vim-region";
         version = "20140329.924";
         src = fetchFromGitHub {
@@ -75350,10 +93957,10 @@
           rev = "7c4a99ce3678fee40c83ab88e8ad075d2a935fdf";
           sha256 = "13g2hin100c8h5bd7hzhyqzj02ab9c35giyv963l7y044v7sbwig";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/23249b485ca8e66a21f858712f46aa76b8554f28/recipes/vim-region";
           sha256 = "1dcnx799lpjsdnnjxqzgskkfj2nx7f4kwf0xjhbg35ny4nyn81dx";
-          name = "vim-region";
+          name = "recipe";
         };
         packageRequires = [ expand-region ];
         meta = {
@@ -75361,20 +93968,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    vimish-fold = callPackage ({ cl-lib ? null, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    vimish-fold = callPackage ({ cl-lib ? null
+                               , emacs
+                               , f
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "vimish-fold";
         version = "20171231.2212";
         src = fetchFromGitHub {
           owner = "mrkkrp";
           repo = "vimish-fold";
-          rev = "c904cd3e8515e76fb836615305e174369211f6df";
-          sha256 = "1kwd6f2qi3p41kryd8z01lkiw7ikpgywgpfy9zbjyb5x6z2hn35s";
+          rev = "1469c953bc20d21d87ce5d92def767e551cda07c";
+          sha256 = "0nywz6nk1qanx7z9sykf28h9c2qj7xzs9w4hya4vmhwigqqbhldl";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b4862b0a3d43f073e645803cbbf11d973a4b51d5/recipes/vimish-fold";
           sha256 = "017by9w53d8pqlsazfycmhdv16yylks308p5vxp1rcw2qacpc5m3";
-          name = "vimish-fold";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs f ];
         meta = {
@@ -75382,8 +93995,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    vimrc-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    vimrc-mode = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "vimrc-mode";
         version = "20170814.1837";
         src = fetchFromGitHub {
@@ -75392,10 +94008,10 @@
           rev = "ba8140fba6e03a35b123acbd62fc8c6f0a03bf4a";
           sha256 = "07pwmjaa24hh20bcanmxgnaf050c0j6190i0qfvpd0gpc4p80pxx";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/vimrc-mode";
           sha256 = "05zmr624qwsj9wqsmjlhjvjl1fc1qxz4vvbb3ljr5fbpxdjrbnpn";
-          name = "vimrc-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -75403,20 +94019,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    virtualenv = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    virtualenv = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "virtualenv";
         version = "20140220.1501";
         src = fetchFromGitHub {
           owner = "aculich";
           repo = "virtualenv.el";
-          rev = "276c0f4d6493b402dc4d22ecdf17b2b072e911b3";
-          sha256 = "0rd7hyv66278dj32yva5q9z1749y84c6fwl2iqrns512j1l4kl8q";
+          rev = "cc82856b6316d5e78073de717f0d5d1a4ee35fa6";
+          sha256 = "1appaxy44njjyp5jp8l0nyqrvbi8hkdvbdfvvf5n08ad43g281p1";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/923e4fcf29423ad55b13132d53759bc436466ef9/recipes/virtualenv";
           sha256 = "1djqzzlbwsp9xyjqjbjwdck73wzikbpq19irzamybk90nc98wirl";
-          name = "virtualenv";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -75424,8 +94043,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    virtualenvwrapper = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    virtualenvwrapper = callPackage ({ dash
+                                     , fetchFromGitHub
+                                     , fetchurl
+                                     , lib
+                                     , melpaBuild
+                                     , s }:
+      melpaBuild {
         pname = "virtualenvwrapper";
         version = "20180211.1744";
         src = fetchFromGitHub {
@@ -75434,10 +94058,10 @@
           rev = "bf13158dde071bdf4901709ed101aba6b8a25f7f";
           sha256 = "003nj9i6kfjyw1bdz1y3dssp3ff7irhsfq21r430xvdfnzrby4ky";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/acc9b816796b9f142c53f90593952b43c962d2d8/recipes/virtualenvwrapper";
           sha256 = "0rn5vwncx8z69xp8hspr06nzkf28l9flchpb2936c2nalmhx6m8i";
-          name = "virtualenvwrapper";
+          name = "recipe";
         };
         packageRequires = [ dash s ];
         meta = {
@@ -75445,20 +94069,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    visible-mark = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    visible-mark = callPackage ({ fetchFromGitLab
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "visible-mark";
         version = "20150623.2150";
         src = fetchFromGitLab {
           owner = "iankelling";
           repo = "visible-mark";
-          rev = "a584db9bc88953b23a9648b3e14ade90767207f8";
-          sha256 = "1rsi9irv9i03627cmfaqz03f9cvpm7555ga8n2gs622lzp6bb3jf";
+          rev = "c1852e13b6b61982738b56977a452ec9026faf1b";
+          sha256 = "15zdbvv6c114mv6hdq375l7ax70sss06p9d7m86hgssc3kiv9vsv";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/76ac7178ee5381e08ae881f3fc6061106eeb1c1d/recipes/visible-mark";
           sha256 = "1rp0gnz28m1drwb1hhsf0mwxzdppdi88hscf788qw8cw65gckv80";
-          name = "visible-mark";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -75466,8 +94093,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    visual-ascii-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    visual-ascii-mode = callPackage ({ fetchFromGitHub
+                                     , fetchurl
+                                     , lib
+                                     , melpaBuild }:
+      melpaBuild {
         pname = "visual-ascii-mode";
         version = "20150129.246";
         src = fetchFromGitHub {
@@ -75476,10 +94106,10 @@
           rev = "99285a099a17472ddd9f1b4f74e9d092dd8c5947";
           sha256 = "1cv8mf3l92a9p8qmkfiphk3r81f2ihg2gyw2r4jbbd5ppwbxkl0n";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/21df748a3f383d62c921e184e2a4c9ae4118ca98/recipes/visual-ascii-mode";
           sha256 = "1h0143h39dq61afswlzlgpknk0gv574x91ar6klqmnaf1snab59g";
-          name = "visual-ascii-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -75487,20 +94117,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    visual-fill-column = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    visual-fill-column = callPackage ({ emacs
+                                      , fetchFromGitHub
+                                      , fetchurl
+                                      , lib
+                                      , melpaBuild }:
+      melpaBuild {
         pname = "visual-fill-column";
-        version = "20170502.1300";
+        version = "20180511.211";
         src = fetchFromGitHub {
           owner = "joostkremers";
           repo = "visual-fill-column";
-          rev = "d97017e9bcca79e6a0f3ef63414a954319feb879";
-          sha256 = "11w3krp5z6yxchqlz45kqiqf0y9drplmanixw3q4r5cwaspx94qh";
+          rev = "606d86e38ca99704cf745fe9cadd603d6001cb0d";
+          sha256 = "1fjzlw6i4jpd0lmdxkzgaypgr2cx5klkb6xwc5k684ly3xp8snc2";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c7628c805840c4687686d0b9dc5007342864721e/recipes/visual-fill-column";
           sha256 = "19y0pwaybjal2rc7migdbnafpi4dfbxvrzgfqr8dlvd9q68v08y5";
-          name = "visual-fill-column";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -75508,8 +94142,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    visual-regexp = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    visual-regexp = callPackage ({ cl-lib ? null
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "visual-regexp";
         version = "20170228.1716";
         src = fetchFromGitHub {
@@ -75518,10 +94156,10 @@
           rev = "b3096c2d391ff4e28a2a4e8cd82efbf11071ea85";
           sha256 = "12zpmzwyp85dzsjpxd3279kpfi9yz3jwc1k9fnb3xv3pjiil5svg";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/visual-regexp";
           sha256 = "16bdqq2j7pnjq3j6qa4rhxzidqdhyg80c7nazd93smis8rcv5d0z";
-          name = "visual-regexp";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -75529,8 +94167,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    visual-regexp-steroids = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, visual-regexp }:
-    melpaBuild {
+    visual-regexp-steroids = callPackage ({ fetchFromGitHub
+                                          , fetchurl
+                                          , lib
+                                          , melpaBuild
+                                          , visual-regexp }:
+      melpaBuild {
         pname = "visual-regexp-steroids";
         version = "20170221.1853";
         src = fetchFromGitHub {
@@ -75539,10 +94181,10 @@
           rev = "a6420b25ec0fbba43bf57875827092e1196d8a9e";
           sha256 = "1isqa4ck6pm4ykcrkr0g1qj8664jkpcsrq0f8dlb0sksns2dqkwj";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7f105ebce741956b7becc86e4bdfcafecf59af74/recipes/visual-regexp-steroids";
           sha256 = "1xkrzyyll8wmb67m75lfm9k8qcm068km8r1k8hcsadpkd01bx1lr";
-          name = "visual-regexp-steroids";
+          name = "recipe";
         };
         packageRequires = [ visual-regexp ];
         meta = {
@@ -75550,8 +94192,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    vlf = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    vlf = callPackage ({ fetchFromGitHub
+                       , fetchurl
+                       , lib
+                       , melpaBuild }:
+      melpaBuild {
         pname = "vlf";
         version = "20180201.1454";
         src = fetchFromGitHub {
@@ -75560,10 +94205,10 @@
           rev = "31b292dc85a374fb343789e217015683bfbdf5f1";
           sha256 = "18ll47if9ajv0jj2aps8592bj7xqhxy74sbsqn07x9ywinxxi9mn";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9116b11eb513dd9e1dc9542d274dd60f183b24c4/recipes/vlf";
           sha256 = "1ipkv5kmda0l39xwbf7ns9p0mx3kb781mxsm9vmbkhr5x577s2j8";
-          name = "vlf";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -75571,8 +94216,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    vmd-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    vmd-mode = callPackage ({ emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "vmd-mode";
         version = "20180223.556";
         src = fetchFromGitHub {
@@ -75581,10 +94230,10 @@
           rev = "24e38a20951dfad6e3e985c7cc6286c1e271da5f";
           sha256 = "00anpbnf0h6iikhpqz4mss507j41xwvv27svw41kpgcwsnrmrqwm";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/vmd-mode";
           sha256 = "1xjyl2xh3vig2rzjqm1a4h2ridygbanmal78s4yc32hacy0lfyrx";
-          name = "vmd-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -75592,8 +94241,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    voca-builder = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, popup }:
-    melpaBuild {
+    voca-builder = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild
+                                , popup }:
+      melpaBuild {
         pname = "voca-builder";
         version = "20161101.945";
         src = fetchFromGitHub {
@@ -75602,10 +94255,10 @@
           rev = "51573beec8cd8308477b0faf453aad93e17f57c5";
           sha256 = "1gd7zqmyn389dfyx1yll1bw5f8kjib87k33s9hxsbx0db8vas9q6";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/42a930e024ce525b2890ccd5a1eb4844859faafd/recipes/voca-builder";
           sha256 = "0mbw87mpbb8rw7xzhmg6yjla2c80x9820kw4q00x00ny5rbhm76y";
-          name = "voca-builder";
+          name = "recipe";
         };
         packageRequires = [ popup ];
         meta = {
@@ -75613,8 +94266,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    volatile-highlights = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    volatile-highlights = callPackage ({ fetchFromGitHub
+                                       , fetchurl
+                                       , lib
+                                       , melpaBuild }:
+      melpaBuild {
         pname = "volatile-highlights";
         version = "20160611.1855";
         src = fetchFromGitHub {
@@ -75623,10 +94279,10 @@
           rev = "9a20091f0ce7fc0a6b3e641a6a46d5f3ac4d8392";
           sha256 = "1dsa6769lphyyv7yg92vkkpk395w52q4m7hdn8xy7s6lh5c6a955";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/volatile-highlights";
           sha256 = "1r6in919aqdziv6bgzp4k7jqa87bd287pacq615sd5m1nzva1a4d";
-          name = "volatile-highlights";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -75634,8 +94290,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    volume = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    volume = callPackage ({ fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "volume";
         version = "20150718.1309";
         src = fetchFromGitHub {
@@ -75644,10 +94303,10 @@
           rev = "ecc1550b3c8b501d37e0f0116b54b535d15f90f6";
           sha256 = "0ymibjq6iwab5ia1fglhz4gm5cnbi792018fmrabcqkisj2zsjb7";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bde261750a2754c5bcf01b9a9260429609b8c2bf/recipes/volume";
           sha256 = "1r01v453bpyh561j8ja36609hy60gc30arvmz4z3c1cybhv8sk1i";
-          name = "volume";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -75655,20 +94314,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    vue-html-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    vue-html-mode = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "vue-html-mode";
-        version = "20180104.1421";
+        version = "20180428.1335";
         src = fetchFromGitHub {
           owner = "AdamNiederer";
           repo = "vue-html-mode";
-          rev = "3fa65f8ac8a4c54f13c32fd43c9865c92c22ce07";
-          sha256 = "00mj1qmcsfndnk7vif7aa9nqy7hd3cnbmn6fhik1mmsqrazcbp0h";
+          rev = "361a9fa117f044c3072dc5a7344ff7be31725849";
+          sha256 = "1z1pphxli8fcahw9fhmxls1v9nyd34pz51jwwa6g468zvdmcjb77";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/48588b163ab76204b9054340071e758045480e19/recipes/vue-html-mode";
           sha256 = "1f4pjfp4298jkvhacxygddg557hhyivgnm5x3yhjipfv6fjkgl2s";
-          name = "vue-html-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -75676,20 +94338,27 @@
           license = lib.licenses.free;
         };
       }) {};
-    vue-mode = callPackage ({ edit-indirect, fetchFromGitHub, fetchurl, lib, melpaBuild, mmm-mode, ssass-mode, vue-html-mode }:
-    melpaBuild {
+    vue-mode = callPackage ({ edit-indirect
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild
+                            , mmm-mode
+                            , ssass-mode
+                            , vue-html-mode }:
+      melpaBuild {
         pname = "vue-mode";
-        version = "20180410.1157";
+        version = "20180515.2012";
         src = fetchFromGitHub {
           owner = "CodeFalling";
           repo = "vue-mode";
-          rev = "eab311f535ac922086466dba3e6f0d428fcff3f2";
-          sha256 = "0j7qbrx0z6kvm9r2swyb2khhn9gciq4yjxg199ckg7k5p8iqlzlq";
+          rev = "5491a4a765814c392de13617ca3ad4a32edd6399";
+          sha256 = "10m5kc0zsvfwr1km66c36qzs6bckq1x0cx4r79vs7sxwwfz8mq2b";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2e5e0a9fff332aeec09f6d3d758e2b67dfdf8397/recipes/vue-mode";
           sha256 = "0gy7a5sliaijq0666l55vbkg15anrw7k1828szdn1ppkraw14bn0";
-          name = "vue-mode";
+          name = "recipe";
         };
         packageRequires = [ edit-indirect mmm-mode ssass-mode vue-html-mode ];
         meta = {
@@ -75697,8 +94366,36 @@
           license = lib.licenses.free;
         };
       }) {};
-    w32-browser = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    vyper-mode = callPackage ({ emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
+        pname = "vyper-mode";
+        version = "20180707.1235";
+        src = fetchFromGitHub {
+          owner = "ralexstokes";
+          repo = "vyper-mode";
+          rev = "323dfddfc38f0b11697e9ebaf04d1b53297e54e5";
+          sha256 = "1vxqgc9c1lj61ipaw05xfby3nl7wn3kp5ga6kpr17v0jlm0667s5";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/492d42d60bc188a567c5e438b838a275a124c699/recipes/vyper-mode";
+          sha256 = "0mf1w4mw0ijmd9zxip1df85cp15fbvv9j5dqjmb8lfm4m43wpd96";
+          name = "recipe";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/vyper-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    w32-browser = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "w32-browser";
         version = "20170101.1154";
         src = fetchFromGitHub {
@@ -75707,10 +94404,10 @@
           rev = "e5c60eafd8f8d3546a0fa295ad5af2414d36b4e6";
           sha256 = "18hcr9l5id2xdin20wrg9sdmwfad7qk78iryyg24ci9lvl53m02x";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ae489be43b1aee93614e40f492ebdf0b98a3fbc1/recipes/w32-browser";
           sha256 = "16sp0gn4yv7iaa55i2kvfsqw3610gr3x31l9lqa14r9xmfhda1rn";
-          name = "w32-browser";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -75718,20 +94415,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    w3m = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    w3m = callPackage ({ fetchFromGitHub
+                       , fetchurl
+                       , lib
+                       , melpaBuild }:
+      melpaBuild {
         pname = "w3m";
-        version = "20180221.2059";
+        version = "20180404.2220";
         src = fetchFromGitHub {
           owner = "emacsorphanage";
           repo = "w3m";
-          rev = "4b9664bab3794379af42d549d9540735c16b5a25";
-          sha256 = "16wics5k7w7b23zayh9j6jbh6dflk6r8wq75p9bnpw1n36gmm8ig";
+          rev = "ea64ccb3d792b60f0815309f588bf46b1f0ca80e";
+          sha256 = "13dhr36177363x5zjbm5ig4g9xg0x6j0j37smzqlwy2bp244mm06";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/30de78c9cf83de30093a5647976eeaf552d4b2cb/recipes/w3m";
           sha256 = "0a4jql7ky62ickccbr2xnyggix5wf726d4pfz7mi3yxlw6i8m79s";
-          name = "w3m";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -75739,8 +94439,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    wacspace = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    wacspace = callPackage ({ cl-lib ? null
+                            , dash
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "wacspace";
         version = "20180311.1650";
         src = fetchFromGitHub {
@@ -75749,10 +94454,10 @@
           rev = "54d19aab6fd2bc5945b7ffc58104e695064927e2";
           sha256 = "1nfx1qsl2gxjqbbc5xsr8f3xz2qyb4wnz3634k3hglb1jpa78j3n";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/58e5ff4c5853c5350d0534894ddb358daa83cee9/recipes/wacspace";
           sha256 = "1xy0mprvyi37zmgj1yrlh5ni08j47lpag1jm3a76cgghgmlfjxrl";
-          name = "wacspace";
+          name = "recipe";
         };
         packageRequires = [ cl-lib dash ];
         meta = {
@@ -75760,19 +94465,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    waf-mode = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    waf-mode = callPackage ({ fetchgit
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "waf-mode";
         version = "20170403.1240";
         src = fetchgit {
           url = "https://bitbucket.org/dvalchuk/waf-mode";
-          rev = "20c75eabd1d54fbce8e0dbef785c9fb68577ee4f";
-          sha256 = "09jqxbkkprsrcj7gj9hi8ll7d17425lyjmdmqf12ffqv5pz6aq87";
+          rev = "91c761336aa137b85b88b53b3f0cc60786d70800";
+          sha256 = "1j2bqhmxjfai343m6iv3a8z37hv154h9kbidbi39d1pz2fl5lv43";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/44c1aa152ba47113a91878df78d9b56eead98744/recipes/waf-mode";
           sha256 = "16rplrs599a67dcxcdc33zb9bqivv4a2mvrshvyip1lp75f36r5h";
-          name = "waf-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -75780,8 +94488,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    waher-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    waher-theme = callPackage ({ emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "waher-theme";
         version = "20141115.430";
         src = fetchFromGitHub {
@@ -75790,10 +94502,10 @@
           rev = "60d31519fcfd8e797723d47961b255ae2f2e2c0a";
           sha256 = "0w59ix8cbbcyhh882c8vkrbh84i8d03h9w7dchr3qy233b8wcxlc";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c734ba401d7d9255e0934c31ca5269866af035db/recipes/waher-theme";
           sha256 = "091kipkb6z6x9ic4chprim9rvnmx4yj4419ijmvpn70w69aspnb5";
-          name = "waher-theme";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -75801,8 +94513,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    wakatime-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    wakatime-mode = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "wakatime-mode";
         version = "20170517.2053";
         src = fetchFromGitHub {
@@ -75811,10 +94526,10 @@
           rev = "b1eae15f38a367017e519c10837c44650631b154";
           sha256 = "0l2nwjz978lamlikipljw143j40bnli7rzf9rixsia9iby4krl25";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a46036a0e53afbebacafd3bc9545c99af79ccfcc/recipes/wakatime-mode";
           sha256 = "1rhy2bwkqlha4bj3zmb0iassiglch7yb2kbas0bbpl3d0hdki2i8";
-          name = "wakatime-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -75822,8 +94537,38 @@
           license = lib.licenses.free;
         };
       }) {};
-    wand = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    wakib-keys = callPackage ({ emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
+        pname = "wakib-keys";
+        version = "20180610.1952";
+        src = fetchFromGitHub {
+          owner = "darkstego";
+          repo = "wakib-keys";
+          rev = "682e3241ebc9147f4e316627cbff456dd316e372";
+          sha256 = "191j9pk989jwhczwimr8smx1qiiwy5d85j195z8aqg252m656fnw";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/b8ef5ae0dcb92e1cf019be3d53ab9b47d89f45bd/recipes/wakib-keys";
+          sha256 = "1cgd15zwl15k2bxy3by17pphh6x1z8lanwkfjy4qyp5sxkjvw1cl";
+          name = "recipe";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/wakib-keys";
+          license = lib.licenses.free;
+        };
+      }) {};
+    wand = callPackage ({ dash
+                        , fetchFromGitHub
+                        , fetchurl
+                        , lib
+                        , melpaBuild
+                        , s }:
+      melpaBuild {
         pname = "wand";
         version = "20180112.454";
         src = fetchFromGitHub {
@@ -75832,10 +94577,10 @@
           rev = "e8939812e03255fff3e15c5d0f9d4da849aaf07b";
           sha256 = "0l79vhf0s5rz9s02bmcfyx7yn4pvn3dnxkr50qfhqajrvfx1105g";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/38be840bbb32094b753ec169b717a70817006655/recipes/wand";
           sha256 = "052zq5dp800hynd9fb6c645kjb9rp3bpkz41ifazjnx4h4864r0l";
-          name = "wand";
+          name = "recipe";
         };
         packageRequires = [ dash s ];
         meta = {
@@ -75843,8 +94588,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    wandbox = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request, s }:
-    melpaBuild {
+    wandbox = callPackage ({ emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild
+                           , request
+                           , s }:
+      melpaBuild {
         pname = "wandbox";
         version = "20170603.531";
         src = fetchFromGitHub {
@@ -75853,10 +94604,10 @@
           rev = "e002fe41f2cd9b4ce2b1dc80b83301176e9117f1";
           sha256 = "0fnbj3k21lisgs94pf8z13cdymmclgpn994xq3xly4gq6l8k0an5";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/wandbox";
           sha256 = "0myyln82nx462bj79acvqxwvmblxild4vbygcrzw5chcwy6crvlz";
-          name = "wandbox";
+          name = "recipe";
         };
         packageRequires = [ emacs request s ];
         meta = {
@@ -75864,20 +94615,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    wanderlust = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, semi }:
-    melpaBuild {
+    wanderlust = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild
+                              , semi }:
+      melpaBuild {
         pname = "wanderlust";
-        version = "20180331.105";
+        version = "20180605.631";
         src = fetchFromGitHub {
           owner = "wanderlust";
           repo = "wanderlust";
-          rev = "afecc04e806c8338e553bdbdb716328fa9f2227a";
-          sha256 = "1sf1mck6pk2xnlfcr4rh47brpgl6dsla7zir8lxpa0224dvy0bvw";
+          rev = "395826e99b84051396d503392f52462b6cb683a5";
+          sha256 = "1i182aq8fmp232flwdvf3v6367pmzxvjjn4snvsy16wk5710vg3b";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/426172b72026d1adeb1bf3fcc6b0407875047333/recipes/wanderlust";
           sha256 = "0lq7fvqc0isv49lcm7ql6prc3hpcj5cx4kf8f4gcnfv5k8159cq9";
-          name = "wanderlust";
+          name = "recipe";
         };
         packageRequires = [ semi ];
         meta = {
@@ -75885,8 +94640,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    warm-night-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    warm-night-theme = callPackage ({ emacs
+                                    , fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "warm-night-theme";
         version = "20161101.728";
         src = fetchFromGitHub {
@@ -75895,10 +94654,10 @@
           rev = "020f084d23409b5035150508ba6e57c2509edd64";
           sha256 = "1jmjyx06p0cvqi1vlg5px2g965q9pgi3j61msxjf5skzw53vlc88";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/312e3298d51b8ed72028df34dbd7620cdd03d8dd/recipes/warm-night-theme";
           sha256 = "1nrjkrr64rry6fjya22b0lcs0f8a2ijvr87192z311y9mw5rvb29";
-          name = "warm-night-theme";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -75906,20 +94665,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    watch-buffer = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    watch-buffer = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "watch-buffer";
         version = "20120331.1344";
         src = fetchFromGitHub {
           owner = "mjsteger";
           repo = "watch-buffer";
-          rev = "761fd7252e6d7bf5148283c2a7ee935f087d9427";
-          sha256 = "0i84ndnxma8s07kf5ixqyhv5f89mzc4iymgazj5inmxhvbc7s7r2";
+          rev = "a01cf15608c5bf91df253104053041ca1afdf411";
+          sha256 = "1gbhcvysrgg3xxyvkl3lkyafqmzxhfg5nb7k3zwlvmxmndnzssg8";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/watch-buffer";
           sha256 = "05f58kg05kfl4srwwjaf7w9jml50yx6bn4x8m1npswp882dsjyh9";
-          name = "watch-buffer";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -75927,8 +94689,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    wavefront-obj-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    wavefront-obj-mode = callPackage ({ fetchFromGitHub
+                                      , fetchurl
+                                      , lib
+                                      , melpaBuild }:
+      melpaBuild {
         pname = "wavefront-obj-mode";
         version = "20170808.1016";
         src = fetchFromGitHub {
@@ -75937,10 +94702,10 @@
           rev = "34027915de6496460d8e68b5991dd24d47d54859";
           sha256 = "0yj4wb5sdsbh3gp0sh2ajrrn6s8vg492809g4gxkxp30jhr6xc9q";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d48e4fdc6c7079a1ca70c1e879473a98c11bbe6c/recipes/wavefront-obj-mode";
           sha256 = "0qqismh6g2fvi45q2q52lq0n9nrh95wgamlsy5j4rx4syfgzxbrk";
-          name = "wavefront-obj-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -75948,8 +94713,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    wc-goal-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    wc-goal-mode = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "wc-goal-mode";
         version = "20140829.659";
         src = fetchFromGitHub {
@@ -75958,10 +94726,10 @@
           rev = "bf21ab9c5a449bcc20dd207a4915dcec218d2699";
           sha256 = "0p7j4hvcxfyjf0na9s3xv29dvmwq82s56lincfasd0ydcpz4fbwc";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6f003b6d6bc91e6f9e510de8f5f5f9189d1c7334/recipes/wc-goal-mode";
           sha256 = "0l3gh96njjldp7n13jn1zjrp17h7ivjak102j6wwspgg6v2h5419";
-          name = "wc-goal-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -75969,8 +94737,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    wc-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    wc-mode = callPackage ({ fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "wc-mode";
         version = "20170126.2029";
         src = fetchFromGitHub {
@@ -75979,10 +94750,10 @@
           rev = "f218f42709a651b34d6c1ddd98856f44648ef707";
           sha256 = "0h79kf37pns92w4zsgazwhg087vkjvnhk9p1npll5ka87zbknndm";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0fda2b54a0ff0b6fc3bd6d20cfcbbf63cae5380f/recipes/wc-mode";
           sha256 = "191dmxfpqnj7d43cr0fhdmj5ldfs7w9zg5pb2lv9wvlfl7asdid6";
-          name = "wc-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -75990,20 +94761,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    wcheck-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    wcheck-mode = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "wcheck-mode";
-        version = "20160711.2213";
+        version = "20180126.416";
         src = fetchFromGitHub {
           owner = "tlikonen";
           repo = "wcheck-mode";
-          rev = "d56345a1ec910a7d95103a441536cfba10ec9672";
-          sha256 = "1vdw9519rqqc3gidrlqpal01vllryi5ljzlrx2aayf8rf98lg6dy";
+          rev = "6aa26626ccc6f7f670de092c7d40e44ab8b410f9";
+          sha256 = "0dgjg136s2qwsnvfs5y6n81ra7zmi8rwxrs6dn08z7mj7pac5kq9";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5d10b59f568fdedf248c2e8eaa06c4a74032ca56/recipes/wcheck-mode";
           sha256 = "0cmdvhgax6r5svn3wkwll4j271qj70g8182c58riwnkhiajxmn3k";
-          name = "wcheck-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -76011,8 +94785,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    weather-metno = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    weather-metno = callPackage ({ cl-lib ? null
+                                 , emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "weather-metno";
         version = "20150831.1807";
         src = fetchFromGitHub {
@@ -76021,10 +94800,10 @@
           rev = "bfc7137095e0ee71aad70ac46f2af677f3c051b6";
           sha256 = "05gfc67724b0mwg8kvk3dsazx3dld50b9xjq8h1nc6jvdz3zxb9z";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/75beac314565b9becb701ddd9bc85660e268c3ae/recipes/weather-metno";
           sha256 = "0h7p4l8y75h27pgk45f0mk3gjd43jk8q97gjf85a9b0afd63d3f6";
-          name = "weather-metno";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -76032,8 +94811,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    web = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    web = callPackage ({ dash
+                       , fetchFromGitHub
+                       , fetchurl
+                       , lib
+                       , melpaBuild
+                       , s }:
+      melpaBuild {
         pname = "web";
         version = "20141231.1201";
         src = fetchFromGitHub {
@@ -76042,10 +94826,10 @@
           rev = "483188dac4bc6b409b985c9dae45f3324a425efd";
           sha256 = "03xcadplw1hg5hxw6bfrhw5xkkxk3i4105f114c6m3d2525jq4y5";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/web";
           sha256 = "141idn49b7x7llz249zbg2yq8snjxpmlpchsd3n1axlrbmx6pfpz";
-          name = "web";
+          name = "recipe";
         };
         packageRequires = [ dash s ];
         meta = {
@@ -76053,8 +94837,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    web-beautify = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    web-beautify = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "web-beautify";
         version = "20161115.1447";
         src = fetchFromGitHub {
@@ -76063,10 +94850,10 @@
           rev = "e1b45321d8c11b404b12c8e55afe55eaa7c84ee9";
           sha256 = "03b5pj58m00lkazyvvasa4qndrkh2kjzv2y7qhxljfg5mngyg3zg";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0d528d3e20b1656dff40860cac0e0fa9dc1a3e87/recipes/web-beautify";
           sha256 = "06ky2svhca8hjgmvxrg3h6ya7prl72q1r88x967yc6b0qq3r7g0f";
-          name = "web-beautify";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -76074,8 +94861,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    web-completion-data = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    web-completion-data = callPackage ({ fetchFromGitHub
+                                       , fetchurl
+                                       , lib
+                                       , melpaBuild }:
+      melpaBuild {
         pname = "web-completion-data";
         version = "20160318.148";
         src = fetchFromGitHub {
@@ -76084,10 +94874,10 @@
           rev = "c272c94e8a71b779c29653a532f619acad433a4f";
           sha256 = "19nzjgvd2i5745283ck3k2vylrr6lnk9h3ggzwrwdhyd3m9433vm";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/604f155a3ce7e5375dcf8b9c149c5af403ef48bd/recipes/web-completion-data";
           sha256 = "1zzdmhyn6bjaidk808s4pdk25a5rn4287949ps5vbpyniaf6gny9";
-          name = "web-completion-data";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -76095,20 +94885,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    web-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    web-mode = callPackage ({ emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "web-mode";
-        version = "20180416.240";
+        version = "20180628.422";
         src = fetchFromGitHub {
           owner = "fxbois";
           repo = "web-mode";
-          rev = "370fba5fefc819b863909330fa17b6b0e8b20080";
-          sha256 = "0rsksx6gbff2l26rcfrxjq51pnl3l61r0vsnwq9ax70djrpk804m";
+          rev = "471e1235d976e209de5262e75ecf7cc3e1fec39f";
+          sha256 = "00m3yyx83sfdsn70iqr80vpj060nfddb2j6gzzsdmsnm0nl0hg8j";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6f0565555eaa356141422c5175d6cca4e9eb5c00/recipes/web-mode";
           sha256 = "1vyhyc5nf4yj2m63inpwmcqvlsihaqw8nn8xvfdg44nhl6vjz97i";
-          name = "web-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -76116,8 +94910,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    web-mode-edit-element = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, web-mode }:
-    melpaBuild {
+    web-mode-edit-element = callPackage ({ emacs
+                                         , fetchFromGitHub
+                                         , fetchurl
+                                         , lib
+                                         , melpaBuild
+                                         , web-mode }:
+      melpaBuild {
         pname = "web-mode-edit-element";
         version = "20161114.954";
         src = fetchFromGitHub {
@@ -76126,10 +94925,10 @@
           rev = "8b8ac07aa8c920dafd94c96a51effb0d6c0ed1ce";
           sha256 = "0aj1ibmnrbaxrkwjf1fac2qzazrj39pql3prcibnchc2bmp191aa";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/web-mode-edit-element";
           sha256 = "1kcycsjjv1bzfn93aq3cdh5d913izrr8cdxmknbyriyipsqryh3l";
-          name = "web-mode-edit-element";
+          name = "recipe";
         };
         packageRequires = [ emacs web-mode ];
         meta = {
@@ -76137,20 +94936,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    web-narrow-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, web-mode }:
-    melpaBuild {
+    web-narrow-mode = callPackage ({ fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild
+                                   , web-mode }:
+      melpaBuild {
         pname = "web-narrow-mode";
         version = "20170406.1910";
         src = fetchFromGitHub {
           owner = "Qquanwei";
           repo = "web-narrow-mode";
-          rev = "73bdcb7d0701abe65dab4fc295d944885e05ae33";
-          sha256 = "1wg54vyfbacmyh8lyd5fgh88lfby17v24l98jjgxscaqgms86bch";
+          rev = "b25fae07844875d5b62d14b98442c88817b7e139";
+          sha256 = "1yk390g41yxh84lsxnbf72x67yik6hqv20magxlazrfrwngvk0cx";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a910da9e0566344d4b195423b5f270cb2bdcc1e5/recipes/web-narrow-mode";
           sha256 = "09k3xp4l235wrffl7a4026wpikxhp10fh3182dlp4pa4wr2vzipi";
-          name = "web-narrow-mode";
+          name = "recipe";
         };
         packageRequires = [ web-mode ];
         meta = {
@@ -76158,20 +94961,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    web-search = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    web-search = callPackage ({ emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "web-search";
         version = "20170911.1246";
         src = fetchFromGitHub {
           owner = "xuchunyang";
           repo = "web-search.el";
-          rev = "bdf590e7d6d62e874810aa4c5017c48e4e93f823";
-          sha256 = "0fwxjmnhkpla6gb58nkcazjh1q9b92w89rfi12pw7qj0449rmihb";
+          rev = "410c490ecf82a3693db3eb62003302233471ff84";
+          sha256 = "0hib0ffwikdydkm5asmvzj6l49pd9694psnn2c010j3ixw6i8gsl";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/503ef2042cc14dbe53e7121b8d0b5ccbdf6c882b/recipes/web-search";
           sha256 = "08iflbp6rmsxsy2lahsdjj9ki70ixqhsas0vxzawz5pi5vk2x9gj";
-          name = "web-search";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -76179,8 +94986,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    web-server = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    web-server = callPackage ({ emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "web-server";
         version = "20140905.1706";
         src = fetchFromGitHub {
@@ -76189,10 +95000,10 @@
           rev = "469cd3bc117bfb8da0c03a2a2fb185e80c81d068";
           sha256 = "0mbhyk7sgisx0l0xiz2xgy4jfbgwazlnxjvajsh4nysyig5rys05";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/70e724b4e6c76d0299d5ea8d2211f48c1c611afe/recipes/web-server";
           sha256 = "1f0iyvwq1kq3zfxx2v596cmah7jfk2a04g2rjllbgxxnzwms29z3";
-          name = "web-server";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -76200,8 +95011,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    webkit-color-picker = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, posframe }:
-    melpaBuild {
+    webkit-color-picker = callPackage ({ emacs
+                                       , fetchFromGitHub
+                                       , fetchurl
+                                       , lib
+                                       , melpaBuild
+                                       , posframe }:
+      melpaBuild {
         pname = "webkit-color-picker";
         version = "20180325.36";
         src = fetchFromGitHub {
@@ -76210,10 +95026,10 @@
           rev = "765cac80144cad4bc0bf59025ea0199f0486f737";
           sha256 = "0a6nirdn1l7cymjycbns38ja9an1z4l5lwjk5h428aly3pmkvdqj";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/af9d2e39385c6833eff6b7c7e5a039238563c00f/recipes/webkit-color-picker";
           sha256 = "1i9244zghabyavxhz86d22fn40qspzdn2sjql8pl3mm8ks7a49a3";
-          name = "webkit-color-picker";
+          name = "recipe";
         };
         packageRequires = [ emacs posframe ];
         meta = {
@@ -76221,20 +95037,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    weblogger = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, xml-rpc }:
-    melpaBuild {
+    weblogger = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild
+                             , xml-rpc }:
+      melpaBuild {
         pname = "weblogger";
         version = "20110926.918";
         src = fetchFromGitHub {
           owner = "hexmode";
           repo = "weblogger-el";
-          rev = "b3dd4aead9d3a87e6d85e7fef4f4f3bd40d87b53";
-          sha256 = "03dkabszk6ya3vaps1ap16psk5bbar8zd5ipn1lmyzsbd3hwm8mj";
+          rev = "40cfbfc69be6a619173804441db2f407e3fa1731";
+          sha256 = "1z7ld9d0crwdh778fyaapx75vpnlnslsh9nf07ywkylhz4w68yyv";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e8ccb10a5d1f4db3b20f96dee3c14ee64f4674e2/recipes/weblogger";
           sha256 = "0k0l715lnqb0a4hlkfjkyhr8i1jaml8z2xzhal7ryhjgvf8xinvs";
-          name = "weblogger";
+          name = "recipe";
         };
         packageRequires = [ xml-rpc ];
         meta = {
@@ -76242,8 +95062,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    webpaste = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }:
-    melpaBuild {
+    webpaste = callPackage ({ cl-lib ? null
+                            , emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild
+                            , request }:
+      melpaBuild {
         pname = "webpaste";
         version = "20180127.1434";
         src = fetchFromGitHub {
@@ -76252,10 +95078,10 @@
           rev = "14fd97bc3c8554d9394b698610dca1186ff68b03";
           sha256 = "1q7pqkww6ggh9sdnqa4vbq6nzivw0w011w3mvwx1mi4zp0dv50zs";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/13847d91c1780783e516943adee8a3530c757e17/recipes/webpaste";
           sha256 = "1pqqapslb5wxfrf1ykrj5jxcl43pix17lawgdqrqkv5fyxbhmfpm";
-          name = "webpaste";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs request ];
         meta = {
@@ -76263,20 +95089,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    websocket = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    websocket = callPackage ({ cl-lib ? null
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "websocket";
-        version = "20180402.2042";
+        version = "20180422.1716";
         src = fetchFromGitHub {
           owner = "ahyatt";
           repo = "emacs-websocket";
-          rev = "e9d148fbb6425c35dc7f76cccdec70aba7fafacf";
-          sha256 = "1gyp67sdi4pwrzdkgslnd9l0sjw7nbkqlh7j4zi423yrb5zxh4wi";
+          rev = "0d96ba2ff5a25c6cd6c66f417cc9b5f38a4308ba";
+          sha256 = "1dgrf7na6r6mmkknphzshlbd5fnzisg0qn0j7vfpa38wgsymaq52";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/websocket";
           sha256 = "1v8jlpahp30lihz7mdznwl6pyrbsdbqznli2wb5gfblnlxil04lg";
-          name = "websocket";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -76284,8 +95114,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    wedge-ws = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    wedge-ws = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "wedge-ws";
         version = "20140714.1449";
         src = fetchFromGitHub {
@@ -76294,10 +95127,10 @@
           rev = "4669115f02d9c6fee067cc5369bb38c0f9db88b2";
           sha256 = "19hgb5knqqc4rb8yl8s604xql8ar6m9r4d379cfakn15jvwqnl98";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/42fb11fe717b5fe73f4a6fa4e199ef4c58a85eb2/recipes/wedge-ws";
           sha256 = "07i2dr807np4fwq3ryxlw11vbc1sik1iv7x5740q258jyc9zfgll";
-          name = "wedge-ws";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -76305,20 +95138,27 @@
           license = lib.licenses.free;
         };
       }) {};
-    weechat = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, tracking }:
-    melpaBuild {
+    weechat = callPackage ({ cl-lib ? null
+                           , emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild
+                           , s
+                           , tracking }:
+      melpaBuild {
         pname = "weechat";
-        version = "20180112.1217";
+        version = "20180513.310";
         src = fetchFromGitHub {
           owner = "the-kenny";
           repo = "weechat.el";
-          rev = "4842e966a557e13fa4f16052cb60d221cdb886cf";
-          sha256 = "0y4vdsm4rb221hmr2a2sn0kj51jsgndkmhwcjiryqxzn2giy9siw";
+          rev = "bcf714e32b012c6a89d5c0a82ab3a74d454908ff";
+          sha256 = "1gm2yhz3qy55qqwf0ccrqw4nifxaig4jpdqmcl0ydx1n3myxx64l";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e38255a31a4ca31541c97a506a55f82e2670abe6/recipes/weechat";
           sha256 = "0sxrms5024bi4irv8x8s8j1zcyd62cpqm0zv4dgpm65wnpc7xc46";
-          name = "weechat";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs s tracking ];
         meta = {
@@ -76326,8 +95166,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    weechat-alert = callPackage ({ alert, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, weechat }:
-    melpaBuild {
+    weechat-alert = callPackage ({ alert
+                                 , cl-lib ? null
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild
+                                 , weechat }:
+      melpaBuild {
         pname = "weechat-alert";
         version = "20160416.548";
         src = fetchFromGitHub {
@@ -76336,10 +95182,10 @@
           rev = "a8fd557c8f335322f132c1c6c08b6741d6394e2e";
           sha256 = "1hkhim2jfdywx6ks4qfcizycp5qsx4ms6929kbgmzzb8i7j380x6";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7a69ad48eabb166f66e6eb5c5cdc75aefc8b989f/recipes/weechat-alert";
           sha256 = "026hkddvd4a6wy7s8s0lklw8b99fpjawdgi7amvpcrn79ylwbf22";
-          name = "weechat-alert";
+          name = "recipe";
         };
         packageRequires = [ alert cl-lib weechat ];
         meta = {
@@ -76347,8 +95193,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    weibo = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    weibo = callPackage ({ cl-lib ? null
+                         , fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "weibo";
         version = "20150307.1442";
         src = fetchFromGitHub {
@@ -76357,10 +95207,10 @@
           rev = "a8abb50b7602fe15fe2bc6400ac29780e956b390";
           sha256 = "0hc5iyjpcik996ns84akrl28scndmn0gd1zfdf1nnqq6n2m5zvgh";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/21f4c1b34f86331ecbcdbdc39858a191232902f2/recipes/weibo";
           sha256 = "1ndgfqqb0gvy8p2fisi57s9bsa2nrnv80smg78m89i4cwagbz6yd";
-          name = "weibo";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -76368,20 +95218,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    wgrep = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    wgrep = callPackage ({ fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "wgrep";
-        version = "20141016.1656";
+        version = "20180710.2326";
         src = fetchFromGitHub {
           owner = "mhayashi1120";
           repo = "Emacs-wgrep";
-          rev = "1cdd7c136f1e7565bb13d2df69be3dc77b83698d";
-          sha256 = "057p99hq0r6z1k8sl15w3sxrqvlv0g9wp39zy1pqhccv2mn3g2d6";
+          rev = "414be70bd313e482cd9f0b70fd2daad4ee23497c";
+          sha256 = "1sdhd587q3pg92lhiayph87azhalmf1gzrnsprkmqvnphv7mvks9";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9648e3df896fcd97b3757a727108bc78261973cc/recipes/wgrep";
           sha256 = "09xs420lvbsmz5z28rf6f1iwa0ixkk0w24qbj6zhl9hidh4mv9y4";
-          name = "wgrep";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -76389,20 +95242,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    wgrep-ack = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, wgrep }:
-    melpaBuild {
+    wgrep-ack = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild
+                             , wgrep }:
+      melpaBuild {
         pname = "wgrep-ack";
         version = "20141012.311";
         src = fetchFromGitHub {
           owner = "mhayashi1120";
           repo = "Emacs-wgrep";
-          rev = "1cdd7c136f1e7565bb13d2df69be3dc77b83698d";
-          sha256 = "057p99hq0r6z1k8sl15w3sxrqvlv0g9wp39zy1pqhccv2mn3g2d6";
+          rev = "9448a9d597bd089ae61e58add2c5dbecb0aa2b8f";
+          sha256 = "0x27h0ccq93avsmb8gim43zklbsb4ghfw30a7hjvz0ilfx02gdca";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9648e3df896fcd97b3757a727108bc78261973cc/recipes/wgrep-ack";
           sha256 = "03l1a681cwnn06m77xg0a547892gy8mh415v9rg3h6lkxwcld8wh";
-          name = "wgrep-ack";
+          name = "recipe";
         };
         packageRequires = [ wgrep ];
         meta = {
@@ -76410,20 +95267,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    wgrep-ag = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, wgrep }:
-    melpaBuild {
+    wgrep-ag = callPackage ({ cl-lib ? null
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild
+                            , wgrep }:
+      melpaBuild {
         pname = "wgrep-ag";
         version = "20160923.403";
         src = fetchFromGitHub {
           owner = "mhayashi1120";
           repo = "Emacs-wgrep";
-          rev = "1cdd7c136f1e7565bb13d2df69be3dc77b83698d";
-          sha256 = "057p99hq0r6z1k8sl15w3sxrqvlv0g9wp39zy1pqhccv2mn3g2d6";
+          rev = "4e9f3d9822acab2d353c858d33ddaebb629fbfe8";
+          sha256 = "14xja70gh9v3565fkl4b46swfrkmh6j6zg9pxwj5h1gicqrgaiwz";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2c50b704343c4cac5e2a62a67e284ba6d8e15f8a/recipes/wgrep-ag";
           sha256 = "1b2mj06kws29ha7g16l5d1s3p3nwyw8rprbpaiijdk9nxqcm0a8a";
-          name = "wgrep-ag";
+          name = "recipe";
         };
         packageRequires = [ cl-lib wgrep ];
         meta = {
@@ -76431,8 +95293,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    wgrep-helm = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, wgrep }:
-    melpaBuild {
+    wgrep-helm = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild
+                              , wgrep }:
+      melpaBuild {
         pname = "wgrep-helm";
         version = "20170510.1539";
         src = fetchFromGitHub {
@@ -76441,10 +95307,10 @@
           rev = "1cdd7c136f1e7565bb13d2df69be3dc77b83698d";
           sha256 = "057p99hq0r6z1k8sl15w3sxrqvlv0g9wp39zy1pqhccv2mn3g2d6";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9648e3df896fcd97b3757a727108bc78261973cc/recipes/wgrep-helm";
           sha256 = "1hh7isc9xifkrdfw88jw0z0xmfazrbcis6d355bcaxlnjy6fzm8b";
-          name = "wgrep-helm";
+          name = "recipe";
         };
         packageRequires = [ wgrep ];
         meta = {
@@ -76452,20 +95318,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    wgrep-pt = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, wgrep }:
-    melpaBuild {
+    wgrep-pt = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild
+                            , wgrep }:
+      melpaBuild {
         pname = "wgrep-pt";
         version = "20140510.1531";
         src = fetchFromGitHub {
           owner = "mhayashi1120";
           repo = "Emacs-wgrep";
-          rev = "1cdd7c136f1e7565bb13d2df69be3dc77b83698d";
-          sha256 = "057p99hq0r6z1k8sl15w3sxrqvlv0g9wp39zy1pqhccv2mn3g2d6";
+          rev = "cd8df1be69257da2e48dc3eae4badc674468b61c";
+          sha256 = "1df7lal4c0zsinrfjp4qv2k3xi1kbl66d36in47pmiam1kkqs9fs";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c39faef3b9c2e1867cd48341d9878b714dbed4eb/recipes/wgrep-pt";
           sha256 = "1gphdf85spsywj3s3ypb7dwrqh0zd70n2vrbgjqkbnfbwqjp9qbg";
-          name = "wgrep-pt";
+          name = "recipe";
         };
         packageRequires = [ wgrep ];
         meta = {
@@ -76473,20 +95343,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    what-the-commit = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    what-the-commit = callPackage ({ fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "what-the-commit";
         version = "20150901.616";
         src = fetchFromGitHub {
           owner = "danielbarbarito";
           repo = "what-the-commit.el";
-          rev = "868c80a1b8614bcbd2225cd0290142c72f2a7956";
-          sha256 = "04w62davpqqqvympkr52bg54c2i45p09q9bs70p9ff5jvc6i3g76";
+          rev = "42604410cfd5be715c8aa730aef4673773454e8b";
+          sha256 = "00fnjjlmc64bqjzmyprscfqr8fa1jbzfj6xjvm19an2qhnzh126q";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6d22725c2fce506c659bd33aabca182be0048905/recipes/what-the-commit";
           sha256 = "0nnyb6hq6r21wf1x3q41ab48b3dmcz5lyli771a59dk1gs8qpgak";
-          name = "what-the-commit";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -76494,20 +95367,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    which-key = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    which-key = callPackage ({ emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "which-key";
-        version = "20180321.331";
+        version = "20180621.1238";
         src = fetchFromGitHub {
           owner = "justbur";
           repo = "emacs-which-key";
-          rev = "bc97659029bffda0861a418da092656b379dd0cd";
-          sha256 = "0j1kpykqz691f8dlb2grfgv5rafr9xvb64yfc9pb07r4f8791fgc";
+          rev = "ff79dfff66f880885c5893dd6fd05dc51173a476";
+          sha256 = "0x9bmm4s5gq9k9x1rkwxr8zz8p2hgsxvzpji138m8m4j809l6cn4";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/315865a3df97c0694f648633d44b8b34df1ac76d/recipes/which-key";
           sha256 = "0vqbhfzcv9m58w41zdhpiymhgl38n15c6d7ffd99narxlkckcj59";
-          name = "which-key";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -76515,8 +95392,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    whitaker = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    whitaker = callPackage ({ dash
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "whitaker";
         version = "20150814.422";
         src = fetchFromGitHub {
@@ -76525,10 +95406,10 @@
           rev = "eaf26ea647b729ca705b73ea70312d5ffdf89448";
           sha256 = "1y75cylvqgn54h8yqahz4wi1qj5yhbs66i7x23jmbmah3q0rycab";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4b5d717e2eaf35ce33b26be049a39f2f75a7de72/recipes/whitaker";
           sha256 = "17fnvb3jh6fi4wddn5qnp6i6ndidg8jf9ac69q9j032c2msr07nj";
-          name = "whitaker";
+          name = "recipe";
         };
         packageRequires = [ dash ];
         meta = {
@@ -76536,8 +95417,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    white-sand-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    white-sand-theme = callPackage ({ emacs
+                                    , fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "white-sand-theme";
         version = "20151117.848";
         src = fetchFromGitHub {
@@ -76546,10 +95431,10 @@
           rev = "97621edd69267dd143760d94393db2c2558c9ea4";
           sha256 = "0sh92g5vd518f80klvljqkjpw4ji909439dpc3sfaccf5jiwn9xn";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b124575c4a4f783b6726d0526b83e67b4ad65cc9/recipes/white-sand-theme";
           sha256 = "19qsiic6yf7g60ygjmw7kg1i28nqpm3zja8cmdh33ny2bbkwxsz5";
-          name = "white-sand-theme";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -76557,8 +95442,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    white-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    white-theme = callPackage ({ emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "white-theme";
         version = "20160917.1043";
         src = fetchFromGitHub {
@@ -76567,10 +95456,10 @@
           rev = "e9e6d5b9d43da6eb15e86f5fbc8b1ba83abe8c78";
           sha256 = "1yqfq1gzkrw79myvj16nfi30ynfyz8yrpbzjcj8nhsc5rfrrmym2";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/white-theme";
           sha256 = "04l5hjhd465w9clrqc4dr8bx8hj4i9dx4nfr9hympgv101bpgy4x";
-          name = "white-theme";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -76578,20 +95467,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    whitespace-cleanup-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    whitespace-cleanup-mode = callPackage ({ fetchFromGitHub
+                                           , fetchurl
+                                           , lib
+                                           , melpaBuild }:
+      melpaBuild {
         pname = "whitespace-cleanup-mode";
         version = "20170505.1923";
         src = fetchFromGitHub {
           owner = "purcell";
           repo = "whitespace-cleanup-mode";
-          rev = "6d0a35159ee04ef9f3b1a80c548f545643ddb397";
-          sha256 = "0pqvrhws49aqyfp25kcrk9q7ib0ckx9gi6avzmymnpxy9aicnb3r";
+          rev = "d375bfb61cb70947a93004cba8ea17a0bc76f5a9";
+          sha256 = "0w6jwg1lyz0hwkhbx3kx6yddakff6azj2ipyxw26rv886gx8a226";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b461cfe450d7ce6bd0c14be3460cacffc1a32e6f/recipes/whitespace-cleanup-mode";
           sha256 = "1fhdjrxxyfx4xsgfjqq9p7vhj98wmqf2r00mv8k27vdaxwsnm5p3";
-          name = "whitespace-cleanup-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -76599,20 +95491,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    whizzml-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    whizzml-mode = callPackage ({ emacs
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "whizzml-mode";
-        version = "20180411.1636";
+        version = "20180711.910";
         src = fetchFromGitHub {
           owner = "whizzml";
           repo = "whizzml-mode";
-          rev = "cfe081c957ad6e70e1fd32c7836008851198431a";
-          sha256 = "1qipmr0v6l6r2ggdp7lbrc14hwfjs6j835ii53y99knmbp7cnci1";
+          rev = "f457052dc5426d542ca69185a5a87905f08f1310";
+          sha256 = "15nlnch97rgpcsxv5prw4ikzl5gbnzycqmq4h1x8n16ianbgh249";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/11f26b15c326c3b8541bac510579b32493916042/recipes/whizzml-mode";
           sha256 = "0gas9xfpz5v9fbhjxhd4msihwz9w4a05l5icsaclxvh06f92wcyk";
-          name = "whizzml-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -76620,8 +95516,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    whole-line-or-region = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    whole-line-or-region = callPackage ({ fetchFromGitHub
+                                        , fetchurl
+                                        , lib
+                                        , melpaBuild }:
+      melpaBuild {
         pname = "whole-line-or-region";
         version = "20180324.2119";
         src = fetchFromGitHub {
@@ -76630,10 +95529,10 @@
           rev = "944290d443a395ef0578531929186d6274ab03e9";
           sha256 = "04hbs8hrm5csnjxvxkfbd9fky0rd6xpr105cy0bvya5c14anzcd4";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/whole-line-or-region";
           sha256 = "0zz9i1jxayw2p6ggfxjvhb1mc3ly9iy4jvk23ycndz9lnnzkch0y";
-          name = "whole-line-or-region";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -76641,8 +95540,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    wide-column = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    wide-column = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "wide-column";
         version = "20170925.913";
         src = fetchFromGitHub {
@@ -76651,10 +95553,10 @@
           rev = "ce9ef4675485a7bea381077866368ef875226b10";
           sha256 = "0qh8hy4jl59bfg4323a8h4q4a78gn4hsglfk2h23hqssbv4mhsp2";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8d29def44ae42dc4b60c1d254a57572bd09faf51/recipes/wide-column";
           sha256 = "1kyyvq9fgaypvhiy9vbvr99xsac5vhylkbjsxn5fhylyc5n867sb";
-          name = "wide-column";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -76662,20 +95564,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    widget-mvc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    widget-mvc = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "widget-mvc";
         version = "20150101.2006";
         src = fetchFromGitHub {
           owner = "kiwanami";
           repo = "emacs-widget-mvc";
-          rev = "ff5a85880df7b87f9f480fe3c28438a0712b7b87";
-          sha256 = "1s0srhklmkmj3lfs8vr1dqi3s48z7fwx9mxqxckk5njld317hqg7";
+          rev = "2576e6f0c35d8dedfa9c2cd6ea4fb4c14cb72b63";
+          sha256 = "0fqv63m8z5m5ghh4j8ccdnmgcdkvi4jqpg9z7lp17g4p9pq3xfjf";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/76d3c38e205076a22628f490d8e8ddd80d091eab/recipes/widget-mvc";
           sha256 = "0njzvdlxb7z480r6dvmksgivhz7rvnil517aj86qx0jbc5mr3l2f";
-          name = "widget-mvc";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -76683,20 +95588,27 @@
           license = lib.licenses.free;
         };
       }) {};
-    widgetjs = callPackage ({ fetchFromGitHub, fetchurl, js2-mode, js2-refactor, lib, makey, melpaBuild, s }:
-    melpaBuild {
+    widgetjs = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , js2-mode
+                            , js2-refactor
+                            , lib
+                            , makey
+                            , melpaBuild
+                            , s }:
+      melpaBuild {
         pname = "widgetjs";
         version = "20160719.804";
         src = fetchFromGitHub {
           owner = "foretagsplatsen";
           repo = "emacs-js";
-          rev = "aafd8a262599571f2de06e3aa75933d8a09e2d35";
-          sha256 = "0663631mxw4mrzlb144fbvry6yffg9hic9jbns147zfgvsp1xcf7";
+          rev = "a1e91bdcecdea50c80f5ff87f7a4f7a2c249713e";
+          sha256 = "1gr430rf8k282ra587qnbgwvccg47ar1n09m6czig5splhnf0086";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/78d7a15152f45a193384741fa00d0649c4bba91e/recipes/widgetjs";
           sha256 = "0y5h1ag2m7w47l4nx4d18yz3fvd411rm1h5w7zz4xh67bnx4zyy1";
-          name = "widgetjs";
+          name = "recipe";
         };
         packageRequires = [ js2-mode js2-refactor makey s ];
         meta = {
@@ -76704,8 +95616,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    wiki-nav = callPackage ({ button-lock, fetchFromGitHub, fetchurl, lib, melpaBuild, nav-flash }:
-    melpaBuild {
+    wiki-nav = callPackage ({ button-lock
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild
+                            , nav-flash }:
+      melpaBuild {
         pname = "wiki-nav";
         version = "20150223.554";
         src = fetchFromGitHub {
@@ -76714,10 +95631,10 @@
           rev = "f9082feb329432fcf2ac49a95e64bed9fda24d58";
           sha256 = "06qjvybf65ffrcnhhbqs333lg51fawaxnva3jvdg7zbrsv4m9acl";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/baa49e7d2d5c07ebf77e7941c240b88fcfd0fc8b/recipes/wiki-nav";
           sha256 = "19mabz0y3fcqsm68ijwwbbqylxgp71anc0a31zgc1blha9jivvwy";
-          name = "wiki-nav";
+          name = "recipe";
         };
         packageRequires = [ button-lock nav-flash ];
         meta = {
@@ -76725,20 +95642,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    wiki-summary = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    wiki-summary = callPackage ({ emacs
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "wiki-summary";
         version = "20150408.1422";
         src = fetchFromGitHub {
           owner = "jozefg";
           repo = "wiki-summary.el";
-          rev = "ed3755dd09f5f73ef78ec295fe842d08b316c8a0";
-          sha256 = "02bczc1mb1cs1aryz5pw6cmpydjmxja2zj91893cz8rnfn1r031i";
+          rev = "ec11f6b7177a3fc50702c771d347d1e86f4462fc";
+          sha256 = "0c1j12lzkgb6rfq2zyfk9mj11qilymcpfp9lf38pkki527akxixl";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/31877f182ab82fd5bb73ec4ddd8526a032d9edf9/recipes/wiki-summary";
           sha256 = "1hiyi3w6rvins8hfxd96bgpihxarmv192q96sadqcwshcqi14zmw";
-          name = "wiki-summary";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -76746,8 +95667,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    wilt = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    wilt = callPackage ({ dash
+                        , emacs
+                        , fetchFromGitHub
+                        , fetchurl
+                        , lib
+                        , melpaBuild
+                        , s }:
+      melpaBuild {
         pname = "wilt";
         version = "20180220.54";
         src = fetchFromGitHub {
@@ -76756,10 +95683,10 @@
           rev = "04dbe37fa35d0b24c791421785d2c97a8cbfe2cc";
           sha256 = "197kqp22pyy1in2rq063mahvrf00vrfvgnfkqp0zy7hpkhiiqvim";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/eea4f2ca8b4f9ea93cc02151fdda6cfee5b68b70/recipes/wilt";
           sha256 = "0nw6zr06zq60j72qfjmbqrxyz022fnisb0bsh6xmlnd1k1kqlrz6";
-          name = "wilt";
+          name = "recipe";
         };
         packageRequires = [ dash emacs s ];
         meta = {
@@ -76767,8 +95694,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    win-switch = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    win-switch = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "win-switch";
         version = "20161009.927";
         src = fetchFromGitHub {
@@ -76777,10 +95707,10 @@
           rev = "954eb5e4c5737f0c06368c42a7f1c3dd374d782f";
           sha256 = "1xpx4sc1g1w8w0yc39k2dys83m8skrpvi745bfrzdl47jngrf54h";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/win-switch";
           sha256 = "1s6inp5kf763rngn58r02fd7n7z3dd55j6hb7s9dgvc856d5z3my";
-          name = "win-switch";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -76788,8 +95718,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    windata = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    windata = callPackage ({ fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "windata";
         version = "20090830.340";
         src = fetchFromGitHub {
@@ -76798,10 +95731,10 @@
           rev = "a723fc446ceaec23d5f29ecc8245d94c99d91625";
           sha256 = "0y8yw5hazsir5kjskrh4mr63mmz87dc7yy5ddmlwpmn03wanqpha";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/84f836338818946a6bb31d35d6ae959571128ed5/recipes/windata";
           sha256 = "1mah2vy46pxwjd6c6ac14d2qfcixs2yrgwmzmisnfgsvprdlxryb";
-          name = "windata";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -76809,20 +95742,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    window-end-visible = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    window-end-visible = callPackage ({ fetchFromGitHub
+                                      , fetchurl
+                                      , lib
+                                      , melpaBuild }:
+      melpaBuild {
         pname = "window-end-visible";
         version = "20140508.1341";
         src = fetchFromGitHub {
           owner = "rolandwalker";
           repo = "window-end-visible";
-          rev = "525500fb2ebc08f3f9ea493972e5f2e1d79f89ef";
-          sha256 = "0g69r64gyz4p3k6n8l0i1837mszycbrp23acnp0iy0y3mg67x3pn";
+          rev = "f0ed55aa5f7875634fb4c8b6fbaa93633bc57d85";
+          sha256 = "0xx2hmfwpdd1nxjds45d4jlfa6p4lcjwy2ryjs4qiwvrc2d03xbq";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c9db386ab3910940addae6e925b2ac17e64e0f87/recipes/window-end-visible";
           sha256 = "1p78n7yysj18404cdc6vahfrzwn5pixyfnja8ch48rj4fm4jbxwq";
-          name = "window-end-visible";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -76830,8 +95766,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    window-jump = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    window-jump = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "window-jump";
         version = "20170809.1508";
         src = fetchFromGitHub {
@@ -76840,10 +95779,10 @@
           rev = "6bdb51e9a346907d60a9625f6180bddd06be6674";
           sha256 = "1wkyvfqmf24c8kb162pwi6wcm88bzf0x9mxljzkx0s8bq9aliny6";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d44fc32e12f00bbaa799b4054e9ff0fc0d3bfbfb/recipes/window-jump";
           sha256 = "1gmqb7j5fb3q3krgx7arrln5nvyg9vcpph6wlxj6py679wfa3lwr";
-          name = "window-jump";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -76851,8 +95790,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    window-layout = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    window-layout = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "window-layout";
         version = "20170214.1633";
         src = fetchFromGitHub {
@@ -76861,10 +95803,10 @@
           rev = "cd2e4f967b610c2bbef53182829e47250d027056";
           sha256 = "0wgqi8r844lbx52fn6az8c1n8m681rp6dkfzd54wmdk1ka7zmvv6";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/window-layout";
           sha256 = "061mvxcj4mg2pmkln7nn6gyscs08aid4cfc6xck0x5gzr1snr639";
-          name = "window-layout";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -76872,8 +95814,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    window-number = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    window-number = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "window-number";
         version = "20170731.1851";
         src = fetchFromGitHub {
@@ -76882,10 +95827,10 @@
           rev = "d41722de646ffeb3f70d26e4a86a5a1ba5c6be87";
           sha256 = "1ifs7zp8c5m9da5dz0y4cq7pgqgdkz63v00ib07xdycnfjp4w17i";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/74523af6e22ebae2f5fe7c4da4e8af8fac5fa074/recipes/window-number";
           sha256 = "1ivd701h6q48i263fxxi44haacaz8cjg562ry8dxd10rbhhsjsq0";
-          name = "window-number";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -76893,8 +95838,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    window-numbering = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    window-numbering = callPackage ({ fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "window-numbering";
         version = "20160809.1110";
         src = fetchFromGitHub {
@@ -76903,10 +95851,10 @@
           rev = "10809b3993a97c7b544240bf5d7ce9b1110a1b89";
           sha256 = "1nlgzrjg5k7wyaka8ziqyv683vsc0f2lw5kr5xajcqlamwbzs7vi";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ce1dc80f69894736b276885e4ec3ce571a8612c9/recipes/window-numbering";
           sha256 = "0x3n0ni16q69lfpyjz61spqghmhvc3cwa4aj80ihii3pk80f769x";
-          name = "window-numbering";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -76914,20 +95862,27 @@
           license = lib.licenses.free;
         };
       }) {};
-    window-purpose = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, imenu-list, let-alist, lib, melpaBuild }:
-    melpaBuild {
+    window-purpose = callPackage ({ cl-lib ? null
+                                  , emacs
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , imenu-list
+                                  , let-alist
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "window-purpose";
-        version = "20171107.659";
+        version = "20180531.1336";
         src = fetchFromGitHub {
           owner = "bmag";
           repo = "emacs-purpose";
-          rev = "2655bbe3399f00d3297ded58f92e7be22876148a";
-          sha256 = "1yn9ha7qly4fw70ifdlvvi2hm3c6svkpy9q9nqxgzbg8j51gqzql";
+          rev = "8737c5d8cb4a0d749771a04a136a784e5d519d5e";
+          sha256 = "0w186mgs7ww52mvqrp02bnwazznhyy6j2g8r21x2d4ri3vavmwrl";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5813120ab674f6db7d0a486433d8faa6cfec1727/recipes/window-purpose";
           sha256 = "1y70jrba3gf9fyf2qdihfshbsblzb88yv9fkcswdzrpq5kmgwp84";
-          name = "window-purpose";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs imenu-list let-alist ];
         meta = {
@@ -76935,8 +95890,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    windsize = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    windsize = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "windsize";
         version = "20151121.540";
         src = fetchFromGitHub {
@@ -76945,10 +95903,10 @@
           rev = "beb6376fdf52afa6f220c89032448460faf76e7f";
           sha256 = "0hijf56ahbc5inn7n39nj96d948c4d05n9d5ci3g3vbl5hsyb121";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/windsize";
           sha256 = "1fzqf86d7pimnc87xdgvpv4hnv7j6ngmk1sjvazj6726xygswkyv";
-          name = "windsize";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -76956,8 +95914,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    windwow = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    windwow = callPackage ({ cl-lib ? null
+                           , dash
+                           , emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "windwow";
         version = "20170815.1848";
         src = fetchFromGitHub {
@@ -76966,10 +95930,10 @@
           rev = "77bad26f651744b68d31b389389147014d250f23";
           sha256 = "0vbmmf8wm76k389g5ncs0grwlpwp3glpwvhdi5dfxaqcp2phaaad";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/12aba18872021ce0affa96c46a17353c7d073ca2/recipes/windwow";
           sha256 = "0cbkp98pwzj484akdbidvdz4kqxv6ix6paimpxnag6fffciq245h";
-          name = "windwow";
+          name = "recipe";
         };
         packageRequires = [ cl-lib dash emacs ];
         meta = {
@@ -76977,20 +95941,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    winnow = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    winnow = callPackage ({ emacs
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "winnow";
         version = "20170903.506";
         src = fetchFromGitHub {
           owner = "dgtized";
           repo = "winnow.el";
-          rev = "18cb6b94338f3b7b4f2cd0331dad22f82dd9e0d3";
-          sha256 = "1wp00zxxcibvl6vjwmvhkgcbi76dyb2g8c30wy4kp7876cpc8hgv";
+          rev = "9ea0ac309d6a7a4aedb2647a13e9106a3b59c46d";
+          sha256 = "0zsnd03mydzhskpcvffmlwbsi28dq0akz1nph7idn4zqca8sx2ia";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/58891c2057ec834f999e3bf82af15e0617a4d4cf/recipes/winnow";
           sha256 = "07kwjdmvzgvg7gc53dv10jfi212m0pimzrhiga38lrqrnrw631m0";
-          name = "winnow";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -76998,20 +95966,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    winpoint = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    winpoint = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "winpoint";
         version = "20131023.1013";
         src = fetchFromGitHub {
           owner = "jorgenschaefer";
           repo = "winpoint";
-          rev = "e6050093c076308184566fa1d1012423d6934773";
-          sha256 = "1qrbvidnmgg7jyasb28bc0z1x4a4ayzq5jmv38dsx0qs080s85wy";
+          rev = "b32ab55f7b8797b9b042a8a89d89d6f79bc356a9";
+          sha256 = "0qbsmqg4mh20k2lf7j92mc8p8qkvjc1a58klhqivpdl60z906z2a";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/665e24e490618c7caeae4a9d17d1f614dc0a2617/recipes/winpoint";
           sha256 = "10ji7xd9ipmy6c2qxljqdxgqf5sb8h7lwz43mr6ixbn7v1b7pp6w";
-          name = "winpoint";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -77019,20 +95990,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    winring = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    winring = callPackage ({ fetchFromGitLab
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "winring";
-        version = "20150804.1108";
+        version = "20180529.1718";
         src = fetchFromGitLab {
           owner = "warsaw";
           repo = "winring";
-          rev = "ad400939b420b5a7914103b7cfe3f0f6574ea48f";
-          sha256 = "1igld3zkvm3qbg1k77cn7rlxi8jqy8cvvp7z5mqwx9ifyihiwd0b";
+          rev = "f2d072bd446b73e93b127523f19ea82b99b9267f";
+          sha256 = "1j0g52panhx91hqw5glnlv5vnnpnjyx49xc8xif8mjf0m27723fv";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2476a28c33502f908b7161c5a9c63c86b8d7b57d/recipes/winring";
           sha256 = "1mgr5z4h7mf677xx8md3pqd31k17qs62z9iamfih206fcwgh24k4";
-          name = "winring";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -77040,8 +96014,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    winum = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    winum = callPackage ({ cl-lib ? null
+                         , dash
+                         , fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "winum";
         version = "20171028.702";
         src = fetchFromGitHub {
@@ -77050,10 +96029,10 @@
           rev = "c56d1cdb8d1723eb4c0d7a7eb3ecd2697739146c";
           sha256 = "09jd5srlnd4060hs719qil84ssmnvq196bz7ywaswgapv1gs1h6r";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c1caa7a54a910a44322fdee300e8cce6ddcde071/recipes/winum";
           sha256 = "0yyvjmvqif6glh9ri6049nxcmgib9mxdhy6816kjhsaqr570f9pw";
-          name = "winum";
+          name = "recipe";
         };
         packageRequires = [ cl-lib dash ];
         meta = {
@@ -77061,19 +96040,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    wisp-mode = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    wisp-mode = callPackage ({ fetchhg
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "wisp-mode";
-        version = "20160419.1232";
+        version = "20180520.58";
         src = fetchhg {
           url = "https://bitbucket.com/ArneBab/wisp";
-          rev = "dbb4f5d19925";
-          sha256 = "1ng4p0yf8lp3nhdz8l3m4zhl13x3bpb9prckw8nghqf2hc96l2dj";
+          rev = "db4210a0af51";
+          sha256 = "0f3yn8dxg21q711533d1zgxwr2y3df1msmchvd5x4rikm8nayp8a";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/wisp-mode";
           sha256 = "10zkp1qbvl8dmxij7zz4p1fixs3891xr1nr57vyb3llar9fgzglc";
-          name = "wisp-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -77081,8 +96063,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    wispjs-mode = callPackage ({ clojure-mode, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    wispjs-mode = callPackage ({ clojure-mode
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "wispjs-mode";
         version = "20170720.1219";
         src = fetchFromGitHub {
@@ -77091,10 +96077,10 @@
           rev = "60f9f5fd9d1556e2d008939f67eb1b1d0f325fa8";
           sha256 = "1hhd8ixb2wr06vrd1kw0cd5jh08zm86h2clbvzv9wmqpawwxfm5f";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a628330ee8deeab2bd5c2d4b61b33f119c4549d8/recipes/wispjs-mode";
           sha256 = "0qzm0dcvjndasnbqpkdc56f1qv66gxv8dfgfcwq5l1bp5wyx813p";
-          name = "wispjs-mode";
+          name = "recipe";
         };
         packageRequires = [ clojure-mode ];
         meta = {
@@ -77102,20 +96088,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    with-editor = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    with-editor = callPackage ({ async
+                               , emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "with-editor";
-        version = "20180414.757";
+        version = "20180618.1602";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "with-editor";
-          rev = "ad5bb005ed3afec2d8b9b2bc1df19fb9b5e2dd84";
-          sha256 = "0hq2dy8djxf45ajk9di1grhgzly0qrijcjfdah8xj5zkwvn9cvlh";
+          rev = "fb9fdde14eddd5bd180d4baabfedc45e5492e115";
+          sha256 = "07jfqnh4mvpky3mm7wyrdwpwnk2a7r1v2k7q5rxmg8i59k99q7bn";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8c52c840dc35f3fd17ec660e113ddbb53aa99076/recipes/with-editor";
           sha256 = "1wsl1vwvywlc32r5pcc9jqd0pbzq1sn4fppxk3vwl0s5h40v8rnb";
-          name = "with-editor";
+          name = "recipe";
         };
         packageRequires = [ async emacs ];
         meta = {
@@ -77123,20 +96114,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    with-namespace = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, loop, melpaBuild }:
-    melpaBuild {
+    with-namespace = callPackage ({ dash
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , loop
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "with-namespace";
         version = "20130407.1122";
         src = fetchFromGitHub {
           owner = "Wilfred";
           repo = "with-namespace.el";
-          rev = "8ac52da3a09cf46087720e30cf730d00f140cde6";
-          sha256 = "1c7g8f3jr7bb0xxprammfg433gd63in5iiiaq8rjmc94h6hdcys3";
+          rev = "36828a40428c8e53c117f2df830b2f7a59ddd306";
+          sha256 = "0qq8ckk5w3hlm4wihhnlpn75gij62aa2nafmvin7q8i454pxbg7a";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/with-namespace";
           sha256 = "1199k1xvvv7ald6ywrh2sfpw2v42ckpcsw6mcj617bg3b5m7770i";
-          name = "with-namespace";
+          name = "recipe";
         };
         packageRequires = [ dash loop ];
         meta = {
@@ -77144,20 +96140,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    with-simulated-input = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, seq }:
-    melpaBuild {
+    with-simulated-input = callPackage ({ emacs
+                                        , fetchFromGitHub
+                                        , fetchurl
+                                        , lib
+                                        , melpaBuild
+                                        , s
+                                        , seq }:
+      melpaBuild {
         pname = "with-simulated-input";
         version = "20170820.2317";
         src = fetchFromGitHub {
           owner = "DarwinAwardWinner";
           repo = "with-simulated-input";
-          rev = "af9a38ce28a741e6d8742750bef5d7b5afa13796";
-          sha256 = "0iann7zi9bgd3vmvxvg2n6x24hkyzbchbli1ymsmfrn8rif9byf7";
+          rev = "1012ccbec77d7d162790706c07bb23c039ccc61f";
+          sha256 = "1489njq2xbsd89kh3z560vwm892zzjbs12lzk1pr0fajqvnm62r5";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e4ddf16e19f5018106a423327ddc7e7499cf9248/recipes/with-simulated-input";
           sha256 = "0113la76nbp18vaffsd7w7wcw5k2sqwgnjq1gslf4khdfqghrkwk";
-          name = "with-simulated-input";
+          name = "recipe";
         };
         packageRequires = [ emacs s seq ];
         meta = {
@@ -77165,8 +96167,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    wn-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    wn-mode = callPackage ({ emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "wn-mode";
         version = "20151109.2152";
         src = fetchFromGitHub {
@@ -77175,10 +96181,10 @@
           rev = "f05c3151523e529af5a0a3fa8c948b61fb369f6e";
           sha256 = "12rfpkyjkhikjh0mihhp5h5pzbm4br68nwf8k1ja9djl77vfzv36";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6213c01e6954985daff8cd1a5a3ef004431f0477/recipes/wn-mode";
           sha256 = "1qy1pkfdnm4pska4cnff9cx2c812ilymajhpmsfc9jdbvhzwrwg3";
-          name = "wn-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -77186,8 +96192,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    wolfram = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    wolfram = callPackage ({ fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "wolfram";
         version = "20170122.2356";
         src = fetchFromGitHub {
@@ -77196,10 +96205,10 @@
           rev = "6b5dceae3fd6cdb4d7562510deeafa02c93c010b";
           sha256 = "1ijyjw2793i7n00i30ma8lw4fzi9w63m6k0xgjx6j78r5y7pfj2g";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/785b5b1ec73e6376f2f2bb405707a1078398fa3a/recipes/wolfram";
           sha256 = "02xp1916v9rydh0586jkx71v256qdg63f87s3m0agc2znnrni9h4";
-          name = "wolfram";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -77207,8 +96216,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    wolfram-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    wolfram-mode = callPackage ({ emacs
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "wolfram-mode";
         version = "20180306.1613";
         src = fetchFromGitHub {
@@ -77217,10 +96230,10 @@
           rev = "be680190cac6ccf579dbce107deaae495928d1b3";
           sha256 = "1cvdw28gvhbr9l65xkv8ld12rb0pcf53jd55gns2b0abz1lg1jc4";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/40ded2302e413e233d867caa4776c54a778b8b99/recipes/wolfram-mode";
           sha256 = "0rc39vvpyhpn0m52i4hs23j6avqfddmrkhjqg339apfq7z35fpli";
-          name = "wolfram-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -77228,20 +96241,27 @@
           license = lib.licenses.free;
         };
       }) {};
-    wonderland = callPackage ({ dash, dash-functional, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, multi }:
-    melpaBuild {
+    wonderland = callPackage ({ dash
+                              , dash-functional
+                              , emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild
+                              , multi }:
+      melpaBuild {
         pname = "wonderland";
         version = "20130912.1819";
         src = fetchFromGitHub {
           owner = "kurisuwhyte";
           repo = "emacs-wonderland";
-          rev = "89d274ad694b0e748efdac23ccd60b7d8b73d7c6";
-          sha256 = "0hacc8ha5w44cgwkipa3nwh1q5gdrcxhjkmw2gnvb1l01crgnack";
+          rev = "28cf6b37000c395ece9519db53147fb826a42bc4";
+          sha256 = "018r35dz8z03wcrx9s28pjisayy21549i232mp6wy9mxkrkxbzpc";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ed02d5e4cba10023ebc7c26f90ba8d1e8ee32a08/recipes/wonderland";
           sha256 = "1b4p49mbzqffm2b2y8sbbi56vnkxap2jscsmla9l6l8brybqjppi";
-          name = "wonderland";
+          name = "recipe";
         };
         packageRequires = [ dash dash-functional emacs multi ];
         meta = {
@@ -77249,8 +96269,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    wordgen = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    wordgen = callPackage ({ cl-lib ? null
+                           , emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "wordgen";
         version = "20170803.1120";
         src = fetchFromGitHub {
@@ -77259,10 +96284,10 @@
           rev = "aacad928ae99a953e034a831dfd0ebdf7d52ac1d";
           sha256 = "06vbc9ycz1nbjwjkg99y3lj6jwb6lnwnmkqf09yr00jjrrfhfash";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5cfdc64a9aa79575dad8057c4cd747d2cdd460aa/recipes/wordgen";
           sha256 = "0vlrplm3pmpwwa8p8j6lck97b875gzzm7vxxc8l9l18vs237cz1m";
-          name = "wordgen";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -77270,8 +96295,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    wordnut = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    wordnut = callPackage ({ emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "wordnut";
         version = "20180312.2143";
         src = fetchFromGitHub {
@@ -77280,10 +96309,10 @@
           rev = "feac531404041855312c1a046bde7ea18c674915";
           sha256 = "1jl0b6g64a9w0q7bfvwha67vgws5xd15b7mkfyb5gkz3pymqhfxn";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/321c5e171eb4da85980968ac3c8ef4300101c0b1/recipes/wordnut";
           sha256 = "1gqmjb2f9izra0x9ds1jyk7h204qsll6viwkvdnmxczyyc0wx44n";
-          name = "wordnut";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -77291,8 +96320,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    wordsmith-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    wordsmith-mode = callPackage ({ fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "wordsmith-mode";
         version = "20171025.730";
         src = fetchFromGitHub {
@@ -77301,10 +96333,10 @@
           rev = "589a97412138145bea70e0450eeddeb7f138d538";
           sha256 = "1zm4grysjpynibldvic75awhcmmnjmlkkvslw8bvirmi58qwvwzj";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3b5fda506e5b388cd6824d433b89032ed46858dc/recipes/wordsmith-mode";
           sha256 = "0s6b6dfqn31jdcgs2mlmvwgpr5a4zs4xi8m002ly11c6sn035xb1";
-          name = "wordsmith-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -77312,20 +96344,27 @@
           license = lib.licenses.free;
         };
       }) {};
-    worf = callPackage ({ ace-link, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild, swiper, zoutline }:
-    melpaBuild {
+    worf = callPackage ({ ace-link
+                        , fetchFromGitHub
+                        , fetchurl
+                        , hydra
+                        , lib
+                        , melpaBuild
+                        , swiper
+                        , zoutline }:
+      melpaBuild {
         pname = "worf";
-        version = "20180408.36";
+        version = "20180620.1011";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "worf";
-          rev = "90f0e5f7a596ead7fc3b5106684ab118ee857340";
-          sha256 = "1yfvknn4nbc6qig0pa4gks1085l91v79cg8hjg7776plz0cwmn08";
+          rev = "b48e0c9bbd617ed8a8962174d804ce7a6da1c10a";
+          sha256 = "14xik793sgjcg8nby8v77x1x8zspgkhz95kzzlzqalbblak3mgbs";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f00f8765e35c21dd1a4b5c01c239ed4d15170ab7/recipes/worf";
           sha256 = "1fkb2ddl684dijsb0cqgmfbg1nz4xv43rb7g5rah05rchy5sgkpi";
-          name = "worf";
+          name = "recipe";
         };
         packageRequires = [ ace-link hydra swiper zoutline ];
         meta = {
@@ -77333,8 +96372,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    workgroups = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    workgroups = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "workgroups";
         version = "20110726.941";
         src = fetchFromGitHub {
@@ -77343,10 +96385,10 @@
           rev = "9572b3492ee09054dc329f64ed846c962b395e39";
           sha256 = "0q32z54qafj8ap3ybx82i3fm1msmzwvpxgmkaglzhi8nccgzbn2n";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/585d3f522920b41845294af50b1da99dff256f8d/recipes/workgroups";
           sha256 = "1v01yr3lk6l0qn80i3r8fq3di0a8bmqjyhwx19hcgiap57xl80h8";
-          name = "workgroups";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -77354,8 +96396,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    workgroups2 = callPackage ({ anaphora, cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    workgroups2 = callPackage ({ anaphora
+                               , cl-lib ? null
+                               , dash
+                               , f
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "workgroups2";
         version = "20141102.1122";
         src = fetchFromGitHub {
@@ -77364,10 +96413,10 @@
           rev = "928d509157ec8a4a2e343b6115dff034c3243a7a";
           sha256 = "0prj2b33h6rya7y9ff91r72bva1y6hg0sv9l11bn1gikmc6lc18n";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4f9cfb740cce05a6805d9a047e4c1380305da4df/recipes/workgroups2";
           sha256 = "0vhj6mb3iflli0l3rjlvlbxz5yk6z3ii5r71gx0m4vp4lhxncy3v";
-          name = "workgroups2";
+          name = "recipe";
         };
         packageRequires = [ anaphora cl-lib dash f ];
         meta = {
@@ -77375,8 +96424,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    world-time-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    world-time-mode = callPackage ({ fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "world-time-mode";
         version = "20140627.107";
         src = fetchFromGitHub {
@@ -77385,10 +96437,10 @@
           rev = "ce7a3b45c87eb24cfe61eee453175d64f741d7cc";
           sha256 = "0i00xm4rynbp2v3gm6h46ajgj8h8nxnsjh6db1659b0hbpnah0ji";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f1429650400baf2b1523b5556eaf6a2178d515d4/recipes/world-time-mode";
           sha256 = "10gdlz4l9iqw1zdlk5i3knysn36iqxdh3xabjq8kq04jkl7i36dl";
-          name = "world-time-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -77396,8 +96448,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    wotd = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
-    melpaBuild {
+    wotd = callPackage ({ emacs
+                        , fetchFromGitHub
+                        , fetchurl
+                        , lib
+                        , melpaBuild
+                        , org }:
+      melpaBuild {
         pname = "wotd";
         version = "20170328.1248";
         src = fetchFromGitHub {
@@ -77406,10 +96463,10 @@
           rev = "d2937a3d91e014f8028a1f33d21c18cc0b065a64";
           sha256 = "0nwq5ymj9kx1fx3kfc789nkd80gwzljwmk7xxzzsrdrv47gm047m";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7a52690a9bae634825bdfb5b6b17e5faccb93e13/recipes/wotd";
           sha256 = "145knl4n35kpqqzqkz1vd18d619nw011d93f8qp5h82xm92p3sb5";
-          name = "wotd";
+          name = "recipe";
         };
         packageRequires = [ emacs org ];
         meta = {
@@ -77417,20 +96474,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    wrap-region = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    wrap-region = callPackage ({ dash
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "wrap-region";
         version = "20140116.2320";
         src = fetchFromGitHub {
           owner = "rejeep";
           repo = "wrap-region.el";
-          rev = "fbae9b0f106187af19823f1a6260b5c68b7252e6";
-          sha256 = "1k5q925igdv5lnpbmy0c2f0j3rj7yh4l6bxbd61g9lcnyl0j3ym9";
+          rev = "5a910ad23ebb0649e644bf62ad042587341da5da";
+          sha256 = "03hjwm51sngkh7jjiwnqhflllqq6i99ib47rm2ja9ii0qyhj1qa0";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/wrap-region";
           sha256 = "058518smxj3j3mr6ljzh7c9x5g23d24104p58sl9nhpw0cq9k28i";
-          name = "wrap-region";
+          name = "recipe";
         };
         packageRequires = [ dash ];
         meta = {
@@ -77438,20 +96499,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    writegood-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    writegood-mode = callPackage ({ fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "writegood-mode";
-        version = "20170925.647";
+        version = "20180525.643";
         src = fetchFromGitHub {
           owner = "bnbeckwith";
           repo = "writegood-mode";
-          rev = "416453af5a44da52646052fa2ee3a63acfd7bf8a";
-          sha256 = "08z35gc3j25h02jmlkzsis4n7a6sy6zy2qykcnp8b3s8y51d0dg0";
+          rev = "b71757ec337e226909fb0422f0224e31acc71733";
+          sha256 = "038gliy6l931r02bf2dbhmp188sgk1rq46ngg9nhf5q5rkf3pi8p";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/75c5a4304999fc3f5a02235a1c2c904238d2ce4f/recipes/writegood-mode";
           sha256 = "1lxammisaj04g5vr5lwms64ywf39w8knrq72x4i94wwzwx5ywi1d";
-          name = "writegood-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -77459,8 +96523,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    writeroom-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, visual-fill-column }:
-    melpaBuild {
+    writeroom-mode = callPackage ({ emacs
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild
+                                  , visual-fill-column }:
+      melpaBuild {
         pname = "writeroom-mode";
         version = "20170623.327";
         src = fetchFromGitHub {
@@ -77469,10 +96538,10 @@
           rev = "9e924dd7dd83f10b026c89cddef7e1646f1a3869";
           sha256 = "1v7hbmi9dqdqyr3png1xwhg3k05jr2q6jdjmj48bxiixl9zhcq9p";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/writeroom-mode";
           sha256 = "1kpsrp3agw8bg3qbf5rf5k1a7ww30q5xsa8z5ywxajsaywjzx1bk";
-          name = "writeroom-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs visual-fill-column ];
         meta = {
@@ -77480,20 +96549,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    ws-butler = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ws-butler = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "ws-butler";
         version = "20170111.1534";
         src = fetchFromGitHub {
           owner = "lewang";
           repo = "ws-butler";
-          rev = "52321b99be69aa1b661da7743c4421a30d8b6bcb";
-          sha256 = "1b6hxhwhzs6xq12w0jmvvjw0bx4czw71xzj3qizq9gx0q4n7a0qf";
+          rev = "323b651dd70ee40a25accc940b8f80c3a3185205";
+          sha256 = "1a4b0lsmwq84qfx51c5xy4fryhb1ysld4fhgw2vr37izf53379sb";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ws-butler";
           sha256 = "1k5nhj37r51i0czrlafra53wir73p0nbq83jjccqmw4p4xk6axl3";
-          name = "ws-butler";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -77501,8 +96573,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    wsd-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    wsd-mode = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "wsd-mode";
         version = "20170731.837";
         src = fetchFromGitHub {
@@ -77511,10 +96586,10 @@
           rev = "566ae4b45b4a34b985f1b363d6cdbd463ab6aba6";
           sha256 = "0k30i1gq6ljxwf97f6nlz8b6blh6hg0b4syfx64lzf0zc22di2l4";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/wsd-mode";
           sha256 = "07vclmnj18wx9wlrcnsl99f9jlk3sb9g6pcdv8x1smk84gccpakc";
-          name = "wsd-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -77522,8 +96597,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    wttrin = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, xterm-color }:
-    melpaBuild {
+    wttrin = callPackage ({ emacs
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild
+                          , xterm-color }:
+      melpaBuild {
         pname = "wttrin";
         version = "20170614.506";
         src = fetchFromGitHub {
@@ -77532,10 +96612,10 @@
           rev = "df5427ce2a5ad4dab652dbb1c4a1834d7ddc2abc";
           sha256 = "1ai655f10iayb4vw0ass2j3x83f4vsv90326mnywkzfl3sxd432z";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1b2b6876562f1fadd4af1ea9b279ac4dc1b21660/recipes/wttrin";
           sha256 = "0msp8lja9nz6khz3dkasv8hnhkaayqxd7m58kma03hpkcjxnaxil";
-          name = "wttrin";
+          name = "recipe";
         };
         packageRequires = [ emacs xterm-color ];
         meta = {
@@ -77543,8 +96623,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    wwtime = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    wwtime = callPackage ({ fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "wwtime";
         version = "20151122.810";
         src = fetchFromGitHub {
@@ -77553,10 +96636,10 @@
           rev = "d04d8fa814b5d3644efaeb28f25520ada69acbbd";
           sha256 = "0ba193ilqmp7l35hhzfym4kvbnj9h57m8mwsxdj6rdj2cwrifx8r";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/28f034fbabe9de76e2e4ae44be8c8240b08f0535/recipes/wwtime";
           sha256 = "0n37k23lkjgaj9wxnr41yk3mwvy62mc9im5l86czqmw5gy4l63ic";
-          name = "wwtime";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -77564,8 +96647,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    www-synonyms = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, request }:
-    melpaBuild {
+    www-synonyms = callPackage ({ cl-lib ? null
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild
+                                , request }:
+      melpaBuild {
         pname = "www-synonyms";
         version = "20170128.1451";
         src = fetchFromGitHub {
@@ -77574,10 +96662,10 @@
           rev = "7e37ea35064ff31c9945f0198a653647d408c936";
           sha256 = "0l4fvq5zdzqvlwxqgqbfx9x0aimvk4x3la9yz9gw3vvj1rwf340i";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2fe69ac09c3e24af9c4e24308e57d7c3c3425096/recipes/www-synonyms";
           sha256 = "0rp5p26hd67k4dsb40hj7jv24i9wncaay88dmiqla48843j4ymgh";
-          name = "www-synonyms";
+          name = "recipe";
         };
         packageRequires = [ cl-lib request ];
         meta = {
@@ -77585,8 +96673,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    x-path-walker = callPackage ({ fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }:
-    melpaBuild {
+    x-path-walker = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , helm-core
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "x-path-walker";
         version = "20160922.1135";
         src = fetchFromGitHub {
@@ -77595,10 +96687,10 @@
           rev = "3b01dbd7a039c6c84fdf8c8ee53ba72090ee950a";
           sha256 = "1gb3lnl3gvckbakc4fy22fcvif3xdfkdaw334xmp33phjb8gjqvj";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c51f2aba59cb93f4bb104a7dde214963cbf002a6/recipes/x-path-walker";
           sha256 = "03l83ph0d8g5pxnzp1gs3gdbwl3vhgvyk186yhqy6sbknq627k2x";
-          name = "x-path-walker";
+          name = "recipe";
         };
         packageRequires = [ helm-core ];
         meta = {
@@ -77606,20 +96698,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    x509-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    x509-mode = callPackage ({ cl-lib ? null
+                             , emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "x509-mode";
-        version = "20180313.153";
+        version = "20180702.36";
         src = fetchFromGitHub {
           owner = "jobbflykt";
           repo = "x509-mode";
-          rev = "d59058608bea1840fdba44810d7184b47bc88410";
-          sha256 = "1srqlzgrp75spygw360d1h2jfhlhmgszfsz9kyn8h564mlc3m35k";
+          rev = "89bdeca8c7494eaaea115031b3235f0bfbd4d945";
+          sha256 = "04m51c7w7nzh5nwpsyzwdcdfk1gsj9cy56xz51x53kla7xbwkdl8";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/27145423eb4e68e006ef96868a35b99d119a3099/recipes/x509-mode";
           sha256 = "15k3pxj3a2vaf64cl2xrzzlvzbqzqc29qyfd8brhq6yc69snr0vj";
-          name = "x509-mode";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -77627,20 +96724,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    x86-lookup = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    x86-lookup = callPackage ({ cl-lib ? null
+                              , emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "x86-lookup";
-        version = "20180321.1802";
+        version = "20180528.935";
         src = fetchFromGitHub {
           owner = "skeeto";
           repo = "x86-lookup";
-          rev = "a72e282d3db72fc1078623f405c2874bd48b9205";
-          sha256 = "0ayjdq50kd3karg0rc9ffxdn8pv0fbf7yfbq5vics8p5w7fl55x0";
+          rev = "609b2ba70dc5a246ac9b4b5f89eb5ef4331519bf";
+          sha256 = "19zgq7mcc3wx847xc911fibvphbsws99m2l3k54xdjp8mb5qfdzm";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/27757b9b5673f5581e678e8cad719138db654415/recipes/x86-lookup";
           sha256 = "1clv1npvdkzsy0a08xrb880yflwzl4d5cc2c5xrs7b837mqpj8hd";
-          name = "x86-lookup";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -77648,20 +96750,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    xah-css-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    xah-css-mode = callPackage ({ emacs
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "xah-css-mode";
-        version = "20180405.1521";
+        version = "20180629.107";
         src = fetchFromGitHub {
           owner = "xahlee";
           repo = "xah-css-mode";
-          rev = "5b630c3a706d7b692e04e44c571ff9c1076be2c3";
-          sha256 = "0di2pyd1b4a0lyz1xi260dha3n6wa8d4nlb59inaxcj4nfw7sv15";
+          rev = "9293a1a21cb7c2a6fb4ae9af0e581f30d2e45016";
+          sha256 = "0wlci3z71qk3l19pkxddd4f3w9mg2si9ab4l3da381hnpi6d3iyp";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/05eed39bae37cc8359d2cc678052cbbcc946e379/recipes/xah-css-mode";
           sha256 = "1kkwfyf94v3ni3d4szy28v49p6f3hy8ww9mlris2vvgc726wy6hr";
-          name = "xah-css-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -77669,20 +96775,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    xah-elisp-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    xah-elisp-mode = callPackage ({ emacs
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "xah-elisp-mode";
-        version = "20180402.2139";
+        version = "20180710.124";
         src = fetchFromGitHub {
           owner = "xahlee";
           repo = "xah-elisp-mode";
-          rev = "95ec296ec6e059e0f802b919fcaeae521714fd68";
-          sha256 = "19hjw9bcq2qsc0m47303r5r1nr144sbsrs0lwzzadxvfyfwpm1q4";
+          rev = "b2fe52007d90934053a6ba885b77d228d6c2bff6";
+          sha256 = "1ma095ivzxblm0daxmgf3lcs59nkxgh4bfaw8vqxysfy0svqrff7";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/05eed39bae37cc8359d2cc678052cbbcc946e379/recipes/xah-elisp-mode";
           sha256 = "0cl07hw1hd3hj7wrzkh20m8vcs7mqsajxjmnlbnk2yg927yyijij";
-          name = "xah-elisp-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -77690,8 +96800,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    xah-find = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    xah-find = callPackage ({ emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "xah-find";
         version = "20180310.450";
         src = fetchFromGitHub {
@@ -77700,10 +96814,10 @@
           rev = "0cd985675c286bfa5f07ab9d00231f8a23505537";
           sha256 = "01h5wdbzf7swrmddai2vsakr8rsqg447w9bnp7akxla426fsr8wg";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/05eed39bae37cc8359d2cc678052cbbcc946e379/recipes/xah-find";
           sha256 = "1d3x9yhm7my3yhvgqnjxr2v28g5w1h4ri40sy6dqcx09bjf3jhyq";
-          name = "xah-find";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -77711,20 +96825,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    xah-fly-keys = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    xah-fly-keys = callPackage ({ emacs
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "xah-fly-keys";
-        version = "20180412.2300";
+        version = "20180702.1521";
         src = fetchFromGitHub {
           owner = "xahlee";
           repo = "xah-fly-keys";
-          rev = "e7181d40cc4bf30eed2672cb97255a8451031002";
-          sha256 = "0lhakj8hr2wg7n3nqc5bqwgxb9lf6yvknryll9xw9lq4q9yha7rg";
+          rev = "11db1184a7f68ee6be0cafe5bd9a304cb0036488";
+          sha256 = "0j4mx27fnx95ri8sm3zsp0xwk4n8civbnn2ld1932kazbhwfwgqv";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/05eed39bae37cc8359d2cc678052cbbcc946e379/recipes/xah-fly-keys";
           sha256 = "0bzfz8q7yd1jai0pgngxwjp82nsfx5ivn24cb20vc5r8hhzj17cs";
-          name = "xah-fly-keys";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -77732,8 +96850,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    xah-get-thing = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    xah-get-thing = callPackage ({ emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "xah-get-thing";
         version = "20170821.353";
         src = fetchFromGitHub {
@@ -77742,10 +96864,10 @@
           rev = "e3ef069ea9fea3a092689d45c94c6211b51d0ea4";
           sha256 = "0z9pflz99p2i7czccpzvw7bkbshfycpb6js9n8a12yhc1ndbz6z0";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/05eed39bae37cc8359d2cc678052cbbcc946e379/recipes/xah-get-thing";
           sha256 = "0m61bmfgqy19h4ivw655mqj547ga8hrpaswcp48hx00hx8mqzcvg";
-          name = "xah-get-thing";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -77753,8 +96875,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    xah-lookup = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    xah-lookup = callPackage ({ emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "xah-lookup";
         version = "20171108.241";
         src = fetchFromGitHub {
@@ -77763,10 +96889,10 @@
           rev = "3029d8ec04e841c57b7482c244a1733eb4c77cb5";
           sha256 = "0ygkl663cqs25kicfnpy06j3sm6jjpagvv90wx3llspjy9adcxvx";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/05eed39bae37cc8359d2cc678052cbbcc946e379/recipes/xah-lookup";
           sha256 = "0z0h1myw6wmybyd0z2lw4l59vgm6q6kh492q77kf3s0fssc0facc";
-          name = "xah-lookup";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -77774,20 +96900,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    xah-math-input = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    xah-math-input = callPackage ({ emacs
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "xah-math-input";
-        version = "20180328.1515";
+        version = "20180709.2228";
         src = fetchFromGitHub {
           owner = "xahlee";
           repo = "xah-math-input";
-          rev = "6e240b83bd3bc19b0edf8a85413b216dbf27f441";
-          sha256 = "1ff3r1a3jgvv33sahi9ajs04m4sch9cmqwx0dlwkn1595smwk8k5";
+          rev = "87e46fcaaada3e87dc828e75a52bec05c8c4c262";
+          sha256 = "1vb53wr93n2m419y81c6naixxc6791bjynbfydm234da7ixsc7mk";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/05eed39bae37cc8359d2cc678052cbbcc946e379/recipes/xah-math-input";
           sha256 = "1afikjk46sjf97fb5fc8h63h7b9af010wxhsbpnmabsb4j72rx5a";
-          name = "xah-math-input";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -77795,8 +96925,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    xah-reformat-code = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    xah-reformat-code = callPackage ({ fetchFromGitHub
+                                     , fetchurl
+                                     , lib
+                                     , melpaBuild }:
+      melpaBuild {
         pname = "xah-reformat-code";
         version = "20170821.411";
         src = fetchFromGitHub {
@@ -77805,10 +96938,10 @@
           rev = "7fec8b28e46b8cc2813fac5149e3bbb56c0aa6b1";
           sha256 = "0mz47laig0p7fwwiv66x60f5jg0kh8zvjd1vg3nnn3xvk37lv2cw";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/05eed39bae37cc8359d2cc678052cbbcc946e379/recipes/xah-reformat-code";
           sha256 = "1sj407nbh4x586hvsq4ycr0ahhxin0wgfwdj0551cz8793wvjpzp";
-          name = "xah-reformat-code";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -77816,20 +96949,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    xah-replace-pairs = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    xah-replace-pairs = callPackage ({ emacs
+                                     , fetchFromGitHub
+                                     , fetchurl
+                                     , lib
+                                     , melpaBuild }:
+      melpaBuild {
         pname = "xah-replace-pairs";
-        version = "20170823.2028";
+        version = "20180507.1949";
         src = fetchFromGitHub {
           owner = "xahlee";
           repo = "xah-replace-pairs";
-          rev = "f051772e097723bafd05a7a05f283b900375ebd7";
-          sha256 = "0r85y1qaqvnj36c931cz4qzxwf86ai35xjaw6bwy7hjjdxp82cz0";
+          rev = "4d845cfbce32d45befd7c454e3476c3ce40d2b43";
+          sha256 = "1mkglrc8mbsjag3pc9zrmqa9x3n009hza1p1jvn3n97wjpc1qxlk";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/05eed39bae37cc8359d2cc678052cbbcc946e379/recipes/xah-replace-pairs";
           sha256 = "0r4aq9davh3ypzcjixr3aw9g659dhiblwbmcyhm8iqhkavcpqr1x";
-          name = "xah-replace-pairs";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -77837,8 +96974,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    xahk-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    xahk-mode = callPackage ({ emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "xahk-mode";
         version = "20170821.407";
         src = fetchFromGitHub {
@@ -77847,10 +96988,10 @@
           rev = "02012b20603c00e3b2ef32159a690ed1e05d12c3";
           sha256 = "09nakcfczb95vd48f8z77igmi1kbcblmgpzfzm9i7df4jcfkkh3c";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/05eed39bae37cc8359d2cc678052cbbcc946e379/recipes/xahk-mode";
           sha256 = "1bs12z7lnqlhm44hq0l98d0ka1bjgvm2yv97yivaj9akd53znca9";
-          name = "xahk-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -77858,8 +96999,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    xbm-life = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    xbm-life = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "xbm-life";
         version = "20160103.217";
         src = fetchFromGitHub {
@@ -77868,10 +97012,10 @@
           rev = "dd6a98ac9ea81b681e68f6318fed47158e5d469e";
           sha256 = "08hzsqf4gawcr9q2h3rxrf1igvdja84aaa821657k04kdq4dpcbj";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6cb4c55583338dafee61fd9c266d2ee7cae2b1ed/recipes/xbm-life";
           sha256 = "1pglxjd4cs630sayx17ai1xflpbyj3hry3156682bgwhqs1vw68q";
-          name = "xbm-life";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -77879,20 +97023,27 @@
           license = lib.licenses.free;
         };
       }) {};
-    xcode-mode = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, multiple-cursors, s }:
-    melpaBuild {
+    xcode-mode = callPackage ({ dash
+                              , emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild
+                              , multiple-cursors
+                              , s }:
+      melpaBuild {
         pname = "xcode-mode";
         version = "20160907.508";
         src = fetchFromGitHub {
           owner = "nicklanasa";
           repo = "xcode-mode";
-          rev = "2ae4f512d6c601ea39d5ab785c2b5288eac24b59";
-          sha256 = "0pi85ylxvjj63cmibgvi493d4ybcp2blhlwgrwzn2hjz31jldh0y";
+          rev = "5b5f0a4f505d44840a4924b24e3ef73b8528d98b";
+          sha256 = "0g2vc13rc9vk20m9l1a1rxkdsc099k33pya3z10sg9pa09a4a2a2";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/845c731bed7dbe9c41c09e47e219299f17d0d489/recipes/xcode-mode";
           sha256 = "1d8r2bc7fiwma1lcrzd9gxhdpvyf2pc6kplx7nyr40ghsb9jlpiw";
-          name = "xcode-mode";
+          name = "recipe";
         };
         packageRequires = [ dash emacs multiple-cursors s ];
         meta = {
@@ -77900,20 +97051,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    xcode-project = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    xcode-project = callPackage ({ emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "xcode-project";
-        version = "20170922.612";
+        version = "20180509.1218";
         src = fetchFromGitHub {
           owner = "nhojb";
           repo = "xcode-project";
-          rev = "ec5d503a51430205daa6f5f382d921b6412b4b55";
-          sha256 = "0m3262mqqhjcpzw8m4n403kr75m561kxvwf8clzwmv0fvkf8aazk";
+          rev = "fe95fb1d1da89f4f03d5dff330fd2d663101f8f0";
+          sha256 = "1fvk92zbl4rl0kz0wnrmrry1amcpqxqqprsjgn209b4i7sh05p06";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/49b866ebf7e707bc74525f83dd5038e6e860fcef/recipes/xcode-project";
           sha256 = "0igp30f6ypmp4l8zmdfpa5bza4avm7mq2gj8v7b3ii655v91n6vi";
-          name = "xcode-project";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -77921,20 +97076,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    xcscope = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    xcscope = callPackage ({ fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "xcscope";
-        version = "20160628.2324";
+        version = "20180426.12";
         src = fetchFromGitHub {
           owner = "dkogan";
           repo = "xcscope.el";
-          rev = "1e4c8e60eb841a3ecb56ff4115b6a8ae5c0bf779";
-          sha256 = "1cc3bmi4fxlgqha7sxswn9lcc126xnr2j8xz6wszjnqh5w274fpp";
+          rev = "57bff67460c587acf60f513de622b4c7ab312081";
+          sha256 = "1l1k85wlmjb2mgzx1la9f0p7j3q0mzj4hlrs98pf4bbfkdbqg7a7";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/068c7846e70b91ce7e88330937fc64a60281802a/recipes/xcscope";
           sha256 = "06xh29cm5v3b5xwj32y0i0h0kvvy995840db4hvab2wn9jw68m8w";
-          name = "xcscope";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -77942,20 +97100,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    xkcd = callPackage ({ fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }:
-    melpaBuild {
+    xkcd = callPackage ({ fetchFromGitHub
+                        , fetchurl
+                        , json ? null
+                        , lib
+                        , melpaBuild }:
+      melpaBuild {
         pname = "xkcd";
         version = "20160419.430";
         src = fetchFromGitHub {
           owner = "vibhavp";
           repo = "emacs-xkcd";
-          rev = "66e928706fd660cfdab204c98a347b49c4267bdf";
-          sha256 = "0znhjwlpgg05g39b16ddgw3a71a93fn2dicfsxjkziffn2a95m0s";
+          rev = "2c538d41a9728939cc5e8292faa78ed50997877d";
+          sha256 = "0p9p3w8i5w1pzh3y3yxz0rg5gywfq4m5anbiyrdn84vdd42jij4x";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/xkcd";
           sha256 = "0gy2952zg1rq5gl10x7iwbchz5jibfcvikd3chifqbmil80wh6b5";
-          name = "xkcd";
+          name = "recipe";
         };
         packageRequires = [ json ];
         meta = {
@@ -77963,8 +97125,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    xml-plus = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    xml-plus = callPackage ({ dash
+                            , emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "xml-plus";
         version = "20170727.1651";
         src = fetchFromGitHub {
@@ -77973,10 +97140,10 @@
           rev = "232fa863c08fc159b21dd58c39ea45dce3334895";
           sha256 = "0b7v59dya346ds1wad0avrqhjimx5n9r3pcgqafagzf34hdcv3jy";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/244388d158efda6fe8c1362a65b89b352c444422/recipes/xml+";
           sha256 = "0xgqyfdn6kkp89zj4h54r009a44sbff0nrhh582zw5rlklypwdz1";
-          name = "xml-plus";
+          name = "recipe";
         };
         packageRequires = [ dash emacs ];
         meta = {
@@ -77984,8 +97151,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    xml-quotes = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    xml-quotes = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "xml-quotes";
         version = "20151230.1449";
         src = fetchFromGitHub {
@@ -77994,10 +97164,10 @@
           rev = "26db170e80b9295861227cdf970721b12539ed44";
           sha256 = "0z3yd3dzcsd7584jchv9q55fx04ig4yjzp8ay2pa112lykv4jxxd";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ab315d783765730aceab43b4fd8c4872a1f1cc05/recipes/xml-quotes";
           sha256 = "1lmafa695xkhd90k6yiv8a57ch1jx33l1zpm39z0kj546mn6y8aq";
-          name = "xml-quotes";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -78005,8 +97175,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    xml-rpc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    xml-rpc = callPackage ({ fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "xml-rpc";
         version = "20160430.1458";
         src = fetchFromGitHub {
@@ -78015,10 +97188,10 @@
           rev = "0ab093d60140d19e31d217c8abdc7dbdac944486";
           sha256 = "0g52bmamcd54acyk6i47ar5jawad6ycvm9g656inb994wprnjin9";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/547d773e07d6229d2135d1b081b5401039ffad39/recipes/xml-rpc";
           sha256 = "14r6xgnpqsb2jlv52vgrhqf3qw8a6gmdyap3ylhilyxw71lxf1js";
-          name = "xml-rpc";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -78026,8 +97199,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    xmlgen = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    xmlgen = callPackage ({ fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "xmlgen";
         version = "20170411.617";
         src = fetchFromGitHub {
@@ -78036,10 +97212,10 @@
           rev = "dba66681f0c5e621a9e70e8afb34903c9ffe93c4";
           sha256 = "096i29v0badx0a6339h9ckdz78zj59gbjdp7vj7vhkq9d830392s";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/xmlgen";
           sha256 = "0c77la6kl02qkapfzbjmhac60f8p837kwg8bp0686ylxh5s31zsh";
-          name = "xmlgen";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -78047,8 +97223,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    xmlunicode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    xmlunicode = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "xmlunicode";
         version = "20160319.912";
         src = fetchFromGitHub {
@@ -78057,10 +97236,10 @@
           rev = "f5d185da46414c0509ebd0aa0fab416becf94612";
           sha256 = "178bdfwiinhf98qm88ivmgy6rd0qjx5gnckkclanybva0r8l6832";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b636126a389a337a3685f9d0dcbca9bf8e784f20/recipes/xmlunicode";
           sha256 = "1ylpvx2p5l863r9qv9jdsm9rbv989c8xn0zpjl8zkcfxqxix4h4p";
-          name = "xmlunicode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -78068,8 +97247,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    xo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    xo = callPackage ({ fetchFromGitHub
+                      , fetchurl
+                      , lib
+                      , melpaBuild }:
+      melpaBuild {
         pname = "xo";
         version = "20160402.2346";
         src = fetchFromGitHub {
@@ -78078,10 +97260,10 @@
           rev = "72fcd867cfa332fdb82f732925cf8977e690af78";
           sha256 = "0761amc73mbgaydp3iyfzgyjxp77yk440s24h69hvk87c5vn1cz3";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fd8cec754da662e4873186c23c1ba13c52cccbba/recipes/xo";
           sha256 = "0kpbnxh8sa2dk8anrvgc7d39qap13pyjxh154gpm8xdb9zhfwl25";
-          name = "xo";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -78089,20 +97271,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    xquery-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    xquery-mode = callPackage ({ cl-lib ? null
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "xquery-mode";
         version = "20170214.319";
         src = fetchFromGitHub {
           owner = "xquery-mode";
           repo = "xquery-mode";
-          rev = "1b655ccf83d02a7bd473d2cf02359ed60bdf7369";
-          sha256 = "1iprgfjrbx3fmqhkgjxdxnlzz2s6h895q270lhjrhkwgpphgna2c";
+          rev = "19e6f9553ce05380843582b879712de00679e4ab";
+          sha256 = "0q04p75qkcbij7cqvhwnfx2729f1v4si05xjv433v7f6dfxxkhhl";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e8ea1c9e26963f290d912df21b81afd689543658/recipes/xquery-mode";
           sha256 = "13xrvygk7wdby6599q6yxw8cm45qqki8szrm49fc3b6pr6vzpidg";
-          name = "xquery-mode";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -78110,20 +97296,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    xquery-tool = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    xquery-tool = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "xquery-tool";
         version = "20170605.126";
         src = fetchFromGitHub {
           owner = "paddymcall";
           repo = "xquery-tool.el";
-          rev = "0d1e2960c48701b83be5255d56324f65a6ee182e";
-          sha256 = "0x6927x18nimh9rgnkl8dyc6r437a03byzscgg053lbg0cf2mqp1";
+          rev = "171abb0c4560c1a50e1a7def07eb61052ed30609";
+          sha256 = "1h3zqq4izzwlg22lj0813bid4j4r5m0blcx33rfak1ngw34zrcza";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cc71e5ea4a0ecb006f62617f5b6caadc9b3c77b2/recipes/xquery-tool";
           sha256 = "069injmvv9zzcbqbms94qx5wjj740jnik6sf3b4xjhln7z1yskp0";
-          name = "xquery-tool";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -78131,8 +97320,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    xref-js2 = callPackage ({ emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild }:
-    melpaBuild {
+    xref-js2 = callPackage ({ emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , js2-mode
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "xref-js2";
         version = "20170530.126";
         src = fetchFromGitHub {
@@ -78141,10 +97335,10 @@
           rev = "d5f93605405989529c2f66b542def6c32429b927";
           sha256 = "1vzsw257xkqwlgfj8d5hnrirjhxzzs9d8ms40ihb2zwsxn70im53";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b5dab444ead98210b4ab3a6f9a61d013aed6d5b7/recipes/xref-js2";
           sha256 = "1mfyszdi1wx2lqd9fyqm0ra227dcsjs8asc1dw2li0alwh7n4xs3";
-          name = "xref-js2";
+          name = "recipe";
         };
         packageRequires = [ emacs js2-mode ];
         meta = {
@@ -78152,20 +97346,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    xresources-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    xresources-theme = callPackage ({ fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "xresources-theme";
         version = "20160331.702";
         src = fetchFromGitHub {
           owner = "CQQL";
           repo = "xresources-theme";
-          rev = "feb0552d31cb54210eabbc1abe32c8ea62841b6f";
-          sha256 = "1dfksid7dc27dz43lrriyr724qs7pf7dqhkmcai6b5qbi893ib8y";
+          rev = "09a0bfc1684161dd1cdc899c027808a99646a652";
+          sha256 = "171vffga2yzxqmgh77vila6x96bz1i6818f1pfaxblw1hz2ga341";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4cef3a5683ea572f823d915ec2a94d591ac915d6/recipes/xresources-theme";
           sha256 = "0spqa3xn3p2lmvlc5hdn7prq4vb70nkyrryx1kavha9igzhlyaga";
-          name = "xresources-theme";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -78173,8 +97370,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    xterm-color = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    xterm-color = callPackage ({ cl-lib ? null
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "xterm-color";
         version = "20180202.1518";
         src = fetchFromGitHub {
@@ -78183,10 +97384,10 @@
           rev = "42374a98f1039e105cad9f16ce585dffc96a3f1c";
           sha256 = "09mzzql76z3gn39qnfjspm8waps8msbkilmlk3n2zrizpbps6crj";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b34a42f1bf5641871da8ce2b688325023262b643/recipes/xterm-color";
           sha256 = "0bvzi1mkxgm4vbq2va1sr0k9h3fdmppq79hkvbizc2xgk72sazpj";
-          name = "xterm-color";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -78194,8 +97395,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    xterm-keybinder = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }:
-    melpaBuild {
+    xterm-keybinder = callPackage ({ cl-lib ? null
+                                   , emacs
+                                   , fetchFromGitHub
+                                   , fetchurl
+                                   , let-alist
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "xterm-keybinder";
         version = "20160522.1756";
         src = fetchFromGitHub {
@@ -78204,10 +97411,10 @@
           rev = "b29c4f700b0fa0c9f627f6725b36462b8fab06d6";
           sha256 = "0ya7c73acwp29glwjd1hf19h8jij2afwmwq7a3h91qx5zdn09wvh";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/656f8e27b4e6055a634249f134a4fc0667fa0e95/recipes/xterm-keybinder";
           sha256 = "1n0zp1mc7x7z0671lf7p9r4qxic90bkf5q3zwz4vinpiw2qh88lz";
-          name = "xterm-keybinder";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs let-alist ];
         meta = {
@@ -78215,20 +97422,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    xtest = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    xtest = callPackage ({ cl-lib ? null
+                         , fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "xtest";
         version = "20141214.906";
         src = fetchFromGitHub {
           owner = "promethial";
           repo = "xtest";
-          rev = "2c2bdf32667506dd9ddf6eb311832add616bdf1c";
-          sha256 = "09mn8s7gzzxgs7kskld8l68zjrcgnvml3fqj69wrfq7b1g62hhxy";
+          rev = "8099be9c2d856f98489834ddb20a01c6fd8922f1";
+          sha256 = "1i4hxpvdxhcdxkfg39jmjqn3zdknccj6apgk80hs4k80am0l881z";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/378fe14c66072ecb899a074c56f95077dfc9667e/recipes/xtest";
           sha256 = "1vbs4sb4frzg8d3l96ip9cc6lc86nbj50vpdfqazvxmdfd1sg4i7";
-          name = "xtest";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -78236,8 +97447,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    xwidgete = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    xwidgete = callPackage ({ emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "xwidgete";
         version = "20171118.1316";
         src = fetchFromGitHub {
@@ -78246,10 +97461,10 @@
           rev = "e4e8410fe32176df85b46234717824519443fb04";
           sha256 = "04j4xwcdxlnrwxs89605zmwxszbi2j0z67v80651pshgnhj5p19i";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/xwidgete";
           sha256 = "1v1dfykkb6nwjwz2623i6x1rl53z4457l6fpa4nv4krdqq79gl5d";
-          name = "xwidgete";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -78257,8 +97472,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    yabin = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    yabin = callPackage ({ fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "yabin";
         version = "20140205.1951";
         src = fetchFromGitHub {
@@ -78267,10 +97485,10 @@
           rev = "db8c404507560ef9147fcce2b94cd706fbfa03b5";
           sha256 = "0f6pvwzhncycw8gnjy24h6q1qglfgvdjfs5dzqx9s43j3yg63lzm";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cc44b28e32ff9b35f60744a175c2d1e3036db8bc/recipes/yabin";
           sha256 = "1kmpm2rbb43c9cgp44qwd24d90mj48k3gyiir3vb6zf6k3syrc17";
-          name = "yabin";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -78278,8 +97496,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    yafolding = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    yafolding = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "yafolding";
         version = "20170304.1917";
         src = fetchFromGitHub {
@@ -78288,10 +97509,10 @@
           rev = "57c015ddd7c3454571c80825bc5391d7a10fa1d7";
           sha256 = "144v8nn4l8ngfdrsgj5nrxp09391gnfrqf950y956cbmqvnlw7z8";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/yafolding";
           sha256 = "1yb1rlxa5f1y1xjqs7ndr5jnf9j5cv0ccqdpbrx4l9xkm3npw9zl";
-          name = "yafolding";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -78299,20 +97520,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    yagist = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    yagist = callPackage ({ cl-lib ? null
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "yagist";
         version = "20160417.2208";
         src = fetchFromGitHub {
           owner = "mhayashi1120";
           repo = "yagist.el";
-          rev = "dcdbd84f348414815d02f3da8a6ee0ac271632d4";
-          sha256 = "0lgy9b893mq4harxh80n0n2zia00s2c6ga8p654q563idrskgz17";
+          rev = "10da4baa272ff0f7052f17debecc340764c7003f";
+          sha256 = "0cxrq5azj2wb8swkzaygizkvdph61v6yr68gjanzgslhvkn66rz1";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/97ea1250ffbf159d7870710b9348ef26616dbedb/recipes/yagist";
           sha256 = "1mz86fq0pb4w54c66vd19m2492mkrzq2qi6ssnn2xwmn8vv02wdd";
-          name = "yagist";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -78320,8 +97545,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    yahoo-weather = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    yahoo-weather = callPackage ({ emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "yahoo-weather";
         version = "20170822.1544";
         src = fetchFromGitHub {
@@ -78330,10 +97559,10 @@
           rev = "a74e29bc81b13efe285b87fa4d0694d75f8e2bb5";
           sha256 = "1nimmv84q5zsv81ji3nmvpmi30f8xh0ypa88hpdpykc5iirj1m0x";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ae5ca93d48a2d24787c3d4ed7ab3a65aa8023f4f/recipes/yahoo-weather";
           sha256 = "1kzi6yp186wfcqh5q1v9vw6b1h8x89sba6wlnacfpjbarwapfif0";
-          name = "yahoo-weather";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -78341,20 +97570,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    yahtzee = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    yahtzee = callPackage ({ emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "yahtzee";
         version = "20171022.712";
         src = fetchFromGitHub {
           owner = "drdv";
           repo = "yahtzee";
-          rev = "673f033c05b4984f5159526db2d7f4a32dd57b6d";
-          sha256 = "1iwmwff538zw95mlrq4jhwaikx2hs6jqcx94rypn6znymrfsf0hp";
+          rev = "5263fb8883d37d79a4ed34dd3216a8947d2ae4a0";
+          sha256 = "1qv8p3zpxkkp0ncq3cs8sq2bj4jrxs4s5jfc5hbs905a9z8bsnq9";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/200169fdabce0ae3a2ecb6f4f3255c15ec3ed094/recipes/yahtzee";
           sha256 = "1fnywiami9mszagmms27dmak6chcichdi7q70x5c6aimc4jb98jk";
-          name = "yahtzee";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -78362,8 +97595,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    yalinum = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    yalinum = callPackage ({ fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "yalinum";
         version = "20130217.243";
         src = fetchFromGitHub {
@@ -78372,10 +97608,10 @@
           rev = "d3e0cbe3f4f5ca311e3298e684901d6fea3ad973";
           sha256 = "12dd4ahg9f1493982d49g7sxx0n6ss4xcfhxwzyaqxckwzfranp0";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/yalinum";
           sha256 = "0jzsvkcvy2mkfmri4bzgrlgw2y0z3hxz44md83s5zmw09mshkahf";
-          name = "yalinum";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -78383,8 +97619,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    yaml-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    yaml-mode = callPackage ({ emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "yaml-mode";
         version = "20180408.2307";
         src = fetchFromGitHub {
@@ -78393,10 +97633,10 @@
           rev = "40067a10ac1360f0b9533f0bbbb2eea128e2574d";
           sha256 = "0v7646vdsbbhxh9ywsypq2ycdsrf6m7wv788qaircbjgn1pk4v7i";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/yaml-mode";
           sha256 = "0afp83xcr8h153cayyaszwkgpap0iyk351dlykmv6bv9d2m774mc";
-          name = "yaml-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -78404,20 +97644,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    yaml-tomato = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    yaml-tomato = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild
+                               , s }:
+      melpaBuild {
         pname = "yaml-tomato";
         version = "20151122.2353";
         src = fetchFromGitHub {
           owner = "RadekMolenda";
           repo = "yaml-tomato";
-          rev = "f9df1c9bdfcec629b03031b2d2032f9dc533cb14";
-          sha256 = "1xgqqgg4q3hrhiap8gmr8iifdr1mg4dl0j236b6alhrgmykbhimy";
+          rev = "1272c502fac6ce6b0f8b7f8a9beb353f0b35e13c";
+          sha256 = "0caz0ls8qlh92hr75xv593d2sk27yscb8nzhgzhiarpdxx447jzz";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/yaml-tomato";
           sha256 = "1asy4nf759lcgksah2g7jvzwwlq9lxfkiji460csk5ycsv8aa99s";
-          name = "yaml-tomato";
+          name = "recipe";
         };
         packageRequires = [ s ];
         meta = {
@@ -78425,8 +97669,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    yandex-weather = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    yandex-weather = callPackage ({ fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "yandex-weather";
         version = "20160311.1237";
         src = fetchFromGitHub {
@@ -78435,10 +97682,10 @@
           rev = "6f823fd9e04ff9efb2aa65f333079e9f7e6e5b28";
           sha256 = "0pw44klm8ldsdjphybzkknv8yh23xhzwg76w3d9cqs79jkd0rw8w";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5221cee4c89dde5cebd9cddb3b4e4c5814b898d7/recipes/yandex-weather";
           sha256 = "11hspadm520cjlv1wk2bdpzg7hg2g0chbh26qijj9jgvca26x0md";
-          name = "yandex-weather";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -78446,8 +97693,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    yang-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    yang-mode = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "yang-mode";
         version = "20180306.407";
         src = fetchFromGitHub {
@@ -78456,10 +97706,10 @@
           rev = "340aec635e359609b22f7e94df15af1af2b070f6";
           sha256 = "0795z6s71vlb709n5lpx2f9adfjndafg1h5860zvy1qc4m1054rz";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bb42ab9b5f118baaf6766c478046552b686981a1/recipes/yang-mode";
           sha256 = "0rl90xbcf3383ls95g1dixh2dr02kc4g60d324cqbb4h59wffp40";
-          name = "yang-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -78467,20 +97717,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    yankpad = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    yankpad = callPackage ({ emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "yankpad";
-        version = "20180415.350";
+        version = "20180624.1615";
         src = fetchFromGitHub {
           owner = "Kungsgeten";
           repo = "yankpad";
-          rev = "a804f145d17b4b68490ee62ba9a9c4fc7faad130";
-          sha256 = "1m9zal19s7v6djrma1xbqwx1n271y0ik44wx9sscmrynmhdlis04";
+          rev = "ad8ce33fec5d9eb2a7e1111b1097e4015f78c0ed";
+          sha256 = "03645wr6ksx6f7q3wpjcx3c7n1bm4v03j8kjkxx2790y77yns3ri";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e64746d10f9e0158621a7c4dc41dc2eca6ad573c/recipes/yankpad";
           sha256 = "1w5r9zk33cjgsmk45znfg32ym06nyqj5q3knr59jmn1fafx7a3z4";
-          name = "yankpad";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -78488,8 +97742,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    yapfify = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    yapfify = callPackage ({ fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "yapfify";
         version = "20180105.1447";
         src = fetchFromGitHub {
@@ -78498,10 +97755,10 @@
           rev = "9e63a9135bd8dbfbee55819837a3aa0d119c5e6f";
           sha256 = "1bf09hah2g8x0jbrdh4fm1v01qjymiv38yvv8a5qmfpv5k93lcrc";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/060c32d8e9fdc56fe702d265a935d74d76082f86/recipes/yapfify";
           sha256 = "0scl8lk1c5i7jp1qj5gg8zf3zyi8lkb57ijkmvcs4czzlyv3y9bm";
-          name = "yapfify";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -78509,8 +97766,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    yara-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    yara-mode = callPackage ({ emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "yara-mode";
         version = "20170719.2351";
         src = fetchFromGitHub {
@@ -78519,10 +97780,10 @@
           rev = "af5c05b34a29fc1bd73a6d21c82cc76320b33e5c";
           sha256 = "1v8z3cwwla42d3r317091g5i7bj1hlbr9sd1p9s9b7y134gpd1xp";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ef22d2dad1bae62721710bbff4b7228204d7c425/recipes/yara-mode";
           sha256 = "12j25nbfg65bkil4wv6f27sszlj3jm6h0zczr0v26xr5syppis17";
-          name = "yara-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -78530,8 +97791,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    yard-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    yard-mode = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "yard-mode";
         version = "20170817.537";
         src = fetchFromGitHub {
@@ -78540,10 +97804,10 @@
           rev = "ba74a47463b0320ae152bd42a7dd7aeecd7b5748";
           sha256 = "0zry3p66bvrk32icnd6kkk8y5rrr8crnqjp6wlp889c8c7wm00n1";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/afad2677f901b8d27922389afb1d235d5c8edc39/recipes/yard-mode";
           sha256 = "0jmlcba8qapjwaaliz9gzs99if3wglkhmlpjzcdy3icx18sw8kzx";
-          name = "yard-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -78551,8 +97815,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    yari = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    yari = callPackage ({ fetchFromGitHub
+                        , fetchurl
+                        , lib
+                        , melpaBuild }:
+      melpaBuild {
         pname = "yari";
         version = "20151127.2339";
         src = fetchFromGitHub {
@@ -78561,10 +97828,10 @@
           rev = "a2cb9656ee5dfe1fc2ee3854f3079a1c8e85dbe9";
           sha256 = "0w9a6j0ndpfwaz1g974vv5jqgbzxw26l19kq51j3ah73063cavpf";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/yari";
           sha256 = "0sch9x899mzwdacg55w5j583k2r4vn71ish7gqpghd7cj13ii66h";
-          name = "yari";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -78572,20 +97839,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    yarn-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    yarn-mode = callPackage ({ emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "yarn-mode";
         version = "20170709.1237";
         src = fetchFromGitHub {
           owner = "anachronic";
           repo = "yarn-mode";
-          rev = "998b408d6be05fd1c3a9fd8db6ffaab3bf86d06b";
-          sha256 = "09mrcv30n6zmgnwgl5pb2cyk6122a0ng1xg20grpmlwbq3qlr424";
+          rev = "99891000efe31214b065fa9446cd5e68c5c42ed8";
+          sha256 = "0cg06ba9yfgjzprq78cvhvvl06av0p2vhnmynddzbpgjgjnwskfy";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/860fa2a8fdb22be374fa64a5277af3ab484a047a/recipes/yarn-mode";
           sha256 = "08a3lrz670jsf531mn1hwhh7fg5dby6i749cscd6d4dyvkzpz5dg";
-          name = "yarn-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -78593,8 +97864,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    yascroll = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    yascroll = callPackage ({ cl-lib ? null
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "yascroll";
         version = "20170315.1206";
         src = fetchFromGitHub {
@@ -78603,10 +97878,10 @@
           rev = "fe4494e5f4faf2832e665c7de0fed99cdbb39478";
           sha256 = "09y8phmvqdwp1k9w84rf6p609jrg0mhgx6akwda8rsvxrrbsh6j4";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/yascroll";
           sha256 = "11g7wn4hgdwnx3n7ra0sh8gk6rykwvrg9g2cihvcv7mjbqgcv53f";
-          name = "yascroll";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -78614,20 +97889,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    yasnippet = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    yasnippet = callPackage ({ cl-lib ? null
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "yasnippet";
-        version = "20180319.607";
+        version = "20180620.1750";
         src = fetchFromGitHub {
           owner = "joaotavora";
           repo = "yasnippet";
-          rev = "fa6a71c42de7fecd58193e2fd3681a0225b71dc5";
-          sha256 = "0zxwqc2ksk43p47svhcxsbw8fazl7krarfj8d1i1r9nkwhx5sqqi";
+          rev = "d3bb879356288ef38975fbf85947c7371b8c9759";
+          sha256 = "1bmwgbi303z1mvar46077vj4974bf7596fs0p4ncnqhcjl75m80j";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5d1927dc3351d3522de1baccdc4ce200ba52bd6e/recipes/yasnippet";
           sha256 = "1r37vz5b8nj6hr6c2ki9fdbrs3kkb4zwimh8r4ixm10kdkk5jqds";
-          name = "yasnippet";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -78635,20 +97914,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    yasnippet-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
-    melpaBuild {
+    yasnippet-snippets = callPackage ({ fetchFromGitHub
+                                      , fetchurl
+                                      , lib
+                                      , melpaBuild
+                                      , yasnippet }:
+      melpaBuild {
         pname = "yasnippet-snippets";
-        version = "20180408.446";
+        version = "20180714.622";
         src = fetchFromGitHub {
           owner = "AndreaCrotti";
           repo = "yasnippet-snippets";
-          rev = "4bbe565b7c9c7286f7ac465f0cc79c3fe5796c0b";
-          sha256 = "0rak66wmj0x4zmksckniamslvcaxsz0dgysrzv22jijmjjqpfd2z";
+          rev = "d153af6d1d8ab8dfbc57f4065cee72f86d5cd2c4";
+          sha256 = "0dkhac40kiyqnq42c2fcdb1jzshgakabq4rq796qfhjpc5j8x5wk";
         };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/25b8d4efe2e7833eb95dfdf33aa3ecc34af7a687/recipes/yasnippet-snippets";
-          sha256 = "0i6rk50a9l26r47v9xsnx35ziz4spx5pml3ys8y30n0r0xjdsj51";
-          name = "yasnippet-snippets";
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/42490bbdac871bce302fbc9a0488ff7de354627e/recipes/yasnippet-snippets";
+          sha256 = "0daawvlw78ya38bbi95swjq8qk5jf5shsyv164m81y2gd8i5c183";
+          name = "recipe";
         };
         packageRequires = [ yasnippet ];
         meta = {
@@ -78656,20 +97939,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    yatemplate = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
-    melpaBuild {
+    yatemplate = callPackage ({ emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild
+                              , yasnippet }:
+      melpaBuild {
         pname = "yatemplate";
-        version = "20180114.734";
+        version = "20180617.252";
         src = fetchFromGitHub {
           owner = "mineo";
           repo = "yatemplate";
-          rev = "4ab835c5ee90a1dbc31c4275a563a9e741a78c6a";
-          sha256 = "119i1p1rj329yh7d5a1wizrwhbvnildzzhl2bv50vkswg9nvg3na";
+          rev = "4f4fca9f04f7088c98aa195cf33635a35a6055cb";
+          sha256 = "04nd9fcp0ff2sjhwrq4nqjicc50m7498vq1qzw2cn5c5gaqmzff8";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8ba3cdb74f121cbf36b6d9d5a434c363905ce526/recipes/yatemplate";
           sha256 = "05gd9sxdiqpw2p1kdagwgxd94wiw1fmmcsp9v4p74i9sqmf6qn6q";
-          name = "yatemplate";
+          name = "recipe";
         };
         packageRequires = [ emacs yasnippet ];
         meta = {
@@ -78677,18 +97965,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    yatex = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild {
+    yatex = callPackage ({ fetchhg
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "yatex";
-        version = "20180223.2345";
+        version = "20180601.2357";
         src = fetchhg {
           url = "https://www.yatex.org/hgrepos/yatex";
-          rev = "af4601ee3c6a";
-          sha256 = "1r0irbkg8c5aapd1i7il31wv2fmhi0bzspiy21k670m896jqx50p";
+          rev = "ea6956f10ce7";
+          sha256 = "192x3qi781hf4xpx2b33clc2xsq1d7vi3fzjv82d5pq1687kjl93";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9854c39fc1889891fe460d0d5ac9224de3f6c635/recipes/yatex";
           sha256 = "1qbqdsqf5s61hyyzx84csnby242n5sdcmcw55pa8r16j8kyzgrc0";
-          name = "yatex";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -78696,20 +97988,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    yaxception = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    yaxception = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "yaxception";
         version = "20150105.652";
         src = fetchFromGitHub {
           owner = "aki2o";
           repo = "yaxception";
-          rev = "4e94cf3e0b9b5631b0e90eb4b7de597ee7185875";
-          sha256 = "0nqyn1b01v1qxv7rcf46qypca61lmpm8d7kqv63jazw3n05qdnj8";
+          rev = "21a36020c6a5319ea6461f4524aa3a0589df3bbd";
+          sha256 = "06fnm2c17hmlfp40mq8lxk1blmcy10z0xxdpy8ykyv1r1r6syjf8";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1da5261081fc66910d935b81e52391c071e52379/recipes/yaxception";
           sha256 = "18n2kjbgfhkhcwigxmv8dk72jp57vsqqd20lc26v5amx6mrhgh58";
-          name = "yaxception";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -78717,8 +98012,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    ycm = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ycm = callPackage ({ fetchFromGitHub
+                       , fetchurl
+                       , lib
+                       , melpaBuild }:
+      melpaBuild {
         pname = "ycm";
         version = "20150822.1136";
         src = fetchFromGitHub {
@@ -78727,10 +98025,10 @@
           rev = "4da8a14abcd0f4fa3235042ade2e12b5068c0601";
           sha256 = "0znchya89zzk30mwl4qfm0q9sfa5m3jspapb892ydj0mck5n4nyj";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/44e168f757cb51249db2deb9f781eff99cf6fb7c/recipes/ycm";
           sha256 = "16ahgvi85ddjlrjxld14zm2vvam0m89mwskizjd5clcz0snk51sc";
-          name = "ycm";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -78738,20 +98036,32 @@
           license = lib.licenses.free;
         };
       }) {};
-    ycmd = callPackage ({ cl-lib ? null, dash, deferred, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pkg-info, request, request-deferred, s }:
-    melpaBuild {
+    ycmd = callPackage ({ cl-lib ? null
+                        , dash
+                        , deferred
+                        , emacs
+                        , fetchFromGitHub
+                        , fetchurl
+                        , let-alist
+                        , lib
+                        , melpaBuild
+                        , pkg-info
+                        , request
+                        , request-deferred
+                        , s }:
+      melpaBuild {
         pname = "ycmd";
-        version = "20171111.854";
+        version = "20180520.353";
         src = fetchFromGitHub {
           owner = "abingham";
           repo = "emacs-ycmd";
-          rev = "a35a2ddd911da6d3a926bdef2614a2898055a5e2";
-          sha256 = "1nig77gqi74k01309r3nfy45ylhi5mj7ajxlhib6i58zlib8ycbl";
+          rev = "966594701c1eef1f6d4dad0c71c6d43a029977d7";
+          sha256 = "05b8l82l3p15r072zhmmwpcnxyyyrhzka5gc3vkzz2sa7wa7sp7j";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4b25378540c64d0214797348579671bf2b8cc696/recipes/ycmd";
           sha256 = "10jqr6xz2fnrd1ihips9jmbcd28zha432h4pxjpswz3ivwjqhxna";
-          name = "ycmd";
+          name = "recipe";
         };
         packageRequires = [
           cl-lib
@@ -78769,20 +98079,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    ydk-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ydk-mode = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "ydk-mode";
         version = "20170113.121";
         src = fetchFromGitHub {
           owner = "jacksonrayhamilton";
           repo = "ydk-mode";
-          rev = "f3f125b29408e0b0a34fec27dcb7c02c5dbfd04e";
-          sha256 = "0ndmbswrv8vyw18zhbmjr11400l546zqaj7dzfvwb5rhdv2d0abi";
+          rev = "3de9ef27dbdf5887f05092895e4ba93e7659e0ec";
+          sha256 = "1kc1qsblfxfxrbgv3ksqf87gzic463136k2v7ryaj3x2r9mc0j3l";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/865b9ee86ca28fc1cedc0a432a292400184711ae/recipes/ydk-mode";
           sha256 = "1z9digf39d7dd736svp0cy6773l3nklzc263q23gwfcg0jswbdyg";
-          name = "ydk-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -78790,20 +98103,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    yesql-ghosts = callPackage ({ cider, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    yesql-ghosts = callPackage ({ cider
+                                , dash
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild
+                                , s }:
+      melpaBuild {
         pname = "yesql-ghosts";
         version = "20150220.437";
         src = fetchFromGitHub {
           owner = "magnars";
           repo = "yesql-ghosts";
-          rev = "8f1faf0137b85a5072d13e1240a463d9a35ce2bb";
-          sha256 = "1fyvvkx6pa41bcr9cyh4yclwdzc5bs742s9fxr6wb4a5scq3hg9m";
+          rev = "416198cdc4f316b0912af5e413410937b9b8432b";
+          sha256 = "0liys4arxias4a0ilssaixml4pvjwk80w93njdxb9f5i8mwwznpj";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3c652657be0f9b9dcb236e01c3abd2fd717190d7/recipes/yesql-ghosts";
           sha256 = "1hxzbnfd15f0ifdqjbw9nhxd0z46x705v2bc0xl71nav78fgpswf";
-          name = "yesql-ghosts";
+          name = "recipe";
         };
         packageRequires = [ cider dash s ];
         meta = {
@@ -78811,8 +98130,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    yoficator = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    yoficator = callPackage ({ fetchFromGitLab
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "yoficator";
         version = "20180129.1252";
         src = fetchFromGitLab {
@@ -78821,10 +98143,10 @@
           rev = "e0dc076cb0d1999cb41585b5f36322681109fe86";
           sha256 = "1vq07ndxrdry26dx3ci4yz1a1qdcr20yznj62y2f0wkyccrai9y9";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5156f01564978718dd99ab3a54f19b6512de5c3c/recipes/yoficator";
           sha256 = "0b6lv6wk5ammhb9rws9kig02wkm84i5avm7a1vd4sb7wkgm9nj9r";
-          name = "yoficator";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -78832,8 +98154,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    yoshi-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    yoshi-theme = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "yoshi-theme";
         version = "20170330.0";
         src = fetchFromGitHub {
@@ -78842,10 +98167,10 @@
           rev = "eab4fb67e8fec47c25c4c1393ac1211f043dbd44";
           sha256 = "01al6pzl9mz04b43a3lwnhdvr5i71qhafz6frl5m9q2k6x1x2n2f";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6e9a549e31c4097ee24b4bff12ec5d20d3beac68/recipes/yoshi-theme";
           sha256 = "1kzdjs3rzg9rxrjgsk0wk75rwvbip6ixg1apcxv2c1a6biqqf2hv";
-          name = "yoshi-theme";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -78853,20 +98178,28 @@
           license = lib.licenses.free;
         };
       }) {};
-    youdao-dictionary = callPackage ({ chinese-word-at-point, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, names, popup, pos-tip }:
-    melpaBuild {
+    youdao-dictionary = callPackage ({ chinese-word-at-point
+                                     , emacs
+                                     , fetchFromGitHub
+                                     , fetchurl
+                                     , lib
+                                     , melpaBuild
+                                     , names
+                                     , popup
+                                     , pos-tip }:
+      melpaBuild {
         pname = "youdao-dictionary";
-        version = "20170226.49";
+        version = "20180713.2114";
         src = fetchFromGitHub {
           owner = "xuchunyang";
           repo = "youdao-dictionary.el";
-          rev = "44548f56a1c736e6a7fae4546657bff0a94bf3cb";
-          sha256 = "1bazpqibydns36d4m6spvhk7vh6l4xz3w4d3jj78xrvcvi2z2rg2";
+          rev = "9496ea3ba8aa999db3dbde88d6aa37f3579d8dea";
+          sha256 = "0kn07ksjdrwl0m1wiac83ljg5drrmyf65gxm4m6r3iz1awd1akbb";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/712bdf83f71c2105754f9b549a889ffc5b7ba565/recipes/youdao-dictionary";
           sha256 = "1qfk7s18br9jask1bpida0cjxks098qpz0ssmw8misi3bjax0fym";
-          name = "youdao-dictionary";
+          name = "recipe";
         };
         packageRequires = [ chinese-word-at-point emacs names popup pos-tip ];
         meta = {
@@ -78874,8 +98207,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    z3-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
-    melpaBuild {
+    z3-mode = callPackage ({ emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , flycheck
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "z3-mode";
         version = "20151120.1455";
         src = fetchFromGitHub {
@@ -78884,10 +98222,10 @@
           rev = "163dc01d59e9880b4dc188d4e1ad84d6c0c852e1";
           sha256 = "1k7m3xk5ksbr2s3ypz5yqafz9sfav1m0qk2jz1xyi3fdaw2j0w2z";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e056fb14b46b97ff31b1db3b8bd31e395a54cd87/recipes/z3-mode";
           sha256 = "183lzhgjj480ca2939za3rlnsbfn24mgi501n66h5wim950v7vgd";
-          name = "z3-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs flycheck ];
         meta = {
@@ -78895,8 +98233,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    zeal-at-point = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    zeal-at-point = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "zeal-at-point";
         version = "20180131.1554";
         src = fetchFromGitHub {
@@ -78905,10 +98246,10 @@
           rev = "0fc3263f44e95acd3e9d91057677621ce4d297ee";
           sha256 = "0aq9w9pjyzdgf63hwffhph6k43vv3cxmffklrjkjj3hqv796k8yd";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4bcb472b6b18b75acd9c68e1fc7ecce4c2a40d8f/recipes/zeal-at-point";
           sha256 = "1cz53plk5bax5azm13y7xz530qcfh0scm0cgrkrgwja2wwlxirnw";
-          name = "zeal-at-point";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -78916,20 +98257,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    zel = callPackage ({ emacs, fetchFromGitHub, fetchurl, frecency, lib, melpaBuild }:
-    melpaBuild {
+    zel = callPackage ({ emacs
+                       , fetchFromGitHub
+                       , fetchurl
+                       , frecency
+                       , lib
+                       , melpaBuild }:
+      melpaBuild {
         pname = "zel";
         version = "20171014.132";
         src = fetchFromGitHub {
           owner = "rudolfochrist";
           repo = "zel";
-          rev = "9dae2d212224d1deae1f62561fa8e4d689fd09f2";
-          sha256 = "1518wp3zjfdvzz5r22cjgn735c4yxr345qzj40b5agww4dsxmwmp";
+          rev = "23b12d107f123667ddd443b9f3e2047209e0055a";
+          sha256 = "1m8bw588r2a1034ynigrzgab857261nrjwnzag5i3rgwn27brfcz";
         };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/b48132eb4c0fd01b9fc31236c5c4701f8f83a806/recipes/zel";
-          sha256 = "14qf83n1wz8hg9wfmbh8b50c5xshc28x1xq6wh4g4lfqbfm7marh";
-          name = "zel";
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/25b445a1dea5e8f1042bed6b5372471c25129fd8/recipes/zel";
+          sha256 = "0fwc1fghsw2rg4fv10kgc9d6rhbq20xa9diqcvp1f1cqs12rfhpd";
+          name = "recipe";
         };
         packageRequires = [ emacs frecency ];
         meta = {
@@ -78937,8 +98283,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    zen-and-art-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    zen-and-art-theme = callPackage ({ fetchFromGitHub
+                                     , fetchurl
+                                     , lib
+                                     , melpaBuild }:
+      melpaBuild {
         pname = "zen-and-art-theme";
         version = "20120622.737";
         src = fetchFromGitHub {
@@ -78947,10 +98296,10 @@
           rev = "a7226cbce0bca2501d69a620cb2aeabfc396c232";
           sha256 = "0dnaxhsw549k54j0mgydm7qbl4pizgipfyzc15f9afsxa107rpnl";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/692cfa0e9edbc1b7114e2ae2f36bef34b20ad17c/recipes/zen-and-art-theme";
           sha256 = "0b2lflji955z90xl9iz2y1vm04yljghbw4948gh5vv5p7mwibgf2";
-          name = "zen-and-art-theme";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -78958,20 +98307,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    zenburn-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    zenburn-theme = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "zenburn-theme";
-        version = "20180222.1757";
+        version = "20180531.902";
         src = fetchFromGitHub {
           owner = "bbatsov";
           repo = "zenburn-emacs";
-          rev = "af752f46306eb710158904b89c1bf0d6786d0a4d";
-          sha256 = "0w3s3c1h7s5j02h7jgbnnh85cx1cmqb5jd8w6fgsp4jna6wn5627";
+          rev = "eea429cb2cbde8674b2a17ccc2bda94b54575c01";
+          sha256 = "12nyjxvlvr1m7wrkfv7l4w16h8n66ssw2mvwcl4b7xbx4d45x1da";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/zenburn-theme";
           sha256 = "1kb371j9aissj0vy07jw4ydfn554blc8b2rbi0x1dvfksr2rhsn9";
-          name = "zenburn-theme";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -78979,8 +98331,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    zencoding-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    zencoding-mode = callPackage ({ fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "zencoding-mode";
         version = "20140213.22";
         src = fetchFromGitHub {
@@ -78989,10 +98344,10 @@
           rev = "58e42af182c98cb9941d27cd042d227fbf4e146c";
           sha256 = "1y3wj15kfbgskl29glmba6lzq43rcm141p4i5s180aqcw7ydp5vr";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e7f2ebb9d860aa4f0797cdaadaa35fb3f5c4460b/recipes/zencoding-mode";
           sha256 = "1fclad1dyngyg9ncfkcqfxybvy8482i2bd409cgxi9y4h1wc7ws7";
-          name = "zencoding-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -79000,19 +98355,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    zenity-color-picker = callPackage ({ emacs, fetchgit, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    zenity-color-picker = callPackage ({ emacs
+                                       , fetchgit
+                                       , fetchurl
+                                       , lib
+                                       , melpaBuild }:
+      melpaBuild {
         pname = "zenity-color-picker";
         version = "20160302.354";
         src = fetchgit {
           url = "https://bitbucket.org/Soft/zenity-color-picker.el";
-          rev = "4f4f46676a461ebc881487fb70c8c181e323db5e";
-          sha256 = "14i2k52qz77dv04w39fyp9hfq983fwa3803anqragk608xgwpf4s";
+          rev = "bdece51052ef7037e0a3481fc1f487939f57777e";
+          sha256 = "12s2zw99q1zn3a1rn5i27mp506nhqh23v3df5inzfsq1b3dji2bl";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8b4c6b03c5ff78ce327dcf66b175e266bbc53dbf/recipes/zenity-color-picker";
           sha256 = "0rim1mbhlb2lj302c58rs5l7bd168nxg1jpir6cbpf8rp0k35ldb";
-          name = "zenity-color-picker";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -79020,20 +98379,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    zephir-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }:
-    melpaBuild {
+    zephir-mode = callPackage ({ cl-lib ? null
+                               , emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild
+                               , pkg-info }:
+      melpaBuild {
         pname = "zephir-mode";
         version = "20170917.2125";
         src = fetchFromGitHub {
           owner = "sergeyklay";
           repo = "zephir-mode";
-          rev = "c2c6b7451667e68e29c353616f54ef9195c3fffd";
-          sha256 = "1h5iv0ggh4jzv180mg8lz72d91b6kcqwy6ypgy3rn50bk6pz06kg";
+          rev = "1e0c287a0928ce2d5bce7399ee12be051a4c78a3";
+          sha256 = "05p237h79x6li9vckavxd38zv4rm5zhl3d47gj1sjg454q7qba33";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5bd901c93ce7f64de6082e801327adbd18fd4517/recipes/zephir-mode";
           sha256 = "0nxm6w7z89q2vvf3bp1p6hb6f2axv9ha85jyiv4k02l46sjprf4j";
-          name = "zephir-mode";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs pkg-info ];
         meta = {
@@ -79041,20 +98406,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    zerodark-theme = callPackage ({ all-the-icons, fetchFromGitHub, fetchurl, flycheck, lib, magit, melpaBuild }:
-    melpaBuild {
+    zerodark-theme = callPackage ({ all-the-icons
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , flycheck
+                                  , lib
+                                  , magit
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "zerodark-theme";
-        version = "20180308.957";
+        version = "20180528.26";
         src = fetchFromGitHub {
           owner = "NicolasPetton";
           repo = "zerodark-theme";
-          rev = "2a240de8cd89c741612d807a521d6b3e51088324";
-          sha256 = "10r806hzmgwnysjgg5lx252ychnhyma1bpwm980pf46vlywws5a0";
+          rev = "876cafc58a54c567456c4823f8c16edce94ba3ac";
+          sha256 = "1g03d1sd1v91f2i66v4m02jy487r9dczif4rnrrwpi5j2iq0ycqx";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d00b78ead693e844e35c760fe2c39b8ed6cb0d81/recipes/zerodark-theme";
           sha256 = "1nqzswmnq6h0av4rivqm237h7ghp7asa2nvls7nz4ma467p9qhp9";
-          name = "zerodark-theme";
+          name = "recipe";
         };
         packageRequires = [ all-the-icons flycheck magit ];
         meta = {
@@ -79062,8 +98433,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    zig-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    zig-mode = callPackage ({ emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "zig-mode";
         version = "20180309.1458";
         src = fetchFromGitHub {
@@ -79072,10 +98447,10 @@
           rev = "4f281e4748a4eae64efaa98d9dfd9b7c163fbed8";
           sha256 = "0pip0kgbxh4cf60j2kzgb9lvrm5vksg83mllk1pcs9mkbxdgjyww";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5cba49d25ebbaa9240d5d87d0c7ca48d928b2e4b/recipes/zig-mode";
           sha256 = "005lsgnsaj8rjkzbhi23g99xy9zln4ggkad11xqmn4xa6g199wly";
-          name = "zig-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -79083,8 +98458,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    zlc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    zlc = callPackage ({ fetchFromGitHub
+                       , fetchurl
+                       , lib
+                       , melpaBuild }:
+      melpaBuild {
         pname = "zlc";
         version = "20151010.1857";
         src = fetchFromGitHub {
@@ -79093,10 +98471,10 @@
           rev = "4dd2ba267ecdeac845a7cbb3147294ee7daa25f4";
           sha256 = "1gb51bqdf87yibs1zngk6q090p05293cpwlwbwzhnih9sl6wkq8x";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/zlc";
           sha256 = "0qw0qf14l09mcnw7h0ccbw17psfpra76qfawkc10zpdb5a2167d0";
-          name = "zlc";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -79104,8 +98482,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    znc = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    znc = callPackage ({ cl-lib ? null
+                       , fetchFromGitHub
+                       , fetchurl
+                       , lib
+                       , melpaBuild }:
+      melpaBuild {
         pname = "znc";
         version = "20160627.1332";
         src = fetchFromGitHub {
@@ -79114,10 +98496,10 @@
           rev = "ce468d185e4a949c45fdd7586313144bc69d4fe5";
           sha256 = "0jh11lbzsndsz9i143av7510417nzwy4j3mmpq7cjixfbmnxdq06";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/znc";
           sha256 = "1017dlzbpb3ww0zb370bgsdrzr4kcc72ddby9j63d95chz2jg0hb";
-          name = "znc";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -79125,8 +98507,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    zombie = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    zombie = callPackage ({ fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "zombie";
         version = "20141222.816";
         src = fetchFromGitHub {
@@ -79135,10 +98520,10 @@
           rev = "ff8cd1b4cdbb4b0b9b8fd1ec8f6fb93eba249345";
           sha256 = "1gm3ly6czbw4vrxcslm50jy6nxf2qsl656cjwbyhw251wppn75cg";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0da12385908c0e2ecd087ea7572fedf0a2dcf03f/recipes/zombie";
           sha256 = "0ji3nsxwbxmmygd6plpbc1lkw6i5zw4y6x3r5n2ah3ds4vjr7cnv";
-          name = "zombie";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -79146,20 +98531,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    zombie-trellys-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, haskell-mode, lib, melpaBuild }:
-    melpaBuild {
+    zombie-trellys-mode = callPackage ({ cl-lib ? null
+                                       , emacs
+                                       , fetchFromGitHub
+                                       , fetchurl
+                                       , haskell-mode
+                                       , lib
+                                       , melpaBuild }:
+      melpaBuild {
         pname = "zombie-trellys-mode";
         version = "20150304.648";
         src = fetchFromGitHub {
           owner = "david-christiansen";
           repo = "zombie-trellys-mode";
-          rev = "7f0c45fdda3a44c3b6d1762d116abb1421b8fba2";
-          sha256 = "04m53hzk5n9vxh0gxi8jzpdhsdjlxnvz7hmsisr3bs99v603ha01";
+          rev = "03b8d3635f65dbf38f9a19b5d1a8dfdcb38ba423";
+          sha256 = "0rp615k41v5v9m9g3ydyzgwr6a7wqrmsdkz3pc2frl1zij8jpjm4";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e66db80ab82a69542688cd57c9e0ec10e6616c87/recipes/zombie-trellys-mode";
           sha256 = "19xzvppw7f35s82hm0y7sga8dyjjyy0dxy6vji4hxdpjziz7lggv";
-          name = "zombie-trellys-mode";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs haskell-mode ];
         meta = {
@@ -79167,8 +98558,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    zone-nyan = callPackage ({ esxml, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    zone-nyan = callPackage ({ esxml
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "zone-nyan";
         version = "20170818.944";
         src = fetchFromGitHub {
@@ -79177,10 +98572,10 @@
           rev = "4b1f8d95f130946718d52806489ffe2762aebfdc";
           sha256 = "1axq4ch7garlfrybq9kgv6x7d8y4dw5y9pqbqlqvlwf4xmdrvzmm";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/zone-nyan";
           sha256 = "1g7i5p26gb9gny64b84x6zqml7fly5q9aykmc6l6c1kfl6pqxs94";
-          name = "zone-nyan";
+          name = "recipe";
         };
         packageRequires = [ esxml ];
         meta = {
@@ -79188,8 +98583,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    zone-rainbow = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    zone-rainbow = callPackage ({ emacs
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "zone-rainbow";
         version = "20160120.534";
         src = fetchFromGitHub {
@@ -79198,10 +98597,10 @@
           rev = "2ba4f1a87c69c4712124ebf12c1f3ea171e1af36";
           sha256 = "0w550l9im3mhxhja1b7cr9phdcbvx5lprw551lj0d1lv7qvjasz0";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c8f678d32c8cd1bcc8ec042e7e68ca3a5259da65/recipes/zone-rainbow";
           sha256 = "0l51fmhvx9vsxbs62cbjgqphb691397f651nqin7cj3dfvchzh4j";
-          name = "zone-rainbow";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -79209,8 +98608,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    zone-select = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    zone-select = callPackage ({ dash
+                               , emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "zone-select";
         version = "20160118.619";
         src = fetchFromGitHub {
@@ -79219,10 +98623,10 @@
           rev = "bf30da12f1625fe6563448fccf3c506acad10af7";
           sha256 = "17mrzf85ym0x5ih4l6sjdjlcmviabf8c8rpvpkd90gp9qxd8pyx1";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ecad1475d9a04ddd84f86ed950f742f68bcf71f8/recipes/zone-select";
           sha256 = "05kc211invmy4ajwf71vgr2b7bdgn99c4a26m95gcjqgy3sh5xzz";
-          name = "zone-select";
+          name = "recipe";
         };
         packageRequires = [ dash emacs ];
         meta = {
@@ -79230,20 +98634,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    zone-sl = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    zone-sl = callPackage ({ emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "zone-sl";
         version = "20160201.410";
         src = fetchFromGitHub {
           owner = "kawabata";
           repo = "zone-sl";
-          rev = "7ec22e3661c6348382f9fc39a9d0063dbd2352ff";
+          rev = "737b21b4b35c28a487ad8a31598e745bc183b209";
           sha256 = "0m1q45pza61j0fp8cxkgmds5fyjrk0nqpwhg8m91610m3pvyc3ap";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/11c976519e0cb320e48f40f4d735e557b3dfc1b9/recipes/zone-sl";
           sha256 = "04rwd6vj3abk3bzhq3swxwcq5da2n9cldrcmvnqgjr975np4cgs3";
-          name = "zone-sl";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -79251,20 +98659,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    zoom = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    zoom = callPackage ({ emacs
+                        , fetchFromGitHub
+                        , fetchurl
+                        , lib
+                        , melpaBuild }:
+      melpaBuild {
         pname = "zoom";
         version = "20180310.421";
         src = fetchFromGitHub {
           owner = "cyrus-and";
           repo = "zoom";
-          rev = "a72714bb14eb32c1c5e7ad1cb4bdeb208450e507";
-          sha256 = "176fbhsh2rk6rn8fisfq4ja71lqvf1zbb393wzfsgg68df39mqyh";
+          rev = "c97ffaf6d0032007f13974b4d542558f9d686e39";
+          sha256 = "0jfz9z6g1zf2jmw5sinnnwnd6z0q8qrgj337f8d2g7mchy85l6fv";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe094c99756ad29eda9bc51f31bb70c4ddc4131/recipes/zoom";
           sha256 = "09bk0nnfj72an2b3rravd6qp21gdgcm1m55qnf2r8rzbgqymq5ls";
-          name = "zoom";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -79272,8 +98684,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    zoom-window = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    zoom-window = callPackage ({ emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "zoom-window";
         version = "20170302.27";
         src = fetchFromGitHub {
@@ -79282,10 +98698,10 @@
           rev = "cd6ecc103fc30b171bda7daf1f44a550854d0dbf";
           sha256 = "1rfhdzwyag32s15ysmf75976nvkx995581afaa4ychj45vwnaqfm";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8a55cc66cc0deb1c24023f638b8e920c9d975859/recipes/zoom-window";
           sha256 = "0l9683nk2bdm49likk9c55c23qfy6f1pn04drqwd1vhpanz4l4b3";
-          name = "zoom-window";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -79293,8 +98709,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    zop-to-char = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    zop-to-char = callPackage ({ cl-lib ? null
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "zop-to-char";
         version = "20160212.754";
         src = fetchFromGitHub {
@@ -79303,10 +98723,10 @@
           rev = "816ea90337db0545a2f0a5079f4d7b3a2822af7d";
           sha256 = "14waf3g7b92k3qd5088w4pn0wcspxjfkbswlzf7nnkjliw1yh0kf";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b0a9277f1a5f1aef8886e739c73dea91d3f81dc5/recipes/zop-to-char";
           sha256 = "0jnspvqqvnaplld083j7cqqxw122qazh88ab7hymci36m3ka9hga";
-          name = "zop-to-char";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -79314,20 +98734,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    zossima = callPackage ({ fetchFromGitHub, fetchurl, inf-ruby, lib, melpaBuild }:
-    melpaBuild {
+    zossima = callPackage ({ fetchFromGitHub
+                           , fetchurl
+                           , inf-ruby
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "zossima";
         version = "20121123.1635";
         src = fetchFromGitHub {
           owner = "technomancy";
           repo = "zossima";
-          rev = "991676635c374d2a12714dcf48c1ce2d6f97a375";
-          sha256 = "0fgwxw7r3zfv0b7xi8bx7kxff2r5hdw9gxf16kwq04fnh18nhi39";
+          rev = "0b3f17c77bc1791687cdb4e15c889f774f9e2c0f";
+          sha256 = "11ygifz67zyrqqqmjs5xrrch796n2na4c9g1mrpdspf7ndiqjbw2";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b7566fe6fffc38981ea33582d783c58f3842fe28/recipes/zossima";
           sha256 = "11kmnbqv4s8arindg7cxcdhbvfxsckks332wn7aiyb3bjhcgzwjb";
-          name = "zossima";
+          name = "recipe";
         };
         packageRequires = [ inf-ruby ];
         meta = {
@@ -79335,8 +98759,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    zotelo = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    zotelo = callPackage ({ cl-lib ? null
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "zotelo";
         version = "20160602.249";
         src = fetchFromGitHub {
@@ -79345,10 +98773,10 @@
           rev = "d9dc089b9adfcc70a63f2a84269a12eb7cb4c748";
           sha256 = "1gff44nwiqhqhppwmsn38njkph4g9bw669p95m8p2avb7x7kiybl";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/zotelo";
           sha256 = "0y6s5ma7633h5pf9zj7vkazidlf211va7nk47ppb1q0iyfkyln36";
-          name = "zotelo";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -79356,20 +98784,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    zotxt = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild, request-deferred }:
-    melpaBuild {
+    zotxt = callPackage ({ fetchFromGitLab
+                         , fetchurl
+                         , lib
+                         , melpaBuild
+                         , request-deferred }:
+      melpaBuild {
         pname = "zotxt";
-        version = "20180218.1053";
+        version = "20180517.1847";
         src = fetchFromGitLab {
           owner = "egh";
           repo = "zotxt-emacs";
-          rev = "5b3715bab55c9f17f134a8fada5b68c07aa66cad";
-          sha256 = "1hz1m4190yi6knz3y088ql8wy3pmsl8lsznqby2vpnn9p74fvl37";
+          rev = "23a4a9f74a658222027d53a9a83cd4bcc583ca8b";
+          sha256 = "09fq3w9yk9kn6bz7y9kgpiw612dvj3yzsdk734js6zgb0p8lfd2c";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b633453e77a719f6b6b6564e66c1c1260db38aa6/recipes/zotxt";
           sha256 = "18jla05g2k8zfrmp7q9kpr1mpw6smxzdyn8nfghm306wvv9ff8y5";
-          name = "zotxt";
+          name = "recipe";
         };
         packageRequires = [ request-deferred ];
         meta = {
@@ -79377,8 +98809,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    zoutline = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    zoutline = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "zoutline";
         version = "20180314.1059";
         src = fetchFromGitHub {
@@ -79387,10 +98822,10 @@
           rev = "b3ee0f0e0b916838c2d2c249beba74ffdb8d5699";
           sha256 = "0sd0017piw0dis6dhpq5dkqd3acisxqgipl7dj8gmc1vnswhdwr8";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4a26341f491145938aee9b531cd861200bfa2f6d/recipes/zoutline";
           sha256 = "1yyww84b58ymbx0w1gkgd0csr0cwlghdmnxk0jbzwc45g9g42k1m";
-          name = "zoutline";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -79398,19 +98833,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    zpresent = callPackage ({ dash, emacs, fetchhg, fetchurl, lib, melpaBuild, org-parser, request }:
-    melpaBuild {
+    zpresent = callPackage ({ dash
+                            , emacs
+                            , fetchhg
+                            , fetchurl
+                            , lib
+                            , melpaBuild
+                            , org-parser
+                            , request }:
+      melpaBuild {
         pname = "zpresent";
-        version = "20180224.2212";
+        version = "20180604.2138";
         src = fetchhg {
           url = "https://bitbucket.com/zck/zpresent.el";
-          rev = "e2e34c061ff5";
-          sha256 = "00rj8lgp5b856csvlrin1vwas1109nmywbrnpny4qck4yghv6zqb";
+          rev = "55fc14b66e2e";
+          sha256 = "17wkhl1a7jmg4ks011lf5h4f2vbhf8dl6vgzdzlmljk15f9hmw35";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3aae38ad54490fa650c832fb7d22e2c73b0fb060/recipes/zpresent";
           sha256 = "0316qyspmdbg94aw620133ilh8kfpr3db1p2cifgccgcacjv3v5j";
-          name = "zpresent";
+          name = "recipe";
         };
         packageRequires = [ dash emacs org-parser request ];
         meta = {
@@ -79418,20 +98860,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    ztree = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ztree = callPackage ({ cl-lib ? null
+                         , fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "ztree";
-        version = "20180409.1322";
+        version = "20180512.1150";
         src = fetchFromGitHub {
           owner = "fourier";
           repo = "ztree";
-          rev = "487957664cedc61d70feccc881092eef6746977b";
-          sha256 = "1hvqx1dfh253iin59j9i1x85xfnhljgwsrvn9pq3lxfvy82zjlc0";
+          rev = "50412fa553fb68fcd7218cc44cf66b5342ab6889";
+          sha256 = "00s3sa90yi6q0260ziqqmx00xl0nnf46mwcl8fbr5mdw14hvk9dl";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f151e057c05407748991f23c021e94c178b87248/recipes/ztree";
           sha256 = "1fk5xz8qq3azc66f954x5qvym94xnv4fg6wy83ihdfwycsas7j20";
-          name = "ztree";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -79439,20 +98885,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    zweilight-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    zweilight-theme = callPackage ({ fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "zweilight-theme";
         version = "20170112.2205";
         src = fetchFromGitHub {
           owner = "philiparvidsson";
           repo = "emacs-zweilight-theme";
-          rev = "7f45ab9e23164d65538edb2beb9692ecdc24c31e";
-          sha256 = "142ixk47a1x6xz8ibavzq7jxppjc2qvfwbly4sdyiwfpznbi4l3a";
+          rev = "890f27c939d8a358c9ef0f402fc3314f475ec874";
+          sha256 = "0pl254c61405n6sgr01qj4z42vqdvbmf59nz55cl23l2q7kdbfdv";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/37422e259ada59122e1b4a31a4ae4dc00be797b9/recipes/zweilight-theme";
           sha256 = "1ykhnyiv5jvn34178mzg2cy6ynvc7jild6zwdqwr3qay87zffmjf";
-          name = "zweilight-theme";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -79460,8 +98909,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    zygospore = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    zygospore = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "zygospore";
         version = "20140703.152";
         src = fetchFromGitHub {
@@ -79470,10 +98922,10 @@
           rev = "1af5ee663f5a7aa08d96a77cacff834dcdf55ea8";
           sha256 = "0v73fgb0gf81vlihiicy32v6x86rr2hv0bxlpw7d3pk4ng1a0l3z";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/zygospore";
           sha256 = "0n9qs6fymdjly0i4rmx87y8gapfn5sqivsivcffi42vcb5f17kxj";
-          name = "zygospore";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -79481,20 +98933,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    zzz-to-char = callPackage ({ avy, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    zzz-to-char = callPackage ({ avy
+                               , cl-lib ? null
+                               , emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "zzz-to-char";
         version = "20171231.2219";
         src = fetchFromGitHub {
           owner = "mrkkrp";
           repo = "zzz-to-char";
-          rev = "db8d9e660ad18a15159779efe34d7a98ef0df535";
-          sha256 = "1wlzlhabq75iqrhg9p2xx8l7rnfzpcjjflxmgyhaxhq188bwrqk6";
+          rev = "8ddda49de3356d8fa0308d79b5d68272baf2c57b";
+          sha256 = "17d8mmmgj2w4nm2nfg12g35i7zbp4bp47ix5ifqqm1zvwmbmzrqx";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7063cbc1f1501ce81552d7ef1d42d1309f547c42/recipes/zzz-to-char";
           sha256 = "16vwp0krshmn5x3ry1j512g4kydx39znjqzri4j7wgg49bz1n7vh";
-          name = "zzz-to-char";
+          name = "recipe";
         };
         packageRequires = [ avy cl-lib emacs ];
         meta = {
@@ -79502,4 +98960,4 @@
           license = lib.licenses.free;
         };
       }) {};
-  }
\ No newline at end of file
+  }
diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
index ff9967e51b3..6e2a71c4311 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
@@ -1,6 +1,10 @@
-{ callPackage }: {
-    _0blayout = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+{ callPackage }:
+  {
+    _0blayout = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "_0blayout";
         version = "1.0.2";
         src = fetchFromGitHub {
@@ -9,10 +13,10 @@
           rev = "b8bb44b5336965b5519b9a826a0f46f8ee31c471";
           sha256 = "1apv5zd3zzni2llj9is7h2bzq1xxbx67kr7c07dfjd26n7l0zvfi";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6521ec44ae8b0ba2e0523517f0f3d5b94ddbe1be/recipes/0blayout";
           sha256 = "027k85h34998i8vmbg2hi4q1m4f7jfva5jm38k0g9m1db700gk92";
-          name = "_0blayout";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -20,20 +24,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    a = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    a = callPackage ({ emacs
+                     , fetchFromGitHub
+                     , fetchurl
+                     , lib
+                     , melpaBuild }:
+      melpaBuild {
         pname = "a";
-        version = "0.1.0alpha4";
+        version = "0.1.0.-3.4";
         src = fetchFromGitHub {
           owner = "plexus";
           repo = "a.el";
           rev = "3af0122abac723f0d3dc21ee50eeb81afa26d361";
           sha256 = "0grwpy4ssmn2m8aihfkxb7ifl7ql2hgicw16wzl0crpy5fndh1mp";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a226f1d81cd1ae81b91c1102fbe40aac2eddcaa8/recipes/a";
           sha256 = "1xqja47iw1c78kiv4854z47iblvvzrc1l35zjdhmhkh9hh10z886";
-          name = "a";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -41,8 +49,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    aa-edit-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, navi2ch }:
-    melpaBuild {
+    aa-edit-mode = callPackage ({ emacs
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild
+                                , navi2ch }:
+      melpaBuild {
         pname = "aa-edit-mode";
         version = "0.0.2";
         src = fetchFromGitHub {
@@ -51,10 +64,10 @@
           rev = "2e56f3b627f0f19fbfce4968180b4d736f7afb5d";
           sha256 = "1rh9n97z1vi7w60qzam5vc025wwm346fgzym2zs1cm7ykyfh3mgd";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/20d00f782f2db87264c7fb1aac7455e44b8b24e7/recipes/aa-edit-mode";
           sha256 = "00b99ik04xx4b2a1cm1z8dl42hjnb5r32qypjyyx8924n1dhxzgn";
-          name = "aa-edit-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs navi2ch ];
         meta = {
@@ -62,8 +75,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    abc-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    abc-mode = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "abc-mode";
         version = "20140225.944";
         src = fetchFromGitHub {
@@ -72,10 +88,10 @@
           rev = "6b5ab7402287dab5a091e94fec9982dc45d9d287";
           sha256 = "13f4l9xzx4xm5m80kkb49zh31w0bn0kw9m5ca28rrx4aysqmwryv";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/aaee9dc5de06747374f311d86a550d3cc15beed1/recipes/abc-mode";
           sha256 = "0qf5lbszyscmagiqhc0d05vzkhdky7ini4w33z1h3j5417sscrcx";
-          name = "abc-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -83,8 +99,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    abyss-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    abyss-theme = callPackage ({ emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "abyss-theme";
         version = "0.7";
         src = fetchFromGitHub {
@@ -93,10 +113,10 @@
           rev = "18791c6e8d9cc2b4815c9f08627a2e94fc0eeb14";
           sha256 = "07z0djv7h3yrv4iw9n633j6dxzxb4nnzijsqkmz22ik6fbwxg5mh";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f390e5153b6360a27abc74983f5fef11226634f3/recipes/abyss-theme";
           sha256 = "0ckrgfd7fjls6g510v8fqpkd0fd18lr0spg3lf5s88gky8ihdg6c";
-          name = "abyss-theme";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -104,20 +124,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    ac-alchemist = callPackage ({ alchemist, auto-complete, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ac-alchemist = callPackage ({ alchemist
+                                , auto-complete
+                                , cl-lib ? null
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "ac-alchemist";
         version = "0.1";
         src = fetchFromGitHub {
           owner = "syohex";
           repo = "emacs-ac-alchemist";
-          rev = "31114f3e1e7cc1e101d0b81819d7876d8861df92";
-          sha256 = "0a8widshsm39cbala17pmnk1sazazhhyqppwalysli170whk49c5";
+          rev = "b1496f6c7f968725076341d3797fe33fb2d36e39";
+          sha256 = "06d6yhknrq1wqdg3ykkswsb515bvhkz23gbclws9lmqslns7g1jf";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ef9037aa41a8d9467838495bb235db32c19cc417/recipes/ac-alchemist";
           sha256 = "02ll3hcixgdb8zyszn78714gy1h2q0vkhpbnwap9302mr2racwl0";
-          name = "ac-alchemist";
+          name = "recipe";
         };
         packageRequires = [ alchemist auto-complete cl-lib ];
         meta = {
@@ -125,8 +151,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    ac-capf = callPackage ({ auto-complete, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ac-capf = callPackage ({ auto-complete
+                           , cl-lib ? null
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "ac-capf";
         version = "0.1";
         src = fetchFromGitHub {
@@ -135,10 +166,10 @@
           rev = "17571dba0a8f98111f2ab758e9bea285b263781b";
           sha256 = "0nyq34yq4jcp3p30ygma3iz1h0q551p33792byj76pa5ps09g1da";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/929da263f57b904c50f5f17b09d4c4b480999c97/recipes/ac-capf";
           sha256 = "1drgk5iz2wp3rxzd39pj0n4cfmm5z8zqlp50jw5z7ffbbg35qxbm";
-          name = "ac-capf";
+          name = "recipe";
         };
         packageRequires = [ auto-complete cl-lib ];
         meta = {
@@ -146,8 +177,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    ac-cider = callPackage ({ auto-complete, cider, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ac-cider = callPackage ({ auto-complete
+                            , cider
+                            , cl-lib ? null
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "ac-cider";
         version = "0.2.3";
         src = fetchFromGitHub {
@@ -156,10 +193,10 @@
           rev = "4be034e5f82421b0a836ec7ff45815c67caffcee";
           sha256 = "12s7wy7fyk5z9q287j871gcsrvj90f4c81h39p66d99jw0cl93qj";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e8adefaf2e284ef91baec3dbd3e10c868de69926/recipes/ac-cider";
           sha256 = "1dszpb706h34miq2bxqyq1ycbran5ax36vcniwp8vvhgcjsw5sz6";
-          name = "ac-cider";
+          name = "recipe";
         };
         packageRequires = [ auto-complete cider cl-lib ];
         meta = {
@@ -167,20 +204,28 @@
           license = lib.licenses.free;
         };
       }) {};
-    ac-clang = callPackage ({ auto-complete, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pos-tip, yasnippet }:
-    melpaBuild {
+    ac-clang = callPackage ({ auto-complete
+                            , cl-lib ? null
+                            , emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild
+                            , pos-tip
+                            , yasnippet }:
+      melpaBuild {
         pname = "ac-clang";
-        version = "2.1.0";
+        version = "2.1.3";
         src = fetchFromGitHub {
           owner = "yaruopooner";
           repo = "ac-clang";
-          rev = "daddbea033d3c6f934e5043cc2fff8eca3b6e5f7";
-          sha256 = "1hp3xpv0kwmilfivif2smbbgknjyk8kcgp399dghdcq71qsxz3wr";
+          rev = "3294b968eb1a8317049190940193f9da47c085ef";
+          sha256 = "160hda911vsc2zcs56560cpv7kj0966vjzwmc0md6fkz3wrj7w0n";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ffe0485048b85825f5e8ba95917d8c9dc64fe5de/recipes/ac-clang";
           sha256 = "070s06xhkzaqfc3j8c4i44rks6gn8z66lwd54j17p8d91x3qjpr4";
-          name = "ac-clang";
+          name = "recipe";
         };
         packageRequires = [ auto-complete cl-lib emacs pos-tip yasnippet ];
         meta = {
@@ -188,8 +233,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    ac-dcd = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, flycheck-dmd-dub, lib, melpaBuild }:
-    melpaBuild {
+    ac-dcd = callPackage ({ auto-complete
+                          , fetchFromGitHub
+                          , fetchurl
+                          , flycheck-dmd-dub
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "ac-dcd";
         version = "0.4";
         src = fetchFromGitHub {
@@ -198,10 +248,10 @@
           rev = "4cb14b1e9fcfc4bf4a084765bc1eb10abfbbbd49";
           sha256 = "0a3s880nswc2s6yh2v5zsmws550q917i7av8nrxc5sp1d03xqwmn";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/64142a4b14531409f45f02a8053ed8948f48221d/recipes/ac-dcd";
           sha256 = "086jp9c6bilc361n1hscza3pbhgvqlq944z7cil2jm1kicsf8s7r";
-          name = "ac-dcd";
+          name = "recipe";
         };
         packageRequires = [ auto-complete flycheck-dmd-dub ];
         meta = {
@@ -209,20 +259,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    ac-emacs-eclim = callPackage ({ auto-complete, eclim, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ac-emacs-eclim = callPackage ({ auto-complete
+                                  , eclim
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "ac-emacs-eclim";
         version = "0.4";
         src = fetchFromGitHub {
           owner = "emacs-eclim";
           repo = "emacs-eclim";
-          rev = "8203fbf8544e65324a948a67718f7a16ba2d52e6";
-          sha256 = "10bbbxhvlwm526g1wib1f87grnayirlg8jbsvmpzxr9nmdjgikz3";
+          rev = "94508ebd071ff1052d68a20f7f1bf1038439fe43";
+          sha256 = "0l72zw93wv8ncn98d6ybnykhi3a60bc0kyx6z699wfhnnhhxhl0p";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1e9d3075587fbd9ca188535fd945a7dc451c6d7e/recipes/ac-emacs-eclim";
           sha256 = "0bkh7x6zj5drdvm9ji4vwqdxv7limd9a1idy8lsg0lcca3rjq3s5";
-          name = "ac-emacs-eclim";
+          name = "recipe";
         };
         packageRequires = [ auto-complete eclim ];
         meta = {
@@ -230,8 +285,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    ac-emoji = callPackage ({ auto-complete, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ac-emoji = callPackage ({ auto-complete
+                            , cl-lib ? null
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "ac-emoji";
         version = "0.2";
         src = fetchFromGitHub {
@@ -240,10 +300,10 @@
           rev = "53677f754929ead403ccde64b714ebb6b8fc808e";
           sha256 = "0cc3jpc4pihbyznyzvf6i3xwc2x78gb5m36ba9gkvxhabsljnlfg";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/15f591f9cba367b071046fef5ae01bbbd0475ce3/recipes/ac-emoji";
           sha256 = "0msh3dh89jzk6hxva34gp9d5pazchgdknxjbi72z26rss9bkp1mw";
-          name = "ac-emoji";
+          name = "recipe";
         };
         packageRequires = [ auto-complete cl-lib ];
         meta = {
@@ -251,8 +311,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    ac-etags = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ac-etags = callPackage ({ auto-complete
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "ac-etags";
         version = "0.6";
         src = fetchFromGitHub {
@@ -261,10 +325,10 @@
           rev = "8cd188b2e4908285ba8178bbd18a555edd7282e8";
           sha256 = "0ijni3qgd68jhznhirhgcl59cr7hwfvbwgf6z120x56jmp8h01d2";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fda9c7def8bc54af4ab17dc049dd94324c8f10fa/recipes/ac-etags";
           sha256 = "0ag49k9izrs4ikzac9lifvvwhcn5n89lr2vb20pngsvg1czdyhzb";
-          name = "ac-etags";
+          name = "recipe";
         };
         packageRequires = [ auto-complete ];
         meta = {
@@ -272,8 +336,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    ac-geiser = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, geiser, lib, melpaBuild }:
-    melpaBuild {
+    ac-geiser = callPackage ({ auto-complete
+                             , fetchFromGitHub
+                             , fetchurl
+                             , geiser
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "ac-geiser";
         version = "0.1";
         src = fetchFromGitHub {
@@ -282,10 +351,10 @@
           rev = "0e2e36532336f27e3dc3b01fff55ad1a4329817d";
           sha256 = "02ifz25rq64z0ifxs52aqdz0iz4mi6xvj88hcn3aakkmsj749vvn";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/586ef409e3ae758b459b625d4bf0108f0525a085/recipes/ac-geiser";
           sha256 = "0v558qz1mp8b1bgk8kgdk5sx5mpd353mw77n5b0pw4b2ikzpz2mx";
-          name = "ac-geiser";
+          name = "recipe";
         };
         packageRequires = [ auto-complete geiser ];
         meta = {
@@ -293,8 +362,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    ac-haskell-process = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, haskell-mode, lib, melpaBuild }:
-    melpaBuild {
+    ac-haskell-process = callPackage ({ auto-complete
+                                      , fetchFromGitHub
+                                      , fetchurl
+                                      , haskell-mode
+                                      , lib
+                                      , melpaBuild }:
+      melpaBuild {
         pname = "ac-haskell-process";
         version = "0.7";
         src = fetchFromGitHub {
@@ -303,10 +377,10 @@
           rev = "0362d4323511107ec70e7165cb612f3ab01b712f";
           sha256 = "0m33v9iy3y37sicfmpx7kvmn8v1a8k6cs7d0v9v5k93p4d5ila41";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/98bd259b6bfd9b49a8ae421807a4ab3821f09608/recipes/ac-haskell-process";
           sha256 = "0kv4z850kv03wiax1flnrp6sgqja25j23l719w7rkr7ck110q8rw";
-          name = "ac-haskell-process";
+          name = "recipe";
         };
         packageRequires = [ auto-complete haskell-mode ];
         meta = {
@@ -314,8 +388,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    ac-helm = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, popup }:
-    melpaBuild {
+    ac-helm = callPackage ({ auto-complete
+                           , fetchFromGitHub
+                           , fetchurl
+                           , helm
+                           , lib
+                           , melpaBuild
+                           , popup }:
+      melpaBuild {
         pname = "ac-helm";
         version = "2.1";
         src = fetchFromGitHub {
@@ -324,10 +404,10 @@
           rev = "f2110576b0eb35850a7f638c1a991a9fa0c8da3a";
           sha256 = "1gw38phyaslpql7szvlpwgyfngdgd21f6lq406vq0gjwwmxgig34";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/50427d365c79aff84ac759d19ce177b4f7ed2751/recipes/ac-helm";
           sha256 = "16ajxlhcah5zbvywpc6l4l1arr308gjpgvdx6l1nrv2zvpckhlwq";
-          name = "ac-helm";
+          name = "recipe";
         };
         packageRequires = [ auto-complete helm popup ];
         meta = {
@@ -335,8 +415,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    ac-html = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild, web-completion-data }:
-    melpaBuild {
+    ac-html = callPackage ({ auto-complete
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild
+                           , web-completion-data }:
+      melpaBuild {
         pname = "ac-html";
         version = "0.31";
         src = fetchFromGitHub {
@@ -345,10 +430,10 @@
           rev = "415a78c3b84855b0c0411832d21a0fb63239b184";
           sha256 = "19v9515ixg22m7h7riix8w3vyhzax1m2pbwdirp59v532xn9b0cz";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ce370d60b2f4dd0570b631f6ca92a221e1fe2de6/recipes/ac-html";
           sha256 = "0qf8f75b6dvy844dq8vh8d9c6k599rh1ynjcif9bwvdpf6pxwvqa";
-          name = "ac-html";
+          name = "recipe";
         };
         packageRequires = [ auto-complete web-completion-data ];
         meta = {
@@ -356,8 +441,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    ac-html-bootstrap = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, web-completion-data }:
-    melpaBuild {
+    ac-html-bootstrap = callPackage ({ fetchFromGitHub
+                                     , fetchurl
+                                     , lib
+                                     , melpaBuild
+                                     , web-completion-data }:
+      melpaBuild {
         pname = "ac-html-bootstrap";
         version = "0.9.3";
         src = fetchFromGitHub {
@@ -366,10 +455,10 @@
           rev = "591e1e996c820da218ea1eee0a500c556769f128";
           sha256 = "1zmjqnlbfchnb7n2v7ms7q06xma1lmf9ry3v6f4pfnwlmz5lsf3a";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6cf8aed547ca2390395dcf52d6c542b6944697af/recipes/ac-html-bootstrap";
           sha256 = "0z71m6xws0k9smhsswaivpikr64mv0wh6klnmi5cwhwcqas6kdi1";
-          name = "ac-html-bootstrap";
+          name = "recipe";
         };
         packageRequires = [ web-completion-data ];
         meta = {
@@ -377,8 +466,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    ac-html-csswatcher = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, web-completion-data }:
-    melpaBuild {
+    ac-html-csswatcher = callPackage ({ fetchFromGitHub
+                                      , fetchurl
+                                      , lib
+                                      , melpaBuild
+                                      , web-completion-data }:
+      melpaBuild {
         pname = "ac-html-csswatcher";
         version = "0.1.7";
         src = fetchFromGitHub {
@@ -387,10 +480,10 @@
           rev = "dadc3c595cf1708291096c03987f1981f3cabc6b";
           sha256 = "0p18wxyyc1jmcwx9y5i77s25v4jszv7cmm4bkwm4dzhkxd33kh1f";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fba8b9bf212e6fa389eae8394d0b3bbce9eb0f92/recipes/ac-html-csswatcher";
           sha256 = "0jb9dnm2lxadrxssf0rjqw8yvvskcq4hys8c21shjyj3gkvwbfqn";
-          name = "ac-html-csswatcher";
+          name = "recipe";
         };
         packageRequires = [ web-completion-data ];
         meta = {
@@ -398,8 +491,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    ac-inf-ruby = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, inf-ruby, lib, melpaBuild }:
-    melpaBuild {
+    ac-inf-ruby = callPackage ({ auto-complete
+                               , fetchFromGitHub
+                               , fetchurl
+                               , inf-ruby
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "ac-inf-ruby";
         version = "0.4";
         src = fetchFromGitHub {
@@ -408,10 +506,10 @@
           rev = "3e22b66d3d3e2712a0fe783b5cdd0583a0d4c318";
           sha256 = "1acm13n59sdgvvzicscxzrr5j1x5sa5x4rc4cnkbwb28nw5a5ysm";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1a72abe0fe1253149afb45b0d9e81b6846a926c0/recipes/ac-inf-ruby";
           sha256 = "04jclf0yxz78x1fsaf5sh1p466947nqrcx337kyhqn0nkj3hplqr";
-          name = "ac-inf-ruby";
+          name = "recipe";
         };
         packageRequires = [ auto-complete inf-ruby ];
         meta = {
@@ -419,8 +517,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    ac-ispell = callPackage ({ auto-complete, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ac-ispell = callPackage ({ auto-complete
+                             , cl-lib ? null
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "ac-ispell";
         version = "0.7";
         src = fetchFromGitHub {
@@ -429,10 +532,10 @@
           rev = "a8c84f7f0b96dc091abc51b1698f24e9c994e6aa";
           sha256 = "16qsj3wni4xhcrjx2rnxdzq6jb7jrl4bngi4an37vgdlrx3w8m6l";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b41acb7387ebef9af2906fa16298b64d6431bfb0/recipes/ac-ispell";
           sha256 = "1vsy2qjh60n5lavivpqhhcpg5pk8zz2r0wy1sb65capn841zdi67";
-          name = "ac-ispell";
+          name = "recipe";
         };
         packageRequires = [ auto-complete cl-lib ];
         meta = {
@@ -440,8 +543,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    ac-mozc = callPackage ({ auto-complete, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, mozc }:
-    melpaBuild {
+    ac-mozc = callPackage ({ auto-complete
+                           , cl-lib ? null
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild
+                           , mozc }:
+      melpaBuild {
         pname = "ac-mozc";
         version = "0.0.4";
         src = fetchFromGitHub {
@@ -450,10 +559,10 @@
           rev = "4c6c8be4701010d9362184437c0f783e0335c631";
           sha256 = "19cb8kq8gmrplkxil22ahvbyq5cng1l2vh2lrfiyqpjsap7zfjz5";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4b3f74039d397037e640cc371d24bdb60ac90bf1/recipes/ac-mozc";
           sha256 = "1v3iiid8cq50i076q98ycks9m827xzncgxqwqs2rqhab0ncy3h0f";
-          name = "ac-mozc";
+          name = "recipe";
         };
         packageRequires = [ auto-complete cl-lib mozc ];
         meta = {
@@ -461,20 +570,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    ac-octave = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ac-octave = callPackage ({ auto-complete
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "ac-octave";
         version = "0.7";
         src = fetchFromGitHub {
           owner = "coldnew";
           repo = "ac-octave";
-          rev = "6d09b94a86f43de84c60e9a699b5e1be61c0f138";
-          sha256 = "1kg5q0bw0ymynsn3j7bjavb6wr8b0bjwm6jfj254g80y1inn4bp4";
+          rev = "ffc12874320bbbde940e5d446898435e7da495f8";
+          sha256 = "1h6g44rl5xia1l7shvihrnxlg0b8xsgvas212d1nvybc572yvbbc";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/634bd324148d6b74e1098362e06dc512456cde31/recipes/ac-octave";
           sha256 = "1g5s4dk1rcgkjn17jfw6g201pw0vfhqcx1nhigmnizpnzy0man9z";
-          name = "ac-octave";
+          name = "recipe";
         };
         packageRequires = [ auto-complete ];
         meta = {
@@ -482,20 +595,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    ac-php = callPackage ({ ac-php-core, auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
-    melpaBuild {
+    ac-php = callPackage ({ ac-php-core
+                          , auto-complete
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild
+                          , yasnippet }:
+      melpaBuild {
         pname = "ac-php";
-        version = "2.0.4";
+        version = "2.0.5";
         src = fetchFromGitHub {
           owner = "xcwen";
           repo = "ac-php";
-          rev = "326721527b2f88df7227cdc41708912b2f9c8494";
-          sha256 = "1rrjzaa1qqzbnwp6ykk4qbdqlrwprdg2z4xqsb8098p052jjdpii";
+          rev = "f489da3ceb04ff6efd9da5c5f56d71f49966e1d4";
+          sha256 = "081v4srqzzwd8v07z013m756qrxll5fpzwf8km0686nc5gcg6q9l";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php";
           sha256 = "1wqwwgdln98snlq5msdx94b7985krvqfn264hxs1h94r85kgn1ba";
-          name = "ac-php";
+          name = "recipe";
         };
         packageRequires = [ ac-php-core auto-complete yasnippet ];
         meta = {
@@ -503,20 +622,30 @@
           license = lib.licenses.free;
         };
       }) {};
-    ac-php-core = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, php-mode, popup, s, xcscope }:
-    melpaBuild {
+    ac-php-core = callPackage ({ dash
+                               , emacs
+                               , f
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild
+                               , php-mode
+                               , popup
+                               , s
+                               , xcscope }:
+      melpaBuild {
         pname = "ac-php-core";
-        version = "2.0.4";
+        version = "2.0.5";
         src = fetchFromGitHub {
           owner = "xcwen";
           repo = "ac-php";
-          rev = "326721527b2f88df7227cdc41708912b2f9c8494";
-          sha256 = "1rrjzaa1qqzbnwp6ykk4qbdqlrwprdg2z4xqsb8098p052jjdpii";
+          rev = "c815709f46b87cd3677f0b29eecae4973709645a";
+          sha256 = "04rbq9q86am6fm4z78pm7lkgjr2p01iq41yfd0qmas5bnvfbzsvk";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php-core";
           sha256 = "0vk3jsxb7dgk5a6pap3bdqkqwpszil0rck1c3y0wyxrlj2y1jcvn";
-          name = "ac-php-core";
+          name = "recipe";
         };
         packageRequires = [ dash emacs f php-mode popup s xcscope ];
         meta = {
@@ -524,8 +653,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    ac-racer = callPackage ({ auto-complete, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, racer }:
-    melpaBuild {
+    ac-racer = callPackage ({ auto-complete
+                            , emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild
+                            , racer }:
+      melpaBuild {
         pname = "ac-racer";
         version = "0.2";
         src = fetchFromGitHub {
@@ -534,10 +669,10 @@
           rev = "4408c2d652dec0432e20c05e001db8222d778c6b";
           sha256 = "01154kqzh3pjy57vxhv27nm69p85a1fwl7r95c7pzmzxgxigfz1p";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e4318daf4dbb6864ee41f41287c89010fb811641/recipes/ac-racer";
           sha256 = "1vkvh8y3ckvzvqxj4i2k6jqri94121wbfjziybli74qba8dca4yp";
-          name = "ac-racer";
+          name = "recipe";
         };
         packageRequires = [ auto-complete emacs racer ];
         meta = {
@@ -545,20 +680,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    ac-rtags = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild, rtags }:
-    melpaBuild {
+    ac-rtags = callPackage ({ auto-complete
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild
+                            , rtags }:
+      melpaBuild {
         pname = "ac-rtags";
         version = "2.18";
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "98d668e85cf9ae84e775742752c5656dd2df2f17";
-          sha256 = "0raqjbkl1ykga4ahgl9xw49cgh3cyqcf42z36z7d6fz1fw192kg0";
+          rev = "7e6b6f21935eedbe4678ba91c5531ac162b51a5a";
+          sha256 = "12629d1s8rplhjh17n3bmgnkpscq4gljgyl84j8qyhh40dwq1qk0";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ac-rtags";
           sha256 = "1w9v32di9135mm598c4506gxf0xr5jyz8dyd9dhga5d60q7g9641";
-          name = "ac-rtags";
+          name = "recipe";
         };
         packageRequires = [ auto-complete rtags ];
         meta = {
@@ -566,8 +706,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    ac-slime = callPackage ({ auto-complete, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, slime }:
-    melpaBuild {
+    ac-slime = callPackage ({ auto-complete
+                            , cl-lib ? null
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild
+                            , slime }:
+      melpaBuild {
         pname = "ac-slime";
         version = "0.8";
         src = fetchFromGitHub {
@@ -576,10 +722,10 @@
           rev = "df6c4e88b5ba2d15d47a651ecf7edc0986624112";
           sha256 = "13yghv7p6c91fn8mrxbwrb6ldk5n3b6nj6a7pwsvks1q73i1pl88";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/ac-slime";
           sha256 = "0mk3k1lcbqa16xvsbgk28x09vzqyaidqaqpq934xdbrwhdgwgckg";
-          name = "ac-slime";
+          name = "recipe";
         };
         packageRequires = [ auto-complete cl-lib slime ];
         meta = {
@@ -587,8 +733,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    ace-flyspell = callPackage ({ avy, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ace-flyspell = callPackage ({ avy
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "ace-flyspell";
         version = "0.1.3";
         src = fetchFromGitHub {
@@ -597,10 +747,10 @@
           rev = "044d38fb8eb390ef1f51cf92cfe5c4ffd103044c";
           sha256 = "0yy7g2903v78a8pavhxi8c7vqbmifn2sjk84zhw5aygihp3d6vf0";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ace-flyspell";
           sha256 = "1zgywb90cg64nllbbk0x9ipm6znyc5yh7vkajrrnw06r5vabyp9y";
-          name = "ace-flyspell";
+          name = "recipe";
         };
         packageRequires = [ avy ];
         meta = {
@@ -608,8 +758,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    ace-isearch = callPackage ({ ace-jump-mode, avy, emacs, fetchFromGitHub, fetchurl, helm-swoop, lib, melpaBuild }:
-    melpaBuild {
+    ace-isearch = callPackage ({ ace-jump-mode
+                               , avy
+                               , emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , helm-swoop
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "ace-isearch";
         version = "0.1.4";
         src = fetchFromGitHub {
@@ -618,10 +775,10 @@
           rev = "7e041d058492c5c35ec70de0e7c5586043e7e5ec";
           sha256 = "0233ai62zhsy5yhv72016clygwp2pcg80y6kr4cjm2k1k2wwy7m9";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/344f0cf784a027cde196b7d766024fb415fa1968/recipes/ace-isearch";
           sha256 = "0n8qf08z9n8c2sp5ks29nxcfks5mil1jj6wq348apda8safk36hm";
-          name = "ace-isearch";
+          name = "recipe";
         };
         packageRequires = [ ace-jump-mode avy emacs helm-swoop ];
         meta = {
@@ -629,8 +786,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    ace-jump-buffer = callPackage ({ avy, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ace-jump-buffer = callPackage ({ avy
+                                   , dash
+                                   , fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "ace-jump-buffer";
         version = "0.4.1";
         src = fetchFromGitHub {
@@ -639,10 +801,10 @@
           rev = "02797c22c10a817dbbdfbd8fddceeba6c4f0499a";
           sha256 = "13wq92ia18q9vyhmvnz1grl1l18hxnaisb7hv13dhfc06alcsrw2";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/31100b5b899e942de7796bcbf6365625d1b62574/recipes/ace-jump-buffer";
           sha256 = "0hkxa0ps0v1hwmjafqbnyr6rc4s0w95igk8y3w53asl7f5sj5mpi";
-          name = "ace-jump-buffer";
+          name = "recipe";
         };
         packageRequires = [ avy dash ];
         meta = {
@@ -650,8 +812,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    ace-jump-helm-line = callPackage ({ avy, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
-    melpaBuild {
+    ace-jump-helm-line = callPackage ({ avy
+                                      , fetchFromGitHub
+                                      , fetchurl
+                                      , helm
+                                      , lib
+                                      , melpaBuild }:
+      melpaBuild {
         pname = "ace-jump-helm-line";
         version = "0.5.0";
         src = fetchFromGitHub {
@@ -660,10 +827,10 @@
           rev = "8779050e4794279946892b6a156d0086554a9c9e";
           sha256 = "1d4bxxcnjbdr6cjr3jmz2zrnzjv5pwrypbp4xqgqyv9rz02n7ac1";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8925f3daa92ff39776b55642aa9ec0e49245c0c7/recipes/ace-jump-helm-line";
           sha256 = "04q8wh6jskvbiq6y2xsp2ir23vgz5zw09rm127sgiqrmn0jc61b9";
-          name = "ace-jump-helm-line";
+          name = "recipe";
         };
         packageRequires = [ avy helm ];
         meta = {
@@ -671,8 +838,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    ace-jump-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ace-jump-mode = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "ace-jump-mode";
         version = "2.0";
         src = fetchFromGitHub {
@@ -681,10 +851,10 @@
           rev = "a62a6867811cd739dd98a5e00a2d2e17edfb5b71";
           sha256 = "1bwvzh056ls2v7y26a0s4j5mj582dmds04lx4x6iqihs04ss74bb";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/ace-jump-mode";
           sha256 = "0yk0kppjyblr5wamncrjm3ym3n8jcl0r0g0cbnwni89smvpngij6";
-          name = "ace-jump-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -692,8 +862,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    ace-jump-zap = callPackage ({ ace-jump-mode, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ace-jump-zap = callPackage ({ ace-jump-mode
+                                , dash
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "ace-jump-zap";
         version = "0.1.2";
         src = fetchFromGitHub {
@@ -702,10 +877,10 @@
           rev = "1a9bf779d8f9225ede9ec482b840942bb58111df";
           sha256 = "0r875w4aq3p091hcrpkpqsivn1q9hmq2ppa1rvxzdaq0rhl9kfz4";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3b435db3b79333a20aa27a72f33c431f0a019ba1/recipes/ace-jump-zap";
           sha256 = "07bkmly3lvlbby2m13nj3m1q0gcnwy5sas7d6ws6vr9jh0d36byb";
-          name = "ace-jump-zap";
+          name = "recipe";
         };
         packageRequires = [ ace-jump-mode dash ];
         meta = {
@@ -713,8 +888,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    ace-link = callPackage ({ avy, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ace-link = callPackage ({ avy
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "ace-link";
         version = "0.5.0";
         src = fetchFromGitHub {
@@ -723,10 +902,10 @@
           rev = "7b9bc8d916b60a501c32b63ce81f315486ad44e9";
           sha256 = "147dz79vg4ym5wg3d544bw2khdb2j3hr73rw4qfm64wf0q2dj0vk";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/68032f40c0ce4170a22db535be4bfa7099f61f85/recipes/ace-link";
           sha256 = "1jl805r2s3wa0xyhss1q28rcy6y2fngf0yfcrcd9wf8kamhpajk5";
-          name = "ace-link";
+          name = "recipe";
         };
         packageRequires = [ avy ];
         meta = {
@@ -734,8 +913,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    ace-pinyin = callPackage ({ ace-jump-mode, avy, fetchFromGitHub, fetchurl, lib, melpaBuild, pinyinlib }:
-    melpaBuild {
+    ace-pinyin = callPackage ({ ace-jump-mode
+                              , avy
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild
+                              , pinyinlib }:
+      melpaBuild {
         pname = "ace-pinyin";
         version = "0.2.5";
         src = fetchFromGitHub {
@@ -744,10 +929,10 @@
           rev = "c444d8d6861dafd06dd41e694dc9db32652e3b7c";
           sha256 = "1d2g873zwq78ggs47954lccmaky20746wg0gafyj93d1qyc3m8rn";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ace-pinyin";
           sha256 = "1b3asvzm3k66lsdkmlsgmnf8xlyic8zv294j1iahzkwm6bzqj8wd";
-          name = "ace-pinyin";
+          name = "recipe";
         };
         packageRequires = [ ace-jump-mode avy pinyinlib ];
         meta = {
@@ -755,8 +940,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    ace-popup-menu = callPackage ({ avy-menu, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ace-popup-menu = callPackage ({ avy-menu
+                                  , emacs
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "ace-popup-menu";
         version = "0.2.1";
         src = fetchFromGitHub {
@@ -765,10 +955,10 @@
           rev = "e7cc8bace9dda5c9fbe545c6fbd41c12679c3d7d";
           sha256 = "1khqh5b9c7ass3q2gc04ayc8idanabkyfpaqvfnag063x16fv40c";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/53742e2242101c4b3b3901f5c74e24facf62c7d6/recipes/ace-popup-menu";
           sha256 = "1cq1mpv7v98bqrpsm598krq1741b6rwih71cx3yjifpbagrv4m5s";
-          name = "ace-popup-menu";
+          name = "recipe";
         };
         packageRequires = [ avy-menu emacs ];
         meta = {
@@ -776,20 +966,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    ace-window = callPackage ({ avy, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ace-window = callPackage ({ avy
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "ace-window";
         version = "0.9.0";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "ace-window";
-          rev = "eef897e590c4ce63c28fd29ebff3c97aec8a69ae";
-          sha256 = "07mcdzjmgrqdvjs94f2n5bkrf5vrq2fwzz256wbm3wzqxqkfy1q6";
+          rev = "56ef753268de8dffebaa96607fb9f0246ebe9d0f";
+          sha256 = "0zx0d695nrh2xiw9ylzr10fd7chkcb6dvhw8fkcyavlyb34dj49y";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/42fe131d3c2ea498e4df30ba539a6b91c00f5b07/recipes/ace-window";
           sha256 = "1k0x8m1phmvgdxb5aj841iai9q96a5lfq8i4b5vnlbc3w888n3xa";
-          name = "ace-window";
+          name = "recipe";
         };
         packageRequires = [ avy ];
         meta = {
@@ -797,8 +991,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    ack-menu = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ack-menu = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "ack-menu";
         version = "0.2.3";
         src = fetchFromGitHub {
@@ -818,8 +1015,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    actionscript-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    actionscript-mode = callPackage ({ fetchFromGitHub
+                                     , fetchurl
+                                     , lib
+                                     , melpaBuild }:
+      melpaBuild {
         pname = "actionscript-mode";
         version = "7.2.2";
         src = fetchFromGitHub {
@@ -828,10 +1028,10 @@
           rev = "fddd7220342d29e7eca734f6b798b7a2849717a5";
           sha256 = "0zybch8hz3mj63i0pxynb4d76ywqcy7b4fsa4hh71c2kb0bnczb3";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2c11e74f2156f109b713380cebf83022d7159d4a/recipes/actionscript-mode";
           sha256 = "1dkiay9jmizvslji5kzab4dxm1dq0jm8ps7sjq6710g7a5aqdvwq";
-          name = "actionscript-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -839,20 +1039,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    adafruit-wisdom = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    adafruit-wisdom = callPackage ({ emacs
+                                   , fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "adafruit-wisdom";
         version = "0.2.1";
         src = fetchFromGitHub {
           owner = "gonewest818";
           repo = "adafruit-wisdom.el";
-          rev = "2b353f9029f359eb4eb4f0364bd2fbbedf081e42";
-          sha256 = "0zyqnwmrj7yigk1z9baqxmzxnwhpxfjz9r1gl090harl69hdp67d";
+          rev = "77a2e92d55a419055dd67fc85dc62fb3166d3b8d";
+          sha256 = "00bdhrzkyzkcayqhakk93fqyr6ciwswrizljcyx242am6x5fc77s";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/18483af52c26f719fbfde626db84a67750bf4754/recipes/adafruit-wisdom";
           sha256 = "0ckh420cirspwg2yd5q9y1az03j2l1jzd67g8dpvqjkgdp485gad";
-          name = "adafruit-wisdom";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -860,8 +1064,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    add-hooks = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    add-hooks = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "add-hooks";
         version = "3.1.1";
         src = fetchFromGitHub {
@@ -870,10 +1077,10 @@
           rev = "a1043b7cdb1ea98055a2c99f8d37584a553ca362";
           sha256 = "1jv9fpcsm572zg0j1mbpbfkqgdlqapy89xhhj19pswkhjns1y2wl";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/901f846aef46d512dc0a1770bab7f07c0ae330cd/recipes/add-hooks";
           sha256 = "09a5b3prznibkb5igfn8x3vsjrlkh3534zycs8g25g4li87mcb6p";
-          name = "add-hooks";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -881,8 +1088,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    add-node-modules-path = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    add-node-modules-path = callPackage ({ fetchFromGitHub
+                                         , fetchurl
+                                         , lib
+                                         , melpaBuild }:
+      melpaBuild {
         pname = "add-node-modules-path";
         version = "1.2.0";
         src = fetchFromGitHub {
@@ -891,10 +1101,10 @@
           rev = "6f7801b2c41e3711406b7e1654257ad5557f5bb3";
           sha256 = "1pfgy1k7vp34k4zb9835y3x4jmf81na60vsf80wlgvfafwk170z6";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/63e99d8fc0678d7b1831cae8940e9e6547780861/recipes/add-node-modules-path";
           sha256 = "0gbl875fgqr5np6r4cs8njs6fil1qmy8a5wir88x78ybdwwxsmbl";
-          name = "add-node-modules-path";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -902,8 +1112,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    addressbook-bookmark = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    addressbook-bookmark = callPackage ({ emacs
+                                        , fetchFromGitHub
+                                        , fetchurl
+                                        , lib
+                                        , melpaBuild }:
+      melpaBuild {
         pname = "addressbook-bookmark";
         version = "1.0";
         src = fetchFromGitHub {
@@ -912,10 +1126,10 @@
           rev = "ad3c73369b804a48803fdfdf2ab613e6220260de";
           sha256 = "012kfqkmpagn8jrp09acpx631qmjim7b33j0pahv1fcqhin89pn6";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a497aec6e27efa627068542cae5a16c01c3c6d3c/recipes/addressbook-bookmark";
           sha256 = "15p00v4ndrsbadal0ss176mks4ynj39786bmrnil29b6sqibd43r";
-          name = "addressbook-bookmark";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -923,8 +1137,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    adoc-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, markup-faces, melpaBuild }:
-    melpaBuild {
+    adoc-mode = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , markup-faces
+                             , melpaBuild }:
+      melpaBuild {
         pname = "adoc-mode";
         version = "0.6.6";
         src = fetchFromGitHub {
@@ -933,10 +1151,10 @@
           rev = "995785538489e573ad208f73c4e833ba60c5cfdb";
           sha256 = "0kp2aafjhqxz3mjr9hkkss85r4n51chws5a2qj1xzb63dh36liwm";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/adoc-mode";
           sha256 = "0jd3zr4zpb4qqn504azl0y02cryv7n9wphv64b0fbpipr7w5hm2c";
-          name = "adoc-mode";
+          name = "recipe";
         };
         packageRequires = [ markup-faces ];
         meta = {
@@ -944,8 +1162,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    aes = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    aes = callPackage ({ fetchFromGitHub
+                       , fetchurl
+                       , lib
+                       , melpaBuild }:
+      melpaBuild {
         pname = "aes";
         version = "0.9";
         src = fetchFromGitHub {
@@ -954,10 +1175,10 @@
           rev = "b7d5da89c3443292e4f0b1c9d254d459933cf5af";
           sha256 = "0nz1lf77qr3vm90rm02d4inw8glav722rxsiqds76m4xsjrq02m7";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/33ca3106852f82624b36c7e3f03f5c0c620f304f/recipes/aes";
           sha256 = "11vl9x3ldrv7q7rd29xk4xmlvfxs0m6iys84f6mlgf00190l5r5v";
-          name = "aes";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -965,20 +1186,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    ag = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    ag = callPackage ({ cl-lib ? null
+                      , dash
+                      , fetchFromGitHub
+                      , fetchurl
+                      , lib
+                      , melpaBuild
+                      , s }:
+      melpaBuild {
         pname = "ag";
         version = "0.47";
         src = fetchFromGitHub {
           owner = "Wilfred";
           repo = "ag.el";
-          rev = "f2cfea210b165564e8d44f4c980b2fedac2462c1";
-          sha256 = "15kp99vwyi7hb1jkq3lwvqzw3v62ycixsq6y4pd1x0nn2v5p5m5r";
+          rev = "b4b0e39b7fb706fc3208e238c2a7e517ebdb999c";
+          sha256 = "1ra5nrc4nvp41rcdc4nkjs9lk7131zd54v63c6lyi3zkg3dyl7im";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/67f410ac3a58a038e194bcf174bc0a8ceceafb9a/recipes/ag";
           sha256 = "1r4ai09vdckkg4h4i7dp781qqmm4kky53p4q8azp3n2c78i1vz6g";
-          name = "ag";
+          name = "recipe";
         };
         packageRequires = [ cl-lib dash s ];
         meta = {
@@ -986,8 +1213,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    aggressive-indent = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    aggressive-indent = callPackage ({ cl-lib ? null
+                                     , emacs
+                                     , fetchFromGitHub
+                                     , fetchurl
+                                     , lib
+                                     , melpaBuild }:
+      melpaBuild {
         pname = "aggressive-indent";
         version = "1.9.0";
         src = fetchFromGitHub {
@@ -996,10 +1228,10 @@
           rev = "d6778ae89cd2d40949aa076a43e327f7acff59c3";
           sha256 = "0xya19w1bwpqrrqvmms0lfhqb168iv7j6kvnn49zbynnf9dhgr9w";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/aggressive-indent";
           sha256 = "1qi8jbr28gax35siim3hnnkiy8pa2vcrzqzc6axr98wzny46x0i2";
-          name = "aggressive-indent";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -1007,8 +1239,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    ahk-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ahk-mode = callPackage ({ emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "ahk-mode";
         version = "1.5.6";
         src = fetchFromGitHub {
@@ -1017,10 +1253,10 @@
           rev = "bf3205efe7b7a40f3c8978f68f14ea3a939cffa8";
           sha256 = "02nkcin0piv7s93c9plhy361dbqr78m0gd19myc7qb7gnm36kzpn";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d8674b54ad5e17d1da1e499c7d8113f8acd8fd5d/recipes/ahk-mode";
           sha256 = "066l4hsb49wbyv381qgn9k4hn8gxlzi20h3qaim9grngjj5ljbni";
-          name = "ahk-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -1028,8 +1264,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    ahungry-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ahungry-theme = callPackage ({ emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "ahungry-theme";
         version = "1.10.0";
         src = fetchFromGitHub {
@@ -1038,10 +1278,10 @@
           rev = "45bf75f17752c8e8dd4c8a4531c0aa419cdccb84";
           sha256 = "03xypgq6vy7819r42g23kgn7p775bc0v9blzhi0zp5c61p4cw8v3";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/520295978fd7de3f4266dd69cc30d0b4fdf09db0/recipes/ahungry-theme";
           sha256 = "0fhim0qscpqx9siprp3ax1azxzmqkzvrjx517d9bnd68z7xxbpqy";
-          name = "ahungry-theme";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -1049,8 +1289,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    airline-themes = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, powerline }:
-    melpaBuild {
+    airline-themes = callPackage ({ fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild
+                                  , powerline }:
+      melpaBuild {
         pname = "airline-themes";
         version = "1.7";
         src = fetchFromGitHub {
@@ -1059,10 +1303,10 @@
           rev = "bd9624a94618f4144762032a93549f53ffc1e7b3";
           sha256 = "1rlszg7z5k8c6fmjk4sjgrc9xgcjc1jah6c7kdl9kypha7y8s4bq";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/addeb923176132a52807308fa5e71d41c9511802/recipes/airline-themes";
           sha256 = "0jkhb6nigyjmwqny7g59h4ssfy64vl3qnwcw46wnx5k9i73cjyih";
-          name = "airline-themes";
+          name = "recipe";
         };
         packageRequires = [ powerline ];
         meta = {
@@ -1070,8 +1314,42 @@
           license = lib.licenses.free;
         };
       }) {};
-    alchemist = callPackage ({ company, dash, elixir-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }:
-    melpaBuild {
+    alan-mode = callPackage ({ emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , flycheck
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
+        pname = "alan-mode";
+        version = "1.0.0";
+        src = fetchFromGitHub {
+          owner = "M-industries";
+          repo = "AlanForEmacs";
+          rev = "0089e7c874c6d35e55be6ecd479ada2b97688a1f";
+          sha256 = "0mw9ja0f2jsj0vqk1zqwpzxm9j2yfahiibd8xkhx0wan0dggx592";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/6e52314db81dad3517ab400099b032260c3e3e6f/recipes/alan-mode";
+          sha256 = "1528rh26kr9zj43djbrfb7vmq78spfay3k3ps5apc580ipx1a4hg";
+          name = "recipe";
+        };
+        packageRequires = [ emacs flycheck ];
+        meta = {
+          homepage = "https://melpa.org/#/alan-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    alchemist = callPackage ({ company
+                             , dash
+                             , elixir-mode
+                             , emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild
+                             , pkg-info }:
+      melpaBuild {
         pname = "alchemist";
         version = "1.8.2";
         src = fetchFromGitHub {
@@ -1080,10 +1358,10 @@
           rev = "34caeed1bd231c7dfa8d2b9aa5c5de2b2a059601";
           sha256 = "1cci0sq568ghx6x7my96m0iiwvqz2f4dh6k3gn3mmfyvi7bmrpww";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6616dc61d17c5bd89bc4d226baab24a1f8e49b3e/recipes/alchemist";
           sha256 = "18jxw0zb7y34qbm4bcpfpb2656f0h9grmrbfskgp4ra4q5q3n369";
-          name = "alchemist";
+          name = "recipe";
         };
         packageRequires = [ company dash elixir-mode emacs pkg-info ];
         meta = {
@@ -1091,20 +1369,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    alda-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    alda-mode = callPackage ({ emacs
+                             , fetchFromGitLab
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "alda-mode";
         version = "0.2.0";
-        src = fetchFromGitHub {
+        src = fetchFromGitLab {
           owner = "jgkamat";
           repo = "alda-mode";
           rev = "97c20b1fd9ad3f138e1100e3a837d05108c4c564";
           sha256 = "1wsvs756cbwbxlaxij352kman7196m39684m6sqnfb685cfrwzdj";
         };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/2612c494a2b6bd43ffbbaef88ce9ee6327779158/recipes/alda-mode";
-          sha256 = "0vpxiw3k0qxp6s19n93qkkyrr44rbw38ygriqdrfpp84pa09wprh";
-          name = "alda-mode";
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/848cb17d871287c401496e4483e400b44696e89d/recipes/alda-mode";
+          sha256 = "0qvaxh4392rpxikylcnn31z13wabaydj5aa4jyn499ggqdz7liw9";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -1112,8 +1394,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    alect-themes = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    alect-themes = callPackage ({ emacs
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "alect-themes";
         version = "0.8";
         src = fetchFromGitHub {
@@ -1122,10 +1408,10 @@
           rev = "1812abbe0079d1075525d9fb2da6fcfec7db3766";
           sha256 = "0sl2njnhm37cya06y39ls8p3zwpjwyv1pd7w3yfk5frz24vaxlcq";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/84c25a290ae4bcc4674434c83c66ae128e4c4282/recipes/alect-themes";
           sha256 = "04fq65qnxlvl5nc2q037c6yb4nf422dfw2913gv6zfh9rdmxsks8";
-          name = "alect-themes";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -1133,8 +1419,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    alert = callPackage ({ fetchFromGitHub, fetchurl, gntp, lib, log4e, melpaBuild }:
-    melpaBuild {
+    alert = callPackage ({ fetchFromGitHub
+                         , fetchurl
+                         , gntp
+                         , lib
+                         , log4e
+                         , melpaBuild }:
+      melpaBuild {
         pname = "alert";
         version = "1.2";
         src = fetchFromGitHub {
@@ -1143,10 +1434,10 @@
           rev = "b301478e34a5c8bd27c17fc7605e6dd576e97935";
           sha256 = "1vpc3q40m6dcrslki4bg725j4kv6c6xfxwjjl1ilg7la49fwwf26";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/113953825ac4ff98d90a5375eb48d8b7bfa224e7/recipes/alert";
           sha256 = "0x3cvczq09jvshz435jw2fjm69457x2wxdvvbbjq46nfnybhi118";
-          name = "alert";
+          name = "recipe";
         };
         packageRequires = [ gntp log4e ];
         meta = {
@@ -1154,8 +1445,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    all-the-icons = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, memoize }:
-    melpaBuild {
+    all-the-icons = callPackage ({ emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild
+                                 , memoize }:
+      melpaBuild {
         pname = "all-the-icons";
         version = "3.2.0";
         src = fetchFromGitHub {
@@ -1164,10 +1460,10 @@
           rev = "52d1f2d36468146c93aaf11399f581401a233306";
           sha256 = "1sdl33117lccznj38021lwcdnpi9nxmym295q6y460y4dm4lx0jn";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/604c01aa15927bd122260529ff0f4bb6a8168b7e/recipes/all-the-icons";
           sha256 = "00ba4gkfvg38l4s0gsb4asvv1hfw9yjl2786imybzy7bkg9f9x3q";
-          name = "all-the-icons";
+          name = "recipe";
         };
         packageRequires = [ emacs memoize ];
         meta = {
@@ -1175,8 +1471,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    all-the-icons-ivy = callPackage ({ all-the-icons, emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
-    melpaBuild {
+    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 {
@@ -1185,10 +1487,10 @@
           rev = "aa791d6b0055bce3ac68970a8ef6abf0726edf0f";
           sha256 = "0mmimibzn5ncy4rpyq6vkk2m2qlki54nf8yirphabh4m2zf9marg";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9496e6bb6f03f35444fb204860bc50e5e1b36214/recipes/all-the-icons-ivy";
           sha256 = "1xv67gxd2sqj6zld4i3qcid0x5qsbd7baz55m93y1ivdqi7x7gr2";
-          name = "all-the-icons-ivy";
+          name = "recipe";
         };
         packageRequires = [ all-the-icons emacs ivy ];
         meta = {
@@ -1196,8 +1498,19 @@
           license = lib.licenses.free;
         };
       }) {};
-    amd-mode = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, js2-mode, js2-refactor, lib, makey, melpaBuild, projectile, s, seq }:
-    melpaBuild {
+    amd-mode = callPackage ({ emacs
+                            , f
+                            , fetchFromGitHub
+                            , fetchurl
+                            , js2-mode
+                            , js2-refactor
+                            , lib
+                            , makey
+                            , melpaBuild
+                            , projectile
+                            , s
+                            , seq }:
+      melpaBuild {
         pname = "amd-mode";
         version = "2.8";
         src = fetchFromGitHub {
@@ -1206,10 +1519,10 @@
           rev = "977b53e28b3141408fff4814be8b67ee23650cac";
           sha256 = "0m80bwar80qsga735cqrn6rbvfz4w9a036zh8inhsigylv3vwqjv";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e4d6e9935e4935c9de769c7bf1c1b6dd256e10da/recipes/amd-mode";
           sha256 = "17ry6vm5xlmdfs0mykdyn05cik38yswq5axdgn8hxrvvb6f58d06";
-          name = "amd-mode";
+          name = "recipe";
         };
         packageRequires = [
           emacs
@@ -1226,41 +1539,54 @@
           license = lib.licenses.free;
         };
       }) {};
-    amx = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    amx = callPackage ({ emacs
+                       , fetchFromGitHub
+                       , fetchurl
+                       , lib
+                       , melpaBuild
+                       , s }:
+      melpaBuild {
         pname = "amx";
-        version = "1.1.1";
+        version = "3.2";
         src = fetchFromGitHub {
           owner = "DarwinAwardWinner";
           repo = "amx";
-          rev = "7d5d7974057a36a332f8b30e99fe464f25b6e0ae";
-          sha256 = "0jqvah4i2r5di8k3rx6hyjnxdr3alzqmlv6iab5wdhkafyvwl0dq";
+          rev = "09e919512692dc31df079ad2cd1a3ca3ac4f1949";
+          sha256 = "180841qv24z6kn3qry5216ija1h50ymm4kcmcxg4pc47bhzcjn1h";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c55bfad05343b2b0f3150fd2b4adb07a1768c1c0/recipes/amx";
           sha256 = "1ikhjvkca0lsb9j719yf6spg6nwc0qaydkd8aax162sis7kp9fap";
-          name = "amx";
+          name = "recipe";
         };
-        packageRequires = [];
+        packageRequires = [ emacs s ];
         meta = {
           homepage = "https://melpa.org/#/amx";
           license = lib.licenses.free;
         };
       }) {};
-    anaconda-mode = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pythonic, s }:
-    melpaBuild {
+    anaconda-mode = callPackage ({ dash
+                                 , emacs
+                                 , f
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild
+                                 , pythonic
+                                 , s }:
+      melpaBuild {
         pname = "anaconda-mode";
-        version = "0.1.9";
+        version = "0.1.12";
         src = fetchFromGitHub {
           owner = "proofit404";
           repo = "anaconda-mode";
-          rev = "89fc16d50b889a17521084347b28f3011b84e113";
-          sha256 = "08wdci57vig88iy5kk57k5qjkzphbbzy8g7b87hxakfgdmcwpg3g";
+          rev = "1879842b0b3772e48e558340a5667fad42526a57";
+          sha256 = "00plc9jsvzh151xmva6xdpfqyxcvy3z3vnsn4g8wpw94n647lrxx";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e03b698fd3fe5b80bdd24ce01f7fba28e9da0da8/recipes/anaconda-mode";
           sha256 = "0gz16aam4zrm3s9ms13h4qcdflf55506kgkpyncq3bi54cvv8n1r";
-          name = "anaconda-mode";
+          name = "recipe";
         };
         packageRequires = [ dash emacs f pythonic s ];
         meta = {
@@ -1268,20 +1594,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    anaphora = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    anaphora = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "anaphora";
-        version = "1.0.0";
+        version = "1.0.4";
         src = fetchFromGitHub {
           owner = "rolandwalker";
           repo = "anaphora";
-          rev = "20bf7dcfa502538d23525f0905b4f845d97993d3";
-          sha256 = "0fnxxvw81c34zhmiyr5awl92wr5941n4gklvzjc4jphaf2nhkg4w";
+          rev = "3b2da3f759b244975852e79721c4a2dbad3905cf";
+          sha256 = "11fgiy029sqz7nvdm7dcal95lacryz9zql0x5h05z48nrrcl4bib";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8505db1945071a15ba0f2bb74b58d4a6875ca7d6/recipes/anaphora";
           sha256 = "1wb7fb3pc4gxvpjlm6gjbyx0rbhjiwd93qwc4vfw6p865ikl19y2";
-          name = "anaphora";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -1289,8 +1618,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    android-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    android-mode = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "android-mode";
         version = "0.5.0";
         src = fetchFromGitHub {
@@ -1299,10 +1631,10 @@
           rev = "f274da87429617b0b9c5889d46b36de64d982da4";
           sha256 = "17m4hp2qb54widwadv23amc1lasnbwzh2ipc6180fnajg8zcbvyw";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/77633aa340803a433570327943fbe31b396f4355/recipes/android-mode";
           sha256 = "1nqrvq411yg4b9xb5cvc7ai7lfalwc2rfhclzprvymc4vxh6k4cc";
-          name = "android-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -1310,20 +1642,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    angular-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    angular-mode = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "angular-mode";
         version = "1.0";
         src = fetchFromGitHub {
           owner = "omouse";
           repo = "angularjs-mode";
-          rev = "7c0fb37f59dfd9e69f00b50e90a0e88c4e25d8c2";
-          sha256 = "1798nv4djhxzbin68zf6w7dbfm9sc39d0kygky52ii36arg5r1zp";
+          rev = "026558260eb2890c72df6a59ae8762669772282b";
+          sha256 = "0ljwaccb0jrp7zrnkp0383185vg3r9pf324al72d445syff5pa6y";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7b120c7f97e8d313387d2e9d9210e7fcdd10523b/recipes/angular-mode";
           sha256 = "1bwfmjldnxki0lqi3ys6r2a3nlhbwm1dibsg2dvzirq8qql02w1i";
-          name = "angular-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -1331,8 +1666,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    angular-snippets = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    angular-snippets = callPackage ({ dash
+                                    , fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild
+                                    , s }:
+      melpaBuild {
         pname = "angular-snippets";
         version = "0.2.3";
         src = fetchFromGitHub {
@@ -1341,10 +1681,10 @@
           rev = "8f737c2cf5fce758a7a3833ebad2952b5398568d";
           sha256 = "0h9i0iimanbvhbqy0cj9na335rs961pvhxjj4k8y53qc73xm102a";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/96a0ad5fdbc52f803846e580856fb9c58181c020/recipes/angular-snippets";
           sha256 = "057phgizn1c6njvdfigb23ljs31knq247gr0rcpqfrdaxsnnzm5c";
-          name = "angular-snippets";
+          name = "recipe";
         };
         packageRequires = [ dash s ];
         meta = {
@@ -1352,8 +1692,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    annotate = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    annotate = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "annotate";
         version = "0.4.7";
         src = fetchFromGitHub {
@@ -1362,10 +1705,10 @@
           rev = "e6af7f8ef7d241fdc9f866d57dce24beb4bb6b87";
           sha256 = "19a419rnqqsmvrcl2vwy3gl7mvbfg669vyin2h2xpm56rxsinvy1";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3aae88b8e3b080501195d291012deab31aaf35f7/recipes/annotate";
           sha256 = "1ajykgara2m713blj2kfmdz12fzm8jw7klyakkyi6i3c3a9m44jy";
-          name = "annotate";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -1373,8 +1716,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    annoying-arrows-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    annoying-arrows-mode = callPackage ({ fetchFromGitHub
+                                        , fetchurl
+                                        , lib
+                                        , melpaBuild }:
+      melpaBuild {
         pname = "annoying-arrows-mode";
         version = "0.1.0";
         src = fetchFromGitHub {
@@ -1383,10 +1729,10 @@
           rev = "fe59f3fd464e7a87cc43fb8a1f135b3bdf8a2fb3";
           sha256 = "1ppq3kszzj2fgr7mwj565bjs8bs285ymy384cnnw7paddgcr9z02";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/annoying-arrows-mode";
           sha256 = "1vswlfypn6ijn0wwa3dsqkz5n3pillpmli2ha4q9snhd3a667vyh";
-          name = "annoying-arrows-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -1394,8 +1740,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    ansi = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    ansi = callPackage ({ dash
+                        , fetchFromGitHub
+                        , fetchurl
+                        , lib
+                        , melpaBuild
+                        , s }:
+      melpaBuild {
         pname = "ansi";
         version = "0.4.1";
         src = fetchFromGitHub {
@@ -1404,10 +1755,10 @@
           rev = "a042c5954453bab9a74177e2b78ad17a824caebc";
           sha256 = "1hbddxarr40ygvaw4pwaivq2l4f0brszw73w1r50lkjlggb7bl3g";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/ansi";
           sha256 = "0b5xnv6z471jm53g37njxin6l8yflsgm80y4wxahfgy8apipcq89";
-          name = "ansi";
+          name = "recipe";
         };
         packageRequires = [ dash s ];
         meta = {
@@ -1415,8 +1766,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    ansible = callPackage ({ f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    ansible = callPackage ({ f
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild
+                           , s }:
+      melpaBuild {
         pname = "ansible";
         version = "0.1.0";
         src = fetchFromGitHub {
@@ -1425,10 +1781,10 @@
           rev = "e9b9431738de4808d8ef70871069f68885cc0d98";
           sha256 = "03d240jngxw51ybrsjw8kdxygrr0ymdckzwga2jr1bqf26v559j2";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8e45bf58b980ff542a5e887707a6361eb5ac0492/recipes/ansible";
           sha256 = "1xdc05fdglqfbizra6s1zl6knnvaq526dkxqnw9g7w269j8f4z8g";
-          name = "ansible";
+          name = "recipe";
         };
         packageRequires = [ f s ];
         meta = {
@@ -1436,8 +1792,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    ansible-doc = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ansible-doc = callPackage ({ emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "ansible-doc";
         version = "0.4";
         src = fetchFromGitHub {
@@ -1446,10 +1806,10 @@
           rev = "bc8128a85a79b14f4a121105d87a5eddc33975ad";
           sha256 = "0z3y69sfzka764wjbx31dywdq4d6bfsafv2gmmbpmxqmwfmy8sz4";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1daaaa7462f0b83c15ed9d9e7e6d0ee94434b8e9/recipes/ansible-doc";
           sha256 = "03idvnn79fr9id81aivkm7g7cmlsg0c520wcq4da8g013xvi342w";
-          name = "ansible-doc";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -1457,8 +1817,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    ansible-vault = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ansible-vault = callPackage ({ emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "ansible-vault";
         version = "0.3.4";
         src = fetchFromGitHub {
@@ -1467,10 +1831,10 @@
           rev = "57cf7e6da30250587c28ebf592d7bca9a3bae1df";
           sha256 = "1m9r3vicmljypq6mhgr86lzgi26dnnlp7g0jbl9bjdk48xfg79wb";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2bff0da29a9b883e53a3d211c5577a3e0bc263a0/recipes/ansible-vault";
           sha256 = "0pmsvpc866rgcajb2ihhb62g3rwhda7vvq2kxkvr566y609vv021";
-          name = "ansible-vault";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -1478,8 +1842,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    anti-zenburn-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    anti-zenburn-theme = callPackage ({ fetchFromGitHub
+                                      , fetchurl
+                                      , lib
+                                      , melpaBuild }:
+      melpaBuild {
         pname = "anti-zenburn-theme";
         version = "2.5.1";
         src = fetchFromGitHub {
@@ -1488,10 +1855,10 @@
           rev = "c80cc51bb1aaf11dd53b9d08e01d61bc9b32622f";
           sha256 = "1c97d2jkh7iawgsbcg19gha9ffnxypbcfz0sgcsgf9vy4bvnc350";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6f6f803dc99a1b1fdb5b4e79f1c9cf72b702d091/recipes/anti-zenburn-theme";
           sha256 = "1sp9p6m2jy4m9fdn1hz25cmasy0mwwgn46qmvm92i56f5x6jlzzk";
-          name = "anti-zenburn-theme";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -1499,20 +1866,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    anyins = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    anyins = callPackage ({ fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "anyins";
         version = "0.1.1";
         src = fetchFromGitHub {
           owner = "antham";
           repo = "anyins";
-          rev = "1ff4673ca197c9bf64c65f718573bf7d478fc562";
-          sha256 = "1z6l72dn98icqsmxb3rrj6l63ijc3xgfa3vdl19yqa2rfy6ya721";
+          rev = "1fa85deff82f1dfbd7a5ae89ad427c2cd417f9af";
+          sha256 = "1v5s43myf8vhgyq64frlbcn87728za7hc9q2v7b2x7h2r6zz6fxr";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a367da2cb71fc0b144f9e608dc4857624991f19c/recipes/anyins";
           sha256 = "0ncf3kn8rackcidkgda2zs60km3hx87rwr9daj7ksmbb6am09s7c";
-          name = "anyins";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -1520,8 +1890,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    anzu = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    anzu = callPackage ({ cl-lib ? null
+                        , emacs
+                        , fetchFromGitHub
+                        , fetchurl
+                        , lib
+                        , melpaBuild }:
+      melpaBuild {
         pname = "anzu";
         version = "0.62";
         src = fetchFromGitHub {
@@ -1530,10 +1905,10 @@
           rev = "3328619fec138862302bbe1b9acf2eea624a4c5e";
           sha256 = "1lzvc0ihcbplir4hqfyxfqpsd78arz15gk92kmq4f8ggbkl37fan";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/anzu";
           sha256 = "181hzwy9bc0zfhax26p20q9cjibrmi9ngps5fa3ja5g6scxfs9g1";
-          name = "anzu";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -1541,8 +1916,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    apache-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    apache-mode = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "apache-mode";
         version = "2.1";
         src = fetchFromGitHub {
@@ -1551,10 +1929,10 @@
           rev = "0906559e0cb2997405d98ea6b2195954e3935d3b";
           sha256 = "0vfyi34qcwkz9975cq5hin1p2zyy3h05fni4f93xyrcs31zvmk22";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/eb13cb0dba1696cc51132cd1ff723fa17f892a7c/recipes/apache-mode";
           sha256 = "0wzfx3kaiwvya30ihq3vpdhy6znkzf25w5x43x457ifdn2vrh9zi";
-          name = "apache-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -1562,8 +1940,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    apib-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, markdown-mode, melpaBuild }:
-    melpaBuild {
+    apib-mode = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , markdown-mode
+                             , melpaBuild }:
+      melpaBuild {
         pname = "apib-mode";
         version = "0.7";
         src = fetchFromGitHub {
@@ -1572,10 +1954,10 @@
           rev = "6cc7c6f21b8e415b1718bb6a07ab2182e9e9dde6";
           sha256 = "1717f78kaqkmbhfwb9kzsv5wi2zabcbwb4wh1jklhcaalvmk3z7d";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/dc2ebb04f975d8226a76260895399c937d6a1940/recipes/apib-mode";
           sha256 = "0y3n0xmyc4gkypq07v4sp0i6291qaj2m13zkg6mxp61zm669v2fb";
-          name = "apib-mode";
+          name = "recipe";
         };
         packageRequires = [ markdown-mode ];
         meta = {
@@ -1583,20 +1965,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    apiwrap = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    apiwrap = callPackage ({ emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "apiwrap";
-        version = "0.4";
+        version = "0.5";
         src = fetchFromGitHub {
           owner = "vermiculus";
           repo = "apiwrap.el";
-          rev = "7935275ee45f0359d887b8563ffd1d002f0c618e";
-          sha256 = "1p6sj46135dh7fgpzrfzsp5zkmx5si5lndwc7pnk30fbz5pindsw";
+          rev = "e4c9c57d6620a788ec8a715ff1bb50542edea3a6";
+          sha256 = "0xpb8mmssajy42r2h1m9inhv1chx19wkp5p0p63nwpk7mhjj8bis";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0197fd3657e65e3826375d9b6f19da3058366c91/recipes/apiwrap";
           sha256 = "0n50n1n5pvcgcp1gmna3ci36pnbanjdbjpgv7zyarlb80hywbiyw";
-          name = "apiwrap";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -1604,8 +1990,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    apples-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    apples-mode = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "apples-mode";
         version = "0.0.2";
         src = fetchFromGitHub {
@@ -1614,10 +2003,10 @@
           rev = "fac47b6255e79a373c5d5e1abe66ea5d74588e9f";
           sha256 = "13j2r4nx2x6j3qx50d5rdnqd8nl5idxdkhizsk7ccz3v2607fbyy";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5ca765a6a2f312f585624ec8b82dc9eb6b9bbc0c/recipes/apples-mode";
           sha256 = "05ssnxs9ybc26jhr69xl9jpb41bz1688minmlc9msq2nvyfnj97s";
-          name = "apples-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -1625,8 +2014,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    aproject = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    aproject = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "aproject";
         version = "0.3";
         src = fetchFromGitHub {
@@ -1635,10 +2027,10 @@
           rev = "3c7d23c341862dfd77fd0a64775df12ddb44ab54";
           sha256 = "1wyz8jvdy4m0cn75mm3zvxagm2gl10q51479f91gnqv14b4rndfc";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/de10c48976352f273e8363c2f6fa60602ee86c9b/recipes/aproject";
           sha256 = "0v3gx2mff2s7knm69y253pm1yr4svy8w00pqbn1chrvymb62jhp2";
-          name = "aproject";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -1646,8 +2038,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    apropospriate-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    apropospriate-theme = callPackage ({ fetchFromGitHub
+                                       , fetchurl
+                                       , lib
+                                       , melpaBuild }:
+      melpaBuild {
         pname = "apropospriate-theme";
         version = "0.1.0";
         src = fetchFromGitHub {
@@ -1656,10 +2051,10 @@
           rev = "0d918da74a7a225fe5a586e26f5d834e579c5323";
           sha256 = "0hqsq7y89crcmqcfbgn885dlvj7f7b0zd9q6adbhyscphk7kasjw";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1da33013f15825ab656260ce7453b8127e0286f4/recipes/apropospriate-theme";
           sha256 = "10bj2bsi7b104m686z8mgvbh493liidsvivxfvfxzbndc8wyjsw9";
-          name = "apropospriate-theme";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -1667,8 +2062,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    artbollocks-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    artbollocks-mode = callPackage ({ fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "artbollocks-mode";
         version = "1.1.2";
         src = fetchFromGitHub {
@@ -1677,10 +2075,10 @@
           rev = "583c7048a1b09cd79554423d5115f5ddd129d190";
           sha256 = "133c1n4ra7z3vb6y47400y71a6ac19pyji0bgd4kr9fcbx0flx91";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/22b237ab91ddd3c17986ea12e6a32f2ce62d3a79/recipes/artbollocks-mode";
           sha256 = "0dlnxicn6nzyiz44y92pbl4nzr9jxfb9a99wacjrwq2ahdrwhhjp";
-          name = "artbollocks-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -1688,8 +2086,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    arview = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    arview = callPackage ({ fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "arview";
         version = "1.2";
         src = fetchFromGitHub {
@@ -1698,10 +2099,10 @@
           rev = "5437b4221b64b238c273a651d4792c577dba6d45";
           sha256 = "1yvirfmvf6v5khl7zhx2ddv9bbxnx1qhwfzi0gy2nmbxlykb6s2j";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/31574cd756f4f93e2c6bcad5eca33a3294cccd54/recipes/arview";
           sha256 = "0d935lj0x3rbar94l7288xrgbcp1wmz6r2l0b7i89r5piczyiy1y";
-          name = "arview";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -1709,8 +2110,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    asilea = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    asilea = callPackage ({ cl-lib ? null
+                          , emacs
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "asilea";
         version = "0.2.1";
         src = fetchFromGitHub {
@@ -1719,10 +2125,10 @@
           rev = "2aab1cc63b64ef08d12e84fd7ba5c94065f6039f";
           sha256 = "1s973vzivibaqjb8acn4ylrdasxh17jcfmmvqp4wm05nwhg75597";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/858e673c66e876d80f41d47d307c944d7bdb147d/recipes/asilea";
           sha256 = "1lb8nr6r6yy06m4pxg8w9ja4zv8k5xwhl95v2wv95y1qwhgnwg3j";
-          name = "asilea";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -1730,8 +2136,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    assess = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, m-buffer, melpaBuild }:
-    melpaBuild {
+    assess = callPackage ({ emacs
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , m-buffer
+                          , melpaBuild }:
+      melpaBuild {
         pname = "assess";
         version = "0.4";
         src = fetchFromGitHub {
@@ -1740,10 +2151,10 @@
           rev = "87118057b3ae0e6542fa5e22050eb44d6efe8baa";
           sha256 = "0cilb32zr38x9kfzfyr1ciag5pzbgp1dk62r7lhn8dxc2ip6f11j";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6f917a34506193f2674b195569dfd3c13ba62c1d/recipes/assess";
           sha256 = "0xj3f48plwxmibax00qn15ya7s0h560xzwr8nkwl5r151v1mc9rr";
-          name = "assess";
+          name = "recipe";
         };
         packageRequires = [ emacs m-buffer ];
         meta = {
@@ -1751,20 +2162,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    async = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    async = callPackage ({ fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "async";
-        version = "1.9.2";
+        version = "1.9.3";
         src = fetchFromGitHub {
           owner = "jwiegley";
           repo = "emacs-async";
-          rev = "d6222c2959caaca5c4980038756097da8a51e505";
-          sha256 = "1w7crkgi2k97zxdqv2k6a88kmz75s5v7p7n8bw8v18dvxx9sfisn";
+          rev = "caad15ce64c1aac5e17d480c59ee6c85ebcb6bb2";
+          sha256 = "1zsnb6dy8p6y68xgidv3dfxaga4biramfw8fq7wac0sc50vc98vq";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/async";
           sha256 = "0s2qrmkqqfgi1ilzbj0rfk27f89p4dycdl1lqkbsm23j0zya53w4";
-          name = "async";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -1772,8 +2186,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    atom-one-dark-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    atom-one-dark-theme = callPackage ({ fetchFromGitHub
+                                       , fetchurl
+                                       , lib
+                                       , melpaBuild }:
+      melpaBuild {
         pname = "atom-one-dark-theme";
         version = "0.4.0";
         src = fetchFromGitHub {
@@ -1782,10 +2199,10 @@
           rev = "c2ae343971f8cda7f5b5392552ce9281f52e53de";
           sha256 = "1xyn8qiikng6vf5rbpfqz9ac10c69aip0w6v9l46w0qxsy8svyaj";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3ba1c4625c9603372746a6c2edb69d65f0ef79f5/recipes/atom-one-dark-theme";
           sha256 = "0wwnkhq7vyysqiqcxc1jsn98155ri4mf4w03k7inl1f8ffpwahvw";
-          name = "atom-one-dark-theme";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -1793,20 +2210,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    atomic-chrome = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, websocket }:
-    melpaBuild {
+    atomic-chrome = callPackage ({ emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , let-alist
+                                 , lib
+                                 , melpaBuild
+                                 , websocket }:
+      melpaBuild {
         pname = "atomic-chrome";
         version = "2.0.0";
         src = fetchFromGitHub {
           owner = "alpha22jp";
           repo = "atomic-chrome";
-          rev = "38ce9127285e1ff45f0f39b9da36a682103bdb96";
-          sha256 = "01zwpdmq13iy3hsgijnqsg0yahjxngfbrnn1dd2x1bzpmr8hpxnz";
+          rev = "5518562aed5b6897a292fc5048a8f590e6047f30";
+          sha256 = "1javrl1aa6hv286hk20yc3h4gvg21a2hagkx0z26g97h4jzb6m24";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/35785773942a5510e2317ded5bdf872ffe434e8c/recipes/atomic-chrome";
           sha256 = "0dx12mjdc4vhbvrcl61a7j247mgs71vvy0qqj6czbpfawfl46am9";
-          name = "atomic-chrome";
+          name = "recipe";
         };
         packageRequires = [ emacs let-alist websocket ];
         meta = {
@@ -1814,20 +2237,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    auctex-latexmk = callPackage ({ auctex, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    auctex-latexmk = callPackage ({ auctex
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "auctex-latexmk";
         version = "1.0.2";
         src = fetchFromGitHub {
           owner = "tom-tan";
           repo = "auctex-latexmk";
-          rev = "4d353522650d7685acbf1d38f7dbc504f734bd84";
-          sha256 = "0qvscgffmzqk8lkcg3yk91vciim5ygk2m4crk02qn72ipkw5q13m";
+          rev = "64967712b1bbfac8069aa5940fddef938a692a1a";
+          sha256 = "0syd65b6x6lz6as5ih5pldmwgbmq0v3d9pay2n04vqrvsij6m3qy";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3f48af615c56f093dff417a5d3b705f9993c518f/recipes/auctex-latexmk";
           sha256 = "1rdlgkiwlgm06i1gjxcfciz6wgdskfhln8qhixyfxk7pnz0ax327";
-          name = "auctex-latexmk";
+          name = "recipe";
         };
         packageRequires = [ auctex ];
         meta = {
@@ -1835,8 +2262,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    aurel = callPackage ({ bui, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    aurel = callPackage ({ bui
+                         , dash
+                         , emacs
+                         , fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "aurel";
         version = "0.9";
         src = fetchFromGitHub {
@@ -1845,10 +2278,10 @@
           rev = "fc7ad208f43f8525f84a18941c9b55f956df8961";
           sha256 = "0mcbw8p4wrnnr39wzkfz9kc899w0k1jb00q1926mchf202cmnz94";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d1612acd2cf1fea739739608113923ec51d307e9/recipes/aurel";
           sha256 = "13zyi55ksv426pcksbm3l9s6bmp102w7j1xbry46bc48al6i2nnl";
-          name = "aurel";
+          name = "recipe";
         };
         packageRequires = [ bui dash emacs ];
         meta = {
@@ -1856,8 +2289,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    aurora-config-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    aurora-config-mode = callPackage ({ fetchFromGitHub
+                                      , fetchurl
+                                      , lib
+                                      , melpaBuild }:
+      melpaBuild {
         pname = "aurora-config-mode";
         version = "0.0.2";
         src = fetchFromGitHub {
@@ -1866,10 +2302,10 @@
           rev = "0a7ca7987c3a0824e25470389c7d25c337a81593";
           sha256 = "0ns1xhpk1awbj3kv946dv11a99p84dhm54vjk72kslxwx42nia28";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/10a44bed8edee646bf68abf7dffbe352a137a278/recipes/aurora-config-mode";
           sha256 = "1hpjwidqmjxanijsc1imc7ww9abbylmkin1p0846fbz1hz3a603c";
-          name = "aurora-config-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -1877,8 +2313,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    auth-source-pass = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    auth-source-pass = callPackage ({ emacs
+                                    , fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "auth-source-pass";
         version = "4.0.1";
         src = fetchFromGitHub {
@@ -1887,10 +2327,10 @@
           rev = "5690092e40c790384692d8e8da3451e6878d8c17";
           sha256 = "1dv202z8briifd4aqn8yvn4kd6zi1cabb2p86qcjj40lzkgn6w3p";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5e268441634a6e58a00e577d6e2292fa226c11b8/recipes/auth-source-pass";
           sha256 = "0icwdwz2zy3f9ynksr81pgq482iapsbx8lpyssiklyw0xgd1k8ak";
-          name = "auth-source-pass";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -1898,8 +2338,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    auto-compile = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, packed }:
-    melpaBuild {
+    auto-compile = callPackage ({ emacs
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild
+                                , packed }:
+      melpaBuild {
         pname = "auto-compile";
         version = "1.4.3";
         src = fetchFromGitHub {
@@ -1908,10 +2353,10 @@
           rev = "6ce4255ab9a0b010ef8414c5bd9a6d6d9eea012f";
           sha256 = "013vw4sgw6hpz7kskilndv7i7ik40asrkgicghjbygwk0lj5ran3";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/57a2fb9524df3fdfdc54c403112e12bd70888b23/recipes/auto-compile";
           sha256 = "08k9wqk4yysps8n5n50v7lpadwsnm553pv9p7m242fwbgbsgz6nf";
-          name = "auto-compile";
+          name = "recipe";
         };
         packageRequires = [ emacs packed ];
         meta = {
@@ -1919,8 +2364,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    auto-complete = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, popup }:
-    melpaBuild {
+    auto-complete = callPackage ({ cl-lib ? null
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild
+                                 , popup }:
+      melpaBuild {
         pname = "auto-complete";
         version = "1.5.1";
         src = fetchFromGitHub {
@@ -1929,10 +2379,10 @@
           rev = "0655b7f1e6c0f8475adc55f2b86404a877f26a77";
           sha256 = "04i9b11iksg6acn885wl3qgi5xpsm3yszlqmd2x21yhprndlz7gb";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/083fb071191bccd6feb3fb84569373a597440fb1/recipes/auto-complete";
           sha256 = "1c4ij5bnclg94jdzhkqvq2vxwv6wvs051mbki1ibjm5f2hlacvh3";
-          name = "auto-complete";
+          name = "recipe";
         };
         packageRequires = [ cl-lib popup ];
         meta = {
@@ -1940,20 +2390,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    auto-complete-clang-async = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    auto-complete-clang-async = callPackage ({ fetchFromGitHub
+                                             , fetchurl
+                                             , lib
+                                             , melpaBuild }:
+      melpaBuild {
         pname = "auto-complete-clang-async";
         version = "0.5";
         src = fetchFromGitHub {
           owner = "Golevka";
           repo = "emacs-clang-complete-async";
-          rev = "a5114e3477793ccb9420acc5cd6a1cb26be65964";
-          sha256 = "1kp2l1cgzlg2g3wllz4gl1ssn4lnx2sn26xqigfrpr8y5rj2bsfj";
+          rev = "5eb63c8a1e4ca3af124baf0f8f801b949888f9b8";
+          sha256 = "09f8hqs9n13lkb7b352ig07b9xm1w0mbbnqfy2s5cw4cppmakf2n";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/23aa24b025216359c5e600eee2f2cd4ecc7556e3/recipes/auto-complete-clang-async";
           sha256 = "1jj0jn1v3070g7g0j5gvpybv145kki8nsjxqb8fjf9qag8ilfkjh";
-          name = "auto-complete-clang-async";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -1961,8 +2414,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    auto-complete-exuberant-ctags = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    auto-complete-exuberant-ctags = callPackage ({ auto-complete
+                                                 , fetchFromGitHub
+                                                 , fetchurl
+                                                 , lib
+                                                 , melpaBuild }:
+      melpaBuild {
         pname = "auto-complete-exuberant-ctags";
         version = "0.0.7";
         src = fetchFromGitHub {
@@ -1971,10 +2428,10 @@
           rev = "ff6121ff8b71beb5aa606d28fd389c484ed49765";
           sha256 = "1fqgyg986fg1dzac5wa97bx82mfddqb6qrfnpr3zksmw3vgykxr0";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1cc9786ed8cea2461b592f860d8e2a0897c57068/recipes/auto-complete-exuberant-ctags";
           sha256 = "1i2s3ycc8jafkzdsz3kbvx1hh95ydi5s6rq6n0wzw1kyy3km35gd";
-          name = "auto-complete-exuberant-ctags";
+          name = "recipe";
         };
         packageRequires = [ auto-complete ];
         meta = {
@@ -1982,8 +2439,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    auto-complete-nxml = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    auto-complete-nxml = callPackage ({ auto-complete
+                                      , fetchFromGitHub
+                                      , fetchurl
+                                      , lib
+                                      , melpaBuild }:
+      melpaBuild {
         pname = "auto-complete-nxml";
         version = "0.5.0";
         src = fetchFromGitHub {
@@ -1992,10 +2453,10 @@
           rev = "ac7b09a23e45f9bd02affb31847263de4180163a";
           sha256 = "18bf1kw85mab0zp7rn85cm1nxjxg5c1dmiv0j0mjwzsv8an4px5y";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c89dcbf03a802a4361e44174a332a312e352be36/recipes/auto-complete-nxml";
           sha256 = "0viscr5k1carn9vhflry16kgihr6fvh6h36b049pgnk6ww085k6a";
-          name = "auto-complete-nxml";
+          name = "recipe";
         };
         packageRequires = [ auto-complete ];
         meta = {
@@ -2003,20 +2464,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    auto-complete-pcmp = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, lib, log4e, melpaBuild, yaxception }:
-    melpaBuild {
+    auto-complete-pcmp = callPackage ({ auto-complete
+                                      , fetchFromGitHub
+                                      , fetchurl
+                                      , lib
+                                      , log4e
+                                      , melpaBuild
+                                      , yaxception }:
+      melpaBuild {
         pname = "auto-complete-pcmp";
         version = "0.0.2";
         src = fetchFromGitHub {
           owner = "aki2o";
           repo = "auto-complete-pcmp";
-          rev = "2595d3dab1ef3549271ca922f212928e9d830eec";
-          sha256 = "1hf2f903hy9afahrgy2fx9smgn631drs6733188zgqi3nkyizj26";
+          rev = "dc5c0af834d327dd686d74a4171e5d9170007a6c";
+          sha256 = "0ygak7hypc27d0wvciksnmg8c5njw2skf1ml60vs63a1krkax63i";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f5c53a8aeaaab23e032a8e7cb5cad7e531a1662c/recipes/auto-complete-pcmp";
           sha256 = "1mpgkwj8jwpvxphlm6iaprwjrldmihbgg97jav0fbm1kjnm4azna";
-          name = "auto-complete-pcmp";
+          name = "recipe";
         };
         packageRequires = [ auto-complete log4e yaxception ];
         meta = {
@@ -2024,20 +2491,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    auto-complete-sage = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild, sage-shell-mode }:
-    melpaBuild {
+    auto-complete-sage = callPackage ({ auto-complete
+                                      , fetchFromGitHub
+                                      , fetchurl
+                                      , lib
+                                      , melpaBuild
+                                      , sage-shell-mode }:
+      melpaBuild {
         pname = "auto-complete-sage";
         version = "0.0.5";
         src = fetchFromGitHub {
           owner = "stakemori";
           repo = "auto-complete-sage";
-          rev = "a61a4e58b14134712e0737280281c0b10e56da93";
-          sha256 = "0l49ciic7g30vklxq6l1ny3mz87l5p8qc30rmkjvkzvg8r52ksn3";
+          rev = "84f808aea247af41f90c872bcfde5edc61ba0974";
+          sha256 = "1rhcgpqdw5v2ghsjsaw0xi9r5vyvdr3mwm8mr0kimqcv4nd4ifn0";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f1cd78dcd58d559c47873f8fcfcab089a8493dd6/recipes/auto-complete-sage";
           sha256 = "02sxbir3arvmnkvxgndlkln9y05jnlv6i8czd6a0wcxk4nj43lq1";
-          name = "auto-complete-sage";
+          name = "recipe";
         };
         packageRequires = [ auto-complete sage-shell-mode ];
         meta = {
@@ -2045,8 +2517,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    auto-dictionary = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    auto-dictionary = callPackage ({ fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "auto-dictionary";
         version = "1.1";
         src = fetchFromGitHub {
@@ -2055,10 +2530,10 @@
           rev = "0e3567a81f7bb0ad53ed9f20c7d3d1ac40c26ad1";
           sha256 = "191294k92qp8gmfypf0q8j8qrym96aqikzvyb9p03wqvbr3r1dsk";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1711d710ac09fe407fde89ee351ccdcb78555d35/recipes/auto-dictionary";
           sha256 = "1va485a8lxvb3507kr83cr6wpssxnf8y4l42mamn9daa8sjx3q16";
-          name = "auto-dictionary";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -2066,8 +2541,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    auto-indent-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    auto-indent-mode = callPackage ({ fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "auto-indent-mode";
         version = "0.126";
         src = fetchFromGitHub {
@@ -2076,10 +2554,10 @@
           rev = "ad7032ee058a74405d04d775b0b384351536bc53";
           sha256 = "1hlsgsdxpx42kmqkjgy9b9ldz5i4dbi879v87pjd2qbkj8iywb6y";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/49af78177278e7072c70fde0eaa5bb82490ebe9d/recipes/auto-indent-mode";
           sha256 = "1nk78p8lqs8cx90asfs8iaqnwwyy8fi5bafaprm9c0nrxz299ibz";
-          name = "auto-indent-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -2087,20 +2565,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    auto-minor-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    auto-minor-mode = callPackage ({ emacs
+                                   , fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "auto-minor-mode";
-        version = "20170716";
+        version = "20180527.1";
         src = fetchFromGitHub {
           owner = "joewreschnig";
           repo = "auto-minor-mode";
-          rev = "06fa6975a9fb171b91a8b8234d65ef72374d64e2";
-          sha256 = "19r71hdgz367f6cgyqfdpilwlmhrjw5drmijpq8m0fxgysnmz2qd";
+          rev = "c62f4e04c7b73835c399f0348bea0ade2720bcbb";
+          sha256 = "0vqqy6nbb884h8qhzqvjycvfqbm9pbhqxr3dlxrhfx8m6c3iasq1";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b3ab5f048034777551e344101d8415cac92362c8/recipes/auto-minor-mode";
           sha256 = "1dpdylrpw1pvlmhh229b3lqs07drx9kdhw4vcv5a48qah14dz6qa";
-          name = "auto-minor-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -2108,8 +2590,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    auto-package-update = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    auto-package-update = callPackage ({ dash
+                                       , emacs
+                                       , fetchFromGitHub
+                                       , fetchurl
+                                       , lib
+                                       , melpaBuild }:
+      melpaBuild {
         pname = "auto-package-update";
         version = "1.6.1";
         src = fetchFromGitHub {
@@ -2118,10 +2605,10 @@
           rev = "cdef79f9fc6f8347fdd05664978fb9a948ea0410";
           sha256 = "05llpa6g4nb4qswmcn7j3bs7hnmkrkax7hsk7wvklr0wrljyg9a2";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/78f549a299a06941edce13381f597f3a61e8c723/recipes/auto-package-update";
           sha256 = "0fdcniq5mrwbc7yvma4088r0frdfvc2ydfil0s003faz0nrjcp8k";
-          name = "auto-package-update";
+          name = "recipe";
         };
         packageRequires = [ dash emacs ];
         meta = {
@@ -2129,8 +2616,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    auto-shell-command = callPackage ({ deferred, fetchFromGitHub, fetchurl, lib, melpaBuild, popwin }:
-    melpaBuild {
+    auto-shell-command = callPackage ({ deferred
+                                      , fetchFromGitHub
+                                      , fetchurl
+                                      , lib
+                                      , melpaBuild
+                                      , popwin }:
+      melpaBuild {
         pname = "auto-shell-command";
         version = "1.0.2";
         src = fetchFromGitHub {
@@ -2139,10 +2631,10 @@
           rev = "59d4abce779a3ce3e920592bf5696b54b2e192c7";
           sha256 = "1h8zsgw30axprs7a5kkygbhvilillzazxgqz01ng36il65fi28s6";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ea710bfa77fee7c2688eea8258ca9d2105d1896e/recipes/auto-shell-command";
           sha256 = "1i78fh72i8yv91rnabf0vs78r43qrjkr36hndmn5ya2xs3b1g41j";
-          name = "auto-shell-command";
+          name = "recipe";
         };
         packageRequires = [ deferred popwin ];
         meta = {
@@ -2150,8 +2642,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    auto-yasnippet = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
-    melpaBuild {
+    auto-yasnippet = callPackage ({ fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild
+                                  , yasnippet }:
+      melpaBuild {
         pname = "auto-yasnippet";
         version = "0.3.0";
         src = fetchFromGitHub {
@@ -2160,10 +2656,10 @@
           rev = "5cc54edbe03c0061bf69883a3e39d3bb16019e0f";
           sha256 = "0n3r7j83csby2s7284hy5pycynazyrkljxkn6xqn08gvxbbbdpdq";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d33c0aee6a5d27217bbae28fc8f448c3badc8a4b/recipes/auto-yasnippet";
           sha256 = "02281gyy07cy72a29fjsixg9byqq3izb9m1jxv98ni8pcy3bpsqa";
-          name = "auto-yasnippet";
+          name = "recipe";
         };
         packageRequires = [ yasnippet ];
         meta = {
@@ -2171,8 +2667,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    autodisass-java-bytecode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    autodisass-java-bytecode = callPackage ({ fetchFromGitHub
+                                            , fetchurl
+                                            , lib
+                                            , melpaBuild }:
+      melpaBuild {
         pname = "autodisass-java-bytecode";
         version = "1.3";
         src = fetchFromGitHub {
@@ -2181,10 +2680,10 @@
           rev = "3d61dbe266133c950b39e880f78d142751c7dc4c";
           sha256 = "1pf2mwnicj5x2kksxwmrzz2vfxj9y9r6rzgc1fl8028mfrmrmg8s";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a094845521d76754a29435012af5fba9f7975a8e/recipes/autodisass-java-bytecode";
           sha256 = "1k19nkbxnysm3qkpdhz4gv2x9nnrp94xl40x84q8n84s6xaan4dc";
-          name = "autodisass-java-bytecode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -2192,8 +2691,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    autodisass-llvm-bitcode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    autodisass-llvm-bitcode = callPackage ({ fetchFromGitHub
+                                           , fetchurl
+                                           , lib
+                                           , melpaBuild }:
+      melpaBuild {
         pname = "autodisass-llvm-bitcode";
         version = "1.1";
         src = fetchFromGitHub {
@@ -2202,10 +2704,10 @@
           rev = "14bb1bfe2be3b04d6e0c87a7a9d1e88ce15506d0";
           sha256 = "1hyp49bidwc53cr25wwwyzcd0cbbqzxkfcpnccimphv24qfsai85";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/657e8f6bd0e44f11db8480ca42fb29d85fc3ec29/recipes/autodisass-llvm-bitcode";
           sha256 = "0bh73nzll9jp7kiqfnb5dwkipw85p3c3cyq58s0nghig02z63j01";
-          name = "autodisass-llvm-bitcode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -2213,8 +2715,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    autopair = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    autopair = callPackage ({ cl-lib ? null
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "autopair";
         version = "0.6.1";
         src = fetchFromGitHub {
@@ -2223,10 +2729,10 @@
           rev = "2d1eb81d12f71248ad305e70cceddf08d4fe2b39";
           sha256 = "0g6kd1r0wizamw26bhp5jkvpsd98rcybkfchc622b9v5b89a07nq";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/autopair";
           sha256 = "161qhk8rc1ldj9hpg0k9phka0gflz9vny7gc8rnylk90p6asmr28";
-          name = "autopair";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -2234,8 +2740,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    autothemer = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    autothemer = callPackage ({ cl-lib ? null
+                              , dash
+                              , emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "autothemer";
         version = "0.2.2";
         src = fetchFromGitHub {
@@ -2244,10 +2756,10 @@
           rev = "8c467f57571c154129d660dfccebd151c998f2d9";
           sha256 = "0cd2pqh6k32sjidkcd8682y4l6mx52xw4a05f38kk8nsrk28m74k";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3d7d7beed6ba10d7aa6a36328a696ba2d0d21dc2/recipes/autothemer";
           sha256 = "1lcyqfzx7qpkr3ajk0zi0mn32yvcwn06f61vhghn9c66xambsr7f";
-          name = "autothemer";
+          name = "recipe";
         };
         packageRequires = [ cl-lib dash emacs ];
         meta = {
@@ -2255,8 +2767,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    avy = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    avy = callPackage ({ cl-lib ? null
+                       , emacs
+                       , fetchFromGitHub
+                       , fetchurl
+                       , lib
+                       , melpaBuild }:
+      melpaBuild {
         pname = "avy";
         version = "0.4.0";
         src = fetchFromGitHub {
@@ -2265,10 +2782,10 @@
           rev = "369af594e5ea28be1d91b22753aace16baadc046";
           sha256 = "0rq9ab264565z83cly743nbhrd9m967apmnlhqr1gy8dm4hcy7nm";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/77fac7a702d4086fb860514e377037acedc60412/recipes/avy";
           sha256 = "0gjq79f8jagbngp0shkcqmwhisc3hpgwfk34kq30nb929nbnlmag";
-          name = "avy";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -2276,8 +2793,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    avy-menu = callPackage ({ avy, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    avy-menu = callPackage ({ avy
+                            , emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "avy-menu";
         version = "0.1.1";
         src = fetchFromGitHub {
@@ -2286,10 +2808,10 @@
           rev = "71b71e64900d0637e17013781042e086e9bf56e7";
           sha256 = "1mxrq2fpx3qa9vy121wnv02r43sb7djc2j8z7c2vh8x56h8bpial";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2f0b4cfb30c405d44803b36ebcaccef0cf87fe2d/recipes/avy-menu";
           sha256 = "1g2bsm0jpig51jwn9f9mx6z5glb0bn4s21194xam768qin0rf4iw";
-          name = "avy-menu";
+          name = "recipe";
         };
         packageRequires = [ avy emacs ];
         meta = {
@@ -2297,8 +2819,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    avy-migemo = callPackage ({ avy, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, migemo }:
-    melpaBuild {
+    avy-migemo = callPackage ({ avy
+                              , emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild
+                              , migemo }:
+      melpaBuild {
         pname = "avy-migemo";
         version = "0.3.2";
         src = fetchFromGitHub {
@@ -2307,10 +2835,10 @@
           rev = "ce87777bea76c45be5f185e9fe356a8efe5c2d16";
           sha256 = "0s6m44b49jm5cnrx1pvk7rfw3zhwiw5xasdlgmlvv7wws7m5snd9";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6a02db29eb3e4b76b4a9cdbc966df5a1bd35dec0/recipes/avy-migemo";
           sha256 = "1zvgkhma445gj1zjl8j25prw95bdpjbvfy8yr0r5liay6g2hf296";
-          name = "avy-migemo";
+          name = "recipe";
         };
         packageRequires = [ avy emacs migemo ];
         meta = {
@@ -2318,8 +2846,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    avy-zap = callPackage ({ avy, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    avy-zap = callPackage ({ avy
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "avy-zap";
         version = "0.1.4";
         src = fetchFromGitHub {
@@ -2328,10 +2860,10 @@
           rev = "67fed60d0dfe9087ca4fe3332f4a78e775b8d239";
           sha256 = "0lmv34pi9qdh76fi3w4lrfyfhzr824nsiif4nyjvpnmrabxgk309";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/10a2a57c78ac1d8ab621031caa21e8574daeb9a0/recipes/avy-zap";
           sha256 = "1zbkf21ggrmg1w0xaw40i3swgc1g4fz0j8p0r9djm9j120d94zkx";
-          name = "avy-zap";
+          name = "recipe";
         };
         packageRequires = [ avy ];
         meta = {
@@ -2339,8 +2871,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    babel = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    babel = callPackage ({ fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "babel";
         version = "1.4";
         src = fetchFromGitHub {
@@ -2349,10 +2884,10 @@
           rev = "65b55ad89017c9b3a1c8c241ac4b4541eabdaf5f";
           sha256 = "0px1xggk6qyrwkma1p3d7b4z2id2gbrsxkliw3nwc1q4zndg1zr7";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b0d748fa06b3cbe336cb01a7e3ed7b0421d885cc/recipes/babel";
           sha256 = "0sdpp4iym61ni32zv75n48ylj4jib8ca6n9hyqwj1b7nqg76mm1c";
-          name = "babel";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -2360,8 +2895,16 @@
           license = lib.licenses.free;
         };
       }) {};
-    back-button = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, nav-flash, pcache, persistent-soft, smartrep, ucs-utils }:
-    melpaBuild {
+    back-button = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild
+                               , nav-flash
+                               , pcache
+                               , persistent-soft
+                               , smartrep
+                               , ucs-utils }:
+      melpaBuild {
         pname = "back-button";
         version = "0.6.6";
         src = fetchFromGitHub {
@@ -2370,10 +2913,10 @@
           rev = "c7b50a3e087a8dc5588d7292379cd387a1afff87";
           sha256 = "0hmn3jlsqgpc602lbcs9wzw0hgr5qpjdcxi2hjlc1cp27ilyscnf";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c9db386ab3910940addae6e925b2ac17e64e0f87/recipes/back-button";
           sha256 = "0vyhvm445d0rs14j5xi419akk5nd88d4hvm4251z62fmnvs50j85";
-          name = "back-button";
+          name = "recipe";
         };
         packageRequires = [
           nav-flash
@@ -2387,8 +2930,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    badwolf-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    badwolf-theme = callPackage ({ emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "badwolf-theme";
         version = "1.2";
         src = fetchFromGitHub {
@@ -2397,10 +2944,10 @@
           rev = "24a557f92a702f632901a5b7bee59945a0a8cde9";
           sha256 = "1plh7i4zhs5p7qkv7p7lnfrmkszn8b3znwvbxgp7wpxay5safc5j";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/badwolf-theme";
           sha256 = "15n33l0iaq2pk70rpw7qdm8dlwcinfclpnlr3bs7vcb1dknp4g9v";
-          name = "badwolf-theme";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -2408,20 +2955,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    banner-comment = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    banner-comment = callPackage ({ emacs
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "banner-comment";
-        version = "2.5";
+        version = "2.6.2";
         src = fetchFromGitHub {
           owner = "WJCFerguson";
           repo = "banner-comment";
-          rev = "9b1c9a94f8b6789c890a7e7eedd6f60ad5aa4d52";
-          sha256 = "02wsnmzbb60d4a8bsb5kywdwcfsqb6chcchs5v2d0s3sacakbmnl";
+          rev = "fedbb071d043106a30e378ee58b96e349e8068ed";
+          sha256 = "1d6yp96rv6p9f3b8ddrpzb3ng2v0vlqb1akcpd7dria6y6aai8l4";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4bb69f15cb6be38a86abf4d15450a29c9a819068/recipes/banner-comment";
           sha256 = "0i5nkfdwfr9mcir2ijdhw563azmr5p7hyl6rfy1r04fzs8j7w2pc";
-          name = "banner-comment";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -2429,8 +2980,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    base16-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    base16-theme = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "base16-theme";
         version = "2.2";
         src = fetchFromGitHub {
@@ -2439,10 +2993,10 @@
           rev = "10180e88d6d9434cec367b6c91222dd2fc3bd8ae";
           sha256 = "01w89g413s1da6rf94y1xnhw79cjy2bqb01yfjs58cy492cm0vr6";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/30862f6be74882cfb57fb031f7318d3fd15551e3/recipes/base16-theme";
           sha256 = "115dhr3gfvdz5wv76fwpv3b4dywiwbk69qrhkfhij8vpcfybrpzx";
-          name = "base16-theme";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -2450,20 +3004,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    bash-completion = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    bash-completion = callPackage ({ fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "bash-completion";
-        version = "2.0.0";
+        version = "2.1.0";
         src = fetchFromGitHub {
           owner = "szermatt";
           repo = "emacs-bash-completion";
-          rev = "9588a9c0ddf18f9869d4145a67e6446a4b66eba2";
-          sha256 = "11rlmrjdpa3vnf0h9vcd75946q9jyf1mpbm7h12hmpj6g2pavgdd";
+          rev = "6aedd690006e07199b2fcd319b9b840a527650e5";
+          sha256 = "1a1wxcqzh0javjmxwi3lng5i99xiylm8lm04kv4q1lh9bli6vmv0";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8b528544841995045fb1f8344aaaa38946bb3915/recipes/bash-completion";
           sha256 = "0l41yj0sb87i27hw6dh35l32hg4qkka6r3bpkckjnfm0xifrd9hj";
-          name = "bash-completion";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -2471,8 +3028,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    bazel-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    bazel-mode = callPackage ({ emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "bazel-mode";
         version = "1.0.0";
         src = fetchFromGitHub {
@@ -2481,10 +3042,10 @@
           rev = "6103da2dd9c9461e35a45fc0544ddf33410baa25";
           sha256 = "0lbiih6lj7qf2h1l2nxcwfkhdzccrs01lcdqsyhp5hysp0zdcr66";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3945f7eba7d5f248cace11a7946262ac2500b01a/recipes/bazel-mode";
           sha256 = "10590pbpg6mwkcwlm01nxf0ypw694h1b57frvn5rnc53al87i586";
-          name = "bazel-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -2492,8 +3053,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    bbcode-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    bbcode-mode = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "bbcode-mode";
         version = "2.1.0";
         src = fetchFromGitHub {
@@ -2502,10 +3066,10 @@
           rev = "73c56a40301c8b017d3e64c08dccc80d1dc47e59";
           sha256 = "0g0dxk33pz18awv7ncv64c2a4lmdx9sigppkvq2mb9za47azk8dh";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1ef095d23cc043f5d14a9deea788ed71d90c586c/recipes/bbcode-mode";
           sha256 = "1kfxzp0916gdphp4dkk4xbramsbqmg6mazvfqni86mra41rdq6sb";
-          name = "bbcode-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -2513,8 +3077,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    bbdb- = callPackage ({ bbdb, fetchFromGitHub, fetchurl, lib, log4e, melpaBuild, yaxception }:
-    melpaBuild {
+    bbdb- = callPackage ({ bbdb
+                         , fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , log4e
+                         , melpaBuild
+                         , yaxception }:
+      melpaBuild {
         pname = "bbdb-";
         version = "0.0.2";
         src = fetchFromGitHub {
@@ -2523,10 +3093,10 @@
           rev = "2839e84c894de2513af41053e80a277a1b483d22";
           sha256 = "17nbnkg0zn6p89r27mk9hl6qhv6xscwdsq8iyikdw03svpr16lnp";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/01e7a8cc1dde506cb2fcfd9270f15dc61c43ec17/recipes/bbdb-";
           sha256 = "1vzbalcchay4pxl9f1sxg0zclgc095f59dlj15pj0bqq61sbl9jf";
-          name = "bbdb-";
+          name = "recipe";
         };
         packageRequires = [ bbdb log4e yaxception ];
         meta = {
@@ -2534,8 +3104,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    bbdb-vcard = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    bbdb-vcard = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "bbdb-vcard";
         version = "0.3";
         src = fetchFromGitHub {
@@ -2544,10 +3117,10 @@
           rev = "9e11fafef1a94bc6395bd1eeacd00f94848ac560";
           sha256 = "0fg72qnb40djyciy4gzj359lqlcbbrq0indbkzd0dj09zipkx0df";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/dd5d9027c49beae89f78d2a30dfa4bd070dff1bd/recipes/bbdb-vcard";
           sha256 = "1kn98b7mh9a28933r4yl8qfl9p92rpix4vkp71sar9cka0m71ilj";
-          name = "bbdb-vcard";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -2555,8 +3128,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    bbdb2erc = callPackage ({ bbdb, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    bbdb2erc = callPackage ({ bbdb
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "bbdb2erc";
         version = "0.1.3";
         src = fetchFromGitHub {
@@ -2565,10 +3142,10 @@
           rev = "f39a36351e1e6f1105c9e32970e7502b77b0dbcd";
           sha256 = "1zkh7dcas80wwjvigl27wj8sp4b5z6lh3qj7zkziinwamwnxbdbs";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/bbdb2erc";
           sha256 = "0k1f6mq9xd3568vg01dqqvcdbdshbdsi4ivkjyxis6dqfnqhlfdd";
-          name = "bbdb2erc";
+          name = "recipe";
         };
         packageRequires = [ bbdb ];
         meta = {
@@ -2576,8 +3153,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    beacon = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, seq }:
-    melpaBuild {
+    beacon = callPackage ({ fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild
+                          , seq }:
+      melpaBuild {
         pname = "beacon";
         version = "1.3.4";
         src = fetchFromGitHub {
@@ -2586,10 +3167,10 @@
           rev = "729338b02a0e331a4faf475da9f54771a3470106";
           sha256 = "0mypzfasclq7bmw0i8hfyp8c1ycd3kdgd5h1faygzh9r0phh7ciy";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d09cfab21be800831644218e9c8c4433087951c0/recipes/beacon";
           sha256 = "1pwxvdfzs9qjd44wvgimipi2hg4qw5sh5wlsl8h8mq2kyx09s7hq";
-          name = "beacon";
+          name = "recipe";
         };
         packageRequires = [ seq ];
         meta = {
@@ -2597,8 +3178,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    beeminder = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
-    melpaBuild {
+    beeminder = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild
+                             , org }:
+      melpaBuild {
         pname = "beeminder";
         version = "1.1.0";
         src = fetchFromGitHub {
@@ -2607,10 +3192,10 @@
           rev = "3e95a669474e27cd51a16caea030456377f83062";
           sha256 = "1bj9yzjvglnb0f4glh8fg478xlm5nqmd9jqm1casdj5m30i4kafn";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/beeminder";
           sha256 = "1cb8xmgsv23b464hpchm9f9i64p3fyf7aillrwk1aa2l1008kyww";
-          name = "beeminder";
+          name = "recipe";
         };
         packageRequires = [ org ];
         meta = {
@@ -2618,8 +3203,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    beginend = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    beginend = callPackage ({ emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "beginend";
         version = "2.0.0";
         src = fetchFromGitHub {
@@ -2628,10 +3217,10 @@
           rev = "a06a479c2279da9e852cf42628b6dfa466fff0bd";
           sha256 = "1jbhg73g1rrkbwql5vi2b0ys9avfazmwzwgd90gkzwavw0ch9cvl";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/31c1157d4fd9e47a780bbd91075252acdc7899dd/recipes/beginend";
           sha256 = "1y81kr9q0zrsr3c3s14rm6l86y5wf1a0kia6d98112fy4fwdm7kq";
-          name = "beginend";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -2639,20 +3228,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    benchmark-init = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    benchmark-init = callPackage ({ fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "benchmark-init";
         version = "1.0";
         src = fetchFromGitHub {
           owner = "dholm";
           repo = "benchmark-init-el";
-          rev = "7a0f263282bbc86b01b662636306f22813082647";
-          sha256 = "1kyn1izm5sbqbp9whnhk9dn3yc7zy8bz5san5w3ivi3rpx15fh94";
+          rev = "8e4c32f32ec869fe521fb4d3c0a69406830b4178";
+          sha256 = "058mic9jkwiqvmp3k9sfd6gb70ysdphnb1iynlszhixbrz5w7zs2";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/54b9ae6fc10b0c56fcc7a0ad73743ffc85a3e9a0/recipes/benchmark-init";
           sha256 = "0dknch4b1j7ff1079z2fhqng7kp4903b3v7mhj15b5vzspbp3wal";
-          name = "benchmark-init";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -2660,8 +3252,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    benchstat = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    benchstat = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "benchstat";
         version = "1.0.0";
         src = fetchFromGitHub {
@@ -2670,10 +3265,10 @@
           rev = "b39a97f3072c2d3c1d3f86790b9e134d05b8d7e6";
           sha256 = "0j508n860dp4in1psnkcriqck6by1jvnscalyff5na8hx6xgyysm";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d9180fbedf95f9b1f5810bbf4929dfee513f89e3/recipes/benchstat";
           sha256 = "0h2zi4gh23bas1zfj7j2x994lwgd3xyys96ipg1vq7z2b06572k9";
-          name = "benchstat";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -2681,8 +3276,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    better-defaults = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    better-defaults = callPackage ({ fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "better-defaults";
         version = "0.1.3";
         src = fetchFromGitHub {
@@ -2691,10 +3289,10 @@
           rev = "90df5752a0a0602feb47aadfd3542aa7fc841bd8";
           sha256 = "1rxznx2l0cdpiz8mad8s6q17m1fngpgb1cki7ch6yh18r3qz8ysr";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7bb729c1ad8602a5c0c27e81c9442981a54a924a/recipes/better-defaults";
           sha256 = "13bqcmx2gagm2ykg921ik3awp8zvw5d4lb69rr6gkpjlqp7nq2cm";
-          name = "better-defaults";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -2702,8 +3300,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    better-shell = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    better-shell = callPackage ({ emacs
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "better-shell";
         version = "1.2";
         src = fetchFromGitHub {
@@ -2712,10 +3314,10 @@
           rev = "f231404b6f8efce33b48e31e5b1566108d0ba000";
           sha256 = "1g5bljvigga856ksyvgix9hk0pp9nzic088kp0bqx0zqvcl82v0b";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/better-shell";
           sha256 = "0si8nj18i3jlhdb8m6f21rmi0lxians34vhw4xhvxw2yr9l85lj6";
-          name = "better-shell";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -2723,20 +3325,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    biblio = callPackage ({ biblio-core, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    biblio = callPackage ({ biblio-core
+                          , emacs
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "biblio";
-        version = "0.1";
+        version = "0.2";
         src = fetchFromGitHub {
           owner = "cpitclaudel";
           repo = "biblio.el";
-          rev = "2550042b647b2b5c400c9cd8ec5fc80adb0fa6df";
-          sha256 = "0skg8wcgdfzd59ay4fbbbdd258cm8q7v321iml46bdipzk0r5lnw";
+          rev = "a5a68fcf677f286f205f32dc7486f6c9f66aa6af";
+          sha256 = "1gxjind6r235az59dr8liv03d8994mqb8a7m28j3c12q7p70aziz";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c5fbaa8c59b0e64d13beb0e0f18b0734afa84f51/recipes/biblio";
           sha256 = "0ym7xvcfd7hh3qdpfb8zpa7w8s4lpg0vngh9d0ns3s3lnhz4mi0g";
-          name = "biblio";
+          name = "recipe";
         };
         packageRequires = [ biblio-core emacs ];
         meta = {
@@ -2744,20 +3351,27 @@
           license = lib.licenses.free;
         };
       }) {};
-    biblio-core = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, seq }:
-    melpaBuild {
+    biblio-core = callPackage ({ dash
+                               , emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , let-alist
+                               , lib
+                               , melpaBuild
+                               , seq }:
+      melpaBuild {
         pname = "biblio-core";
-        version = "0.1";
+        version = "0.2";
         src = fetchFromGitHub {
           owner = "cpitclaudel";
           repo = "biblio.el";
-          rev = "2550042b647b2b5c400c9cd8ec5fc80adb0fa6df";
-          sha256 = "0skg8wcgdfzd59ay4fbbbdd258cm8q7v321iml46bdipzk0r5lnw";
+          rev = "0036495a2e0d4b02b9e957e498f9437e394d6ed9";
+          sha256 = "1f0p5fgvabdpafil7s8sy82hgcfzg1skxfgj72ylv3crq36bn4vp";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f4f086d3e8fd6a95ce198e148cd3ede35dd73fb8/recipes/biblio-core";
           sha256 = "0zpfamrb2gka41h834a05hxdbw4h55777kh6rhjikjfmy765nl97";
-          name = "biblio-core";
+          name = "recipe";
         };
         packageRequires = [ dash emacs let-alist seq ];
         meta = {
@@ -2765,8 +3379,37 @@
           license = lib.licenses.free;
         };
       }) {};
-    bifocal = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    bicycle = callPackage ({ emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
+        pname = "bicycle";
+        version = "0.1.0";
+        src = fetchFromGitHub {
+          owner = "tarsius";
+          repo = "bicycle";
+          rev = "30c451e6c6910c5aa5ed2b189679ca5e3bc0d6f7";
+          sha256 = "1kyiyq79shwkycgl3373pwgqbg1aqxsai44yl9vw17s37hhff70n";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/ec9b4138ffaf81b556e01b85ce4b112e77909260/recipes/bicycle";
+          sha256 = "16ikqbmsjyknj3580wdnp8ffs85bq9idf9hvxm0ihgw5gy469xqj";
+          name = "recipe";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/bicycle";
+          license = lib.licenses.free;
+        };
+      }) {};
+    bifocal = callPackage ({ emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "bifocal";
         version = "0.0.3";
         src = fetchFromGitHub {
@@ -2775,10 +3418,10 @@
           rev = "a8b222b069a6bd64531b4780905989797bad8abe";
           sha256 = "0c6vzh35lj3pg9wd4v2fy6xdmcg9kq3n5br6rp4lx257gxglzpwh";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/79e71995bd8452bad2e717884f148ec74c9735fc/recipes/bifocal";
           sha256 = "07qrxsby611l3cwsmw3d53h1n7cd1vg53j4vlc2isg56l2m4qks5";
-          name = "bifocal";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -2786,8 +3429,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    binclock = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    binclock = callPackage ({ cl-lib ? null
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "binclock";
         version = "1.11";
         src = fetchFromGitHub {
@@ -2796,10 +3443,10 @@
           rev = "b964e437311e5406a31c0ec7038b3bf1fd02b876";
           sha256 = "0ljxb70vx7x0yn8y1ilf4phk0hamprl43dh23fm3njqqgw60hzbk";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/95dfa38d795172dca6a09cd02e21630747723949/recipes/binclock";
           sha256 = "1s0072kcd1xp8355j8aph94gb3a1wqmzx1hhfp9d6bzqf6cij8gk";
-          name = "binclock";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -2807,20 +3454,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    bind-key = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    bind-key = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "bind-key";
         version = "2.3";
         src = fetchFromGitHub {
           owner = "jwiegley";
           repo = "use-package";
-          rev = "cd58b268a8a025451c11c3cb1ba18d4f27f245da";
-          sha256 = "14x01dg7fgj4icf8l8w90pksazc0sn6qrrd0k3xjr2zg1wzdcang";
+          rev = "d867b0370e4e311c71665ccaa418374a15097461";
+          sha256 = "193a9x1d6c8hprinrls2mpplrab2syn64zjyfgxwzisjqgik02dy";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d39d33af6b6c9af9fe49bda319ea05c711a1b16e/recipes/bind-key";
           sha256 = "1qw2c27016d3yfg0w10is1v72y2jvzhq07ca4h6v17yi94ahj5xm";
-          name = "bind-key";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -2828,8 +3478,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    bind-map = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    bind-map = callPackage ({ emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "bind-map";
         version = "1.1.1";
         src = fetchFromGitHub {
@@ -2838,10 +3492,10 @@
           rev = "bf4181e3a41463684adfffc6c5c305b30480e30f";
           sha256 = "0vrk17yg3jbww92p433p64ijmjf7cjg2wmzi9w418235w1xdfzz8";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f58800af5965a6e7c9314aa00e971196ea0d036e/recipes/bind-map";
           sha256 = "1jzkp010b4vs1bdhccf5igmymfxab4vxs1pccpk9n5n5a4xaa358";
-          name = "bind-map";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -2849,20 +3503,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    bing-dict = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    bing-dict = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "bing-dict";
         version = "0.2.3";
         src = fetchFromGitHub {
           owner = "cute-jumper";
           repo = "bing-dict.el";
-          rev = "7c067b7a3a1a4797476f03a65f4a0b4a269a70c7";
-          sha256 = "1cw8zxcj7ygj73dc8xf6b4sdjrwxfl6h07mrwym8anllqs2v0fa6";
+          rev = "da071309f6ffbb9e66e6720dd05e31964ff402a9";
+          sha256 = "1wl810k3zl0v4i4280mzjdgd9mdc7q9s13s5svj197mlsx7gkifw";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/bing-dict";
           sha256 = "1cqjndq8xm2bwjvdj95dn377bp9r6rrkp1z4a45faj408mipahli";
-          name = "bing-dict";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -2870,8 +3527,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    birds-of-paradise-plus-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    birds-of-paradise-plus-theme = callPackage ({ fetchFromGitHub
+                                                , fetchurl
+                                                , lib
+                                                , melpaBuild }:
+      melpaBuild {
         pname = "birds-of-paradise-plus-theme";
         version = "0.1.1";
         src = fetchFromGitHub {
@@ -2880,10 +3540,10 @@
           rev = "ba2c4443388a73f2c5e2de0c24d3106676aeb6fa";
           sha256 = "1r3f5d67x257g8kvdbdsl4w3y1dvc1d6s9x8bygbkvyahfi5m5hn";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3932853232c269f158806aebe416b456c752a9bb/recipes/birds-of-paradise-plus-theme";
           sha256 = "0vdv2siy30kf1qhzrc39sygjk17lwm3ix58pcs3shwkg1y5amj3m";
-          name = "birds-of-paradise-plus-theme";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -2891,20 +3551,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    bm = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    bm = callPackage ({ fetchFromGitHub
+                      , fetchurl
+                      , lib
+                      , melpaBuild }:
+      melpaBuild {
         pname = "bm";
-        version = "201610";
+        version = "201807";
         src = fetchFromGitHub {
           owner = "joodland";
           repo = "bm";
-          rev = "c77ea49f5632b5d987243eddb4b36e84b870bf42";
-          sha256 = "0jfi24kck1ag19lfcfzbivwb1zhid173p7f8chc01cz68l1pp7jw";
+          rev = "b1bc10b1e9f01c48a7eedb9b08a22d05e7baed3c";
+          sha256 = "16kfzi6chf28jyrsmz0jba3qq3mvxqambsdh09vr76ivmwbv48gh";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/bm";
           sha256 = "07459r7m12j2nsb7qrb26bx32alylhaaq3z448n42lz02a8dc63g";
-          name = "bm";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -2912,8 +3575,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    bnfc = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    bnfc = callPackage ({ emacs
+                        , fetchFromGitHub
+                        , fetchurl
+                        , lib
+                        , melpaBuild }:
+      melpaBuild {
         pname = "bnfc";
         version = "0.4";
         src = fetchFromGitHub {
@@ -2922,10 +3589,10 @@
           rev = "1b58df1dd0cb9b81900632fb2843a03b94f56fdb";
           sha256 = "0lmqrcy80nw6vmf81kh6q39x8pwhzrj6lbk31xpl8mvwnpqaykmn";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7871b6372a391ace76edea40c6f92ceb10b70bf9/recipes/bnfc";
           sha256 = "0h6qhyi7vcikg7zhv8lywdz033kp27a8z1ymq5wgs4aqs184igm6";
-          name = "bnfc";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -2933,8 +3600,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    bog = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    bog = callPackage ({ cl-lib ? null
+                       , fetchFromGitHub
+                       , fetchurl
+                       , lib
+                       , melpaBuild }:
+      melpaBuild {
         pname = "bog";
         version = "1.3.1";
         src = fetchFromGitHub {
@@ -2943,10 +3614,10 @@
           rev = "6ed4d3edbe771e586d873b826330f3ef23aa1611";
           sha256 = "0s4jwlaq3mqyzkyg3x4nh4nx7vw825jhz7ggakay7a2cfvpa4i2j";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/19fd0bf2f8e52c79120c492a6dcabdd51b465d35/recipes/bog";
           sha256 = "1ci8xxca7dclmi5v37y5k45qlmzs6a9hi6m7czgiwxii902w5pkl";
-          name = "bog";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -2954,8 +3625,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    bongo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    bongo = callPackage ({ fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "bongo";
         version = "1.0";
         src = fetchFromGitHub {
@@ -2964,10 +3638,10 @@
           rev = "c5280a11fe8ff39fba4b09ec4a39b0f799d2b59c";
           sha256 = "1q3ws2vn062dh7ci6jn2k2bcn7szh3ap64sgwkzdd6f1pas37fnr";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/692428769cd792dc0644641682c2793103dd00c6/recipes/bongo";
           sha256 = "07i9gw067r2igp6s2g2iakm1ybvw04q6zznna2cfdf08nax64ghv";
-          name = "bongo";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -2975,8 +3649,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    bool-flip = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    bool-flip = callPackage ({ emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "bool-flip";
         version = "1.0.1";
         src = fetchFromGitHub {
@@ -2985,10 +3663,10 @@
           rev = "0f7cc9b387429239fb929896511727d4e49a795b";
           sha256 = "1051gy7izy25jwh079231d4lh9azchbqc6nvfrkv8s9ck407a65a";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f56377a7c3f4b75206ad9ba570c35dbf752079e9/recipes/bool-flip";
           sha256 = "1xfspqxshx7m8gh6g1snkaahka9f71fnq7hx81nik4s9s8pmxj9c";
-          name = "bool-flip";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -2996,8 +3674,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    boon = callPackage ({ dash, emacs, expand-region, fetchFromGitHub, fetchurl, lib, melpaBuild, multiple-cursors }:
-    melpaBuild {
+    boon = callPackage ({ dash
+                        , emacs
+                        , expand-region
+                        , fetchFromGitHub
+                        , fetchurl
+                        , lib
+                        , melpaBuild
+                        , multiple-cursors }:
+      melpaBuild {
         pname = "boon";
         version = "1.0";
         src = fetchFromGitHub {
@@ -3006,10 +3691,10 @@
           rev = "d9f0545708bbbbe3df23b2b91cdd2824beb0df56";
           sha256 = "0crqwyhzkwpi7c0rqcgmgqx6g4f8fw9gd9nh0ii6p5agiw140yj8";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/boon";
           sha256 = "0gryw7x97jd46jgrm93cjagj4p7w93cjc36i2ps9ajf0d8m4gajb";
-          name = "boon";
+          name = "recipe";
         };
         packageRequires = [ dash emacs expand-region multiple-cursors ];
         meta = {
@@ -3017,8 +3702,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    borg = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    borg = callPackage ({ fetchFromGitHub
+                        , fetchurl
+                        , lib
+                        , melpaBuild }:
+      melpaBuild {
         pname = "borg";
         version = "2.0.0";
         src = fetchFromGitHub {
@@ -3027,10 +3715,10 @@
           rev = "34eac585d6829e17ce59b09fe6ad5d675302c096";
           sha256 = "1q7k2c7pxcywg6xjk8awg73skyw59a6w4aa9sxbsz9vdj2zn04k9";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/878ab90d444f3a1fd2c9f9068ca7b477e218f1da/recipes/borg";
           sha256 = "0gn4hf7hn190gl0kg59nr6jzjnb39c0hy9b3brrsfld9hyxga9jr";
-          name = "borg";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -3038,8 +3726,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    boxquote = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    boxquote = callPackage ({ cl-lib ? null
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "boxquote";
         version = "2.1";
         src = fetchFromGitHub {
@@ -3048,10 +3740,10 @@
           rev = "b6a4ad3ee5b327bd3b1bf65f8733bd301fe59883";
           sha256 = "1f61k3sw9zvn6jq60ygi6p66blr52497fadimzcaspa79k9y1cfm";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d2148f8f17b16154bfc337df69a5ad31e25a9b05/recipes/boxquote";
           sha256 = "0s6cxb8y1y8w9vxxhj1izs8d0gzk4z2zm0cm9gkw1h7k2kyggx6s";
-          name = "boxquote";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -3059,8 +3751,38 @@
           license = lib.licenses.free;
         };
       }) {};
-    browse-kill-ring = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    browse-at-remote = callPackage ({ cl-lib ? null
+                                    , f
+                                    , fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild
+                                    , s }:
+      melpaBuild {
+        pname = "browse-at-remote";
+        version = "0.10.0";
+        src = fetchFromGitHub {
+          owner = "rmuslimov";
+          repo = "browse-at-remote";
+          rev = "47bab994640f086939c30cc6416e770ad067e950";
+          sha256 = "0vhia7xmszcb3lxrb8wh93a3knjfzj48h8nhj4fh8zj1pjz6args";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/browse-at-remote";
+          sha256 = "0s088ba047azba60rlfn3jbqr321vnm953i7dqw2gj9xml90kbm4";
+          name = "recipe";
+        };
+        packageRequires = [ cl-lib f s ];
+        meta = {
+          homepage = "https://melpa.org/#/browse-at-remote";
+          license = lib.licenses.free;
+        };
+      }) {};
+    browse-kill-ring = callPackage ({ fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "browse-kill-ring";
         version = "2.0.0";
         src = fetchFromGitHub {
@@ -3069,10 +3791,10 @@
           rev = "2a7acf98c348c4f405a6b2ab216224ca14915be8";
           sha256 = "0y9m6cv70pzcm0v2v8nwmyh1xx40831chx72m85h5ic5db03gy7b";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/294dc32a672e6b6b0ebfc46cdf0ff9ceacf73e89/recipes/browse-kill-ring";
           sha256 = "1d97ap0vrg5ymp96z7y6si98fspxzy02jh1i4clvw5lggjfibhq4";
-          name = "browse-kill-ring";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -3080,8 +3802,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    browse-url-dwim = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, string-utils }:
-    melpaBuild {
+    browse-url-dwim = callPackage ({ fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild
+                                   , string-utils }:
+      melpaBuild {
         pname = "browse-url-dwim";
         version = "0.6.8";
         src = fetchFromGitHub {
@@ -3090,10 +3816,10 @@
           rev = "11f1c53126619c7ef1bb5f5d6914ce0b3cce0e30";
           sha256 = "08qz9l0gb7fvknzkp67srhldzkk8cylnbn0qwkflxgcs6ndfk95y";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a082c2dc0458e3007a947923f5b97e88217199e8/recipes/browse-url-dwim";
           sha256 = "13bv2ka5pp9k4kwrxfqfawwxzsqlakvpi9a32gxgx7qfi0dcb1rf";
-          name = "browse-url-dwim";
+          name = "recipe";
         };
         packageRequires = [ string-utils ];
         meta = {
@@ -3101,8 +3827,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    bshell = callPackage ({ buffer-manage, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    bshell = callPackage ({ buffer-manage
+                          , emacs
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "bshell";
         version = "0.3";
         src = fetchFromGitHub {
@@ -3111,10 +3842,10 @@
           rev = "884a8b906617d305e9d5d2c3750618d2f86f9aed";
           sha256 = "16qh71yhpxs5cxjmkiqiia8xrxa0ym2n32znp4yc7xiv2xfw2ss4";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cf0ed51304f752af3e1f56caf2856d1521d782a4/recipes/bshell";
           sha256 = "1ds8xvh74i6wqswjp8i30knr74l4gbalkb2jil8qjb9wp9l1gw9z";
-          name = "bshell";
+          name = "recipe";
         };
         packageRequires = [ buffer-manage emacs ];
         meta = {
@@ -3122,8 +3853,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    buffer-flip = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    buffer-flip = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "buffer-flip";
         version = "2.1";
         src = fetchFromGitHub {
@@ -3132,10 +3866,10 @@
           rev = "e093360e05164c78255866c1ac8f966aa38ba514";
           sha256 = "1s35llycdhhclf9kl1q9l7zzzfqrnnvbiqv5csfw0mngfj0lz77f";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3924870cac1392a7eaeeda34b92614c26c674d63/recipes/buffer-flip";
           sha256 = "0ka9ynj528yp1p31hbhm89627v6dpwspybly806n92vxavxrn098";
-          name = "buffer-flip";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -3143,20 +3877,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    buffer-manage = callPackage ({ choice-program, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    buffer-manage = callPackage ({ choice-program
+                                 , dash
+                                 , emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "buffer-manage";
-        version = "0.6";
+        version = "0.7";
         src = fetchFromGitHub {
           owner = "plandes";
           repo = "buffer-manage";
-          rev = "44b26d5c17a4ecea3484727fa46c3d734569a018";
-          sha256 = "0c9hz2532vcbn69am7pd2zyraqgw0q139qsck9hs1vfxnsj4v8dc";
+          rev = "8bbe342a4dafcfdaf305baea98bd4208036ab89a";
+          sha256 = "027d71ppkcq60lkzgal8wv4xpjs4hzgih5ry9q2d4g0dr7wkjp3j";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/28f8f376df810e6ebebba9fb2c93eabbe3526cc9/recipes/buffer-manage";
           sha256 = "0fwri332faybv2apjh8zajqpryi0g4kk3and8djibpvci40l42jb";
-          name = "buffer-manage";
+          name = "recipe";
         };
         packageRequires = [ choice-program dash emacs ];
         meta = {
@@ -3164,8 +3904,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    buffer-move = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    buffer-move = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "buffer-move";
         version = "0.6.2";
         src = fetchFromGitHub {
@@ -3174,10 +3917,10 @@
           rev = "9bf3ff940011c7af3fdd172fa3ea2511c7a8a190";
           sha256 = "0xdks4jfqyhkh34y48iq3gz8swp0f526kwnaai5mhgvazvs4za8c";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e30e053eab078a8bef73e42b90299231ea0997ee/recipes/buffer-move";
           sha256 = "0wysywff2bggrha7lpl83c8x6ln7zgdj9gsqmjva6gramqb260fg";
-          name = "buffer-move";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -3185,8 +3928,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    buffer-utils = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    buffer-utils = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "buffer-utils";
         version = "0.1.0";
         src = fetchFromGitHub {
@@ -3195,10 +3941,10 @@
           rev = "b4d325543e25518d725a2122b49cd72a0d6a079a";
           sha256 = "0rp9hiysy13c4in7b420r7yjza2knlmvphj7l01xbxphbilplqk5";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a082c2dc0458e3007a947923f5b97e88217199e8/recipes/buffer-utils";
           sha256 = "0cfipdn4fc4fvz513mwiaihvbdi05mza3z5z1379wlljw6r539z2";
-          name = "buffer-utils";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -3206,20 +3952,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    buffer-watcher = callPackage ({ f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    buffer-watcher = callPackage ({ f
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "buffer-watcher";
         version = "0.1";
         src = fetchFromGitHub {
           owner = "NicolasPetton";
           repo = "buffer-watcher";
-          rev = "353d76882c65d44341b6f28bd86279dda00c3440";
-          sha256 = "0x9bcnya47pf78p6ksdvs1ca5arvbgyi1q8b9yxq55fg3k9523ln";
+          rev = "056ad29ce1c33c575b371b856b80d580a4b9a7d2";
+          sha256 = "0c4w7mpkc82886gng14h2srlbr138vf7kcs8ajwj6is47zc75nkb";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c8681776d467951d14d8247e6939bd9a6f2a80ec/recipes/buffer-watcher";
           sha256 = "0v096021xk7k821bxb5zddw6sljqa6fs8f7s8j0w3pv6lmhra1ln";
-          name = "buffer-watcher";
+          name = "recipe";
         };
         packageRequires = [ f ];
         meta = {
@@ -3227,20 +3977,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    bufshow = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    bufshow = callPackage ({ fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "bufshow";
         version = "0.1.0";
         src = fetchFromGitHub {
           owner = "pjones";
           repo = "bufshow";
-          rev = "d8424e412d63dcc721c64fbd2ddd2420a03b4e8b";
-          sha256 = "0x9q4amsmawi8jqj9xxg81khvb3gyyf9hjvb0w6vhrgjwpxiq8sy";
+          rev = "984dc947992cada3dcdb7ea066a9794e45daa66f";
+          sha256 = "1mjykz21kx2aj0r9x7j2rh6mr64wd0m7wzn9ppxrw6296l2y253m";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/543a734795eed11aa47a8e1348d14e362b341af0/recipes/bufshow";
           sha256 = "027cd0jzb8yxm66q1bhyi75f2m9f2pq3aswgav1d18na3ybwg65h";
-          name = "bufshow";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -3248,8 +4001,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    bug-reference-github = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    bug-reference-github = callPackage ({ fetchFromGitHub
+                                        , fetchurl
+                                        , lib
+                                        , melpaBuild }:
+      melpaBuild {
         pname = "bug-reference-github";
         version = "1.0.0";
         src = fetchFromGitHub {
@@ -3258,10 +4014,10 @@
           rev = "f570a0532bfb44f095b42cf68ab1f69799101137";
           sha256 = "09rbxgrk7jp9xajya6nccj0ak7fc48wyxq4sfmjmy3q1qfszdsc3";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5dfce86371692dddef78a6c1d772138b487b82cb/recipes/bug-reference-github";
           sha256 = "18yzxwanbrxsab6ba75z1196x0m6dapdhbvy6df5b5x5viz99cf6";
-          name = "bug-reference-github";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -3269,8 +4025,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    bui = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    bui = callPackage ({ dash
+                       , emacs
+                       , fetchFromGitHub
+                       , fetchurl
+                       , lib
+                       , melpaBuild }:
+      melpaBuild {
         pname = "bui";
         version = "1.1.0";
         src = fetchFromGitHub {
@@ -3279,10 +4040,10 @@
           rev = "3bf8af2f339d2483203eda2c97a61b8771c3269d";
           sha256 = "1qx7cdm7jd15rf1silwj1yh0mg5fhldfi001k1msi50nyni90c82";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/38b7c9345de75a707b4a73e8bb8e2f213e4fd739/recipes/bui";
           sha256 = "0a4g55k02hi3cwvk4d35lk2x5kc4fabskl2025i83hx0rqw4w3f1";
-          name = "bui";
+          name = "recipe";
         };
         packageRequires = [ dash emacs ];
         meta = {
@@ -3290,8 +4051,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    build-status = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    build-status = callPackage ({ cl-lib ? null
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "build-status";
         version = "0.0.2";
         src = fetchFromGitHub {
@@ -3300,10 +4065,10 @@
           rev = "c29a0146c5d0be274f5e17921e01698f572c23a1";
           sha256 = "03f0h7sp0sr9kjyhvcx7i34lvc26f5x8nikfidihgzhrqpprv2b6";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/23bbe012f313cf0cf4c45a66eb0bee9361ced564/recipes/build-status";
           sha256 = "0ckyf0asll50gifx1v0qqzpimjms8i1rgw9bnqiyj861qn5hch92";
-          name = "build-status";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -3311,8 +4076,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    bundler = callPackage ({ fetchFromGitHub, fetchurl, inf-ruby, lib, melpaBuild }:
-    melpaBuild {
+    bundler = callPackage ({ fetchFromGitHub
+                           , fetchurl
+                           , inf-ruby
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "bundler";
         version = "1.1.0";
         src = fetchFromGitHub {
@@ -3321,10 +4090,10 @@
           rev = "4cb4fafe092d587cc9e58ff61cf900fb7f409adf";
           sha256 = "18d74nwcpk1i8adxzfwz1lgqqcxsc4wkrb490v64pph79dxsi80h";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ade7d0f0f0e553b48634e60ecaf7b91d0776d5f0/recipes/bundler";
           sha256 = "0i5ybc6i8ackxpaa75kwrg44zdq3jkvy48c42vaaafpddjwjnsy4";
-          name = "bundler";
+          name = "recipe";
         };
         packageRequires = [ inf-ruby ];
         meta = {
@@ -3332,20 +4101,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    bury-successful-compilation = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    bury-successful-compilation = callPackage ({ fetchFromGitHub
+                                               , fetchurl
+                                               , lib
+                                               , melpaBuild }:
+      melpaBuild {
         pname = "bury-successful-compilation";
         version = "0.1";
         src = fetchFromGitHub {
           owner = "EricCrosson";
           repo = "bury-successful-compilation";
-          rev = "ca58a5df0aa3f266a8df0e3e5d3d962c086be0a9";
-          sha256 = "03hab3iw2jjckal20zwsw7cm38nf7pan0m96d8ab4i75phy6liyw";
+          rev = "7b16dc71b43914928cc16da674e69d7af975238a";
+          sha256 = "08ny1iycsgpal99g180w9yvk6ql8qn2kkc9xk9lmfv5p1wqm3l4w";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f66e2e23c7a1fa0ce6fa8a0e814242b7c46c299c/recipes/bury-successful-compilation";
           sha256 = "1gkq4r1573m6m57fp7x69k7kcpqchpcqfcz3792v0wxr22zhkwr3";
-          name = "bury-successful-compilation";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -3353,8 +4125,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    butler = callPackage ({ deferred, emacs, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }:
-    melpaBuild {
+    butler = callPackage ({ deferred
+                          , emacs
+                          , fetchFromGitHub
+                          , fetchurl
+                          , json ? null
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "butler";
         version = "0.2.4";
         src = fetchFromGitHub {
@@ -3363,10 +4141,10 @@
           rev = "0e91e0f01ac9c09422f076a096ee567ee138e7a4";
           sha256 = "1pii9dw4skq7nr4na6qxqasl36av8cwjp71bf1fgppqpcd9z8skj";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c86e3f5083e59568afac69eed9aa8c1a0bd76e2e/recipes/butler";
           sha256 = "1jv74l9jy55qpwf5np9nlj6a1wqsm3xirm7wm89d1h2mbsfcr0mq";
-          name = "butler";
+          name = "recipe";
         };
         packageRequires = [ deferred emacs json ];
         meta = {
@@ -3374,20 +4152,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    buttercup = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    buttercup = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "buttercup";
-        version = "1.11";
+        version = "1.12";
         src = fetchFromGitHub {
           owner = "jorgenschaefer";
           repo = "emacs-buttercup";
-          rev = "8d27bb99463bc230a76dee96378dd337622988f5";
-          sha256 = "0s5vfzcfsiqb6bc6jh95a2dyy23b4bvhdpzn2fcq8awldbpx51fh";
+          rev = "39d625ce53bb1e1b9b03d9c9c70aa81e94fcc66a";
+          sha256 = "1y97af0kl0yiirnajn44jcz865acndjwkr3zhpf65lm0bbaxfp2a";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d4b187cb5b3cc5b546bfa6b94b6792e6363242d1/recipes/buttercup";
           sha256 = "1grrrdk5pl9l1jvnwzl8g0102gipvxb5qn6k2nmv28jpl57v8dkb";
-          name = "buttercup";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -3395,20 +4176,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    button-lock = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    button-lock = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "button-lock";
         version = "1.0.2";
         src = fetchFromGitHub {
           owner = "rolandwalker";
           repo = "button-lock";
-          rev = "cd0bf4a3c2f224d851e6ed8a54a6e80c129b225f";
-          sha256 = "1kqcc1d56jz107bswlzvdng6ny6qwp93yck2i2j921msn62qvbb2";
+          rev = "9a8f950e06ff222b667c38facf4fb9d6ef6f1d8e";
+          sha256 = "1rga1m50bhps4kv841g798w7vn80kcwyinb4ra33ldri7jyx34qj";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/83459421dd2eb3d60ec668c3d5bb38d99ee64aff/recipes/button-lock";
           sha256 = "1arrdmb3nm570hgs18y9sz3z9v0wlkr3vwa2zgfnc15lmf0y34mp";
-          name = "button-lock";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -3416,8 +4200,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    cacoo = callPackage ({ concurrent, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    cacoo = callPackage ({ concurrent
+                         , fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "cacoo";
         version = "2.1.2";
         src = fetchFromGitHub {
@@ -3426,10 +4214,10 @@
           rev = "c2e6a8830144810cd4e51de3646cb8200bcebbc6";
           sha256 = "1k2hmc87ifww95k3m8ksiswkk2z0y8grssba7381g8dnlp6jgprx";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2bd55f5c29876c2483001cd9deaca68cab5054b9/recipes/cacoo";
           sha256 = "0kri4vi6dpsf0zk24psm16f3aa27cq5b54ga7zygmr02csq24a6z";
-          name = "cacoo";
+          name = "recipe";
         };
         packageRequires = [ concurrent ];
         meta = {
@@ -3437,8 +4225,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    cake-inflector = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    cake-inflector = callPackage ({ fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild
+                                  , s }:
+      melpaBuild {
         pname = "cake-inflector";
         version = "1.1.1";
         src = fetchFromGitHub {
@@ -3447,10 +4239,10 @@
           rev = "40bf11890842ba305954528694e1c39a8b73737b";
           sha256 = "1w7yq35gzzwyf480d8gc5r6jbnawg09l6663q068ir6zr9pp4far";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/77c46238b632047160d6dfac9b257f57b0c4283b/recipes/cake-inflector";
           sha256 = "04mrqcm1igb638skaq2b3nr5yzxnck2vwhln61rnh7lkfxq7wbwf";
-          name = "cake-inflector";
+          name = "recipe";
         };
         packageRequires = [ s ];
         meta = {
@@ -3458,8 +4250,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    calendar-norway = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    calendar-norway = callPackage ({ fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "calendar-norway";
         version = "0.9.3";
         src = fetchFromGitHub {
@@ -3468,10 +4263,10 @@
           rev = "8501b2ee515e995f345365391b03f44c812cabdf";
           sha256 = "0lch835rq2rqyh0vyi75dhyl7hm6bv27f2z753wggh0jyg6qxi7a";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c5d01230027d5cec9da2545a9ce9270a611f6567/recipes/calendar-norway";
           sha256 = "1i23ks0bnq62bvn3szvqf0ikcam4s92yvr998mkjxhdhc94zd19c";
-          name = "calendar-norway";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -3479,8 +4274,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    calfw = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    calfw = callPackage ({ fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "calfw";
         version = "1.6";
         src = fetchFromGitHub {
@@ -3489,10 +4287,10 @@
           rev = "c538d3746449b4f0e16b16aad3073d4f7379d805";
           sha256 = "0r42cagvmvvib76kd15nd9ix55ys6i549vxnls4z16s864695zpa";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cc64274abdc7c8fb904b43d2d036aac98e738131/recipes/calfw";
           sha256 = "0am1nafc16zax8082gjlz0pi85lryjhrx0v80nzgr23iybj5mfx4";
-          name = "calfw";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -3500,20 +4298,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    calfw-cal = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    calfw-cal = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "calfw-cal";
         version = "1.6";
         src = fetchFromGitHub {
           owner = "kiwanami";
           repo = "emacs-calfw";
-          rev = "c538d3746449b4f0e16b16aad3073d4f7379d805";
-          sha256 = "0r42cagvmvvib76kd15nd9ix55ys6i549vxnls4z16s864695zpa";
+          rev = "136dce009a26e7d8a8064af422c2cf8170e852c5";
+          sha256 = "1hiip8hfl7myimgba7ggs1ki1pk3ag7nyfa8j2zzm87n93g5xia4";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cc64274abdc7c8fb904b43d2d036aac98e738131/recipes/calfw-cal";
           sha256 = "1wylkd7jl1ifq56jj04l5b9wfrjkhwncxzrjgnbgg1cl2klf6v4m";
-          name = "calfw-cal";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -3521,20 +4322,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    calfw-howm = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    calfw-howm = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "calfw-howm";
         version = "1.6";
         src = fetchFromGitHub {
           owner = "kiwanami";
           repo = "emacs-calfw";
-          rev = "c538d3746449b4f0e16b16aad3073d4f7379d805";
-          sha256 = "0r42cagvmvvib76kd15nd9ix55ys6i549vxnls4z16s864695zpa";
+          rev = "4f6e5d4d917b9d346a8867941b90133e50e820d8";
+          sha256 = "0dkilf8kvxcy6rr2bynzyk5kf8dqcxhm9b9h36g8h11j181p6bl7";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cc64274abdc7c8fb904b43d2d036aac98e738131/recipes/calfw-howm";
           sha256 = "08cv16cq211sy2v1i0gk7d81f0gyywv0i9szmamnrbjif3rrv2m0";
-          name = "calfw-howm";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -3542,20 +4346,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    calfw-ical = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    calfw-ical = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "calfw-ical";
         version = "1.6";
         src = fetchFromGitHub {
           owner = "kiwanami";
           repo = "emacs-calfw";
-          rev = "c538d3746449b4f0e16b16aad3073d4f7379d805";
-          sha256 = "0r42cagvmvvib76kd15nd9ix55ys6i549vxnls4z16s864695zpa";
+          rev = "a67fa1023b3fddc1d1f38114c1d207376c8e6289";
+          sha256 = "0g8s3pgivqk1vqdgkndznkl48c4m5yiahkjxyqyv2781hdb4f6xa";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cc64274abdc7c8fb904b43d2d036aac98e738131/recipes/calfw-ical";
           sha256 = "1bh9ahwp9b5knjxph79kl19fgs48x3w7dga299l0xvbxq2jhs95q";
-          name = "calfw-ical";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -3563,20 +4370,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    calfw-org = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    calfw-org = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "calfw-org";
         version = "1.6";
         src = fetchFromGitHub {
           owner = "kiwanami";
           repo = "emacs-calfw";
-          rev = "c538d3746449b4f0e16b16aad3073d4f7379d805";
-          sha256 = "0r42cagvmvvib76kd15nd9ix55ys6i549vxnls4z16s864695zpa";
+          rev = "e03ae470788778e7714b73520014eadc03a88abd";
+          sha256 = "0rhasr818qijd2pcgifi0j3q4fkbiw2ck1nivajk7m810p53bxbj";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cc64274abdc7c8fb904b43d2d036aac98e738131/recipes/calfw-org";
           sha256 = "1cfpjh08djz3k067w3580yb15p1csks3gzch9c4cbrbcjvg8inh5";
-          name = "calfw-org";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -3584,8 +4394,16 @@
           license = lib.licenses.free;
         };
       }) {};
-    call-graph = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, hierarchy, ivy, lib, melpaBuild, tree-mode }:
-    melpaBuild {
+    call-graph = callPackage ({ cl-lib ? null
+                              , emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , hierarchy
+                              , ivy
+                              , lib
+                              , melpaBuild
+                              , tree-mode }:
+      melpaBuild {
         pname = "call-graph";
         version = "0.1.0";
         src = fetchFromGitHub {
@@ -3594,10 +4412,10 @@
           rev = "0bbe292b1b9c7ba1d8a65ed5e475f6a53f5f9f27";
           sha256 = "0kckjs7yg8d04nir5z3f00k05272kgma98794g0ycgfn1vrck0h0";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a6acf099e2510c82b4b03e2f35051afc3d28af45/recipes/call-graph";
           sha256 = "0cklr79gqqrb94jq8aq65wqriamay78vv9sd3jrvp86ixl3ig5xc";
-          name = "call-graph";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs hierarchy ivy tree-mode ];
         meta = {
@@ -3605,8 +4423,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    camcorder = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, names }:
-    melpaBuild {
+    camcorder = callPackage ({ cl-lib ? null
+                             , emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild
+                             , names }:
+      melpaBuild {
         pname = "camcorder";
         version = "0.2";
         src = fetchFromGitHub {
@@ -3615,10 +4439,10 @@
           rev = "a2b5e0629ee3c01ead684e148965ac68e533efbd";
           sha256 = "0v927m3l5cf0j0rs0nfk5whwqmmxs941d8qalxi19j1ihspjz8d6";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/camcorder";
           sha256 = "1kbnpz3kn8ycpy8nlp8bsnnd1k1h7m02h7w5f7raw97sk4cnpvbi";
-          name = "camcorder";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs names ];
         meta = {
@@ -3626,20 +4450,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    caml = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    caml = callPackage ({ fetchFromGitHub
+                        , fetchurl
+                        , lib
+                        , melpaBuild }:
+      melpaBuild {
         pname = "caml";
-        version = "4.7.0beta2";
+        version = "4.7.0";
         src = fetchFromGitHub {
           owner = "ocaml";
           repo = "ocaml";
-          rev = "c0bd6a27e138911560f43dc75d5fde2ade4d6cfe";
-          sha256 = "0z08mpvfa5jvbdxkx9wlarn1zpp01aaxasmy63cz452jr8zg0nll";
+          rev = "ca71bda2ac7e5143f58fa9a1693f97e709a91332";
+          sha256 = "1ksx2ym5s68m87rnjjkdwhp5ci6cfw0yhmjjmq1r4a0d0r77x4lr";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d5a3263cdcc229b11a3e96edbf632d56f32c47aa/recipes/caml";
           sha256 = "1ixs0626nsg1ilqdwj5rd8kicjy7mprswwy0kprppmpmc8y7xf7c";
-          name = "caml";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -3647,8 +4474,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    cargo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, rust-mode }:
-    melpaBuild {
+    cargo = callPackage ({ emacs
+                         , fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild
+                         , rust-mode }:
+      melpaBuild {
         pname = "cargo";
         version = "0.4.1";
         src = fetchFromGitHub {
@@ -3657,10 +4489,10 @@
           rev = "b0487f95a7de7a1d6f03cdd05220f633977d65a2";
           sha256 = "0r9v7q7hkdw2q3iifyrb6n9jrssz2rcv2xcc7n1nmg1v40av3ijd";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e997b356b009b3d2ab467fe49b79d728a8cfe24b/recipes/cargo";
           sha256 = "06zq657cxfk5l4867qqsvhskcqc9wswyl030wj27a43idj8n41jx";
-          name = "cargo";
+          name = "recipe";
         };
         packageRequires = [ emacs rust-mode ];
         meta = {
@@ -3668,8 +4500,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    caseformat = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    caseformat = callPackage ({ cl-lib ? null
+                              , dash
+                              , emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild
+                              , s }:
+      melpaBuild {
         pname = "caseformat";
         version = "0.1.0";
         src = fetchFromGitHub {
@@ -3678,10 +4517,10 @@
           rev = "72707c9f0f0819b4e2aa45876432a293aa07f814";
           sha256 = "0mg49rpz362ipn5qzqhyfs3d6fpb51rfa73kna3gxdw0wxq2sa7g";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ba158fbeebcda6b6122b18c97ab8042b1c0a0bc0/recipes/caseformat";
           sha256 = "1qwyr74jbx4jpfcw8sccg47q1vdg094rr06m111gsz2yaj9m0gfk";
-          name = "caseformat";
+          name = "recipe";
         };
         packageRequires = [ cl-lib dash emacs s ];
         meta = {
@@ -3689,20 +4528,30 @@
           license = lib.licenses.free;
         };
       }) {};
-    cask = callPackage ({ cl-lib ? null, dash, epl, f, fetchFromGitHub, fetchurl, lib, melpaBuild, package-build, s, shut-up }:
-    melpaBuild {
+    cask = callPackage ({ cl-lib ? null
+                        , dash
+                        , epl
+                        , f
+                        , fetchFromGitHub
+                        , fetchurl
+                        , lib
+                        , melpaBuild
+                        , package-build
+                        , s
+                        , shut-up }:
+      melpaBuild {
         pname = "cask";
-        version = "0.8.3";
+        version = "0.8.4";
         src = fetchFromGitHub {
           owner = "cask";
           repo = "cask";
-          rev = "ccfe38ae133cc843865f87607d3f4f3960b76870";
-          sha256 = "1bv0lganh5xhjp2r84js596p1sqndvxnhn3q6l7m7lcdxrjckcy8";
+          rev = "ba5f6eb78178deb954ab9ac02e0e370315097ebe";
+          sha256 = "1p37lq8xpyq0rc7phxgsw3b73h8vf9rkpa5959rb5k46w6ps9686";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b86c666ee9b0620390a250dddd42b17cbec2409f/recipes/cask";
           sha256 = "11nr6my3vlb1xiyai7qwii3nszda2mnkhkjlbh3d0699h0yw7dk5";
-          name = "cask";
+          name = "recipe";
         };
         packageRequires = [ cl-lib dash epl f package-build s shut-up ];
         meta = {
@@ -3710,20 +4559,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    cask-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    cask-mode = callPackage ({ emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "cask-mode";
         version = "0.1";
         src = fetchFromGitHub {
           owner = "Wilfred";
           repo = "cask-mode";
-          rev = "5203b1beac4dd2ee07a6e993bc86719f5f35dbbf";
-          sha256 = "09y4cr32i2cw06lnq698lajxmqyzq2ah426f4dm176xfbrim89d5";
+          rev = "90a257549aa201a12c2b07157f650e3cdd7af06e";
+          sha256 = "07qisn5sqdw6y0avfhhj57rwbdjxc0dfxmpf0ax5l8fgq6m0h5qc";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2d8bc1afaf69b4f29ba1bb0243c25574bc1197cc/recipes/cask-mode";
           sha256 = "0fs9zyihipr3klnh3w22h43qz0wnxplm62x4kx7pm1chq9bc9kz6";
-          name = "cask-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -3731,8 +4584,19 @@
           license = lib.licenses.free;
         };
       }) {};
-    cask-package-toolset = callPackage ({ ansi, cl-lib ? null, commander, dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s, shut-up }:
-    melpaBuild {
+    cask-package-toolset = callPackage ({ ansi
+                                        , cl-lib ? null
+                                        , commander
+                                        , dash
+                                        , emacs
+                                        , f
+                                        , fetchFromGitHub
+                                        , fetchurl
+                                        , lib
+                                        , melpaBuild
+                                        , s
+                                        , shut-up }:
+      melpaBuild {
         pname = "cask-package-toolset";
         version = "0.9.2";
         src = fetchFromGitHub {
@@ -3741,10 +4605,10 @@
           rev = "2c74cd827e88c7f8360581a841e45f0b794510e7";
           sha256 = "1hk5q6p1j7cqg5srr3v21xfyy7aas4hfj1a66h21c2xvfjra3hxw";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ed71e45389626e700b93b29d5e2659b6706274d8/recipes/cask-package-toolset";
           sha256 = "13ix093c0a58rjqj7zfp3914xj3hvj276gb2d8zhvrx9vvs1345g";
-          name = "cask-package-toolset";
+          name = "recipe";
         };
         packageRequires = [ ansi cl-lib commander dash emacs f s shut-up ];
         meta = {
@@ -3752,8 +4616,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    caskxy = callPackage ({ fetchFromGitHub, fetchurl, lib, log4e, melpaBuild, yaxception }:
-    melpaBuild {
+    caskxy = callPackage ({ fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , log4e
+                          , melpaBuild
+                          , yaxception }:
+      melpaBuild {
         pname = "caskxy";
         version = "0.0.5";
         src = fetchFromGitHub {
@@ -3762,10 +4631,10 @@
           rev = "279f3ab79bd77fe69cb3148a79896b9bf118a9b3";
           sha256 = "1j1lw5zifp7q1ykm6si0nzxfp7n3z2lzla2njkkxmc2s6m7w4x1a";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1d61aea505e4913879f68081497e85542e9fd786/recipes/caskxy";
           sha256 = "0x4s3c8m75zxsvqpgfc5xwll0489zzdnngmnq048z9gkgcd7pd2s";
-          name = "caskxy";
+          name = "recipe";
         };
         packageRequires = [ log4e yaxception ];
         meta = {
@@ -3773,7 +4642,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    catmacs = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
+    catmacs = callPackage ({ fetchgit
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "catmacs";
         version = "0.1.1";
         src = fetchgit {
@@ -3781,10 +4654,10 @@
           rev = "c6e8277bd2aab3f5fbf10d419111110f3b33564f";
           sha256 = "0kdlmmqgpgmhbbvafywllqdwkkd5a41rf8zhfmxhs3ydza86hmlg";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e62e45ea234a574ed602f27c3c6bc240bcd4fa43/recipes/catmacs";
           sha256 = "0ym1szmq9ib75yiyy5jw647fcs7gg0d5dkskqc293pg81qf3im50";
-          name = "catmacs";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -3792,8 +4665,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    cbm = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    cbm = callPackage ({ cl-lib ? null
+                       , fetchFromGitHub
+                       , fetchurl
+                       , lib
+                       , melpaBuild }:
+      melpaBuild {
         pname = "cbm";
         version = "0.6";
         src = fetchFromGitHub {
@@ -3802,10 +4679,10 @@
           rev = "5b41c936ba9f6d170309a85ffebc9939c1050b31";
           sha256 = "091ln3d0jhdgahbwfdm1042b19886n3kwipw5gk8d0jnq5vwrkws";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f28dbc97dc23cdb0b4c74f8805775c787635871e/recipes/cbm";
           sha256 = "02ch0gdw610c8dfxxjxs7ijsc9lzbhklj7hqgwfwksnyc36zcjmn";
-          name = "cbm";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -3813,20 +4690,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    cdlatex = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    cdlatex = callPackage ({ fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "cdlatex";
         version = "4.7";
         src = fetchFromGitHub {
           owner = "cdominik";
           repo = "cdlatex";
-          rev = "b7183c2200392b6d85fca69390f4a65fac7a7b19";
+          rev = "1d491c2dddb05cdace1ae0e1f56a36009b065d85";
           sha256 = "1jj9vmhc4s3ych08bjm1c2xwi81z1p20rj7bvxrgvb5aga2ghi9d";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/cdlatex";
           sha256 = "021gj0jw93r8gk0cacw1ldfibpwr6fpkcrnign7b4nqqnb3135k9";
-          name = "cdlatex";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -3834,8 +4714,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    cdnjs = callPackage ({ dash, deferred, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }:
-    melpaBuild {
+    cdnjs = callPackage ({ dash
+                         , deferred
+                         , f
+                         , fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild
+                         , pkg-info }:
+      melpaBuild {
         pname = "cdnjs";
         version = "0.2.1";
         src = fetchFromGitHub {
@@ -3844,10 +4731,10 @@
           rev = "ce19880d3ec3d81e6c665d0b1dfea99cc7a3f908";
           sha256 = "02j45ngddx7n5gvy42r8y3s22bmxlnvg2pqjfh0li8m599fnd11h";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/66e4ce4e2c7e4aaac9dc0ce476c4759b000ff5d6/recipes/cdnjs";
           sha256 = "1clm86n643z1prxrlxlg59jg43l9wwm34x5d88bj6yvix8g6wkb7";
-          name = "cdnjs";
+          name = "recipe";
         };
         packageRequires = [ dash deferred f pkg-info ];
         meta = {
@@ -3855,8 +4742,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    celery = callPackage ({ dash-functional, deferred, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    celery = callPackage ({ dash-functional
+                          , deferred
+                          , emacs
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild
+                          , s }:
+      melpaBuild {
         pname = "celery";
         version = "0.0.3";
         src = fetchFromGitHub {
@@ -3865,10 +4759,10 @@
           rev = "163ebede3f6a7f59202ff319675b0873dd1de365";
           sha256 = "07h5g905i1jglsryl0dnqxz8yya5kkyjjggzbk4nl3rcj41lyas7";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4b896b2b89d990a7ce2f4bf4ce0aee0d126f3e55/recipes/celery";
           sha256 = "0m3hmvp6xz2m7z1kbb0ii0j3c95zi19652gfixq5a5x23kz8y59h";
-          name = "celery";
+          name = "recipe";
         };
         packageRequires = [ dash-functional deferred emacs s ];
         meta = {
@@ -3876,20 +4770,27 @@
           license = lib.licenses.free;
         };
       }) {};
-    cerbere = callPackage ({ f, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild, pkg-info, s }:
-    melpaBuild {
+    cerbere = callPackage ({ f
+                           , fetchFromGitHub
+                           , fetchurl
+                           , go-mode
+                           , lib
+                           , melpaBuild
+                           , pkg-info
+                           , s }:
+      melpaBuild {
         pname = "cerbere";
         version = "0.1.0";
         src = fetchFromGitHub {
           owner = "nlamirault";
           repo = "cerbere";
-          rev = "11de1e7ec5126083ae697f5a9993facdb9895f9d";
-          sha256 = "08hqgsjvs62l1cfzshbpj80xd8365qmx2b5r5jq20d5cj68s36wl";
+          rev = "f9fb567b01bde8870ce36293ed8206a056169bbd";
+          sha256 = "1nkqah0igjwv5yhx5yrp42pyi87vzlp1q10sn4l3a0spixn1mnlf";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4145e270a2113f30f8bb4d0f6c335f1c76f77b1c/recipes/cerbere";
           sha256 = "1g3svmh5dlh5mvyag3hmiy90dfkk6f7ppd9qpwckxqyll9vl7r06";
-          name = "cerbere";
+          name = "recipe";
         };
         packageRequires = [ f go-mode pkg-info s ];
         meta = {
@@ -3897,8 +4798,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    ceylon-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ceylon-mode = callPackage ({ emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "ceylon-mode";
         version = "0.2";
         src = fetchFromGitHub {
@@ -3907,10 +4812,10 @@
           rev = "00f790b3ed5ec48e2461e20a4d466ba45c634e13";
           sha256 = "08zk6aspy59gv3989zxz0ibxxwkbjasa83ilpzvpcwszrzq8x640";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/09cd1a2ccf33b209a470780a66d54e1b1d597a86/recipes/ceylon-mode";
           sha256 = "0dgqmmb8qmvzn557h0fw1mx4y0p96870l8f8glizkk3fifg7wgq4";
-          name = "ceylon-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -3918,20 +4823,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    cfengine-code-style = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    cfengine-code-style = callPackage ({ fetchFromGitHub
+                                       , fetchurl
+                                       , lib
+                                       , melpaBuild }:
+      melpaBuild {
         pname = "cfengine-code-style";
-        version = "3.11.0";
+        version = "3.12.0";
         src = fetchFromGitHub {
           owner = "cfengine";
           repo = "core";
-          rev = "520851447dba901097b121b58b1a0da370481a2c";
-          sha256 = "0sz4zqw2s7f5rhqad4kmrfdsl24xqflfsm4hzfbwzvsrlp7ndis7";
+          rev = "10e43677e99a29d8072bb120e7cd7b9d03b1218f";
+          sha256 = "0mncl7wb2vi620snk4z01k0wdbvvd5b2nw9nlnfr9a4hkn3fg44r";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c737839aeda583e61257ad40157e24df7f918b0f/recipes/cfengine-code-style";
           sha256 = "1ny8xvdnz740qmw9m81xnwd0gh0a516arpvl3nfimglaai5bfc9a";
-          name = "cfengine-code-style";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -3939,20 +4847,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    cframe = callPackage ({ buffer-manage, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    cframe = callPackage ({ buffer-manage
+                          , dash
+                          , emacs
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "cframe";
         version = "0.1";
         src = fetchFromGitHub {
           owner = "plandes";
           repo = "cframe";
-          rev = "bb99672502046e87c8f029ce98c637f762a4fc54";
-          sha256 = "088px3wlvr4km913y7hajrjqnxnv6n325rk6353bkbah2d75vxq4";
+          rev = "61844d948e4464625f7023de62aeb27ca742b36f";
+          sha256 = "1v413kvygfkdiqi9zg6ypihf2vcks0vs80qshg0ynm5zy27f984y";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6e39555b2538cc8a955766c5533871396e8fe712/recipes/cframe";
           sha256 = "0pngdaflk1pk2xmwbij4b520b3mlacnjab4r3jby0phah44ziv4l";
-          name = "cframe";
+          name = "recipe";
         };
         packageRequires = [ buffer-manage dash emacs ];
         meta = {
@@ -3960,20 +4874,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    chapel-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    chapel-mode = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "chapel-mode";
         version = "1.0.0";
         src = fetchFromGitHub {
           owner = "russel";
           repo = "Emacs-Chapel-Mode";
-          rev = "936a76a26bdc4f9570c4d54369f74bcd1cb0a698";
-          sha256 = "0n93qz5hzsnrs6c3y5yighfpdpkkmabxyi5i755hfcs5007v199v";
+          rev = "816a1a54ff5ffdd20b6a4d249ace774740a3924c";
+          sha256 = "0kp18xlc1005hbkfhng03y4xgaicqf6b5vwgnwbbw9s5qzirmhix";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ff32db72ad55a7191b5105192480e17535c7edde/recipes/chapel-mode";
           sha256 = "0hmnsv8xf85fc4jqkaqz5j3sf56hgib4jp530vvyc2dl2sps6vzz";
-          name = "chapel-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -3981,8 +4898,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    char-menu = callPackage ({ avy-menu, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    char-menu = callPackage ({ avy-menu
+                             , emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "char-menu";
         version = "0.1.1";
         src = fetchFromGitHub {
@@ -3991,10 +4913,10 @@
           rev = "f4d8bf8fa6787e2aaca2ccda5223646541d7a4b2";
           sha256 = "0zyi1ha17jk3zz7nirasrrx43j3jkrsfz7ypbc4mk44w7hsvx2hj";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f6676747e853045b3b19e7fc9524c793c6a08303/recipes/char-menu";
           sha256 = "11jkwghrmmvpv7piznkpa0wilwjdsps9rix3950pfabhlllw268l";
-          name = "char-menu";
+          name = "recipe";
         };
         packageRequires = [ avy-menu emacs ];
         meta = {
@@ -4002,8 +4924,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    charmap = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    charmap = callPackage ({ fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "charmap";
         version = "0.0.1";
         src = fetchFromGitHub {
@@ -4012,10 +4937,10 @@
           rev = "165193d91ef96f563ae8366ed4c1a2df5a4eaed2";
           sha256 = "0crnd64cnsnaj5mcy55q0sc1rnamxa1xbpwpmirhyhxz780klww6";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/11c549fca81c4276054f614d86d17fa7af4ab32e/recipes/charmap";
           sha256 = "1j7762d2i17ysn9ys8j7wfv989avmax8iylml2hc26mwbpyfpm84";
-          name = "charmap";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -4023,8 +4948,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    chatwork = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    chatwork = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "chatwork";
         version = "0.3";
         src = fetchFromGitHub {
@@ -4033,10 +4961,10 @@
           rev = "fea231d479f06bf40dbfcf45de143eecc9ed744c";
           sha256 = "163xr18lm4awfgh4lcp7pr04jirpvlk8w1g4445zbxbpjfvv268z";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/77ae72e62b8771e890525c063522e7091ca8f674/recipes/chatwork";
           sha256 = "0p71swcpfqbx2zmp5nh57f0m30cn68g3019005wa5x4fg7dx746p";
-          name = "chatwork";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -4044,8 +4972,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    cheat-sh = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    cheat-sh = callPackage ({ emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "cheat-sh";
         version = "1.7";
         src = fetchFromGitHub {
@@ -4054,10 +4986,10 @@
           rev = "6409bb66241255cc9a0362f2acdcb0b34344f9f2";
           sha256 = "1nmsja1s45fs93v2vbalfralixvzp88rgv47vf9p80i7x6w2149m";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ebac62fb3828d81e30145b9948d60e781e20eda2/recipes/cheat-sh";
           sha256 = "0f6wqyh3c3ap0l6khikqlw8sqqi6fsl468gn157faza4x63j9z80";
-          name = "cheat-sh";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -4065,8 +4997,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    checkbox = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    checkbox = callPackage ({ cl-lib ? null
+                            , emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "checkbox";
         version = "0.2.1";
         src = fetchFromGitHub {
@@ -4075,10 +5012,10 @@
           rev = "2afc2011fa35ccfa0ce9ef46cb1896911fa340d1";
           sha256 = "09ypxhfad3v1pz0xhw4xgxvfj7ad2kb3ff9zy1mnw7fzsa7gw6nj";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/81c4a9d10238836865716f5ea45f8e0e625a87c6/recipes/checkbox";
           sha256 = "17gw6w1m6bs3sfx8nqa8nzdq26m8w85a0fca5qw3bmd18bcmknqa";
-          name = "checkbox";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -4086,8 +5023,39 @@
           license = lib.licenses.free;
         };
       }) {};
-    chinese-word-at-point = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    chee = callPackage ({ dash
+                        , f
+                        , fetchFromGitHub
+                        , fetchurl
+                        , lib
+                        , melpaBuild
+                        , s }:
+      melpaBuild {
+        pname = "chee";
+        version = "0.3.0";
+        src = fetchFromGitHub {
+          owner = "eikek";
+          repo = "chee";
+          rev = "beeaa5bb2ce92f1a745440c7ff7468e5f6524701";
+          sha256 = "1n0n6rnhms2mgh9yjc5whhf3n37y5lp9jk3ban6f6hn55f8p1gmk";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/25b445a1dea5e8f1042bed6b5372471c25129fd8/recipes/chee";
+          sha256 = "1sw84qaca2cwgrw332wfqjp3kg3axgi9n6wx5a6h2n3liq5yr1wj";
+          name = "recipe";
+        };
+        packageRequires = [ dash f s ];
+        meta = {
+          homepage = "https://melpa.org/#/chee";
+          license = lib.licenses.free;
+        };
+      }) {};
+    chinese-word-at-point = callPackage ({ cl-lib ? null
+                                         , fetchFromGitHub
+                                         , fetchurl
+                                         , lib
+                                         , melpaBuild }:
+      melpaBuild {
         pname = "chinese-word-at-point";
         version = "0.2.3";
         src = fetchFromGitHub {
@@ -4096,10 +5064,10 @@
           rev = "36a03cce32fe059d2b581cb2e029715c0be81074";
           sha256 = "1jsy43avingxxccs0zw2qm5ysx8g76xhhh1mnyypxskl9m60qb4j";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c9b7785eca577218feade982c979694389f37ec3/recipes/chinese-word-at-point";
           sha256 = "0pjs4ckncv84qrdj0pyibrbiy86f1gmjla9n2cgh10xbc7j9y0c4";
-          name = "chinese-word-at-point";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -4107,8 +5075,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    choice-program = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    choice-program = callPackage ({ cl-lib ? null
+                                  , emacs
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "choice-program";
         version = "0.4";
         src = fetchFromGitHub {
@@ -4117,10 +5090,10 @@
           rev = "27607ec1fe241c58fbc1f861454a8e2ec1fd7b15";
           sha256 = "0q8krgsydrc2xc29y60qljifdvxfmxnvbncxsh64xhrzsnrgwmq5";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6e39555b2538cc8a955766c5533871396e8fe712/recipes/choice-program";
           sha256 = "0a21yd3b8sb15vms9mclaa7xnnk0as08p6q38mwdwjp9sgcfyh1b";
-          name = "choice-program";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -4128,20 +5101,29 @@
           license = lib.licenses.free;
         };
       }) {};
-    cider = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, queue, seq, spinner }:
-    melpaBuild {
+    cider = callPackage ({ clojure-mode
+                         , emacs
+                         , fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild
+                         , pkg-info
+                         , queue
+                         , seq
+                         , spinner }:
+      melpaBuild {
         pname = "cider";
-        version = "0.16.0";
+        version = "0.17.0";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "cider";
-          rev = "74f7901b416efbd032bb4f8b5c25f57fdf731115";
-          sha256 = "0n2b6q8r2gzr3ghyvg5sawir47rk7jmsslvxx6by27bn77h4nzil";
+          rev = "5b1c148078b3c6083f7777f2c3349d5c6403fdba";
+          sha256 = "0yl1s84kq3438rbndzaxsxghjps82pgjpv76n5dwbkzcwpb84wn9";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/55a937aed818dbe41530037da315f705205f189b/recipes/cider";
           sha256 = "1a6hb728a3ir18c2dn9zfd3jn79fi5xjn5gqr7ljy6qb063xd4qx";
-          name = "cider";
+          name = "recipe";
         };
         packageRequires = [ clojure-mode emacs pkg-info queue seq spinner ];
         meta = {
@@ -4149,8 +5131,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    cider-eval-sexp-fu = callPackage ({ emacs, eval-sexp-fu, fetchFromGitHub, fetchurl, highlight, lib, melpaBuild }:
-    melpaBuild {
+    cider-eval-sexp-fu = callPackage ({ emacs
+                                      , eval-sexp-fu
+                                      , fetchFromGitHub
+                                      , fetchurl
+                                      , highlight
+                                      , lib
+                                      , melpaBuild }:
+      melpaBuild {
         pname = "cider-eval-sexp-fu";
         version = "1.1";
         src = fetchFromGitHub {
@@ -4159,10 +5147,10 @@
           rev = "6b437bf073b21543e72d76fd0392a28fba7cbfbe";
           sha256 = "1frpr5dwg7aa0pjr2sarck498lj11li8xi36s5qa8qhflgl29jpn";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/947f4d106d70f95ca8aac124ab0d90b2975208df/recipes/cider-eval-sexp-fu";
           sha256 = "1n4sgv042qd9560pllabysx0c5snly6i22bk126y8f8rn0zj58iq";
-          name = "cider-eval-sexp-fu";
+          name = "recipe";
         };
         packageRequires = [ emacs eval-sexp-fu highlight ];
         meta = {
@@ -4170,20 +5158,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    cil-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    cil-mode = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "cil-mode";
         version = "0.4";
         src = fetchFromGitHub {
           owner = "ForNeVeR";
           repo = "cil-mode";
-          rev = "a78a88ca9a66a82f069329a96e34b67478ae2d9b";
+          rev = "8023b45ec60961bf4c3a3d8a564727c463ed09d1";
           sha256 = "06p6hz6jrnvnlbxdr1pjgf5wh4n34kf6al4589qg1s88r2lf86bl";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ccbf4a7c9df3c85207c7160ee68ecc4ba4f3801a/recipes/cil-mode";
           sha256 = "1h18r086bqspyn5n252yzw8x2zgyaqzdd8pbcf5gqlh1w8kapq4y";
-          name = "cil-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -4191,20 +5182,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    circadian = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    circadian = callPackage ({ emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "circadian";
-        version = "0.3.1";
+        version = "0.3.2";
         src = fetchFromGitHub {
           owner = "GuidoSchmidt";
           repo = "circadian.el";
-          rev = "feec308591b43e7869d7a018d5c6fc7e943d53ee";
-          sha256 = "0j8an9ny3jk9nmlpi360n064m20nhah9p8rj6wb9xbvnfrri5zjk";
+          rev = "9894361dcd6ffb6d4629b4cbbabda2153699eb8e";
+          sha256 = "0wpsykmai3idz0bgfl07hwl9nr4x9sgprvqgw8jln4dz2wf5gdic";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3440905a20bc91bb2637a87c04ff8410379f150d/recipes/circadian";
           sha256 = "13797y1w1636bibisz5i5p2xp0smd3apnhc1nx8ijm75smx679id";
-          name = "circadian";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -4212,20 +5207,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    circe = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    circe = callPackage ({ cl-lib ? null
+                         , fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "circe";
-        version = "2.7";
+        version = "2.10";
         src = fetchFromGitHub {
           owner = "jorgenschaefer";
           repo = "circe";
-          rev = "661a2cdb3a3d9bc11ee511a4f90116c88e0d3484";
-          sha256 = "19fcvmm915dz9l2w1rna4yik96rb3hrk7042012g961xn4sgs0ih";
+          rev = "fedfa7eb8516a53fa70b6a1f4fce4b5ab66ea91f";
+          sha256 = "10gi14kwxd81blddpvqh95lgmpbfgp0m955naxix3bs3r6a75n4s";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a2b295656d53fddc76cacc86b239e5648e49e3a4/recipes/circe";
           sha256 = "1f54d8490gfx0r0cdvgmcjdxqpni43msy0k2mgqd1qz88a4b5l07";
-          name = "circe";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -4233,8 +5232,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    circe-notifications = callPackage ({ alert, circe, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    circe-notifications = callPackage ({ alert
+                                       , circe
+                                       , emacs
+                                       , fetchFromGitHub
+                                       , fetchurl
+                                       , lib
+                                       , melpaBuild }:
+      melpaBuild {
         pname = "circe-notifications";
         version = "1.0";
         src = fetchFromGitHub {
@@ -4243,10 +5248,10 @@
           rev = "80c44441ecd3ae04ae63760aa20afa837c1ed05b";
           sha256 = "0s0iw5vclciziga78f1lvj6sdg84a132in39k4vz0pj598ypin1w";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/76c0408423c4e0728789de7b356b2971d6c446c7/recipes/circe-notifications";
           sha256 = "06y525x5yc0xgbw0cf16mc72ca9bv8j8z4gpgznbad2qp7psf53c";
-          name = "circe-notifications";
+          name = "recipe";
         };
         packageRequires = [ alert circe emacs ];
         meta = {
@@ -4254,8 +5259,17 @@
           license = lib.licenses.free;
         };
       }) {};
-    citeproc = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, queue, s, string-inflection }:
-    melpaBuild {
+    citeproc = callPackage ({ dash
+                            , emacs
+                            , f
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild
+                            , queue
+                            , s
+                            , string-inflection }:
+      melpaBuild {
         pname = "citeproc";
         version = "0.1.1";
         src = fetchFromGitHub {
@@ -4264,10 +5278,10 @@
           rev = "6d68f52ebd150e035b33dcaa59d9e2aceab69b84";
           sha256 = "04xz3y3j8k1pv5v6v9wqscqlpmgqi85fs3igrv8c9y0xagild29k";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/20aa56e9a4809cee1082224b1b4e65921a48bda1/recipes/citeproc";
           sha256 = "1qphg2bg7vvjzgvnsscbyf40llxxh4aa2s2ffk8vsbfd4p8208cq";
-          name = "citeproc";
+          name = "recipe";
         };
         packageRequires = [ dash emacs f queue s string-inflection ];
         meta = {
@@ -4275,8 +5289,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    cl-format = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    cl-format = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "cl-format";
         version = "1.1";
         src = fetchFromGitHub {
@@ -4285,10 +5302,10 @@
           rev = "4380cb8009c47cc6d9098b383082b93b1aefa460";
           sha256 = "108s96viral3s62a77jfgvjam08hdk97frfmxjg3xpp2ifccjs7h";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/cl-format";
           sha256 = "09jwy0fgaz2f04dvcdns6w859s6izvrkp8ib4lws3x8kx8z918fy";
-          name = "cl-format";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -4296,8 +5313,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    cl-lib-highlight = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    cl-lib-highlight = callPackage ({ cl-lib ? null
+                                    , fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "cl-lib-highlight";
         version = "1.0.0";
         src = fetchFromGitHub {
@@ -4306,10 +5327,10 @@
           rev = "c117451df8455769701af6c8e92a8fb29c05e1fa";
           sha256 = "12vgi5dicx3lxzngjcg9g3nflrhfy9wdw6ldm72zarp1h96jy5cw";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/696c79669478b0d1c9769cc6f0fe581ee056cf32/recipes/cl-lib-highlight";
           sha256 = "13qdrvpxq928p27b1xdcbsscyhqk042rwfa17037gp9h02fd42j8";
-          name = "cl-lib-highlight";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -4317,8 +5338,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    click-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    click-mode = callPackage ({ emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "click-mode";
         version = "0.0.4";
         src = fetchFromGitHub {
@@ -4327,10 +5352,10 @@
           rev = "c074e7b5b0a88434d0d3411f18884d1f6e288b33";
           sha256 = "0w34ixzk8vs2nv5xr7l1b3k0crl1lqvbq6gs5r4b8rhsx9b6c1mb";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1859bb26e3efd66394d7d9f4d2296cbeeaf5ba4d/recipes/click-mode";
           sha256 = "1p5dz4a74w5zxdlw17h5z9dglapia4p29880liw3bif2c7dzkg0r";
-          name = "click-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -4338,8 +5363,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    cliphist = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
-    melpaBuild {
+    cliphist = callPackage ({ emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , ivy
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "cliphist";
         version = "0.5.5";
         src = fetchFromGitHub {
@@ -4348,10 +5378,10 @@
           rev = "e454254f8bd9dbaea28e95c786d7297a2d4e920a";
           sha256 = "1lxsy78kmrrb82y7nlaaaq2qsly7f3wa8jw1bagjax4rwvld0vim";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/82d86dae4ad8efc8ef342883c164c56e43079171/recipes/cliphist";
           sha256 = "0mg6pznijba3kvp3r57pi54v6mgih2vfwj2kg6qmcy1abrc0xq29";
-          name = "cliphist";
+          name = "recipe";
         };
         packageRequires = [ emacs ivy ];
         meta = {
@@ -4359,20 +5389,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    clips-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    clips-mode = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "clips-mode";
         version = "0.7";
         src = fetchFromGitHub {
           owner = "grettke";
           repo = "clips-mode";
-          rev = "a3ab4a3e958d54a16544ec38fe6338f27df20817";
-          sha256 = "0i6sj5rs4b9v8aqq9l6wr15080qb101hdxspx6innhijhajgmssd";
+          rev = "f7869b67c2a8f061ce05f1e48abbcb41a6c455ce";
+          sha256 = "07r01g5xcr3w0kq09m4rb8ws0ss77szczycybvas4379sf3g8dv9";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d28484bf5e9ad72778ad63f73deeea1eb1263236/recipes/clips-mode";
           sha256 = "083wrhjn04rg8vr6j0ziffdbdhbfn63wzl4q7yzpkf8qckh6mxhf";
-          name = "clips-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -4380,8 +5413,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    clj-refactor = callPackage ({ cider, clojure-mode, edn, emacs, fetchFromGitHub, fetchurl, hydra, inflections, lib, melpaBuild, multiple-cursors, paredit, s, seq, yasnippet }:
-    melpaBuild {
+    clj-refactor = callPackage ({ cider
+                                , clojure-mode
+                                , edn
+                                , emacs
+                                , fetchFromGitHub
+                                , fetchurl
+                                , hydra
+                                , inflections
+                                , lib
+                                , melpaBuild
+                                , multiple-cursors
+                                , paredit
+                                , s
+                                , seq
+                                , yasnippet }:
+      melpaBuild {
         pname = "clj-refactor";
         version = "2.3.1";
         src = fetchFromGitHub {
@@ -4390,10 +5437,10 @@
           rev = "9005de31ed05122d3db9f503fbc69722abf3634b";
           sha256 = "1pvxwvx36fl971j9dfhfk33sqg70nsw57brsi6kgphq7dgzmv7dk";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3a2db268e55d10f7d1d5a5f02d35b2c27b12b78e/recipes/clj-refactor";
           sha256 = "1qvds6dylazvrzz1ji2z2ldw72pa2nxqacb9d04gasmkqc32ipvz";
-          name = "clj-refactor";
+          name = "recipe";
         };
         packageRequires = [
           cider
@@ -4413,8 +5460,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    cljr-helm = callPackage ({ cl-lib ? null, clj-refactor, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }:
-    melpaBuild {
+    cljr-helm = callPackage ({ cl-lib ? null
+                             , clj-refactor
+                             , fetchFromGitHub
+                             , fetchurl
+                             , helm-core
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "cljr-helm";
         version = "0.11";
         src = fetchFromGitHub {
@@ -4423,10 +5476,10 @@
           rev = "f2fc7b698a56e4a44d5dfbc6a55d77a93c0fa9a4";
           sha256 = "0jy6hkz8sr1bplymwxnjg4q408cw2dgfrv70chlw3y5ddc4cingj";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d99b67e295ef59916211bf22b57b4d093e3d53ab/recipes/cljr-helm";
           sha256 = "108a1xgnc6qy088vs41j3npwk25a5vny0xx4r3yh76jsmpdpcgnc";
-          name = "cljr-helm";
+          name = "recipe";
         };
         packageRequires = [ cl-lib clj-refactor helm-core ];
         meta = {
@@ -4434,20 +5487,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    clocker = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }:
-    melpaBuild {
+    clocker = callPackage ({ dash
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild
+                           , projectile }:
+      melpaBuild {
         pname = "clocker";
         version = "0.0.11";
         src = fetchFromGitHub {
           owner = "roman";
           repo = "clocker.el";
-          rev = "4a4831ed4e42e18976edd16b844cb16cb78f3c17";
-          sha256 = "0hz6a7gj0zfsdaifkhwf965c96rkjc3kivvqlf50zllsw0ysbnn0";
+          rev = "07338bc4b850d262eb263ac306ae3366cac6e078";
+          sha256 = "0f6qav92lyp36irdlamcxhzfd4p1i4iq18d5cmr7fgfwi894ikcg";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/dadd3f5abad2e1f7863c4d654ff065f641395f64/recipes/clocker";
           sha256 = "0cckrk40k1labiqjh7ghzpx5zi136xz70j3ipp117x52qf24k10k";
-          name = "clocker";
+          name = "recipe";
         };
         packageRequires = [ dash projectile ];
         meta = {
@@ -4455,8 +5513,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    clojure-cheatsheet = callPackage ({ cider, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
-    melpaBuild {
+    clojure-cheatsheet = callPackage ({ cider
+                                      , fetchFromGitHub
+                                      , fetchurl
+                                      , helm
+                                      , lib
+                                      , melpaBuild }:
+      melpaBuild {
         pname = "clojure-cheatsheet";
         version = "0.4.0";
         src = fetchFromGitHub {
@@ -4465,10 +5528,10 @@
           rev = "f8db406b7b13a580c142d08865c9a03c101235fa";
           sha256 = "1x1kfycf3023z0r3v7xqci59k8jv5wn2vqc9y0nx7k5qgifmswrx";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0569da79bd8145df334965c5d4364a50b6b548fa/recipes/clojure-cheatsheet";
           sha256 = "05sw3bkdcadslpsk64ds0ciavmdgqk7fr5q3z505vvafmszfnaqv";
-          name = "clojure-cheatsheet";
+          name = "recipe";
         };
         packageRequires = [ cider helm ];
         meta = {
@@ -4476,20 +5539,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    clojure-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    clojure-mode = callPackage ({ emacs
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "clojure-mode";
-        version = "5.6.1";
+        version = "5.8.1";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "clojure-mode";
-          rev = "fdbdfb91e0a5731bf9a739b70c5f217c5d12ae6d";
-          sha256 = "1qadymqzs5fn1sb347xzfw8lqq6s85vvkh4kzm35m61g5i2lm86y";
+          rev = "09831e36efaaa3aa284c241cca1f53ac55cbe410";
+          sha256 = "1fw5lbyyhjcfl23i1day8shs3diihvlqx59372c7k7gw8wb8phnq";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5e3cd2e6ee52692dc7b2a04245137130a9f521c7/recipes/clojure-mode";
           sha256 = "11n0rjhs1mmlzdqy711g432an5ybdka5xj0ipsk8dx6xcyab70np";
-          name = "clojure-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -4497,20 +5564,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    clojure-mode-extra-font-locking = callPackage ({ clojure-mode, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    clojure-mode-extra-font-locking = callPackage ({ clojure-mode
+                                                   , fetchFromGitHub
+                                                   , fetchurl
+                                                   , lib
+                                                   , melpaBuild }:
+      melpaBuild {
         pname = "clojure-mode-extra-font-locking";
-        version = "5.6.1";
+        version = "5.8.1";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "clojure-mode";
-          rev = "fdbdfb91e0a5731bf9a739b70c5f217c5d12ae6d";
-          sha256 = "1qadymqzs5fn1sb347xzfw8lqq6s85vvkh4kzm35m61g5i2lm86y";
+          rev = "9bbc8d59b3b4dfe3f0564f0d06832a309b4e4e4e";
+          sha256 = "0brwcxlz337bd1y1vjlix2aq6qjzqqrl0g9hag5lmpkimnbbnbv1";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5e3cd2e6ee52692dc7b2a04245137130a9f521c7/recipes/clojure-mode-extra-font-locking";
           sha256 = "00nff9mkj61i76dj21x87vhz0bbkzgvkx1ypkxcv6yf3pfhq7r8n";
-          name = "clojure-mode-extra-font-locking";
+          name = "recipe";
         };
         packageRequires = [ clojure-mode ];
         meta = {
@@ -4518,8 +5589,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    clojure-quick-repls = callPackage ({ cider, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    clojure-quick-repls = callPackage ({ cider
+                                       , dash
+                                       , fetchFromGitHub
+                                       , fetchurl
+                                       , lib
+                                       , melpaBuild }:
+      melpaBuild {
         pname = "clojure-quick-repls";
         version = "0.1.0";
         src = fetchFromGitHub {
@@ -4528,10 +5604,10 @@
           rev = "90f82e294cfdfb65231adc456177580cd69bfc00";
           sha256 = "0sw34yjp8934xd2n76lbwyvxkbyz5pxszj6gkflas8lfjvms9z7d";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e618430057eb3ac235ab4a44767524919c870036/recipes/clojure-quick-repls";
           sha256 = "10glzyd4y3918pwp048pc1y7y7fa34fkqckn1nbys841dbssmay0";
-          name = "clojure-quick-repls";
+          name = "recipe";
         };
         packageRequires = [ cider dash ];
         meta = {
@@ -4539,8 +5615,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    clojure-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
-    melpaBuild {
+    clojure-snippets = callPackage ({ fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild
+                                    , yasnippet }:
+      melpaBuild {
         pname = "clojure-snippets";
         version = "1.0.1";
         src = fetchFromGitHub {
@@ -4549,10 +5629,10 @@
           rev = "83785faa607884308a42b81f160854f2cecfd098";
           sha256 = "1sdgf1avfw7w3m3i7nqb9m9nhqk8lr0bri686lrkq23ds2b44454";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4898fc6746b30b0d0453b3b56d02479bfb0f70b9/recipes/clojure-snippets";
           sha256 = "15622mdd6b3fpwp22d32p78yap08pyscs2vc83sv1xz4338i0lij";
-          name = "clojure-snippets";
+          name = "recipe";
         };
         packageRequires = [ yasnippet ];
         meta = {
@@ -4560,20 +5640,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    closql = callPackage ({ emacs, emacsql-sqlite, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    closql = callPackage ({ emacs
+                          , emacsql-sqlite
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "closql";
-        version = "0.5.1";
+        version = "0.6.0";
         src = fetchFromGitHub {
           owner = "emacscollective";
           repo = "closql";
-          rev = "01cb892f6a457fbff857d924cebfdc77f69bd45d";
-          sha256 = "0c5b6w67qjy2kvk3daljjg01xsv91c03n6kxvg5bswqq1j7n66si";
+          rev = "faed079570c2e70b0e4988177e35b7990afa4752";
+          sha256 = "0ni2akjb1n5w6vz3b210c3bya9mbyyxiygn8hna707qnszd0li8r";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2df16abf56e53d4a1cc267a78797419520ff8a1c/recipes/closql";
           sha256 = "13ybna20w2d1b3n0y5p1ybhkw0j0zh5nd43p1yvf8h1haj983l87";
-          name = "closql";
+          name = "recipe";
         };
         packageRequires = [ emacs emacsql-sqlite ];
         meta = {
@@ -4581,8 +5666,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    clues-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    clues-theme = callPackage ({ emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "clues-theme";
         version = "1.0.1";
         src = fetchFromGitHub {
@@ -4591,10 +5680,10 @@
           rev = "abd61f2b7f3e98de58ca26e6d1230e70c6406cc7";
           sha256 = "118k5bnlk9sc2n04saaxjncmc1a4m1wlf2y7xyklpffkazbd0m72";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6f26b8281f9bd05e3c8f2ef21838275711e622c9/recipes/clues-theme";
           sha256 = "0b0gypmxx8qjd8hgxf4kbvci1nwacsxl7rm5s1bcnk9cwc6k2jpr";
-          name = "clues-theme";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -4602,8 +5691,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    cm-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    cm-mode = callPackage ({ cl-lib ? null
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "cm-mode";
         version = "1.6";
         src = fetchFromGitHub {
@@ -4612,10 +5705,10 @@
           rev = "276d49c859822265070ae5dfbb403fd7d8d06436";
           sha256 = "0mqbjw9wiaq735v307hd7g0g6i3a4k7h71bi4g9rr2jbgiljmql4";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/42dda804ec0c7338c39c57eec6ba479609a38555/recipes/cm-mode";
           sha256 = "1rgfpxbnp8wiq9j8aywm2n07rxzkhqljigwynrkyvrnsgxlq2a9x";
-          name = "cm-mode";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -4623,8 +5716,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    cmake-ide = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, levenshtein, lib, melpaBuild, seq }:
-    melpaBuild {
+    cmake-ide = callPackage ({ cl-lib ? null
+                             , emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , levenshtein
+                             , lib
+                             , melpaBuild
+                             , seq }:
+      melpaBuild {
         pname = "cmake-ide";
         version = "0.5";
         src = fetchFromGitHub {
@@ -4633,10 +5733,10 @@
           rev = "a2e476ad42e61075cae9beb35fb83e3c1bf8619e";
           sha256 = "0n169i4y2c450bk5r284bakjk3hsg74pply5fqxvdm6p5p1z2vr1";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/17e8a8a5205d222950dc8e9245549a48894b864a/recipes/cmake-ide";
           sha256 = "0xvy7l80zw67jgvk1rkhwzjvsqjqckmd8zj6s67rgbm56z6ypmcg";
-          name = "cmake-ide";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs levenshtein seq ];
         meta = {
@@ -4644,20 +5744,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    cmake-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    cmake-mode = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "cmake-mode";
-        version = "3.11.0";
+        version = "3.12.0.-1.3";
         src = fetchFromGitHub {
           owner = "Kitware";
           repo = "CMake";
-          rev = "61fd4c742013a7f9139db190f936703b656540ff";
-          sha256 = "1iiyysw16asqj1c077gk6s9pqy8qij6d83kwxc59swc7xgcy1g0d";
+          rev = "d88451568dae61422d9d1b5796ad450ad28e0eb6";
+          sha256 = "1hg99q4w0cfhm53qmiqirzrfk1bnx1lmb5kx2swfwcrxyyp80kby";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode";
           sha256 = "0zbn8syb5lw5xp1qcy3qcl75zfiyik30xvqyl38gdqddm9h7qmz7";
-          name = "cmake-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -4665,8 +5768,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    cmake-project = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    cmake-project = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "cmake-project";
         version = "0.7";
         src = fetchFromGitHub {
@@ -4675,10 +5781,10 @@
           rev = "ec61f687772cccdb699f64ebe1e8dc8ba83f790f";
           sha256 = "10xlny2agxjknvnjdnw41cyb3d361yy0wvpc8l1d0xwnmmfh3bxk";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0857c4db1027981ea73bc32bcaa15e5df53edea3/recipes/cmake-project";
           sha256 = "13n6j9ljvzjzkknbm9zkhxljcn12avl39gxqq95hah44dr11rns3";
-          name = "cmake-project";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -4686,20 +5792,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    cnfonts = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    cnfonts = callPackage ({ emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "cnfonts";
         version = "0.9.1";
         src = fetchFromGitHub {
           owner = "tumashu";
           repo = "cnfonts";
-          rev = "cbe1ddd49e33b790a568c55351146aa5b909f173";
-          sha256 = "11d44lf0m0kbzq1mvyqkl4aprys0xqaarp08nij57xnynin1rynx";
+          rev = "5cfe656554c91b3d0dcc5417e43afa85d2a7a182";
+          sha256 = "1px5gc83g70whdiysq7mmxz7rm74mhsjs2y1vbzgg8k1z0cs9wkp";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0d5787ffeeee68ffa41f3e777071815084e0ed7a/recipes/cnfonts";
           sha256 = "1pryn08fkdrdj7w302205nj1qhfbk1jzqxx6717crrxakkdqmn9w";
-          name = "cnfonts";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -4707,8 +5817,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    codic = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    codic = callPackage ({ cl-lib ? null
+                         , emacs
+                         , fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "codic";
         version = "0.3";
         src = fetchFromGitHub {
@@ -4717,10 +5832,10 @@
           rev = "52bbb6997ef4ab9fb7fea43bbfff7f04671aa557";
           sha256 = "14jcxrs3b02pbppvdsabr7c74i3c6d1lmd6l1p9dj8gv413pghsz";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/acc9b816796b9f142c53f90593952b43c962d2d8/recipes/codic";
           sha256 = "0fq2qfqhkd6injgl66vcpd61j67shl9xj260aj6cgb2nriq0jxgn";
-          name = "codic";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -4728,8 +5843,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    coffee-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    coffee-mode = callPackage ({ cl-lib ? null
+                               , emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "coffee-mode";
         version = "0.6.3";
         src = fetchFromGitHub {
@@ -4738,10 +5858,10 @@
           rev = "adfb7ae73d6ee2ef790c780dd3c967e62930e94a";
           sha256 = "0yhmg5j051mviqp5laz7y1zjs1w9ykbbxqm7vrgf2py0hpd1kcrg";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/coffee-mode";
           sha256 = "1px50hs0x30psa5ljndpcc22c0qwcaxslpjf28cfgxinawnp74g1";
-          name = "coffee-mode";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -4749,8 +5869,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    color-identifiers-mode = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    color-identifiers-mode = callPackage ({ dash
+                                          , emacs
+                                          , fetchFromGitHub
+                                          , fetchurl
+                                          , lib
+                                          , melpaBuild }:
+      melpaBuild {
         pname = "color-identifiers-mode";
         version = "1.0.0";
         src = fetchFromGitHub {
@@ -4759,10 +5884,10 @@
           rev = "536151410dbb198b328dc62b829d9692cec0b1bd";
           sha256 = "1zwgyp65jivds9zvbp5k5q3gazffh3w0mvs739ddq93lkf165rwh";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5c735755e414fdf169aca5ec6f742533d21472e0/recipes/color-identifiers-mode";
           sha256 = "1hxp8lzn7kfckn5ngxic6qiz3nbynilqlxhlq9k1n1llfg216gfq";
-          name = "color-identifiers-mode";
+          name = "recipe";
         };
         packageRequires = [ dash emacs ];
         meta = {
@@ -4770,8 +5895,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    color-theme-modern = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    color-theme-modern = callPackage ({ emacs
+                                      , fetchFromGitHub
+                                      , fetchurl
+                                      , lib
+                                      , melpaBuild }:
+      melpaBuild {
         pname = "color-theme-modern";
         version = "0.0.2";
         src = fetchFromGitHub {
@@ -4780,10 +5909,10 @@
           rev = "7107540d22e8ff045e0707de84c8b179fd829302";
           sha256 = "0apvqrva3f7valjrxpslln8460kpr82z4zazj3lg3j82k102zla9";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2db82e101916d8709b711034da5ca6e4072e1077/recipes/color-theme-modern";
           sha256 = "0f662ham430fgxpqw96zcl1whcm28cv710g6wvg4fma60sblaxcm";
-          name = "color-theme-modern";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -4791,8 +5920,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    color-theme-sanityinc-solarized = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    color-theme-sanityinc-solarized = callPackage ({ fetchFromGitHub
+                                                   , fetchurl
+                                                   , lib
+                                                   , melpaBuild }:
+      melpaBuild {
         pname = "color-theme-sanityinc-solarized";
         version = "2.29";
         src = fetchFromGitHub {
@@ -4801,10 +5933,10 @@
           rev = "554e941131d009c0a5d7129ed96796182b4cc590";
           sha256 = "13jmg05skv409z8pg5m9rzkajj9knyln0ff8a3i1pbpyrnpngmmc";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/color-theme-sanityinc-solarized";
           sha256 = "0xg79hgb893f1nqx6q4q6hp4w6rvgp1aah1v2r3scg2jk057qxkf";
-          name = "color-theme-sanityinc-solarized";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -4812,8 +5944,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    color-theme-sanityinc-tomorrow = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    color-theme-sanityinc-tomorrow = callPackage ({ fetchFromGitHub
+                                                  , fetchurl
+                                                  , lib
+                                                  , melpaBuild }:
+      melpaBuild {
         pname = "color-theme-sanityinc-tomorrow";
         version = "1.17";
         src = fetchFromGitHub {
@@ -4822,10 +5957,10 @@
           rev = "81d8990085960824f700520d08027e6aca58feaa";
           sha256 = "1x3aq6hadp158vh8mf9hmj5rikq0qz7a1frv7vbl39xr3wcnjj23";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/color-theme-sanityinc-tomorrow";
           sha256 = "1k8iwjc7iidq5sxybs47rnswa6c5dwqfdzfw7w0by2h1id2z6nqd";
-          name = "color-theme-sanityinc-tomorrow";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -4833,8 +5968,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    colormaps = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    colormaps = callPackage ({ emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "colormaps";
         version = "0.1.2";
         src = fetchFromGitHub {
@@ -4843,10 +5982,10 @@
           rev = "3a88961ba66b09a49ea5aa92b2b8776b2c92d68c";
           sha256 = "083hks2zzalizdsgabiwc1kd114r748v5i3w3kfk8pv37i2gay35";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f4c795d9e323b08bc8354a6933a061644705a2ec/recipes/colormaps";
           sha256 = "16plhgpfz1wb58p6h8wxjhplhgv0mbj3f2xj34p6vydh44l8w8q2";
-          name = "colormaps";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -4854,8 +5993,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    commander = callPackage ({ cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    commander = callPackage ({ cl-lib ? null
+                             , dash
+                             , f
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild
+                             , s }:
+      melpaBuild {
         pname = "commander";
         version = "0.7.0";
         src = fetchFromGitHub {
@@ -4864,10 +6010,10 @@
           rev = "2c8a57b9c619e29ccbe2d5a85921b9c689e95bf9";
           sha256 = "1j6hhyzww7wfwk6bllbb5mk4hw4qs8hsgfbfdifsam9c6i4spm45";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8b308e05dd85856addbc04a9438f5026803cebd7/recipes/commander";
           sha256 = "17y0hg6a90hflgwn24ww23qmvc1alzivpipca8zvpf0nih4fl393";
-          name = "commander";
+          name = "recipe";
         };
         packageRequires = [ cl-lib dash f s ];
         meta = {
@@ -4875,8 +6021,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    comment-dwim-2 = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    comment-dwim-2 = callPackage ({ fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "comment-dwim-2";
         version = "1.2.2";
         src = fetchFromGitHub {
@@ -4885,10 +6034,10 @@
           rev = "8cedecde018b5872195bfead6511af822776a430";
           sha256 = "0kzlv2my0cc7d3nki2rlm32nmb2nyjb38inmvlf13z0m2kybg2ps";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4ac6ac97875117013515a36c9a4452fbd6c0d74c/recipes/comment-dwim-2";
           sha256 = "1w9w2a72ygsj5w47vjqcljajmmbz0mi8dhz5gjnpwxjwsr6fn6lj";
-          name = "comment-dwim-2";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -4896,8 +6045,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    comment-tags = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }:
-    melpaBuild {
+    comment-tags = callPackage ({ emacs
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild
+                                , pkg-info }:
+      melpaBuild {
         pname = "comment-tags";
         version = "0.1";
         src = fetchFromGitHub {
@@ -4906,10 +6060,10 @@
           rev = "293a30026d7750f6657d6c2e6d6428abf1d7db5a";
           sha256 = "06s0phgqpzkkv81gl0cm6x8rjs53lhs8b2j56xamflqiydq0fz7n";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6ac71f4ffc19bce4f571001f9270d5be855dfc3c/recipes/comment-tags";
           sha256 = "13slv150zch0b7zpxa2dbqjzpqh0iy559m6rc0zs0dwdagzryp3i";
-          name = "comment-tags";
+          name = "recipe";
         };
         packageRequires = [ emacs pkg-info ];
         meta = {
@@ -4917,8 +6071,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    commenter = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }:
-    melpaBuild {
+    commenter = callPackage ({ emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , let-alist
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "commenter";
         version = "0.5.2";
         src = fetchFromGitHub {
@@ -4927,10 +6086,10 @@
           rev = "6d1885419434ba779270c6fda0e30d390bb074bd";
           sha256 = "1jwd3whag39qhzhbsfivzdlcr6vj37dv5ychkhmilw8v6dfdnpdb";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/437afab17b22c0c559617afa06923b5bc73a3ae8/recipes/commenter";
           sha256 = "01bm8jbj6xw23nls4fps6zwjkgvcsjhmn3l3ncqd764kwhxdx8q3";
-          name = "commenter";
+          name = "recipe";
         };
         packageRequires = [ emacs let-alist ];
         meta = {
@@ -4938,8 +6097,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    common-lisp-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
-    melpaBuild {
+    common-lisp-snippets = callPackage ({ fetchFromGitHub
+                                        , fetchurl
+                                        , lib
+                                        , melpaBuild
+                                        , yasnippet }:
+      melpaBuild {
         pname = "common-lisp-snippets";
         version = "0.1.2";
         src = fetchFromGitHub {
@@ -4948,10 +6111,10 @@
           rev = "fc5c2683952328927a6d1c1f2694b85ddf7e9053";
           sha256 = "1835kg05794p1wdi7fsmpzlnnqy79dgfnfrxjfjj2j1gzcwmynsw";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/48d0166ccd3dcdd3df4719349778c6c5ab6872ca/recipes/common-lisp-snippets";
           sha256 = "0ig8cz00cbfx0jckqk1xhsvm18ivl2mjvcn65s941nblsywfvxjl";
-          name = "common-lisp-snippets";
+          name = "recipe";
         };
         packageRequires = [ yasnippet ];
         meta = {
@@ -4959,8 +6122,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    company = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    company = callPackage ({ emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "company";
         version = "0.9.6";
         src = fetchFromGitHub {
@@ -4969,10 +6136,10 @@
           rev = "4711695af3df93f1bbceee165c505fea5bfc49ac";
           sha256 = "0x8zwq88k85ikzr0klm6nfa6i1wbykzfa790cg9cmi7wrsywimm1";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/96e7b4184497d0d0db532947f2801398b72432e4/recipes/company";
           sha256 = "0v4x038ly970lkzb0n8fbqssfqwx1p46xldr7nss32jiqvavr4m4";
-          name = "company";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -4980,8 +6147,16 @@
           license = lib.licenses.free;
         };
       }) {};
-    company-anaconda = callPackage ({ anaconda-mode, cl-lib ? null, company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    company-anaconda = callPackage ({ anaconda-mode
+                                    , cl-lib ? null
+                                    , company
+                                    , dash
+                                    , fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild
+                                    , s }:
+      melpaBuild {
         pname = "company-anaconda";
         version = "0.2.0";
         src = fetchFromGitHub {
@@ -4990,10 +6165,10 @@
           rev = "182a8fdabc01630f255beeb2708728c0cd5c6316";
           sha256 = "1rqf9i4l32njpwx4aiwxqr994g3jzispwprs6nwjfvg70xkvm4m0";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0eb23a75c8b57b4af1737c0508f03e66430e6076/recipes/company-anaconda";
           sha256 = "1s7y47ghy7q35qpfqavh4p9wr91i6r579mdbpvv6h5by856yn4gl";
-          name = "company-anaconda";
+          name = "recipe";
         };
         packageRequires = [ anaconda-mode cl-lib company dash s ];
         meta = {
@@ -5001,20 +6176,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    company-ansible = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    company-ansible = callPackage ({ company
+                                   , emacs
+                                   , fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "company-ansible";
-        version = "0.7.0";
+        version = "0.7.1";
         src = fetchFromGitHub {
           owner = "krzysztof-magosa";
           repo = "company-ansible";
-          rev = "42753d43333c6e4ad83797f0234149b76b463369";
-          sha256 = "1g93vnizl42k52ar47g7yn2csjyzsqvwb6siwbpfvjgbsr5d5d01";
+          rev = "c6dc714e3a15f89671ae5e8fe668858b20ef63e8";
+          sha256 = "01nly13i2bs77lrvkm26i96vrrigbxpb9cakski9fv3xrvfxq9bv";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7b44cd4bd9f9a7c942ca3f3bd88b2ce61ffff130/recipes/company-ansible";
           sha256 = "084l9dr2hvm00952y4m3jhchzxjhcd61sfn5ywj9b9a1d4sr110d";
-          name = "company-ansible";
+          name = "recipe";
         };
         packageRequires = [ company emacs ];
         meta = {
@@ -5022,8 +6202,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    company-cabal = callPackage ({ cl-lib ? null, company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    company-cabal = callPackage ({ cl-lib ? null
+                                 , company
+                                 , emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "company-cabal";
         version = "0.2.1";
         src = fetchFromGitHub {
@@ -5032,10 +6218,10 @@
           rev = "f458de88cad16ed48a605e8347e56433e73dcef8";
           sha256 = "0ll9dxzsgrpy4psz3dqhzny990lfccn63swcyfvl8mnqgwbrq8k0";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ee888b1ba57b6af3a3330607898810cd248862db/recipes/company-cabal";
           sha256 = "0pbjidj88c9qri6xw8023yqwnczad5ig224cbsz6vsmdla2nlxra";
-          name = "company-cabal";
+          name = "recipe";
         };
         packageRequires = [ cl-lib company emacs ];
         meta = {
@@ -5043,8 +6229,16 @@
           license = lib.licenses.free;
         };
       }) {};
-    company-coq = callPackage ({ cl-lib ? null, company, company-math, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
-    melpaBuild {
+    company-coq = callPackage ({ cl-lib ? null
+                               , company
+                               , company-math
+                               , dash
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild
+                               , yasnippet }:
+      melpaBuild {
         pname = "company-coq";
         version = "1.0";
         src = fetchFromGitHub {
@@ -5053,10 +6247,10 @@
           rev = "bb507a11b088a8c9bb6500b384ed588bc690fcea";
           sha256 = "0s6gzdmxlsl1l0vh52xspxys1wmsq063p6nva6qisg1r622gjzjl";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7f89e3097c654774981953ef125679fec0b5b7c9/recipes/company-coq";
           sha256 = "1iagm07ckf60kg4i8m4n0gfmv0brqc4dcn7lkcz229r3f4kyqksa";
-          name = "company-coq";
+          name = "recipe";
         };
         packageRequires = [ cl-lib company company-math dash yasnippet ];
         meta = {
@@ -5064,20 +6258,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    company-dict = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, parent-mode }:
-    melpaBuild {
+    company-dict = callPackage ({ company
+                                , emacs
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild
+                                , parent-mode }:
+      melpaBuild {
         pname = "company-dict";
         version = "1.2.7";
         src = fetchFromGitHub {
           owner = "hlissner";
           repo = "emacs-company-dict";
-          rev = "d51b801fe319e7984cbc202c4745214d84039942";
-          sha256 = "16ai8ljp0i75kby1knj7ldysd8s6kd6drmlh9ygyddxbi2i35x61";
+          rev = "cc2f7aecc0a9d5b44c471a5550a49fd3ca535360";
+          sha256 = "1swd87p4vxlxqcajfh0clypqdwdkn85k3iy9gms1hm4m23wj6a4m";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/212c077def5b4933c6001056132181e1a5850a7c/recipes/company-dict";
           sha256 = "1377b40f1j4rmw7lnhy1zsm6r234ds5zsn02v1ajm3bzrpkkmin0";
-          name = "company-dict";
+          name = "recipe";
         };
         packageRequires = [ company emacs parent-mode ];
         meta = {
@@ -5085,8 +6285,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    company-edbi = callPackage ({ cl-lib ? null, company, edbi, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    company-edbi = callPackage ({ cl-lib ? null
+                                , company
+                                , edbi
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild
+                                , s }:
+      melpaBuild {
         pname = "company-edbi";
         version = "0.1";
         src = fetchFromGitHub {
@@ -5095,10 +6302,10 @@
           rev = "08dc69ccfbcf10ca83f7075e9b735c6885cd7e11";
           sha256 = "0n2hvrfbybsp57w6m9mm7ywjq30fwwx9bzc2rllfr06d2ms7naai";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5d881ff0927d5bd7f8192f58927ceabb9bad4beb/recipes/company-edbi";
           sha256 = "067ff1xdyqy4qzgk5pmqf4kksfjk1glkrslcj3rk4zmhcalwrfrm";
-          name = "company-edbi";
+          name = "recipe";
         };
         packageRequires = [ cl-lib company edbi s ];
         meta = {
@@ -5106,20 +6313,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    company-emacs-eclim = callPackage ({ cl-lib ? null, company, eclim, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    company-emacs-eclim = callPackage ({ cl-lib ? null
+                                       , company
+                                       , eclim
+                                       , fetchFromGitHub
+                                       , fetchurl
+                                       , lib
+                                       , melpaBuild }:
+      melpaBuild {
         pname = "company-emacs-eclim";
         version = "0.4";
         src = fetchFromGitHub {
           owner = "emacs-eclim";
           repo = "emacs-eclim";
-          rev = "8203fbf8544e65324a948a67718f7a16ba2d52e6";
-          sha256 = "10bbbxhvlwm526g1wib1f87grnayirlg8jbsvmpzxr9nmdjgikz3";
+          rev = "94508ebd071ff1052d68a20f7f1bf1038439fe43";
+          sha256 = "0l72zw93wv8ncn98d6ybnykhi3a60bc0kyx6z699wfhnnhhxhl0p";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1e9d3075587fbd9ca188535fd945a7dc451c6d7e/recipes/company-emacs-eclim";
           sha256 = "1l56hcy0y3cr38z1pjf0ilsdqdzvj3zwd40markm6si2xhdr8xig";
-          name = "company-emacs-eclim";
+          name = "recipe";
         };
         packageRequires = [ cl-lib company eclim ];
         meta = {
@@ -5127,8 +6340,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    company-emoji = callPackage ({ cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    company-emoji = callPackage ({ cl-lib ? null
+                                 , company
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "company-emoji";
         version = "2.5.0";
         src = fetchFromGitHub {
@@ -5137,10 +6355,10 @@
           rev = "8dc88ffe0773ef44321f245d39430c14a1bc2b82";
           sha256 = "1y8l9wnc13g79znyw2qsbm33da2bhkj270ppikkg9h4x2qpmxilq";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5733dccdffe97911a30352fbcda2900c33d79810/recipes/company-emoji";
           sha256 = "1mflqqw9gnfcqjb6g8ivdfl7s4mdyjg7j0457hamgyvgvpxsh8x3";
-          name = "company-emoji";
+          name = "recipe";
         };
         packageRequires = [ cl-lib company ];
         meta = {
@@ -5148,8 +6366,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    company-erlang = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, ivy-erlang-complete, lib, melpaBuild }:
-    melpaBuild {
+    company-erlang = callPackage ({ company
+                                  , emacs
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , ivy-erlang-complete
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "company-erlang";
         version = "0.1.1";
         src = fetchFromGitHub {
@@ -5158,10 +6382,10 @@
           rev = "bc0524a16f17b66c7397690e4ca0e004f09ea6c5";
           sha256 = "04wm3i65fpzln7sdcny88hfjfm0n7wy44ffsr3697x4l95d0bnyh";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ca96ed0b5d6f8aea4de56ddeaa003b9c81d96219/recipes/company-erlang";
           sha256 = "0qlc89c05523kjzsb7j3yfi022la47kgixl74ggkafhn60scwdm7";
-          name = "company-erlang";
+          name = "recipe";
         };
         packageRequires = [ company emacs ivy-erlang-complete ];
         meta = {
@@ -5169,8 +6393,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    company-ghc = callPackage ({ cl-lib ? null, company, emacs, fetchFromGitHub, fetchurl, ghc, lib, melpaBuild }:
-    melpaBuild {
+    company-ghc = callPackage ({ cl-lib ? null
+                               , company
+                               , emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , ghc
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "company-ghc";
         version = "1.1.0";
         src = fetchFromGitHub {
@@ -5179,10 +6410,10 @@
           rev = "64e4f9d0cf9377138a8dee34c69e7d578fd71090";
           sha256 = "0y9i0q37xjbnlnlxq7xjvnpn6ykzbd55g6nbw10z1wg0m2v7f96r";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/28f6a983444f796c81df7e5ee94d74c480b21298/recipes/company-ghc";
           sha256 = "07adykza4dqs64bk8vjmgryr54khxmcy28hms5z8i1qpsk9vmvnn";
-          name = "company-ghc";
+          name = "recipe";
         };
         packageRequires = [ cl-lib company emacs ghc ];
         meta = {
@@ -5190,20 +6421,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    company-go = callPackage ({ company, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }:
-    melpaBuild {
+    company-go = callPackage ({ company
+                              , fetchFromGitHub
+                              , fetchurl
+                              , go-mode
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "company-go";
         version = "20170907";
         src = fetchFromGitHub {
           owner = "nsf";
           repo = "gocode";
-          rev = "c7fddb39ecbc9ebd1ebe7d2a3af473ed0fffffa1";
-          sha256 = "0qx8pq38faig41xkl1a4hrgp3ziyjyn6g53vn5wj7cdgm5kk67nb";
+          rev = "84b76ec55b44739143088371a34ef30a4719dfe4";
+          sha256 = "0ig9jsx9gv3cya11r0w07xpby9rzlh3iz02mir0z7ffnf8qawmrc";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/company-go";
           sha256 = "1ncy5wlg3ywr17zrxb1d1bap4gdvwr35w9a8b0crz5h3l3y4cp29";
-          name = "company-go";
+          name = "recipe";
         };
         packageRequires = [ company go-mode ];
         meta = {
@@ -5211,8 +6447,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    company-irony = callPackage ({ cl-lib ? null, company, emacs, fetchFromGitHub, fetchurl, irony, lib, melpaBuild }:
-    melpaBuild {
+    company-irony = callPackage ({ cl-lib ? null
+                                 , company
+                                 , emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , irony
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "company-irony";
         version = "1.1.0";
         src = fetchFromGitHub {
@@ -5221,10 +6464,10 @@
           rev = "52aca45bcd0f2cb0648fcafa2bbb4f8ad4b2fee7";
           sha256 = "1qgyam2vyjw90kpxns5cd6bq3qiqjhzpwrlvmi18vyb69qcgqd8a";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d2b6a8d57b192325dcd30fddc9ff8dd1516ad680/recipes/company-irony";
           sha256 = "15adamk1b9y1i6k06i5ahf1wn70cgwlhgk0x6fk8pl5izg05z1km";
-          name = "company-irony";
+          name = "recipe";
         };
         packageRequires = [ cl-lib company emacs irony ];
         meta = {
@@ -5232,8 +6475,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    company-irony-c-headers = callPackage ({ cl-lib ? null, company, fetchFromGitHub, fetchurl, irony, lib, melpaBuild }:
-    melpaBuild {
+    company-irony-c-headers = callPackage ({ cl-lib ? null
+                                           , company
+                                           , fetchFromGitHub
+                                           , fetchurl
+                                           , irony
+                                           , lib
+                                           , melpaBuild }:
+      melpaBuild {
         pname = "company-irony-c-headers";
         version = "1.0.0";
         src = fetchFromGitHub {
@@ -5242,10 +6491,10 @@
           rev = "ba304fe7eebdff90bbc7dea063b45b82638427fa";
           sha256 = "1x2dfjmy86icyv2g1y5bjlr87w8rixqdcndkwm1sba6ha277wp9i";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9f9f62d8ef438a9ba4872bd7731768eddc5905de/recipes/company-irony-c-headers";
           sha256 = "0kiag5ggmc2f5c3gd8nn40x16i686jpdrfrflgrz2aih8p3g6af8";
-          name = "company-irony-c-headers";
+          name = "recipe";
         };
         packageRequires = [ cl-lib company irony ];
         meta = {
@@ -5253,8 +6502,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    company-jedi = callPackage ({ cl-lib ? null, company, emacs, fetchFromGitHub, fetchurl, jedi-core, lib, melpaBuild }:
-    melpaBuild {
+    company-jedi = callPackage ({ cl-lib ? null
+                                , company
+                                , emacs
+                                , fetchFromGitHub
+                                , fetchurl
+                                , jedi-core
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "company-jedi";
         version = "0.4";
         src = fetchFromGitHub {
@@ -5263,10 +6519,10 @@
           rev = "ad49407451c7f28fe137f9c8f3a7fc89e8693a1b";
           sha256 = "1ihqapp4dv92794rsgyq0rmhwika60cmradqd4bn9b72ss6plxs1";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bded1840a39fbf1e014c01276eb2f9c5a4fc218f/recipes/company-jedi";
           sha256 = "1krrgrjq967c3j02y0i345yx6w4crisnj1k3bhih6j849fvy3fvj";
-          name = "company-jedi";
+          name = "recipe";
         };
         packageRequires = [ cl-lib company emacs jedi-core ];
         meta = {
@@ -5274,8 +6530,16 @@
           license = lib.licenses.free;
         };
       }) {};
-    company-lsp = callPackage ({ company, dash, emacs, fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild, s }:
-    melpaBuild {
+    company-lsp = callPackage ({ company
+                               , dash
+                               , emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , lsp-mode
+                               , melpaBuild
+                               , s }:
+      melpaBuild {
         pname = "company-lsp";
         version = "2.0.1";
         src = fetchFromGitHub {
@@ -5284,10 +6548,10 @@
           rev = "4512d062c38922d8b8cf402ca6043c246e915694";
           sha256 = "0q95lgw02qy5dn3vpdhspmvjhnfzmmn2asajaf15q5lkjbsvxfrk";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5125f53307c1af3d9ccf2bae3c25e7d23dfe1932/recipes/company-lsp";
           sha256 = "09nbi6vxw8l26gfgsc1k3bx4m8i1px1b0jxaywszky5bv4fdy03l";
-          name = "company-lsp";
+          name = "recipe";
         };
         packageRequires = [ company dash emacs lsp-mode s ];
         meta = {
@@ -5295,8 +6559,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    company-math = callPackage ({ company, fetchFromGitHub, fetchurl, lib, math-symbol-lists, melpaBuild }:
-    melpaBuild {
+    company-math = callPackage ({ company
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , math-symbol-lists
+                                , melpaBuild }:
+      melpaBuild {
         pname = "company-math";
         version = "1.3";
         src = fetchFromGitHub {
@@ -5305,10 +6574,10 @@
           rev = "7e7f8c71f57b12f9bcbbf01f2bbcc59343ad76d4";
           sha256 = "0akqhhjvzsg0lbqx4bbkfkzijidwgi3bb32sxl3yxz7zfm9pbhn2";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fadff01600d57f5b9ea9c0c47ed109e058114998/recipes/company-math";
           sha256 = "0chig8k8l65bnd0a6734fiy0ikl20k9v2wlndh3ckz5a8h963g87";
-          name = "company-math";
+          name = "recipe";
         };
         packageRequires = [ company math-symbol-lists ];
         meta = {
@@ -5316,8 +6585,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    company-ngram = callPackage ({ cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    company-ngram = callPackage ({ cl-lib ? null
+                                 , company
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "company-ngram";
         version = "0.8.0";
         src = fetchFromGitHub {
@@ -5326,10 +6600,10 @@
           rev = "d15182df3eac72b29772802759b77c9eafef5066";
           sha256 = "05108s2a3c857n9j3c34hdni3fyq149pva4m3f51lis4wqrm4zv7";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/937e6a23782450525c4a90392c414173481e101b/recipes/company-ngram";
           sha256 = "1y9k9s8c248m91xld4f5l75j4swml333rpwq590bsx7mrsq131xx";
-          name = "company-ngram";
+          name = "recipe";
         };
         packageRequires = [ cl-lib company ];
         meta = {
@@ -5337,20 +6611,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    company-nixos-options = callPackage ({ cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild, nixos-options }:
-    melpaBuild {
+    company-nixos-options = callPackage ({ cl-lib ? null
+                                         , company
+                                         , fetchFromGitHub
+                                         , fetchurl
+                                         , lib
+                                         , melpaBuild
+                                         , nixos-options }:
+      melpaBuild {
         pname = "company-nixos-options";
         version = "0.0.1";
         src = fetchFromGitHub {
           owner = "travisbhartwell";
           repo = "nix-emacs";
-          rev = "5fc8fa29bea9dd8e9c822af92f9bc6ddc223635f";
-          sha256 = "1lm7rkgf7q5g4ji6v1masfbhxdpwni8d77dapsy5k9p73cr2aqld";
+          rev = "a3475995f9e107d339b9ea7a739ac6ebe2bf050f";
+          sha256 = "1jp6z1hrh80irvhz5lv5blbcc821w98y67ni1fmnlwdiv2mp049l";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6846c7d86e70a9dd8300b89b61435aa7e146be96/recipes/company-nixos-options";
           sha256 = "1yrqqdadmf7qfxpqp8wwb325zjnwwjmn2hhnl7i3j0ckg6hqyqf0";
-          name = "company-nixos-options";
+          name = "recipe";
         };
         packageRequires = [ cl-lib company nixos-options ];
         meta = {
@@ -5358,20 +6638,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    company-php = callPackage ({ ac-php-core, cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    company-php = callPackage ({ ac-php-core
+                               , cl-lib ? null
+                               , company
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "company-php";
-        version = "2.0.4";
+        version = "2.0.5";
         src = fetchFromGitHub {
           owner = "xcwen";
           repo = "ac-php";
-          rev = "326721527b2f88df7227cdc41708912b2f9c8494";
-          sha256 = "1rrjzaa1qqzbnwp6ykk4qbdqlrwprdg2z4xqsb8098p052jjdpii";
+          rev = "e452a20a9f94113260b9cba9af7fb44cc8c647ef";
+          sha256 = "08gvn4gq2j349rz24ask6nzqnvw15p9c8r2lby4n6n0zc6iaxzm5";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/company-php";
           sha256 = "1gnhklfkg17vxfx7fw65lr4nr07jx71y84mhs9zszwcr9p840hh5";
-          name = "company-php";
+          name = "recipe";
         };
         packageRequires = [ ac-php-core cl-lib company ];
         meta = {
@@ -5379,8 +6665,41 @@
           license = lib.licenses.free;
         };
       }) {};
-    company-quickhelp = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pos-tip }:
-    melpaBuild {
+    company-prescient = callPackage ({ company
+                                     , emacs
+                                     , fetchFromGitHub
+                                     , fetchurl
+                                     , lib
+                                     , melpaBuild
+                                     , prescient }:
+      melpaBuild {
+        pname = "company-prescient";
+        version = "2.0";
+        src = fetchFromGitHub {
+          owner = "raxod502";
+          repo = "prescient.el";
+          rev = "515959a2523b43608c9d06dcf8adde8911ce42b9";
+          sha256 = "1k8xk154sql3b2b7hpyxslcgl88aaxq5ak2sr760jsq2qk7878bw";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/b92c34e493bbefab1d7747b0855d1ab2f984cb7c/recipes/company-prescient";
+          sha256 = "0cp918ihbjqxfgqnifknl5hphmvq5bl42dhp5ylvijsfa8kvbsb9";
+          name = "recipe";
+        };
+        packageRequires = [ company emacs prescient ];
+        meta = {
+          homepage = "https://melpa.org/#/company-prescient";
+          license = lib.licenses.free;
+        };
+      }) {};
+    company-quickhelp = callPackage ({ company
+                                     , emacs
+                                     , fetchFromGitHub
+                                     , fetchurl
+                                     , lib
+                                     , melpaBuild
+                                     , pos-tip }:
+      melpaBuild {
         pname = "company-quickhelp";
         version = "2.3.0";
         src = fetchFromGitHub {
@@ -5389,10 +6708,10 @@
           rev = "b2953c725654650677e3d66eaeec666826d5f65f";
           sha256 = "08ccsfvwdpzpj0gai3xrdb2bv1nl6myjkxsc5774pbvlq9nkfdvr";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/022cc4fee54bb0194822947c70058145e2980b94/recipes/company-quickhelp";
           sha256 = "042bwv0wd4hksbm528zb7pbllzk83p8qjq5f8z46p84c8mmxfp9g";
-          name = "company-quickhelp";
+          name = "recipe";
         };
         packageRequires = [ company emacs pos-tip ];
         meta = {
@@ -5400,20 +6719,28 @@
           license = lib.licenses.free;
         };
       }) {};
-    company-restclient = callPackage ({ cl-lib ? null, company, emacs, fetchFromGitHub, fetchurl, know-your-http-well, lib, melpaBuild, restclient }:
-    melpaBuild {
+    company-restclient = callPackage ({ cl-lib ? null
+                                      , company
+                                      , emacs
+                                      , fetchFromGitHub
+                                      , fetchurl
+                                      , know-your-http-well
+                                      , lib
+                                      , melpaBuild
+                                      , restclient }:
+      melpaBuild {
         pname = "company-restclient";
         version = "0.1.0";
         src = fetchFromGitHub {
           owner = "iquiw";
           repo = "company-restclient";
-          rev = "98e4b2af0e84ba4192c16288123aed96541c6401";
-          sha256 = "0i1fh5lvqwlgn3g3fzh0xacxyljx6gkryipn133vfkv4jbns51n4";
+          rev = "c228f559cf845b4ac8e35728841e5352c1bec3b6";
+          sha256 = "0dq7vsk2pp2q6g8wp2agwfn0jjjb80kyq004biyci0p96qxr4li4";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dd063bc3789772fdcc6a8555817588962e60825/recipes/company-restclient";
           sha256 = "1md0n4k4wmbh9rmbwqh3kg2fj0c34rzqfd56jsq8lcdg14k0kdcb";
-          name = "company-restclient";
+          name = "recipe";
         };
         packageRequires = [
           cl-lib
@@ -5427,20 +6754,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    company-rtags = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, rtags }:
-    melpaBuild {
+    company-rtags = callPackage ({ company
+                                 , emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild
+                                 , rtags }:
+      melpaBuild {
         pname = "company-rtags";
         version = "2.18";
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "98d668e85cf9ae84e775742752c5656dd2df2f17";
-          sha256 = "0raqjbkl1ykga4ahgl9xw49cgh3cyqcf42z36z7d6fz1fw192kg0";
+          rev = "e4060b551575be378344c0cc1aedf11446b4f264";
+          sha256 = "01xc5r2am0xck7q6jal3zyrqbzpx68fzqi9af7zb1klyw2s5v807";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/company-rtags";
           sha256 = "0dicxbp3xn02pflrpfndj7hs494prvz64llsk1xpc2z23kfarp6f";
-          name = "company-rtags";
+          name = "recipe";
         };
         packageRequires = [ company emacs rtags ];
         meta = {
@@ -5448,8 +6781,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    company-shell = callPackage ({ cl-lib ? null, company, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    company-shell = callPackage ({ cl-lib ? null
+                                 , company
+                                 , dash
+                                 , emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "company-shell";
         version = "1.2.1";
         src = fetchFromGitHub {
@@ -5458,10 +6798,10 @@
           rev = "acdbf8cba6ad9831d81a77bab7bbfd50f19edd86";
           sha256 = "1dk927da7g4a39sva9bda978bx6hpiz5kf341fj8sb7xhryvh5r2";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bbaa05d158f3806b9f79a2c826763166dbee56ca/recipes/company-shell";
           sha256 = "0my9jghf3s4idkgrpki8mj1lm5ichfvznb09lfwf07fjhg0q1apz";
-          name = "company-shell";
+          name = "recipe";
         };
         packageRequires = [ cl-lib company dash emacs ];
         meta = {
@@ -5469,8 +6809,16 @@
           license = lib.licenses.free;
         };
       }) {};
-    company-sourcekit = callPackage ({ company, dash, dash-functional, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, sourcekit }:
-    melpaBuild {
+    company-sourcekit = callPackage ({ company
+                                     , dash
+                                     , dash-functional
+                                     , emacs
+                                     , fetchFromGitHub
+                                     , fetchurl
+                                     , lib
+                                     , melpaBuild
+                                     , sourcekit }:
+      melpaBuild {
         pname = "company-sourcekit";
         version = "0.2.0";
         src = fetchFromGitHub {
@@ -5479,10 +6827,10 @@
           rev = "8ba62ac25bf533b7f148f333bcb5c1db799f749b";
           sha256 = "01dh0wdaydiai4v13r8g05rpiwqr5qqi34wif8vbk2mrr25wc7i9";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/45969cd5cd936ea61fbef4722843b0b0092d7b72/recipes/company-sourcekit";
           sha256 = "0hr5j1ginf43h4qf3fvsh3z53z0c7w5a9lhrvdwmlzj396qhqmzs";
-          name = "company-sourcekit";
+          name = "recipe";
         };
         packageRequires = [ company dash dash-functional emacs sourcekit ];
         meta = {
@@ -5490,8 +6838,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    company-statistics = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    company-statistics = callPackage ({ company
+                                      , emacs
+                                      , fetchFromGitHub
+                                      , fetchurl
+                                      , lib
+                                      , melpaBuild }:
+      melpaBuild {
         pname = "company-statistics";
         version = "0.2.2";
         src = fetchFromGitHub {
@@ -5500,10 +6853,10 @@
           rev = "906d8137224c1a5bd1dc913940e0d32ffecf5523";
           sha256 = "0c98kfg7gimjx9cf8dmbk9mdsrybhphshrdl8dhif3zqvn6gxyd7";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/89d05b43f31ec157ce8e7bfba4b7c9119bda6dd2/recipes/company-statistics";
           sha256 = "1fl4ldj17m3xhi6xbw3bp9c2jir34xv3jh9daiw8g912fv2l5dcj";
-          name = "company-statistics";
+          name = "recipe";
         };
         packageRequires = [ company emacs ];
         meta = {
@@ -5511,8 +6864,17 @@
           license = lib.licenses.free;
         };
       }) {};
-    company-tern = callPackage ({ cl-lib ? null, company, dash, dash-functional, fetchFromGitHub, fetchurl, lib, melpaBuild, s, tern }:
-    melpaBuild {
+    company-tern = callPackage ({ cl-lib ? null
+                                , company
+                                , dash
+                                , dash-functional
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild
+                                , s
+                                , tern }:
+      melpaBuild {
         pname = "company-tern";
         version = "0.3.0";
         src = fetchFromGitHub {
@@ -5521,10 +6883,10 @@
           rev = "b20b3e490bf277c8480712210e3c92ea489859ef";
           sha256 = "1l4b54rqwsb32r8zwwrag7s35zc3kpviafdrqkq8r1nyshg2yccm";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/acc9b816796b9f142c53f90593952b43c962d2d8/recipes/company-tern";
           sha256 = "17pw4jx3f1hymj6sc0ri18jz9ngggj4a41kxx14fnmmm8adqn6wh";
-          name = "company-tern";
+          name = "recipe";
         };
         packageRequires = [ cl-lib company dash dash-functional s tern ];
         meta = {
@@ -5532,20 +6894,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    company-terraform = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, terraform-mode }:
-    melpaBuild {
+    company-terraform = callPackage ({ company
+                                     , emacs
+                                     , fetchFromGitHub
+                                     , fetchurl
+                                     , lib
+                                     , melpaBuild
+                                     , terraform-mode }:
+      melpaBuild {
         pname = "company-terraform";
-        version = "1.1";
+        version = "1.2";
         src = fetchFromGitHub {
           owner = "rafalcieslak";
           repo = "emacs-company-terraform";
-          rev = "b08ced5bac44c0253e3725a7f7a6246bdf1cf2b6";
-          sha256 = "10922ykv6ii28rnhg4vri2g1fs5897xjxw6a5pk1rw2mld5kx57r";
+          rev = "45a2bd090af79c119f92414c4dee8939b38903d1";
+          sha256 = "0gcg20f4nld54y48mssd3sfc7fxq07iff9gsi5av4b86kyzjfr6x";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1d9732da975dcf59d3b311b19e20abbb29c33656/recipes/company-terraform";
           sha256 = "198ppqn6f7y9bg582z5s4cl9gg1q9ibsr7mmn68b50zvma7ankzh";
-          name = "company-terraform";
+          name = "recipe";
         };
         packageRequires = [ company emacs terraform-mode ];
         meta = {
@@ -5553,8 +6921,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    company-web = callPackage ({ cl-lib ? null, company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, web-completion-data }:
-    melpaBuild {
+    company-web = callPackage ({ cl-lib ? null
+                               , company
+                               , dash
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild
+                               , web-completion-data }:
+      melpaBuild {
         pname = "company-web";
         version = "2.1";
         src = fetchFromGitHub {
@@ -5563,10 +6938,10 @@
           rev = "f0cc9187c9c34f72ad71f5649a69c74f996bae9a";
           sha256 = "1xcwwcy2866vzaqgn7hrl7j8k48mk74i4shm40v7ybacws47s9nr";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/company-web";
           sha256 = "1q2am684l4d038a3ymyy6gg2ds9lq5mcfc4in8dmvap5grdhia4b";
-          name = "company-web";
+          name = "recipe";
         };
         packageRequires = [ cl-lib company dash web-completion-data ];
         meta = {
@@ -5574,8 +6949,18 @@
           license = lib.licenses.free;
         };
       }) {};
-    company-ycmd = callPackage ({ company, dash, deferred, f, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, s, ycmd }:
-    melpaBuild {
+    company-ycmd = callPackage ({ company
+                                , dash
+                                , deferred
+                                , f
+                                , fetchFromGitHub
+                                , fetchurl
+                                , let-alist
+                                , lib
+                                , melpaBuild
+                                , s
+                                , ycmd }:
+      melpaBuild {
         pname = "company-ycmd";
         version = "1.2";
         src = fetchFromGitHub {
@@ -5584,10 +6969,10 @@
           rev = "d042a673b4d717c3ca9d641f120bfe16c994c740";
           sha256 = "0rxw86xi9xgr0fp6wmd6hgqgqr9flk7p4lcr0052jhlwknj1nrx0";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/company-ycmd";
           sha256 = "1dycbp2q8grvv94mwp9n8s7xpz2zjs05l3lf471j3nlbk6xfsn5d";
-          name = "company-ycmd";
+          name = "recipe";
         };
         packageRequires = [ company dash deferred f let-alist s ycmd ];
         meta = {
@@ -5595,20 +6980,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    composable = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    composable = callPackage ({ emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "composable";
         version = "0.0.1";
         src = fetchFromGitHub {
           owner = "paldepind";
           repo = "composable.el";
-          rev = "4739b6a730498e7526d06222810c3ccf3723d509";
-          sha256 = "1mii790r6gaz0nidlaib50wj4vryfvw7ls6b4mg1nw5km7hplpgq";
+          rev = "a3c582994582603ef037db4464f8ea49d759a42e";
+          sha256 = "0qlrvr5z9gi6yr9angp5ijmjzqqhwbxlpz9265113x9cy9kjdkpl";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1fc0f076198e4be46a33a26eea9f2d273dda12b8/recipes/composable";
           sha256 = "1fs4pczjn9sv12sladf6zbkz0cmzxr0jaqkiwryydal1l5nqqxcy";
-          name = "composable";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -5616,8 +7005,16 @@
           license = lib.licenses.free;
         };
       }) {};
-    composer = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, request, s, seq }:
-    melpaBuild {
+    composer = callPackage ({ emacs
+                            , f
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild
+                            , request
+                            , s
+                            , seq }:
+      melpaBuild {
         pname = "composer";
         version = "0.0.8";
         src = fetchFromGitHub {
@@ -5626,10 +7023,10 @@
           rev = "2d16d3bb65c53e9e26f4b7b22ad38590a4a48ee1";
           sha256 = "1zxqqd12p1db75icbwbdj51fvp8zzhivi8ssnxda1r5y5crbiqdv";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/eb13cb0dba1696cc51132cd1ff723fa17f892a7c/recipes/composer";
           sha256 = "01w9cywhfngkrl9az8kfpzm12nc0zwmax01pyxlbi2l2icmvp5s1";
-          name = "composer";
+          name = "recipe";
         };
         packageRequires = [ emacs f request s seq ];
         meta = {
@@ -5637,20 +7034,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    concurrent = callPackage ({ deferred, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    concurrent = callPackage ({ deferred
+                              , emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "concurrent";
         version = "0.5.1";
         src = fetchFromGitHub {
           owner = "kiwanami";
           repo = "emacs-deferred";
-          rev = "d012a1ab50edcc2c44e3e49006f054dbff47cb6c";
-          sha256 = "0xy9zb6wwkgwhcxdnslqk52bq3z24chgk6prqi4ks0qcf2bwyh5h";
+          rev = "9668749635472a63e7a9282e2124325405199b79";
+          sha256 = "1ch5br9alvwcpijl9g8w5ypjrah29alpfpk4hjw23rwzyq5p4izq";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8bc29a8d518ce7a584277089bd4654f52ac0f358/recipes/concurrent";
           sha256 = "09wjw69bqrr3424h0mpb2kr5ixh96syjjsqrcyd7z2lsas5ldpnf";
-          name = "concurrent";
+          name = "recipe";
         };
         packageRequires = [ deferred emacs ];
         meta = {
@@ -5658,8 +7060,16 @@
           license = lib.licenses.free;
         };
       }) {};
-    conda = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pythonic, s }:
-    melpaBuild {
+    conda = callPackage ({ dash
+                         , emacs
+                         , f
+                         , fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild
+                         , pythonic
+                         , s }:
+      melpaBuild {
         pname = "conda";
         version = "0.0.9";
         src = fetchFromGitHub {
@@ -5668,10 +7078,10 @@
           rev = "64b804c33f2667e8232689770a9f2e332c2dd0ab";
           sha256 = "1w1p1m2d0mwi3frkah5cnphyqsix7fp1li8glhlwf923cg48cxfq";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fcf762e34837975f5440a1d81a7f09699778123e/recipes/conda";
           sha256 = "1hi292h6ccl7vkvyxcwwcdxw8q2brv3hy0mnlikzj2qy5pbnfg4y";
-          name = "conda";
+          name = "recipe";
         };
         packageRequires = [ dash emacs f pythonic s ];
         meta = {
@@ -5679,8 +7089,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    conkeror-minor-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    conkeror-minor-mode = callPackage ({ fetchFromGitHub
+                                       , fetchurl
+                                       , lib
+                                       , melpaBuild }:
+      melpaBuild {
         pname = "conkeror-minor-mode";
         version = "1.6.2";
         src = fetchFromGitHub {
@@ -5689,10 +7102,10 @@
           rev = "476e81c27b056e21c192391fe674a2bf875466b0";
           sha256 = "0sz3qx1bn0lwjhka2l6wfl4b5486ji9dklgjs7fdlkg3dgpp1ahx";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/conkeror-minor-mode";
           sha256 = "1ch108f20k7xbf79azsp31hh4wmw7iycsxddcszgxkbm7pj11933";
-          name = "conkeror-minor-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -5700,8 +7113,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    conllu-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, parsec }:
-    melpaBuild {
+    conllu-mode = callPackage ({ cl-lib ? null
+                               , emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild
+                               , parsec }:
+      melpaBuild {
         pname = "conllu-mode";
         version = "0.1.0";
         src = fetchFromGitHub {
@@ -5710,10 +7129,10 @@
           rev = "993fd6bc2b5c7b70815a3ecede1642f607513615";
           sha256 = "0x6ga4h084qcf9h6nak7c66qq1slq907n64sqx41gnd3zbscmwxa";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/444f943baddfeafe29708d6d68aeeeedbb7aa7bd/recipes/conllu-mode";
           sha256 = "1wffvvs8d0xcnz6mcm9rbr8imyj4npyc148yh0gzfzlgjm0fiz1v";
-          name = "conllu-mode";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs parsec ];
         meta = {
@@ -5721,20 +7140,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    connection = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    connection = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "connection";
         version = "1.10";
         src = fetchFromGitHub {
           owner = "myrkr";
           repo = "dictionary-el";
-          rev = "9ef1672ecd367827381bbbc9af93685980083c5c";
-          sha256 = "05xfgn9sabi1ykk8zbk2vza1g8pdrg08j5cb58f50nda3q8ndf4s";
+          rev = "a5ef20b2c32457880827ceda58f927ad9a26d2b7";
+          sha256 = "0ahn0v6qdfwvv9n0m6jcgrzmyarbsbvpgq8g4qy2g37ak4j60hp7";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5b08ed7b90e3283e177eff57cb02b12a093dc258/recipes/connection";
           sha256 = "1y68d2kay8p5vapailxhrc5dl7b8k8nkvp7pa54md3fsivwp1d0q";
-          name = "connection";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -5742,8 +7164,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    contextual = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    contextual = callPackage ({ cl-lib ? null
+                              , dash
+                              , emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "contextual";
         version = "1.0.1";
         src = fetchFromGitHub {
@@ -5752,10 +7180,10 @@
           rev = "8134a2d8034c624f4fdbbb0b3893de12f4257909";
           sha256 = "0s4b7dkndhnh8q3plvg2whjx8zd7ffz4hnbn3xh86xd3k7sch7av";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/44e5b799e411b8e2d89c8e9aeb4720126ac908b7/recipes/contextual";
           sha256 = "0vribs0fa1xf5kwkmvzjwhiawni0p3v56c5l4dkz8d7wn2g6wfdx";
-          name = "contextual";
+          name = "recipe";
         };
         packageRequires = [ cl-lib dash emacs ];
         meta = {
@@ -5763,8 +7191,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    contextual-menubar = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    contextual-menubar = callPackage ({ fetchFromGitHub
+                                      , fetchurl
+                                      , lib
+                                      , melpaBuild }:
+      melpaBuild {
         pname = "contextual-menubar";
         version = "1.0.0";
         src = fetchFromGitHub {
@@ -5773,10 +7204,10 @@
           rev = "cc2e7c952b59401188b81d84be81dead9d0da3db";
           sha256 = "01mk5xzsg52vfqjri1my193y6jczg2dp3pa2d0v0vw11m1k433h3";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cba21d98f3abbf1f45d1fdd9164d4660b7d3e368/recipes/contextual-menubar";
           sha256 = "0r9bsnvf45h7gsdfhsz7h02nskjvflfa2yjarjv9fcl7aipz8rr6";
-          name = "contextual-menubar";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -5784,8 +7215,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    copy-as-format = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    copy-as-format = callPackage ({ cl-lib ? null
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "copy-as-format";
         version = "0.0.7";
         src = fetchFromGitHub {
@@ -5794,10 +7229,10 @@
           rev = "971957166fe64d914ec4be209b4f80efeeabbb19";
           sha256 = "0ynzy2sb75w24d2kwjpkb3vl98yyz0sbcj6nd31y2r2n2kkdna24";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/42fe8a2113d1c15701abe7a7e0a68e939c3d789b/recipes/copy-as-format";
           sha256 = "1yij5mqm0dg6326yms0a2w8gs42kdxq0ih8dhkpdar54r0bk3m8k";
-          name = "copy-as-format";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -5805,20 +7240,27 @@
           license = lib.licenses.free;
         };
       }) {};
-    copy-file-on-save = callPackage ({ cl-lib ? null, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    copy-file-on-save = callPackage ({ cl-lib ? null
+                                     , emacs
+                                     , f
+                                     , fetchFromGitHub
+                                     , fetchurl
+                                     , lib
+                                     , melpaBuild
+                                     , s }:
+      melpaBuild {
         pname = "copy-file-on-save";
-        version = "0.0.3";
+        version = "0.0.5";
         src = fetchFromGitHub {
           owner = "emacs-php";
           repo = "emacs-auto-deployment";
-          rev = "aaa847b43af225ccb282aab2d9cddafe500d9f62";
-          sha256 = "0n2z91g7p9i724xqx2qq4s5xnxnf4vjccnvy1i706cddpjn02d6f";
+          rev = "5af6d5fcc35ddf9050eada96fd5f334bf0661b62";
+          sha256 = "1q9liby1dmwwmg2jz13gx2ld47bpcqb9c7vx4qgky75wb5c2q1xz";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/eb13cb0dba1696cc51132cd1ff723fa17f892a7c/recipes/copy-file-on-save";
           sha256 = "1mcwgkhd241aijnmzrrqqn9f7hiq5k1w4fj83v50aixrcs049gc3";
-          name = "copy-file-on-save";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs f s ];
         meta = {
@@ -5826,20 +7268,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    copyit = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    copyit = callPackage ({ cl-lib ? null
+                          , emacs
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "copyit";
         version = "0.0.2";
         src = fetchFromGitHub {
           owner = "zonuexe";
           repo = "emacs-copyit";
-          rev = "c973d3650208a033aaf845989d023f9c6e572ddd";
-          sha256 = "1fwndjbzwhl4dzrw5jxbq66yggxkl81ga3cnnl7rm3s63pkb6l3w";
+          rev = "be8dca96ef434d6658e4707b042c094e909d5141";
+          sha256 = "1058qvgl6fkz5srizny0hfbjgqfsb5l9id7zrs5fb5qkilk9s01v";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/69bd50fd1f3865d48cec9fe2680d260d746248e5/recipes/copyit";
           sha256 = "1m28irqixzl44c683dxvc5x6l3qcqlpy6jzk6629paqkdi5mx1c0";
-          name = "copyit";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -5847,8 +7294,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    copyit-pandoc = callPackage ({ copyit, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pandoc }:
-    melpaBuild {
+    copyit-pandoc = callPackage ({ copyit
+                                 , emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild
+                                 , pandoc }:
+      melpaBuild {
         pname = "copyit-pandoc";
         version = "0.0.2";
         src = fetchFromGitHub {
@@ -5857,10 +7310,10 @@
           rev = "c973d3650208a033aaf845989d023f9c6e572ddd";
           sha256 = "1fwndjbzwhl4dzrw5jxbq66yggxkl81ga3cnnl7rm3s63pkb6l3w";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/69bd50fd1f3865d48cec9fe2680d260d746248e5/recipes/copyit-pandoc";
           sha256 = "03v448gh6glq126r95w4y6s2p08jgjhkc6zgsplx0v9d5f2mwaqk";
-          name = "copyit-pandoc";
+          name = "recipe";
         };
         packageRequires = [ copyit emacs pandoc ];
         meta = {
@@ -5868,20 +7321,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    corral = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    corral = callPackage ({ fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "corral";
         version = "0.3.20";
         src = fetchFromGitHub {
           owner = "nivekuil";
           repo = "corral";
-          rev = "e7ab6aa118e46b93d4933d1364bc273f57cd6911";
-          sha256 = "00055gzv032xxzqm1hffipljy8fzgsm58cbv8dzajh035jvdgpv7";
+          rev = "8813288de240956641b37deafaaa4811548246df";
+          sha256 = "06l2imhxm6dijkqlhk9s0vsa5a0ghybpy7qk7wpkgv0dlm3k3w7n";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7b0d7e326f0401de0488b77d39af7bd7b8e8fdd4/recipes/corral";
           sha256 = "1drccqk4qzkgvkgkzlrrfd1dcgj8ziqriijrjihrzjgjsbpzv6da";
-          name = "corral";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -5889,8 +7345,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    counsel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }:
-    melpaBuild {
+    counsel = callPackage ({ emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild
+                           , swiper }:
+      melpaBuild {
         pname = "counsel";
         version = "0.10.0";
         src = fetchFromGitHub {
@@ -5899,10 +7360,10 @@
           rev = "4a2cee03519f98cf95b29905dec2566a39ff717e";
           sha256 = "14vnigqb5c3yi4q9ysw1fiwdqyqwyklqpb9wnjf81chm7s2mshnr";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06c50f32b8d603db0d70e77907e36862cd66b811/recipes/counsel";
           sha256 = "0y8cb2q4mqvzan5n8ws5pjpm7bkjcghg5q19mzc3gqrq9vrvyzi6";
-          name = "counsel";
+          name = "recipe";
         };
         packageRequires = [ emacs swiper ];
         meta = {
@@ -5910,8 +7371,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    counsel-bbdb = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
-    melpaBuild {
+    counsel-bbdb = callPackage ({ emacs
+                                , fetchFromGitHub
+                                , fetchurl
+                                , ivy
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "counsel-bbdb";
         version = "0.0.3";
         src = fetchFromGitHub {
@@ -5920,10 +7386,10 @@
           rev = "c86f4b9ef99c9db0b2c4196a300d61300dc2d0c1";
           sha256 = "1dchyg8cs7n0zbj6mr2z840yi06b2wja65k04idlcs6ngy1vc3sr";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0ed9bcdb1f25a6dd743c1dac2bb6cda73a5a5dc2/recipes/counsel-bbdb";
           sha256 = "14d9mk44skpmyj0zkqwz97j80r630j7s5hfrrhlsafdpl5aafjxp";
-          name = "counsel-bbdb";
+          name = "recipe";
         };
         packageRequires = [ emacs ivy ];
         meta = {
@@ -5931,8 +7397,16 @@
           license = lib.licenses.free;
         };
       }) {};
-    counsel-dash = callPackage ({ counsel, dash, dash-functional, emacs, fetchFromGitHub, fetchurl, helm-dash, lib, melpaBuild }:
-    melpaBuild {
+    counsel-dash = callPackage ({ counsel
+                                , dash
+                                , dash-functional
+                                , emacs
+                                , fetchFromGitHub
+                                , fetchurl
+                                , helm-dash
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "counsel-dash";
         version = "0.1.3";
         src = fetchFromGitHub {
@@ -5941,10 +7415,10 @@
           rev = "a342340bbd8e50e4d1015e0b91d8ecd8f6cdf9f2";
           sha256 = "1ma67lc4y9y3byrz8v6635w8q2scp6f2cqagq09k723k5nnwisfj";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0f8af4d854f972bfed3d2122b4c089f72d8b5f2a/recipes/counsel-dash";
           sha256 = "0pzh8ww1p2jb859gdjr5ypya3rwhiyg3c79xhx8filxrqxgjv5fk";
-          name = "counsel-dash";
+          name = "recipe";
         };
         packageRequires = [ counsel dash dash-functional emacs helm-dash ];
         meta = {
@@ -5952,20 +7426,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    counsel-etags = callPackage ({ counsel, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    counsel-etags = callPackage ({ counsel
+                                 , emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "counsel-etags";
-        version = "1.5.1";
+        version = "1.6.2";
         src = fetchFromGitHub {
           owner = "redguardtoo";
           repo = "counsel-etags";
-          rev = "307638efaa172539e77fe425626eac99f7abf654";
-          sha256 = "0c0fqn9hin9738bcxib354al6pd64arj2pccacjiyg1sa5h3mwj3";
+          rev = "9437ce4e4adb7140df6af0a4528069b9e54de44b";
+          sha256 = "14q7w6pz3pslwr4s1f2b8wiq6k1jvp09mwml9x2j5ljw7j3145pi";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/87528349a3ab305bfe98f30c5404913272817a38/recipes/counsel-etags";
           sha256 = "1h3dlczm1m21d4h41vz9ngg5fi02g6f95qalfxdnsvz0d4w4yxk0";
-          name = "counsel-etags";
+          name = "recipe";
         };
         packageRequires = [ counsel emacs ];
         meta = {
@@ -5973,20 +7452,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    counsel-gtags = callPackage ({ counsel, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    counsel-gtags = callPackage ({ counsel
+                                 , emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "counsel-gtags";
         version = "0.1";
         src = fetchFromGitHub {
           owner = "syohex";
           repo = "emacs-counsel-gtags";
-          rev = "8066dd4cd6eb157345fb43788bacf2c5d746b497";
-          sha256 = "07kxv56p340a913673h30q65814ji7lwc6gsn9vcr18rsdaj7qwi";
+          rev = "88c47af65fafaabd908e80dec4cf2aae921581c0";
+          sha256 = "0qgvic4vdmgr46c0jya80v1ky2v9viqvqgkxzmq4i81zl6f7ad4d";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c7ccc35632219dbec5fdad7401545e7c071b910c/recipes/counsel-gtags";
           sha256 = "12qyb1lnzyd2rr4ankpqi30h0bj66ap5qw87y4605k0j44vhnsax";
-          name = "counsel-gtags";
+          name = "recipe";
         };
         packageRequires = [ counsel emacs ];
         meta = {
@@ -5994,8 +7478,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    counsel-projectile = callPackage ({ counsel, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }:
-    melpaBuild {
+    counsel-projectile = callPackage ({ counsel
+                                      , fetchFromGitHub
+                                      , fetchurl
+                                      , lib
+                                      , melpaBuild
+                                      , projectile }:
+      melpaBuild {
         pname = "counsel-projectile";
         version = "0.2.0";
         src = fetchFromGitHub {
@@ -6004,10 +7493,10 @@
           rev = "536872f022f449548bdb97faa1776d1d44499d73";
           sha256 = "0pm5sqhr24n2ffycazxgl3d3dl7gai8svwz01vc0pgx9c0x75kl8";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/389f16f886a385b02f466540f042a16eea8ba792/recipes/counsel-projectile";
           sha256 = "1gshphxaa902kq878rnizn3k1zycakwqkciz92z3xxb3bdyy0hnl";
-          name = "counsel-projectile";
+          name = "recipe";
         };
         packageRequires = [ counsel projectile ];
         meta = {
@@ -6015,8 +7504,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    counsel-tramp = callPackage ({ counsel, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    counsel-tramp = callPackage ({ counsel
+                                 , emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "counsel-tramp";
         version = "0.4.1";
         src = fetchFromGitHub {
@@ -6025,10 +7519,10 @@
           rev = "3f5ae75a6bde00bffeb2877b4ed4bd45610c0dfa";
           sha256 = "06dhhjrgpikzpdl1hck0ckjbx8yzx8jbymb3ajfxglgvrvid4l1k";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e1822b735b6bd533f658bd64ddccda29e19e9a5e/recipes/counsel-tramp";
           sha256 = "1ga57v6whnpigciw54k3hs0idq4cbl35qrysarik72f46by859v5";
-          name = "counsel-tramp";
+          name = "recipe";
         };
         packageRequires = [ counsel emacs ];
         meta = {
@@ -6036,8 +7530,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    coverage = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, ov }:
-    melpaBuild {
+    coverage = callPackage ({ cl-lib ? null
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild
+                            , ov }:
+      melpaBuild {
         pname = "coverage";
         version = "0.3";
         src = fetchFromGitHub {
@@ -6046,10 +7545,10 @@
           rev = "c73d984168955ca0f47f44b0464aa45282df42b6";
           sha256 = "1kn61j91x4r4kc498y2jas5il4pc4qzhkj8392g2qiq5m3lbv4vl";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cd70e138534551dd12ba4d165ba56fbd1e033241/recipes/coverage";
           sha256 = "0ja7wsx2sj0h01sk1l3c0aidbs1ld4gj3kiwq6brs7r018sz45pm";
-          name = "coverage";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ov ];
         meta = {
@@ -6057,29 +7556,37 @@
           license = lib.licenses.free;
         };
       }) {};
-    coverlay = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    coverlay = callPackage ({ cl-lib ? null
+                            , emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "coverlay";
-        version = "0.4.0";
+        version = "3.0.1";
         src = fetchFromGitHub {
           owner = "twada";
           repo = "coverlay.el";
-          rev = "b4d5d4dd702152bc7e7ca788d22e4feb74dc32fe";
-          sha256 = "0ji8n4sv0zqmfn4g7ay927d8ya6wrvqdzvd5sc6vicma9gn27lvj";
+          rev = "8205a845d58755dd7640b2e2b5991bf842998935";
+          sha256 = "1mppan4ml4dblwxdgr8pli7nj864frc7n7c6h47q4vfb4flg29n0";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/coverlay";
           sha256 = "1n0fblacwps94mhbdwpi22frhqp3pxg4323ghb79rvszb7in9i8j";
-          name = "coverlay";
+          name = "recipe";
         };
-        packageRequires = [];
+        packageRequires = [ cl-lib emacs ];
         meta = {
           homepage = "https://melpa.org/#/coverlay";
           license = lib.licenses.free;
         };
       }) {};
-    cpputils-cmake = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    cpputils-cmake = callPackage ({ fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "cpputils-cmake";
         version = "5.5";
         src = fetchFromGitHub {
@@ -6088,10 +7595,10 @@
           rev = "55e5c69554379632692a0fa20bfadeef9194fbdd";
           sha256 = "1rk0bwdvfrp24z69flh7jg3c8vgvwk6vciixmmmldnrlwhpnbh6i";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9b84a159e97f7161d0705da5dd5e8c34ae5cb848/recipes/cpputils-cmake";
           sha256 = "0fswmmmrjv897n51nidmn8gs8yp00595g35vwjafsq6rzfg58j60";
-          name = "cpputils-cmake";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -6099,8 +7606,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    creamsody-theme = callPackage ({ autothemer, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    creamsody-theme = callPackage ({ autothemer
+                                   , fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "creamsody-theme";
         version = "0.3.7";
         src = fetchFromGitHub {
@@ -6109,10 +7620,10 @@
           rev = "32fa3f4e461da92700523b1b20e7b28974c19a26";
           sha256 = "01q1l8ajw6lpp1bb4yp8r70d86hcl4hy0mz7x1hzqsvb7flhppp0";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/488f95b9e425726d641120130d894babcc3b3e85/recipes/creamsody-theme";
           sha256 = "0l3mq43bszxrz0bxmxb76drp4c8721cw8akgk3l5a800wqbfp2l7";
-          name = "creamsody-theme";
+          name = "recipe";
         };
         packageRequires = [ autothemer ];
         meta = {
@@ -6120,8 +7631,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    creds = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    creds = callPackage ({ dash
+                         , fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild
+                         , s }:
+      melpaBuild {
         pname = "creds";
         version = "0.0.6.1";
         src = fetchFromGitHub {
@@ -6130,10 +7646,10 @@
           rev = "00ebefd10005c170b790a01380cb6a98f798ce5c";
           sha256 = "169ai0xkh3988racnhaapxw0v1pbxvcaq470x1qacdzdpka4a7bs";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/81b032049ccc3837e8693f010b39716912f76bba/recipes/creds";
           sha256 = "0n11xxaf93bbc9ih25wj09zzw4sj32wb99qig4zcy8bpkl5y3llk";
-          name = "creds";
+          name = "recipe";
         };
         packageRequires = [ dash s ];
         meta = {
@@ -6141,8 +7657,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    cricbuzz = callPackage ({ dash, enlive, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    cricbuzz = callPackage ({ dash
+                            , enlive
+                            , f
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild
+                            , s }:
+      melpaBuild {
         pname = "cricbuzz";
         version = "0.3.5";
         src = fetchFromGitHub {
@@ -6151,10 +7674,10 @@
           rev = "557f75f10525e7a4d50e83010b9ed07fbf9df889";
           sha256 = "18lc56l5vcbrw2agpgjcap5q0l1mi64khgkk00x7r9wm1zilf9wp";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/cricbuzz";
           sha256 = "18nmr7rpbylqgfx5q3ps38wx9q1ndj06msgyjyc8lqpipbsz0pip";
-          name = "cricbuzz";
+          name = "recipe";
         };
         packageRequires = [ dash enlive f s ];
         meta = {
@@ -6162,8 +7685,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    crm-custom = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    crm-custom = callPackage ({ cl-lib ? null
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "crm-custom";
         version = "0.5";
         src = fetchFromGitHub {
@@ -6172,10 +7699,10 @@
           rev = "f1aaccf64306a5f99d9bf7ba815d7ea41c15518d";
           sha256 = "1kl6blr4dlz40gfc845071nhfms4fm59284ja2177bhghy3wmw6r";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5e0752ba601a8d518d3c7fb54fd008602e7dc19f/recipes/crm-custom";
           sha256 = "14w15skxr44p9ilhpswlgdbqfw8jghxi69l37yk4m449m7g9694c";
-          name = "crm-custom";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -6183,8 +7710,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    crux = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, seq }:
-    melpaBuild {
+    crux = callPackage ({ fetchFromGitHub
+                        , fetchurl
+                        , lib
+                        , melpaBuild
+                        , seq }:
+      melpaBuild {
         pname = "crux";
         version = "0.3.0";
         src = fetchFromGitHub {
@@ -6193,10 +7724,10 @@
           rev = "5b3c8155a9e9fe6f189645d175976026a2dc7b8d";
           sha256 = "0809pb8626i6z1dics3i1cs30p4qd8bzqcgr20lx9k3yq2abq2k7";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/575e3442a925500a5806e0b900208c1e6bfd11ae/recipes/crux";
           sha256 = "10lim1sngqbdqqwyq6ksqjjqpkm97aj1jk550sgwj28338lnw73c";
-          name = "crux";
+          name = "recipe";
         };
         packageRequires = [ seq ];
         meta = {
@@ -6204,20 +7735,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    cryptol-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    cryptol-mode = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "cryptol-mode";
         version = "0.1.0";
         src = fetchFromGitHub {
           owner = "thoughtpolice";
           repo = "cryptol-mode";
-          rev = "a54d000d24757fad2a91ae2853b16a97ebe52771";
-          sha256 = "00wgbcw09xn9xi52swi4wyi9dj9p9hyin7i431xi6zkhxysw4q7w";
+          rev = "b893e81452b631b464e5a98d17abd3d6627cc629";
+          sha256 = "0s62xpwx1m875cqcpd1c5yxgjglwvpa1pz3f7fkl485q5ip4zydl";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/de12333bb429d84b2c214ac7ebb0219f67838f4f/recipes/cryptol-mode";
           sha256 = "08iq69gqmps8cckybhj9065b8a2a49p0rpzgx883qxnypsmjfmf2";
-          name = "cryptol-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -6225,8 +7759,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    crystal-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    crystal-mode = callPackage ({ emacs
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "crystal-mode";
         version = "0.1.0";
         src = fetchFromGitHub {
@@ -6235,10 +7773,10 @@
           rev = "0fe6815201bebe4c5ff6857bd541d95b05132b10";
           sha256 = "0r75dvc0jqcqi1qjns8zj132dnm0s6mvqlqynkis16nigbawix8m";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d4b9b47d7deecf0cf24a42b26d50021cb1219a69/recipes/crystal-mode";
           sha256 = "1fgpz7zab6nc6kvjzjsbvrbg8shf4by0f20cvjvyky8kym72q0hk";
-          name = "crystal-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -6246,20 +7784,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    csharp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    csharp-mode = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "csharp-mode";
-        version = "0.9.0";
+        version = "0.9.2";
         src = fetchFromGitHub {
           owner = "josteink";
           repo = "csharp-mode";
-          rev = "6c0a0d6cf602666d63a06c3652ce522b3a5a7661";
-          sha256 = "1pw96s0675rf35hwaxdzids9s8ynkb0g66yximiiz6ryh4ama0wn";
+          rev = "5e47b7764b3f4c97c260a902e8072d444dbd0f1b";
+          sha256 = "1dnhpxcinrwc7dmwgzbg4lnly05h38f00zrfsjincvii6d8rjiw0";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/736716bbcfd9c9fb1d10ce290cb4f66fe1c68f44/recipes/csharp-mode";
           sha256 = "17j84qrprq492dsn103dji8mvh29mbdlqlpsszbgfdgnpvfr1rv0";
-          name = "csharp-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -6267,8 +7808,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    csound-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, multi, shut-up }:
-    melpaBuild {
+    csound-mode = callPackage ({ emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild
+                               , multi
+                               , shut-up }:
+      melpaBuild {
         pname = "csound-mode";
         version = "0.2.0";
         src = fetchFromGitHub {
@@ -6277,10 +7824,10 @@
           rev = "5a892e6ad72e7844e8e14c0da04fcb6bc125fe5e";
           sha256 = "1gzg2r7agllz2asp7dbxykydpnw3861whs2pfhr3fwwb39xf1pva";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c940d29de11e43b4abf2901c466c94d426a21818/recipes/csound-mode";
           sha256 = "047a78nhkn6qycsz8w9a0r1xyz5wyf4rds3z5yx9sn5wkv54w95d";
-          name = "csound-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs multi shut-up ];
         meta = {
@@ -6288,8 +7835,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    csv = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    csv = callPackage ({ fetchFromGitLab
+                       , fetchurl
+                       , lib
+                       , melpaBuild }:
+      melpaBuild {
         pname = "csv";
         version = "2.1";
         src = fetchFromGitLab {
@@ -6298,10 +7848,10 @@
           rev = "aa1dfa1263565d5fac3879c21d8ddf5f8915e411";
           sha256 = "1vmazjrfcsa9aa9aw8bq5sazdhqvhxyj837dyw5lmh8gk7z0xdaa";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/233f9de5f65fd8374f2c1912503c30905aa6691d/recipes/csv";
           sha256 = "1rvi5p27lsb284zqgv4cdqkbqc9r92axmvg7sv52rm7qcj8njwqd";
-          name = "csv";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -6309,8 +7859,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    ctable = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ctable = callPackage ({ fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "ctable";
         version = "0.1.2";
         src = fetchFromGitHub {
@@ -6319,10 +7872,10 @@
           rev = "08a017bde6d24ea585e39ce2637bebe28774d316";
           sha256 = "13zq8kym1y6bzrpxbcdz32323a6azy5px4ridff6xh8bfprwlay3";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8bc29a8d518ce7a584277089bd4654f52ac0f358/recipes/ctable";
           sha256 = "040qmlgfvjc1f908n52m5ll2fizbrhjzbd0kgrsw37bvm3029rx1";
-          name = "ctable";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -6330,8 +7883,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    ctags-update = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ctags-update = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "ctags-update";
         version = "1.0";
         src = fetchFromGitHub {
@@ -6340,10 +7896,10 @@
           rev = "ff4f211e42df94fdeba376e62b65dc67f0388589";
           sha256 = "09vdfmm846zhn5nxnndi7qg7rdsf5xd4zhynbx0mnm00cfw1vf0y";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e5d0c347ff8cf6e0ade80853775fd6b84f387fa5/recipes/ctags-update";
           sha256 = "07548jjpx4var2817y47i6br8iicjlj66n1b33h0av6r1h514nci";
-          name = "ctags-update";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -6351,8 +7907,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    ctxmenu = callPackage ({ fetchFromGitHub, fetchurl, lib, log4e, melpaBuild, popup, yaxception }:
-    melpaBuild {
+    ctxmenu = callPackage ({ fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , log4e
+                           , melpaBuild
+                           , popup
+                           , yaxception }:
+      melpaBuild {
         pname = "ctxmenu";
         version = "0.3.0";
         src = fetchFromGitHub {
@@ -6361,10 +7923,10 @@
           rev = "5c2376859562b98c07c985d2b483658e4c0e888e";
           sha256 = "1jlr2miwqsg06hk2clvsrw9fa98m2n76qfq8qv5svrb8dpil04wb";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6fc4f51bb6ce8fa9e37c0aeb51696b1980aece0c/recipes/ctxmenu";
           sha256 = "03g9px858mg19wapqszwav3599slljdyam8bvn1ri85fpa5ydvdp";
-          name = "ctxmenu";
+          name = "recipe";
         };
         packageRequires = [ log4e popup yaxception ];
         meta = {
@@ -6372,20 +7934,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    cubicaltt = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    cubicaltt = callPackage ({ cl-lib ? null
+                             , emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "cubicaltt";
         version = "1.0";
         src = fetchFromGitHub {
           owner = "mortberg";
           repo = "cubicaltt";
-          rev = "3257eadf70826fb3ef060c46f85b7a4d60464b1d";
-          sha256 = "1c5nfzsj4bi2rk3d3r2iw03kkpc5dg9p3q3xzj7cxfg2wmg1xaxk";
+          rev = "260b34e710cf18883f61f30bfcaf4e3823bebc0c";
+          sha256 = "0wdc26niyx2h49hfqshwqbvg0sbsg5dlfmwnl5y9jwf12170a9q3";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1be42b49c206fc4f0df6fb50fed80b3d9b76710b/recipes/cubicaltt";
           sha256 = "1wgy6965cnw201wx4a2pn71sa40mh2712y0d0470klr156krj0n9";
-          name = "cubicaltt";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -6393,20 +7960,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    cubicle-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    cubicle-mode = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "cubicle-mode";
         version = "1.1.2";
         src = fetchFromGitHub {
           owner = "cubicle-model-checker";
           repo = "cubicle";
-          rev = "b043b0247bf9b144a5c3360e5096a4b141dd1fb6";
-          sha256 = "0zsfz1h68xpbgdb1ln8l081vwrgd7i01ap4rjlyrsk8j3q3ry5wz";
+          rev = "9d108b900e0123236b4991c2d06b5061f34feee8";
+          sha256 = "1n3x6m19swkq07zah4hh0ni6gx864bq1w0km06nq33x8189zczrr";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/81c29c912b83cbb536d30ba04130b39c0e5e5969/recipes/cubicle-mode";
           sha256 = "0xcmd0s6dfryl1ihfaqq0pfqc906yzzwk3d3nv8g6b6w78pv1lzv";
-          name = "cubicle-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -6414,8 +7984,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    cuda-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    cuda-mode = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "cuda-mode";
         version = "1.0.0";
         src = fetchFromGitHub {
@@ -6424,10 +7997,10 @@
           rev = "c8cf7d92b8039cdd0bd525c258ab42f49a0f91cf";
           sha256 = "1y685qfdkjyl7dwyvivlgc2lwp102vy6hvcb9zynw84c49f726sn";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d21cf17a4a9ae391e2e9cf9be3399095fa23ef55/recipes/cuda-mode";
           sha256 = "0ip4vax93x72bjrh6prik6ddmrvszpsmgm0fxfz772rp24smc300";
-          name = "cuda-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -6435,20 +8008,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    cwl-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, yaml-mode }:
-    melpaBuild {
+    cwl-mode = callPackage ({ emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild
+                            , yaml-mode }:
+      melpaBuild {
         pname = "cwl-mode";
         version = "0.2.5";
         src = fetchFromGitHub {
           owner = "tom-tan";
           repo = "cwl-mode";
-          rev = "bdeb9c0734126f940db80bfb8b1dc735dab671c7";
-          sha256 = "0x9rvyhgy7ijq2r9pin94jz7nisrw6z91jch7d27lkhrmyb1rwk3";
+          rev = "2fa8c8db68a8665ed555126975edd8749bcfc009";
+          sha256 = "0zgnnvf8k5zcigykcf6slgcjmwb1l0jdfaqm19r34wp3md8wf0v1";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2309764cd56d9631dd97981a78b50b9fe793a280/recipes/cwl-mode";
           sha256 = "0x8akxxmphpgsc2m78h6b0fs6vvcfvmi1q2jrz8hwlmai8f7zi9j";
-          name = "cwl-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs yaml-mode ];
         meta = {
@@ -6456,20 +8034,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    cyberpunk-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    cyberpunk-theme = callPackage ({ fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "cyberpunk-theme";
-        version = "1.19";
+        version = "1.21";
         src = fetchFromGitHub {
           owner = "n3mo";
           repo = "cyberpunk-theme.el";
-          rev = "8c3cc39bcff5def0d476c080b5248436da7f990f";
-          sha256 = "1npwrw3pgdmvqhihcqcfi2yrs178iiip5fcj8zhpp6cr9yqsvvgi";
+          rev = "17f68f8ac70b712d2870ecb6adb3841b992074fa";
+          sha256 = "05mfgr9aj7knn7niadv9p6z3qrfpq2lbbi2wxxx62xywim9maw2y";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4c632d1e501d48dab54432ab111ce589aa229125/recipes/cyberpunk-theme";
           sha256 = "0l2bwb5afkkhrbh99v2gns1vil9s5911hbnlq5w35nmg1wvbmbc9";
-          name = "cyberpunk-theme";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -6477,8 +8058,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    cyphejor = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    cyphejor = callPackage ({ emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "cyphejor";
         version = "0.1.2";
         src = fetchFromGitHub {
@@ -6487,10 +8072,10 @@
           rev = "d7842388a1872b165489624a1a68f536de97e28d";
           sha256 = "1gi7rp0vf3iahljzjhs3rj9c0rvfcfs93hr8a3hl0ch3h9qq8ng2";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ad7cacfa39d8f85e26372ef21898663aebb68e43/recipes/cyphejor";
           sha256 = "18l5km4xm5j3vv19k3fxs8i3rg4qnhrvx7b62vmyfcqmpiasrh6g";
-          name = "cyphejor";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -6498,20 +8083,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    cython-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    cython-mode = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "cython-mode";
-        version = "0.28.2";
+        version = "0.28.4";
         src = fetchFromGitHub {
           owner = "cython";
           repo = "cython";
-          rev = "93e3bb9b7558d597d10c4cb8aa1dd887ed37dc2b";
-          sha256 = "1cywxcfrb2j33ncldylimqhj7r7yzlb6ghy5i8c9784vfvxd56yh";
+          rev = "9f3f99fd6378ffb17976d74356fd3ba7e22f85b3";
+          sha256 = "164ksml3i5gmcwripjsn5byfvnnjf86wrkkd9saw481ym6imii3c";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/be9bfabe3f79153cb859efc7c3051db244a63879/recipes/cython-mode";
           sha256 = "0asai1f1pncrfxx296fn6ky09hj1qam5j0dpxxkzhy0a34xz0k2i";
-          name = "cython-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -6519,20 +8107,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    d-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    d-mode = callPackage ({ fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "d-mode";
         version = "2.0.9";
         src = fetchFromGitHub {
           owner = "Emacs-D-Mode-Maintainers";
           repo = "Emacs-D-Mode";
-          rev = "98af62e67026fee1dda9155e1a463917fc83802e";
-          sha256 = "0fzplvi1sm8k2sabfdvrd7j2xypwqh0g9v1mxa75dajdmcd85zpj";
+          rev = "d7f46a28aca981e719d12460bf9b71e355d79565";
+          sha256 = "0kg91rdlvq2ypc6cww9gakbyd631lakcmqmbs7v0agc7vmba61xz";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3c13e9ccc358743de660b1f0e89d6bb709c42bff/recipes/d-mode";
           sha256 = "060k9ndjx0n5vlpzfxlv5zxnizx72d7y9vk7gz7gdvpm6w2ha0a2";
-          name = "d-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -6540,8 +8131,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    dad-joke = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    dad-joke = callPackage ({ emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "dad-joke";
         version = "1.4";
         src = fetchFromGitHub {
@@ -6550,10 +8145,10 @@
           rev = "bee47e7b746b403228fa7d7361cb095de19ac9ba";
           sha256 = "14snnnjs28jg6k8x6g90m3dbcx10306ipcd256d3l6czk9p17vpd";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/484d571b2737f7c613816333afdde6460c64e635/recipes/dad-joke";
           sha256 = "1cg8iaq79w5zx1s3dirdl7ymcp162mmsy5c4vly90v20yrijblad";
-          name = "dad-joke";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -6561,8 +8156,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    daemons = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    daemons = callPackage ({ emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "daemons";
         version = "1.2.0";
         src = fetchFromGitHub {
@@ -6571,10 +8170,10 @@
           rev = "9e6868e2559ea7d70fbad8c419798124f406cc40";
           sha256 = "00ijgm22ck76gw0x79krl05yy0m8a502yfakazfy5xhpn1zi6ab7";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1f780485e72ae2885f698fdab0156855f70831f1/recipes/daemons";
           sha256 = "14givkrw9p0m261hawahzi0n8jarapb63kv1s62faq57mqnq23jr";
-          name = "daemons";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -6582,20 +8181,29 @@
           license = lib.licenses.free;
         };
       }) {};
-    dante = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lib, melpaBuild, s }:
-    melpaBuild {
+    dante = callPackage ({ dash
+                         , emacs
+                         , f
+                         , fetchFromGitHub
+                         , fetchurl
+                         , flycheck
+                         , haskell-mode
+                         , lib
+                         , melpaBuild
+                         , s }:
+      melpaBuild {
         pname = "dante";
         version = "1.4";
         src = fetchFromGitHub {
           owner = "jyp";
           repo = "dante";
-          rev = "1a25bf26ee8d9878ce858cfaff84b083339056d6";
-          sha256 = "0kvsx9n8qm9s2w9bz167jzcb1b3d4fgc807w1miwil9dcyar6rkk";
+          rev = "3500ade60c5c4e831b04c92c56dc888063335d3b";
+          sha256 = "07nc1bgb67nlsf567cky6kvd3blm0w7nwpr92xga7jm6dqnqhlkg";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5afa8226077cbda4b76f52734cf8e0b745ab88e8/recipes/dante";
           sha256 = "1j0qwjshh2227k63vd06bvrsccymqssx26yfzams1xf7bp6y0krs";
-          name = "dante";
+          name = "recipe";
         };
         packageRequires = [ dash emacs f flycheck haskell-mode s ];
         meta = {
@@ -6603,20 +8211,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    darcula-theme = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    darcula-theme = callPackage ({ fetchFromGitLab
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "darcula-theme";
         version = "2.0";
         src = fetchFromGitLab {
           owner = "fommil";
           repo = "emacs-darcula-theme";
           rev = "2ecd466ffa7a3157b9ddcd7545b6fb8ad308c976";
-          sha256 = "1y8rsc63nl4n43pvn283f1vcpqyjnv6xl60fwyscwrqaz19bsnl1";
+          sha256 = "1h5lssnc1am54hkprnp61bsj5fnm8j556q2gbhljfjgrdwnqv8ky";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/23c8f10205187babb17e3abc3dc40eb1938e6640/recipes/darcula-theme";
           sha256 = "1n9mpkdyf5jpxc5azfs38ccp9p0b5ii87sz4c7z4khs94y0gxqh3";
-          name = "darcula-theme";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -6624,8 +8235,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    darktooth-theme = callPackage ({ autothemer, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    darktooth-theme = callPackage ({ autothemer
+                                   , fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "darktooth-theme";
         version = "0.3.7";
         src = fetchFromGitHub {
@@ -6634,10 +8249,10 @@
           rev = "fb66992286c009e594eb7bb9ee2f1cdc3bebb555";
           sha256 = "0n7qgnyl4rdvgwjb7gz6m1c22mxwg8bp08r7lz27z0b1bcyw94sc";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b7f62ac1566ced7332e83253f79078dc30cb7889/recipes/darktooth-theme";
           sha256 = "1vss0mg1vz4wvsal1r0ya8lid2c18ig11ip5v9nc80b5slbixzvs";
-          name = "darktooth-theme";
+          name = "recipe";
         };
         packageRequires = [ autothemer ];
         meta = {
@@ -6645,8 +8260,16 @@
           license = lib.licenses.free;
         };
       }) {};
-    dart-mode = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, s }:
-    melpaBuild {
+    dart-mode = callPackage ({ cl-lib ? null
+                             , dash
+                             , emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , flycheck
+                             , lib
+                             , melpaBuild
+                             , s }:
+      melpaBuild {
         pname = "dart-mode";
         version = "1.0.3";
         src = fetchFromGitHub {
@@ -6655,10 +8278,10 @@
           rev = "f3a7c7b71fb12d02fa02700bc10426cb10010d01";
           sha256 = "1g0c37qfqki7v1a5rxf6sy7k07i529rw3f1wmjl7g1zhd9bwsml2";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dart-mode";
           sha256 = "00zvgxfxgk5jair796l6appyq5hc7hs2s2wglv1j4l7g50b05cla";
-          name = "dart-mode";
+          name = "recipe";
         };
         packageRequires = [ cl-lib dash emacs flycheck s ];
         meta = {
@@ -6666,8 +8289,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    dash = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    dash = callPackage ({ fetchFromGitHub
+                        , fetchurl
+                        , lib
+                        , melpaBuild }:
+      melpaBuild {
         pname = "dash";
         version = "2.14.1";
         src = fetchFromGitHub {
@@ -6676,10 +8302,10 @@
           rev = "a74f4cfcdc8d0642a9f602ad494f0354f27dacc9";
           sha256 = "1kzijmjxjxgr7p8clphzvmm47vczckbs8mza9an77c25bn627ywl";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/57eed8767c3e98614259c408dc0b5c54d3473883/recipes/dash";
           sha256 = "0azm47900bk2frpjsgy108fr3p1jk4h9kmp4b5j5pibgsm26azgz";
-          name = "dash";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -6687,20 +8313,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    dash-functional = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    dash-functional = callPackage ({ dash
+                                   , emacs
+                                   , fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "dash-functional";
         version = "2.14.1";
         src = fetchFromGitHub {
           owner = "magnars";
           repo = "dash.el";
-          rev = "a74f4cfcdc8d0642a9f602ad494f0354f27dacc9";
-          sha256 = "1kzijmjxjxgr7p8clphzvmm47vczckbs8mza9an77c25bn627ywl";
+          rev = "528e5a51f1af668e3075f2beccd2b39785ccb2ba";
+          sha256 = "0c65wkyzqsi0jignbhl0j9hh0711069x0l54sqbfb72viy0sppck";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/57eed8767c3e98614259c408dc0b5c54d3473883/recipes/dash-functional";
           sha256 = "0hx36hs12mf4nmskaaqrqpcgwrfjdqj6qcxn6bwb0s5m2jf9hs8p";
-          name = "dash-functional";
+          name = "recipe";
         };
         packageRequires = [ dash emacs ];
         meta = {
@@ -6708,8 +8339,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    dashboard = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, page-break-lines }:
-    melpaBuild {
+    dashboard = callPackage ({ emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild
+                             , page-break-lines }:
+      melpaBuild {
         pname = "dashboard";
         version = "1.2.4";
         src = fetchFromGitHub {
@@ -6718,10 +8354,10 @@
           rev = "8594c4f55448148b720eda5b72d51667fb7a8a39";
           sha256 = "1hhh1kfsz87qfmh45wjf2r93rz79rq0vbyxlfrsl02092zjbl1zr";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e9a79341ccaa82a8c065e71c02fe6aee22007c66/recipes/dashboard";
           sha256 = "08pdpjfrg8v80gljy146cwpz624dshhbz8843zl1zszwp2p00kqy";
-          name = "dashboard";
+          name = "recipe";
         };
         packageRequires = [ emacs page-break-lines ];
         meta = {
@@ -6729,8 +8365,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    date-at-point = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    date-at-point = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "date-at-point";
         version = "0.1";
         src = fetchFromGitHub {
@@ -6739,10 +8378,10 @@
           rev = "662f8350a83311503dc0aae47a28752f9f1270c9";
           sha256 = "06aprbhhxb6bbzmf0r5yq2ry6x7708vp4d94ja3ir6zcwc96wn0k";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a6dbeddd236f312fac1d5542dfd2edf81df8fad2/recipes/date-at-point";
           sha256 = "0r26df6px6q5jlxj29nhl3qbp6kzy9hs5vd72kpiirgn4wlmagp0";
-          name = "date-at-point";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -6750,20 +8389,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    date-field = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, log4e, melpaBuild, yaxception }:
-    melpaBuild {
+    date-field = callPackage ({ dash
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , log4e
+                              , melpaBuild
+                              , yaxception }:
+      melpaBuild {
         pname = "date-field";
         version = "0.0.1";
         src = fetchFromGitHub {
           owner = "aki2o";
           repo = "emacs-date-field";
-          rev = "11c9170d1f7b343233f7716d4c0a62be024c1654";
-          sha256 = "1lmwnj2fnvijj9qp4rjggl7c4x91vnpb47rqaam6m2wmr5wbrx3w";
+          rev = "3b0af9c49293fc4346078ed2e13a6ebf41bbe54e";
+          sha256 = "1skvkbbqvwbw58ahdbf2m1z7s0kfi5v7c0lavc9ifrs91pqpqx9z";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fe790729a67d2210cbccefce43805daa20db647d/recipes/date-field";
           sha256 = "0fmw13sa4ajs1xkrkdpcjpbp0jl9d81cgvwh93myg8yjjn7wbmvk";
-          name = "date-field";
+          name = "recipe";
         };
         packageRequires = [ dash log4e yaxception ];
         meta = {
@@ -6771,8 +8416,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    datetime = callPackage ({ emacs, extmap, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    datetime = callPackage ({ emacs
+                            , extmap
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "datetime";
         version = "0.4.1";
         src = fetchFromGitHub {
@@ -6781,10 +8431,10 @@
           rev = "d8674ac11f9ebb702e5bbac10a4a6e5542958ef5";
           sha256 = "19d4wximzwdcs0i2r48k6m60wwxcx5f89jw75k4hr0wvx0352a82";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/91ef4352603cc69930ab3d63f0a90eee63f5f328/recipes/datetime";
           sha256 = "0c000fnqg936dhjw5qij4lydzllw1x1jgnyy960zh6r61pk062xj";
-          name = "datetime";
+          name = "recipe";
         };
         packageRequires = [ emacs extmap ];
         meta = {
@@ -6792,20 +8442,53 @@
           license = lib.licenses.free;
         };
       }) {};
-    debpaste = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, xml-rpc }:
-    melpaBuild {
+    deadgrep = callPackage ({ dash
+                            , emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild
+                            , projectile
+                            , s
+                            , spinner }:
+      melpaBuild {
+        pname = "deadgrep";
+        version = "0.4";
+        src = fetchFromGitHub {
+          owner = "Wilfred";
+          repo = "deadgrep";
+          rev = "160fa79bc76fa79ab727e369c5053bd61ca62a49";
+          sha256 = "0csval9g9w606dvj24rv2x5f6rbaj1lczavvcldq0wgj8fivkyh1";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/93389fae7233b83ea904e17bdaf83f8247cda3d8/recipes/deadgrep";
+          sha256 = "01m5ds7lic9g11a5iwzw86k6xcv56wbbzjm1343ckbbi255h9i09";
+          name = "recipe";
+        };
+        packageRequires = [ dash emacs projectile s spinner ];
+        meta = {
+          homepage = "https://melpa.org/#/deadgrep";
+          license = lib.licenses.free;
+        };
+      }) {};
+    debpaste = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild
+                            , xml-rpc }:
+      melpaBuild {
         pname = "debpaste";
         version = "0.1.5";
         src = fetchFromGitHub {
           owner = "alezost";
           repo = "debpaste.el";
-          rev = "6f2a400665062468ebd03a2ce1de2a73d9084958";
-          sha256 = "1wi70r56pd5z0x4dp4m58p9asq03j74kdm4fi9vai83vsl2z9amq";
+          rev = "038f0ff7824f4e3dd455e2232eeca70fa8abcec5";
+          sha256 = "1darxggvyv100cfb7imyzvgif8a09pnky62pf3bl2612hhvaijfb";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/debpaste";
           sha256 = "0h3hx3vgdhchmndabmzprddq3bxd80jnv4xvma9v6k1v07bl721v";
-          name = "debpaste";
+          name = "recipe";
         };
         packageRequires = [ xml-rpc ];
         meta = {
@@ -6813,8 +8496,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    decide = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    decide = callPackage ({ fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "decide";
         version = "0.7";
         src = fetchFromGitHub {
@@ -6823,10 +8509,10 @@
           rev = "90133687118c236142b8110571c463304b3192f9";
           sha256 = "04yakjnh9c165ssmcwkkm03lnlhgfx5bnk0v3cm73kmwdmfd2q7s";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6adcd300e2ac2c718989cf855fd7b3eef654df00/recipes/decide";
           sha256 = "1gjkays48lhrifi9jwja5n2dpxjbl7f9rmka1nsqg9vf7s59vhhc";
-          name = "decide";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -6834,8 +8520,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    dedicated = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    dedicated = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "dedicated";
         version = "1.0.0";
         src = fetchFromGitHub {
@@ -6844,10 +8533,10 @@
           rev = "8275fb672f9cc4ba6682ebda0ef91db827e32992";
           sha256 = "0pba9s0h37sxyqh733vi6k5raa4cs7aradipf3826inw36jcw414";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5f2a50f62475639af011c99c6cc38928b74b3b0a/recipes/dedicated";
           sha256 = "1ka8n02r3nd2ksbid23g2qd6707c7xsjx7lbbdi6pcmwam5mglw9";
-          name = "dedicated";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -6855,8 +8544,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    default-text-scale = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    default-text-scale = callPackage ({ fetchFromGitHub
+                                      , fetchurl
+                                      , lib
+                                      , melpaBuild }:
+      melpaBuild {
         pname = "default-text-scale";
         version = "0.1";
         src = fetchFromGitHub {
@@ -6865,10 +8557,10 @@
           rev = "c90c08b9fe5f25474067a00c4a4babdb413b25b1";
           sha256 = "031f8ls1q80j717cg6b4pjd37wk7vrl5hcycsn8ca7yssmqa8q81";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/db5e0b70e2d9c80aa41ae2c397f822789c2d3cc2/recipes/default-text-scale";
           sha256 = "18r90ic38fnlsbg4gi3r962vban398x2bf3rqhrc6z4jk4aiv3mi";
-          name = "default-text-scale";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -6876,8 +8568,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    deferred = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    deferred = callPackage ({ emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "deferred";
         version = "0.5.1";
         src = fetchFromGitHub {
@@ -6886,10 +8582,10 @@
           rev = "d012a1ab50edcc2c44e3e49006f054dbff47cb6c";
           sha256 = "0xy9zb6wwkgwhcxdnslqk52bq3z24chgk6prqi4ks0qcf2bwyh5h";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/deferred";
           sha256 = "1i8jfapzmw86iqwhnnlqmcj6zh4hyhizdcwjxcnxdj6kvxmwyysm";
-          name = "deferred";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -6897,8 +8593,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    define-word = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    define-word = callPackage ({ emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "define-word";
         version = "0.1.0";
         src = fetchFromGitHub {
@@ -6907,10 +8607,10 @@
           rev = "38e2f94779652fc6280a51b68dc910431513a8e1";
           sha256 = "1lyqd9cgj7cb2lasf6ycw5j8wnsx2nrfm8ra4sg3dgcspm01a89g";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e318b30d8b2b89981f4b89d78e5a46e77d3de412/recipes/define-word";
           sha256 = "035fdfwnxw0mir1dyvrimygx2gafcgnvlcsmwmry1rsfh39n5b9a";
-          name = "define-word";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -6918,8 +8618,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    deft = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    deft = callPackage ({ fetchFromGitHub
+                        , fetchurl
+                        , lib
+                        , melpaBuild }:
+      melpaBuild {
         pname = "deft";
         version = "0.8";
         src = fetchFromGitHub {
@@ -6928,10 +8631,10 @@
           rev = "c4b30d780bfa732ff52d85f0311e4a045f44a7b4";
           sha256 = "0z7cilgiz6krvl5h2z72hkch43qxmypb0k6p5vxn5lx1p6v0mrf2";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1e2a0e4698d4e71ec28656594f6a83504a823490/recipes/deft";
           sha256 = "0f6z9hsigbwdsmg0abk1ddl9j19d0rpj4gzkl0d5arcpqbla26hp";
-          name = "deft";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -6939,20 +8642,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    demangle-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    demangle-mode = callPackage ({ cl-lib ? null
+                                 , emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "demangle-mode";
-        version = "1.2.1";
+        version = "1.2.2";
         src = fetchFromGitHub {
           owner = "liblit";
           repo = "demangle-mode";
-          rev = "0f9436f98225e0f5a5deecea4680c173e76f0322";
-          sha256 = "0n10c45lvdfczhd2mpkciggv4d83mcnbpmjhxzvmnf7n5ar6aw6a";
+          rev = "374c84a0b190f0f0ea76b956035003228077d1e0";
+          sha256 = "02z2mjillglyv65ijdlc62hbjddp3xv185xg7s93xz7ymg04c394";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6ced9f4ffb051a8474d3f72695156416cf2dd8be/recipes/demangle-mode";
           sha256 = "0ky0bb6rc99vrdli4lhs656qjndnla9b7inc2ji9l4n1zki5qxzk";
-          name = "demangle-mode";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -6960,8 +8668,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    describe-number = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yabin }:
-    melpaBuild {
+    describe-number = callPackage ({ fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild
+                                   , yabin }:
+      melpaBuild {
         pname = "describe-number";
         version = "0.3.1";
         src = fetchFromGitHub {
@@ -6970,10 +8682,10 @@
           rev = "40618345a37831804b29589849a785ef5aa5ac24";
           sha256 = "13fasbhdjwc4jh3cy25gm5sbbg56hq8la271098qpx6dhqm2wycq";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d5ed9063f7e9f540bc90c1df4e3604d4af9bcfe5/recipes/describe-number";
           sha256 = "0gvriailni2ppz69g0bwnb1ik1ghjkj341k45vllz30j0frp9iji";
-          name = "describe-number";
+          name = "recipe";
         };
         packageRequires = [ yabin ];
         meta = {
@@ -6981,8 +8693,39 @@
           license = lib.licenses.free;
         };
       }) {};
-    desktop-plus = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    desktop-environment = callPackage ({ emacs
+                                       , fetchFromGitHub
+                                       , fetchurl
+                                       , lib
+                                       , melpaBuild }:
+      melpaBuild {
+        pname = "desktop-environment";
+        version = "0.2.0";
+        src = fetchFromGitHub {
+          owner = "DamienCassou";
+          repo = "desktop-environment";
+          rev = "10df99c6c6805a01acbbdfb7d02dc8cf2780d88d";
+          sha256 = "1fal3yfmqg10cb53qsf5gsq2gvyz9w16wmlpnpjwjzwnjfn6l73r";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/dfe988e0dd4a1272ecf7b2fe758ef0c81e2acad2/recipes/desktop-environment";
+          sha256 = "0iai1awpkv4n8k263854mx95c8yh2vvif6z91mgn6hck8774v9zp";
+          name = "recipe";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/desktop-environment";
+          license = lib.licenses.free;
+        };
+      }) {};
+    desktop-plus = callPackage ({ dash
+                                , emacs
+                                , f
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "desktop-plus";
         version = "0.2";
         src = fetchFromGitHub {
@@ -6991,10 +8734,10 @@
           rev = "a9cb8dd0af5071d9f148211b408c54306239381c";
           sha256 = "10f5dkrwfd6a1ab98j2kywkh1h01pnanvj2i7fv9a9vxnmiywrcf";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0b009b42c73490d56d4613dcf5a57447fb4ccab4/recipes/desktop+";
           sha256 = "0w7i6k4814hwb19l7ly9yq59674xiw57ylrwxq7yprwx52sgs2r8";
-          name = "desktop-plus";
+          name = "recipe";
         };
         packageRequires = [ dash emacs f ];
         meta = {
@@ -7002,8 +8745,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    desktop-registry = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    desktop-registry = callPackage ({ fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "desktop-registry";
         version = "1.2.0";
         src = fetchFromGitHub {
@@ -7012,10 +8758,10 @@
           rev = "244c2e7f9f0a1050aa8a47ad0b38f4e4584682dd";
           sha256 = "11qvhbz7149vqh61fgqqn4inw0ic6ib9lz2xgr9m54pdw9a901mp";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0fda2b54a0ff0b6fc3bd6d20cfcbbf63cae5380f/recipes/desktop-registry";
           sha256 = "1sfj0w6hlrx37js63fn1v5xc9ngmahv07g42z68717md6w3c8g0v";
-          name = "desktop-registry";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -7023,20 +8769,48 @@
           license = lib.licenses.free;
         };
       }) {};
-    dictionary = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    diary-manager = callPackage ({ emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
+        pname = "diary-manager";
+        version = "2.0.1";
+        src = fetchFromGitHub {
+          owner = "raxod502";
+          repo = "diary-manager";
+          rev = "01851f42aee0526995ea88c3d42b7fe12e1cb7fd";
+          sha256 = "1q1zrqawrr844lzjc5l480im6rjdyagir0dr805vgyv31fhp1vmw";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/a014f4d862a2480f7edb1266f79ce0801cca13c2/recipes/diary-manager";
+          sha256 = "1sk0pvadx4jmv93dj796ysn3jh2wvywayd7dd20v22kdvnlii73d";
+          name = "recipe";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/diary-manager";
+          license = lib.licenses.free;
+        };
+      }) {};
+    dictionary = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "dictionary";
         version = "1.10";
         src = fetchFromGitHub {
           owner = "myrkr";
           repo = "dictionary-el";
-          rev = "9ef1672ecd367827381bbbc9af93685980083c5c";
-          sha256 = "05xfgn9sabi1ykk8zbk2vza1g8pdrg08j5cb58f50nda3q8ndf4s";
+          rev = "3a461aec5aa5b78a1ad8919eab11abfb0d5d65b3";
+          sha256 = "10hnxy2n1njskh3nrjagp2lphhliw66cp8pjyh4m2zbj60ciz0ci";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5b08ed7b90e3283e177eff57cb02b12a093dc258/recipes/dictionary";
           sha256 = "0zr9sm5rmr0frxdr0za72wiffip9391fn9dm5y5x0aj1z4c1n28w";
-          name = "dictionary";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -7044,8 +8818,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    diff-hl = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    diff-hl = callPackage ({ cl-lib ? null
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "diff-hl";
         version = "1.8.4";
         src = fetchFromGitHub {
@@ -7054,10 +8832,10 @@
           rev = "e93367512080e540dc5dd126dfcb38b4a5e9415b";
           sha256 = "03pvh213w0sgyvv0xrkj43bs53p2xfr7162yhzdh24qwa8dd23qv";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/diff-hl";
           sha256 = "135jgjfaiq6kj72ji5k22v4pqc8gjjmcv80r5rkjbjigzlvcvvj2";
-          name = "diff-hl";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -7065,8 +8843,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    difflib = callPackage ({ cl-generic, emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, s }:
-    melpaBuild {
+    difflib = callPackage ({ cl-generic
+                           , emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , ht
+                           , lib
+                           , melpaBuild
+                           , s }:
+      melpaBuild {
         pname = "difflib";
         version = "0.3.8";
         src = fetchFromGitHub {
@@ -7075,10 +8860,10 @@
           rev = "b08850251812d71e62fd6956081299590acdf37b";
           sha256 = "03k5iy610f1m2nmkdk69p49fcfqfyxmy3h6fqvqsr2v1hix8i54a";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/df1924ddff6fd1b5fa32481d3b3d6fbe89a127d3/recipes/difflib";
           sha256 = "07bm5hib3ihrrx0lhfsl6km9gfckl73qd4cb37h93zw0hc9xwhy6";
-          name = "difflib";
+          name = "recipe";
         };
         packageRequires = [ cl-generic emacs ht s ];
         meta = {
@@ -7086,8 +8871,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    diffview = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    diffview = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "diffview";
         version = "1.0";
         src = fetchFromGitHub {
@@ -7096,10 +8884,10 @@
           rev = "471dc36af93e68849bf2da0db991e186283b3546";
           sha256 = "1ci2gmyl0i736b2sxh77fyg4hs2pkn6rn9z7v2hzv6xlgqd6j3z6";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0ea5dd4c9c114618ac20f565c878f509ce8d9872/recipes/diffview";
           sha256 = "0vlzmykvxjwjww313brl1nr13kz41jypsk0s3l8q3rbsnkpfic5k";
-          name = "diffview";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -7107,8 +8895,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    digistar-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    digistar-mode = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "digistar-mode";
         version = "0.4";
         src = fetchFromGitHub {
@@ -7117,10 +8908,10 @@
           rev = "0dcde58ec6e473042e55d4f283b223554546de5b";
           sha256 = "0jzwaivsqh66py9hd3dg1ys5rc3p6pn8ndpwpvgyivk4pg6zhhj6";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/851fa17152b664df99b80a654e5c055bb5227181/recipes/digistar-mode";
           sha256 = "0khzxlrm09h31i1nqz6rnzhrdssb3kppc4klpxza612l306fih0s";
-          name = "digistar-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -7128,20 +8919,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    dim = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    dim = callPackage ({ emacs
+                       , fetchFromGitHub
+                       , fetchurl
+                       , lib
+                       , melpaBuild }:
+      melpaBuild {
         pname = "dim";
         version = "0.1";
         src = fetchFromGitHub {
           owner = "alezost";
           repo = "dim.el";
-          rev = "0c19a510580ebdc77e6db536f0f8ed2840b9b33e";
-          sha256 = "1vrd74vmm60gb69a4in412mjncnhkjbfpakpaa6w9rj7w4kyfiz1";
+          rev = "aee695f4c227e11aa22376667712815aafbb3616";
+          sha256 = "1nixb8xw7rdrq9da1767jl8xximfdcwav2fs0kwmxjc6vahh7ya1";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3a740ab40cab3a1890f56df808f41a2d541aa77c/recipes/dim";
           sha256 = "0gsyily47g3g55qmhp1wzfz319l1pkgjz4lbigafjzlzqxyclz52";
-          name = "dim";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -7149,20 +8944,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    dim-autoload = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    dim-autoload = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "dim-autoload";
         version = "2.0.1";
         src = fetchFromGitHub {
           owner = "tarsius";
           repo = "dim-autoload";
-          rev = "788320fe089fafbdf1cb09d2ab4d29d64a804e21";
-          sha256 = "0iyhjww7p274x418n1iw1xj2fkmn5k9icav0jyzbwmy83a2nmr52";
+          rev = "2ff7ded0c9f8bb582fb9018bea47ead44d048cf8";
+          sha256 = "0lbfgfx3015b1kspqrsnlpvzl7i06yxafj1i2lpcy7ay4fv5rp54";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/66b1a81dfd09a2859ae996d5d8e3d704857a340f/recipes/dim-autoload";
           sha256 = "0lhzzjrgfvbqnzwhjywrk3skdb7x10xdq7d21q6kdk3h5r0np9f9";
-          name = "dim-autoload";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -7170,8 +8968,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    diminish = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    diminish = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "diminish";
         version = "0.45";
         src = fetchFromGitHub {
@@ -7180,10 +8981,10 @@
           rev = "0211de96b7cfba9c9dc8d2d392dbd4ccdb22bc65";
           sha256 = "0qpgfgp8hrzz4vdifxq8h25n0a0jlzgf7aa1fpy6r0080v5rqbb6";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1bfb4acb381cada46458cf60eae9b88d007294d5/recipes/diminish";
           sha256 = "1h6a31jllypk47akjflz89xk6h47na96pim17d6g4rpqcafc2k43";
-          name = "diminish";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -7191,8 +8992,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    dimmer = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    dimmer = callPackage ({ emacs
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "dimmer";
         version = "0.3.0";
         src = fetchFromGitHub {
@@ -7201,10 +9006,10 @@
           rev = "12fc52a6570ec25020281735f5a0ca780a9105af";
           sha256 = "1jv9rrv15nb5hpwcaqlpjj932gyisrkwbv11czkg3v0bn7qn6yif";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8ae80e9202d69ed3214325dd15c4b2f114263954/recipes/dimmer";
           sha256 = "0w8n5svckk1jp8856pg2gkws9798prqjjkdqf8ili2hjcqnd1a3r";
-          name = "dimmer";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -7212,8 +9017,17 @@
           license = lib.licenses.free;
         };
       }) {};
-    dionysos = callPackage ({ alert, cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, libmpdee, melpaBuild, pkg-info, s }:
-    melpaBuild {
+    dionysos = callPackage ({ alert
+                            , cl-lib ? null
+                            , dash
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , libmpdee
+                            , melpaBuild
+                            , pkg-info
+                            , s }:
+      melpaBuild {
         pname = "dionysos";
         version = "0.6.0";
         src = fetchFromGitHub {
@@ -7222,10 +9036,10 @@
           rev = "98bc789d20e41020d6e62d63d3c78f8032fa4bf2";
           sha256 = "1hma72dyn3w6cwd3vrgg4hdlrxgwqs55cjyxb05vs9csz7r42208";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/890445eca3c555acd2639a6f509c8e83b687f2bd/recipes/dionysos";
           sha256 = "1wjgj74dnlwd79gc3l7ymbx75jka8rw9smzbb10dsfppw3rrzfmz";
-          name = "dionysos";
+          name = "recipe";
         };
         packageRequires = [ alert cl-lib dash libmpdee pkg-info s ];
         meta = {
@@ -7233,8 +9047,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    dired-atool = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    dired-atool = callPackage ({ emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "dired-atool";
         version = "1.1.0";
         src = fetchFromGitHub {
@@ -7243,10 +9061,10 @@
           rev = "a2470f805c8cfbeee459b000edaaa5474bac35f9";
           sha256 = "1d813b4wiamif48v0za5invnss52mn7yw3hzrlxd4918gy5y2r74";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dired-atool";
           sha256 = "0qljx6fmz1hal9r2smjyc957wcvcpg16vp5mv65ip6d26k5qsj0w";
-          name = "dired-atool";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -7254,8 +9072,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    dired-efap = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    dired-efap = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "dired-efap";
         version = "0.8";
         src = fetchFromGitHub {
@@ -7264,10 +9085,10 @@
           rev = "2b849bc5c09d0b752a177495ea1b851ee821f5bf";
           sha256 = "1m0nx8wd6q56qbp5mbp9n466kyglrz34nflwvgd1qnmi08jwswgv";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5669ca2adc48f3349eb59276850e6174e37f9de7/recipes/dired-efap";
           sha256 = "01j5v6584qi8ia7zmk03kx3i3kmm6hn6ycfgqlh5va6lp2h9sr00";
-          name = "dired-efap";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -7275,8 +9096,36 @@
           license = lib.licenses.free;
         };
       }) {};
-    dired-fdclone = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    dired-explorer = callPackage ({ cl-lib ? null
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
+        pname = "dired-explorer";
+        version = "0.6";
+        src = fetchFromGitHub {
+          owner = "jidaikobo-shibata";
+          repo = "dired-explorer";
+          rev = "3ade0a31b5340271d05e9bf443f2504960f6c6dd";
+          sha256 = "0lbm326na005k3pa11rqq5nbhvm55dydi2a7fzs3bzlqwbx7d6fq";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/acd40e02185847dfdcd70b3cacea703133e4356d/recipes/dired-explorer";
+          sha256 = "12mymmcl663ci543vqzg8jai8kgfbb3gw5wsbcm4ln3j8d5fgzd9";
+          name = "recipe";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "https://melpa.org/#/dired-explorer";
+          license = lib.licenses.free;
+        };
+      }) {};
+    dired-fdclone = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "dired-fdclone";
         version = "1.5.4";
         src = fetchFromGitHub {
@@ -7285,10 +9134,10 @@
           rev = "903d7a736d240ef7352989a4e5d0ff9129c2ee3c";
           sha256 = "0vkdsm29g1cvvv1j8xgjwr94x20zx8k2wvmncrpakcwq6d47cfxw";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8a0ddc10b11772d72a473e8d24ab4641bf4239a4/recipes/dired-fdclone";
           sha256 = "11aikq2q3m9h4zpgl24f8npvpwd98jgh8ygjwy2x5q8as8i89vf9";
-          name = "dired-fdclone";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -7296,8 +9145,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    dired-hide-dotfiles = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    dired-hide-dotfiles = callPackage ({ emacs
+                                       , fetchFromGitHub
+                                       , fetchurl
+                                       , lib
+                                       , melpaBuild }:
+      melpaBuild {
         pname = "dired-hide-dotfiles";
         version = "0.1";
         src = fetchFromGitHub {
@@ -7306,10 +9159,10 @@
           rev = "32cf3b6f90dc56f6ff271c28d827aab303bc6221";
           sha256 = "1fpzgmvbgfgl6wdrynlpvvdlbm8npgrmnzfz2133zvf5x3zfzq6r";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ba64a50f85fdb0ad54149dfed4051b4c1a719cbb/recipes/dired-hide-dotfiles";
           sha256 = "0yy131cvj9a9sz02ari7pzwf22r5y7acyg757h3jvih317v6jyp0";
-          name = "dired-hide-dotfiles";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -7317,20 +9170,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    dired-icon = callPackage ({ emacs, fetchFromGitLab, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    dired-icon = callPackage ({ emacs
+                              , fetchFromGitLab
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "dired-icon";
         version = "0.5";
         src = fetchFromGitLab {
           owner = "xuhdev";
           repo = "dired-icon";
           rev = "dbace8d2250f84487d31b39050fcdc260fcde804";
-          sha256 = "0r9qmr2l5kjwh1frp0k87nyaf13f7f9fjjf9yf9z92djqapfm9dd";
+          sha256 = "1d9105ibaw858gqp19rx2m6xm3hl57vzsmdqir883cy46qpvwhki";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8a96249947cba52cd75515b3dc83b0842fedf624/recipes/dired-icon";
           sha256 = "0nyiqcywc1p8kw3psisl4zxwmf2g0x82kanka85zxxdz15s509j1";
-          name = "dired-icon";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -7338,8 +9195,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    dired-imenu = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    dired-imenu = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "dired-imenu";
         version = "0.5.0";
         src = fetchFromGitHub {
@@ -7348,10 +9208,10 @@
           rev = "610e21fe0988c85931d34894d3eee2442c79ab0a";
           sha256 = "088h9yn6wndq4pq6f7q4iz17f9f4ci29z9nh595idljp3vwr7qid";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e346de86b7f7fd5dad548f0936cde54ac11e3f79/recipes/dired-imenu";
           sha256 = "09yix4fkr03jq6j2rmvyg6gkmcnraw49a8m9649r3m525qdnhxs1";
-          name = "dired-imenu";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -7359,8 +9219,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    dired-k = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    dired-k = callPackage ({ emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "dired-k";
         version = "0.19";
         src = fetchFromGitHub {
@@ -7369,10 +9233,10 @@
           rev = "3f0b9315f87b0f930d51089e311d41282d5f8b15";
           sha256 = "09xh097v3fd0mjxqlmbfwjlr1v4a99mj4rvwdb6kqgajmlhgi9hx";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7f8a828b2fbfa11c4b74192d9d0cfa0ad34b3da7/recipes/dired-k";
           sha256 = "0lghdmy9qcjykscfxvfrz8cpp87qc0vfd03vw8nfpvwcs2sd28i8";
-          name = "dired-k";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -7380,20 +9244,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    dired-quick-sort = callPackage ({ fetchFromGitLab, fetchurl, hydra, lib, melpaBuild }:
-    melpaBuild {
+    dired-quick-sort = callPackage ({ fetchFromGitLab
+                                    , fetchurl
+                                    , hydra
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "dired-quick-sort";
         version = "0.1";
         src = fetchFromGitLab {
           owner = "xuhdev";
           repo = "dired-quick-sort";
           rev = "fe39cfb2d4a7ba6b30f98134548b4e4bac67c469";
-          sha256 = "014frvpszixn8cx7rdx704glmjbslv3py3kw0pb0xqf50k4scynf";
+          sha256 = "1a9r1kz5irpvb2byabbf27sy7rjzaygfpqimpag41sj955wlgy9a";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4d278178128deb03a7b1d2e586dc38da2c7af857/recipes/dired-quick-sort";
           sha256 = "01vrk3wqq2zmcblyp9abi2lvrzr2a5ca8r8gjjnr5223037ppl3l";
-          name = "dired-quick-sort";
+          name = "recipe";
         };
         packageRequires = [ hydra ];
         meta = {
@@ -7401,8 +9269,38 @@
           license = lib.licenses.free;
         };
       }) {};
-    dired-single = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    dired-rsync = callPackage ({ dash
+                               , emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild
+                               , s }:
+      melpaBuild {
+        pname = "dired-rsync";
+        version = "0.4";
+        src = fetchFromGitHub {
+          owner = "stsquad";
+          repo = "dired-rsync";
+          rev = "3ee95c35d1b7d62ffbc38f16f8c79904ad22a84d";
+          sha256 = "1zrpmymd0fj74apkx413mpxvz3iwvfdxq5zx3sw5akpqc9nphn8n";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/ce9f41ad832cef527dde97f829a8b8339e6ac48b/recipes/dired-rsync";
+          sha256 = "0lykj7nfpaspwn90macvr7iir4jlrx88i0s9spii7iic2fnm51ql";
+          name = "recipe";
+        };
+        packageRequires = [ dash emacs s ];
+        meta = {
+          homepage = "https://melpa.org/#/dired-rsync";
+          license = lib.licenses.free;
+        };
+      }) {};
+    dired-single = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "dired-single";
         version = "0.1.3";
         src = fetchFromGitHub {
@@ -7411,10 +9309,10 @@
           rev = "5b002927fd8c7f954eec187227ac59dcaa8edfa3";
           sha256 = "0mfvyjbx7l7a1sfq47m6rb507xxw92nykkkpzmi2mpwv30f1c22j";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/41669decbb7ad5c4dbe152a863f16d87e7bba493/recipes/dired-single";
           sha256 = "13h8dsn7bkz8ji2rrb7vyrqb2znxarpiynqi65mfli7dn5k086vf";
-          name = "dired-single";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -7422,8 +9320,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    dired-toggle-sudo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    dired-toggle-sudo = callPackage ({ fetchFromGitHub
+                                     , fetchurl
+                                     , lib
+                                     , melpaBuild }:
+      melpaBuild {
         pname = "dired-toggle-sudo";
         version = "1.0";
         src = fetchFromGitHub {
@@ -7432,10 +9333,10 @@
           rev = "02449dbda4e168f99fe5352c9628df5d39e11483";
           sha256 = "0ajj8d6k5in2hclcrqckinfh80ylddplva0ryfbkzsjkfq167cv2";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5cdee2d52c0c53566fdd77a5d42edf365764acff/recipes/dired-toggle-sudo";
           sha256 = "0fy05af9aq9791ij4j9pscdk5j44pbg0kmhpqli41qiazjw7v2va";
-          name = "dired-toggle-sudo";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -7443,8 +9344,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    diredfl = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    diredfl = callPackage ({ emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "diredfl";
         version = "0.4";
         src = fetchFromGitHub {
@@ -7453,10 +9358,10 @@
           rev = "45e9c46f58c655694758d4986b9195c8bb40ddf3";
           sha256 = "1zb2lz7rp58zqvpniqcsmqabi7nqg2d8bfd0hgmq68bn2hd25b5z";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3da86e18d423198766455929da1dcb3a9a3be381/recipes/diredfl";
           sha256 = "0cybq15yq07x2mnrnwapy020d598yymcy8y9wwf1m7f59p3h9hvn";
-          name = "diredfl";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -7464,8 +9369,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    diredful = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    diredful = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "diredful";
         version = "1.10";
         src = fetchFromGitHub {
@@ -7474,10 +9382,10 @@
           rev = "b17b3087e0084a5571a9ac4d47ccfc36d96b109e";
           sha256 = "1d8n8wj5k82a1sfg93kn3ajci804mpp9j206x5f185zd48wb25z8";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/76f3d178e7c3982b53c7ee0096c839397534d732/recipes/diredful";
           sha256 = "0y8x6q1yfsk0srxsh4g5nbsms1g9pk9d103jx7cfdac79mcigw7x";
-          name = "diredful";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -7485,8 +9393,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    direnv = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, with-editor }:
-    melpaBuild {
+    direnv = callPackage ({ dash
+                          , emacs
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild
+                          , with-editor }:
+      melpaBuild {
         pname = "direnv";
         version = "1.4.0";
         src = fetchFromGitHub {
@@ -7495,10 +9409,10 @@
           rev = "03c4edffba45722a9511d6d10992578f140d095f";
           sha256 = "1b8xp0yprpy1sc8hmim6jcdmgpc8yj6wjzgj4rdy77k7l96016v8";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5419809ee62b920463e359c8e1314cd0763657c1/recipes/direnv";
           sha256 = "0zzmi5m6fh42kyf8dyjrjyrl03pkbipnh4mnssrhp83ljczxkyhd";
-          name = "direnv";
+          name = "recipe";
         };
         packageRequires = [ dash emacs with-editor ];
         meta = {
@@ -7506,8 +9420,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    direx = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    direx = callPackage ({ fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "direx";
         version = "1.0.0";
         src = fetchFromGitHub {
@@ -7516,10 +9433,10 @@
           rev = "423caeed13249e37afc937dc8134cb3c53e0f111";
           sha256 = "0p8c2hjgr81idm1psv3i3v5hr5rv0875ig8app2yqjwzvl0nn73f";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a4b0903466d63b1c87abc002b0e064e36a8cddd3/recipes/direx";
           sha256 = "1x3rnrhhyrrvgry9n7kc0734la1zp4gc4bpy50f2qpfd452jwqdm";
-          name = "direx";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -7527,8 +9444,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    direx-grep = callPackage ({ direx, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    direx-grep = callPackage ({ direx
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "direx-grep";
         version = "0.1.0";
         src = fetchFromGitHub {
@@ -7537,10 +9458,10 @@
           rev = "1109a512a80b2673a70b18b8568514049017faad";
           sha256 = "0swdh0qynpijsv6a2d308i42hfa0jwqsnmf4sm8vrhaf3vv25f5h";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6a88a29090a0d6c636f4aeb5214433db66367d9e/recipes/direx-grep";
           sha256 = "0y2wrzq06prm55akwgaqjg56znknyvbayav13asirqzg258skvm2";
-          name = "direx-grep";
+          name = "recipe";
         };
         packageRequires = [ direx ];
         meta = {
@@ -7548,8 +9469,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    disable-mouse = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    disable-mouse = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "disable-mouse";
         version = "0.3";
         src = fetchFromGitHub {
@@ -7558,10 +9482,10 @@
           rev = "81639930bcaeedadbcc19728e91719afcac84613";
           sha256 = "0l6mai68ns3qw3rlvjvzsnqwdy7bxqiy0vdwflq0l1plxb1vazyc";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/dbbc396373212fdf731e135cde391f27708ff015/recipes/disable-mouse";
           sha256 = "0c0ps39s6wg3grspvgck0cwxnas73nfaahfa87l0mmgsrsvas5m7";
-          name = "disable-mouse";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -7569,8 +9493,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    discover = callPackage ({ fetchFromGitHub, fetchurl, lib, makey, melpaBuild }:
-    melpaBuild {
+    discover = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , makey
+                            , melpaBuild }:
+      melpaBuild {
         pname = "discover";
         version = "0.3";
         src = fetchFromGitHub {
@@ -7579,10 +9507,10 @@
           rev = "bbfda2b4e429985a8fa7971d264c942767cfa816";
           sha256 = "0qxw30zrlcxhxb0alrgyiclrk44dysal8xsbz2mvgrb6jli8wg18";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/688e32e98758aa6fd31218e98608bd54a76c3e83/recipes/discover";
           sha256 = "1hf57p90jn1zzhjl63zv9ascbgkcbr0p0zmd3fvzpjsw84235dga";
-          name = "discover";
+          name = "recipe";
         };
         packageRequires = [ makey ];
         meta = {
@@ -7590,20 +9518,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    discover-my-major = callPackage ({ fetchFromGitHub, fetchurl, lib, makey, melpaBuild }:
-    melpaBuild {
+    discover-my-major = callPackage ({ fetchgit
+                                     , fetchurl
+                                     , lib
+                                     , makey
+                                     , melpaBuild }:
+      melpaBuild {
         pname = "discover-my-major";
         version = "1.0";
-        src = fetchFromGitHub {
-          owner = "steckerhalter";
-          repo = "discover-my-major";
-          rev = "57d76fd21ec54706289cf9396fc871250569951e";
-          sha256 = "1wlqyl03hhnflbyay3qlvdzqzvv5rbybcjpfddggda7ias9h0pr4";
+        src = fetchgit {
+          url = "https://framagit.org/steckerhalter/discover-my-major.git";
+          rev = "aca4ee2b45e96c7fd6167d006531472944c389ad";
+          sha256 = "1c2p31a1mlaqi4h83ij0y3vhrw2hja5cz3kf52qpnhqva7si5fx9";
         };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/274185fa94a3442c56593f3c8b99bdc6b9bd4994/recipes/discover-my-major";
-          sha256 = "0ch2y4grdjp7pvw2kxqnqdl7jd3q609n3pm3r0gn6k0xmcw85fgg";
-          name = "discover-my-major";
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/f0a8eb0eefe88b4ea683a4743c0f8393506e014b/recipes/discover-my-major";
+          sha256 = "1b10bwhls5bx83hzhqq1ylc2civ3bsivd6db46f3s5hpgvr4q17n";
+          name = "recipe";
         };
         packageRequires = [ makey ];
         meta = {
@@ -7611,8 +9542,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    dispass = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    dispass = callPackage ({ fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "dispass";
         version = "1.1.2";
         src = fetchFromGitHub {
@@ -7621,10 +9555,10 @@
           rev = "38b880e72cfe5e65179b16791903b0900c73eff4";
           sha256 = "1b1a1bwc6nv6wkd8jg1cqmjb9m9pxi5i2wbrz97fgii23dwfmlnl";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dispass";
           sha256 = "09c9v41rh63hjpdh377rbfvpial33r41dn5bss3632fi34az5l9n";
-          name = "dispass";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -7632,8 +9566,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    ditz-mode = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ditz-mode = callPackage ({ fetchhg
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "ditz-mode";
         version = "0.3";
         src = fetchhg {
@@ -7652,8 +9589,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    dix = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    dix = callPackage ({ cl-lib ? null
+                       , fetchFromGitHub
+                       , fetchurl
+                       , lib
+                       , melpaBuild }:
+      melpaBuild {
         pname = "dix";
         version = "0.3.5";
         src = fetchFromGitHub {
@@ -7662,10 +9603,10 @@
           rev = "86880826a0cc878e2e5d50bc835eed5c8e2f001a";
           sha256 = "00qyzpqdw4im7c4bqqpiayv4kr9iqlm6mhsziazjvrjsvvi0p9ij";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/149eeba213b82aa0bcda1073aaf1aa02c2593f91/recipes/dix";
           sha256 = "0c5fmknpy6kwlz7nx0csbbia1maz0szj7yha1p7wq28s3a5426xq";
-          name = "dix";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -7673,20 +9614,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    dix-evil = callPackage ({ dix, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    dix-evil = callPackage ({ dix
+                            , evil
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "dix-evil";
         version = "0.3.5";
         src = fetchFromGitHub {
           owner = "unhammer";
           repo = "dix";
-          rev = "86880826a0cc878e2e5d50bc835eed5c8e2f001a";
-          sha256 = "00qyzpqdw4im7c4bqqpiayv4kr9iqlm6mhsziazjvrjsvvi0p9ij";
+          rev = "1cfef0d3376a18c78dd1dfc1ac9ac3ad0e8c4475";
+          sha256 = "0p2cvr7mjpag86wacxm6s39y7p118gh2ccqw02jzabwxlfasfbw3";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d9dcceb57231bf2082154cab394064a59d84d3a5/recipes/dix-evil";
           sha256 = "1jscaksnl5qmpqgkjkv6sx56llz0w4p5h7j73c4a1hld94gwklh3";
-          name = "dix-evil";
+          name = "recipe";
         };
         packageRequires = [ dix evil ];
         meta = {
@@ -7694,20 +9640,30 @@
           license = lib.licenses.free;
         };
       }) {};
-    docker = callPackage ({ dash, docker-tramp, emacs, fetchFromGitHub, fetchurl, json-mode, lib, magit-popup, melpaBuild, s, tablist }:
-    melpaBuild {
+    docker = callPackage ({ dash
+                          , docker-tramp
+                          , emacs
+                          , fetchFromGitHub
+                          , fetchurl
+                          , json-mode
+                          , lib
+                          , magit-popup
+                          , melpaBuild
+                          , s
+                          , tablist }:
+      melpaBuild {
         pname = "docker";
-        version = "0.5.3";
+        version = "0.7.0";
         src = fetchFromGitHub {
           owner = "Silex";
           repo = "docker.el";
-          rev = "9ffeff244318ed119279d0a44784b7f690d1393d";
-          sha256 = "13c7x9pf6690w8l1jqnjf0bi9np9ndzmw1n6imy9cks8bpqbkdyd";
+          rev = "0bcc50fa0c94c1647511d37efcb46fa8b5d23db3";
+          sha256 = "12qggbxjmj939zzv774cqydfa3ykw7v77qphkjvlx2j2vq7r1d90";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6c74bf8a41c17bc733636f9e7c05f3858d17936b/recipes/docker";
           sha256 = "10x05vli7lg1w3fdbkrl34y4mwbhp2c7nqdwnbdy53i81jisw2lk";
-          name = "docker";
+          name = "recipe";
         };
         packageRequires = [
           dash
@@ -7723,8 +9679,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    docker-compose-mode = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, yaml-mode }:
-    melpaBuild {
+    docker-compose-mode = callPackage ({ dash
+                                       , emacs
+                                       , fetchFromGitHub
+                                       , fetchurl
+                                       , lib
+                                       , melpaBuild
+                                       , yaml-mode }:
+      melpaBuild {
         pname = "docker-compose-mode";
         version = "1.1.0";
         src = fetchFromGitHub {
@@ -7733,10 +9695,10 @@
           rev = "7f4cd0b1718df2ab93d51bd395b2f37df9482265";
           sha256 = "1fbcxwfvm33xcdj3cs26d9i1zyrryyjjkv7sc3mfxd45nq8d3ivj";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/37dd4c1fc11d22598c6faf03ccc860503a68b950/recipes/docker-compose-mode";
           sha256 = "1hldddl86h0i1ysxklkr1kyz44lzic1zr68x3vb0mha4n5d6bl5g";
-          name = "docker-compose-mode";
+          name = "recipe";
         };
         packageRequires = [ dash emacs yaml-mode ];
         meta = {
@@ -7744,8 +9706,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    docker-tramp = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    docker-tramp = callPackage ({ cl-lib ? null
+                                , emacs
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "docker-tramp";
         version = "0.1";
         src = fetchFromGitHub {
@@ -7754,10 +9721,10 @@
           rev = "d8b510365d8e65551f4f792f251e7212411708c3";
           sha256 = "0lxvzmfg52fhxrhbvp92zwp7cv4i1rlxnkyyzgngj3sjm7y60yvg";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6c74bf8a41c17bc733636f9e7c05f3858d17936b/recipes/docker-tramp";
           sha256 = "19kky80qm68n2izpjfyiy4gjywav7ljcmp101kmziklpqdldgh1w";
-          name = "docker-tramp";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -7765,8 +9732,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    dockerfile-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    dockerfile-mode = callPackage ({ fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "dockerfile-mode";
         version = "1.2";
         src = fetchFromGitHub {
@@ -7775,10 +9745,10 @@
           rev = "9a75fcd119c5b2a1d723d440bbe4b1db56df90cc";
           sha256 = "1cmh8pwwa6dhl4w66wy8s5yqxs326mnaalg1ig2yhl4bjk8gi4m2";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1406f5a24115d29e3b140c360a51b977a369e4f9/recipes/dockerfile-mode";
           sha256 = "1dxvzn35a9qd3x8pjvrvb2g71yf84404g6vz81y0p353rf2zknpa";
-          name = "dockerfile-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -7786,8 +9756,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    dokuwiki-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    dokuwiki-mode = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "dokuwiki-mode";
         version = "0.1.1";
         src = fetchFromGitHub {
@@ -7796,10 +9769,10 @@
           rev = "e4e116f6fcc373e3f5937c1a7daa5c2c9c6d3fa1";
           sha256 = "0bmcm7lvzm8sg2l1j7bg02jasxb8g81q9ilycblmsl1ckbfwq0yp";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/dokuwiki-mode";
           sha256 = "1jc3sn61mipkhgr91wp74s673jk2w5991p54jlw05qqpf5gmxd7v";
-          name = "dokuwiki-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -7807,8 +9780,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    doom = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    doom = callPackage ({ cl-lib ? null
+                        , fetchFromGitHub
+                        , fetchurl
+                        , lib
+                        , melpaBuild }:
+      melpaBuild {
         pname = "doom";
         version = "1.3";
         src = fetchFromGitHub {
@@ -7817,10 +9794,10 @@
           rev = "5e2d3f54e5b84eaa533cbdb6cf17b1b6009f0730";
           sha256 = "04h1hlsc83w4dppw9m44jq7mkcpy0bblvnzrhvsh06pibjywdd73";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0960deb3b1d106ad2ffa95a44f34cb9efc026f01/recipes/doom";
           sha256 = "1ji2fdiw5b13n76nv2wvkz6v155b0qgh1rxwmv3m5nnrbmklfjh5";
-          name = "doom";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -7828,8 +9805,51 @@
           license = lib.licenses.free;
         };
       }) {};
-    doom-themes = callPackage ({ all-the-icons, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    doom-modeline = callPackage ({ all-the-icons
+                                 , dash
+                                 , eldoc-eval
+                                 , emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild
+                                 , projectile
+                                 , shrink-path }:
+      melpaBuild {
+        pname = "doom-modeline";
+        version = "0.2.0";
+        src = fetchFromGitHub {
+          owner = "seagle0128";
+          repo = "doom-modeline";
+          rev = "845e0319d3cce53424e2c804290c16014df53709";
+          sha256 = "135152m1a96549blh658lvk4q76dy3bhnl2f0vf78q1pxnrv9mx1";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/f4f610757f85fb01bd9b1dd212ddbea8f34f3ecd/recipes/doom-modeline";
+          sha256 = "0pscrhhgk4wpz1f2r94ficgan4f9blbhqzvav1wjahwp7fn5m29j";
+          name = "recipe";
+        };
+        packageRequires = [
+          all-the-icons
+          dash
+          eldoc-eval
+          emacs
+          projectile
+          shrink-path
+        ];
+        meta = {
+          homepage = "https://melpa.org/#/doom-modeline";
+          license = lib.licenses.free;
+        };
+      }) {};
+    doom-themes = callPackage ({ all-the-icons
+                               , cl-lib ? null
+                               , emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "doom-themes";
         version = "2.1.1";
         src = fetchFromGitHub {
@@ -7838,10 +9858,10 @@
           rev = "98120f9b362b53983e932f126cf92848297b745a";
           sha256 = "03pnnbqa09iqyypgbgwlkxr6w1j46rla6pivbq7fy366yk2x03x0";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c5084bc2c3fe378af6ff39d65e40649c6359b7b5/recipes/doom-themes";
           sha256 = "0plqhis9ki3ck1pbv4hiqk4x428fps8qsfx72mamdayyx2nncdrs";
-          name = "doom-themes";
+          name = "recipe";
         };
         packageRequires = [ all-the-icons cl-lib emacs ];
         meta = {
@@ -7849,8 +9869,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    dotenv-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    dotenv-mode = callPackage ({ emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "dotenv-mode";
         version = "0.2.4";
         src = fetchFromGitHub {
@@ -7859,10 +9883,10 @@
           rev = "f4c52bcd5313379b9f2460db7f7a33119dfa96ea";
           sha256 = "1fplkhxnsgdrg10iqsmw162zny2idz4vvv35spsb9j0hsk8imclc";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9fc022c54b90933e70dcedb6a85167c2d9d7ba79/recipes/dotenv-mode";
           sha256 = "1lwfzfri6vywcjkc9wassrz0rdrg0kvljxsm6b4smlnphp6pdbbs";
-          name = "dotenv-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -7870,20 +9894,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    downplay-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    downplay-mode = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "downplay-mode";
         version = "0.1";
         src = fetchFromGitHub {
           owner = "tobias";
           repo = "downplay-mode";
-          rev = "225a4b3ca09e6f463dfdd54941c98b02be8d574c";
-          sha256 = "13czcxmmvy4g9ysfjr6lb91c0fqv1xv8ppd27wbfsrgxm3aaqimb";
+          rev = "bd03a160e5e191eed1c20dfb8e69f2e314ef4e64";
+          sha256 = "1i22pbnpi4zdh3c4drhhi8x6b9k3k4vz758vyajzb9mc2i67llxm";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/50d67ea3c4d92b4093373d5e4ff07b7d5a3dc537/recipes/downplay-mode";
           sha256 = "1v6nga101ljzza8qj3lkmkzzl0vvzj4lsh1m69698s8prnczxr9b";
-          name = "downplay-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -7891,8 +9918,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    dr-racket-like-unicode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    dr-racket-like-unicode = callPackage ({ emacs
+                                          , fetchFromGitHub
+                                          , fetchurl
+                                          , lib
+                                          , melpaBuild }:
+      melpaBuild {
         pname = "dr-racket-like-unicode";
         version = "1.1.0";
         src = fetchFromGitHub {
@@ -7901,10 +9932,10 @@
           rev = "4953f1c8a68472e157a0dcd0a7e35a4ec2577133";
           sha256 = "1i7k7d2gnzd2izplhdmjbkcxvkwnc3y3y0hrcp2rq60bjpkcl1gv";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6e612ede00c4b44ace741d2b6baabc61571af15c/recipes/dr-racket-like-unicode";
           sha256 = "0cqcbn4hmv99d8z03xc0rqw4yh5by6g09y33h75dhl9nh95rybgf";
-          name = "dr-racket-like-unicode";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -7912,20 +9943,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    dracula-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    dracula-theme = callPackage ({ emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "dracula-theme";
-        version = "1.2.5";
+        version = "1.4.0";
         src = fetchFromGitHub {
           owner = "dracula";
           repo = "emacs";
-          rev = "509293bebeaf26ee662ff35a28a7af019190f286";
-          sha256 = "0ddznxn75qk22g0ah4490ysghvb9r6nin1a005y0zmschz46bar8";
+          rev = "1f649824d996b1ecdcc5980210b774f0cb950e9a";
+          sha256 = "1gsj8na6nnz0vv9j215wdf39q834chc6pmk9mv8hcvcbdbc4f8wa";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d63cb8906726f106e65f7d9895b49a38ffebf8d5/recipes/dracula-theme";
           sha256 = "1px162v7h7136rasafq875yzw0h8n6wvzbyh73c3w093kd30bmh8";
-          name = "dracula-theme";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -7933,20 +9968,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    draft-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    draft-mode = callPackage ({ fetchFromGitLab
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "draft-mode";
         version = "0.1.1";
-        src = fetchFromGitHub {
+        src = fetchFromGitLab {
           owner = "gaudecker";
           repo = "draft-mode";
-          rev = "4779fb32daf53746459da2def7e08004492d4f18";
-          sha256 = "0z3w58zplm5ks195zfsaq8kwbc944p3kbzs702jgz02wcrm4c28y";
+          rev = "f059c04b044f62aec764c7698adddad301bfe89c";
+          sha256 = "01dspkv7g4xmmqgz6f1p190h5p4f4vrw8r9dikrjch02bb76wqir";
         };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/d5ee50f467025fb8b9a3b4577fc471a2b2ee191a/recipes/draft-mode";
-          sha256 = "1wg9cx39f4dhrykb4zx4fh0x5cfrh5aicwwfh1h3yzpc4zlr7xfh";
-          name = "draft-mode";
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/cbfefacda071c0f5ee698a4c345a2d6fea6a0d24/recipes/draft-mode";
+          sha256 = "19lq1a3rj6fck3xq2vcz8fk30hpx25kyfz6c7hmq36kx4lv0mjpa";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -7954,8 +9992,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    drag-stuff = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    drag-stuff = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "drag-stuff";
         version = "0.3.0";
         src = fetchFromGitHub {
@@ -7964,10 +10005,10 @@
           rev = "d49fe376d24f0f8ac5ade67b6d7fccc2487c81db";
           sha256 = "1jrr59iazih3imkl9ja1lbni9v3xv6b8gmqs015g2mxhlql35jka";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/drag-stuff";
           sha256 = "1q67q20gfhixzkmddhzp6fd8z2qfpsmyyvymmaffjcscnjaz21w4";
-          name = "drag-stuff";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -7975,8 +10016,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    drupal-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, php-mode }:
-    melpaBuild {
+    drupal-mode = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild
+                               , php-mode }:
+      melpaBuild {
         pname = "drupal-mode";
         version = "0.7.3";
         src = fetchFromGitHub {
@@ -7985,10 +10030,10 @@
           rev = "49ce63c659aa0af7a2daf0c9e74e58fbce6deb71";
           sha256 = "1l2xc24y037b3z62yxmq2bx1x3qqv56d15bf3qmb3mpgm4gh85j6";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/13e16af340868048eb1f51f9865dfc707e57abe8/recipes/drupal-mode";
           sha256 = "14jvk4phq3wcff3yvhygix0c9cpbphh0dvm961i93jpsx7g9awgn";
-          name = "drupal-mode";
+          name = "recipe";
         };
         packageRequires = [ php-mode ];
         meta = {
@@ -7996,8 +10041,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    drupal-spell = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    drupal-spell = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "drupal-spell";
         version = "0.2.2";
         src = fetchFromGitHub {
@@ -8006,10 +10054,10 @@
           rev = "a69f5e3b62c4c0da74ce26c1d00d5b8f7395e4ae";
           sha256 = "156cscpavrp695lp8pgjg5jnq3b8n9c2h8qg8w89dd4vfkc3iikd";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bb859d9755bde3fd852bc7d08f2fab2429ba31b3/recipes/drupal-spell";
           sha256 = "117rr2bfnc99g3qsr127grxwaqp54cxjaj3nl2nr6z78nja0fij3";
-          name = "drupal-spell";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -8017,8 +10065,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    dtrt-indent = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    dtrt-indent = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "dtrt-indent";
         version = "0.7";
         src = fetchFromGitHub {
@@ -8027,10 +10078,10 @@
           rev = "0ac070c9576e4ebab12cd6800ac2ac3abcecc2c1";
           sha256 = "0dambn5l0wvbhccvhh5hbz9hw66y4mp1la3wj85dl9kgr7hq1ry7";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/61bcbcfa6c0f38a1d87f5b6913b8be6c50ef2994/recipes/dtrt-indent";
           sha256 = "1npn2jngy1wq0jpwmg1hkn8lx6ncbqsi587jl38lyp2xwchshfk5";
-          name = "dtrt-indent";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -8038,8 +10089,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    ducpel = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ducpel = callPackage ({ cl-lib ? null
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "ducpel";
         version = "0.1";
         src = fetchFromGitHub {
@@ -8048,10 +10103,10 @@
           rev = "ece785baaa102bd2e9d54257af3a92bacc5757bc";
           sha256 = "17yldk76mxakhb90bma7r4z9jgx02wankgk17r2di196mc04bj7b";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2d64adac965e1dac0f29dab9a587cd6ce9c3bb3a/recipes/ducpel";
           sha256 = "1cqrkgg7n9bhjswnpl7yc6w6yjs4gfbliaqsimmf9z43wk2ml4pc";
-          name = "ducpel";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -8059,8 +10114,16 @@
           license = lib.licenses.free;
         };
       }) {};
-    dumb-jump = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s }:
-    melpaBuild {
+    dumb-jump = callPackage ({ dash
+                             , emacs
+                             , f
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild
+                             , popup
+                             , s }:
+      melpaBuild {
         pname = "dumb-jump";
         version = "0.5.2";
         src = fetchFromGitHub {
@@ -8069,10 +10132,10 @@
           rev = "260054500d4731c36574b6cbc519de29fdd22f43";
           sha256 = "00ph85vp8sa3k99qrdxfz4l8zx121q9xf47vvspzg26bk9l4nwin";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dumb-jump";
           sha256 = "1j90n8gydsp2v07rysz1k5vf6hspybcl27214sib1iz3hbimid1w";
-          name = "dumb-jump";
+          name = "recipe";
         };
         packageRequires = [ dash emacs f popup s ];
         meta = {
@@ -8080,8 +10143,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    dyalog-mode = callPackage ({ cl-lib ? null, emacs, fetchhg, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    dyalog-mode = callPackage ({ cl-lib ? null
+                               , emacs
+                               , fetchhg
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "dyalog-mode";
         version = "0.7";
         src = fetchhg {
@@ -8100,8 +10168,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    dynamic-fonts = callPackage ({ fetchFromGitHub, fetchurl, font-utils, lib, melpaBuild, pcache, persistent-soft }:
-    melpaBuild {
+    dynamic-fonts = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , font-utils
+                                 , lib
+                                 , melpaBuild
+                                 , pcache
+                                 , persistent-soft }:
+      melpaBuild {
         pname = "dynamic-fonts";
         version = "0.6.4";
         src = fetchFromGitHub {
@@ -8110,10 +10184,10 @@
           rev = "d318498b377d8941c7420f51616c78e3440d00f5";
           sha256 = "1ppwlill1z4vqd566h9zi6zx5jb7hggmnmqrga84j5n7fwqvgz7f";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c9db386ab3910940addae6e925b2ac17e64e0f87/recipes/dynamic-fonts";
           sha256 = "0a210ca41maa755lv1n7hhpxp0f7lfxrxbi0x34icbkfkmijhl6q";
-          name = "dynamic-fonts";
+          name = "recipe";
         };
         packageRequires = [ font-utils pcache persistent-soft ];
         meta = {
@@ -8121,8 +10195,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    dynamic-ruler = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    dynamic-ruler = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "dynamic-ruler";
         version = "0.1.6";
         src = fetchFromGitHub {
@@ -8131,10 +10208,10 @@
           rev = "c9c0de6fe5721f06b50e01d9b4684b519c71b367";
           sha256 = "09skp2d5likqjlrsfis3biqw59sjkgid5249fld9ahqm5f1wq296";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/926c43867120db429807ff5aaacc8af65a1738c8/recipes/dynamic-ruler";
           sha256 = "13jc3xbsyc3apkdfy0iafmsfvgqs0zfa5w8jxp7zj4dhb7pxpnmc";
-          name = "dynamic-ruler";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -8142,8 +10219,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    e2wm = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, window-layout }:
-    melpaBuild {
+    e2wm = callPackage ({ fetchFromGitHub
+                        , fetchurl
+                        , lib
+                        , melpaBuild
+                        , window-layout }:
+      melpaBuild {
         pname = "e2wm";
         version = "1.4";
         src = fetchFromGitHub {
@@ -8152,10 +10233,10 @@
           rev = "4353d3394c77a49f8f0291c239858c8c5e877549";
           sha256 = "12midsrx07pdrsr1qbl2rpi7xyhxqx08bkz7n7gf8vsmqkpfp56s";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8da85815c39f58552a968ae68ee07c08c53b0f61/recipes/e2wm";
           sha256 = "0dp360jr3fgxqywkp7g88cp02g37kw2hdsc0f70hjak9n3sy03la";
-          name = "e2wm";
+          name = "recipe";
         };
         packageRequires = [ window-layout ];
         meta = {
@@ -8163,8 +10244,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    e2wm-R = callPackage ({ e2wm, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    e2wm-R = callPackage ({ e2wm
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "e2wm-R";
         version = "0.4";
         src = fetchFromGitHub {
@@ -8173,10 +10258,10 @@
           rev = "fe17906bf48324032a1beaec9af32b9b49ea9125";
           sha256 = "1yf081rac0chvkjha9z9xi1p983gmhjph0hai6ppsz5hzf2vikpp";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9a3ba9843bdf275815b149e4c4b0a947bbc5e614/recipes/e2wm-R";
           sha256 = "09v4fz178lch4d6m801ipclfxm2qrap5601aysnzyvc2apvyr3sh";
-          name = "e2wm-R";
+          name = "recipe";
         };
         packageRequires = [ e2wm ];
         meta = {
@@ -8184,8 +10269,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    e2wm-direx = callPackage ({ direx, e2wm, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    e2wm-direx = callPackage ({ direx
+                              , e2wm
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "e2wm-direx";
         version = "0.0.5";
         src = fetchFromGitHub {
@@ -8194,10 +10284,10 @@
           rev = "f319625b56c44e601af7c17fc6dbb88e5d70ebae";
           sha256 = "09i7d2rc9zd4s3nqrhd3ggs1ykdpxf0pyhxixxw2xy0q6nbswjia";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8320cf626050cf455c97ef22e7a8ccfb253e3243/recipes/e2wm-direx";
           sha256 = "0nv8aciq0swxi9ahwc2pvk9c7i3rmlp7vrzqcan58ml0i3nm17wg";
-          name = "e2wm-direx";
+          name = "recipe";
         };
         packageRequires = [ direx e2wm ];
         meta = {
@@ -8205,20 +10295,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    e2wm-pkgex4pl = callPackage ({ e2wm, fetchFromGitHub, fetchurl, lib, melpaBuild, plsense-direx }:
-    melpaBuild {
+    e2wm-pkgex4pl = callPackage ({ e2wm
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild
+                                 , plsense-direx }:
+      melpaBuild {
         pname = "e2wm-pkgex4pl";
         version = "0.0.1";
         src = fetchFromGitHub {
           owner = "aki2o";
           repo = "e2wm-pkgex4pl";
-          rev = "7ea994450727190c4f3cb46cb429ba41b692ecc0";
-          sha256 = "1vrlfzy1wynm7x4m7pl8vim7ykqd6qkcilwz7sjc1lbckz11ig0d";
+          rev = "b72561b75e98961f05544a2159d83592c964ba1e";
+          sha256 = "1cx6kdxhq9ybwwvc1vpwcfy08yf1h4xacgimm36kp9xayvxsmq2j";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8f84b421cb1673d2a9fe820cee11dc4a6e72adad/recipes/e2wm-pkgex4pl";
           sha256 = "0hgdbqfw3015fr929m36kfiqqzsid6afs3222iqq0apg7gfj7jil";
-          name = "e2wm-pkgex4pl";
+          name = "recipe";
         };
         packageRequires = [ e2wm plsense-direx ];
         meta = {
@@ -8226,20 +10321,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    e2wm-sww = callPackage ({ e2wm, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    e2wm-sww = callPackage ({ e2wm
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "e2wm-sww";
         version = "0.0.2";
         src = fetchFromGitHub {
           owner = "aki2o";
           repo = "e2wm-sww";
-          rev = "1063f9854bd34db5ac771cd1036cecc89834729d";
-          sha256 = "0mz43mwcgyc1c9p9b7nflnjxdxjm2nxbhl0scj6llzphikicr35g";
+          rev = "db454ac3eddd53a62f2725f6e2d5ac455caf200c";
+          sha256 = "1a8z94z0wp9r4kh44bn2m74k866jwq7zvjihxmmzr0rfb85q2d99";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cc873e8271e9f372e08da5d0e4b77c8ba0e3a8cb/recipes/e2wm-sww";
           sha256 = "0x45j62cjivf9v7jp1b41yya3f9akp92md6cbv0v7bwz98g2vsk8";
-          name = "e2wm-sww";
+          name = "recipe";
         };
         packageRequires = [ e2wm ];
         meta = {
@@ -8247,8 +10346,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    e2wm-term = callPackage ({ e2wm, fetchFromGitHub, fetchurl, lib, log4e, melpaBuild, yaxception }:
-    melpaBuild {
+    e2wm-term = callPackage ({ e2wm
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , log4e
+                             , melpaBuild
+                             , yaxception }:
+      melpaBuild {
         pname = "e2wm-term";
         version = "0.0.5";
         src = fetchFromGitHub {
@@ -8257,10 +10362,10 @@
           rev = "65b5ac88043d5c4048920a048f3599904ca55981";
           sha256 = "0qv3kh6q3q7vgfsd8x25x8agi3fp96dkpjnxdidkwk6k8h9n0jzw";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c9a800f5af893cb670cedb47e4a723c407be8429/recipes/e2wm-term";
           sha256 = "0wrq06yap80a96l9l0hs7x7rng7sx6vi1hz778kknb6il4f2f45g";
-          name = "e2wm-term";
+          name = "recipe";
         };
         packageRequires = [ e2wm log4e yaxception ];
         meta = {
@@ -8268,20 +10373,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    eacl = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
-    melpaBuild {
+    eacl = callPackage ({ emacs
+                        , fetchFromGitHub
+                        , fetchurl
+                        , ivy
+                        , lib
+                        , melpaBuild }:
+      melpaBuild {
         pname = "eacl";
-        version = "1.1.2";
+        version = "1.1.3";
         src = fetchFromGitHub {
           owner = "redguardtoo";
           repo = "eacl";
-          rev = "80113a9f6cc246cef67e3e20ec052788c38ab116";
-          sha256 = "1pwppn0m288d6j9b7cdshgc3rxv0nfs94klc1fpsyfxqx0a6f23z";
+          rev = "ccf1401b1acff67fe445c95e8be7b09e8c3ae5d8";
+          sha256 = "0v02asdmhj5la9nqck2230s04gf518cjs7wa4lykf8j46bc13vac";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8223bec7eed97f0bad300af9caa4c8207322d39a/recipes/eacl";
           sha256 = "16afsf3diz498jb63q85lm5ifvm487clfl838qzagl1l4aywhlwr";
-          name = "eacl";
+          name = "recipe";
         };
         packageRequires = [ emacs ivy ];
         meta = {
@@ -8289,20 +10399,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    easy-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, popup }:
-    melpaBuild {
+    easy-hugo = callPackage ({ emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild
+                             , popup }:
+      melpaBuild {
         pname = "easy-hugo";
-        version = "3.2.24";
+        version = "3.3.27";
         src = fetchFromGitHub {
           owner = "masasam";
           repo = "emacs-easy-hugo";
-          rev = "fbcd7dfd737e6ec90f7bee6a911ff66e86577a64";
-          sha256 = "1yabqf8mksadfab7pfk87a3yimda3x6la2kvrxf76kbzbl23h3dx";
+          rev = "3b0516c87d33a75dd777f6336fdf53be0374abcb";
+          sha256 = "1qf7wk0vx1p0y77cnzihq4zrmz1dffwabsxgf0mz770nskys6y82";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/easy-hugo";
           sha256 = "1m7iw6njxxsk82agyqay277iql578b3wz6z9wjs8ls30ps8s2b8g";
-          name = "easy-hugo";
+          name = "recipe";
         };
         packageRequires = [ emacs popup ];
         meta = {
@@ -8310,20 +10425,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    easy-jekyll = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    easy-jekyll = callPackage ({ emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "easy-jekyll";
-        version = "1.6.13";
+        version = "1.6.15";
         src = fetchFromGitHub {
           owner = "masasam";
           repo = "emacs-easy-jekyll";
-          rev = "742366a2eb8bdb3d91e108e701ca8a1e83084671";
-          sha256 = "1i3pxg5mskbk2zmcavbd78sr9l45qqcjjfp3p0i8q5kbm9zjr5fm";
+          rev = "84c19d0380617ce2e40a2b42ce9bedf65e52779d";
+          sha256 = "1vbb60vb98nqbwrxl6p3gcvjpnjlscp0hp4k53rcgjd75w9vbnsj";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c3f281145bad12c27bdbef32ccc07b6a5f13b577/recipes/easy-jekyll";
           sha256 = "16jj70fr23z5qsaijv4d4xfiiypny2cama8rsaci9fk9haq19lxv";
-          name = "easy-jekyll";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -8331,20 +10450,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    easy-kill = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    easy-kill = callPackage ({ cl-lib ? null
+                             , emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "easy-kill";
         version = "0.9.3";
         src = fetchFromGitHub {
           owner = "leoliu";
           repo = "easy-kill";
-          rev = "e3b2442e2096cefff94ea8656e49af07fee58f47";
-          sha256 = "0r56nqrj6iaz57ys6hqdq5qkyliv7dj6dv274l228r7x0axrwd9m";
+          rev = "20ed0d595e5893e2c57a634a3137ef87b1714f17";
+          sha256 = "0ppxx5798zxwm9dzqjmf1maz2a6asv3fwiw8ypdmzx77y0vbckv0";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7d0a74c2a7d8859e9311bc8d71f5e6cf5a8063b6/recipes/easy-kill";
           sha256 = "10jcv7a4vcnaj3wkabip2xwzcwlmvdlqkl409a9lnzfasxcpf32i";
-          name = "easy-kill";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -8352,8 +10476,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    easy-kill-extras = callPackage ({ easy-kill, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    easy-kill-extras = callPackage ({ easy-kill
+                                    , fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "easy-kill-extras";
         version = "0.9.4.1";
         src = fetchFromGitHub {
@@ -8362,10 +10490,10 @@
           rev = "e60a74d7121eff7c263098aea2901cc05a5f6acd";
           sha256 = "1rabkb2pkafnfx68df1zjwbj8bl7361n35lvzrvldc3v85bfam48";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7b55d93f78fefde47a2bd4ebbfd93c028fab1f40/recipes/easy-kill-extras";
           sha256 = "0xzlzv57nvrc142saydwfib51fyqcdzjccc1hj6xvgcdbwadlnjy";
-          name = "easy-kill-extras";
+          name = "recipe";
         };
         packageRequires = [ easy-kill ];
         meta = {
@@ -8373,8 +10501,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    easy-repeat = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    easy-repeat = callPackage ({ emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "easy-repeat";
         version = "0.2";
         src = fetchFromGitHub {
@@ -8383,10 +10515,10 @@
           rev = "060f0e6801c82c40c06961dc0528a00e18947a8c";
           sha256 = "18bm5ns1qrxq0rrz9sylshr62wkymh1m6b7ch2y74f8rcwdwjgnq";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f1f5e0d19043f6a24ab4069c9c850e96cbe61a8f/recipes/easy-repeat";
           sha256 = "1vx57gpw0nbxh976s18va4ali1nqxqffhaxv1c5rhf4pwlk2fa06";
-          name = "easy-repeat";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -8394,8 +10526,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    ebal = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ebal = callPackage ({ emacs
+                        , f
+                        , fetchFromGitHub
+                        , fetchurl
+                        , lib
+                        , melpaBuild }:
+      melpaBuild {
         pname = "ebal";
         version = "0.3.1";
         src = fetchFromGitHub {
@@ -8404,10 +10541,10 @@
           rev = "4d19565516785348894c4911e757e33a270b3efd";
           sha256 = "1wj9h8ypi70az387c7pcrpc59lpf89dkp2q4df2ighxw3l648mb7";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/629aa451162a0085488caad4052a56366b7ce392/recipes/ebal";
           sha256 = "1kqnlp5n1aig1qbqdq9q50wgqkzd1l6h9wi1gv43cif8qa1kxhwg";
-          name = "ebal";
+          name = "recipe";
         };
         packageRequires = [ emacs f ];
         meta = {
@@ -8415,8 +10552,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    ebf = callPackage ({ cl-lib ? null, dash, dash-functional, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ebf = callPackage ({ cl-lib ? null
+                       , dash
+                       , dash-functional
+                       , fetchFromGitHub
+                       , fetchurl
+                       , lib
+                       , melpaBuild }:
+      melpaBuild {
         pname = "ebf";
         version = "1.0.0";
         src = fetchFromGitHub {
@@ -8425,10 +10568,10 @@
           rev = "d0bd4fe1abbe327e7d9228eff09927fec57e8378";
           sha256 = "16hiwz8a1hyyiflzn53v97704v783pg18yxapn7pqk90fbcf7czw";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/22e2f6383f2a7a01778c0524af19a68af57796ae/recipes/ebf";
           sha256 = "072w1hczzb4z0dadvqy8px9zfnfd2z0w8nwa7q2qm5njg30rrqpb";
-          name = "ebf";
+          name = "recipe";
         };
         packageRequires = [ cl-lib dash dash-functional ];
         meta = {
@@ -8436,20 +10579,27 @@
           license = lib.licenses.free;
         };
       }) {};
-    ebib = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib, seq }:
-    melpaBuild {
+    ebib = callPackage ({ dash
+                        , emacs
+                        , fetchFromGitHub
+                        , fetchurl
+                        , lib
+                        , melpaBuild
+                        , parsebib
+                        , seq }:
+      melpaBuild {
         pname = "ebib";
-        version = "2.11.8";
+        version = "2.11.11";
         src = fetchFromGitHub {
           owner = "joostkremers";
           repo = "ebib";
-          rev = "fb43f9354f9f9c4c65091ae15732b1d941475186";
-          sha256 = "16l6l2qpkq10wkd95vbch2f7qcsb0jw4rjdf0gck2q8si8i2xi9h";
+          rev = "212dea4a52f04eaa1d13a895fffea04f5884f12b";
+          sha256 = "150dggfk79pk11qlzfl2sk1xaibdy0sbh6n94r7i2w235p2yg8p5";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/ebib";
           sha256 = "1kdqf5nk9l6mr3698nqngrkw5dicgf7d24krir5wrcfbrsqrfmid";
-          name = "ebib";
+          name = "recipe";
         };
         packageRequires = [ dash emacs parsebib seq ];
         meta = {
@@ -8457,20 +10607,29 @@
           license = lib.licenses.free;
         };
       }) {};
-    eclim = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild, popup, s, yasnippet }:
-    melpaBuild {
+    eclim = callPackage ({ cl-lib ? null
+                         , dash
+                         , fetchFromGitHub
+                         , fetchurl
+                         , json ? null
+                         , lib
+                         , melpaBuild
+                         , popup
+                         , s
+                         , yasnippet }:
+      melpaBuild {
         pname = "eclim";
         version = "0.4";
         src = fetchFromGitHub {
           owner = "emacs-eclim";
           repo = "emacs-eclim";
-          rev = "8203fbf8544e65324a948a67718f7a16ba2d52e6";
-          sha256 = "10bbbxhvlwm526g1wib1f87grnayirlg8jbsvmpzxr9nmdjgikz3";
+          rev = "6da0025d387119bb88c8bc870156fb1a8411ac4e";
+          sha256 = "1jpscpjlfgjcfivz86sg6d41m6c8brwali8annhxwk3qykxdh9ik";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1e9d3075587fbd9ca188535fd945a7dc451c6d7e/recipes/eclim";
           sha256 = "1n60ci6kjmzy2khr3gs7s8gf21j1f9zjaj5a1yy2dyygsarbxw7b";
-          name = "eclim";
+          name = "recipe";
         };
         packageRequires = [ cl-lib dash json popup s yasnippet ];
         meta = {
@@ -8478,8 +10637,17 @@
           license = lib.licenses.free;
         };
       }) {};
-    ecukes = callPackage ({ ansi, commander, dash, espuds, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    ecukes = callPackage ({ ansi
+                          , commander
+                          , dash
+                          , espuds
+                          , f
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild
+                          , s }:
+      melpaBuild {
         pname = "ecukes";
         version = "0.6.17";
         src = fetchFromGitHub {
@@ -8488,10 +10656,10 @@
           rev = "3a77ba9f1064c2bca47b401974c009e65727c46e";
           sha256 = "1isscwz4h3nx62lwfrj899lp2yc27zk1ndgr441d848495ccmshn";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/14cf66e6929db2a0f377612e786aaed9eb12b799/recipes/ecukes";
           sha256 = "0ava8hrc7r1mzv6xgbrb84qak5xrf6fj8g9qr4i4g0cr7843nrw0";
-          name = "ecukes";
+          name = "recipe";
         };
         packageRequires = [ ansi commander dash espuds f s ];
         meta = {
@@ -8499,20 +10667,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    edbi = callPackage ({ concurrent, ctable, epc, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    edbi = callPackage ({ concurrent
+                        , ctable
+                        , epc
+                        , fetchFromGitHub
+                        , fetchurl
+                        , lib
+                        , melpaBuild }:
+      melpaBuild {
         pname = "edbi";
         version = "0.1.2";
         src = fetchFromGitHub {
           owner = "kiwanami";
           repo = "emacs-edbi";
-          rev = "39b833d2e51ae5ce66ebdec7c5425ff0d34e02d2";
-          sha256 = "0xy3q68i47a3s81jwr0rdvc1722bp78ng56xm53pri05g1z0db9s";
+          rev = "ad3cebf1fa90a92d112ce6ecf404dc0192ea9367";
+          sha256 = "0j9pkb4r5rmx0h0rsvgnkp75ars63v6llhv9vc41fbjir14fs81x";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/238a11afa52d2c01d69eb16ffd7d07ccd6dff403/recipes/edbi";
           sha256 = "0qq0j16n8lyvkqqlcsrq1m7r7f0in6b92d74mpx5c6siv6z2vxlr";
-          name = "edbi";
+          name = "recipe";
         };
         packageRequires = [ concurrent ctable epc ];
         meta = {
@@ -8520,8 +10694,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    edbi-minor-mode = callPackage ({ edbi, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    edbi-minor-mode = callPackage ({ edbi
+                                   , fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "edbi-minor-mode";
         version = "0.1";
         src = fetchFromGitHub {
@@ -8530,10 +10708,10 @@
           rev = "566a2141a6eb9d9d5d7e1bd7c251d1c5e8f0d2ec";
           sha256 = "1g6mlmrwl8p5ffj9q298vymd9xi2kpp7mhbmz4by4f6a3g831c88";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5fb878b60c7ecbb1e3a47aef1d9765061c510644/recipes/edbi-minor-mode";
           sha256 = "0p7vdf9cp6i7mhjxj82670pfflf1kacalmakb7ssgigs1nsf3spi";
-          name = "edbi-minor-mode";
+          name = "recipe";
         };
         packageRequires = [ edbi ];
         meta = {
@@ -8541,20 +10719,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    ede-php-autoload = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ede-php-autoload = callPackage ({ fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "ede-php-autoload";
         version = "1.1.0";
         src = fetchFromGitHub {
           owner = "stevenremot";
           repo = "ede-php-autoload";
-          rev = "28a989232c276ee7fc5112c9050b1c29f628be9f";
-          sha256 = "0kc51bb5jxrsra9ycg43n35dd8kngby321qbcixaj68cksf0whrm";
+          rev = "3f13302b9e8dbb6a24205c4bc21acadff487d30b";
+          sha256 = "03mjw824d0l2g8n07ys3j89x8chbx64znhhz14y6ni4b9650njdf";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8ee9f7fd9cbc3397cd9af34b08b75c3d9d8bc551/recipes/ede-php-autoload";
           sha256 = "0b7qbighncipgfaksvggpyldc5h0wxbjbiyaghglvycc4p1sfjd0";
-          name = "ede-php-autoload";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -8562,8 +10743,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    ede-php-autoload-composer-installers = callPackage ({ ede-php-autoload, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    ede-php-autoload-composer-installers = callPackage ({ ede-php-autoload
+                                                        , f
+                                                        , fetchFromGitHub
+                                                        , fetchurl
+                                                        , lib
+                                                        , melpaBuild
+                                                        , s }:
+      melpaBuild {
         pname = "ede-php-autoload-composer-installers";
         version = "0.1.0";
         src = fetchFromGitHub {
@@ -8572,10 +10759,10 @@
           rev = "f9942e07d0773444040084ac84652e69f0fd46d5";
           sha256 = "04gw8ma5c898ai7haxvdagmxx8zw9ncc9v0cv8a5ddg6arvzkl1z";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6e0e9058593b32b8d9fd7873d4698b4dd516930f/recipes/ede-php-autoload-composer-installers";
           sha256 = "0s7dv81niz4h8kj0648x2nbmz47hqxchfs2rjmjpy2lcbifvj268";
-          name = "ede-php-autoload-composer-installers";
+          name = "recipe";
         };
         packageRequires = [ ede-php-autoload f s ];
         meta = {
@@ -8583,20 +10770,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    ede-php-autoload-drupal = callPackage ({ ede-php-autoload, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    ede-php-autoload-drupal = callPackage ({ ede-php-autoload
+                                           , f
+                                           , fetchFromGitHub
+                                           , fetchurl
+                                           , lib
+                                           , melpaBuild
+                                           , s }:
+      melpaBuild {
         pname = "ede-php-autoload-drupal";
         version = "0.1.1";
         src = fetchFromGitHub {
           owner = "xendk";
           repo = "ede-php-autoload-drupal";
-          rev = "6b62ffa7a69f52aab79067eaed80b2720f7e3fc2";
-          sha256 = "001yhxngr6h7v1sjz0wskd5dv6fiby7m1mbc8vdz1h93150wzahp";
+          rev = "9fbda34704a15136f934d628b2a24b5e30f8510b";
+          sha256 = "095w19b9lhqfsf7fg58k5v2w1wxkfc44dd828ah62083a2ph5d56";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/532fec4788350cc11893c32e3895f06510a39d35/recipes/ede-php-autoload-drupal";
           sha256 = "139sr7jy5hb8h5zmw5mw01r0dy7yvbbyaxzj62m1a589n8w6a964";
-          name = "ede-php-autoload-drupal";
+          name = "recipe";
         };
         packageRequires = [ ede-php-autoload f s ];
         meta = {
@@ -8604,8 +10797,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    edit-indirect = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    edit-indirect = callPackage ({ emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "edit-indirect";
         version = "0.1.5";
         src = fetchFromGitHub {
@@ -8614,10 +10811,10 @@
           rev = "032ac0ec690d4999d564fd882588c7a197efe8dd";
           sha256 = "0by1x53pji39fjrj5bd446kz831nv0vdgw2jqasbym4pc1p2947r";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/acc9b816796b9f142c53f90593952b43c962d2d8/recipes/edit-indirect";
           sha256 = "0q5jjmrvx5kaajllmhaxihsab2kr1vmcsfqrhxdhw3x3nf41s439";
-          name = "edit-indirect";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -8625,8 +10822,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    edit-list = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    edit-list = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "edit-list";
         version = "0.3";
         src = fetchFromGitHub {
@@ -8635,10 +10835,10 @@
           rev = "f460d3f9e208a4e606fe6ded307f1b011916ca71";
           sha256 = "0981hy1n50yizc3k06vbxqrpfml817a67kab1hkgkw5v6ymm1hc9";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6c8aa348ce5289a8b1238f186affac1d544af755/recipes/edit-list";
           sha256 = "0mi12jfgx06i0yr8k5nk80xryqszjv0xykdnri505862rb90xakv";
-          name = "edit-list";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -8646,20 +10846,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    edit-server = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    edit-server = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "edit-server";
         version = "1.15";
         src = fetchFromGitHub {
           owner = "stsquad";
           repo = "emacs_chrome";
-          rev = "4e959de2f78268b348d2eaac4e43c846792d345f";
-          sha256 = "0xxby3ghs38i1l7kag12rnzlzcg9297pm8k6kqq3aqzsg9d2950y";
+          rev = "7e083580f8cc00ee88d9db00b8b47ae4349502a5";
+          sha256 = "0kvvs9pkwydarpzmar4mbqvp05jrkvq06yz99l3llklaw09g7bfv";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d98d69008b5ca8b92fa7a6045b9d1af86f269386/recipes/edit-server";
           sha256 = "0ffxcgmnz0f2c1i3vfwm8vlm6jyd7ibf4kq5z8c6n50zkwfdmns0";
-          name = "edit-server";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -8667,20 +10870,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    editorconfig = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    editorconfig = callPackage ({ cl-lib ? null
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "editorconfig";
-        version = "0.7.11";
+        version = "0.7.12";
         src = fetchFromGitHub {
           owner = "editorconfig";
           repo = "editorconfig-emacs";
-          rev = "2ec90f13ad98481c5324eea4877de7a80d814d86";
-          sha256 = "160f7ciy8yp75gja3abm4rjy61wmk2b7b0k032qimiawkvg57bx2";
+          rev = "ae856b02a6513521bdf6a77a7ef51805fb0abf57";
+          sha256 = "0y13276ajz12rw1xcfqnr7q6kkk6zi0f55p10nblfkhxclhr0f7z";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/50d4f2ed288ef38153a7eab44c036e4f075b51d0/recipes/editorconfig";
           sha256 = "0zv96m07ml8i3k7zm7sdci4hn611n3ypna7zppfkwbdyr7d5k2gc";
-          name = "editorconfig";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -8688,20 +10895,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    editorconfig-custom-majormode = callPackage ({ editorconfig, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    editorconfig-custom-majormode = callPackage ({ editorconfig
+                                                 , fetchFromGitHub
+                                                 , fetchurl
+                                                 , lib
+                                                 , melpaBuild }:
+      melpaBuild {
         pname = "editorconfig-custom-majormode";
-        version = "0.0.1";
+        version = "0.0.3";
         src = fetchFromGitHub {
           owner = "10sr";
           repo = "editorconfig-custom-majormode-el";
-          rev = "338742889240bad23f8e90c0a89b8e641ce2befa";
-          sha256 = "0f3cdg5pdwghm7vyg3kxhddfk0rmjpg30h330pa20pf7qnk3gwip";
+          rev = "ae613f0a56364afbbab19d4377c108406d5cfc7c";
+          sha256 = "0sm3xdysnqzc6nc2n7rcnr478l7qdy7bv8rhq500240aprzv63y4";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fcd47bf4630442ad1a941ad432cef64c7746aa71/recipes/editorconfig-custom-majormode";
           sha256 = "0ykvjg3gwxky6w5cm0y5s63q9820b7d25fy9plw8sarxwy2a5lxy";
-          name = "editorconfig-custom-majormode";
+          name = "recipe";
         };
         packageRequires = [ editorconfig ];
         meta = {
@@ -8709,8 +10920,16 @@
           license = lib.licenses.free;
         };
       }) {};
-    edn = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, peg, s }:
-    melpaBuild {
+    edn = callPackage ({ cl-lib ? null
+                       , dash
+                       , emacs
+                       , fetchFromGitHub
+                       , fetchurl
+                       , lib
+                       , melpaBuild
+                       , peg
+                       , s }:
+      melpaBuild {
         pname = "edn";
         version = "1.1.2";
         src = fetchFromGitHub {
@@ -8719,10 +10938,10 @@
           rev = "bb035dcbeccccdb2c899d2cce8e81486764d0ad7";
           sha256 = "06v34l9dkykrrdfpnm3zi5wjm0fdvy76pbkfnk92wqkjp8fqimhd";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/305dd770d9db86d5ee602e6bd571b7c4f6c4ddbe/recipes/edn";
           sha256 = "00cy8axhy2p3zalzl8k2083l5a7s3aswb9qfk9wsmf678m8pqwqg";
-          name = "edn";
+          name = "recipe";
         };
         packageRequires = [ cl-lib dash emacs peg s ];
         meta = {
@@ -8730,20 +10949,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    edts = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    edts = callPackage ({ fetchFromGitHub
+                        , fetchurl
+                        , lib
+                        , melpaBuild }:
+      melpaBuild {
         pname = "edts";
         version = "0.1.0";
         src = fetchFromGitHub {
           owner = "tjarvstrand";
           repo = "edts";
-          rev = "61855db6f1315ea45f97ed95b47a3f182ec4c6be";
-          sha256 = "1a1apa48n24yisd2zw5k4lfkngx3016x6y11qi80hg75vrnmg7f1";
+          rev = "f25b8450efaee916900d8cb7b3fb0f3c5d1990f5";
+          sha256 = "00i7nd3lkak360klfmq3zngfm251l4d319lrwln0ajlk0x2gljag";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/782db7fba2713bfa17d9305ae15b0a9e1985445b/recipes/edts";
           sha256 = "0f0rbd0mqqwn743qmr1g5mmi1sbmlcglclww8jxvbvb61jq8vspr";
-          name = "edts";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -8751,8 +10973,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    eg = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    eg = callPackage ({ cl-lib ? null
+                      , emacs
+                      , fetchFromGitHub
+                      , fetchurl
+                      , lib
+                      , melpaBuild }:
+      melpaBuild {
         pname = "eg";
         version = "1.1";
         src = fetchFromGitHub {
@@ -8761,10 +10988,10 @@
           rev = "0791452498719afb7409d1f723dbea2ec26d56f1";
           sha256 = "1y16pah8f4jp117vihvlcwvsw2i85gdk45h9y9r1w9mslb24faac";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3d2b6b92b2a71486f260571885bf149ad6afc551/recipes/eg";
           sha256 = "1ic6qzk0zmay3vvbb8jg35irqkc0k68dmgbq4j9isiawy449zvp7";
-          name = "eg";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -8772,20 +10999,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    egg = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    egg = callPackage ({ fetchFromGitHub
+                       , fetchurl
+                       , lib
+                       , melpaBuild }:
+      melpaBuild {
         pname = "egg";
         version = "1.0.9";
         src = fetchFromGitHub {
           owner = "byplayer";
           repo = "egg";
-          rev = "499894195528203cfcf309228bf7578dd8cd5698";
-          sha256 = "1ryb7smvf66hk307yazkjn9bqzbwzbyyb5db200fq6j2zdjwsmaj";
+          rev = "59e87b5f150ba5add385b29f8e07cb41e6588bca";
+          sha256 = "16cs1ba2v2pm8wsm6z71s7ad619f45vi4v6hwqswi6fljjhmc175";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a1c97870c2641d73685f07a12f010530cc186544/recipes/egg";
           sha256 = "144g1fvs2cmn3px0a98nvxl5cz70kx30v936k5ppyi8gvbj0md5i";
-          name = "egg";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -8793,20 +11023,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    egison-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    egison-mode = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "egison-mode";
         version = "3.7.10";
         src = fetchFromGitHub {
           owner = "egisatoshi";
           repo = "egison3";
-          rev = "b7c073e0a29c9632d82b501849e270d62304e22f";
-          sha256 = "13p6nfsjnbhw0cgy1s28ww9dk4hmwmanf2j6ydhcafvbynp964zs";
+          rev = "0f8289294b1a8de029f89643438e8384e7ee789f";
+          sha256 = "1rkxz4gj11z1jpd3g71m6sbzb5j4ggm6sixk3r18wb8wv91v4fgs";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f543dd136e2af6c36b12073ea75b3c4d4bc79769/recipes/egison-mode";
           sha256 = "0x11fhv8kkx34h831k2q70y5qfz7wnfia4ka5mbmps7mpr68zcwi";
-          name = "egison-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -8814,18 +11047,48 @@
           license = lib.licenses.free;
         };
       }) {};
-    eide = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
+    eglot = callPackage ({ emacs
+                         , fetchFromGitHub
+                         , fetchurl
+                         , jsonrpc
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
+        pname = "eglot";
+        version = "1.1";
+        src = fetchFromGitHub {
+          owner = "joaotavora";
+          repo = "eglot";
+          rev = "9211f162dc3eb956c51faeb3e7195603fa84c60c";
+          sha256 = "0p3fry60xvh7za0p8pyz4h21nzj6df1cbl9lxdzd19rwfd35fzpp";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/6c644530eca56f93d94fac2c9d7663c35c2b8c01/recipes/eglot";
+          sha256 = "17w39hcgv4p49g841qaicjdx7xac72yxvsc83jf1rrakg713pj7y";
+          name = "recipe";
+        };
+        packageRequires = [ emacs jsonrpc ];
+        meta = {
+          homepage = "https://melpa.org/#/eglot";
+          license = lib.licenses.free;
+        };
+      }) {};
+    eide = callPackage ({ fetchgit
+                        , fetchurl
+                        , lib
+                        , melpaBuild }:
+      melpaBuild {
         pname = "eide";
-        version = "2.1.2";
+        version = "2.1.3";
         src = fetchgit {
-          url = "https://git.tuxfamily.org/eide/emacs-ide.git";
-          rev = "5f046ea74eee7af9afbd815c2bfd11fa9c72e6b3";
-          sha256 = "1bd9vqqzhbkpfr80r91r65gv6mqnjqfnyclylivg79sfkkahil9n";
+          url = "https://framagit.org/eide/eide.git";
+          rev = "7e4f101923d1aaa4ad4626ff60375ece8dd13e1d";
+          sha256 = "0j343hdarrlgznc4f59gbix20zlpr4wv5b8db6m0262ajc5q5zfb";
         };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/34b70a5616e27ff9904a2803c86e049acfe9b26d/recipes/eide";
-          sha256 = "168f4mz10byq1kdcfd029gkb3j6jk6lc4kdr4g204823x073f0ni";
-          name = "eide";
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/a42244392719c620b47bc43a7a8501dab4b6f74e/recipes/eide";
+          sha256 = "1962shxcfn3v1ljann7182ca6ciy5xfbcd6l9l8rc8gikp55qv8m";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -8833,8 +11096,20 @@
           license = lib.licenses.free;
         };
       }) {};
-    ein = callPackage ({ auto-complete, cl-generic, dash, deferred, fetchFromGitHub, fetchurl, lib, melpaBuild, request, request-deferred, s, skewer-mode, websocket }:
-    melpaBuild {
+    ein = callPackage ({ auto-complete
+                       , cl-generic
+                       , dash
+                       , deferred
+                       , fetchFromGitHub
+                       , fetchurl
+                       , lib
+                       , melpaBuild
+                       , request
+                       , request-deferred
+                       , s
+                       , skewer-mode
+                       , websocket }:
+      melpaBuild {
         pname = "ein";
         version = "0.14.1";
         src = fetchFromGitHub {
@@ -8843,10 +11118,10 @@
           rev = "fcf9bff0af071f5e2020ac77d9a9473325e4c5bb";
           sha256 = "1xk7k4av9hy0i7zqwpzis0rjp5myvxs52k45ah00zg8wi5hybq1x";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/215e163755fe391ce1f049622e7b9bf9a8aea95a/recipes/ein";
           sha256 = "14blq1cbrp00rq0ilk7z9qppqfj0r4n3jidw3abcpchvh5ln086r";
-          name = "ein";
+          name = "recipe";
         };
         packageRequires = [
           auto-complete
@@ -8864,8 +11139,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    eink-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    eink-theme = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "eink-theme";
         version = "1.0.0";
         src = fetchFromGitHub {
@@ -8874,10 +11152,10 @@
           rev = "93d25c097b105594472c4f99d693f439b4b709f0";
           sha256 = "0m7qsk378c30fva2n2ag99rsdklx5nsqc395msg1ab11sbpxvis0";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a1349c3f93ab60983f77c28f97048fa258b612a6/recipes/eink-theme";
           sha256 = "0z437cpf1b8bqyi7bv0w0dnc52q4f5g17530lwdcxjkr38s9b1zn";
-          name = "eink-theme";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -8885,8 +11163,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    el-autoyas = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    el-autoyas = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "el-autoyas";
         version = "0.5";
         src = fetchFromGitHub {
@@ -8895,10 +11176,10 @@
           rev = "bde0251ecb504f585dfa27c205c8e312655310cc";
           sha256 = "0dbp2zz993cm7mrd58c4iflbzqwg50wzgn2cpwfivk14w1mznh4n";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cc4845343dbb8f8294394f6850788e4f1fe6b99b/recipes/el-autoyas";
           sha256 = "0hh5j79f3z82nmb3kqry8k8lgc1qswk6ni3g9jg60pasc3wkbh6c";
-          name = "el-autoyas";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -8906,8 +11187,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    el-get = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    el-get = callPackage ({ fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "el-get";
         version = "5.1";
         src = fetchFromGitHub {
@@ -8916,10 +11200,10 @@
           rev = "bfffd553f4c72b818e9ee94f05458eae7a16056b";
           sha256 = "1awyh9ffd6a4cia239s89asb88ddqlnrv757d76vcb701pq412bz";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1c61197a2b616d6d3c6b652248cb166196846b44/recipes/el-get";
           sha256 = "1438v2sw5n67q404c93y2py226v469nagqwp4w9l6yyy40h4myhz";
-          name = "el-get";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -8927,8 +11211,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    el-init = callPackage ({ anaphora, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    el-init = callPackage ({ anaphora
+                           , cl-lib ? null
+                           , emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "el-init";
         version = "0.2.0";
         src = fetchFromGitHub {
@@ -8937,10 +11227,10 @@
           rev = "25fd21d820bca1cf576b8f70c8d5a3bc76792597";
           sha256 = "1mzla7ijmq1mgzr6bf16mjdycbf8ylsf4zdk4j6fh5kw5n4k6c5n";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f0c18cc62ffaaf839284ed7b261cc6f375fab813/recipes/el-init";
           sha256 = "121n6z8p9kzi7axp4i2kyi621gw20635w4j81i1bryblaqrv5kl5";
-          name = "el-init";
+          name = "recipe";
         };
         packageRequires = [ anaphora cl-lib emacs ];
         meta = {
@@ -8948,20 +11238,29 @@
           license = lib.licenses.free;
         };
       }) {};
-    el-init-viewer = callPackage ({ anaphora, cl-lib ? null, ctable, dash, el-init, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    el-init-viewer = callPackage ({ anaphora
+                                  , cl-lib ? null
+                                  , ctable
+                                  , dash
+                                  , el-init
+                                  , emacs
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "el-init-viewer";
         version = "0.1.0";
         src = fetchFromGitHub {
           owner = "HKey";
           repo = "el-init-viewer";
-          rev = "dcc595ba51b5aff972292278aa528c7ddb46f1b5";
-          sha256 = "1488wv0f9ihzzf9fl8cki044k61b0kva604hdwpb2qk9gnjr4g1l";
+          rev = "5e42667c53aa096f671c011474e0d75cf1947a18";
+          sha256 = "057hbf78p8ihpnschmzng4yn1jqpw12drvgxk4l8csr3fpqw4spf";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f90e6be757783352c4a7732177ff2e2c0a066247/recipes/el-init-viewer";
           sha256 = "0kkmsml9xf2n8nlrcicfg2l78s3dlhd6ssx0s62v77v4wdpl297m";
-          name = "el-init-viewer";
+          name = "recipe";
         };
         packageRequires = [ anaphora cl-lib ctable dash el-init emacs ];
         meta = {
@@ -8969,8 +11268,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    el-mock = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    el-mock = callPackage ({ fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "el-mock";
         version = "1.25.1";
         src = fetchFromGitHub {
@@ -8979,10 +11281,10 @@
           rev = "3069931de75bb6704ecf565af5390009dc4dae00";
           sha256 = "13mv1rhgkwiww2wh5w926jz7idppp492wir1vdl245c5x50dh4f7";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b1989beb927657c0ff7e79fe448f62ac58c11be7/recipes/el-mock";
           sha256 = "07m7w7n202nijnxidy0j0r4nbcvlnbkm9b0n8qb2bwi3d4cfp77l";
-          name = "el-mock";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -8990,20 +11292,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    el-patch = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    el-patch = callPackage ({ emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "el-patch";
-        version = "1.2";
+        version = "2.1";
         src = fetchFromGitHub {
           owner = "raxod502";
           repo = "el-patch";
-          rev = "cc26f37e19ebc60ca75067115d3794cda88003c5";
-          sha256 = "0b8yy51dy5280y7yvq0ylm20m9bvzi7lzs3c9m1i2gb3ssx7267w";
+          rev = "c10108162bc72b8d09ccf9c914e892e1209f9c20";
+          sha256 = "0fibq04fncv8pia8xjaxc6gc4x046cg26ag6dw6gg0wj79gpyrv9";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2f4f57e0edbae35597aa4a7744d22d2f971d5de5/recipes/el-patch";
           sha256 = "1imijmsni8c8fxjrzprnanf94c1pma3h5w9p75c4y99l8l3xmj7g";
-          name = "el-patch";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -9011,8 +11317,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    el-spice = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    el-spice = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "el-spice";
         version = "0.3.0";
         src = fetchFromGitHub {
@@ -9021,10 +11330,10 @@
           rev = "972dace20ec61cd27b9322432d0c7a688c6f061a";
           sha256 = "1wrb46y4s4v0lwwyriz2qn1j1l804jyb4dmadf462jxln85rml70";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4666eee9f6837d6d9dba77e04aa4c8c4a93b47b5/recipes/el-spice";
           sha256 = "0i0l3y9w1q9pf5zhvmsq4h427imix67jgcfwq21b6j82dzg5l4hg";
-          name = "el-spice";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -9032,20 +11341,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    el-x = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    el-x = callPackage ({ fetchFromGitHub
+                        , fetchurl
+                        , lib
+                        , melpaBuild }:
+      melpaBuild {
         pname = "el-x";
         version = "0.3.1";
         src = fetchFromGitHub {
           owner = "sigma";
           repo = "el-x";
-          rev = "e96541c1f32e0a3aca4ad0a0eb382bd898250163";
-          sha256 = "1i6j44ssxm1xdg0mf91nh1lnprwsaxsx8vsrf720nan7mfr283h5";
+          rev = "b0b69b182f7a81a550ccf9b3a14d8d91560b4f70";
+          sha256 = "1dky0vydwh7l786w7gci4x17kkf6dg8gijmqzl4y0ij9zm9kfxzz";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0346f6349cf39a0414cd055b06d8ed193f4972d4/recipes/el-x";
           sha256 = "1721d9mljlcbdwb5b9934q7a48y30x6706pp4bjvgys0r64dml5g";
-          name = "el-x";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -9053,8 +11365,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    el2org = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    el2org = callPackage ({ emacs
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "el2org";
         version = "0.6.0";
         src = fetchFromGitHub {
@@ -9063,10 +11379,10 @@
           rev = "4a33469cd305e581603d7ef63bc2a1f2156f2e2e";
           sha256 = "0mzddqny6wpg1fv99xrvlv7rxmaifvmy5bvj4in4pldhm4cx4q1b";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/el2org";
           sha256 = "02kyvzpjws2mrp414i4zm4fmrnzgkaax6bnrlyhp17a8aqaggbnh";
-          name = "el2org";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -9074,8 +11390,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    elbank = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }:
-    melpaBuild {
+    elbank = callPackage ({ emacs
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild
+                          , seq }:
+      melpaBuild {
         pname = "elbank";
         version = "1.2";
         src = fetchFromGitHub {
@@ -9084,10 +11405,10 @@
           rev = "f494716105b1a9f4f52f43bc3dd37c9cd0309bf5";
           sha256 = "0bvx6nq0gjjbjs0mzd1x1ajyjpa181z0n4kv4aknh3is210gbpbb";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/05d252ee84adae2adc88fd325540f76b6cdaf010/recipes/elbank";
           sha256 = "1ry84aiajyrnrspf7w4yjm0rmdam8ijrz0s7291yr8c70hslc997";
-          name = "elbank";
+          name = "recipe";
         };
         packageRequires = [ emacs seq ];
         meta = {
@@ -9095,8 +11416,38 @@
           license = lib.licenses.free;
         };
       }) {};
-    eldoc-eval = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    elcouch = callPackage ({ emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , json-mode
+                           , lib
+                           , libelcouch
+                           , melpaBuild }:
+      melpaBuild {
+        pname = "elcouch";
+        version = "0.3.0";
+        src = fetchFromGitHub {
+          owner = "DamienCassou";
+          repo = "elcouch";
+          rev = "d22e8cab9328966b2e2d5bc4fc17a4abbb222736";
+          sha256 = "0l9ah3ijlidjshwkazfcdasm3hmigw8dcyqgi9pmpv0kw9096y64";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/b5d9a35dd5a272a592d248993ea7e5dda8fdf0ab/recipes/elcouch";
+          sha256 = "1dp7chvnz6gadqgyqbvdxpva3hm3sx60izsa690mp2rifjyxgqf1";
+          name = "recipe";
+        };
+        packageRequires = [ emacs json-mode libelcouch ];
+        meta = {
+          homepage = "https://melpa.org/#/elcouch";
+          license = lib.licenses.free;
+        };
+      }) {};
+    eldoc-eval = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "eldoc-eval";
         version = "1.1";
         src = fetchFromGitHub {
@@ -9105,10 +11456,10 @@
           rev = "deca5e39f31282a06531002d289258cd099433c0";
           sha256 = "1fh9dx669czkwy4msylcg64azz3az27akx55ipnazb5ghmsi7ivk";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/63ba2004d3db4c5a71676dca82ad880328cf6073/recipes/eldoc-eval";
           sha256 = "0z4scgi2xgrgd47aqqmyv1ww8alh43s0qny5qmh3f1nnppz3nd7c";
-          name = "eldoc-eval";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -9116,8 +11467,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    electric-operator = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, names }:
-    melpaBuild {
+    electric-operator = callPackage ({ dash
+                                     , emacs
+                                     , fetchFromGitHub
+                                     , fetchurl
+                                     , lib
+                                     , melpaBuild
+                                     , names }:
+      melpaBuild {
         pname = "electric-operator";
         version = "1.0.0";
         src = fetchFromGitHub {
@@ -9126,10 +11483,10 @@
           rev = "16df9e16da8efe25d410ba17165d7f5c1ad4e043";
           sha256 = "010zr6dgix6bf8xshs8kascpzcrg83vqd1w71qin9anw6rf3z4d4";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/906cdf8647524bb76f644373cf8b65397d9053a5/recipes/electric-operator";
           sha256 = "043bkpvvk42lmkll5jnz4q8i0m44y4wdxvkz6hiqhqcp1rv03nw2";
-          name = "electric-operator";
+          name = "recipe";
         };
         packageRequires = [ dash emacs names ];
         meta = {
@@ -9137,8 +11494,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    elf-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    elf-mode = callPackage ({ emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "elf-mode";
         version = "0.1.0";
         src = fetchFromGitHub {
@@ -9147,10 +11508,10 @@
           rev = "cd280d683cd3341d8bb31af6db7e3b74a133e6ab";
           sha256 = "0cbvjbk2893ag1iy8ggixpirfiyhssm7fii96hb9jqdz874cdl0k";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/368d1ff91f310e5ffe68f872ab0a91584a41a66e/recipes/elf-mode";
           sha256 = "0xwpaqg4mc0a0d8a4dxbd1sqzvi01gfhwr75f7i3sjzx0fj8vcwd";
-          name = "elf-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -9158,20 +11519,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    elfeed = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    elfeed = callPackage ({ emacs
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "elfeed";
-        version = "2.3.0";
+        version = "3.0.0";
         src = fetchFromGitHub {
           owner = "skeeto";
           repo = "elfeed";
-          rev = "00b25d974abc4f3e61676068397758035bfdfc30";
-          sha256 = "0qivqhz2mhjyqrqkfjrv8q6387cbzwvmyay2jbws5vibwbxjciwz";
+          rev = "7e0abfee1470ae6323b559a7a9f843dd0076d622";
+          sha256 = "01x4ww63lvn04c7f3ab5vx2s20xqisvv8213qwswz7vr9nxja5yi";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/407ae027fcec444622c2a822074b95996df9e6af/recipes/elfeed";
           sha256 = "1psga7fcjk2b8xjg10fndp9l0ib72l5ggf43gxp62i4lxixzv8f9";
-          name = "elfeed";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -9179,8 +11544,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    elfeed-protocol = callPackage ({ cl-lib ? null, elfeed, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    elfeed-protocol = callPackage ({ cl-lib ? null
+                                   , elfeed
+                                   , emacs
+                                   , fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "elfeed-protocol";
         version = "0.5.3";
         src = fetchFromGitHub {
@@ -9189,10 +11560,10 @@
           rev = "611a1f57373e3692abf5122652ea7f6f96d3f6ec";
           sha256 = "0z9xij39p6m2855ksk40qaf830d04smhl3ag9gjb4fhzvw671k76";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3f1eef8add7cd2cfefe6fad6d8e69d65696e9677/recipes/elfeed-protocol";
           sha256 = "1gd2ny764qsnnqf3j7rbdqhh7hqd5c0fzwxx6wacd0dpbq4w56qi";
-          name = "elfeed-protocol";
+          name = "recipe";
         };
         packageRequires = [ cl-lib elfeed emacs ];
         meta = {
@@ -9200,20 +11571,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    elfeed-web = callPackage ({ elfeed, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, simple-httpd }:
-    melpaBuild {
+    elfeed-web = callPackage ({ elfeed
+                              , emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild
+                              , simple-httpd }:
+      melpaBuild {
         pname = "elfeed-web";
-        version = "2.3.0";
+        version = "3.0.0";
         src = fetchFromGitHub {
           owner = "skeeto";
           repo = "elfeed";
-          rev = "00b25d974abc4f3e61676068397758035bfdfc30";
-          sha256 = "0qivqhz2mhjyqrqkfjrv8q6387cbzwvmyay2jbws5vibwbxjciwz";
+          rev = "7e0abfee1470ae6323b559a7a9f843dd0076d622";
+          sha256 = "01x4ww63lvn04c7f3ab5vx2s20xqisvv8213qwswz7vr9nxja5yi";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/62459d16ee44d5fcf170c0ebc981ca2c7d4672f2/recipes/elfeed-web";
           sha256 = "14ydwvjjc6wbhkj4g4xdh0c3nh4asqsz8ln7my5vjib881vmaq1n";
-          name = "elfeed-web";
+          name = "recipe";
         };
         packageRequires = [ elfeed emacs simple-httpd ];
         meta = {
@@ -9221,8 +11598,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    elisp-def = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    elisp-def = callPackage ({ dash
+                             , emacs
+                             , f
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild
+                             , s }:
+      melpaBuild {
         pname = "elisp-def";
         version = "1.0";
         src = fetchFromGitHub {
@@ -9231,10 +11615,10 @@
           rev = "5e0d766a5db537f4e7145c2053c22829d736ceba";
           sha256 = "0l9az09yw40rr2xrvf01c3idfqplddr1kk880qscnzj8v9p06l4x";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1f027b844efdc5946d2ad80d7052a8f3b96aac3d/recipes/elisp-def";
           sha256 = "1y29nsgjv9nb03g0jc5hb1a8k23r54ivdlv9h0a384cig8i91hsz";
-          name = "elisp-def";
+          name = "recipe";
         };
         packageRequires = [ dash emacs f s ];
         meta = {
@@ -9242,8 +11626,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    elisp-lint = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    elisp-lint = callPackage ({ emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "elisp-lint";
         version = "0.2.0";
         src = fetchFromGitHub {
@@ -9252,10 +11640,10 @@
           rev = "9d894e99377859171ee54cb7d2b2e7f2cc7c267c";
           sha256 = "11pvqskjhxxsyxmy8wllqwa0qg0j9280h0m5rzjghgsdcnlisyvq";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/61595c78ac7f15eef47bf28636ad796f74741509/recipes/elisp-lint";
           sha256 = "13cxcn0qp63f2nkv37c3w47dby9cqm4l1f8xilgpczdaxd86kd63";
-          name = "elisp-lint";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -9263,29 +11651,39 @@
           license = lib.licenses.free;
         };
       }) {};
-    elisp-refs = callPackage ({ dash, f, fetchFromGitHub, fetchurl, lib, list-utils, loop, melpaBuild, s }:
-    melpaBuild {
+    elisp-refs = callPackage ({ dash
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , loop
+                              , melpaBuild
+                              , s }:
+      melpaBuild {
         pname = "elisp-refs";
-        version = "1.2";
+        version = "1.3";
         src = fetchFromGitHub {
           owner = "Wilfred";
           repo = "refs.el";
-          rev = "8f2da5ba5b728a8f278813c95d0fda3364cca40c";
-          sha256 = "0i0xjy4x3i349jbpbqhfz57frk8cdakwi78fw1mlycx4qinlx2n0";
+          rev = "788f6f65d5171b1887b3ff9e4cad900e8046b2b1";
+          sha256 = "0c7hcbjqynw6k5idpmfxn6xbr192ahhk8a2g72npap97flpw6cdq";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/60891099e241ebd32d39bdcfe4953529a5a3263e/recipes/elisp-refs";
           sha256 = "16h7dccmzvmap3knnwhjq79wm82xm3whria70vq5msl2y252f6cx";
-          name = "elisp-refs";
+          name = "recipe";
         };
-        packageRequires = [ dash f list-utils loop s ];
+        packageRequires = [ dash loop s ];
         meta = {
           homepage = "https://melpa.org/#/elisp-refs";
           license = lib.licenses.free;
         };
       }) {};
-    elisp-slime-nav = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    elisp-slime-nav = callPackage ({ cl-lib ? null
+                                   , fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "elisp-slime-nav";
         version = "0.9";
         src = fetchFromGitHub {
@@ -9294,10 +11692,10 @@
           rev = "0e96d9f1f0d334f09414b509d44d5c000b51f432";
           sha256 = "11vyy0bvzbs1h1kggikrvhd658j7c730w0pdp6qkm60rigvfi1ih";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/elisp-slime-nav";
           sha256 = "009zgp68i4naprpjr8lcp06lh3i5ickn0nh0lgvrqs0niprnzh8c";
-          name = "elisp-slime-nav";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -9305,8 +11703,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    elixir-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }:
-    melpaBuild {
+    elixir-mode = callPackage ({ emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild
+                               , pkg-info }:
+      melpaBuild {
         pname = "elixir-mode";
         version = "2.3.1";
         src = fetchFromGitHub {
@@ -9315,10 +11718,10 @@
           rev = "a1f4d60ec555574c945201359d2e32b183c69f4b";
           sha256 = "06bi68x49v6f7flpz279mm4jpg31ll3s274givm3pvr8slcxs6xg";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6374ced0de38d83bf99147f702f30706615480ed/recipes/elixir-mode";
           sha256 = "1dba3jfg210i2rw8qy866396xn2xjgmbcyl006d6fibpr3j4lxaf";
-          name = "elixir-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs pkg-info ];
         meta = {
@@ -9326,8 +11729,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    elixir-yasnippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
-    melpaBuild {
+    elixir-yasnippets = callPackage ({ fetchFromGitHub
+                                     , fetchurl
+                                     , lib
+                                     , melpaBuild
+                                     , yasnippet }:
+      melpaBuild {
         pname = "elixir-yasnippets";
         version = "0.0.1";
         src = fetchFromGitHub {
@@ -9336,10 +11743,10 @@
           rev = "6b55c88ce483932f226b6bca0212b589d1d393ea";
           sha256 = "0dx5h3sfccc2bp1jxnqqki95x5hp1skw8n5n4lnh703yjga5gkrz";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6c37a13d56e9a0a4e7e2c11349ed87610a0f6b2c/recipes/elixir-yasnippets";
           sha256 = "0vmkcd88wfafv31lyw0983p4qjj387qf258q7py1ij47fcmfp579";
-          name = "elixir-yasnippets";
+          name = "recipe";
         };
         packageRequires = [ yasnippet ];
         meta = {
@@ -9347,8 +11754,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    elm-mode = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, s }:
-    melpaBuild {
+    elm-mode = callPackage ({ emacs
+                            , f
+                            , fetchFromGitHub
+                            , fetchurl
+                            , let-alist
+                            , lib
+                            , melpaBuild
+                            , s }:
+      melpaBuild {
         pname = "elm-mode";
         version = "0.20.3";
         src = fetchFromGitHub {
@@ -9357,10 +11771,10 @@
           rev = "29f50a940113d793a21998f3bb414fdd9b0c5daa";
           sha256 = "02c7xl9w81140l7p9kywr5qwsdyv92nxdhzqcxjk0r09x7s0cvsk";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5d1a4d786b137f61ed3a1dd4ec236d0db120e571/recipes/elm-mode";
           sha256 = "1gw9szkyr1spcx7qijddhxlm36h0hmfd53b4yzp1336yx44mlnd1";
-          name = "elm-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs f let-alist s ];
         meta = {
@@ -9368,8 +11782,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    elmacro = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    elmacro = callPackage ({ dash
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild
+                           , s }:
+      melpaBuild {
         pname = "elmacro";
         version = "1.1.0";
         src = fetchFromGitHub {
@@ -9378,10 +11797,10 @@
           rev = "9ed19a362b63d9c7436a78feb91bc694194cfefe";
           sha256 = "00qqa9p9z50gxna4qrsvph4nj41gldl1qj210ywk3lgwn0jjm0k9";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/566cc5bc0f71c5a4191ad93b917dc268f6e1a2da/recipes/elmacro";
           sha256 = "0644rgwawivrq1shsjx1x2p53z7jgr6bxqgn2smzql8pp6azy7xz";
-          name = "elmacro";
+          name = "recipe";
         };
         packageRequires = [ dash s ];
         meta = {
@@ -9389,8 +11808,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    elmine = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    elmine = callPackage ({ fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "elmine";
         version = "0.3";
         src = fetchFromGitHub {
@@ -9399,10 +11821,10 @@
           rev = "091f61c70c9e7630a74b7b127488051d143a35e7";
           sha256 = "080nnw6ddsczbm7gk50x4dkahi77fsybfiki5iyp39fjpa7lfzq3";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/elmine";
           sha256 = "1xkx1wwrzd2dl13z8n4qh3gl202j0i9crab5b3788z8mq0g4v4bn";
-          name = "elmine";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -9410,8 +11832,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    elpa-audit = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    elpa-audit = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "elpa-audit";
         version = "0.4";
         src = fetchFromGitHub {
@@ -9420,10 +11845,10 @@
           rev = "a7a1806278c73ea6cb6d235714e7bc8088971df5";
           sha256 = "1q4krfrc2dy0vr7q148msfpkcwj55mlsrn4n5xjnya4xj0134ib7";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/elpa-audit";
           sha256 = "18a8n22g53d8fxzr3snb2px28gvxbkx44grrx8lywaprz1f1lwdi";
-          name = "elpa-audit";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -9431,8 +11856,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    elpa-clone = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    elpa-clone = callPackage ({ cl-lib ? null
+                              , emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "elpa-clone";
         version = "0.0.6";
         src = fetchFromGitHub {
@@ -9441,10 +11871,10 @@
           rev = "92f4c9d3570ad002575a90d0cc4a522c203a1110";
           sha256 = "0m5w5wgyslvakcqpr3d198sy3561w2h002gflw0jp47v17hba1r7";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/11861edd9c7f9deebd44fd1f8ef648e7a04caf2b/recipes/elpa-clone";
           sha256 = "172gpmpwf75y41n3v05l47w34x83vy63bqk97fd8a6b4dkj91lqa";
-          name = "elpa-clone";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -9452,8 +11882,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    elpa-mirror = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    elpa-mirror = callPackage ({ emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "elpa-mirror";
         version = "2.1.1";
         src = fetchFromGitHub {
@@ -9462,31 +11896,41 @@
           rev = "83a38b5721c459d311833522903de96f874e1a4e";
           sha256 = "0j2nk1nhbihfqajkmzp3501mhv5617qhb7qbj46qz8azs8a1dvri";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d64ce7042c45f29fb394be25ce415912182bac8b/recipes/elpa-mirror";
           sha256 = "1jnviav2ybr13cgllg26kfjrwrl25adggnqiiwyjwgbbzxfycah8";
-          name = "elpa-mirror";
+          name = "recipe";
         };
-        packageRequires = [];
+        packageRequires = [ emacs ];
         meta = {
           homepage = "https://melpa.org/#/elpa-mirror";
           license = lib.licenses.free;
         };
       }) {};
-    elpy = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, find-file-in-project, highlight-indentation, lib, melpaBuild, pyvenv, s, yasnippet }:
-    melpaBuild {
+    elpy = callPackage ({ company
+                        , emacs
+                        , fetchFromGitHub
+                        , fetchurl
+                        , find-file-in-project
+                        , highlight-indentation
+                        , lib
+                        , melpaBuild
+                        , pyvenv
+                        , s
+                        , yasnippet }:
+      melpaBuild {
         pname = "elpy";
-        version = "1.19.0";
+        version = "1.22.0";
         src = fetchFromGitHub {
           owner = "jorgenschaefer";
           repo = "elpy";
-          rev = "8b04039b8112fd18392861718dc30ba011626dee";
-          sha256 = "0yyn1a8sdn8avmwmlg98365irr9b2rx2jrjxs3y93d1bhlmr816i";
+          rev = "47eac168f38e40fc07f56ea37fb1bee7f645e42a";
+          sha256 = "09inijph1r0l94balf0z01g2dgx22y53c346cxf4fkm2hcjd2fd7";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1d8fcd8745bb15402c9f3b6f4573ea151415237a/recipes/elpy";
           sha256 = "1ri3dwnkw005plj1g5grmmq9np41sqk4s2v18pwsvr18ysnq6nnr";
-          name = "elpy";
+          name = "recipe";
         };
         packageRequires = [
           company
@@ -9502,20 +11946,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    elscreen = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    elscreen = callPackage ({ emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "elscreen";
-        version = "2018snapshot3snapshot21";
+        version = "2018.-4.3.-4.21";
         src = fetchFromGitHub {
           owner = "knu";
           repo = "elscreen";
           rev = "02164afab2c5fbff6e4aa7c59e0daedc6c504772";
           sha256 = "1jzp7w2c9xl8x8kdxcchgp8s3ygvj70pi2vwwg1qilkya7yv61p0";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e6140694c1dea0a573586d23d1f63d46c9b22936/recipes/elscreen";
           sha256 = "1mlqbw14ilk6d3ba38kfw50pnlhb9f6sm5hy9dw58gp59siark5s";
-          name = "elscreen";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -9523,8 +11971,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    elscreen-fr = callPackage ({ elscreen, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }:
-    melpaBuild {
+    elscreen-fr = callPackage ({ elscreen
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild
+                               , seq }:
+      melpaBuild {
         pname = "elscreen-fr";
         version = "0.0.3";
         src = fetchFromGitHub {
@@ -9533,10 +11986,10 @@
           rev = "b9c11f80d277086d5d5bf88623e15fc7adbbbe3c";
           sha256 = "1dz8jqd2agh06hya59vbybrmgyhyz2rk6c9panrm49w37v0bwksb";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/18730986df5eb9816eec7ad479abe1e338d3c66f/recipes/elscreen-fr";
           sha256 = "1kmga1zz9mb3hxd2sxja2vz45pix5a52yl0g9z4vmak32x9rgqrm";
-          name = "elscreen-fr";
+          name = "recipe";
         };
         packageRequires = [ elscreen seq ];
         meta = {
@@ -9544,8 +11997,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    elscreen-mew = callPackage ({ elscreen, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    elscreen-mew = callPackage ({ elscreen
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "elscreen-mew";
         version = "1.0.2";
         src = fetchFromGitHub {
@@ -9554,10 +12011,10 @@
           rev = "89871fad690ae161dc076e16ef481b1965612077";
           sha256 = "14hwl5jzmm43qa4jbpsyswbz4hk1l2iwqh3ank6502bz58877k6c";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/47404ea3cfb591b780ca7e31095951a708b0a6b7/recipes/elscreen-mew";
           sha256 = "06g4wcfjs036nn64ac0zsvr08cfmak2hyj83y7a0r35yxr1853w4";
-          name = "elscreen-mew";
+          name = "recipe";
         };
         packageRequires = [ elscreen ];
         meta = {
@@ -9565,8 +12022,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    elwm = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    elwm = callPackage ({ dash
+                        , fetchFromGitHub
+                        , fetchurl
+                        , lib
+                        , melpaBuild }:
+      melpaBuild {
         pname = "elwm";
         version = "0.0.2";
         src = fetchFromGitHub {
@@ -9575,10 +12036,10 @@
           rev = "c33b183f006ad476c3a44dab316f580f8b369930";
           sha256 = "1k7npf93xbmrsq607x8zlgrpzqvplgia3ixz5w1lr1jlv1m2m8x2";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0eb45a6141b797243973695be4c0582c9ad6965d/recipes/elwm";
           sha256 = "0rf663ih3lfg4n4pj4dpp133967zha5m1wr46riaxpha7xr59al9";
-          name = "elwm";
+          name = "recipe";
         };
         packageRequires = [ dash ];
         meta = {
@@ -9586,20 +12047,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    elx = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    elx = callPackage ({ emacs
+                       , fetchFromGitHub
+                       , fetchurl
+                       , lib
+                       , melpaBuild }:
+      melpaBuild {
         pname = "elx";
-        version = "1.2.2";
+        version = "1.2.4";
         src = fetchFromGitHub {
           owner = "emacscollective";
           repo = "elx";
-          rev = "c5fb4853d8a7d266c8d484522cbaa6b31e745695";
-          sha256 = "1lc9kdflssp4j220p252hskd5ikl0fbvhqp6fksfynrj1j02p4jg";
+          rev = "10a21c35915e249d5487aa3ced70fcfb749a9d0c";
+          sha256 = "1jl2lp4gas89vx1xjx5gzh56fhx16mvfqwqs84cpxdbwb2qzch21";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/57a2fb9524df3fdfdc54c403112e12bd70888b23/recipes/elx";
           sha256 = "008nwa2gn3d2ayr8023pxyvph52gh9m56f77h41hp8hcw6hbdwrz";
-          name = "elx";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -9607,8 +12072,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    emacs-setup = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    emacs-setup = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "emacs-setup";
         version = "1.0";
         src = fetchFromGitHub {
@@ -9617,10 +12085,10 @@
           rev = "cc36ad5318c6c0e65d1b9ff8dff5ea2437675de2";
           sha256 = "15l3ab11vcmzqibkd6h5zqw5a83k8dmgcp4n26px29c0gv6bkpy8";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/abb7101b2d48af56af09d1dc85c540300dba7b3c/recipes/emacs-setup";
           sha256 = "1x4rh8vx6fsb2d6dz2g9j6jamin1vmpppwy3yzbl1dnf7w4hx4kh";
-          name = "emacs-setup";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -9628,20 +12096,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    emacsagist = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    emacsagist = callPackage ({ cl-lib ? null
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "emacsagist";
         version = "1.0.0";
         src = fetchFromGitHub {
           owner = "echosa";
           repo = "emacsagist";
-          rev = "aba342ba59c254a88017f25e9fb7a8cd6f2fda83";
-          sha256 = "0ciqxyahlzaxq854jm25zbrbmrhcaj5csdhxa0az9crwha8wkmw2";
+          rev = "539b9c4c0652d793391135ba1fc2e503dbb7deba";
+          sha256 = "0n5cpmbyf8mhq03ikhzbycjwkxv3fmjwq1a9zvv3z9ik8yxnbw99";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/07612d46faebb28e1eeb8ddae2ac20e2dc0175f6/recipes/emacsagist";
           sha256 = "1cyz7nf0zxa21979jf5kdmkgwiyd17vsmpcmrw1af37ly27l8l64";
-          name = "emacsagist";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -9649,8 +12121,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    emacsc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    emacsc = callPackage ({ fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "emacsc";
         version = "1.2.20131027";
         src = fetchFromGitHub {
@@ -9659,10 +12134,10 @@
           rev = "69607bdc3a0c070e924a3bcac93180f917992368";
           sha256 = "1r6cpb7fck5znb7q7zrxcsjn7d3xiqhq8dp1ar1rsd6k4h05by4j";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/acc9b816796b9f142c53f90593952b43c962d2d8/recipes/emacsc";
           sha256 = "1fbf9al3yds0il18jz6hbpj1fsjlpb1kgp450gb6r09lc46x77mk";
-          name = "emacsc";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -9670,8 +12145,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    emacsql = callPackage ({ cl-generic, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, finalize, lib, melpaBuild }:
-    melpaBuild {
+    emacsql = callPackage ({ cl-generic
+                           , cl-lib ? null
+                           , emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , finalize
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "emacsql";
         version = "2.0.3";
         src = fetchFromGitHub {
@@ -9680,10 +12162,10 @@
           rev = "dcf0dda9391f3978896547582efb72b5632c2ffe";
           sha256 = "07gvx0bbpf6j3g8kpk9908wf8fx1yb3075v6407wjxxighl0n5zz";
         };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/9cc47c05fb0d282531c9560252090586e9f6196e/recipes/emacsql";
-          sha256 = "1x4rn8dmgz871dhz878i2mqci576zccf9i2xmq2ishxgqm0hp8ax";
-          name = "emacsql";
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/9c3b6175b5c64f03b0b9dfdc10f393081d681309/recipes/emacsql";
+          sha256 = "0c2d0kymzr53wh87fq1wy2x5ahfsymz0cw8qbrqx0k613l3mpr38";
+          name = "recipe";
         };
         packageRequires = [ cl-generic cl-lib emacs finalize ];
         meta = {
@@ -9691,20 +12173,27 @@
           license = lib.licenses.free;
         };
       }) {};
-    emacsql-mysql = callPackage ({ cl-generic, cl-lib ? null, emacs, emacsql, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    emacsql-mysql = callPackage ({ cl-generic
+                                 , cl-lib ? null
+                                 , emacs
+                                 , emacsql
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "emacsql-mysql";
         version = "2.0.3";
         src = fetchFromGitHub {
           owner = "skeeto";
           repo = "emacsql";
-          rev = "dcf0dda9391f3978896547582efb72b5632c2ffe";
-          sha256 = "07gvx0bbpf6j3g8kpk9908wf8fx1yb3075v6407wjxxighl0n5zz";
+          rev = "5df2891557f52eadd094eca618775163b1618af5";
+          sha256 = "18916pxlgamprv9lk0g0bfyx040imyfzry5r35gyf4s4jb8kjnsm";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9cc47c05fb0d282531c9560252090586e9f6196e/recipes/emacsql-mysql";
           sha256 = "1c20zhpdzfqjds6kcjhiq1m5ch53fsx6n1xk30i35kkg1wxaaqzy";
-          name = "emacsql-mysql";
+          name = "recipe";
         };
         packageRequires = [ cl-generic cl-lib emacs emacsql ];
         meta = {
@@ -9712,20 +12201,28 @@
           license = lib.licenses.free;
         };
       }) {};
-    emacsql-psql = callPackage ({ cl-generic, cl-lib ? null, emacs, emacsql, fetchFromGitHub, fetchurl, lib, melpaBuild, pg }:
-    melpaBuild {
+    emacsql-psql = callPackage ({ cl-generic
+                                , cl-lib ? null
+                                , emacs
+                                , emacsql
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild
+                                , pg }:
+      melpaBuild {
         pname = "emacsql-psql";
         version = "2.0.3";
         src = fetchFromGitHub {
           owner = "skeeto";
           repo = "emacsql";
-          rev = "dcf0dda9391f3978896547582efb72b5632c2ffe";
-          sha256 = "07gvx0bbpf6j3g8kpk9908wf8fx1yb3075v6407wjxxighl0n5zz";
+          rev = "5df2891557f52eadd094eca618775163b1618af5";
+          sha256 = "18916pxlgamprv9lk0g0bfyx040imyfzry5r35gyf4s4jb8kjnsm";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9cc47c05fb0d282531c9560252090586e9f6196e/recipes/emacsql-psql";
           sha256 = "1aa1g9jyjmz6w0lmi2cf67926ad3xvs0qsg7lrccnllr9k0flly3";
-          name = "emacsql-psql";
+          name = "recipe";
         };
         packageRequires = [ cl-generic cl-lib emacs emacsql pg ];
         meta = {
@@ -9733,20 +12230,27 @@
           license = lib.licenses.free;
         };
       }) {};
-    emacsql-sqlite = callPackage ({ cl-generic, cl-lib ? null, emacs, emacsql, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    emacsql-sqlite = callPackage ({ cl-generic
+                                  , cl-lib ? null
+                                  , emacs
+                                  , emacsql
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "emacsql-sqlite";
         version = "2.0.3";
         src = fetchFromGitHub {
           owner = "skeeto";
           repo = "emacsql";
-          rev = "dcf0dda9391f3978896547582efb72b5632c2ffe";
-          sha256 = "07gvx0bbpf6j3g8kpk9908wf8fx1yb3075v6407wjxxighl0n5zz";
+          rev = "e597696682a9a7f9d2a8350dfe1f7beb05365da4";
+          sha256 = "1900aca9nbcwmmmpm5h46zblzay47i2v4x4zb0w7mnzcidq8g1h4";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3cfa28c7314fa57fa9a3aaaadf9ef83f8ae541a9/recipes/emacsql-sqlite";
           sha256 = "1y81nabzzb9f7b8azb9giy23ckywcbrrg4b88gw5qyjizbb3h70x";
-          name = "emacsql-sqlite";
+          name = "recipe";
         };
         packageRequires = [ cl-generic cl-lib emacs emacsql ];
         meta = {
@@ -9754,20 +12258,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    emacsshot = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    emacsshot = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "emacsshot";
         version = "0.4";
         src = fetchFromGitHub {
           owner = "marcowahl";
           repo = "emacsshot";
-          rev = "f2f8996d877ece5469c459c9bb7f33fe43c95822";
-          sha256 = "00q344vgihl2s0snibfwsjvxqkbvy2jlqnnid7qw5gcni673b2hl";
+          rev = "eeb4bf9cc9d15250fc3c080492dd147ecd378bce";
+          sha256 = "1wqxhdhblf0v32sk1q92hnsgzjl13vvwsh9l35mkfn8563ih6il5";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/efdd85accc6053f92efcbfdb7ddc37b23a07a3b0/recipes/emacsshot";
           sha256 = "08xqx017yfizdj8wz7nbh9i7qpar6398sri78abzf78inv828s9j";
-          name = "emacsshot";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -9775,8 +12282,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    emamux = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    emamux = callPackage ({ emacs
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "emamux";
         version = "0.14";
         src = fetchFromGitHub {
@@ -9785,10 +12296,10 @@
           rev = "573dd1cf18584a1fd240efb16c7726b6fd790b73";
           sha256 = "19y69qw79miim9cz5ji54gwspjkcp9g2c1xr5s7jj2fiabnxax6b";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6de1ed3dfccb9f7e7b8586e8334af472a4988840/recipes/emamux";
           sha256 = "1pg0gzi8rn0yafssrsiqdyj5dbfy984srq1r4dpp8p3bi3n0fkfz";
-          name = "emamux";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -9796,8 +12307,37 @@
           license = lib.licenses.free;
         };
       }) {};
-    embrace = callPackage ({ cl-lib ? null, expand-region, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    emaps = callPackage ({ fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
+        pname = "emaps";
+        version = "0.1.0";
+        src = fetchFromGitHub {
+          owner = "GuiltyDolphin";
+          repo = "emaps";
+          rev = "823b8f72e6459c9f1a5dd62451ee4005ef71d955";
+          sha256 = "1g9637j8f65q3l6k4aw5p847m891irh74kg3pa2p9w0ppsa6n3jm";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4faeda02aabc0b6c5003cdf5d1fdfca0fd71b0d7/recipes/emaps";
+          sha256 = "151rh6lyqi0ps2w022shzjj67nkg6y4m1nfj90qyc7jgl64qb9qw";
+          name = "recipe";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/emaps";
+          license = lib.licenses.free;
+        };
+      }) {};
+    embrace = callPackage ({ cl-lib ? null
+                           , expand-region
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "embrace";
         version = "0.1.4";
         src = fetchFromGitHub {
@@ -9806,10 +12346,10 @@
           rev = "dd5da196e5bcc5e6d87e1937eca0c21da4334ef2";
           sha256 = "1m0qyipkp5ydgcav8d0m58fbj1gilipbj7g8mg40iajr8wfqcjdc";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e8f07e3b5ba4ec4b0b79fba5a2cca5a3986218b6/recipes/embrace";
           sha256 = "1w9zp9n91703d6jd4adl2xk574wsr7fm2a9v32b1i9bi3hr0hdjc";
-          name = "embrace";
+          name = "recipe";
         };
         packageRequires = [ cl-lib expand-region ];
         meta = {
@@ -9817,8 +12357,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    emmet-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    emmet-mode = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "emmet-mode";
         version = "1.0.8";
         src = fetchFromGitHub {
@@ -9827,10 +12370,10 @@
           rev = "bf76d717c60f33d223cdac35513105e9f9244885";
           sha256 = "1dsa85bk33j90h1ypaz1ylqh9yp2xvlga237h3kwa5y3sb0d5ydi";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/emmet-mode";
           sha256 = "0wjv4hqddjvbdrmsxzav5rpwnm2n6lr86jzkrnav8f2kyzypdsnr";
-          name = "emmet-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -9838,19 +12381,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    emms = callPackage ({ cl-lib ? null, fetchgit, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    emms = callPackage ({ cl-lib ? null
+                        , fetchgit
+                        , fetchurl
+                        , lib
+                        , melpaBuild }:
+      melpaBuild {
         pname = "emms";
-        version = "4.4";
+        version = "5.0";
         src = fetchgit {
           url = "https://git.savannah.gnu.org/git/emms.git";
-          rev = "88fecd0234da595843ce6be4d3f9f2b755ff612d";
-          sha256 = "0ycm2lggljhzrb10r3c322c7bb580gk125x9nvpvjrvsp74p8im0";
+          rev = "cffef39bd9297154b3ed91a68f8fc230e0f87fba";
+          sha256 = "1xzfpmcp3vnslv38ql7ympmmcbl0q3wzdvkbfn245g94iyz3a97f";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/emms";
           sha256 = "1xpry8h96gvjnc0v8x0vk5dnmlq1r7m3ljpampdwv9pfwl95fh94";
-          name = "emms";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -9858,8 +12405,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    emms-mode-line-cycle = callPackage ({ emacs, emms, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    emms-mode-line-cycle = callPackage ({ emacs
+                                        , emms
+                                        , fetchFromGitHub
+                                        , fetchurl
+                                        , lib
+                                        , melpaBuild }:
+      melpaBuild {
         pname = "emms-mode-line-cycle";
         version = "0.2.5";
         src = fetchFromGitHub {
@@ -9868,10 +12420,10 @@
           rev = "2c2f395e484a1d345050ddd61ff5fab71a92a6bc";
           sha256 = "0q80f0plch6k4lhs8c9qm3mfycfbp3kn5sjrk9zxgxwnn901y9mp";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/dab676acd774616a32a0373f30647f3cb4522afc/recipes/emms-mode-line-cycle";
           sha256 = "1jdmfh1i9v84iy7bj2dbc3s2wfzkrby3pabd99gnqzd9gn1cn8ca";
-          name = "emms-mode-line-cycle";
+          name = "recipe";
         };
         packageRequires = [ emacs emms ];
         meta = {
@@ -9879,20 +12431,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    emms-player-mpv = callPackage ({ emms, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    emms-player-mpv = callPackage ({ emms
+                                   , fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "emms-player-mpv";
-        version = "0.1.0";
+        version = "0.2.0";
         src = fetchFromGitHub {
           owner = "dochang";
           repo = "emms-player-mpv";
-          rev = "ccc0090ba1ebaad6bd3b079d6d810e9a051218b3";
-          sha256 = "1jy7zc26ypwl46ag26gbspbn7p4lf3jxgb34l8blqzk8qn8fxz0c";
+          rev = "9c9ffc6f00a737a6db6377681a88e5292ebcf86b";
+          sha256 = "17kvkx63q30p5r2lsv6pqdm2zi8my3yn3js7j3c2qlygd9sf80pz";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9679cb8d4b3b9dce1e0bff16647ea3f3e02c4189/recipes/emms-player-mpv";
           sha256 = "175rmqx3bgys4chw8ylyf9rk07sg0llwbs9ivrv2d3ayhcz1lg9y";
-          name = "emms-player-mpv";
+          name = "recipe";
         };
         packageRequires = [ emms ];
         meta = {
@@ -9900,8 +12456,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    emms-player-simple-mpv = callPackage ({ cl-lib ? null, emacs, emms, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    emms-player-simple-mpv = callPackage ({ cl-lib ? null
+                                          , emacs
+                                          , emms
+                                          , fetchFromGitHub
+                                          , fetchurl
+                                          , lib
+                                          , melpaBuild }:
+      melpaBuild {
         pname = "emms-player-simple-mpv";
         version = "0.4.0";
         src = fetchFromGitHub {
@@ -9910,10 +12472,10 @@
           rev = "bcc056364df5f405716006a8b7bb90102a57f62f";
           sha256 = "0kz31qsn3nrpi8r31nlxlkkkah0qcdkq9a9i9ypv4ky7pvnzx6m5";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/emms-player-simple-mpv";
           sha256 = "1lv1rhd5vya068mnnaysfh56raar79hf2g413ysrk3yhyajk6316";
-          name = "emms-player-simple-mpv";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs emms ];
         meta = {
@@ -9921,8 +12483,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    emms-state = callPackage ({ emms, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    emms-state = callPackage ({ emms
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "emms-state";
         version = "0.2";
         src = fetchFromGitHub {
@@ -9931,10 +12497,10 @@
           rev = "77930300222333b71eafd495cc1fee3a3585eb23";
           sha256 = "1kipxa9ax8zi9qqk19mknpg7nnlzgr734kh9bnklydipwnsy00pi";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8f2798e22c6ccbadf73e65d8a8d901e47f55cb83/recipes/emms-state";
           sha256 = "080y02hxxqfn0a0dhq5vm0r020v2q3h1612a2zkq5fxi8ssvhp9i";
-          name = "emms-state";
+          name = "recipe";
         };
         packageRequires = [ emms ];
         meta = {
@@ -9942,8 +12508,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    emoji-cheat-sheet-plus = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
-    melpaBuild {
+    emoji-cheat-sheet-plus = callPackage ({ emacs
+                                          , fetchFromGitHub
+                                          , fetchurl
+                                          , helm
+                                          , lib
+                                          , melpaBuild }:
+      melpaBuild {
         pname = "emoji-cheat-sheet-plus";
         version = "1.2.1";
         src = fetchFromGitHub {
@@ -9952,10 +12523,10 @@
           rev = "96a003127d646a2683d81ca906a17eace0a6413e";
           sha256 = "1rk7am0xvpnv98yi7a62wlyh576md4n2ddj7nm201bjd4wdl2yxk";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ffbfae9577673ef8d50b55624f94288e315deba4/recipes/emoji-cheat-sheet-plus";
           sha256 = "1ciwlbw0ihm0p5gnnl3safcj7dxwiy53bkj8cmw3i334al0gjnnv";
-          name = "emoji-cheat-sheet-plus";
+          name = "recipe";
         };
         packageRequires = [ emacs helm ];
         meta = {
@@ -9963,8 +12534,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    emoji-fontset = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    emoji-fontset = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "emoji-fontset";
         version = "0.1.1";
         src = fetchFromGitHub {
@@ -9973,10 +12547,10 @@
           rev = "e460c9a08e48ec4103e38a7a04acae20880149a9";
           sha256 = "0xdlqsrwdf0smi5z9rjj46nwrrfpl0gzanf0jmdg8zzn62l6ldck";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/60df435eb82fcc9a8a02a0a271bb6a2d5a161bc4/recipes/emoji-fontset";
           sha256 = "19affsvlm1rzrzdh1k6xsv79icdkzx4izxivrd2ia6y2wcg9wc5d";
-          name = "emoji-fontset";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -9984,8 +12558,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    emojify = callPackage ({ emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, seq }:
-    melpaBuild {
+    emojify = callPackage ({ emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , ht
+                           , lib
+                           , melpaBuild
+                           , seq }:
+      melpaBuild {
         pname = "emojify";
         version = "1.0";
         src = fetchFromGitHub {
@@ -9994,10 +12574,10 @@
           rev = "9fac58de9b8f7539bfd4c6983bc826e27d060b30";
           sha256 = "1z5j4nr9c6806f6ys4p3b2byxca7zc34ap1bysai8nvzxz02rzf6";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/488d2751b5fd3bf00f5a6f0545530f44563b86d7/recipes/emojify";
           sha256 = "1sgd32qm43hwby75a9q2pz1yfzj988i35d8p9f18zvbxypy7b2yp";
-          name = "emojify";
+          name = "recipe";
         };
         packageRequires = [ emacs ht seq ];
         meta = {
@@ -10005,25 +12585,41 @@
           license = lib.licenses.free;
         };
       }) {};
-    emr = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, list-utils, melpaBuild, paredit, popup, projectile, redshank, s }:
-    melpaBuild {
+    emr = callPackage ({ cl-lib ? null
+                       , clang-format
+                       , dash
+                       , emacs
+                       , fetchFromGitHub
+                       , fetchurl
+                       , iedit
+                       , lib
+                       , list-utils
+                       , melpaBuild
+                       , paredit
+                       , popup
+                       , projectile
+                       , redshank
+                       , s }:
+      melpaBuild {
         pname = "emr";
-        version = "0.3.6";
+        version = "0.3.7";
         src = fetchFromGitHub {
           owner = "chrisbarrett";
           repo = "emacs-refactor";
-          rev = "fd20fc1887e2ebcf752f0170b1f3bf697043fd4b";
-          sha256 = "0pl7i2a0mf2s33qpsc14dcvqbl6jm5xrvcnrhfr7visvnih29cy4";
+          rev = "ff330b50526fa6da34bd410b506cb89408ef8c1e";
+          sha256 = "1jbyg3b1y8rs2s7xq79gzllfnxcr1whg6zja2kl7zk23kkn65s7r";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2cd2ebec5bd6465bffed284130e1d534f52169a9/recipes/emr";
           sha256 = "05vpfxg6lviclnms2zyrza8dc87m60mimlwd11ihvsbngi9gcw8x";
-          name = "emr";
+          name = "recipe";
         };
         packageRequires = [
           cl-lib
+          clang-format
           dash
           emacs
+          iedit
           list-utils
           paredit
           popup
@@ -10036,8 +12632,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    engine-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    engine-mode = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "engine-mode";
         version = "2.0.0";
         src = fetchFromGitHub {
@@ -10046,10 +12645,10 @@
           rev = "243d04691475b47a4453ad7106d8268ca14d9f28";
           sha256 = "02xas46nl28mascqsyr1zcd4hn15bh0fjv2xlxv1kmrj0pis94ml";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ea1b5dfb6628cf17e77369f25341835aad425f54/recipes/engine-mode";
           sha256 = "1gg7i93163m7k7lr3pnal1svymnhzwrfpfcdc0798d7ybv26gg8c";
-          name = "engine-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -10057,20 +12656,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    enh-ruby-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    enh-ruby-mode = callPackage ({ emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "enh-ruby-mode";
         version = "20180330";
         src = fetchFromGitHub {
           owner = "zenspider";
           repo = "enhanced-ruby-mode";
-          rev = "c9c39ff07f8cf45814071a77b559477bd57bc3b1";
-          sha256 = "1w563cnxadmjbfnwbazqazrpmw2k5xyk4yaxgfk2glxahk4dr0fn";
+          rev = "b9d7d986c761e7f43993da0c3012e4fe77b19281";
+          sha256 = "190x5l5jhyxhfy57hvxk06yzxji2r3f99vw6a8ngyshvyxap7wq3";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cd1ac1ce69b77b11f34c4175611a852e7ec0806c/recipes/enh-ruby-mode";
           sha256 = "0r486yajjf7vsaz92ypxpfmz2nsvw9giffpxb9szj7fcry3nfdns";
-          name = "enh-ruby-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -10078,8 +12681,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    enlive = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    enlive = callPackage ({ fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "enlive";
         version = "0.0.1";
         src = fetchFromGitHub {
@@ -10088,10 +12694,10 @@
           rev = "60facaf8bc48b660d209551c0ce4d17e5c907ab8";
           sha256 = "08j6b79vy8ry4ad1abk3hvxjbb4ylrhkvrbrnq1gcikl4h1p2v63";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/388fa2580e687d9608b11cdc069841831b414b29/recipes/enlive";
           sha256 = "1dyayk37zik12qfh8zbjmhsch64yqsx3acrlm7hcnavx465hmhnz";
-          name = "enlive";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -10099,20 +12705,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    enotify = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    enotify = callPackage ({ fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "enotify";
         version = "0.1.3";
         src = fetchFromGitHub {
           owner = "laynor";
           repo = "enotify";
-          rev = "75c84b53703e5d52cb18acc9251b87ffa400f388";
-          sha256 = "1in4wbwkxn8qfcsfjbczzk73z74w4ixlml61wk666dw0kpscgbs5";
+          rev = "6bbd67c5e469d5613d9a8d60b0e13612df265c35";
+          sha256 = "1yxw1x4xixxj16pm4a4vk062hr50aaqidh91aljrx0jhv0akybdw";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f10631b740eea56e7209d7e84f0da8613274ef1d/recipes/enotify";
           sha256 = "0mii6m6zw9y8njgzi79rcf1n251iw7qz3yqjjij3c19rk3zpm5qi";
-          name = "enotify";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -10120,8 +12729,18 @@
           license = lib.licenses.free;
         };
       }) {};
-    ensime = callPackage ({ company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s, sbt-mode, scala-mode, yasnippet }:
-    melpaBuild {
+    ensime = callPackage ({ company
+                          , dash
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild
+                          , popup
+                          , s
+                          , sbt-mode
+                          , scala-mode
+                          , yasnippet }:
+      melpaBuild {
         pname = "ensime";
         version = "2.0.2";
         src = fetchFromGitHub {
@@ -10130,10 +12749,10 @@
           rev = "3d3ab18436ad6089496b3bce1d49c64a86965431";
           sha256 = "0p821zwpiznjh736af5avnx9abssx0zbb9xhs74yhh1mcdi1whq7";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/502faab70af713f50dd8952be4f7a5131075e78e/recipes/ensime";
           sha256 = "1d8y72l7bh93x9zdj3d3qjhrrzr804rgi6kjifyrin772dffjwby";
-          name = "ensime";
+          name = "recipe";
         };
         packageRequires = [
           company
@@ -10149,20 +12768,27 @@
           license = lib.licenses.free;
         };
       }) {};
-    eopengrok = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, magit, melpaBuild, s }:
-    melpaBuild {
+    eopengrok = callPackage ({ cl-lib ? null
+                             , dash
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , magit
+                             , melpaBuild
+                             , s }:
+      melpaBuild {
         pname = "eopengrok";
         version = "0.5.0";
         src = fetchFromGitHub {
           owner = "youngker";
           repo = "eopengrok.el";
-          rev = "11c99f7e1e2c1c7d70cbda496cb5b6c7f6e4082a";
-          sha256 = "1c5kzq3h7gr0459z364dyq5m8vq0ydclw5wphqj9fyg28mxjj6ns";
+          rev = "7c61cb06972708665f8e2921e6b9e7234e75cc24";
+          sha256 = "1r70k8ckfwdhya0zb2w5whpqvl8jx6w7i04vws99rzdw08ashack";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2b87ea158a6fdbc6b4e40fd7c0f6814d135f8545/recipes/eopengrok";
           sha256 = "0756x78113286hwk1i1m5s8xq04gh7zxb4fkmw58lg2ssff8q6av";
-          name = "eopengrok";
+          name = "recipe";
         };
         packageRequires = [ cl-lib dash magit s ];
         meta = {
@@ -10170,8 +12796,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    epc = callPackage ({ concurrent, ctable, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    epc = callPackage ({ concurrent
+                       , ctable
+                       , fetchFromGitHub
+                       , fetchurl
+                       , lib
+                       , melpaBuild }:
+      melpaBuild {
         pname = "epc";
         version = "0.1.1";
         src = fetchFromGitHub {
@@ -10180,10 +12811,10 @@
           rev = "16e975efad63093a1f1f7b59f8fda5a3cf34f2a0";
           sha256 = "0smk23f23jdnvmrisj5d4isna36sr15bbvh53dq5261y8ddxlkvw";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8bc29a8d518ce7a584277089bd4654f52ac0f358/recipes/epc";
           sha256 = "1l9rcx07pa4b9z5654gyw6b64c95lcigzg15amphwr56v2g3rbzx";
-          name = "epc";
+          name = "recipe";
         };
         packageRequires = [ concurrent ctable ];
         meta = {
@@ -10191,20 +12822,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    epkg = callPackage ({ closql, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    epkg = callPackage ({ closql
+                        , dash
+                        , emacs
+                        , fetchFromGitHub
+                        , fetchurl
+                        , lib
+                        , melpaBuild }:
+      melpaBuild {
         pname = "epkg";
-        version = "3.0.0";
+        version = "3.1.0";
         src = fetchFromGitHub {
           owner = "emacscollective";
           repo = "epkg";
-          rev = "1768e91e02a2d6441c2d82a711912a9498d2316e";
-          sha256 = "02fknkqxqxzqdqa2vj7ql6swrl83v1xs5iym5r6yr6mpj69di8bd";
+          rev = "b3dac5d4596d304f17a283c5cfe9dc77989fa96a";
+          sha256 = "17qdywa8qw6n8a3r4s1cbjbmh2a4vjnxp6fqhiglbbfc1xqw2p1n";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2df16abf56e53d4a1cc267a78797419520ff8a1c/recipes/epkg";
           sha256 = "0vvkjjaffvwvsvld3c6hwd18icmp2lc7f9yqvclifpadi98dhpww";
-          name = "epkg";
+          name = "recipe";
         };
         packageRequires = [ closql dash emacs ];
         meta = {
@@ -10212,8 +12849,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    epl = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    epl = callPackage ({ cl-lib ? null
+                       , fetchFromGitHub
+                       , fetchurl
+                       , lib
+                       , melpaBuild }:
+      melpaBuild {
         pname = "epl";
         version = "0.9";
         src = fetchFromGitHub {
@@ -10222,10 +12863,10 @@
           rev = "fd906d3f92d58ecf24169055744409886ceb06ce";
           sha256 = "0d3z5z90ln8ipk1yds1n1p8fj9yyh2kpspqjs7agl38indra3nb4";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9c6cf24e86d8865bd2e4b405466118de1894851f/recipes/epl";
           sha256 = "0zr3r2hn9jaxscrl83hyixznb8l5dzfr6fsac76aa8x12xgsc5hn";
-          name = "epl";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -10233,20 +12874,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    epm = callPackage ({ emacs, epl, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    epm = callPackage ({ emacs
+                       , epl
+                       , fetchFromGitHub
+                       , fetchurl
+                       , lib
+                       , melpaBuild }:
+      melpaBuild {
         pname = "epm";
-        version = "0.1beta2";
+        version = "0.1.-2.2";
         src = fetchFromGitHub {
           owner = "xuchunyang";
           repo = "epm";
           rev = "ee004d00c8c8fbe32c4e5baf6279c5e68dc5f201";
           sha256 = "0llkgjqr9hl66nya1ppvrlcvmy3rh4pwc25ywq4zi0fbl25qsf5d";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e12e8ae2e8e8aff7cbd75a951dd328cb9ccf58b0/recipes/epm";
           sha256 = "0k94qhzxjzw5d0c53jnyx1xfciwr9qib845awyjaybzzs34s8r08";
-          name = "epm";
+          name = "recipe";
         };
         packageRequires = [ emacs epl ];
         meta = {
@@ -10254,8 +12900,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    erc-crypt = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    erc-crypt = callPackage ({ cl-lib ? null
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "erc-crypt";
         version = "1.6";
         src = fetchFromGitHub {
@@ -10264,10 +12914,10 @@
           rev = "731f9264a5bf08a8fc0b5ce69e72058c86f873a5";
           sha256 = "13jpq5ws5dm8fyjrskk4icxwz8k5wgh396cc8f8wxrjna4wb843w";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a1a71b46c0370d2ed25aa3f39983048a04576ad5/recipes/erc-crypt";
           sha256 = "1mzzqcxjnll4d9r9n5z80zfb3ywkd8jx6b49g02vwf1iak9h7hv3";
-          name = "erc-crypt";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -10275,8 +12925,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    erc-hipchatify = callPackage ({ alert, emacs, fetchhg, fetchurl, lib, melpaBuild, request, s }:
-    melpaBuild {
+    erc-hipchatify = callPackage ({ alert
+                                  , emacs
+                                  , fetchhg
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild
+                                  , request
+                                  , s }:
+      melpaBuild {
         pname = "erc-hipchatify";
         version = "0.1";
         src = fetchhg {
@@ -10295,8 +12952,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    erc-hl-nicks = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    erc-hl-nicks = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "erc-hl-nicks";
         version = "1.3.3";
         src = fetchFromGitHub {
@@ -10305,10 +12965,10 @@
           rev = "756c4438a8245ccd3e389bf6c9850ee8453783ec";
           sha256 = "0c82rxpl5v7bbxirf1ksg06xv5xcddh8nkrpj7i6nvfarwdfnk4f";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/erc-hl-nicks";
           sha256 = "03hxsknf31vrja2amfa317ig4c34i5jpdq35zczrp00ap0s31nbq";
-          name = "erc-hl-nicks";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -10316,20 +12976,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    erc-scrolltoplace = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, switch-buffer-functions }:
-    melpaBuild {
+    erc-scrolltoplace = callPackage ({ emacs
+                                     , fetchFromGitLab
+                                     , fetchurl
+                                     , lib
+                                     , melpaBuild
+                                     , switch-buffer-functions }:
+      melpaBuild {
         pname = "erc-scrolltoplace";
         version = "0.1.0";
-        src = fetchFromGitHub {
+        src = fetchFromGitLab {
           owner = "jgkamat";
           repo = "erc-scrolltoplace";
           rev = "7539654e4a72edcc5bba07a101961e5bf0a9d449";
           sha256 = "11zpqwh1mlfifbgnvhc63bvnhg340jgxssm3m43hr1sxsyb52lh6";
         };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/e8ba300957fc00f5e53cf63dfa1e37a27b0d6d60/recipes/erc-scrolltoplace";
-          sha256 = "1cr5nxdk854zcb1w0xvmi4mg45lxv011gap4i96nvdpd4qxmcxph";
-          name = "erc-scrolltoplace";
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/848cb17d871287c401496e4483e400b44696e89d/recipes/erc-scrolltoplace";
+          sha256 = "0632i1p26z3f633iinkqka0x2dd55x02xidk9qr66jh0dzfs6q3i";
+          name = "recipe";
         };
         packageRequires = [ emacs switch-buffer-functions ];
         meta = {
@@ -10337,8 +13002,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    erc-twitch = callPackage ({ erc ? null, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }:
-    melpaBuild {
+    erc-twitch = callPackage ({ erc ? null
+                              , fetchFromGitHub
+                              , fetchurl
+                              , json ? null
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "erc-twitch";
         version = "1.1";
         src = fetchFromGitHub {
@@ -10347,10 +13017,10 @@
           rev = "6938191c787d66fef4c13674e0a98a9d64eff364";
           sha256 = "1xsxykmhz34gmyj4jb26qfai7j95kzlc7vfydrajc6is7xlrwhfk";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/46f8640b24bade45cc729eeb370adf959f99526f/recipes/erc-twitch";
           sha256 = "08vlwcxrzc2ndm52112z1r0qnz6jlmjhiwq2j3j59fbw82ys61ia";
-          name = "erc-twitch";
+          name = "recipe";
         };
         packageRequires = [ erc json ];
         meta = {
@@ -10358,8 +13028,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    erc-youtube = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    erc-youtube = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "erc-youtube";
         version = "0.1";
         src = fetchFromGitHub {
@@ -10368,10 +13041,10 @@
           rev = "97054ba8475b442e2aa81e5a291f668b7f28697f";
           sha256 = "0kh4amx3l3a14qaiyvjyak1jbybs6n49mdvzjrd1i2vd1y74zj5w";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a80ee9617a30a8ad1d457a0b0c7f35e6ec1c0bb2/recipes/erc-youtube";
           sha256 = "12ylxkskkgfv5x7vlkib963ichb3rlmdzkf4zh8a39cgl8wsmacx";
-          name = "erc-youtube";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -10379,8 +13052,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    ercn = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ercn = callPackage ({ fetchFromGitHub
+                        , fetchurl
+                        , lib
+                        , melpaBuild }:
+      melpaBuild {
         pname = "ercn";
         version = "1.1.1";
         src = fetchFromGitHub {
@@ -10389,10 +13065,10 @@
           rev = "73b00dadf83b97dd9edd8381a4b27f583c08b7f6";
           sha256 = "19jninbf0dhdw3kn4d38bxmklg0v7sh3m9dwj6z69w99r5pcw480";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a12f264653d79224adeb5d0ae76518dc408ff1e9/recipes/ercn";
           sha256 = "0yvis02bypw6v1zv7i326y8s6j0id558n0bdri52hr5pw85imnlp";
-          name = "ercn";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -10400,8 +13076,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    erefactor = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    erefactor = callPackage ({ cl-lib ? null
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "erefactor";
         version = "0.7.0";
         src = fetchFromGitHub {
@@ -10410,10 +13090,10 @@
           rev = "fde3fd42c815c76e8015f69518a92f6bfcfde990";
           sha256 = "17i567nfm0rykimh6bpcc5f2l7wsf8zcdy2jzd7sgrl54dvb0g9i";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/18063e16a6f556b1871e1a5b74e353a85a794e63/recipes/erefactor";
           sha256 = "0ma9sbrq4n8y5w7vvbhhgmw25aiykbq5yhxzm0knj32bgpviprw7";
-          name = "erefactor";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -10421,8 +13101,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    ergoemacs-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, undo-tree }:
-    melpaBuild {
+    ergoemacs-mode = callPackage ({ cl-lib ? null
+                                  , emacs
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild
+                                  , undo-tree }:
+      melpaBuild {
         pname = "ergoemacs-mode";
         version = "5.16.10.12";
         src = fetchFromGitHub {
@@ -10431,10 +13117,10 @@
           rev = "ac70b2563fb6e3d69ea382fddc87b5721c20c292";
           sha256 = "0ydxyylijdd6da4n9by441352shphrpfyk2631ld5aq3gz27z9gi";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/02920517987c7fc698de9952cbb09dfd41517c40/recipes/ergoemacs-mode";
           sha256 = "0h99m0n3q41lw5fm33pc1405lrxyc8rzghnc6c7j4a6gr1d82s62";
-          name = "ergoemacs-mode";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs undo-tree ];
         meta = {
@@ -10442,20 +13128,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    erlang = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    erlang = callPackage ({ emacs
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "erlang";
-        version = "20.3.2";
+        version = "21.0.3";
         src = fetchFromGitHub {
           owner = "erlang";
           repo = "otp";
-          rev = "c5ee502e6031986983d3596745cad7fd547fd9c2";
-          sha256 = "0cd7rz32cxghxb2q7g3p52sxbhwqn4pkjlf28hy1dms6q7f85zv1";
+          rev = "9d5af99762b3795c763fb62c1516247bd3f8e12f";
+          sha256 = "0anlp0qj2blgdjzdw8rxmpz659yzbdl3r69b6slm1c1aa77ayc17";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang";
           sha256 = "1cs768xxbyrr78ln50k4yknmpbcc1iplws3k07r0gx5f3ca73iaq";
-          name = "erlang";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -10463,8 +13153,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    ert-async = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ert-async = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "ert-async";
         version = "0.1.2";
         src = fetchFromGitHub {
@@ -10473,10 +13166,10 @@
           rev = "f64a7ed5b0d2900c9a3d8cc33294bf8a79bc8526";
           sha256 = "0hn9i405nfhjd1h9vnwj43nxbbz00khrwkjq0acfyxjaz1shfac9";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2ec669e3fc73b0b499b84cec87d0f8621274732e/recipes/ert-async";
           sha256 = "004798ckri5j72j0xvzkyciss1iz4lw9gya2749hkjxlamg14cn5";
-          name = "ert-async";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -10484,19 +13177,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    ert-junit = callPackage ({ ert ? null, fetchgit, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ert-junit = callPackage ({ ert ? null
+                             , fetchgit
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "ert-junit";
-        version = "0.1.1";
+        version = "0.3";
         src = fetchgit {
           url = "https://bitbucket.org/olanilsson/ert-junit";
-          rev = "341c755e7b60f8d2081303951377968b1d1a6c23";
-          sha256 = "0y06i97bbim6lmvk8l3adifwzhkjyrgyxv02ksshk4npr0b627gx";
+          rev = "cd1f63627d4e6635086322f34be09ba535e26b97";
+          sha256 = "0a2ddvpm8yparl3zq05mp239k5dgplcmc9s61ak9d5qn65l8mwyr";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/27c627eacab54896a1363dbabc56250a65343dd8/recipes/ert-junit";
           sha256 = "0bv22mhh1ahbjwi6s1csxkh11dmy0srabkddjd33l4havykxlg6g";
-          name = "ert-junit";
+          name = "recipe";
         };
         packageRequires = [ ert ];
         meta = {
@@ -10504,8 +13201,17 @@
           license = lib.licenses.free;
         };
       }) {};
-    ert-runner = callPackage ({ ansi, commander, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s, shut-up }:
-    melpaBuild {
+    ert-runner = callPackage ({ ansi
+                              , commander
+                              , dash
+                              , f
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild
+                              , s
+                              , shut-up }:
+      melpaBuild {
         pname = "ert-runner";
         version = "0.7.0";
         src = fetchFromGitHub {
@@ -10514,10 +13220,10 @@
           rev = "00056c37817f15b1870ccedd13cedf102e3194dd";
           sha256 = "0rdgdslspzb4s0n4a68hnwfm8vm8baasa8nzrdinf0nryn7rrhbf";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0a1acc68f296e80b6ed99a1783e9f67be54ffac9/recipes/ert-runner";
           sha256 = "0fnb8rmjr5lvc3dq0fnyxhws8ync1lj5xp8ycs63z4ax6gmdqr48";
-          name = "ert-runner";
+          name = "recipe";
         };
         packageRequires = [ ansi commander dash f s shut-up ];
         meta = {
@@ -10525,8 +13231,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    es-lib = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    es-lib = callPackage ({ cl-lib ? null
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "es-lib";
         version = "0.4";
         src = fetchFromGitHub {
@@ -10535,10 +13245,10 @@
           rev = "753b27363e39c10edc9e4e452bdbbbe4d190df4a";
           sha256 = "0jq4yp80wiphlpsc0429rg8n50g8l4lf78q0l3nywz2p93smjy9b";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f10631b740eea56e7209d7e84f0da8613274ef1d/recipes/es-lib";
           sha256 = "0mwvgf5385qsp91zsdw75ipif1h90xy277xdmrpwixsxd7abbn0n";
-          name = "es-lib";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -10546,8 +13256,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    es-mode = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, spark }:
-    melpaBuild {
+    es-mode = callPackage ({ cl-lib ? null
+                           , dash
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild
+                           , spark }:
+      melpaBuild {
         pname = "es-mode";
         version = "4.3.0";
         src = fetchFromGitHub {
@@ -10556,10 +13272,10 @@
           rev = "996730ebce57d810d2c275c7fadb11c2b1134dea";
           sha256 = "1qhfnd5anp5qrmravv7ks5ix763xnki2f5jwcyj70qyxwr0l60cg";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9912193f73c4beae03b295822bf41cb2298756e2/recipes/es-mode";
           sha256 = "0zp84k5idqkrvc9qci49ains0b86kpk97lk1jcwyj75s4xsfyp1y";
-          name = "es-mode";
+          name = "recipe";
         };
         packageRequires = [ cl-lib dash spark ];
         meta = {
@@ -10567,8 +13283,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    es-windows = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    es-windows = callPackage ({ cl-lib ? null
+                              , emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "es-windows";
         version = "0.3";
         src = fetchFromGitHub {
@@ -10577,10 +13298,10 @@
           rev = "7ebe6c6e0831373847d7adbedeaa2e506b54b2af";
           sha256 = "0cjchwrhk7bw87bg10zgcwkga50rvs0jn5v2jf6bbsxbcqx2nfc9";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/944d4cd54e040d2a58e1778cb282727deee83f92/recipes/es-windows";
           sha256 = "112ngkan0hv3y7m71479f46x5gwdmf0vhbqrzs5kcjwlacqlrahx";
-          name = "es-windows";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -10588,8 +13309,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    esa = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    esa = callPackage ({ cl-lib ? null
+                       , fetchFromGitHub
+                       , fetchurl
+                       , lib
+                       , melpaBuild }:
+      melpaBuild {
         pname = "esa";
         version = "0.8.13";
         src = fetchFromGitHub {
@@ -10598,10 +13323,10 @@
           rev = "0f69f9f45ac15018c48853509ac38e68286f9c0e";
           sha256 = "0cairmqsaghl2ddb2v8zhcwy5ik756m7gkair8xrbigz4jklpcv9";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/esa";
           sha256 = "0y4mbq0z6vp0faxq6dq5hhxnsbi685amxqbvpxkxahl1nckp76lb";
-          name = "esa";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -10609,20 +13334,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    esh-autosuggest = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    esh-autosuggest = callPackage ({ company
+                                   , emacs
+                                   , fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "esh-autosuggest";
         version = "2.0.0";
         src = fetchFromGitHub {
           owner = "dieggsy";
           repo = "esh-autosuggest";
-          rev = "a8a9381e76ea2e0d934bc70caa47f23209bcc155";
-          sha256 = "116pdjgpjy9b0psm5kzwkwy7dq8vn0p6dy75dl1zsy2xrjf1iqdw";
+          rev = "95078aa17a104bc724283df48af36abfe4125853";
+          sha256 = "0fwxk26wlk2wkqs82zs5m3rd6670mjf6bar928cqam1f63fvx09q";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/dc3776068d6928fc1661a27cccaeb8fb85577099/recipes/esh-autosuggest";
           sha256 = "1rcng1dhy4yw95qg909ck33svpdxhv9v5k7226d29gp4y54dwyrx";
-          name = "esh-autosuggest";
+          name = "recipe";
         };
         packageRequires = [ company emacs ];
         meta = {
@@ -10630,8 +13360,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    esh-help = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    esh-help = callPackage ({ dash
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "esh-help";
         version = "1.0.1";
         src = fetchFromGitHub {
@@ -10640,10 +13374,10 @@
           rev = "8a8a9d4d9852f8bd96da3b94e95ff57097ac8ec6";
           sha256 = "02fybhmqm2qmy5qdig7xvwxazqi499pw32kh5mrsbdr14srg9fhs";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ab94c66d1ed7cfdbc437ee239984ba70408fd28a/recipes/esh-help";
           sha256 = "1k925wmn8jy9rxxsxxawasxq6r4yzwl116digdx314gd3i04sh3w";
-          name = "esh-help";
+          name = "recipe";
         };
         packageRequires = [ dash ];
         meta = {
@@ -10651,8 +13385,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    eshell-autojump = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    eshell-autojump = callPackage ({ fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "eshell-autojump";
         version = "0.2";
         src = fetchFromGitHub {
@@ -10661,10 +13398,10 @@
           rev = "c0866d7f2789831665ebb01b812bae89d085bff0";
           sha256 = "0nkmwwx224r50y2xnrz3v26l3ngqshvy5hs861gy4zagwllqfmvc";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/68bd1a8ec9d17eff2d23e15b3686f7c0b8723126/recipes/eshell-autojump";
           sha256 = "09l2680hknmdbwr4cncv1v4b0adik0c3sm5i9m3qbwyyxm8m41i5";
-          name = "eshell-autojump";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -10672,8 +13409,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    eshell-bookmark = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    eshell-bookmark = callPackage ({ emacs
+                                   , fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "eshell-bookmark";
         version = "2.0.0";
         src = fetchFromGitHub {
@@ -10682,10 +13423,10 @@
           rev = "deda4b848b2fb979dbe73ead2cb866610e3596ed";
           sha256 = "14dmsnixf9vqdhsixw693sml0fn80zcf0b37z049fb40cmppqxdw";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e7bf4702a907727990fcc676980f2b219e22ab0c/recipes/eshell-bookmark";
           sha256 = "1bybxlq1h5chrjxqjb23kq8dmgw2xrjwkrnvpbphblqzpdy5ck0s";
-          name = "eshell-bookmark";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -10693,8 +13434,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    eshell-did-you-mean = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    eshell-did-you-mean = callPackage ({ cl-lib ? null
+                                       , emacs
+                                       , fetchFromGitHub
+                                       , fetchurl
+                                       , lib
+                                       , melpaBuild }:
+      melpaBuild {
         pname = "eshell-did-you-mean";
         version = "0.1";
         src = fetchFromGitHub {
@@ -10703,10 +13449,10 @@
           rev = "7cb6ef8e2274d0a50a9e114d412307a6543533d5";
           sha256 = "0v0wshck5n4hspcv1zk1g2nm6xiigcjp16lx0dc8wzkl6ymljvbg";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a7649eca21a21ddbbc7131f29cbbd91a00a84060/recipes/eshell-did-you-mean";
           sha256 = "1z1wpn3sj1gi5nn0a71wg0i3av0dijnk79dc32zh3qlh500kz8mz";
-          name = "eshell-did-you-mean";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -10714,8 +13460,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    eshell-git-prompt = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    eshell-git-prompt = callPackage ({ cl-lib ? null
+                                     , dash
+                                     , emacs
+                                     , fetchFromGitHub
+                                     , fetchurl
+                                     , lib
+                                     , melpaBuild }:
+      melpaBuild {
         pname = "eshell-git-prompt";
         version = "0.1.2";
         src = fetchFromGitHub {
@@ -10724,10 +13476,10 @@
           rev = "b6bb2d7bd4e393b4170b29891cfefb72ae020aab";
           sha256 = "02i00an9wa8ns66xq900la68m7pd4hwv95g83cvf22bypivx7p2y";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5272280b19579c302ba41b53c77e42bc5e8ccbda/recipes/eshell-git-prompt";
           sha256 = "0a8pyppqvnavvb8rwsjxagb76hra9zhs5gwa0ylyznmql83f8w8s";
-          name = "eshell-git-prompt";
+          name = "recipe";
         };
         packageRequires = [ cl-lib dash emacs ];
         meta = {
@@ -10735,8 +13487,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    eshell-prompt-extras = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    eshell-prompt-extras = callPackage ({ fetchFromGitHub
+                                        , fetchurl
+                                        , lib
+                                        , melpaBuild }:
+      melpaBuild {
         pname = "eshell-prompt-extras";
         version = "0.96";
         src = fetchFromGitHub {
@@ -10745,10 +13500,10 @@
           rev = "7581c109673c40aceff278cd524273f50ffe170d";
           sha256 = "1m1jisjz974cfz89i6l2zq666yzhsqipc6dmqlrm8mw81fxsfm1h";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/eshell-prompt-extras";
           sha256 = "0kh4lvjkayjdz5lqvdqmdcblxizxk9kwmigjwa68kx8z6ngmfwa5";
-          name = "eshell-prompt-extras";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -10756,8 +13511,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    eshell-up = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    eshell-up = callPackage ({ emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "eshell-up";
         version = "0.0.3";
         src = fetchFromGitHub {
@@ -10766,10 +13525,10 @@
           rev = "653121392acd607d5dfbca0832927e06806a2d39";
           sha256 = "05mfwp8zira7p2ip1rmqa08arlbkv7w1mbx7s5saj655scg7jaq3";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/eshell-up";
           sha256 = "1jyaaw950isissjjgqflfn2bllgdfcyphpbi7il06mv9p0dzpwvy";
-          name = "eshell-up";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -10777,8 +13536,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    eshell-z = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    eshell-z = callPackage ({ cl-lib ? null
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "eshell-z";
         version = "0.3.2";
         src = fetchFromGitHub {
@@ -10787,10 +13550,10 @@
           rev = "96ec3f5f8a801c893d2c6a6b140e333ef2bfd8b5";
           sha256 = "1aac4m814jgxwpz7lbyx5r4z5dmawp4sk7pwbx0zqpnbcsaq5wwc";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8079cecaa59ad2ef22812960838123effc46a9b3/recipes/eshell-z";
           sha256 = "14ixazj0nscyqsdv7brqnfr0q8llir1pwb91yhl9jdqypmadpm6d";
-          name = "eshell-z";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -10798,8 +13561,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    eslint-fix = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    eslint-fix = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "eslint-fix";
         version = "1.0.0";
         src = fetchFromGitHub {
@@ -10808,10 +13574,10 @@
           rev = "be90d1e78b1dfd43b6b3b1c06868539e2ac27d3a";
           sha256 = "1l7pm0ywjby0giilyn6qsz1zh54sgmvmii7y9jhrva13c5kgg9an";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/eslint-fix";
           sha256 = "0ry271jlv95nhdqx6qxmvkpa10lpwkg1q6asnliviwplq2mxw2da";
-          name = "eslint-fix";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -10819,8 +13585,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    eslintd-fix = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    eslintd-fix = callPackage ({ dash
+                               , emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "eslintd-fix";
         version = "1.1.0";
         src = fetchFromGitHub {
@@ -10829,10 +13600,10 @@
           rev = "97e8aa9b106e3e4b3a44c775ca972bdd2feda9ec";
           sha256 = "1g6bv58m1052x2f5ffs17ryyqv0ay8vii5bwqs7dyfhlpppsn6c8";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c72d2b3ee9b8066d51d09e165e58e9846ca879cc/recipes/eslintd-fix";
           sha256 = "0lv4xpp9bm1yyn9mj7hpgw1v46yyxr0nlwggbav78jbg4v7ai04v";
-          name = "eslintd-fix";
+          name = "recipe";
         };
         packageRequires = [ dash emacs ];
         meta = {
@@ -10840,8 +13611,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    espuds = callPackage ({ dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    espuds = callPackage ({ dash
+                          , f
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild
+                          , s }:
+      melpaBuild {
         pname = "espuds";
         version = "0.3.3";
         src = fetchFromGitHub {
@@ -10850,10 +13627,10 @@
           rev = "1405972873339e056517217136de4ad3202d744a";
           sha256 = "16r4j27j9yfdiy841w9q5ykkc6n3wrm7hvfacagb32mydk821ijg";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/14cf66e6929db2a0f377612e786aaed9eb12b799/recipes/espuds";
           sha256 = "16yzw9l64ahf5v92jzb7vyb4zqxxplq6qh0y9rkfmvm59s4nhk6c";
-          name = "espuds";
+          name = "recipe";
         };
         packageRequires = [ dash f s ];
         meta = {
@@ -10861,20 +13638,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    ess = callPackage ({ fetchFromGitHub, fetchurl, julia-mode, lib, melpaBuild }:
-    melpaBuild {
+    ess = callPackage ({ fetchFromGitHub
+                       , fetchurl
+                       , julia-mode
+                       , lib
+                       , melpaBuild }:
+      melpaBuild {
         pname = "ess";
         version = "17.11";
         src = fetchFromGitHub {
           owner = "emacs-ess";
           repo = "ESS";
-          rev = "a218dec600c25687a81419e42b555141911504c6";
-          sha256 = "0wl90xiifn83clm25ya953pa91734h0sav1426y5czrmswzw7mj1";
+          rev = "f59a95e72ba2803229cc9aeb7559186c528dbcea";
+          sha256 = "0lwajgf39r75g239plbhlbppgj7vyc5via72qq906jqy89b5iic7";
         };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/12997b9e2407d782b3d2fcd2843f7c8b22442c0a/recipes/ess";
-          sha256 = "02kz4fjxr0vrj5mg13cq758nzykizq4dmsijraxv46snvh337v5i";
-          name = "ess";
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/156a6fa9e6ee16174d215c1dcd524aff847b3bf0/recipes/ess";
+          sha256 = "1psqrw9k7d2ha8zid2mkc6bgcyalrm3n53c00g3cgckkbahl7r6n";
+          name = "recipe";
         };
         packageRequires = [ julia-mode ];
         meta = {
@@ -10882,8 +13663,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    ess-R-data-view = callPackage ({ ctable, ess, fetchFromGitHub, fetchurl, lib, melpaBuild, popup }:
-    melpaBuild {
+    ess-R-data-view = callPackage ({ ctable
+                                   , ess
+                                   , fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild
+                                   , popup }:
+      melpaBuild {
         pname = "ess-R-data-view";
         version = "1.0";
         src = fetchFromGitHub {
@@ -10892,10 +13679,10 @@
           rev = "d6e98d3ae1e2a2ea39a56eebcdb73e99d29562e9";
           sha256 = "1ya2ay52gkrd31pmw45ban8kkxgnzhhwkzkypwdhjfccq3ys835x";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/492c90bd0ee97c0b895efa0c5e647b2becc6db11/recipes/ess-R-data-view";
           sha256 = "0r2fzwayf3yb7fqk6f31x4xfqiiczwik8qw4rrvkqx2h3s1kz7i0";
-          name = "ess-R-data-view";
+          name = "recipe";
         };
         packageRequires = [ ctable ess popup ];
         meta = {
@@ -10903,8 +13690,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    ess-smart-underscore = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ess-smart-underscore = callPackage ({ fetchFromGitHub
+                                        , fetchurl
+                                        , lib
+                                        , melpaBuild }:
+      melpaBuild {
         pname = "ess-smart-underscore";
         version = "0.79";
         src = fetchFromGitHub {
@@ -10913,10 +13703,10 @@
           rev = "ef18a160aeb3b1a7ae5fe93759f8e92147da8746";
           sha256 = "1avb6dng4xgw3bp7bw0j60wl6s4y26alfys9vwwj29rlzvjrlh74";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b4d6166f5c80cf37c79256402fa633ad2274d065/recipes/ess-smart-underscore";
           sha256 = "01pki1xa8zpgvldcbjwg6vmslj7ddf44hsx976xipc95vrdk15r2";
-          name = "ess-smart-underscore";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -10924,8 +13714,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    esup = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    esup = callPackage ({ cl-lib ? null
+                        , emacs
+                        , fetchFromGitHub
+                        , fetchurl
+                        , lib
+                        , melpaBuild }:
+      melpaBuild {
         pname = "esup";
         version = "0.6";
         src = fetchFromGitHub {
@@ -10934,10 +13729,10 @@
           rev = "53355b13dc9f1636ba681ffff830162ebbd3b223";
           sha256 = "1a4b8390azimlrr5ayxvaks1w7009vfbm56q11ybx00xxrd26v43";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b9d2948a42da5d4864404d2d11a924a4f235fc3b/recipes/esup";
           sha256 = "0cv3zc2zzm38ki3kxq58g9sp4gsk3dffa398wky6z83a3zc02zs0";
-          name = "esup";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -10945,8 +13740,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    esxml = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    esxml = callPackage ({ fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "esxml";
         version = "0.3.4";
         src = fetchFromGitHub {
@@ -10955,10 +13753,10 @@
           rev = "5548ceba17deae0c3c6d0092672edc4de3c75ce3";
           sha256 = "00vv8a75wdklygdyr4km9mc2ismxak69c45jmcny41xl44rp9x8m";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/db6556fe1b2403d1bcdade263986fd0faf0d9087/recipes/esxml";
           sha256 = "1375gryii984l33gc8f8yhl3vncjmw1w9k6xpvjgmnpx2fwr1vbq";
-          name = "esxml";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -10966,8 +13764,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    eterm-256color = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, xterm-color }:
-    melpaBuild {
+    eterm-256color = callPackage ({ emacs
+                                  , f
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild
+                                  , xterm-color }:
+      melpaBuild {
         pname = "eterm-256color";
         version = "0.3.13";
         src = fetchFromGitHub {
@@ -10976,10 +13780,10 @@
           rev = "dab96af559deb443c4c9c00e23389926e1607192";
           sha256 = "0ysxblc90kjcz84siprnyxwh94scflivqbxylzkvjm7hbx93rsh1";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e556383f7e18c0215111aa720d4653465e91eff6/recipes/eterm-256color";
           sha256 = "1mxc2hqjcj67jq5k4621a7f089qahcqw7f0dzqpaxn7if11w333b";
-          name = "eterm-256color";
+          name = "recipe";
         };
         packageRequires = [ emacs f xterm-color ];
         meta = {
@@ -10987,20 +13791,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    ethan-wspace = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ethan-wspace = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "ethan-wspace";
         version = "0.7.1";
         src = fetchFromGitHub {
           owner = "glasserc";
           repo = "ethan-wspace";
-          rev = "e055ee6730c0b03525d32e67511ef6c51e4c29e4";
-          sha256 = "0ik3y60xd3ap1pg5dr5ab6bq4qh8gblpgz1iiprmv7acr3ckzc41";
+          rev = "14ae43130e019034367cd2b6e2bf9a067955dd33";
+          sha256 = "19i8y8ys58mvzmz0ijcdv9nnrs3b85zbgl087d68734vhp73iy78";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9454f3a58e3416fa60d8411b0db19c408935408f/recipes/ethan-wspace";
           sha256 = "0k4kqkf5c6ysyhh1vpi9v4220yxm5ir3ippq2gmvvhnk77pg6hws";
-          name = "ethan-wspace";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -11008,8 +13815,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    eval-in-repl = callPackage ({ ace-window, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, paredit }:
-    melpaBuild {
+    eval-in-repl = callPackage ({ ace-window
+                                , dash
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild
+                                , paredit }:
+      melpaBuild {
         pname = "eval-in-repl";
         version = "0.9.6";
         src = fetchFromGitHub {
@@ -11018,10 +13831,10 @@
           rev = "7e2b42570b449b2a3c2922f3036a027d1e393a60";
           sha256 = "0x97flv356kd7j6wbhacz0lmsrdd9as87b0n6nliq5n0y30my8dy";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0bee5fb7a7874dd20babd1de7f216c5bda3e0115/recipes/eval-in-repl";
           sha256 = "10h5vy9wdiqf9dgk1d1bsvp93y8sfcxghzg8zbhhn7m5cqg2wh63";
-          name = "eval-in-repl";
+          name = "recipe";
         };
         packageRequires = [ ace-window dash paredit ];
         meta = {
@@ -11029,29 +13842,38 @@
           license = lib.licenses.free;
         };
       }) {};
-    eval-sexp-fu = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    eval-sexp-fu = callPackage ({ cl-lib ? null
+                                , fetchFromGitHub
+                                , fetchurl
+                                , highlight
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "eval-sexp-fu";
-        version = "0.4.0";
+        version = "0.4.2";
         src = fetchFromGitHub {
           owner = "hchbaw";
           repo = "eval-sexp-fu.el";
-          rev = "b28d9c4d57511072aa17b2464693e38b769482e0";
-          sha256 = "0lwpl9akdxml9f51pgsv0g7k7mr8dvqm94l01i7vq8jl6vd6v6i5";
+          rev = "1cfd0f3e167d63080692fad97ffe0091b024ad73";
+          sha256 = "0l20ja8s0881jlrlmba496iyizfa0j5bvc2x39rshn8qqyka2dq2";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4b1a896521cac1f54f7571ad5837ff215d01044d/recipes/eval-sexp-fu";
           sha256 = "17cazf81z4cszflnfp66zyq2cclw5sp9539pxskdf267cf7r0ycs";
-          name = "eval-sexp-fu";
+          name = "recipe";
         };
-        packageRequires = [];
+        packageRequires = [ cl-lib highlight ];
         meta = {
           homepage = "https://melpa.org/#/eval-sexp-fu";
           license = lib.licenses.free;
         };
       }) {};
-    evalator = callPackage ({ fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }:
-    melpaBuild {
+    evalator = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , helm-core
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "evalator";
         version = "1.0.0";
         src = fetchFromGitHub {
@@ -11060,10 +13882,10 @@
           rev = "edf3840f5aa025cf38d0c2677b2f88f59079409e";
           sha256 = "1a3y69s7lb24zdivxcpsjh9l6adxyjqxbpgradnj0q1n6kdyq679";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/544a503d72c0a501f9ca854cd11181a7783294a3/recipes/evalator";
           sha256 = "0k6alxwg89gc4v5m2bxmzmj7l6kywhbh4036xgz19q28xnlbr9xk";
-          name = "evalator";
+          name = "recipe";
         };
         packageRequires = [ helm-core ];
         meta = {
@@ -11071,8 +13893,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    evil = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, goto-chg, lib, melpaBuild, undo-tree }:
-    melpaBuild {
+    evil = callPackage ({ cl-lib ? null
+                        , emacs
+                        , fetchFromGitHub
+                        , fetchurl
+                        , goto-chg
+                        , lib
+                        , melpaBuild
+                        , undo-tree }:
+      melpaBuild {
         pname = "evil";
         version = "1.2.13";
         src = fetchFromGitHub {
@@ -11081,10 +13910,10 @@
           rev = "427cf5faa57e8794ac93f594dc3d1972e687a25a";
           sha256 = "02xc9zgrabnlwk3wlsxbzbhdzi3fm5fk8kimvgdcp8vsnpdcrhql";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/440482c0edac8ee8bd4fe22f6bc5c1607f34c7ad/recipes/evil";
           sha256 = "1d36r6mi5nvrwnk4a9338wmhr72fcbrwj0r8gmvivpjdngjy4k39";
-          name = "evil";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs goto-chg undo-tree ];
         meta = {
@@ -11092,20 +13921,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    evil-anzu = callPackage ({ anzu, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    evil-anzu = callPackage ({ anzu
+                             , evil
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "evil-anzu";
         version = "0.3";
         src = fetchFromGitHub {
           owner = "syohex";
           repo = "emacs-evil-anzu";
-          rev = "64cc08a3546373f28cd7bfd76a3e93bd78efa251";
-          sha256 = "0lw7fg4gqwj30r0l6k2ni36sxqkf65zf0d0z3rxnpwbxlf8dlkrr";
+          rev = "995141132bbf063fe568a6562bcf8bb8a827c784";
+          sha256 = "04a66f5yq3zmdw5ids6dm0kzzk1ivqagbw17a5656gg0ahzpsppv";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06b0609b56016d938b28d56d9eeb6305116b38af/recipes/evil-anzu";
           sha256 = "19cmc61l370mm4h2m6jw5pdcsvj4wcv9zpa8z7k1fjg57mwmmn70";
-          name = "evil-anzu";
+          name = "recipe";
         };
         packageRequires = [ anzu evil ];
         meta = {
@@ -11113,20 +13947,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    evil-args = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    evil-args = callPackage ({ evil
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "evil-args";
         version = "1.0";
         src = fetchFromGitHub {
           owner = "wcsmith";
           repo = "evil-args";
-          rev = "2a88b4d19953a11227cc1e91973b92149116f44c";
-          sha256 = "1nh7wa4ynr7ln42x32znzqsmh7ijzy5ymd7rszf49l8677alvazq";
+          rev = "b554f83a31dd47cac9799725f379675f54ed0a6a";
+          sha256 = "08743swy936v8fhbaplrr0wpwlp7vplvy2iwkh56p7gb5gqmlfli";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0976c82a22f1a8701b9da0b8ba4753ed48191376/recipes/evil-args";
           sha256 = "1bwdvf1i3jc77bw2as1wr1djm8z3a7wms60694xkyqh0m909hs2w";
-          name = "evil-args";
+          name = "recipe";
         };
         packageRequires = [ evil ];
         meta = {
@@ -11134,8 +13972,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    evil-colemak-basics = callPackage ({ emacs, evil, evil-snipe, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    evil-colemak-basics = callPackage ({ emacs
+                                       , evil
+                                       , evil-snipe
+                                       , fetchFromGitHub
+                                       , fetchurl
+                                       , lib
+                                       , melpaBuild }:
+      melpaBuild {
         pname = "evil-colemak-basics";
         version = "2.1.0";
         src = fetchFromGitHub {
@@ -11144,10 +13988,10 @@
           rev = "7844079b47f47bb1dc24c885b0ac2e67524fa960";
           sha256 = "0phspmd31pcxana2lp6mqywmghhdpj6ydsrl1bjn4b1gcp1fqsy2";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/945417d19faf492fb678aee3ba692d14e7518d85/recipes/evil-colemak-basics";
           sha256 = "1sbbli0hdmpc23f3g5n95svqfdg3rlvf71plyvpv1a6va9jhi83k";
-          name = "evil-colemak-basics";
+          name = "recipe";
         };
         packageRequires = [ emacs evil evil-snipe ];
         meta = {
@@ -11155,8 +13999,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    evil-commentary = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    evil-commentary = callPackage ({ evil
+                                   , fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "evil-commentary";
         version = "2.1.1";
         src = fetchFromGitHub {
@@ -11165,10 +14013,10 @@
           rev = "395f91014b69844b81660c155f42eb9b1b3d199d";
           sha256 = "0zjs9zyqfygnpxapvf0ymmiid40i06cxbhjzd81zw33nafgkf6r4";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fe5b05152c919d49ddd920b1bd5ffc351141fa0d/recipes/evil-commentary";
           sha256 = "151iiimmkpn58pl9zn40qssfahbrqy83axyl9dcd6kx2ywv5gcxz";
-          name = "evil-commentary";
+          name = "recipe";
         };
         packageRequires = [ evil ];
         meta = {
@@ -11176,20 +14024,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    evil-embrace = callPackage ({ emacs, embrace, evil-surround, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    evil-embrace = callPackage ({ emacs
+                                , embrace
+                                , evil-surround
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "evil-embrace";
         version = "0.1.1";
         src = fetchFromGitHub {
           owner = "cute-jumper";
           repo = "evil-embrace.el";
-          rev = "4379adea032b25e359d01a36301b4a5afdd0d1b7";
-          sha256 = "0rj1ippc6yi560xalhd91r7a00lk3d0jk13w464myznkpnasfw3a";
+          rev = "8b2083c514af143f6d2f5d1cb4272c5bfb7437a3";
+          sha256 = "1cplq9s3fw8nadcipjrix46jfcjbgg3xhz6d226wcqgmg90aclfn";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d4886f068766514deab5673b4366d6bdd311e3b6/recipes/evil-embrace";
           sha256 = "10cfkksh3llyfk26x36b7ri0x6a6hrcv275pxk7ckhs1pyhb14y7";
-          name = "evil-embrace";
+          name = "recipe";
         };
         packageRequires = [ emacs embrace evil-surround ];
         meta = {
@@ -11197,8 +14051,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    evil-escape = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    evil-escape = callPackage ({ cl-lib ? null
+                               , emacs
+                               , evil
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "evil-escape";
         version = "3.14";
         src = fetchFromGitHub {
@@ -11207,10 +14067,10 @@
           rev = "b4d44fc5015341e484495fc86b73d09b2ac062ec";
           sha256 = "0s8lmmm25qabicwaj9jybpbd8mkc62yl7jnhk1lpablydjkv3w2i";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/evil-escape";
           sha256 = "0jiwsgcqw8m6z4z82gx0m0r0vbvkcxc0czhn4mqjwkhhglwzgi8l";
-          name = "evil-escape";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs evil ];
         meta = {
@@ -11218,8 +14078,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    evil-iedit-state = callPackage ({ evil, fetchFromGitHub, fetchurl, iedit, lib, melpaBuild }:
-    melpaBuild {
+    evil-iedit-state = callPackage ({ evil
+                                    , fetchFromGitHub
+                                    , fetchurl
+                                    , iedit
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "evil-iedit-state";
         version = "1.1";
         src = fetchFromGitHub {
@@ -11228,10 +14093,10 @@
           rev = "eab7d5e3e7d25c4a852fedb6c0c7f50dd9e9bd7c";
           sha256 = "0r9gif2sgf84z8qniz6chr32av9g2i38rlyms81m8ssghf0j86ss";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b0b6b7d09c023cfe34da65fa1eb8f3fdbe7b1290/recipes/evil-iedit-state";
           sha256 = "1dihyh7vqcp7kvfic613k7v33czr93hz04d635awrsyzgy8savhl";
-          name = "evil-iedit-state";
+          name = "recipe";
         };
         packageRequires = [ evil iedit ];
         meta = {
@@ -11239,8 +14104,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    evil-leader = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    evil-leader = callPackage ({ evil
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "evil-leader";
         version = "0.4.3";
         src = fetchFromGitHub {
@@ -11249,10 +14118,10 @@
           rev = "753b01eb4958370ae2226b3780ff31fe157c2852";
           sha256 = "1k2zinchs0jjllp8zkpggckyy63dkyi5yig3p46vh4w45jdzysk5";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/evil-leader";
           sha256 = "154s2nb170hzksmc87wnzlwg3ic3w3ravgsfvwkyfi2q285vmra6";
-          name = "evil-leader";
+          name = "recipe";
         };
         packageRequires = [ evil ];
         meta = {
@@ -11260,8 +14129,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    evil-lisp-state = callPackage ({ bind-map, evil, fetchFromGitHub, fetchurl, lib, melpaBuild, smartparens }:
-    melpaBuild {
+    evil-lisp-state = callPackage ({ bind-map
+                                   , evil
+                                   , fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild
+                                   , smartparens }:
+      melpaBuild {
         pname = "evil-lisp-state";
         version = "8.2";
         src = fetchFromGitHub {
@@ -11270,10 +14145,10 @@
           rev = "3c65fecd9917a41eaf6460f22187e2323821f3ce";
           sha256 = "1n6r8xs670r5qp4b5f72nr9g8nlqcrx1v7yqqlbkgv8gns8n5xgh";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/evil-lisp-state";
           sha256 = "16h6zi0kkq2zlrwqiz6avnw2ady3h9gmxyinvk5gbkskxf12d1pz";
-          name = "evil-lisp-state";
+          name = "recipe";
         };
         packageRequires = [ bind-map evil smartparens ];
         meta = {
@@ -11281,8 +14156,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    evil-magit = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }:
-    melpaBuild {
+    evil-magit = callPackage ({ evil
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , magit
+                              , melpaBuild }:
+      melpaBuild {
         pname = "evil-magit";
         version = "0.4.2";
         src = fetchFromGitHub {
@@ -11291,10 +14171,10 @@
           rev = "a24186be7cc2cdab24b56f6dcc4665eeb8349c1a";
           sha256 = "12hr2w5r2hgagb3hqbi59v73rxpjml5prc3m7dw3wzsm0rf1rwh3";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/50315ec837d2951bf5b2bb75809a35dd7ffc8fe8/recipes/evil-magit";
           sha256 = "02ncki7qrl22804576h76xl4d5lvvk32lzn9gvxn63hb19r0s980";
-          name = "evil-magit";
+          name = "recipe";
         };
         packageRequires = [ evil magit ];
         meta = {
@@ -11302,8 +14182,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    evil-mark-replace = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    evil-mark-replace = callPackage ({ evil
+                                     , fetchFromGitHub
+                                     , fetchurl
+                                     , lib
+                                     , melpaBuild }:
+      melpaBuild {
         pname = "evil-mark-replace";
         version = "0.0.4";
         src = fetchFromGitHub {
@@ -11312,10 +14196,10 @@
           rev = "56cf191724a3e82239ca47a17b071c20aedb0617";
           sha256 = "01hccc49xxb6lnzr0lwkkwndbk4sv0jyyz3khbcxsgkpzjiydihv";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/089accfa2646fc4f265cb8e9b9a05dcf5aa4c4f6/recipes/evil-mark-replace";
           sha256 = "03cq43vlv1b53w4kw7mjvk026i8rzhhryfb27ddn6ipgc6xh68a0";
-          name = "evil-mark-replace";
+          name = "recipe";
         };
         packageRequires = [ evil ];
         meta = {
@@ -11323,20 +14207,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    evil-matchit = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    evil-matchit = callPackage ({ evil
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "evil-matchit";
-        version = "2.2.6";
+        version = "2.2.8";
         src = fetchFromGitHub {
           owner = "redguardtoo";
           repo = "evil-matchit";
-          rev = "50bb88241983f0bf06d35a455a87c04eddc11c83";
-          sha256 = "1qn5nydh2pinjlyyplrdxrn2r828im6mgij95ahs8z14y9yxwcif";
+          rev = "8a10046f25e4b707ccf8ff6fbcb74e71bd32498d";
+          sha256 = "0ik105g50frj87c5awy4gkq43gm4hmlzr6klx7x5fbyjx9d9f2id";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/aeab4a998bffbc784e8fb23927d348540baf9951/recipes/evil-matchit";
           sha256 = "01z69n20qs4gngd28ry4kn825cax5km9hn96i87yrvq7nfa64swq";
-          name = "evil-matchit";
+          name = "recipe";
         };
         packageRequires = [ evil ];
         meta = {
@@ -11344,8 +14232,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    evil-mc = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    evil-mc = callPackage ({ cl-lib ? null
+                           , emacs
+                           , evil
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "evil-mc";
         version = "0.0.3";
         src = fetchFromGitHub {
@@ -11354,10 +14248,10 @@
           rev = "be2259b8cedd62011b25ddbcc1774bbbe9a66c61";
           sha256 = "0p435ykkq41nksd40qczlhz6kvs2zpkxch661wy0w93wffwnq3b9";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/96770d778a03ab012fb82a3a0122983db6f9b0c4/recipes/evil-mc";
           sha256 = "0cq4xg6svb5gz4ra607wy768as2igla4h1xcrfnxldknk476fqqs";
-          name = "evil-mc";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs evil ];
         meta = {
@@ -11365,8 +14259,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    evil-multiedit = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, iedit, lib, melpaBuild }:
-    melpaBuild {
+    evil-multiedit = callPackage ({ cl-lib ? null
+                                  , emacs
+                                  , evil
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , iedit
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "evil-multiedit";
         version = "1.3.8";
         src = fetchFromGitHub {
@@ -11375,10 +14276,10 @@
           rev = "c0cb6858399863e51935dae62c7c61ebc68f92eb";
           sha256 = "010y4vxj7rr5kr4csbh72s60ndqzqxdrvgkyb65vxb5vskr1n1wm";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/997f5a6999d1add57fae33ba8eb3e3bc60d7bb56/recipes/evil-multiedit";
           sha256 = "0p02q9skqw2zhx7sfadqgs7vn518s72856962dam0xw4sqasplfp";
-          name = "evil-multiedit";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs evil iedit ];
         meta = {
@@ -11386,8 +14287,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    evil-nerd-commenter = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    evil-nerd-commenter = callPackage ({ emacs
+                                       , fetchFromGitHub
+                                       , fetchurl
+                                       , lib
+                                       , melpaBuild }:
+      melpaBuild {
         pname = "evil-nerd-commenter";
         version = "3.2.3";
         src = fetchFromGitHub {
@@ -11396,10 +14301,10 @@
           rev = "34d411715ead5829d6d8969511047feb703b067e";
           sha256 = "0ax846dy2hbrbvkj7nzfkcl5i1x9rga8bvg0ln55ivhq0iiy1lkv";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a3e1ff69e7cc95a5b5d628524ad836833f4ee736/recipes/evil-nerd-commenter";
           sha256 = "1pa5gh065hqn5mhs47qvjllwdwwafl0clk555mb6w7svq58r6i8d";
-          name = "evil-nerd-commenter";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -11407,8 +14312,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    evil-numbers = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    evil-numbers = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "evil-numbers";
         version = "0.4";
         src = fetchFromGitHub {
@@ -11417,10 +14325,10 @@
           rev = "8834eb2e8bd93561a706363946701d0d90546a9f";
           sha256 = "13jg2xbh4p02x1nj77b6csb93hh56c1nv8kslcq2hjj3caipk4m8";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/evil-numbers";
           sha256 = "1lpmkklwjdf7ayhv99g9zh3l9hzrwm0hr0ijvbc7yz3n398zn1b2";
-          name = "evil-numbers";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -11428,8 +14336,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    evil-opener = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild, opener }:
-    melpaBuild {
+    evil-opener = callPackage ({ evil
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild
+                               , opener }:
+      melpaBuild {
         pname = "evil-opener";
         version = "0.2.2";
         src = fetchFromGitHub {
@@ -11438,10 +14351,10 @@
           rev = "c384f67278046fdcd220275fdd212ab85672cbeb";
           sha256 = "0gci909a2rbx5i8dyzyrcddwdic7nvpk6y6djvn521yaag4sq87h";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/evil-opener";
           sha256 = "0cld853pyzlaa306rpypw2wm4953i6y06irlk96bql9aa1zx977g";
-          name = "evil-opener";
+          name = "recipe";
         };
         packageRequires = [ evil opener ];
         meta = {
@@ -11449,8 +14362,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    evil-org = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
-    melpaBuild {
+    evil-org = callPackage ({ evil
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild
+                            , org }:
+      melpaBuild {
         pname = "evil-org";
         version = "0.1.1";
         src = fetchFromGitHub {
@@ -11459,10 +14377,10 @@
           rev = "2d7c58dbeca0d4ac7b4eab5f47b77946951f27e9";
           sha256 = "09l0ph9rc941kr718zq0dw27fq6l7rb0h2003ihw7q0a5yr8fpk7";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1768558ed0a0249421437b66fe45018dd768e637/recipes/evil-org";
           sha256 = "18glpsnpxap4dvnvkl59h9pnwlp20libsfbbkmvrbzsvbdyspg6z";
-          name = "evil-org";
+          name = "recipe";
         };
         packageRequires = [ evil org ];
         meta = {
@@ -11470,8 +14388,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    evil-quickscope = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    evil-quickscope = callPackage ({ evil
+                                   , fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "evil-quickscope";
         version = "0.1.4";
         src = fetchFromGitHub {
@@ -11480,10 +14402,10 @@
           rev = "37a20e4c56c6058abf186ad4013c155e695e876f";
           sha256 = "1ja9ggj70wf0nmma4xnc1zdzg2crq9h1cv3cj7cgwjmllflgkfq7";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ec118caf243c74d243f533c9e12f7de0d6c43bc4/recipes/evil-quickscope";
           sha256 = "0xym1mh4p68i00l1lshywf5fdg1vw3szxp3fk9fwfcg04z6vd489";
-          name = "evil-quickscope";
+          name = "recipe";
         };
         packageRequires = [ evil ];
         meta = {
@@ -11491,8 +14413,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    evil-replace-with-char = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    evil-replace-with-char = callPackage ({ emacs
+                                          , evil
+                                          , fetchFromGitHub
+                                          , fetchurl
+                                          , lib
+                                          , melpaBuild }:
+      melpaBuild {
         pname = "evil-replace-with-char";
         version = "1.0.0";
         src = fetchFromGitHub {
@@ -11501,10 +14428,10 @@
           rev = "dddbbafdd620cc48dd0a257baf4010e1b415ebe8";
           sha256 = "0gcmva2q1bxqp3p8cl1nf19kh4nkgfdm64havyzhnkwq18q84pxi";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0ac1b487e0fe193cc46c8b489686972ed6db3973/recipes/evil-replace-with-char";
           sha256 = "0lgazw53j44rc72czwqxs6yaz67l9i1v52wbi7l9w958fnjra84r";
-          name = "evil-replace-with-char";
+          name = "recipe";
         };
         packageRequires = [ emacs evil ];
         meta = {
@@ -11512,8 +14439,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    evil-rsi = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    evil-rsi = callPackage ({ evil
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "evil-rsi";
         version = "2.0.0";
         src = fetchFromGitHub {
@@ -11522,10 +14453,10 @@
           rev = "236bf6ed1e2285698db808463e5f2f69f5f5e7c0";
           sha256 = "1xz629qv1ss1fap397k48piawcwl8lrybraq5449bw1vvn1a4d9f";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/24f438b47e8ede0ef84261424c122d2ac28b90cb/recipes/evil-rsi";
           sha256 = "0mc39n72420n36kwyf9zpw1pgyih0aigfnmkbywb0yxgj7myc345";
-          name = "evil-rsi";
+          name = "recipe";
         };
         packageRequires = [ evil ];
         meta = {
@@ -11533,8 +14464,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    evil-search-highlight-persist = callPackage ({ fetchFromGitHub, fetchurl, highlight, lib, melpaBuild }:
-    melpaBuild {
+    evil-search-highlight-persist = callPackage ({ fetchFromGitHub
+                                                 , fetchurl
+                                                 , highlight
+                                                 , lib
+                                                 , melpaBuild }:
+      melpaBuild {
         pname = "evil-search-highlight-persist";
         version = "1.8";
         src = fetchFromGitHub {
@@ -11543,10 +14478,10 @@
           rev = "0e2b3d4e3dec5f38ae95f62519eb2736f73c0b85";
           sha256 = "1jfi2k9dm0cc9bx8klppm965ydhdw17a2n664199vhxrap6g27yk";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f2e91974ddb219c88229782b70ade7e14f20c0b5/recipes/evil-search-highlight-persist";
           sha256 = "08l8ymrp9vkpwprq9gp4562yvcnd4hfc3z7n4n5lz7h6ffv3zym3";
-          name = "evil-search-highlight-persist";
+          name = "recipe";
         };
         packageRequires = [ highlight ];
         meta = {
@@ -11554,8 +14489,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    evil-smartparens = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild, smartparens }:
-    melpaBuild {
+    evil-smartparens = callPackage ({ emacs
+                                    , evil
+                                    , fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild
+                                    , smartparens }:
+      melpaBuild {
         pname = "evil-smartparens";
         version = "0.4.0";
         src = fetchFromGitHub {
@@ -11564,10 +14505,10 @@
           rev = "9fe4eed1c6327197afe6c13bb0771e18908aff00";
           sha256 = "1di4qz5fbrlwbg16c2j0m7y8zqfxw027qd7zqmc3rwk9znbhg7wl";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/850898fbfc8e0aeb779e8feae56476d989110e79/recipes/evil-smartparens";
           sha256 = "1viwrd6gfqmwhlil80pk68dikn3cjf9ddsy0z781z3qfx0j35qza";
-          name = "evil-smartparens";
+          name = "recipe";
         };
         packageRequires = [ emacs evil smartparens ];
         meta = {
@@ -11575,8 +14516,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    evil-snipe = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    evil-snipe = callPackage ({ cl-lib ? null
+                              , emacs
+                              , evil
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "evil-snipe";
         version = "2.0.8";
         src = fetchFromGitHub {
@@ -11585,10 +14532,10 @@
           rev = "dc62ac317fd29f018e9785c1b3b7dd7ad57b3938";
           sha256 = "18j33smlajj7ynigfgm64z3kfys5idbxin2gd93civ2564n85r33";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6748f3febbe2f098761e967b4dc67791186d0aa7/recipes/evil-snipe";
           sha256 = "0gcmpjw3iw7rjk86b2k6clfigp48vakfjd1a9n8qramhnc85rgkn";
-          name = "evil-snipe";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs evil ];
         meta = {
@@ -11596,8 +14543,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    evil-space = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    evil-space = callPackage ({ evil
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "evil-space";
         version = "0.0.6";
         src = fetchFromGitHub {
@@ -11606,10 +14557,10 @@
           rev = "f77860fa00662e2def3e1885adac777f051e1e61";
           sha256 = "1rchanv0vq9rx6x69608dlpdybvkn8a9ymx8wzm7gqpz9qh6xqrk";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4e5a4b9427038f90898ac0e237e71ba7152501f5/recipes/evil-space";
           sha256 = "1asvh873r1xgffvz3nr653yn8h5ifaphnafp6wf1b1mja6as7f23";
-          name = "evil-space";
+          name = "recipe";
         };
         packageRequires = [ evil ];
         meta = {
@@ -11617,8 +14568,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    evil-string-inflection = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild, string-inflection }:
-    melpaBuild {
+    evil-string-inflection = callPackage ({ emacs
+                                          , evil
+                                          , fetchFromGitHub
+                                          , fetchurl
+                                          , lib
+                                          , melpaBuild
+                                          , string-inflection }:
+      melpaBuild {
         pname = "evil-string-inflection";
         version = "1.0.0";
         src = fetchFromGitHub {
@@ -11627,10 +14584,10 @@
           rev = "f6a3eca0f0fa8e56e6938e1dd48537eef1fae05f";
           sha256 = "1akk0yylwcw4f91hprrrsijhbdcmrx1nnpgfyzpl4k5d4b30y8d5";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0720a0f5b775fcee8d1cfa0defe80048e2dd0972/recipes/evil-string-inflection";
           sha256 = "0w9x49c0gmv4waspa9fvbhf2adm19cixkwx7a7la9v4qy7da6akh";
-          name = "evil-string-inflection";
+          name = "recipe";
         };
         packageRequires = [ emacs evil string-inflection ];
         meta = {
@@ -11638,20 +14595,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    evil-surround = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    evil-surround = callPackage ({ evil
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "evil-surround";
         version = "1.0.1";
         src = fetchFromGitHub {
           owner = "emacs-evil";
           repo = "evil-surround";
-          rev = "f6162a7b5a65a297c8ebb8a81ce6e1278f958bbc";
-          sha256 = "0kqkji4yn4khfrgghwkzgbh687fs3p07lj61x4i7w1ay1416lvn9";
+          rev = "55c820083a5f28d5361baeb9cd7da92549e5b3f5";
+          sha256 = "0qnv0c1byvzlclc8yaq6jjy61vza3zq2i773b30ss0rfpa03p13z";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2c9dc47a4c837c44429a74fd998fe468c00639f2/recipes/evil-surround";
           sha256 = "0aphv5zinb0lzdx22qbzcr7fn6jbpkdczar7py3df6mzxw5wvcm1";
-          name = "evil-surround";
+          name = "recipe";
         };
         packageRequires = [ evil ];
         meta = {
@@ -11659,8 +14620,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    evil-swap-keys = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    evil-swap-keys = callPackage ({ emacs
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "evil-swap-keys";
         version = "1.0.0";
         src = fetchFromGitHub {
@@ -11669,10 +14634,10 @@
           rev = "56bc201e265a6bd482a7c41a7c81d2238341ef3a";
           sha256 = "0n0hl0plaghz9rjssabxwfzm46kr6564hpfh6hn8lzla4rf1q5zs";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2abff8e3d54ac13c4fe90692a56437844accca25/recipes/evil-swap-keys";
           sha256 = "12cx95mjm4ymggidvf41gh3a364z32h655jmhk417v0ga9jk9fv6";
-          name = "evil-swap-keys";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -11680,8 +14645,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    evil-test-helpers = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    evil-test-helpers = callPackage ({ evil
+                                     , fetchFromGitHub
+                                     , fetchurl
+                                     , lib
+                                     , melpaBuild }:
+      melpaBuild {
         pname = "evil-test-helpers";
         version = "1.2.13";
         src = fetchFromGitHub {
@@ -11690,10 +14659,10 @@
           rev = "427cf5faa57e8794ac93f594dc3d1972e687a25a";
           sha256 = "02xc9zgrabnlwk3wlsxbzbhdzi3fm5fk8kimvgdcp8vsnpdcrhql";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/87da8c50f9167ad9c3844b23becb6904f809611d/recipes/evil-test-helpers";
           sha256 = "0l4skyznzgr76z518q22lf90ymlsfcs02w8vqkg8az1nfl3ch7fs";
-          name = "evil-test-helpers";
+          name = "recipe";
         };
         packageRequires = [ evil ];
         meta = {
@@ -11701,20 +14670,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    evil-text-object-python = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    evil-text-object-python = callPackage ({ emacs
+                                           , evil
+                                           , fetchFromGitHub
+                                           , fetchurl
+                                           , lib
+                                           , melpaBuild }:
+      melpaBuild {
         pname = "evil-text-object-python";
         version = "1.0.1";
         src = fetchFromGitHub {
           owner = "wbolster";
           repo = "evil-text-object-python";
-          rev = "3b3fb01e7ad7eeeeae1143695547fe75148cc44f";
-          sha256 = "1alin2rmx1xa1w3b1nb76bplmg10il55jxxm6jj7qs6z1izzllci";
+          rev = "7aae5558be25b4a33abdede8a91da1cc7d08f1bc";
+          sha256 = "0qfqfqbq3jijnmg0rp6agz9skcv2drnpyn481c7f455z46xi87kl";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0d0893b07bc4a057561a1c1a85b7520c50f31e12/recipes/evil-text-object-python";
           sha256 = "0jdzs1yn8nrxq890427yjrxdvnzj8jy7bs3jj4w4c0fik26ngqhm";
-          name = "evil-text-object-python";
+          name = "recipe";
         };
         packageRequires = [ emacs evil ];
         meta = {
@@ -11722,8 +14696,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    evil-textobj-anyblock = callPackage ({ cl-lib ? null, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    evil-textobj-anyblock = callPackage ({ cl-lib ? null
+                                         , evil
+                                         , fetchFromGitHub
+                                         , fetchurl
+                                         , lib
+                                         , melpaBuild }:
+      melpaBuild {
         pname = "evil-textobj-anyblock";
         version = "0.1";
         src = fetchFromGitHub {
@@ -11732,10 +14711,10 @@
           rev = "068d26a625cd6202aaf70a8ff399f9130c0ffa68";
           sha256 = "0vsf7yzlb2j7c5c7cnk81y1979psy6a9v7klg6c2j9lkcn3cqpvj";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/36b734960313d4cb484cebaac0f112781436631c/recipes/evil-textobj-anyblock";
           sha256 = "03vk30s2wkcszcjxmh5ww39rihnag9cp678wdzq4bnqy0c6rnjwa";
-          name = "evil-textobj-anyblock";
+          name = "recipe";
         };
         packageRequires = [ cl-lib evil ];
         meta = {
@@ -11743,20 +14722,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    evil-tutor = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    evil-tutor = callPackage ({ evil
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "evil-tutor";
         version = "1.0";
         src = fetchFromGitHub {
           owner = "syl20bnr";
           repo = "evil-tutor";
-          rev = "909273bac88b98a565f1b89bbb13d523b7edce2b";
-          sha256 = "1rskvkmz30xyy8xfjf2i35f3dxh663gb3plfy3f0j6z17i086jl2";
+          rev = "79b47a9f444ddaa289c66e8995ee116941429c24";
+          sha256 = "11hiaxiqc2f522y7rgfr6bjnmx4nrssq1q9g96w4rsb10627qvsf";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4b7bfffdc34e181893b8cf4d1cc091f6c3f91126/recipes/evil-tutor";
           sha256 = "1hvc2w5ykrgh62n4sxqqqcdk5sd7nmh6xzv4mir5vf9y2dgqcvsn";
-          name = "evil-tutor";
+          name = "recipe";
         };
         packageRequires = [ evil ];
         meta = {
@@ -11764,8 +14747,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    evil-visual-mark-mode = callPackage ({ dash, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    evil-visual-mark-mode = callPackage ({ dash
+                                         , evil
+                                         , fetchFromGitHub
+                                         , fetchurl
+                                         , lib
+                                         , melpaBuild }:
+      melpaBuild {
         pname = "evil-visual-mark-mode";
         version = "0.0.3";
         src = fetchFromGitHub {
@@ -11774,10 +14762,10 @@
           rev = "094ee37599492885ff3144918fcdd9b74dadaaa0";
           sha256 = "07cmql8zsqz1qchq2mp3qybbay499dk1yglisig6jfddcmrbbggz";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/293cdd3387f26e4c8f21582d75a194963ac9cff7/recipes/evil-visual-mark-mode";
           sha256 = "1qgr2dfhfz6imnlznicl7lplajd1s8wny7mlxs1bkms3xjcjfi48";
-          name = "evil-visual-mark-mode";
+          name = "recipe";
         };
         packageRequires = [ dash evil ];
         meta = {
@@ -11785,8 +14773,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    evil-visual-replace = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    evil-visual-replace = callPackage ({ evil
+                                       , fetchFromGitHub
+                                       , fetchurl
+                                       , lib
+                                       , melpaBuild }:
+      melpaBuild {
         pname = "evil-visual-replace";
         version = "0.0.5";
         src = fetchFromGitHub {
@@ -11795,10 +14787,10 @@
           rev = "163fc827a1ffc106475da470c37fb26f4cc9b008";
           sha256 = "1gfyrq7xfzmzh3x8k5f08n027dlbwi0pkkxf9c39fkxp4jngibsz";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/evil-visual-replace";
           sha256 = "1dq3bd9aqpk3jq1c9yzlpjyw6mi8l428l111vrmfg156k1w22v01";
-          name = "evil-visual-replace";
+          name = "recipe";
         };
         packageRequires = [ evil ];
         meta = {
@@ -11806,20 +14798,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    evil-visualstar = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    evil-visualstar = callPackage ({ evil
+                                   , fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "evil-visualstar";
         version = "0.2.0";
         src = fetchFromGitHub {
           owner = "bling";
           repo = "evil-visualstar";
-          rev = "eb996eca0081b6e8bab70b2c0a86ef1c71087bf6";
-          sha256 = "11y2jrwbsw4fcx77zkhj1cn2hl1zcdqy00bv3mpbcrs03jywssrk";
+          rev = "bd9e1b50c03b37c57355d387f291c2ec8ce51eec";
+          sha256 = "17m4kdz1is4ipnyiv9n3vss49faswbbd6v57df9npzsbn5jyydd0";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/578d33f3f8e68ef1b3ca3fb8af9b9ff77b649bd3/recipes/evil-visualstar";
           sha256 = "135l9hjfbpn0a6p53picnpydi9qs5vrk2rfn64gxa5ag2apcyycy";
-          name = "evil-visualstar";
+          name = "recipe";
         };
         packageRequires = [ evil ];
         meta = {
@@ -11827,8 +14823,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    evm = callPackage ({ dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    evm = callPackage ({ dash
+                       , f
+                       , fetchFromGitHub
+                       , fetchurl
+                       , lib
+                       , melpaBuild }:
+      melpaBuild {
         pname = "evm";
         version = "0.4.2";
         src = fetchFromGitHub {
@@ -11837,10 +14838,10 @@
           rev = "d0623b2355436a5fd9f7238b419782080c79196b";
           sha256 = "0739v0m9vj70a55z0canslyqgafzys815i7a0r6bxj2f9iwq6rhb";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bbcead697f745d197459f90ee05b172e35af2411/recipes/evm";
           sha256 = "19l6cs5schbnph0pwhhj66gkxsswd4bmjpy79l9kxzpjf107wc03";
-          name = "evm";
+          name = "recipe";
         };
         packageRequires = [ dash f ];
         meta = {
@@ -11848,8 +14849,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    eww-lnum = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    eww-lnum = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "eww-lnum";
         version = "1.1";
         src = fetchFromGitHub {
@@ -11858,10 +14862,10 @@
           rev = "daef49974446ed4c1001e0549c3f74679bca6bd3";
           sha256 = "0gs6bi3s2sszc6v2b26929azmn5513kvyin99n4d0ark1jdbjmv2";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/eww-lnum";
           sha256 = "1hhc6q8zlj335v27j4dq6ms7frqpivfabs9w3vkaly5kjr60fw7c";
-          name = "eww-lnum";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -11869,20 +14873,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    exato = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    exato = callPackage ({ emacs
+                         , evil
+                         , fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "exato";
         version = "0.0.6";
         src = fetchFromGitHub {
           owner = "ninrod";
           repo = "exato";
-          rev = "70f7ca2a4c6de0392e5e54ac4f16c96daa106be6";
-          sha256 = "0ns43whqcq3cv9vh8wbakj5fgs0lsn8f3q1rgl4rw4mfgbvv85pm";
+          rev = "39c08f56483243c28a39886a7218039a138e5f63";
+          sha256 = "1q0jjaw5k9bql7bk5idin724vbcgx0iwn2dm4mg1c51cczqsd2rg";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/939efbcb9b40a2df5ef14e653fb242a8e37c72f9/recipes/exato";
           sha256 = "1h2dd3yhv1n0sznznw8ncx98g53hgi1rg1zkd0nmldih2rd5qisn";
-          name = "exato";
+          name = "recipe";
         };
         packageRequires = [ emacs evil ];
         meta = {
@@ -11890,20 +14899,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    exec-path-from-shell = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    exec-path-from-shell = callPackage ({ fetchFromGitHub
+                                        , fetchurl
+                                        , lib
+                                        , melpaBuild }:
+      melpaBuild {
         pname = "exec-path-from-shell";
         version = "1.11";
         src = fetchFromGitHub {
           owner = "purcell";
           repo = "exec-path-from-shell";
-          rev = "4d6a6aa18031a4bbdd5b3bfad8686dc5ff942ab2";
-          sha256 = "0n86zj350jw1lxnaa450qmggza0za3a1zg9k9clwb9cjz4wwghsi";
+          rev = "5e80a4159b1b78d66f99aa1c071b778f6c64e6e6";
+          sha256 = "1pqyv78cknj6zwg2xvbxp4qkdjs0bic3w9w3mj7chja4qza83ijg";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/exec-path-from-shell";
           sha256 = "014bfcs7znds4if1njyq4s5zrfnr6b3wj6722b4l5r58gh9mlrr5";
-          name = "exec-path-from-shell";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -11911,8 +14923,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    exiftool = callPackage ({ emacs, fetchgit, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    exiftool = callPackage ({ emacs
+                            , fetchgit
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "exiftool";
         version = "0.3";
         src = fetchgit {
@@ -11920,10 +14936,10 @@
           rev = "8dd70ba5214a73960361a0c6220bb4aa72b9e478";
           sha256 = "0sb71bj8djppzac02bpl3v7fy0jlidd4aagg8bmmgyp7zx84xws8";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4835a76909d020781021e747fbc341111a94dbfa/recipes/exiftool";
           sha256 = "1zvcps64yvz8lsjhi1j0808983fv2s7kx67yjr8ps454mcl8bpab";
-          name = "exiftool";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -11931,8 +14947,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    expand-region = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    expand-region = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "expand-region";
         version = "0.11.0";
         src = fetchFromGitHub {
@@ -11941,10 +14960,10 @@
           rev = "0bc14fc7fbbcca5da4fdd9695cfd7cbd36eb3b96";
           sha256 = "0h40dhc3kn8fq86xnwi5lz7ql8my8737y7wkqr897p15y90swr35";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/expand-region";
           sha256 = "1c7f1nqsqdc75h22fxxnyg0m4yxj6l23sirk3c71fqj14paxqnwg";
-          name = "expand-region";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -11952,8 +14971,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    express = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, string-utils }:
-    melpaBuild {
+    express = callPackage ({ fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild
+                           , string-utils }:
+      melpaBuild {
         pname = "express";
         version = "0.6.0";
         src = fetchFromGitHub {
@@ -11962,10 +14985,10 @@
           rev = "e6dc9abdc395ef537408befebeb4fd3ed4ee5c60";
           sha256 = "106yh793scbyharsk1dvrirkj3c6666w8jqilpkaz78vwyw3zs5y";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9a97f5f81af13c49f5bea31455d7da0bf2c12e4f/recipes/express";
           sha256 = "0lhisy4ds96bwpc7k8w9ws1zi1qh0d36nhxsp36bqzfi09ig0nb9";
-          name = "express";
+          name = "recipe";
         };
         packageRequires = [ string-utils ];
         meta = {
@@ -11973,8 +14996,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    exsqlaim-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    exsqlaim-mode = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild
+                                 , s }:
+      melpaBuild {
         pname = "exsqlaim-mode";
         version = "0.0.1";
         src = fetchFromGitHub {
@@ -11983,10 +15010,10 @@
           rev = "e77d2a07addffd7df4393019d9c3dad1ab1925d9";
           sha256 = "19v5sf3nf6dciakvs7ksbg66b5z1hybc4ivs24hm6k3fziblfzzs";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7f660d7629bc27144c99ebcba45f1b06b14c5745/recipes/exsqlaim-mode";
           sha256 = "0ssn48wcn3x066nsl8y78y57ndasqv5x6ifxbifdxl3f5vjhyvg7";
-          name = "exsqlaim-mode";
+          name = "recipe";
         };
         packageRequires = [ s ];
         meta = {
@@ -11994,8 +15021,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    extend-dnd = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    extend-dnd = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "extend-dnd";
         version = "0.5";
         src = fetchFromGitHub {
@@ -12004,10 +15034,10 @@
           rev = "a1923d57f8f5e862cc66c189b5e6627bc84a2119";
           sha256 = "1k2j8szavyq2wy5c0skvs03a88cr9njy7y63b7knh2m92nw4830d";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f2d866ca12cb997b7fad878808c0966f3413b73d/recipes/extend-dnd";
           sha256 = "0rknpvp8yw051pg3blvmjpp3c9a82jw7f10mq67ggbz98w227417";
-          name = "extend-dnd";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -12015,8 +15045,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    extmap = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    extmap = callPackage ({ emacs
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "extmap";
         version = "1.0";
         src = fetchFromGitHub {
@@ -12025,10 +15059,10 @@
           rev = "3860b69fb19c962425d4e271ee0a24547b67d323";
           sha256 = "1vjwinb7m9l2bw324v4m1g4mc9yqjs84bfjci93m0a1ih8n4zdbr";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/91ef4352603cc69930ab3d63f0a90eee63f5f328/recipes/extmap";
           sha256 = "0c12gfd3480y4fc22ik02n7h85k6s70i5jv5i872h0yi68cgd01j";
-          name = "extmap";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -12036,8 +15070,18 @@
           license = lib.licenses.free;
         };
       }) {};
-    exwm-x = callPackage ({ bind-key, cl-lib ? null, counsel, exwm, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild, swiper, switch-window }:
-    melpaBuild {
+    exwm-x = callPackage ({ bind-key
+                          , cl-lib ? null
+                          , counsel
+                          , exwm
+                          , fetchFromGitHub
+                          , fetchurl
+                          , ivy
+                          , lib
+                          , melpaBuild
+                          , swiper
+                          , switch-window }:
+      melpaBuild {
         pname = "exwm-x";
         version = "1.8.1";
         src = fetchFromGitHub {
@@ -12046,10 +15090,10 @@
           rev = "4f7946db67d6599baba6b3961e8f543a68707742";
           sha256 = "00lcn5106xig2y9gyir1f1gzyp2i05rwq1lbbbah8aipkdi3z9xl";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a0e6e23bcffdcd1e17c70599c563609050e5de40/recipes/exwm-x";
           sha256 = "1d9q57vz63sk3h1g5gvp9xnmqkpa73wppmiy2bv8mxk11whl6xa3";
-          name = "exwm-x";
+          name = "recipe";
         };
         packageRequires = [
           bind-key
@@ -12065,8 +15109,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    eyebrowse = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    eyebrowse = callPackage ({ dash
+                             , emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "eyebrowse";
         version = "0.7.7";
         src = fetchFromGitHub {
@@ -12075,10 +15124,10 @@
           rev = "7294ed5fbf5f38407b599a10a335b8c4ec15a8d5";
           sha256 = "1lhpf88042mg9q328w2d328ka9pild4ppdynbn3rsib9zgxp8waq";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/90d052bfc0b94cf177e33b2ffc01a45d254fc1b1/recipes/eyebrowse";
           sha256 = "09fkzm8z8nkr4s9fbmfcjc80h50051f48v6n14l76xicglr5p861";
-          name = "eyebrowse";
+          name = "recipe";
         };
         packageRequires = [ dash emacs ];
         meta = {
@@ -12086,8 +15135,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    eziam-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    eziam-theme = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "eziam-theme";
         version = "1.0";
         src = fetchFromGitHub {
@@ -12096,10 +15148,10 @@
           rev = "a2bdda95f840c15240975c32b66d4d1e0682a1e1";
           sha256 = "1z0m3pzhyif1rx8g4gzg1wfdqdkxdaahjjq8hx2fj4k4l16bia99";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4e0411583bd4fdbe425eb07de98851136fa1eeb0/recipes/eziam-theme";
           sha256 = "0iz3r4r54ai8y4qhnix291ra7qfmk8dbr06f52pgmz3gzin1cqpb";
-          name = "eziam-theme";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -12107,8 +15159,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    f = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    f = callPackage ({ dash
+                     , fetchFromGitHub
+                     , fetchurl
+                     , lib
+                     , melpaBuild
+                     , s }:
+      melpaBuild {
         pname = "f";
         version = "0.20.0";
         src = fetchFromGitHub {
@@ -12117,10 +15174,10 @@
           rev = "de6d4d40ddc844eee643e92d47b9d6a63fbebb48";
           sha256 = "1a47xk3yp1rp17fqg7ldl3d3fb888h0fz3sysqfdz1bfdgs8a9bk";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/f";
           sha256 = "18qax8i24gpccif4xcxccclpwl00plxjf3zbq9dry37b1r4mj57s";
-          name = "f";
+          name = "recipe";
         };
         packageRequires = [ dash s ];
         meta = {
@@ -12128,8 +15185,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    f3 = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
-    melpaBuild {
+    f3 = callPackage ({ cl-lib ? null
+                      , emacs
+                      , fetchFromGitHub
+                      , fetchurl
+                      , helm
+                      , lib
+                      , melpaBuild }:
+      melpaBuild {
         pname = "f3";
         version = "0.1";
         src = fetchFromGitHub {
@@ -12138,10 +15201,10 @@
           rev = "19120dda2d760d3dd6c6aa620121d1de0a40932d";
           sha256 = "1qg48zbjdjqimw4516ymrsilz41zkib9321q0caf9474s9xyp2bi";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5b40de62a82d6895a37ff795d56f7d0f783461e6/recipes/f3";
           sha256 = "099wibgp9k6sgglaqigic5ay6qg7aqijnis5crwjl7b81ddqp610";
-          name = "f3";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs helm ];
         meta = {
@@ -12149,8 +15212,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    fabric = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    fabric = callPackage ({ fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "fabric";
         version = "0.2.0";
         src = fetchFromGitHub {
@@ -12159,10 +15225,10 @@
           rev = "004934318f63d8cf955022f87b2c33eb97ada280";
           sha256 = "0crhkdbxz1ldbrvppi95g005ni5zg99z1271rkrnk5i6cvc4hlq5";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/83939d2a4d5874244a4916eee9ae6b327af18b5d/recipes/fabric";
           sha256 = "1mkblsakdhvi10b67bv3j0jsf7hr8lf9sibmprvx8smqsih7l88m";
-          name = "fabric";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -12170,20 +15236,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    factlog = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    factlog = callPackage ({ fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "factlog";
         version = "0.0.1";
         src = fetchFromGitHub {
           owner = "tkf";
           repo = "factlog";
-          rev = "c834fdab81ec5b1bdc0ee2721a12cecb48a319bf";
-          sha256 = "01l8dlfpyy97b17djbza46rq11xlbkhd5kn2r26r2xac8klj4pka";
+          rev = "6b83e4f54097a59a13bcccfd29805e432f4e9584";
+          sha256 = "1mmyl3ndv5c17mvwxrmv0czjnr5i9b7zydg8swipwgshc3kvn7l0";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9075a42edee1ac7de0812d2eefcba5681859eb6e/recipes/factlog";
           sha256 = "163482vfpa52b5ya5xps4qnclbaql1x0q54gqdwwmm04as8qbfz7";
-          name = "factlog";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -12191,20 +15260,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    faff-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    faff-theme = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "faff-theme";
-        version = "2.0";
+        version = "2.2";
         src = fetchFromGitHub {
           owner = "WJCFerguson";
           repo = "emacs-faff-theme";
-          rev = "0835c25b5e4ae7a79f0c1c4c44867f2d2e73b642";
-          sha256 = "0msh7w8qmrd9977zamyh0qifzf5bwl6g1012gc8lsr995c6gwm87";
+          rev = "8fbdf71a2e63a8ec997c387bd8319c0dc825a938";
+          sha256 = "17ckad411h033l4cpg337vkwvyxrpvqvi9pa56p7mpxzfg3q8a3v";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0b35c169fe56a5612ff5a4242140f617fdcae14f/recipes/faff-theme";
           sha256 = "1dmwbkp94zsddy0brs3mkdjr09n69maw2mrdfhriqcdk56qpwp4g";
-          name = "faff-theme";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -12212,8 +15284,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    fancy-battery = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    fancy-battery = callPackage ({ emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "fancy-battery";
         version = "0.2";
         src = fetchFromGitHub {
@@ -12222,10 +15298,10 @@
           rev = "5b8115bbeb67c52d4202a12dcd5726fb66e0a1ff";
           sha256 = "05lwcwf412m717yhwpjrswqkm8c3i7391rmiwv2k8xc1vk6dpp4g";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/eae3af4145c534992d1c1ee5bb6420651c7c5d82/recipes/fancy-battery";
           sha256 = "03rkfdkrzyal9abdiv8c73w10sm974hxf3xg5015hibfi6kzg8ii";
-          name = "fancy-battery";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -12233,20 +15309,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    fancy-narrow = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    fancy-narrow = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "fancy-narrow";
         version = "0.9.5";
         src = fetchFromGitHub {
           owner = "Malabarba";
           repo = "fancy-narrow";
-          rev = "c0f70b4333d4764323b7154e37a378adb1610ab7";
-          sha256 = "0vcr1gnqawvc1yclqs23jvxm6bqix8kpflf1c7znb0wzxmz9kx7y";
+          rev = "4737d706d1f3e90885e6642ba782f1fa605414c6";
+          sha256 = "0825hyz8b2biil0pd2bgjxqd2zm3gw9si7br5hnh51qasbaw9hid";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/fancy-narrow";
           sha256 = "15i86jz6rdpva1az7gqp1wbm8kispcfc8h6v9fqsbag9sbzvgcyv";
-          name = "fancy-narrow";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -12254,8 +15333,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    fastdef = callPackage ({ fetchFromGitHub, fetchurl, ivy, lib, melpaBuild, w3m }:
-    melpaBuild {
+    fastdef = callPackage ({ fetchFromGitHub
+                           , fetchurl
+                           , ivy
+                           , lib
+                           , melpaBuild
+                           , w3m }:
+      melpaBuild {
         pname = "fastdef";
         version = "0.2.0";
         src = fetchFromGitHub {
@@ -12264,10 +15348,10 @@
           rev = "0696f41dc150d35ce31fe8d2ea74f4173818bb55";
           sha256 = "1p5vmbx7zdzxnyjzcp2vxscd3dwf7xk82wk9dfiv99svwqv2ki3w";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f6effb2fbccc71e8a44c53138e3c21f10dc55fbc/recipes/fastdef";
           sha256 = "1cf4slxhcp2z7h9k3l31h06nnqsyb4smwnj55ivil2lm0fa0vlzj";
-          name = "fastdef";
+          name = "recipe";
         };
         packageRequires = [ ivy w3m ];
         meta = {
@@ -12275,8 +15359,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    fastnav = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    fastnav = callPackage ({ fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "fastnav";
         version = "1.0.7";
         src = fetchFromGitHub {
@@ -12285,10 +15372,10 @@
           rev = "54626e9e7cc7be5bc2bd01732e95ed2afc2312a1";
           sha256 = "0h32w63vv451797zi6206j529fd4j8l3fp7rqip3s8xn8d4728x1";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d2a7dce6617bf4ed250dba150e6787bf48891c64/recipes/fastnav";
           sha256 = "08hg256w8k9f5nzgpyl1jykbf28vmvv09kkhzs0s2zhwbl2158a5";
-          name = "fastnav";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -12296,8 +15383,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    faust-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    faust-mode = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "faust-mode";
         version = "0.6";
         src = fetchFromGitHub {
@@ -12306,10 +15396,10 @@
           rev = "7c31b22bdbfd2f8c16ec117d2975d56dd61ac15c";
           sha256 = "0a3p69ay88da13cz2cqx00r3qs2swnn7vkcvchcqyrdybfjs7y4z";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b362e7daeabd07c726ad9770d7d4941dfffd5b19/recipes/faust-mode";
           sha256 = "0l8cbf5i6lv6i5vyqp6ngfmrm2y6z2070b8m10w4376kbbnr266z";
-          name = "faust-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -12317,19 +15407,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    faustine = callPackage ({ emacs, faust-mode, fetchgit, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    faustine = callPackage ({ emacs
+                            , faust-mode
+                            , fetchgit
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "faustine";
         version = "0.4";
         src = fetchgit {
           url = "https://bitbucket.org/yphil/faustine";
-          rev = "f186461e2bc38ec8ae38bd5ab727cc769218a168";
-          sha256 = "16p7qmljjki4svci3mxzydmvpxaprbnfq6794b3adyyixkmgr6k7";
+          rev = "feb938af3a5363e0e0210aa98a447e1896ceca47";
+          sha256 = "1c0xc1nk9djjk39ksysszliphibnpm7c472p4lvgkmrsmg28i23k";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8b4c6b03c5ff78ce327dcf66b175e266bbc53dbf/recipes/faustine";
           sha256 = "1blmz993xrwkyr7snj7rm07s07imgpdlfqi6wxkm4ns6iwa2q60s";
-          name = "faustine";
+          name = "recipe";
         };
         packageRequires = [ emacs faust-mode ];
         meta = {
@@ -12337,8 +15432,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    fcitx = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    fcitx = callPackage ({ fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "fcitx";
         version = "0.2.3";
         src = fetchFromGitHub {
@@ -12347,10 +15445,10 @@
           rev = "6d552ab44234ed78ce9a50f2412f56197266bc9f";
           sha256 = "08l859rw1lwj6hdxrlxqlxf1cfxv8yv9h1jsgs5zfis3hp7nq39j";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e8c40f09d9397b3ca32a7ed37203f490497dc984/recipes/fcitx";
           sha256 = "0a8wd588c26p3czfp5hn2n46f2vwyg5v301sv0y07b55b1i3ynmx";
-          name = "fcitx";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -12358,8 +15456,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    feature-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    feature-mode = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "feature-mode";
         version = "0.4";
         src = fetchFromGitHub {
@@ -12368,10 +15469,10 @@
           rev = "4bd8f19da816115094beb4b0e085822eb298ac37";
           sha256 = "1cxjygg05v8s96c8z6plk3hl34jaiwg7s7dl7dsk20rj5f54kgw7";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0a70991695f9ff305f12cfa45e0a597f4a782ba3/recipes/feature-mode";
           sha256 = "0ryinmpqb3c91qcna6gbijcmqv3skxdc947dlr5s1w623z9nxgqg";
-          name = "feature-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -12379,8 +15480,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    fill-column-indicator = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    fill-column-indicator = callPackage ({ fetchFromGitHub
+                                         , fetchurl
+                                         , lib
+                                         , melpaBuild }:
+      melpaBuild {
         pname = "fill-column-indicator";
         version = "1.90";
         src = fetchFromGitHub {
@@ -12389,10 +15493,10 @@
           rev = "f7b3f99b41ff017f50a21ad53eed16f8ef5ab7ee";
           sha256 = "0snjznxdwwfdgccdcvrnk467416r244r2r5qcm2sga8l0ha9gw9z";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4ea0c00a7784621fcca0391a9c8ea85e9dd43852/recipes/fill-column-indicator";
           sha256 = "0w8cmijv7ihij9yyncz6lixb6awzzl7n9qpjj2bks1d5rx46blma";
-          name = "fill-column-indicator";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -12400,20 +15504,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    fill-function-arguments = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    fill-function-arguments = callPackage ({ emacs
+                                           , fetchFromGitHub
+                                           , fetchurl
+                                           , lib
+                                           , melpaBuild }:
+      melpaBuild {
         pname = "fill-function-arguments";
         version = "0.9";
         src = fetchFromGitHub {
           owner = "davidshepherd7";
           repo = "fill-function-arguments";
-          rev = "e819fca19a138ae67201220e41fe1d4384fb2a42";
-          sha256 = "102aalb7bfvjgf1klqsx6mn5a4vfjq63kwn7wqs9cmlib1mp8vnf";
+          rev = "bf4b390de851b0bb81309865835fd3ec4c7bfb72";
+          sha256 = "1qq5ab39zyis11lhaarcbpd7s9fvmpymw8wi92iq16fp720l6pfa";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b78eab67517b19516e5d265018afcbff0acfa9ec/recipes/fill-function-arguments";
           sha256 = "1gigzzz2csl3a55jmjx391a5k3ymixnwpblsn0pfgkkk4p3674q0";
-          name = "fill-function-arguments";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -12421,8 +15529,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    finalize = callPackage ({ cl-generic, cl-lib ? null, eieio ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    finalize = callPackage ({ cl-generic
+                            , cl-lib ? null
+                            , eieio ? null
+                            , emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "finalize";
         version = "2.0.0";
         src = fetchFromGitHub {
@@ -12431,10 +15546,10 @@
           rev = "0f7d47c4d50f1c76fc3b43bfc2d4886dd3e8ca27";
           sha256 = "1gvlm4i62af5jscwz0jccc8ra0grprxpg2rlq91d5nn8dn5lpy79";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1b55869b5183644de02687d2e56f9b68854ccda3/recipes/finalize";
           sha256 = "1n0w4kdzc4hv4pprv13lr88gh46slpxdvsc162nqm5mrqp9giqqq";
-          name = "finalize";
+          name = "recipe";
         };
         packageRequires = [ cl-generic cl-lib eieio emacs ];
         meta = {
@@ -12442,8 +15557,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    find-by-pinyin-dired = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, pinyinlib }:
-    melpaBuild {
+    find-by-pinyin-dired = callPackage ({ fetchFromGitHub
+                                        , fetchurl
+                                        , lib
+                                        , melpaBuild
+                                        , pinyinlib }:
+      melpaBuild {
         pname = "find-by-pinyin-dired";
         version = "0.0.3";
         src = fetchFromGitHub {
@@ -12452,10 +15571,10 @@
           rev = "2c48434637bd63840fca4d2c6cf9ebd5dd44658f";
           sha256 = "0ial0lbvg0xbrwn8cm68xc5wxj3xgp110y2zgypkdpak8gkv8b5h";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0aa68b4603bf4071d7d12b40de0138ecab1989d7/recipes/find-by-pinyin-dired";
           sha256 = "150hvih3mdd1dqffgdcv3nn4qhy86s4lhjkfq0cfzgngfwif8qqq";
-          name = "find-by-pinyin-dired";
+          name = "recipe";
         };
         packageRequires = [ pinyinlib ];
         meta = {
@@ -12463,20 +15582,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    find-file-in-project = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
-    melpaBuild {
+    find-file-in-project = callPackage ({ emacs
+                                        , fetchFromGitHub
+                                        , fetchurl
+                                        , ivy
+                                        , lib
+                                        , melpaBuild }:
+      melpaBuild {
         pname = "find-file-in-project";
-        version = "5.6.4";
+        version = "5.6.8";
         src = fetchFromGitHub {
           owner = "technomancy";
           repo = "find-file-in-project";
-          rev = "5691beb79f78c6a0ef1a18460df9fd1571ec3361";
-          sha256 = "0mvli1r7ml596y6v9qsip76j78f58q6jnwb18j8c7rngsrg08rc4";
+          rev = "1c54325cb60bde7496dad4e19f4c2a857999df58";
+          sha256 = "1pxqqpj6cdwbhca6vaj98d86f1l0vl09zp054wf0sv759l25ac0l";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/find-file-in-project";
           sha256 = "0aznnv82xhnilc9j4cdmcgh6ksv7bhjjm3pa76hynnyrfn7kq7wy";
-          name = "find-file-in-project";
+          name = "recipe";
         };
         packageRequires = [ emacs ivy ];
         meta = {
@@ -12484,8 +15608,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    find-file-in-repository = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    find-file-in-repository = callPackage ({ fetchFromGitHub
+                                           , fetchurl
+                                           , lib
+                                           , melpaBuild }:
+      melpaBuild {
         pname = "find-file-in-repository";
         version = "1.2";
         src = fetchFromGitHub {
@@ -12494,10 +15621,10 @@
           rev = "8b888f85029a2ff9159a724b42aeacdb051c3420";
           sha256 = "0wbmmrd7brf4498pdyilz17rzv7221cj8sd4h11gac2r72f1q2md";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/58705ac6201b73851ce4ce9ebeb0e65463765961/recipes/find-file-in-repository";
           sha256 = "0q1ym06w2yn3nzpj018dj6h68f7rmkxczyl061mirjp8z9c6a9q6";
-          name = "find-file-in-repository";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -12505,8 +15632,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    fiplr = callPackage ({ fetchFromGitHub, fetchurl, grizzl, lib, melpaBuild }:
-    melpaBuild {
+    fiplr = callPackage ({ fetchFromGitHub
+                         , fetchurl
+                         , grizzl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "fiplr";
         version = "0.2.4";
         src = fetchFromGitHub {
@@ -12515,10 +15646,10 @@
           rev = "100dfc33f43da8c49e50e8a2222b9d95532f6e24";
           sha256 = "0lwgbd9zwdv7qs39c3fp4hrc17d9wrwwjgba7a14zwrhb27m7j07";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/fiplr";
           sha256 = "1a4w0yqdkz477lfyin4lb9k9qkfpx4350kfxmrqx6dj3aadkikca";
-          name = "fiplr";
+          name = "recipe";
         };
         packageRequires = [ grizzl ];
         meta = {
@@ -12526,20 +15657,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    firefox-controller = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, moz, popwin }:
-    melpaBuild {
+    firefox-controller = callPackage ({ cl-lib ? null
+                                      , fetchFromGitHub
+                                      , fetchurl
+                                      , lib
+                                      , melpaBuild
+                                      , moz
+                                      , popwin }:
+      melpaBuild {
         pname = "firefox-controller";
         version = "2.1";
         src = fetchFromGitHub {
           owner = "cute-jumper";
           repo = "emacs-firefox-controller";
-          rev = "a8af8cbf70afaf6b89a26d6ac69af8e92afc181f";
-          sha256 = "0icgl88pwizwzkdqsxbwhnc6pdyqsfd7wgjnkvg3206i7hcqwpsp";
+          rev = "5b1bedec83206f41672b1b65bba859f235bff48b";
+          sha256 = "04afwxgydrn23bv93zqf9bd2cp02i9dcfqbi809arkmh8723qf6k";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/70a69c20f8dcf73c878f2172dcc9f1796fdc0408/recipes/firefox-controller";
           sha256 = "03y96b3l75w9al8ylijnlb8pcfkwddyfnh8xwig1b6k08zxfgal6";
-          name = "firefox-controller";
+          name = "recipe";
         };
         packageRequires = [ cl-lib moz popwin ];
         meta = {
@@ -12547,8 +15684,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    fireplace = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    fireplace = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "fireplace";
         version = "1.1.2";
         src = fetchFromGitHub {
@@ -12557,10 +15697,10 @@
           rev = "2b966ed65b714c613f79e9144d004dfa3b28f1ed";
           sha256 = "1f5053bbvjdmm64zv6r2qkswkpwvx0s3qz4bwm9zya583a6g0nv8";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4c1ac52c1cfe7ccf46092c2d299ebbffdc1b7609/recipes/fireplace";
           sha256 = "1apcypznq23fc7xgy4xy1c5hvfvjx1xhyq3aaq1lf59v99zchciw";
-          name = "fireplace";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -12568,8 +15708,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    firestarter = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    firestarter = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "firestarter";
         version = "0.2.5";
         src = fetchFromGitHub {
@@ -12578,10 +15721,10 @@
           rev = "4d6b106f325ac1802eabce3c8a7cd0a4c7a32864";
           sha256 = "13daz15v0sshl7lxcg1xcbpl64gklgh50pzk0qxmn5ygw7nlifn0";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5b046eb3b63220b937e1b70f633cb5424dc782a1/recipes/firestarter";
           sha256 = "1cpx664hyrdnpb1jps1x6lm7idwlfjblkfygj48cjz9pzd6ld5mp";
-          name = "firestarter";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -12589,8 +15732,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    fish-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    fish-mode = callPackage ({ emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "fish-mode";
         version = "0.1.4";
         src = fetchFromGitHub {
@@ -12599,10 +15746,10 @@
           rev = "bac709ac1235751952d6022dddc6307d9135d096";
           sha256 = "0a74ghmjjrxfdhk4mvq6lar4w6l6lc4iilabs99smqr2fn5rsslq";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/efac97c0f54a3300251020c4626056526c18b441/recipes/fish-mode";
           sha256 = "0l6k06bs0qdhj3h8vf5fv8c3rbhiqfwszrpb0v2cgnb6xhwzmq14";
-          name = "fish-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -12610,8 +15757,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    fix-input = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    fix-input = callPackage ({ emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "fix-input";
         version = "0.1.1";
         src = fetchFromGitHub {
@@ -12620,10 +15771,10 @@
           rev = "a70edfa7880ff9b082f358607d2a9ad6a8dcc8f3";
           sha256 = "121m0h0nwxr27f9d2llbgl63ni1makcg66lnvg24wx07wggf0n8z";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7d31f907997d1d07ec794a4f09824f43818f035c/recipes/fix-input";
           sha256 = "03xpr7rlv0xq1d9126j1fk0c2j7ssf366n0yc8yzm9vq32n9pp4p";
-          name = "fix-input";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -12631,8 +15782,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    fix-muscle-memory = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    fix-muscle-memory = callPackage ({ fetchFromGitHub
+                                     , fetchurl
+                                     , lib
+                                     , melpaBuild }:
+      melpaBuild {
         pname = "fix-muscle-memory";
         version = "0.93";
         src = fetchFromGitHub {
@@ -12641,10 +15795,10 @@
           rev = "df687aea23c6eac4b751f993893c2fd56e5a8a3b";
           sha256 = "02nl4vz6fnbjc7w1lk1y9z0qw5bsxr407ww0b2wqw6h8spmcpcrc";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c6b0501714a6d82657b88d11e3f79d75eea17d8e/recipes/fix-muscle-memory";
           sha256 = "0qhasnjw0bj5hzw27r8vj6shhwc3zxcp3wmxijh1rpdw4773f7n8";
-          name = "fix-muscle-memory";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -12652,8 +15806,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    fix-word = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    fix-word = callPackage ({ cl-lib ? null
+                            , emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "fix-word";
         version = "0.1.2";
         src = fetchFromGitHub {
@@ -12662,10 +15821,10 @@
           rev = "91552cbceac8e2b7c23036f044fc84f5c6f8e338";
           sha256 = "1pilsd3hkryyl4sd6s4nvmraszkdmcn3qdqi939yjgzp4lz3q412";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/22636390e8a15c09293a1506a901286dd72e565f/recipes/fix-word";
           sha256 = "0a8w09cx8p5pkkd4533nd199axkhdhs2a7blp7syfn40bkscx6xc";
-          name = "fix-word";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -12673,8 +15832,17 @@
           license = lib.licenses.free;
         };
       }) {};
-    fixmee = callPackage ({ back-button, button-lock, fetchFromGitHub, fetchurl, lib, melpaBuild, nav-flash, smartrep, string-utils, tabulated-list ? null }:
-    melpaBuild {
+    fixmee = callPackage ({ back-button
+                          , button-lock
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild
+                          , nav-flash
+                          , smartrep
+                          , string-utils
+                          , tabulated-list ? null }:
+      melpaBuild {
         pname = "fixmee";
         version = "0.8.6";
         src = fetchFromGitHub {
@@ -12683,10 +15851,10 @@
           rev = "aa3be8ad9fcc9c0c7ff15f70cda4ba77de96dd74";
           sha256 = "1hnxdmzqmnp3dr7mpr58pjmigykb3cxwphxzia013kfi37ipf5a0";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f5d06db82e237e6c6babd92a1fd2b58c29662e4f/recipes/fixmee";
           sha256 = "0wnp6h8f547fsi1lkk4ajny7g21dnr76qfhxl82n0l5h1ps4w8mp";
-          name = "fixmee";
+          name = "recipe";
         };
         packageRequires = [
           back-button
@@ -12701,8 +15869,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    flatui-dark-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    flatui-dark-theme = callPackage ({ emacs
+                                     , fetchFromGitHub
+                                     , fetchurl
+                                     , lib
+                                     , melpaBuild }:
+      melpaBuild {
         pname = "flatui-dark-theme";
         version = "0.3.0";
         src = fetchFromGitHub {
@@ -12711,10 +15883,10 @@
           rev = "af5c84e2a2810748cc71a68ec7ba333097cc1f63";
           sha256 = "0c0pm67d8w9jdraap0sswvx7ywly9ifimij2c5w9p4hiph8gisr9";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5f9dc5abeb37422c63cac74f9a006d54c4a7c5a5/recipes/flatui-dark-theme";
           sha256 = "1mswmkhi43fm0cmdgf0ywpy9lmapy0syl65kqh68sa3jqbznhm6y";
-          name = "flatui-dark-theme";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -12722,8 +15894,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    flex-compile = callPackage ({ buffer-manage, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    flex-compile = callPackage ({ buffer-manage
+                                , dash
+                                , emacs
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "flex-compile";
         version = "0.2";
         src = fetchFromGitHub {
@@ -12732,10 +15910,10 @@
           rev = "82e217aaab34dfd1faf7d03c82eca49706190232";
           sha256 = "1zp0gki61g487x6bypxlkbjzi972y80pzmhqdisl6qx9yrmk60vy";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/259caeebc317e81ab9d532a371ea85656c2b1619/recipes/flex-compile";
           sha256 = "1hlh4k7qgln87xajnjjhf1yyg6bgdwd0iczhlfw8gdwfj5xpjd38";
-          name = "flex-compile";
+          name = "recipe";
         };
         packageRequires = [ buffer-manage dash emacs ];
         meta = {
@@ -12743,8 +15921,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    floobits = callPackage ({ fetchFromGitHub, fetchurl, highlight, json ? null, lib, melpaBuild }:
-    melpaBuild {
+    floobits = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , highlight
+                            , json ? null
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "floobits";
         version = "1.9.2";
         src = fetchFromGitHub {
@@ -12753,10 +15936,10 @@
           rev = "ed5586d1bf94f36354091648e824ccb6fcaf807f";
           sha256 = "08m9snmkhdjmvw1pqww9l39xqas9f6yxksjxvfjjfnad8ak80x9b";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/95c859e8440049579630b4c2bcc31e7eaa13b1f1/recipes/floobits";
           sha256 = "1jpk0q4mkf9ag1rqyai993nz5ngzfvxq9n9avmaaq59gkk9cjraf";
-          name = "floobits";
+          name = "recipe";
         };
         packageRequires = [ highlight json ];
         meta = {
@@ -12764,8 +15947,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    flow-minor-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    flow-minor-mode = callPackage ({ emacs
+                                   , fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "flow-minor-mode";
         version = "0.3";
         src = fetchFromGitHub {
@@ -12774,10 +15961,10 @@
           rev = "50dded94ad201fdc9453656a8b15179981cd5acd";
           sha256 = "1vaqml0ypbc14mnwycgm9slkds3bgg6x5qz99kck98acbcfijxk6";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/66504f789069922ea56f268f4da90fac52b601ff/recipes/flow-minor-mode";
           sha256 = "190dv225sb37jawzrasd7qkbznrmkrdnb90l44il63vrlmjv3r1s";
-          name = "flow-minor-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -12785,20 +15972,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    flower = callPackage ({ clomacs, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    flower = callPackage ({ clomacs
+                          , emacs
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "flower";
-        version = "0.4.1";
+        version = "0.4.2";
         src = fetchFromGitHub {
           owner = "PositiveTechnologies";
           repo = "flower";
-          rev = "98c53b03da698833058b9ad6b6eb8be46cfd00f6";
-          sha256 = "08wq66gvqy14mcpm8x14xz3hvw4h7rcd5ivynma91d4358qrmqap";
+          rev = "4d05448dc0118078ec320f564d87acaa740ae47c";
+          sha256 = "02p74f5hfhrhv5l7b9cwfbczsgkpqajlmr66qmkdljgc8ksr86n2";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c8a731715d360aea9af2b898242fd4eee5419d14/recipes/flower";
           sha256 = "1cb9ppgspdrg4yrrlq4sfajpa6s7xiwvdf9b3947rmmxizgqgynd";
-          name = "flower";
+          name = "recipe";
         };
         packageRequires = [ clomacs emacs ];
         meta = {
@@ -12806,8 +15998,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    flx = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    flx = callPackage ({ cl-lib ? null
+                       , fetchFromGitHub
+                       , fetchurl
+                       , lib
+                       , melpaBuild }:
+      melpaBuild {
         pname = "flx";
         version = "0.6.1";
         src = fetchFromGitHub {
@@ -12816,10 +16012,10 @@
           rev = "7fce6a4cdb65ac1b52e2b409ba548767581ce34c";
           sha256 = "0sjybrcnb2sl33swy3q664vqrparajcl0m455gciiih2j87hwadc";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/63bdf3ae2f861e333a8f9c5997f5cc52869d3b3a/recipes/flx";
           sha256 = "04plfhrnw7jx2jaxhbhw4ypydfcb8v0x2m5hyacvrli1mca2iyf9";
-          name = "flx";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -12827,8 +16023,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    flx-ido = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, flx, lib, melpaBuild }:
-    melpaBuild {
+    flx-ido = callPackage ({ cl-lib ? null
+                           , fetchFromGitHub
+                           , fetchurl
+                           , flx
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "flx-ido";
         version = "0.6.1";
         src = fetchFromGitHub {
@@ -12837,10 +16038,10 @@
           rev = "7fce6a4cdb65ac1b52e2b409ba548767581ce34c";
           sha256 = "0sjybrcnb2sl33swy3q664vqrparajcl0m455gciiih2j87hwadc";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/63bdf3ae2f861e333a8f9c5997f5cc52869d3b3a/recipes/flx-ido";
           sha256 = "00wcwbvfjbcx8kyap7rl1b6nsgqdwjzlpv6al2cdpdd19rm1vgdc";
-          name = "flx-ido";
+          name = "recipe";
         };
         packageRequires = [ cl-lib flx ];
         meta = {
@@ -12848,8 +16049,16 @@
           license = lib.licenses.free;
         };
       }) {};
-    flycheck = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pkg-info, seq }:
-    melpaBuild {
+    flycheck = callPackage ({ dash
+                            , emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , let-alist
+                            , lib
+                            , melpaBuild
+                            , pkg-info
+                            , seq }:
+      melpaBuild {
         pname = "flycheck";
         version = "31";
         src = fetchFromGitHub {
@@ -12858,10 +16067,10 @@
           rev = "401b115d10e202a1b31f57340438420081af21ce";
           sha256 = "141i6wzqlb0dslmca6930cal7q4y5wbwzmxrpjk3hgm6nxz483p8";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/649f9c3576e81409ae396606798035173cc6669f/recipes/flycheck";
           sha256 = "045k214dq8bmrai13da6gwdz97a2i998gggxqswqs4g52l1h6hvr";
-          name = "flycheck";
+          name = "recipe";
         };
         packageRequires = [ dash emacs let-alist pkg-info seq ];
         meta = {
@@ -12869,8 +16078,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    flycheck-apertium = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
-    melpaBuild {
+    flycheck-apertium = callPackage ({ fetchFromGitHub
+                                     , fetchurl
+                                     , flycheck
+                                     , lib
+                                     , melpaBuild }:
+      melpaBuild {
         pname = "flycheck-apertium";
         version = "0.2";
         src = fetchFromGitHub {
@@ -12879,10 +16092,10 @@
           rev = "71cf49d5aaee962b995583384bfa045a1d4c3db7";
           sha256 = "14idjjz6fhmq806mmncmqnr9bvcjks6spin8z6jb0gqcg1dbhm06";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7f6cec0d312f0e86e17829e6fd8f87acabc0174f/recipes/flycheck-apertium";
           sha256 = "1cc15sljqs6gvb3wiw7n1wkd714qkvfpw6l1kg4lfx9r4jalcvw7";
-          name = "flycheck-apertium";
+          name = "recipe";
         };
         packageRequires = [ flycheck ];
         meta = {
@@ -12890,8 +16103,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    flycheck-cask = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
-    melpaBuild {
+    flycheck-cask = callPackage ({ dash
+                                 , emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , flycheck
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "flycheck-cask";
         version = "0.4";
         src = fetchFromGitHub {
@@ -12900,10 +16119,10 @@
           rev = "b4667500dcf52f96ec7e0fa10dd07edf191cbf5b";
           sha256 = "1wm5saf29gw0gp0qq5glf9qq3iras99npc2rip7bsnn0czr2mscy";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/flycheck-cask";
           sha256 = "0d2m7mg91k1nazysayryxagql1vi975n7iv0snknhbw4wisqp82f";
-          name = "flycheck-cask";
+          name = "recipe";
         };
         packageRequires = [ dash emacs flycheck ];
         meta = {
@@ -12911,8 +16130,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    flycheck-checkbashisms = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
-    melpaBuild {
+    flycheck-checkbashisms = callPackage ({ emacs
+                                          , fetchFromGitHub
+                                          , fetchurl
+                                          , flycheck
+                                          , lib
+                                          , melpaBuild }:
+      melpaBuild {
         pname = "flycheck-checkbashisms";
         version = "1.5";
         src = fetchFromGitHub {
@@ -12921,10 +16145,10 @@
           rev = "39362240b8e38e6ddc1da2e2c2229e3fecdf6057";
           sha256 = "1s2zq97d7ryif6rlbvriz36dh23wmwi67v4q6krl77dfzcs705b3";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f5678ea5aef4dc8a517d6d9381a64f182645d344/recipes/flycheck-checkbashisms";
           sha256 = "1rq0ymlr1dl39v0sfyjmdv4pq3q9116cz9wvgpvfgalq8759q5sz";
-          name = "flycheck-checkbashisms";
+          name = "recipe";
         };
         packageRequires = [ emacs flycheck ];
         meta = {
@@ -12932,8 +16156,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    flycheck-checkpatch = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
-    melpaBuild {
+    flycheck-checkpatch = callPackage ({ emacs
+                                       , fetchFromGitHub
+                                       , fetchurl
+                                       , flycheck
+                                       , lib
+                                       , melpaBuild }:
+      melpaBuild {
         pname = "flycheck-checkpatch";
         version = "0.1";
         src = fetchFromGitHub {
@@ -12942,10 +16171,10 @@
           rev = "aca98ea79f8b26a95f9dbdd4142b01fdd2def866";
           sha256 = "0bs36dp1jy2z9zfq4mnrin9ik0ffl7023h6dx3qbfya1gcxs07py";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/193aaae5640434559cd479df1463ee44eab14d86/recipes/flycheck-checkpatch";
           sha256 = "1apjn26n663rjddv5iagfs65fdf22049ykmzggybbnprvnmasf55";
-          name = "flycheck-checkpatch";
+          name = "recipe";
         };
         packageRequires = [ emacs flycheck ];
         meta = {
@@ -12953,20 +16182,27 @@
           license = lib.licenses.free;
         };
       }) {};
-    flycheck-clojure = callPackage ({ cider, emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild }:
-    melpaBuild {
+    flycheck-clojure = callPackage ({ cider
+                                    , emacs
+                                    , fetchFromGitHub
+                                    , fetchurl
+                                    , flycheck
+                                    , let-alist
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "flycheck-clojure";
         version = "0.1.5";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "squiggly-clojure";
-          rev = "fc0f1473c85b5287c8a62c1eee86894c98fbb84c";
-          sha256 = "0dqnv7l82h09janakq2b3ncz3jj99418pb91w0gabvfylww3pm21";
+          rev = "67985fba99d0b2e524d426f266e58499ab8c5514";
+          sha256 = "1bv5px1px4cbaqc3d805px6irx654b3asj5g8frk6hxr99l6x93w";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c9c642a234f93ed4cf5edcf27a552a8916984946/recipes/flycheck-clojure";
           sha256 = "1b20gcs6fvq9pm4nl2qwsf34sg6wxngdql921q2pyh5n1xsxhm28";
-          name = "flycheck-clojure";
+          name = "recipe";
         };
         packageRequires = [ cider emacs flycheck let-alist ];
         meta = {
@@ -12974,20 +16210,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    flycheck-color-mode-line = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
-    melpaBuild {
+    flycheck-color-mode-line = callPackage ({ dash
+                                            , emacs
+                                            , fetchFromGitHub
+                                            , fetchurl
+                                            , flycheck
+                                            , lib
+                                            , melpaBuild }:
+      melpaBuild {
         pname = "flycheck-color-mode-line";
         version = "0.3";
         src = fetchFromGitHub {
           owner = "flycheck";
           repo = "flycheck-color-mode-line";
-          rev = "c85319f8d2579e770c9060bfef11bedc1370d8be";
-          sha256 = "11xc08xld758xx9myqjsiqz8vk3gh4d9c4yswswvky6mrx34c0y5";
+          rev = "9b69ab84f4fa51abeec4882b3a8d1453dfddb744";
+          sha256 = "0qll32rhw8q7z41qwzcsh9k5yhdg6bp4wx6w8j65ky52qia767k4";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/02b5b60b74581ff0d1815155223e0c6e94a851a1/recipes/flycheck-color-mode-line";
           sha256 = "0hw19nsh5h2l8qbp7brqmml2fhs8a0x850vlvq3qfd7z248gvhrq";
-          name = "flycheck-color-mode-line";
+          name = "recipe";
         };
         packageRequires = [ dash emacs flycheck ];
         meta = {
@@ -12995,20 +16237,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    flycheck-crystal = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
-    melpaBuild {
+    flycheck-crystal = callPackage ({ fetchFromGitHub
+                                    , fetchurl
+                                    , flycheck
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "flycheck-crystal";
         version = "0.1.0";
         src = fetchFromGitHub {
           owner = "crystal-lang-tools";
           repo = "emacs-crystal-mode";
-          rev = "0fe6815201bebe4c5ff6857bd541d95b05132b10";
-          sha256 = "0r75dvc0jqcqi1qjns8zj132dnm0s6mvqlqynkis16nigbawix8m";
+          rev = "5795e05450016d1337c1a198ae7ea76deeec40e2";
+          sha256 = "0yipv79gcwp4i3y8gxjd1npgi8fx2iv8lipb14a8165y84ygkf4l";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c718f809af30226611358f9aaed7519e52923fd3/recipes/flycheck-crystal";
           sha256 = "04avxav2rayprm09xkphs1ni10j1kk10j7m77afcac0gnma5rwyn";
-          name = "flycheck-crystal";
+          name = "recipe";
         };
         packageRequires = [ flycheck ];
         meta = {
@@ -13016,8 +16262,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    flycheck-dmd-dub = callPackage ({ f, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
-    melpaBuild {
+    flycheck-dmd-dub = callPackage ({ f
+                                    , fetchFromGitHub
+                                    , fetchurl
+                                    , flycheck
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "flycheck-dmd-dub";
         version = "0.12";
         src = fetchFromGitHub {
@@ -13026,10 +16277,10 @@
           rev = "41a839e18eb7159175c59a2f8b2f5f283191e33f";
           sha256 = "0a78np6nb9ciz440n9ks6kybwggkq99knzv7swbmvngvhg96khbx";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a812594901c1099283bdf51fbea1aa077cfc588d/recipes/flycheck-dmd-dub";
           sha256 = "0pg3sf7h6xqv65yqclhlb7fx1mp2w0m3qk4vji6m438kxy6fhzqm";
-          name = "flycheck-dmd-dub";
+          name = "recipe";
         };
         packageRequires = [ f flycheck ];
         meta = {
@@ -13037,8 +16288,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    flycheck-gometalinter = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
-    melpaBuild {
+    flycheck-gometalinter = callPackage ({ emacs
+                                         , fetchFromGitHub
+                                         , fetchurl
+                                         , flycheck
+                                         , lib
+                                         , melpaBuild }:
+      melpaBuild {
         pname = "flycheck-gometalinter";
         version = "0.1.4";
         src = fetchFromGitHub {
@@ -13047,10 +16303,10 @@
           rev = "2e863429cc953cf4c14783e249df56d1ae669868";
           sha256 = "07r2csy2psflvg0pl6n9scfwhnp9mv7hs02hz861v5kbkfx0ajzw";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8bfe9f2d030c04fb292297eb9226072bfea2ac64/recipes/flycheck-gometalinter";
           sha256 = "1bnvj5kwgbh0dv989rsjcvmcij1ahwcz0vpr6a8f2p6wwvksw1h2";
-          name = "flycheck-gometalinter";
+          name = "recipe";
         };
         packageRequires = [ emacs flycheck ];
         meta = {
@@ -13058,8 +16314,17 @@
           license = lib.licenses.free;
         };
       }) {};
-    flycheck-haskell = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, haskell-mode, let-alist, lib, melpaBuild, seq }:
-    melpaBuild {
+    flycheck-haskell = callPackage ({ dash
+                                    , emacs
+                                    , fetchFromGitHub
+                                    , fetchurl
+                                    , flycheck
+                                    , haskell-mode
+                                    , let-alist
+                                    , lib
+                                    , melpaBuild
+                                    , seq }:
+      melpaBuild {
         pname = "flycheck-haskell";
         version = "0.8";
         src = fetchFromGitHub {
@@ -13068,10 +16333,10 @@
           rev = "ee3401d97cc5e8edc216f2369e9dea3d363e462c";
           sha256 = "0yryd346cp5zir3icldkhjzwjb0bkq8rlidbr62dry1cw9bic6z0";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6ca601613788ae830655e148a222625035195f55/recipes/flycheck-haskell";
           sha256 = "12lgirz3j6n5ns2ikq4n41z0d33qp1lb5lfz1q11qvpbpn9d0jn7";
-          name = "flycheck-haskell";
+          name = "recipe";
         };
         packageRequires = [ dash emacs flycheck haskell-mode let-alist seq ];
         meta = {
@@ -13079,8 +16344,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    flycheck-hdevtools = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
-    melpaBuild {
+    flycheck-hdevtools = callPackage ({ fetchFromGitHub
+                                      , fetchurl
+                                      , flycheck
+                                      , lib
+                                      , melpaBuild }:
+      melpaBuild {
         pname = "flycheck-hdevtools";
         version = "0.3";
         src = fetchFromGitHub {
@@ -13089,10 +16358,10 @@
           rev = "fbf90b9a7d2d90f69ac55b57d18f0f4a47afed61";
           sha256 = "136mdg21a8sqxhijsjsvpli7r7sb40nmf80p6gmgb1ghwmhlm8k3";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9e210eb2405cc85dd1d03e9119d2249178950398/recipes/flycheck-hdevtools";
           sha256 = "0ahvai1q4x59ryiyccvqvjisgqbaiahx4gk8ssaxhblhj0sqga93";
-          name = "flycheck-hdevtools";
+          name = "recipe";
         };
         packageRequires = [ flycheck ];
         meta = {
@@ -13100,8 +16369,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    flycheck-irony = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, irony, lib, melpaBuild }:
-    melpaBuild {
+    flycheck-irony = callPackage ({ emacs
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , flycheck
+                                  , irony
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "flycheck-irony";
         version = "0.1.0";
         src = fetchFromGitHub {
@@ -13110,10 +16385,10 @@
           rev = "34940ae5ab8f4c721d9c1118ebfc3496d7e67a84";
           sha256 = "0qa5a8wzvzxwqql92ibc9s43k8sj3vwn7skz9hfr8av0skkhx996";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1e367afce9a792c168ef1e7e20cc5903f7b570d8/recipes/flycheck-irony";
           sha256 = "0qk814m5s7mjba659llml0gy1g3045w8l1g73w2pnm1pbpqdfn3z";
-          name = "flycheck-irony";
+          name = "recipe";
         };
         packageRequires = [ emacs flycheck irony ];
         meta = {
@@ -13121,20 +16396,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    flycheck-joker = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
-    melpaBuild {
+    flycheck-joker = callPackage ({ fetchFromGitHub
+                                  , fetchurl
+                                  , flycheck
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "flycheck-joker";
-        version = "1.1.0";
+        version = "1.2.0";
         src = fetchFromGitHub {
           owner = "candid82";
           repo = "flycheck-joker";
-          rev = "c34c3922a2e8bc918f250602e0ddf655cdcad456";
-          sha256 = "0fp7h0pmxk02x1kisqvnb9wkjjn9bl91capmnllrb7qmb24w6pd5";
+          rev = "0d8d5683a273093ca12841bf93d10dae97ccbc5d";
+          sha256 = "0r9w0ky1522yz1jdi8fd36lpdjm30vxq41x77vswikqxvscri3dq";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/599bf33a5d4a4a590b355001e532cab4e1ee9ef6/recipes/flycheck-joker";
           sha256 = "0war80zdljpjhfihqrind8471ic7l4z7j74zmrysybxvnd5nr7l3";
-          name = "flycheck-joker";
+          name = "recipe";
         };
         packageRequires = [ flycheck ];
         meta = {
@@ -13142,8 +16421,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    flycheck-julia = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
-    melpaBuild {
+    flycheck-julia = callPackage ({ emacs
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , flycheck
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "flycheck-julia";
         version = "0.1.1";
         src = fetchFromGitHub {
@@ -13152,10 +16436,10 @@
           rev = "213b60a5a9a1cb7887260e1d159b5bb27167cbb6";
           sha256 = "0wk8mc8j67dmc3mxzrhypgxmyywwrjh5q5llj4m2mgf0j7yp2576";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4e964e3c6f737d0102b4fd7440fa9d434e6382bf/recipes/flycheck-julia";
           sha256 = "0340bv0lifs8pajk7gh7rngdjg62vaggn5biyysng642dlg5fwqs";
-          name = "flycheck-julia";
+          name = "recipe";
         };
         packageRequires = [ emacs flycheck ];
         meta = {
@@ -13163,20 +16447,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    flycheck-kotlin = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
-    melpaBuild {
+    flycheck-kotlin = callPackage ({ fetchFromGitHub
+                                   , fetchurl
+                                   , flycheck
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "flycheck-kotlin";
         version = "0.3";
         src = fetchFromGitHub {
           owner = "whirm";
           repo = "flycheck-kotlin";
-          rev = "cbb9fbf70dbe8efcc3971b3606ee95c97469b1fe";
-          sha256 = "0bxjx7xcpscv6vv4yxll8hh43aabv2dnrvkymb47jm3yvjr9cs1c";
+          rev = "44dfae49a7355232492e17c150b7f80a84835c45";
+          sha256 = "1495yxk308d1j3hw8gfdrsg8xs1imzgwfnwadrz9hx36rjd2dhj5";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f158727cc8892aadba0a613dd08e65e2fc791b48/recipes/flycheck-kotlin";
           sha256 = "0vh4f3ap1ciddf2fvfnjz668d6spyx49xs2wfp1hrzxn5yqpnra5";
-          name = "flycheck-kotlin";
+          name = "recipe";
         };
         packageRequires = [ flycheck ];
         meta = {
@@ -13184,8 +16472,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    flycheck-ledger = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
-    melpaBuild {
+    flycheck-ledger = callPackage ({ fetchFromGitHub
+                                   , fetchurl
+                                   , flycheck
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "flycheck-ledger";
         version = "0.4";
         src = fetchFromGitHub {
@@ -13194,10 +16486,10 @@
           rev = "9401b6c83f60bfd29edfc62fee76f75e17a3a41e";
           sha256 = "1pdssw5k88ym5fczllfjv26sp4brlyrywnlzq5baha5pq91h9cb6";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/dc715e6849aa5d6017e2478514c4a0d84c7ddbe5/recipes/flycheck-ledger";
           sha256 = "0807pd2km4r60wgd6jakscbx63ab22d9kvf1cml0ad8wynsap7jl";
-          name = "flycheck-ledger";
+          name = "recipe";
         };
         packageRequires = [ flycheck ];
         meta = {
@@ -13205,8 +16497,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    flycheck-mix = callPackage ({ elixir-mode, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
-    melpaBuild {
+    flycheck-mix = callPackage ({ elixir-mode
+                                , fetchFromGitHub
+                                , fetchurl
+                                , flycheck
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "flycheck-mix";
         version = "1.0.0";
         src = fetchFromGitHub {
@@ -13215,10 +16512,10 @@
           rev = "c565ebb12a48fcd49cc65656d79295c3288fcb84";
           sha256 = "1yncail979sfljmib7b1m9aw376xd4b76apz4d50hj83lrfy169c";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fd2a4d71b7f4c0082b687a23fd367d55186625a9/recipes/flycheck-mix";
           sha256 = "1wp8lp45lc519w3xsws2c91jlbfmc0pc8764kxsifk74akwcizfl";
-          name = "flycheck-mix";
+          name = "recipe";
         };
         packageRequires = [ elixir-mode flycheck ];
         meta = {
@@ -13226,20 +16523,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    flycheck-mmark = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
-    melpaBuild {
+    flycheck-mmark = callPackage ({ emacs
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , flycheck
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "flycheck-mmark";
         version = "0.1.0";
         src = fetchFromGitHub {
           owner = "mmark-md";
           repo = "flycheck-mmark";
-          rev = "b73b40cb9c5cf6bc6fa501aa87a4c30b210c0c5f";
-          sha256 = "1w75accl67i0qwadwp7dgpxaj0i8zwckvv5isyn93vknzw5dz66x";
+          rev = "9ac97f2ff7c669f1c5581b1a6677daa2383b0884";
+          sha256 = "0yis6dgvclm434zycc731y48ac4wviafn1k9w18qmlz9qnjqpivd";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2fd10423ab80e32245bb494005c8f87a8987fffb/recipes/flycheck-mmark";
           sha256 = "0lnw7pz40hijcpi9b92vjxvvyh9v50ww2f2r8z9pyhl9mjy2245x";
-          name = "flycheck-mmark";
+          name = "recipe";
         };
         packageRequires = [ emacs flycheck ];
         meta = {
@@ -13247,8 +16549,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    flycheck-nimsuggest = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, nim-mode }:
-    melpaBuild {
+    flycheck-nimsuggest = callPackage ({ emacs
+                                       , fetchFromGitHub
+                                       , fetchurl
+                                       , flycheck
+                                       , lib
+                                       , melpaBuild
+                                       , nim-mode }:
+      melpaBuild {
         pname = "flycheck-nimsuggest";
         version = "0.8.1";
         src = fetchFromGitHub {
@@ -13257,10 +16565,10 @@
           rev = "8b1c69e9aa924368bc4dadd4cde818ff158cd3f0";
           sha256 = "0vnwy7b3xs2smbr6ah6yk8hq7vvsciq7d6m1qr91nfnazdgvxmvg";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cb4170f002dbcd1906e81836f3ce035b1e81c379/recipes/flycheck-nimsuggest";
           sha256 = "099mlzramm6z66zyjb6ypn7qb0hpvwbbgk9ydsanj8sni0dd66hv";
-          name = "flycheck-nimsuggest";
+          name = "recipe";
         };
         packageRequires = [ emacs flycheck nim-mode ];
         meta = {
@@ -13268,8 +16576,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    flycheck-objc-clang = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
-    melpaBuild {
+    flycheck-objc-clang = callPackage ({ emacs
+                                       , fetchFromGitHub
+                                       , fetchurl
+                                       , flycheck
+                                       , lib
+                                       , melpaBuild }:
+      melpaBuild {
         pname = "flycheck-objc-clang";
         version = "2.0.2";
         src = fetchFromGitHub {
@@ -13278,10 +16591,10 @@
           rev = "f4a76ac199b67ff383ab5e70434c9b98b48c92d5";
           sha256 = "0ryanx4vmy9jwqjnwvma6dm136y4fh227cyhz206km6595bbn3nc";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4ff4412f507371b93cfb85fc744e54110cd87338/recipes/flycheck-objc-clang";
           sha256 = "07mzwd04a69d7xpkjmhfmf95j69h6accnf9bb9br7jb1hi9vdalp";
-          name = "flycheck-objc-clang";
+          name = "recipe";
         };
         packageRequires = [ emacs flycheck ];
         meta = {
@@ -13289,8 +16602,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    flycheck-ocaml = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild, merlin }:
-    melpaBuild {
+    flycheck-ocaml = callPackage ({ emacs
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , flycheck
+                                  , let-alist
+                                  , lib
+                                  , melpaBuild
+                                  , merlin }:
+      melpaBuild {
         pname = "flycheck-ocaml";
         version = "0.3";
         src = fetchFromGitHub {
@@ -13299,10 +16619,10 @@
           rev = "9b4cd83ad2a87cc94b5d4e1ac26ac235475f1e6c";
           sha256 = "1phfarws2aajkgcl96hqa4ydmb1yncg10q2ldzf8ff6yd6mvk51l";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8ce9283eb1285953a2578eb7c4d280b4d98c801f/recipes/flycheck-ocaml";
           sha256 = "1cv2bb66aql2kj1y1gsl4xji8yrzrq6rd8hxxs5vpfsk47052lf7";
-          name = "flycheck-ocaml";
+          name = "recipe";
         };
         packageRequires = [ emacs flycheck let-alist merlin ];
         meta = {
@@ -13310,8 +16630,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    flycheck-package = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, package-lint }:
-    melpaBuild {
+    flycheck-package = callPackage ({ fetchFromGitHub
+                                    , fetchurl
+                                    , flycheck
+                                    , lib
+                                    , melpaBuild
+                                    , package-lint }:
+      melpaBuild {
         pname = "flycheck-package";
         version = "0.12";
         src = fetchFromGitHub {
@@ -13320,10 +16645,10 @@
           rev = "afe8a49343d90d08ee72ac6f993d424dcc39cc38";
           sha256 = "19pz8h01yacfqsyh5940pam6vigvavsqg6qd84994d7mmzl534qa";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d17ec69c9f192625e74dfadf03b11d0d7dc575e7/recipes/flycheck-package";
           sha256 = "0068kpia17rsgjdmzsjnw0n6x5z9jvfxggxlzkszvwsx73mvcs2d";
-          name = "flycheck-package";
+          name = "recipe";
         };
         packageRequires = [ flycheck package-lint ];
         meta = {
@@ -13331,8 +16656,39 @@
           license = lib.licenses.free;
         };
       }) {};
-    flycheck-pony = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
-    melpaBuild {
+    flycheck-phpstan = callPackage ({ emacs
+                                    , fetchFromGitHub
+                                    , fetchurl
+                                    , flycheck
+                                    , lib
+                                    , melpaBuild
+                                    , phpstan }:
+      melpaBuild {
+        pname = "flycheck-phpstan";
+        version = "0.2.1";
+        src = fetchFromGitHub {
+          owner = "emacs-php";
+          repo = "phpstan.el";
+          rev = "3653f2a316f4199cbd3238e984eea2325e2618d5";
+          sha256 = "1dyba8hpr16nsdv1i45pl3w97728w7p8vl9gf5gvd18xcll4848d";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/5a2b6cc39957e6d7185bd2bdfa3755e5b1f474a6/recipes/flycheck-phpstan";
+          sha256 = "1dr0h6cnwxdjmhlackv4gpsljwzs27gk41p8q99r0m44dada9gaf";
+          name = "recipe";
+        };
+        packageRequires = [ emacs flycheck phpstan ];
+        meta = {
+          homepage = "https://melpa.org/#/flycheck-phpstan";
+          license = lib.licenses.free;
+        };
+      }) {};
+    flycheck-pony = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , flycheck
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "flycheck-pony";
         version = "0.2.1";
         src = fetchFromGitHub {
@@ -13341,10 +16697,10 @@
           rev = "3d3387133a44f5b3f0fb178ef4addf6e1ce1df2f";
           sha256 = "1da10q378k5kbcj0rrpzhm7r3ym4rfwc7v1ialcndbmflsn09m5s";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e2bcb82f4ddb92243058c9ab1a67d4f7ef87b155/recipes/flycheck-pony";
           sha256 = "18w1d7y3jsmsc4wg0909p72cnvbxzsmnirmrahhwgsb963fij5qk";
-          name = "flycheck-pony";
+          name = "recipe";
         };
         packageRequires = [ flycheck ];
         meta = {
@@ -13352,8 +16708,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    flycheck-popup-tip = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, popup }:
-    melpaBuild {
+    flycheck-popup-tip = callPackage ({ emacs
+                                      , fetchFromGitHub
+                                      , fetchurl
+                                      , flycheck
+                                      , lib
+                                      , melpaBuild
+                                      , popup }:
+      melpaBuild {
         pname = "flycheck-popup-tip";
         version = "0.12.2";
         src = fetchFromGitHub {
@@ -13362,10 +16724,10 @@
           rev = "ef86aad907f27ca076859d8d9416f4f7727619c6";
           sha256 = "1bi6f9nm4bylsbjv4qnkar35s6xzdf2cc2cxi3g691p9527apdz6";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9b2269ee9532bb092756ae0c0693cb44b73820e8/recipes/flycheck-popup-tip";
           sha256 = "1j8pgljnxcbfh08qpbr9jkw56l7d6k8lmdcsjbi6jd7jmyqbqvnx";
-          name = "flycheck-popup-tip";
+          name = "recipe";
         };
         packageRequires = [ emacs flycheck popup ];
         meta = {
@@ -13373,8 +16735,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    flycheck-pos-tip = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, pos-tip }:
-    melpaBuild {
+    flycheck-pos-tip = callPackage ({ emacs
+                                    , fetchFromGitHub
+                                    , fetchurl
+                                    , flycheck
+                                    , lib
+                                    , melpaBuild
+                                    , pos-tip }:
+      melpaBuild {
         pname = "flycheck-pos-tip";
         version = "0.3";
         src = fetchFromGitHub {
@@ -13383,10 +16751,10 @@
           rev = "3f1d5297fdff44a14ee624160eefdc678e2bd0bd";
           sha256 = "0qxx3xdgk5l793yg5ffbi5qhrxrf6akwdz93n2vibpkdjkvzyh2y";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/698843f75e17b9e6160487c0153f9d6b4af288f6/recipes/flycheck-pos-tip";
           sha256 = "09i2jmwj8b915fhyczwdb1j7c551ggbva33avis77ga1s9v3nsf9";
-          name = "flycheck-pos-tip";
+          name = "recipe";
         };
         packageRequires = [ emacs flycheck pos-tip ];
         meta = {
@@ -13394,20 +16762,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    flycheck-pycheckers = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
-    melpaBuild {
+    flycheck-pycheckers = callPackage ({ fetchFromGitHub
+                                       , fetchurl
+                                       , flycheck
+                                       , lib
+                                       , melpaBuild }:
+      melpaBuild {
         pname = "flycheck-pycheckers";
-        version = "0.8";
+        version = "0.9";
         src = fetchFromGitHub {
           owner = "msherry";
           repo = "flycheck-pycheckers";
-          rev = "facb6e6cff7baaf38cf4e76a3e27a508225fc3f7";
-          sha256 = "061iahihq348ncbx9zh8ihca6j2fkc1nygk5f7v2q4j2g7kmfv8n";
+          rev = "526488b4d8a2067ca666ed8f4de631db79651fb3";
+          sha256 = "17arb41j884gg8xdbc7nf0raahzinkslkpr161497dvs2xfpb9zi";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/af36dca316b318d25d65c9e842f15f736e19ea63/recipes/flycheck-pycheckers";
           sha256 = "18ski3bp8x33589pc273i5ia3hffvlb4czrd97wkfgr4k59ww6yq";
-          name = "flycheck-pycheckers";
+          name = "recipe";
         };
         packageRequires = [ flycheck ];
         meta = {
@@ -13415,8 +16787,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    flycheck-rebar3 = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
-    melpaBuild {
+    flycheck-rebar3 = callPackage ({ fetchFromGitHub
+                                   , fetchurl
+                                   , flycheck
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "flycheck-rebar3";
         version = "1.1.0";
         src = fetchFromGitHub {
@@ -13425,10 +16801,10 @@
           rev = "56a7c94857f0a0ea6a2a73c476a1a2faadc0f7c6";
           sha256 = "1pas49arri2vs9zm3r8jl4md74p5fpips3imc3s7nafbfrhh8ix3";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2acff5eea030b91e457df8aa75243993c87ca00e/recipes/flycheck-rebar3";
           sha256 = "1ml9k61n5vy4c2q6c10q9j10ky0iqkinx21bl7hip1r6b5b1kmmc";
-          name = "flycheck-rebar3";
+          name = "recipe";
         };
         packageRequires = [ flycheck ];
         meta = {
@@ -13436,20 +16812,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    flycheck-rtags = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, rtags }:
-    melpaBuild {
+    flycheck-rtags = callPackage ({ emacs
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , flycheck
+                                  , lib
+                                  , melpaBuild
+                                  , rtags }:
+      melpaBuild {
         pname = "flycheck-rtags";
         version = "2.18";
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "98d668e85cf9ae84e775742752c5656dd2df2f17";
-          sha256 = "0raqjbkl1ykga4ahgl9xw49cgh3cyqcf42z36z7d6fz1fw192kg0";
+          rev = "7e6b6f21935eedbe4678ba91c5531ac162b51a5a";
+          sha256 = "12629d1s8rplhjh17n3bmgnkpscq4gljgyl84j8qyhh40dwq1qk0";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/flycheck-rtags";
           sha256 = "00v6shfs7piqapmyqyi0fk3182rcfa3p8wr2cm5vqlrana13kbw4";
-          name = "flycheck-rtags";
+          name = "recipe";
         };
         packageRequires = [ emacs flycheck rtags ];
         meta = {
@@ -13457,20 +16839,27 @@
           license = lib.licenses.free;
         };
       }) {};
-    flycheck-status-emoji = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild }:
-    melpaBuild {
+    flycheck-status-emoji = callPackage ({ cl-lib ? null
+                                         , emacs
+                                         , fetchFromGitHub
+                                         , fetchurl
+                                         , flycheck
+                                         , let-alist
+                                         , lib
+                                         , melpaBuild }:
+      melpaBuild {
         pname = "flycheck-status-emoji";
-        version = "1.2.2";
+        version = "1.3";
         src = fetchFromGitHub {
           owner = "liblit";
           repo = "flycheck-status-emoji";
-          rev = "2f323cb210a280fc05061f3fc689c627b40bfcb3";
-          sha256 = "0gz18jp5bcwm86w6ir8vyf8rb3l2h524zfvx0jpfk0k1mmxj9cs7";
+          rev = "61e93ac41847d27b8eea3a334ced2d1783687b77";
+          sha256 = "104zz9fihvd5klzdcaxsdmmfp0q5qisq5bbff48rfwdxnlp8dskr";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5abd6aaa8d2bf55ae75cd217820763531f91958b/recipes/flycheck-status-emoji";
           sha256 = "0p42424b1fsmfcjyl252vhblppmpjwd6br2yqh10fi60wmprvn2p";
-          name = "flycheck-status-emoji";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs flycheck let-alist ];
         meta = {
@@ -13478,8 +16867,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    flycheck-swift = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
-    melpaBuild {
+    flycheck-swift = callPackage ({ emacs
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , flycheck
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "flycheck-swift";
         version = "2.0";
         src = fetchFromGitHub {
@@ -13488,10 +16882,10 @@
           rev = "822d1415eabfd464adc52063f9c44da1c87f0ff9";
           sha256 = "0gf7cxrsrf62kamm4xy1fi4v264szm6qk607ifg4bi5dmdc10b0k";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fd99bea06079c4231363c37e3361bd9e5b1ba490/recipes/flycheck-swift";
           sha256 = "1s6rn4wyz9la6bw228jfxx8dxjyk5hf8r3vbmq0k808p772zki0z";
-          name = "flycheck-swift";
+          name = "recipe";
         };
         packageRequires = [ emacs flycheck ];
         meta = {
@@ -13499,8 +16893,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    flycheck-swift3 = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
-    melpaBuild {
+    flycheck-swift3 = callPackage ({ emacs
+                                   , fetchFromGitHub
+                                   , fetchurl
+                                   , flycheck
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "flycheck-swift3";
         version = "2.0.2";
         src = fetchFromGitHub {
@@ -13509,10 +16908,10 @@
           rev = "06a6f98d7e498860b345bbd03e96bfe59608f508";
           sha256 = "0h1n4x0fvqfb6jcapbab1ck6bj4d7irbn9zz2hxv2rlrkqxfsmh3";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f1fb8c731c118327dc0bbb726e046fec46bcfb82/recipes/flycheck-swift3";
           sha256 = "05yfrn42svcvdkr8mx16ii8llhzn33lxdawksjqiqg671s6fgdpa";
-          name = "flycheck-swift3";
+          name = "recipe";
         };
         packageRequires = [ emacs flycheck ];
         meta = {
@@ -13520,8 +16919,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    flycheck-tip = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, popup }:
-    melpaBuild {
+    flycheck-tip = callPackage ({ emacs
+                                , fetchFromGitHub
+                                , fetchurl
+                                , flycheck
+                                , lib
+                                , melpaBuild
+                                , popup }:
+      melpaBuild {
         pname = "flycheck-tip";
         version = "0.5.0";
         src = fetchFromGitHub {
@@ -13530,10 +16935,10 @@
           rev = "0bfddf52ae4ec48d970324f8336a5d62986bbc9e";
           sha256 = "0azjr5mfb3hnb66m1b2319i035mn5i9qz24y7fj5crhnc9vp8w3s";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/024f1e588e94014734fa252ee7bdb00b4991ede9/recipes/flycheck-tip";
           sha256 = "0zab1zknrnsw5xh5pwzzcpz7p40bbywkf9zx99sgsd6b5j1jz656";
-          name = "flycheck-tip";
+          name = "recipe";
         };
         packageRequires = [ emacs flycheck popup ];
         meta = {
@@ -13541,20 +16946,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    flycheck-title = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
-    melpaBuild {
+    flycheck-title = callPackage ({ emacs
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , flycheck
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "flycheck-title";
         version = "1.0";
         src = fetchFromGitHub {
           owner = "Wilfred";
           repo = "flycheck-title";
-          rev = "2b7a11c39420e517a07d0c95126455c1617f2c61";
-          sha256 = "07p3bwf4mvsdxvqwl9zd35rm6ax6ywqiy8gsh1ag3ygqbmd94cwy";
+          rev = "4686fa30069f6f3d996bd63978b8fd47f534df24";
+          sha256 = "18s60kvvh9glk7b1fj5b18shif0h9cfkh0zrvljscxid01nk9l7k";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2996b70645cd6fd093e3b31b9586ce5acb036cf6/recipes/flycheck-title";
           sha256 = "1cxid9qmzy8pl8qkvr6kgvfqm05pjw8cxpz66x619hbkw2vr7sza";
-          name = "flycheck-title";
+          name = "recipe";
         };
         packageRequires = [ emacs flycheck ];
         meta = {
@@ -13562,20 +16972,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    flycheck-yamllint = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
-    melpaBuild {
+    flycheck-yamllint = callPackage ({ fetchFromGitHub
+                                     , fetchurl
+                                     , flycheck
+                                     , lib
+                                     , melpaBuild }:
+      melpaBuild {
         pname = "flycheck-yamllint";
         version = "0.1.0";
         src = fetchFromGitHub {
           owner = "krzysztof-magosa";
           repo = "flycheck-yamllint";
-          rev = "aa211b1243168a4f752888c0014c5b9d2da178b1";
-          sha256 = "1dg2lymb53vp16isdc6k0gq1a43h7vjpksbacskyd4nwmsxaf2bm";
+          rev = "110d310fae409e1869b82c34e60936bd3783dc69";
+          sha256 = "0xfmnwmc26wzfw1r4q70yxzm9qqvcpxx953pvssavrxfyg3bdgf4";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/932ee0a1f13a52d53102b90911da79145208cbb5/recipes/flycheck-yamllint";
           sha256 = "1q2sy0hsbnwdlwq99wk8n5gi9fd8bs4jvi859np8bylbhhb3kj8m";
-          name = "flycheck-yamllint";
+          name = "recipe";
         };
         packageRequires = [ flycheck ];
         meta = {
@@ -13583,8 +16997,16 @@
           license = lib.licenses.free;
         };
       }) {};
-    flycheck-ycmd = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild, ycmd }:
-    melpaBuild {
+    flycheck-ycmd = callPackage ({ dash
+                                 , emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , flycheck
+                                 , let-alist
+                                 , lib
+                                 , melpaBuild
+                                 , ycmd }:
+      melpaBuild {
         pname = "flycheck-ycmd";
         version = "1.2";
         src = fetchFromGitHub {
@@ -13593,10 +17015,10 @@
           rev = "d042a673b4d717c3ca9d641f120bfe16c994c740";
           sha256 = "0rxw86xi9xgr0fp6wmd6hgqgqr9flk7p4lcr0052jhlwknj1nrx0";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/flycheck-ycmd";
           sha256 = "114k5y3jy470g5zzhxy03036gcayc08n6g61cidlr2zlyq80glyr";
-          name = "flycheck-ycmd";
+          name = "recipe";
         };
         packageRequires = [ dash emacs flycheck let-alist ycmd ];
         meta = {
@@ -13604,8 +17026,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    flymake-coffee = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }:
-    melpaBuild {
+    flymake-coffee = callPackage ({ fetchFromGitHub
+                                  , fetchurl
+                                  , flymake-easy
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "flymake-coffee";
         version = "0.12";
         src = fetchFromGitHub {
@@ -13614,10 +17040,10 @@
           rev = "d4ef325255ea36d1dd622f29284fe72c3fc9abc0";
           sha256 = "1svj5n7mmzhq03azlv4n33rz0nyqb00qr8ihdbc8hh2xnp63j5rc";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/flymake-coffee";
           sha256 = "1aig1d4fgjdg31vrg8k43z5hbqiydgfvxi45p1695s3kbdm8pr2d";
-          name = "flymake-coffee";
+          name = "recipe";
         };
         packageRequires = [ flymake-easy ];
         meta = {
@@ -13625,8 +17051,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    flymake-css = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }:
-    melpaBuild {
+    flymake-css = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , flymake-easy
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "flymake-css";
         version = "0.3";
         src = fetchFromGitHub {
@@ -13635,10 +17065,10 @@
           rev = "3e56d47d3c53e39741aa4f702bb9fb827cce22ed";
           sha256 = "054ws88fcfz3hf3cha7dvndm52v5n4jc4vzif1lif44xq0iggwqa";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/flymake-css";
           sha256 = "0kqm3wn9symqc9ivnh11gqgq8ql2bhpqvxfm86d8vwm082hd92c5";
-          name = "flymake-css";
+          name = "recipe";
         };
         packageRequires = [ flymake-easy ];
         meta = {
@@ -13646,8 +17076,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    flymake-cursor = callPackage ({ fetchFromGitHub, fetchurl, flymake ? null, lib, melpaBuild }:
-    melpaBuild {
+    flymake-cursor = callPackage ({ fetchFromGitHub
+                                  , fetchurl
+                                  , flymake ? null
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "flymake-cursor";
         version = "1.0.2";
         src = fetchFromGitHub {
@@ -13656,10 +17090,10 @@
           rev = "5cac5045398b1436ceb143d48961b50d38ae1396";
           sha256 = "0xaq8zfd90kqqwg8ik081jblrdyj6p3fh2xpf6a4sdj8826ry93v";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a02597edee67c84bef259d7fc5c5b61bd39a5b86/recipes/flymake-cursor";
           sha256 = "0v5abg3h9kmybr0cyr7hqy4rn88h84snzxbsmqcbjw24s10v9p0s";
-          name = "flymake-cursor";
+          name = "recipe";
         };
         packageRequires = [ flymake ];
         meta = {
@@ -13667,20 +17101,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    flymake-easy = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    flymake-easy = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "flymake-easy";
         version = "0.10";
         src = fetchFromGitHub {
           owner = "purcell";
           repo = "flymake-easy";
-          rev = "2a24f260cdc3b9c8f9263b653a475d90efa1d392";
-          sha256 = "1j35k52na02b59yglfb48w6m5qzydvzqfsylb8ax5ks0f287yf0c";
+          rev = "09deafbcb5f094de8465c2bbfe270ba0f517f515";
+          sha256 = "1ld0g3hrbplmw3xgg6jg032hncnlxyc3hid4vn38lkcj3y7ls61b";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/flymake-easy";
           sha256 = "0y7nm2p5x1f0nqfj73zr6xzbpf4wrzx8sn8154yx0qm0qh3id39v";
-          name = "flymake-easy";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -13688,8 +17125,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    flymake-gjshint = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    flymake-gjshint = callPackage ({ fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "flymake-gjshint";
         version = "0.0.6";
         src = fetchFromGitHub {
@@ -13698,10 +17138,10 @@
           rev = "71495ee5303de18293decd57ab9f9abdbaabfa05";
           sha256 = "002s01cymgx4z4l3j2pqirg7899pljdx2hmbz8k6cksdxlymzmkd";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b4673825b15519e9eb2204ade5cc045751771c52/recipes/flymake-gjshint";
           sha256 = "19jcd5z4883z3fzlrdn4fzmsvn16f4hfnhgw4vbs5b0ma6a8ka44";
-          name = "flymake-gjshint";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -13709,8 +17149,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    flymake-haml = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }:
-    melpaBuild {
+    flymake-haml = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , flymake-easy
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "flymake-haml";
         version = "0.8";
         src = fetchFromGitHub {
@@ -13719,10 +17163,10 @@
           rev = "343449920866238db343d61343bc845cc8bc5e1b";
           sha256 = "1b3lf5jwan03k7rb97g4bb982dacdwsfdddnwc0inx9gs3qq1zni";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/flymake-haml";
           sha256 = "0dmdhh12h4xrx6mc0qrwavngk2sx0l4pfqkjjyavabsgcs9wlgp1";
-          name = "flymake-haml";
+          name = "recipe";
         };
         packageRequires = [ flymake-easy ];
         meta = {
@@ -13730,8 +17174,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    flymake-haskell-multi = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }:
-    melpaBuild {
+    flymake-haskell-multi = callPackage ({ fetchFromGitHub
+                                         , fetchurl
+                                         , flymake-easy
+                                         , lib
+                                         , melpaBuild }:
+      melpaBuild {
         pname = "flymake-haskell-multi";
         version = "0.3";
         src = fetchFromGitHub {
@@ -13740,10 +17188,10 @@
           rev = "d2c9aeffd33440d360c1ea0c5aef6d1f171599f9";
           sha256 = "0k1qc0r0gr7f9l5if2a67cv4k73z5yxd6vxd6l1bqw500y0aajxz";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e879eca5eb11b2ae77ee2cb8d8150d85e9e93ebd/recipes/flymake-haskell-multi";
           sha256 = "0cyzmmghwkkv6020s6n436lwymi6dr49i7gkci5n0hw5pdywcaij";
-          name = "flymake-haskell-multi";
+          name = "recipe";
         };
         packageRequires = [ flymake-easy ];
         meta = {
@@ -13751,8 +17199,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    flymake-hlint = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }:
-    melpaBuild {
+    flymake-hlint = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , flymake-easy
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "flymake-hlint";
         version = "0.2";
         src = fetchFromGitHub {
@@ -13761,10 +17213,10 @@
           rev = "d540e250a80a09da3036c16bf86f9deb6d738c9c";
           sha256 = "1ygg51r4ym4x7h4svizwllsvr72x9np6jvjqpk8ayv3w2fpb9l31";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/17820f32d46e845cc44b237d0bfd5c2d898721de/recipes/flymake-hlint";
           sha256 = "0wq1ijhn3ypy31yk8jywl5hnz0r0vlhcxjyznzccwqbdc5vf7b2x";
-          name = "flymake-hlint";
+          name = "recipe";
         };
         packageRequires = [ flymake-easy ];
         meta = {
@@ -13772,8 +17224,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    flymake-jslint = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    flymake-jslint = callPackage ({ fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "flymake-jslint";
         version = "0.23";
         src = fetchFromGitHub {
@@ -13782,10 +17237,10 @@
           rev = "30693f75059bab53a9d2eb676c68751f4d8b091c";
           sha256 = "00zkm3wqlss386qd6jiq0siga7c48n5ykh0vf9q5v83rmpd79yri";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/flymake-jslint";
           sha256 = "1cq8fni4p0qhigx0qh34ypmcsbnilra1ixgnrn9mgg8x3cvcm4cm";
-          name = "flymake-jslint";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -13793,8 +17248,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    flymake-json = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }:
-    melpaBuild {
+    flymake-json = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , flymake-easy
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "flymake-json";
         version = "0.1";
         src = fetchFromGitHub {
@@ -13803,10 +17262,10 @@
           rev = "ad8e482db1ad29e23bdd9d089b9bc3615649ce65";
           sha256 = "0rzlw80mi39147yqnpzcvw9wvr5svksd3kn6s3w8191f2kc6xzzv";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/acb0a4d29159aa6d74f754911f63152dac3425bd/recipes/flymake-json";
           sha256 = "1p5kajiycpqy2id664bs0fb1mbf73a43qqfdi4c57n6j9x7fxp4d";
-          name = "flymake-json";
+          name = "recipe";
         };
         packageRequires = [ flymake-easy ];
         meta = {
@@ -13814,8 +17273,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    flymake-less = callPackage ({ fetchFromGitHub, fetchurl, less-css-mode, lib, melpaBuild }:
-    melpaBuild {
+    flymake-less = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , less-css-mode
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "flymake-less";
         version = "0.3";
         src = fetchFromGitHub {
@@ -13824,10 +17287,10 @@
           rev = "8cbb5e41c8f4b988cee3ef4449cfa9aea3540893";
           sha256 = "0ggvmsjj6p6a7cwr2bzhlcf8ab4v6a2bz5djsscd2ryy570p367z";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6d4eae8b7b7d81ebf4d85f38fc3a17b4bc918318/recipes/flymake-less";
           sha256 = "05k5daphxy94164c73ia7f4l1gv2cmlw8xzs8xnddg7ly22gjhi0";
-          name = "flymake-less";
+          name = "recipe";
         };
         packageRequires = [ less-css-mode ];
         meta = {
@@ -13835,8 +17298,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    flymake-perlcritic = callPackage ({ fetchFromGitHub, fetchurl, flymake ? null, lib, melpaBuild }:
-    melpaBuild {
+    flymake-perlcritic = callPackage ({ fetchFromGitHub
+                                      , fetchurl
+                                      , flymake ? null
+                                      , lib
+                                      , melpaBuild }:
+      melpaBuild {
         pname = "flymake-perlcritic";
         version = "1.0.3";
         src = fetchFromGitHub {
@@ -13845,10 +17312,10 @@
           rev = "0692d6ad5495f6e5438bde0a10345829b8e1def8";
           sha256 = "11r982h5fhjkmm9ld8wfdip0ghinw523nm1w4fmy830g0bbkgkrq";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ca7bf43ef8893bf04e9658390e306ef69e80a156/recipes/flymake-perlcritic";
           sha256 = "0hibnh463wzhvpix7gygpgs04gi6salwjrsjc6d43lxlsn3y1im8";
-          name = "flymake-perlcritic";
+          name = "recipe";
         };
         packageRequires = [ flymake ];
         meta = {
@@ -13856,8 +17323,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    flymake-php = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }:
-    melpaBuild {
+    flymake-php = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , flymake-easy
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "flymake-php";
         version = "0.5";
         src = fetchFromGitHub {
@@ -13866,10 +17337,10 @@
           rev = "91f867e209011af31a2ca2d8f6874b994403bcb2";
           sha256 = "0dzyid0av9icp77wv0zcsygpw46z24qibq1ra0iwnkzl3kqvkyzh";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/flymake-php";
           sha256 = "12ds2l5kvs7fz38syp4amasbjkpqd36rlpajnb3xxll0hbk6vffk";
-          name = "flymake-php";
+          name = "recipe";
         };
         packageRequires = [ flymake-easy ];
         meta = {
@@ -13877,8 +17348,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    flymake-python-pyflakes = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }:
-    melpaBuild {
+    flymake-python-pyflakes = callPackage ({ fetchFromGitHub
+                                           , fetchurl
+                                           , flymake-easy
+                                           , lib
+                                           , melpaBuild }:
+      melpaBuild {
         pname = "flymake-python-pyflakes";
         version = "0.9";
         src = fetchFromGitHub {
@@ -13887,10 +17362,10 @@
           rev = "78806a25b0f01f03df4210a79a6eaeec59511d7a";
           sha256 = "0l8qpcbzfi32h3vy7iwydx3hg2w60x9l3v3rabzjx412m5d00gsh";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/49091c0eca4158b80269b6ff5f7f3fc8e981420b/recipes/flymake-python-pyflakes";
           sha256 = "0asbjxv03zkbcjayanv13qzbv4z7b6fi0z1j6yv7fl6q9mgvm497";
-          name = "flymake-python-pyflakes";
+          name = "recipe";
         };
         packageRequires = [ flymake-easy ];
         meta = {
@@ -13898,8 +17373,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    flymake-ruby = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }:
-    melpaBuild {
+    flymake-ruby = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , flymake-easy
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "flymake-ruby";
         version = "0.8";
         src = fetchFromGitHub {
@@ -13908,10 +17387,10 @@
           rev = "e14e8e2abda223bd3920dbad0eefd5af5973ae6d";
           sha256 = "0d2vmpgr5c2cbpxcqm5x1ckfysbpwcbaa9frcnp2yfp8scvkvqj0";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/flymake-ruby";
           sha256 = "1shr6d03vx85nmyxnysglzlc1pz0zy3n28nrcmxqgdm02g197bzr";
-          name = "flymake-ruby";
+          name = "recipe";
         };
         packageRequires = [ flymake-easy ];
         meta = {
@@ -13919,8 +17398,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    flymake-sass = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }:
-    melpaBuild {
+    flymake-sass = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , flymake-easy
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "flymake-sass";
         version = "0.6";
         src = fetchFromGitHub {
@@ -13929,10 +17412,10 @@
           rev = "1c7664818db539de7f3dab396c013528a3f5b8b4";
           sha256 = "0c74qdgy9c4hv3nyjnbqdzypbg9399vq3p5ngp5lasc7iz6vi0h8";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/flymake-sass";
           sha256 = "0sz6n5r9pdphgvvaljg9zdwj3dqayaxzxmb4s8x4b05c8yx3ba0d";
-          name = "flymake-sass";
+          name = "recipe";
         };
         packageRequires = [ flymake-easy ];
         meta = {
@@ -13940,8 +17423,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    flymake-shell = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }:
-    melpaBuild {
+    flymake-shell = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , flymake-easy
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "flymake-shell";
         version = "0.8";
         src = fetchFromGitHub {
@@ -13950,10 +17437,10 @@
           rev = "ec097bd77db5523a04ceb15a128e01689d36fb90";
           sha256 = "0c2lz1p91yhprmlbmp0756d96yiy0w92zf0c9vlp0i9abvd0cvkc";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/flymake-shell";
           sha256 = "13ff4r0k29yqgx8ybxz7hh50cjsadcjb7pd0075s9xcrzia5x63i";
-          name = "flymake-shell";
+          name = "recipe";
         };
         packageRequires = [ flymake-easy ];
         meta = {
@@ -13961,8 +17448,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    flyspell-correct = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    flyspell-correct = callPackage ({ fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "flyspell-correct";
         version = "0.4";
         src = fetchFromGitHub {
@@ -13971,10 +17461,10 @@
           rev = "7e7f94a36699c7e7bba728df722e13a7b4af4b73";
           sha256 = "16lbhbgyrpp9ig9li1v31bs9i5z8dchjb1vrkcih020p3g9vwi27";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fa06fbe3bc40ae5e3f6d10dee93a9d49e9288ba5/recipes/flyspell-correct";
           sha256 = "0d2205h234na9s942s83yvkq89l9w9jnl5yfrxkkdiq8pw0dvymd";
-          name = "flyspell-correct";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -13982,8 +17472,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    flyspell-correct-helm = callPackage ({ fetchFromGitHub, fetchurl, flyspell-correct, helm, lib, melpaBuild }:
-    melpaBuild {
+    flyspell-correct-helm = callPackage ({ fetchFromGitHub
+                                         , fetchurl
+                                         , flyspell-correct
+                                         , helm
+                                         , lib
+                                         , melpaBuild }:
+      melpaBuild {
         pname = "flyspell-correct-helm";
         version = "0.4";
         src = fetchFromGitHub {
@@ -13992,10 +17487,10 @@
           rev = "7e7f94a36699c7e7bba728df722e13a7b4af4b73";
           sha256 = "16lbhbgyrpp9ig9li1v31bs9i5z8dchjb1vrkcih020p3g9vwi27";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7b9302d8f804c77eb81fee7ed27f13cb1176f6/recipes/flyspell-correct-helm";
           sha256 = "18s2bzszy6x31avqg7j2lsll2cf4asb8njwhmx4mm215agack976";
-          name = "flyspell-correct-helm";
+          name = "recipe";
         };
         packageRequires = [ flyspell-correct helm ];
         meta = {
@@ -14003,8 +17498,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    flyspell-correct-ivy = callPackage ({ fetchFromGitHub, fetchurl, flyspell-correct, ivy, lib, melpaBuild }:
-    melpaBuild {
+    flyspell-correct-ivy = callPackage ({ fetchFromGitHub
+                                        , fetchurl
+                                        , flyspell-correct
+                                        , ivy
+                                        , lib
+                                        , melpaBuild }:
+      melpaBuild {
         pname = "flyspell-correct-ivy";
         version = "0.4";
         src = fetchFromGitHub {
@@ -14013,10 +17513,10 @@
           rev = "7e7f94a36699c7e7bba728df722e13a7b4af4b73";
           sha256 = "16lbhbgyrpp9ig9li1v31bs9i5z8dchjb1vrkcih020p3g9vwi27";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7b9302d8f804c77eb81fee7ed27f13cb1176f6/recipes/flyspell-correct-ivy";
           sha256 = "1n5iyab6bj761w6vxncyqvqzwh9k60pzq5f2n00ifrz74pqs537i";
-          name = "flyspell-correct-ivy";
+          name = "recipe";
         };
         packageRequires = [ flyspell-correct ivy ];
         meta = {
@@ -14024,8 +17524,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    flyspell-correct-popup = callPackage ({ fetchFromGitHub, fetchurl, flyspell-correct, lib, melpaBuild, popup }:
-    melpaBuild {
+    flyspell-correct-popup = callPackage ({ fetchFromGitHub
+                                          , fetchurl
+                                          , flyspell-correct
+                                          , lib
+                                          , melpaBuild
+                                          , popup }:
+      melpaBuild {
         pname = "flyspell-correct-popup";
         version = "0.4";
         src = fetchFromGitHub {
@@ -14034,10 +17539,10 @@
           rev = "7e7f94a36699c7e7bba728df722e13a7b4af4b73";
           sha256 = "16lbhbgyrpp9ig9li1v31bs9i5z8dchjb1vrkcih020p3g9vwi27";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7b9302d8f804c77eb81fee7ed27f13cb1176f6/recipes/flyspell-correct-popup";
           sha256 = "1fr8ajwldcl58i8xm31dz1mjwbi9f4q8s58x5jrqhqha0x4p4h9l";
-          name = "flyspell-correct-popup";
+          name = "recipe";
         };
         packageRequires = [ flyspell-correct popup ];
         meta = {
@@ -14045,8 +17550,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    flyspell-lazy = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    flyspell-lazy = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "flyspell-lazy";
         version = "0.6.10";
         src = fetchFromGitHub {
@@ -14055,10 +17563,10 @@
           rev = "31786fe04a4732d2f845e1c7e96fcb030182ef10";
           sha256 = "1g09s57b773nm9xqslzbin5i2h18k55nx00s5nnkvx1qg0n0mzkm";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a082c2dc0458e3007a947923f5b97e88217199e8/recipes/flyspell-lazy";
           sha256 = "0lzazrhsfh5m7n57dzx0v46d5mg87wpwwkjzf5j9gpv1mc1xfg1y";
-          name = "flyspell-lazy";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -14066,8 +17574,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    flyspell-popup = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, popup }:
-    melpaBuild {
+    flyspell-popup = callPackage ({ fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild
+                                  , popup }:
+      melpaBuild {
         pname = "flyspell-popup";
         version = "0.3";
         src = fetchFromGitHub {
@@ -14076,10 +17588,10 @@
           rev = "29311849bfd253b9b689bf331860b4c4d3bd4dde";
           sha256 = "0x7jilwb0fgzsr7ma59sgd0d4122cl0hwzr28vi3z5s8wdab7nc4";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/186d00724137c055b521a5f5c54acf71c4b16c32/recipes/flyspell-popup";
           sha256 = "0wp15ra1ry6xpwal6mb53ixh3f0s4nps0rdyfli7hhaiwbr9bhql";
-          name = "flyspell-popup";
+          name = "recipe";
         };
         packageRequires = [ popup ];
         meta = {
@@ -14087,20 +17599,27 @@
           license = lib.licenses.free;
         };
       }) {};
-    fn = callPackage ({ cl-lib ? null, dash, dash-functional, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    fn = callPackage ({ cl-lib ? null
+                      , dash
+                      , dash-functional
+                      , emacs
+                      , fetchFromGitHub
+                      , fetchurl
+                      , lib
+                      , melpaBuild }:
+      melpaBuild {
         pname = "fn";
         version = "0.1.2";
         src = fetchFromGitHub {
           owner = "troyp";
           repo = "fn.el";
-          rev = "2842e3c6d1b5c96184fa638c37b25ce5b347a1a6";
-          sha256 = "0kxpy87f44gkfzrnhcrprca0irkpddpbw7wbrm4aidw0synpab91";
+          rev = "fe65dc654d319e6fa9cef4d7eca0f8dd847b6a32";
+          sha256 = "1j2rrwizafwramlzrjcsfv8xbz72qmiaa120cb1ri8wp6nyvhys0";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6d2929604b6dd21d6cf425643927a9c216801dc1/recipes/fn";
           sha256 = "0cb98rxdb6sd0kws6bc4pa536kiyw3yk0hlfqcm3ps81hcgqjhhn";
-          name = "fn";
+          name = "recipe";
         };
         packageRequires = [ cl-lib dash dash-functional emacs ];
         meta = {
@@ -14108,8 +17627,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    focus = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    focus = callPackage ({ cl-lib ? null
+                         , emacs
+                         , fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "focus";
         version = "0.1.1";
         src = fetchFromGitHub {
@@ -14118,10 +17642,10 @@
           rev = "75202c9445f52eab6fb82f00006f37cd20dae6b2";
           sha256 = "1v9y3dp7sd4rsm31myp3l1jxpwjw3madajb6yz9rw0yhdirfwgbg";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4e8f1217224514f9b048b7101c89e3b1a305821e/recipes/focus";
           sha256 = "0jw26j8npyl3dgsrs7ap2djxmkafn2hl6gfqvi7v76bccs4jkyv8";
-          name = "focus";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -14129,8 +17653,36 @@
           license = lib.licenses.free;
         };
       }) {};
-    fold-dwim-org = callPackage ({ fetchFromGitHub, fetchurl, fold-dwim, lib, melpaBuild }:
-    melpaBuild {
+    fold-dwim = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
+        pname = "fold-dwim";
+        version = "1.2";
+        src = fetchFromGitHub {
+          owner = "emacsattic";
+          repo = "fold-dwim";
+          rev = "4764b0246a722d37eb8ec9f204ffaccaad1755d0";
+          sha256 = "1k8z30imlxvqm7lv12kgqdfgc5znxyvl9jxi8j2ymmwlgy11f726";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/62064e272a658d998b1ccf13dc3c2e3e454acade/recipes/fold-dwim";
+          sha256 = "1k5186s69qahwbzvwq70af3bkcglls9a82c5jw5mdw3ic8k631sh";
+          name = "recipe";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/fold-dwim";
+          license = lib.licenses.free;
+        };
+      }) {};
+    fold-dwim-org = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , fold-dwim
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "fold-dwim-org";
         version = "0.6";
         src = fetchFromGitHub {
@@ -14139,10 +17691,10 @@
           rev = "c09bb2b46d65afbd1d0febc6fded7495be7a3037";
           sha256 = "14jvbkahwvv4wb0s9vp8gqmlpv1d4269j5rsjxn79q5pawjzslxw";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/97d22d9feaf521ce576b80d2933ecbc166c1dbe7/recipes/fold-dwim-org";
           sha256 = "0812p351rzvqcfn00k92nfhlg3y772y4z4b9f0xqnpa935y6harn";
-          name = "fold-dwim-org";
+          name = "recipe";
         };
         packageRequires = [ fold-dwim ];
         meta = {
@@ -14150,8 +17702,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    fold-this = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    fold-this = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "fold-this";
         version = "0.3.0";
         src = fetchFromGitHub {
@@ -14160,10 +17715,10 @@
           rev = "90b41d7b588ab1c3295bf69f7dd87bf31b543a6a";
           sha256 = "1cbabpyp66nl5j8yhyj2jih4mhaljxvjh9ij05clai71z4598ahn";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9853fcb99bd8717c77fa2b3bafb6e85d0d5d491c/recipes/fold-this";
           sha256 = "1iri4a6ixw3q7qr803cj2ik7rvmww1b6ybj5q2pvkf1v25r8655d";
-          name = "fold-this";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -14171,8 +17726,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    font-utils = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, pcache, persistent-soft }:
-    melpaBuild {
+    font-utils = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild
+                              , pcache
+                              , persistent-soft }:
+      melpaBuild {
         pname = "font-utils";
         version = "0.7.8";
         src = fetchFromGitHub {
@@ -14181,10 +17741,10 @@
           rev = "9192d3f8ee6a4e75f34c3fed10378674cc2b11d3";
           sha256 = "1k90w8v5rpswqb8fn1cc8sq5w12gf4sn6say5dhvqd63512b0055";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2af0a1644116e89c5a705ffe0885ffe3ee874eaf/recipes/font-utils";
           sha256 = "0k33jdchjkj7j211a23kfp5axg74cfsrrq4axsb1pfp124swh2n5";
-          name = "font-utils";
+          name = "recipe";
         };
         packageRequires = [ pcache persistent-soft ];
         meta = {
@@ -14192,8 +17752,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    fontawesome = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }:
-    melpaBuild {
+    fontawesome = callPackage ({ emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , helm-core
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "fontawesome";
         version = "0.4";
         src = fetchFromGitHub {
@@ -14202,10 +17767,10 @@
           rev = "72b4f2f83c7fdacd225aee58f93acefc53166626";
           sha256 = "1icwjd1rbyr1g8ifyhvpi21wjff2qrddq2rmp5lmiajnwrlfli0d";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/93b92f10802ceffc353db3d220dccfd47ea7fa41/recipes/fontawesome";
           sha256 = "07hn4s929xklc74j8s6pd61rxmxw3911dq47wql77vb5pijv6dr3";
-          name = "fontawesome";
+          name = "recipe";
         };
         packageRequires = [ emacs helm-core ];
         meta = {
@@ -14213,8 +17778,40 @@
           license = lib.licenses.free;
         };
       }) {};
-    foreman-mode = callPackage ({ dash, dash-functional, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    fontify-face = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
+        pname = "fontify-face";
+        version = "1.0.0";
+        src = fetchFromGitHub {
+          owner = "Fuco1";
+          repo = "fontify-face";
+          rev = "5bbd4bbbb69f3fe156af53d32000a4b769ed4cbd";
+          sha256 = "0s2vwzjd08xj4vpmx7knyrld44k6dd9mhync50r580wpgrgfxm04";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/72bd6750dd5a7d9ed6e408e690f76c260ffd7d9e/recipes/fontify-face";
+          sha256 = "1w7xlkladqkbh7gpnkbi53a7k9p5wzma4y9jgwbc58hng9ggm1k0";
+          name = "recipe";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/fontify-face";
+          license = lib.licenses.free;
+        };
+      }) {};
+    foreman-mode = callPackage ({ dash
+                                , dash-functional
+                                , emacs
+                                , f
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild
+                                , s }:
+      melpaBuild {
         pname = "foreman-mode";
         version = "0.0.1";
         src = fetchFromGitHub {
@@ -14223,10 +17820,10 @@
           rev = "e90d2b56e83ab914f9ba9e78126bd7a534d5b8fb";
           sha256 = "199kybf2bvywqfnwr5w893km82829k1j7sp079y6s2601hq8ylw9";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/edeeb2b52ac70f8bdad38d3af62a7e434853c504/recipes/foreman-mode";
           sha256 = "0p3kwbld05wf3dwcv0k6ynz727fiy0ik2srx4js9wvagy57x98kv";
-          name = "foreman-mode";
+          name = "recipe";
         };
         packageRequires = [ dash dash-functional emacs f s ];
         meta = {
@@ -14234,8 +17831,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    form-feed = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    form-feed = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "form-feed";
         version = "0.2.2";
         src = fetchFromGitHub {
@@ -14244,10 +17844,10 @@
           rev = "eac6724c093458745e9ae0e37221077fa2ad0ff6";
           sha256 = "171jna631b2iqcimfsik9c66gii8nc0zdb58m077w00rn7rcxbh2";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/468503d8103766e8196e977325e3bcb696219f6b/recipes/form-feed";
           sha256 = "1abwjkzi3irw0jwpv3f584zc72my9n8iq8zp5s0354xk6iwrl1rh";
-          name = "form-feed";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -14255,8 +17855,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    format-sql = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    format-sql = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "format-sql";
         version = "0.4";
         src = fetchFromGitHub {
@@ -14265,10 +17868,10 @@
           rev = "97f475c245cd6c81a72a265678e2087cee66ac7b";
           sha256 = "0mikksamljps1czacgqavlnzzhgs8s3f8q4jza6v3csf8kgp5zd0";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/085c03104aa5a809a112525547eec51100b6fb09/recipes/format-sql";
           sha256 = "0684xqzs933vj9d3n3lv7afk4gii41kaqykbb05cribaswapsanj";
-          name = "format-sql";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -14276,8 +17879,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    fortune-cookie = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    fortune-cookie = callPackage ({ fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "fortune-cookie";
         version = "1.0.0";
         src = fetchFromGitHub {
@@ -14286,10 +17892,10 @@
           rev = "bad99a2cd090f6646c7ee1125b95dd98744939c6";
           sha256 = "1kiflisiabc39lxi5hcazfvcwrpasl01lqsi2sri6pyrcrjyh8mf";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ab0d56626c9bf847c693b4d9ddb08acee636054f/recipes/fortune-cookie";
           sha256 = "0xg0zk7hnyhnbhqpxnzrgqs5yz0sy6wb0n9982qc0pa6jqnl9z78";
-          name = "fortune-cookie";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -14297,8 +17903,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    fountain-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    fountain-mode = callPackage ({ emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "fountain-mode";
         version = "2.5.3";
         src = fetchFromGitHub {
@@ -14307,10 +17917,10 @@
           rev = "8269066a9035fcf50eb835de3745a62c1cb96660";
           sha256 = "1s1wyhjdyp12iz3zk333z5wlbxl5x3hki9q16164fk9ifhkrppxd";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/913386ac8d5049d37154da3ab32bde408a226511/recipes/fountain-mode";
           sha256 = "1i55gcjy8ycr1ww2fh1a2j0bchx1bsfs0zd6v4cv5zdgy7vw6840";
-          name = "fountain-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -14318,8 +17928,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    frames-only-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }:
-    melpaBuild {
+    frames-only-mode = callPackage ({ emacs
+                                    , fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild
+                                    , seq }:
+      melpaBuild {
         pname = "frames-only-mode";
         version = "1.0.0";
         src = fetchFromGitHub {
@@ -14328,10 +17943,10 @@
           rev = "5a2947d797a5d6f74d3a9c97f8c0ab6cff115b28";
           sha256 = "0y0sdjixaxvywrlp2sw51wnczhk51q1svl5aghbk9rkxpwv9ys9v";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1e628416ad9420b3ac5bbfacf930a86d98958ac8/recipes/frames-only-mode";
           sha256 = "17p04l16ghz9kk096xk37yjpi4rmla86gp7c8ysjf6q6nyh0608h";
-          name = "frames-only-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs seq ];
         meta = {
@@ -14339,20 +17954,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    frameshot = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    frameshot = callPackage ({ emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "frameshot";
         version = "0.1.1";
         src = fetchFromGitHub {
           owner = "tarsius";
           repo = "frameshot";
-          rev = "4e7b252e9fd9227de8b25f384af2c855ec45279a";
-          sha256 = "020irzkqr7gs99xsvdd0haja0jvw46dk40xi7ab0m3cq7957srjh";
+          rev = "65994602fdf3d8881f0cabffebbce6c0e493e3c8";
+          sha256 = "0crvvacpajlhdida54gvv4y11xx78qscr6nznx0bhdb12sj3n45q";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e5cfaa4b5fda97054d45691fad9d79b559f2df14/recipes/frameshot";
           sha256 = "1z5f988m9s25miyxbhaxk6m4af9afvblb2p5mdidva04szjklr70";
-          name = "frameshot";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -14360,8 +17979,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    free-keys = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    free-keys = callPackage ({ cl-lib ? null
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "free-keys";
         version = "1.0.0";
         src = fetchFromGitHub {
@@ -14370,10 +17993,10 @@
           rev = "edfd69dc369b2647447b7c28c7c1163b1ddf45b4";
           sha256 = "0xgifa7s9n882f9ymyyz9gc11xfbj3vfpnxiq1fqfm5hmwx9pwbc";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/55067e899ba618d4394ad9657322c92a667a0774/recipes/free-keys";
           sha256 = "0j9cfgy2nkbska4lm5z32p804i9n8pdgn50bs5zzk1ilwd5vbalj";
-          name = "free-keys";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -14381,8 +18004,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    fringe-helper = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    fringe-helper = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "fringe-helper";
         version = "1.0.1";
         src = fetchFromGitHub {
@@ -14391,10 +18017,10 @@
           rev = "0f10a196c6e57222b8d4c94eafc40a96e7b20f1b";
           sha256 = "1c3yx9j3q8fkfiay4nzcabsq9i4ydqf6vxk8vv80h78gg9afrzrj";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/fringe-helper";
           sha256 = "1i5wra4j0rvrsl9vbg7fzga8cadw43ka2rwdj1m11wq8m3cs8g7m";
-          name = "fringe-helper";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -14402,8 +18028,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    fsbot-data-browser = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    fsbot-data-browser = callPackage ({ fetchFromGitHub
+                                      , fetchurl
+                                      , lib
+                                      , melpaBuild }:
+      melpaBuild {
         pname = "fsbot-data-browser";
         version = "0.3";
         src = fetchFromGitHub {
@@ -14412,10 +18041,10 @@
           rev = "6bca4f7de63e31839d2542f6c678b79931dec344";
           sha256 = "0lvpgfp89sz6f6rn576g1g88s0q3ibj5ghydjwfcg9w6h7vx5b5s";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/37a0901b98e1c66be6906234e6d6520a6e940e97/recipes/fsbot-data-browser";
           sha256 = "0jijvl07jk200fs01ln4dmw5nx9jg3f9b7gjaknyd18vyvbwr3s5";
-          name = "fsbot-data-browser";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -14423,20 +18052,30 @@
           license = lib.licenses.free;
         };
       }) {};
-    fsharp-mode = callPackage ({ company, company-quickhelp, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, popup, pos-tip, s }:
-    melpaBuild {
+    fsharp-mode = callPackage ({ company
+                               , company-quickhelp
+                               , dash
+                               , fetchFromGitHub
+                               , fetchurl
+                               , flycheck
+                               , lib
+                               , melpaBuild
+                               , popup
+                               , pos-tip
+                               , s }:
+      melpaBuild {
         pname = "fsharp-mode";
-        version = "1.9.11";
+        version = "1.9.12";
         src = fetchFromGitHub {
           owner = "rneatherway";
           repo = "emacs-fsharp-mode-bin";
-          rev = "5504550605354146842c8f5c34482ece778b7b31";
-          sha256 = "0hjqgyjch8fdz54akcpw5kmx2z1yvck6k8qyc0mzzmb54iiayf5a";
+          rev = "68d2121a7317d90fe3794c9295d117f4aebd1438";
+          sha256 = "0mymvik20slbgsasjpn6nkqcb4z6z4mvd1sf1xalv0qjk24vrlmk";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/dc45611e2b629d8bc5f74555368f964420b79541/recipes/fsharp-mode";
           sha256 = "07pkj30cawh0diqhrp3jkshgsd0i3y34rdnjb4af8mr7dsbsxb6z";
-          name = "fsharp-mode";
+          name = "recipe";
         };
         packageRequires = [
           company
@@ -14452,8 +18091,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    fstar-mode = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    fstar-mode = callPackage ({ dash
+                              , emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "fstar-mode";
         version = "0.9.4.0";
         src = fetchFromGitHub {
@@ -14462,10 +18106,10 @@
           rev = "3a9be64827bbed8e34d38803b5c44d8d4f6cd688";
           sha256 = "0manmkd66355g1fw2q1q96ispd0vxf842i8dcr6g592abrz5lhi7";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c58ace42342c3d3ff5a56d86a16206f2ecb45f77/recipes/fstar-mode";
           sha256 = "1kwa6gqh91265vpp4gcady2brkizfkfjj0gnya9lar6x7rn4gj7s";
-          name = "fstar-mode";
+          name = "recipe";
         };
         packageRequires = [ dash emacs ];
         meta = {
@@ -14473,8 +18117,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    full-ack = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    full-ack = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "full-ack";
         version = "1.0";
         src = fetchFromGitHub {
@@ -14483,10 +18130,10 @@
           rev = "0aef4be1686535f83217cafb1524818071bd8325";
           sha256 = "0c3w3xs2jbdqgsqw0qmdbwii6p395qfznird4gg0hfr7lby2kmjq";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/full-ack";
           sha256 = "09ikhyhpvkcl6yl6pa4abnw6i7yfsx5jkmzypib94w7khikvb309";
-          name = "full-ack";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -14494,8 +18141,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    fullframe = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    fullframe = callPackage ({ cl-lib ? null
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "fullframe";
         version = "0.5.0";
         src = fetchFromGitHub {
@@ -14504,10 +18155,10 @@
           rev = "d6a5217f7f2a5a5edcb75140f3fa69b3a50f1cdd";
           sha256 = "0m43qnhp6ibsskpjkxc86p3lrjsjc0ndqml3lbd65s79x4x7i3fi";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/13d1dc5c39543b65c6bb4150c3690211872c00dc/recipes/fullframe";
           sha256 = "08sh8lmb6g8asv28fcb36ilcn0ka4fc6ka0pnslid0h4c32fxp2a";
-          name = "fullframe";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -14515,8 +18166,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    function-args = callPackage ({ fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
-    melpaBuild {
+    function-args = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , ivy
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "function-args";
         version = "0.6.0";
         src = fetchFromGitHub {
@@ -14525,10 +18180,10 @@
           rev = "0b07db81c0c1fa88d1ec763219ee57640858f79d";
           sha256 = "0lg9bhwn3za4jvz38zld389gdl48qf34nqqqrzj0r119g1jqdrg1";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/80688d85a34b77783140ad2b8a47ef60c762b084/recipes/function-args";
           sha256 = "13yfscr993pll5yg019v9dwy71g123a166w114n2m78h0rbnzdak";
-          name = "function-args";
+          name = "recipe";
         };
         packageRequires = [ ivy ];
         meta = {
@@ -14536,8 +18191,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    futhark-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    futhark-mode = callPackage ({ cl-lib ? null
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "futhark-mode";
         version = "0.4.1";
         src = fetchFromGitHub {
@@ -14557,8 +18216,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    fuzzy = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    fuzzy = callPackage ({ fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "fuzzy";
         version = "0.1";
         src = fetchFromGitHub {
@@ -14567,10 +18229,10 @@
           rev = "939f4e9a3f08d83925b41dd3d23b2321f3f6b09c";
           sha256 = "1g7my9ha5cnwg3pjwa86wncg5gphv18xpnpmj3xc3vg7z5m45rss";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9e0197df173fbd7ec1e7e35c47476fcf2aaa483f/recipes/fuzzy";
           sha256 = "1hwdh9bx4g4vzzyc20vdwxsii611za37kc9ik40kwjjk62qmll8h";
-          name = "fuzzy";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -14578,8 +18240,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    fvwm-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    fvwm-mode = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "fvwm-mode";
         version = "1.6.4";
         src = fetchFromGitHub {
@@ -14588,10 +18253,10 @@
           rev = "d48a309bb7db21f5404b6619c6ee861fe0457704";
           sha256 = "0c3g0yfclczdh6nxmg9lljjf288zibqy51bhh1b1cgdmxcbpg8bv";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ac39130f8a031d6fe7df4411a5f94f2cdf652449/recipes/fvwm-mode";
           sha256 = "07y32cnp4qfhncp7s24gmlxljdrj5miicinfaf4gc7hihb4bkrkb";
-          name = "fvwm-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -14599,8 +18264,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    fwb-cmds = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    fwb-cmds = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "fwb-cmds";
         version = "1.1.1";
         src = fetchFromGitHub {
@@ -14609,10 +18277,10 @@
           rev = "90258a5c7dbbaa2ac227e0fb4ff6c7d5aec3628f";
           sha256 = "1xwvv8wjgdaz96v1x1xc5w697bfvcanlcixd0n5qbx6ryakqrb72";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fe40cdeb5e19628937820181479897acdad40200/recipes/fwb-cmds";
           sha256 = "0wnjvi0v0l2h1mhwlsk2d8ggwh3nk7pks48l55gp18nmj00jxycx";
-          name = "fwb-cmds";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -14620,8 +18288,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    fxrd-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    fxrd-mode = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild
+                             , s }:
+      melpaBuild {
         pname = "fxrd-mode";
         version = "1.0";
         src = fetchFromGitHub {
@@ -14630,10 +18302,10 @@
           rev = "795b969346982b75e24b5c8619b46197982fbb4d";
           sha256 = "0aha13vqj6ygyr7bflrxll837g4z6wrmrhh5rhcd0vphqg70frgn";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/796eb6b2126ec616c0de6af6abb7598900557c12/recipes/fxrd-mode";
           sha256 = "17zimg64lqc1yh9gnp5izshkvviz996aym7q6n9p61a4kqq37z4r";
-          name = "fxrd-mode";
+          name = "recipe";
         };
         packageRequires = [ s ];
         meta = {
@@ -14641,8 +18313,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    fzf = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    fzf = callPackage ({ emacs
+                       , fetchFromGitHub
+                       , fetchurl
+                       , lib
+                       , melpaBuild }:
+      melpaBuild {
         pname = "fzf";
         version = "0.2";
         src = fetchFromGitHub {
@@ -14651,10 +18327,10 @@
           rev = "383a050920e9b99d37c21d041deb7f38b202485c";
           sha256 = "14drm6b6rxbcdilcms1jlqyrqbipcqbdil6q06ni9pgafi7xp8hz";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1671e17c99ef1932c6a2e83fc4fa2e4eb6674bc8/recipes/fzf";
           sha256 = "0jjzm1gq85fx1gmj6nqaijnjws9bm8hmk40ws3x7fmsp41qq5py0";
-          name = "fzf";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -14662,20 +18338,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    gams-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    gams-mode = callPackage ({ emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "gams-mode";
         version = "6.5";
         src = fetchFromGitHub {
           owner = "ShiroTakeda";
           repo = "gams-mode";
-          rev = "3022e9f8411628e6a210fb5843d858b15a7513f5";
-          sha256 = "06hc8yy1g2vyvib8yrhwzs8fvgxnrxlw6iyzi7phjp9fgr3cp504";
+          rev = "0a7f3f5d44ea59c34677049882f0a34ff9935bc9";
+          sha256 = "0wl2dfcfvjy23gcwk6qfxbxjlykw438fi9h1y2855adcc9zrhwzx";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c895a716636b00c2a158d33aab18f664a8601833/recipes/gams-mode";
           sha256 = "0hx9mv4sqskz4nn7aks64hqd4vn3m7b34abzhy9bnmyw6d5zzfci";
-          name = "gams-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -14683,20 +18363,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    gather = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    gather = callPackage ({ fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "gather";
         version = "1.1.0";
         src = fetchFromGitHub {
           owner = "mhayashi1120";
           repo = "Emacs-gather";
-          rev = "303af57dd2ae0fc1363a3d1a84d475167f58c84a";
-          sha256 = "1q9bz294bc6bplwfrfzsczh444v9152wv7zm2l1pcpwv8n8581p6";
+          rev = "b9038e5b960039688e7a80ee770e0aee81d5c6c8";
+          sha256 = "1b73n7ydkckrq2sjq4jb2hva8lfqaiaaad2gcgjx2y15rvbb26d0";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/595e40c7102294684badf86deb72d86bbc3c1426/recipes/gather";
           sha256 = "1f0cqqp1a7w8g1pfvzxxb0hjrxq4m79a4n85dncqj2xhjxrkm0xk";
-          name = "gather";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -14704,8 +18387,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    geben = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    geben = callPackage ({ cl-lib ? null
+                         , emacs
+                         , fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "geben";
         version = "1.1.1";
         src = fetchFromGitHub {
@@ -14714,10 +18402,10 @@
           rev = "003abd23a7468daa133dfbc7ef85d0d61a0410dc";
           sha256 = "15ck23xv3dz9i4w5xd9lkg0c6rlsyxdz465xrpkr77fq9qw0c4dg";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6f8648609e160f7dcefe4a963e8b00475f2fff78/recipes/geben";
           sha256 = "1ai1qcx76m8xh80c8zixq9cqbhnqmj3jk3r7lj3ngbiwx4pnlnwf";
-          name = "geben";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -14725,20 +18413,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    geben-helm-projectile = callPackage ({ emacs, fetchFromGitHub, fetchurl, geben, helm-projectile, lib, melpaBuild }:
-    melpaBuild {
+    geben-helm-projectile = callPackage ({ emacs
+                                         , fetchFromGitHub
+                                         , fetchurl
+                                         , geben
+                                         , helm-projectile
+                                         , lib
+                                         , melpaBuild }:
+      melpaBuild {
         pname = "geben-helm-projectile";
         version = "0.0.4";
         src = fetchFromGitHub {
           owner = "ahungry";
           repo = "geben-helm-projectile";
-          rev = "31ce0faca5dcc71924884f03fd5a7a25d00ccd9b";
-          sha256 = "0a1srhwfbgkvndjfi9irg5s6snlxyqrw1vwyqg1sn8aqnbpgib04";
+          rev = "14db489efcb20c5aa9102288c94cec3c5a87c35d";
+          sha256 = "1nd1jhy393vkn2g65zhygxkpgna0l8gkndxr8jb6qjkkapk58k8l";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b7d28c45304a69e6ca78b3d00df2563171c027ee/recipes/geben-helm-projectile";
           sha256 = "11zhapys6wx2cadflvjimsmilwvjpfd4ihwzzmap8shxpyllsq9r";
-          name = "geben-helm-projectile";
+          name = "recipe";
         };
         packageRequires = [ emacs geben helm-projectile ];
         meta = {
@@ -14746,20 +18440,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    geiser = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    geiser = callPackage ({ fetchFromGitLab
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "geiser";
         version = "0.10";
-        src = fetchFromGitHub {
+        src = fetchFromGitLab {
           owner = "jaor";
           repo = "geiser";
           rev = "775d1d734a677274fbbf4af780592bb3768d3f9b";
           sha256 = "086qlii1w7sqxwnxwxvc4d6d71p829jabhgwvi0l0bjkxn7bx8pq";
         };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/b0fe32d24cedd5307b4cccfb08a7095d81d639a0/recipes/geiser";
-          sha256 = "067rrjvyn5sz60w9h7qn542d9iycm2q4ryvx3n6xlard0dky5596";
-          name = "geiser";
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/67dc8d6e33f3522043f96761b23ea68c9c27084e/recipes/geiser";
+          sha256 = "1g7z6c3lfa7slwrxk7q8awqs39qibcv2kc4c2fwlwvgbcfhkw085";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -14767,8 +18464,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    genrnc = callPackage ({ concurrent, deferred, fetchFromGitHub, fetchurl, lib, log4e, melpaBuild, yaxception }:
-    melpaBuild {
+    genrnc = callPackage ({ concurrent
+                          , deferred
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , log4e
+                          , melpaBuild
+                          , yaxception }:
+      melpaBuild {
         pname = "genrnc";
         version = "0.1.0";
         src = fetchFromGitHub {
@@ -14777,10 +18481,10 @@
           rev = "da75b1966a73ad215ec2ced4522c25f4d0bf1f9a";
           sha256 = "08cw1fa25kbhbq2sp1cpn90bz38i9hjfdj93xf6wvki55b52s0nn";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/dd2d908ba5fa96d90643091573939e54d9165aaa/recipes/genrnc";
           sha256 = "1nwbdscl0yh9j1n421can93m6s8j9dkyb3xmpampr6x528g6z0lm";
-          name = "genrnc";
+          name = "recipe";
         };
         packageRequires = [ concurrent deferred log4e yaxception ];
         meta = {
@@ -14788,8 +18492,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    german-holidays = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    german-holidays = callPackage ({ fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "german-holidays";
         version = "0.2.0";
         src = fetchFromGitHub {
@@ -14798,10 +18505,10 @@
           rev = "8388b3bf5b5c38f9b9fcc9216ca26ef0640c6edc";
           sha256 = "0344w4sbd6wlgl13j163v0hzjw9nwhvpr5s7658xsdd90wp4i701";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bf5b3807ff989b13f95e8d6fad2f26a42ff0643c/recipes/german-holidays";
           sha256 = "0fgrxdgyl6va6axjc5l4sp90pyqaz5zha1g73xyhbxblshm5dwxn";
-          name = "german-holidays";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -14809,8 +18516,37 @@
           license = lib.licenses.free;
         };
       }) {};
-    ggo-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    gf = callPackage ({ fetchFromGitHub
+                      , fetchurl
+                      , ht
+                      , lib
+                      , melpaBuild
+                      , s }:
+      melpaBuild {
+        pname = "gf";
+        version = "1.0.1";
+        src = fetchFromGitHub {
+          owner = "grammaticalframework";
+          repo = "gf-emacs-mode";
+          rev = "4ab35bb727bd0717e0691d3c490f72551e13d683";
+          sha256 = "0al1ad92ga84wm0kx66wplnn1p05mxf7ik4r5gknr8jp6aa1lcqd";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/1c2cc74eb19c54219cd5c5c11d886074859f0948/recipes/gf";
+          sha256 = "170q5a7lwa9pbpn0ghcfzny0jfn42wgns1lcv8fngr0k1njfj6v8";
+          name = "recipe";
+        };
+        packageRequires = [ ht s ];
+        meta = {
+          homepage = "https://melpa.org/#/gf";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ggo-mode = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "ggo-mode";
         version = "20130521";
         src = fetchFromGitHub {
@@ -14819,10 +18555,10 @@
           rev = "ea5097f87072309c7b77204888d459d084bf630f";
           sha256 = "1m9ra9qp7bgf6anfqyn56n3xa9a25ran10k9wd355qknd5skq1zz";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e055994c3c3042eab11f11ec916ad5b56689809f/recipes/ggo-mode";
           sha256 = "1403x530n90jlfz3lq2vfiqx84cxsrhgs6hhmniq960cjj31q35p";
-          name = "ggo-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -14830,8 +18566,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    ggtags = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ggtags = callPackage ({ cl-lib ? null
+                          , emacs
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "ggtags";
         version = "0.8.12";
         src = fetchFromGitHub {
@@ -14840,10 +18581,10 @@
           rev = "7a7ee76a8055531482927e6abf7e0ef676165dd2";
           sha256 = "1kyg26wdimy5k5icglgqg9gdfvzkgk4xis12nx1xkh01j2imzl97";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b158bb1bc2fbe3de61a6b21174eac7b1457edda2/recipes/ggtags";
           sha256 = "1cmry4knxbx9257ivhfxsd09z07z3g3wjihi99nrwmhb9h4mpqyw";
-          name = "ggtags";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -14851,8 +18592,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    gh = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, logito, melpaBuild, pcache }:
-    melpaBuild {
+    gh = callPackage ({ emacs
+                      , fetchFromGitHub
+                      , fetchurl
+                      , lib
+                      , logito
+                      , melpaBuild
+                      , pcache }:
+      melpaBuild {
         pname = "gh";
         version = "0.10.0";
         src = fetchFromGitHub {
@@ -14861,10 +18608,10 @@
           rev = "d0471dd1ba279072cbf8caf6368f3008d7120f25";
           sha256 = "099msgsxdqyjrd18jv2mfkpaylp2scq18782354lcpr3fbp8vbsl";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/gh";
           sha256 = "1141l8pas3m755yzby4zsan7p81nbnlch3kj1zh69qzjpgqp30c0";
-          name = "gh";
+          name = "recipe";
         };
         packageRequires = [ emacs logito pcache ];
         meta = {
@@ -14872,20 +18619,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    ghc = callPackage ({ fetchFromGitHub, fetchurl, haskell-mode, lib, melpaBuild }:
-    melpaBuild {
+    ghc = callPackage ({ fetchFromGitHub
+                       , fetchurl
+                       , haskell-mode
+                       , lib
+                       , melpaBuild }:
+      melpaBuild {
         pname = "ghc";
         version = "5.8.0.0";
         src = fetchFromGitHub {
           owner = "DanielG";
           repo = "ghc-mod";
-          rev = "35690941aadbe44d9401102ab44a39753e0bb2b5";
-          sha256 = "0fcaxj2lhkhkm2h91d9fdqas2b99wblwl74l2y6ckpf05hrc4w1q";
+          rev = "a96d820753030fb8de0944727ddc3fed191eab00";
+          sha256 = "1xdb4482i03lily4lj41y9wsadh2qwqmh8wrzzal966gqk4m25i4";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/ghc";
           sha256 = "02nc7a9khqpd4ca2snam8dq72m53q8x7v5awx56bjq31z6vcmav5";
-          name = "ghc";
+          name = "recipe";
         };
         packageRequires = [ haskell-mode ];
         meta = {
@@ -14893,8 +18644,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    ghc-imported-from = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ghc-imported-from = callPackage ({ emacs
+                                     , fetchFromGitHub
+                                     , fetchurl
+                                     , lib
+                                     , melpaBuild }:
+      melpaBuild {
         pname = "ghc-imported-from";
         version = "0.1.2";
         src = fetchFromGitHub {
@@ -14903,10 +18658,10 @@
           rev = "fcff08628a19f5d26151564659218cc677779b79";
           sha256 = "1ywwyc2kz1c1s26c412nmzh55cinh84cfiazyyi3jsy5zzwhrbhi";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ghc-imported-from";
           sha256 = "063kbymk4r1yrg5ks660d2byrnia6gs6nimjzrvqfi2ib1psc7jc";
-          name = "ghc-imported-from";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -14914,8 +18669,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    ghq = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ghq = callPackage ({ fetchFromGitHub
+                       , fetchurl
+                       , lib
+                       , melpaBuild }:
+      melpaBuild {
         pname = "ghq";
         version = "0.1.2";
         src = fetchFromGitHub {
@@ -14924,10 +18682,10 @@
           rev = "aae4b8cb22fd6c24d2c9e3962c7e8e9dac6d9825";
           sha256 = "0rh2k93c3a0vl073a3s3a3h6gkw454v1lyd7y8l3pd24vw9hc628";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a9daa3b0039f6b296b8176523cffbbe27506bb02/recipes/ghq";
           sha256 = "0prvywcgwdhx5pw66rv5kkfriahal2mli2ibam5np3z6bwcq4ngh";
-          name = "ghq";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -14935,20 +18693,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    ghub = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }:
-    melpaBuild {
+    ghub = callPackage ({ emacs
+                        , fetchFromGitHub
+                        , fetchurl
+                        , let-alist
+                        , lib
+                        , melpaBuild }:
+      melpaBuild {
         pname = "ghub";
-        version = "2.0.0";
+        version = "2.0.1";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "ghub";
-          rev = "ae37bef2eb3afb8232bb0a6f7306a8da2390abf4";
-          sha256 = "1k8bim7yk3swpzsx5lwm6qbjfqf2lsssir0zlqzrkid61d3ixfgy";
+          rev = "9496d29d645823b52db347d5571cfd3c4ddcff06";
+          sha256 = "1xa5pdzp18ykm59kc10bx3rqh0c1vq203yrikvqdj1gx088ksmj7";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/70a4dbd62fd6ebb4e056d0e97fa1a958437ddc91/recipes/ghub";
           sha256 = "031bzp61aal2id5sazwjz30svydjvxvphw5wbv5cyy4dqyh7w2ps";
-          name = "ghub";
+          name = "recipe";
         };
         packageRequires = [ emacs let-alist ];
         meta = {
@@ -14956,20 +18719,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    ghub-plus = callPackage ({ apiwrap, emacs, fetchFromGitHub, fetchurl, ghub, lib, melpaBuild }:
-    melpaBuild {
+    ghub-plus = callPackage ({ apiwrap
+                             , emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , ghub
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "ghub-plus";
-        version = "0.2.1";
+        version = "0.3";
         src = fetchFromGitHub {
           owner = "vermiculus";
           repo = "ghub-plus";
-          rev = "8cfdaf42446a68e6aa4eb0655d43563407cb5636";
-          sha256 = "0acfqf1219bnzyf64sv68fvpi4a13nc0wv8dz5a8h6r1j0ysx6qj";
+          rev = "b4a9662f5a6562f8d1dfdda2f009ec78a107c9a2";
+          sha256 = "0xi7xhdla64xbcfqi8x8yzqc6v6rrqxd4q8lcrv7sw08ap5ykfas";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/03a412fd25218ff6f302734e078a699ff0234e36/recipes/ghub+";
           sha256 = "0xx7nwmjx3f7z6z164x1lb9arbb3m3d16mpn92v66w572rhbr34n";
-          name = "ghub-plus";
+          name = "recipe";
         };
         packageRequires = [ apiwrap emacs ghub ];
         meta = {
@@ -14977,8 +18746,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    gist = callPackage ({ emacs, fetchFromGitHub, fetchurl, gh, lib, melpaBuild }:
-    melpaBuild {
+    gist = callPackage ({ emacs
+                        , fetchFromGitHub
+                        , fetchurl
+                        , gh
+                        , lib
+                        , melpaBuild }:
+      melpaBuild {
         pname = "gist";
         version = "1.4.0";
         src = fetchFromGitHub {
@@ -14987,10 +18761,10 @@
           rev = "a03f142455e8b39f77fbd57ee1c1e44478c1f9e2";
           sha256 = "1xisjaxr54zrxzxj8cp8f90kzphd5v3j56d14534fm5r1f5343vp";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/gist";
           sha256 = "053fl8aw0ram9wsabzvmlm5w2klwd2pgcn2w9r1yqfs4xqja5sd3";
-          name = "gist";
+          name = "recipe";
         };
         packageRequires = [ emacs gh ];
         meta = {
@@ -14998,8 +18772,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    git = callPackage ({ dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    git = callPackage ({ dash
+                       , f
+                       , fetchFromGitHub
+                       , fetchurl
+                       , lib
+                       , melpaBuild
+                       , s }:
+      melpaBuild {
         pname = "git";
         version = "0.1.1";
         src = fetchFromGitHub {
@@ -15008,10 +18788,10 @@
           rev = "8b7f1477ef367b5b7de452589dd9a8ab30150d0a";
           sha256 = "06ws3x5qa92drmn6rcp502jk2yil6q9gkzdmb2gww9gb2g695wl5";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ce19d2716416295966716db47241a0e37b412ab5/recipes/git";
           sha256 = "1nd2yvfgin13m368gjn7xah99glspnam4g4fh348x4makxcaw8w5";
-          name = "git";
+          name = "recipe";
         };
         packageRequires = [ dash f s ];
         meta = {
@@ -15019,8 +18799,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    git-annex = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    git-annex = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "git-annex";
         version = "1.1";
         src = fetchFromGitHub {
@@ -15029,10 +18812,10 @@
           rev = "7d41775a1709b5754a7779e9f64f15d336ea5c8c";
           sha256 = "0fm62lm29wp1ljgyi6pqqkzwzps53cjjbj5j3y0c2013ry7va6c5";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9c91e16bb9e92db9dc9be6a7af3944c3290d2f14/recipes/git-annex";
           sha256 = "0194y24vq1w6m2cjgqgx9dqp99cq8y9licyry2zxa5brbrsxi94l";
-          name = "git-annex";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -15040,8 +18823,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    git-attr = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    git-attr = callPackage ({ emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "git-attr";
         version = "0.0.3";
         src = fetchFromGitHub {
@@ -15050,10 +18837,10 @@
           rev = "c03078637a00ea301cbcc7ae301ae928b10af889";
           sha256 = "05wzy8g0yjkks0zmcvwn9dmr6kxk1bz91xic3c08b0j1z5lbsdv7";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3417e4bc586df60b5e6239b1f7683b87953f5b7c/recipes/git-attr";
           sha256 = "084l3zdcgy1ka2wq1fz9d6ryhg38gxvr52njlv43gwibzvbqniyi";
-          name = "git-attr";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -15061,8 +18848,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    git-auto-commit-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    git-auto-commit-mode = callPackage ({ fetchFromGitHub
+                                        , fetchurl
+                                        , lib
+                                        , melpaBuild }:
+      melpaBuild {
         pname = "git-auto-commit-mode";
         version = "4.4.0";
         src = fetchFromGitHub {
@@ -15071,10 +18861,10 @@
           rev = "075e5f9ded66c2035581a7b216896556cc586814";
           sha256 = "0psmr7749nzxln4b500sl3vrf24x3qijp12ir0i5z4x25k72hrlh";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5660fb76ce93e5fe56227698d079c6994ef3305f/recipes/git-auto-commit-mode";
           sha256 = "0nf4n63xnzcsizjk1yl8qvqj9wjdqy57kvn6r736xvsxwzd44xgl";
-          name = "git-auto-commit-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -15082,8 +18872,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    git-command = callPackage ({ fetchFromGitHub, fetchurl, git-ps1-mode, lib, melpaBuild, term-run, with-editor }:
-    melpaBuild {
+    git-command = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , git-ps1-mode
+                               , lib
+                               , melpaBuild
+                               , term-run
+                               , with-editor }:
+      melpaBuild {
         pname = "git-command";
         version = "0.2.0";
         src = fetchFromGitHub {
@@ -15092,10 +18888,10 @@
           rev = "6cc5c17ca3cc1967b5402bb9a0538fb90933428d";
           sha256 = "0a3ws852ypi34ash39srkwzkfish4n3c5lma10d9xzddjrwapgj9";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8a55d697bc95a7026c7788c13e4765e1b71075e3/recipes/git-command";
           sha256 = "1hsxak63y6648n0jkzl5ajxg45w84qq8vljvjh0bmwfrbb67kwbg";
-          name = "git-command";
+          name = "recipe";
         };
         packageRequires = [ git-ps1-mode term-run with-editor ];
         meta = {
@@ -15103,20 +18899,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    git-commit = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, with-editor }:
-    melpaBuild {
+    git-commit = callPackage ({ dash
+                              , emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild
+                              , with-editor }:
+      melpaBuild {
         pname = "git-commit";
-        version = "2.12.1";
+        version = "2.13.0";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "44508d71fb400910adb5d0594b56d3c34aa3a5de";
-          sha256 = "0cpcdrikfcmkb6sj13bvznilyk8yc054pq5md874s3j224bdxcnx";
+          rev = "e03685e813330a750c1d2e525a8f8c74901fccfb";
+          sha256 = "119x8lg8alf97j8r3swmy6yf9112a9s2z2584n74bk847mxl2qwz";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/git-commit";
           sha256 = "1i7122fydqga68cilgzir80xfq77hnrw75zrvn52mjymfli6aza2";
-          name = "git-commit";
+          name = "recipe";
         };
         packageRequires = [ dash emacs with-editor ];
         meta = {
@@ -15124,29 +18926,43 @@
           license = lib.licenses.free;
         };
       }) {};
-    git-commit-insert-issue = callPackage ({ bitbucket, fetchFromGitLab, fetchurl, github-issues, gitlab, lib, melpaBuild, projectile, s }:
-    melpaBuild {
+    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";
         src = fetchFromGitLab {
           owner = "emacs-stuff";
           repo = "git-commit-insert-issue";
           rev = "5f08c17bf93b17915415d435ee41923d924fe20b";
-          sha256 = "1gffjf6byasisa9jdcv9n4n5zqalvzfsxv7z75zl0g3ph7wc7bbm";
+          sha256 = "11my5apnyhdqh0pmq9wdjd1iah415a5nw87sk586cb3vxnbn5qas";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/git-commit-insert-issue";
           sha256 = "0xhlchr7dbm0hp4cjba3x1fdf7lnfc97id327i2fqgkdc4yn9fax";
-          name = "git-commit-insert-issue";
+          name = "recipe";
         };
-        packageRequires = [ bitbucket github-issues gitlab projectile s ];
+        packageRequires = [ bitbucket github-issues gitlab helm projectile s ];
         meta = {
           homepage = "https://melpa.org/#/git-commit-insert-issue";
           license = lib.licenses.free;
         };
       }) {};
-    git-gutter = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    git-gutter = callPackage ({ cl-lib ? null
+                              , emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "git-gutter";
         version = "0.90";
         src = fetchFromGitHub {
@@ -15155,10 +18971,10 @@
           rev = "a786465bd527c13e32c73c02b95086560c1be878";
           sha256 = "1abagq0psip7cgsqbfjv72qy60ywsny0ibsfcn74ldj6a9v17mz5";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/81f0f525680fea98e804f39dbde1dada887e8821/recipes/git-gutter";
           sha256 = "19s344i95piixlzq4mjgmgjw7cy8af02z6hg89jjjdbxrfl4i2fg";
-          name = "git-gutter";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -15166,8 +18982,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    git-gutter-fringe = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, fringe-helper, git-gutter, lib, melpaBuild }:
-    melpaBuild {
+    git-gutter-fringe = callPackage ({ cl-lib ? null
+                                     , emacs
+                                     , fetchFromGitHub
+                                     , fetchurl
+                                     , fringe-helper
+                                     , git-gutter
+                                     , lib
+                                     , melpaBuild }:
+      melpaBuild {
         pname = "git-gutter-fringe";
         version = "0.23";
         src = fetchFromGitHub {
@@ -15176,10 +18999,10 @@
           rev = "dfc93d1064df154a809aab350942830408051da3";
           sha256 = "18jpa5i99x0gqizs2qbqr8c1jlza8x9vpb6wg9zqd4np1p6q4lan";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/81f0f525680fea98e804f39dbde1dada887e8821/recipes/git-gutter-fringe";
           sha256 = "10k07dzmkxsxzwc70vpv05rxjyps9494y6k7yhlv8d46x7xjyp0z";
-          name = "git-gutter-fringe";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs fringe-helper git-gutter ];
         meta = {
@@ -15187,8 +19010,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    git-gutter-fringe-plus = callPackage ({ fetchFromGitHub, fetchurl, fringe-helper, git-gutter-plus, lib, melpaBuild }:
-    melpaBuild {
+    git-gutter-fringe-plus = callPackage ({ fetchFromGitHub
+                                          , fetchurl
+                                          , fringe-helper
+                                          , git-gutter-plus
+                                          , lib
+                                          , melpaBuild }:
+      melpaBuild {
         pname = "git-gutter-fringe-plus";
         version = "0.1";
         src = fetchFromGitHub {
@@ -15197,10 +19025,10 @@
           rev = "ce9d594c0189e78d78df26a0c26bbcf886e373cd";
           sha256 = "1c7ijbpa7xw831k55cdm2gl8r597rxnp22jcmqnfpwqkqmk48ln9";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ad46c349d13f7d40db706b487319ede40b96b09c/recipes/git-gutter-fringe+";
           sha256 = "1zkjb8p08cq2nqskn79rjszlhp9mrblplgamgi66yskz8qb1bgcc";
-          name = "git-gutter-fringe-plus";
+          name = "recipe";
         };
         packageRequires = [ fringe-helper git-gutter-plus ];
         meta = {
@@ -15208,8 +19036,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    git-gutter-plus = callPackage ({ fetchFromGitHub, fetchurl, git-commit, lib, melpaBuild }:
-    melpaBuild {
+    git-gutter-plus = callPackage ({ fetchFromGitHub
+                                   , fetchurl
+                                   , git-commit
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "git-gutter-plus";
         version = "0.4";
         src = fetchFromGitHub {
@@ -15218,10 +19050,10 @@
           rev = "f8daebb6569bb116086d8653da3505382e03d940";
           sha256 = "101hracd77mici778x3ixwrcicd6fqkcr9z76kapkr0dq5z42yjb";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b2db25d23c2a1a4f38867aac25d687a150e95c2b/recipes/git-gutter+";
           sha256 = "1w78p5cz6kyl9kmndgvwnfrs80ha707s8952hycrihgfb6lixmp0";
-          name = "git-gutter-plus";
+          name = "recipe";
         };
         packageRequires = [ git-commit ];
         meta = {
@@ -15229,20 +19061,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    git-lens = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    git-lens = callPackage ({ emacs
+                            , fetchFromGitLab
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "git-lens";
         version = "0.7.0";
-        src = fetchFromGitHub {
+        src = fetchFromGitLab {
           owner = "pidu";
           repo = "git-lens";
           rev = "ea49e2e005af977a08331f8caa8f64d102b3b932";
           sha256 = "0prx0xbnhhp46c09nnzpz07jgr3s5ngrw8zjksf48abr8acwywfv";
         };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/66fd7c0642e8e61b883d2030f88892d039380475/recipes/git-lens";
-          sha256 = "1vv3s89vk5ncinqh2f724z0qbbzp8g4y5y670ryy56w1l6v2acfb";
-          name = "git-lens";
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/a52b516b7b10bdada2f64499c8f43f85a236f254/recipes/git-lens";
+          sha256 = "02a393b5y4vpmf9ixgyi3a4gbzk4146zql827ljlav3j0434ssw2";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -15250,29 +19086,38 @@
           license = lib.licenses.free;
         };
       }) {};
-    git-link = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    git-link = callPackage ({ emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "git-link";
-        version = "0.5.1";
+        version = "0.7.1";
         src = fetchFromGitHub {
           owner = "sshaw";
           repo = "git-link";
-          rev = "472af75eca7aba42a1934f408c4bda55e34c9dcf";
-          sha256 = "0xgvwg2zxb9akk3kxxcz5cvgw4zkbqx5p4b5in01z5aj4lqmjw6s";
+          rev = "efd14ab5f17f5942d25e165210447f3983f3250e";
+          sha256 = "0rd2g4s73xk8m595aa11vr59gnn5mx7lbcf0040w1xqvlrryzyc9";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1385443585e628e3d4efb3badb7611e9d653e0c9/recipes/git-link";
           sha256 = "1vqabnmdw8pxd84c15ghh1rnglwb5i4zxicvpkg1ci8xalayn1c7";
-          name = "git-link";
+          name = "recipe";
         };
-        packageRequires = [ cl-lib ];
+        packageRequires = [ emacs ];
         meta = {
           homepage = "https://melpa.org/#/git-link";
           license = lib.licenses.free;
         };
       }) {};
-    git-messenger = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, popup }:
-    melpaBuild {
+    git-messenger = callPackage ({ emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild
+                                 , popup }:
+      melpaBuild {
         pname = "git-messenger";
         version = "0.18";
         src = fetchFromGitHub {
@@ -15281,10 +19126,10 @@
           rev = "9297464c010dd8a2d584ac8e012876856655a8b5";
           sha256 = "04fnby2nblk8l70gv09asxkmnn53fh1pdfs77ix44npp99fyw8ix";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e791293133f30e5d96c4b29e972f9016c06c476d/recipes/git-messenger";
           sha256 = "1rnqsv389why13cy6462vyq12qc2zk58p01m3hsazp1gpfw2hfzn";
-          name = "git-messenger";
+          name = "recipe";
         };
         packageRequires = [ emacs popup ];
         meta = {
@@ -15292,8 +19137,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    git-ps1-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    git-ps1-mode = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "git-ps1-mode";
         version = "0.2.2";
         src = fetchFromGitHub {
@@ -15302,10 +19150,10 @@
           rev = "288e5c4d0ff20a4e1ac9e72b6af632f67f1d7525";
           sha256 = "1hyq3il03cm6apfawps60r4km8r6pw0vphzba30smsqfk50z3ya3";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ea177b5ea168828881bd8dcd29ef6b4cb81317f0/recipes/git-ps1-mode";
           sha256 = "15gswi9s0m3hrsl1qqyjnjgbglsai95klbdp51h3pcq7zj22wkn6";
-          name = "git-ps1-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -15313,20 +19161,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    git-timemachine = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    git-timemachine = callPackage ({ emacs
+                                   , fetchFromGitLab
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "git-timemachine";
         version = "4.5";
-        src = fetchFromGitHub {
+        src = fetchFromGitLab {
           owner = "pidu";
           repo = "git-timemachine";
           rev = "dbcb92ffaa5f8350d47f4fbd74512f4000b8c043";
           sha256 = "1ml06jfjyrcqmbpr5hqvbpi3yy6l2aa836jq8qjla1h74g9qka7z";
         };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/41e95e41fc429b688f0852f58ec6ce80303b68ce/recipes/git-timemachine";
-          sha256 = "0nhl3g31r4a8j7rp5kbh17ixi16w32h80bc92vvjj3dlmk996nzq";
-          name = "git-timemachine";
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/a52b516b7b10bdada2f64499c8f43f85a236f254/recipes/git-timemachine";
+          sha256 = "06xdzic7j3d3pqgwxp1q6fs8sf3mi02a9phjvhk90kyvbr8h94ck";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -15334,20 +19186,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    git-wip-timemachine = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    git-wip-timemachine = callPackage ({ fetchFromGitHub
+                                       , fetchurl
+                                       , lib
+                                       , melpaBuild
+                                       , s }:
+      melpaBuild {
         pname = "git-wip-timemachine";
         version = "1.0";
         src = fetchFromGitHub {
           owner = "itsjeyd";
           repo = "git-wip-timemachine";
-          rev = "7da7f2acec0b1d1252d7474b13190ae88e5b205d";
-          sha256 = "0igawn43i81icshimj5agv33ab120hd6182knlrn3i46p7lcs3lx";
+          rev = "ae1600263608c7b84f6f136fca929875cd385bc1";
+          sha256 = "1y5h817lymsaqpj8wv3hha36ihspv4c17mwl020x91r82ijd1aym";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/81b5dd5765f52efdb88fdc14f48af641a18b3dcb/recipes/git-wip-timemachine";
           sha256 = "02fi51k6l23cgnwjp507ylkiwb8azmnhc0fips68nwn9dghzp6dw";
-          name = "git-wip-timemachine";
+          name = "recipe";
         };
         packageRequires = [ s ];
         meta = {
@@ -15355,20 +19211,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    gitattributes-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    gitattributes-mode = callPackage ({ fetchFromGitHub
+                                      , fetchurl
+                                      , lib
+                                      , melpaBuild }:
+      melpaBuild {
         pname = "gitattributes-mode";
         version = "1.2.7";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "git-modes";
-          rev = "b08ac12f09a6cfe967ef70dad3f22430da4fbdab";
-          sha256 = "13zwdl0gn8ykqprqv3f3sfjsdqx9zk8ih4k4y7qm5i36crip8nyy";
+          rev = "95ad581ae2aeba87b418ae9554eb326cdba9837d";
+          sha256 = "15irwyc0fmp0k5dag1n07xa8ka7n84drbrg2savslvb9m71011dg";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4b4e2ddd2a80875afc0fc654052e6cbff2f3777f/recipes/gitattributes-mode";
           sha256 = "1gjs0pjh6ap0h54savamzx94lq6vqrg58jxqaq5n5qplrbg15a6x";
-          name = "gitattributes-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -15376,8 +19235,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    gitconfig = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    gitconfig = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "gitconfig";
         version = "1.0.0";
         src = fetchFromGitHub {
@@ -15386,10 +19248,10 @@
           rev = "6c313a39e20702ddcebc12d146f69db1ce668901";
           sha256 = "0j0w6ywhiapmx7dk20yw3zgf8803kmccnjsr664am3g85kbb644v";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/gitconfig";
           sha256 = "0lqm04nfhhhsdagrjnnagkpg7vpswd8lkd3l52lmpdh0fy16kgrf";
-          name = "gitconfig";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -15397,20 +19259,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    gitconfig-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    gitconfig-mode = callPackage ({ fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "gitconfig-mode";
         version = "1.2.7";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "git-modes";
-          rev = "b08ac12f09a6cfe967ef70dad3f22430da4fbdab";
-          sha256 = "13zwdl0gn8ykqprqv3f3sfjsdqx9zk8ih4k4y7qm5i36crip8nyy";
+          rev = "ae6e897c06d3ff609a65a3ac2500d21ccc888822";
+          sha256 = "111pm9wwq8p3wiqgap7gyi20say3daadlaxgq2v3mwxyax8fyx34";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/44a37f59b87f59a587f6681e7aadfabf137c98d7/recipes/gitconfig-mode";
           sha256 = "0hqky40kcgxdnghnf56gpi0xp7ik45ssia1x84v0mvfwqc50dgn1";
-          name = "gitconfig-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -15418,8 +19283,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    github-browse-file = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    github-browse-file = callPackage ({ cl-lib ? null
+                                      , fetchFromGitHub
+                                      , fetchurl
+                                      , lib
+                                      , melpaBuild }:
+      melpaBuild {
         pname = "github-browse-file";
         version = "0.5.0";
         src = fetchFromGitHub {
@@ -15428,10 +19297,10 @@
           rev = "fa5cc00a40869430fb44596792961a4cddf9c265";
           sha256 = "07vgnmfn0kbg3h3vhf3xk443yi1b55761x881xlmw9sr9nraa578";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f8bca60348fc5e2ad55663e69b8690093cf861ca/recipes/github-browse-file";
           sha256 = "03xvgxlw7wmfby898din7dfcg87ihahkhlav1n7qklw6qi7skjcr";
-          name = "github-browse-file";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -15439,8 +19308,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    github-clone = callPackage ({ emacs, fetchFromGitHub, fetchurl, gh, lib, magit, melpaBuild }:
-    melpaBuild {
+    github-clone = callPackage ({ emacs
+                                , fetchFromGitHub
+                                , fetchurl
+                                , gh
+                                , lib
+                                , magit
+                                , melpaBuild }:
+      melpaBuild {
         pname = "github-clone";
         version = "0.2";
         src = fetchFromGitHub {
@@ -15449,10 +19324,10 @@
           rev = "ab048cf49d9ebda73acae803bc44e731e629d540";
           sha256 = "18c169nxvdl7iv18pyqx690ldg6pkc8njaxdg1cww6ykqzqnfxh7";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ba11d6a5cc2fbc76037687c842f90dc815a6468e/recipes/github-clone";
           sha256 = "0ffrm4lmcj3d9kx3g2d5xbiih7hn4frs0prjrvcjq8acvsbc50q9";
-          name = "github-clone";
+          name = "recipe";
         };
         packageRequires = [ emacs gh magit ];
         meta = {
@@ -15460,20 +19335,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    github-elpa = callPackage ({ commander, fetchFromGitHub, fetchurl, git, lib, melpaBuild, package-build }:
-    melpaBuild {
+    github-elpa = callPackage ({ commander
+                               , fetchFromGitHub
+                               , fetchurl
+                               , git
+                               , lib
+                               , melpaBuild
+                               , package-build }:
+      melpaBuild {
         pname = "github-elpa";
         version = "0.0.1";
         src = fetchFromGitHub {
           owner = "10sr";
           repo = "github-elpa";
-          rev = "c5960375ed5d67465412be7eb0ac558082feebc7";
-          sha256 = "02710iy9zz4ymmb2ydrca5kbdc5i06fjg7212iyvpd58yfzxjj2m";
+          rev = "649e66cd84e5af6f7fe13fd502e799d19aac0cda";
+          sha256 = "09q6v0vsk344chzwp6sp5cwyr7hkvzi2r1w6xxg1zwy7rzy4klfz";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/81ec06e370f51b750ba3313b661d7386710cffb0/recipes/github-elpa";
           sha256 = "1981dnz49l5r4qsn49i4dhy6x4ln0haff6gl2zx0p5p0zfkzbi7x";
-          name = "github-elpa";
+          name = "recipe";
         };
         packageRequires = [ commander git package-build ];
         meta = {
@@ -15481,8 +19362,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    github-notifier = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    github-notifier = callPackage ({ emacs
+                                   , fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "github-notifier";
         version = "0.1";
         src = fetchFromGitHub {
@@ -15491,10 +19376,10 @@
           rev = "f8d011ebef9f626a94a27b5576c8ed06e6ff8987";
           sha256 = "0glkn36fs93y2n1583k8v958qfhl212hbdk3cpkq432hj08wzjnr";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c09f4e7e8a84a241881d214e8359f8a50ab14ddf/recipes/github-notifier";
           sha256 = "1jqc2wx1pvkca8syj97ds32404szm0wn12b7zpa98265sg3n64nw";
-          name = "github-notifier";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -15502,8 +19387,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    github-search = callPackage ({ fetchFromGitHub, fetchurl, gh, lib, magit, melpaBuild }:
-    melpaBuild {
+    github-search = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , gh
+                                 , lib
+                                 , magit
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "github-search";
         version = "0.0.1";
         src = fetchFromGitHub {
@@ -15512,10 +19402,10 @@
           rev = "1a5c1f8291f4d41e57367a8522699cb08eea8fc4";
           sha256 = "1382hda3hgpx3c3d1kjzz8hs4l5hi3s7c485hsgihhr6xdd5wrgm";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/733a808400858513137e0e3d7d38b5b25e8ddc5a/recipes/github-search";
           sha256 = "1pwrzbbwnq0il5494561fyvkr0vmm5jqlvpffgkk28c54vs7ms0b";
-          name = "github-search";
+          name = "recipe";
         };
         packageRequires = [ gh magit ];
         meta = {
@@ -15523,20 +19413,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    gitignore-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    gitignore-mode = callPackage ({ fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "gitignore-mode";
         version = "1.2.7";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "git-modes";
-          rev = "b08ac12f09a6cfe967ef70dad3f22430da4fbdab";
-          sha256 = "13zwdl0gn8ykqprqv3f3sfjsdqx9zk8ih4k4y7qm5i36crip8nyy";
+          rev = "ae6e897c06d3ff609a65a3ac2500d21ccc888822";
+          sha256 = "111pm9wwq8p3wiqgap7gyi20say3daadlaxgq2v3mwxyax8fyx34";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/44a37f59b87f59a587f6681e7aadfabf137c98d7/recipes/gitignore-mode";
           sha256 = "1i98ribmnxr4hwphd95f9hcfm5wfwgdbcxw3g0w17ws7z0ir61mn";
-          name = "gitignore-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -15544,20 +19437,27 @@
           license = lib.licenses.free;
         };
       }) {};
-    gitlab = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, request, s }:
-    melpaBuild {
+    gitlab = callPackage ({ dash
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild
+                          , pkg-info
+                          , request
+                          , s }:
+      melpaBuild {
         pname = "gitlab";
         version = "0.8.0";
         src = fetchFromGitHub {
           owner = "nlamirault";
           repo = "emacs-gitlab";
-          rev = "a1c1441ff5ffb290e695eb9ac05431e9385578f4";
-          sha256 = "0ywjrgafpl4cnrykx9yysazr7hkd2pxk67h065f8z3mid6cgh1wa";
+          rev = "cffba49c1260421b8e388c65365b229970098e5c";
+          sha256 = "1wh6z7ni8nwqigvgz77zgqszx60s1k1chpzgzs1k3kfby7apxww1";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1d012991188956f6e06c37d504b0d06ab31487b9/recipes/gitlab";
           sha256 = "0vxsqfnipgapnd2ijvdnkspk68dlnki3pkpkzg2h6hyazmzrsqnq";
-          name = "gitlab";
+          name = "recipe";
         };
         packageRequires = [ dash pkg-info request s ];
         meta = {
@@ -15565,20 +19465,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    gitlab-ci-mode = callPackage ({ emacs, fetchFromGitLab, fetchurl, lib, melpaBuild, yaml-mode }:
-    melpaBuild {
+    gitlab-ci-mode = callPackage ({ emacs
+                                  , fetchFromGitLab
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild
+                                  , yaml-mode }:
+      melpaBuild {
         pname = "gitlab-ci-mode";
         version = "20180306.1";
         src = fetchFromGitLab {
           owner = "joewreschnig";
           repo = "gitlab-ci-mode";
           rev = "313431fa5b8b5ce4512909dfc15675bb99395f6f";
-          sha256 = "0wjz87nhcwzp201jxv3qlj88hn7p8nvq20924y06gra2d656znar";
+          sha256 = "0zdj3f0a5fg4vwhbv851jv4fs1dqfz2w4jsxqbri2zhzdjxc97vn";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d7915ddcf21fdec539a86bb86c209cf0bbd378cb/recipes/gitlab-ci-mode";
           sha256 = "1jg6ihrgccrcwg30ysyqw9k7rmvfmsrp70skr2057hfamvccwn4f";
-          name = "gitlab-ci-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs yaml-mode ];
         meta = {
@@ -15586,20 +19491,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    gitlab-ci-mode-flycheck = callPackage ({ emacs, fetchFromGitLab, fetchurl, flycheck, gitlab-ci-mode, lib, melpaBuild }:
-    melpaBuild {
+    gitlab-ci-mode-flycheck = callPackage ({ emacs
+                                           , fetchFromGitLab
+                                           , fetchurl
+                                           , flycheck
+                                           , gitlab-ci-mode
+                                           , lib
+                                           , melpaBuild }:
+      melpaBuild {
         pname = "gitlab-ci-mode-flycheck";
         version = "20180304.1";
         src = fetchFromGitLab {
           owner = "joewreschnig";
           repo = "gitlab-ci-mode-flycheck";
           rev = "388fd05f3ea88ed3ebafb09868fc021f6ecc7625";
-          sha256 = "111clb37329c7v0lv1lwypb8bv7qb9f495f2cy45j2n711vymdna";
+          sha256 = "0idpg4265rfx5i0i8cgfs6w3gncc766mbg81ldxqjhzvq3n28z39";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d7915ddcf21fdec539a86bb86c209cf0bbd378cb/recipes/gitlab-ci-mode-flycheck";
           sha256 = "19ixd60yynsvmaj7mkppp6k73793x794vrnhx3hh6n7dap1rsjdh";
-          name = "gitlab-ci-mode-flycheck";
+          name = "recipe";
         };
         packageRequires = [ emacs flycheck gitlab-ci-mode ];
         meta = {
@@ -15607,8 +19518,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    gitpatch = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    gitpatch = callPackage ({ emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "gitpatch";
         version = "0.5.1";
         src = fetchFromGitHub {
@@ -15617,10 +19532,10 @@
           rev = "94d40a2ee2b7cd7b209546ea02568079176b0034";
           sha256 = "1drf4fvmak7brf16axkh4nfz8pg44i7pjhfjz3dbkycbpp8y5vig";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e1746d87f65dc4b0d8f47c7d6ba4c7e0dfa35953/recipes/gitpatch";
           sha256 = "0qaswkk06z24v40nkjkv7f6gfv0dlsjd6wchkn0ppqw95883vhv1";
-          name = "gitpatch";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -15628,8 +19543,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    gitter = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }:
-    melpaBuild {
+    gitter = callPackage ({ emacs
+                          , fetchFromGitHub
+                          , fetchurl
+                          , let-alist
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "gitter";
         version = "1";
         src = fetchFromGitHub {
@@ -15638,10 +19558,10 @@
           rev = "bd2ba457109dd5d3e4b419e3ef5cbd3b5c9498d6";
           sha256 = "1fzl40bwdfbcq55p3kvbzjqr5w0703imzgrmqcf4f6jhav127zk6";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b8076c3b4d60e4c505bb6f4e426ecc4f69d74684/recipes/gitter";
           sha256 = "1ad5abqgfh6x2fcqbbdvgbg8xin69j0h93z7bav1hs3jla7mgwnv";
-          name = "gitter";
+          name = "recipe";
         };
         packageRequires = [ emacs let-alist ];
         meta = {
@@ -15649,8 +19569,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    gl-conf-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    gl-conf-mode = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "gl-conf-mode";
         version = "0.3";
         src = fetchFromGitHub {
@@ -15659,10 +19582,10 @@
           rev = "1a53e548277eb9c669bbeda4bee9be32be7a82ec";
           sha256 = "059m30vvp71y630pcam6qfv5bxc35ygj26wcg28p56pccxxyj3q9";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e3117e62d429e44506f7d82fc64252d41bc1a4b6/recipes/gl-conf-mode";
           sha256 = "0lf8xmq309aqyf16ymqlr8gj2qawlsqagbdndj0kgj72dnnw4cfm";
-          name = "gl-conf-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -15670,20 +19593,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    glab = callPackage ({ emacs, fetchFromGitHub, fetchurl, ghub, lib, melpaBuild }:
-    melpaBuild {
+    glab = callPackage ({ emacs
+                        , fetchFromGitHub
+                        , fetchurl
+                        , ghub
+                        , lib
+                        , melpaBuild }:
+      melpaBuild {
         pname = "glab";
-        version = "2.0.0";
+        version = "2.0.1";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "ghub";
-          rev = "ae37bef2eb3afb8232bb0a6f7306a8da2390abf4";
-          sha256 = "1k8bim7yk3swpzsx5lwm6qbjfqf2lsssir0zlqzrkid61d3ixfgy";
+          rev = "4831933da059ee084a16016558b9ccd8c581a8ff";
+          sha256 = "1b5jrpj3z989r3mf4jfch8rnaaa5hyb2395xz3v37f0vsphd7s0y";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/70a4dbd62fd6ebb4e056d0e97fa1a958437ddc91/recipes/glab";
           sha256 = "0ym8bgym11mdv5bw22lgkcxyqy7qgxxm0yjmrq8qx7i55gqayyb8";
-          name = "glab";
+          name = "recipe";
         };
         packageRequires = [ emacs ghub ];
         meta = {
@@ -15691,8 +19619,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    gmail-message-mode = callPackage ({ fetchFromGitHub, fetchurl, ham-mode, lib, melpaBuild }:
-    melpaBuild {
+    gmail-message-mode = callPackage ({ fetchFromGitHub
+                                      , fetchurl
+                                      , ham-mode
+                                      , lib
+                                      , melpaBuild }:
+      melpaBuild {
         pname = "gmail-message-mode";
         version = "1.4";
         src = fetchFromGitHub {
@@ -15701,10 +19633,10 @@
           rev = "ec36672a9dc93c09ebe2f77597b498d11883d008";
           sha256 = "0xcdd3abcrqr7nabdmmh0kgfar64hhgnrhsiwg3q201cymhnv49p";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/gmail-message-mode";
           sha256 = "0py0i7b893ihb8l1hmk3jfl0xil450znadcd18q7svr3zl2m0gkk";
-          name = "gmail-message-mode";
+          name = "recipe";
         };
         packageRequires = [ ham-mode ];
         meta = {
@@ -15712,8 +19644,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    gmail2bbdb = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    gmail2bbdb = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "gmail2bbdb";
         version = "0.0.6";
         src = fetchFromGitHub {
@@ -15722,10 +19657,10 @@
           rev = "181ef6039227bb30a02041d8cfdc435551a7d948";
           sha256 = "0205ldrw1i7czq44pqdl374cl0rjp5w5zadrayw8brl7mmw92byn";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fb3c88b20a7614504165cd5fb459b0a9d5c73f60/recipes/gmail2bbdb";
           sha256 = "03jhrk4vpjim3ybzjxy7s9r1cgjysj9vlc4criz5k0w7vqz3r28j";
-          name = "gmail2bbdb";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -15733,8 +19668,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    gmpl-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    gmpl-mode = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "gmpl-mode";
         version = "0.1.0";
         src = fetchFromGitHub {
@@ -15743,10 +19681,10 @@
           rev = "25d20f9d24594e85cb6f80d35d7c73b7e82cbc71";
           sha256 = "0x0a94bfkk72kqyr5m6arx450qsg1axmp5r0c4r9m84z8j08r4v1";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c89a523f87db358c477e5840b0e043e9f253e640/recipes/gmpl-mode";
           sha256 = "1f60xim8h85jmqpvgfg402ff8mjd66gla8fa0cwi7l18ijnjblpz";
-          name = "gmpl-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -15754,8 +19692,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    gntp = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    gntp = callPackage ({ fetchFromGitHub
+                        , fetchurl
+                        , lib
+                        , melpaBuild }:
+      melpaBuild {
         pname = "gntp";
         version = "0.1";
         src = fetchFromGitHub {
@@ -15764,10 +19705,10 @@
           rev = "767571135e2c0985944017dc59b0be79af222ef5";
           sha256 = "1nvyjjjydrimpxy4cpg90si7sr8lmldbhlcm2mx8npklp9pn5y3a";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c69a148d3b72d1be6ea10100a8e0cbbd918baa9c/recipes/gntp";
           sha256 = "1ywj3p082g54dcpy8q4jnkqfr12npikx8yz14r0njxdlr0janh4f";
-          name = "gntp";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -15775,8 +19716,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    gnuplot = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    gnuplot = callPackage ({ fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "gnuplot";
         version = "0.7.0";
         src = fetchFromGitHub {
@@ -15785,10 +19729,10 @@
           rev = "aefd4f671485fbcea42511ce79a7a60e5e0110a3";
           sha256 = "0bwri3cvm2vr27kyqkrddm28fs08axnd4nm9amfgp54xp20bn4yn";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/78be03893e4b0502ce999375e5630d32bda56ac1/recipes/gnuplot";
           sha256 = "06c5gqf02fkra8c52xck1lqvf4yg45zfibyf9zqmnbwk7p2jxrds";
-          name = "gnuplot";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -15796,20 +19740,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    gnus-desktop-notify = callPackage ({ fetchFromGitHub, fetchurl, gnus ? null, lib, melpaBuild }:
-    melpaBuild {
+    gnus-desktop-notify = callPackage ({ fetchFromGitLab
+                                       , fetchurl
+                                       , gnus ? null
+                                       , lib
+                                       , melpaBuild }:
+      melpaBuild {
         pname = "gnus-desktop-notify";
         version = "1.4";
-        src = fetchFromGitHub {
+        src = fetchFromGitLab {
           owner = "wavexx";
           repo = "gnus-desktop-notify.el";
           rev = "210c70f0021ee78e724f1d8e00ca96e1e99928ca";
           sha256 = "08j8x0iaz5s9q0b68d8h3153w0z6vak5l8qgw3dd1drz5p9xnvyw";
         };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/gnus-desktop-notify";
-          sha256 = "08k32vhdp6i8c03rp1k6b5jmvj5ijplj26mdblrgasklcqbdnlfs";
-          name = "gnus-desktop-notify";
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/c1cf98dff029d494007fe25d29bd8bcfecc5b8e6/recipes/gnus-desktop-notify";
+          sha256 = "1cfcmmq0ywgp41g0rf8s5fabh3yqbv9iacxi7v74kqh59bqdnz3x";
+          name = "recipe";
         };
         packageRequires = [ gnus ];
         meta = {
@@ -15817,20 +19765,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    gnus-x-gm-raw = callPackage ({ fetchFromGitHub, fetchurl, lib, log4e, melpaBuild, yaxception }:
-    melpaBuild {
+    gnus-x-gm-raw = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , log4e
+                                 , melpaBuild
+                                 , yaxception }:
+      melpaBuild {
         pname = "gnus-x-gm-raw";
         version = "0.0.1";
         src = fetchFromGitHub {
           owner = "aki2o";
           repo = "gnus-x-gm-raw";
-          rev = "978bdfcecc8844465b71641c2e909fcdc66b22be";
-          sha256 = "1i3f67x2l9l5c5agspbkxr2mmh3rpq3009d8yzh6r1lih0b4hril";
+          rev = "c2c8c5e94ac94f4c40e023452119c088ac59eac9";
+          sha256 = "0gf418ri69yzi9cbxdyna9kxjsniyw72xix2r94m439k1axpwa3f";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/263b87e40e32421ae56a99971a7e1baca0484778/recipes/gnus-x-gm-raw";
           sha256 = "1a5iccghzqmcndql2bppvr48535sf6jbvc83iypr1031z1b5k4wg";
-          name = "gnus-x-gm-raw";
+          name = "recipe";
         };
         packageRequires = [ log4e yaxception ];
         meta = {
@@ -15838,8 +19791,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    go-add-tags = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    go-add-tags = callPackage ({ emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild
+                               , s }:
+      melpaBuild {
         pname = "go-add-tags";
         version = "0.4";
         src = fetchFromGitHub {
@@ -15848,10 +19806,10 @@
           rev = "54879945e46a0884c5f93d7fd6c866a9cdf401ac";
           sha256 = "1gr65skrd41pk46ilfsbxfdng4br6h9c6blf1q1wx6i9ylhs0ak5";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/55d3b893bd68d3d2d86ecdbb4ed442edd256516a/recipes/go-add-tags";
           sha256 = "0nvas44rsvqzk2ay5bhzkbrnzql13vnxq9pk4lp4mvp86dda9qim";
-          name = "go-add-tags";
+          name = "recipe";
         };
         packageRequires = [ emacs s ];
         meta = {
@@ -15859,20 +19817,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    go-autocomplete = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    go-autocomplete = callPackage ({ auto-complete
+                                   , fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "go-autocomplete";
         version = "20170907";
         src = fetchFromGitHub {
           owner = "nsf";
           repo = "gocode";
-          rev = "c7fddb39ecbc9ebd1ebe7d2a3af473ed0fffffa1";
-          sha256 = "0qx8pq38faig41xkl1a4hrgp3ziyjyn6g53vn5wj7cdgm5kk67nb";
+          rev = "beae6bdcc6fc300059038961b7a3e977e0fb7c61";
+          sha256 = "0fhs17v2x24nhs0kd2yjzr56jni2767yrjxims6phsaxs9m5aih2";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/go-autocomplete";
           sha256 = "1ldsq81a167dk2r2mvzyp3v3j2mxc4l9p6b12i7pv8zrjlkhma5a";
-          name = "go-autocomplete";
+          name = "recipe";
         };
         packageRequires = [ auto-complete ];
         meta = {
@@ -15880,8 +19842,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    go-direx = callPackage ({ cl-lib ? null, direx, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    go-direx = callPackage ({ cl-lib ? null
+                            , direx
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "go-direx";
         version = "0.4";
         src = fetchFromGitHub {
@@ -15890,10 +19857,10 @@
           rev = "aecb9fef4d56d04d230d37c75c260c8392b5ad9f";
           sha256 = "05yc0nylg3457an5j7yp3x23157j0hbi21qhcpgsa01144mwnwln";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/032c0c3cd04f36f1bc66bb7d9d789d354c620a09/recipes/go-direx";
           sha256 = "0dq5d7fsld4hww8fl68c18qp6fl3781dqqwd98cg68bihw2wwni7";
-          name = "go-direx";
+          name = "recipe";
         };
         packageRequires = [ cl-lib direx ];
         meta = {
@@ -15901,8 +19868,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    go-dlv = callPackage ({ fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }:
-    melpaBuild {
+    go-dlv = callPackage ({ fetchFromGitHub
+                          , fetchurl
+                          , go-mode
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "go-dlv";
         version = "0.1.0";
         src = fetchFromGitHub {
@@ -15911,10 +19882,10 @@
           rev = "45a9e8a047c9995eb7c802268d96b3e527569f41";
           sha256 = "0pph99fl3bwws9vr1r8fs411frd04rfdhl87fy2a75cqcpxlhsj4";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/go-dlv";
           sha256 = "0lb5v9pmd6m8nvk4c9gcda5dmshrf5812gg1arq5p2g0nzg32mm8";
-          name = "go-dlv";
+          name = "recipe";
         };
         packageRequires = [ go-mode ];
         meta = {
@@ -15922,8 +19893,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    go-eldoc = callPackage ({ emacs, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }:
-    melpaBuild {
+    go-eldoc = callPackage ({ emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , go-mode
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "go-eldoc";
         version = "0.30";
         src = fetchFromGitHub {
@@ -15932,10 +19908,10 @@
           rev = "f1ad302ec4073354801e613293be2f55ba770618";
           sha256 = "0hkwhmgjyn5jxrd0k1nakrvy4d7cz7sxb1nw4hb1rqmz4yd14c8i";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6ce1190db06cc214746215dd27648eded5fe5140/recipes/go-eldoc";
           sha256 = "1k115dirfqxdnb6hdzlw41xdy2dxp38g3vq5wlvslqggha7gzhkk";
-          name = "go-eldoc";
+          name = "recipe";
         };
         packageRequires = [ emacs go-mode ];
         meta = {
@@ -15943,8 +19919,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    go-errcheck = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    go-errcheck = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "go-errcheck";
         version = "1.1.2";
         src = fetchFromGitHub {
@@ -15953,10 +19932,10 @@
           rev = "1b0cd6af048a8b2074ace14ab51fb6c987beb430";
           sha256 = "1fm6xd3vsi8mqh0idddjpfxlsmz1ljmjppw3qkxl1vr0qz3598k3";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c874f608a55cafcc6e57ca2c80bdae6b1c2e47e9/recipes/go-errcheck";
           sha256 = "11a75h32cd5h5xjv30x83k60s49k9fhgis31358q46y2gbvqp5bs";
-          name = "go-errcheck";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -15964,20 +19943,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    go-fill-struct = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    go-fill-struct = callPackage ({ emacs
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "go-fill-struct";
         version = "0.1";
         src = fetchFromGitHub {
           owner = "s-kostyaev";
           repo = "go-fill-struct";
-          rev = "3c97c92e78f3629a7a1069404c7c641881c16d0e";
-          sha256 = "0ara9qqv31pr7dpcby6xp24llf79m0dmwrx4yv6w0bhxi197fmlx";
+          rev = "814ccc8c5e50e6be4190259439c450afe7fb6ef4";
+          sha256 = "0zkdff390b00y0g1gfm2pgniq7allda55544cw7ccsvdaqayyhjc";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0c03d2382efd20e248b27b5505cdeed67d000f73/recipes/go-fill-struct";
           sha256 = "19xxqb836saxigvwdqf4xv0y9zrl7csv97x0facgyjyiqmwhx3x7";
-          name = "go-fill-struct";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -15985,20 +19968,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    go-guru = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }:
-    melpaBuild {
+    go-guru = callPackage ({ cl-lib ? null
+                           , fetchFromGitHub
+                           , fetchurl
+                           , go-mode
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "go-guru";
         version = "1.5.0";
         src = fetchFromGitHub {
           owner = "dominikh";
           repo = "go-mode.el";
-          rev = "35f6826e435c3004dabf134d0f2ae2f31ea7b6a2";
-          sha256 = "1nd2h50yb0493wvf1h7fzplq45rmqn2w7kxpgnlxzhkvq99v8vzf";
+          rev = "d13feb239b13b910ec4db19356f34c3801299407";
+          sha256 = "1a1c1b7isa9smazfnr8w2wzxxjzz3xcr6l3dvmq41g752wfakb3i";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0cede3a468b6f7e4ad88e9fa985f0fdee7d195f5/recipes/go-guru";
           sha256 = "01f0gz65z8d0iv8k49xl2sp6q4qnsvwhd4g8fb2irp7iclb0xmvk";
-          name = "go-guru";
+          name = "recipe";
         };
         packageRequires = [ cl-lib go-mode ];
         meta = {
@@ -16006,8 +19994,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    go-impl = callPackage ({ emacs, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }:
-    melpaBuild {
+    go-impl = callPackage ({ emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , go-mode
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "go-impl";
         version = "0.14";
         src = fetchFromGitHub {
@@ -16016,10 +20009,10 @@
           rev = "69f0d0ef05771487e15abec500cd06befd171abf";
           sha256 = "1rmik6g3l9q1bqavmqx1fhcadz4pwswgfnkbaxl6c5b6g2sl26iq";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/aa1a0845cc1a6970018b397d13394aaa8147e5d0/recipes/go-impl";
           sha256 = "09frwpwc080rfpwkb63yv47dyj741lrpyrp65sq2bn4sf03xw0cx";
-          name = "go-impl";
+          name = "recipe";
         };
         packageRequires = [ emacs go-mode ];
         meta = {
@@ -16027,8 +20020,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    go-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    go-mode = callPackage ({ fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "go-mode";
         version = "1.5.0";
         src = fetchFromGitHub {
@@ -16037,10 +20033,10 @@
           rev = "35f6826e435c3004dabf134d0f2ae2f31ea7b6a2";
           sha256 = "1nd2h50yb0493wvf1h7fzplq45rmqn2w7kxpgnlxzhkvq99v8vzf";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0cede3a468b6f7e4ad88e9fa985f0fdee7d195f5/recipes/go-mode";
           sha256 = "0ghqm4lbkfla79plqiyb1lzf5kbz0380h9vf8px15zal00xrv0bl";
-          name = "go-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -16048,8 +20044,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    go-playground = callPackage ({ emacs, fetchFromGitHub, fetchurl, go-mode, gotest, lib, melpaBuild }:
-    melpaBuild {
+    go-playground = callPackage ({ emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , go-mode
+                                 , gotest
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "go-playground";
         version = "1.3";
         src = fetchFromGitHub {
@@ -16058,10 +20060,10 @@
           rev = "eebb1fec2177bc85b746b948beac873a77bea4a2";
           sha256 = "0ixpcms4f0q8327jyp2k48x03vjxwmzdsq76vg4j0kmjs9dfad1v";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/900aabb7bc2350698f8740d72a5fad69c9219c33/recipes/go-playground";
           sha256 = "1rabwc80qwkafq833m6a199zfiwwmf0hha89721gc7i0myk9pac6";
-          name = "go-playground";
+          name = "recipe";
         };
         packageRequires = [ emacs go-mode gotest ];
         meta = {
@@ -16069,20 +20071,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    go-rename = callPackage ({ fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }:
-    melpaBuild {
+    go-rename = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , go-mode
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "go-rename";
         version = "1.5.0";
         src = fetchFromGitHub {
           owner = "dominikh";
           repo = "go-mode.el";
-          rev = "35f6826e435c3004dabf134d0f2ae2f31ea7b6a2";
-          sha256 = "1nd2h50yb0493wvf1h7fzplq45rmqn2w7kxpgnlxzhkvq99v8vzf";
+          rev = "d13feb239b13b910ec4db19356f34c3801299407";
+          sha256 = "1a1c1b7isa9smazfnr8w2wzxxjzz3xcr6l3dvmq41g752wfakb3i";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d806abe90da9a8951fdb0c31e2167bde13183c5c/recipes/go-rename";
           sha256 = "1cd2nfgwnqzylbry11ahahdip8w66w5hnrndrs65ip10s08w2xki";
-          name = "go-rename";
+          name = "recipe";
         };
         packageRequires = [ go-mode ];
         meta = {
@@ -16090,8 +20096,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    go-scratch = callPackage ({ emacs, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }:
-    melpaBuild {
+    go-scratch = callPackage ({ emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , go-mode
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "go-scratch";
         version = "0.0.1";
         src = fetchFromGitHub {
@@ -16100,10 +20111,10 @@
           rev = "3f68cbcce04f59eb8e83af109164731ec0454be0";
           sha256 = "1a6vg2vwgnafb61pwrd837fwlq5gs80wawbzjsnykawnmcaag8pm";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1713e6f02f8908b828ac2722a3185ea7cceb0609/recipes/go-scratch";
           sha256 = "11ahvmxbh67wa39cymymxmcpkq0kcn5jz0rrvazjy2p1hx3x1ma5";
-          name = "go-scratch";
+          name = "recipe";
         };
         packageRequires = [ emacs go-mode ];
         meta = {
@@ -16111,8 +20122,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    go-tag = callPackage ({ emacs, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }:
-    melpaBuild {
+    go-tag = callPackage ({ emacs
+                          , fetchFromGitHub
+                          , fetchurl
+                          , go-mode
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "go-tag";
         version = "1.1.0";
         src = fetchFromGitHub {
@@ -16121,10 +20137,10 @@
           rev = "8dbcb7d42dccac046c7beb31bdf79bb09a0fef40";
           sha256 = "1l20az4lhgbrh96sk6bpvp3w4bh29653fms4bimmiaqmhn2n14y2";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fc4cd3fd8fb0707912e205b9d71789ea8126c442/recipes/go-tag";
           sha256 = "18ff41i0gr708fl4gzzspf9cc09nv4wy21wsn609yhwlh7w0vs1f";
-          name = "go-tag";
+          name = "recipe";
         };
         packageRequires = [ emacs go-mode ];
         meta = {
@@ -16132,20 +20148,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    godoctor = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    godoctor = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "godoctor";
-        version = "0.0.9";
+        version = "0.6.0";
         src = fetchFromGitHub {
           owner = "microamp";
           repo = "godoctor.el";
-          rev = "f892a4dbabe61186540d6035c5185fd929a6a543";
-          sha256 = "1cg09mihvqchgvdxwlrg9vcdj1kvmmy8zmlkscxi6smaxbi0yvjm";
+          rev = "4b45ff3d0572f0e84056e4c3ba91fcc178199859";
+          sha256 = "12gga1ghc54r6f2adyaq30hm2yxspvgg54zd4k82c3d6cj51qwci";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0e23e1362ff7d477ad9ce6cfff694db989dfb87b/recipes/godoctor";
           sha256 = "0k734hry9npsr6zhsplcvmcjqw6jdf79pv4k9dw0xvd598hkpazz";
-          name = "godoctor";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -16153,8 +20172,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    golden-ratio = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    golden-ratio = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "golden-ratio";
         version = "1.0";
         src = fetchFromGitHub {
@@ -16163,10 +20185,10 @@
           rev = "79b1743fc1a2f3462445e9ddd0a869f30065bb6d";
           sha256 = "00igv83hiyx7x3pf2grmjpd379brn33fm85f05k104mkkrhg99nm";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e87b2af052d0406431957d75aa3717899bdbc8ae/recipes/golden-ratio";
           sha256 = "15fkrv0sgpzmnw2h4fp2gb83d8s42khkfq1h76l241njjayk1f81";
-          name = "golden-ratio";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -16174,8 +20196,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    google-maps = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    google-maps = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "google-maps";
         version = "1.0.0";
         src = fetchFromGitHub {
@@ -16184,10 +20209,10 @@
           rev = "90151ab59e693243ca8da660ce7b9ce361ea5126";
           sha256 = "183igr5lp20zcqi7rc01fk76sfxdhksd74i11v16gdsifdkjimd0";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/671afe0ff3889ae8c4b2d7b8617a3a25c16f3f0f/recipes/google-maps";
           sha256 = "0a0wqs3cnlpar2dzdi6h14isw78vgqr2r6psmrzbdl00s4fcyxwx";
-          name = "google-maps";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -16195,8 +20220,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    google-this = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    google-this = callPackage ({ emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "google-this";
         version = "1.12";
         src = fetchFromGitHub {
@@ -16205,10 +20234,10 @@
           rev = "8a2e3ca5da6a8c89bfe99a21486c6c7db125dc84";
           sha256 = "1dbra309w8awmi0g0pp7r2dm9nwrj2j9lpl7md8wa89rnzazwahl";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/google-this";
           sha256 = "0hg9y1b03aiamyn3mam3hyxmxy21wygxrnrww91zcbwlzgp4dd2c";
-          name = "google-this";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -16216,8 +20245,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    google-translate = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    google-translate = callPackage ({ fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "google-translate";
         version = "0.11.14";
         src = fetchFromGitHub {
@@ -16226,10 +20258,10 @@
           rev = "486c63bbfa0338589589f628703c38112035a5b2";
           sha256 = "08b4lxnwy9iqxacbjjljybvvdkl9g2dy6vga6hw7h7h32qra8w2j";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e3c275e59cbfe6e40f9cd4c470fc66544c9a6d21/recipes/google-translate";
           sha256 = "1crgzdd32mk6hrawdypg496dwh51wzwfb5wqw4a2j5l8y958xf47";
-          name = "google-translate";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -16237,8 +20269,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    gorepl-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    gorepl-mode = callPackage ({ emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "gorepl-mode";
         version = "1.0.0";
         src = fetchFromGitHub {
@@ -16247,10 +20283,10 @@
           rev = "17e025951f5964a0542a4b353ddddbc734c01eed";
           sha256 = "1abb78xxsggawl43hspl0cr0f7i1b3jd9r6xl1nl5jg97i4byg0b";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/gorepl-mode";
           sha256 = "0xcjjh9hf3pv5jgv089c6bb00s215fc9qwn72fav1xbm5f49nkaq";
-          name = "gorepl-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -16258,8 +20294,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    gotest = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild, s }:
-    melpaBuild {
+    gotest = callPackage ({ emacs
+                          , f
+                          , fetchFromGitHub
+                          , fetchurl
+                          , go-mode
+                          , lib
+                          , melpaBuild
+                          , s }:
+      melpaBuild {
         pname = "gotest";
         version = "0.14.0";
         src = fetchFromGitHub {
@@ -16268,10 +20311,10 @@
           rev = "8a5ef7363f83edb3b77c5e23876f13dd8c23b2b9";
           sha256 = "1ksi37kmy9mnrjr5lf9f0ga5nvi3r2kc85g6yvdfj0mbsjm1pnp7";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0670b42c0c998daa7bf01080757976ac3589ec06/recipes/gotest";
           sha256 = "1kan3gykhci33jgg67jjiiz7rqlz5mpxp8sh6mb0n6kpfmgb4ly9";
-          name = "gotest";
+          name = "recipe";
         };
         packageRequires = [ emacs f go-mode s ];
         meta = {
@@ -16279,8 +20322,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    gotham-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    gotham-theme = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "gotham-theme";
         version = "1.1.8";
         src = fetchFromGitHub {
@@ -16289,10 +20335,10 @@
           rev = "417d61978d139cb5d089c5365fc8d3166d76d3ac";
           sha256 = "0rc40cfj2mby1q7bk1pp1fxdi72nh9ip80spjdm1csvjjc4dbkwr";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4b388de872be397864a1217a330ba80437c287c0/recipes/gotham-theme";
           sha256 = "0jars6rvf7hkyf71vq06mqki1r840i1dvv43dissqjg5i4lr79cl";
-          name = "gotham-theme";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -16300,8 +20346,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    goto-chg = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    goto-chg = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "goto-chg";
         version = "1.7.2";
         src = fetchFromGitHub {
@@ -16310,10 +20359,10 @@
           rev = "e5b38e4e1378f6ea48fa9e8439f49c2998654aa4";
           sha256 = "1fxdvgdafavc4sad5i8g0wvpdqzlgzmvfi07yrah1c5vwkrslbvj";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cf1fc176430fe3ab55ce537a0efc59780bb812be/recipes/goto-chg";
           sha256 = "1yd4jq4zql4av9nr1sdk4nsnnk54c3brgjhpczndy1ipiaxlnydy";
-          name = "goto-chg";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -16321,20 +20370,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    goto-gem = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    goto-gem = callPackage ({ fetchFromGitLab
+                            , fetchurl
+                            , lib
+                            , melpaBuild
+                            , s }:
+      melpaBuild {
         pname = "goto-gem";
         version = "1.2";
-        src = fetchFromGitHub {
+        src = fetchFromGitLab {
           owner = "pidu";
           repo = "goto-gem";
           rev = "6f5bd405c096ef879fed1298c09d0daa0bae5dac";
           sha256 = "188q7jr1y872as3w32m8lf6vwl2by1ibgdk6zk7dhpcjwd0ik7x7";
         };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/5f576f6fab4ee466c54ce2c50569a447b6d617cc/recipes/goto-gem";
-          sha256 = "06vy9m01qccvahxr5xn0plzw9knl5ig7gi5q5r1smfx92bmzkg3a";
-          name = "goto-gem";
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/a52b516b7b10bdada2f64499c8f43f85a236f254/recipes/goto-gem";
+          sha256 = "0i79z1isdbnqmz5rlqjjys68l27nl90m1gzks4f9d6dsgfryhgwx";
+          name = "recipe";
         };
         packageRequires = [ s ];
         meta = {
@@ -16342,8 +20395,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    goto-last-change = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    goto-last-change = callPackage ({ fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "goto-last-change";
         version = "1.2.1";
         src = fetchFromGitHub {
@@ -16352,10 +20408,10 @@
           rev = "58b0928bc255b47aad318cd183a5dce8f62199cc";
           sha256 = "1f0zlvva7d7iza1v79yjp0bm7vd011q4cy14g1saryll32z115z5";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d68945f5845e5e44fb6c11726a56acd4dc56e101/recipes/goto-last-change";
           sha256 = "1yl9p95ls04bkmf4d6az72pycp27bv7q7wxxzvj8sj97bgwvwajx";
-          name = "goto-last-change";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -16363,20 +20419,28 @@
           license = lib.licenses.free;
         };
       }) {};
-    govc = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, json-mode, lib, magit-popup, melpaBuild, s }:
-    melpaBuild {
+    govc = callPackage ({ dash
+                        , emacs
+                        , fetchFromGitHub
+                        , fetchurl
+                        , json-mode
+                        , lib
+                        , magit-popup
+                        , melpaBuild
+                        , s }:
+      melpaBuild {
         pname = "govc";
-        version = "0.17.1";
+        version = "0.18.0";
         src = fetchFromGitHub {
           owner = "vmware";
           repo = "govmomi";
-          rev = "123ed177021588bac57b5c87c1a84270ddf2eca8";
-          sha256 = "0m144lpjbyil8cs57dw9q72abjhrd8cfwbalvzyaldgnx10j8gkc";
+          rev = "e3a01f9611c32b2362366434bcd671516e78955d";
+          sha256 = "0cicd4m8ll7y1n0c97drmvmqwsqaspwpzc6nfp73f887m8ff1xis";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/92d6391318021c63b06fe39b0ca38f667bb45ae9/recipes/govc";
           sha256 = "1ivgaziv25wlzg6y4zh8x7mv97pnyhi7p8jpvgh5fg5lnqpzhl4v";
-          name = "govc";
+          name = "recipe";
         };
         packageRequires = [ dash emacs json-mode magit-popup s ];
         meta = {
@@ -16384,8 +20448,37 @@
           license = lib.licenses.free;
         };
       }) {};
-    grab-mac-link = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    gpastel = callPackage ({ emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
+        pname = "gpastel";
+        version = "0.3.0";
+        src = fetchFromGitHub {
+          owner = "DamienCassou";
+          repo = "gpastel";
+          rev = "21b7d79530134d6a47eeb252b684f884c769d291";
+          sha256 = "1s1gnkpz6byf6by8r1bl9vq3slmsdavjb2ybp2zgic48favz1qm2";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/9b70e05ff0a074f9e2f1373e8495dc8df462deea/recipes/gpastel";
+          sha256 = "0mjy4n26s89b481dby018l80glgfwfaacihmd7vhh2c75ns671a6";
+          name = "recipe";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/gpastel";
+          license = lib.licenses.free;
+        };
+      }) {};
+    grab-mac-link = callPackage ({ emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "grab-mac-link";
         version = "0.2";
         src = fetchFromGitHub {
@@ -16394,10 +20487,10 @@
           rev = "8bf05a69758fd10a4303c5c458cd91a49ab8b1b2";
           sha256 = "12x47k3mm5hvhgn7fmfi7bqfa3naz8w1sx6fl3rmnbzvldb89i1k";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e4cc8a72a9f161f024ed9415ad281dbea5f07a18/recipes/grab-mac-link";
           sha256 = "1a4wyvx1mlgnd45nn99lwy3vaiwhi1nrphfln86pb6z939dxakj3";
-          name = "grab-mac-link";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -16405,8 +20498,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    grab-x-link = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    grab-x-link = callPackage ({ cl-lib ? null
+                               , emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "grab-x-link";
         version = "0.5";
         src = fetchFromGitHub {
@@ -16415,10 +20513,10 @@
           rev = "d19f0c0da0ddc55005a4c1cdc2b8c5de8bea1e8c";
           sha256 = "1l9jg2w8ym169b5dhg3k5vksbmicg4n1a55x7ddjysf8n887cpid";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/64d4d4e6f9d6a3ea670757f248afd355baf1d933/recipes/grab-x-link";
           sha256 = "1kni49n1v716w4hjfm49mk25jshfc6idpby0k58qvngbfqk3kzy5";
-          name = "grab-x-link";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -16426,8 +20524,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    gradle-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    gradle-mode = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild
+                               , s }:
+      melpaBuild {
         pname = "gradle-mode";
         version = "0.5.5";
         src = fetchFromGitHub {
@@ -16436,10 +20538,10 @@
           rev = "579de06674551919cddac9cfe42129f4fb0155c9";
           sha256 = "0k86lrb55d701nj6pvlw3kjp1dcd3lzfya0hv6q56c529y69d782";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/771cc597daebf9b4aa308f8b350af91a515b44c9/recipes/gradle-mode";
           sha256 = "0lx9qi93wmiy9pxjxqp68scbcb4bx88b6jiqk3y8jg5cajizh24g";
-          name = "gradle-mode";
+          name = "recipe";
         };
         packageRequires = [ s ];
         meta = {
@@ -16447,8 +20549,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    grails = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    grails = callPackage ({ emacs
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "grails";
         version = "0.4.1";
         src = fetchFromGitHub {
@@ -16457,10 +20563,10 @@
           rev = "fa638abe5c37f3f8af4fcd32f212453185ce50b1";
           sha256 = "1npsjniazaq20vz3kvwr8p30ivc6x24r9a16rfcwhr5wjx3nn91b";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/be0196207245ea9d23fda09121d624db9ea6d83d/recipes/grails";
           sha256 = "177y6xv35d2dhc3pdx5qhpywlmlqgfnjpzfm9yxc8l6q2rgs8irw";
-          name = "grails";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -16468,20 +20574,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    grails-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    grails-mode = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "grails-mode";
         version = "2.0";
         src = fetchFromGitHub {
           owner = "Groovy-Emacs-Modes";
           repo = "groovy-emacs-modes";
-          rev = "d7b362e6186d263ec3eefc141dbb5b27a8773f24";
-          sha256 = "0c1d4cbnlny8gpcd20zr1wxx6ggf28jgh7sgd5r1skpsvjpbfqx2";
+          rev = "50801257d376fd7383ddf9c19ff567183c24ad0b";
+          sha256 = "0wy8iw12b9bs7xza8jjnjvggr59rgbsgn1kk2g0pj0nppvfdrvjm";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe318b4e51a280a55c01fa30455e4a180df8bd6/recipes/grails-mode";
           sha256 = "1zdlmdkwyaj2zns3xwmqpil83j7857aj2070kvx8xza66dxcnlm4";
-          name = "grails-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -16489,8 +20598,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    grails-projectile-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }:
-    melpaBuild {
+    grails-projectile-mode = callPackage ({ cl-lib ? null
+                                          , emacs
+                                          , fetchFromGitHub
+                                          , fetchurl
+                                          , lib
+                                          , melpaBuild
+                                          , projectile }:
+      melpaBuild {
         pname = "grails-projectile-mode";
         version = "1.1.2";
         src = fetchFromGitHub {
@@ -16499,10 +20614,10 @@
           rev = "8efca50ce92b556fe9d467b157d7aec635bcc017";
           sha256 = "0xnj0wp0na53l0y8fiaah50ij4r80j8a29hbjbcicska21p5w1s1";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/35d49029c1f665ad40e543040d98d5a770bfea96/recipes/grails-projectile-mode";
           sha256 = "0dy8v2mila7ccvb7j5jlfkhfjsjfk3bm3rcy84m0rgbqjai67amn";
-          name = "grails-projectile-mode";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs projectile ];
         meta = {
@@ -16510,20 +20625,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    grandshell-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    grandshell-theme = callPackage ({ fetchgit
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "grandshell-theme";
         version = "1.3";
-        src = fetchFromGitHub {
-          owner = "steckerhalter";
-          repo = "grandshell-theme";
-          rev = "22c8df52c0fb8899fa748fa2980947ab38b53380";
-          sha256 = "08556ci80iycm4qkvbnrci55wyv91b4fh6sjp0im0ywndmrq3yyc";
+        src = fetchgit {
+          url = "https://framagit.org/steckerhalter/grandshell-theme.git";
+          rev = "8e18bfcfb66db8591ce742308a40b6341e75d335";
+          sha256 = "13y3plbia4vli9c3mv01nf520zh7ilzywpqj0nsl7x6pzw9fx0np";
         };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/5b04b0024f5a0367e2998d35ca88c2613a8e3470/recipes/grandshell-theme";
-          sha256 = "1mnnjsw1kx40b6ws8wmk25fz9rq8rd70xia9cjpwdfkg7kh8xvsa";
-          name = "grandshell-theme";
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/f0a8eb0eefe88b4ea683a4743c0f8393506e014b/recipes/grandshell-theme";
+          sha256 = "1r0r0r0g116f4jp3rip8mjqqgdam4h5dr5qvdglr9xpirfcw6wq3";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -16531,20 +20648,34 @@
           license = lib.licenses.free;
         };
       }) {};
-    graphene = callPackage ({ company, dash, exec-path-from-shell, fetchFromGitHub, fetchurl, flycheck, graphene-meta-theme, ido-completing-read-plus, lib, melpaBuild, ppd-sr-speedbar, smartparens, smex, sr-speedbar, web-mode }:
-    melpaBuild {
+    graphene = callPackage ({ company
+                            , dash
+                            , exec-path-from-shell
+                            , fetchFromGitHub
+                            , fetchurl
+                            , flycheck
+                            , graphene-meta-theme
+                            , ido-completing-read-plus
+                            , lib
+                            , melpaBuild
+                            , ppd-sr-speedbar
+                            , smartparens
+                            , smex
+                            , sr-speedbar
+                            , web-mode }:
+      melpaBuild {
         pname = "graphene";
-        version = "0.9.9";
+        version = "1.0.0";
         src = fetchFromGitHub {
           owner = "rdallasgray";
           repo = "graphene";
-          rev = "9dbd50e532ca45076e03db0f96a57d21528fc460";
-          sha256 = "0sqxnjmfbr0plahdmp87j8xpl3qkyimf9vkqall4ccljx8irdl6s";
+          rev = "cc8477fcfb7771ea4e5bbaf3c01f9e679234c1c1";
+          sha256 = "0j0igcmfl61c4pakqmyxpwr4kjar9i81vkl84rw19phc7k9497nb";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0206d6adcb7855c2174c3cd506b71c21def1209b/recipes/graphene";
           sha256 = "1wz3rvd8b7gx5d0k7yi4dd69ax5bybcm10vdc7xp4yn296lmyl9k";
-          name = "graphene";
+          name = "recipe";
         };
         packageRequires = [
           company
@@ -16564,8 +20695,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    graphene-meta-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    graphene-meta-theme = callPackage ({ fetchFromGitHub
+                                       , fetchurl
+                                       , lib
+                                       , melpaBuild }:
+      melpaBuild {
         pname = "graphene-meta-theme";
         version = "0.0.5";
         src = fetchFromGitHub {
@@ -16574,10 +20708,10 @@
           rev = "62cc73fee31f1bd9474027b83a249feee050271e";
           sha256 = "1ydl6dlg5z4infq8j09izwgs6n97yza6nbq5rs1xfv00zd9gr63c";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/44af719ede73c9fe7787272d7868587ce8966e3d/recipes/graphene-meta-theme";
           sha256 = "1cqdr93lccdpxkzgap3r3qc92dh8vqgdlnxvqkw7lrcbs31fvf3q";
-          name = "graphene-meta-theme";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -16585,8 +20719,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    graphviz-dot-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    graphviz-dot-mode = callPackage ({ fetchFromGitHub
+                                     , fetchurl
+                                     , lib
+                                     , melpaBuild }:
+      melpaBuild {
         pname = "graphviz-dot-mode";
         version = "0.4";
         src = fetchFromGitHub {
@@ -16595,10 +20732,10 @@
           rev = "7301cc276206b6995d265bcb9eb308bb83c760be";
           sha256 = "1zk664ilyz14p11csmqgzs73gx08hy32h3pnyymzqkavmgb6h3s0";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6e2f1e66b33fd95142be4622c996911e38d56281/recipes/graphviz-dot-mode";
           sha256 = "04rkynsrsk6w4sxn1pc0b9b6pij1p7yraywbrk7qvv05fv69kri2";
-          name = "graphviz-dot-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -16606,8 +20743,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    grapnel = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    grapnel = callPackage ({ fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "grapnel";
         version = "0.5.3";
         src = fetchFromGitHub {
@@ -16616,10 +20756,10 @@
           rev = "7387234eb3f0285a490fddb1e06a4bf029719fb7";
           sha256 = "0xcj1kqzgxifhrhpl9j2nfpnkd6213ix5z7f97269v3inpzaiyf5";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/dd482e4b2c45921b81c5fb3dfce53acfec3c3093/recipes/grapnel";
           sha256 = "019cdx1wdx8sc2ibqwgp1akgckzxxvrayyp2sv806gha0kn6yf6r";
-          name = "grapnel";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -16627,8 +20767,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    grass-mode = callPackage ({ cl-lib ? null, dash, fetchhg, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    grass-mode = callPackage ({ cl-lib ? null
+                              , dash
+                              , fetchhg
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "grass-mode";
         version = "0.1";
         src = fetchhg {
@@ -16647,8 +20792,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    green-is-the-new-black-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    green-is-the-new-black-theme = callPackage ({ fetchFromGitHub
+                                                , fetchurl
+                                                , lib
+                                                , melpaBuild }:
+      melpaBuild {
         pname = "green-is-the-new-black-theme";
         version = "0.0.6";
         src = fetchFromGitHub {
@@ -16657,10 +20805,10 @@
           rev = "8a03687a2b8b55c5dc7f099086019278d505d8d8";
           sha256 = "07j5sv8dskqxpbzr5f58n75cziyqm9v01c3f7wmwfs8jl7h5nc4m";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3e42528d5677fd90515cad47266c07ea3d4363fb/recipes/green-is-the-new-black-theme";
           sha256 = "03q0vj409icmawffy2kd9yl04r453q80cy1p9y4i3xk368z0362g";
-          name = "green-is-the-new-black-theme";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -16668,8 +20816,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    green-screen-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    green-screen-theme = callPackage ({ fetchFromGitHub
+                                      , fetchurl
+                                      , lib
+                                      , melpaBuild }:
+      melpaBuild {
         pname = "green-screen-theme";
         version = "1.0.24";
         src = fetchFromGitHub {
@@ -16678,10 +20829,10 @@
           rev = "c348ea0adf0e6ae99294a05be183a7b425a4bab0";
           sha256 = "1rqhac5j06gpc9gp44g4r3zdkw1baskwrz3bw1n1haw4a1k0657q";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/821744ca106f1b74941524782e4581fc93800fed/recipes/green-screen-theme";
           sha256 = "0a45xcl74kp3v39bl169sq46mqxiwvvis6jzwcy6yrl2vqqi4mab";
-          name = "green-screen-theme";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -16689,8 +20840,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    grep-context = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    grep-context = callPackage ({ cl-lib ? null
+                                , dash
+                                , emacs
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "grep-context";
         version = "0.1.0";
         src = fetchFromGitHub {
@@ -16699,10 +20856,10 @@
           rev = "4c63d0f2654dee1e249c2054d118d674a757bd45";
           sha256 = "0n2bc9q6bvbfpaqivp3ajy9ad1wr7hfdd98qhnspsap67p73kfn4";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/41dbaf627ae4ef86c222d2b6b5d3523fdb9a4637/recipes/grep-context";
           sha256 = "175s9asbnk2wlgpzc5izcd3vlfvdj064n38myy9qf4awn12c2y1g";
-          name = "grep-context";
+          name = "recipe";
         };
         packageRequires = [ cl-lib dash emacs ];
         meta = {
@@ -16710,7 +20867,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    grin = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild {
+    grin = callPackage ({ fetchhg
+                        , fetchurl
+                        , lib
+                        , melpaBuild }:
+      melpaBuild {
         pname = "grin";
         version = "1.0";
         src = fetchhg {
@@ -16729,8 +20890,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    grizzl = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    grizzl = callPackage ({ fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "grizzl";
         version = "0.1.1";
         src = fetchFromGitHub {
@@ -16739,10 +20903,10 @@
           rev = "c775de1c34d1e5a374e2f40c1ae2396b4b003fe7";
           sha256 = "1bq73kcx744xnlm2yvccrzlbyx91c492sg7blx2a9z643v3gg1zs";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/grizzl";
           sha256 = "0354xskqzxc38l14zxqs31hadwh27v9lyx67y3hnd94d8abr0qcb";
-          name = "grizzl";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -16750,8 +20914,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    groovy-imports = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pcache, s }:
-    melpaBuild {
+    groovy-imports = callPackage ({ emacs
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild
+                                  , pcache
+                                  , s }:
+      melpaBuild {
         pname = "groovy-imports";
         version = "1.0";
         src = fetchFromGitHub {
@@ -16760,10 +20930,10 @@
           rev = "e56d7dda617555ec6205644d32ffddf2e1fa43d9";
           sha256 = "060zxl2y4p50g5fwgplgx07h5akfplp49rkv5cx09rqlcyzqhqwa";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b18a6842805856062e9452dc32bf0fd458f7d51a/recipes/groovy-imports";
           sha256 = "09yjkwsm192lgala1pvxw47id4j7362sl3j1hn9ald2m8m3ddyfs";
-          name = "groovy-imports";
+          name = "recipe";
         };
         packageRequires = [ emacs pcache s ];
         meta = {
@@ -16771,8 +20941,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    groovy-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    groovy-mode = callPackage ({ emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild
+                               , s }:
+      melpaBuild {
         pname = "groovy-mode";
         version = "2.0";
         src = fetchFromGitHub {
@@ -16781,10 +20956,10 @@
           rev = "d7b362e6186d263ec3eefc141dbb5b27a8773f24";
           sha256 = "0c1d4cbnlny8gpcd20zr1wxx6ggf28jgh7sgd5r1skpsvjpbfqx2";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe318b4e51a280a55c01fa30455e4a180df8bd6/recipes/groovy-mode";
           sha256 = "1pxw7rdn56klmr6kw21lhzh7zhp338gyf54ypsml64ibzr1x9kal";
-          name = "groovy-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs s ];
         meta = {
@@ -16792,8 +20967,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    gruber-darker-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    gruber-darker-theme = callPackage ({ fetchFromGitHub
+                                       , fetchurl
+                                       , lib
+                                       , melpaBuild }:
+      melpaBuild {
         pname = "gruber-darker-theme";
         version = "0.6";
         src = fetchFromGitHub {
@@ -16802,10 +20980,10 @@
           rev = "0c08d77e615aceb9e6e1ca66b1fbde275200cfe4";
           sha256 = "14h0rcd3nkw3pmx8jwip20p6rzl9qdkip5g52gfjjbqfvaffsrkd";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/87ade74553c04cb9dcfe16d03f263cc6f1fed046/recipes/gruber-darker-theme";
           sha256 = "0vn4msixb77xj6p5mlfchjyyjhzah0lcmp0z82s8849zd194fxqi";
-          name = "gruber-darker-theme";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -16813,8 +20991,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    grunt = callPackage ({ ansi-color ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    grunt = callPackage ({ ansi-color ? null
+                         , dash
+                         , fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "grunt";
         version = "1.3.2";
         src = fetchFromGitHub {
@@ -16823,10 +21006,10 @@
           rev = "e27dbb6b3de9b36c7fb28f69aa06b4b2ea32d4b9";
           sha256 = "0zpmhjwj64s72iv3dgsy07pfh20f25ngsy3pszmlrfkxk0926d8k";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/acc9b816796b9f142c53f90593952b43c962d2d8/recipes/grunt";
           sha256 = "1qdzqcrff9x97kyy0d4j636d5i751qja10liw8i0lf4lk6n0lywz";
-          name = "grunt";
+          name = "recipe";
         };
         packageRequires = [ ansi-color dash ];
         meta = {
@@ -16834,20 +21017,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    gruvbox-theme = callPackage ({ autothemer, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    gruvbox-theme = callPackage ({ autothemer
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "gruvbox-theme";
-        version = "1.22.1";
+        version = "1.26.0";
         src = fetchFromGitHub {
           owner = "Greduan";
           repo = "emacs-theme-gruvbox";
-          rev = "b6d93d25faff573a7f7712bc33fce1fe422473e0";
-          sha256 = "1j8ivqhzrz5kaq1as4s5vljjpan8adqdc5s2ms8p3p83b2kg55si";
+          rev = "796999e5db2a0e43ad64c062c1bec3c966d095bc";
+          sha256 = "0qj5k0c1592ikrb7gcibqwf8hhj6lq4cw7zrb3kmpk4zakzy7a2w";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2bd48c87919f64ced9f3add4860751bb34cb5ecb/recipes/gruvbox-theme";
           sha256 = "042mnwlmixygk2mf24ygk7rkv1rfavc5a36hs9x8b68jnf3khj32";
-          name = "gruvbox-theme";
+          name = "recipe";
         };
         packageRequires = [ autothemer ];
         meta = {
@@ -16855,8 +21042,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    gscholar-bibtex = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    gscholar-bibtex = callPackage ({ fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "gscholar-bibtex";
         version = "0.3.3";
         src = fetchFromGitHub {
@@ -16865,10 +21055,10 @@
           rev = "ba4ce159e385d695d8560e8b06b3cbe48424861c";
           sha256 = "0idnfhk17avp0r4706grjqqkz0xl98gs0bx7wrkvwym3y2gadlz2";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9fa546d3dce59b07a623ee83e3befe139dc10481/recipes/gscholar-bibtex";
           sha256 = "0d41gr9amf9vdn9pl9lamhp2swqllxslv9r3wsgzqvjl7zayd1az";
-          name = "gscholar-bibtex";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -16876,8 +21066,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    guide-key = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, popwin }:
-    melpaBuild {
+    guide-key = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild
+                             , popwin }:
+      melpaBuild {
         pname = "guide-key";
         version = "1.2.5";
         src = fetchFromGitHub {
@@ -16886,10 +21080,10 @@
           rev = "626f3aacfe4561eddc46617570426246b88e9cab";
           sha256 = "1bmcvn8a7g9ahpv2fww673hx9pa7nnrj9kpljq65azf61vq2an2g";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/490b81308ae8132d8c3fd8c3951be88159719172/recipes/guide-key";
           sha256 = "0zjrdvppcg8b2k6hfdj45rswc1ks9xgimcr2yvgpc8prrwk1yjsf";
-          name = "guide-key";
+          name = "recipe";
         };
         packageRequires = [ popwin ];
         meta = {
@@ -16897,8 +21091,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    guide-key-tip = callPackage ({ fetchFromGitHub, fetchurl, guide-key, lib, melpaBuild, pos-tip }:
-    melpaBuild {
+    guide-key-tip = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , guide-key
+                                 , lib
+                                 , melpaBuild
+                                 , pos-tip }:
+      melpaBuild {
         pname = "guide-key-tip";
         version = "0.0.1";
         src = fetchFromGitHub {
@@ -16907,10 +21106,10 @@
           rev = "e08b2585228529aeaae5e0ae0948f898e83a6200";
           sha256 = "040mcfhj2gggp8w1pgip7rxb1bnb23rxlm02wl6x1qv5i0q7g5x3";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1f23db7563654ab58632d56e3b01d2f78276fc3e/recipes/guide-key-tip";
           sha256 = "0h2vkkbxq361dkn6irm1v19qj7bkhxcjljiksd5wwlq5zsq6bd06";
-          name = "guide-key-tip";
+          name = "recipe";
         };
         packageRequires = [ guide-key pos-tip ];
         meta = {
@@ -16918,29 +21117,41 @@
           license = lib.licenses.free;
         };
       }) {};
-    guix = callPackage ({ bui, dash, emacs, fetchFromGitHub, fetchurl, geiser, lib, magit-popup, melpaBuild }:
-    melpaBuild {
+    guix = callPackage ({ bui
+                        , dash
+                        , edit-indirect
+                        , emacs
+                        , fetchFromGitHub
+                        , fetchurl
+                        , geiser
+                        , lib
+                        , magit-popup
+                        , melpaBuild }:
+      melpaBuild {
         pname = "guix";
-        version = "0.3.4";
+        version = "0.4.1.1";
         src = fetchFromGitHub {
           owner = "alezost";
           repo = "guix.el";
-          rev = "a43828f6e5d6dc4e623a4b78e0dfdddbf5b20185";
-          sha256 = "0c19njb5cg6g3fav9322hkbl4h9zwcbymhc5wr0k9yqi7pv8gz0v";
+          rev = "60a922a0d48747f1c1d945a725f40a9d1f1fa3a9";
+          sha256 = "0jp0bjy9l2m3kii0p1fnqmvsbz9hafv5s5840czsda3mc9x9c7b0";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b3d8c73e8a946b8265487a0825d615d80aa3337d/recipes/guix";
           sha256 = "0h4jwc4h2jv09c6rngb614fc39qfy04rmvqrn1l54hn28s6q7sk9";
-          name = "guix";
+          name = "recipe";
         };
-        packageRequires = [ bui dash emacs geiser magit-popup ];
+        packageRequires = [ bui dash edit-indirect emacs geiser magit-popup ];
         meta = {
           homepage = "https://melpa.org/#/guix";
           license = lib.licenses.free;
         };
       }) {};
-    guru-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    guru-mode = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "guru-mode";
         version = "0.2";
         src = fetchFromGitHub {
@@ -16949,10 +21160,10 @@
           rev = "62a9a0025249f2f8866b94683c4114c39f48e1fa";
           sha256 = "1y46qd9cgkfb0wp2cvksjncyp77hd2jnr4bm4zafqirc3qhbysx0";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e60af6ccb902d8ef00cfecbb13cafebbe3b00d89/recipes/guru-mode";
           sha256 = "0j25nxs3ndybq1ik36qyqdprmhav4ba8ny7v2z61s23id8hz3xjs";
-          name = "guru-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -16960,8 +21171,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    gxref = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    gxref = callPackage ({ emacs
+                         , fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "gxref";
         version = "0.1";
         src = fetchFromGitHub {
@@ -16970,10 +21185,10 @@
           rev = "15723a9d910d7dd9ea18cab0336332cf988aeceb";
           sha256 = "1l5d1kh2dy3w42i8c3z63c7mzarxixxiby2g7ay2i809yxj10y1n";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/429b9150d4054fcadab8c5ca3b688921eeb19b78/recipes/gxref";
           sha256 = "06qlfjclfx00m8pr7lk6baim3vjk5i0m75i1p4aihp2vflvgjaby";
-          name = "gxref";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -16981,8 +21196,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    hacker-typer = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    hacker-typer = callPackage ({ emacs
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "hacker-typer";
         version = "1.0.6";
         src = fetchFromGitHub {
@@ -16991,10 +21210,10 @@
           rev = "d5a23714a4ccc5071580622f278597d5973f40bd";
           sha256 = "13wp7cg9d9ij44inxxyk1knczglxrbfaq50wyhc4x5zfhz5yw7wx";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8e04a3a1606ea23865c04d93e3dc77cb55b9931f/recipes/hacker-typer";
           sha256 = "128y562cxi8rblnqjdzhqc6b58bxi67f6hz569gqw4jywz0xcd0g";
-          name = "hacker-typer";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -17002,8 +21221,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    hackernews = callPackage ({ fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }:
-    melpaBuild {
+    hackernews = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , json ? null
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "hackernews";
         version = "0.4.0";
         src = fetchFromGitHub {
@@ -17012,10 +21235,10 @@
           rev = "22a15dc57dd6aab7793c0f9c2b72e161e0bee00c";
           sha256 = "0bpbiadv4bf3lllsm0w1jcw8nc7c9zl97m972hbxb1dgv90gvs5b";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c43a342e47e5ede468bcf51a60d4dea3926f51bd/recipes/hackernews";
           sha256 = "1x1jf5gkhmpiby5rmy0sziywh6c1f1n0p4f6dlz6ifbwns7har6a";
-          name = "hackernews";
+          name = "recipe";
         };
         packageRequires = [ json ];
         meta = {
@@ -17023,8 +21246,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    ham-mode = callPackage ({ fetchFromGitHub, fetchurl, html-to-markdown, lib, markdown-mode, melpaBuild }:
-    melpaBuild {
+    ham-mode = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , html-to-markdown
+                            , lib
+                            , markdown-mode
+                            , melpaBuild }:
+      melpaBuild {
         pname = "ham-mode";
         version = "1.1.2";
         src = fetchFromGitHub {
@@ -17033,10 +21261,10 @@
           rev = "3a141986a21c2aa6eefb428983352abb8b7907d2";
           sha256 = "0d3xmagl18pas19zbpg27j0lmdiry23df48z4vkjsrcllqg25v5g";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/ham-mode";
           sha256 = "000qrdby7d6zmp5066vs4gjlc9ik0ybrgcwzcbfgxb16w1g9xpmz";
-          name = "ham-mode";
+          name = "recipe";
         };
         packageRequires = [ html-to-markdown markdown-mode ];
         meta = {
@@ -17044,20 +21272,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    hamburger-menu = callPackage ({ emacs, fetchFromGitLab, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    hamburger-menu = callPackage ({ emacs
+                                  , fetchFromGitLab
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "hamburger-menu";
         version = "1.0.5";
         src = fetchFromGitLab {
           owner = "iain";
           repo = "hamburger-menu-mode";
           rev = "fd37f013c2f2619a88d3ed5311a9d1308cc82614";
-          sha256 = "1nykpp8afa0c0wiax1qn8wf5hfjaixk5kn4yhcw40z00pb8i2z5f";
+          sha256 = "196ydb57h4mjagjaiflvb20my561i6mdc6v6694ibdik2yns2inm";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e8017730403cc0e613e3939017f85074753c3778/recipes/hamburger-menu";
           sha256 = "0ws9729i51arjqwpiywcpb7y3c5sm3c9wrq8q0k0m9hpq8h11wdb";
-          name = "hamburger-menu";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -17065,8 +21297,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    haml-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, ruby-mode ? null }:
-    melpaBuild {
+    haml-mode = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild
+                             , ruby-mode ? null }:
+      melpaBuild {
         pname = "haml-mode";
         version = "3.1.9";
         src = fetchFromGitHub {
@@ -17075,10 +21311,10 @@
           rev = "5e0baf7b795b9e41ac03b55f8feff6b51027c43b";
           sha256 = "0fmr7ji8x5ki9fzybpbg3xbhzws6n7ffk7d0zf9jl1x3jd8d6988";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/haml-mode";
           sha256 = "0ih0m7zr6kgn6zd45zbp1jgs1ydc5i5gmq6l080wma83v5w1436f";
-          name = "haml-mode";
+          name = "recipe";
         };
         packageRequires = [ ruby-mode ];
         meta = {
@@ -17086,8 +21322,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    hardcore-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    hardcore-mode = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "hardcore-mode";
         version = "0.1.0";
         src = fetchFromGitHub {
@@ -17096,10 +21335,10 @@
           rev = "5ab75594a7a0ca236e2ac87882ee439ff6155d96";
           sha256 = "08l6p9n2ggg4filad1k663qc2gjgfbia4knnnif4sw7h92yb31jl";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b929b3343cd5925944665e4e09b4524bca873c95/recipes/hardcore-mode";
           sha256 = "1bgi1acpw4z7i03d0i8mrd2hpjn6hyvkdsk0ks9q380yp9mqmiwd";
-          name = "hardcore-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -17107,8 +21346,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    hardhat = callPackage ({ fetchFromGitHub, fetchurl, ignoramus, lib, melpaBuild }:
-    melpaBuild {
+    hardhat = callPackage ({ fetchFromGitHub
+                           , fetchurl
+                           , ignoramus
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "hardhat";
         version = "0.4.6";
         src = fetchFromGitHub {
@@ -17117,10 +21360,10 @@
           rev = "9038a49ab55cd4c502cf7f07ed0d1b9b6bc3626e";
           sha256 = "0j9z46j777y3ljpai5czdlwl07f0irp4fsk4677n11ndyqm1amb5";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/081aa3e1d50c2c9e5a9b9ce0716258a93279f605/recipes/hardhat";
           sha256 = "16pdbpm647ag9cadmdm75nwwyzrqsd9y1b4zgkl3pg669mi5vl5z";
-          name = "hardhat";
+          name = "recipe";
         };
         packageRequires = [ ignoramus ];
         meta = {
@@ -17128,8 +21371,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    harvest = callPackage ({ fetchFromGitHub, fetchurl, hydra, lib, melpaBuild, s, swiper }:
-    melpaBuild {
+    harvest = callPackage ({ fetchFromGitHub
+                           , fetchurl
+                           , hydra
+                           , lib
+                           , melpaBuild
+                           , s
+                           , swiper }:
+      melpaBuild {
         pname = "harvest";
         version = "0.3.8";
         src = fetchFromGitHub {
@@ -17138,10 +21387,10 @@
           rev = "69041907bdca68d3ab6802e08ec698c3448f28a1";
           sha256 = "0rqxi668wra1mfzq4fqscjghis5gqnwpazgidgix13brybaxydx4";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c97d3f653057eab35c612109792884334be556fe/recipes/harvest";
           sha256 = "1r6brld6iq03wsr1b3jhdkxwrcxa6g6fwa1jiy1kgjsr9dq1m51c";
-          name = "harvest";
+          name = "recipe";
         };
         packageRequires = [ hydra s swiper ];
         meta = {
@@ -17149,8 +21398,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    haskell-emacs = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    haskell-emacs = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "haskell-emacs";
         version = "4.0.3";
         src = fetchFromGitHub {
@@ -17159,10 +21411,10 @@
           rev = "a2c6a079175904689eed7c6c200754bfa85d1ed9";
           sha256 = "1xpaqcj33vyzs5yv2w4dahw8a2vb6zcb3z7y2aqc5jdg3fx9ypam";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5daff329a96a6d10bca11d838bbc95d1c8bcfbd9/recipes/haskell-emacs";
           sha256 = "1wkh7qws35c32hha0p9rpjz5pls2844920nh919lvp2wmq9l6jd6";
-          name = "haskell-emacs";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -17170,20 +21422,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    haskell-emacs-base = callPackage ({ fetchFromGitHub, fetchurl, haskell-emacs, lib, melpaBuild }:
-    melpaBuild {
+    haskell-emacs-base = callPackage ({ fetchFromGitHub
+                                      , fetchurl
+                                      , haskell-emacs
+                                      , lib
+                                      , melpaBuild }:
+      melpaBuild {
         pname = "haskell-emacs-base";
         version = "4.0.3";
         src = fetchFromGitHub {
           owner = "knupfer";
           repo = "haskell-emacs";
-          rev = "a2c6a079175904689eed7c6c200754bfa85d1ed9";
-          sha256 = "1xpaqcj33vyzs5yv2w4dahw8a2vb6zcb3z7y2aqc5jdg3fx9ypam";
+          rev = "7f91f65254902b8ff04fdb679bc569b2f6a51637";
+          sha256 = "17i9l6wgrvmp31ca4xrax31f7bjnn0vn2figycxhfaq9f6vxgkkn";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5daff329a96a6d10bca11d838bbc95d1c8bcfbd9/recipes/haskell-emacs-base";
           sha256 = "1fwkds6qyhbxxdgxfzmgd7dlcxr08ynrrg5jdp9r7f924pd536vb";
-          name = "haskell-emacs-base";
+          name = "recipe";
         };
         packageRequires = [ haskell-emacs ];
         meta = {
@@ -17191,20 +21447,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    haskell-emacs-text = callPackage ({ fetchFromGitHub, fetchurl, haskell-emacs, lib, melpaBuild }:
-    melpaBuild {
+    haskell-emacs-text = callPackage ({ fetchFromGitHub
+                                      , fetchurl
+                                      , haskell-emacs
+                                      , lib
+                                      , melpaBuild }:
+      melpaBuild {
         pname = "haskell-emacs-text";
         version = "4.0.3";
         src = fetchFromGitHub {
           owner = "knupfer";
           repo = "haskell-emacs";
-          rev = "a2c6a079175904689eed7c6c200754bfa85d1ed9";
-          sha256 = "1xpaqcj33vyzs5yv2w4dahw8a2vb6zcb3z7y2aqc5jdg3fx9ypam";
+          rev = "cc240612740fc3fd6e3c3d8cdfe486a89954f5d1";
+          sha256 = "09g6b1ad7qi9k58ymgmssgapwapxcwf30qhmfl2w8sl045ngzlkk";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5daff329a96a6d10bca11d838bbc95d1c8bcfbd9/recipes/haskell-emacs-text";
           sha256 = "1j18fhhra6lv32xrq8jc6l8i56fgn68da81wymcimpmpbp0hl5fy";
-          name = "haskell-emacs-text";
+          name = "recipe";
         };
         packageRequires = [ haskell-emacs ];
         meta = {
@@ -17212,8 +21472,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    haskell-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    haskell-mode = callPackage ({ emacs
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "haskell-mode";
         version = "16.1";
         src = fetchFromGitHub {
@@ -17222,10 +21486,10 @@
           rev = "d2ea5239bf02f3917a78a5c2dcbc5b6f6dd1b359";
           sha256 = "1qk36y0v9fzass6785il65c6wb5cfj4ihhwkvgnzmbafpa8p4dvq";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7f18b4dcbad4192b0153a316cff6533272898f1a/recipes/haskell-mode";
           sha256 = "0wijvcpfdbl17iwzy47vf8brkj2djarfr8y28rw0wqvbs381zzwp";
-          name = "haskell-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -17233,8 +21497,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    haskell-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
-    melpaBuild {
+    haskell-snippets = callPackage ({ fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild
+                                    , yasnippet }:
+      melpaBuild {
         pname = "haskell-snippets";
         version = "0.1.0";
         src = fetchFromGitHub {
@@ -17243,10 +21511,10 @@
           rev = "bcf12cf33a67ddc2f023a55072859e637fe4fa25";
           sha256 = "0b3d7rvqvvcsp51aqfhl0zg9zg8j0p6vlfvga6jp9xc7626vh6f6";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b5534e58ea66fd90ba4a69262f0b303c7fb85af4/recipes/haskell-snippets";
           sha256 = "10bvv7q694fahcpm83v8lpqihg1gvfzrp1hdzwiffxydfvdbalh2";
-          name = "haskell-snippets";
+          name = "recipe";
         };
         packageRequires = [ yasnippet ];
         meta = {
@@ -17254,8 +21522,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    haskell-tab-indent = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    haskell-tab-indent = callPackage ({ fetchgit
+                                      , fetchurl
+                                      , lib
+                                      , melpaBuild }:
+      melpaBuild {
         pname = "haskell-tab-indent";
         version = "0.1.0";
         src = fetchgit {
@@ -17263,10 +21534,10 @@
           rev = "38d50e9bb8f64ba13ffbd9bcff32db820403a0fc";
           sha256 = "00bjmww8pc9jr4ssqcv7k0migbxl1c8qs2l1khf25fxvgd1nyy02";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/371f9f45e441cdf4e95557d1e9692619fab3024a/recipes/haskell-tab-indent";
           sha256 = "0vdfmy56w5yi202nbd28v1bzj97v1wxnfnb5z3dh9687p2abgnr7";
-          name = "haskell-tab-indent";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -17274,20 +21545,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    hasky-extensions = callPackage ({ avy-menu, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    hasky-extensions = callPackage ({ avy-menu
+                                    , emacs
+                                    , fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "hasky-extensions";
         version = "0.2.0";
         src = fetchFromGitHub {
           owner = "hasky-mode";
           repo = "hasky-extensions";
-          rev = "65bf7bc3967cbda23789d6c505daf73eed9a43aa";
-          sha256 = "0r91hcm265xa8amdfi44pn0cqf4m9zigzqx1ldgg8qd6l9r2hbh7";
+          rev = "51cff958785c1d26f76decd2e2b95bd15ab48096";
+          sha256 = "0bqcg18apfj8ibzklw7yip35s1wkjfb8z3qyxn43vyylkynvrj37";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e3f73e3df8476fa231d04211866671dd74911603/recipes/hasky-extensions";
           sha256 = "0ymigba1d0qkrk3ccd3cx754safzmx1v5d13976571rszgmkvr15";
-          name = "hasky-extensions";
+          name = "recipe";
         };
         packageRequires = [ avy-menu emacs ];
         meta = {
@@ -17295,8 +21571,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    hasky-stack = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, magit-popup, melpaBuild }:
-    melpaBuild {
+    hasky-stack = callPackage ({ emacs
+                               , f
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , magit-popup
+                               , melpaBuild }:
+      melpaBuild {
         pname = "hasky-stack";
         version = "0.8.0";
         src = fetchFromGitHub {
@@ -17305,10 +21587,10 @@
           rev = "3e17ce07dd6b0207474e4ff14ad7b8c467382947";
           sha256 = "0cdsdlgapf9xxj928hlb7ch9x8rznayrvj7n8j2vzfa0kfmg7qwf";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c3faf544872478c3bccf2fe7dc51d406031e4d80/recipes/hasky-stack";
           sha256 = "08ds0v5p829s47lbhibswnbn1aqfnwf6xx7p5bc5062wxdvqahw8";
-          name = "hasky-stack";
+          name = "recipe";
         };
         packageRequires = [ emacs f magit-popup ];
         meta = {
@@ -17316,8 +21598,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    haxor-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    haxor-mode = callPackage ({ emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "haxor-mode";
         version = "0.7.0";
         src = fetchFromGitHub {
@@ -17326,10 +21612,10 @@
           rev = "6fa25a8e6b6a59481bc0354c2fe1e0ed53cbdc91";
           sha256 = "0pdfvqbz4wmjl15wi3k4h7myij8v63vmyiq8g9fai18f7ad2klp1";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/haxor-mode";
           sha256 = "0ss0kkwjyc7z7vcb89qr02p70c6m2jarr34mxmdv6ipwil58jj1s";
-          name = "haxor-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -17337,8 +21623,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    hcl-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    hcl-mode = callPackage ({ emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "hcl-mode";
         version = "0.3";
         src = fetchFromGitHub {
@@ -17347,10 +21637,10 @@
           rev = "6a6daf37522188a2f2fcdebc60949fc3bdabbc06";
           sha256 = "0jqrgq15jz6pvx38pnwkizzfiih0d3nxqphyrc92nqpcyimg8b6g";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/66b441525dc300b364d9be0358ae1e0fa2a8b4fe/recipes/hcl-mode";
           sha256 = "1wrs9kj6ahsdnbn3fdaqhclq1ia6w4x726hjvl6pyk01sb0spnin";
-          name = "hcl-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -17358,20 +21648,52 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }:
-    melpaBuild {
+    heaven-and-hell = callPackage ({ emacs
+                                   , fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
+        pname = "heaven-and-hell";
+        version = "0.0.4";
+        src = fetchFromGitHub {
+          owner = "valignatev";
+          repo = "heaven-and-hell";
+          rev = "c2af013e0def7d3234e0eb2fb66a0a2374d5a7f2";
+          sha256 = "08n7sr0l4di1c4zgfa17i3x43451sd60z70pjka8rmznys766lsg";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/685edd63bf65520be304cbd564db7f5974fc5ae1/recipes/heaven-and-hell";
+          sha256 = "19r0p78r9c78ly8awkgc33xa5b75zkkrb5kwvxbagirxdgkjv74r";
+          name = "recipe";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/heaven-and-hell";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm = callPackage ({ async
+                        , emacs
+                        , fetchFromGitHub
+                        , fetchurl
+                        , helm-core
+                        , lib
+                        , melpaBuild
+                        , popup }:
+      melpaBuild {
         pname = "helm";
-        version = "2.9.2";
+        version = "2.9.8";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm";
-          rev = "d5b9404176c41b16dffe522d45d08bdc7cb60e28";
-          sha256 = "0mr5jllsargsbw6xrqpacxi40nx472sd5qhbaf5a6ydc6l1qyqyk";
+          rev = "8de42d08f45a7052ed858132de43a76f933f58f7";
+          sha256 = "1g36knyppz8lfbcn84hx6ivf8b34s26wx5dh4xw85sq6pwi5yn7s";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm";
           sha256 = "03la01d0syikjgsjq0krlp3p894djwfxqfmd2srddwks7ish6xjf";
-          name = "helm";
+          name = "recipe";
         };
         packageRequires = [ async emacs helm-core popup ];
         meta = {
@@ -17379,8 +21701,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-ack = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
-    melpaBuild {
+    helm-ack = callPackage ({ cl-lib ? null
+                            , fetchFromGitHub
+                            , fetchurl
+                            , helm
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "helm-ack";
         version = "0.13";
         src = fetchFromGitHub {
@@ -17389,10 +21716,10 @@
           rev = "5982f3cb6ec9f460ebbe06ec0ce7b3590bca3118";
           sha256 = "0ps86zpyywibjwcm9drmamla979ad61fyqr8d6bv71fr56k9ak21";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/258d447778525c26c65a5819ba1edc00e2bb65e5/recipes/helm-ack";
           sha256 = "1a8sc5gd2g57dl9g18wyydfmihy74yniwhjr27h7vxylnf2g3pni";
-          name = "helm-ack";
+          name = "recipe";
         };
         packageRequires = [ cl-lib helm ];
         meta = {
@@ -17400,8 +21727,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-ag = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
-    melpaBuild {
+    helm-ag = callPackage ({ emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , helm
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "helm-ag";
         version = "0.58";
         src = fetchFromGitHub {
@@ -17410,10 +21742,10 @@
           rev = "39ed137823665fca2fa5b215f7c3e8701173f7b7";
           sha256 = "0a6yls52pkqsaj6s5nsi70kzpvssdvb87bfnp8gp26q2y3syx4ni";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/81f0f525680fea98e804f39dbde1dada887e8821/recipes/helm-ag";
           sha256 = "050qh5xqh8lwkgmz3jxm8gql5nd7bq8sp9q6mzm2z7367qy4qqyf";
-          name = "helm-ag";
+          name = "recipe";
         };
         packageRequires = [ emacs helm ];
         meta = {
@@ -17421,8 +21753,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-aws = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
-    melpaBuild {
+    helm-aws = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , helm
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "helm-aws";
         version = "1.0.0";
         src = fetchFromGitHub {
@@ -17431,10 +21767,10 @@
           rev = "172a4a3427d31c999e27e9ee06aa8e3822364a8c";
           sha256 = "015p5sszd54x81qm96gx6xwjkvbi4f3j9i2nhcvlkk75s95w1ijv";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/421182006b8af17dae8b5ad453cc11e2d990a053/recipes/helm-aws";
           sha256 = "0sjgdjpznjxsf6nlv2ah45fw17j8j5apdphd1fp43rjv1lskkgc5";
-          name = "helm-aws";
+          name = "recipe";
         };
         packageRequires = [ helm ];
         meta = {
@@ -17442,8 +21778,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-backup = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }:
-    melpaBuild {
+    helm-backup = callPackage ({ cl-lib ? null
+                               , fetchFromGitHub
+                               , fetchurl
+                               , helm
+                               , lib
+                               , melpaBuild
+                               , s }:
+      melpaBuild {
         pname = "helm-backup";
         version = "1.0.0";
         src = fetchFromGitHub {
@@ -17452,10 +21794,10 @@
           rev = "3f39d296ddc77df758b812c50e3c267dd03db8bb";
           sha256 = "05528ajhmvkc50i65wcb3bi1w4i3y1vvr56dvq6yp7cbyw9r7b8w";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5e6eba7b201e91211e43c39e501f6066f0afeb8b/recipes/helm-backup";
           sha256 = "182jbm36yzayxi9y3vhpyn25ivrgay37sncqvah35vbw52lnjcn3";
-          name = "helm-backup";
+          name = "recipe";
         };
         packageRequires = [ cl-lib helm s ];
         meta = {
@@ -17463,8 +21805,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-bbdb = callPackage ({ bbdb, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
-    melpaBuild {
+    helm-bbdb = callPackage ({ bbdb
+                             , fetchFromGitHub
+                             , fetchurl
+                             , helm
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "helm-bbdb";
         version = "1.1";
         src = fetchFromGitHub {
@@ -17473,10 +21820,10 @@
           rev = "20513422102fea4c08a0433d728a7783bb4968c8";
           sha256 = "0ns537fimv774n1bq0r8k4qwdpapbw96linqyhx9mxp23zkhlg80";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7025c319fcabc64576c0c6554d0d572cef697693/recipes/helm-bbdb";
           sha256 = "1wlacbfs23shvyaq616r1p84h8321zz1k5nzir5qg8nr6lssi8vp";
-          name = "helm-bbdb";
+          name = "recipe";
         };
         packageRequires = [ bbdb helm ];
         meta = {
@@ -17484,8 +21831,18 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-bibtex = callPackage ({ biblio, cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, parsebib, s }:
-    melpaBuild {
+    helm-bibtex = callPackage ({ biblio
+                               , cl-lib ? null
+                               , dash
+                               , f
+                               , fetchFromGitHub
+                               , fetchurl
+                               , helm
+                               , lib
+                               , melpaBuild
+                               , parsebib
+                               , s }:
+      melpaBuild {
         pname = "helm-bibtex";
         version = "2.0.0";
         src = fetchFromGitHub {
@@ -17494,10 +21851,10 @@
           rev = "d6a98ac6f28d2a6a05e203115211c98333d40aca";
           sha256 = "0arhy051945lxjqg77b275ny9nsv60cqj0qfpmvd8xkc07lqfn23";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f4118a7721435240cf8489daa4dd39369208855b/recipes/helm-bibtex";
           sha256 = "037pqgyyb2grg88yfxx1r8yp4lrgz2fyzz9fbbp34l8s6vk3cp4z";
-          name = "helm-bibtex";
+          name = "recipe";
         };
         packageRequires = [ biblio cl-lib dash f helm parsebib s ];
         meta = {
@@ -17505,8 +21862,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-bm = callPackage ({ bm, cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }:
-    melpaBuild {
+    helm-bm = callPackage ({ bm
+                           , cl-lib ? null
+                           , fetchFromGitHub
+                           , fetchurl
+                           , helm
+                           , lib
+                           , melpaBuild
+                           , s }:
+      melpaBuild {
         pname = "helm-bm";
         version = "0.3";
         src = fetchFromGitHub {
@@ -17515,10 +21879,10 @@
           rev = "d66341f5646c23178d4d8bffb6cfebe3fb73f1d7";
           sha256 = "011k37p4vnzm1x8vyairllanvjfknskl20bdfv0glf64xgbdpfil";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/115033d7b02d3ca42902195de933f62c5f927ae4/recipes/helm-bm";
           sha256 = "1dnlcvn0zv4qv4ii4j0h9r8w6vhi3l0c5aa768kblh5r2rf4bjjh";
-          name = "helm-bm";
+          name = "recipe";
         };
         packageRequires = [ bm cl-lib helm s ];
         meta = {
@@ -17526,8 +21890,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-books = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
-    melpaBuild {
+    helm-books = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , helm
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "helm-books";
         version = "1.0.1";
         src = fetchFromGitHub {
@@ -17536,10 +21904,10 @@
           rev = "b4c57d2aed596faad41a753dccbcd0a31a717b76";
           sha256 = "1yr5prp9xvd73balxbn4yn52zah2advq1186ba5aanj436pal0fh";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/acba3db40f37e74e1bf9e30f2abed431c259ff50/recipes/helm-books";
           sha256 = "0xh53vji7nsnpi0b38cjh97x26ryxk61mj7bd6m63qwh8dyhs3yx";
-          name = "helm-books";
+          name = "recipe";
         };
         packageRequires = [ helm ];
         meta = {
@@ -17547,8 +21915,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-bundle-show = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
-    melpaBuild {
+    helm-bundle-show = callPackage ({ fetchFromGitHub
+                                    , fetchurl
+                                    , helm
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "helm-bundle-show";
         version = "1.1.5";
         src = fetchFromGitHub {
@@ -17557,10 +21929,10 @@
           rev = "b34523aa8a7f82ed9a1bf3643c35b65866a7877a";
           sha256 = "1j9xmlidipsfbz0kfxwz0c6hi9xsbk36h6i30wqdd0ls0zw5xm30";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2f10f7387cca102696c38af1d8dc0fe5da5e366f/recipes/helm-bundle-show";
           sha256 = "1af5g233kjf04m2fryizk51a1s2mcmj36zip5nyb8skcsfl4riq7";
-          name = "helm-bundle-show";
+          name = "recipe";
         };
         packageRequires = [ helm ];
         meta = {
@@ -17568,8 +21940,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-c-yasnippet = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, yasnippet }:
-    melpaBuild {
+    helm-c-yasnippet = callPackage ({ cl-lib ? null
+                                    , fetchFromGitHub
+                                    , fetchurl
+                                    , helm-core
+                                    , lib
+                                    , melpaBuild
+                                    , yasnippet }:
+      melpaBuild {
         pname = "helm-c-yasnippet";
         version = "0.6.7";
         src = fetchFromGitHub {
@@ -17578,10 +21956,10 @@
           rev = "1fa400233ba8e990066c47cca1e2af64bd192d4d";
           sha256 = "108584bmadgidqkdfvf333zkyb5v9f84pasz5h01fkh57ks8by9f";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2fc20598a2cd22efb212ba43159c6728f0249e5e/recipes/helm-c-yasnippet";
           sha256 = "0jwj4giv6lxb3h7vqqb2alkwq5kp0shy2nraik33956p4l8dfs90";
-          name = "helm-c-yasnippet";
+          name = "recipe";
         };
         packageRequires = [ cl-lib helm-core yasnippet ];
         meta = {
@@ -17589,8 +21967,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-cider = callPackage ({ cider, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }:
-    melpaBuild {
+    helm-cider = callPackage ({ cider
+                              , emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , helm-core
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "helm-cider";
         version = "0.4.0";
         src = fetchFromGitHub {
@@ -17599,10 +21983,10 @@
           rev = "9a948b834dd31b3f60d4701d6dd0ecfab0adbb72";
           sha256 = "0wssd9jv6xighjhfh3p8if1anz3rcrjr71a4j063v6gyknb7fv27";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-cider";
           sha256 = "0ykhrvh6mix55sv4j8q6614sibksdlwaks736maamqwl3wk6826x";
-          name = "helm-cider";
+          name = "recipe";
         };
         packageRequires = [ cider emacs helm-core ];
         meta = {
@@ -17610,8 +21994,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-circe = callPackage ({ circe, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
-    melpaBuild {
+    helm-circe = callPackage ({ circe
+                              , cl-lib ? null
+                              , emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , helm
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "helm-circe";
         version = "0.4";
         src = fetchFromGitHub {
@@ -17620,10 +22011,10 @@
           rev = "9091651d9fdd8d49d8ff6f9dcf3a2ae416c9f15a";
           sha256 = "1gwg299s8ps0q97iw6p515gwn73rjk1icgl3j7cj1s143njjg122";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-circe";
           sha256 = "07559rg55b0glxiw787xmvxrhms14jz21bvprc5n24b4j827g9xw";
-          name = "helm-circe";
+          name = "recipe";
         };
         packageRequires = [ circe cl-lib emacs helm ];
         meta = {
@@ -17631,8 +22022,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-codesearch = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }:
-    melpaBuild {
+    helm-codesearch = callPackage ({ cl-lib ? null
+                                   , dash
+                                   , fetchFromGitHub
+                                   , fetchurl
+                                   , helm
+                                   , lib
+                                   , melpaBuild
+                                   , s }:
+      melpaBuild {
         pname = "helm-codesearch";
         version = "0.4.0";
         src = fetchFromGitHub {
@@ -17641,10 +22039,10 @@
           rev = "e80e76e492f626659b88dbe362b11aa0a3b0a116";
           sha256 = "16njr3xcvpzg4x6qq2pwk80pca9pxhc6vjvfy3dzy4hi9nxryrs6";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0a992824e46a4170e2f0915f7a507fcb8a9ef0a6/recipes/helm-codesearch";
           sha256 = "1v21zwcyx73bc1lcfk60v8xim31bwdk4p06g9i4qag3cijdlli9q";
-          name = "helm-codesearch";
+          name = "recipe";
         };
         packageRequires = [ cl-lib dash helm s ];
         meta = {
@@ -17652,20 +22050,27 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-commandlinefu = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, json ? null, let-alist, lib, melpaBuild }:
-    melpaBuild {
+    helm-commandlinefu = callPackage ({ emacs
+                                      , fetchFromGitHub
+                                      , fetchurl
+                                      , helm
+                                      , json ? null
+                                      , let-alist
+                                      , lib
+                                      , melpaBuild }:
+      melpaBuild {
         pname = "helm-commandlinefu";
         version = "0.3";
         src = fetchFromGitHub {
           owner = "xuchunyang";
           repo = "helm-commandlinefu";
-          rev = "e11cd3e961c1c4c973b51d8d12592e7235a4971b";
-          sha256 = "1l61csd1gqz7kg5zjx60cfy824g42p682z7pk0rqzlrz8498wvkh";
+          rev = "83839c0250ff3a35d3052eab3111450e0caa5fe1";
+          sha256 = "0fxxwxxpqvhzc3wgskaarxagf4si83kk5k5j67kzklgrlklhf1xn";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7eaf1e41ef2fa90b6bb6a80891ef1bf52ef1029b/recipes/helm-commandlinefu";
           sha256 = "150nqib0sr4n35vdj1xrxcja8gkv3chzhdbgkjxqgkz2yq10xxnd";
-          name = "helm-commandlinefu";
+          name = "recipe";
         };
         packageRequires = [ emacs helm json let-alist ];
         meta = {
@@ -17673,8 +22078,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-company = callPackage ({ company, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
-    melpaBuild {
+    helm-company = callPackage ({ company
+                                , fetchFromGitHub
+                                , fetchurl
+                                , helm
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "helm-company";
         version = "0.2.2";
         src = fetchFromGitHub {
@@ -17683,10 +22093,10 @@
           rev = "acc9c7901e094c1591327a0db1ec7a439f67a84d";
           sha256 = "1d4q9clp0q56br80c21a4wz1gc4jw3mdy97z9mq07x9i8rhlppzs";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8acf7420f2ac8a36474594bc34316f187b43d771/recipes/helm-company";
           sha256 = "1wl1mzm1h9ig351y77yascdv4z0cka1gayi8cnnlayk763is7q34";
-          name = "helm-company";
+          name = "recipe";
         };
         packageRequires = [ company helm ];
         meta = {
@@ -17694,20 +22104,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    helm-core = callPackage ({ async
+                             , emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "helm-core";
-        version = "2.9.2";
+        version = "2.9.8";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm";
-          rev = "d5b9404176c41b16dffe522d45d08bdc7cb60e28";
-          sha256 = "0mr5jllsargsbw6xrqpacxi40nx472sd5qhbaf5a6ydc6l1qyqyk";
+          rev = "8de42d08f45a7052ed858132de43a76f933f58f7";
+          sha256 = "1g36knyppz8lfbcn84hx6ivf8b34s26wx5dh4xw85sq6pwi5yn7s";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core";
           sha256 = "1dyv8rv1728vwsp6vfdq954sp878jbp3srbfxl9gsgjnv1l6vjda";
-          name = "helm-core";
+          name = "recipe";
         };
         packageRequires = [ async emacs ];
         meta = {
@@ -17715,8 +22130,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-cscope = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, xcscope }:
-    melpaBuild {
+    helm-cscope = callPackage ({ cl-lib ? null
+                               , emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , helm
+                               , lib
+                               , melpaBuild
+                               , xcscope }:
+      melpaBuild {
         pname = "helm-cscope";
         version = "0.1.1";
         src = fetchFromGitHub {
@@ -17725,10 +22147,10 @@
           rev = "b82db54071bd2d1c77db2e648f8b4e61b1abe288";
           sha256 = "0xnqkc4z22m41v5lgf87dd8xc4gmf932zbnbdhf9xic1gal1779c";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3d2e3460df1ec750053bc8402ad6eb822c10c697/recipes/helm-cscope";
           sha256 = "13a76wc1ia4c0v701dxqc9ycbb43d5k09m5pfsvs8mccisfzk9y4";
-          name = "helm-cscope";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs helm xcscope ];
         meta = {
@@ -17736,8 +22158,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-dash = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
-    melpaBuild {
+    helm-dash = callPackage ({ cl-lib ? null
+                             , fetchFromGitHub
+                             , fetchurl
+                             , helm
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "helm-dash";
         version = "1.3.0";
         src = fetchFromGitHub {
@@ -17746,10 +22173,10 @@
           rev = "9a230125a7a11f5fa90aa048b61abd95eb78ddfe";
           sha256 = "0xs3nq86qmvkiazn5w564npdgbcfjlnpw2f48g2jd43yznblz7ly";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-dash";
           sha256 = "032hwwq4r72grzls5ww7bjyj39c82wkcgf3k7myfcrqd3lgblrwb";
-          name = "helm-dash";
+          name = "recipe";
         };
         packageRequires = [ cl-lib helm ];
         meta = {
@@ -17757,8 +22184,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-descbinds = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
-    melpaBuild {
+    helm-descbinds = callPackage ({ fetchFromGitHub
+                                  , fetchurl
+                                  , helm
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "helm-descbinds";
         version = "1.13";
         src = fetchFromGitHub {
@@ -17767,10 +22198,10 @@
           rev = "6d5ddc11e6cef86548bd6b3e0d840112d602659c";
           sha256 = "03b79wdcp4im0fwadzhyc8jxl2wqvg8gmpflnznrwz3l71bi4sqq";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/447610a05422cd2f35399e43d98bf46410ff0408/recipes/helm-descbinds";
           sha256 = "1890ss4pimjxskzzllf57fg07xbs8zqcrp6r8r6x989llrfvd1h7";
-          name = "helm-descbinds";
+          name = "recipe";
         };
         packageRequires = [ helm ];
         meta = {
@@ -17778,20 +22209,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-directory = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
-    melpaBuild {
+    helm-directory = callPackage ({ emacs
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , helm
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "helm-directory";
         version = "0.6.4";
         src = fetchFromGitHub {
           owner = "masasam";
           repo = "emacs-helm-directory";
-          rev = "2c6d45404506ba744888dcdb65e9f63878f2da16";
-          sha256 = "1a5j4zzn249jdm4kcri64x1dxazhhk7g5dmgnhflrnbrc2kdwm8h";
+          rev = "caa013b820b5263bf1c6446debfea0766dae8ab8";
+          sha256 = "15ljhz7cik7qzbh69l28c9mcvls5zgk42lp5bm9kl9fg6m6aasvq";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d0c066d6f285ab6d572dab4549781101547cb704/recipes/helm-directory";
           sha256 = "01c5a08v6rd867kdyrfwdvj05z4srzj9g6xy4scirlbwbff0q76n";
-          name = "helm-directory";
+          name = "recipe";
         };
         packageRequires = [ emacs helm ];
         meta = {
@@ -17799,8 +22235,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-dired-history = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
-    melpaBuild {
+    helm-dired-history = callPackage ({ cl-lib ? null
+                                      , fetchFromGitHub
+                                      , fetchurl
+                                      , helm
+                                      , lib
+                                      , melpaBuild }:
+      melpaBuild {
         pname = "helm-dired-history";
         version = "1.3";
         src = fetchFromGitHub {
@@ -17809,10 +22250,10 @@
           rev = "281523f9fc46cf00fafd670ba5cd16552a607212";
           sha256 = "1bqavj5ljr350dckyf39i9plkb0rbhyd17ka94n2g6daapgpq0x6";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-dired-history";
           sha256 = "0qciafa42rbw0dxgkp5mbbwbrcziswmwdj2lszm0px1bip4x7yb8";
-          name = "helm-dired-history";
+          name = "recipe";
         };
         packageRequires = [ cl-lib helm ];
         meta = {
@@ -17820,8 +22261,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-emms = callPackage ({ cl-lib ? null, emacs, emms, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
-    melpaBuild {
+    helm-emms = callPackage ({ cl-lib ? null
+                             , emacs
+                             , emms
+                             , fetchFromGitHub
+                             , fetchurl
+                             , helm
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "helm-emms";
         version = "1.3";
         src = fetchFromGitHub {
@@ -17830,10 +22278,10 @@
           rev = "d7da090af0f63b92c5d735197992c732adbeef3d";
           sha256 = "0fs0i33di3liyx1f55xpg5nmac1b750n37g3pkxw2mil7fx7dz32";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/db836b671705607f6cd9bce8229884b1f29b4a76/recipes/helm-emms";
           sha256 = "1vq7cxnacmhyczsa4s5h1nnzc08m66harfnxsqxyrdsnggv9hbf5";
-          name = "helm-emms";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs emms helm ];
         meta = {
@@ -17841,20 +22289,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-etags-plus = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
-    melpaBuild {
+    helm-etags-plus = callPackage ({ fetchFromGitHub
+                                   , fetchurl
+                                   , helm
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "helm-etags-plus";
         version = "1.1";
         src = fetchFromGitHub {
           owner = "jixiuf";
           repo = "helm-etags-plus";
-          rev = "99512856918e485862ceb21460476adb0349f525";
-          sha256 = "08ddxp1hm0ckx6gq9yl6dhh0jrfb6f747snchykl3z5p0ayknvlm";
+          rev = "647e267af51caff9f49d8aa00657b7e08cc3bce4";
+          sha256 = "1j8z7bgm5kjp1hrjrmnr3k0frajvwcmpv1mjvw0pxhqf3gyvzf3n";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e5d0c347ff8cf6e0ade80853775fd6b84f387fa5/recipes/helm-etags-plus";
           sha256 = "0lw21yp1q6iggzlb1dks3p6qdfppnqf50f3rijjs18lisp4izp99";
-          name = "helm-etags-plus";
+          name = "recipe";
         };
         packageRequires = [ helm ];
         meta = {
@@ -17862,8 +22314,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-ext = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
-    melpaBuild {
+    helm-ext = callPackage ({ emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , helm
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "helm-ext";
         version = "0.1.2";
         src = fetchFromGitHub {
@@ -17872,10 +22329,10 @@
           rev = "c8ac56918b200239b3f73a4e6a031deecc2c5646";
           sha256 = "08c6n4zr6s3h7y0kk6g51xqs6hs29hkfmn55jfjw6hpimbk3vi1j";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1ee74cb0aa3445bc9ae4226c2043ee4de3ac6cd3/recipes/helm-ext";
           sha256 = "0la2i0b7nialib4wq26cxcak8nq1jzavsw8f0mvbavsb7hfwkpgw";
-          name = "helm-ext";
+          name = "recipe";
         };
         packageRequires = [ emacs helm ];
         meta = {
@@ -17883,20 +22340,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-firefox = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
-    melpaBuild {
+    helm-firefox = callPackage ({ cl-lib ? null
+                                , emacs
+                                , fetchFromGitHub
+                                , fetchurl
+                                , helm
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "helm-firefox";
         version = "1.3";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm-firefox";
-          rev = "0ad34b7b5abc485a86cae6920c14de861cbeb085";
-          sha256 = "08mjsi2f9s29fkk35cj1rrparjnkm836qmbfdwdz7y51f9varjbs";
+          rev = "294850c4ce16ae25f2214f863cee0118add60974";
+          sha256 = "1kaa58xlnr82qsvdzn8sxk5kkd2lxqnvfciyw7kfi2fdrl6nr4pf";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/257e452d37768d2f3a6e0a5ccd062d128b2bc867/recipes/helm-firefox";
           sha256 = "0677nj0zsk11vvp3q3xl9nk8dhz3ki9yl3kfb57wgnmprp109wgs";
-          name = "helm-firefox";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs helm ];
         meta = {
@@ -17904,8 +22367,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-flycheck = callPackage ({ dash, fetchFromGitHub, fetchurl, flycheck, helm-core, lib, melpaBuild }:
-    melpaBuild {
+    helm-flycheck = callPackage ({ dash
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , flycheck
+                                 , helm-core
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "helm-flycheck";
         version = "0.4";
         src = fetchFromGitHub {
@@ -17914,10 +22383,10 @@
           rev = "a15e62a6432c165c4f2c17388686873383400d7d";
           sha256 = "0q9yksx66ry4x3vkcyyj437il225s2ad5h6vkxpyz04p62g3ysnx";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9cce1662d4ca7b7d868685084294d22ebf6c39e9/recipes/helm-flycheck";
           sha256 = "038f9294qc0jnkzrrjxm97hyhwa4sca3wdsjbaya50cf0g4cmk7b";
-          name = "helm-flycheck";
+          name = "recipe";
         };
         packageRequires = [ dash flycheck helm-core ];
         meta = {
@@ -17925,20 +22394,27 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-ghc = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, ghc, helm, lib, melpaBuild }:
-    melpaBuild {
+    helm-ghc = callPackage ({ cl-lib ? null
+                            , emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , ghc
+                            , helm
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "helm-ghc";
         version = "0.1.0";
         src = fetchFromGitHub {
           owner = "david-christiansen";
           repo = "helm-ghc";
-          rev = "d3603ee18299b789be255297dc42af16dd431869";
-          sha256 = "00ls9v3jdpz3wka90crd193z3ipwnf1b0slmldn4vb9ivrndh6wn";
+          rev = "3947bfd6b5a05074e776f0b51f414f1a5a724888";
+          sha256 = "0j8mbn33rv4jky9zh1hgw8da8wgs2760057mx8rv5x6i1qcm3bqd";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-ghc";
           sha256 = "0bv0sfpya1jyay9p80lv0w6h9kdp96r8lnp6nj15w660p1b51c0d";
-          name = "helm-ghc";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ghc helm ];
         meta = {
@@ -17946,8 +22422,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-ghq = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
-    melpaBuild {
+    helm-ghq = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , helm
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "helm-ghq";
         version = "1.7.0";
         src = fetchFromGitHub {
@@ -17956,10 +22436,10 @@
           rev = "21ccdb537a3be3d9351e01c6365df8e804e8bc56";
           sha256 = "1v3h6dszj223yvlkrjj6r4jwiyaj3iswbcl5d4ffwgaf72cxm4gn";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e94eec646def7c77b15f6a6ac1841200848e62c7/recipes/helm-ghq";
           sha256 = "14f3cbsj7jhlhrp561d8pasllnx1cmi7jk6v2fja7ghzj76dnvq6";
-          name = "helm-ghq";
+          name = "recipe";
         };
         packageRequires = [ helm ];
         meta = {
@@ -17967,8 +22447,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-git-grep = callPackage ({ fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }:
-    melpaBuild {
+    helm-git-grep = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , helm-core
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "helm-git-grep";
         version = "0.10.1";
         src = fetchFromGitHub {
@@ -17977,10 +22461,10 @@
           rev = "744cea07dba6e6a5effbdba83f1b786c78fd86d3";
           sha256 = "172m7wbgx9qnv9n1slbzpd9j24p6blddik49z6bq3zdg1vlnf3dv";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/338d28c3fe201a7b2f15793be6d540f44819f4d8/recipes/helm-git-grep";
           sha256 = "1ww6a4q78w5hnwikq7y93ic2b7x070c27r946lh6p8cz1k4b8vqi";
-          name = "helm-git-grep";
+          name = "recipe";
         };
         packageRequires = [ helm-core ];
         meta = {
@@ -17988,20 +22472,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-github-stars = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
-    melpaBuild {
+    helm-github-stars = callPackage ({ emacs
+                                     , fetchFromGitHub
+                                     , fetchurl
+                                     , helm
+                                     , lib
+                                     , melpaBuild }:
+      melpaBuild {
         pname = "helm-github-stars";
-        version = "1.3.2";
+        version = "1.3.4";
         src = fetchFromGitHub {
           owner = "Sliim";
           repo = "helm-github-stars";
-          rev = "9211be3fbb65ca8819e0d1a54524ed8abbfaa4fa";
-          sha256 = "1sbhh3dmb47sy3r2iw6vmvbq5bpjac4xdg8i5a0m0c392a38nfqn";
+          rev = "c0ca595e23246165adc12bd85ba7b09760290bc3";
+          sha256 = "0z3nangwhxxhlzd7la9k8gqqxr321iy9z5w6hlvb3f3qgxc84y17";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2e77f4a75504ca3e1091cdc757e91fb1ae361fa7/recipes/helm-github-stars";
           sha256 = "1r4mc4v71171sq9rbbhm346s92fb7jnvvl91y2q52jqmrnzzl9zy";
-          name = "helm-github-stars";
+          name = "recipe";
         };
         packageRequires = [ emacs helm ];
         meta = {
@@ -18009,20 +22498,27 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-gitlab = callPackage ({ dash, fetchFromGitHub, fetchurl, gitlab, helm, lib, melpaBuild, s }:
-    melpaBuild {
+    helm-gitlab = callPackage ({ dash
+                               , fetchFromGitHub
+                               , fetchurl
+                               , gitlab
+                               , helm
+                               , lib
+                               , melpaBuild
+                               , s }:
+      melpaBuild {
         pname = "helm-gitlab";
         version = "0.8.0";
         src = fetchFromGitHub {
           owner = "nlamirault";
           repo = "emacs-gitlab";
-          rev = "a1c1441ff5ffb290e695eb9ac05431e9385578f4";
-          sha256 = "0ywjrgafpl4cnrykx9yysazr7hkd2pxk67h065f8z3mid6cgh1wa";
+          rev = "cffba49c1260421b8e388c65365b229970098e5c";
+          sha256 = "1wh6z7ni8nwqigvgz77zgqszx60s1k1chpzgzs1k3kfby7apxww1";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1d012991188956f6e06c37d504b0d06ab31487b9/recipes/helm-gitlab";
           sha256 = "010ihx3yddhb8j3jqcssc49qnf3i7xlz0s380mpgrdxgz6yahsmd";
-          name = "helm-gitlab";
+          name = "recipe";
         };
         packageRequires = [ dash gitlab helm s ];
         meta = {
@@ -18030,8 +22526,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-go-package = callPackage ({ deferred, emacs, fetchFromGitHub, fetchurl, go-mode, helm-core, lib, melpaBuild }:
-    melpaBuild {
+    helm-go-package = callPackage ({ deferred
+                                   , emacs
+                                   , fetchFromGitHub
+                                   , fetchurl
+                                   , go-mode
+                                   , helm-core
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "helm-go-package";
         version = "0.3.0";
         src = fetchFromGitHub {
@@ -18040,10 +22543,10 @@
           rev = "7db5ea9ce97502152a6bb1fe38f8fabb5a49abd2";
           sha256 = "08llqkswilzsigh28w9qjbqi5g5z0ylfabz5sqia7c18gjshvz0h";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/449d272b94c189176305ca17652d76adac087ce5/recipes/helm-go-package";
           sha256 = "102yhn1xg83l67yaq3brn35a03fkvqqhad10rq0h39n4i1slq3z6";
-          name = "helm-go-package";
+          name = "recipe";
         };
         packageRequires = [ deferred emacs go-mode helm-core ];
         meta = {
@@ -18051,8 +22554,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-gtags = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
-    melpaBuild {
+    helm-gtags = callPackage ({ emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , helm
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "helm-gtags";
         version = "1.5.6";
         src = fetchFromGitHub {
@@ -18061,10 +22569,10 @@
           rev = "dbe0d2d9d08058d469ad2d729bd782515b5b3b62";
           sha256 = "0zyspn9rqfs3hkq8qx0q1w5qiv30ignbmycyv0vn3a6q7a5fsnhx";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/81f0f525680fea98e804f39dbde1dada887e8821/recipes/helm-gtags";
           sha256 = "1kbpfqhhbxmp3f70h91x2fws9mhx87zx4nzjjl29lpl93vf8xckl";
-          name = "helm-gtags";
+          name = "recipe";
         };
         packageRequires = [ emacs helm ];
         meta = {
@@ -18072,8 +22580,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-hatena-bookmark = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
-    melpaBuild {
+    helm-hatena-bookmark = callPackage ({ fetchFromGitHub
+                                        , fetchurl
+                                        , helm
+                                        , lib
+                                        , melpaBuild }:
+      melpaBuild {
         pname = "helm-hatena-bookmark";
         version = "2.2.3";
         src = fetchFromGitHub {
@@ -18082,10 +22594,10 @@
           rev = "d64833a5bbb4ae112ed176f6473232e526138572";
           sha256 = "01b6nlbidk93arnnd2irm088qlws4i4p1sagsh9v153x6sk0r38k";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3e9335ad16d4151dd4970c4a3ad1fee9a84404fa/recipes/helm-hatena-bookmark";
           sha256 = "14091zrp4vj7752rb5s3pkyvrrsdl7iaj3q9ys8rjmbsjwcv30id";
-          name = "helm-hatena-bookmark";
+          name = "recipe";
         };
         packageRequires = [ helm ];
         meta = {
@@ -18093,8 +22605,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-hayoo = callPackage ({ fetchFromGitHub, fetchurl, haskell-mode, helm, json ? null, lib, melpaBuild }:
-    melpaBuild {
+    helm-hayoo = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , haskell-mode
+                              , helm
+                              , json ? null
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "helm-hayoo";
         version = "0.0.5";
         src = fetchFromGitHub {
@@ -18103,10 +22621,10 @@
           rev = "f49a77e8b8704bb7eb0d1097eefb8010a6617664";
           sha256 = "1imfzz6cfdq7fgrcgrafy2nln929mgh31vybk9frm7a9jpamqdxp";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-hayoo";
           sha256 = "06nbilb6vfa8959ss5d06zbcwqxlbyi3cb5jnbdag0jnpxvv1hqb";
-          name = "helm-hayoo";
+          name = "recipe";
         };
         packageRequires = [ haskell-mode helm json ];
         meta = {
@@ -18114,20 +22632,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-ispell = callPackage ({ fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }:
-    melpaBuild {
+    helm-ispell = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , helm-core
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "helm-ispell";
         version = "0.1";
         src = fetchFromGitHub {
           owner = "syohex";
           repo = "emacs-helm-ispell";
-          rev = "640723ace794d21b8a5892012db99f963149415b";
-          sha256 = "0bz2ngw816jvpw1a10j31y5hf1knz0mzz60l073h33qci11jbwid";
+          rev = "9dd7e24cacf755879e569891700520554972b5c8";
+          sha256 = "1qh84a9qxdr13w9qbn4l1rqs0rq7pmn4is3kmwg7ya85yh3wmzyb";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/edc42b26027dcd7daf0d6f2bd19ca4736fc12d6d/recipes/helm-ispell";
           sha256 = "0qyj6whgb2p0v231wn6pvx4awvl1wxppppqqbx5255j8r1f3l1b0";
-          name = "helm-ispell";
+          name = "recipe";
         };
         packageRequires = [ helm-core ];
         meta = {
@@ -18135,8 +22657,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-lobsters = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    helm-lobsters = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "helm-lobsters";
         version = "0.1.0";
         src = fetchFromGitHub {
@@ -18156,8 +22681,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-ls-git = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
-    melpaBuild {
+    helm-ls-git = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , helm
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "helm-ls-git";
         version = "1.9.1";
         src = fetchFromGitHub {
@@ -18166,10 +22695,10 @@
           rev = "7b7b6dc2554603ad98412927f84a803625069ab3";
           sha256 = "1s748a5abj58hd7cwzfggfnnmyzhj04gpbqqwqmskn8xlsq5qcdi";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b487b4c0db9092bb7e32aad9265b79a9d18c8478/recipes/helm-ls-git";
           sha256 = "08rsy9479nk03kinjfkxddrq6wi4sx2a0wrz37cl2q517qi7sibj";
-          name = "helm-ls-git";
+          name = "recipe";
         };
         packageRequires = [ helm ];
         meta = {
@@ -18177,8 +22706,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-ls-hg = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
-    melpaBuild {
+    helm-ls-hg = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , helm
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "helm-ls-hg";
         version = "1.8.0";
         src = fetchFromGitHub {
@@ -18187,10 +22720,10 @@
           rev = "61b91a22fcfb62d0fc56e361ec01ce96973c7165";
           sha256 = "1msrsqiwk7bg5gry5cia8a6c7ifymfyn738hk8g2qwzzw4vkxxcs";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/03a22c9ec281330c4603aec6feb04cf580dee340/recipes/helm-ls-hg";
           sha256 = "0ca0xn7n8bagxb504xgkcv04rpm1vxhx2m77biqrx5886pwl25bh";
-          name = "helm-ls-hg";
+          name = "recipe";
         };
         packageRequires = [ helm ];
         meta = {
@@ -18198,20 +22731,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-make = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild, projectile }:
-    melpaBuild {
+    helm-make = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , helm
+                             , lib
+                             , melpaBuild
+                             , projectile }:
+      melpaBuild {
         pname = "helm-make";
         version = "0.1.0";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "helm-make";
-          rev = "6558a79d20d04465419b312da198190be6832647";
-          sha256 = "17ls0bplnja2qvg3129x2irgsgs7l4bjj0qi7b9z16i6knjkwfya";
+          rev = "4bedccdaa65fcd4ea5b643738ea55bf865532c1a";
+          sha256 = "0c9hgazfaf56iv7ghww9ni6db3bv6897785n0mz3b3khf2mj2388";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0f25f066c60d4caff1fbf885bc944cac47515ec8/recipes/helm-make";
           sha256 = "1r6jjy1rlsii6p6pinbz7h6gcw4vmcycd3vj338bfbnqp5rrf2mc";
-          name = "helm-make";
+          name = "recipe";
         };
         packageRequires = [ helm projectile ];
         meta = {
@@ -18219,8 +22757,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-migemo = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, migemo }:
-    melpaBuild {
+    helm-migemo = callPackage ({ cl-lib ? null
+                               , fetchFromGitHub
+                               , fetchurl
+                               , helm-core
+                               , lib
+                               , melpaBuild
+                               , migemo }:
+      melpaBuild {
         pname = "helm-migemo";
         version = "1.22";
         src = fetchFromGitHub {
@@ -18229,10 +22773,10 @@
           rev = "2d964309a5415cf47f5154271e6fe7b6a7fffec7";
           sha256 = "03588hanfa20pjp9w1bqy8wsf5x6az0vfq0bmcnr4xvlf6fhkyxs";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ce6eb840368f8cbee66dc061478d5096b9dacb68/recipes/helm-migemo";
           sha256 = "1cjvb1lm1fsg5ky63fvrphwl5a7r7xf6qzb4mvl06ikj8hv2h33x";
-          name = "helm-migemo";
+          name = "recipe";
         };
         packageRequires = [ cl-lib helm-core migemo ];
         meta = {
@@ -18240,20 +22784,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-mode-manager = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
-    melpaBuild {
+    helm-mode-manager = callPackage ({ fetchFromGitHub
+                                     , fetchurl
+                                     , helm
+                                     , lib
+                                     , melpaBuild }:
+      melpaBuild {
         pname = "helm-mode-manager";
         version = "1.0.0";
         src = fetchFromGitHub {
           owner = "istib";
           repo = "helm-mode-manager";
-          rev = "1fc1d65a27bc57d3a5bbd359f3eb77a6353fa4a5";
-          sha256 = "1srx5f0s9x7zan7ayqd6scxfhcvr3nkd4yzs96hphd87rb18apzk";
+          rev = "12d762eadaf67df9e5e0f607e7a8cf1f6eea778b";
+          sha256 = "17zvv089845j0v5d4hc3d2hq8mkxq2cafx29qgvbvgpfifxx1z3h";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-mode-manager";
           sha256 = "04yhqbb9cliv1922b0abpc1wrladvhyfmwn8ifqfkzaks4067rhl";
-          name = "helm-mode-manager";
+          name = "recipe";
         };
         packageRequires = [ helm ];
         meta = {
@@ -18261,8 +22809,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-mt = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, multi-term }:
-    melpaBuild {
+    helm-mt = callPackage ({ cl-lib ? null
+                           , emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , helm
+                           , lib
+                           , melpaBuild
+                           , multi-term }:
+      melpaBuild {
         pname = "helm-mt";
         version = "0.9";
         src = fetchFromGitHub {
@@ -18271,10 +22826,10 @@
           rev = "d2bff4100118483bc398c56d0ff095294209265b";
           sha256 = "1wci63y0vjvrvrylkhhrz8p9q0ml6la5cpj4rx5cwin9rkmislm6";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e726bf0b9b3f371b21f1f0d75175e0dda62f6fb0/recipes/helm-mt";
           sha256 = "04hx8cg8wmm2w8g942nc9mvm12ammmjnx4k61ljrq76smd8s3x2a";
-          name = "helm-mt";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs helm multi-term ];
         meta = {
@@ -18282,20 +22837,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-nixos-options = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild, nixos-options }:
-    melpaBuild {
+    helm-nixos-options = callPackage ({ fetchFromGitHub
+                                      , fetchurl
+                                      , helm
+                                      , lib
+                                      , melpaBuild
+                                      , nixos-options }:
+      melpaBuild {
         pname = "helm-nixos-options";
         version = "0.0.1";
         src = fetchFromGitHub {
           owner = "travisbhartwell";
           repo = "nix-emacs";
-          rev = "5fc8fa29bea9dd8e9c822af92f9bc6ddc223635f";
-          sha256 = "1lm7rkgf7q5g4ji6v1masfbhxdpwni8d77dapsy5k9p73cr2aqld";
+          rev = "5ee8a6b22c464028d19d5cebc8f69087bb667c01";
+          sha256 = "1cn8drnkna9vr56fb6w0gmz5kyy9r8a71ph48fsblgqr9fjqw31j";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6846c7d86e70a9dd8300b89b61435aa7e146be96/recipes/helm-nixos-options";
           sha256 = "1nsi4hfw53iwn29fp33dkri1c6w8kdyn4sa0yn2fi6144ilmq933";
-          name = "helm-nixos-options";
+          name = "recipe";
         };
         packageRequires = [ helm nixos-options ];
         meta = {
@@ -18303,8 +22863,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-notmuch = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild, notmuch }:
-    melpaBuild {
+    helm-notmuch = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , helm
+                                , lib
+                                , melpaBuild
+                                , notmuch }:
+      melpaBuild {
         pname = "helm-notmuch";
         version = "1.1";
         src = fetchFromGitHub {
@@ -18313,10 +22878,10 @@
           rev = "782c221bf293eee55990de5b54171f08d881dcee";
           sha256 = "04mlsjqhh2nw2javxz8m1hbnsq0s70dw5pnwdbx8s9dk1p8ikxvw";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/98667b3aa43d3e0f6174eeef82acaf71d7019aac/recipes/helm-notmuch";
           sha256 = "1ixdc1ba4ygxl0lpg6ijk06dgj2hfv5p5k6ivq60ss0axyisnnv0";
-          name = "helm-notmuch";
+          name = "recipe";
         };
         packageRequires = [ helm notmuch ];
         meta = {
@@ -18324,8 +22889,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-open-github = callPackage ({ emacs, fetchFromGitHub, fetchurl, gh, helm-core, lib, melpaBuild }:
-    melpaBuild {
+    helm-open-github = callPackage ({ emacs
+                                    , fetchFromGitHub
+                                    , fetchurl
+                                    , gh
+                                    , helm-core
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "helm-open-github";
         version = "0.15";
         src = fetchFromGitHub {
@@ -18334,10 +22905,10 @@
           rev = "553f3ab0fe0a028015e9b6cb7c35fb139ec222fc";
           sha256 = "1xj5b44nkdvbxhk1bnllqm2qq393w22ccy708prrhiq8fmk53aa8";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/81f0f525680fea98e804f39dbde1dada887e8821/recipes/helm-open-github";
           sha256 = "1wqlwg21s9pjgcrwr8kdrppinmjn235nadkp4003g0md1d64zxpx";
-          name = "helm-open-github";
+          name = "recipe";
         };
         packageRequires = [ emacs gh helm-core ];
         meta = {
@@ -18345,20 +22916,28 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-org-rifle = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }:
-    melpaBuild {
+    helm-org-rifle = callPackage ({ dash
+                                  , emacs
+                                  , f
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , helm
+                                  , lib
+                                  , melpaBuild
+                                  , s }:
+      melpaBuild {
         pname = "helm-org-rifle";
-        version = "1.5.1";
+        version = "1.6.0";
         src = fetchFromGitHub {
           owner = "alphapapa";
           repo = "helm-org-rifle";
-          rev = "ecf5ad53bef572e38d8c8d93b516f8eab8c4dfe5";
-          sha256 = "14020ws87m64bfxqw30c9hc88zb7w4kxs5svd2a10y00lgrg2m93";
+          rev = "349a3d717d4201404d88c1ee71eb2cd8dc17aeb2";
+          sha256 = "1i35cy8yk9r6k2fq07cnbqf7wlfmdqhwihffqkzdp2wm5m762mnv";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f39cc94dde5aaf0d6cfea5c98dd52cdb0bcb1615/recipes/helm-org-rifle";
           sha256 = "0hx764vql2qgw9i8qrr3kkn23lw6jx3x604dm1y33ig6a15gy3a3";
-          name = "helm-org-rifle";
+          name = "recipe";
         };
         packageRequires = [ dash emacs f helm s ];
         meta = {
@@ -18366,8 +22945,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-orgcard = callPackage ({ fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }:
-    melpaBuild {
+    helm-orgcard = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , helm-core
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "helm-orgcard";
         version = "0.2";
         src = fetchFromGitHub {
@@ -18376,10 +22959,10 @@
           rev = "9655ac340d1ccc5f3d1c0f7c49be8dd3556d4d0d";
           sha256 = "1zyjxrrda7nxxjqczv2p3sfimxy2pq734kf51j6v2y0biclc4bk3";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ce6eb840368f8cbee66dc061478d5096b9dacb68/recipes/helm-orgcard";
           sha256 = "1a56y8fny7qxxidc357n7l3yi7h66hidhvwhkam8y5wk6k61460p";
-          name = "helm-orgcard";
+          name = "recipe";
         };
         packageRequires = [ helm-core ];
         meta = {
@@ -18387,8 +22970,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-pages = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
-    melpaBuild {
+    helm-pages = callPackage ({ cl-lib ? null
+                              , emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , helm
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "helm-pages";
         version = "0.1.1";
         src = fetchFromGitHub {
@@ -18397,10 +22986,10 @@
           rev = "e334ca3312e51d6fdfa989df5d3ebe683d673c0e";
           sha256 = "1r2ndmrw5ivawb940j8jnmqzxv46qrzd3cqh9fvxx5yicf020fjf";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7a33cb19b6e71240896bbe5da07ab25f2ee11f0b/recipes/helm-pages";
           sha256 = "1v3w8100invb5wsmm3dyl41pjs7s889s3b1rlr6vlcspa1ncv3wj";
-          name = "helm-pages";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs helm ];
         meta = {
@@ -18408,8 +22997,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-perldoc = callPackage ({ cl-lib ? null, deferred, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
-    melpaBuild {
+    helm-perldoc = callPackage ({ cl-lib ? null
+                                , deferred
+                                , fetchFromGitHub
+                                , fetchurl
+                                , helm
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "helm-perldoc";
         version = "0.7";
         src = fetchFromGitHub {
@@ -18418,10 +23013,10 @@
           rev = "18645f2065a07acce2c6b50a2f9d7a2554e532a3";
           sha256 = "01cj2897hqz02mfz32nxlyyp59iwm0gz1zj11s8ll7pwy9q3r90g";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/81f0f525680fea98e804f39dbde1dada887e8821/recipes/helm-perldoc";
           sha256 = "1qx0g81qcqanjiz5fxysagjhsxaj31g6nsi2hhdgq4x4nqrlmrhb";
-          name = "helm-perldoc";
+          name = "recipe";
         };
         packageRequires = [ cl-lib deferred helm ];
         meta = {
@@ -18429,8 +23024,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-perspeen = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild, perspeen }:
-    melpaBuild {
+    helm-perspeen = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , helm
+                                 , lib
+                                 , melpaBuild
+                                 , perspeen }:
+      melpaBuild {
         pname = "helm-perspeen";
         version = "0.1.2";
         src = fetchFromGitHub {
@@ -18439,10 +23039,10 @@
           rev = "aec145d5196aed1689563d138a2aa37b139e1759";
           sha256 = "1wv13mvm9149nl9p93znl3d2yfnq4rph440ja07w804cd61qjhq9";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1ee26a57aacbd571da0cfaca2c31eec6ea86a543/recipes/helm-perspeen";
           sha256 = "07cnsfhph807fqyai3by2c5ml9a40gxkq280f27disf8sc45rg1y";
-          name = "helm-perspeen";
+          name = "recipe";
         };
         packageRequires = [ helm perspeen ];
         meta = {
@@ -18450,8 +23050,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-proc = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
-    melpaBuild {
+    helm-proc = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , helm
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "helm-proc";
         version = "0.0.5";
         src = fetchFromGitHub {
@@ -18460,10 +23064,10 @@
           rev = "0a75a86e4f381143134e0cdcd8c84c5b5b0fb2d6";
           sha256 = "0bgpd50ningqyzwhfinfrn6gqacard5ynwllhg9clq0f683sbck2";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-proc";
           sha256 = "11mh8ny8mhdmp16s21vy9yyql56zxcgmj2aapqs5jy4yad5q62rz";
-          name = "helm-proc";
+          name = "recipe";
         };
         packageRequires = [ helm ];
         meta = {
@@ -18471,20 +23075,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-project-persist = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild, project-persist }:
-    melpaBuild {
+    helm-project-persist = callPackage ({ fetchFromGitHub
+                                        , fetchurl
+                                        , helm
+                                        , lib
+                                        , melpaBuild
+                                        , project-persist }:
+      melpaBuild {
         pname = "helm-project-persist";
         version = "1.0.0";
         src = fetchFromGitHub {
           owner = "Sliim";
           repo = "helm-project-persist";
-          rev = "df63a21b9118f9639f0f4a336127b4fb8ec6deec";
-          sha256 = "1q7hfj8ldwivhjp9ns5pvsn0ds6pyvl2zhl366c22s6q8jmbr8ik";
+          rev = "6ed96dafb7eb2e8cc5010f960262927f4a0f8cdf";
+          sha256 = "0fcn4kx8dsda8z13fwdnv94hyb2fkv61qdx1263fmsnhllya9ygg";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/98780edaf8b1d97aec9e25d07d93289c90fd5069/recipes/helm-project-persist";
           sha256 = "1n87kn1n3453mpdj6amyrgivslskmnzdafpspvkz7b0smf9mv2ld";
-          name = "helm-project-persist";
+          name = "recipe";
         };
         packageRequires = [ helm project-persist ];
         meta = {
@@ -18492,8 +23101,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-projectile = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, projectile }:
-    melpaBuild {
+    helm-projectile = callPackage ({ cl-lib ? null
+                                   , dash
+                                   , fetchFromGitHub
+                                   , fetchurl
+                                   , helm
+                                   , lib
+                                   , melpaBuild
+                                   , projectile }:
+      melpaBuild {
         pname = "helm-projectile";
         version = "0.14.0";
         src = fetchFromGitHub {
@@ -18502,10 +23118,10 @@
           rev = "1a90f93732f1a1e8080098d65eadd6a1cd799e31";
           sha256 = "0lph38p112fridighqcizpsyzjbv7qr3d8prbfj6w6q6gfl6cna4";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8bc4e3a5af7ba86d277c73a1966a91c87d3d855a/recipes/helm-projectile";
           sha256 = "18y7phrvbpdi3cnghwyhh0v1bwm95nwq1lymzf8lrcbmrwcvh36a";
-          name = "helm-projectile";
+          name = "recipe";
         };
         packageRequires = [ cl-lib dash helm projectile ];
         meta = {
@@ -18513,8 +23129,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-pt = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
-    melpaBuild {
+    helm-pt = callPackage ({ fetchFromGitHub
+                           , fetchurl
+                           , helm
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "helm-pt";
         version = "0.2";
         src = fetchFromGitHub {
@@ -18523,10 +23143,10 @@
           rev = "03e35e2bb5b683d79897d07acb57ee67009cc6cd";
           sha256 = "0jm6nnnjyd4kmm1knh0mq3xhnw2hvs3linwlynj8yaliqvlv6brv";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/550eb9f42c90fd9e80714579c12ee6bfcacb5bb7/recipes/helm-pt";
           sha256 = "1imhy0bsm9aldv0pvf88280qdya01lznxpx5gi5wffhrz17yh4pi";
-          name = "helm-pt";
+          name = "recipe";
         };
         packageRequires = [ helm ];
         meta = {
@@ -18534,8 +23154,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-purpose = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, window-purpose }:
-    melpaBuild {
+    helm-purpose = callPackage ({ emacs
+                                , fetchFromGitHub
+                                , fetchurl
+                                , helm
+                                , lib
+                                , melpaBuild
+                                , window-purpose }:
+      melpaBuild {
         pname = "helm-purpose";
         version = "0.1";
         src = fetchFromGitHub {
@@ -18544,10 +23170,10 @@
           rev = "115a9d612aa07bb6f7f7b18f42b34918699660b9";
           sha256 = "1jy9l4an2aqynj86pw2qxpzw446xm376n2ykiz17qlimqbxhwkgz";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-purpose";
           sha256 = "16c9if636v7l8z5df011vdj4a3ci5kf3rdfk4g9hdbbl639yca79";
-          name = "helm-purpose";
+          name = "recipe";
         };
         packageRequires = [ emacs helm window-purpose ];
         meta = {
@@ -18555,8 +23181,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-pydoc = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }:
-    melpaBuild {
+    helm-pydoc = callPackage ({ cl-lib ? null
+                              , fetchFromGitHub
+                              , fetchurl
+                              , helm-core
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "helm-pydoc";
         version = "0.7";
         src = fetchFromGitHub {
@@ -18565,10 +23196,10 @@
           rev = "30f1814b5b16db0413ffe74b0d0420b38e153df9";
           sha256 = "1ik0vllakh73kc2zbgii4sm33n9pj388gaz69j4drz2mik307zvs";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/81f0f525680fea98e804f39dbde1dada887e8821/recipes/helm-pydoc";
           sha256 = "1sh7gqqiwk85kx89l1sihlkb8ff1g9n460nwj1y1bsrpfl6if4j7";
-          name = "helm-pydoc";
+          name = "recipe";
         };
         packageRequires = [ cl-lib helm-core ];
         meta = {
@@ -18576,8 +23207,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-qiita = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
-    melpaBuild {
+    helm-qiita = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , helm
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "helm-qiita";
         version = "1.0.2";
         src = fetchFromGitHub {
@@ -18586,10 +23221,10 @@
           rev = "1eb97a44ba6fbfe61a0735b0c62171ee5217eda1";
           sha256 = "1swkj65fhk48704ny3x6h95qqm2g21d94vzd8s8qqyjmnajj07i3";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/37331f6cc8a95fd2b2ed5b20be0bcb604ea66dee/recipes/helm-qiita";
           sha256 = "1iz2w1901zz3zk9zazikmnkzng5klnvqn4ph1id7liksrcdpdmpm";
-          name = "helm-qiita";
+          name = "recipe";
         };
         packageRequires = [ helm ];
         meta = {
@@ -18597,8 +23232,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-rdefs = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
-    melpaBuild {
+    helm-rdefs = callPackage ({ emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , helm
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "helm-rdefs";
         version = "1.0.1";
         src = fetchFromGitHub {
@@ -18607,10 +23247,10 @@
           rev = "cd3a6b3af3015ee58ef30cb7c81c79ebe5fc867b";
           sha256 = "0ji7ak9pkmw0wxzmw5a1amvn3pkj90v9jv1yi12w388njxn7qsvj";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e1c7a20847513dc1153d54a3a700bc120f71dc6b/recipes/helm-rdefs";
           sha256 = "0z3nrqrz63j9nxkbxdsjj3z8zhsqlik28iry3j1plgsxq1mhrn0y";
-          name = "helm-rdefs";
+          name = "recipe";
         };
         packageRequires = [ emacs helm ];
         meta = {
@@ -18618,8 +23258,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-recoll = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
-    melpaBuild {
+    helm-recoll = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , helm
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "helm-recoll";
         version = "0.5";
         src = fetchFromGitHub {
@@ -18628,10 +23272,10 @@
           rev = "cc4c4fa9c8f4f99383647baa8512b60523dc8b36";
           sha256 = "1ic2k8ls084yn9h96pk8815wlvxkwwdq75zhm1ls197pkbw7gh7y";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0a0d168f96470753c22b92ad863be98d8c421ccd/recipes/helm-recoll";
           sha256 = "0pr2pllplml55k1xx9inr3dm90ichg2wb62dvgvmbq2sqdf4606b";
-          name = "helm-recoll";
+          name = "recipe";
         };
         packageRequires = [ helm ];
         meta = {
@@ -18639,8 +23283,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-rg = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
-    melpaBuild {
+    helm-rg = callPackage ({ cl-lib ? null
+                           , dash
+                           , emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , helm
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "helm-rg";
         version = "0.1";
         src = fetchFromGitHub {
@@ -18649,10 +23300,10 @@
           rev = "96dcbeb366caa0b158668384113458ee5f7c4dfd";
           sha256 = "1k9yv9iw694alf5w7555ygk2i1b26i90rqq7ny63a4nd3y5cbs5f";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/958fbafdcb214f1ec89fd0d84c6600c89890e0cf/recipes/helm-rg";
           sha256 = "0gfq59540q9s6mr04q7dz638zqmqbqmbl1qaczddgmjn4vyjmf7v";
-          name = "helm-rg";
+          name = "recipe";
         };
         packageRequires = [ cl-lib dash emacs helm ];
         meta = {
@@ -18660,8 +23311,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-robe = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
-    melpaBuild {
+    helm-robe = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , helm
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "helm-robe";
         version = "0.2";
         src = fetchFromGitHub {
@@ -18670,10 +23325,10 @@
           rev = "7348d0bc0251b51979554ea678b970fd01c0efe9";
           sha256 = "163ljqar3vvbavzc8sk6rnf8awyc2rhh2g117fglswich3c8lnqg";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e7018f57f6f0e4bd71e172ae23c050b44276581b/recipes/helm-robe";
           sha256 = "1gi4nkm9xvnxv0frmhiiw8dkmnmhfpr9n0b6jpidlvr8xr4s5kyw";
-          name = "helm-robe";
+          name = "recipe";
         };
         packageRequires = [ helm ];
         meta = {
@@ -18681,20 +23336,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-rtags = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild, rtags }:
-    melpaBuild {
+    helm-rtags = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , helm
+                              , lib
+                              , melpaBuild
+                              , rtags }:
+      melpaBuild {
         pname = "helm-rtags";
         version = "2.18";
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "98d668e85cf9ae84e775742752c5656dd2df2f17";
-          sha256 = "0raqjbkl1ykga4ahgl9xw49cgh3cyqcf42z36z7d6fz1fw192kg0";
+          rev = "ccba23e842a43e8079e22c2fc93d022ac40dedaf";
+          sha256 = "091gh5mmgz357mz0jpmbzzrsy04bjczac02i94jxf49p6yw9v4ga";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/helm-rtags";
           sha256 = "1vv6wnniplyls344qzgcf1ivv25c8qilax6sbhvsf46lvrwnr48n";
-          name = "helm-rtags";
+          name = "recipe";
         };
         packageRequires = [ helm rtags ];
         meta = {
@@ -18702,8 +23362,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-rubygems-org = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
-    melpaBuild {
+    helm-rubygems-org = callPackage ({ cl-lib ? null
+                                     , emacs
+                                     , fetchFromGitHub
+                                     , fetchurl
+                                     , helm
+                                     , lib
+                                     , melpaBuild }:
+      melpaBuild {
         pname = "helm-rubygems-org";
         version = "0.0.1";
         src = fetchFromGitHub {
@@ -18712,10 +23378,10 @@
           rev = "6aaed984f698cbdf9f9aceb0221404563e28764d";
           sha256 = "1sff8kagyhmwcxf9062il1077d4slvr2kq76abj496610gpb75i0";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/655be547d57d358eff968f42c13dcf4371529a72/recipes/helm-rubygems-org";
           sha256 = "04ni03ak53z3rggdgf68qh7ksgcf3s0f2cv6skwjqw7v8qhph6qs";
-          name = "helm-rubygems-org";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs helm ];
         meta = {
@@ -18723,8 +23389,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-sage = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, sage-shell-mode }:
-    melpaBuild {
+    helm-sage = callPackage ({ cl-lib ? null
+                             , fetchFromGitHub
+                             , fetchurl
+                             , helm
+                             , lib
+                             , melpaBuild
+                             , sage-shell-mode }:
+      melpaBuild {
         pname = "helm-sage";
         version = "0.0.4";
         src = fetchFromGitHub {
@@ -18733,10 +23405,10 @@
           rev = "b42b4ba5fd1b17c4b54c30376a053281686beeb8";
           sha256 = "1s6aw1viyzhhrfiazzi82n7bkvshp7clwi6539660m72lfwc5zdl";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/09760a7f7b3cff6551c394fc7b2298567ca88eb0/recipes/helm-sage";
           sha256 = "1vnq15fjaap0ai7dadi64sm4415xssmahk2j7kx45sasy4qaxlbj";
-          name = "helm-sage";
+          name = "recipe";
         };
         packageRequires = [ cl-lib helm sage-shell-mode ];
         meta = {
@@ -18744,8 +23416,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-smex = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, smex }:
-    melpaBuild {
+    helm-smex = callPackage ({ emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , helm
+                             , lib
+                             , melpaBuild
+                             , smex }:
+      melpaBuild {
         pname = "helm-smex";
         version = "0.3";
         src = fetchFromGitHub {
@@ -18754,10 +23432,10 @@
           rev = "2269375dfa452b88b5170d1a5d5849ebb2c1e413";
           sha256 = "0n2ki7g0hygsq4bi5zkhp3v772ld7niiajfznxmv11dgn949a52s";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/85568bd732da952053148e07b95e53f7caf5f62c/recipes/helm-smex";
           sha256 = "02jvq2hyq4wwc9v8gaxr9vkjldc60khdbjf71p8w2iny5w3k0jbj";
-          name = "helm-smex";
+          name = "recipe";
         };
         packageRequires = [ emacs helm smex ];
         meta = {
@@ -18765,8 +23443,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-spaces = callPackage ({ fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, spaces }:
-    melpaBuild {
+    helm-spaces = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , helm-core
+                               , lib
+                               , melpaBuild
+                               , spaces }:
+      melpaBuild {
         pname = "helm-spaces";
         version = "0.4";
         src = fetchFromGitHub {
@@ -18775,10 +23458,10 @@
           rev = "877e2b5178926308d6a7c2a37477bb12c33a96d4";
           sha256 = "1cz8aw6zprzfalagma7jmbycwll2chk2l4n5hkgqyhakdfm2ryzm";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8c2ffb50643223b68a62fab348cd5aba24ce92e6/recipes/helm-spaces";
           sha256 = "0hdvkk173k98iycvii5xpbiblx044125pl7jyz4kb8r1vvwcv791";
-          name = "helm-spaces";
+          name = "recipe";
         };
         packageRequires = [ helm-core spaces ];
         meta = {
@@ -18786,8 +23469,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-swoop = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
-    melpaBuild {
+    helm-swoop = callPackage ({ emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , helm
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "helm-swoop";
         version = "1.7.4";
         src = fetchFromGitHub {
@@ -18796,10 +23484,10 @@
           rev = "c66336b8245ddc51c4206f19c119f1081920985c";
           sha256 = "0b23j1bkpg4pm310hqdhgnl4mxsj05gpl08b6kb2ja4fzrg6adsk";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-swoop";
           sha256 = "1b3nyh4h5kcvwam539va4gzxa3rl4a0rdcriif21yq340yifjbdx";
-          name = "helm-swoop";
+          name = "recipe";
         };
         packageRequires = [ emacs helm ];
         meta = {
@@ -18807,20 +23495,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-system-packages = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, seq }:
-    melpaBuild {
+    helm-system-packages = callPackage ({ emacs
+                                        , fetchFromGitHub
+                                        , fetchurl
+                                        , helm
+                                        , lib
+                                        , melpaBuild
+                                        , seq }:
+      melpaBuild {
         pname = "helm-system-packages";
-        version = "1.9.0";
+        version = "1.10.0";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm-system-packages";
-          rev = "f1aeafd3de4d434fb89b9f65b863c9a53a7d2feb";
-          sha256 = "194f2in1k4g9fm66q63ayqmrg5shj807nq4phmkgfm02p1hj7v5w";
+          rev = "a82a25a94a670b36e34c5ae192f41b4a104955e5";
+          sha256 = "0y5wzvfycb1bvgdk782xyl744fih43vz14wmq6gcqjarw6xfniz5";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0c46cfb0fcda0500e15d04106150a072a1a75ccc/recipes/helm-system-packages";
           sha256 = "01mndx2zzh7r7gmpn6gd1vy1w3l6dnhvgn7n2p39viji1r8b39s4";
-          name = "helm-system-packages";
+          name = "recipe";
         };
         packageRequires = [ emacs helm seq ];
         meta = {
@@ -18828,8 +23522,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-themes = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
-    melpaBuild {
+    helm-themes = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , helm
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "helm-themes";
         version = "0.5";
         src = fetchFromGitHub {
@@ -18838,10 +23536,10 @@
           rev = "8c979f4efc6174eed7df5f3b62db955246202818";
           sha256 = "0rzbdrs5d5a0icpxrqik2iaz8i5bacw6nm2caf75s9w9j0j6s9li";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/81f0f525680fea98e804f39dbde1dada887e8821/recipes/helm-themes";
           sha256 = "0r7kyd0i0spwi7xkjrpm2kyphrsl3hqm5pw96nd3ia0jiwp8550j";
-          name = "helm-themes";
+          name = "recipe";
         };
         packageRequires = [ helm ];
         meta = {
@@ -18849,20 +23547,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-tramp = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
-    melpaBuild {
+    helm-tramp = callPackage ({ emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , helm
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "helm-tramp";
-        version = "0.9.5";
+        version = "1.0.5";
         src = fetchFromGitHub {
           owner = "masasam";
           repo = "emacs-helm-tramp";
-          rev = "34cc68bededd3ff6cbec8140f33c530fd3206a64";
-          sha256 = "1lway52ssh6zn6jw8157fp8d4brrkdln03vgll2r53bd69i2ipmn";
+          rev = "07d2f02166038c14052009f6fb9c2a163118e2cc";
+          sha256 = "1yi4wq484nrjb1yphp6dbaqjgfq7hr78gh9v9cys7dqg910ngy4f";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-tramp";
           sha256 = "0wqnabaywkhj1fnc3wpx7czrqbja1hsqwcpixmvv0fyrflmza517";
-          name = "helm-tramp";
+          name = "recipe";
         };
         packageRequires = [ emacs helm ];
         meta = {
@@ -18870,20 +23573,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-unicode = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
-    melpaBuild {
+    helm-unicode = callPackage ({ emacs
+                                , fetchFromGitHub
+                                , fetchurl
+                                , helm
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "helm-unicode";
         version = "0.0.3";
         src = fetchFromGitHub {
           owner = "bomgar";
           repo = "helm-unicode";
-          rev = "3b2a61dd9d4c9e85946567e07d8e70e276c5136b";
-          sha256 = "1247ghg1jkslgvwbffzsaxabz5l6qszw14vrwgln9smsc42cxjy2";
+          rev = "87a738b9ff2b3a0a136dd45f4cc354bf6dd8573f";
+          sha256 = "0kq1775b04jxlww6bvns5d4wl6rk6cvfl8f2avam8l9q1gw80y8h";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f720b9f9b667bf9ff3080938beab36aa0036dc92/recipes/helm-unicode";
           sha256 = "1j95qy2zwdb46dl30ankfx7013l0akc61m14s473j93w320j5224";
-          name = "helm-unicode";
+          name = "recipe";
         };
         packageRequires = [ emacs helm ];
         meta = {
@@ -18891,8 +23599,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-w32-launcher = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
-    melpaBuild {
+    helm-w32-launcher = callPackage ({ cl-lib ? null
+                                     , emacs
+                                     , fetchFromGitHub
+                                     , fetchurl
+                                     , helm
+                                     , lib
+                                     , melpaBuild }:
+      melpaBuild {
         pname = "helm-w32-launcher";
         version = "0.1.6";
         src = fetchFromGitHub {
@@ -18901,10 +23615,10 @@
           rev = "01aa370a32900e7521330fba495474f2aa435e19";
           sha256 = "0s8zp3kx2kxlfyd26yr3lphwcybhbm8qa9vzmxr3kaylwy6jpz5q";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fa678329a5081e1affa460c00239dabfd1b9dd82/recipes/helm-w32-launcher";
           sha256 = "0bzn2vhspn6lla815qxwsl9gwfyiwgwmnysr6rjpyacmi17d73ri";
-          name = "helm-w32-launcher";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs helm ];
         meta = {
@@ -18912,8 +23626,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-w3m = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, w3m }:
-    melpaBuild {
+    helm-w3m = callPackage ({ cl-lib ? null
+                            , emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , helm
+                            , lib
+                            , melpaBuild
+                            , w3m }:
+      melpaBuild {
         pname = "helm-w3m";
         version = "1.0";
         src = fetchFromGitHub {
@@ -18922,10 +23643,10 @@
           rev = "280673470672c9fbc57fd6a91defeb9f6641fc8a";
           sha256 = "0d47mqib4zkfadq26vpy0ih7j18d6n5v4c21wvr4hhg6hg205iiz";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f683fc9c7990e9ecb8a94808a7d03eb90c5569b1/recipes/helm-w3m";
           sha256 = "1rr83ija93iqz74k236hk3v75jk0iwcccwqpqgys7spvrld0b9pz";
-          name = "helm-w3m";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs helm w3m ];
         meta = {
@@ -18933,8 +23654,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-zhihu-daily = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
-    melpaBuild {
+    helm-zhihu-daily = callPackage ({ cl-lib ? null
+                                    , emacs
+                                    , fetchFromGitHub
+                                    , fetchurl
+                                    , helm
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "helm-zhihu-daily";
         version = "0.3";
         src = fetchFromGitHub {
@@ -18943,10 +23670,10 @@
           rev = "be27dcc6be1eb97663b65581a9a5c0fc81cfaba7";
           sha256 = "1s8q97pra27bacvm5knj0sjgj7iqljlhxqiniaw8ij8w4fhcdh93";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/27246ec2bad3c85f8bb76aa26ebcd800edfe0d70/recipes/helm-zhihu-daily";
           sha256 = "0hkgail60s9qhxl0pskqxjvfz93iq1qh1kcmcq0x5kq7d08b911r";
-          name = "helm-zhihu-daily";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs helm ];
         meta = {
@@ -18954,20 +23681,30 @@
           license = lib.licenses.free;
         };
       }) {};
-    helpful = callPackage ({ dash, dash-functional, elisp-refs, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s, shut-up }:
-    melpaBuild {
+    helpful = callPackage ({ dash
+                           , dash-functional
+                           , elisp-refs
+                           , emacs
+                           , f
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild
+                           , s
+                           , shut-up }:
+      melpaBuild {
         pname = "helpful";
-        version = "0.9";
+        version = "0.12";
         src = fetchFromGitHub {
           owner = "Wilfred";
           repo = "helpful";
-          rev = "c527d0a9f66b50c28dfc44b88c5dd634c770ade2";
-          sha256 = "0mbqwxnk689mx58yjqs6dyyfkcgakginm35nqzp3kdwsvwvvkxzb";
+          rev = "5f3fb4752de3868e688ff2046790bda569bb6e23";
+          sha256 = "0z56icc8pmm537n34gy8a50a0i42glr58i860xmzlpxdn9f66dxp";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/889d34b654de13bd413d46071a5ff191cbf3d157/recipes/helpful";
           sha256 = "17w9j5v1r2c8ka1fpzbr295cgnsbiw8fxlslh4zbjqzaazamchn2";
-          name = "helpful";
+          name = "recipe";
         };
         packageRequires = [ dash dash-functional elisp-refs emacs f s shut-up ];
         meta = {
@@ -18975,8 +23712,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    hfst-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    hfst-mode = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "hfst-mode";
         version = "0.4.0";
         src = fetchFromGitHub {
@@ -18985,10 +23725,10 @@
           rev = "ac1bb9dd92545d3e7fdc05c83996c227cc15c6b8";
           sha256 = "0zsz8542kh51clzy8j7g29bwm8zcnfxm9sjzh3xjpqk2ziqf4ii6";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e324bb114997f9cc57d76d8a66fec4ff4d1d71fe/recipes/hfst-mode";
           sha256 = "1w342n5k9ak1m5znysvrplpr9dhmi7hxbkr4d1dx51dn0azbpjh7";
-          name = "hfst-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -18996,8 +23736,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    hi2 = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    hi2 = callPackage ({ fetchFromGitHub
+                       , fetchurl
+                       , lib
+                       , melpaBuild }:
+      melpaBuild {
         pname = "hi2";
         version = "1.0";
         src = fetchFromGitHub {
@@ -19006,10 +23749,10 @@
           rev = "c9d199727b5cdcb9e36a972b38131ce4611fd6c8";
           sha256 = "1s08sgbh5v59lqskd0s1dscs6dy7z5mkqqkabs3gd35agbfvbmlf";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ba880f0130707098e5b648f74d14e151b0110e4e/recipes/hi2";
           sha256 = "1wxkjg1jnw05lqzggi20jy2jl20d8brvv76vmrf6lnz62g6jv9h2";
-          name = "hi2";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -19017,8 +23760,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    hide-lines = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    hide-lines = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "hide-lines";
         version = "20130623.1701";
         src = fetchFromGitHub {
@@ -19027,10 +23773,10 @@
           rev = "4bfb4c6f4769bd6c637e4c18bbf65506832fc9f0";
           sha256 = "01cy7v9ql70bsvjz3idq23jpyb8jb61bs9ff8vf5y3fj45pc32ps";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ae489be43b1aee93614e40f492ebdf0b98a3fbc1/recipes/hide-lines";
           sha256 = "18h5ygi6idpb5wjlmjjvjmwcw7xiljkfxdvq7pm8wnw75p705x4d";
-          name = "hide-lines";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -19038,8 +23784,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    hide-mode-line = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    hide-mode-line = callPackage ({ emacs
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "hide-mode-line";
         version = "1.0.1";
         src = fetchFromGitHub {
@@ -19048,10 +23798,10 @@
           rev = "86b9057391edad75467261c2e579603567e608f9";
           sha256 = "0qmjmwhmlm008r22n2mv7lir4v1lpfz1c3yvqlwjgv0glbyvqd88";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2af28365f9fbc6ae71043a67966490c5d18a6095/recipes/hide-mode-line";
           sha256 = "0yl6aicpib5h1ckqi3gyilh2nwvp8gf1017n1w1755j01gw1p9hl";
-          name = "hide-mode-line";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -19059,8 +23809,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    hierarchy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    hierarchy = callPackage ({ emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "hierarchy";
         version = "0.7.0";
         src = fetchFromGitHub {
@@ -19069,10 +23823,10 @@
           rev = "4ab1372c252847c316f8978a81e2fe92ff79579e";
           sha256 = "1kykbb1sil5cycfa5aj8dhsxc5yrx1641i2np5kwdjid6ahdlz5r";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7aea238a2d14e9f58c0474251984b6c617b6854d/recipes/hierarchy";
           sha256 = "0fh1a590pdq21b4mwh9wrfsmm2lw2faw18r35cdzy8fgyf89yimp";
-          name = "hierarchy";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -19080,8 +23834,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    highlight-blocks = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    highlight-blocks = callPackage ({ emacs
+                                    , fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "highlight-blocks";
         version = "0.1.16";
         src = fetchFromGitHub {
@@ -19090,10 +23848,10 @@
           rev = "9c4240a5d16008db430d1a81c76dad474d3deb0c";
           sha256 = "0c65jk00j88qxfki2g88hy9g6n92rzskwcn1fbmwcw3qgaz4b6w5";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/eaf524488c408483ea8f2c3a71174b1b5fc3f5da/recipes/highlight-blocks";
           sha256 = "1a32iv5kgf6g6ygbs559w156dh578k45m860czazfx0d6ap3k5m1";
-          name = "highlight-blocks";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -19101,8 +23859,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    highlight-defined = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    highlight-defined = callPackage ({ emacs
+                                     , fetchFromGitHub
+                                     , fetchurl
+                                     , lib
+                                     , melpaBuild }:
+      melpaBuild {
         pname = "highlight-defined";
         version = "0.1.5";
         src = fetchFromGitHub {
@@ -19111,10 +23873,10 @@
           rev = "9cc03c7136b56c04ea053fbe08a3a4a6af26b90e";
           sha256 = "08czwa165rnd5z0dwwdddn7zi5w63sdk31l47bj0598kbly01n7r";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/acc9b816796b9f142c53f90593952b43c962d2d8/recipes/highlight-defined";
           sha256 = "1vjxm35wf4c2qphpkjh57hf03a5qdssdlmfj0n0gwxsdw1q5rpms";
-          name = "highlight-defined";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -19122,8 +23884,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    highlight-indentation = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    highlight-indentation = callPackage ({ fetchFromGitHub
+                                         , fetchurl
+                                         , lib
+                                         , melpaBuild }:
+      melpaBuild {
         pname = "highlight-indentation";
         version = "0.7.0";
         src = fetchFromGitHub {
@@ -19132,10 +23897,10 @@
           rev = "cd6d8168ccb04c6c0394f42e9512c58f23c01689";
           sha256 = "00l54k75qk24a0znzl4ij3s3nrnr2wy9ha3za8apphzlm98m907k";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/31c443de5088410c0fe1b1c18f664b33ad259277/recipes/highlight-indentation";
           sha256 = "0iblrrbssjwfn71n8xxjcl98pjv1qw1igf3hlz6mh8740fsca3d6";
-          name = "highlight-indentation";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -19143,8 +23908,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    highlight-numbers = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, parent-mode }:
-    melpaBuild {
+    highlight-numbers = callPackage ({ emacs
+                                     , fetchFromGitHub
+                                     , fetchurl
+                                     , lib
+                                     , melpaBuild
+                                     , parent-mode }:
+      melpaBuild {
         pname = "highlight-numbers";
         version = "0.2.3";
         src = fetchFromGitHub {
@@ -19153,10 +23923,10 @@
           rev = "b7adef0286aaa5bca8e98a12d0ffed3a880e25aa";
           sha256 = "1r07mpyr7rhd7bkg778hx6vbhb4n9ixgzkpszhgks7ri6ia38pj8";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/882e3a4877ddd22cc52f56f0ce3d55b6e4831c7a/recipes/highlight-numbers";
           sha256 = "1bywrjv9ybr65mwkrxggb52jdqn16z8acgs5vqm0faq43an8i5yv";
-          name = "highlight-numbers";
+          name = "recipe";
         };
         packageRequires = [ emacs parent-mode ];
         meta = {
@@ -19164,8 +23934,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    highlight-parentheses = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    highlight-parentheses = callPackage ({ fetchFromGitHub
+                                         , fetchurl
+                                         , lib
+                                         , melpaBuild }:
+      melpaBuild {
         pname = "highlight-parentheses";
         version = "1.1.0";
         src = fetchFromGitHub {
@@ -19174,10 +23947,10 @@
           rev = "5aa800a68e3795716de1e7f2722e836781190f31";
           sha256 = "08ld4wjrkd77cghmrf1n2hn2yzid7bdqwz6b1rzzqaiwxl138iy9";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/highlight-parentheses";
           sha256 = "1d38wxk5bwblddr74crzwjwpgyr8zgcl5h5ilywg35jpv7n66lp5";
-          name = "highlight-parentheses";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -19185,8 +23958,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    highlight-quoted = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    highlight-quoted = callPackage ({ emacs
+                                    , fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "highlight-quoted";
         version = "0.1";
         src = fetchFromGitHub {
@@ -19195,10 +23972,10 @@
           rev = "cdd7164f9ad3a9929387c08af641ef6f5f013f4f";
           sha256 = "1ahg9qzss67jpw0wp2izys6lyss4nqjy9320fpa4vdx39msdmjjb";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/93b5ba18e4bc31ca60aee9cb4674586cd8523bcf/recipes/highlight-quoted";
           sha256 = "0x6gxi0jfxvpx7r1fm43ikxlxilnbk2xbhdy9xivhgmmdyqiqqkl";
-          name = "highlight-quoted";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -19206,8 +23983,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    highlight-symbol = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    highlight-symbol = callPackage ({ fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "highlight-symbol";
         version = "1.3";
         src = fetchFromGitHub {
@@ -19216,10 +23996,10 @@
           rev = "6136dac6d4328c19077a838dfbae2efc4caa4db2";
           sha256 = "09z13kv2g21kjjkkm3iyaz93sdjmdy2d563r8n7r7ng94acrn7f6";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/highlight-symbol";
           sha256 = "01zw7xrkpgc89m55d60dx3s3kjajh5c164f64s2fzrgl9xj92h0r";
-          name = "highlight-symbol";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -19227,20 +24007,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    hindent = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    hindent = callPackage ({ cl-lib ? null
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "hindent";
-        version = "5.2.5";
+        version = "5.2.6";
         src = fetchFromGitHub {
           owner = "chrisdone";
           repo = "hindent";
-          rev = "cba1110ca413a41a443b8368d63d295d7d36de7a";
-          sha256 = "020dj6q483b7fabspgvnjqw0rhrgj3q1ncdcpafmyn1fgip5y0zq";
+          rev = "dc47d8b98ebd6ee7fdd7de5f75e65e5b5eedf72f";
+          sha256 = "0xp3mpiyrc6886bi9rih4vbmsar56h8i5sapigd3gn2pv2v688bc";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/dbae71a47446095f768be35e689025aed57f462f/recipes/hindent";
           sha256 = "1f3vzgnqigwbwvglxv0ziz3kyp5dxjraw3vlghkpw39f57mky4xz";
-          name = "hindent";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -19248,8 +24032,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    hippie-expand-slime = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    hippie-expand-slime = callPackage ({ fetchFromGitHub
+                                       , fetchurl
+                                       , lib
+                                       , melpaBuild }:
+      melpaBuild {
         pname = "hippie-expand-slime";
         version = "0.1";
         src = fetchFromGitHub {
@@ -19258,10 +24045,10 @@
           rev = "de31fbc9f9d55891a006463bcee7670b47084015";
           sha256 = "0mzk4agkcaaw7gryi0wrxv0blqndqsjf1ivdvr2nrnqi798sdhbr";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/hippie-expand-slime";
           sha256 = "0kxyv1lpkg33qgfv1jfqx03640py7525bcnc9dk98w6y6y92zf4m";
-          name = "hippie-expand-slime";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -19269,8 +24056,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    hippie-namespace = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    hippie-namespace = callPackage ({ fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "hippie-namespace";
         version = "0.5.8";
         src = fetchFromGitHub {
@@ -19279,10 +24069,10 @@
           rev = "79a662dfe9e61341e071b879f4f9101ca027ad10";
           sha256 = "0nfr8ad0klqwi97fjchvwx9mfc672lhv3ll166sr8vn6jlh7rkv0";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c9db386ab3910940addae6e925b2ac17e64e0f87/recipes/hippie-namespace";
           sha256 = "1bzjhq116ci9c9f0aw121fn3drmg2pw5ny1w6wcasa4p30syxxf0";
-          name = "hippie-namespace";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -19290,8 +24080,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    history = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    history = callPackage ({ emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "history";
         version = "1.0.0";
         src = fetchFromGitHub {
@@ -19300,10 +24094,10 @@
           rev = "adef53ecc2f6067bb61f020a2b66c5185a51632d";
           sha256 = "0dy98sg92xvnr4algm2v2bnjcdwzv0b0vqk0312b0ziinkzisas1";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f51d4cc6521546c99197adeb35459fcd53bd67d4/recipes/history";
           sha256 = "0s8pcz53bk1w4h5847204vb6j838vr8za66ni1b2y4pas76zjr5g";
-          name = "history";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -19311,8 +24105,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    historyf = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    historyf = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "historyf";
         version = "0.0.9";
         src = fetchFromGitHub {
@@ -19321,10 +24118,10 @@
           rev = "64ab6c9d2cd6dec6982622bf675326e011373cd2";
           sha256 = "1mxicha6m61qxz1mv9z76x4g9fpqk4ch9i6jf7nnpxd6x4xz3f7z";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a67279875c19475433fa13625c95ee5855962a59/recipes/historyf";
           sha256 = "15pcaqfjpkfwcy46yqqw10q8kpw7aamcg0gr4frbdgzbv0yld08s";
-          name = "historyf";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -19332,8 +24129,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    hl-anything = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    hl-anything = callPackage ({ emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "hl-anything";
         version = "0.0.9";
         src = fetchFromGitHub {
@@ -19342,10 +24143,10 @@
           rev = "de631c87d3a6602cdbf84c1623558334fda354fa";
           sha256 = "0889dzrwizpkyh3wms13k8zx27ipsrsxfa4j4yzk4cwk3aicckcr";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f38d26ede4e2e1d495a02c68e3b5041702b032e8/recipes/hl-anything";
           sha256 = "0czpc82j5hbzprc66aall72lqnk38dxgpzx4rs8sbx95cag12dxa";
-          name = "hl-anything";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -19353,8 +24154,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    hl-sentence = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    hl-sentence = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "hl-sentence";
         version = "3";
         src = fetchFromGitHub {
@@ -19363,10 +24167,10 @@
           rev = "f88882772f1a29fabb54194cc8aacd80d7f5b085";
           sha256 = "1hgigbgppdhmr7rc901r95kyydjk05dck8mwbryh7kpglns365fa";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/hl-sentence";
           sha256 = "16sjfs0nnpwzj1cqfna9vhmxgznwwhb2qdmjci25hlgrdxwwyahs";
-          name = "hl-sentence";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -19374,20 +24178,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    hl-todo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    hl-todo = callPackage ({ fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "hl-todo";
-        version = "1.8.1";
+        version = "1.9.0";
         src = fetchFromGitHub {
           owner = "tarsius";
           repo = "hl-todo";
-          rev = "fbe311b3be34cb5719e612f71d46a87b99954309";
-          sha256 = "0f7dsp2b0hzzz6klcmawwlid1jyl90ax0p2ph7bh2791jhywq60k";
+          rev = "770c9862ed79a2437b764050a1006c62f9e32747";
+          sha256 = "0vp8n7ymy7i3db2mqgj2a3sbd2hisj9kjvl6apn6y0bpw5vknfdy";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7c262f6a1a10e8b3cc30151cad2e34ceb66c6ed7/recipes/hl-todo";
           sha256 = "1iyh68xwldj1r02blar5zi01wnb90dkbmi67vd6h78ksghl3z9j4";
-          name = "hl-todo";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -19395,8 +24202,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    hoa-pp-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, names }:
-    melpaBuild {
+    hoa-pp-mode = callPackage ({ emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild
+                               , names }:
+      melpaBuild {
         pname = "hoa-pp-mode";
         version = "0.3.0";
         src = fetchFromGitHub {
@@ -19405,10 +24217,10 @@
           rev = "a72104a191214fba502653643a0d166a8f5341d9";
           sha256 = "1wg6vc9swwspi6s6jpig3my83i2pq8vkq2cy1q3an87rczacmfzp";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0c0d707dad9dc86bb3d6a829a60e21e92a5f3160/recipes/hoa-pp-mode";
           sha256 = "01ijfn0hd645j6j88rids5dsanmzwmky37slf50yqffnv69jwvla";
-          name = "hoa-pp-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs names ];
         meta = {
@@ -19416,8 +24228,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    homebrew-mode = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, inf-ruby, lib, melpaBuild }:
-    melpaBuild {
+    homebrew-mode = callPackage ({ dash
+                                 , emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , inf-ruby
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "homebrew-mode";
         version = "1.3.6";
         src = fetchFromGitHub {
@@ -19426,10 +24244,10 @@
           rev = "d422307aee2f897d1a92e3b959c3214bc54cbe38";
           sha256 = "1z4d0niz8q24f2z8rnfnc2rlmkffkf7qc57qn4695jbkzb7galfz";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1e4007f6d15574098722fb427b6a9903f77afb21/recipes/homebrew-mode";
           sha256 = "088wc5fq4r5yj1nbh7mriyqf0xwqmbxvblj9d2wwrkkdm5flc8mj";
-          name = "homebrew-mode";
+          name = "recipe";
         };
         packageRequires = [ dash emacs inf-ruby ];
         meta = {
@@ -19437,8 +24255,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    hookify = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    hookify = callPackage ({ dash
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild
+                           , s }:
+      melpaBuild {
         pname = "hookify";
         version = "0.2.1";
         src = fetchFromGitHub {
@@ -19447,10 +24270,10 @@
           rev = "e76127230716f7fab6662410c03c3872d17a172b";
           sha256 = "1yvz9d5h7npxhsdf6s9fgxpmqk5ixx91iwivbhzcz935gs2886hc";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/aa04ccd0ac05beed5de8d51ed96ccbf0071fdea1/recipes/hookify";
           sha256 = "0prls539ifk2fsqklcxmbrwmgbm9hya50z486d7sw426lh648qmy";
-          name = "hookify";
+          name = "recipe";
         };
         packageRequires = [ dash s ];
         meta = {
@@ -19458,8 +24281,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    hound = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, request }:
-    melpaBuild {
+    hound = callPackage ({ cl-lib ? null
+                         , fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild
+                         , request }:
+      melpaBuild {
         pname = "hound";
         version = "1.1.0";
         src = fetchFromGitHub {
@@ -19468,10 +24296,10 @@
           rev = "28cb804d99f9240d690d60098644e4300336b5fa";
           sha256 = "1zyd6350mbah7wjz7qrwyh9pr4jpk5i1v8p7cfmdlja92fpqj9rh";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/90cfc34eb4e8be7bf887533b85feba91131a435b/recipes/hound";
           sha256 = "0qri6bddd3c4sqvaqvmqw6xg46vwlfi1by3gc9i3izpq4xl1cr1v";
-          name = "hound";
+          name = "recipe";
         };
         packageRequires = [ cl-lib request ];
         meta = {
@@ -19479,20 +24307,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    ht = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ht = callPackage ({ dash
+                      , fetchFromGitHub
+                      , fetchurl
+                      , lib
+                      , melpaBuild }:
+      melpaBuild {
         pname = "ht";
         version = "2.2";
         src = fetchFromGitHub {
           owner = "Wilfred";
           repo = "ht.el";
-          rev = "a23a72342fda1eb3cc8d792f86efabe45eb0d1fd";
-          sha256 = "1p3qa7g0wa0wbviv2f8bda39cjys3naayk5xjm3nxxmqsyy8papx";
+          rev = "a741bac82797d25ec0542764df7443e9e7241033";
+          sha256 = "1m1v31bfaw2g3jymcxsl2bi1z37pj0sfhmldljk8m9zgjll56g6c";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6c7589bca1c1dfcc0fe76779f6847fda946ab981/recipes/ht";
           sha256 = "16vmxksannn2wyn8r44jbkdp19jvz1bg57ggbs1vn0yi7nkanwbd";
-          name = "ht";
+          name = "recipe";
         };
         packageRequires = [ dash ];
         meta = {
@@ -19500,8 +24332,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    html-to-markdown = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    html-to-markdown = callPackage ({ fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "html-to-markdown";
         version = "1.5.1";
         src = fetchFromGitHub {
@@ -19510,10 +24345,10 @@
           rev = "0fa0effd71acd8981a425ef11e0e63d53aea3199";
           sha256 = "0c648dl5zwjrqx9n6zr6nyzx2zcnv05d5i4hvhjpl9q3y011ncns";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/html-to-markdown";
           sha256 = "1gjh9ndqsb3nfb7w5h7carjckkgy6qh63b4mg141j19dsyx9rrjv";
-          name = "html-to-markdown";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -19521,8 +24356,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    htmlize = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    htmlize = callPackage ({ fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "htmlize";
         version = "1.53";
         src = fetchFromGitHub {
@@ -19531,10 +24369,10 @@
           rev = "1bc2f1b0feb852fa5a289a1d72646b16ac84adf1";
           sha256 = "0dr235c0z8is3pi5xdgqyqljg6px0b2aya6qb79zkyi477bmz4ip";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/075aa00a0757c6cd1ad392f0300bf5f1b937648d/recipes/htmlize";
           sha256 = "16nvvsi4nxi0zzk5a6mwmp43p0ls20zdx9r18mxz6bsaw6jangh2";
-          name = "htmlize";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -19542,20 +24380,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    httpcode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    httpcode = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "httpcode";
         version = "0.1";
         src = fetchFromGitHub {
           owner = "rspivak";
           repo = "httpcode.el";
-          rev = "2c8eb3b5455254ba70fb71f7178886bfc2d3af90";
-          sha256 = "1h9n388fi17nbyfciqywgrq3n165kpiildbimx59qyk2ac3v7rqk";
+          rev = "9f860730ffa0b11f48ad8db3eb57b3e844918c4e";
+          sha256 = "1wk9dkf2g95zsdfcvbazi9hls5k3yia86npsmyk486pj0ij9xmvj";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/906da23e26d44f8c71ba57ab59bb089caea673a9/recipes/httpcode";
           sha256 = "05k1al1j119x6zf03p7jn2r9qql33859583nbf85k41bhicknpgh";
-          name = "httpcode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -19563,8 +24404,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    httprepl = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    httprepl = callPackage ({ dash
+                            , emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild
+                            , s }:
+      melpaBuild {
         pname = "httprepl";
         version = "1.1";
         src = fetchFromGitHub {
@@ -19573,10 +24420,10 @@
           rev = "d2de8a676544deed1a5e084631a7799e487dbe55";
           sha256 = "0dd257988bdar9hl2711ch5qshx9jc11fqxcvbrd7rc1va5cshs9";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c49824f6e2dc2f3482e607c2d3a1e2d7685bf688/recipes/httprepl";
           sha256 = "0899qb1yfnsyf04hhvnk47qnq4d1f4vd5ghj43x4743wd2b9qawh";
-          name = "httprepl";
+          name = "recipe";
         };
         packageRequires = [ dash emacs s ];
         meta = {
@@ -19584,20 +24431,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    hugsql-ghosts = callPackage ({ cider, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    hugsql-ghosts = callPackage ({ cider
+                                 , dash
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild
+                                 , s }:
+      melpaBuild {
         pname = "hugsql-ghosts";
-        version = "0.1.1";
+        version = "0.1.3";
         src = fetchFromGitHub {
           owner = "rkaercher";
           repo = "hugsql-ghosts";
-          rev = "9d76acb41333c6377c7fe79e936008d10fe55420";
-          sha256 = "18wkqvmfr5v3mf3si0mwmwlc5gms82jzb5p3q3kpbmsayzg3xi8n";
+          rev = "f3ebc60c66204ad39058cb84eb4bd5facce091df";
+          sha256 = "0pcr39x8yxl5aa0sz20gw20ixz5imw5m19bzhzbzyn7slr65hlqn";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/969fd5e51bf93b5eff6919956c43c041a3b24d1e/recipes/hugsql-ghosts";
           sha256 = "1v1iypis5iyimdr9796qpqw0qmhzijap0nbr0mhhyp4001kakkwz";
-          name = "hugsql-ghosts";
+          name = "recipe";
         };
         packageRequires = [ cider dash s ];
         meta = {
@@ -19605,8 +24458,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    hungry-delete = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    hungry-delete = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "hungry-delete";
         version = "1.1.5";
         src = fetchFromGitHub {
@@ -19615,10 +24471,10 @@
           rev = "78a787a87aceb821818bbe2a322fbf2e5cbf80c3";
           sha256 = "171s7akqcpj0jcbm8w19b4n9kdzw0acf7cv0ymwdz5mmgmfiy292";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e33960d9b7e24f830ebe4e5a26a562422d52fe97/recipes/hungry-delete";
           sha256 = "0hcsm3yndkyfqzb77ibx7df6bjppc34x5yabi6nd389pdscp9rpz";
-          name = "hungry-delete";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -19626,20 +24482,27 @@
           license = lib.licenses.free;
         };
       }) {};
-    hy-mode = callPackage ({ dash, dash-functional, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    hy-mode = callPackage ({ dash
+                           , dash-functional
+                           , emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild
+                           , s }:
+      melpaBuild {
         pname = "hy-mode";
-        version = "1.0.2";
+        version = "1.0.3";
         src = fetchFromGitHub {
           owner = "hylang";
           repo = "hy-mode";
-          rev = "267a3b163136d207d8d9ecd0d2aa14dc30fd0690";
-          sha256 = "11n60zzhad68vff7fqzkvbj04i3xc3xp9yc2v26v8y6zpqizhib0";
+          rev = "27a9e6bee0df741f2699e00e64ea2c7a279b401d";
+          sha256 = "1jxximiznz7fw9ys5k6plw85zrbzvxidql7py1fdi425fdp4058z";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fc9ab5cf16b61bb27559cd8ec5cf665a5aab2154/recipes/hy-mode";
           sha256 = "1vxrqla3p82x7s3kn7x4h33vcdfms21srxgxzidr02k37f0vi82m";
-          name = "hy-mode";
+          name = "recipe";
         };
         packageRequires = [ dash dash-functional emacs s ];
         meta = {
@@ -19647,20 +24510,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    hyai = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    hyai = callPackage ({ cl-lib ? null
+                        , emacs
+                        , fetchFromGitHub
+                        , fetchurl
+                        , lib
+                        , melpaBuild }:
+      melpaBuild {
         pname = "hyai";
         version = "1.0.0";
         src = fetchFromGitHub {
           owner = "iquiw";
           repo = "hyai";
-          rev = "7c644d31f62943c75ccf5a772e43450b462cc08f";
-          sha256 = "1b8992vzq5bh01pjlj181nzqjrqs4fbjpwvv8h7gjq42sf8w59sm";
+          rev = "a6d936a68ddbdfa314662c7c3e2b40538334ddeb";
+          sha256 = "108i53sbjdwx2bz5cfbi0a06vy3a44vgwag43nkbpjk116bnjkc9";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1dd9bd1cfd2f3b760b664a4677b0e4e617cbdfa6/recipes/hyai";
           sha256 = "00ns7q5b11c5amwkq11fs4p5vrmdfmjljfrcxbwb39gc12yrhn7s";
-          name = "hyai";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -19668,8 +24536,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    hydandata-light-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    hydandata-light-theme = callPackage ({ fetchFromGitHub
+                                         , fetchurl
+                                         , lib
+                                         , melpaBuild }:
+      melpaBuild {
         pname = "hydandata-light-theme";
         version = "0.9.0";
         src = fetchFromGitHub {
@@ -19678,10 +24549,10 @@
           rev = "3b9bb5f213029a8331818b1d670194ef26d9505a";
           sha256 = "11vgz64f8vs8vqp4scj9qvrfdshag7bs615ly9zvzzlk68jivdya";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/413c617f15947782891159a240e0c9014f1f7d11/recipes/hydandata-light-theme";
           sha256 = "0jw43m91m10ifqg335y6d52r6ri77hcmxkird8wsyrpsnk3cfb60";
-          name = "hydandata-light-theme";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -19689,8 +24560,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    hyde = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    hyde = callPackage ({ fetchFromGitHub
+                        , fetchurl
+                        , lib
+                        , melpaBuild }:
+      melpaBuild {
         pname = "hyde";
         version = "0.2";
         src = fetchFromGitHub {
@@ -19699,10 +24573,10 @@
           rev = "181f9d2f91c2678a22243c5485162fa7999fd893";
           sha256 = "0nwsmc4c3v0wbfy917ik9k7yz8yclfac695p7p9sh9y354k3maw4";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/151f5c1097e5020dbc13e41f2657aae781c5942b/recipes/hyde";
           sha256 = "18kjcxm7qmv9bfh4crw37zgax8khjqs9zkp4lrb490zlad2asbs3";
-          name = "hyde";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -19710,8 +24584,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    hydra = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    hydra = callPackage ({ cl-lib ? null
+                         , fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "hydra";
         version = "0.14.0";
         src = fetchFromGitHub {
@@ -19720,10 +24598,10 @@
           rev = "943636fe4a35298d9d234222bc4520dec9ef2305";
           sha256 = "0ln4z2796ycy33g5jcxkqvm7638qxy4sipsab7d2864hh700cikg";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a4375d8ae519290fd5018626b075c226016f951d/recipes/hydra";
           sha256 = "1c59l43p39ins3dn9690gm6llwm4b9p0pk78lip0dwlx736drdbw";
-          name = "hydra";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -19731,8 +24609,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    ialign = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ialign = callPackage ({ emacs
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "ialign";
         version = "0.4.2";
         src = fetchFromGitHub {
@@ -19741,10 +24623,10 @@
           rev = "7ad88c8f7922adc616b8f060b65fa1add8952ea1";
           sha256 = "0bh03w91i622hbar5dcq631ndxx1y8kd3h655pgw1g0lqkv1mlnc";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/072f1f7ce17e2972863bce10af9c52b3c6502eab/recipes/ialign";
           sha256 = "070a0fa2vbdfvbnpbzv4z0c7311lf8sy2zw2ifn9k548n4l8k62j";
-          name = "ialign";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -19752,20 +24634,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    ibuffer-projectile = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }:
-    melpaBuild {
+    ibuffer-projectile = callPackage ({ fetchFromGitHub
+                                      , fetchurl
+                                      , lib
+                                      , melpaBuild
+                                      , projectile }:
+      melpaBuild {
         pname = "ibuffer-projectile";
         version = "0.2";
         src = fetchFromGitHub {
           owner = "purcell";
           repo = "ibuffer-projectile";
-          rev = "8b225dc779088ce65b81d8d86dc5d394baa53e2e";
-          sha256 = "1zcnp61c9cp2kvns3v499hifk072rxm4rhw4pvdv2mm966vcxzvc";
+          rev = "36b3fc2d42337174d4fa37c4d2a77e6153634965";
+          sha256 = "0kvf2mn6b1dkn72cs1bpamy2wc5j1n48j4x6kl3ihvh7bibqg115";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/363a6a888945f2c8b02f5715539439ba744d737d/recipes/ibuffer-projectile";
           sha256 = "1qh4krggmsc6lx5mg60n8aakmi3f6ppl1gw094vfcsni96jl34fk";
-          name = "ibuffer-projectile";
+          name = "recipe";
         };
         packageRequires = [ projectile ];
         meta = {
@@ -19773,20 +24659,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    ibuffer-tramp = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ibuffer-tramp = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "ibuffer-tramp";
         version = "1.0.0";
         src = fetchFromGitHub {
           owner = "svend";
           repo = "ibuffer-tramp";
-          rev = "bcad0bda3a67f55d1be936bf8fa9ef735fe1e3f3";
-          sha256 = "1ry7nbhqhjy6gkxd10s97nbm6flk5nm0l5q8071fprx8xxphqj8f";
+          rev = "41fab2ad174f53a4cf5ef7d2ebef518dede82ab4";
+          sha256 = "1mfrbr725p27p3s5nxh7xhm81pdr78ysz8l3kwrlp97bb6dmljmq";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a1a7449b15cb2a89cf06ea3de2cfdc6bc387db3b/recipes/ibuffer-tramp";
           sha256 = "11a9b9g1jk2r3fldi012zka4jzy68kfn4991xp046qm2fbc7la32";
-          name = "ibuffer-tramp";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -19794,8 +24683,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    ibuffer-vc = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ibuffer-vc = callPackage ({ cl-lib ? null
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "ibuffer-vc";
         version = "0.10";
         src = fetchFromGitHub {
@@ -19804,10 +24697,10 @@
           rev = "b2bac7aa69335933ebb2e6f34259fa96d2c8d46a";
           sha256 = "0bqdi5w120256g74k0j4jj81x804x1gcg4dxa74w3mb6fl5xlvs8";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/ibuffer-vc";
           sha256 = "0bn5qyiq07cgzci10xl57ss5wsk7bfhi3hjq2v6yvpy9v704dvla";
-          name = "ibuffer-vc";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -19815,8 +24708,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    identica-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    identica-mode = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "identica-mode";
         version = "1.3.1";
         src = fetchFromGitHub {
@@ -19825,10 +24721,10 @@
           rev = "cf9183ee11ac922e85c7c908f04e2d00b03111b3";
           sha256 = "047gzycr49cs8wlmm9j4ry7b7jxmfhmbayx6rbbxs49lba8dgwlk";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/812b7c1fbc435f0530b7f66a1e65f62f5f00da01/recipes/identica-mode";
           sha256 = "1r69ylykjap305g23cry4wajiqhpgw08nw3b5d9i1y3mwx0j253q";
-          name = "identica-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -19836,8 +24732,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    idle-highlight-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    idle-highlight-mode = callPackage ({ fetchFromGitHub
+                                       , fetchurl
+                                       , lib
+                                       , melpaBuild }:
+      melpaBuild {
         pname = "idle-highlight-mode";
         version = "1.1.3";
         src = fetchFromGitHub {
@@ -19846,10 +24745,10 @@
           rev = "c466f2a9e291f9da1167dc879577b2e1a7880482";
           sha256 = "0x4w1ksrw7dicl84zpf4d4scg672dyan9g95jkn6zvri0lr8xciv";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/idle-highlight-mode";
           sha256 = "1i5ky61bq0dpk71yasfpjhsrv29mmp9nly9f5xxin7gz3x0f36fc";
-          name = "idle-highlight-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -19857,20 +24756,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    ido-at-point = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ido-at-point = callPackage ({ emacs
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "ido-at-point";
         version = "1.0.0";
         src = fetchFromGitHub {
           owner = "katspaugh";
           repo = "ido-at-point";
-          rev = "e5907bbe8a3d148d07698b76bd994dc3076e16ee";
-          sha256 = "1bii7vj8pmmijcpvq3a1scky4ais7k6d7zympb3m9dmz355m9rpp";
+          rev = "6b267f202dc3d3d924c904fbd894e9a209f231de";
+          sha256 = "1bj8k5fq6x3s5qmr02bnkcls7sndmg4wjjjrsd3fr6yl8c4jcy3k";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6ffbfa66c4284a134265efc606fdc7652b0a7f75/recipes/ido-at-point";
           sha256 = "0jpgq2iiwgqifwdhwhqv0cd3lp846pdqar6rxqgw9fvvb8bijqm0";
-          name = "ido-at-point";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -19878,8 +24781,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    ido-complete-space-or-hyphen = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ido-complete-space-or-hyphen = callPackage ({ fetchFromGitHub
+                                                , fetchurl
+                                                , lib
+                                                , melpaBuild }:
+      melpaBuild {
         pname = "ido-complete-space-or-hyphen";
         version = "1.1";
         src = fetchFromGitHub {
@@ -19888,10 +24794,10 @@
           rev = "ad9baaec10e06be3f85db97b6c8fd970cf20df77";
           sha256 = "1ffmsmi31jc0gqnbdxrd8ipsy790bn6hgq3rmayylavmdpg3qfd5";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/59e11094068d3a0c0e4edc1f82158c43d3b15e0e/recipes/ido-complete-space-or-hyphen";
           sha256 = "1wk0cq5gjnprmpyvhh80ksz3fash42hckvmx8m95crbzjg9j0gbc";
-          name = "ido-complete-space-or-hyphen";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -19899,20 +24805,27 @@
           license = lib.licenses.free;
         };
       }) {};
-    ido-completing-read-plus = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, memoize, s }:
-    melpaBuild {
+    ido-completing-read-plus = callPackage ({ cl-lib ? null
+                                            , emacs
+                                            , fetchFromGitHub
+                                            , fetchurl
+                                            , lib
+                                            , melpaBuild
+                                            , memoize
+                                            , s }:
+      melpaBuild {
         pname = "ido-completing-read-plus";
-        version = "4.7";
+        version = "4.11";
         src = fetchFromGitHub {
           owner = "DarwinAwardWinner";
           repo = "ido-completing-read-plus";
-          rev = "51861afe385f59f3262ee40acbe772ccb3dd52e7";
-          sha256 = "0hspgk8m4acyhpcldwg3xqla9xp3fjrhf37cnjp45j1b3h94x3iy";
+          rev = "03bdf989a9af88d4eeed4003ae74c98baf58ff72";
+          sha256 = "08d77ysbzd25rm8rjslckhqlsyim047c9zwq2ybbzqpjy3q52qfy";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6104efc035bcf469d133ab9a2caf42c9d4482334/recipes/ido-completing-read+";
           sha256 = "0rxdv3cd0bg0p8c1bck5vichdq941dki934k23qf5p6cfgw8gw4z";
-          name = "ido-completing-read-plus";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs memoize s ];
         meta = {
@@ -19920,8 +24833,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    ido-describe-bindings = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ido-describe-bindings = callPackage ({ dash
+                                         , fetchFromGitHub
+                                         , fetchurl
+                                         , lib
+                                         , melpaBuild }:
+      melpaBuild {
         pname = "ido-describe-bindings";
         version = "0.0.11";
         src = fetchFromGitHub {
@@ -19930,10 +24847,10 @@
           rev = "a142ff1c33df23ed9665497d0dcae2943b3c706a";
           sha256 = "0967709jyp9s04i6gi90axgqzhz03cdf1j1w39yrkds6q1b6v7jw";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/31b8e255630f1348a5b5730f7b624ad550d219ad/recipes/ido-describe-bindings";
           sha256 = "1lsa09h025vd908r9q571iq2ia0zdpnq04mlihb3crpp5v9n9ws2";
-          name = "ido-describe-bindings";
+          name = "recipe";
         };
         packageRequires = [ dash ];
         meta = {
@@ -19941,8 +24858,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    ido-grid-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ido-grid-mode = callPackage ({ emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "ido-grid-mode";
         version = "1.1.5";
         src = fetchFromGitHub {
@@ -19951,10 +24872,10 @@
           rev = "8bbd66e365d4f6f352bbb17673be5869ab26d7ab";
           sha256 = "0f1p6cnl0arcc2y1h99nqcflp7byvyf6hj6fmv5xqggs66qc72lb";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ido-grid-mode";
           sha256 = "0sq1d2fwvv247rr9lqg9x87d5h910k5ifqr9cjyskc74mvhrcsr3";
-          name = "ido-grid-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -19962,8 +24883,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    ido-load-library = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, pcache, persistent-soft }:
-    melpaBuild {
+    ido-load-library = callPackage ({ fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild
+                                    , pcache
+                                    , persistent-soft }:
+      melpaBuild {
         pname = "ido-load-library";
         version = "0.2.0";
         src = fetchFromGitHub {
@@ -19972,10 +24898,10 @@
           rev = "8589cb1e4303066eb333f1cfc789835d1cbe21df";
           sha256 = "1z7az7h90v72llxvdclcywvf1qd0nhkfa45bp99xi7cy7sqsqssf";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/baa49e7d2d5c07ebf77e7941c240b88fcfd0fc8b/recipes/ido-load-library";
           sha256 = "13f83gqh39p3yjy7r7qc7kzgdcmqh4b5c07zl7rwzb8y9rz59lhj";
-          name = "ido-load-library";
+          name = "recipe";
         };
         packageRequires = [ pcache persistent-soft ];
         meta = {
@@ -19983,8 +24909,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    ido-occur = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ido-occur = callPackage ({ dash
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "ido-occur";
         version = "0.2.0";
         src = fetchFromGitHub {
@@ -19993,10 +24923,10 @@
           rev = "b0e67fe4835c162cbcf8a982bdf377955b9ac5ae";
           sha256 = "13f21vx3q1qbnl13n3lx1rnr8dhq3zwch22pvy53h8q6sdf7r73a";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8a576d8569bf82be01e7d50defcc99a90aab1436/recipes/ido-occur";
           sha256 = "058l2pklg12wkvyyshk8va6shphpbc508fv9a8x25pw857a28pji";
-          name = "ido-occur";
+          name = "recipe";
         };
         packageRequires = [ dash ];
         meta = {
@@ -20004,8 +24934,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    ido-vertical-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ido-vertical-mode = callPackage ({ fetchFromGitHub
+                                     , fetchurl
+                                     , lib
+                                     , melpaBuild }:
+      melpaBuild {
         pname = "ido-vertical-mode";
         version = "0.1.6";
         src = fetchFromGitHub {
@@ -20014,10 +24947,10 @@
           rev = "c3e0514405ba5c15b5527e7f8e2d42dff259788f";
           sha256 = "1lv82q639xjnmvby56nwqn23ijh6f163bk675s33dkingm8csj8k";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d4bbd212ea4606b9871cf583d06b5cee2f6ce0a9/recipes/ido-vertical-mode";
           sha256 = "1vg5s6nd6v2g8ychz1q9cdqvsdw6vag7d9w68sn7blpmlr0nqhfm";
-          name = "ido-vertical-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -20025,8 +24958,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    ido-yes-or-no = callPackage ({ fetchFromGitHub, fetchurl, ido-completing-read-plus, lib, melpaBuild }:
-    melpaBuild {
+    ido-yes-or-no = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , ido-completing-read-plus
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "ido-yes-or-no";
         version = "1.4";
         src = fetchFromGitHub {
@@ -20035,10 +24972,10 @@
           rev = "9ddee9e878ad62d58c9f4b3a7685f22b8e36e420";
           sha256 = "046ns1nqisz830f6xwlly1qgmi4v2ikw6vmj0f93jprv4vkjylpq";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e575f46b8597a34523df6b6a75da5a640f4c5a2e/recipes/ido-yes-or-no";
           sha256 = "0glag4yb9xyf1lxxbdhph2nq6s1vg44i6f2z1ii8bkxpambz2ana";
-          name = "ido-yes-or-no";
+          name = "recipe";
         };
         packageRequires = [ ido-completing-read-plus ];
         meta = {
@@ -20046,8 +24983,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    idomenu = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    idomenu = callPackage ({ fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "idomenu";
         version = "0.1";
         src = fetchFromGitHub {
@@ -20056,10 +24996,10 @@
           rev = "5daaf7e06e4704ae43c825488109d7eb8c049321";
           sha256 = "0bq0kx0889rdy8aasxbpmb0a4awpk2b24zv6x1dmhacmc5rj11i0";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f856045bc5ab2aee4dd4ad9806917e27e56ec64c/recipes/idomenu";
           sha256 = "0mg601ak9mhp2fg5n13npcfzphgyms4vkqd18ldmv098z2z1412h";
-          name = "idomenu";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -20067,20 +25007,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    idris-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, prop-menu }:
-    melpaBuild {
+    idris-mode = callPackage ({ cl-lib ? null
+                              , emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild
+                              , prop-menu }:
+      melpaBuild {
         pname = "idris-mode";
         version = "0.9.19";
         src = fetchFromGitHub {
           owner = "idris-hackers";
           repo = "idris-mode";
-          rev = "314a0baea5752069de08e814bb134a9643fb675d";
-          sha256 = "0iwgbaq2797k1f7ql86i2pjfa67cha4s2v0mgmrd0qcgqkxsdq92";
+          rev = "66a822a621e7bade71fdeb32e9fe520b322c8967";
+          sha256 = "1c3drq4f62p9arm92arp4dby1cw2fh5x3lmlb63rxbpsh5askw75";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/17a86efca3bdebef7c92ba6ece2de214d283c627/recipes/idris-mode";
           sha256 = "0hiiizz976hz3z3ciwg1gs9y10qhxbs8givhz89kvyn4s4861a1s";
-          name = "idris-mode";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs prop-menu ];
         meta = {
@@ -20088,8 +25034,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    iedit = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    iedit = callPackage ({ fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "iedit";
         version = "0.9.9.9";
         src = fetchFromGitHub {
@@ -20098,10 +25047,10 @@
           rev = "39919478f9472ce7a808ca601f4c19261ecc2f99";
           sha256 = "1pwkrm98vlpzsy5iwwfksdaz3zzyi7bvdf5fglhsn4ssf47p787g";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/iedit";
           sha256 = "0bh8ir6kspxjsvjww5y3b5hl3flbm2cc77jh8vnnva3z086f18mh";
-          name = "iedit";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -20109,8 +25058,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    iflipb = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    iflipb = callPackage ({ fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "iflipb";
         version = "1.4";
         src = fetchFromGitHub {
@@ -20119,10 +25071,10 @@
           rev = "a5ad1fbd1173cff5228dab265515c92c0778f86a";
           sha256 = "0gyxd5d57j0x93mqnfwwdf28plp102xh0ag2d2iws7y1d5m99wm2";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fad6fc8bc3c0be0d5789a0d7626ebc3f298b4318/recipes/iflipb";
           sha256 = "1nfrrxgi9nlhn477z8ay7jxycpcghhhmmg9dagdhrlrr20fx697d";
-          name = "iflipb";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -20130,8 +25082,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    ignoramus = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ignoramus = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "ignoramus";
         version = "0.7.4";
         src = fetchFromGitHub {
@@ -20140,10 +25095,10 @@
           rev = "00385fcd0d42de3a470f61c1fdbe7e19fbef9c5b";
           sha256 = "1ca2n6vv2z7c3550w0jzwmp6xp0rmrrbljr1ik2ijign62r35a3q";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ac5439afe2f9a902e615f0cf919ef7138559c0f0/recipes/ignoramus";
           sha256 = "1czqdmlrds1l5afi8ldg7nrxcwav86538z2w1npad3dz8xk67da9";
-          name = "ignoramus";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -20151,8 +25106,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    image-archive = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    image-archive = callPackage ({ cl-lib ? null
+                                 , emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "image-archive";
         version = "0.0.7";
         src = fetchFromGitHub {
@@ -20161,10 +25121,10 @@
           rev = "699e967fa7b1dfcce2bf2ec878e74f4238bb6e45";
           sha256 = "0imvxzcja91cd19zm2frqfpxm8j0bc89w9s7q0pkpvyjz44kjbq8";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/17464f31b07f64da0e9db187cd6f5facee3ad7ce/recipes/image-archive";
           sha256 = "0x0lv5dr1gc9bnr3dn26bc9s1ccq2rp8c4a1licbi929f0jyxxfp";
-          name = "image-archive";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -20172,8 +25132,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    image-dired-plus = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    image-dired-plus = callPackage ({ cl-lib ? null
+                                    , fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "image-dired-plus";
         version = "0.7.2";
         src = fetchFromGitHub {
@@ -20182,10 +25146,10 @@
           rev = "b68094625d963056ad64e0e44af0e2266b2eadc7";
           sha256 = "1n2ya9s0ld257a8iryjd0dz0z2zs1xhzfiwsdkq4l4azwxl54m29";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/98f83f450804f1dc496a7bda17818cdae3f52151/recipes/image-dired+";
           sha256 = "0hhwqfn490n7p12n7ij4xbjh15gfvicmn21fvwbnrmfqc343pcdy";
-          name = "image-dired-plus";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -20193,8 +25157,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    image-plus = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    image-plus = callPackage ({ cl-lib ? null
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "image-plus";
         version = "0.6.2";
         src = fetchFromGitHub {
@@ -20203,10 +25171,10 @@
           rev = "967508a6c151e6ab6e97d3ac332dc5599011830d";
           sha256 = "0k69xbih0273xvmj035vcmm67l6hgjb99pb1jbva5x0pnszb1vdv";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/02d7400477a993b7a3cae327501dbf8db97dfa28/recipes/image+";
           sha256 = "1a9dxswnqn6cvx28180kclpjc0vc6fimzp7n91gpdwnmy123x6hg";
-          name = "image-plus";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -20214,8 +25182,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    imake = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    imake = callPackage ({ emacs
+                         , fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "imake";
         version = "1.0.1";
         src = fetchFromGitHub {
@@ -20224,10 +25196,10 @@
           rev = "7df5fb9684a0288313ef5f64594078d477105959";
           sha256 = "0xc19ir5ak1bfq0ag48ql5rj58zd565csgxhpa30s9lvvkc8kvr5";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/28de8f7f5302b27c7c6600ad65a998119518be43/recipes/imake";
           sha256 = "0j732fi6999n9990w4l28raw140fvqfbynyh4x65yilhw95r7c34";
-          name = "imake";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -20235,20 +25207,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    imapfilter = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    imapfilter = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "imapfilter";
         version = "1.0.3";
         src = fetchFromGitHub {
           owner = "tarsius";
           repo = "imapfilter";
-          rev = "79bbbe918319bc1e8f42a0bef53dc7c77fe868ea";
-          sha256 = "0lqhwh8kav7f526a40rjdy2hzarzph1i3ig2dmbf02gp32sl7rg9";
+          rev = "5e842a8c60ba98f344edf1b1e65f5a480ed938ed";
+          sha256 = "16k7cxzdjbblzckp5qppw1ga0rzdh3ww2ni7ry1h43p9cfna0kcx";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2415894afa3404fbd73c84c58f8b8267187d6d86/recipes/imapfilter";
           sha256 = "0i893kqj6yzadhza800r6ri7fihl01r57z8yrzzh3d09qaias5vz";
-          name = "imapfilter";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -20256,8 +25231,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    imenu-anywhere = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    imenu-anywhere = callPackage ({ cl-lib ? null
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "imenu-anywhere";
         version = "1.1.4";
         src = fetchFromGitHub {
@@ -20266,10 +25245,10 @@
           rev = "fc7f0fd2f19e5ebee70156a99bf87393123893e3";
           sha256 = "0g2gb7jrys81kphmhlvhvzwl8l75j36y6pqjawh9wmzzwad876q5";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/imenu-anywhere";
           sha256 = "1ylqzdnd3nzcpyyd6rh6i5q9mvf8c99rvpk51fzfm3yq2kyw4dbq";
-          name = "imenu-anywhere";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -20277,8 +25256,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    imenu-list = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    imenu-list = callPackage ({ cl-lib ? null
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "imenu-list";
         version = "0.8";
         src = fetchFromGitHub {
@@ -20287,10 +25270,10 @@
           rev = "27170d27c9594989587c03c23f753a809f6a0e10";
           sha256 = "13xh9bdl3k6ccfq83wjmkpi4269qahv4davki4wq18dr4amrzhlx";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/86dea881a5b2d0458449f08b82c2614ad9abd068/recipes/imenu-list";
           sha256 = "092fsn7hnbfabcyakbqyk20pk62sr8xrs45aimkv1l91681np98s";
-          name = "imenu-list";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -20298,8 +25281,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    imenus = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    imenus = callPackage ({ cl-lib ? null
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "imenus";
         version = "0.2";
         src = fetchFromGitHub {
@@ -20308,10 +25295,10 @@
           rev = "ee1bbd2228dbb86df2865dc9004d375421b171ba";
           sha256 = "1y57xp0w0c6hg3gn4f1l3612a18li4gwhfa4dy18fy94gr54ycpx";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cc571105a8d7e2ea85391812f1fa639787fa7563/recipes/imenus";
           sha256 = "1q0j6r2n5vjlbgchkz9zdglmmbpd8agawzcg61knqrgzpc4lk82r";
-          name = "imenus";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -20319,8 +25306,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    immutant-server = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    immutant-server = callPackage ({ fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "immutant-server";
         version = "1.2.0";
         src = fetchFromGitHub {
@@ -20329,10 +25319,10 @@
           rev = "6f3d303354a229780a33e6bae64460a95bfefe60";
           sha256 = "1pf7pqh8yzyvh4gzvp5npfq8kcfjcbzra0kkw7zmz769xxc8v84x";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d6e906492f9982e2cebd1e4838d7b7c81a295efa/recipes/immutant-server";
           sha256 = "15vcxag1ni41ja4b3q0444sq5ysrisis59la7li6h3617wy8r02i";
-          name = "immutant-server";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -20340,20 +25330,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    impatient-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, htmlize, lib, melpaBuild, simple-httpd }:
-    melpaBuild {
+    impatient-mode = callPackage ({ cl-lib ? null
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , htmlize
+                                  , lib
+                                  , melpaBuild
+                                  , simple-httpd }:
+      melpaBuild {
         pname = "impatient-mode";
-        version = "1.0.0";
+        version = "1.1";
         src = fetchFromGitHub {
           owner = "skeeto";
           repo = "impatient-mode";
-          rev = "eba1efce3dd20b5f5017ab64bae0cfb3b181c2b0";
-          sha256 = "0vr4i3ayp1n8zg3v9rfv81qnr0vrdbkzphwd5kyadjgy4sbfjykj";
+          rev = "96c068d5add95595dc5be42115d100cf99f908ba";
+          sha256 = "18fawpnqcm1yv7f83sz05pjihwydmafmccfmizyg0hlgayhj0izf";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/aaa64c4d43139075d77f4518de94bcbe475d21fc/recipes/impatient-mode";
           sha256 = "07z5ds3zgzkxvxwaalp9i5x2rl5sq4jjk8ygk1rfmsl52l5y1z6j";
-          name = "impatient-mode";
+          name = "recipe";
         };
         packageRequires = [ cl-lib htmlize simple-httpd ];
         meta = {
@@ -20361,8 +25357,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    import-js = callPackage ({ emacs, fetchFromGitHub, fetchurl, grizzl, lib, melpaBuild }:
-    melpaBuild {
+    import-js = callPackage ({ emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , grizzl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "import-js";
         version = "2.0.0";
         src = fetchFromGitHub {
@@ -20371,10 +25372,10 @@
           rev = "0a1032894445062b87dbe4e2c8cdba35ac25c250";
           sha256 = "0vx2k4k8ig1k74ifxaxvhbkmfmba683qza7f9pp08daa43mgr1r3";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6f26b8281f9bd05e3c8f2ef21838275711e622c9/recipes/import-js";
           sha256 = "00b2qv1y8879cf8ayplmwqd36w7sppx57myi2wjhy9i2rnvdbmgn";
-          name = "import-js";
+          name = "recipe";
         };
         packageRequires = [ emacs grizzl ];
         meta = {
@@ -20382,8 +25383,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    import-popwin = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, popwin }:
-    melpaBuild {
+    import-popwin = callPackage ({ emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild
+                                 , popwin }:
+      melpaBuild {
         pname = "import-popwin";
         version = "0.10";
         src = fetchFromGitHub {
@@ -20392,10 +25398,10 @@
           rev = "6a21efc7fd44f8c2484d22eadf298e4bfd4bc003";
           sha256 = "1h4c3cib87hvgp37c30lx7cpyxvgdsb9hp7z0nfrkbbif0acrj2i";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a6f0629515f36e2e98839a6894ca8c0f58862dc2/recipes/import-popwin";
           sha256 = "0vkw6y09m68bvvn1wzah4gzm69z099xnqhn359xfns2ljm74bvgy";
-          name = "import-popwin";
+          name = "recipe";
         };
         packageRequires = [ emacs popwin ];
         meta = {
@@ -20403,20 +25409,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    importmagic = callPackage ({ emacs, epc, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    importmagic = callPackage ({ emacs
+                               , epc
+                               , f
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "importmagic";
         version = "1.1";
         src = fetchFromGitHub {
           owner = "anachronic";
           repo = "importmagic.el";
-          rev = "c0360a8146ca65565a7fa66c6d72986edd916dd5";
-          sha256 = "0s6hp62kmhvmgj3m5jr3cfqc8yv3p8jfxk0piq8xbf2chr1hp6l5";
+          rev = "ab9e5c260a2044578597a467eff59e5598a7ef1c";
+          sha256 = "1ifv6zfrknivjsgk0p8wh0n2bqqs1zfy8551216dfvigqs20wvq4";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/importmagic";
           sha256 = "1kpmgpll0zz3zlr3q863v1fq6wmwdwx7mn676x0r7g4iy1bdslmv";
-          name = "importmagic";
+          name = "recipe";
         };
         packageRequires = [ emacs epc f ];
         meta = {
@@ -20424,8 +25436,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    indent-guide = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    indent-guide = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "indent-guide";
         version = "20160630";
         src = fetchFromGitHub {
@@ -20434,10 +25449,10 @@
           rev = "feb207cb5610f351c7cdcf266e0c99117b2f786c";
           sha256 = "0ykddzily3b6c6k7fvq274pqdjf3934n8p3nrmnsw6c93i1ndd4f";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5d7110054801e3af5e5ef710a29f73116a2bc746/recipes/indent-guide";
           sha256 = "029fj9rr9vfmkysi6lzpwra92j6ppw675qpj3sinfq7fqqlicvp7";
-          name = "indent-guide";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -20445,8 +25460,16 @@
           license = lib.licenses.free;
         };
       }) {};
-    indium = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, seq, websocket }:
-    melpaBuild {
+    indium = callPackage ({ company
+                          , emacs
+                          , fetchFromGitHub
+                          , fetchurl
+                          , js2-mode
+                          , lib
+                          , melpaBuild
+                          , seq
+                          , websocket }:
+      melpaBuild {
         pname = "indium";
         version = "1.2.0";
         src = fetchFromGitHub {
@@ -20455,10 +25478,10 @@
           rev = "5ece767ea30a350dcdb1a4defaca174e85efedc5";
           sha256 = "1djkzjxv7idqg5pmbqf60lmvibp3ccvgdkdwb48wzn2yvnqr2vw6";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4292058cc6e31cabc0de575134427bce7fcef541/recipes/indium";
           sha256 = "024ljx7v8xahmr8jm41fiy8i5jbg48ybqp5n67k4jwg819cz8wvl";
-          name = "indium";
+          name = "recipe";
         };
         packageRequires = [ company emacs js2-mode seq websocket ];
         meta = {
@@ -20466,8 +25489,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    inf-clojure = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    inf-clojure = callPackage ({ clojure-mode
+                               , emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "inf-clojure";
         version = "2.1.0";
         src = fetchFromGitHub {
@@ -20476,10 +25504,10 @@
           rev = "247ca70f8ba5104be292aea20fbde6adb37e359f";
           sha256 = "11hyva006bc4hbhzjwb4brilm6fb7qfm5h66nl0gmmyva40y6412";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5d6112e06d1efcb7cb5652b0bec8d282d7f67bd9/recipes/inf-clojure";
           sha256 = "0n8w0vx1dnbfz88j45a57z9bsmkxr2zyh6ld72ady8asanf17zhl";
-          name = "inf-clojure";
+          name = "recipe";
         };
         packageRequires = [ clojure-mode emacs ];
         meta = {
@@ -20487,8 +25515,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    inf-crystal = callPackage ({ crystal-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    inf-crystal = callPackage ({ crystal-mode
+                               , emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "inf-crystal";
         version = "0.1.0";
         src = fetchFromGitHub {
@@ -20497,10 +25530,10 @@
           rev = "71a330f2d29e2fb4f51d223cf6230b88620a80af";
           sha256 = "0vija33n2j4j5inzm29qk1bjzaxjm97zn263j15258pqxwkbddv3";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ff84c742eebb84577f362b2739f4bcf1434d58ac/recipes/inf-crystal";
           sha256 = "09ssq7i5c2fxxbrsp3nn1f1ah1yv2nb19n5s1iqyykkk316k2q26";
-          name = "inf-crystal";
+          name = "recipe";
         };
         packageRequires = [ crystal-mode emacs ];
         meta = {
@@ -20508,8 +25541,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    inf-ruby = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    inf-ruby = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "inf-ruby";
         version = "2.5.1";
         src = fetchFromGitHub {
@@ -20518,10 +25554,10 @@
           rev = "81adadf0f98122b655d0c2bee9c8074d2b6a3ee2";
           sha256 = "1r452h6cyypqlc59q8dx5smkwhck4qjcg1pf9qdw539cpva5q77z";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/inf-ruby";
           sha256 = "02f01vwzr6j9iqcdns4l579bhia99sw8hwdqfwqjs9gk3xampfpp";
-          name = "inf-ruby";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -20529,8 +25565,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    inflections = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    inflections = callPackage ({ cl-lib ? null
+                               , emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "inflections";
         version = "2.5";
         src = fetchFromGitHub {
@@ -20539,10 +25580,10 @@
           rev = "40a7ffdf734ffe7d1968909663146255d7ba69c8";
           sha256 = "1ig1wdjg914p9ng1nir2fid4mb3xz2dbpmkdnfy1klq2zp0xw2s3";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/392c7616d27bf12b29ef3c2ea71e42ffaea81cc6/recipes/inflections";
           sha256 = "0f02bhm2a5xiaxnf2c2hlpa4p121xfyyj3c59fy0yldipdxhvw70";
-          name = "inflections";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -20550,8 +25591,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    info-buffer = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    info-buffer = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "info-buffer";
         version = "0.2";
         src = fetchFromGitHub {
@@ -20560,10 +25604,10 @@
           rev = "d35dad6e766c6e2ddb8dc6acb4ce5b6e10fbcaa7";
           sha256 = "0czkp7cf7qmdm1jdn67gxyxz8b4qj2kby8if50d450xqwbx0da7x";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3c44a1d69725b687444329d8af43c9799112b407/recipes/info-buffer";
           sha256 = "1vkgkwgwym0j5xip7mai11anlpa2h7vd5m9i1xga1b23hcs9r1w4";
-          name = "info-buffer";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -20571,8 +25615,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    info-colors = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    info-colors = callPackage ({ emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "info-colors";
         version = "0.2";
         src = fetchFromGitHub {
@@ -20581,10 +25629,10 @@
           rev = "13dd9b6a7288e6bb692b210bcb9cd72016658dae";
           sha256 = "1h2q19574sc1lrxm9k78668pwcg3z17bnbgykmah01zlmbs264sx";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d671ae8dc27439eea427e1848fc11c96ec5aee64/recipes/info-colors";
           sha256 = "1mbabrfdy9xn7lpqivqm8prp83qmdv5r0acijwvxqd3a52aadc2x";
-          name = "info-colors";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -20592,8 +25640,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    inherit-local = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    inherit-local = callPackage ({ emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "inherit-local";
         version = "1.1.1";
         src = fetchFromGitHub {
@@ -20602,10 +25654,10 @@
           rev = "b1f4ff9c41f9d64e4adaf5adcc280b82f084cdc7";
           sha256 = "1fargashyqn4ga420k3ikc1akf7mw3zcarpg24gh2591p4swa0ih";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/08b978724ff26b3ea7a134d307d888c80e2a92a9/recipes/inherit-local";
           sha256 = "1v3q3s6qq64k1f4ck6rfgsy1arnf9cxg2kw6d1ahfrwr4ixsqm87";
-          name = "inherit-local";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -20613,8 +25665,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    init-loader = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    init-loader = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "init-loader";
         version = "0.2";
         src = fetchFromGitHub {
@@ -20623,10 +25678,10 @@
           rev = "128ee76adbf431f0b8c30a3a29cb20c9c5100cde";
           sha256 = "031vb7ndz68x0119v4pyizz0ykd341ywcp5s7i4z35zx1vcqj8az";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e46e6ec79ff4c76fc85e13321e6dabd5797c5f45/recipes/init-loader";
           sha256 = "0rq7759abp0ml0l8dycvdl0j5wsxw9z5y9pyx68973a4ssbx2i0r";
-          name = "init-loader";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -20634,8 +25689,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    init-open-recentf = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    init-open-recentf = callPackage ({ emacs
+                                     , fetchFromGitHub
+                                     , fetchurl
+                                     , lib
+                                     , melpaBuild }:
+      melpaBuild {
         pname = "init-open-recentf";
         version = "0.0.3";
         src = fetchFromGitHub {
@@ -20644,10 +25703,10 @@
           rev = "a4f5338a14302d44fa5aebb1ddc7aff3dc9abbe3";
           sha256 = "0iph5cpz2dva1rnvp5xynmkndny87z308pziadk1qgf05mc0i61d";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4db8b6eced50726c788d7343137f6b4558575abf/recipes/init-open-recentf";
           sha256 = "0xlmfxhxb2car8vfx7krxmxb3d56x0r3zzkj8ds7yqvr65z85x2r";
-          name = "init-open-recentf";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -20655,8 +25714,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    initsplit = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    initsplit = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "initsplit";
         version = "1.6";
         src = fetchFromGitHub {
@@ -20665,10 +25727,10 @@
           rev = "950bdc568e3fd08e6106170953caf98ac582a431";
           sha256 = "1rfw38a63bvzglqx7mb8wlnzjvlmkhkn35hn66snqqgvnmnvi54g";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5a908c8fad08cd4d7dbb586570d0f0b384bf9071/recipes/initsplit";
           sha256 = "0n9dk3x62vgxfn39jkmdg8wxsik0xqkprifgvqzyvn8xcx1blyyq";
-          name = "initsplit";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -20676,8 +25738,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    inline-crypt = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    inline-crypt = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "inline-crypt";
         version = "0.1.4";
         src = fetchFromGitHub {
@@ -20686,10 +25751,10 @@
           rev = "497ce9dc29a8ccac0b6dd6854f5d120514350282";
           sha256 = "0jipds844432a8m4d5gxbbkk2h1rsq9fg748g6bxy2q066kyzfz6";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b04fffe5e52f26e92930a112a64531228f94e340/recipes/inline-crypt";
           sha256 = "04mcyyqa9h6g6wrzphzqalpqxsndmzxpavlpdc24z4a2c5s3yz8n";
-          name = "inline-crypt";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -20697,8 +25762,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    inlineR = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    inlineR = callPackage ({ fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "inlineR";
         version = "1.0";
         src = fetchFromGitHub {
@@ -20707,10 +25775,10 @@
           rev = "29357186beca825e3d0451b700ec09b9ed65e37b";
           sha256 = "15nasjknmzy57ilj1gaz3w5sj8b3ijcpgwcd6w2r9xhgcl86m40q";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3a7228e5f23a4e66f4510b2f6fc41c36aa791991/recipes/inlineR";
           sha256 = "1fflq2gkpfn3jkv4a6yywzmxsq6qszfid1ri85ass1ppw6scdvzw";
-          name = "inlineR";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -20718,8 +25786,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    insert-shebang = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    insert-shebang = callPackage ({ fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "insert-shebang";
         version = "0.9.6";
         src = fetchFromGitHub {
@@ -20728,10 +25799,10 @@
           rev = "adfa473f07443b231914d277c20a3419b30399b6";
           sha256 = "10zy3vg5fr30hhv0q3jldffhjacg1yrv5d9gfkdz55ry277l3xz1";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c257f4f5011cd7d0b2a5ef3adf13f9871bf0be92/recipes/insert-shebang";
           sha256 = "0z88l1q925v9lwzr6nas9qjy0f57qxilg6smgpx9wj6lll3f7p5v";
-          name = "insert-shebang";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -20739,8 +25810,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    instapaper = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    instapaper = callPackage ({ fetchhg
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "instapaper";
         version = "0.9.5";
         src = fetchhg {
@@ -20759,8 +25833,35 @@
           license = lib.licenses.free;
         };
       }) {};
-    intellij-theme = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    intel-hex-mode = callPackage ({ fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
+        pname = "intel-hex-mode";
+        version = "0.1.3";
+        src = fetchFromGitHub {
+          owner = "mschuldt";
+          repo = "intel-hex-mode";
+          rev = "e83c94e1c31a8435a88b3ae395f2bc842ef83217";
+          sha256 = "0jpc6wh3agdh38wdjr1x880iiaj6698nr8dkgx114fsfj1la6f7v";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/f1bf82134671b1383f5f4d4a3c180081bea66814/recipes/intel-hex-mode";
+          sha256 = "02ffbrkr3zajqhrxc3grmqm632ji4fmgnfabn42islpcfq12q3i4";
+          name = "recipe";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/intel-hex-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    intellij-theme = callPackage ({ fetchFromGitLab
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "intellij-theme";
         version = "1.3";
         src = fetchFromGitLab {
@@ -20769,10 +25870,10 @@
           rev = "1bbfff8e6742d18e9b77ed796f44da3b7bd10606";
           sha256 = "0ml1gi2cn6h3xm5c78vxwv327r0rgimia1vqqi9jb09yb6lckbgj";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cfe86071b2e84929476a771da99341f4a73cfd06/recipes/intellij-theme";
           sha256 = "1g8cninmq840sl8fmhq2hcsmz7nccbjmprzcl8w1zdavfp86b97g";
-          name = "intellij-theme";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -20780,8 +25881,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    interleave = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    interleave = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "interleave";
         version = "1.1.0";
         src = fetchFromGitHub {
@@ -20790,10 +25894,10 @@
           rev = "6b28363eac939227c6cdc8a73a1d3ea5b002442d";
           sha256 = "1qs6j9cz152wfy54c5d1a558l0df6wxv3djlvfl2mx58wf0sk73h";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6c43d4aaaf4fca17f2bc0ee90a21c51071886ae2/recipes/interleave";
           sha256 = "18b3fpxn07y5abkcnaw9is9ihdhik7xjdj6kzl1pz958lk9f4hfy";
-          name = "interleave";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -20801,20 +25905,27 @@
           license = lib.licenses.free;
         };
       }) {};
-    intero = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lib, melpaBuild }:
-    melpaBuild {
+    intero = callPackage ({ company
+                          , emacs
+                          , fetchFromGitHub
+                          , fetchurl
+                          , flycheck
+                          , haskell-mode
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "intero";
-        version = "0.1.29";
+        version = "0.1.31";
         src = fetchFromGitHub {
           owner = "commercialhaskell";
           repo = "intero";
-          rev = "73997cf10277e9781682768113ebd87eeb6d2882";
-          sha256 = "1mf2ddpgnyjiq2km1qc4l926xp8mj9vrszlizh39hn3acxqlac7s";
+          rev = "14a31536061fa6ad643456f79abe39636c48ffd9";
+          sha256 = "0gabipr8bvxhigidkivczqyv67nl6ylf0gipb0f4lxs8mcnwzcvn";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/intero";
           sha256 = "15n7ipsq8ylmq4blsycpszkx034j9sb92vqvaz30j5v307fmvs99";
-          name = "intero";
+          name = "recipe";
         };
         packageRequires = [ company emacs flycheck haskell-mode ];
         meta = {
@@ -20822,8 +25933,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    inverse-acme-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    inverse-acme-theme = callPackage ({ fetchFromGitHub
+                                      , fetchurl
+                                      , lib
+                                      , melpaBuild }:
+      melpaBuild {
         pname = "inverse-acme-theme";
         version = "1.12.0";
         src = fetchFromGitHub {
@@ -20843,8 +25957,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    iplayer = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    iplayer = callPackage ({ fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "iplayer";
         version = "0.1";
         src = fetchFromGitHub {
@@ -20853,10 +25970,10 @@
           rev = "48b664e36e1a8e37eeb3eee80b91ff7126ed449a";
           sha256 = "043dnij48zdyg081sa7y64lm35z7zvrv8gcymv3l3a98r1yhy3v6";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6e9a97667365f1c30f53a6aeeb7b909a78888eb1/recipes/iplayer";
           sha256 = "0wnxvdlnvlmspqsaqx0ldw8j03qjckkqzvx3cbpc2yfs55pm3p7r";
-          name = "iplayer";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -20864,8 +25981,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    ipython-shell-send = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ipython-shell-send = callPackage ({ emacs
+                                      , fetchFromGitHub
+                                      , fetchurl
+                                      , lib
+                                      , melpaBuild }:
+      melpaBuild {
         pname = "ipython-shell-send";
         version = "1.0.2";
         src = fetchFromGitHub {
@@ -20874,10 +25995,10 @@
           rev = "36523a387c15ee1652a5b0e291d4d4838da5e912";
           sha256 = "1iba7jpagc0n436pbylpcbwbdxk6bw7y0i7pjgxxwfm8akaj9i68";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9d3513d38f94de4d86124b5d5a33be8d5f0bfa43/recipes/ipython-shell-send";
           sha256 = "07im2f3890yxpcy4qz1bihi68aslam7qir4vqf05bhqlgaqzamv8";
-          name = "ipython-shell-send";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -20885,8 +26006,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    ir-black-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ir-black-theme = callPackage ({ fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "ir-black-theme";
         version = "1.0.1";
         src = fetchFromGitHub {
@@ -20895,10 +26019,10 @@
           rev = "b1ca1d0778e3e6228ff756e7fdaf5f5982000fa2";
           sha256 = "036q933yw7pimnnq43ydaqqfccgf4iwvjhjmsavp7l6y1w16rvmy";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5e725582bc322d03c9dca2b22e8606444fd8753c/recipes/ir-black-theme";
           sha256 = "1qpq9zbv63ywzk5mlr8x53g3rn37k0mdv6x1l1hcd90gka7vga9v";
-          name = "ir-black-theme";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -20906,8 +26030,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    irony = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }:
-    melpaBuild {
+    irony = callPackage ({ cl-lib ? null
+                         , fetchFromGitHub
+                         , fetchurl
+                         , json ? null
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "irony";
         version = "1.2.0";
         src = fetchFromGitHub {
@@ -20916,10 +26045,10 @@
           rev = "78b06aa2df5251adaabb6c749febc1f1bd2ad605";
           sha256 = "0nhjrnlmss535jbshjjd30vydbr8py21vkx4p294w6d8vg2rssf8";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d2b6a8d57b192325dcd30fddc9ff8dd1516ad680/recipes/irony";
           sha256 = "1xcxrdrs7imi31nxpszgpaywq4ivni75hrdl4zzrf103xslqpl8a";
-          name = "irony";
+          name = "recipe";
         };
         packageRequires = [ cl-lib json ];
         meta = {
@@ -20927,8 +26056,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    isgd = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    isgd = callPackage ({ fetchFromGitHub
+                        , fetchurl
+                        , lib
+                        , melpaBuild }:
+      melpaBuild {
         pname = "isgd";
         version = "1.1";
         src = fetchFromGitHub {
@@ -20937,10 +26069,10 @@
           rev = "764306dadd5a9213799081a48aba22f7c75cca9a";
           sha256 = "09hx28lmldm7z3x22a0qx34id09fdp3z61pdr61flgny213q1ach";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d5ff75b269fd57c5822277b9ed850c69b626f1a5/recipes/isgd";
           sha256 = "0yc9mkjzj3w64f48flnjvd193mk9gndrrqbxz3cvmvq3vgahhzyi";
-          name = "isgd";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -20948,20 +26080,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    iter2 = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    iter2 = callPackage ({ emacs
+                         , fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "iter2";
-        version = "0.9.6";
+        version = "0.9.7";
         src = fetchFromGitHub {
           owner = "doublep";
           repo = "iter2";
-          rev = "b0e8ecebe2d6807403a5eb1c75d68a4706259d4e";
-          sha256 = "038z7scy572n6cx0z59kiz59v7zqvn70wg2bwka5f3pglr67wzhp";
+          rev = "f8fb8dc7230cdcd37c5d0e4e5a432125c13816d2";
+          sha256 = "13q8p9cjz9c9j2l4vlwy6nvwh9y3b0aclg1b32zfdqhs6kmypisd";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d94316660051ee0ba0c12e380e6203986440368f/recipes/iter2";
           sha256 = "0kl3z2wwpvk2ddsb3798g41pv0xycsf9dclhv00snpzsr61d9v65";
-          name = "iter2";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -20969,8 +26105,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    ivy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ivy = callPackage ({ emacs
+                       , fetchFromGitHub
+                       , fetchurl
+                       , lib
+                       , melpaBuild }:
+      melpaBuild {
         pname = "ivy";
         version = "0.10.0";
         src = fetchFromGitHub {
@@ -20979,10 +26119,10 @@
           rev = "4a2cee03519f98cf95b29905dec2566a39ff717e";
           sha256 = "14vnigqb5c3yi4q9ysw1fiwdqyqwyklqpb9wnjf81chm7s2mshnr";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy";
           sha256 = "0xf5p91r2ljl93wbr5wbgnb4hzhs00wkaf4fmdlf31la8xwwp5ci";
-          name = "ivy";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -20990,20 +26130,30 @@
           license = lib.licenses.free;
         };
       }) {};
-    ivy-bibtex = callPackage ({ biblio, cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib, s, swiper }:
-    melpaBuild {
+    ivy-bibtex = callPackage ({ biblio
+                              , cl-lib ? null
+                              , dash
+                              , f
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild
+                              , parsebib
+                              , s
+                              , swiper }:
+      melpaBuild {
         pname = "ivy-bibtex";
         version = "2.0.0";
         src = fetchFromGitHub {
           owner = "tmalsburg";
           repo = "helm-bibtex";
-          rev = "d6a98ac6f28d2a6a05e203115211c98333d40aca";
-          sha256 = "0arhy051945lxjqg77b275ny9nsv60cqj0qfpmvd8xkc07lqfn23";
+          rev = "8be32be58e96e3d57b0cc667d05f98c63aa2a32e";
+          sha256 = "1rsn0gxqibw2b31k3hx1fix46f3qmwp013njkpn31fzg3gckbwra";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c23c09225c57a9b9abe0a0a770a9184ae2e58f7c/recipes/ivy-bibtex";
           sha256 = "0qni48s09lgzqr98r49dhrzpfqp9yfwga11h7vhqclscjvlalpc2";
-          name = "ivy-bibtex";
+          name = "recipe";
         };
         packageRequires = [ biblio cl-lib dash f parsebib s swiper ];
         meta = {
@@ -21011,8 +26161,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    ivy-dired-history = callPackage ({ cl-lib ? null, counsel, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
-    melpaBuild {
+    ivy-dired-history = callPackage ({ cl-lib ? null
+                                     , counsel
+                                     , fetchFromGitHub
+                                     , fetchurl
+                                     , ivy
+                                     , lib
+                                     , melpaBuild }:
+      melpaBuild {
         pname = "ivy-dired-history";
         version = "1.0";
         src = fetchFromGitHub {
@@ -21021,10 +26177,10 @@
           rev = "3604840f85e4ff2d7ecab6233e820cb2ec5c8733";
           sha256 = "0slisbnfcdx8jv0p67ag6s4l0m0jmrwcpm5a2jm6sai9x67ayn4l";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ad37f6b04ff45fbffeadefc94db16baa27bcc2ac/recipes/ivy-dired-history";
           sha256 = "1vj073k5m0l8rx9iiisikzl053ad9mlhvbk30f5zmw9sw7b9blyl";
-          name = "ivy-dired-history";
+          name = "recipe";
         };
         packageRequires = [ cl-lib counsel ivy ];
         meta = {
@@ -21032,8 +26188,16 @@
           license = lib.licenses.free;
         };
       }) {};
-    ivy-erlang-complete = callPackage ({ async, counsel, emacs, erlang, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
-    melpaBuild {
+    ivy-erlang-complete = callPackage ({ async
+                                       , counsel
+                                       , emacs
+                                       , erlang
+                                       , fetchFromGitHub
+                                       , fetchurl
+                                       , ivy
+                                       , lib
+                                       , melpaBuild }:
+      melpaBuild {
         pname = "ivy-erlang-complete";
         version = "0.3.1";
         src = fetchFromGitHub {
@@ -21042,10 +26206,10 @@
           rev = "62e2b14ff25b0c143c882cb38d029b216acc3dd6";
           sha256 = "0sbxmj3ap0navgi7lxlgwb9ykfb8khgh7nl1hmqfh2jn9vx2s568";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ac1b9e350d3f066e4e56202ebb443134d5fc3669/recipes/ivy-erlang-complete";
           sha256 = "00fqjgrhvcn3ibpgiy4b0sr4x9p6ym5r1rvi4rdzsw2i3nxmgf3a";
-          name = "ivy-erlang-complete";
+          name = "recipe";
         };
         packageRequires = [ async counsel emacs erlang ivy ];
         meta = {
@@ -21053,20 +26217,51 @@
           license = lib.licenses.free;
         };
       }) {};
-    ivy-gitlab = callPackage ({ dash, fetchFromGitHub, fetchurl, gitlab, ivy, lib, melpaBuild, s }:
-    melpaBuild {
+    ivy-feedwrangler = callPackage ({ fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
+        pname = "ivy-feedwrangler";
+        version = "0.4.2";
+        src = fetchFromGitHub {
+          owner = "asimpson";
+          repo = "ivy-feedwrangler";
+          rev = "051eac49cae32b16fab2e06ff0115cd8fb5dc499";
+          sha256 = "1irp76kbg8d7wmgvfjbb4c3wmd29bdrl503jkq4w52fl57g94cvj";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/cf1c112939545f6d157111eabcb573738b09ef7c/recipes/ivy-feedwrangler";
+          sha256 = "1mxm37biix8c0s32gfv4pidffvlgdz5i9325zk71fhgfzqwkf5vx";
+          name = "recipe";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/ivy-feedwrangler";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ivy-gitlab = callPackage ({ dash
+                              , fetchFromGitHub
+                              , fetchurl
+                              , gitlab
+                              , ivy
+                              , lib
+                              , melpaBuild
+                              , s }:
+      melpaBuild {
         pname = "ivy-gitlab";
         version = "0.8.0";
         src = fetchFromGitHub {
           owner = "nlamirault";
           repo = "emacs-gitlab";
-          rev = "a1c1441ff5ffb290e695eb9ac05431e9385578f4";
-          sha256 = "0ywjrgafpl4cnrykx9yysazr7hkd2pxk67h065f8z3mid6cgh1wa";
+          rev = "5e2add142f26da9c8f114ea8b0a1a2c7cdeea09f";
+          sha256 = "0lhmxwb653l22y8micn0ay43nsmhm7vm71qdy55ln4qzzfxn508s";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/35d4d4f22e4c567954287b2a1cabcb595497095a/recipes/ivy-gitlab";
           sha256 = "0gbwsmb6my0327f9j96s20mybnjaw9yaiwhs3sy3vav0qww91z1y";
-          name = "ivy-gitlab";
+          name = "recipe";
         };
         packageRequires = [ dash gitlab ivy s ];
         meta = {
@@ -21074,8 +26269,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    ivy-hydra = callPackage ({ emacs, fetchFromGitHub, fetchurl, hydra, ivy, lib, melpaBuild }:
-    melpaBuild {
+    ivy-hydra = callPackage ({ emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , hydra
+                             , ivy
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "ivy-hydra";
         version = "0.10.0";
         src = fetchFromGitHub {
@@ -21084,10 +26285,10 @@
           rev = "4a2cee03519f98cf95b29905dec2566a39ff717e";
           sha256 = "14vnigqb5c3yi4q9ysw1fiwdqyqwyklqpb9wnjf81chm7s2mshnr";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy-hydra";
           sha256 = "1xv8nfi6dzhx868h44ydq4f5jmsa7rbqfa7jk8g0z0ifv477hrvx";
-          name = "ivy-hydra";
+          name = "recipe";
         };
         packageRequires = [ emacs hydra ivy ];
         meta = {
@@ -21095,8 +26296,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    ivy-mpdel = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, libmpdel, melpaBuild, mpdel }:
-    melpaBuild {
+    ivy-mpdel = callPackage ({ emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , ivy
+                             , lib
+                             , libmpdel
+                             , melpaBuild
+                             , mpdel }:
+      melpaBuild {
         pname = "ivy-mpdel";
         version = "0.4.0";
         src = fetchFromGitHub {
@@ -21105,10 +26313,10 @@
           rev = "f9f745792abfed85d535b4cb5b2a95f944bbad1d";
           sha256 = "1sxd9hny0n751irf87bab0g3ygq6j4g32gdy4yk27y3r00i9g4b6";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bb25443752e18e47afc63d5497cc5052c388a607/recipes/ivy-mpdel";
           sha256 = "1v9xiy4bs7r24li6fwi5dfqav8dfr3dy0xhj3wnzvcgwxp5ji56r";
-          name = "ivy-mpdel";
+          name = "recipe";
         };
         packageRequires = [ emacs ivy libmpdel mpdel ];
         meta = {
@@ -21116,8 +26324,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    ivy-pages = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
-    melpaBuild {
+    ivy-pages = callPackage ({ emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , ivy
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "ivy-pages";
         version = "0.1.1";
         src = fetchFromGitHub {
@@ -21126,10 +26339,10 @@
           rev = "428a901f94c9625c8407fd2bf76f9d7714d40d87";
           sha256 = "11lcv8dqlmfqvhn7n3wfp9idr5hf30312p213y5pvs4m70lbc9k2";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/93f1183beb74aa4a96de8cd043a2a8eefdd7ad7e/recipes/ivy-pages";
           sha256 = "0zz8nbjma8r6r7xxbg7xfz13202d77k1ybzpib41slmljzh7xgwv";
-          name = "ivy-pages";
+          name = "recipe";
         };
         packageRequires = [ emacs ivy ];
         meta = {
@@ -21137,8 +26350,41 @@
           license = lib.licenses.free;
         };
       }) {};
-    ivy-purpose = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild, window-purpose }:
-    melpaBuild {
+    ivy-prescient = callPackage ({ emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , ivy
+                                 , lib
+                                 , melpaBuild
+                                 , prescient }:
+      melpaBuild {
+        pname = "ivy-prescient";
+        version = "2.0";
+        src = fetchFromGitHub {
+          owner = "raxod502";
+          repo = "prescient.el";
+          rev = "515959a2523b43608c9d06dcf8adde8911ce42b9";
+          sha256 = "1k8xk154sql3b2b7hpyxslcgl88aaxq5ak2sr760jsq2qk7878bw";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/a92495d09689932ab9f0b716078ceeeb9cc154e0/recipes/ivy-prescient";
+          sha256 = "017ibpbj390q5d051k3wn50774wvcixzbwikvi5ifzqkhgixqk9c";
+          name = "recipe";
+        };
+        packageRequires = [ emacs ivy prescient ];
+        meta = {
+          homepage = "https://melpa.org/#/ivy-prescient";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ivy-purpose = callPackage ({ emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , ivy
+                               , lib
+                               , melpaBuild
+                               , window-purpose }:
+      melpaBuild {
         pname = "ivy-purpose";
         version = "0.1";
         src = fetchFromGitHub {
@@ -21147,10 +26393,10 @@
           rev = "0495f2f3aed64d7e0028125e76a9a68f8fc4107e";
           sha256 = "1hiw7mnrr0cnnp0a2mh837pzdaknadwv0sk82vya6blx0a7m691g";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1fa2a37a1a6492eddf638216acec4b9d54d3498d/recipes/ivy-purpose";
           sha256 = "0c5n7x3sa57wslwnldvc0i315xhyi1zndyhr07rzka1rhj8v1c4v";
-          name = "ivy-purpose";
+          name = "recipe";
         };
         packageRequires = [ emacs ivy window-purpose ];
         meta = {
@@ -21158,20 +26404,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    ivy-rtags = callPackage ({ fetchFromGitHub, fetchurl, ivy, lib, melpaBuild, rtags }:
-    melpaBuild {
+    ivy-rtags = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , ivy
+                             , lib
+                             , melpaBuild
+                             , rtags }:
+      melpaBuild {
         pname = "ivy-rtags";
         version = "2.18";
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "98d668e85cf9ae84e775742752c5656dd2df2f17";
-          sha256 = "0raqjbkl1ykga4ahgl9xw49cgh3cyqcf42z36z7d6fz1fw192kg0";
+          rev = "7e6b6f21935eedbe4678ba91c5531ac162b51a5a";
+          sha256 = "12629d1s8rplhjh17n3bmgnkpscq4gljgyl84j8qyhh40dwq1qk0";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ivy-rtags";
           sha256 = "18f0jak643dd8lmx701wgk95miajabd8190ls35831slr28lqxsq";
-          name = "ivy-rtags";
+          name = "recipe";
         };
         packageRequires = [ ivy rtags ];
         meta = {
@@ -21179,8 +26430,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    ivy-youtube = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild, request }:
-    melpaBuild {
+    ivy-youtube = callPackage ({ cl-lib ? null
+                               , fetchFromGitHub
+                               , fetchurl
+                               , ivy
+                               , lib
+                               , melpaBuild
+                               , request }:
+      melpaBuild {
         pname = "ivy-youtube";
         version = "0.3.2";
         src = fetchFromGitHub {
@@ -21189,10 +26446,10 @@
           rev = "23e1089d4c4fc32db20df14ba10078aabf117e87";
           sha256 = "0m70vxjj49kf8bzni2qchgzgx808z1fcfh02cflkhjcb77dkq8d6";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ivy-youtube";
           sha256 = "1masw9qc33valx55klfhzx0bg1hfazmn5yd9wh12q2gjsz8nxyw4";
-          name = "ivy-youtube";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ivy request ];
         meta = {
@@ -21200,20 +26457,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    ix = callPackage ({ fetchFromGitHub, fetchurl, grapnel, lib, melpaBuild }:
-    melpaBuild {
+    ix = callPackage ({ fetchFromGitHub
+                      , fetchurl
+                      , grapnel
+                      , lib
+                      , melpaBuild }:
+      melpaBuild {
         pname = "ix";
         version = "0.7";
         src = fetchFromGitHub {
           owner = "theanalyst";
           repo = "ix.el";
-          rev = "498dac674f4f1910d39087b1457c5da5465a0614";
-          sha256 = "0rpxh1jv98dl9b5ldjkljk70z4hkl61kcmvy1lhpj3lxn8ysv87a";
+          rev = "47632caf925fbb3cc8633834d2d619032d039336";
+          sha256 = "1j6axmi6fxcl2ja4660ygxchggm2dzjngi0k3g6pimawykvgxs3n";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3a9d68fcf5bddbf07909b77682474dc592077051/recipes/ix";
           sha256 = "1fl76dk8vgw3mrh5iz99lrsllwya6ij9d1lj3szcrs4qnj0b5ql3";
-          name = "ix";
+          name = "recipe";
         };
         packageRequires = [ grapnel ];
         meta = {
@@ -21221,8 +26482,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    iy-go-to-char = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    iy-go-to-char = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "iy-go-to-char";
         version = "3.2.1";
         src = fetchFromGitHub {
@@ -21231,10 +26495,10 @@
           rev = "77b40d64eef9dad11eca59f4e3fbc6e849de7434";
           sha256 = "1mb0k4lmbkbpn6qzzg8n14pybhd5zla77ppqac6a9kw89fj2qj4i";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0fda2b54a0ff0b6fc3bd6d20cfcbbf63cae5380f/recipes/iy-go-to-char";
           sha256 = "10szn9y7gl8947p3f9w6p6vzjf1a9cjif9mbj3qdqx4vbsl9mqpz";
-          name = "iy-go-to-char";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -21242,8 +26506,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    j-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    j-mode = callPackage ({ fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "j-mode";
         version = "1.1.1";
         src = fetchFromGitHub {
@@ -21252,10 +26519,10 @@
           rev = "caa55dfaae01d1875380929826952c2b3ef8a653";
           sha256 = "07kbicf760nw4qlb2lkf1ns8yzqy0r5jqqwqjbsnqxx4sm52hml9";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/410134ab2145adad3648b1024bfe4f6801df82c9/recipes/j-mode";
           sha256 = "0f9lsr9hjhdvmzx565ivlncfzb4iq4rjjn6a41053cjy50bl066i";
-          name = "j-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -21263,7 +26530,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    jabber = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
+    jabber = callPackage ({ fetchgit
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "jabber";
         version = "0.8.92";
         src = fetchgit {
@@ -21282,8 +26553,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    jade-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    jade-mode = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "jade-mode";
         version = "1.0.0";
         src = fetchFromGitHub {
@@ -21292,10 +26566,10 @@
           rev = "4e7a20db492719062f40b225ed730ed50be5db56";
           sha256 = "0krbd1qa2408a97pqhl7fv0x8x1n2l3qq33zzj4w4vv0c55jk43n";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/877b5a3e612e1b1d6d51e60c66b0b79f231abdb2/recipes/jade-mode";
           sha256 = "156j0d9wx6hrhph0nsjsi1jha4h65rcbrbff1j2yr8vdsszjrs94";
-          name = "jade-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -21303,8 +26577,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    jammer = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    jammer = callPackage ({ fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "jammer";
         version = "0.1.1";
         src = fetchFromGitHub {
@@ -21313,10 +26590,10 @@
           rev = "1ba232b71507b468c60dc53c2bc8888bef36c858";
           sha256 = "0x0vz7m9kn7b2aiqvrdqx8qh84ynbpzy2asz2b18l47bcwa7r5bh";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cb82a6e936e2d5d1dd5930b600ede52dac3ceb33/recipes/jammer";
           sha256 = "01c4bii7gswhp6z9dgx4bhvsywiwbbdv7mg1zj6vp1530l74zx6z";
-          name = "jammer";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -21324,8 +26601,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    japanlaw = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    japanlaw = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "japanlaw";
         version = "0.9.1";
         src = fetchFromGitHub {
@@ -21334,10 +26614,10 @@
           rev = "d90b204b018893d5d75286c92948c0bddf94cce2";
           sha256 = "08gkxxaw789g1r0dql11skz6i8bdrrz4wp87fzs9f5rgx99xxr6h";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6192e1db76f017c3b1315453144cffc47cdd495d/recipes/japanlaw";
           sha256 = "1pxss1mjk5660k80r1xqgslnbrsr6r4apgp9abjwjfxpg4f6d0sa";
-          name = "japanlaw";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -21345,8 +26625,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    java-imports = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pcache, s }:
-    melpaBuild {
+    java-imports = callPackage ({ emacs
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild
+                                , pcache
+                                , s }:
+      melpaBuild {
         pname = "java-imports";
         version = "0.1.0";
         src = fetchFromGitHub {
@@ -21355,10 +26641,10 @@
           rev = "275f354c245df741b45e88d085660722e81a12be";
           sha256 = "1bngn6v6w60qb3zz7s3px7v3wk99a3hfvzrg9l06dz1q7xgyvsi1";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5f6f4e4c14c422c2066f2200bb9b8f35e2ecc896/recipes/java-imports";
           sha256 = "1waz6skyrm1n8wpc0pwa652l11wz8qz1m89mqxk27k3lwyd84n98";
-          name = "java-imports";
+          name = "recipe";
         };
         packageRequires = [ emacs pcache s ];
         meta = {
@@ -21366,8 +26652,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    javadoc-lookup = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    javadoc-lookup = callPackage ({ cl-lib ? null
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "javadoc-lookup";
         version = "1.1.0";
         src = fetchFromGitHub {
@@ -21376,10 +26666,10 @@
           rev = "507a2dd443d60b537b8f779c1847e2cd0ccd1382";
           sha256 = "16gywcma1s8kslwznlxwlx0xj0gs5g31637kb74vfdplk48f04zj";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3d7d5f55c7d90181cc4eff68bb472f772f070a93/recipes/javadoc-lookup";
           sha256 = "1fffs0iqkk9rg5vbxifvn09j4i2751p81bzcvy5fslr3r1r2nv79";
-          name = "javadoc-lookup";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -21387,8 +26677,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    jdecomp = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    jdecomp = callPackage ({ emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "jdecomp";
         version = "0.2.0";
         src = fetchFromGitHub {
@@ -21397,10 +26691,10 @@
           rev = "1590b06f139f036c1041e1ce5c0acccaa24b31a7";
           sha256 = "0sb9vzn6cycys31r98kxwgpn7v9aw5ck86nkskmn9hhhkrfsabii";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/jdecomp";
           sha256 = "1vgjmz7rxvgy9lprzr5b018lzqy3h0zg8913la1bzgwlm3mr68y5";
-          name = "jdecomp";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -21408,8 +26702,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    jedi = callPackage ({ auto-complete, emacs, fetchFromGitHub, fetchurl, jedi-core, lib, melpaBuild }:
-    melpaBuild {
+    jedi = callPackage ({ auto-complete
+                        , emacs
+                        , fetchFromGitHub
+                        , fetchurl
+                        , jedi-core
+                        , lib
+                        , melpaBuild }:
+      melpaBuild {
         pname = "jedi";
         version = "0.2.7";
         src = fetchFromGitHub {
@@ -21418,10 +26718,10 @@
           rev = "8da022c8cda511428c72a6dc4c5be3c0a0c88584";
           sha256 = "0xbp9fcxgbf298w05hvf52z41kk7r52975ailgdn8sg60xc98fa7";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bded1840a39fbf1e014c01276eb2f9c5a4fc218f/recipes/jedi";
           sha256 = "1777060q25k9n2g6h1lm5lkki900pmjqkxq72mrk3j19jr4pk9m4";
-          name = "jedi";
+          name = "recipe";
         };
         packageRequires = [ auto-complete emacs jedi-core ];
         meta = {
@@ -21429,8 +26729,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    jedi-core = callPackage ({ cl-lib ? null, emacs, epc, fetchFromGitHub, fetchurl, lib, melpaBuild, python-environment }:
-    melpaBuild {
+    jedi-core = callPackage ({ cl-lib ? null
+                             , emacs
+                             , epc
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild
+                             , python-environment }:
+      melpaBuild {
         pname = "jedi-core";
         version = "0.2.7";
         src = fetchFromGitHub {
@@ -21439,10 +26746,10 @@
           rev = "8da022c8cda511428c72a6dc4c5be3c0a0c88584";
           sha256 = "0xbp9fcxgbf298w05hvf52z41kk7r52975ailgdn8sg60xc98fa7";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bded1840a39fbf1e014c01276eb2f9c5a4fc218f/recipes/jedi-core";
           sha256 = "0pzi32zdb4g9n4kvpmkdflmqypa7nckmnjq60a3ngym4wlzbb32f";
-          name = "jedi-core";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs epc python-environment ];
         meta = {
@@ -21450,8 +26757,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    jetbrains = callPackage ({ cl-lib ? null, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    jetbrains = callPackage ({ cl-lib ? null
+                             , emacs
+                             , f
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "jetbrains";
         version = "0.0.2";
         src = fetchFromGitHub {
@@ -21460,10 +26773,10 @@
           rev = "38e136079f3f2ddbe0e8b7dec01cf6b515e897d8";
           sha256 = "1ji64qip5raf0lbv7fv36rd4fwa33zn0xi7sa0zrgf0kcsr0qasb";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/00dd4626e261d9831fc62d866d50b7257ee418c4/recipes/jetbrains";
           sha256 = "0254dkzf2x5dj3j549xjash0lsadkn0bdcyjkjlrv8hqvdr1f1m7";
-          name = "jetbrains";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs f ];
         meta = {
@@ -21471,8 +26784,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    jinja2-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    jinja2-mode = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "jinja2-mode";
         version = "0.2";
         src = fetchFromGitHub {
@@ -21481,10 +26797,10 @@
           rev = "cfaa7bbe7bb290cc500440124ce89686f3e26f86";
           sha256 = "0l26wcy496k6xk7q5sf905xir0p73ziy6c44is77854lv3y0z381";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b79196cf0dc0b436ff75eabea369a62f92825d9f/recipes/jinja2-mode";
           sha256 = "0480fh719r4v7xdwyf4jlg1k36y54i5zrv7gxlhfm66pil75zafx";
-          name = "jinja2-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -21492,8 +26808,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    jpop = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    jpop = callPackage ({ dash
+                        , emacs
+                        , fetchFromGitHub
+                        , fetchurl
+                        , lib
+                        , melpaBuild }:
+      melpaBuild {
         pname = "jpop";
         version = "3.2.3";
         src = fetchFromGitHub {
@@ -21502,10 +26823,10 @@
           rev = "f3eed65e54dc2daaa7678e6eb169d35c4a7d1e63";
           sha256 = "17wiv1b8c56c2zi9b9mjm37kl7yc735nk3188wnmq3fqjgdpwpwg";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2a52a3cf909d12201196b92685435f9fa338b7ba/recipes/jpop";
           sha256 = "00chh1aqnkkkhdp44sapdjx37cbn92g42wapdq7kcl8v1v0xmnjr";
-          name = "jpop";
+          name = "recipe";
         };
         packageRequires = [ dash emacs ];
         meta = {
@@ -21513,8 +26834,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    jq-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    jq-mode = callPackage ({ emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "jq-mode";
         version = "0.3.0";
         src = fetchFromGitHub {
@@ -21523,10 +26848,10 @@
           rev = "8384a1926cc22000e5e42f86f28d807fd6149f8e";
           sha256 = "0fa84jln0vddrc218s8scz6hx12ym0wimh6dm58wqxias7gm9fgk";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/318705966e26e58f87b53c115c519db95874ac1c/recipes/jq-mode";
           sha256 = "1xvh641pdkvbppb2nzwn1ljdk7sv6laq29kdv09kxaqd89vm0vin";
-          name = "jq-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -21534,20 +26859,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    js-auto-format-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    js-auto-format-mode = callPackage ({ emacs
+                                       , fetchFromGitHub
+                                       , fetchurl
+                                       , lib
+                                       , melpaBuild }:
+      melpaBuild {
         pname = "js-auto-format-mode";
         version = "1.1.0";
         src = fetchFromGitHub {
           owner = "ybiquitous";
           repo = "js-auto-format-mode";
-          rev = "6bd44162ac422304803f606278bb0c08ab940a5d";
-          sha256 = "1hy4wyw7yi93ngagg9qmkljjqaypfnzks3vny1pn6d5nw2acb1vx";
+          rev = "1558fb539e0beb7f98901280d695968a2351384d";
+          sha256 = "16l2mjklazmfpdin3vz3ddf083phhyrhi18n0rfhv5rwh9m23wr9";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2d3be16771b5b5fde639da3ee97890620354ee7a/recipes/js-auto-format-mode";
           sha256 = "1gxf7xz1j3ga2pk5w8cgny7l8kid59zap2a97lhb50w1qczfqqzs";
-          name = "js-auto-format-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -21555,8 +26884,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    js-comint = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    js-comint = callPackage ({ emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "js-comint";
         version = "1.1.1";
         src = fetchFromGitHub {
@@ -21565,10 +26898,10 @@
           rev = "83e932e4a83d1a69098ee87e0ab911d299368e60";
           sha256 = "1r2fwsdfkbqnm4n4dwlp7gc267ghj4vd0naj431w7pl529dmrb6x";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bc9d20b95e369e5a73c85a4a9385d3a8f9edd4ca/recipes/js-comint";
           sha256 = "0jvkjb0rmh87mf20v6rjapi2j6qv8klixy0y0kmh3shylkni3an1";
-          name = "js-comint";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -21576,8 +26909,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    js2-closure = callPackage ({ fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild }:
-    melpaBuild {
+    js2-closure = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , js2-mode
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "js2-closure";
         version = "2.2.1";
         src = fetchFromGitHub {
@@ -21586,10 +26923,10 @@
           rev = "74a75f001a8bc2b9c02b9e8b4557f7ee3c5f84fb";
           sha256 = "1gapx656s4ngy8s8y1p56xxnclwf4qqg83l3jizknxky7yhayyl9";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/61bf3e70ae38a78184f0b373ff6f0db234f51cb2/recipes/js2-closure";
           sha256 = "19732bf98lk2ah2ssgkr1ngxx7rz3nhsiw84lsfmydb0vvm4fpk7";
-          name = "js2-closure";
+          name = "recipe";
         };
         packageRequires = [ js2-mode ];
         meta = {
@@ -21597,8 +26934,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    js2-highlight-vars = callPackage ({ fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild }:
-    melpaBuild {
+    js2-highlight-vars = callPackage ({ fetchFromGitHub
+                                      , fetchurl
+                                      , js2-mode
+                                      , lib
+                                      , melpaBuild }:
+      melpaBuild {
         pname = "js2-highlight-vars";
         version = "0.1.0";
         src = fetchFromGitHub {
@@ -21607,10 +26948,10 @@
           rev = "bf38d12cf65eebc8b81866fd03f6a0389bb2a9ed";
           sha256 = "0r2szaxr3q0gvxqd9asn03q8jf3nclxv4mqdsjn96s98n45x388l";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5f4a7c90be2e032277ae87b8de36d2e3f6146f09/recipes/js2-highlight-vars";
           sha256 = "07bq393g2jy8ydvaqyqn6vdyfvyminvgi239yvwzg5g9a1xjc475";
-          name = "js2-highlight-vars";
+          name = "recipe";
         };
         packageRequires = [ js2-mode ];
         meta = {
@@ -21618,8 +26959,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    js2-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    js2-mode = callPackage ({ cl-lib ? null
+                            , emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "js2-mode";
         version = "20180301";
         src = fetchFromGitHub {
@@ -21628,10 +26974,10 @@
           rev = "38e425785d5ea4600c3642f6500062ecedf694a4";
           sha256 = "1afvm8cp9h0v0pk7v3jwag6f608v1787l7m7a9541ld616cgb5x7";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/js2-mode";
           sha256 = "0f9cj3n55qnlifxwk1yp8n1kfd319jf7qysnkk28xpvglzw24yjv";
-          name = "js2-mode";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -21639,8 +26985,16 @@
           license = lib.licenses.free;
         };
       }) {};
-    js2-refactor = callPackage ({ dash, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, multiple-cursors, s, yasnippet }:
-    melpaBuild {
+    js2-refactor = callPackage ({ dash
+                                , fetchFromGitHub
+                                , fetchurl
+                                , js2-mode
+                                , lib
+                                , melpaBuild
+                                , multiple-cursors
+                                , s
+                                , yasnippet }:
+      melpaBuild {
         pname = "js2-refactor";
         version = "0.9.0";
         src = fetchFromGitHub {
@@ -21649,10 +27003,10 @@
           rev = "089c7800e3e7b0a89ee2392037ac07851bcee298";
           sha256 = "1iwblf5i7k1i1ax9pjv7n8zv9q157krirdn0gwcib6dwza2i30jp";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8935264dfea9bacc89fef312215624d1ad9fc437/recipes/js2-refactor";
           sha256 = "09dcfwpxxyw0ffgjjjaaxbsj0x2nwfrmxy1a05h8ba3r3jl4kl1r";
-          name = "js2-refactor";
+          name = "recipe";
         };
         packageRequires = [ dash js2-mode multiple-cursors s yasnippet ];
         meta = {
@@ -21660,20 +27014,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    js3-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    js3-mode = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "js3-mode";
         version = "1.1.0";
         src = fetchFromGitHub {
           owner = "thomblake";
           repo = "js3-mode";
-          rev = "5ccda46ba39998a74bd724fdffb34634be5b6563";
-          sha256 = "17d0nf1kz7mgv5qz57q6khy4w5vrmsliqirggahk9s6nnsx1j56n";
+          rev = "a1943e3b69ccf7592ef6e3c992c06af978823da5";
+          sha256 = "1ild74qgx88gxrsmza5zjn51636zwxyc1j1c31m1xfw0najvl0dd";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/805a7c7fee2bafd8785813963bf91ac1ca417fd1/recipes/js3-mode";
           sha256 = "12s5qf6zfcv4m5kqxvh9b4zgwf433x39a210d957gjjp5mywbb1r";
-          name = "js3-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -21681,20 +27038,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    jsfmt = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    jsfmt = callPackage ({ fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "jsfmt";
         version = "0.2.0";
         src = fetchFromGitHub {
           owner = "brettlangdon";
           repo = "jsfmt.el";
-          rev = "c5d9742872509143db0250a77db705ef78f02cd0";
-          sha256 = "0pjmslxwmlb9cb3j5qfsyxq1lg1ywzw1p9dvj330c2m7nla1j70x";
+          rev = "192a3db81145c6fb9c0a9830db01ac4ec4f5d677";
+          sha256 = "07bnvacmg6xm8r8ksiv7zkaghmad3s1qwy00fsy5pa47spxm3lxn";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4ddc99843dec18a295dfc36e7b429f0e1ab7fb71/recipes/jsfmt";
           sha256 = "1syy32sv2d57b3gja0ly65h36mfnyq6hzf5lnnl3r58yvbdzngqd";
-          name = "jsfmt";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -21702,8 +27062,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    json-mode = callPackage ({ fetchFromGitHub, fetchurl, json-reformat, json-snatcher, lib, melpaBuild }:
-    melpaBuild {
+    json-mode = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , json-reformat
+                             , json-snatcher
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "json-mode";
         version = "1.7.0";
         src = fetchFromGitHub {
@@ -21712,10 +27077,10 @@
           rev = "9ba01b868a6b138feeff82b9eb0abd331d29325f";
           sha256 = "0i79lqzdg59vkqwjd3q092xxn9vhxspb1vn4pkis0vfvn46g01jy";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/03d0ff6c8d724cf39446fa27f52aa5cc1a3cefb6/recipes/json-mode";
           sha256 = "014j10wgxsqy6d6aksnkz2dr5cmpsi8c7v4a825si1vgb4622a70";
-          name = "json-mode";
+          name = "recipe";
         };
         packageRequires = [ json-reformat json-snatcher ];
         meta = {
@@ -21723,8 +27088,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    json-navigator = callPackage ({ emacs, fetchFromGitHub, fetchurl, hierarchy, lib, melpaBuild }:
-    melpaBuild {
+    json-navigator = callPackage ({ emacs
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , hierarchy
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "json-navigator";
         version = "0.1.0";
         src = fetchFromGitHub {
@@ -21733,10 +27103,10 @@
           rev = "bc5634fc78d2e43ebd3c255350829877f3e4549c";
           sha256 = "1j2lic9sn00j6pzq5qslv9m2z0rvsxkvz73z8swp7vcrsgz7qvqd";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/62d4d68bd473652b80988a68250e9190b886ad6e/recipes/json-navigator";
           sha256 = "0yfl31cg0mkgsbpgx00m9h2cxnhsavcf7zlspb0qr4g2zq6ya1wx";
-          name = "json-navigator";
+          name = "recipe";
         };
         packageRequires = [ emacs hierarchy ];
         meta = {
@@ -21744,8 +27114,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    json-reformat = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    json-reformat = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "json-reformat";
         version = "0.0.6";
         src = fetchFromGitHub {
@@ -21754,10 +27127,10 @@
           rev = "b9bd375ec1deb10d2ba09c409bdcf99c56d7a716";
           sha256 = "0qp4n2k6s69jj4gwwimkpadjv245y54wk3bxb1x96f034gkp81vs";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f8c7976237f327fdfa58eea26ac8679f40ef3163/recipes/json-reformat";
           sha256 = "1m5p895w9qdgb8f67xykhzriribgmp20a1lvj64iap4aam6wp8na";
-          name = "json-reformat";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -21765,8 +27138,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    json-snatcher = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    json-snatcher = callPackage ({ emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "json-snatcher";
         version = "1.0.0";
         src = fetchFromGitHub {
@@ -21775,10 +27152,10 @@
           rev = "c4cecc0a5051bd364373aa499c47a1bb7a5ac51c";
           sha256 = "05zsgnk7grgw9jzwl80h5sxfpifxlr37b4mkbvx7mjq4z14xc2jw";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/990de179e20c169aa02ffec42c89f18ce02239c8/recipes/json-snatcher";
           sha256 = "0f6j9g3c5fz3wlqa88706cbzinrs3dnfpgsr2d3h3117gic4iwp4";
-          name = "json-snatcher";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -21786,20 +27163,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    jsonnet-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    jsonnet-mode = callPackage ({ emacs
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "jsonnet-mode";
         version = "0.0.1";
         src = fetchFromGitHub {
           owner = "mgyucht";
           repo = "jsonnet-mode";
-          rev = "efe768fdcff25d746674fbbf229b9e1a7efea4f1";
-          sha256 = "1a52266y83z9i3sg7hhc8sw7rhjy5i9wdy2bv7s2fv00lnngaj29";
+          rev = "a729ccf20aa04041b0dfe1178ba70d750f648e2f";
+          sha256 = "1ry95sv9ydcr3da16gjjh26wrn4ssf06c5zv084s33id6cipg2n3";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ba17372732723f73e8eeb6e7c47abc0edeb20da4/recipes/jsonnet-mode";
           sha256 = "1aadys887szlc924qr645lby9f8vzvxkwhq6byhppk1b01h911ia";
-          name = "jsonnet-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -21807,8 +27188,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    jsx-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    jsx-mode = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "jsx-mode";
         version = "0.1.10";
         src = fetchFromGitHub {
@@ -21817,10 +27201,10 @@
           rev = "1ca260b76f6e6251c528ed89501597a5b456c179";
           sha256 = "1wx28rr5dk238yz07xn95v88qmv10c1gz9pcxard2kszpnmrn6dx";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7dea24e922f18c1f7e1b97da07ba2e4f33170557/recipes/jsx-mode";
           sha256 = "1lnjnyn8qf3biqr92z443z6b58dly7glksp1g986vgqzdprq3n1b";
-          name = "jsx-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -21828,20 +27212,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    jump = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, findr, inflections, lib, melpaBuild }:
-    melpaBuild {
+    jump = callPackage ({ cl-lib ? null
+                        , fetchFromGitHub
+                        , fetchurl
+                        , findr
+                        , inflections
+                        , lib
+                        , melpaBuild }:
+      melpaBuild {
         pname = "jump";
         version = "2.5";
         src = fetchFromGitHub {
           owner = "eschulte";
           repo = "jump.el";
-          rev = "40a7ffdf734ffe7d1968909663146255d7ba69c8";
-          sha256 = "1ig1wdjg914p9ng1nir2fid4mb3xz2dbpmkdnfy1klq2zp0xw2s3";
+          rev = "9519c675e8a650f6afade7d870e925d0fb50f112";
+          sha256 = "1bm1mgd632gq3cl4zrq66vnqq9ynvc01iy6szp464ccnm3cmqdzr";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f0c791aebccc08b770b3969ce5d2e82cbe26f80e/recipes/jump";
           sha256 = "18g0fa9g8m9jscsm6pn7jwdq94l4aj0dfhrv2hqapq1q1x537364";
-          name = "jump";
+          name = "recipe";
         };
         packageRequires = [ cl-lib findr inflections ];
         meta = {
@@ -21849,8 +27239,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    jump-to-line = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    jump-to-line = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "jump-to-line";
         version = "0.2.0";
         src = fetchFromGitHub {
@@ -21859,10 +27252,10 @@
           rev = "01ef8c3529d85e6c59cc20840acbc4a8e8325bc8";
           sha256 = "1s9plmg323m1p625xqnks0yqz0zlsjacdj7pv8f783r0d9jmfq3s";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4b6c700a28b65cbbad36a9bbaf88cc36c8191eb0/recipes/jump-to-line";
           sha256 = "09ifhsggl5mrb6l8nqnl38yph0v26v30y98ic8hl23i455hqkkdr";
-          name = "jump-to-line";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -21870,8 +27263,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    jvm-mode = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    jvm-mode = callPackage ({ dash
+                            , emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "jvm-mode";
         version = "0.2.0";
         src = fetchFromGitHub {
@@ -21880,10 +27278,10 @@
           rev = "16d84c8c80bb214367bae6ed30b08756521c27d6";
           sha256 = "1785nsv61m51lpykai2wxrv6zmwbm5654v937fgw177p37054s83";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7cdb7d7d7b955405eb6357277b5d049df8aa85ce/recipes/jvm-mode";
           sha256 = "1r283b4s0pzq4hgwcz5cnhlvdvq4gy0x51g3vp0762s8qx969a5w";
-          name = "jvm-mode";
+          name = "recipe";
         };
         packageRequires = [ dash emacs ];
         meta = {
@@ -21891,8 +27289,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    kaesar = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    kaesar = callPackage ({ cl-lib ? null
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "kaesar";
         version = "0.9.0";
         src = fetchFromGitHub {
@@ -21901,10 +27303,10 @@
           rev = "4fa74851cd928f30e9f2ee1aa27ee6074ad253ea";
           sha256 = "03l9w238a5kyfin3v1fy1q2pl0gvmb87j0v89g6nk114s7m4y3r8";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/201fac8639e59dc923ea31da1f84a99f83d51b47/recipes/kaesar";
           sha256 = "0zhi1dv1ay1azh7afq4x6bdg91clwpsr13nrzy7539yrn9sglj5l";
-          name = "kaesar";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -21912,8 +27314,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    kaesar-file = callPackage ({ fetchFromGitHub, fetchurl, kaesar, lib, melpaBuild }:
-    melpaBuild {
+    kaesar-file = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , kaesar
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "kaesar-file";
         version = "0.9.0";
         src = fetchFromGitHub {
@@ -21922,10 +27328,10 @@
           rev = "4fa74851cd928f30e9f2ee1aa27ee6074ad253ea";
           sha256 = "03l9w238a5kyfin3v1fy1q2pl0gvmb87j0v89g6nk114s7m4y3r8";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/201fac8639e59dc923ea31da1f84a99f83d51b47/recipes/kaesar-file";
           sha256 = "0dcizg82maad98mbqqw5lamwz7n2lpai09jsrc66x3wy8k784alc";
-          name = "kaesar-file";
+          name = "recipe";
         };
         packageRequires = [ kaesar ];
         meta = {
@@ -21933,8 +27339,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    kaesar-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, kaesar, lib, melpaBuild }:
-    melpaBuild {
+    kaesar-mode = callPackage ({ cl-lib ? null
+                               , fetchFromGitHub
+                               , fetchurl
+                               , kaesar
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "kaesar-mode";
         version = "0.9.0";
         src = fetchFromGitHub {
@@ -21943,10 +27354,10 @@
           rev = "4fa74851cd928f30e9f2ee1aa27ee6074ad253ea";
           sha256 = "03l9w238a5kyfin3v1fy1q2pl0gvmb87j0v89g6nk114s7m4y3r8";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/201fac8639e59dc923ea31da1f84a99f83d51b47/recipes/kaesar-mode";
           sha256 = "0yqnlchbpmhsqc8j531n08vybwa32cy0v9sy4f9fgxa90rfqczry";
-          name = "kaesar-mode";
+          name = "recipe";
         };
         packageRequires = [ cl-lib kaesar ];
         meta = {
@@ -21954,8 +27365,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    kakapo-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    kakapo-mode = callPackage ({ cl-lib ? null
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "kakapo-mode";
         version = "1.2";
         src = fetchFromGitHub {
@@ -21964,10 +27379,10 @@
           rev = "fe3d579867f7465cd3ad04f29b4b2b3b820edc01";
           sha256 = "0b6af8hnrn0v4z1xpahjfpw5iga2bmgd3qwfn3is2rygsn5rkm40";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a43f0f1f6a0773240a51d379ec786c20a9389e7b/recipes/kakapo-mode";
           sha256 = "0a99cqflpzasl4wcmmf99aj8xgywkym37j7mvnsajrsk5wawdlss";
-          name = "kakapo-mode";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -21975,20 +27390,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    kaolin-themes = callPackage ({ autothemer, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    kaolin-themes = callPackage ({ autothemer
+                                 , cl-lib ? null
+                                 , emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "kaolin-themes";
-        version = "1.3.2";
+        version = "1.3.5";
         src = fetchFromGitHub {
           owner = "ogdenwebb";
           repo = "emacs-kaolin-themes";
-          rev = "0a80628e083db6e9d4b4af73be5d917d7d667330";
-          sha256 = "1brb0l39xkl19h9xslvmms9vcziygfp244xs5r3n4dqn43c7rr68";
+          rev = "e183b7adb06338046f1a17a94e18ec67e62d4e42";
+          sha256 = "1mvspqll53p8rz66588lvdflwfx4av6cnzigid6n10d1cy35p5vg";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/043a4e3bd5301ef8f4df2cbda0b3f4111eb399e4/recipes/kaolin-themes";
           sha256 = "1pd2v54d578f1wbwvqzplkdz1qvy8w8s6na511b0v5y9sksgm2xw";
-          name = "kaolin-themes";
+          name = "recipe";
         };
         packageRequires = [ autothemer cl-lib emacs ];
         meta = {
@@ -21996,20 +27417,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    karma = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    karma = callPackage ({ fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "karma";
         version = "0.1.0";
         src = fetchFromGitHub {
           owner = "tonini";
           repo = "karma.el";
-          rev = "f4ee856e7f59649e9d9021c46f872f9b4f5b7e6e";
-          sha256 = "0avcg307r4navvgj3hjkggk4gr7mzs4mljhxh223r8g69l9bm6m8";
+          rev = "940b8b8f228b04f2dbd9f9f4451ffa561a35af93";
+          sha256 = "0ha4y7p100n2qkin9f4kna0s9ysa6dgvvvmgvqgnbz8x5v2ak22y";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/681e12556c3ab3e2a8376d5c7c33ee5a213de650/recipes/karma";
           sha256 = "19wl7js7wmw7jv2q3l4r5zl718lhy2a0jhl79k57ihwhxdc58fwc";
-          name = "karma";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -22017,8 +27441,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    key-chord = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    key-chord = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "key-chord";
         version = "0.6";
         src = fetchFromGitHub {
@@ -22027,10 +27454,10 @@
           rev = "8468998946367157830df19a1e92785d22a34178";
           sha256 = "10ldhwp9a21r9g72hzaig1h5yh2zblny0r36nf5nz6gzikfcq0cd";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ae489be43b1aee93614e40f492ebdf0b98a3fbc1/recipes/key-chord";
           sha256 = "1g0jqmnn575h5n4figxbc5xs76zl8b1cdqa6wbi3d1p2rn3g8scr";
-          name = "key-chord";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -22038,8 +27465,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    key-combo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    key-combo = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "key-combo";
         version = "1.6";
         src = fetchFromGitHub {
@@ -22048,10 +27478,10 @@
           rev = "0bc0cf6466a4257047a21a6d01913e92e6862165";
           sha256 = "14ijniyvcfmj4y77yhiplsclincng2r3jbdnmmdnwzliv65f7l6q";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/99b422ef5f7b9dda894207e3133791fb9963a092/recipes/key-combo";
           sha256 = "1v8saw92jphvjkyy7j9jx7cxzgisl4zpf4wjzdjfw3la5lz11waf";
-          name = "key-combo";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -22059,8 +27489,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    key-seq = callPackage ({ fetchFromGitHub, fetchurl, key-chord, lib, melpaBuild }:
-    melpaBuild {
+    key-seq = callPackage ({ fetchFromGitHub
+                           , fetchurl
+                           , key-chord
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "key-seq";
         version = "1.0.1";
         src = fetchFromGitHub {
@@ -22069,10 +27503,10 @@
           rev = "e29b083a6427d061638749194fc249ef69ad2cc0";
           sha256 = "05vpydcgiaya35b62cdjxna9y02vnwzzg6p8jh0dkr9k44h4iy3f";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0d54ab1b6973a44362e50559dd91344d0b17f513/recipes/key-seq";
           sha256 = "166k6hl9vvsnnksvhrv5cbhv9bdiclnbfv7qf67q4c1an9xzqi74";
-          name = "key-seq";
+          name = "recipe";
         };
         packageRequires = [ key-chord ];
         meta = {
@@ -22080,20 +27514,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    keycast = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    keycast = callPackage ({ emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "keycast";
         version = "0.1.1";
         src = fetchFromGitHub {
           owner = "tarsius";
           repo = "keycast";
-          rev = "46370b8a72922902921d3ed2fa194564568053dc";
-          sha256 = "0wgicba3v5l7a0wmmr3awf026vhf4grrn8c4i2hipi9ij3wckqzc";
+          rev = "0d28c26b07a062ab58c01c6cbedc3e68bd4ec8a1";
+          sha256 = "0wfy5wbr150y57mlzsxhb6bq9ycqj2jk5i6nhwl4q8b6xd3mh6p6";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/aaaf62c586818f2493667ad6ec8877234a58da53/recipes/keycast";
           sha256 = "19qq5y1zjp3029kfq0c59xl9xnxqmdn2pd04sblznchcr9jdy5id";
-          name = "keycast";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -22101,8 +27539,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    keychain-environment = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    keychain-environment = callPackage ({ fetchFromGitHub
+                                        , fetchurl
+                                        , lib
+                                        , melpaBuild }:
+      melpaBuild {
         pname = "keychain-environment";
         version = "2.4.1";
         src = fetchFromGitHub {
@@ -22111,10 +27552,10 @@
           rev = "d3643196de6dc79ea77f9f4805028350fd76100b";
           sha256 = "0wzs77nwal6apinc39d4arj3lralv2cb9aw9gkikk46fgk404hwj";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4382c9e7e8dee2cafea9ee49965d0952ca359dd5/recipes/keychain-environment";
           sha256 = "1w77cg00bwx68h0d6k6r1fzwdwz97q12ch2hmpzjnblqs0i4sv8v";
-          name = "keychain-environment";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -22122,8 +27563,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    keydef = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    keydef = callPackage ({ fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "keydef";
         version = "1.15";
         src = fetchFromGitHub {
@@ -22132,10 +27576,10 @@
           rev = "dff2be9f58d12d8c6a490ad0c1b2b10b55528dc0";
           sha256 = "0dkc51bmix4b8czs2wg6vz8vk32qlll1b9fjmx6xshrxm85cyhvv";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5f2a50f62475639af011c99c6cc38928b74b3b0a/recipes/keydef";
           sha256 = "0yb2vgj7abyg8j7qmv74nsanv50lf350q1m58rjv8wm31yykg992";
-          name = "keydef";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -22143,8 +27587,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    keyfreq = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    keyfreq = callPackage ({ fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "keyfreq";
         version = "1.8";
         src = fetchFromGitHub {
@@ -22153,10 +27600,10 @@
           rev = "f3a96693e2e4c6893198a0223e3f3c648ae09cec";
           sha256 = "1x87mbnzkggx5llh0i0s3sj1nfw7liwnlqc9csya517w4x5mhl8i";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cd7157bad0f3039321b5b279a88e7e4fce895543/recipes/keyfreq";
           sha256 = "1rw6hzmw7h5ngvndy7aa41pq911y2hr9kqc9w4gdd5v2p4ln1qh7";
-          name = "keyfreq";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -22164,8 +27611,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    keymap-utils = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    keymap-utils = callPackage ({ cl-lib ? null
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "keymap-utils";
         version = "3.0.1";
         src = fetchFromGitHub {
@@ -22174,10 +27625,10 @@
           rev = "1ad766dbc111ec78b1a292da97b9bd4856cd2ff7";
           sha256 = "0imx8zp21bm066bzdynvasylrlhw0gr8mpk2bwkz8j1y5lsp54v8";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c03acebf1462dea36c81d4b9ab41e2e5739be3c3/recipes/keymap-utils";
           sha256 = "0nbcwz4nls0pva79lbx91bpzkl38g98yavwkvg2rxbhn9vjbhzs9";
-          name = "keymap-utils";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -22185,8 +27636,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    keyset = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    keyset = callPackage ({ cl-lib ? null
+                          , dash
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "keyset";
         version = "0.1.2";
         src = fetchFromGitHub {
@@ -22195,10 +27651,10 @@
           rev = "25658ef79d26971ce41d9df207dff58d38daa091";
           sha256 = "0z6sgz8nywsd00zaayafwy5hfi7kzxfifjkfr5cn1l7wlypyksfv";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7bad8a1f1b94fbfbde5d8035f7e22431e64a9eec/recipes/keyset";
           sha256 = "1kfw0pfb6qm2ji1v0kb8xgz8q2yd2k9kxmaz5vxcdixdlax3xiqg";
-          name = "keyset";
+          name = "recipe";
         };
         packageRequires = [ cl-lib dash ];
         meta = {
@@ -22206,8 +27662,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    kibit-helper = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    kibit-helper = callPackage ({ emacs
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild
+                                , s }:
+      melpaBuild {
         pname = "kibit-helper";
         version = "0.1.1";
         src = fetchFromGitHub {
@@ -22216,10 +27677,10 @@
           rev = "ec5f154db3bb0c838e86f527353f08644cede926";
           sha256 = "0ky167xh1hrmqsldybzjhyqjizgjzs1grn5mf8sm2j9qwcvjw2zv";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f7fee551ca9ed226f1285dffe87027e1e1047f65/recipes/kibit-helper";
           sha256 = "15viybjqksylvm5ash2kzsil0cpdka56wj1rryixa8y1bwlj8y4s";
-          name = "kibit-helper";
+          name = "recipe";
         };
         packageRequires = [ emacs s ];
         meta = {
@@ -22227,8 +27688,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    kill-or-bury-alive = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    kill-or-bury-alive = callPackage ({ cl-lib ? null
+                                      , emacs
+                                      , fetchFromGitHub
+                                      , fetchurl
+                                      , lib
+                                      , melpaBuild }:
+      melpaBuild {
         pname = "kill-or-bury-alive";
         version = "0.1.3";
         src = fetchFromGitHub {
@@ -22237,10 +27703,10 @@
           rev = "51daf55565034b8cb6aa3ca2aa0a827e31751041";
           sha256 = "1qbdxjni1brhsw6m4cvd2jjaf3y8v3fkbxxf0pvsb089mkpi7mpq";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/25016ed09b6333bd79b989a8f6b7b03cd92e08b3/recipes/kill-or-bury-alive";
           sha256 = "0mm0m8hpy5v98cap4f0s38dcviirm7s6ra4l94mknyvnx0f73lz8";
-          name = "kill-or-bury-alive";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -22248,8 +27714,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    kill-ring-search = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    kill-ring-search = callPackage ({ fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "kill-ring-search";
         version = "1.1";
         src = fetchFromGitHub {
@@ -22258,10 +27727,10 @@
           rev = "3a5bc1767f742c91aa788df79ecec836a0946edb";
           sha256 = "0axvhikhg4fikiz4ifg0p4a5ygphbpjs0wd0gcbx29n0y54d1i93";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/kill-ring-search";
           sha256 = "1jggi6r5j2dr9y17v4cyskc0wydfdpqgp1pib5dr2kg6n6w0s5xl";
-          name = "kill-ring-search";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -22269,8 +27738,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    killer = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    killer = callPackage ({ fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "killer";
         version = "0.2.2";
         src = fetchFromGitHub {
@@ -22279,10 +27751,10 @@
           rev = "52256640aebbb8c25f8527843c2425b848031cd8";
           sha256 = "0imylcaiwpzvvb3g8kpsna1vk7v7bwdjfcsa98i41m1rv9yla86l";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bd8c3ec8fa272273128134dea96c0c999a524549/recipes/killer";
           sha256 = "10z4vqwrpss7mk0gq8xdsbsl0qibpp7s1g0l8wlmrsgn6kjkr2ma";
-          name = "killer";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -22290,20 +27762,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    kivy-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    kivy-mode = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "kivy-mode";
-        version = "1.10.0";
+        version = "1.10.1";
         src = fetchFromGitHub {
           owner = "kivy";
           repo = "kivy";
-          rev = "a4116a58d7c5448a4c6615021302375cbe3e129a";
-          sha256 = "070ybsn66spb82jp1fzrnkn6xlbn7jn8zprmxkz8jv0lf5lg6ggk";
+          rev = "0c63c698fdf3f283581dcb53f2909a0bf7ab2737";
+          sha256 = "0jn16i7qnf80irxi149cfn8z38czii8paazfs8mz1qzgmx2ycj2i";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/688e2a114073958c413e56e1d117d48db9d16fb8/recipes/kivy-mode";
           sha256 = "02l230rwivr7rbiqm4vg70458z35f9v9w3mdapcrqd5d07y5mvi1";
-          name = "kivy-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -22311,8 +27786,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    kiwix = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    kiwix = callPackage ({ cl-lib ? null
+                         , emacs
+                         , fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "kiwix";
         version = "0.4.0";
         src = fetchFromGitHub {
@@ -22321,10 +27801,10 @@
           rev = "b84a5ff33efdf13dda22ed32ea37a09b15cd1690";
           sha256 = "07nb141hxjabin8vr14hpn80vzrjaq1b3h6p76m0bwxvzbi8765r";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/kiwix";
           sha256 = "0x5ld557kxzx5s8ziy5axgvm1fxlq81l9gvinfgs8f257vjlki07";
-          name = "kiwix";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -22332,20 +27812,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    know-your-http-well = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    know-your-http-well = callPackage ({ fetchFromGitHub
+                                       , fetchurl
+                                       , lib
+                                       , melpaBuild }:
+      melpaBuild {
         pname = "know-your-http-well";
         version = "0.5.0";
         src = fetchFromGitHub {
           owner = "for-GET";
           repo = "know-your-http-well";
-          rev = "c381a9735f3ea86ebc9667e35cdfeab0b67fefb7";
-          sha256 = "1lppggnii2r9fvlhh33gbdrwb50za8lnalavlq9s86ngndn4n94k";
+          rev = "ab8cf84ad8031ff85b983c528ebb7117dc784aad";
+          sha256 = "19qky551arnb7gl7w0yp54kkdls03m9wn9bxnr7hm5nv1bml2y64";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2ab50ae6278022281b2b7297c086089e5e669c7a/recipes/know-your-http-well";
           sha256 = "0k2x0ajxkivim8nfpli716y7f4ssrmvwi56r94y34x4j3ib3px3q";
-          name = "know-your-http-well";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -22353,20 +27836,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    ksp-cfg-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ksp-cfg-mode = callPackage ({ cl-lib ? null
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "ksp-cfg-mode";
-        version = "0.5";
+        version = "0.5.1";
         src = fetchFromGitHub {
           owner = "lashtear";
           repo = "ksp-cfg-mode";
-          rev = "713a22ee28688e581ec3ad60228c853b516a14b6";
-          sha256 = "04r8mfsc349wdhx1brlf2l54v4dn58y69fqv3glhvml12962lwy3";
+          rev = "fda64705f605fb8fccee53a5040fe4865ca17d44";
+          sha256 = "19brscxk85cky2kzwyyljz6xqrfvyyyg7dqmadlnlrf8kw9wnb2x";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d49db5938fa4e3ab1176a955a4788b15c63d9e69/recipes/ksp-cfg-mode";
           sha256 = "0azcn4qvziacbw1qy33fwdaldw7xpzr672vzjsqhr0b2vg9m2ipi";
-          name = "ksp-cfg-mode";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -22374,8 +27861,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    kubernetes = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }:
-    melpaBuild {
+    kubernetes = callPackage ({ dash
+                              , emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , magit
+                              , melpaBuild }:
+      melpaBuild {
         pname = "kubernetes";
         version = "0.12.0";
         src = fetchFromGitHub {
@@ -22384,10 +27877,10 @@
           rev = "d4ce5eb5da1ea0879b7d3266d97aecc8aee2807c";
           sha256 = "1asjmxw24bvaapjaljj37pv9cbvqqw7577q1mds4lnicvnbdsxzi";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/16850227ea48f6f38102b9cdf80e0758766a24d2/recipes/kubernetes";
           sha256 = "06357a8y3rpvid03r9vhmjgq97hmiah5g8gff32dij9424vidil9";
-          name = "kubernetes";
+          name = "recipe";
         };
         packageRequires = [ dash emacs magit ];
         meta = {
@@ -22395,8 +27888,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    kubernetes-evil = callPackage ({ evil, fetchFromGitHub, fetchurl, kubernetes, lib, melpaBuild }:
-    melpaBuild {
+    kubernetes-evil = callPackage ({ evil
+                                   , fetchFromGitHub
+                                   , fetchurl
+                                   , kubernetes
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "kubernetes-evil";
         version = "0.12.0";
         src = fetchFromGitHub {
@@ -22405,10 +27903,10 @@
           rev = "d4ce5eb5da1ea0879b7d3266d97aecc8aee2807c";
           sha256 = "1asjmxw24bvaapjaljj37pv9cbvqqw7577q1mds4lnicvnbdsxzi";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/16850227ea48f6f38102b9cdf80e0758766a24d2/recipes/kubernetes-evil";
           sha256 = "12ygfs6g9aivf2ws3lxwjm5xnd2kidhli889icpygd5v7gnk9pg8";
-          name = "kubernetes-evil";
+          name = "recipe";
         };
         packageRequires = [ evil kubernetes ];
         meta = {
@@ -22416,8 +27914,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    kurecolor = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    kurecolor = callPackage ({ emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild
+                             , s }:
+      melpaBuild {
         pname = "kurecolor";
         version = "1.2.6";
         src = fetchFromGitHub {
@@ -22426,10 +27929,10 @@
           rev = "a27153f6a01f38226920772dc4917b73166da5e6";
           sha256 = "04av67q5841jli6rp39hav3a5gr2vcf3db4qsv553i23ffplb955";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/58a5ebdbf82e83e6602161bca049d468887abe02/recipes/kurecolor";
           sha256 = "0q0q0dfv376h7j3sgwxqwfpxy1qjbvb6i5clsxz9xp4ly89w4d4f";
-          name = "kurecolor";
+          name = "recipe";
         };
         packageRequires = [ emacs s ];
         meta = {
@@ -22437,8 +27940,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    labburn-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    labburn-theme = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "labburn-theme";
         version = "1.0.0";
         src = fetchFromGitHub {
@@ -22447,10 +27953,10 @@
           rev = "bfa1d9f1c7e107cb45754fe57e4e72a9be70e9d1";
           sha256 = "1r221fwfigr6fk4p3xh00wgw9wxm2gpzvj17jf5pgd7cvyspchsy";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b1bfc9870fbe61f58f107b72fd7f16efba22c902/recipes/labburn-theme";
           sha256 = "09qqb62hfga88zka0pc27rc8i43cxi84cv1x8wj0vvzx6mvic1lm";
-          name = "labburn-theme";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -22458,8 +27964,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    langtool = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    langtool = callPackage ({ cl-lib ? null
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "langtool";
         version = "2.0.0";
         src = fetchFromGitHub {
@@ -22468,10 +27978,10 @@
           rev = "d93286722cff3fecf8641a4a6c3b0691f30362fe";
           sha256 = "17xa055705n4jb7nafqvqgl0a6fdaxp3b3q8q0gsv5vzycsc74ga";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/503845e79e67c921f1fde31447f3dd4da2b6f993/recipes/langtool";
           sha256 = "1xq70jyhzg0qmvialy015crbdk9rdibhwpl36khab9hi2999wxyw";
-          name = "langtool";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -22479,8 +27989,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    latex-extra = callPackage ({ auctex, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    latex-extra = callPackage ({ auctex
+                               , cl-lib ? null
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "latex-extra";
         version = "1.14";
         src = fetchFromGitHub {
@@ -22489,10 +28004,10 @@
           rev = "82d99b8b0c2db20e5270749582e03bcc2443ffb5";
           sha256 = "15m7zvdhg5z7d8alrw66p703wdp5r57lxrgq3zz7xc4hscwghlb1";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/latex-extra";
           sha256 = "1w98ngxymafigjpfalybhs12jcf4916wk4nlxflfjcx8ryd9wjcj";
-          name = "latex-extra";
+          name = "recipe";
         };
         packageRequires = [ auctex cl-lib ];
         meta = {
@@ -22500,20 +28015,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    latex-math-preview = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    latex-math-preview = callPackage ({ fetchFromGitLab
+                                      , fetchurl
+                                      , lib
+                                      , melpaBuild }:
+      melpaBuild {
         pname = "latex-math-preview";
         version = "0.7.2";
         src = fetchFromGitLab {
           owner = "latex-math-preview";
           repo = "latex-math-preview";
           rev = "c1c87c4c5501f98b97af19f7e3454a2369265edc";
-          sha256 = "1mp6bpl8992pi40vs6b86q922h4z8879mrjalldv5dyz57ym5fsq";
+          sha256 = "118xrgrnwsmsysmframf6bmb0gkrdrm3jbkgivzxs41cw92fhbzw";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9e413b7684e9199510b00035825aa861d670e072/recipes/latex-math-preview";
           sha256 = "14bn0q5czrrkb1vjdkwx6f2x4zwjkxgrc0bcncv23l13qls1gkmr";
-          name = "latex-math-preview";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -22521,8 +28039,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    latex-unicode-math-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    latex-unicode-math-mode = callPackage ({ fetchFromGitHub
+                                           , fetchurl
+                                           , lib
+                                           , melpaBuild }:
+      melpaBuild {
         pname = "latex-unicode-math-mode";
         version = "0.3.1";
         src = fetchFromGitHub {
@@ -22531,10 +28052,10 @@
           rev = "3b82347291edcb32e4062b0048c367a3079b3e8c";
           sha256 = "1xylfg8xpyb2m0qnysf58cl05ibbg4drhgq7msiiql2qrdzvpx9f";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9c021dfad8928c1a352e0ef5526eefa6c0a9cb37/recipes/latex-unicode-math-mode";
           sha256 = "1p9gpp28vylibv1s95bzfgscznw146ybgk6f3qdbbnafrcrmifcr";
-          name = "latex-unicode-math-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -22542,20 +28063,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    lcb-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    lcb-mode = callPackage ({ emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "lcb-mode";
         version = "0.1.1";
         src = fetchFromGitHub {
           owner = "peter-b";
           repo = "lcb-mode";
-          rev = "be0768e9aa6f9b8e76f2230f4f7f4d152a766b9a";
-          sha256 = "0mgcqqhjadm8ckp6x37f9j4xcs61g73m9v8qr4zbw115yci2d0xk";
+          rev = "e5b0b6ca6c5feeb2502d66a760ddf5bb590d04c4";
+          sha256 = "0i58qz4l5rzwp9kx4r9f818ly21ys71zh1zjxppp220p3yydljfq";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fd1380a9ba363f62f297e3ab2995341258b51fd1/recipes/lcb-mode";
           sha256 = "184vd5ll0ms2lspzv8zz2zbairsr8i9p3gs28hrnnwm6mrpx4n18";
-          name = "lcb-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -22563,8 +28088,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    lcr = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    lcr = callPackage ({ dash
+                       , emacs
+                       , fetchFromGitHub
+                       , fetchurl
+                       , lib
+                       , melpaBuild }:
+      melpaBuild {
         pname = "lcr";
         version = "0.9";
         src = fetchFromGitHub {
@@ -22573,10 +28103,10 @@
           rev = "3bc341205bba437c8fec4fefefaf39793c0405ae";
           sha256 = "0jvdnb3fn33wq7ixb7ayrallq1j5gc9nh3i3nmy03yg11h60h1am";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/29374d3da932675b7b3e28ab8906690dad9c9cbe/recipes/lcr";
           sha256 = "07syirjlrw8g95zk273953mnmg9x4bv8jpyvvzghhin4saiiiw3k";
-          name = "lcr";
+          name = "recipe";
         };
         packageRequires = [ dash emacs ];
         meta = {
@@ -22584,8 +28114,18 @@
           license = lib.licenses.free;
         };
       }) {};
-    leanote = callPackage ({ async, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pcache, request, s }:
-    melpaBuild {
+    leanote = callPackage ({ async
+                           , cl-lib ? null
+                           , emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , let-alist
+                           , lib
+                           , melpaBuild
+                           , pcache
+                           , request
+                           , s }:
+      melpaBuild {
         pname = "leanote";
         version = "0.4.0";
         src = fetchFromGitHub {
@@ -22594,10 +28134,10 @@
           rev = "1bd49fdf13ef707bae7edaa724a1592aa7fb002f";
           sha256 = "1k58rhk5p819cvfa6zg7j3ysvzhq6dc433fzhh1ff0gwga2vrqbz";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b00b806ae4562ca5a74f41c12ef35bfa597bcfa8/recipes/leanote";
           sha256 = "1xnfv7bpkw3ir402962zbp856d56nas098nkf7bamnsnax6kkqw7";
-          name = "leanote";
+          name = "recipe";
         };
         packageRequires = [ async cl-lib emacs let-alist pcache request s ];
         meta = {
@@ -22605,8 +28145,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    ledger-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ledger-mode = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "ledger-mode";
         version = "3.1.1";
         src = fetchFromGitHub {
@@ -22615,10 +28158,10 @@
           rev = "96c4e81eed52e0ef514dc15a6ea6d877b3409a2a";
           sha256 = "12q6wblwnb6y5c1882jz14742fqbm6p5jpzlvz7p90ylqfl7h989";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1549048b6f57fbe9d1f7fcda74b78a7294327b7b/recipes/ledger-mode";
           sha256 = "10asbcb5syv3b75bngsab3c84dp2xmc0q7s29im6kf4mzv5zcfcf";
-          name = "ledger-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -22626,8 +28169,16 @@
           license = lib.licenses.free;
         };
       }) {};
-    lentic = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, m-buffer, melpaBuild, s }:
-    melpaBuild {
+    lentic = callPackage ({ dash
+                          , emacs
+                          , f
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , m-buffer
+                          , melpaBuild
+                          , s }:
+      melpaBuild {
         pname = "lentic";
         version = "0.11";
         src = fetchFromGitHub {
@@ -22636,10 +28187,10 @@
           rev = "8655ecd51e189bbdd6a4d8405dc3ea2e689c709a";
           sha256 = "04h6vk7w25yp4kzkwqnsmc59bm0182qqkyk5nxm3a1lv1v1590lf";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cbb6f9cc3c1040b80fbf3f2df2ac2c3c8d18b6b1/recipes/lentic";
           sha256 = "0y94y1qwj23kqp491b1fzqsrjak96k1dmmzmakbl7q8vc9bncl5m";
-          name = "lentic";
+          name = "recipe";
         };
         packageRequires = [ dash emacs f m-buffer s ];
         meta = {
@@ -22647,8 +28198,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    less-css-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    less-css-mode = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "less-css-mode";
         version = "0.21";
         src = fetchFromGitHub {
@@ -22657,10 +28211,10 @@
           rev = "59bf174c4e9f053ec2a7ef8c8a8198490390f6fb";
           sha256 = "1rkjamdy2a80w439vb2hhr7vqjj47wi2azlr7yq2xdz9851xsx9f";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/less-css-mode";
           sha256 = "188iplnwwhawq3dby3388kimy0jh1k9r8v9nxz52hy9rhh9hykf8";
-          name = "less-css-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -22668,8 +28222,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    letcheck = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    letcheck = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "letcheck";
         version = "0.4";
         src = fetchFromGitHub {
@@ -22678,10 +28235,10 @@
           rev = "e85b185993a2eaeec6490709f4c131fde2edd672";
           sha256 = "1l9qjmyb4a3f6i2iimpmjczbx890cd1p24n941s13sg67xfbm7hn";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d6a0937f704e33bbb9ea8f101cd87c44e8050afb/recipes/letcheck";
           sha256 = "1sjwi1ldg6b1qvj9cvfwxq3qlkfas6pm8zasf43baljmnz38mxh2";
-          name = "letcheck";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -22689,8 +28246,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    lfe-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    lfe-mode = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "lfe-mode";
         version = "1.3";
         src = fetchFromGitHub {
@@ -22699,10 +28259,10 @@
           rev = "af14b1439097850ffa39935419ed83f5bcaa6d09";
           sha256 = "0pgwi0h0d34353m39jin8dxw4yykgfcg90k6pc4qkjyrg40hh4l6";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c44bdb00707c9ef90160e0a44f7148b480635132/recipes/lfe-mode";
           sha256 = "0smncyby53ipm8yqslz88sqjafk0x6r8d0qwk4wzk0pbgfyklhgs";
-          name = "lfe-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -22710,20 +28270,50 @@
           license = lib.licenses.free;
         };
       }) {};
-    libmpdel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    libelcouch = callPackage ({ emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild
+                              , request }:
+      melpaBuild {
+        pname = "libelcouch";
+        version = "0.8.0";
+        src = fetchFromGitHub {
+          owner = "DamienCassou";
+          repo = "libelcouch";
+          rev = "1396144ebbb9790d4c744db0d4aacc0211b8e8e6";
+          sha256 = "1r0wrqiqar3jw5xbp1qv7kj7m1fdzciyy9690hwiq99dcm8nlri3";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/209d5c507cfe42b152c21a4534c3ba549186420f/recipes/libelcouch";
+          sha256 = "1zfjyfyjd59z0ns32v2b0r5g9ypjxrlmkx3djmxsmzd4an8ciq3p";
+          name = "recipe";
+        };
+        packageRequires = [ emacs request ];
+        meta = {
+          homepage = "https://melpa.org/#/libelcouch";
+          license = lib.licenses.free;
+        };
+      }) {};
+    libmpdel = callPackage ({ emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "libmpdel";
-        version = "0.5.0";
+        version = "0.7.0";
         src = fetchFromGitHub {
           owner = "mpdel";
           repo = "libmpdel";
-          rev = "abb748b6cb35de4652df80ce8539bfc63189619d";
-          sha256 = "0ccqcn85131pywzga4644f0azxrsl5ay69m6jz27zzvshs7gzzjv";
+          rev = "fcc719c2f23df4b5838eab76a40fef11055203de";
+          sha256 = "0qw6rrb16bbhwg1gci4ymn2nshzf21lcf2nyphxbn4vcv400cw4k";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bb25443752e18e47afc63d5497cc5052c388a607/recipes/libmpdel";
           sha256 = "0qi9g3czwzi9hhp7gjczpzjx9vgzz52xi91332l0sxcxmwbawjp1";
-          name = "libmpdel";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -22731,8 +28321,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    lice = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    lice = callPackage ({ fetchFromGitHub
+                        , fetchurl
+                        , lib
+                        , melpaBuild }:
+      melpaBuild {
         pname = "lice";
         version = "0.2";
         src = fetchFromGitHub {
@@ -22741,10 +28334,10 @@
           rev = "69f2d87984f3f3d469db35e241fbbe979384cd03";
           sha256 = "0hi8s20vw4a5i5n5jlm5dzgsl1qpfyqbpskqszjls1xrrf3dd4zl";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2508699ebfc846742940c5e4356b095b540e2405/recipes/lice";
           sha256 = "1hv2hz3153x0gk7f2js18dbx5pyprfdf2pfxb658fj16vxpp7y6x";
-          name = "lice";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -22752,20 +28345,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    line-up-words = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    line-up-words = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "line-up-words";
         version = "1.0.0";
         src = fetchFromGitHub {
           owner = "janestreet";
           repo = "line-up-words";
-          rev = "54d2c51c1c3da7e06be47b829bf465bf467ab53f";
-          sha256 = "0qda9i5yjjf2x5cpg6nxkzqwa8fzzjxk0yyc4295kbawwd83vglr";
+          rev = "8de4f19b24caed1ca409925a93fef2625c84fe87";
+          sha256 = "1qdn24zan6iiai7cfzxn4x8jslb52yhz83mpgmv4932yk4pfcmsd";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/28ac7764a19fee2e1e2a89d95569815f1940c5e4/recipes/line-up-words";
           sha256 = "0agsrrkwwfmbiy4z3g4hkrpfr3nqgd5lwfn18qrdxynijd5rqs79";
-          name = "line-up-words";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -22773,8 +28369,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    lingr = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    lingr = callPackage ({ fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "lingr";
         version = "0.2";
         src = fetchFromGitHub {
@@ -22783,10 +28382,10 @@
           rev = "c9c20dd9b4967aa2f8873d6890d6797e6a498d23";
           sha256 = "11sw43z5b0vypmhi0yysf2bxjy8fqpzl61y503jb7nhcfywmfkys";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bf5d29710ab17b1a98f9b559344e4dd40a2b9c08/recipes/lingr";
           sha256 = "1445bxiirsxl9kgm0j86xc9d0pbaa5f07c1i66pw2vl40bvhrjff";
-          name = "lingr";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -22794,20 +28393,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    link = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    link = callPackage ({ fetchFromGitHub
+                        , fetchurl
+                        , lib
+                        , melpaBuild }:
+      melpaBuild {
         pname = "link";
         version = "1.10";
         src = fetchFromGitHub {
           owner = "myrkr";
           repo = "dictionary-el";
-          rev = "9ef1672ecd367827381bbbc9af93685980083c5c";
-          sha256 = "05xfgn9sabi1ykk8zbk2vza1g8pdrg08j5cb58f50nda3q8ndf4s";
+          rev = "a5ef20b2c32457880827ceda58f927ad9a26d2b7";
+          sha256 = "0ahn0v6qdfwvv9n0m6jcgrzmyarbsbvpgq8g4qy2g37ak4j60hp7";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5b08ed7b90e3283e177eff57cb02b12a093dc258/recipes/link";
           sha256 = "17jpsg3f2954b740vyj37ikygrg5gmp0bjhbid8bh8vbz7xx9zy8";
-          name = "link";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -22815,8 +28417,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    link-hint = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    link-hint = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "link-hint";
         version = "0.1";
         src = fetchFromGitHub {
@@ -22836,8 +28441,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    linum-relative = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    linum-relative = callPackage ({ fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "linum-relative";
         version = "0.6";
         src = fetchFromGitHub {
@@ -22846,10 +28454,10 @@
           rev = "896df4b40c1e1eb59f55fcee48a1543f0ccd724e";
           sha256 = "0b3n1gk2w1p72x0zfdz9l70winq2fnjpjrgq0awxx730xk7ypp5n";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/97ae01be4892a7c35aa0f82213433a2944041d87/recipes/linum-relative";
           sha256 = "0s1lc3lppazv0481dxknm6qrxhvkv0r9hw8xmdrpjc282l91whkj";
-          name = "linum-relative";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -22857,8 +28465,17 @@
           license = lib.licenses.free;
         };
       }) {};
-    lispy = callPackage ({ ace-window, emacs, fetchFromGitHub, fetchurl, hydra, iedit, lib, melpaBuild, multiple-cursors, swiper }:
-    melpaBuild {
+    lispy = callPackage ({ ace-window
+                         , emacs
+                         , fetchFromGitHub
+                         , fetchurl
+                         , hydra
+                         , iedit
+                         , lib
+                         , melpaBuild
+                         , multiple-cursors
+                         , swiper }:
+      melpaBuild {
         pname = "lispy";
         version = "0.26.0";
         src = fetchFromGitHub {
@@ -22867,10 +28484,10 @@
           rev = "7756a8fbbadbebbd5e20768569ed92ad6c402c5c";
           sha256 = "05iqhnhj61f30yk4ih63rimmyp134gyq18frc8qgrnwym64dsm6l";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e23c062ff32d7aeae486c01e29c56a74727dcf1d/recipes/lispy";
           sha256 = "12qk2gpwzz7chfz7x3wds39r4iiipvcw2rjqncir46b6zzlb1q0g";
-          name = "lispy";
+          name = "recipe";
         };
         packageRequires = [
           ace-window
@@ -22885,8 +28502,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    lispyscript-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    lispyscript-mode = callPackage ({ fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "lispyscript-mode";
         version = "0.3.5";
         src = fetchFromGitHub {
@@ -22895,10 +28515,10 @@
           rev = "9a4200085e2a15725a58616d131a56f5edce214b";
           sha256 = "0qyj04p63fdh3iasp5cna1z5fhibmfyl9lvwyh22ajzsfbr3nhnk";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bf912fa20edc9cff12645381b303e37f2de14976/recipes/lispyscript-mode";
           sha256 = "02biai45l5xl2m9l1drphrlj6r01msmadhyg774ijdk1x4gm5nhr";
-          name = "lispyscript-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -22906,8 +28526,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    list-packages-ext = callPackage ({ fetchFromGitHub, fetchurl, ht, lib, melpaBuild, persistent-soft, s }:
-    melpaBuild {
+    list-packages-ext = callPackage ({ fetchFromGitHub
+                                     , fetchurl
+                                     , ht
+                                     , lib
+                                     , melpaBuild
+                                     , persistent-soft
+                                     , s }:
+      melpaBuild {
         pname = "list-packages-ext";
         version = "0.1.0";
         src = fetchFromGitHub {
@@ -22916,10 +28542,10 @@
           rev = "344719b313c208c644490f8f1130e21405402f05";
           sha256 = "197cqkiwxgamhfwbc8h492cmjll3fypkwzcphj26dfnr22v63kwq";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/71c217d98c6967d979f57f89ca26200304b0fc37/recipes/list-packages-ext";
           sha256 = "15m4888fm5xv697y7jspghg1ra49fyrny4y2x7h8ivcbslvpglvk";
-          name = "list-packages-ext";
+          name = "recipe";
         };
         packageRequires = [ ht persistent-soft s ];
         meta = {
@@ -22927,8 +28553,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    list-unicode-display = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    list-unicode-display = callPackage ({ cl-lib ? null
+                                        , fetchFromGitHub
+                                        , fetchurl
+                                        , lib
+                                        , melpaBuild }:
+      melpaBuild {
         pname = "list-unicode-display";
         version = "0.1";
         src = fetchFromGitHub {
@@ -22937,10 +28567,10 @@
           rev = "59770cf3572bd36c3e9ba044846dc420c0dca09b";
           sha256 = "05nn4db8s8h4mn3fxhwsa111ayvlq1raf6bifh7jciyw7a2c3aww";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0c8e2a974a56665b97d7622b0428994edadc88a0/recipes/list-unicode-display";
           sha256 = "01x9i5k5vhjscmkx0l6r27w1cdp9n6xk1pdjf98z3y88dnsmyfha";
-          name = "list-unicode-display";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -22948,8 +28578,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    list-utils = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    list-utils = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "list-utils";
         version = "0.4.4";
         src = fetchFromGitHub {
@@ -22958,10 +28591,10 @@
           rev = "acf18aca1131a90f8d673974673e3c5d8fdc6a86";
           sha256 = "0ql159v7sxs33yh2l080kchrj52vk34knz50cvqi3ykpb7djg3sz";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f9fcd716cbb9f5a4de82a49e57bcb20c483d05f6/recipes/list-utils";
           sha256 = "0bknprr4jb1d20i9lj2aa17vpg1kqwdyzzwmy1kfydnkpf5scnr3";
-          name = "list-utils";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -22969,20 +28602,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    lit-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    lit-mode = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "lit-mode";
         version = "0.1.1";
         src = fetchFromGitHub {
           owner = "HectorAE";
           repo = "lit-mode";
-          rev = "c61c403afc8333a5649c5421ab1a6341dc1c7d92";
-          sha256 = "0mr0king5dj20vdycpszxnfs9ch808fhcz3q7svxfngj3d3671wd";
+          rev = "bfecbe898223393f34340ca379977be753ee497a";
+          sha256 = "1sjyb5v3s9z128ifjqx7a1dsgds2iz185y82581qxakl7ylmn15k";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7a6a1c79c9bba7b17c150ea0663bc61936f15d83/recipes/lit-mode";
           sha256 = "05rf7ki060nqnvircn0dkpdrg7xbh7phb8bqgsab89ycc7l9vv59";
-          name = "lit-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -22990,8 +28626,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    literal-string = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, markdown-mode, melpaBuild }:
-    melpaBuild {
+    literal-string = callPackage ({ emacs
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , markdown-mode
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "literal-string";
         version = "0.1";
         src = fetchFromGitHub {
@@ -23000,10 +28641,10 @@
           rev = "46dd2b620df70d681261616f1a26afa4a032e2d5";
           sha256 = "02a1jvxk2m1lb21p3281cr9xyhzix31cn8a9la53w90sz569i66r";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6519bb53f409eeb0d557809b338849e473c193c4/recipes/literal-string";
           sha256 = "0ylv9dpw17w272f92vn5cldklyz1d8daihi1fsh5ylvxqpinyrkn";
-          name = "literal-string";
+          name = "recipe";
         };
         packageRequires = [ emacs markdown-mode ];
         meta = {
@@ -23011,8 +28652,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    literate-coffee-mode = callPackage ({ coffee-mode, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    literate-coffee-mode = callPackage ({ coffee-mode
+                                        , fetchFromGitHub
+                                        , fetchurl
+                                        , lib
+                                        , melpaBuild }:
+      melpaBuild {
         pname = "literate-coffee-mode";
         version = "0.4";
         src = fetchFromGitHub {
@@ -23021,10 +28666,10 @@
           rev = "39fe3bfa1f68a7b8b91160875589219b214a2cd6";
           sha256 = "1fh9wrw5irn0g3dy8gkk63csdcxgi3w2038mxx3sk6ki3r2bmhw8";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/literate-coffee-mode";
           sha256 = "18fdgay7xfgza75z3xma666f414m9dn7d50w94wzzmv7ja74sp64";
-          name = "literate-coffee-mode";
+          name = "recipe";
         };
         packageRequires = [ coffee-mode ];
         meta = {
@@ -23032,8 +28677,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    live-code-talks = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, narrowed-page-navigation }:
-    melpaBuild {
+    live-code-talks = callPackage ({ cl-lib ? null
+                                   , emacs
+                                   , fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild
+                                   , narrowed-page-navigation }:
+      melpaBuild {
         pname = "live-code-talks";
         version = "0.2.1";
         src = fetchFromGitHub {
@@ -23042,10 +28693,10 @@
           rev = "3a2ecdb49b2651d87999d4cad56ba8f1004c7a99";
           sha256 = "1cwydbhhbs5v9y2s872zxc5lflqmfrdvnc8xz0qars52d7lg4br5";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/live-code-talks";
           sha256 = "1ji4lww71dqxnn5c9inix8xqcmgc76wbps0ylxhhgs44ki4hlyrm";
-          name = "live-code-talks";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs narrowed-page-navigation ];
         meta = {
@@ -23053,8 +28704,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    live-py-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    live-py-mode = callPackage ({ emacs
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "live-py-mode";
         version = "2.22.0";
         src = fetchFromGitHub {
@@ -23063,10 +28718,10 @@
           rev = "ab2f9bea32dbad11a6464a4880e5487645a0f65a";
           sha256 = "0w3kpszsrh0gj0a62iqhnhm3flmmgq0pl0d6w5r61mvlq9wck5dv";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c7615237e80b46b5c50cb51a3ed5b07d92566fb7/recipes/live-py-mode";
           sha256 = "0yn1a0gf9yn068xifpv8p77d917mnalc56pll800zlpsdk8ljicq";
-          name = "live-py-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -23074,8 +28729,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    lively = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    lively = callPackage ({ fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "lively";
         version = "0.2";
         src = fetchFromGitHub {
@@ -23084,10 +28742,10 @@
           rev = "6ec648fcde85e81393db1ed1364860f960179c92";
           sha256 = "06sdaj2akwjg1a7yvmm3gsip66iaq9bhm3gr45szwg6z622q4gvf";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3e4b01286dbc84f01b43955b693ca08e675ffa07/recipes/lively";
           sha256 = "1q8cbl3sr3dpvzk57985giy4xmz4lvg94jcw7shbhz1v9q05dr5g";
-          name = "lively";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -23095,8 +28753,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    lms = callPackage ({ emacs, fetchhg, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    lms = callPackage ({ emacs
+                       , fetchhg
+                       , fetchurl
+                       , lib
+                       , melpaBuild }:
+      melpaBuild {
         pname = "lms";
         version = "0.7";
         src = fetchhg {
@@ -23115,8 +28777,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    load-relative = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    load-relative = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "load-relative";
         version = "1.0";
         src = fetchFromGitHub {
@@ -23125,10 +28790,10 @@
           rev = "15ffaa9ebf1b7bbfcc307d1716eec135253b3b8d";
           sha256 = "1fq4bnngbh9a18hq8mvnqkzs74k3g4c0lmwsncbhy6n21njv3kdy";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f052f201f7c308325c27cc2423e85cf6b9b67b4e/recipes/load-relative";
           sha256 = "0j8ybbjzhzgjx47pqqdbsqi8n6pzqcf6zqc38x7cf1kkklgc87ay";
-          name = "load-relative";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -23136,20 +28801,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    loc-changes = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    loc-changes = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "loc-changes";
         version = "1.1";
         src = fetchFromGitHub {
           owner = "rocky";
           repo = "emacs-loc-changes";
-          rev = "8447baff7cb4839ef8d1d747a14e5da85d0cee5b";
-          sha256 = "1089sbx20r30sis39vwy29fxhb2n3hh35rdv09lpzdxdq01s8wwp";
+          rev = "2a0cf1a5890a8937089e4e10f383f4d40c3ac587";
+          sha256 = "0xjnpwj0hddpcl2jd6xk64g32djs6xnnms9bhmxs25p894aa40py";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5ce68d573d19f26ecfd190f8e6cd1f384ca3e8a/recipes/loc-changes";
           sha256 = "1akgij61b2ixpkchrriabwvx68cg4v5r5w9ncjrjh91hskjprfxh";
-          name = "loc-changes";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -23157,20 +28825,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    log4e = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    log4e = callPackage ({ fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "log4e";
         version = "0.3.0";
         src = fetchFromGitHub {
           owner = "aki2o";
           repo = "log4e";
-          rev = "6592682ab7de0e3d1915aa4d3c53e083be79fbeb";
-          sha256 = "1l28n7a0v2zkknc70i1wn6qb5i21dkhfizzk8wcj28v44cgzk022";
+          rev = "ec74a535796c74310c0fbbb9002595d322d03192";
+          sha256 = "0ws87an0a591pdqk4y3b9xlbgv1lk7qsyviqv0khj0m49dy68w81";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/90d0e451c5a8eb25db95990b058964a9acea4b89/recipes/log4e";
           sha256 = "1klj59dv8k4r0hily489dp12ra5hq1jnsdc0wcakh6zirmakhs34";
-          name = "log4e";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -23178,8 +28849,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    logalimacs = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    logalimacs = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "logalimacs";
         version = "1.0.0";
         src = fetchFromGitHub {
@@ -23188,10 +28862,10 @@
           rev = "cfd7aaa925934f876eee6e8c550cf6e7a239a2ac";
           sha256 = "0g5vq9xy9lwczs77lr91c1srhhfmasnnnmjvgc55hbl6iwmbizbm";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ef9833a5ca4d455f1d33b9367860e2051d60662f/recipes/logalimacs";
           sha256 = "0ai7a01bdi3a0amgi63pwgdp8wgcgx10an4nhc627wgb1cqxb7p6";
-          name = "logalimacs";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -23199,8 +28873,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    logito = callPackage ({ eieio ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    logito = callPackage ({ eieio ? null
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "logito";
         version = "0.1";
         src = fetchFromGitHub {
@@ -23209,10 +28887,10 @@
           rev = "824acb89d2cc18cb47281a4fbddd81ad244a2052";
           sha256 = "0jpyd2f33pk984kg0q9hxdl4615jb7sxsggnb30mpz7a2ws479xr";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/logito";
           sha256 = "0xi7zbxpialsn4pknj8aqmkbiwwsbapwynrrjb8avhli2hd4s3fl";
-          name = "logito";
+          name = "recipe";
         };
         packageRequires = [ eieio ];
         meta = {
@@ -23220,20 +28898,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    logview = callPackage ({ datetime, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    logview = callPackage ({ datetime
+                           , emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "logview";
-        version = "0.9";
+        version = "0.11.1";
         src = fetchFromGitHub {
           owner = "doublep";
           repo = "logview";
-          rev = "9ec279d933923dab2d8d1f140adc43073dab6433";
-          sha256 = "1qhzs75pxnaksbhczmpdcy2zmrqavlzkzss7ik5nv2wf9vs0sn02";
+          rev = "902c881f5e1ca802761b856b3945bd418847dd79";
+          sha256 = "1df41wabldg1ahcbqi5szwml5hqdjm6p3hj5b8ajkkagykrnh8xg";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1df3c11ed7738f32e6ae457647e62847701c8b19/recipes/logview";
           sha256 = "0gks3j5avx8k3427a36lv7gr95id3cylaamgn5qwbg14s54y0vsh";
-          name = "logview";
+          name = "recipe";
         };
         packageRequires = [ datetime emacs ];
         meta = {
@@ -23241,20 +28924,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    loop = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    loop = callPackage ({ fetchFromGitHub
+                        , fetchurl
+                        , lib
+                        , melpaBuild }:
+      melpaBuild {
         pname = "loop";
         version = "1.3";
         src = fetchFromGitHub {
           owner = "Wilfred";
           repo = "loop.el";
-          rev = "c3598bd3ad0677f66e061b3ba51a05d05275283e";
-          sha256 = "1gs95xnmnn8aa4794k7h8mw1sz1nfdh9v0caqj6yvnsdnwy74n5x";
+          rev = "3e175e479a49cf419cb54042449aba0bd6cd9e08";
+          sha256 = "07r6jc6dr6x0s2a6p18ad0m23p7d5dv4w8c5ilkj7vs18dwr1vmv";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ba481ca96469b3bd518e4fd8f24947338c8af014/recipes/loop";
           sha256 = "0pav16kinzljmzx84vfz63fvi39af4628vk1jw79jk0pyg9rjbar";
-          name = "loop";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -23262,8 +28948,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    love-minor-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, lua-mode, melpaBuild }:
-    melpaBuild {
+    love-minor-mode = callPackage ({ fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , lua-mode
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "love-minor-mode";
         version = "1.2";
         src = fetchFromGitHub {
@@ -23272,10 +28962,10 @@
           rev = "3ca8f3405338f2d6f4fbcdd5e89342a46378543a";
           sha256 = "1hwm7yxbwvb27pa35cgcxyjfjdjhk2a33i417q2akc7vppdbcmzh";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0f224c4c7519b3668b1270c957227e486896b7b6/recipes/love-minor-mode";
           sha256 = "1skg039h2hn8dh47ww6n9l776s2yda8ariab4v9f56kb21bncr4m";
-          name = "love-minor-mode";
+          name = "recipe";
         };
         packageRequires = [ lua-mode ];
         meta = {
@@ -23283,20 +28973,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    lsp-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    lsp-mode = callPackage ({ emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "lsp-mode";
-        version = "4.1";
+        version = "4.2";
         src = fetchFromGitHub {
           owner = "emacs-lsp";
           repo = "lsp-mode";
-          rev = "065c36f1fceb6322b7ff8fd4bc623aa0cf6136ba";
-          sha256 = "0129h8h2abc7vcv0h5b2lsr6swa0zq597s5r7zcfj3macga7iifr";
+          rev = "8d20214293637beca0e8d50a864ac4980b9064e8";
+          sha256 = "0l8i5ra5hzbj3r6qw26v7lqjdvc4yb956j2h2nv7ahmd4g5f95np";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-mode";
           sha256 = "0cklwllqxzsvs4wvvvsc1pqpmp9w99m8wimpby6v6wlijfg6y1m9";
-          name = "lsp-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -23304,20 +28998,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    lsp-ocaml = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild }:
-    melpaBuild {
+    lsp-ocaml = callPackage ({ emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , lsp-mode
+                             , melpaBuild }:
+      melpaBuild {
         pname = "lsp-ocaml";
-        version = "0.1.0";
+        version = "0.2.0";
         src = fetchFromGitHub {
           owner = "emacs-lsp";
           repo = "lsp-ocaml";
-          rev = "e826f82929b8a388a90600d3570cf66c020f0b91";
-          sha256 = "1mb912ffw8w5dggxaijz700j2yhzq69fil81gki3r66n077nacmr";
+          rev = "5a8c776b6d75b502703243b3d628fccd813481b0";
+          sha256 = "1431f8r8c4h8jbghggk1s2bwqr1qlxys3d52xsvf35bbk1gki5an";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7be2d7a7af3d744c531e5e018d791bf2566df428/recipes/lsp-ocaml";
           sha256 = "17334qcgqrz4jd5npizyq20fmxy07z2p3pq98s5np2kc4h9ara33";
-          name = "lsp-ocaml";
+          name = "recipe";
         };
         packageRequires = [ emacs lsp-mode ];
         meta = {
@@ -23325,8 +29024,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    lua-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    lua-mode = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "lua-mode";
         version = "20151025";
         src = fetchFromGitHub {
@@ -23335,10 +29037,10 @@
           rev = "bdf121b2c05bc74d3d7961a91d7afeb6176e0f45";
           sha256 = "1qawjd0nbj1c142van7r01pmq74vkzcvnn27jgn79wwhplp9gm99";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ca7bf43ef8893bf04e9658390e306ef69e80a156/recipes/lua-mode";
           sha256 = "0gyi7w2h192h3pmrhq39lxwlwd9qyqs303lnp2655pikdzk9js94";
-          name = "lua-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -23346,8 +29048,86 @@
           license = lib.licenses.free;
         };
       }) {};
-    m-buffer = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, seq }:
-    melpaBuild {
+    lusty-explorer = callPackage ({ fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
+        pname = "lusty-explorer";
+        version = "3.0";
+        src = fetchFromGitHub {
+          owner = "sjbach";
+          repo = "lusty-emacs";
+          rev = "fc4b2f0f8a07db107234490fdfbf72f8b76a6643";
+          sha256 = "014fivh9shi7p3x31bl22x48agrgygp0pf2lgzzflrxcynmprbnp";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/efedaa3b1de5f6406c7dcd842eee42eefaf8ab50/recipes/lusty-explorer";
+          sha256 = "0xqanmmkyvzcg2g4zvascq5j004bqz7vmz1a19c25g9cs3rdh0ps";
+          name = "recipe";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/lusty-explorer";
+          license = lib.licenses.free;
+        };
+      }) {};
+    lv = callPackage ({ fetchFromGitHub
+                      , fetchurl
+                      , lib
+                      , melpaBuild }:
+      melpaBuild {
+        pname = "lv";
+        version = "0.14.0";
+        src = fetchFromGitHub {
+          owner = "abo-abo";
+          repo = "hydra";
+          rev = "a07b92a8755dfb064701210b634e2dc4839552ac";
+          sha256 = "11k0ifmr90vdinibhyqqyqrmpxbn9c5pjpzhr4p66wv6249s540w";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/5114349617617673d5055fe28cb8f8c86cf41f83/recipes/lv";
+          sha256 = "1lkm40rwpj9hmckng9bz5g4jbx9g9i3wlqgl6rq0m6i14syr69v4";
+          name = "recipe";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/lv";
+          license = lib.licenses.free;
+        };
+      }) {};
+    lxc-tramp = callPackage ({ cl-lib ? null
+                             , emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
+        pname = "lxc-tramp";
+        version = "0.1.0";
+        src = fetchFromGitHub {
+          owner = "montag451";
+          repo = "lxc-tramp";
+          rev = "17fc5962e7c27ac4f0bcc4ed7312dd5709063341";
+          sha256 = "03h6aw98mbwwqj08bzpg147hanx97r8fr8jv790zw7iqqjp46hsm";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/2464020a5b3d89bddcd122cad81fed84ded9b117/recipes/lxc-tramp";
+          sha256 = "0rksh7k30kh3i23c98qinffz2zj6h1bshaw994hwy8qwgm38vx61";
+          name = "recipe";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/lxc-tramp";
+          license = lib.licenses.free;
+        };
+      }) {};
+    m-buffer = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild
+                            , seq }:
+      melpaBuild {
         pname = "m-buffer";
         version = "0.15";
         src = fetchFromGitHub {
@@ -23356,10 +29136,10 @@
           rev = "6eb1d2535a82707a83733173bc400a0d8e520c80";
           sha256 = "1sx76i59razwccvn6x7rx5a124bfyjw9fcbxf4gj7nsg33qiq809";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c34d02682e87c9978a3583bd903dcac5da5b41d5/recipes/m-buffer";
           sha256 = "17smq7wlidsls870hla5b94xq2pwk24b88jvrbbcqw6f5z3ypf94";
-          name = "m-buffer";
+          name = "recipe";
         };
         packageRequires = [ seq ];
         meta = {
@@ -23367,8 +29147,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    mac-pseudo-daemon = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    mac-pseudo-daemon = callPackage ({ cl-lib ? null
+                                     , fetchFromGitHub
+                                     , fetchurl
+                                     , lib
+                                     , melpaBuild }:
+      melpaBuild {
         pname = "mac-pseudo-daemon";
         version = "2.1";
         src = fetchFromGitHub {
@@ -23377,10 +29161,10 @@
           rev = "4d10e327cd8ee5bb7f006d68744be21c7097c1fc";
           sha256 = "0rjdjddlkaps9cfyc23kcr3cdh08c12jfgkz7ca2j141mm89pyp2";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6104efc035bcf469d133ab9a2caf42c9d4482334/recipes/mac-pseudo-daemon";
           sha256 = "12fwrcnwzsfms42rzv4wif5yzx3gnsz8yzdcgkpl37kkx85iy8v0";
-          name = "mac-pseudo-daemon";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -23388,8 +29172,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    macro-math = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    macro-math = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "macro-math";
         version = "1.0";
         src = fetchFromGitHub {
@@ -23398,10 +29185,10 @@
           rev = "105e03c80290d1b88984b2d265a149a13d722920";
           sha256 = "0dgsl1x6r8m9vvff1ia0kmz21h0dji2jl5cqlpx1m947zh45dahj";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/macro-math";
           sha256 = "072ycszl4cjc9nvv4axsgyfzz9djpgh4y1xqfr1nxi41nsdfc9kn";
-          name = "macro-math";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -23409,20 +29196,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    macrostep = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    macrostep = callPackage ({ cl-lib ? null
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "macrostep";
         version = "0.9";
         src = fetchFromGitHub {
           owner = "joddie";
           repo = "macrostep";
-          rev = "1e2593279f3722e31d8a8f07e297a5c546586cba";
-          sha256 = "0g9bnq4p3ffvva30hpll80dn3i41m51mcvw3qf787zg1nmc5a0j6";
+          rev = "9a6b04a5f7e57e4ba42309e8ce257cd7637514ec";
+          sha256 = "0aqlk9rlxfqlb3qr88xxcii5lcxxiyygg62kzxpv16prhv1n8a3i";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/macrostep";
           sha256 = "1h1gag21x05a14j0wbg0lg502fq2hbqfhjlg05kysw9f870whfq2";
-          name = "macrostep";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -23430,8 +29221,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    magic-filetype = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    magic-filetype = callPackage ({ emacs
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild
+                                  , s }:
+      melpaBuild {
         pname = "magic-filetype";
         version = "0.3.0";
         src = fetchFromGitHub {
@@ -23440,10 +29236,10 @@
           rev = "019494add5ff02dd36cb3f500142fc51125522cc";
           sha256 = "1hw77d4wgqrms8rvkv3xd50v4y9qjvm7cpz5rkgmvizs34pjqy22";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/eb13cb0dba1696cc51132cd1ff723fa17f892a7c/recipes/magic-filetype";
           sha256 = "0f0j8fgh2gpkarz9308pns0d89wc2dchyim6hbixkdpqzg9gskc3";
-          name = "magic-filetype";
+          name = "recipe";
         };
         packageRequires = [ emacs s ];
         meta = {
@@ -23451,20 +29247,31 @@
           license = lib.licenses.free;
         };
       }) {};
-    magit = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, ghub, git-commit, let-alist, lib, magit-popup, melpaBuild, with-editor }:
-    melpaBuild {
+    magit = callPackage ({ async
+                         , dash
+                         , emacs
+                         , fetchFromGitHub
+                         , fetchurl
+                         , ghub
+                         , git-commit
+                         , let-alist
+                         , lib
+                         , magit-popup
+                         , melpaBuild
+                         , with-editor }:
+      melpaBuild {
         pname = "magit";
-        version = "2.12.1";
+        version = "2.13.0";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "44508d71fb400910adb5d0594b56d3c34aa3a5de";
-          sha256 = "0cpcdrikfcmkb6sj13bvznilyk8yc054pq5md874s3j224bdxcnx";
+          rev = "e03685e813330a750c1d2e525a8f8c74901fccfb";
+          sha256 = "119x8lg8alf97j8r3swmy6yf9112a9s2z2584n74bk847mxl2qwz";
         };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/b0a9a6277974a7a38c0c46d9921b54747a85501a/recipes/magit";
-          sha256 = "1wbqz2s1ips0kbhy6jv0mm4vh110m5r65rx0ik11dsqv1fv3hwga";
-          name = "magit";
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/ac8feccfa0f4eb5bda2ef561a6be66ba145c00e0/recipes/magit";
+          sha256 = "03iv74rgng5fcy3qfr76hiy0hj6x2z0pis1yj8wm1naq5rc55hjn";
+          name = "recipe";
         };
         packageRequires = [
           async
@@ -23481,20 +29288,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    magit-annex = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }:
-    melpaBuild {
+    magit-annex = callPackage ({ cl-lib ? null
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , magit
+                               , melpaBuild }:
+      melpaBuild {
         pname = "magit-annex";
-        version = "1.4.0";
+        version = "1.6.0";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit-annex";
-          rev = "895c229c2b0d822a4debb302d8638105ecb4ee20";
-          sha256 = "0316csgc95dalqmkxj6qlb7inzcg4csfs9n3im1ygswcswpdaajh";
+          rev = "42ccbe9137718151accc85abc2726b4f3729b5cb";
+          sha256 = "1zrqm4nhy1d2pg6gwd6m4225smcns5pl8kpcpi3072gprblncphl";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-annex";
           sha256 = "1ri58s1ly416ksmb7mql6vnmx7hq59lmhi7qijknjarw7qs3bqys";
-          name = "magit-annex";
+          name = "recipe";
         };
         packageRequires = [ cl-lib magit ];
         meta = {
@@ -23502,8 +29314,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    magit-filenotify = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }:
-    melpaBuild {
+    magit-filenotify = callPackage ({ emacs
+                                    , fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , magit
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "magit-filenotify";
         version = "0.1";
         src = fetchFromGitHub {
@@ -23512,10 +29329,10 @@
           rev = "575c4321f61fb8f25e4779f9ffd4514ac086ae96";
           sha256 = "1vn6x53kpwv3zf2b5xjswyz6v853r8b9dg88qhwd2h480hrx6kal";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ca5541d2ce3553e9ade2c1ec1c0d78103dfd0c4d/recipes/magit-filenotify";
           sha256 = "1ihk5yi6psqkccpi2bq2h70kn7k874zl7wcinjaq21lirk4z7bvn";
-          name = "magit-filenotify";
+          name = "recipe";
         };
         packageRequires = [ emacs magit ];
         meta = {
@@ -23523,8 +29340,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    magit-find-file = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }:
-    melpaBuild {
+    magit-find-file = callPackage ({ dash
+                                   , fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , magit
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "magit-find-file";
         version = "2.1.0";
         src = fetchFromGitHub {
@@ -23533,10 +29355,10 @@
           rev = "035da838b1a19e7a5ee135b4ca8475f4e235b61e";
           sha256 = "1jlww053s580d7rlvmr1dl79wxasa0hhh2jnwb1ra353d6h3a73w";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/magit-find-file";
           sha256 = "1y66nsq1hbv1sb4n71gdxv7p1rz37vd9lkf7zl7avy0dchs499ik";
-          name = "magit-find-file";
+          name = "recipe";
         };
         packageRequires = [ dash magit ];
         meta = {
@@ -23544,8 +29366,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    magit-gerrit = callPackage ({ fetchFromGitHub, fetchurl, lib, magit, melpaBuild }:
-    melpaBuild {
+    magit-gerrit = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , magit
+                                , melpaBuild }:
+      melpaBuild {
         pname = "magit-gerrit";
         version = "0.3";
         src = fetchFromGitHub {
@@ -23554,10 +29380,10 @@
           rev = "699c5c39c6dbdc8d730721eaf1491f982dd78142";
           sha256 = "0ym24gjd6c04zry08abcb09zvjbgj8nc1j12q0r51fhzzadxcxbb";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f7cc000debed666ad6800e31c114eedb7384317c/recipes/magit-gerrit";
           sha256 = "1iwvg10ly6dlf8llz9f8d4qfdbvd3s28wf48qgn1wjlxpka6zrd4";
-          name = "magit-gerrit";
+          name = "recipe";
         };
         packageRequires = [ magit ];
         meta = {
@@ -23565,8 +29391,16 @@
           license = lib.licenses.free;
         };
       }) {};
-    magit-gh-pulls = callPackage ({ emacs, fetchFromGitHub, fetchurl, gh, lib, magit, melpaBuild, pcache, s }:
-    melpaBuild {
+    magit-gh-pulls = callPackage ({ emacs
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , gh
+                                  , lib
+                                  , magit
+                                  , melpaBuild
+                                  , pcache
+                                  , s }:
+      melpaBuild {
         pname = "magit-gh-pulls";
         version = "0.5.3";
         src = fetchFromGitHub {
@@ -23575,10 +29409,10 @@
           rev = "d526f4c9ee1709c79f8a4630699ce1f25ae054e7";
           sha256 = "11fd3c7wnqy08khj6za8spbsm3k1rqqih21lbax2iwvxl8jv4dv0";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9b54fe4f51820c2f707e1f5d8a1128fff19a319c/recipes/magit-gh-pulls";
           sha256 = "0qn9vjxi33pya9s8v3g95scmhwrn2yf5pjm7d24frq766wigjv8d";
-          name = "magit-gh-pulls";
+          name = "recipe";
         };
         packageRequires = [ emacs gh magit pcache s ];
         meta = {
@@ -23586,8 +29420,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    magit-gitflow = callPackage ({ fetchFromGitHub, fetchurl, lib, magit, magit-popup, melpaBuild }:
-    melpaBuild {
+    magit-gitflow = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , magit
+                                 , magit-popup
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "magit-gitflow";
         version = "2.2.3";
         src = fetchFromGitHub {
@@ -23596,10 +29435,10 @@
           rev = "cc41b561ec6eea947fe9a176349fb4f771ed865b";
           sha256 = "0jz69wrrzvqadaphmjrr146nzvmphsbl7rmc3ccnpw1gw6gnz81f";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/dfaeb33dec2c75d21733b6e51d063664c6544e4d/recipes/magit-gitflow";
           sha256 = "0wsqq3xpqqfak4aqwsh5sxjb1m62z3z0ysgdmnrch3qsh480r8vf";
-          name = "magit-gitflow";
+          name = "recipe";
         };
         packageRequires = [ magit magit-popup ];
         meta = {
@@ -23607,20 +29446,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    magit-imerge = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }:
-    melpaBuild {
+    magit-imerge = callPackage ({ emacs
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , magit
+                                , melpaBuild }:
+      melpaBuild {
         pname = "magit-imerge";
-        version = "0.3.0";
+        version = "0.3.1";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit-imerge";
-          rev = "f337f178a1b4d2e4c1199fa02338febe216ab902";
-          sha256 = "1x0714qxryj3fg9qwnsxrksdja1q98vvjpdwn8h9anifxa0wknh6";
+          rev = "d798ceef08c01f0475c78d394544a2ae910a9cea";
+          sha256 = "0x86b9xh8j9qywqh78w6b6jj75yzzdcz17cqz8sy48y12zy2skpi";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e78a5c27eedfc9b1d79e37e8d333c5d253f31a3c/recipes/magit-imerge";
           sha256 = "0rycmbsi2s7rjqfpcv794vhkybav7d8ikzdaxai36szxpg9pzhj4";
-          name = "magit-imerge";
+          name = "recipe";
         };
         packageRequires = [ emacs magit ];
         meta = {
@@ -23628,8 +29472,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    magit-org-todos = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }:
-    melpaBuild {
+    magit-org-todos = callPackage ({ emacs
+                                   , fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , magit
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "magit-org-todos";
         version = "0.1.2";
         src = fetchFromGitHub {
@@ -23638,10 +29487,10 @@
           rev = "0bfa36bbc50e62de0a3406031cb93e2f57dcdc55";
           sha256 = "07r5x256k1fjjxs1yfg41kc94nwvnjlk2vvknkra3j8v9p0j88m7";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/84480cad490cab2f087a484ed7b9d3d3064bbd29/recipes/magit-org-todos";
           sha256 = "0yywgzm2jzvsccm9h0a0s1q8fag9dfajnznwk6iqz5pywq5mxijr";
-          name = "magit-org-todos";
+          name = "recipe";
         };
         packageRequires = [ emacs magit ];
         meta = {
@@ -23649,8 +29498,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    magit-popup = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    magit-popup = callPackage ({ async
+                               , dash
+                               , emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "magit-popup";
         version = "2.12.3";
         src = fetchFromGitHub {
@@ -23659,10 +29514,10 @@
           rev = "32e6da899abd6657c098534c5775fc7177047f49";
           sha256 = "0nrvs7gwd9kn4n808akrydn7zggvy9zyk38yrcmm561kw0h0h903";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0263ca6aea7bf6eae26a637454affbda6bd106df/recipes/magit-popup";
           sha256 = "1pv5slspcfmi10bnnw6acpijn7vkn2h9iqww3w641v41d3p37jmv";
-          name = "magit-popup";
+          name = "recipe";
         };
         packageRequires = [ async dash emacs ];
         meta = {
@@ -23670,20 +29525,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    magit-stgit = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }:
-    melpaBuild {
+    magit-stgit = callPackage ({ emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , magit
+                               , melpaBuild }:
+      melpaBuild {
         pname = "magit-stgit";
         version = "2.1.3";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit-stgit";
-          rev = "1b064485d512ab547d606dcea9ad4298f355095c";
-          sha256 = "01mgnm5nr2yg377pk4bwlzzgbabsx611wrpx2vzsbiwd97yppdqf";
+          rev = "9d13effdbc213a0c8dcce78e1825011631fa0652";
+          sha256 = "163a1rddl54jgxm5dygnbp1pz1as4hhjszan1rcabvzcfnfdpakj";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-stgit";
           sha256 = "12wg1ig2jzy2np76brpwxdix9pwv75chviq3c24qyv4y80pd11sv";
-          name = "magit-stgit";
+          name = "recipe";
         };
         packageRequires = [ emacs magit ];
         meta = {
@@ -23691,8 +29551,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    magit-svn = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }:
-    melpaBuild {
+    magit-svn = callPackage ({ emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , magit
+                             , melpaBuild }:
+      melpaBuild {
         pname = "magit-svn";
         version = "2.2.1";
         src = fetchFromGitHub {
@@ -23701,10 +29566,10 @@
           rev = "c833903732a14478f5c4cfc561bae7c50671b36c";
           sha256 = "01kcsc53q3mbhgjssjpby7ypnhqsr48rkl1xz3ahaypmlp929gl9";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-svn";
           sha256 = "02n732z06f0bhxqkxzlvm36bpqr40pas09zbzpfdk4pb6f9f80s0";
-          name = "magit-svn";
+          name = "recipe";
         };
         packageRequires = [ emacs magit ];
         meta = {
@@ -23712,8 +29577,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    magit-tbdiff = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }:
-    melpaBuild {
+    magit-tbdiff = callPackage ({ emacs
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , magit
+                                , melpaBuild }:
+      melpaBuild {
         pname = "magit-tbdiff";
         version = "0.2.0";
         src = fetchFromGitHub {
@@ -23722,10 +29592,10 @@
           rev = "2e7d54d290260e5834cca06863d78fc563d7373c";
           sha256 = "07i0bnjkflgrrg246z996slzy28b2kjhhv13z0lcb72w46l935yr";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ad97eea866c8732e3adc17551d37a6d1ae511e6c/recipes/magit-tbdiff";
           sha256 = "1wydmw4f1072k8frk8mi8aaky7dndinq8n7kn10q583bjlxgw80r";
-          name = "magit-tbdiff";
+          name = "recipe";
         };
         packageRequires = [ emacs magit ];
         meta = {
@@ -23733,20 +29603,70 @@
           license = lib.licenses.free;
         };
       }) {};
-    magit-topgit = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }:
-    melpaBuild {
+    magit-todos = callPackage ({ a
+                               , anaphora
+                               , async
+                               , dash
+                               , emacs
+                               , f
+                               , fetchFromGitHub
+                               , fetchurl
+                               , hl-todo
+                               , lib
+                               , magit
+                               , melpaBuild
+                               , pcre2el
+                               , s }:
+      melpaBuild {
+        pname = "magit-todos";
+        version = "1.0.2";
+        src = fetchFromGitHub {
+          owner = "alphapapa";
+          repo = "magit-todos";
+          rev = "204e163d941dcc3b89db8a462d73e3c69e8e83bc";
+          sha256 = "1v78rzgk9s3ww97smqryyr3f2np5zwxx0j7v79rwmy49ck2n3cvq";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/b4544ab55d2c8b8c3b7eb739b9fb90ebb246d68b/recipes/magit-todos";
+          sha256 = "0vqmbw0qj8a5wf4ig9hgc0v3l1agdkvgprzjv178hs00297br2s8";
+          name = "recipe";
+        };
+        packageRequires = [
+          a
+          anaphora
+          async
+          dash
+          emacs
+          f
+          hl-todo
+          magit
+          pcre2el
+          s
+        ];
+        meta = {
+          homepage = "https://melpa.org/#/magit-todos";
+          license = lib.licenses.free;
+        };
+      }) {};
+    magit-topgit = callPackage ({ emacs
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , magit
+                                , melpaBuild }:
+      melpaBuild {
         pname = "magit-topgit";
         version = "2.1.2";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit-topgit";
-          rev = "11489ea798bc88d0ea5244bbf725285eedfefbef";
-          sha256 = "1y7ss475ibjx354m73jn5dxd98g33jcijx48b30p45rbm6ha3i8q";
+          rev = "243fdfa7ce62dce4efd01b6b818a2791868db2f0";
+          sha256 = "06fbjv3zd92lvg4xjsp9l4jkxx2glhng3ys3s9jmvy5y49pymwb2";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-topgit";
           sha256 = "1ngrgf40n1g6ncd5nqgr0zgxwlkmv9k4fik96dgzysgwincx683i";
-          name = "magit-topgit";
+          name = "recipe";
         };
         packageRequires = [ emacs magit ];
         meta = {
@@ -23754,20 +29674,29 @@
           license = lib.licenses.free;
         };
       }) {};
-    magithub = callPackage ({ emacs, fetchFromGitHub, fetchurl, ghub-plus, git-commit, lib, magit, markdown-mode, melpaBuild, s }:
-    melpaBuild {
+    magithub = callPackage ({ emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , ghub-plus
+                            , git-commit
+                            , lib
+                            , magit
+                            , markdown-mode
+                            , melpaBuild
+                            , s }:
+      melpaBuild {
         pname = "magithub";
-        version = "0.1.5";
+        version = "0.1.7";
         src = fetchFromGitHub {
           owner = "vermiculus";
           repo = "magithub";
-          rev = "08a1c1341d0982248ec86e1697fa1b6418cd80f5";
-          sha256 = "062xghazkm8lh207fpqp7csd3nwgkz47g831hqa94iz28n97x0pq";
+          rev = "81e75cbbbac820a3297e6b6a1e5dc6d9cfe091d0";
+          sha256 = "1iq8c939c0a6v8gq31vcjw6nxwnz4fpavcd6xf4h2rb6rkmxmhvl";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/magithub";
           sha256 = "11par5rncsa866gazdw98d4902rvyjnnwbiwpndlyh06ak0lryab";
-          name = "magithub";
+          name = "recipe";
         };
         packageRequires = [ emacs ghub-plus git-commit magit markdown-mode s ];
         meta = {
@@ -23775,8 +29704,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    make-color = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    make-color = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "make-color";
         version = "0.4";
         src = fetchFromGitHub {
@@ -23785,10 +29717,10 @@
           rev = "b19cb40c0619e267f2948ed37aff67b712a6deed";
           sha256 = "0fp5gbin1sgsdz39spk74vadkzig3ydwhpzx9vg7f231kk5f6wzx";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bb765469c65589ae9d7dbc420a8edcf44c3be5d1/recipes/make-color";
           sha256 = "0mrv8b67lpid5m8rfbhcik76bvnjlw4xmcrd2c2iinyl02y07r5k";
-          name = "make-color";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -23796,8 +29728,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    makey = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    makey = callPackage ({ cl-lib ? null
+                         , fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "makey";
         version = "0.3";
         src = fetchFromGitHub {
@@ -23806,10 +29742,10 @@
           rev = "a61781e69d3b451551e269446e1c5f624ab81137";
           sha256 = "1rr7vpm3xxzcaam3m8xni3ajy8ycyljix07n2jzczayri9sd8csy";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/688e32e98758aa6fd31218e98608bd54a76c3e83/recipes/makey";
           sha256 = "06xgrlkqvg288yd4lyhx4vi80jlfarhblxk5m5zzs5as7n08cvk4";
-          name = "makey";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -23817,20 +29753,29 @@
           license = lib.licenses.free;
         };
       }) {};
-    malinka = callPackage ({ cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile, rtags, s }:
-    melpaBuild {
+    malinka = callPackage ({ cl-lib ? null
+                           , dash
+                           , f
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild
+                           , projectile
+                           , rtags
+                           , s }:
+      melpaBuild {
         pname = "malinka";
         version = "0.3.1";
         src = fetchFromGitHub {
           owner = "LefterisJP";
           repo = "malinka";
-          rev = "81cf7dd81fbf124ceda31ee963cce8c3616f28f1";
-          sha256 = "0hwxwwjzjxv2mmkxmalr2hp3x8apwcyvn2bz4d4yd4wrzcscay97";
+          rev = "899e2c0020f283a00f7a24244749af5b9abfe3fe";
+          sha256 = "0m7dkycpfjch8h3983ddasxil4pf4gf0xbjlamijb00n25bxv1dg";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/malinka";
           sha256 = "1zmnlgy9k1s1s2wgkhlwfsnknmhggy0rx3l495a5x1kqsx6i0c9y";
-          name = "malinka";
+          name = "recipe";
         };
         packageRequires = [ cl-lib dash f projectile rtags s ];
         meta = {
@@ -23838,8 +29783,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    mallard-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    mallard-mode = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "mallard-mode";
         version = "0.3.0";
         src = fetchFromGitHub {
@@ -23848,10 +29796,10 @@
           rev = "152cd44d53c881457fe57c1aba77e8e2fca4d1b0";
           sha256 = "1272fsjzsza9dxm8s64b7x2jzr3ks8wjpwvgcxha2dnsjzklcdcj";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/19c5543664ca685a70e53baa1357842e83cbf8f7/recipes/mallard-mode";
           sha256 = "0y2ikjgy107kb85pz50vv7ywslqgbrrkcfsrd8gsk1jky4qn8izd";
-          name = "mallard-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -23859,8 +29807,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    map-progress = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    map-progress = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "map-progress";
         version = "0.5.0";
         src = fetchFromGitHub {
@@ -23869,10 +29820,10 @@
           rev = "6b8ef6b60626772082b2e80ec54d1f1275e1a1b8";
           sha256 = "1fkijm0gikbwmxa9hf7s1rcwb0ipzjygd1mlicsm78rxvdd8k877";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5ed3335eaf0be7368059bcdb52c46f5e47c0c1a5/recipes/map-progress";
           sha256 = "0zc5vii72gbfwbb35w8m30c8r9zck971hwgcn1a4wjczgn4vkln7";
-          name = "map-progress";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -23880,8 +29831,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    map-regexp = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    map-regexp = callPackage ({ cl-lib ? null
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "map-regexp";
         version = "0.3.0";
         src = fetchFromGitHub {
@@ -23890,10 +29845,10 @@
           rev = "b8e06284ec1c593d7d2bda5f35597a63de46333f";
           sha256 = "0kk1sk3cr4dbmgq4wzml8kdf14dn9jbyq4bwmvk0i7dic9vwn21c";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/927314443ecc00d94e7125de669e82832c5a125c/recipes/map-regexp";
           sha256 = "0yiif0033lhaqggywzfizfia3siggwcz7yv4z7przhnr04akdmbj";
-          name = "map-regexp";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -23901,8 +29856,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    marcopolo = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, request, s }:
-    melpaBuild {
+    marcopolo = callPackage ({ dash
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild
+                             , pkg-info
+                             , request
+                             , s }:
+      melpaBuild {
         pname = "marcopolo";
         version = "0.3.0";
         src = fetchFromGitHub {
@@ -23911,10 +29873,10 @@
           rev = "ce6ad40d7feab0568924e3bd9659b76e3eecd55e";
           sha256 = "0y4b69r2l6kvh7g8f1y9v1pdall3n668ci24lp04lcms6rxcrsnh";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/936a1cff601594575c5b550c5eb16e7dafc8a5ab/recipes/marcopolo";
           sha256 = "1nbck1m7lhync7n474578d2g1zc72c841hi236xjbdd2lnxz3zz0";
-          name = "marcopolo";
+          name = "recipe";
         };
         packageRequires = [ dash pkg-info request s ];
         meta = {
@@ -23922,8 +29884,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    mark-tools = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    mark-tools = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "mark-tools";
         version = "0.3";
         src = fetchFromGitHub {
@@ -23932,10 +29897,10 @@
           rev = "0e7ac2522ac84155cab341dc49f7f0b81067133c";
           sha256 = "0fcyspz7n97n84d9203mxgn8ar4rn52qa49s3vayfrbkn038j5qw";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9ca36020392807aca9658d13481868d8b6c23d51/recipes/mark-tools";
           sha256 = "1688y7lnzhwdva2ildjabzi10i87klfsgvs947i7gfgxl7jwhisq";
-          name = "mark-tools";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -23943,8 +29908,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    markdown-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    markdown-mode = callPackage ({ cl-lib ? null
+                                 , emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "markdown-mode";
         version = "2.3";
         src = fetchFromGitHub {
@@ -23953,10 +29923,10 @@
           rev = "cde5c5d2bcce470c494b76e23cfe1364b6291c20";
           sha256 = "1zm1j4w0f3h01bmmpsv4j4mh6i13nnl8fcqlj2hsa1ncy1lgi8q7";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/74610ec93d4478e835f8b3b446279efc0c71d644/recipes/markdown-mode";
           sha256 = "0gfb3hp87kpcrvxax3m5hsaclwwk1qmxc73cg26smzd1kjfwgz14";
-          name = "markdown-mode";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -23964,8 +29934,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    markdown-mode-plus = callPackage ({ fetchFromGitHub, fetchurl, lib, markdown-mode, melpaBuild }:
-    melpaBuild {
+    markdown-mode-plus = callPackage ({ fetchFromGitHub
+                                      , fetchurl
+                                      , lib
+                                      , markdown-mode
+                                      , melpaBuild }:
+      melpaBuild {
         pname = "markdown-mode-plus";
         version = "0.8";
         src = fetchFromGitHub {
@@ -23974,10 +29948,10 @@
           rev = "f35e63284c5caed19b29501730e134018a78e441";
           sha256 = "1adl36fj506kgfw40gpagzsd7aypfdvy60141raggd5844i6y96r";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ca7bf43ef8893bf04e9658390e306ef69e80a156/recipes/markdown-mode+";
           sha256 = "1535kcj9nmcgmk2448jxc0jmnqy7f50cw2ngffjq5w8bfhgf7q00";
-          name = "markdown-mode-plus";
+          name = "recipe";
         };
         packageRequires = [ markdown-mode ];
         meta = {
@@ -23985,8 +29959,17 @@
           license = lib.licenses.free;
         };
       }) {};
-    markdown-preview-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, markdown-mode, melpaBuild, uuidgen, web-server, websocket }:
-    melpaBuild {
+    markdown-preview-mode = callPackage ({ cl-lib ? null
+                                         , emacs
+                                         , fetchFromGitHub
+                                         , fetchurl
+                                         , lib
+                                         , markdown-mode
+                                         , melpaBuild
+                                         , uuidgen
+                                         , web-server
+                                         , websocket }:
+      melpaBuild {
         pname = "markdown-preview-mode";
         version = "0.9";
         src = fetchFromGitHub {
@@ -23995,10 +29978,10 @@
           rev = "134fd336750b8b3165bc906f0a7161c25eb6f589";
           sha256 = "0j1jdvmn8psarjdl1j4d3rsjmnb3gcissh2l78xj2c8vckmp2g24";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d3c5d222cf0d7eca6a4e3eb914907f8ca58e40f0/recipes/markdown-preview-mode";
           sha256 = "1cam5wfxca91q3i1kl0qbdvnfy62hr5ksargi4430kgaz34bcbyn";
-          name = "markdown-preview-mode";
+          name = "recipe";
         };
         packageRequires = [
           cl-lib
@@ -24013,8 +29996,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    markdown-toc = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, markdown-mode, melpaBuild, s }:
-    melpaBuild {
+    markdown-toc = callPackage ({ dash
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , markdown-mode
+                                , melpaBuild
+                                , s }:
+      melpaBuild {
         pname = "markdown-toc";
         version = "0.1.2";
         src = fetchFromGitHub {
@@ -24023,10 +30012,10 @@
           rev = "15587c76bec43dd778a2034035f98a79ad29e96a";
           sha256 = "00rvpbfcdy1npddxa7yynqpzwrx1h2bm69x9yh42dv6ss3vk1sjs";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4db1e90be8e34d5ad0c898be10dfa5cd95ccb921/recipes/markdown-toc";
           sha256 = "0slky735yzmbfi4ld264vw64b4a4nllhywp19ya0sljbsfycbihv";
-          name = "markdown-toc";
+          name = "recipe";
         };
         packageRequires = [ dash markdown-mode s ];
         meta = {
@@ -24034,8 +30023,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    markup = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    markup = callPackage ({ cl-lib ? null
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "markup";
         version = "2.0.1";
         src = fetchFromGitHub {
@@ -24044,10 +30037,10 @@
           rev = "876da2d3f23473475bb0fd0a1480ae11d2671291";
           sha256 = "0rggadka5aqgrik3qky6s75s5yb5bfj6fcpxjz1iyrwi0fka0akd";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a75c955ad6b2f68b8933329e545625d948f6f8f4/recipes/markup";
           sha256 = "0yw4b42nc2n7nanqvj596hwjf0p4qc7x6g2d9g5cwi7975iak8pf";
-          name = "markup";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -24055,8 +30048,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    markup-faces = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    markup-faces = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "markup-faces";
         version = "1.0.0";
         src = fetchFromGitHub {
@@ -24065,10 +30061,10 @@
           rev = "c43612633c6c161857a3bab5752ae192bb03f5f3";
           sha256 = "0nk2rm14ccwrh1aaxzm80rllsz8g38h9w52m0pf3nnwh6sa757nk";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/markup-faces";
           sha256 = "06fawlv4ih2lsmk7x6h9p5rppl8vw2w3nvlss95kb8fj5fwf7mw9";
-          name = "markup-faces";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -24076,8 +30072,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    marshal = callPackage ({ eieio ? null, fetchFromGitHub, fetchurl, ht, json ? null, lib, melpaBuild }:
-    melpaBuild {
+    marshal = callPackage ({ eieio ? null
+                           , fetchFromGitHub
+                           , fetchurl
+                           , ht
+                           , json ? null
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "marshal";
         version = "0.8.2";
         src = fetchFromGitHub {
@@ -24086,10 +30088,10 @@
           rev = "d714219aeb388ded88582c47940f2c6febae333c";
           sha256 = "1mr5p2yiad1k15byrlk0a784kj7rvibpn4li5phk4rnm0zg1xy9s";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/203f2061c5c7d4aefab3175de5e0538f12158ee3/recipes/marshal";
           sha256 = "17ikd8f1k42f28d4v5dn83zb44bsx7g336db60q068w6z8d4jbgl";
-          name = "marshal";
+          name = "recipe";
         };
         packageRequires = [ eieio ht json ];
         meta = {
@@ -24097,8 +30099,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    mastodon = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    mastodon = callPackage ({ emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "mastodon";
         version = "0.7.2";
         src = fetchFromGitHub {
@@ -24107,10 +30113,10 @@
           rev = "ae8dabda04e377a6ac22cb854e4844f68073f533";
           sha256 = "1avf2wkzd14dj27i9skm3mn3ipkr1zp93yrwxrk2q5kphj1qji2j";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/809d963b69b154325faaf61e54ca87b94c1c9a90/recipes/mastodon";
           sha256 = "1bsyf4j6zs9gin0k7p22yv5gaqd6m3vdc2fiagfbs7gxsmhb6p4i";
-          name = "mastodon";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -24118,20 +30124,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    material-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    material-theme = callPackage ({ emacs
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "material-theme";
         version = "1.2";
         src = fetchFromGitHub {
           owner = "cpaulik";
           repo = "emacs-material-theme";
-          rev = "b66838d220ad380a16da1d8878936974b26f815d";
-          sha256 = "128zn4078b2av3vs8vrqa73fb53vrm64lqg0ks6kymnnmyvcz8v2";
+          rev = "c59b4874914b5b28068be25292690325f19739dd";
+          sha256 = "1sp2h2n0ihp0r6q7c1861awg7rqh6bcxz4hgnny1gj5vjz9h7rch";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d31ababaa50061e767605c979a3f327a654e564b/recipes/material-theme";
           sha256 = "1d259avldc5fq121xrqv53h8s4f4bp6b89nz2rvjhygz7f8hargq";
-          name = "material-theme";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -24139,8 +30149,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    math-symbol-lists = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    math-symbol-lists = callPackage ({ fetchFromGitHub
+                                     , fetchurl
+                                     , lib
+                                     , melpaBuild }:
+      melpaBuild {
         pname = "math-symbol-lists";
         version = "1.2";
         src = fetchFromGitHub {
@@ -24149,10 +30162,10 @@
           rev = "328f792599e4e298d164e3c6331a2426d82ebf64";
           sha256 = "1kj9r2mvmvnj6m2bwhbj8fspqiq8fdrhkaj0ir43f7qmd4imblsj";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fadff01600d57f5b9ea9c0c47ed109e058114998/recipes/math-symbol-lists";
           sha256 = "01j11k29acj0b1pcapmgi2d2s3p50bkms21i2qcj0cbqgz8h6s27";
-          name = "math-symbol-lists";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -24160,8 +30173,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    maven-test-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    maven-test-mode = callPackage ({ emacs
+                                   , fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild
+                                   , s }:
+      melpaBuild {
         pname = "maven-test-mode";
         version = "0.1.5";
         src = fetchFromGitHub {
@@ -24170,10 +30188,10 @@
           rev = "f79409907375591283291eb96af4754b1ccc0e6f";
           sha256 = "0x92b1qrhyrdh0z0xriyjc12h0wpk16x4yawj5i828ca6mz0qh5g";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bdc7f677c53431542cb8d7c95666d021dead2b98/recipes/maven-test-mode";
           sha256 = "1k9w51rh003p67yalzq1w8am40nnr2khyyb5y4bwxgpms8z391fm";
-          name = "maven-test-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs s ];
         meta = {
@@ -24181,8 +30199,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    maxframe = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    maxframe = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "maxframe";
         version = "0.5";
         src = fetchFromGitHub {
@@ -24191,10 +30212,10 @@
           rev = "4f1dbbe68048864037eae277b9280b90fd701ff1";
           sha256 = "08gbkd8wln89j9yxp0zzd539hbwy1db31gca3vxxrpszixx8280y";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/maxframe";
           sha256 = "1lxj60qcvv8vakdq79k1brzv3ki74kajrx8620dzx76bnfkryxk8";
-          name = "maxframe";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -24202,8 +30223,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    mb-url = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    mb-url = callPackage ({ cl-lib ? null
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "mb-url";
         version = "0.1.0";
         src = fetchFromGitHub {
@@ -24212,10 +30237,10 @@
           rev = "129a0bb6a684be76fb9f09010e710065d0e5baaa";
           sha256 = "1apy7abjhdbgh8001rzv41q40bfl444rcz62lvgdwj3lg45zb8xc";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/dd9a8ff6e094b061a7b9d790df1fd4086c5d0a9d/recipes/mb-url";
           sha256 = "1nf8ssan00qsn3d4dc6h6qzdwqzh977qb5d2m33kiwi6qb98988h";
-          name = "mb-url";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -24223,20 +30248,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    mbe = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    mbe = callPackage ({ cl-lib ? null
+                       , emacs
+                       , fetchFromGitHub
+                       , fetchurl
+                       , lib
+                       , melpaBuild }:
+      melpaBuild {
         pname = "mbe";
         version = "0.1";
         src = fetchFromGitHub {
           owner = "ijp";
           repo = "mbe.el";
-          rev = "b022030d6e26198bb8a93a5b0bfe7aa891cd59ec";
-          sha256 = "00gwd2jf5ncgyay5w2jc2mhv18jf4ydnzpfkxaxw9zjbdxg4ym2i";
+          rev = "06d5b8e240e6c277978314ceec31ad48b3b2966e";
+          sha256 = "10zpm6b7r0h7b5hn84a92r1a747zvwgxr4gpa2wbjd74l5b0qciq";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0a8a16e485d608dbd59151d77e252048a49f9d25/recipes/mbe";
           sha256 = "0h18mbcjy8nh4gl12kg2v8x6ps320yk7sbgq5alqnx2shp80kri3";
-          name = "mbe";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -24244,8 +30274,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    mc-extras = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, multiple-cursors }:
-    melpaBuild {
+    mc-extras = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild
+                             , multiple-cursors }:
+      melpaBuild {
         pname = "mc-extras";
         version = "1.2.4";
         src = fetchFromGitHub {
@@ -24254,10 +30288,10 @@
           rev = "f0ba639e9b18cc56e80ae45bbb2b694dbad9171a";
           sha256 = "0d6ncj6zd0lfsdpffbh3l25ycjw5hn0rwi5znp5hpl06b1ycyk4s";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/12747bb8603ebc09ce0873f3317a99e34d818313/recipes/mc-extras";
           sha256 = "0b110x6ygc95v5pb9lk1i731x5s6dagl5afzv37l1qchys36xrym";
-          name = "mc-extras";
+          name = "recipe";
         };
         packageRequires = [ multiple-cursors ];
         meta = {
@@ -24265,20 +30299,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    mediawiki = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    mediawiki = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "mediawiki";
-        version = "2.2.5";
+        version = "2.2.9";
         src = fetchFromGitHub {
           owner = "hexmode";
           repo = "mediawiki-el";
-          rev = "f8f95722193cb74da2f6a01a0e558707c9b8c46d";
-          sha256 = "1vsla0a5x4kfyj3ca4r1v8cspp12dadi0frpailclaxfmpmpl5d3";
+          rev = "8473e12d1839f5287a4227586bf117dad820f867";
+          sha256 = "03rpj3yrk3i1l9yjnamnx38idn6y4zi9zg53bc83sx3g2b4m5v04";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/865e0ba1dbace58784181d214000d090478173bd/recipes/mediawiki";
           sha256 = "17cbrzfdp6jbbf74mn2fi1cwv7d1hvdbw9j84p43jzscnaa5ikx6";
-          name = "mediawiki";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -24286,20 +30323,27 @@
           license = lib.licenses.free;
         };
       }) {};
-    meghanada = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, yasnippet }:
-    melpaBuild {
+    meghanada = callPackage ({ company
+                             , emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , flycheck
+                             , lib
+                             , melpaBuild
+                             , yasnippet }:
+      melpaBuild {
         pname = "meghanada";
-        version = "1.0.0";
+        version = "1.0.7";
         src = fetchFromGitHub {
           owner = "mopemope";
           repo = "meghanada-emacs";
-          rev = "5479b42efe3ed504e3a0824e039e8365ebc0b788";
-          sha256 = "1jn4cpd6y310c8kkk7w0lpchac0rd3f8ri3lmy369gi1sb2xsk94";
+          rev = "f55a237e10fac1f06b50a41c54236ed9fc197530";
+          sha256 = "17shp56xg47sfp9l1iak5dscr62yj9i55xwnfn380x24pxrsfp88";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4c75c69b2f00be9a93144f632738272c1e375785/recipes/meghanada";
           sha256 = "10f1fxma3lqcyv78i0p9mjpi79jfjd5lq5q60ylpxqp18nrql1s4";
-          name = "meghanada";
+          name = "recipe";
         };
         packageRequires = [ company emacs flycheck yasnippet ];
         meta = {
@@ -24307,8 +30351,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    melpa-upstream-visit = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    melpa-upstream-visit = callPackage ({ fetchFromGitHub
+                                        , fetchurl
+                                        , lib
+                                        , melpaBuild
+                                        , s }:
+      melpaBuild {
         pname = "melpa-upstream-visit";
         version = "1.0.0";
         src = fetchFromGitHub {
@@ -24317,10 +30365,10 @@
           rev = "7310c74fdead3c0f86ad6eff76cf989e63f70f66";
           sha256 = "12cp56ppmwpdgf5afx7hd2qb8d1qq8z27191fbbf5zqw8cq5zkpd";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c110538a1ae2419505ea8f144ef7de2d67cad568/recipes/melpa-upstream-visit";
           sha256 = "0j4afy9ipzr7pwkij8ab207mabd7srganlyyif9h1hvclj9svdmf";
-          name = "melpa-upstream-visit";
+          name = "recipe";
         };
         packageRequires = [ s ];
         meta = {
@@ -24328,8 +30376,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    memoize = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    memoize = callPackage ({ fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "memoize";
         version = "1.1";
         src = fetchFromGitHub {
@@ -24338,10 +30389,10 @@
           rev = "636defefa9168f90bce6fc27431352ac7d01a890";
           sha256 = "04qgnlg4x6va7x364dhj1wbjmz8p5iq2vk36mn9198k2vxmijwzk";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6cc9be5bbcff04de5e6d3bb8c47d202fd350989b/recipes/memoize";
           sha256 = "0mzz3hghnbkmxf9wgjqv3sbyxyqqzvvscazq9ybb0b41qrzm73s6";
-          name = "memoize";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -24349,8 +30400,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    mentor = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, seq, xml-rpc }:
-    melpaBuild {
+    mentor = callPackage ({ cl-lib ? null
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild
+                          , seq
+                          , xml-rpc }:
+      melpaBuild {
         pname = "mentor";
         version = "0.3.1";
         src = fetchFromGitHub {
@@ -24359,10 +30416,10 @@
           rev = "2b6aea26fd998d6e6fdac5e6b768f9a1751e268a";
           sha256 = "1j6wf2z4816qj17bm45frhmxk1snsad3jvkjpasyg8pscf4kqi07";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/083de4bd25b6b013a31b9d5ecdffad139a4ba91e/recipes/mentor";
           sha256 = "0nkf7f90m2qf11l97zwvb114yrpbqk1xxr2bh2nvbx8m1c8nad9s";
-          name = "mentor";
+          name = "recipe";
         };
         packageRequires = [ cl-lib seq xml-rpc ];
         meta = {
@@ -24370,20 +30427,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    merlin = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    merlin = callPackage ({ fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "merlin";
-        version = "3.0.5";
+        version = "3.1.0";
         src = fetchFromGitHub {
           owner = "the-lambda-church";
           repo = "merlin";
-          rev = "a5dbf8e321ff162476555e62264468dd6f55c279";
-          sha256 = "0mq4ddr3g64dd4bhq812hb5xvlkswfmib1nw34f3m8sghmaxcd5z";
+          rev = "a9149b6ec88b455e0e040da6a6c0ca325d052904";
+          sha256 = "1f9aqlic7i9ib5lfsix731bkzh857djcgfsqggxy95xvxswm8xpr";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b1b9bfd3164e62758dc0a3362d85c6627ed7cbf8/recipes/merlin";
           sha256 = "177cy9xcrjckxv8gvi1zhg2ndfr8cmsr37inyvpi5dxqy6d6alhp";
-          name = "merlin";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -24391,8 +30451,37 @@
           license = lib.licenses.free;
         };
       }) {};
-    meson-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    merlin-eldoc = callPackage ({ emacs
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
+        pname = "merlin-eldoc";
+        version = "1.2";
+        src = fetchFromGitHub {
+          owner = "khady";
+          repo = "merlin-eldoc";
+          rev = "33544dcc389003ed6e3eabdade90c81db62ab0af";
+          sha256 = "0p24l4jnsiaq3a36dq99pb74djnzjx7qjddns3w5l9s1hkrh79g5";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/a7130ec893175323775e887babbcec7a1e324c01/recipes/merlin-eldoc";
+          sha256 = "0r4997813yz81zvmdgvr0xcp9c321h55z39lajpj1plmrs3c7bry";
+          name = "recipe";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/merlin-eldoc";
+          license = lib.licenses.free;
+        };
+      }) {};
+    meson-mode = callPackage ({ emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "meson-mode";
         version = "0.1";
         src = fetchFromGitHub {
@@ -24401,10 +30490,10 @@
           rev = "212d9f38a08074f1cb6e914e12b60bc52dcb8bee";
           sha256 = "1kv7413y5530frs1nrp0nl40h9j0idwp7vlg761r260200m8sl3v";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4702a31ffd6b9c34f96d151f2611a1bfb25baa88/recipes/meson-mode";
           sha256 = "16yg217ghx6pvlxha2swznkg12c2a9hhyi0hnsbqdj2ijcdzca80";
-          name = "meson-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -24412,8 +30501,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    meta-presenter = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    meta-presenter = callPackage ({ fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "meta-presenter";
         version = "1.0.0";
         src = fetchFromGitHub {
@@ -24422,10 +30514,10 @@
           rev = "7ba8d30e36ce6de6e563c7f3a41a24d288787c48";
           sha256 = "0m23qsbai8j0bx0px7v3ipw92i4y8maxibna6zqrw3msv1j3s7cw";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b73e9424515b3ddea220b786e91c57ee22bed87f/recipes/meta-presenter";
           sha256 = "0f70cfa91wavchlx8d9hdlgq90cmnylhbg2dbw603rzjkyvslp5d";
-          name = "meta-presenter";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -24433,8 +30525,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    metaweblog = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, xml-rpc }:
-    melpaBuild {
+    metaweblog = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild
+                              , xml-rpc }:
+      melpaBuild {
         pname = "metaweblog";
         version = "1.0.1";
         src = fetchFromGitHub {
@@ -24443,10 +30539,10 @@
           rev = "aa14380eb7e7b879a0c16c96866b20a987cd3f2a";
           sha256 = "146w9laysdqbikpzr2gc9vnjrdsa87d8i13f2swlh1kvq2dn3rz5";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/metaweblog";
           sha256 = "10kwqnfafby4ap0572mfkkdssr13y9p2gl9z3nmxqjjy04fkfi8b";
-          name = "metaweblog";
+          name = "recipe";
         };
         packageRequires = [ xml-rpc ];
         meta = {
@@ -24454,20 +30550,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    mew = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    mew = callPackage ({ fetchFromGitHub
+                       , fetchurl
+                       , lib
+                       , melpaBuild }:
+      melpaBuild {
         pname = "mew";
-        version = "6.7";
+        version = "6.8";
         src = fetchFromGitHub {
           owner = "kazu-yamamoto";
           repo = "Mew";
-          rev = "08289430ce14780a03789b71d2060ff4392fbae6";
-          sha256 = "1dhws4a298zrm88cdn66sikdk06n0p60d32cxsgybakkhg5c5wgr";
+          rev = "972677a1aeb138709727634418c391316a3bf33c";
+          sha256 = "14ahl8xdm3a168qfnlbw99rlhvr6nhw94nj01m6ny4f3rkh1p2hk";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/362dfc4d0fdb3e5cb39564160de62c3440ce182e/recipes/mew";
           sha256 = "0423xxn3cw6jmsd7vrw30hx9phga5chxzi6x7cvpswg1mhcyn9fk";
-          name = "mew";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -24475,20 +30574,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    mgmtconfig-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    mgmtconfig-mode = callPackage ({ emacs
+                                   , fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "mgmtconfig-mode";
         version = "0.0.15";
         src = fetchFromGitHub {
           owner = "purpleidea";
           repo = "mgmt";
-          rev = "3ad7097c8aa7eab7f895aab9af22338c0cf82986";
-          sha256 = "04sq8qn6wpsn5yxyf1g2cxv74v3r7n1n32jv174qdn4qknc9khkv";
+          rev = "f01eea33e9b396f1e7501944216271d0d9b8df6f";
+          sha256 = "19grypbx6kxgdlqnj1h7rz2clvrwk98z5sk9dar0077ncp2k1f80";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4cf3dd70ae73c2b049e201a3547bbeb9bb117983/recipes/mgmtconfig-mode";
           sha256 = "0bdjaqfk68av4lfc4cpacrl2mxvimplfkbadi9l6wb65vlqz6sil";
-          name = "mgmtconfig-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -24496,8 +30599,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    mhc = callPackage ({ calfw, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    mhc = callPackage ({ calfw
+                       , fetchFromGitHub
+                       , fetchurl
+                       , lib
+                       , melpaBuild }:
+      melpaBuild {
         pname = "mhc";
         version = "1.1.1";
         src = fetchFromGitHub {
@@ -24506,10 +30613,10 @@
           rev = "46d2a983b77b3139c9694ffba16ae875edc7d5b0";
           sha256 = "1bp4xqklf422n0zwwyj0ag3a4nndg8klazrga6rlvpy01hgg3drl";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d8d3efa0fcd6cd4af94bc99b35614ef6402cbdba/recipes/mhc";
           sha256 = "02ikn9hx0kcfc2xrx4f38zpkfi6vgz7chcxk6q5d0vcsp93b4lql";
-          name = "mhc";
+          name = "recipe";
         };
         packageRequires = [ calfw ];
         meta = {
@@ -24517,8 +30624,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    migemo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    migemo = callPackage ({ fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "migemo";
         version = "1.9.1";
         src = fetchFromGitHub {
@@ -24527,10 +30637,10 @@
           rev = "97e07796573c4c47f286bfe8eeb6428cb474526e";
           sha256 = "1ckb5hymwj4wmsxakalsky4mkzn9vxhxr6416b2cr6r5jxj4xgsl";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2424b0328a0198a03359455abdb3024a8067c857/recipes/migemo";
           sha256 = "0y49imdwygv5zd7cyh9ngda4gyb2mld2a4s7zh4yzlh7z5ha9qkr";
-          name = "migemo";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -24538,8 +30648,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    milkode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    milkode = callPackage ({ fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "milkode";
         version = "0.4";
         src = fetchFromGitHub {
@@ -24548,10 +30661,10 @@
           rev = "ba97e2aeefa1d9d0b3835bf08edd0de248b0c513";
           sha256 = "1qg64mxsm2cswk52mlj7sx7k6gfnrsdwnf68i7cachri0i8aq4ap";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/29fffbec2d3067c046c456602779af8c04bf898f/recipes/milkode";
           sha256 = "07v6xgalx7vcw5sghckwvz584746cba05ql8flv8n556glm7hibh";
-          name = "milkode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -24559,8 +30672,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    minibuffer-complete-cycle = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    minibuffer-complete-cycle = callPackage ({ fetchFromGitHub
+                                             , fetchurl
+                                             , lib
+                                             , melpaBuild }:
+      melpaBuild {
         pname = "minibuffer-complete-cycle";
         version = "1.25.20130814";
         src = fetchFromGitHub {
@@ -24569,10 +30685,10 @@
           rev = "3df80135887d0169e02294a948711f6dfeca4a6f";
           sha256 = "1zyb6c3xwdzk7dpn7xi0mvbcjdfxvzz1a0zlbs053pfar8iim5fk";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/afac2cf41fe57efa8d313fdbab0b0b795ec144e4/recipes/minibuffer-complete-cycle";
           sha256 = "0y1mxs6q9a8lzprrlb22qff6x5mvkw4gp2l6p2js2r0j9jzyffq2";
-          name = "minibuffer-complete-cycle";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -24580,8 +30696,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    minibuffer-cua = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    minibuffer-cua = callPackage ({ fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "minibuffer-cua";
         version = "1.0.0";
         src = fetchFromGitHub {
@@ -24590,10 +30709,10 @@
           rev = "e8dcddc24d4f2e8d7987336fb58259e3cc78bbcb";
           sha256 = "07nbn2pwlp33kr136xsm6lzddhjs538xkz0fbays89psblmy4kwj";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f3b0f1f260b02c14da4d584b6af08b2fa3adf39c/recipes/minibuffer-cua";
           sha256 = "1ragvr73ykbvpgynnq3z0z4yzrlfhfqlwc1vbxclb8x2xmxq7pzw";
-          name = "minibuffer-cua";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -24601,8 +30720,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    miniedit = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    miniedit = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "miniedit";
         version = "2.0";
         src = fetchFromGitHub {
@@ -24611,10 +30733,10 @@
           rev = "e12bf659c3eb92dd8a4cb77642dc0865c54667a3";
           sha256 = "1850z96gly0jnr50472idqz1drzqarr0n23bbasslrc501xkg0bq";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5f2a50f62475639af011c99c6cc38928b74b3b0a/recipes/miniedit";
           sha256 = "10s407q7igdi2hsaaahbw8vckalrl7z3s6l9cflf51q16xh2ih87";
-          name = "miniedit";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -24622,8 +30744,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    minimal-session-saver = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    minimal-session-saver = callPackage ({ fetchFromGitHub
+                                         , fetchurl
+                                         , lib
+                                         , melpaBuild }:
+      melpaBuild {
         pname = "minimal-session-saver";
         version = "0.6.2";
         src = fetchFromGitHub {
@@ -24632,10 +30757,10 @@
           rev = "aaba48a8525e1310b221eeb96763304c22e9a4b4";
           sha256 = "0kjhn48sf2ps3k5pv06gqmqc4hlk6di9ld3ssw6vwfh8313x1fc5";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c9db386ab3910940addae6e925b2ac17e64e0f87/recipes/minimal-session-saver";
           sha256 = "1ay7wvriga28bdmarpfwagqzmmk93ri9f3idhr6z6iivwggwyy2i";
-          name = "minimal-session-saver";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -24643,20 +30768,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    minions = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    minions = callPackage ({ dash
+                           , emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "minions";
         version = "0.2.0";
         src = fetchFromGitHub {
           owner = "tarsius";
           repo = "minions";
-          rev = "4fa1b333ecc13f577fab84ee64b8ee385a214b1e";
-          sha256 = "0gzp1n0jpjmlskbw8mpdpql0d050qdcxwkcw1bfpp07xbs071w0l";
+          rev = "536653d2dcae8362f2d02fee3ca8b65d4c875db7";
+          sha256 = "1wa35cbffvzg0ciif93nv6jv7b0m72ixic0w8iwc5wbbvk9k5wip";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/769a2167d7f6dfdbbfda058ddea036f80b97d230/recipes/minions";
           sha256 = "0ximlj93yp6646bh99r2vnayk15ky26sibrmrqqysfw1pzs4a940";
-          name = "minions";
+          name = "recipe";
         };
         packageRequires = [ dash emacs ];
         meta = {
@@ -24664,8 +30794,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    minitest = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    minitest = callPackage ({ dash
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "minitest";
         version = "0.8.0";
         src = fetchFromGitHub {
@@ -24674,10 +30808,10 @@
           rev = "2bed01262b0d888473468b5c7bd7d73694d31320";
           sha256 = "0nd0jl5r5drnh98wdpqj2i7pgs7zvcizsh4qbvh8n0iw0c3f0pwh";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/41b2e55c0fe48267dc4f55924c782c6f934d8ca4/recipes/minitest";
           sha256 = "0x6nd4kkhiw8hh79r69861pf41j8p1y39kzf2rl61zlmyjz9zpmw";
-          name = "minitest";
+          name = "recipe";
         };
         packageRequires = [ dash ];
         meta = {
@@ -24685,8 +30819,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    mips-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    mips-mode = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "mips-mode";
         version = "1.1.1";
         src = fetchFromGitHub {
@@ -24695,10 +30832,10 @@
           rev = "e6c25201a3325b555e64388908d584f3f81d9e32";
           sha256 = "0ai4ff6hinajvnp8r86s5pv0rrv8h68ncdz4k98kka1ws2f79zdf";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/024a76b83efce47271bcb0ce3bde01b88349f391/recipes/mips-mode";
           sha256 = "0gg18v80lbndi2yyr5nl37mz0zpamwv9ha4clajkf0bc0vplxkj7";
-          name = "mips-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -24706,8 +30843,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    mmm-jinja2 = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, mmm-mode }:
-    melpaBuild {
+    mmm-jinja2 = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild
+                              , mmm-mode }:
+      melpaBuild {
         pname = "mmm-jinja2";
         version = "0.1";
         src = fetchFromGitHub {
@@ -24716,10 +30857,10 @@
           rev = "c8cb763174fa2fb61b9a0e5e0ff8cb0210f8492f";
           sha256 = "0big2i3bg4cm14f68ncaiz2h6dk6zqiisrz4l0bv10q9kaa9q2sj";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/721b9a6f16fb8efd4d339ac7953cc07d7a234b53/recipes/mmm-jinja2";
           sha256 = "0zg4psrgikb8644x3vmsns0id71ni9fcpm591zn16b4j64llvgsi";
-          name = "mmm-jinja2";
+          name = "recipe";
         };
         packageRequires = [ mmm-mode ];
         meta = {
@@ -24727,8 +30868,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    mmm-mako = callPackage ({ fetchhg, fetchurl, lib, melpaBuild, mmm-mode }:
-    melpaBuild {
+    mmm-mako = callPackage ({ fetchhg
+                            , fetchurl
+                            , lib
+                            , melpaBuild
+                            , mmm-mode }:
+      melpaBuild {
         pname = "mmm-mako";
         version = "1.1";
         src = fetchhg {
@@ -24747,8 +30892,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    mmt = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    mmt = callPackage ({ cl-lib ? null
+                       , emacs
+                       , fetchFromGitHub
+                       , fetchurl
+                       , lib
+                       , melpaBuild }:
+      melpaBuild {
         pname = "mmt";
         version = "0.2.0";
         src = fetchFromGitHub {
@@ -24757,10 +30907,10 @@
           rev = "f7db836a10720ee50217012e7e2597ebcf624f90";
           sha256 = "13vbfc5597v0gd87qyhn10f93nb477vjpg3jlpphbax9fvkf4gav";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d1137bb53ecd92b1a8537abcd2635602c5ab3277/recipes/mmt";
           sha256 = "0hal3qcw6x9658xpdaw6q9l2rr2z107pvg5bdzshf67p1b3lf9dq";
-          name = "mmt";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -24768,8 +30918,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    mocha = callPackage ({ fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild }:
-    melpaBuild {
+    mocha = callPackage ({ fetchFromGitHub
+                         , fetchurl
+                         , js2-mode
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "mocha";
         version = "1.1";
         src = fetchFromGitHub {
@@ -24778,10 +30932,10 @@
           rev = "4ca9495d4b00b753f055152bd4256c07d7b208f4";
           sha256 = "0yj9kc59c227727kh1zjxwrhijzd7rdhix7qqm4na1z6s4ycpxbm";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/39c26134ba95f277a4e9400e506433d96a695aa4/recipes/mocha";
           sha256 = "0kjgrl5iy7cd3b9csgpjg3y0wp0q6c7c8cvf0mx8gdbsj7296kyx";
-          name = "mocha";
+          name = "recipe";
         };
         packageRequires = [ js2-mode ];
         meta = {
@@ -24789,8 +30943,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    mocha-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
-    melpaBuild {
+    mocha-snippets = callPackage ({ fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild
+                                  , yasnippet }:
+      melpaBuild {
         pname = "mocha-snippets";
         version = "1.0.0";
         src = fetchFromGitHub {
@@ -24799,10 +30957,10 @@
           rev = "e054137bd78f0d236e983874da1f345d30a71816";
           sha256 = "0lxc5zhb03jpy48ql4mn2l35qhsdwav4dkxyqim72b7c75cy1cml";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/93c472e3d7f318373342907ca7253253ef12dab8/recipes/mocha-snippets";
           sha256 = "0dbsdk4jpzxv2sxx0nia9zhd0a0wmkz1qcqmbd15m1909ccdwxds";
-          name = "mocha-snippets";
+          name = "recipe";
         };
         packageRequires = [ yasnippet ];
         meta = {
@@ -24810,8 +30968,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    mocker = callPackage ({ eieio ? null, el-x, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    mocker = callPackage ({ eieio ? null
+                          , el-x
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "mocker";
         version = "0.3.1";
         src = fetchFromGitHub {
@@ -24820,10 +30983,10 @@
           rev = "55b078b53ea49e48bd1821d96f0fb86f794fdc6c";
           sha256 = "1lav7am41v63xgavq8pr88y828jmd1cxd4prjq7jlbxm6nvrwxh2";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/16a4fe34a6f354d396c24ff13e15157510202259/recipes/mocker";
           sha256 = "1g90jp1czrrzrmn7n4linby3q4fb4gcflzv2amjv0sdimw1ln1w3";
-          name = "mocker";
+          name = "recipe";
         };
         packageRequires = [ eieio el-x ];
         meta = {
@@ -24831,8 +30994,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    modalka = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    modalka = callPackage ({ emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "modalka";
         version = "0.1.5";
         src = fetchFromGitHub {
@@ -24841,10 +31008,10 @@
           rev = "1259afa084f58d143d133aac56a6c0c10bc460f2";
           sha256 = "0ggj8q92sb6wp3hs1vhpmy56id0p3i9zwnw24g2v7xa7w8ac9s7l";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fa0a02da851a603b81e183f461da55bf4c71f0e9/recipes/modalka";
           sha256 = "0bkjykvl6sw797h7j76dzn1viy598asly98gcl5wrq13n4w1md4c";
-          name = "modalka";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -24852,8 +31019,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    mode-icons = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    mode-icons = callPackage ({ cl-lib ? null
+                              , emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "mode-icons";
         version = "0.4.0";
         src = fetchFromGitHub {
@@ -24862,10 +31034,10 @@
           rev = "37581ed911e4469f773ddfb7b40a85592d323b76";
           sha256 = "1ykj68d4h92i4qv90zgwrf9jhy1n22l2h9k5f1zsn8hvz9mhj1av";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0fda2b54a0ff0b6fc3bd6d20cfcbbf63cae5380f/recipes/mode-icons";
           sha256 = "1dqcry27rz7afyvjg7345wysp6wmh8fpj32ysk5iw5i7v5scf6kf";
-          name = "mode-icons";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -24873,8 +31045,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    mode-line-debug = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    mode-line-debug = callPackage ({ fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "mode-line-debug";
         version = "1.2.3";
         src = fetchFromGitHub {
@@ -24883,10 +31058,10 @@
           rev = "a0fcc394b07d2414bd6f722da10f1c7567333f6b";
           sha256 = "04vsb0lniy90bhnqb590dap9y4wac64xz0lc2rlfczic0nrqd1aa";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b0080ab9ef1eca5dd19b3fd9af536d8aa17773a2/recipes/mode-line-debug";
           sha256 = "0ppj14bm3rx3xgg4mfxa5zcm2r129jgmsx817wq3h7akjngcbfkd";
-          name = "mode-line-debug";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -24894,8 +31069,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    modern-cpp-font-lock = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    modern-cpp-font-lock = callPackage ({ fetchFromGitHub
+                                        , fetchurl
+                                        , lib
+                                        , melpaBuild }:
+      melpaBuild {
         pname = "modern-cpp-font-lock";
         version = "0.1.3";
         src = fetchFromGitHub {
@@ -24904,10 +31082,10 @@
           rev = "3e9c18b5a2ade485565f5191f12a724f1969dbb0";
           sha256 = "0jg5yix4c18gvy5n4wsi7zg2sb7r0bw0xlmq0w15g3z63nhy69vc";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4bfc2386049adfe7a8e20da9b69fb73d6cb71387/recipes/modern-cpp-font-lock";
           sha256 = "0h43icb5rqbkc5699kdy2mrjs5448phl18jch45ylp2wy2r8c2qj";
-          name = "modern-cpp-font-lock";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -24915,8 +31093,36 @@
           license = lib.licenses.free;
         };
       }) {};
-    monitor = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    moe-theme = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
+        pname = "moe-theme";
+        version = "1.0.0";
+        src = fetchFromGitHub {
+          owner = "kuanyui";
+          repo = "moe-theme.el";
+          rev = "b8f0206614ab40ffb75e50ce6c38675fb9c7cf2e";
+          sha256 = "0pn3a1rrj7ycxh91x3q008b6rmq7rbl8ir6diqzqfp6y465pn2w2";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4efefd7edacf90620436ad4ef9ceb470618a8018/recipes/moe-theme";
+          sha256 = "1nqvj8spvffgjvqlf25rcm3dc6w1axb6qlwwsjhq401a6xhw67f6";
+          name = "recipe";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/moe-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    monitor = callPackage ({ dash
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "monitor";
         version = "0.3.0";
         src = fetchFromGitHub {
@@ -24925,10 +31131,10 @@
           rev = "8c67c06f60a89b2583bae90afc91a7e7d73260fd";
           sha256 = "1r2sns49f5fw4f122s165sa41nkrkq2qs20n98g2pfd1whflqfnb";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b9df614e8e7b9dfdbd7eec552a2b13e0f5acfc22/recipes/monitor";
           sha256 = "11n4nv6vkjw434yrwqjw20229m2sxqxxdp7sg99gzrd5gjyab643";
-          name = "monitor";
+          name = "recipe";
         };
         packageRequires = [ dash ];
         meta = {
@@ -24936,8 +31142,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    monokai-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    monokai-theme = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "monokai-theme";
         version = "3.5.3";
         src = fetchFromGitHub {
@@ -24946,10 +31155,10 @@
           rev = "1143c072f5153ae1a69807e5e8af163069b947d2";
           sha256 = "0dy8c3349j7fmp8052hbgvk0b7ldlv5jqpg0paq1i0hlypivd30i";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2bc9ce95a02fc4bcf7bc7547849c1c15d6db5089/recipes/monokai-theme";
           sha256 = "13mv4vgsmdbf3v748lqi7b42hvr3yp86n97rb6792bcgd3kbdx7a";
-          name = "monokai-theme";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -24957,8 +31166,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    monroe = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    monroe = callPackage ({ fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "monroe";
         version = "0.3.1";
         src = fetchFromGitHub {
@@ -24967,10 +31179,10 @@
           rev = "0b9b043f042145bf62969add7ec476ea51da7cbd";
           sha256 = "101lfrykdbv37spkbw7zihhx26bc1lhjyxbanrcp9880bxj04jiy";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/590e5e784c5a1c12a241d90c9a0794d2737a61ef/recipes/monroe";
           sha256 = "04rhninxppvilk7s90g0wwa0g9vfcg7mk8mrb2m2c7cb9vj6wyig";
-          name = "monroe";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -24978,20 +31190,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    moody = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    moody = callPackage ({ emacs
+                         , fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "moody";
-        version = "0.2.0";
+        version = "0.3.0";
         src = fetchFromGitHub {
           owner = "tarsius";
           repo = "moody";
-          rev = "db27ba168503bd6e6c98c313e73699dc403a10aa";
-          sha256 = "1y0zg0flcv3sawyqvwilh1ysvbn1bsnkn0b2n89lj00zyb5dj5z8";
+          rev = "adf652f35cba1bb3d0f254e1905e2deeeb0fbdba";
+          sha256 = "1zspq29n60r0kd9fy7d50zdypljigwcjb0qa5gkwiipnhpcnf9bp";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/63521fe6a1e540544a07231cc94144439e8caea7/recipes/moody";
           sha256 = "095241sjw330fb5lk48aa4zx8xbzk8s4ml22n6a8bzr99nkhn5jy";
-          name = "moody";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -24999,20 +31215,48 @@
           license = lib.licenses.free;
         };
       }) {};
-    morlock = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    moom = callPackage ({ emacs
+                        , fetchFromGitHub
+                        , fetchurl
+                        , lib
+                        , melpaBuild }:
+      melpaBuild {
+        pname = "moom";
+        version = "1.2.0";
+        src = fetchFromGitHub {
+          owner = "takaxp";
+          repo = "moom";
+          rev = "536eac1dd2b187f65ed85ad8efc95f7e2bcaadb2";
+          sha256 = "12v2m66dlvnggmraxgmcfq4ycv6wdc56dv63gggrcy7zhlxwi9vp";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/c55081230ee02346ed02e0ab19ee2302e7b9ffa7/recipes/moom";
+          sha256 = "11l4yc8fhxsrsjfksqj4cxr13jln0khhd2dn09i94n71dx7lybh1";
+          name = "recipe";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/moom";
+          license = lib.licenses.free;
+        };
+      }) {};
+    morlock = callPackage ({ fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "morlock";
         version = "1.0.2";
         src = fetchFromGitHub {
           owner = "tarsius";
           repo = "morlock";
-          rev = "b883d48024ddfffebe2d0dd69f5ed54c617f8834";
-          sha256 = "0xns4f39x012n7piiv6kgb45n932wxs5fp4yyq44p1mnr0m8v4y8";
+          rev = "5fd655ba3050981ab8059bcddf5b19c21f9ceea1";
+          sha256 = "0bgrqydh9bb059j6b6y86xn6qdq85y0radsi1zq20p5xmrsgivbn";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b6ef53bbc80edda12a90a8a9705fe14415972833/recipes/morlock";
           sha256 = "0693jr1k8mzd7hwp52azkl62c1g1p5yinarjcmdksfyqblqq5jna";
-          name = "morlock";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -25020,20 +31264,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    mosey = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    mosey = callPackage ({ emacs
+                         , fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "mosey";
-        version = "0.1";
+        version = "0.2";
         src = fetchFromGitHub {
           owner = "alphapapa";
           repo = "mosey.el";
-          rev = "4d28bf359242477a45994336c2ce37243965c65e";
-          sha256 = "1xakw1q5m3iahvj7xapyi008pr2nrl3msgdfdfsk561ci7bc2008";
+          rev = "2e3ac9d334fa2937ed5267193dfd25d8e1f14dc2";
+          sha256 = "1yxy6m5igvsy37vn93ijs0b479v50vsnsyp8zi548iy2ribr0qr5";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/76a9a43eea68db9f82c07677235c481a6f243aa2/recipes/mosey";
           sha256 = "0zprzr5aqv77kmg1ki9w6fw1nc2ap6yqjl4ak05a1i9cq8g6nf3m";
-          name = "mosey";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -25041,8 +31289,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    move-dup = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    move-dup = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "move-dup";
         version = "1.0.0";
         src = fetchFromGitHub {
@@ -25051,10 +31302,10 @@
           rev = "dae61de7aa5e2bf56a7bab1fa36fa3a39520a3c0";
           sha256 = "1mrrxx2slxi1qgf483nnxv3y8scfsc844sfnzn4b7hjpfpali0r8";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3ea1f7f015a366192492981ff75672fc363c6c18/recipes/move-dup";
           sha256 = "0b0lmiisl9yckblwf7619if88qsmbka3bl4qiaqam7fka7psxs7f";
-          name = "move-dup";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -25062,20 +31313,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    move-text = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    move-text = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "move-text";
         version = "2.0.8";
         src = fetchFromGitHub {
           owner = "emacsfodder";
           repo = "move-text";
-          rev = "bdaf3e3a0d33cd528cad1d10facbdf0635232e4d";
-          sha256 = "06jxk5g23822gfmwrxhc34zand3dr8p2wjh1zs3j61ibz6n0nmz1";
+          rev = "daaa5c3e01d1b88f4eea8e1421acd2453c2df350";
+          sha256 = "1hm2j28vf7zh5h552wszawxsp2c4jwpc33017ld1vc9qcccp3895";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/82bfd0f41e42eed1d4c2361ec1d1685edebbac1b/recipes/move-text";
           sha256 = "04bfrkanafmbrdyw06ciw9kiyn7h3kpikxk3clx2gc04jl67hzgy";
-          name = "move-text";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -25083,20 +31337,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    mowedline = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    mowedline = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "mowedline";
         version = "3.3.0";
         src = fetchFromGitHub {
           owner = "retroj";
           repo = "mowedline";
-          rev = "c17501b48ded8261d815ab60bf14cddf7040be72";
-          sha256 = "1k3b018xq2qqq30v0ik13imy9c84241kyavj5ascxhywx956v18g";
+          rev = "bde4de0a4e1404127b0a48897d8cd1d1cb8a263d";
+          sha256 = "0wwl9f01b9sgs8n19a4i7h08xaf6zdljf2plbdpyy4gzi2iiqcc4";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/86f7df6b8df3398ef476c0ed31722b03f16b2fec/recipes/mowedline";
           sha256 = "0c2hvvwa7s5iyz517jaskshdcq9zs15zr6xsvrcb3biahrh4bmfb";
-          name = "mowedline";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -25104,20 +31361,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    moz = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    moz = callPackage ({ fetchFromGitHub
+                       , fetchurl
+                       , lib
+                       , melpaBuild }:
+      melpaBuild {
         pname = "moz";
         version = "1.1.0";
         src = fetchFromGitHub {
           owner = "bard";
           repo = "mozrepl";
-          rev = "646208b67e6c9c56d188db1eba999846d518935f";
-          sha256 = "13bf5jn1kgqg59j5czlzvajq2fw1rz4h5jqfc7x8w1a067nymf2c";
+          rev = "9a3e3e08c12379a54d51ec92a012995c9597c566";
+          sha256 = "1g7rriy8xnsx0xpdw54ywra2pzz6ynqlf6mpmr59xf6v8wpz85pk";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6839c5e52364fb32f6d8a351e5c2f21fbd6669a1/recipes/moz";
           sha256 = "0ar2xgsi7csjj6fgiamrjwjc58j942dm32j3f3lz21yn2c4pnyxi";
-          name = "moz";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -25125,8 +31385,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    moz-controller = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, moz }:
-    melpaBuild {
+    moz-controller = callPackage ({ fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild
+                                  , moz }:
+      melpaBuild {
         pname = "moz-controller";
         version = "1.0";
         src = fetchFromGitHub {
@@ -25135,10 +31399,10 @@
           rev = "42fd842039620de7fb122f7e4ffc1ab802ee97c5";
           sha256 = "1w1i1clkjg9mj1g4i2y3xw3hyj8s7h9gr04qgyb9c1q8vh11z8d0";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fcc20337594a76a547f696adece121ae592c6917/recipes/moz-controller";
           sha256 = "18gca1csl9dfi9995mky8cbgi3xzf1if8pzdjiz5404gzcqk0rfd";
-          name = "moz-controller";
+          name = "recipe";
         };
         packageRequires = [ moz ];
         meta = {
@@ -25146,8 +31410,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    mozc-temp = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, mozc }:
-    melpaBuild {
+    mozc-temp = callPackage ({ dash
+                             , emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild
+                             , mozc }:
+      melpaBuild {
         pname = "mozc-temp";
         version = "1.0.0";
         src = fetchFromGitHub {
@@ -25156,10 +31426,10 @@
           rev = "7f5dd5fc8ceeca9b1822f7e056a4be67e2e74959";
           sha256 = "1gdi2pz8450h11aknz3hbgjlx09w6c4l8d8sz0zv3pb1z8cqkgqv";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e0c77275d759bf73df11fa151b4e737d7cb15adf/recipes/mozc-temp";
           sha256 = "0x1bsa1py0kn73hzbsb4ijl0bqng8nib191vgn6xq8f5cx55044d";
-          name = "mozc-temp";
+          name = "recipe";
         };
         packageRequires = [ dash emacs mozc ];
         meta = {
@@ -25167,20 +31437,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    mpdel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, libmpdel, melpaBuild }:
-    melpaBuild {
+    mpdel = callPackage ({ emacs
+                         , fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , libmpdel
+                         , melpaBuild }:
+      melpaBuild {
         pname = "mpdel";
-        version = "0.4.0";
+        version = "0.6.0";
         src = fetchFromGitHub {
           owner = "mpdel";
           repo = "mpdel";
-          rev = "3786dd31a9f0a3355c967889323742cfe61f4141";
-          sha256 = "0fqdhjmywyw9yd97glrw12j962kmq062djgz2ymv6kspy2g1xv9y";
+          rev = "a1e05828e3bc03679530b4cfff1306706171cb78";
+          sha256 = "1avfhkklhkkazy1b0ymcmc0walrs29ak36vbvaxs480r5s16dkjd";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bb25443752e18e47afc63d5497cc5052c388a607/recipes/mpdel";
           sha256 = "1py6zk16yl7pyql2qxzd770clzszw7c769hw70n963kns1qmpif8";
-          name = "mpdel";
+          name = "recipe";
         };
         packageRequires = [ emacs libmpdel ];
         meta = {
@@ -25188,20 +31463,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    mpmc-queue = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, queue }:
-    melpaBuild {
+    mpmc-queue = callPackage ({ emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild
+                              , queue }:
+      melpaBuild {
         pname = "mpmc-queue";
         version = "0.1.1";
         src = fetchFromGitHub {
           owner = "smizoe";
           repo = "mpmc-queue";
-          rev = "4775ddcb120528828ef1fcb7ee761524a0907a31";
-          sha256 = "0fbrx288vpd0vx2cph7kfclr7hhplqjgynr6csmkh8jaskv26p79";
+          rev = "5e14451bdebaa17a1de9a78a712abf833e2652d8";
+          sha256 = "1vlpfw79s9gczdwy6a7hl4rn94ld7jrbslga0pz8am9jnq0i9dh0";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/30511f1e5eaf45b5f43fbacdd6c7254cb39b1d2c/recipes/mpmc-queue";
           sha256 = "08jcmhfl87nsg6zgv582yfs152bqihbcssh085gxxqn2x99li354";
-          name = "mpmc-queue";
+          name = "recipe";
         };
         packageRequires = [ emacs queue ];
         meta = {
@@ -25209,8 +31489,16 @@
           license = lib.licenses.free;
         };
       }) {};
-    mpv = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild, names, org }:
-    melpaBuild {
+    mpv = callPackage ({ cl-lib ? null
+                       , emacs
+                       , fetchFromGitHub
+                       , fetchurl
+                       , json ? null
+                       , lib
+                       , melpaBuild
+                       , names
+                       , org }:
+      melpaBuild {
         pname = "mpv";
         version = "0.1.0";
         src = fetchFromGitHub {
@@ -25219,10 +31507,10 @@
           rev = "059135de3979e044f14503806047476d9be9f0e8";
           sha256 = "1pjhch8vah0kf73fl2fk6khhrx1kflggd3zlxrf7w4fxr0qn8la3";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2392c1d1042ac6a42bbf9aa7e394c03e178829d0/recipes/mpv";
           sha256 = "1vq308ac6jj1h8qa2b2sypisb38hbvwjimqndhpfir06fghkw94l";
-          name = "mpv";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs json names org ];
         meta = {
@@ -25230,8 +31518,41 @@
           license = lib.licenses.free;
         };
       }) {};
-    msvc = callPackage ({ ac-clang, cedet ? null, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    mqtt-mode = callPackage ({ dash
+                             , emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
+        pname = "mqtt-mode";
+        version = "0.1.0";
+        src = fetchFromGitHub {
+          owner = "andrmuel";
+          repo = "mqtt-mode";
+          rev = "613e70e9b9940e635e779994b5c83f86eb62c8e6";
+          sha256 = "1ci1w4yma6axiigz55b2ip0r7zy8v215532jc0rkb3wyn14nsrh7";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/b85c84ff9523026620e5b3cf864bbc7b9f81d57a/recipes/mqtt-mode";
+          sha256 = "1zbnhd65c9wz9yr29j37c8z7vz3axpfwkzx0z8xjplp40mafpz1z";
+          name = "recipe";
+        };
+        packageRequires = [ dash emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/mqtt-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    msvc = callPackage ({ ac-clang
+                        , cedet ? null
+                        , cl-lib ? null
+                        , emacs
+                        , fetchFromGitHub
+                        , fetchurl
+                        , lib
+                        , melpaBuild }:
+      melpaBuild {
         pname = "msvc";
         version = "1.3.7";
         src = fetchFromGitHub {
@@ -25240,10 +31561,10 @@
           rev = "dfc529aa6da8b46b0a0c7db9a0e5e9bc33ab1fb3";
           sha256 = "19n9an0nznwqw3ml022i6vidqbrgxf4yff0nbvvcb91ppc1saf40";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/69939b85353a23f374cab996ede879ab315a323b/recipes/msvc";
           sha256 = "04gq2klana557qvsi3bv6416l0319jsqb6bdfs7y6729qd94hlq3";
-          name = "msvc";
+          name = "recipe";
         };
         packageRequires = [ ac-clang cedet cl-lib emacs ];
         meta = {
@@ -25251,8 +31572,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    mtg-deck-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    mtg-deck-mode = callPackage ({ emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "mtg-deck-mode";
         version = "0.2";
         src = fetchFromGitHub {
@@ -25261,10 +31586,10 @@
           rev = "7774641630ef85999ab2f6d57eebddbc7c1e7244";
           sha256 = "12ajrlgyj14jf66if7bdgj69jm72wzrmiclx7x8dpsz4zpj38m20";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/425fa66cffe7bfda71de4ff2b49e951456bdeae1/recipes/mtg-deck-mode";
           sha256 = "07hszf33nawhp218f90qr4s713yyjdd7zzkq0s8q0fb6aai5iiih";
-          name = "mtg-deck-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -25272,8 +31597,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    mu4e-alert = callPackage ({ alert, emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, s }:
-    melpaBuild {
+    mu4e-alert = callPackage ({ alert
+                              , emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , ht
+                              , lib
+                              , melpaBuild
+                              , s }:
+      melpaBuild {
         pname = "mu4e-alert";
         version = "1.0";
         src = fetchFromGitHub {
@@ -25282,10 +31614,10 @@
           rev = "3453e25ff6c07c1b768b2a79fdb9fc5c97100e76";
           sha256 = "1nvsfbfsma59ilf7c3vjngnmx3aapwvvvaafdy5szm5r6lkicqvg";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/mu4e-alert";
           sha256 = "0b74ky51nx75vcrrbabr5cj2cx4yax5kgaq479hjp5yc5mq2q46r";
-          name = "mu4e-alert";
+          name = "recipe";
         };
         packageRequires = [ alert emacs ht s ];
         meta = {
@@ -25293,8 +31625,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    mu4e-maildirs-extension = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    mu4e-maildirs-extension = callPackage ({ fetchFromGitHub
+                                           , fetchurl
+                                           , lib
+                                           , melpaBuild }:
+      melpaBuild {
         pname = "mu4e-maildirs-extension";
         version = "0.8";
         src = fetchFromGitHub {
@@ -25303,10 +31638,10 @@
           rev = "8b384b0bbda46c473dea3ee7dc68c2b3f2548528";
           sha256 = "1lyd8pcawn106zwlbq6gdq05i2zhry1qh9cdyjiw61nvgbbfi0yx";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/mu4e-maildirs-extension";
           sha256 = "0bisxm0rph5q1p3zjr7vyyr0jqr3ihs6ihiwyfr8d3dvba1zhffc";
-          name = "mu4e-maildirs-extension";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -25314,8 +31649,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    multi = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    multi = callPackage ({ emacs
+                         , fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "multi";
         version = "2.0.1";
         src = fetchFromGitHub {
@@ -25324,10 +31663,10 @@
           rev = "884203b11fdac8374ec644cca975469aab263404";
           sha256 = "11zabs7qpdhri6n90ck7pgwcbz46d813nyl73h5m1i8jvz1wzx7v";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c9fea5cf529bcdf412af2926e55b8d77edc07eca/recipes/multi";
           sha256 = "1c240d1c1g8wb2ld944344zklnv86d9rycmya4z53b2ai10642ig";
-          name = "multi";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -25335,8 +31674,16 @@
           license = lib.licenses.free;
         };
       }) {};
-    multi-line = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, shut-up }:
-    melpaBuild {
+    multi-line = callPackage ({ cl-lib ? null
+                              , dash
+                              , emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild
+                              , s
+                              , shut-up }:
+      melpaBuild {
         pname = "multi-line";
         version = "0.1.5";
         src = fetchFromGitHub {
@@ -25345,10 +31692,10 @@
           rev = "778c7510b7f066f53cf1f96a6ad1079fda5dc1f7";
           sha256 = "0lr1i2a4fw40iz8qz2zqch63ci9pwvrri219phv22kn76jqn39mh";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0f8eee6798a0ba71d437a1cbf82e360a5b60eafb/recipes/multi-line";
           sha256 = "1aadmijnjr029s1qq4gk8xyl9m8xb5x5774b8i3jyfixyjqvhvwp";
-          name = "multi-line";
+          name = "recipe";
         };
         packageRequires = [ cl-lib dash emacs s shut-up ];
         meta = {
@@ -25356,8 +31703,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    multi-project = callPackage ({ emacs, fetchhg, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    multi-project = callPackage ({ emacs
+                                 , fetchhg
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "multi-project";
         version = "0.0.26";
         src = fetchhg {
@@ -25376,8 +31727,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    multi-run = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, window-layout }:
-    melpaBuild {
+    multi-run = callPackage ({ emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild
+                             , window-layout }:
+      melpaBuild {
         pname = "multi-run";
         version = "1";
         src = fetchFromGitHub {
@@ -25386,10 +31742,10 @@
           rev = "87d9eed414999fd94685148d39e5308c099e65ca";
           sha256 = "0m4wk6sf01b7bq5agmyfcm9kpmwmd90wbvh7fkhs61mrs86s2zw8";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e05ad99477bb97343232ded7083fddb810ae1781/recipes/multi-run";
           sha256 = "1iv4a49czdjl0slp8590f1ya0vm8g2ycnkwrdpqi3b55haaqp91h";
-          name = "multi-run";
+          name = "recipe";
         };
         packageRequires = [ emacs window-layout ];
         meta = {
@@ -25397,8 +31753,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    multi-term = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    multi-term = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "multi-term";
         version = "1.2";
         src = fetchFromGitHub {
@@ -25407,10 +31766,10 @@
           rev = "c9e67edb772f2d9f9da8d887dc746459cfbce244";
           sha256 = "1bn6zx931vz2fa72ab999r33bxv8brn3cqmalvq25x7s4z3q1lyi";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ae489be43b1aee93614e40f492ebdf0b98a3fbc1/recipes/multi-term";
           sha256 = "16idk4nd7qpyrvyspbrdl8gdfaclng6ny0xigk6fqdv352djalal";
-          name = "multi-term";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -25418,8 +31777,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    multi-web-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    multi-web-mode = callPackage ({ fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "multi-web-mode";
         version = "0.2.1";
         src = fetchFromGitHub {
@@ -25428,10 +31790,10 @@
           rev = "0517b9e2b3052533ac0cb71eba7073ed309fce06";
           sha256 = "1d9y3dw27pgzgv6wk575d5ign55xdqgbl3ycyq1z7sji1477lz6b";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/multi-web-mode";
           sha256 = "0vi4yvahr10aqpcz4127c8pcqpr5srwc1yhgipnbnm86qnh34ql5";
-          name = "multi-web-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -25439,8 +31801,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    multiple-cursors = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    multiple-cursors = callPackage ({ cl-lib ? null
+                                    , fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "multiple-cursors";
         version = "1.4.0";
         src = fetchFromGitHub {
@@ -25449,10 +31815,10 @@
           rev = "b3bd49c756cd959c0fb998d27eaf3d273570b05e";
           sha256 = "1ijgvzv5r44xqvz751fd5drbvrspapw6xwv47582w255j363r6ss";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5f015e6b88be2a5ded363bd882a558e94d1f391/recipes/multiple-cursors";
           sha256 = "0mky5p9wpd3270wr5vfna8rkk2ff81wk7vicyxli39195m0qgg0x";
-          name = "multiple-cursors";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -25460,20 +31826,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    mustache = callPackage ({ dash, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, s }:
-    melpaBuild {
+    mustache = callPackage ({ dash
+                            , fetchFromGitHub
+                            , fetchurl
+                            , ht
+                            , lib
+                            , melpaBuild
+                            , s }:
+      melpaBuild {
         pname = "mustache";
         version = "0.23";
         src = fetchFromGitHub {
           owner = "Wilfred";
           repo = "mustache.el";
-          rev = "b0ea352813592424164520a49e86c04600242752";
-          sha256 = "1n2ymd92qpvsby6ms0l3kjhdzzc47rri2aiscc6bs07hm4mjpr9q";
+          rev = "9963a8ddd42ba01899b9d3c74c518745dfe1a2fb";
+          sha256 = "0514fdiq81qqcz6x9fajn9qxsg11q8dkg3n8b36xx4zpyawz59c4";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d1bcf9599ca6d2c29333071a80f96808d4ab52e2/recipes/mustache";
           sha256 = "1pjr00xx77mlfw1myxaz6i3y2gbivhbiq5hyjxxbjlfrkm1vxc8g";
-          name = "mustache";
+          name = "recipe";
         };
         packageRequires = [ dash ht s ];
         meta = {
@@ -25481,8 +31853,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    mustache-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    mustache-mode = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "mustache-mode";
         version = "1.3";
         src = fetchFromGitHub {
@@ -25491,10 +31866,10 @@
           rev = "bf9897eb287ca47ced65d7d4e07ea61ea0aec39f";
           sha256 = "15gw4d0hp15rglsj8hzd290li4p0kadj2dsz0dgfcxld7hnimihk";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/mustache-mode";
           sha256 = "1xmqh663r5i42a586xn0wzw6h1jkvhbnw5iwvjv96w452slhkr36";
-          name = "mustache-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -25502,8 +31877,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    mwim = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    mwim = callPackage ({ fetchFromGitHub
+                        , fetchurl
+                        , lib
+                        , melpaBuild }:
+      melpaBuild {
         pname = "mwim";
         version = "0.4";
         src = fetchFromGitHub {
@@ -25512,10 +31890,10 @@
           rev = "462207227b98a6a4356d51419f5ad5ba9356e5cf";
           sha256 = "06lw6064i82daasgm87gm58d142pypqc1q3cnx1cm35hyj4skd32";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b7e1aa2fa1294b27ed7b6c5bdd5844fa5c37df72/recipes/mwim";
           sha256 = "0bsibwplvyv96y5i5svm2b0jwzs5a7jr2aara7v7xnpj0nqaxm8k";
-          name = "mwim";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -25523,8 +31901,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    mykie = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    mykie = callPackage ({ cl-lib ? null
+                         , emacs
+                         , fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "mykie";
         version = "0.3.1";
         src = fetchFromGitHub {
@@ -25533,10 +31916,10 @@
           rev = "ab8f7549f9018c26278d101af1b90997c9e5e0b3";
           sha256 = "0550k0rfm0zai306642v689mcpsw9pbd5vs0il82cihwvrxjifc5";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e10504a19e052c080be2ccc9b1b8fd2e73a852e0/recipes/mykie";
           sha256 = "12ram39fp3m9ar6q184rsnpkxb14y0ajibng7ia2ck54ck7n36cj";
-          name = "mykie";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -25544,8 +31927,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    mysql-to-org = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    mysql-to-org = callPackage ({ emacs
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild
+                                , s }:
+      melpaBuild {
         pname = "mysql-to-org";
         version = "1.0.0";
         src = fetchFromGitHub {
@@ -25554,10 +31942,10 @@
           rev = "0f51b174a0ee6c9820baf9d79783923b270f3ffc";
           sha256 = "1gxp1a26sna0p3xq6by8bk4yphhh32bvll0sdm2p3wkpdaci7hyz";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/mysql-to-org";
           sha256 = "0jjdv6ywdn1618l36bw3xa3mdgg3rc8r0rdv9xdqx8mmg648a7gj";
-          name = "mysql-to-org";
+          name = "recipe";
         };
         packageRequires = [ emacs s ];
         meta = {
@@ -25565,8 +31953,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    myterminal-controls = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    myterminal-controls = callPackage ({ cl-lib ? null
+                                       , emacs
+                                       , fetchFromGitHub
+                                       , fetchurl
+                                       , lib
+                                       , melpaBuild }:
+      melpaBuild {
         pname = "myterminal-controls";
         version = "1.0.0";
         src = fetchFromGitHub {
@@ -25575,10 +31968,10 @@
           rev = "59ff3a02e34969a2ac608906937cb65cb514f9f1";
           sha256 = "11b0m09n1qqhjbdmcilb1g1408k17700qn37m3wavjrcjvdhnd5n";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4a82a45d9fcafea0795f832bce1bdd7bc83667e2/recipes/myterminal-controls";
           sha256 = "0ipk5s2whf3l68q0dydm1j6rcb6jhk61hgjwxygdphifvih7c5y2";
-          name = "myterminal-controls";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -25586,8 +31979,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    name-this-color = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    name-this-color = callPackage ({ cl-lib ? null
+                                   , dash
+                                   , emacs
+                                   , fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "name-this-color";
         version = "0.3.0";
         src = fetchFromGitHub {
@@ -25596,10 +31995,10 @@
           rev = "e37cd1291d5d68d4c8d6386eab9cb9d94fd3bcfa";
           sha256 = "0amhw630hgc0j8wr8m6aav399ixi3vbwrck79hhlr3pmyh91vv7n";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/name-this-color";
           sha256 = "15x3dp135p45gv4qn4ll3pd6zqi4glcpv6fzvjxnx0dcval9z4d8";
-          name = "name-this-color";
+          name = "recipe";
         };
         packageRequires = [ cl-lib dash emacs ];
         meta = {
@@ -25607,8 +32006,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    nameless = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    nameless = callPackage ({ emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "nameless";
         version = "1.0.2";
         src = fetchFromGitHub {
@@ -25617,10 +32020,10 @@
           rev = "ab1a5c589378334eafca105af1a17f73b9065423";
           sha256 = "107q1rximjnag9r9vgwh0iv687i3rsscbdnjc46f8l16j6vi4n7d";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8e4ee4dae5f32a8d445dc0cc2455c1f7075c9b3d/recipes/nameless";
           sha256 = "14agx54h2vqfb0656n12z761ywyxsdskd6xa1ccar70l9vwj85vq";
-          name = "nameless";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -25628,8 +32031,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    names = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    names = callPackage ({ cl-lib ? null
+                         , emacs
+                         , fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "names";
         version = "20151201.0";
         src = fetchFromGitHub {
@@ -25638,10 +32046,10 @@
           rev = "00862c57ae6363ba86d1e5ce138929a1b6d5c7e6";
           sha256 = "0m82g27gwf9mvicivmcilqghz5b24ijmnw0jf0wl2skfbbg0sydh";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/names";
           sha256 = "1q784606jlakw1z6sx2g2x8hz8c8arywrm2r626wj0v105v510vg";
-          name = "names";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -25649,8 +32057,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    narrow-reindent = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    narrow-reindent = callPackage ({ emacs
+                                   , fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "narrow-reindent";
         version = "0.2.0";
         src = fetchFromGitHub {
@@ -25659,10 +32071,10 @@
           rev = "87466aac4dbeb79597124dd077bf5c704872fd3d";
           sha256 = "10yn215xb4s6kshk108y75im1xbdp0vwc9kah5bbaflp9234i0zh";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/73c7f01a009dc7ac1b9da8ce41859695a97b7878/recipes/narrow-reindent";
           sha256 = "0fybal70kk62zlra63x4jb72694m0mzv4cx746prx9anvq1ss2i0";
-          name = "narrow-reindent";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -25670,8 +32082,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    narrowed-page-navigation = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    narrowed-page-navigation = callPackage ({ cl-lib ? null
+                                            , emacs
+                                            , fetchFromGitHub
+                                            , fetchurl
+                                            , lib
+                                            , melpaBuild }:
+      melpaBuild {
         pname = "narrowed-page-navigation";
         version = "0.1.0";
         src = fetchFromGitHub {
@@ -25680,10 +32097,10 @@
           rev = "b215adbac4873f56fbab65772062f0f5be8058a1";
           sha256 = "0ydxj6dc10knambma2hpimqrhfz216nbj96w1dcwgjixs4cd4nax";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e37e993fec280428f094b6c8ec418fe5ba8c6d49/recipes/narrowed-page-navigation";
           sha256 = "1yrmih60dd69qnin505jlmfidm2svzpdrz46286r7nm6pk7s4pb7";
-          name = "narrowed-page-navigation";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -25691,8 +32108,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    nasm-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    nasm-mode = callPackage ({ emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "nasm-mode";
         version = "1.1.1";
         src = fetchFromGitHub {
@@ -25701,10 +32122,10 @@
           rev = "d990ed94d902b74a5c834fb567e03307607cee45";
           sha256 = "1dyc50a1zskx9fqxl2iy2x74f3bkb2ccz908v0aj13rqfqqnns9j";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a1a832b3bd7c2f2d3cee8bcfb5421d22acf5523e/recipes/nasm-mode";
           sha256 = "1626yf9mmqlsw8w01vzqsyb5ipa56259d4kl6w871k7rvhxwff17";
-          name = "nasm-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -25712,8 +32133,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    nav-flash = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    nav-flash = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "nav-flash";
         version = "1.1.0";
         src = fetchFromGitHub {
@@ -25722,10 +32146,10 @@
           rev = "9054a0f9b51da9e5207672efc029ba265ba28f34";
           sha256 = "119hy8rs83f17d6zizdaxn2ck3sylxbyz7adszbznjc8zrbaw0ic";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c9db386ab3910940addae6e925b2ac17e64e0f87/recipes/nav-flash";
           sha256 = "0936kr0s6zxxmjwaqm7ywdw2im4dxai1xb7j6xa2gp7c70qvvsx3";
-          name = "nav-flash";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -25733,20 +32157,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    navi-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    navi-mode = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "navi-mode";
         version = "2.0";
         src = fetchFromGitHub {
           owner = "alphapapa";
           repo = "navi";
-          rev = "5c979b3b3873b0e67751a1321a9e271d066f2022";
-          sha256 = "15jh1lsgqfnpbmrikm8kdh5bj60yb96f2as2anppjjsgl6w96glh";
+          rev = "c1b91438aebe2115a4e5d8ebec995dade74f19c4";
+          sha256 = "175l9s269wzqlg0axs7lr4834x7ghkgfz43xqcxnd2sdsmyrdd7s";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8edf78a0ecd2ff8e6e066b80751a31e11a068c3f/recipes/navi-mode";
           sha256 = "0pc52iq8lng2g0vpnrhdfxmibc1dx9ksmrjg0303as1yv41fnc69";
-          name = "navi-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -25754,8 +32181,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    navorski = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, multi-term, s }:
-    melpaBuild {
+    navorski = callPackage ({ dash
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild
+                            , multi-term
+                            , s }:
+      melpaBuild {
         pname = "navorski";
         version = "0.2.7";
         src = fetchFromGitHub {
@@ -25764,10 +32197,10 @@
           rev = "4546d4e4dfbec20ee8c423c045408a3388a9eab9";
           sha256 = "09cb07f98aclgq8jf5419305zydkk1hz4nvzrwqz7syrlpvx8xi5";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9246cef94029d2da2211345c076ed55deb91e8fa/recipes/navorski";
           sha256 = "0dnzpsm0ya8rbcik5wp378hc9k7gjb3gwmkqqj889c38q5cdwsx7";
-          name = "navorski";
+          name = "recipe";
         };
         packageRequires = [ dash multi-term s ];
         meta = {
@@ -25775,8 +32208,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    ncl-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ncl-mode = callPackage ({ emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "ncl-mode";
         version = "0.99.2";
         src = fetchFromGitHub {
@@ -25785,10 +32222,10 @@
           rev = "164e504e25cec1812fbae5c3dae164d9f6018ece";
           sha256 = "1m3llm87qgd7sr6ci22nd835vdg0qprs5m9lqcx74k689jl89cni";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2eea3936b8a3a7546450d1d7399e0f86d855fefd/recipes/ncl-mode";
           sha256 = "1niy0w24q6q6j7s0l9fcaqai7zz2gg1qlk2s9sxb8j79jc41y47k";
-          name = "ncl-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -25796,20 +32233,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    nemerle = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    nemerle = callPackage ({ fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "nemerle";
         version = "1.2";
         src = fetchFromGitHub {
           owner = "rsdn";
           repo = "nemerle";
-          rev = "556270ce8b97668a65e9ec20a05f78c3dffeac60";
-          sha256 = "19xxg4ya6vndk2ljdnl284zs8qf9dkq4ghr7pmsclp9n7zh46v48";
+          rev = "69cec44ed3861ddfa0e23a4e44b926dda8a9716b";
+          sha256 = "0hk18jd4bz0gp7b0qn2vgh3sc7r7cygc3gg269dyv5v4n1vyxx79";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/nemerle";
           sha256 = "1rbalq3s2inwz9cf6bfmnxgqd9ylba3crflfjs6b4mnp33z4swny";
-          name = "nemerle";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -25817,8 +32257,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    neon-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    neon-mode = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "neon-mode";
         version = "1.3.0";
         src = fetchFromGitHub {
@@ -25827,10 +32270,10 @@
           rev = "99d15e46beaf1e7d71e39a00cce810df1f33229d";
           sha256 = "07vsi07m5q070fvkqhz32qa2y7dgnyi1kggairimbiwbn98bh642";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c6b2a4898bf21413c4d9e6714af129bbb0a23e1a/recipes/neon-mode";
           sha256 = "0kgyc0rkxvvks5ykizfv82f2cx7ck17sk63plj7bld6khlcgv0y6";
-          name = "neon-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -25838,8 +32281,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    neotree = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    neotree = callPackage ({ cl-lib ? null
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "neotree";
         version = "0.5.2";
         src = fetchFromGitHub {
@@ -25848,10 +32295,10 @@
           rev = "5e1271655170f4cdc6849258e383c548a4e6e3d0";
           sha256 = "0hx72fq10772bbyqrj7mhhp02k26cccjxdadiqm1ykainhfmn1x0";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9caf2e12762d334563496d2c75fae6c74cfe5c1c/recipes/neotree";
           sha256 = "05smm1xsn866lsrak0inn2qw6dvzy24lz6h7rvinlhk5w27xva06";
-          name = "neotree";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -25859,8 +32306,35 @@
           license = lib.licenses.free;
         };
       }) {};
-    nginx-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    netease-music = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
+        pname = "netease-music";
+        version = "1.0";
+        src = fetchFromGitHub {
+          owner = "nicehiro";
+          repo = "netease-music";
+          rev = "f3bba59664e1c4c4ed47f16fa786151272d99a70";
+          sha256 = "1a6r7cmxvg83fa285drli2nac9a56kyd2pn4y1vfcg7jiy6czhiw";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/ca3d4a8f8d9080e26a8fe2c38c0001d5cfc3c88c/recipes/netease-music";
+          sha256 = "1vb81f1l45v6rny91rcqvnhzqh5ybdr0r39yrcaih8zhvamk685z";
+          name = "recipe";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/netease-music";
+          license = lib.licenses.free;
+        };
+      }) {};
+    nginx-mode = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "nginx-mode";
         version = "1.1.9";
         src = fetchFromGitHub {
@@ -25869,10 +32343,10 @@
           rev = "a2bab83c2eb233d57d76b236e7c141c2ccc97005";
           sha256 = "17dh5pr3gh6adrbqx588gimxbb2fr7iv2qrxv6r48w2727l344xs";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a6da3640b72496e2b32e6ed21aa39df87af9f7f3/recipes/nginx-mode";
           sha256 = "07k17m64zhv6gik8v4n73d8l1k6fsp4qp8cl94r384ny0187y65c";
-          name = "nginx-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -25880,8 +32354,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    niceify-info = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    niceify-info = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "niceify-info";
         version = "1.0.1";
         src = fetchFromGitHub {
@@ -25890,10 +32367,10 @@
           rev = "66b45916f1994e16ee023d29fa7cf8fec48078f1";
           sha256 = "0dzcaa88l7yjc7fhyhkvbzs7bmhi6bb6rx41wsnnidlnpzbgdrk7";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0b2a923da7363d904eb848eb335736974e05dba1/recipes/niceify-info";
           sha256 = "1s9c8yxbab9zl5jx38alwa2hpp4zj5cb9a5gfm3x09jf3iw768bl";
-          name = "niceify-info";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -25901,8 +32378,41 @@
           license = lib.licenses.free;
         };
       }) {};
-    nim-mode = callPackage ({ commenter, emacs, epc, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild }:
-    melpaBuild {
+    night-owl-theme = callPackage ({ emacs
+                                   , fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
+        pname = "night-owl-theme";
+        version = "0.1.0";
+        src = fetchFromGitHub {
+          owner = "aaronjensen";
+          repo = "night-owl-emacs";
+          rev = "250824cbbdb37c631c9abc71fdf21cf35d476d8b";
+          sha256 = "0rjwvc0fm0bcnz611q9vxvkzax5bryyc8g8b6sawz9m3l2sqdrch";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/77fe194a0e58bdb9789c85f3c50895eb886b4016/recipes/night-owl-theme";
+          sha256 = "121jc59ry60h1ml1vxx4a6l4a6jcxk7fc4wz32fqv5pr03rzgs7h";
+          name = "recipe";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/night-owl-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    nim-mode = callPackage ({ commenter
+                            , emacs
+                            , epc
+                            , fetchFromGitHub
+                            , fetchurl
+                            , flycheck
+                            , let-alist
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "nim-mode";
         version = "0.4.1";
         src = fetchFromGitHub {
@@ -25911,10 +32421,10 @@
           rev = "86abed21b9b718ac65cc167f208e0bd5b92c79ed";
           sha256 = "0h1paf9z6xvkay97ns74w2w9plwi46md5f2kik4jvjy74p57gxal";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/dc2ccb5f24b9d55c77eaa7952a9e6a2e0ed7be24/recipes/nim-mode";
           sha256 = "1kzn3kkkj7jzs7fqhvib196sl3vp7kbhb4icqzmvvmv366lkaib6";
-          name = "nim-mode";
+          name = "recipe";
         };
         packageRequires = [ commenter emacs epc flycheck let-alist ];
         meta = {
@@ -25922,20 +32432,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    ninja-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ninja-mode = callPackage ({ emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "ninja-mode";
         version = "1.8.2";
         src = fetchFromGitHub {
           owner = "martine";
           repo = "ninja";
-          rev = "253e94c1fa511704baeb61cf69995bbf09ba435e";
-          sha256 = "16scq9hcq6c5ap6sy8j4qi75qps1zvrf3p79j1vbrvnqzp928i5f";
+          rev = "484c16336f19bd8970bb6e75322d61b92a229899";
+          sha256 = "1wc0cvmfhpvfzdy127d1n812q93dd9sp3mmqnc8jzy8i3frqqqq6";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/aed2f32a02cb38c49163d90b1b503362e2e4a480/recipes/ninja-mode";
           sha256 = "1m7f25sbkz8k343giczrnw2ah5i3mk4c7csi8kk9x5y16030asik";
-          name = "ninja-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -25943,8 +32457,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    nix-buffer = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    nix-buffer = callPackage ({ emacs
+                              , f
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "nix-buffer";
         version = "3.1.1";
         src = fetchFromGitHub {
@@ -25953,10 +32472,10 @@
           rev = "db57cda36e7477bdc7ef5a136357b971b1d4d099";
           sha256 = "0b01b4l9c70sad5r5py5hvg7s6k6idwwp0pv3rn8rj0fq5wlyixj";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/08b978724ff26b3ea7a134d307d888c80e2a92a9/recipes/nix-buffer";
           sha256 = "1fjkf88345v9l2v2mk8a057mw0p0rckf6rjf00y5464dyhh58vcd";
-          name = "nix-buffer";
+          name = "recipe";
         };
         packageRequires = [ emacs f ];
         meta = {
@@ -25964,8 +32483,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    nix-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    nix-mode = callPackage ({ emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "nix-mode";
         version = "1.2.2";
         src = fetchFromGitHub {
@@ -25974,10 +32497,10 @@
           rev = "cc23fd6a0e394aeeed603e2bfeb4a5ebc63db660";
           sha256 = "1vz3s2jx14nzy53f04d821n4f2s22ys5h9s7af6cnpynkwawyhhq";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e1870d786dbfac3b14386c8030e06f2d13ab9da6/recipes/nix-mode";
           sha256 = "10f3ly4860lkxzykw4fbvhn3i0c2hgj77jfjbhlk2c1jz9x4yyy5";
-          name = "nix-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -25985,8 +32508,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    nixos-options = callPackage ({ emacs, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }:
-    melpaBuild {
+    nixos-options = callPackage ({ emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , json ? null
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "nixos-options";
         version = "0.0.1";
         src = fetchFromGitHub {
@@ -25995,10 +32523,10 @@
           rev = "5fc8fa29bea9dd8e9c822af92f9bc6ddc223635f";
           sha256 = "1lm7rkgf7q5g4ji6v1masfbhxdpwni8d77dapsy5k9p73cr2aqld";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6846c7d86e70a9dd8300b89b61435aa7e146be96/recipes/nixos-options";
           sha256 = "1m3jipidk10zj68rzjbacgjlal31jf80gqjxlgj4qs8lm671gxmm";
-          name = "nixos-options";
+          name = "recipe";
         };
         packageRequires = [ emacs json ];
         meta = {
@@ -26006,20 +32534,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    no-littering = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    no-littering = callPackage ({ cl-lib ? null
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "no-littering";
-        version = "0.5.13";
+        version = "0.5.14";
         src = fetchFromGitHub {
           owner = "emacscollective";
           repo = "no-littering";
-          rev = "57bf044e2f779a03c7bb80c9131d31286ca9660d";
-          sha256 = "0fdsm6d3v2hjcyl2kcrzv1fzy17qy8l5a5kpkrv3xq3s25l7dqx1";
+          rev = "9bffebc0f4858a06ba374f1d48a7dffd3537b93e";
+          sha256 = "02dhplz597r5qp1mljy1npx2kzg07l938d2xivwy9cd6jlkj35ya";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/57a2fb9524df3fdfdc54c403112e12bd70888b23/recipes/no-littering";
           sha256 = "15w784ir48v8biiaar8ip19s9y3wn5831m815kcw02mgzy3bfjmh";
-          name = "no-littering";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -26027,20 +32559,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    noccur = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    noccur = callPackage ({ fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "noccur";
         version = "0.2";
         src = fetchFromGitHub {
           owner = "NicolasPetton";
           repo = "noccur.el";
-          rev = "6cc02ce07178a61ae38a849f80472c01969272bc";
-          sha256 = "0wk86gm0by9c8mfbvydz5va07qd30n6wx067inqfa7wjffaq0xr7";
+          rev = "ff2a76883c43b283a08680733ec3ad403a1b1827";
+          sha256 = "0y18hpwgzvm1i9yb3b6fxpbh3fmzkmyldq4as65i5s8n66i7mr6j";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/41f15b8298390310e95cbe137ea1516c0be10b94/recipes/noccur";
           sha256 = "0a8l50v09bgap7rsls808k9wyjpjbcxaffsvz7hh9rw9s7m5fz5g";
-          name = "noccur";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -26048,8 +32583,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    nodejs-repl = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    nodejs-repl = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "nodejs-repl";
         version = "0.1.6";
         src = fetchFromGitHub {
@@ -26058,10 +32596,10 @@
           rev = "16770656a4072f8fbbd29d0cace4893a3d5541b1";
           sha256 = "1hcvi4nhgfrjalq8nw20kjjpcf4xmjid70qpqdv8dsgfann5i3wl";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/14f22f97416111fcb02e299ff2b20c44fb75f049/recipes/nodejs-repl";
           sha256 = "0rvhhrsw87kfrwdhm8glq6b3nr0v90ivm7fcc0da4yc2jmcyk907";
-          name = "nodejs-repl";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -26069,20 +32607,49 @@
           license = lib.licenses.free;
         };
       }) {};
-    nofrils-acme-theme = callPackage ({ emacs, fetchFromGitLab, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    nodemcu-mode = callPackage ({ emacs
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
+        pname = "nodemcu-mode";
+        version = "0.1.0";
+        src = fetchFromGitHub {
+          owner = "andrmuel";
+          repo = "nodemcu-mode";
+          rev = "8effd9f3df40b6b92a2f05e4d54750b624afc4a7";
+          sha256 = "1s19sshsm4cdx8kj5prmsq8ryz4843xcqmdayvlfl99jxsp9j4pm";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/a414f8b30954a50d74e4ae42abcf436cfca8d2b4/recipes/nodemcu-mode";
+          sha256 = "0xx5dys8vifgaf3hb4q762xhhn1jybc4xwajqj98iban4nrakb3a";
+          name = "recipe";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/nodemcu-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    nofrils-acme-theme = callPackage ({ emacs
+                                      , fetchFromGitLab
+                                      , fetchurl
+                                      , lib
+                                      , melpaBuild }:
+      melpaBuild {
         pname = "nofrils-acme-theme";
         version = "0.1.0";
         src = fetchFromGitLab {
           owner = "esessoms";
           repo = "nofrils-theme";
           rev = "7825f88cb881a84eaa5cd1689772819a18eb2943";
-          sha256 = "1aslhxk5mp6khf66ac4c441vywhiqpb4kyajagb8b1p10z8hrqva";
+          sha256 = "009did3i3i8yi0virq606l02w1mw0gdyiqablqg7m368gx0gfvh5";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c59ddaa5e41d3c25c446b1ed1905d7f88b448e0a/recipes/nofrils-acme-theme";
           sha256 = "01xqsn8whczv34lfa9vbm5rpvrvsrlpav8pzng10jvax1a9wdp3a";
-          name = "nofrils-acme-theme";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -26090,8 +32657,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    nord-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    nord-theme = callPackage ({ emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "nord-theme";
         version = "0.3.0";
         src = fetchFromGitHub {
@@ -26100,10 +32671,10 @@
           rev = "290aa9221a10e107acb0f06d0ec338fcb3e44785";
           sha256 = "0az5l8y3jg6yk587wvgz1v5671d8p1vf9m0529x9axi1x7yzxry1";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/31cb60069825abe3998c8b43bc9177b39a7f3659/recipes/nord-theme";
           sha256 = "0p4fqg4i2ayimd8kxsqnb1xkapzhhxf7szxi1skva4dcym3z67cc";
-          name = "nord-theme";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -26111,7 +32682,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    nose = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild {
+    nose = callPackage ({ fetchhg
+                        , fetchurl
+                        , lib
+                        , melpaBuild }:
+      melpaBuild {
         pname = "nose";
         version = "0.1.1";
         src = fetchhg {
@@ -26130,18 +32705,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    notmuch = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
+    notmuch = callPackage ({ fetchgit
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "notmuch";
-        version = "0.26.1";
+        version = "0.27";
         src = fetchgit {
           url = "https://git.notmuchmail.org/git/notmuch";
-          rev = "ea690a44d1a5af3da496b0d9482471cbd9623231";
-          sha256 = "0c9ihkwg2p2sq1zkribbc4k60sl5zdi3sgcy0v2amydsk5kkfy3r";
+          rev = "c20a5eb80520a11cb697a45b0d9553c68e2199c8";
+          sha256 = "13gpsgx5k26x8r38q56y01mfz2r1haxw76hc52mq8vypfl1gpw3x";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d05fbde3aabfec4efdd19a33fd2b1297905acb5a/recipes/notmuch";
           sha256 = "0pznpl0aqybdg4b2qypq6k4jac64sssqhgz6rvk9g2nkqhkds1x7";
-          name = "notmuch";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -26149,8 +32728,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    notmuch-labeler = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, notmuch }:
-    melpaBuild {
+    notmuch-labeler = callPackage ({ fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild
+                                   , notmuch }:
+      melpaBuild {
         pname = "notmuch-labeler";
         version = "0.1";
         src = fetchFromGitHub {
@@ -26159,10 +32742,10 @@
           rev = "d65d1129555d368243df4770ecc1e7ccb88efc58";
           sha256 = "1ss87vlp7625lnn2iah3rc1xfxcbpx4kmiww9n16jx073fs2rj18";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2e9940e66bbf70ec868dbdaaeaa1fbd4f076a2e1/recipes/notmuch-labeler";
           sha256 = "1c0cbkk5k8ps01xl63a0xa2adkqaj0znw8qs8ca4ai8v1420bpl0";
-          name = "notmuch-labeler";
+          name = "recipe";
         };
         packageRequires = [ notmuch ];
         meta = {
@@ -26170,20 +32753,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    nov = callPackage ({ dash, emacs, esxml, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    nov = callPackage ({ dash
+                       , emacs
+                       , esxml
+                       , fetchFromGitHub
+                       , fetchurl
+                       , lib
+                       , melpaBuild }:
+      melpaBuild {
         pname = "nov";
-        version = "0.2.3";
+        version = "0.2.4";
         src = fetchFromGitHub {
           owner = "wasamasa";
           repo = "nov.el";
-          rev = "e7bb37334ca85ce0e3f5c980464f652266a11218";
-          sha256 = "1lymf4ir9kja0dpifbx230cq3n1li25kcdn3x3bh8fskiil1pqm0";
+          rev = "3be6e8cd1a6311b0782ca2aa3d9961bec6183632";
+          sha256 = "1i7caa7s0c2qmf8bf9bi6sp7yavpnxlck6gm9fc0lkywrjfq0ixs";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cf543955ba2d5d0074fa2a5ba176f9415f6e006d/recipes/nov";
           sha256 = "0hlcncpdazi4rn5yxd0zq85v7gpjhw7a6dl2i99zf4ymsan97lhq";
-          name = "nov";
+          name = "recipe";
         };
         packageRequires = [ dash emacs esxml ];
         meta = {
@@ -26191,20 +32780,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    noxml-fold = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    noxml-fold = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "noxml-fold";
         version = "0.0.2";
         src = fetchFromGitHub {
           owner = "paddymcall";
           repo = "noXML-fold";
-          rev = "56fbc44b25cee9f8719edb3c7f8b1c4327dc1051";
-          sha256 = "00h6nwbx2l0rp2i7n0328w6ckp4gkspqk3q91ciixb4lkhh20cz2";
+          rev = "69138e030f4c25e635f0af94d2272504ec88992d";
+          sha256 = "0amg0d733njmj654lf2q92j8ql76h29zjk37fj692mjykcqsbf98";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/13d2af88b292293cb5ab50819c63acfe936630c8/recipes/noxml-fold";
           sha256 = "11dninxxwhflf2qrmvwmrryspd9j6m95kdlmyx59ykqvw8j0siqc";
-          name = "noxml-fold";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -26212,8 +32804,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    npm-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    npm-mode = callPackage ({ emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "npm-mode";
         version = "0.6.0";
         src = fetchFromGitHub {
@@ -26222,10 +32818,10 @@
           rev = "84b35211cba4f2d5f03b8dc2b60ae4b03d90bf8a";
           sha256 = "1mh6nbffciw4yhv049kdhh796ysj1x21ndm3fwymhskb3dy0w1ss";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/22dd6b2f8a94f56a61f4b70bd7e44b1bcf96eb18/recipes/npm-mode";
           sha256 = "1aym4jfr6im6hdc5d7995q6myhgig286fk9hpaxdf418h1s17rqr";
-          name = "npm-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -26233,20 +32829,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    nrepl-sync = callPackage ({ cider, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    nrepl-sync = callPackage ({ cider
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "nrepl-sync";
         version = "0.3.1";
         src = fetchFromGitHub {
           owner = "phillord";
           repo = "lein-sync";
-          rev = "471a08df87687a3eab61b3b8bf25a2e0962b5d5b";
-          sha256 = "1l07nrlfd5qj8jnqacjba7mb6prapg8d8h3881l3kb66sn02ahgy";
+          rev = "9506238562c2e0c0df744e0d81edff4c74322a7d";
+          sha256 = "1si5pfczk3iypdx2ydhirznx2hvp6r7sq2hy64gn3mn4r68svlfi";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2059ab6f2a3adc5af4f0876546e344e806e22ee5/recipes/nrepl-sync";
           sha256 = "01b504b4d8rrhlf3sfq3kk9i222fch6jd5jbm02kqw20fgv6q3jd";
-          name = "nrepl-sync";
+          name = "recipe";
         };
         packageRequires = [ cider ];
         meta = {
@@ -26254,8 +32854,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    nsis-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    nsis-mode = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "nsis-mode";
         version = "0.44";
         src = fetchFromGitHub {
@@ -26264,10 +32867,10 @@
           rev = "f1bf701c37680553c8f51462e0829d0dd6c53187";
           sha256 = "0c4qfbb345yna5c30czq8nhcx283z1fnpp6h16p7vjqs6y37czsl";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e9b169a80c7afdeb0c6e17cd289114b5d3d97266/recipes/nsis-mode";
           sha256 = "0pc047ryw906sz5mv0awvl67kh20prsgx6fbh0j1qm0cali2792l";
-          name = "nsis-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -26275,20 +32878,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    number-lock = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    number-lock = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "number-lock";
         version = "1.0.0";
         src = fetchFromGitHub {
           owner = "Liu233w";
           repo = "number-lock.el";
-          rev = "846e86e2b3b07410f69e70d3ba7afb072b5585da";
-          sha256 = "12gza7lxpwrp191gi9gm61wpvgwsrda52zva9bz3ncqfp7w0y32i";
+          rev = "1c71e31ae4974e04a21c22c6f059a59221793901";
+          sha256 = "0iy16jbp4zaaxf9lk1yw9n1dzqbvsmqnny3iplvlp69a70q0j2z8";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3c107adabe2e4c5b35ebb6b21db076cdea0e9c24/recipes/number-lock";
           sha256 = "13xqn4bcjm01zl0rgbwzad58x35230lm2qiipbyqkh2ma0a9pqn4";
-          name = "number-lock";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -26296,8 +32902,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    numbers = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    numbers = callPackage ({ emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "numbers";
         version = "1.4";
         src = fetchFromGitHub {
@@ -26306,10 +32916,10 @@
           rev = "74be68b94143f042ce461b2a69202f515acaf20c";
           sha256 = "0b4bgc4hkndia8zg4d23l1w78iwzj1l46ifrhz5z1p97qldalb0x";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5c77353d3a2b0d360bb28e528ef2707227081c72/recipes/numbers";
           sha256 = "02cx19fi34yvc0icajnwrmb8lr2g8y08kis08v9xxalfxz06kb3h";
-          name = "numbers";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -26317,8 +32927,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    nvm = callPackage ({ dash, dash-functional, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    nvm = callPackage ({ dash
+                       , dash-functional
+                       , f
+                       , fetchFromGitHub
+                       , fetchurl
+                       , lib
+                       , melpaBuild
+                       , s }:
+      melpaBuild {
         pname = "nvm";
         version = "0.2.0";
         src = fetchFromGitHub {
@@ -26327,10 +32944,10 @@
           rev = "d18b13e8275a57ee6c55dc71b671f02a8e6522ad";
           sha256 = "1624jj922l0bbav1v8szdr0lpyx0ng959fg3sspg1j15kgkir8kf";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/nvm";
           sha256 = "0md1ybc2r2fxykwk21acjhdzy2kw326bdwa1d15c6f48lknzvg4w";
-          name = "nvm";
+          name = "recipe";
         };
         packageRequires = [ dash dash-functional f s ];
         meta = {
@@ -26338,8 +32955,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    nyan-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    nyan-mode = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "nyan-mode";
         version = "1.1.2";
         src = fetchFromGitHub {
@@ -26348,10 +32968,10 @@
           rev = "4195cd368aca8f05a71cbff4e60cfa9dde10319a";
           sha256 = "1bnfxw6cnhsqill3n32j9bc6adl437ia9ivbwvwjpz1ay928yxm7";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4d8c3000df5f2ee2493a54dee6f9b65008add753/recipes/nyan-mode";
           sha256 = "1z2wnsbjllqa533g1ab5cgbv3d9hjix7fsd7z9c45nqh5cmadmyv";
-          name = "nyan-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -26359,20 +32979,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    o-blog = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    o-blog = callPackage ({ fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "o-blog";
         version = "2.0";
         src = fetchFromGitHub {
           owner = "renard";
           repo = "o-blog";
-          rev = "5db9594c6e3439c000b183551d7975c2e29131f4";
-          sha256 = "0r12023yy8j96bp8z2ml6ffyr2c9rcd5abkh6vqnkwsdxkzx6wrs";
+          rev = "069220e1046988ecd4658b09f9e2470c476c34e1";
+          sha256 = "16x0wy3w0vqpp17k5scbd53zwi8dxngm064rzg1kc24md8q6kqib";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d5f24e70260f46445b119817bc1326f29b367c4b/recipes/o-blog";
           sha256 = "08grkyvg27wd5232q3y8p0v7higfq7bmsdzmvhja96v6qy2xsbja";
-          name = "o-blog";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -26380,8 +33003,39 @@
           license = lib.licenses.free;
         };
       }) {};
-    ob-blockdiag = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ob-async = callPackage ({ async
+                            , dash
+                            , emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild
+                            , org }:
+      melpaBuild {
+        pname = "ob-async";
+        version = "1.0.0";
+        src = fetchFromGitHub {
+          owner = "astahlman";
+          repo = "ob-async";
+          rev = "4bd85c9065f4b075190ffa5a721b9191bc84d6e9";
+          sha256 = "0i8551vhn6l7gfw3zxnrimp6nzlxkp13gkvzmcmjs1c5pbxqrrik";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ob-async";
+          sha256 = "0k7kv71nnibp53lav774c61w9pzhq8qvch9rvpyyrwbyd67ninl8";
+          name = "recipe";
+        };
+        packageRequires = [ async dash emacs org ];
+        meta = {
+          homepage = "https://melpa.org/#/ob-async";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ob-blockdiag = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "ob-blockdiag";
         version = "20170728.113";
         src = fetchFromGitHub {
@@ -26390,10 +33044,10 @@
           rev = "634fcf64a4ae735afe7001d865b03f5d71e23046";
           sha256 = "0xr3bv4wxz13b1grfyl2qnrszzab3n9735za837nf4lxh527ksaj";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/261b77a3fd07644d1c250b16857de70cc1bbf478/recipes/ob-blockdiag";
           sha256 = "1lmawbgrlp6qd7p664jcl98y1xd2yqw9np6j52bh9i6s3cz6628g";
-          name = "ob-blockdiag";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -26401,20 +33055,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    ob-coffeescript = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ob-coffeescript = callPackage ({ fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "ob-coffeescript";
         version = "1.0.0";
         src = fetchFromGitHub {
           owner = "brantou";
           repo = "ob-coffeescript";
-          rev = "b70f3d822c707cb02333fcb739ba4874614cad2a";
-          sha256 = "0284v3km41427q7dr0wmvf3zhbsgzj0j2r9zny0g3n85qvyk0rgd";
+          rev = "219c83f6c44e3612a7718c996365df1de747127d";
+          sha256 = "14va23m0wab1jf6jc5m61y2c0kcmc8dha463vyci1mvs3p1psjr8";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ba1a808c77653bac1948d6c44bd1db09301ffeff/recipes/ob-coffeescript";
           sha256 = "05q1wnabw52kd3fpcpinpxs9z6xmi4n1p19jbcz0bgjpnw05s27p";
-          name = "ob-coffeescript";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -26422,20 +33079,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    ob-http = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    ob-http = callPackage ({ cl-lib ? null
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild
+                           , s }:
+      melpaBuild {
         pname = "ob-http";
         version = "0.2.0";
         src = fetchFromGitHub {
           owner = "zweifisch";
           repo = "ob-http";
-          rev = "20393dd8130d21a3f06d8514da14c5ffdd88ae44";
-          sha256 = "0xa7rgsb0d1d96h5bb0n0sy1hgmd2fg6r6g2aqp1c29ld4hpi7r7";
+          rev = "d57a9d4bb8727f36cb264189fe0a4cd9ef7c1c56";
+          sha256 = "1iqcfzkk4b923mnh20g4dfpjp35a8qcwbmi86li8jj11bknrx6dw";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/950b02f76a04f453992b8720032e8c4cec9a039a/recipes/ob-http";
           sha256 = "0b7ghz9pqbyn3b52cpmnwa2wnd4svj23p6gc48ybwzwiid42wiss";
-          name = "ob-http";
+          name = "recipe";
         };
         packageRequires = [ cl-lib s ];
         meta = {
@@ -26443,20 +33105,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    ob-hy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ob-hy = callPackage ({ emacs
+                         , fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "ob-hy";
-        version = "1.0.0";
+        version = "1.0.1";
         src = fetchFromGitHub {
           owner = "brantou";
           repo = "ob-hy";
-          rev = "a3512f274709dc4ab6c18d7955d361f8715505f0";
-          sha256 = "1i796041svy7njjl3aqaxzjydmm24q688vpxvqd0pj5hyajqdgqw";
+          rev = "a42ecaf440adc03e279afe43ee5ef6093ddd542a";
+          sha256 = "0kv92r6j0dcqcg1s0g4iq1xvanscg6crwniysbrq6ifvmc4lvfdj";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/12a7a7dba169010a3a047f961010236a203c16c2/recipes/ob-hy";
           sha256 = "18a8fpda0f28wxmjprhd9dmz7bpk1j3iayl20lqffrcal6m4f1h7";
-          name = "ob-hy";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -26464,8 +33130,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    ob-prolog = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ob-prolog = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "ob-prolog";
         version = "1.0.2";
         src = fetchFromGitHub {
@@ -26474,10 +33143,10 @@
           rev = "efa86bb70fd1907806f3e43705aff54d35582442";
           sha256 = "0g25nn2h7djgc9rp59spx9096jdypsizd0vfzwj96cpq90lkysjx";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fb87868cd74325f0a4a38c5542c264501000951d/recipes/ob-prolog";
           sha256 = "0ki8yd20yk5xwn0zpk06zjxzgrsf8paydif9n98svb9s2l9wrh1s";
-          name = "ob-prolog";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -26485,8 +33154,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    ob-sagemath = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, sage-shell-mode }:
-    melpaBuild {
+    ob-sagemath = callPackage ({ emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild
+                               , s
+                               , sage-shell-mode }:
+      melpaBuild {
         pname = "ob-sagemath";
         version = "0.4";
         src = fetchFromGitHub {
@@ -26495,10 +33170,10 @@
           rev = "450d510a5eb1fd644d0037e9f02271ca33639fb0";
           sha256 = "00i7jszlfh67xzvqnp137aaia68rkk4ri5v0fs32ym10pcj8l4dp";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/dc074af316a09906a26ad957a56e3dc272cd813b/recipes/ob-sagemath";
           sha256 = "02ispac1y4g7p7iyscf5p8lvp92ncrn6281jm9igyiny1w6hivy7";
-          name = "ob-sagemath";
+          name = "recipe";
         };
         packageRequires = [ emacs s sage-shell-mode ];
         meta = {
@@ -26506,8 +33181,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    ob-sml = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, sml-mode }:
-    melpaBuild {
+    ob-sml = callPackage ({ fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild
+                          , sml-mode }:
+      melpaBuild {
         pname = "ob-sml";
         version = "0.2";
         src = fetchFromGitHub {
@@ -26516,10 +33195,10 @@
           rev = "5dc966acbe65e9e158bfa90018035bf52d4dafd4";
           sha256 = "1xx6hyq3gk4bavcx6i9bhipbn4mn5rv2ga9lryq09qgq2l9znclk";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d1b0fbe1198fa624771c2f61249db502de57942a/recipes/ob-sml";
           sha256 = "04qvzhwjr8ipvq3znnhn0wbl4pbb1rwxi90iidavzk3phbkpaskn";
-          name = "ob-sml";
+          name = "recipe";
         };
         packageRequires = [ sml-mode ];
         meta = {
@@ -26527,8 +33206,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    ob-translate = callPackage ({ fetchFromGitHub, fetchurl, google-translate, lib, melpaBuild, org }:
-    melpaBuild {
+    ob-translate = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , google-translate
+                                , lib
+                                , melpaBuild
+                                , org }:
+      melpaBuild {
         pname = "ob-translate";
         version = "0.1.2";
         src = fetchFromGitHub {
@@ -26537,10 +33221,10 @@
           rev = "6b39cc1a94a1071107a4391684b1bffb5b9826f3";
           sha256 = "10hm20dzhkxk61ass3bd5gdn1bs2l60y3zjnpkxinzn7m6aaniia";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4d89e4006afc51bd44e23f87a1d1ef1140489ab3/recipes/ob-translate";
           sha256 = "1hi0rxbyxvk9sbk2fy3kqw7l4lgri921vya1mn4i1q2i1979r2gz";
-          name = "ob-translate";
+          name = "recipe";
         };
         packageRequires = [ google-translate org ];
         meta = {
@@ -26548,8 +33232,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    ob-uart = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ob-uart = callPackage ({ fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "ob-uart";
         version = "0.1.0";
         src = fetchFromGitHub {
@@ -26558,10 +33245,10 @@
           rev = "90daeac90a9e75c20cdcf71234c67b812110c50e";
           sha256 = "1syxxq411izmyfrhlywasax7n5c3yjy487mvfdjzjg8csmmk0m9v";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5334f1a48b8ea6b7a660db27910769093c76113d/recipes/ob-uart";
           sha256 = "1dkbyk8da0zw784dgwi8njnz304s54341dyfzvlb0lhcn41dmkz7";
-          name = "ob-uart";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -26569,8 +33256,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    obfusurl = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    obfusurl = callPackage ({ cl-lib ? null
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "obfusurl";
         version = "2.1";
         src = fetchFromGitHub {
@@ -26579,10 +33270,10 @@
           rev = "7a5a41905000ce2ec1fd72509a5567e5fd9f47e5";
           sha256 = "0jbrxlpx0cxg8jzqrssk3y3ab7v62ymi6ys24542a8vpk522vqxk";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/201fe11682cb06b26775a52c81b6a1258b74b4d0/recipes/obfusurl";
           sha256 = "0xx2zsjbkd17iy7xzqc66f9xgc97f9js3nz656yhmmxakjk2krra";
-          name = "obfusurl";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -26590,8 +33281,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    ocodo-svg-modelines = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, svg-mode-line-themes }:
-    melpaBuild {
+    ocodo-svg-modelines = callPackage ({ fetchFromGitHub
+                                       , fetchurl
+                                       , lib
+                                       , melpaBuild
+                                       , svg-mode-line-themes }:
+      melpaBuild {
         pname = "ocodo-svg-modelines";
         version = "0.1.4";
         src = fetchFromGitHub {
@@ -26600,10 +33295,10 @@
           rev = "a6c5b9a7536c7a8fa3bd9d9dafdebc8d99903018";
           sha256 = "05ay599nc6jdw2fjss4izz1ynv2wc4svff932n8j9hvrhygipb2w";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5b9651865f4f8009c9b31fa1e5561de97a5ad8de/recipes/ocodo-svg-modelines";
           sha256 = "0fa88ns70wsr9i9gf4zx3fvmn1a32mrjsda105n0cx6c965kfmay";
-          name = "ocodo-svg-modelines";
+          name = "recipe";
         };
         packageRequires = [ svg-mode-line-themes ];
         meta = {
@@ -26611,8 +33306,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    ocp-indent = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ocp-indent = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "ocp-indent";
         version = "1.6.1";
         src = fetchFromGitHub {
@@ -26621,10 +33319,10 @@
           rev = "5d83bc71d12c89850cb0fdff50d4830adb705b6c";
           sha256 = "0rcaa11mjqka032g94wgw9llqpflyk3ywr3lr6jyxbh1rjvnipnw";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e1af061328b15360ed25a232cc6b8fbce4a7b098/recipes/ocp-indent";
           sha256 = "0wc4z9dsnnyr24n3vg1npvc3rm53av8bpbvrl8kldxxdiwgnbkjw";
-          name = "ocp-indent";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -26632,20 +33330,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    octicons = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    octicons = callPackage ({ cl-lib ? null
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "octicons";
         version = "0.1";
         src = fetchFromGitHub {
           owner = "syohex";
           repo = "emacs-octicons";
-          rev = "77bb1a49045f89b3eaf9bcffeefbb9e1abaee556";
-          sha256 = "19fg6r7aiirfsbp2h1a824476sn1ln4nz8kvpdzkzvyf1hzx68gw";
+          rev = "7ffc50ac99d43bc92928dec9f269eceb7e76bf0b";
+          sha256 = "17hpcr864lx0g68by4n2n013zbplnihvidqm629zgr9b9ybanxy8";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c62867eae1a254eb5fe820d4387dd4e8a0ff9be2/recipes/octicons";
           sha256 = "02f37bvnc5qvkvfbyx5wp54nz71bqm747mq1p5361sx091lllkxk";
-          name = "octicons";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -26653,8 +33355,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    offlineimap = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    offlineimap = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "offlineimap";
         version = "1";
         src = fetchFromGitHub {
@@ -26663,10 +33368,10 @@
           rev = "646482203aacdf847d57d0a96263fddcfc33fb61";
           sha256 = "0az4llfgva4wvpljyc5s2m7ggfnj06ssp32x8bncr5fzksha3r7b";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/671afe0ff3889ae8c4b2d7b8617a3a25c16f3f0f/recipes/offlineimap";
           sha256 = "0nza7lrz7cn06njcblwh9hy3050j8ja4awbxx7jzv6nazjg7201b";
-          name = "offlineimap";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -26674,20 +33379,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    olivetti = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    olivetti = callPackage ({ emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "olivetti";
-        version = "1.5.9";
+        version = "1.6.1";
         src = fetchFromGitHub {
           owner = "rnkn";
           repo = "olivetti";
-          rev = "35d275d8bdfc5107c25db5a4995b65ba936f1d56";
-          sha256 = "00havcpsbk54xfcys9lhm9sv1d753jk3cmvssa2c52pp5frpxz3i";
+          rev = "02272654f1d920ea2da5a4b553acd5e5cc096ab1";
+          sha256 = "0f7i2f42mlr27d9wa9h2zvz0k0xyqvwndzgz81x8gsm0w1iv15k9";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/697334ca3cdb9630572ae267811bd5c2a67d2a95/recipes/olivetti";
           sha256 = "0fkvw2y8r4ww2ar9505xls44j0rcrxc884p5srf1q47011v69mhd";
-          name = "olivetti";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -26695,8 +33404,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    omni-kill = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    omni-kill = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "omni-kill";
         version = "0.6.0";
         src = fetchFromGitHub {
@@ -26705,10 +33417,10 @@
           rev = "904549c8fd6ac3cf22b5d7111ca8944e179cffea";
           sha256 = "1mlnh5pdqdv1qb8jvi0wvkgbpy74zq807gmp04bp6cpxdns9j63f";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c24df34d2fa5d908223379e909148423ba327ae2/recipes/omni-kill";
           sha256 = "03kydl16rd9mnc1rnan2byqa6f70891fhcj16wkavl2r68rfj75k";
-          name = "omni-kill";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -26716,8 +33428,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    omni-log = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, s }:
-    melpaBuild {
+    omni-log = callPackage ({ dash
+                            , emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , ht
+                            , lib
+                            , melpaBuild
+                            , s }:
+      melpaBuild {
         pname = "omni-log";
         version = "0.3.6";
         src = fetchFromGitHub {
@@ -26726,10 +33445,10 @@
           rev = "20021eb788cbeec0371145468430b259686f519d";
           sha256 = "1sf2zbhjaz5b9xmz6632338cga7d326ibgw8b8c6c6b4vk16yhqc";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/47bb19bb7b4713c3fd82c1035a2fe66588c069e3/recipes/omni-log";
           sha256 = "0c29243zq8r89ax4rxlmb8imag12icnldcb0q0xsnhjccw8lyw1r";
-          name = "omni-log";
+          name = "recipe";
         };
         packageRequires = [ dash emacs ht s ];
         meta = {
@@ -26737,8 +33456,16 @@
           license = lib.licenses.free;
         };
       }) {};
-    omni-quotes = callPackage ({ dash, f, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, omni-log, s }:
-    melpaBuild {
+    omni-quotes = callPackage ({ dash
+                               , f
+                               , fetchFromGitHub
+                               , fetchurl
+                               , ht
+                               , lib
+                               , melpaBuild
+                               , omni-log
+                               , s }:
+      melpaBuild {
         pname = "omni-quotes";
         version = "0.5.0";
         src = fetchFromGitHub {
@@ -26747,10 +33474,10 @@
           rev = "454116c1dd6581baaeefd6b9310b1b6b7a5c36d0";
           sha256 = "1h8lrpi5wizi5vncdz83cxlx7c71xw3sw89sfg462zfbz2sq8afl";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3402524f79381c99fdeb81a6a5a9241c918811be/recipes/omni-quotes";
           sha256 = "0dqki0ibabs9cpcjvnh8lc2114x46i1xmnyjc6qqblfxa3ggdygs";
-          name = "omni-quotes";
+          name = "recipe";
         };
         packageRequires = [ dash f ht omni-log s ];
         meta = {
@@ -26758,8 +33485,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    omni-scratch = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    omni-scratch = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "omni-scratch";
         version = "0.6.0";
         src = fetchFromGitHub {
@@ -26768,10 +33498,10 @@
           rev = "636374c59c7d33c2f72c97ad8ba9fb4854f2324d";
           sha256 = "0w62bk2m0gs4b605s691z4iap9baz1z6c8z4v9vb05917qlsx5xb";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6ba3e128a7fe4476d82266506b18ba9984c37944/recipes/omni-scratch";
           sha256 = "190dkqcw8xywzrq8a99w4rqi0y1h2aj23s84g2ln1sf7jaf6d6n9";
-          name = "omni-scratch";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -26779,20 +33509,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    omni-tags = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, pcre2el }:
-    melpaBuild {
+    omni-tags = callPackage ({ cl-lib ? null
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild
+                             , pcre2el }:
+      melpaBuild {
         pname = "omni-tags";
         version = "0.1.2";
         src = fetchFromGitHub {
           owner = "AdrieanKhisbe";
           repo = "omni-tags.el";
-          rev = "a7078bfbc9a6256efd0e57530df9fd7808bc2185";
-          sha256 = "0c34rci5793hd674x2srhqvnj46llrbkrw1xpzf73s4ib5zhh7xi";
+          rev = "a39bcb31647d3d6c81253d2476bd50ceb1179a4b";
+          sha256 = "0688xl5izq3189w4fxzw255md3r092f56xhbbsszqf8rra42qq42";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c77e57f41484c08cae9f47c4379d1752ccf43ce2/recipes/omni-tags";
           sha256 = "133ww1jf14jbw02ssbx2a46mp52j18a2wwzb6x77azb0akmf1lzl";
-          name = "omni-tags";
+          name = "recipe";
         };
         packageRequires = [ cl-lib pcre2el ];
         meta = {
@@ -26800,20 +33535,33 @@
           license = lib.licenses.free;
         };
       }) {};
-    omnisharp = callPackage ({ auto-complete, cl-lib ? null, csharp-mode, dash, emacs, f, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, popup, s, shut-up }:
-    melpaBuild {
+    omnisharp = callPackage ({ auto-complete
+                             , cl-lib ? null
+                             , csharp-mode
+                             , dash
+                             , emacs
+                             , f
+                             , fetchFromGitHub
+                             , fetchurl
+                             , flycheck
+                             , lib
+                             , melpaBuild
+                             , popup
+                             , s
+                             , shut-up }:
+      melpaBuild {
         pname = "omnisharp";
         version = "4.2";
         src = fetchFromGitHub {
           owner = "OmniSharp";
           repo = "omnisharp-emacs";
-          rev = "c00a3a9157432c578fffb79169232e4a81d4ad31";
-          sha256 = "0ghwqf1wbiywzdx0qlgs4y94z4ivlgac8rpg1bimlb8xfx62sia0";
+          rev = "588b8482685adedbc56933cb13c58d9cc6a82456";
+          sha256 = "1iqwxc19jvcb2gsm2aq59zblg1qjmbxgb2yl3h3aybqp968j3i00";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e327c483be04de32638b420c5b4e043d12a2cd01/recipes/omnisharp";
           sha256 = "0gh0wwdpdx2cjf95pcagj52inf7mrmiq7x8p0x5c7lvl4pfzhh87";
-          name = "omnisharp";
+          name = "recipe";
         };
         packageRequires = [
           auto-complete
@@ -26832,20 +33580,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    opam = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    opam = callPackage ({ emacs
+                        , fetchFromGitHub
+                        , fetchurl
+                        , lib
+                        , melpaBuild }:
+      melpaBuild {
         pname = "opam";
         version = "0.1";
         src = fetchFromGitHub {
           owner = "lunaryorn";
           repo = "opam.el";
-          rev = "83fb2850d29ec792754e0af18b015e089aad2695";
-          sha256 = "119pk7gg4fw5bdvir8077ra603b5nbqvd7ph9cqrwxa056jzvry8";
+          rev = "d5b15e6f75e4e46e6d4064ef45fb25c90515aa85";
+          sha256 = "00alzjidp7v0ll4pb5ybkk3hly6phzn4izar4n4clmpwn623fjf8";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fc4e2076ebaefe7e241607ff6920fe243d10ccd0/recipes/opam";
           sha256 = "004r93nn1ranvxkcc0y5m3p8gh4axgghgnsvim38nc1sqda5h6xa";
-          name = "opam";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -26853,8 +33605,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    opencl-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    opencl-mode = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "opencl-mode";
         version = "1.0";
         src = fetchFromGitHub {
@@ -26863,10 +33618,10 @@
           rev = "14109a4bb56105a9c052ae49ad4c638b4cc210b2";
           sha256 = "0n64l1jrrk60g192nn0240qcv2p9r138mi9gb38qq5k65wffbc21";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d97575fdae88d55b55686aa6814f858813cad171/recipes/opencl-mode";
           sha256 = "1g351wiaycwmg1bnf4s2mdnc3lb2ml5l54g19184xqssfqlx7y79";
-          name = "opencl-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -26874,20 +33629,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    opener = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }:
-    melpaBuild {
+    opener = callPackage ({ cl-lib ? null
+                          , emacs
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild
+                          , request }:
+      melpaBuild {
         pname = "opener";
         version = "0.2.2";
         src = fetchFromGitHub {
           owner = "0robustus1";
           repo = "opener.el";
-          rev = "c384f67278046fdcd220275fdd212ab85672cbeb";
-          sha256 = "0gci909a2rbx5i8dyzyrcddwdic7nvpk6y6djvn521yaag4sq87h";
+          rev = "ab75048b1073fb1b1452dabae94ab55e0cfb57c4";
+          sha256 = "00kh8m23jzwb0wipwjdm2wad08xqrlcg00vzc4vzijgrapz0da3h";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c5a448f1936f46176bc2462eb03955a0c19efb9e/recipes/opener";
           sha256 = "0fhny4m7x19wnlnr19s4rkl04dkx95yppd51jzrkr96xiznw97s7";
-          name = "opener";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs request ];
         meta = {
@@ -26895,8 +33656,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    opensource = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, request, s }:
-    melpaBuild {
+    opensource = callPackage ({ dash
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild
+                              , pkg-info
+                              , request
+                              , s }:
+      melpaBuild {
         pname = "opensource";
         version = "0.2.0";
         src = fetchFromGitHub {
@@ -26905,10 +33673,10 @@
           rev = "27d06be45c852e84e47c33cbd0f4c344fd9a0370";
           sha256 = "1rjf78vki4xp8y856v95877093p3zgfc9mx92npscsi1g93dxn80";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ec4255a403e912a14a7013ea96f554d3588dfc30/recipes/opensource";
           sha256 = "17gi20s2vi7m75qqaff907x1g8ja5ny90klldpqmj258m2j6a6my";
-          name = "opensource";
+          name = "recipe";
         };
         packageRequires = [ dash pkg-info request s ];
         meta = {
@@ -26916,8 +33684,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    operate-on-number = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    operate-on-number = callPackage ({ fetchFromGitHub
+                                     , fetchurl
+                                     , lib
+                                     , melpaBuild }:
+      melpaBuild {
         pname = "operate-on-number";
         version = "1.1.0";
         src = fetchFromGitHub {
@@ -26926,10 +33697,10 @@
           rev = "6a17272e2b6e23260edb1b5eeb01905a1f37e0a6";
           sha256 = "12q09kdcgv6hl1hmgarl73j4g9gi4h7sj865655mdja0ns9n1pdb";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/aec74eff8ca3d5e381d7a6d61c73f1a0716f1c60/recipes/operate-on-number";
           sha256 = "1rw3fqbzfizgcbz3yaf99rr2546msna4z7dyfa8dbi8h7yzl4fhk";
-          name = "operate-on-number";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -26937,20 +33708,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-ac = callPackage ({ auto-complete-pcmp, fetchFromGitHub, fetchurl, lib, log4e, melpaBuild, yaxception }:
-    melpaBuild {
+    org-ac = callPackage ({ auto-complete-pcmp
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , log4e
+                          , melpaBuild
+                          , yaxception }:
+      melpaBuild {
         pname = "org-ac";
         version = "0.0.2";
         src = fetchFromGitHub {
           owner = "aki2o";
           repo = "org-ac";
-          rev = "9cbbda79e2fe964ded3f39cf7a2e74f1be3d6b9a";
-          sha256 = "1xckin2d6s40kgr2293g72ipc57f8gp6y63303kmqcv3qm8q13ca";
+          rev = "b637dfdacdeea8a61303eea338c8ca9b73eb5fff";
+          sha256 = "16j9zalchijdskfwz38icdwhfnxbkvybzqnzdjjm2ihk734yl6vg";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/adf598f8dae69ff286ae78d353a2a5d4363b4480/recipes/org-ac";
           sha256 = "059jr3v3558cgw626zbqfwmwwv5f4637ai26h7b6psqh0x9sf3mr";
-          name = "org-ac";
+          name = "recipe";
         };
         packageRequires = [ auto-complete-pcmp log4e yaxception ];
         meta = {
@@ -26958,8 +33735,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-agenda-property = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    org-agenda-property = callPackage ({ emacs
+                                       , fetchFromGitHub
+                                       , fetchurl
+                                       , lib
+                                       , melpaBuild }:
+      melpaBuild {
         pname = "org-agenda-property";
         version = "1.3.1";
         src = fetchFromGitHub {
@@ -26968,10 +33749,10 @@
           rev = "2ff628a14a3e758863bbd88fba4db9f77fd2c3a8";
           sha256 = "0gkxxzdk8bd1yi5x9217pkq9d01ccq8znxc7h8qcw0p1336rigfc";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/org-agenda-property";
           sha256 = "0zsjzjw52asl609q7a2s4jcsm478p4cxzhnd3azyr9ypxydjf6qk";
-          name = "org-agenda-property";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -26979,8 +33760,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-alert = callPackage ({ alert, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    org-alert = callPackage ({ alert
+                             , dash
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild
+                             , s }:
+      melpaBuild {
         pname = "org-alert";
         version = "0.1.0";
         src = fetchFromGitHub {
@@ -26989,10 +33776,10 @@
           rev = "685c18aa5ce994360c7f9e8bbf49590c412187ac";
           sha256 = "0gkv2sfl9nb64qqh5xhgq68r9kfmsny3vpcmnzk2mqjcb9nh657s";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2976b7f9271bc46679a5774ff5f388b81a9f0cf8/recipes/org-alert";
           sha256 = "0n5a24iv8cj395xr0gfgi0hs237dd98zm2fws05k47vy3ygni152";
-          name = "org-alert";
+          name = "recipe";
         };
         packageRequires = [ alert dash s ];
         meta = {
@@ -27000,8 +33787,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-autolist = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    org-autolist = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "org-autolist";
         version = "0.14";
         src = fetchFromGitHub {
@@ -27010,10 +33800,10 @@
           rev = "c82d1e83e982b5f0c106b8800e5b0cfd5f73fdc1";
           sha256 = "0ykiafbdjb2iy0s1gr6l51gddjbk08iwj4v13hgm8b675bl0cw56";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ca8e2cdb282674b20881bf6b4fc49af42a5d09a7/recipes/org-autolist";
           sha256 = "1jvspxhxlvd7h1srk9dbk1v5dykmf8jsjaqicpll7ial6i0qgikj";
-          name = "org-autolist";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -27021,20 +33811,27 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-babel-eval-in-repl = callPackage ({ emacs, ess, eval-in-repl, fetchFromGitHub, fetchurl, lib, matlab-mode, melpaBuild }:
-    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.4";
         src = fetchFromGitHub {
           owner = "diadochos";
           repo = "org-babel-eval-in-repl";
-          rev = "bfa72c582ac1531ad42aba23e2b1267ab68e31f6";
-          sha256 = "1jm56zxa99s163jv02vhfrshmykvld7girq7gmj1x60g3wjzhn5k";
+          rev = "36ebf7d855df8ace9429270cfc48cf2e949775eb";
+          sha256 = "1hjwxmn1gsq9wfhhydqlnss66zq4wl13vkq4irf0l50xspzscg8l";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/org-babel-eval-in-repl";
           sha256 = "0brqp0w9s28ibws4idlm1rw09lsfa98l5wbpwm64rvlixhs6zlnx";
-          name = "org-babel-eval-in-repl";
+          name = "recipe";
         };
         packageRequires = [ emacs ess eval-in-repl matlab-mode ];
         meta = {
@@ -27042,8 +33839,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-beautify-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    org-beautify-theme = callPackage ({ fetchFromGitHub
+                                      , fetchurl
+                                      , lib
+                                      , melpaBuild }:
+      melpaBuild {
         pname = "org-beautify-theme";
         version = "0.3.1";
         src = fetchFromGitHub {
@@ -27052,10 +33852,10 @@
           rev = "7b7a7cbd4f25f77e8bd81783f517b2b182220fd9";
           sha256 = "0nqw4apv642vqbjjqbi960zim9lkbnaszrlasf25c9fnzdg1m134";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f55f1ee9890f720e058401a052e14c7411252967/recipes/org-beautify-theme";
           sha256 = "0rrlyn61xh3szw8aihxpbmg809xx5ac66xqzj895dn1raz129h2w";
-          name = "org-beautify-theme";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -27063,8 +33863,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-board = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    org-board = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "org-board";
         version = "1018";
         src = fetchFromGitHub {
@@ -27073,10 +33876,10 @@
           rev = "405bfd630f1b31bd77158bc8e79aab86812cba65";
           sha256 = "066shdqp0bca2xlds1m0c5ml3yxqfyzsyyy7sy72ybv41n5b11x3";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d8063ee17586d9b1e7415f7b924239826b81ab08/recipes/org-board";
           sha256 = "00jsrxc8f85cvrh7364n7337frdj12yknlfp28fhdgk2ph6d7bp4";
-          name = "org-board";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -27084,8 +33887,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-bookmark-heading = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    org-bookmark-heading = callPackage ({ emacs
+                                        , fetchFromGitHub
+                                        , fetchurl
+                                        , lib
+                                        , melpaBuild }:
+      melpaBuild {
         pname = "org-bookmark-heading";
         version = "1.0.0";
         src = fetchFromGitHub {
@@ -27094,10 +33901,10 @@
           rev = "70b014e09977371a8c9bad03085c116693062b19";
           sha256 = "0j765rb2yfwnc0ri53jb8d6lxj6knpmy495bk3sd63492kdrxf93";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/eaadbd149399c6e3c48ac5cbeedeb29a3f5791f1/recipes/org-bookmark-heading";
           sha256 = "1q92rg9d945ypcpb7kig2r0cr7nb7avsylaa7nxjib25advx80n9";
-          name = "org-bookmark-heading";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -27105,8 +33912,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-bullets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    org-bullets = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "org-bullets";
         version = "0.2.4";
         src = fetchFromGitHub {
@@ -27115,10 +33925,10 @@
           rev = "b70ac2ec805bcb626a6e39ea696354577c681b36";
           sha256 = "10nr4sjffnqbllv6gmak6pviyynrb7pi5nvrq331h5alm3xcpq0w";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fe60fc3c60d87b5fd7aa24e858c79753d5f7d2f6/recipes/org-bullets";
           sha256 = "0yrfgd6r71rng3qipp3y9i5mpm6510k4xsfgyidcn25v27fysk3v";
-          name = "org-bullets";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -27126,8 +33936,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-category-capture = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
-    melpaBuild {
+    org-category-capture = callPackage ({ emacs
+                                        , fetchFromGitHub
+                                        , fetchurl
+                                        , lib
+                                        , melpaBuild
+                                        , org }:
+      melpaBuild {
         pname = "org-category-capture";
         version = "1.1.0";
         src = fetchFromGitHub {
@@ -27136,10 +33951,10 @@
           rev = "48f621b595e748c5e03431f237facf258ffc9443";
           sha256 = "00n2msmwcjjiibrhrvpawzgz6qcjjfy9qnii1iaass0038g4bd89";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6760daac1ef9d9d7ba07e2fc9668873020f901f1/recipes/org-category-capture";
           sha256 = "0l5n71h9lc8q9k0sb5ghzwb81lah4l1ykc06shfl9zw5lqqvahav";
-          name = "org-category-capture";
+          name = "recipe";
         };
         packageRequires = [ emacs org ];
         meta = {
@@ -27147,8 +33962,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-clock-csv = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org, s }:
-    melpaBuild {
+    org-clock-csv = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild
+                                 , org
+                                 , s }:
+      melpaBuild {
         pname = "org-clock-csv";
         version = "1.1";
         src = fetchFromGitHub {
@@ -27157,10 +33977,10 @@
           rev = "20ab6ee4395bedc0a7b8dfaf7b51f2c63dc8d2c6";
           sha256 = "00lcvmls7zlkqmsi0yfiihyxv49803jlc9khcbqawxlkijvr65pm";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e023cb898699f76f6c3d9ffe8162aacfc6a8c34f/recipes/org-clock-csv";
           sha256 = "02spjrzdf1kmvyvqkzg7nnmq9kqv75zwxn5ifqmg0f7a1gw28f0l";
-          name = "org-clock-csv";
+          name = "recipe";
         };
         packageRequires = [ org s ];
         meta = {
@@ -27168,8 +33988,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-commentary = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
-    melpaBuild {
+    org-commentary = callPackage ({ dash
+                                  , emacs
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild
+                                  , org }:
+      melpaBuild {
         pname = "org-commentary";
         version = "0.3.0";
         src = fetchFromGitHub {
@@ -27178,10 +34004,10 @@
           rev = "2eeeb0f506e30ef82263e67279d837a79cbde021";
           sha256 = "02an98pc52yfxsxmz1kib692yx93rqdi1q3lpvblzyd3hhd51rlr";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3e0a40d9ea5849b9c22378a84ac8122e4eb2737d/recipes/org-commentary";
           sha256 = "0ym1rq2zhyhc6hkk40wsa9jni2h1z5dkaisldqzg8ggl7iv3v4fx";
-          name = "org-commentary";
+          name = "recipe";
         };
         packageRequires = [ dash emacs org ];
         meta = {
@@ -27189,8 +34015,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-doing = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    org-doing = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "org-doing";
         version = "0.1";
         src = fetchFromGitHub {
@@ -27199,10 +34028,10 @@
           rev = "e099514cfc162f8fe3d383456a7964743b0455d5";
           sha256 = "1hvnrw0y3chlfv6zxsczmm8zybrnakn3x13ykv2zblw96am9kd2s";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4c497b87e14ab614c963f4b2f041bc0111b6e936/recipes/org-doing";
           sha256 = "17w49z78fvbz182sxv9mnryj124gm9jbdmbybppjqz4rk6wvnm2j";
-          name = "org-doing";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -27210,8 +34039,37 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-dp = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    org-download = callPackage ({ async
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
+        pname = "org-download";
+        version = "0.1.0";
+        src = fetchFromGitHub {
+          owner = "abo-abo";
+          repo = "org-download";
+          rev = "a57beffd0f09b218a9487d1750960878c1d5b12c";
+          sha256 = "1disqqfwjl366kv6xgc28w7zbc4xl9a0jmdj7w27mb00sxzfk3vb";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/edab283bc9ca736499207518b4c9f5e71e822bd9/recipes/org-download";
+          sha256 = "19yjx0qqpmrdwagp3d6lwwv7dcb745m9ccq3m29sin74f5p4svsi";
+          name = "recipe";
+        };
+        packageRequires = [ async ];
+        meta = {
+          homepage = "https://melpa.org/#/org-download";
+          license = lib.licenses.free;
+        };
+      }) {};
+    org-dp = callPackage ({ cl-lib ? null
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "org-dp";
         version = "1";
         src = fetchFromGitHub {
@@ -27220,10 +34078,10 @@
           rev = "d740c2065120f71762c48877da1a31dea881e98e";
           sha256 = "0cxccxz17pj67wgmyxr74n381mknqgqkyav3jkxs4ghg59g5nygl";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7f337375082da316ed07b8ce9c775b484b8cdbf6/recipes/org-dp";
           sha256 = "0fnrzpgw8l0g862j20yy4mw1wfcm2i04r6dxi4yd7yay8bw2i4yq";
-          name = "org-dp";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -27231,8 +34089,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-edit-latex = callPackage ({ auctex, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    org-edit-latex = callPackage ({ auctex
+                                  , emacs
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "org-edit-latex";
         version = "0.8.3";
         src = fetchFromGitHub {
@@ -27241,10 +34104,10 @@
           rev = "39cbc9a99acb030f537c7269ab93958187321871";
           sha256 = "1w0lyz71dq8x28ira4hig1b70bqn1dr53w3k5dgch9szcf6xa86y";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/org-edit-latex";
           sha256 = "0nkiz4682qgk5dy4if3gij98738482ys8zwm8yx834za38xxbwry";
-          name = "org-edit-latex";
+          name = "recipe";
         };
         packageRequires = [ auctex emacs ];
         meta = {
@@ -27252,8 +34115,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-elisp-help = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
-    melpaBuild {
+    org-elisp-help = callPackage ({ cl-lib ? null
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild
+                                  , org }:
+      melpaBuild {
         pname = "org-elisp-help";
         version = "1.0.0";
         src = fetchFromGitHub {
@@ -27262,10 +34130,10 @@
           rev = "3e33ab1a2933dd7f2782ef91d667a37f12d633ab";
           sha256 = "088pbafz1x4z7qi70cjbrvfrcdrjp4zy0yl115klbidshqhxycmj";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b0a9bf5046a4c3be8a83004d506bd258a6f7ff15/recipes/org-elisp-help";
           sha256 = "0a4wvz52hkcw5nrml3h1yp8w97vg5jw22wnpfbb827zh7iwb259h";
-          name = "org-elisp-help";
+          name = "recipe";
         };
         packageRequires = [ cl-lib org ];
         meta = {
@@ -27273,8 +34141,44 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-gcal = callPackage ({ alert, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org, request-deferred }:
-    melpaBuild {
+    org-evil = callPackage ({ dash
+                            , evil
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild
+                            , monitor
+                            , org }:
+      melpaBuild {
+        pname = "org-evil";
+        version = "0.5.0";
+        src = fetchFromGitHub {
+          owner = "GuiltyDolphin";
+          repo = "org-evil";
+          rev = "3b4620edc606412ef75c0b5aa637af22486eb126";
+          sha256 = "0aqya9l9s55h5wd728iz15f53p5xajrfk8pn9gjxnw0i8m4d09sd";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/17a4772d409aa5dbda5fb84d86c237fd2653c70b/recipes/org-evil";
+          sha256 = "0wvd201k9b9ghg39rwbah6rw8b7hyyd27vvqjynjwbk3v8rp5zyn";
+          name = "recipe";
+        };
+        packageRequires = [ dash evil monitor org ];
+        meta = {
+          homepage = "https://melpa.org/#/org-evil";
+          license = lib.licenses.free;
+        };
+      }) {};
+    org-gcal = callPackage ({ alert
+                            , cl-lib ? null
+                            , emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild
+                            , org
+                            , request-deferred }:
+      melpaBuild {
         pname = "org-gcal";
         version = "0.2";
         src = fetchFromGitHub {
@@ -27283,10 +34187,10 @@
           rev = "badd3629e6243563c30ff1dd0452b7601f6cc036";
           sha256 = "1pxfcyf447h18220izi8qlnwdr8rlwn5kds8gr5i1v90s6hpa498";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1c2d5bd8d8f2616dae19b9232d9442fe423d6e5e/recipes/org-gcal";
           sha256 = "1mp6cm0rhd4r9pfvsjjp86sdqxjbbg7gk41zx0zf0s772smddy3q";
-          name = "org-gcal";
+          name = "recipe";
         };
         packageRequires = [ alert cl-lib emacs org request-deferred ];
         meta = {
@@ -27294,8 +34198,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-gnome = callPackage ({ alert, fetchFromGitHub, fetchurl, gnome-calendar, lib, melpaBuild, telepathy }:
-    melpaBuild {
+    org-gnome = callPackage ({ alert
+                             , fetchFromGitHub
+                             , fetchurl
+                             , gnome-calendar
+                             , lib
+                             , melpaBuild
+                             , telepathy }:
+      melpaBuild {
         pname = "org-gnome";
         version = "0.3";
         src = fetchFromGitHub {
@@ -27304,10 +34214,10 @@
           rev = "1012d47886cfd30eed25b73d9f18e475e0155f88";
           sha256 = "0b57ik05iax2h3nrj96kysbk4hxmxlaabd0n6lv1xsayrlli3sj1";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4f7ebd2d2312954d098fe4afd07c3d02b4df475d/recipes/org-gnome";
           sha256 = "0c37gfs6xs0jbvg6ypd4z5ip1khm26wr5lxgmv1dzcc383ynzg0v";
-          name = "org-gnome";
+          name = "recipe";
         };
         packageRequires = [ alert gnome-calendar telepathy ];
         meta = {
@@ -27315,8 +34225,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-if = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    org-if = callPackage ({ fetchFromGitLab
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "org-if";
         version = "0.2.0";
         src = fetchFromGitLab {
@@ -27325,10 +34238,10 @@
           rev = "fab602cc1bbee7a4e99c0083e129219d3f9ed2e8";
           sha256 = "1iyqv34b7q2k73srshcnpvfzcadq47w4rzkqp6m1d3ajk8x2vypq";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/09df84b60c46678ad40d8dabc08fcfe518f5ad79/recipes/org-if";
           sha256 = "0h0jdyawz2j4mp33w85z8q77l37qid8palvw5n4z379qa0wr5h96";
-          name = "org-if";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -27336,20 +34249,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-index = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    org-index = callPackage ({ emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "org-index";
-        version = "5.8.8";
+        version = "5.8.9";
         src = fetchFromGitHub {
           owner = "marcihm";
           repo = "org-index";
-          rev = "0dfe0a67979279345378ca006ab4f727df378aca";
-          sha256 = "16wjzskq000grkanaw9zca2qbw9yzpndhfd2g0b0if2mf1g31mkv";
+          rev = "c26f48ec26f5d345e354845c7686fed4751d2136";
+          sha256 = "0n571b2r0c6l9jklqgr0nxz5ca2jw7yfqpngl21lq06zz95lw9lw";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/54946e733901986304f7a7a5139b2818ebf97eb3/recipes/org-index";
           sha256 = "1dp52xqrhby2xyi6p2d0ggp5irqsqwicp62ndg5wszyd33clxab5";
-          name = "org-index";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -27357,20 +34274,27 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-jira = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request, s }:
-    melpaBuild {
+    org-jira = callPackage ({ cl-lib ? null
+                            , emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild
+                            , request
+                            , s }:
+      melpaBuild {
         pname = "org-jira";
-        version = "3.0.0";
+        version = "3.1.1";
         src = fetchFromGitHub {
           owner = "ahungry";
           repo = "org-jira";
-          rev = "51a1b2248ec421aecdd38aaf5c2876a036b08bb7";
-          sha256 = "0zyh5nn9hgiz0ic67ypahaah5f3vjmall7z0ffn4gl0fy22sar6h";
+          rev = "03d6ebcf177db7b208c6a99386695e839f314314";
+          sha256 = "07hy37by9ics7rc1sgkpg8qk2xzp67ny4i4rkd7q7j4abqdr131v";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/730a585e5c9216a2428a134c09abcc20bc7c631d/recipes/org-jira";
           sha256 = "0dvh9k0i75jxyy3v01c4cfyws8ij6718hsivi2xyrgig7pwp16ib";
-          name = "org-jira";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs request s ];
         meta = {
@@ -27378,20 +34302,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-journal = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    org-journal = callPackage ({ emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "org-journal";
-        version = "1.13.3";
+        version = "1.14.2";
         src = fetchFromGitHub {
           owner = "bastibe";
           repo = "org-journal";
-          rev = "f24d6c5e71954fd1a748e719b9b4b51f77879800";
-          sha256 = "10cqri6k3lvsngwg060nj4n15ip54h3ldlyxgnknmp6wl0vjsjr3";
+          rev = "2395db4deb255c05d0d3a75c95f53263b74939c9";
+          sha256 = "018wjn7v8a1z4z1sycz7b01rdck73ap13cr3lvfqvp9mms94qq71";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/org-journal";
           sha256 = "1npzqxn1ssigq7k1nrxz3xymxaazby0ddgxq6lgw2a1zjmjm4h2b";
-          name = "org-journal";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -27399,20 +34327,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-kanban = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    org-kanban = callPackage ({ dash
+                              , emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "org-kanban";
-        version = "0.2.0";
+        version = "0.4.3";
         src = fetchFromGitHub {
           owner = "gizmomogwai";
           repo = "org-kanban";
-          rev = "2f0909f6f988f5185026a46a9cc929404652672f";
-          sha256 = "08imw445bic3r8x7wls78dqskgx9ny5lixdksrvnp806vixq0f94";
+          rev = "e391db5c4db31b23d542fe31b4e93a7fc8712d86";
+          sha256 = "0m987admsxy8wpiylwd4cagpzn4yg1b3p0z77ksw2zgz0ykfnx5s";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a9f3a10c126fa43a6fa60ee7f8e50c7a9661dbc1/recipes/org-kanban";
           sha256 = "1flgqa2pwzw6b2zm3j09i9bvz1i8k03mbwj6l75yrk29lh4njq41";
-          name = "org-kanban";
+          name = "recipe";
         };
         packageRequires = [ dash emacs ];
         meta = {
@@ -27420,8 +34353,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-link-travis = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
-    melpaBuild {
+    org-link-travis = callPackage ({ fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild
+                                   , org }:
+      melpaBuild {
         pname = "org-link-travis";
         version = "0.0.1";
         src = fetchFromGitHub {
@@ -27430,10 +34367,10 @@
           rev = "596615ad8373d9090bd4138da683524f0ad0bda5";
           sha256 = "1797pd264zn19zk93nifyw6pwk2a7wrpfir373qclk601yv2g5h8";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/52c7f9539630e5ac7748fe36fd27c3486649ab74/recipes/org-link-travis";
           sha256 = "0hj4x7cw7a3ry8xislkz9bnavy77z4cpmnvns02yi3gnib53mlfs";
-          name = "org-link-travis";
+          name = "recipe";
         };
         packageRequires = [ org ];
         meta = {
@@ -27441,8 +34378,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-linkany = callPackage ({ fetchFromGitHub, fetchurl, lib, log4e, melpaBuild, yaxception }:
-    melpaBuild {
+    org-linkany = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , log4e
+                               , melpaBuild
+                               , yaxception }:
+      melpaBuild {
         pname = "org-linkany";
         version = "0.0.2";
         src = fetchFromGitHub {
@@ -27451,10 +34393,10 @@
           rev = "ed4a6614b56c9baef31647ea728b3d5fae6ed3a2";
           sha256 = "1bggz782ci0z6aw76v51ykbmfzh5g6cxh43w798as1152sn7im3p";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/df82cf95e34775b22da0a8bb29750f603c58f259/recipes/org-linkany";
           sha256 = "0arjj3c23yqm1ljvbnl7v9cqvd9lbz4381g8f3jyqbafs25bdc3c";
-          name = "org-linkany";
+          name = "recipe";
         };
         packageRequires = [ log4e yaxception ];
         meta = {
@@ -27462,8 +34404,41 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-mime = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    org-make-toc = callPackage ({ dash
+                                , emacs
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild
+                                , org
+                                , s }:
+      melpaBuild {
+        pname = "org-make-toc";
+        version = "0.2";
+        src = fetchFromGitHub {
+          owner = "alphapapa";
+          repo = "org-make-toc";
+          rev = "c27e3600473100daa3007fb134cd3fe13e821d90";
+          sha256 = "0078qpimkx6ps1cnyb1kaxiz4k93ppm7axsbrm18qic6mvp6i2nc";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/df87749128bcfd27ca93a65084a2e88cd9ed5c3f/recipes/org-make-toc";
+          sha256 = "0xaw3d1axvln4pr7p0jnqf0j6fd1g6cra1gykvf6y12zx02xkchh";
+          name = "recipe";
+        };
+        packageRequires = [ dash emacs org s ];
+        meta = {
+          homepage = "https://melpa.org/#/org-make-toc";
+          license = lib.licenses.free;
+        };
+      }) {};
+    org-mime = callPackage ({ cl-lib ? null
+                            , emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "org-mime";
         version = "0.1.1";
         src = fetchFromGitHub {
@@ -27472,10 +34447,10 @@
           rev = "0752659f7a19cead182584fabc9544464f69b83e";
           sha256 = "06lay5w03ah3w156spgh4bv2ma4x42pyhr3glfxw7vplfr5klvfz";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/521678fa13884dae69c2b4b7a2af718b2eea4b28/recipes/org-mime";
           sha256 = "14154pajl2bbawdd8iqfwgc67pcjp2lxl6f92c62nwq12wkcnny6";
-          name = "org-mime";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -27483,20 +34458,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-mru-clock = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    org-mru-clock = callPackage ({ emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "org-mru-clock";
-        version = "0.1.2";
+        version = "0.2.1";
         src = fetchFromGitHub {
           owner = "unhammer";
           repo = "org-mru-clock";
-          rev = "10f6a7021c82dc6795f4020e89889a5a72eb8832";
-          sha256 = "00f4l5w6p0l1x5ghpvbp5934m9m012fabvzb7apazwdr5c7xbd7q";
+          rev = "0e2dcb7799fb82bbe55c8aa9930192871e8b6109";
+          sha256 = "08z6jc7qhj7zmzf1sag1n4nqh77k1dis2ijc6s2pzqlaxm3rhxyw";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b36bf1c1faa4d7e38254416a293e56af96214136/recipes/org-mru-clock";
           sha256 = "1arww5x6vdyyn1bwxry91w88phbr9l6nk8xxrw40iqmmbhggahgm";
-          name = "org-mru-clock";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -27504,8 +34483,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-multiple-keymap = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
-    melpaBuild {
+    org-multiple-keymap = callPackage ({ cl-lib ? null
+                                       , emacs
+                                       , fetchFromGitHub
+                                       , fetchurl
+                                       , lib
+                                       , melpaBuild
+                                       , org }:
+      melpaBuild {
         pname = "org-multiple-keymap";
         version = "0.2";
         src = fetchFromGitHub {
@@ -27514,10 +34499,10 @@
           rev = "20eb3be6be9f0abbad9f0d007e40cb00c8109201";
           sha256 = "0yxfhzygiki8sha1dddac4g72r51yi4jnga2scmk51f9jgwqbihp";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0a22beed723d149282e70e3411b79e8ce9f5ab2b/recipes/org-multiple-keymap";
           sha256 = "16iv5575634asvn1b2k535ml8g4lqgy8z5w6ykma5f9phq5idb9f";
-          name = "org-multiple-keymap";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs org ];
         meta = {
@@ -27525,20 +34510,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-noter = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
-    melpaBuild {
+    org-noter = callPackage ({ cl-lib ? null
+                             , emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild
+                             , org }:
+      melpaBuild {
         pname = "org-noter";
-        version = "1.0.1";
+        version = "1.1.0";
         src = fetchFromGitHub {
           owner = "weirdNox";
           repo = "org-noter";
-          rev = "32cdf41079ca67c5906a10215eb7fbaefebab994";
-          sha256 = "11hhw8fk1qn63hwdx49h9h58p2hmxhmni6qdazd0ipk68finmy8f";
+          rev = "8f86583bd573cb0f146aae5d2394e615efb0cafe";
+          sha256 = "0fgmn7gqh146zrmvc1p7dik93sjajay0n8i8qdd4sbdzw64shzl1";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4a2bc0d95dc2744277d6acbba1f7483b4c14d75c/recipes/org-noter";
           sha256 = "0vsc2b1yz9lw0zv1vnm722pl35kxpwhcdi7h6mijhnw8vv7rhixf";
-          name = "org-noter";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs org ];
         meta = {
@@ -27546,8 +34537,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-outlook = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    org-outlook = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "org-outlook";
         version = "0.11";
         src = fetchFromGitHub {
@@ -27556,10 +34550,10 @@
           rev = "070c37d017ccb71d94c3c69c99632fa6570ec2cc";
           sha256 = "15fy6xpz6mk4j3nkrhiqal2dp77rhxmk8a7xiw037xr1jgq9sd9a";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/804a4b6802d2cf53e5415d956f0b4772853f4c69/recipes/org-outlook";
           sha256 = "0cn8h6yy67jr5h1yxsfqmr8q7ii4f99pgghfp821m01pj55qyjx9";
-          name = "org-outlook";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -27567,8 +34561,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-page = callPackage ({ fetchFromGitHub, fetchurl, ht, htmlize, lib, melpaBuild, mustache, org }:
-    melpaBuild {
+    org-page = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , ht
+                            , htmlize
+                            , lib
+                            , melpaBuild
+                            , mustache
+                            , org }:
+      melpaBuild {
         pname = "org-page";
         version = "0.41";
         src = fetchFromGitHub {
@@ -27577,10 +34578,10 @@
           rev = "09febf89d8dcb226aeedf8164169b31937b64439";
           sha256 = "0zc20m63a1iz9aziid5jsvcbl86k9dg9js4k3almchh55az4a0i3";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/872f163d4da58760009001472e2240f00d4d2d89/recipes/org-page";
           sha256 = "1326m3w7vz22zk7rx40z28fddsccy5fl1qhbb7clci8l69blcc2v";
-          name = "org-page";
+          name = "recipe";
         };
         packageRequires = [ ht htmlize mustache org ];
         meta = {
@@ -27588,19 +34589,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-password-manager = callPackage ({ fetchgit, fetchurl, lib, melpaBuild, org, s }:
-    melpaBuild {
+    org-password-manager = callPackage ({ fetchgit
+                                        , fetchurl
+                                        , lib
+                                        , melpaBuild
+                                        , org
+                                        , s }:
+      melpaBuild {
         pname = "org-password-manager";
         version = "0.0.1";
         src = fetchgit {
-          url = "https://git.leafac.com/org-password-manager";
-          rev = "d3a33ddfe583180bdb76cfb8bbd772e0078b24a3";
-          sha256 = "0pqmnhd3qdg06agj6h8v8lm4m5q8px0qmd7a1bfn6i5g2bq9zrck";
+          url = "https://github.com/leafac/org-password-manager";
+          rev = "108ad275965c9a65905d1a0064e7d9b5f6a62d3f";
+          sha256 = "0551fd71qbxzxxmhxqvlkh3skkswgcc1sgdl30mf5chylbnw8kly";
         };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/02ef86ffe6923921cc1246e51ad8db87faa00ecb/recipes/org-password-manager";
-          sha256 = "0n07k2nng3zkrcif85f1r2g2l4vha78lmrdnj590axn7l5q5fidm";
-          name = "org-password-manager";
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fba84d698f7d16ffc0dc16618efcd1cdc0b39d79/recipes/org-password-manager";
+          sha256 = "0wxvl6ypgn6ky1z3dh33ya3rh73znkh5f8qhqwfmwp7hy2mbl4la";
+          name = "recipe";
         };
         packageRequires = [ org s ];
         meta = {
@@ -27608,8 +34614,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-pdfview = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org, pdf-tools }:
-    melpaBuild {
+    org-pdfview = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild
+                               , org
+                               , pdf-tools }:
+      melpaBuild {
         pname = "org-pdfview";
         version = "0.4";
         src = fetchFromGitHub {
@@ -27618,10 +34629,10 @@
           rev = "3a96bfb57cb158ac02cfb4225512699c66f5221d";
           sha256 = "0lrcj3mcdfcdrndivhj5ds386zrsy78sfg0i8126wwwc5lfh48vq";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/org-pdfview";
           sha256 = "1qhlmzf2ffcrjnx4yghv7n6rsry8bcwnkw489spgraq9vxvqklah";
-          name = "org-pdfview";
+          name = "recipe";
         };
         packageRequires = [ org pdf-tools ];
         meta = {
@@ -27629,8 +34640,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-pomodoro = callPackage ({ alert, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    org-pomodoro = callPackage ({ alert
+                                , cl-lib ? null
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "org-pomodoro";
         version = "2.1.0";
         src = fetchFromGitHub {
@@ -27639,10 +34655,10 @@
           rev = "a6d867865f1a033fb5a09cca6643045d7ebac49c";
           sha256 = "0r5shgikm34d66i2hblyknbblpg92lb2zc9x4bcb28xkh7m9d0xv";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e54e77c5619b56e9b488b3fe8761188b6b3b4198/recipes/org-pomodoro";
           sha256 = "1vdi07hrhniyhhvg0hcr5mlixy6bjynvwm89z2lvfyvnnxpx0r27";
-          name = "org-pomodoro";
+          name = "recipe";
         };
         packageRequires = [ alert cl-lib ];
         meta = {
@@ -27650,8 +34666,16 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-projectile = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org-category-capture, projectile, s }:
-    melpaBuild {
+    org-projectile = callPackage ({ dash
+                                  , emacs
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild
+                                  , org-category-capture
+                                  , projectile
+                                  , s }:
+      melpaBuild {
         pname = "org-projectile";
         version = "1.1.0";
         src = fetchFromGitHub {
@@ -27660,10 +34684,10 @@
           rev = "48f621b595e748c5e03431f237facf258ffc9443";
           sha256 = "00n2msmwcjjiibrhrvpawzgz6qcjjfy9qnii1iaass0038g4bd89";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9d7a7ab98f364d3d5e93f83f0cb3d80a95f28689/recipes/org-projectile";
           sha256 = "0xdkd5pkyi6yfqi4przgp5mpklyxfxv0cww285zdlh00rzl935cw";
-          name = "org-projectile";
+          name = "recipe";
         };
         packageRequires = [ dash emacs org-category-capture projectile s ];
         meta = {
@@ -27671,20 +34695,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-projectile-helm = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, org-projectile }:
-    melpaBuild {
+    org-projectile-helm = callPackage ({ emacs
+                                       , fetchFromGitHub
+                                       , fetchurl
+                                       , helm
+                                       , lib
+                                       , melpaBuild
+                                       , org-projectile }:
+      melpaBuild {
         pname = "org-projectile-helm";
         version = "1.1.0";
         src = fetchFromGitHub {
           owner = "IvanMalison";
           repo = "org-projectile";
-          rev = "48f621b595e748c5e03431f237facf258ffc9443";
-          sha256 = "00n2msmwcjjiibrhrvpawzgz6qcjjfy9qnii1iaass0038g4bd89";
+          rev = "fc62993b5a0b9c13d4e6abeff5a504fc75edad85";
+          sha256 = "08gbgzn8dxl9wl3y4igq1lsnlxi94ak5w7pn9ykw7y6nr2714bms";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6760daac1ef9d9d7ba07e2fc9668873020f901f1/recipes/org-projectile-helm";
           sha256 = "0x79j5yr9wsgzjf1dpp7d4xiji8hgyhr79vb973an5z2r02vnaf4";
-          name = "org-projectile-helm";
+          name = "recipe";
         };
         packageRequires = [ emacs helm org-projectile ];
         meta = {
@@ -27692,20 +34722,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-protocol-jekyll = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    org-protocol-jekyll = callPackage ({ fetchFromGitHub
+                                       , fetchurl
+                                       , lib
+                                       , melpaBuild }:
+      melpaBuild {
         pname = "org-protocol-jekyll";
         version = "0.1";
         src = fetchFromGitHub {
           owner = "vonavi";
           repo = "org-protocol-jekyll";
-          rev = "c1ac46793eb9bf22b1a601e841947428be5c9766";
-          sha256 = "1cxjzj955rvp0ijbp7ifpmkxdhimz8hqjw5c9gv6zwjqb5iih9ry";
+          rev = "ed09d166d665ad45f61184cfddcfc24b62e37bc7";
+          sha256 = "1iz6g1c37xrlrpi9avalkad6wmfb2l7yiawng0kbqm9i0bqkjhhs";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6d1ee7c75da91fcf303ea89d148a05ac1e58e23e/recipes/org-protocol-jekyll";
           sha256 = "18wg489n2d1sx9jk00ki6p2rxkqz67kqwnmy2kb1ga1rmb6x9wfs";
-          name = "org-protocol-jekyll";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -27713,8 +34746,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-random-todo = callPackage ({ alert, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    org-random-todo = callPackage ({ alert
+                                   , emacs
+                                   , fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "org-random-todo";
         version = "0.5.2";
         src = fetchFromGitHub {
@@ -27723,10 +34761,10 @@
           rev = "60364c18725d2f3898a9099e7e546ae406dd6578";
           sha256 = "0k86hqmqilvkam886mb85v991ivwnglallwj4l9ghszl7awy207m";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/80fad6244ea3e5bdf7f448c9f62374fae45bae78/recipes/org-random-todo";
           sha256 = "0yflppdbkfn2phd21zkjdlidzasfm846mzniay83v3akz0qx31lr";
-          name = "org-random-todo";
+          name = "recipe";
         };
         packageRequires = [ alert emacs ];
         meta = {
@@ -27734,8 +34772,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-readme = callPackage ({ fetchFromGitHub, fetchurl, header2, http-post-simple, lib, lib-requires, melpaBuild, yaoddmuse }:
-    melpaBuild {
+    org-readme = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , header2
+                              , http-post-simple
+                              , lib
+                              , lib-requires
+                              , melpaBuild
+                              , yaoddmuse }:
+      melpaBuild {
         pname = "org-readme";
         version = "20130322.926";
         src = fetchFromGitHub {
@@ -27744,10 +34789,10 @@
           rev = "15054e42351b5ec6b629c55760a578516e035355";
           sha256 = "0hhgfw0sqvl9jmmslwxn6v3dii99v09yz2h0ia5np9lzyxsc207a";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/317318e6071b174e0ec6302ea4f526976d837db4/recipes/org-readme";
           sha256 = "1qqbsgspd006gy0kc614w7bg6na0ygmflvqkmw47899pbgj81hxh";
-          name = "org-readme";
+          name = "recipe";
         };
         packageRequires = [ header2 http-post-simple lib-requires yaoddmuse ];
         meta = {
@@ -27755,8 +34800,21 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-ref = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, helm-bibtex, hydra, ivy, key-chord, lib, melpaBuild, pdf-tools, s }:
-    melpaBuild {
+    org-ref = callPackage ({ dash
+                           , emacs
+                           , f
+                           , fetchFromGitHub
+                           , fetchurl
+                           , helm
+                           , helm-bibtex
+                           , hydra
+                           , ivy
+                           , key-chord
+                           , lib
+                           , melpaBuild
+                           , pdf-tools
+                           , s }:
+      melpaBuild {
         pname = "org-ref";
         version = "1.1.1";
         src = fetchFromGitHub {
@@ -27765,10 +34823,10 @@
           rev = "db6c52f41faba686a378a8c57356a563f5cef496";
           sha256 = "0kx6w3zz5gmlmr9bx1mdq1k8ykkbnll6m91z90p6f2xm96j627j6";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/550e4dcef2f74fbd96474561c1cb6c4fd80091fe/recipes/org-ref";
           sha256 = "087isxf3z8cgmmniaxr3lpq9jg3sriw88dwp4f0ky286hlvgzw08";
-          name = "org-ref";
+          name = "recipe";
         };
         packageRequires = [
           dash
@@ -27787,8 +34845,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-repo-todo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    org-repo-todo = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "org-repo-todo";
         version = "0.0.3";
         src = fetchFromGitHub {
@@ -27797,10 +34858,10 @@
           rev = "cba6145c6821fd2bbd96a1c9ef2346c281b76ad2";
           sha256 = "0b57qy87sa8qcki16rgh16ldziay57yd7f98cpinaq0adcrqywy0";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d17b602004628e17dae0f46f2b33be0afb05f729/recipes/org-repo-todo";
           sha256 = "0l5ns1hs3i4dhrpmvzl34zc9zysgjkfa7j8apbda59n9jdvml5v1";
-          name = "org-repo-todo";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -27808,20 +34869,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-rich-yank = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    org-rich-yank = callPackage ({ emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "org-rich-yank";
-        version = "0.1.1";
+        version = "0.2.0";
         src = fetchFromGitHub {
           owner = "unhammer";
           repo = "org-rich-yank";
-          rev = "ffa90b29604e27a60ad341c06d0e43769af19715";
-          sha256 = "1z9137nirbaydqpw5b7ii3qnpn09v1kiqnyxsxkgc0q3arb1m1f6";
+          rev = "f6bbf973bef7063c6ab475db25a630bc7ee317da";
+          sha256 = "1by1ymypwlnnnh8fx4ndcwsrif83xyx56mlvmv2lx6wmyliv0py9";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1261823d88459b6ac42d6c55c157a326173663df/recipes/org-rich-yank";
           sha256 = "1v0sc90g5sl6b9ylxbk2y8s3pvxkf4v7k2rkzpgpbp4nrq0miy4y";
-          name = "org-rich-yank";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -27829,20 +34894,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-static-blog = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    org-static-blog = callPackage ({ emacs
+                                   , fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "org-static-blog";
-        version = "1.1.2";
+        version = "1.2.1";
         src = fetchFromGitHub {
           owner = "bastibe";
           repo = "org-static-blog";
-          rev = "ab4ad93a23e5402b5276c061945872dd6d586e75";
-          sha256 = "07j4gyw22372nlfbaf94w6a7pza01zp6ivsg9iq2hcnx5pniv7hz";
+          rev = "f69d2fd6671fb250fbd87df5efa898a7bf5b9bda";
+          sha256 = "1h9c96rbxxk1jypib5f9pfi5zkimkvhxi61j0sps6r39435dd3w7";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e0768d41a3de625c04ac8644ef2e05f17ee99908/recipes/org-static-blog";
           sha256 = "07vh2k7cj0cs1yzfmrrz9p03x5mbfh0bigbl93s72h1wf7i05rkw";
-          name = "org-static-blog";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -27850,8 +34919,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-sync = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
-    melpaBuild {
+    org-sync = callPackage ({ cl-lib ? null
+                            , emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild
+                            , org }:
+      melpaBuild {
         pname = "org-sync";
         version = "0.3.0";
         src = fetchFromGitHub {
@@ -27860,10 +34935,10 @@
           rev = "8c65dceaa2f3d436f83ed591916f22556a6e7f91";
           sha256 = "0zx9gpvm5gy9k45lbhaks9s935id727lszsh40gmpdp5zxf3rjk1";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/923ddbaf1a158caac5e666a396a8dc66969d204a/recipes/org-sync";
           sha256 = "0n8fz2d1vg9r8dszgasbnb6pgaxr2i8mqrp953prf1nhmfpjpxad";
-          name = "org-sync";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs org ];
         meta = {
@@ -27871,8 +34946,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-table-comment = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    org-table-comment = callPackage ({ fetchFromGitHub
+                                     , fetchurl
+                                     , lib
+                                     , melpaBuild }:
+      melpaBuild {
         pname = "org-table-comment";
         version = "0.2.0";
         src = fetchFromGitHub {
@@ -27881,10 +34959,10 @@
           rev = "33b9966c33ecbc3e27cca67c2f2cdea04364d74e";
           sha256 = "1qx3kd02sxs9k7adlvdlbmyhkc5kr7ni5lw4gxjw3nphnc536bkb";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2c1f08c41969bc8a7104fb914564b4f6cab667e2/recipes/org-table-comment";
           sha256 = "1d40vl8aa1x27z4gwnkzxgrqp7vd3ln2pc445ijjxp1wr8bjxvdz";
-          name = "org-table-comment";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -27892,8 +34970,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-table-sticky-header = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
-    melpaBuild {
+    org-table-sticky-header = callPackage ({ fetchFromGitHub
+                                           , fetchurl
+                                           , lib
+                                           , melpaBuild
+                                           , org }:
+      melpaBuild {
         pname = "org-table-sticky-header";
         version = "0.1.1";
         src = fetchFromGitHub {
@@ -27902,10 +34984,10 @@
           rev = "4dba2dc9a3ed63f58aa946aeec84a52d46ca4043";
           sha256 = "0az4lzd9qk4cx7jjfj36r2fvlkwyrhn3xqhha5d1pydglnhd9amy";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5dd0e18bf4c3f3263eff8aff6d7c743a554243b5/recipes/org-table-sticky-header";
           sha256 = "1rk41279rcsdma39zpr1ka5p47gh1d0969wahd0jbm5xlmx5gz2m";
-          name = "org-table-sticky-header";
+          name = "recipe";
         };
         packageRequires = [ org ];
         meta = {
@@ -27913,8 +34995,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-tfl = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
-    melpaBuild {
+    org-tfl = callPackage ({ cl-lib ? null
+                           , emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild
+                           , org }:
+      melpaBuild {
         pname = "org-tfl";
         version = "0.4.0";
         src = fetchFromGitHub {
@@ -27923,10 +35011,10 @@
           rev = "f0d7d39106a1de5457f5160cddd98ab892b61066";
           sha256 = "1rwdibiq0w4nzccmvdkpwnmfga70y35lfg2xlkqxd02x7bfl7j3m";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d9e97f2fee577c7e3fb42e4ca9d4f422c8907faf/recipes/org-tfl";
           sha256 = "1rqmmw0222vbxfn5wxq9ni2j813x92lpv99jjszqjvgnf2rkhjhf";
-          name = "org-tfl";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs org ];
         meta = {
@@ -27934,8 +35022,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-themis = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    org-themis = callPackage ({ cl-lib ? null
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "org-themis";
         version = "0.4.1";
         src = fetchFromGitHub {
@@ -27944,10 +35036,10 @@
           rev = "4b4bf1fa1e853664bf006dda8afe2db00e522aaa";
           sha256 = "12fksqi9flf84h1lbmbcjnqxa7dairp50wvlwfhbp1hbb8l9z63a";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/60e0efe4f201ed96e90c437e3e7205e0344d4676/recipes/org-themis";
           sha256 = "08rajz5y7h88fh94s2ad0f66va4vi31k9hwdv8p212bs276rp7ln";
-          name = "org-themis";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -27955,8 +35047,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-time-budgets = callPackage ({ alert, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    org-time-budgets = callPackage ({ alert
+                                    , cl-lib ? null
+                                    , fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "org-time-budgets";
         version = "1.0.1";
         src = fetchFromGitHub {
@@ -27965,10 +35062,10 @@
           rev = "f2a8fe3d9d6104f3dd61fabbb385a596363b360b";
           sha256 = "09iw2jffb2qrx5r07zd1j8sk5wafamjkc2khqyfwc5kx6xyp1f46";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/776b58b433ab7dde5870300d288c3e6734fc32c0/recipes/org-time-budgets";
           sha256 = "0r8km586n6xdnjha7xnzlh03nw1dp066hydaz8kxfmhvygl9cpah";
-          name = "org-time-budgets";
+          name = "recipe";
         };
         packageRequires = [ alert cl-lib ];
         meta = {
@@ -27976,8 +35073,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-toodledo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    org-toodledo = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "org-toodledo";
         version = "2.1.0";
         src = fetchFromGitHub {
@@ -27986,10 +35086,10 @@
           rev = "5473c1a2762371b198862aa8fd83fd3ec57485a4";
           sha256 = "0qqa62fsmra6v4061kpki8wbhfcwkgnb2gzxwvnaqlcmhivksg6v";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4956fb6c5f1076a02f07d0f953e846fee39bfaa6/recipes/org-toodledo";
           sha256 = "0c7qr0jsc4iyrwkc22xp9nmk6984v7q1k0rvpd62m07lb5gvbiq3";
-          name = "org-toodledo";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -27997,8 +35097,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-tracktable = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    org-tracktable = callPackage ({ cl-lib ? null
+                                  , emacs
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "org-tracktable";
         version = "0.3.1";
         src = fetchFromGitHub {
@@ -28007,10 +35112,10 @@
           rev = "8e0e60a582a034bd66d5efb72d513140b7d4d90a";
           sha256 = "1aq7qv5jyc2x2a4iphnzmmsvak6dbi7nwdcf3m8nly8w75vrl5lj";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/57263d996e321f842d0741898370390146606c63/recipes/org-tracktable";
           sha256 = "0mngf9q2ffxq32cgng0xl30661mj15wmr9y4hr3xddj626kxrp00";
-          name = "org-tracktable";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -28018,8 +35123,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-transform-tree-table = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    org-transform-tree-table = callPackage ({ dash
+                                            , fetchFromGitHub
+                                            , fetchurl
+                                            , lib
+                                            , melpaBuild
+                                            , s }:
+      melpaBuild {
         pname = "org-transform-tree-table";
         version = "0.1.2";
         src = fetchFromGitHub {
@@ -28028,10 +35138,10 @@
           rev = "0a9bf07f01bc5fc3b349aff64e83999a8de83b52";
           sha256 = "1h15fr16kgbyrxambmk4hsmha6hx4c4yqkccb82g3wlvzmnqj5x3";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/afca0e652a993848610606866609edbf2f5f76ae/recipes/org-transform-tree-table";
           sha256 = "0n68cw769nk90ms6w1w6cc1nxjwn1navkz56mf11bsiqvsk3km7r";
-          name = "org-transform-tree-table";
+          name = "recipe";
         };
         packageRequires = [ dash s ];
         meta = {
@@ -28039,8 +35149,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-tree-slide = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    org-tree-slide = callPackage ({ fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "org-tree-slide";
         version = "2.8.4";
         src = fetchFromGitHub {
@@ -28049,10 +35162,10 @@
           rev = "dccd80418a4444df5e8301695ff0d0dfe86a3c21";
           sha256 = "0aacxxwhwjzby0f9r4q0lra5lqcrw5snnm1yc63jrs6c0ifakk45";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6160c259bc4bbcf3b98c220222430f798ee6463f/recipes/org-tree-slide";
           sha256 = "0v857zplv0wdbg4li667v2p5pn5zcf9fgbqcwa75x8babilkl6jn";
-          name = "org-tree-slide";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -28060,8 +35173,16 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-trello = callPackage ({ dash, dash-functional, deferred, fetchFromGitHub, fetchurl, lib, melpaBuild, request-deferred, s }:
-    melpaBuild {
+    org-trello = callPackage ({ dash
+                              , dash-functional
+                              , deferred
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild
+                              , request-deferred
+                              , s }:
+      melpaBuild {
         pname = "org-trello";
         version = "0.8.1";
         src = fetchFromGitHub {
@@ -28070,10 +35191,10 @@
           rev = "c38c36159cdeb2348c4e9ca75246aa9cc1dfd76c";
           sha256 = "02gx3kv4mkij69ln8x8wf9n28x17pbb4kv85v78d3lxph7ykqimc";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/188ed8dc1ce2704838f7a2883c41243598150a46/recipes/org-trello";
           sha256 = "14lq8nn1x6qb3jx518zaaz5582m4npd593w056igqhahkfm0qp8i";
-          name = "org-trello";
+          name = "recipe";
         };
         packageRequires = [ dash dash-functional deferred request-deferred s ];
         meta = {
@@ -28081,20 +35202,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-vcard = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    org-vcard = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "org-vcard";
         version = "0.2.0";
         src = fetchFromGitHub {
           owner = "flexibeast";
           repo = "org-vcard";
-          rev = "a6ab82ab28fa78f7c985d3ea9c9fafdd17f7ea8b";
-          sha256 = "14l3xqahqmnfl3sskqcr33xpcsic8dm9cr9wmbv5la3xv14n10k7";
+          rev = "a697c966579a8a67e02ad6b5d7f7897a1b5b4620";
+          sha256 = "1fx36yqq21wmccv055kd8p0ks2gmycyw68x4v57lszadg5rcf77k";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/df860814a09c376c9a6a2c5e7f528bbae29810b2/recipes/org-vcard";
           sha256 = "0l6azshvzl1wws582njqr3qx4h73gwrdqwa3jcic1qbs9hg2l4yl";
-          name = "org-vcard";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -28102,8 +35226,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-wild-notifier = callPackage ({ alert, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    org-wild-notifier = callPackage ({ alert
+                                     , dash
+                                     , emacs
+                                     , fetchFromGitHub
+                                     , fetchurl
+                                     , lib
+                                     , melpaBuild }:
+      melpaBuild {
         pname = "org-wild-notifier";
         version = "0.2.4";
         src = fetchFromGitHub {
@@ -28112,10 +35242,10 @@
           rev = "5da63fc00db20b60eb46a241cc8308547d85b3ad";
           sha256 = "1269az078d6d0x7ims2qa6wdv8ql2hn70fwigfqw116v9602ywjr";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/114552a24f73f13b253e3db4885039b680f6ef33/recipes/org-wild-notifier";
           sha256 = "1lmpa614jnkpmfg3m1d2wjn9w0zig3gwd02n3dyjn23n71fiyhkp";
-          name = "org-wild-notifier";
+          name = "recipe";
         };
         packageRequires = [ alert dash emacs ];
         meta = {
@@ -28123,8 +35253,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    org2blog = callPackage ({ fetchFromGitHub, fetchurl, htmlize, lib, melpaBuild, metaweblog, org, xml-rpc }:
-    melpaBuild {
+    org2blog = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , htmlize
+                            , lib
+                            , melpaBuild
+                            , metaweblog
+                            , org
+                            , xml-rpc }:
+      melpaBuild {
         pname = "org2blog";
         version = "1.0.2";
         src = fetchFromGitHub {
@@ -28133,10 +35270,10 @@
           rev = "bd2028b6a79daa63fc5481deaed63c4efc681be0";
           sha256 = "1qpw5bs5qjlpw3hphbf2jg0h8bdrcgrb8xavdsx8viwjl013d4ps";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/org2blog";
           sha256 = "1xa03k9z8fq74w0w3vfkigz24i6c8s4vib077l16vqik7wg4yh40";
-          name = "org2blog";
+          name = "recipe";
         };
         packageRequires = [ htmlize metaweblog org xml-rpc ];
         meta = {
@@ -28144,8 +35281,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    org2jekyll = callPackage ({ dash-functional, deferred, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    org2jekyll = callPackage ({ dash-functional
+                              , deferred
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild
+                              , s }:
+      melpaBuild {
         pname = "org2jekyll";
         version = "0.1.9";
         src = fetchFromGitHub {
@@ -28154,10 +35297,10 @@
           rev = "35e11ffa24b140d2e247df195489fca344bd0c08";
           sha256 = "089nqbda5mg1ippqnsl5wcx9n1gpnaqhl6kz54n47kivb400bidh";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/48a1e5bd5e338bd3593f004f95b6fbb12595bfb7/recipes/org2jekyll";
           sha256 = "1j9d6xf5nsakifxwd4zmjc29lbj46ffn3z109k2y2yhz7q3r9hzv";
-          name = "org2jekyll";
+          name = "recipe";
         };
         packageRequires = [ dash-functional deferred s ];
         meta = {
@@ -28165,8 +35308,19 @@
           license = lib.licenses.free;
         };
       }) {};
-    org2web = callPackage ({ cl-lib ? null, dash, el2org, fetchFromGitHub, fetchurl, ht, htmlize, lib, melpaBuild, mustache, org, simple-httpd }:
-    melpaBuild {
+    org2web = callPackage ({ cl-lib ? null
+                           , dash
+                           , el2org
+                           , fetchFromGitHub
+                           , fetchurl
+                           , ht
+                           , htmlize
+                           , lib
+                           , melpaBuild
+                           , mustache
+                           , org
+                           , simple-httpd }:
+      melpaBuild {
         pname = "org2web";
         version = "0.9.1";
         src = fetchFromGitHub {
@@ -28175,10 +35329,10 @@
           rev = "5243b399927a4c474bb3b8d1c8a00799df1f27d7";
           sha256 = "0wsvfn409a2ivbich8b8zqza78sprirg4bl7igx536ydqclmi0n7";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2864959163442165b9b1cd5471dc2649508decde/recipes/org2web";
           sha256 = "0lcqf0pgkd7jilasw1485fy45k269jxvyl7hl7qrcs94s6fy2vaf";
-          name = "org2web";
+          name = "recipe";
         };
         packageRequires = [
           cl-lib
@@ -28195,8 +35349,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    orgbox = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
-    melpaBuild {
+    orgbox = callPackage ({ cl-lib ? null
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild
+                          , org }:
+      melpaBuild {
         pname = "orgbox";
         version = "0.5.0";
         src = fetchFromGitHub {
@@ -28205,10 +35364,10 @@
           rev = "ecaf5a064431cf92922338c974df8fce1a8f1734";
           sha256 = "02mxp17p7bj4xamg0m6zk832hmpqcgzc7bjbjcnvbvrawhc255hy";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b1948eca5a18f35b61b9a0baf532753fd105ba3a/recipes/orgbox";
           sha256 = "12wfqlpjh9nr7zgqs4h8kmfsk825n68qcbn8z2fw2mpshg3nj7l8";
-          name = "orgbox";
+          name = "recipe";
         };
         packageRequires = [ cl-lib org ];
         meta = {
@@ -28216,8 +35375,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    orgit = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild, org }:
-    melpaBuild {
+    orgit = callPackage ({ dash
+                         , emacs
+                         , fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , magit
+                         , melpaBuild
+                         , org }:
+      melpaBuild {
         pname = "orgit";
         version = "1.5.1";
         src = fetchFromGitHub {
@@ -28226,10 +35392,10 @@
           rev = "d909f92d3b1b42184143fd5e6d4c6a2762477ab7";
           sha256 = "1jdc874bxkpbfpllak3vmfsn82p930s565bzff341vzv7aw2528c";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/73b5f7c44c90540e4cbdc003d9881f0ac22cc7bc/recipes/orgit";
           sha256 = "0askccb3h98v8gmylwxaph3gbyv5b1sp4slws76aqz1kq9x0jy7w";
-          name = "orgit";
+          name = "recipe";
         };
         packageRequires = [ dash emacs magit org ];
         meta = {
@@ -28237,20 +35403,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    orglink = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
-    melpaBuild {
+    orglink = callPackage ({ dash
+                           , emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild
+                           , org }:
+      melpaBuild {
         pname = "orglink";
         version = "1.1.3";
         src = fetchFromGitHub {
           owner = "tarsius";
           repo = "orglink";
-          rev = "e9e90e16ddaceaf99c9b251a215d6338b9762b4d";
-          sha256 = "0vqyidi54rbpqwqi6iv1xaqkr9gfr0pfhr1msxckh8jy6avgy319";
+          rev = "82ea67b7f1bf10627759044acb74828f66a85a83";
+          sha256 = "0zqbz1idj73wz3kljkkzl7mvalk73j7xpl3di6mb16ylscg9sraw";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/be9b8e97cda6af91d54d402887f225e3a0caf055/recipes/orglink";
           sha256 = "0ldrvvqs3hlazj0dch162gsbnbxcg6fgrxid8p7w9gj19vbcl52b";
-          name = "orglink";
+          name = "recipe";
         };
         packageRequires = [ dash emacs org ];
         meta = {
@@ -28258,20 +35430,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    orgtbl-show-header = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    orgtbl-show-header = callPackage ({ fetchFromGitHub
+                                      , fetchurl
+                                      , lib
+                                      , melpaBuild }:
+      melpaBuild {
         pname = "orgtbl-show-header";
         version = "1.0.0";
         src = fetchFromGitHub {
           owner = "DamienCassou";
           repo = "orgtbl-show-header";
-          rev = "f0f48ccc0f96d4aa2a676ff609d9dddd71748e6f";
-          sha256 = "0zfiq9d5jqzpmscngb1s2jgfiqmbi4dyw0fqa59v2g84gxjg793x";
+          rev = "2f13391f56cf94f8fe1dc79d6eccb662198f9b69";
+          sha256 = "0s3pf18n7vh67am1pjaa22gh645088dbz2rgxixr9avpfyalaycj";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9c5ea906b1d642405ca532d89dbb32cf79f53582/recipes/orgtbl-show-header";
           sha256 = "1xgqjg3lmcczdblxaka47cc1ad8p8jhyb2nqwq0qnbqw46fqjp3k";
-          name = "orgtbl-show-header";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -28279,8 +35454,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    osx-browse = callPackage ({ browse-url-dwim, fetchFromGitHub, fetchurl, lib, melpaBuild, string-utils }:
-    melpaBuild {
+    osx-browse = callPackage ({ browse-url-dwim
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild
+                              , string-utils }:
+      melpaBuild {
         pname = "osx-browse";
         version = "0.8.8";
         src = fetchFromGitHub {
@@ -28289,10 +35469,10 @@
           rev = "6186a6020e143e90d557c8d062c44fcdba0516c7";
           sha256 = "0g1xhh88a65vcq6rlh7ii16pra4pv519ajcws0h93ldbbjiy7p0m";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/081aa3e1d50c2c9e5a9b9ce0716258a93279f605/recipes/osx-browse";
           sha256 = "06rfzq2hxhzg6jh2zs28r7ffxwlq40nz954j13ly8403c7rmbrfm";
-          name = "osx-browse";
+          name = "recipe";
         };
         packageRequires = [ browse-url-dwim string-utils ];
         meta = {
@@ -28300,8 +35480,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    osx-clipboard = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    osx-clipboard = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "osx-clipboard";
         version = "0.1";
         src = fetchFromGitHub {
@@ -28310,10 +35493,10 @@
           rev = "e46dd31327a3f92f77b013b4c9b1e5fdd0e5c73d";
           sha256 = "1ykn48src7qhx9cmpjkaqsz7h36p75kkq1h9wlcpv5fhaky2d4n4";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/71b85cd2b2122a2742f919d10bfcb054b681e61e/recipes/osx-clipboard";
           sha256 = "0gjgr451v6rlyarz96v6h8kfbvkk7npvhgvkgwdi0bjighrhlv4f";
-          name = "osx-clipboard";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -28321,8 +35504,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    osx-dictionary = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    osx-dictionary = callPackage ({ cl-lib ? null
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "osx-dictionary";
         version = "0.4";
         src = fetchFromGitHub {
@@ -28331,10 +35518,10 @@
           rev = "0e5e5f1b0077a62673855889d529dd4f0cc8f665";
           sha256 = "1zpr50q7i4wg1x7vsj69rh1b8xvk9r0591y4fvvs3a2l1llca2mq";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ae4467ad646d663f0266f39a76f9764004903424/recipes/osx-dictionary";
           sha256 = "13033fxc5vjd1f7mm6znmprcp3mwxbvblb2d25shr8d4imqqhv82";
-          name = "osx-dictionary";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -28342,8 +35529,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    osx-location = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    osx-location = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "osx-location";
         version = "0.4";
         src = fetchFromGitHub {
@@ -28352,10 +35542,10 @@
           rev = "110aee945b53ea550e4debe69bf3c077d940ec8c";
           sha256 = "1csnxpsfnv9lv07kgvc60qx5c33sshmnz60p3qjz7ym7rnjy9b5x";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8673dafb02a8d70c278bfd2c063f40992defe3a3/recipes/osx-location";
           sha256 = "1p12mmrw70p3b04zlprkdxdfnb7m3vkm6gci3fwhr5zyfvwxvn0c";
-          name = "osx-location";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -28363,20 +35553,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    osx-pseudo-daemon = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    osx-pseudo-daemon = callPackage ({ fetchFromGitHub
+                                     , fetchurl
+                                     , lib
+                                     , melpaBuild }:
+      melpaBuild {
         pname = "osx-pseudo-daemon";
         version = "2.1";
         src = fetchFromGitHub {
           owner = "DarwinAwardWinner";
           repo = "mac-pseudo-daemon";
-          rev = "4d10e327cd8ee5bb7f006d68744be21c7097c1fc";
-          sha256 = "0rjdjddlkaps9cfyc23kcr3cdh08c12jfgkz7ca2j141mm89pyp2";
+          rev = "0358b3acd932082082971c489012bf139f5860dc";
+          sha256 = "1scdqy8g8dx3qzii70p3m2gddqqy7dkv63p8nfkp7vw1y5m19426";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6104efc035bcf469d133ab9a2caf42c9d4482334/recipes/osx-pseudo-daemon";
           sha256 = "1sch7bb8hl96fji2ayw2ah5cjgsga08wj44vddjxskyway8ykf0z";
-          name = "osx-pseudo-daemon";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -28384,8 +35577,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    osx-trash = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    osx-trash = callPackage ({ emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "osx-trash";
         version = "0.2";
         src = fetchFromGitHub {
@@ -28394,10 +35591,10 @@
           rev = "529619b84d21e18a38ec5255eb40f6b8ede38b2a";
           sha256 = "1n44wdffkw14si9kb7bpkp6d9cjwjrvksfh22y9549dhs1vav6qq";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1f4c86e5b86df6c5c2c484f041fa3e434bbfbbb1/recipes/osx-trash";
           sha256 = "1f6pi53mhp2pvrfjm8544lqqj36gzpzxq245lzvv91lvqkxr9ysj";
-          name = "osx-trash";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -28405,8 +35602,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    outlook = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    outlook = callPackage ({ emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "outlook";
         version = "0.1";
         src = fetchFromGitHub {
@@ -28415,10 +35616,10 @@
           rev = "5847c6f13b106cb54529080e9050be5b8b5be867";
           sha256 = "13wlfklk342gv5fmzpnz69mc07vm8x6xmh7li1w7f13ci3v4s045";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c5ce3e6800213b117578a1022f25407f2ec1604f/recipes/outlook";
           sha256 = "0yq9zl7dr8kkm4rps5np4dwvjfhzsxq9wd1af7zwcmms4l3qry6k";
-          name = "outlook";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -28426,20 +35627,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    outorg = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    outorg = callPackage ({ fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "outorg";
         version = "2.0";
         src = fetchFromGitHub {
           owner = "alphapapa";
           repo = "outorg";
-          rev = "e946cda497bae53fca6fa1579910237e216170bf";
-          sha256 = "1v9kx5xr7xcr6i664h2g6j8824yjsjdn5pvgmawvxrrplbjmiqnp";
+          rev = "04986bdb0b91fdd97974e032dced01dd8de759a4";
+          sha256 = "154nkvjaa78zhazmyv8ia8axgs7s1xr3zpv0z3mjl3v0ny7s5j21";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8edf78a0ecd2ff8e6e066b80751a31e11a068c3f/recipes/outorg";
           sha256 = "10jh64d1nalfig69nnsib46915jinv37lvmxa0aj91zymq2szdm9";
-          name = "outorg";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -28447,20 +35651,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    outshine = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    outshine = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "outshine";
         version = "2.0";
         src = fetchFromGitHub {
           owner = "alphapapa";
           repo = "outshine";
-          rev = "cf1097692b3ea0367d3c821769399fec5831e200";
-          sha256 = "1v04iyx57w8scw3iqrivii7q0sh8sa7xacswdhd18mw9kvjrbj98";
+          rev = "2313595aa2d72ec35e5bee31d1513752eafac01c";
+          sha256 = "1jw09qh4vcp3d4qbp9bi4a4kxy88jrxfskh3r1pdbcjlci4wfhjm";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8edf78a0ecd2ff8e6e066b80751a31e11a068c3f/recipes/outshine";
           sha256 = "1qqmvs17hq5s047nqplg4sa09xg5ck6zwqyg91xmbh71bx80v28v";
-          name = "outshine";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -28468,8 +35675,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    ov = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ov = callPackage ({ emacs
+                      , fetchFromGitHub
+                      , fetchurl
+                      , lib
+                      , melpaBuild }:
+      melpaBuild {
         pname = "ov";
         version = "1.0.6";
         src = fetchFromGitHub {
@@ -28478,10 +35689,10 @@
           rev = "4e1c254d74bc1773c92f1613c3865cdcb4bc7095";
           sha256 = "0qxk2rf84j86syxi8xknsq252irwg7sz396v3bb4wqz4prpj0kzc";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/18d8a10ba3018cb61924af3a1682b82f543f2d98/recipes/ov";
           sha256 = "0d71mpv74cfxcnwixbrl90nr22cw4kv5sdgpny5wycvh6cgmd6qb";
-          name = "ov";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -28489,20 +35700,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    overcast-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    overcast-theme = callPackage ({ emacs
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "overcast-theme";
         version = "1.1.0";
         src = fetchFromGitHub {
           owner = "myTerminal";
           repo = "overcast-theme";
-          rev = "009257956522dedf07d9e136ee41ac0b1b0b3518";
-          sha256 = "1g3s44n839s7fw3spkph31m0a5walilj151v0jyp302mjfn396nh";
+          rev = "faafe7c19106cb4db29ba716d117fbb6ebdda3f4";
+          sha256 = "1kjvx2wjb9ksdr7w0c4xnvqa4sbplj6rwlh85lbmcg8lwkb1s2sy";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d86691c61fc880954a05502a6474cc2fa0d0a43b/recipes/overcast-theme";
           sha256 = "1v8hdnvc4pfmadkvdm6b8z0cy20pminvhjdlr13q5m9immr88a4r";
-          name = "overcast-theme";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -28510,8 +35725,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    overseer = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }:
-    melpaBuild {
+    overseer = callPackage ({ dash
+                            , emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild
+                            , pkg-info }:
+      melpaBuild {
         pname = "overseer";
         version = "0.3.0";
         src = fetchFromGitHub {
@@ -28520,10 +35741,10 @@
           rev = "cf532a4e373e3da2077ccbaa48d4bfacd14661ba";
           sha256 = "0jz8p6bwpfncxwi6ssmi6ngx8sjjica565i6ln0gsr5i11zfb7nx";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/overseer";
           sha256 = "0zbh0j21h6wsqnqvnzai6y6rpccdciksb7g64qw7fx0cpg5x2ms8";
-          name = "overseer";
+          name = "recipe";
         };
         packageRequires = [ dash emacs pkg-info ];
         meta = {
@@ -28531,8 +35752,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    owdriver = callPackage ({ fetchFromGitHub, fetchurl, lib, log4e, melpaBuild, smartrep, yaxception }:
-    melpaBuild {
+    owdriver = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , log4e
+                            , melpaBuild
+                            , smartrep
+                            , yaxception }:
+      melpaBuild {
         pname = "owdriver";
         version = "0.0.6";
         src = fetchFromGitHub {
@@ -28541,10 +35768,10 @@
           rev = "0479389d9df9e70ff9ce69dff06252d3aa40fc86";
           sha256 = "0f2psx4lq98l3q3fnibsfqxp2hvvwk7b30zjvjlry3bffg3l7pfk";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f3f9c1bb19345c6027a945e7f265632da1a391cb/recipes/owdriver";
           sha256 = "0j8z7ynan0zj581x50gsi9lljkbi6bwmzpfyha3i6q8ch5qkdxfd";
-          name = "owdriver";
+          name = "recipe";
         };
         packageRequires = [ log4e smartrep yaxception ];
         meta = {
@@ -28552,20 +35779,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    ox-epub = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
-    melpaBuild {
+    ox-epub = callPackage ({ emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild
+                           , org }:
+      melpaBuild {
         pname = "ox-epub";
         version = "0.3";
         src = fetchFromGitHub {
           owner = "ofosos";
           repo = "ox-epub";
-          rev = "3d958203e169cbfb2204c43cb4c5543befec0b9d";
-          sha256 = "057sqmvm8hwkhcg3yd4i8zz2xlqsqrpyiklyiw750s3i5mxdn0k7";
+          rev = "7991155e4b80bafee616108014be5281c22bae83";
+          sha256 = "09di3qq0nc9m3dnqik392vbdps829wlkxdsjlcpdm0dfms9wq10v";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c3ac31dfef00e83fa6b716ea006f35afb5dc6cd5/recipes/ox-epub";
           sha256 = "15q6vsmgv76c0qfdxa3prqvgmr6n7k4rd4bpi05574ibi23y0ynh";
-          name = "ox-epub";
+          name = "recipe";
         };
         packageRequires = [ emacs org ];
         meta = {
@@ -28573,8 +35805,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    ox-gfm = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ox-gfm = callPackage ({ fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "ox-gfm";
         version = "1.0";
         src = fetchFromGitHub {
@@ -28583,10 +35818,10 @@
           rev = "99f93011b069e02b37c9660b8fcb45dab086a07f";
           sha256 = "0drdypmgxk3238hmkqw9s3cw9wv94cyfqar5ar0bv0k69s92pxj8";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/10e90430f29ce213fe57c507f06371ea0b29b66b/recipes/ox-gfm";
           sha256 = "065ngmzfd3g2h8n903hc4d363hz4z5rrdgizh2xpz03kf3plca6q";
-          name = "ox-gfm";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -28594,8 +35829,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    ox-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
-    melpaBuild {
+    ox-hugo = callPackage ({ emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild
+                           , org }:
+      melpaBuild {
         pname = "ox-hugo";
         version = "0.8";
         src = fetchFromGitHub {
@@ -28604,10 +35844,10 @@
           rev = "9751d34e1133b89a533a978c085b0715f85db648";
           sha256 = "11h464cyc28ld0b0zridgm4drydc1qjxbm1y24zrwlkyqqjk6yr7";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1e1240bb7b5bb8773f804b987901566a20e3e8a9/recipes/ox-hugo";
           sha256 = "1niarxj2y4a14lrv2nqcc36msw7k61h8fbjpcdrfbaw3n0kchd40";
-          name = "ox-hugo";
+          name = "recipe";
         };
         packageRequires = [ emacs org ];
         meta = {
@@ -28615,20 +35855,27 @@
           license = lib.licenses.free;
         };
       }) {};
-    ox-ioslide = callPackage ({ cl-lib ? null, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
-    melpaBuild {
+    ox-ioslide = callPackage ({ cl-lib ? null
+                              , emacs
+                              , f
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild
+                              , org }:
+      melpaBuild {
         pname = "ox-ioslide";
         version = "0.2";
         src = fetchFromGitHub {
           owner = "coldnew";
           repo = "org-ioslide";
-          rev = "e81f7a6dab512da7eaa8c2c50c673538b97db267";
-          sha256 = "047fcvpvwzaqisw4q3p6hxgjyqsi2n9nms1qx9w4znvxrnjq8jz3";
+          rev = "6cb628e022ef224e9fe8b8b6c123713449d8f06b";
+          sha256 = "1ipscvm7rdp8vcpd2f9516k5mjhdx03sb1p2c9j7krkhigfrbpsr";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b960abca4d642c47e640300876eefee1851e6b86/recipes/ox-ioslide";
           sha256 = "0z0qnvpw64wxbgz8203rphswlh9hd2i11pz2mlay8l3bzz4gx4vc";
-          name = "ox-ioslide";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs f org ];
         meta = {
@@ -28636,8 +35883,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    ox-pandoc = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, org }:
-    melpaBuild {
+    ox-pandoc = callPackage ({ dash
+                             , emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , ht
+                             , lib
+                             , melpaBuild
+                             , org }:
+      melpaBuild {
         pname = "ox-pandoc";
         version = "1.150707";
         src = fetchFromGitHub {
@@ -28646,10 +35900,10 @@
           rev = "035f1d60a0139349232c382cfd23a96902b7003d";
           sha256 = "0h49pfl97vl796sm7r62rpv3slj0z5krm4zrqkgz0q6zlyrjay29";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ca17de8cdd53bb32a9d3faaeb38f19f92b18ee38/recipes/ox-pandoc";
           sha256 = "0wy6yvwd4vyq6xalkrshnfjjxlh1p24y52z49894nz5fl63b74xc";
-          name = "ox-pandoc";
+          name = "recipe";
         };
         packageRequires = [ dash emacs ht org ];
         meta = {
@@ -28657,8 +35911,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    ox-twbs = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ox-twbs = callPackage ({ fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "ox-twbs";
         version = "1.1.1";
         src = fetchFromGitHub {
@@ -28667,10 +35924,10 @@
           rev = "2414e6b1de7deb6dd2ae79a7be633fdccb9c2f28";
           sha256 = "0kd45p8y7ykadmai4jn1x1pgpafyqggwb1ccbjzalxw4k9wmd45f";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ox-twbs";
           sha256 = "050rv270jlkc1v7wp47cv9cwr9pz3n840dd4jxxhfs6s47b9ln73";
-          name = "ox-twbs";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -28678,8 +35935,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    pabbrev = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    pabbrev = callPackage ({ fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "pabbrev";
         version = "4.1";
         src = fetchFromGitHub {
@@ -28688,10 +35948,10 @@
           rev = "127a8b10cf352b0491fefd2f4178ba78ee587564";
           sha256 = "073qpa223ja673p63mhvy4l6yyv3k7z05ifwvn7bmq4b5fq42hw6";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c032b0d126e0196b4526ee04f5103582610681ea/recipes/pabbrev";
           sha256 = "1mbfa40pbzbi00sp155zm43sj6nw221mcayc2rk3ppin9ps95hx3";
-          name = "pabbrev";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -28699,20 +35959,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    package-build = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    package-build = callPackage ({ cl-lib ? null
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "package-build";
-        version = "1.2";
+        version = "2.2";
         src = fetchFromGitHub {
           owner = "melpa";
           repo = "package-build";
-          rev = "d6f926e3688d1c8d3c9d06cbfdd5a31f85accf00";
-          sha256 = "072dlzskl0w4xcnrzgy36gzn4sla4hw84yr82rv04akb9mg4ya9m";
+          rev = "9aac3517bde14346eadbe2c7d354672a456b9db3";
+          sha256 = "0wa7d5vzxql499knlpbs07l5mw7kmxgwzv63i42arm1sqfplq5df";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/948fb86b710aafe6bc71f95554655dfdfcab0cca/recipes/package-build";
           sha256 = "0kr82j9rbvmapsph0jdxy24p0b8mcnj01sg1myywf428nf30cgbh";
-          name = "package-build";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -28720,20 +35984,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    package-lint = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    package-lint = callPackage ({ cl-lib ? null
+                                , emacs
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "package-lint";
         version = "0.5";
         src = fetchFromGitHub {
           owner = "purcell";
           repo = "package-lint";
-          rev = "1cee5135bd9a12e1b28e515a28093a751b4f7dd1";
-          sha256 = "1qvvdr5wx37x5jrw4hkx5vl4jmi3l1bjn97nnvwlsmzi6sgkcwsr";
+          rev = "f3ad224da996126873ee75484caafa874476ace6";
+          sha256 = "03hgzm1d8srimkp9qpb3xi6sh8rvkdwkv7mr005fzhax6awd5a2h";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9744d8521b4ac5aeb1f28229c0897af7260c6f78/recipes/package-lint";
           sha256 = "0w7nkj4yz5yqmhr3mr7kxa6aqqfs75m3l2578s39940a5sdzirwy";
-          name = "package-lint";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -28741,8 +36010,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    package-plus = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    package-plus = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "package-plus";
         version = "1.1.0";
         src = fetchFromGitHub {
@@ -28751,10 +36023,10 @@
           rev = "4a9618a44ec4f26a14e0136cd9d3c4855fceb25b";
           sha256 = "1xv0ra130qg0ksgqi4npspnv0ckq77k7f5kcibavj030h578kj97";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/49cfbbc4535aa7e175aa819d67b8aa52a6f94384/recipes/package+";
           sha256 = "1mbsxr4llz8ny7n7w3lykld9yvbaywlfqnvr9l0aiv9rvmdv03bn";
-          name = "package-plus";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -28762,8 +36034,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    package-safe-delete = callPackage ({ emacs, epl, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    package-safe-delete = callPackage ({ emacs
+                                       , epl
+                                       , fetchFromGitHub
+                                       , fetchurl
+                                       , lib
+                                       , melpaBuild }:
+      melpaBuild {
         pname = "package-safe-delete";
         version = "0.1.7";
         src = fetchFromGitHub {
@@ -28772,10 +36049,10 @@
           rev = "138171e4fc03c0ef05a8260cbb5cd2e114c1c194";
           sha256 = "1pdv6d6bm5jmpgjqf9ycvzasxz1205zdi0zjrmkr33c03azwz7rd";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/61b961211276bd95655b6a0967eda5037a3d240b/recipes/package-safe-delete";
           sha256 = "12ss5yjhnyxsif4vlbgxamn5jfa0wxkkphffxnv6drhvmpq226jw";
-          name = "package-safe-delete";
+          name = "recipe";
         };
         packageRequires = [ emacs epl ];
         meta = {
@@ -28783,20 +36060,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    package-utils = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, restart-emacs }:
-    melpaBuild {
+    package-utils = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild
+                                 , restart-emacs }:
+      melpaBuild {
         pname = "package-utils";
-        version = "1.0.0";
+        version = "1.0.1";
         src = fetchFromGitHub {
           owner = "Silex";
           repo = "package-utils";
-          rev = "652531caf1a1df916d2185e7f47085bd0509c940";
-          sha256 = "0lmz4szrfs2445q8nyqnh9hgm69bwdf7q78sfqyxiw1fqaj205si";
+          rev = "5621b95c56b55499f0463fd8b29501da25d861bd";
+          sha256 = "1mhsf0l0253d9b7n3c68mw5kwnsk7wf217y7m2fiybh51bdgjfnd";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a1bb884a0299408daa716eba42cb39f79622766c/recipes/package-utils";
           sha256 = "02hgh7wg68ysfhw5hckrpshzv4vm1vnm395d34x6vpgl4ccx7v9r";
-          name = "package-utils";
+          name = "recipe";
         };
         packageRequires = [ restart-emacs ];
         meta = {
@@ -28804,20 +36085,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    packed = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    packed = callPackage ({ emacs
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "packed";
         version = "3.0.0";
         src = fetchFromGitHub {
           owner = "emacscollective";
           repo = "packed";
-          rev = "c41c3dfda86ae33832ffc146923e2a4675cbacfa";
-          sha256 = "1272xmb3l8ddfijqzci3x0kxwibqb0sbkci4rbcv9ba9hpxp4d1v";
+          rev = "788ea94bff319d6a776954c32cff1de8b400f051";
+          sha256 = "1sga68hf6zf5j8sb56zqy35p5gn6x7c12m6h8q1gzazfy7xz57p0";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/57a2fb9524df3fdfdc54c403112e12bd70888b23/recipes/packed";
           sha256 = "103z6fas2fkvlhvwbv1rl6jcij5pfsv5vlqqsb4dkq1b0s7k11jd";
-          name = "packed";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -28825,8 +36110,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    page-break-lines = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    page-break-lines = callPackage ({ fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "page-break-lines";
         version = "0.11";
         src = fetchFromGitHub {
@@ -28835,10 +36123,10 @@
           rev = "67b5928a7f14568baf2716b5741e13659a86b9ea";
           sha256 = "1wp974716ih2cz9kdmdz7xwjy1qnnfzdzlfr9kchknagw8d9nn12";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/page-break-lines";
           sha256 = "0i5kx191wnq9763jyqxbyh33hvdaqbd98a1rhgqd97zhvg0hslz1";
-          name = "page-break-lines";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -28846,8 +36134,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    pallet = callPackage ({ cask, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    pallet = callPackage ({ cask
+                          , dash
+                          , f
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild
+                          , s }:
+      melpaBuild {
         pname = "pallet";
         version = "0.9.2";
         src = fetchFromGitHub {
@@ -28856,10 +36151,10 @@
           rev = "0e1ae11e1ebfe644cbf832df62ac2dbf6ecd0501";
           sha256 = "03mlg6dmpjw8fq2s3c4gpqj20kjhzldz3m51bf6s0mxq9bclx2xw";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bf977287e9bd668efbd972c9937906384ee832c6/recipes/pallet";
           sha256 = "0q50cdwnn2w1n5h4bappncjjyi5yaixxannwgy23fngdrz1mxwd7";
-          name = "pallet";
+          name = "recipe";
         };
         packageRequires = [ cask dash f s ];
         meta = {
@@ -28867,20 +36162,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    panda-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    panda-theme = callPackage ({ emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "panda-theme";
         version = "0.1";
         src = fetchFromGitHub {
           owner = "jamiecollinson";
           repo = "emacs-panda-theme";
-          rev = "ae24179e7a8a9667b169f00dbd891257530c1d22";
-          sha256 = "05vv4idl9h59jd089hpd09xcy1ix30bq0c4fif2b66170aychvii";
+          rev = "4016c16709889ca974bc194c039523b85c29c903";
+          sha256 = "1kfg8dswg9hp07mcafz6s78md31wyn03r3pzz1jvysnlfdg9ak7c";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a90ca1275ceab8e1ea4fdfa9049fbd24a5fd0bf5/recipes/panda-theme";
           sha256 = "1q3zp331hz8l54p8ym9jrs4f36aj15r8aka6bqqnalnk237xqxl7";
-          name = "panda-theme";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -28888,20 +36187,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    pandoc = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    pandoc = callPackage ({ emacs
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "pandoc";
         version = "0.0.1";
         src = fetchFromGitHub {
           owner = "zonuexe";
           repo = "pandoc.el";
-          rev = "0f59533bbd8494fea3172551efb6ec49f61ba285";
-          sha256 = "0xqd64k8liaywsf65apj5xmf7ip6sikjmpc4740nld8iywhq8gf4";
+          rev = "d45e35c917d9d775c05747d9feb49a1a831ad831";
+          sha256 = "15ks8wlaj6n50cqmvw48pz191ha96krfwd38ygwq0kk1nm7y1y8g";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d6c21ff09d67fad2658e0de08bc2edb7588c504a/recipes/pandoc";
           sha256 = "0x81anxam7agr2v2zqgc331zs5s5zxcw54kzpanndda23n51h5cc";
-          name = "pandoc";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -28909,20 +36212,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    pandoc-mode = callPackage ({ dash, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild }:
-    melpaBuild {
+    pandoc-mode = callPackage ({ dash
+                               , fetchFromGitHub
+                               , fetchurl
+                               , hydra
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "pandoc-mode";
-        version = "2.23";
+        version = "2.25";
         src = fetchFromGitHub {
           owner = "joostkremers";
           repo = "pandoc-mode";
-          rev = "58f893d54c0916ad832097a579288ef8ce405da5";
-          sha256 = "03nh5ivcwknnsw9khz196n6s3pa1392jk7pm2mr4yjjs24izyz1i";
+          rev = "436a5847df3326436ec546dbb360d23c8e0e2030";
+          sha256 = "0qvfhgwvzfchzg2ap62f3giw0fnbapb2w67j3allpcra34qpnszd";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/pandoc-mode";
           sha256 = "0qvc6cf87h1jqf590kd68jfg25snxaxayfds634wj4z6gp70l781";
-          name = "pandoc-mode";
+          name = "recipe";
         };
         packageRequires = [ dash hydra ];
         meta = {
@@ -28930,8 +36238,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    pangu-spacing = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    pangu-spacing = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "pangu-spacing";
         version = "0.4";
         src = fetchFromGitHub {
@@ -28940,10 +36251,10 @@
           rev = "034b4ef8a1b29bf7bfed6a916380941506ed26ed";
           sha256 = "0gmdzagyg0p7q1gyj2a3aqp2g4asljpib3n67nikr0v99c2mki5y";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c0b00eda1d20ff2cbffe3ac606e5fd60d915a5d6/recipes/pangu-spacing";
           sha256 = "082qh26vlk7kifz1800lyai17yvngwjygrfrsh1dsd8dxhk6l9j8";
-          name = "pangu-spacing";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -28951,20 +36262,28 @@
           license = lib.licenses.free;
         };
       }) {};
-    paradox = callPackage ({ emacs, fetchFromGitHub, fetchurl, hydra, let-alist, lib, melpaBuild, seq, spinner }:
-    melpaBuild {
+    paradox = callPackage ({ emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , hydra
+                           , let-alist
+                           , lib
+                           , melpaBuild
+                           , seq
+                           , spinner }:
+      melpaBuild {
         pname = "paradox";
         version = "2.5.2";
         src = fetchFromGitHub {
           owner = "Malabarba";
           repo = "paradox";
-          rev = "dfdfbec8b4a3b71966c134f00c3f5edfa87b6245";
-          sha256 = "1l0rs49lbclq4ayhnx6vi6bxn37a0h2ylk73fjcbar2lbr1dhf9r";
+          rev = "17a6690d42a1e854ec270ed930c7494077570fc8";
+          sha256 = "1vg5i4cxgn4a8cgx43i75w3cf0d8sb6ig6xxxdj3pvpzc81i53bc";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/paradox";
           sha256 = "1xq14nfvprsq18464qr4mhphq7cl1f570lji5n8z6j9vpfm9a4p2";
-          name = "paradox";
+          name = "recipe";
         };
         packageRequires = [ emacs hydra let-alist seq spinner ];
         meta = {
@@ -28972,7 +36291,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    paredit = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
+    paredit = callPackage ({ fetchgit
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "paredit";
         version = "24";
         src = fetchgit {
@@ -28980,10 +36303,10 @@
           rev = "82bb75ceb2ddc272d6618d94874b7fc13181a409";
           sha256 = "13wzz5fahbz5svc4ql3ajzzpd1fv0ynwpa5widklbcp5yqncv1vm";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/paredit";
           sha256 = "01qh8kfb5hyfi0jfl1kq3inkyzr0rf3wncmzgxlkfdc8zlq4v653";
-          name = "paredit";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -28991,8 +36314,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    paredit-everywhere = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, paredit }:
-    melpaBuild {
+    paredit-everywhere = callPackage ({ fetchFromGitHub
+                                      , fetchurl
+                                      , lib
+                                      , melpaBuild
+                                      , paredit }:
+      melpaBuild {
         pname = "paredit-everywhere";
         version = "0.4";
         src = fetchFromGitHub {
@@ -29001,10 +36328,10 @@
           rev = "72b7cd5dcdc02233a32e9f1a6c2d21dc30532170";
           sha256 = "0jbjwjl92pf0kih3p2x20ms2kpyzzam8fir661nimpmk802ahgkj";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/593890222d074c6a308eb1b809077c6861e1af30/recipes/paredit-everywhere";
           sha256 = "0gbkwk8mrbjr2l8pz3q4y6j8q4m12zmzl31c88ngs1k5d86wav36";
-          name = "paredit-everywhere";
+          name = "recipe";
         };
         packageRequires = [ paredit ];
         meta = {
@@ -29012,20 +36339,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    paren-face = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    paren-face = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "paren-face";
         version = "1.0.4";
         src = fetchFromGitHub {
           owner = "tarsius";
           repo = "paren-face";
-          rev = "a45d111153a76c481fa0b36d6172ac90e073dfc4";
-          sha256 = "1cr0vnm57lxs48z17ddcv7qlfvks7wdsp01zsw0c7i3h5ajl8myp";
+          rev = "42b2141b5427bc78d640229821b2b8053e6743d2";
+          sha256 = "1f1srk4100rsc7i6257q460g4ykmqx4fwrpgb57dlp83d3342c6h";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d398398d1d5838dc4985a06515ee668f0f566aab/recipes/paren-face";
           sha256 = "0dmzk66m3rd8x0rb925pyrfpc2qsvayks4kmhpb2ccdrx68pg8gf";
-          name = "paren-face";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -29033,8 +36363,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    parent-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    parent-mode = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "parent-mode";
         version = "2.3";
         src = fetchFromGitHub {
@@ -29043,10 +36376,10 @@
           rev = "db692cf08deff2f0e973e6e86e26662b44813d1b";
           sha256 = "0i5bc7lyyrx6swqlrp9l5x72yzwi53qn6ldrfs99gh08b3yvsnni";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9736d8f6c3065c46b8c4e0056e9d592d3ec973e9/recipes/parent-mode";
           sha256 = "1ndn6m6aasmk9yrml9xqj8141100nw7qi1bhnlsss3v8b6njwwig";
-          name = "parent-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -29054,8 +36387,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    parinfer = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    parinfer = callPackage ({ cl-lib ? null
+                            , dash
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "parinfer";
         version = "0.4.10";
         src = fetchFromGitHub {
@@ -29064,10 +36402,10 @@
           rev = "5b3b247d68eeaf7404598cbcbf2158e07f16e65d";
           sha256 = "0v97ncb0w1slb0x8861l3yr1kqz6fgw1fwl1z9lz6hh8p2ih34sk";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/470ab2b5cceef23692523b4668b15a0775a0a5ba/recipes/parinfer";
           sha256 = "05w4w7j6xyj19dm63073amd4n7fw4zm3qnn4x02fk2011iw8fq7i";
-          name = "parinfer";
+          name = "recipe";
         };
         packageRequires = [ cl-lib dash ];
         meta = {
@@ -29075,8 +36413,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    parsebib = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    parsebib = callPackage ({ emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "parsebib";
         version = "2.3.2";
         src = fetchFromGitHub {
@@ -29085,10 +36427,10 @@
           rev = "c8d59deb20552f9a1885297b5ae0b8f753d191a5";
           sha256 = "1b1iiiy184czp014gg1bb3jks9frmkw8hs5z2l2lnzjmfjr6jm6g";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c39633957475dcd6a033760ba20a957716cce59c/recipes/parsebib";
           sha256 = "07br2x68scsxykdk2ajc4mfqhdb7vjkcfgz3vnpy91sirxzgfjdd";
-          name = "parsebib";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -29096,8 +36438,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    parsec = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    parsec = callPackage ({ cl-lib ? null
+                          , emacs
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "parsec";
         version = "0.1.3";
         src = fetchFromGitHub {
@@ -29106,10 +36453,10 @@
           rev = "8f0c266d8b9b0ee5fcf9b80c518644b2849ff3b3";
           sha256 = "1zwdh3dwqvw9z79mxgf9kf1l2c0pb32sknhrs7ppca613nk9c58j";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/248aaf5ff9c98cd3e439d0a26611cdefe6b6c32a/recipes/parsec";
           sha256 = "1p3364sv5r868xjj1411xqj4acxqmbzcdl900sd03585ql5wbypj";
-          name = "parsec";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -29117,8 +36464,40 @@
           license = lib.licenses.free;
         };
       }) {};
-    pass = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, password-store }:
-    melpaBuild {
+    parseclj = callPackage ({ a
+                            , emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
+        pname = "parseclj";
+        version = "0.1.0";
+        src = fetchFromGitHub {
+          owner = "clojure-emacs";
+          repo = "parseclj";
+          rev = "93a0f43529598984835f88e64b62fa68bebda89b";
+          sha256 = "03bm5dm4hmkqimv4wqxjjh5814pxysmm7z54bv2rf7zwv1x7dggr";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e2a977779a7ee49f57b849b14e581210a7f47d61/recipes/parseclj";
+          sha256 = "077qigx0qyjyvm3437ffnv05rmnpqxvpxf69yyfdgnay1xclv172";
+          name = "recipe";
+        };
+        packageRequires = [ a emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/parseclj";
+          license = lib.licenses.free;
+        };
+      }) {};
+    pass = callPackage ({ emacs
+                        , f
+                        , fetchFromGitHub
+                        , fetchurl
+                        , lib
+                        , melpaBuild
+                        , password-store }:
+      melpaBuild {
         pname = "pass";
         version = "1.7";
         src = fetchFromGitHub {
@@ -29127,10 +36506,10 @@
           rev = "2ccf4f68fa4d2aab7efbdc26ebdc45ac1ef1819c";
           sha256 = "11b8c0qihgkl46hjqx6g1p1ifd7lc3q7jhqds3gr41zsrnlyi3p8";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/428c2d53db69bed8938ec3486dfcf7fc048cd4e8/recipes/pass";
           sha256 = "1vvyvnqf6k7wm0p45scwi6ny86slkrcbr36lnxdlkf96cqyrqzfr";
-          name = "pass";
+          name = "recipe";
         };
         packageRequires = [ emacs f password-store ];
         meta = {
@@ -29138,41 +36517,50 @@
           license = lib.licenses.free;
         };
       }) {};
-    passmm = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    passmm = callPackage ({ emacs
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild
+                          , password-store }:
+      melpaBuild {
         pname = "passmm";
-        version = "0.2.0";
+        version = "0.3.1";
         src = fetchFromGitHub {
           owner = "pjones";
           repo = "passmm";
-          rev = "983fc8e3e6d24bb8088e2e89254ecd5e03db787d";
-          sha256 = "1mcxfk3yqhxslsjl3j25n87di5i2a3v9rk1cj1vnf46695s2fk38";
+          rev = "2e0cd4e8ef7e6017dbc295664c925d32d6fdc688";
+          sha256 = "0f2nkmbphmrnfkx4yw7w0ch33kpdzqjalah2pf6nj0rm629b1dad";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8ae2a1e10375f9cd55d19502c9740b2737eba209/recipes/passmm";
           sha256 = "0p6qps9ww7s6w5x7p6ha26xj540pk4bjkr629lcicrvnfr5jsg4b";
-          name = "passmm";
+          name = "recipe";
         };
-        packageRequires = [ emacs ];
+        packageRequires = [ emacs password-store ];
         meta = {
           homepage = "https://melpa.org/#/passmm";
           license = lib.licenses.free;
         };
       }) {};
-    passthword = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    passthword = callPackage ({ cl-lib ? null
+                              , fetchFromGitLab
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "passthword";
         version = "1.4";
-        src = fetchFromGitHub {
+        src = fetchFromGitLab {
           owner = "pidu";
           repo = "passthword";
           rev = "58a91defdbeec9014b4e46f909a7411b3a627285";
           sha256 = "1g0mvg9i8f2qccb4b0m4d74zkjx9gjfv47x57by6cdaf9yywqryi";
         };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/399bb6d6e36ca4c1e54566e66d7065fe1011f99c/recipes/passthword";
-          sha256 = "076jayziipjx260yk3p37pf5k0qsagalidah3y6hiflrlq4sfgjn";
-          name = "passthword";
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/a52b516b7b10bdada2f64499c8f43f85a236f254/recipes/passthword";
+          sha256 = "19zv80kidb6a3985n3zij507hvffcxhcvlfxd01gwx64wvfc0c3c";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -29180,29 +36568,42 @@
           license = lib.licenses.free;
         };
       }) {};
-    password-store = callPackage ({ f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    password-store = callPackage ({ emacs
+                                  , f
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild
+                                  , s
+                                  , with-editor }:
+      melpaBuild {
         pname = "password-store";
-        version = "1.7.1";
+        version = "1.7.2";
         src = fetchFromGitHub {
           owner = "zx2c4";
           repo = "password-store";
-          rev = "38ec1c72e29c872ec0cdde82f75490640d4019bf";
-          sha256 = "04rqph353qfhnrwji6fmvrbk4yag8brqpbpaysq5z0c9l4p9ci87";
+          rev = "65cead8c0fdb07ce3821f6b97bdcb32684d0c3f7";
+          sha256 = "0rm364l9mg2gl16ng5zd02gkfq8592mhrp81sk1v0wwh8wlyrzrh";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/207f8ec84572176749d328cb2bbc4e87c36f202c/recipes/password-store";
           sha256 = "03r8j14l12yc42b51fzvn1jh8j85nyl1rg6c80r0a7ihwkj27jv6";
-          name = "password-store";
+          name = "recipe";
         };
-        packageRequires = [ f s ];
+        packageRequires = [ emacs f s with-editor ];
         meta = {
           homepage = "https://melpa.org/#/password-store";
           license = lib.licenses.free;
         };
       }) {};
-    password-store-otp = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, password-store, s }:
-    melpaBuild {
+    password-store-otp = callPackage ({ emacs
+                                      , fetchFromGitHub
+                                      , fetchurl
+                                      , lib
+                                      , melpaBuild
+                                      , password-store
+                                      , s }:
+      melpaBuild {
         pname = "password-store-otp";
         version = "0.1.5";
         src = fetchFromGitHub {
@@ -29211,10 +36612,10 @@
           rev = "a39a64a91de36e87b852339635bd3c5fb0e32441";
           sha256 = "0gb48blvnn6ci2wl45z81p41ny7vbgl610hqy6b2hyr2171qjd60";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fc89d02554a6ff150ad42634879073892f3e88be/recipes/password-store-otp";
           sha256 = "0m3n4gjf6hmcs2kg80h1whzbl74zsj79ihliyqfcdfc4v31m32sg";
-          name = "password-store-otp";
+          name = "recipe";
         };
         packageRequires = [ emacs password-store s ];
         meta = {
@@ -29222,20 +36623,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    pastehub = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    pastehub = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "pastehub";
         version = "0.5.2";
         src = fetchFromGitHub {
           owner = "kiyoka";
           repo = "pastehub";
-          rev = "37b045c67659c078f1517d0fbd5282dab58dca23";
-          sha256 = "0m6qjsq6qfwwszm95lj8c58l75vbmx9r5hm9bfywyympfgy0fa1n";
+          rev = "3cc5dcb87104f3b4320a6d7fa20fa7340e6b7026";
+          sha256 = "0wbb5689n9k351gf3s9mqr3bi00lpajk0h1k9gx1b2mdbb7lq7xd";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bb8645a9880c586ef2ad16f3a4e61ba76176c224/recipes/pastehub";
           sha256 = "1slvqn5ay6gkbi0ai1gy1wmc02h4g3n6srrh4fqn72y7b9nv5i0v";
-          name = "pastehub";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -29243,8 +36647,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    pastelmac-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    pastelmac-theme = callPackage ({ emacs
+                                   , fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "pastelmac-theme";
         version = "1.0";
         src = fetchFromGitHub {
@@ -29253,10 +36661,10 @@
           rev = "bead21741e3f46f6506e8aef4469d4240a819389";
           sha256 = "1v5mpjb8kavbqhvg4rizwg8cypgmi6ngdiy8qp9pimmkb56y42ly";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a7151773de39fe570e3e9b351daad89db9dd267f/recipes/pastelmac-theme";
           sha256 = "168zzqhp2dbfcnknwfqxk68rgmibfw71ksghvi6h2j2c1m08l23f";
-          name = "pastelmac-theme";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -29264,8 +36672,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    pastery = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }:
-    melpaBuild {
+    pastery = callPackage ({ emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild
+                           , request }:
+      melpaBuild {
         pname = "pastery";
         version = "0.2.1";
         src = fetchFromGitHub {
@@ -29274,10 +36687,10 @@
           rev = "4493be98b743b4d062cb4e00760125e394a55022";
           sha256 = "0bmm18d84lrkclg4md46k1ma03w7a97s10hrvjcm9yj8xbrjqqsc";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6058218450071db0af9a5b8ce8ec09a735c4ab66/recipes/pastery";
           sha256 = "006qawjc86spbbs2pxvhg9w94rcsxap577cndqwaiw1k0cc8vkhp";
-          name = "pastery";
+          name = "recipe";
         };
         packageRequires = [ emacs request ];
         meta = {
@@ -29285,8 +36698,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    pathify = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    pathify = callPackage ({ fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "pathify";
         version = "0.1";
         src = fetchFromGitHub {
@@ -29295,10 +36711,10 @@
           rev = "335332a900717ae01bde5ccb8f3dc97a5350f123";
           sha256 = "1brdyrp2sz1pszdfr6f4w94qxk5lrd6kphc1xa5pywfns14c9386";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/459460c977b9cf033e22937899ad380e01efcf11/recipes/pathify";
           sha256 = "1z970xnzbhmfikj1rkfx24jvwc7f1xxw6hk7kmahxvphjxrvgc2f";
-          name = "pathify";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -29306,8 +36722,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    paxedit = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, paredit }:
-    melpaBuild {
+    paxedit = callPackage ({ cl-lib ? null
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild
+                           , paredit }:
+      melpaBuild {
         pname = "paxedit";
         version = "1.1.8";
         src = fetchFromGitHub {
@@ -29316,10 +36737,10 @@
           rev = "644eb7036a475fbcba4de5d46d6940b1e8ef33cd";
           sha256 = "0jmhr658cczblag8knr8j77q58yj268rkhh5dmga66l0sb30wb21";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/106b272c2f0741d21d31a0ddfa4f521c575559c1/recipes/paxedit";
           sha256 = "06ymilr0zrwfpyzql7dcpg48lhkx73f2jlaw3caxgsjaz7x3n4ic";
-          name = "paxedit";
+          name = "recipe";
         };
         packageRequires = [ cl-lib paredit ];
         meta = {
@@ -29327,8 +36748,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    pcache = callPackage ({ eieio ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    pcache = callPackage ({ eieio ? null
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "pcache";
         version = "0.4.2";
         src = fetchFromGitHub {
@@ -29337,10 +36762,10 @@
           rev = "025ef2411fa1bf82a9ac61dfdb7bd4cedaf2d740";
           sha256 = "1jkdyacpcvbsm1g2rjpnk6hfr01r3j5ibgh09441scz41v6xk248";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/pcache";
           sha256 = "0wwx20x6gzlli3hh4zd9pfv2cmqfm38xbl9p4vsgy08q1rm5agva";
-          name = "pcache";
+          name = "recipe";
         };
         packageRequires = [ eieio ];
         meta = {
@@ -29348,8 +36773,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    pcomplete-extension = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    pcomplete-extension = callPackage ({ cl-lib ? null
+                                       , emacs
+                                       , fetchFromGitHub
+                                       , fetchurl
+                                       , lib
+                                       , melpaBuild }:
+      melpaBuild {
         pname = "pcomplete-extension";
         version = "1.0";
         src = fetchFromGitHub {
@@ -29358,10 +36788,10 @@
           rev = "839740c90de857e18db2f578d6660951522faab5";
           sha256 = "0h0p4c08z0dqxmg55fzch1d2f38rywfk1j0an2f4sc94lj7ckbm6";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6cb8a938418f84a5b0ede92e84a516f38e4b1011/recipes/pcomplete-extension";
           sha256 = "0m0c9ir44p21rj93fkisvpvi08936717ljmzsr4qdf69b3i54cwc";
-          name = "pcomplete-extension";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -29369,20 +36799,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    pcre2el = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    pcre2el = callPackage ({ cl-lib ? null
+                           , emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "pcre2el";
         version = "1.8";
         src = fetchFromGitHub {
           owner = "joddie";
           repo = "pcre2el";
-          rev = "166a10472002010692dbc35f323ffb8110a294c5";
-          sha256 = "1dpfhrxbaqpgjzac3m9hclbzlnrxq9b8bx6za53aqvml72yzxc6i";
+          rev = "3eba762d3a9619496d7ef2929d95117040ca93fa";
+          sha256 = "0m76flv62z6f167hlw5lmnzrwyzj412vfpgcw1lrla2l7mjv011z";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f04a25e467cc4c7d9a263330a7a1a53d67c6eb9b/recipes/pcre2el";
           sha256 = "1l72hv9843qk5p8gi9ibr15wczm804j3ws2v1x7nx4dr7pc5c7l3";
-          name = "pcre2el";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -29390,8 +36825,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    pcsv = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    pcsv = callPackage ({ fetchFromGitHub
+                        , fetchurl
+                        , lib
+                        , melpaBuild }:
+      melpaBuild {
         pname = "pcsv";
         version = "1.3.6";
         src = fetchFromGitHub {
@@ -29400,10 +36838,10 @@
           rev = "91599aaba70a8e8593fa2f36165af82cbd35e41e";
           sha256 = "03k3xhrim4s3yvbnl8g8ci5g7chlffycdw7d6a1pz3077mxf1f1z";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/80ffaf99b2a4566a3f9d0309cd7b63f563f3826e/recipes/pcsv";
           sha256 = "1zphndkbva59g1fd319a240yvq8fjk315b1fyrb8zvmqpgk9n0dl";
-          name = "pcsv";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -29411,8 +36849,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    pdf-tools = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, tablist }:
-    melpaBuild {
+    pdf-tools = callPackage ({ emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , let-alist
+                             , lib
+                             , melpaBuild
+                             , tablist }:
+      melpaBuild {
         pname = "pdf-tools";
         version = "0.80";
         src = fetchFromGitHub {
@@ -29421,10 +36865,10 @@
           rev = "920e598c1ec6eb9a48dde32282d10adc9cc3b011";
           sha256 = "1i4647vax5na73basc5dz4lh9kprir00fh8ps4i0l1y3ippnjs2s";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8e3d53913f4e8a618e125fa9c1efb3787fbf002d/recipes/pdf-tools";
           sha256 = "1hnc8cci00mw78h7d7gs8smzrgihqz871sdc9hfvamb7iglmdlxw";
-          name = "pdf-tools";
+          name = "recipe";
         };
         packageRequires = [ emacs let-alist tablist ];
         meta = {
@@ -29432,8 +36876,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    peg = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    peg = callPackage ({ fetchFromGitHub
+                       , fetchurl
+                       , lib
+                       , melpaBuild }:
+      melpaBuild {
         pname = "peg";
         version = "0.6";
         src = fetchFromGitHub {
@@ -29442,10 +36889,10 @@
           rev = "081efeca91d790c7fbc90871ac22c40935f4833b";
           sha256 = "0kjz7ch4bn0m4v9zgqyqcrsasnqc5c5drv2hp22j7rnbb7ny0q3n";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9b9b55a02e903ae7e75f8b636fdb1cf907c5db7c/recipes/peg";
           sha256 = "0nxy9xn99myz0p36m4jflfj48qxhhn1sspbfx8d90030xg3cc2gm";
-          name = "peg";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -29453,8 +36900,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    pelican-mode = callPackage ({ emacs, fetchgit, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    pelican-mode = callPackage ({ emacs
+                                , fetchgit
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "pelican-mode";
         version = "20170808";
         src = fetchgit {
@@ -29462,10 +36913,10 @@
           rev = "8b13c30c4ec38dd535eadf26e463f8616d5c089c";
           sha256 = "0rghcyp09ga95ag0pjbk4hdxxlsnr93dr6706z0xvfgmninbn5aw";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/aede5994c2e76c7fd860661c1e3252fb741f9228/recipes/pelican-mode";
           sha256 = "0z6w5j3qwb58pndqbmpsvy1l77w9jv90bss9qq9hicil8nlk4pvi";
-          name = "pelican-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -29473,8 +36924,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    per-buffer-theme = callPackage ({ cl-lib ? null, fetchhg, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    per-buffer-theme = callPackage ({ cl-lib ? null
+                                    , fetchhg
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "per-buffer-theme";
         version = "1.5";
         src = fetchhg {
@@ -29493,20 +36948,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    persistent-scratch = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    persistent-scratch = callPackage ({ emacs
+                                      , fetchFromGitHub
+                                      , fetchurl
+                                      , lib
+                                      , melpaBuild }:
+      melpaBuild {
         pname = "persistent-scratch";
-        version = "0.3";
+        version = "0.3.1";
         src = fetchFromGitHub {
           owner = "Fanael";
           repo = "persistent-scratch";
-          rev = "551c655fa349e6f48e4e29f427fff7594f76ac1d";
-          sha256 = "1iqfr8s4cvnnmqw5yxyr6b6nghbsc95mgjlc61qxa8wa1mpv31rz";
+          rev = "0bfd717d28ce9e262741b06341c61306602c7711";
+          sha256 = "1fq3m3p81rrvv1yp0cxfznphx7gava11sn09x706lmm1js62jnip";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f1e32702bfa15490b692d5db59e22d2c07b292d1/recipes/persistent-scratch";
           sha256 = "0iai65lsg3zxj07hdb9201w3rwrvdb3wffr6k2jdl8hzg5idghn1";
-          name = "persistent-scratch";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -29514,8 +36973,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    persistent-soft = callPackage ({ fetchFromGitHub, fetchurl, lib, list-utils, melpaBuild, pcache }:
-    melpaBuild {
+    persistent-soft = callPackage ({ fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , list-utils
+                                   , melpaBuild
+                                   , pcache }:
+      melpaBuild {
         pname = "persistent-soft";
         version = "0.8.10";
         src = fetchFromGitHub {
@@ -29524,10 +36988,10 @@
           rev = "a1e0ddf2a12a6f18cab565dee250f070384cbe02";
           sha256 = "14p20br8vzxs39d4hswzrrkgwql5nnmn5j17cpbabzjvck42rixc";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c9db386ab3910940addae6e925b2ac17e64e0f87/recipes/persistent-soft";
           sha256 = "0a4xiwpgyyynjf69s8p183mqd3z53absv544ggvhb2gkpm6jravc";
-          name = "persistent-soft";
+          name = "recipe";
         };
         packageRequires = [ list-utils pcache ];
         meta = {
@@ -29535,8 +36999,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    persp-fr = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, persp-mode }:
-    melpaBuild {
+    persp-fr = callPackage ({ emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild
+                            , persp-mode }:
+      melpaBuild {
         pname = "persp-fr";
         version = "0.0.3";
         src = fetchFromGitHub {
@@ -29545,10 +37014,10 @@
           rev = "4d2d1a75019f520742da79f1aeed9c4a960677e0";
           sha256 = "1waakbmxwm0xdnl0iznyk61ccwdjvwv5g1naml31r7q0cnk0jfz8";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8e09213dddf003a1275eafb767431a507ecf7639/recipes/persp-fr";
           sha256 = "0p4379yr1b32l8ghq1axyb8qhp28gnq5qxxvbk3mdzgbwwj8y4b2";
-          name = "persp-fr";
+          name = "recipe";
         };
         packageRequires = [ emacs persp-mode ];
         meta = {
@@ -29556,8 +37025,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    persp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    persp-mode = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "persp-mode";
         version = "2.9.6";
         src = fetchFromGitHub {
@@ -29566,10 +37038,10 @@
           rev = "1dfea0de788f6d25ee47b5c62ddbeaf9e8e92f06";
           sha256 = "11ww8hg9p8qlmr8zpir0m5xzzbvd1faiqjx6vn4b05d4ll03rnhm";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/caad63d14f770f07d09b6174b7b40c5ab06a1083/recipes/persp-mode";
           sha256 = "1bgni7y5xsn4a21494npr90w3320snfzw1hvql30xrr57pw3765w";
-          name = "persp-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -29577,8 +37049,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    persp-projectile = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, perspective, projectile }:
-    melpaBuild {
+    persp-projectile = callPackage ({ cl-lib ? null
+                                    , fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild
+                                    , perspective
+                                    , projectile }:
+      melpaBuild {
         pname = "persp-projectile";
         version = "0.2.0";
         src = fetchFromGitHub {
@@ -29587,10 +37065,10 @@
           rev = "7686633acf44402fa90429759cca6a155e4df2b9";
           sha256 = "0rqyzsmg32sdr4k9i2lf3jfyr9bskkl7gfb5ndl16iip9py7403z";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8bc4e3a5af7ba86d277c73a1966a91c87d3d855a/recipes/persp-projectile";
           sha256 = "10l2kqjyigg98qbbpf3qf4d5bm63kkk4vp7ip8fibgj1p9gqmnxm";
-          name = "persp-projectile";
+          name = "recipe";
         };
         packageRequires = [ cl-lib perspective projectile ];
         meta = {
@@ -29598,20 +37076,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    perspective = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    perspective = callPackage ({ cl-lib ? null
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "perspective";
-        version = "1.12";
+        version = "2.1";
         src = fetchFromGitHub {
           owner = "nex3";
           repo = "perspective-el";
-          rev = "3a8d59045a6370fae1ec2011865190a7465d707f";
-          sha256 = "12c2rrhysrcl2arc6hpzv6lxbb1r3bzlvdp23hnp9sci6yc10k3q";
+          rev = "7d1a16fb3058966ac3b2bea52225373bd3aa30cd";
+          sha256 = "0qbxrcxdsnsvap1p6nrh0r4bxx2xvjz3y1mjk2wwbcj5hw2jkk0r";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/perspective";
           sha256 = "021ax1c2ys82dcjs5jl7b4nb83n6gax2imnpm030rcbihjl1lzm7";
-          name = "perspective";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -29619,20 +37101,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    perspeen = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    perspeen = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "perspeen";
         version = "0.1";
         src = fetchFromGitHub {
           owner = "seudut";
           repo = "perspeen";
-          rev = "30ee14339cf8fe2e59e5384085afee3f8eb58dda";
-          sha256 = "0mi7ipx0zg0vrm9da24i4j0300xj0dm3jjg35f466pm3a7xafrsg";
+          rev = "4079e254d542876eaa7e37b3c4b77d4f6a0f4e16";
+          sha256 = "1y54zlrrzc7h1kflvayhxnmh2xrv2nc708hd9m63h99li4xqcdzp";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/perspeen";
           sha256 = "0kwmllas9vnppsfaviy58d0nk4hmlqp566mfr4l53x46sybv1y04";
-          name = "perspeen";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -29640,8 +37125,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    pfuture = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    pfuture = callPackage ({ emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "pfuture";
         version = "1.2";
         src = fetchFromGitHub {
@@ -29650,10 +37139,10 @@
           rev = "8b5cd8dfb8769d2b24484a313d3d21938afd3dfb";
           sha256 = "1d63sfwy7qmldhq2xda9dglg91cy2kpjdr2rlmqb48w95wf0am3m";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5fb70c9f56a58b5c7a2e8b69b191aa2fc7c9bcc8/recipes/pfuture";
           sha256 = "15fr9wkpv8v1p22wz7hsyihq7f807ck105c2crfs8y7capfvs53s";
-          name = "pfuture";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -29661,8 +37150,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    ph = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ph = callPackage ({ emacs
+                      , fetchFromGitHub
+                      , fetchurl
+                      , lib
+                      , melpaBuild }:
+      melpaBuild {
         pname = "ph";
         version = "0.1.0";
         src = fetchFromGitHub {
@@ -29671,10 +37164,10 @@
           rev = "ed45c371642e313810b56c45af08fdfbd71a7dfe";
           sha256 = "1qxsc5wyk8l9gkgmqy3mzwxdhji1ljqw9s1jfxkax7fyv4d1v31p";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f62ca074ca2df780ab32aac50b2b828ee6a9934c/recipes/ph";
           sha256 = "0azx4cpfdn01yrqyn0q1gg9z7w0h0rn7zl39v3dx6yidd76ysh0l";
-          name = "ph";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -29682,20 +37175,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    phan = callPackage ({ composer, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    phan = callPackage ({ composer
+                        , emacs
+                        , f
+                        , fetchFromGitHub
+                        , fetchurl
+                        , lib
+                        , melpaBuild }:
+      melpaBuild {
         pname = "phan";
-        version = "0.0.3";
+        version = "0.0.4";
         src = fetchFromGitHub {
           owner = "emacs-php";
           repo = "phan.el";
-          rev = "17b44a62580272bcf5ee91fb58098292e9de6f83";
-          sha256 = "002qak8jlim6pjj3ckikzzcc6n40mcqd5qvzakazi1q01z1ffsnd";
+          rev = "6b077b3421a0b2c0b98a6906b8ab0d14d9d7bf50";
+          sha256 = "1af4pam149dgxqzwqkjklxxqq2n8fg3l1b9w6bmaw24lx1pdxcyv";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/eb13cb0dba1696cc51132cd1ff723fa17f892a7c/recipes/phan";
           sha256 = "17ar6nxy0plx5li49kgf4f0h99wwmnnp5kwmpf34jg9ygyhaglvb";
-          name = "phan";
+          name = "recipe";
         };
         packageRequires = [ composer emacs f ];
         meta = {
@@ -29703,8 +37202,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    phi-search = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    phi-search = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "phi-search";
         version = "20160630";
         src = fetchFromGitHub {
@@ -29713,10 +37215,10 @@
           rev = "40b86bfe9ae15377fbee842b1de3d93c2eb7dd69";
           sha256 = "10kyq3lkhmbmj1hl9awzc0w8073dn9mbjd5skh660ljg5mmi6x62";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2f0274300c33f19ca6f868e1d570ffee513dbdf7/recipes/phi-search";
           sha256 = "0nj06ixl76dd80zg83q4bi8k224mcwb612mr4gd1xppj5k8xl03g";
-          name = "phi-search";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -29724,8 +37226,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    phi-search-mc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, multiple-cursors, phi-search }:
-    melpaBuild {
+    phi-search-mc = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild
+                                 , multiple-cursors
+                                 , phi-search }:
+      melpaBuild {
         pname = "phi-search-mc";
         version = "2.2.1";
         src = fetchFromGitHub {
@@ -29734,10 +37241,10 @@
           rev = "4c6d2d39feb502febb81fc98b7b5854d88150c69";
           sha256 = "0r6cl1ng41s6wsy5syjlkaip0mp8h491diipdc1psbhnpk4vabsv";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/83cf3fa3736eb2583dcf6bca16b9acb89e3408a3/recipes/phi-search-mc";
           sha256 = "07hd80rbyzr5n3yd7hv1j51nl6pvcxmln20g6xvw8gh5yfl9k0m8";
-          name = "phi-search-mc";
+          name = "recipe";
         };
         packageRequires = [ multiple-cursors phi-search ];
         meta = {
@@ -29745,20 +37252,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    php-auto-yasnippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, php-mode, yasnippet }:
-    melpaBuild {
+    php-auto-yasnippets = callPackage ({ fetchFromGitHub
+                                       , fetchurl
+                                       , lib
+                                       , melpaBuild
+                                       , php-mode
+                                       , yasnippet }:
+      melpaBuild {
         pname = "php-auto-yasnippets";
         version = "2.3.1";
         src = fetchFromGitHub {
-          owner = "ejmr";
+          owner = "emacs-php";
           repo = "php-auto-yasnippets";
           rev = "1950d83cbcc5c5d62cd3bc432e1595870fe8cabf";
           sha256 = "0zs11811kx6x1zgc1icd8gw420saa7z6zshpzmrddnbznya4qql6";
         };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/d47ca8cd5900a80a2ede1b354547addf9b2bbbac/recipes/php-auto-yasnippets";
-          sha256 = "1hhddvpc80b6wvjpbpibsf24rp5a5p45m0bg7m0c8mx181h9mqgn";
-          name = "php-auto-yasnippets";
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/28b2d8802f98e339ff01ecf9733b71b6c631123e/recipes/php-auto-yasnippets";
+          sha256 = "047i51ks2nn7ydrx2hjx9qvsh3lxnyxp8a6c3h3nb1acy84f5bd1";
+          name = "recipe";
         };
         packageRequires = [ php-mode yasnippet ];
         meta = {
@@ -29766,20 +37278,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    php-cs-fixer = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    php-cs-fixer = callPackage ({ cl-lib ? null
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "php-cs-fixer";
-        version = "1.0beta4";
+        version = "1.0.-2.4";
         src = fetchFromGitHub {
           owner = "OVYA";
           repo = "php-cs-fixer";
-          rev = "ca2c075a22ad156c336d2aa093fb6394c9f6c112";
-          sha256 = "1axjfsfasg7xyq5ax2bx7rh2mgf8caw5bh858hhp1gk9xvi21qhx";
+          rev = "2e28b82d192c6f420ecb8cbef04256f3c9c47c4b";
+          sha256 = "1lh37z4z09nz4wfp8ly94dwrmjsqpg6phw5r8y4gjhfnfbgpq4b9";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a3631c4b81c1784995ae9e74d832e301d79214e2/recipes/php-cs-fixer";
           sha256 = "1xvz6v1fwngi2rizrx5sf0wrs4cy8rb13467r26k8hb7z8h1rqmf";
-          name = "php-cs-fixer";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -29787,20 +37303,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    php-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    php-mode = callPackage ({ cl-lib ? null
+                            , emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "php-mode";
-        version = "1.19.0";
+        version = "1.19.1";
         src = fetchFromGitHub {
           owner = "ejmr";
           repo = "php-mode";
-          rev = "c68013a583e2f0bd0792e0988ff9ce3e6deae531";
-          sha256 = "0ycqf8fr3f4flgww9ffiga2hkj8l6ikcdj93iafp7qxqs1bzjxfl";
+          rev = "aacb133b3d89ed0da8d936a162f49afc2aa5dfd4";
+          sha256 = "1al6l37377psiykk6syyyc3sfifr7x3mqyb2rms5kqqkff53x1yx";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7cdbc35fee67b87b87ec72aa00e6dca77aef17c4/recipes/php-mode";
           sha256 = "1lc4d3fgxhanqr3b8zr99z0la6cpzs2rksj806lnsfw38klvi89y";
-          name = "php-mode";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -29808,8 +37329,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    php-runtime = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    php-runtime = callPackage ({ cl-lib ? null
+                               , emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "php-runtime";
         version = "0.1.0";
         src = fetchFromGitHub {
@@ -29818,10 +37344,10 @@
           rev = "fa4312863245511462b75cb31df2f8558288f4df";
           sha256 = "1glwy0cgnn0z4rnd45pqy0bmyaddhxfjlj778hz7ghy40h9kqbdn";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/615c9ac208d8c20082a8ac83e49e93d99e2cbc89/recipes/php-runtime";
           sha256 = "0dvnwajrjsgyqzglzpkx9vwx3f55mrag6dsbdjqc9vvpvxhmgfwb";
-          name = "php-runtime";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -29829,8 +37355,38 @@
           license = lib.licenses.free;
         };
       }) {};
-    phpcbf = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    phpactor = callPackage ({ cl-lib ? null
+                            , emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
+        pname = "phpactor";
+        version = "0.0.2";
+        src = fetchFromGitHub {
+          owner = "emacs-php";
+          repo = "phpactor.el";
+          rev = "fc301e6388332bb23162adaff2c59bb9214d66a4";
+          sha256 = "1iy7pqs2p2h98kr4blnif577qbbyp7ldyrl20g6515k9g888fxab";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/d67b98ecd541c227c011615f67d7a0890f5e1af3/recipes/phpactor";
+          sha256 = "0w2iszi74y3s6rcn6p2ic545cg319y4jpy83npbh5m98y8jma84m";
+          name = "recipe";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/phpactor";
+          license = lib.licenses.free;
+        };
+      }) {};
+    phpcbf = callPackage ({ fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild
+                          , s }:
+      melpaBuild {
         pname = "phpcbf";
         version = "0.9.2";
         src = fetchFromGitHub {
@@ -29839,10 +37395,10 @@
           rev = "b556b548ceb061b002389d6165d2cc63d8bddb5d";
           sha256 = "09rinyx0621d7613xmbyvrrlav6d4ia332wkgg0m9dn265g3h56z";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/77ef54e3fb2715a081786dc54f99ae74def5c77c/recipes/phpcbf";
           sha256 = "1hf88ys4grffpqgavrbc72dn3m7crafgid2ygzx9c5j55syh8mfv";
-          name = "phpcbf";
+          name = "recipe";
         };
         packageRequires = [ s ];
         meta = {
@@ -29850,8 +37406,41 @@
           license = lib.licenses.free;
         };
       }) {};
-    phpunit = callPackage ({ cl-lib ? null, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, s }:
-    melpaBuild {
+    phpstan = callPackage ({ emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
+        pname = "phpstan";
+        version = "0.2.1";
+        src = fetchFromGitHub {
+          owner = "emacs-php";
+          repo = "phpstan.el";
+          rev = "3653f2a316f4199cbd3238e984eea2325e2618d5";
+          sha256 = "1dyba8hpr16nsdv1i45pl3w97728w7p8vl9gf5gvd18xcll4848d";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/5a2b6cc39957e6d7185bd2bdfa3755e5b1f474a6/recipes/phpstan";
+          sha256 = "0j3xb3h6fqgk0nv5mlfz7lgfkcy0z04an9qy8nq5y473hdj87qzm";
+          name = "recipe";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/phpstan";
+          license = lib.licenses.free;
+        };
+      }) {};
+    phpunit = callPackage ({ cl-lib ? null
+                           , emacs
+                           , f
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild
+                           , pkg-info
+                           , s }:
+      melpaBuild {
         pname = "phpunit";
         version = "0.16.0";
         src = fetchFromGitHub {
@@ -29860,10 +37449,10 @@
           rev = "a13706733f98be3639c47311fc820b3b50f4bc33";
           sha256 = "0vfvybjinj0knim4ax0xspz7zr3n2y9ap1lvwqx1gwydr06w4jrl";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0670b42c0c998daa7bf01080757976ac3589ec06/recipes/phpunit";
           sha256 = "0nj8ss1yjkcqnbnn4jgbp0403ljjk2xhipzikdrl3dbxlf14i4f8";
-          name = "phpunit";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs f pkg-info s ];
         meta = {
@@ -29871,8 +37460,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    pillar = callPackage ({ fetchFromGitHub, fetchurl, lib, makey, melpaBuild }:
-    melpaBuild {
+    pillar = callPackage ({ fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , makey
+                          , melpaBuild }:
+      melpaBuild {
         pname = "pillar";
         version = "1.0.0";
         src = fetchFromGitHub {
@@ -29881,10 +37474,10 @@
           rev = "13a7f676544cc66005ccd8e6fc1c25e4ccd6f909";
           sha256 = "19i8hgzr7kdj4skf0cnv6vlsklq9qcyxcv3p33k9vgq7y4f9mah8";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bff55f1182f3bd0bc8a8773921f703168d87de21/recipes/pillar";
           sha256 = "1lklky3shyvm1iygp621hbldpx37m0a9vd5l6mxs4y60ksj6z0js";
-          name = "pillar";
+          name = "recipe";
         };
         packageRequires = [ makey ];
         meta = {
@@ -29892,8 +37485,36 @@
           license = lib.licenses.free;
         };
       }) {};
-    pinyin-search = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    pinboard-popular = callPackage ({ fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , loop
+                                    , melpaBuild }:
+      melpaBuild {
+        pname = "pinboard-popular";
+        version = "0.1.2";
+        src = fetchFromGitHub {
+          owner = "asimpson";
+          repo = "pinboard-popular";
+          rev = "df6f5928f1e5a614fb770f6f4b9aefe0bf4d1c25";
+          sha256 = "1x3qaqj81w1wblkd4rd1b7nggmgnf6jahh3zh2p6nlr200fg52lq";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/094f63e451622571aac832b14221a0d5a96de9c5/recipes/pinboard-popular";
+          sha256 = "0d9ng4mclnb9yfzh8wzz03fbhfxayns0dg31bdixkwvy2vk00rkf";
+          name = "recipe";
+        };
+        packageRequires = [ loop ];
+        meta = {
+          homepage = "https://melpa.org/#/pinboard-popular";
+          license = lib.licenses.free;
+        };
+      }) {};
+    pinyin-search = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "pinyin-search";
         version = "1.1.0";
         src = fetchFromGitHub {
@@ -29902,10 +37523,10 @@
           rev = "5895cccfa6b43263ee243c5642cc16dd9a69fb4e";
           sha256 = "12jhdkgfck2a6d5jj65l9d98dm34gsyi0ya4h21dbbvz35zivz70";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/03da6f02778f7fae77a00cdc420cfbafead6dec4/recipes/pinyin-search";
           sha256 = "1si693nmmxgg0kp5mxvj5nq946kfc5cv3wfsl4znbqzps8qb2b7z";
-          name = "pinyin-search";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -29913,8 +37534,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    pinyinlib = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    pinyinlib = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "pinyinlib";
         version = "0.1.1";
         src = fetchFromGitHub {
@@ -29923,10 +37547,10 @@
           rev = "39943d226c2a42a9013421a0b4b6d5d3696bf234";
           sha256 = "1nwj4c3y0kdlkf3jqd2dnibaiazrq6qcj533xk2qw4wmx072yij0";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f4aa27985dcfaf24f1863667b89e13df4710546f/recipes/pinyinlib";
           sha256 = "0kv67qa3825fw64qimkph2b65pilrsx5730y4c7f7c1f8giz5vxr";
-          name = "pinyinlib";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -29934,8 +37558,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    pip-requirements = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    pip-requirements = callPackage ({ dash
+                                    , fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "pip-requirements";
         version = "0.5";
         src = fetchFromGitHub {
@@ -29944,10 +37572,10 @@
           rev = "93e0595f037e3a95c1c1cd6f00f7e052a9a25912";
           sha256 = "016r7y5nfnx6iws3hq4xnyrcv00y6zmd453psxhivi896wb8szfq";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5eaf6987f92070ccc33d3e28c6bb2b96f72ba1aa/recipes/pip-requirements";
           sha256 = "1wsjfyqga7pzp8gsm5x53qrkn40srairbjpifyrqbi2fpzmwhrnz";
-          name = "pip-requirements";
+          name = "recipe";
         };
         packageRequires = [ dash ];
         meta = {
@@ -29955,8 +37583,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    pixiv-novel-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    pixiv-novel-mode = callPackage ({ fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "pixiv-novel-mode";
         version = "0.0.3";
         src = fetchFromGitHub {
@@ -29965,10 +37596,10 @@
           rev = "4dd9caf749190fab8f0b33862b3894b635de46c5";
           sha256 = "1wg8pcwd70ixn2bxh01934zl12ry4pgx3l9dccpbjdi40gira00d";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/92092c1c13c37520f98b952d40745aa062f062c1/recipes/pixiv-novel-mode";
           sha256 = "0f1rxvf9nrw984122i6dzsgik9axfjv6yscmg203s065n9lz17px";
-          name = "pixiv-novel-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -29976,8 +37607,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    pkg-info = callPackage ({ epl, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    pkg-info = callPackage ({ epl
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "pkg-info";
         version = "0.6";
         src = fetchFromGitHub {
@@ -29986,10 +37621,10 @@
           rev = "f9bb471ee95d1c5fe9adc6b0e98db2ddff3ddc0e";
           sha256 = "0nk12dcppdyhav6m6yf7abpywyd7amxd4237zsfd32w4zxsx39k1";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/pkg-info";
           sha256 = "1k23hmpcq534060qcxbrv4g6bw9nzcbjg192mbdp20kwidw7p81n";
-          name = "pkg-info";
+          name = "recipe";
         };
         packageRequires = [ epl ];
         meta = {
@@ -29997,8 +37632,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    pkgbuild-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    pkgbuild-mode = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "pkgbuild-mode";
         version = "0.14";
         src = fetchFromGitHub {
@@ -30007,10 +37645,10 @@
           rev = "6bb7cb3b0599ac0ae3c1d8d5014aefc1ecff7965";
           sha256 = "0a8qb1ldk6bjs7fpxgxrf90md7q46fhl71gmay8yafdkh6hn0kqr";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ca7bf43ef8893bf04e9658390e306ef69e80a156/recipes/pkgbuild-mode";
           sha256 = "1lp7frjahcpr4xnzxz77qj5hbpxbxm2g28apkixrnc1xjha66v3x";
-          name = "pkgbuild-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -30018,20 +37656,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    plain-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    plain-theme = callPackage ({ emacs
+                               , fetchFromGitLab
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "plain-theme";
         version = "8";
-        src = fetchFromGitHub {
+        src = fetchFromGitLab {
           owner = "yegortimoshenko";
           repo = "plain-theme";
           rev = "2609a811335d58cfb73a65d6307c156fe09037d3";
           sha256 = "0g5vl4xigdm2pn2mnkwgj1kxdjr66w7ynr77bchy3ij6qvzdzkqd";
         };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/d7ad3737f081f101500317f7e183be6b1e7e8122/recipes/plain-theme";
-          sha256 = "0igncivhnzzirglmz451czx69cwshjkigqvqddj0a77b1cwszfw8";
-          name = "plain-theme";
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/b147fb05a1b4296e1b85d31ba018d132a5bb5ed2/recipes/plain-theme";
+          sha256 = "10qq7cy6hqh6c8qi796y9lk4wyyjbhdn1pvkcw3g29cfh857x50m";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -30039,8 +37681,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    plantuml-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    plantuml-mode = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "plantuml-mode";
         version = "1.2.5";
         src = fetchFromGitHub {
@@ -30049,10 +37694,10 @@
           rev = "5a2e8d0dd2ba9286fc3c82d8689d25050290f68d";
           sha256 = "1gcv5gmps371wd2sjbq4g5p2yj2ip8lpn81lypwb5xavqa7gjhlv";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/38e74bb9923044323f34473a5b13867fe39bed25/recipes/plantuml-mode";
           sha256 = "03srbg34512vxcqn95q4r7h2aqbqq0sd5c9ffnbx2a75vsblqc6h";
-          name = "plantuml-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -30060,8 +37705,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    platformio-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }:
-    melpaBuild {
+    platformio-mode = callPackage ({ fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild
+                                   , projectile }:
+      melpaBuild {
         pname = "platformio-mode";
         version = "0.2.2";
         src = fetchFromGitHub {
@@ -30070,10 +37719,10 @@
           rev = "470a80c1d764a6e1680a2b41ca5a847869a07a27";
           sha256 = "1nznbkl06cdq4pyqmvkp9jynsjibn0fd6ai4mggz6ggcwzcixbf0";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/platformio-mode";
           sha256 = "1v1pp3365wj19a5wmsxyyy5n548z3lmcbm2pwl914wip3ca7546f";
-          name = "platformio-mode";
+          name = "recipe";
         };
         packageRequires = [ projectile ];
         meta = {
@@ -30081,8 +37730,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    play-crystal = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }:
-    melpaBuild {
+    play-crystal = callPackage ({ dash
+                                , emacs
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild
+                                , request }:
+      melpaBuild {
         pname = "play-crystal";
         version = "0.1.2";
         src = fetchFromGitHub {
@@ -30091,10 +37746,10 @@
           rev = "86b54346e7c832c14f8e5654a462f6490a6b11d7";
           sha256 = "0kvkr24f8r21pahm2lsvbr9bg53770wxwpdfmmjljs2zmgxf2c40";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/92715977136afa731e85e894542dc88b664b3304/recipes/play-crystal";
           sha256 = "1jqf36b1mhyf4j7fs386g6isy09q7k8zwdc4rb34mhjg1a56gcnf";
-          name = "play-crystal";
+          name = "recipe";
         };
         packageRequires = [ dash emacs request ];
         meta = {
@@ -30102,8 +37757,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    play-routes-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    play-routes-mode = callPackage ({ fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "play-routes-mode";
         version = "1.0";
         src = fetchFromGitHub {
@@ -30112,10 +37770,10 @@
           rev = "d7eb682cd474d90b3a3d005290cd6d4fe9f94cae";
           sha256 = "0slfaclbhjm5paw8l7rr3y9xxjyhkizp9lwyvlgpkd38n4pgj2bx";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/740cef8687232eb0e2186e8df956c2d4f39575cf/recipes/play-routes-mode";
           sha256 = "17phqil2zf5rfvhs5v743dh4lix4v2azbf33z9n97ahs7j66y2gz";
-          name = "play-routes-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -30123,8 +37781,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    plenv = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    plenv = callPackage ({ fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "plenv";
         version = "0.32";
         src = fetchFromGitHub {
@@ -30133,10 +37794,10 @@
           rev = "ee937d0f3a1a7ba2d035f45be896d3ed8fefaee2";
           sha256 = "11cbpgjsnw8fiqf1s12hbm9qxgjcw6y2zxx7wz4wg7idmi7m0b7g";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a0819979b9567ac5fab9ed6821eba8fe7ee6a299/recipes/plenv";
           sha256 = "0dw9fy5wd9wm76ag6yyw3f9jnlj7rcdcxgdjm30h514qfi9hxbw4";
-          name = "plenv";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -30144,8 +37805,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    plsense = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, lib, log4e, melpaBuild, yaxception }:
-    melpaBuild {
+    plsense = callPackage ({ auto-complete
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , log4e
+                           , melpaBuild
+                           , yaxception }:
+      melpaBuild {
         pname = "plsense";
         version = "0.4.7";
         src = fetchFromGitHub {
@@ -30154,10 +37821,10 @@
           rev = "f6fb22607a5252b2556d2e7fa14f1bcab5d9747a";
           sha256 = "0f00dv5jwbhs99j4jc6lvr5n0mv1y80yg7zpp6yrmhww6829l5rg";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fb1025f146514e9c142cd96cac9f2989d6d1a8c5/recipes/plsense";
           sha256 = "1ka06r4ashhjkfyzql9mfvs3gj7n684h4gaycj29w4nfqrhcw9va";
-          name = "plsense";
+          name = "recipe";
         };
         packageRequires = [ auto-complete log4e yaxception ];
         meta = {
@@ -30165,8 +37832,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    plsense-direx = callPackage ({ direx, fetchFromGitHub, fetchurl, lib, log4e, melpaBuild, plsense, yaxception }:
-    melpaBuild {
+    plsense-direx = callPackage ({ direx
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , log4e
+                                 , melpaBuild
+                                 , plsense
+                                 , yaxception }:
+      melpaBuild {
         pname = "plsense-direx";
         version = "0.2.0";
         src = fetchFromGitHub {
@@ -30175,10 +37849,10 @@
           rev = "8a2f465264c74e04524cc789cdad0190ace43f6c";
           sha256 = "0s34nbqqy6aqi113xj452pbmqp43046wfbfbbfv1xwhybgq0c1j1";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/65fb1d8b4ed12f097958842d1b00dcdf3660b184/recipes/plsense-direx";
           sha256 = "0qd4b7gkmn5ydadhp70995rap3643s1aa8gfi5izgllzhg0i864j";
-          name = "plsense-direx";
+          name = "recipe";
         };
         packageRequires = [ direx log4e plsense yaxception ];
         meta = {
@@ -30186,8 +37860,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    plur = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    plur = callPackage ({ emacs
+                        , fetchFromGitHub
+                        , fetchurl
+                        , lib
+                        , melpaBuild }:
+      melpaBuild {
         pname = "plur";
         version = "0.1";
         src = fetchFromGitHub {
@@ -30196,10 +37874,10 @@
           rev = "5bdd3b9a2f0624414bd596e798644713cd1545f0";
           sha256 = "0qlxj19hj96l4lw81xh5r14ppf6kp63clikk060s9yw00q7gnl6a";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/38f6f53fcd1186efd5e6752166da4e23b712cdb1/recipes/plur";
           sha256 = "0nf1dc7xf2zp316rssnz8sv374akcr54hp0rb219qvgyck9bdqiv";
-          name = "plur";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -30207,18 +37885,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    po-mode = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
+    po-mode = callPackage ({ fetchgit
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "po-mode";
         version = "0.19.8.1";
         src = fetchgit {
           url = "https://git.savannah.gnu.org/git/gettext.git";
-          rev = "c737bf843616ca984c9416048a2da845e9ad3f50";
-          sha256 = "0hlvnq3cigpb8f4yxy2llcmmn0b38prlb1awwy6zl5fwwi9ksrwk";
+          rev = "7fa0c2779d7de8a263271abfbe684185dbf6898b";
+          sha256 = "1w154dzp98kjqsid4g0jq7cnpm4mivgffgjks6gr89dssq9qc3yh";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/po-mode";
           sha256 = "0km19n87iqd6m6n23h46b6225zyvava9jbx6b8frna3sjwb4ls7w";
-          name = "po-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -30226,8 +37908,48 @@
           license = lib.licenses.free;
         };
       }) {};
-    pocket-reader = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, kv, lib, melpaBuild, org-web-tools, ov, pocket-lib, rainbow-identifiers, s }:
-    melpaBuild {
+    pocket-lib = callPackage ({ dash
+                              , emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , kv
+                              , lib
+                              , melpaBuild
+                              , request
+                              , s }:
+      melpaBuild {
+        pname = "pocket-lib";
+        version = "0.1";
+        src = fetchFromGitHub {
+          owner = "alphapapa";
+          repo = "pocket-lib.el";
+          rev = "ef3bcf452129b74e7b82265f6c08f9569fd19515";
+          sha256 = "0r2y6idzwkvaclsnaskdlzk9afvxnm9kkyy8y38cfwany3kbmyzj";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/71f17ce28f4fc8c2c100848be8aec15526ef8697/recipes/pocket-lib";
+          sha256 = "0v619blifmvm36dr773wjf35fjji4dj3pyck9nkz0m8zmpz0fg78";
+          name = "recipe";
+        };
+        packageRequires = [ dash emacs kv request s ];
+        meta = {
+          homepage = "https://melpa.org/#/pocket-lib";
+          license = lib.licenses.free;
+        };
+      }) {};
+    pocket-reader = callPackage ({ dash
+                                 , emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , kv
+                                 , lib
+                                 , melpaBuild
+                                 , org-web-tools
+                                 , ov
+                                 , pocket-lib
+                                 , rainbow-identifiers
+                                 , s }:
+      melpaBuild {
         pname = "pocket-reader";
         version = "0.1.1";
         src = fetchFromGitHub {
@@ -30236,10 +37958,10 @@
           rev = "e65a7e7529ece4fb7a738c062e73d5c07ace9574";
           sha256 = "0bqxsvhmwvf0gpjmmh7pmzyw4lpcarj2prm52bgncch8x1f0gvnp";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/835a7bf2f72987183e9d15ada7ae747fb5715c11/recipes/pocket-reader";
           sha256 = "0gcgmz4mhjgvqbh2gmv8v09sy80cnfccjym455m0fbl31b8dczhf";
-          name = "pocket-reader";
+          name = "recipe";
         };
         packageRequires = [
           dash
@@ -30256,20 +37978,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    point-pos = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    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";
+          rev = "f4126b64567a81e7f22058f09d56c63b2ff06632";
+          sha256 = "1sbwz9kxvnd5r24q9x6bhcjajjnm2z8q6khgqs4gl4ycs60kn0s6";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/23a1e835155fba51f595c10c46487a4c269f43ff/recipes/point-pos";
           sha256 = "1zv6hx8i8jwq52j4la1ff0ar0bpbs2pb4gcsh9hypghba11gnync";
-          name = "point-pos";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -30277,20 +38002,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    pomidor = callPackage ({ alert, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    pomidor = callPackage ({ alert
+                           , emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "pomidor";
         version = "0.2";
         src = fetchFromGitHub {
           owner = "TatriX";
           repo = "pomidor";
-          rev = "5780ce2aaa98882a79e92f5eefaaf10fd8dbee3a";
+          rev = "3f9186e4dc8fe8bf06b8f2ac9c68ecd8aafb4a65";
           sha256 = "19bz3pg3s265wpcwb458i84138z170rgd1qybn6vrll2brvwsf8b";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4e0d4f313081594df23f357c40feb456847d8bd0/recipes/pomidor";
           sha256 = "0pdzipyza98dhnz6am8lrmz8fh3p1c21v2mhs56fb9lwyvcgv8fi";
-          name = "pomidor";
+          name = "recipe";
         };
         packageRequires = [ alert emacs ];
         meta = {
@@ -30298,8 +38028,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    pony-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
-    melpaBuild {
+    pony-snippets = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild
+                                 , yasnippet }:
+      melpaBuild {
         pname = "pony-snippets";
         version = "0.0.1";
         src = fetchFromGitHub {
@@ -30308,10 +38042,10 @@
           rev = "56018b23a11563c6766ed706024b22aa5a4556b4";
           sha256 = "0xjvxfkrl6wl31s7rvbv9zczn6d6i9vf20waqlr3c2ff3zy55ygy";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/pony-snippets";
           sha256 = "12ygvpfkzldq6s4mwbrxs4x9927i7pa7ywn7lf1r3gg4h29ar9gn";
-          name = "pony-snippets";
+          name = "recipe";
         };
         packageRequires = [ yasnippet ];
         meta = {
@@ -30319,8 +38053,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    ponylang-mode = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ponylang-mode = callPackage ({ dash
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "ponylang-mode";
         version = "0.0.9";
         src = fetchFromGitHub {
@@ -30329,10 +38067,10 @@
           rev = "38786ba7f9f5709d511e27b85028b2dc6aff532d";
           sha256 = "0cr22scxk3y2qdlhhfvwf4fkk2ql1c0r73fxzhw64dhwm4q01pih";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7d51adec3c6519d6ffe9b3f7f8a86b4dbc2c9817/recipes/ponylang-mode";
           sha256 = "02fq0qp7f4bzmynzszrwskfs78nzsmf413qjxqndrh3hamixzpi1";
-          name = "ponylang-mode";
+          name = "recipe";
         };
         packageRequires = [ dash ];
         meta = {
@@ -30340,8 +38078,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    pophint = callPackage ({ fetchFromGitHub, fetchurl, lib, log4e, melpaBuild, popup, yaxception }:
-    melpaBuild {
+    pophint = callPackage ({ fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , log4e
+                           , melpaBuild
+                           , popup
+                           , yaxception }:
+      melpaBuild {
         pname = "pophint";
         version = "0.9.3";
         src = fetchFromGitHub {
@@ -30350,10 +38094,10 @@
           rev = "28dc6a76e726f371bcca3160c27ae2017324399c";
           sha256 = "18i0kivn6prh5pwdr7b4pxfxqsc8l4mks1h6cfs7iwnfn15g5k19";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0055c2887acbbd8a2803bf3f81ac2cc444cc805a/recipes/pophint";
           sha256 = "1chq2j79hg095jxw5z3pz4qicqrccw0gj4sxrin0a55hnprzzp72";
-          name = "pophint";
+          name = "recipe";
         };
         packageRequires = [ log4e popup yaxception ];
         meta = {
@@ -30361,8 +38105,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    popup = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    popup = callPackage ({ cl-lib ? null
+                         , fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "popup";
         version = "0.5.3";
         src = fetchFromGitHub {
@@ -30371,10 +38119,10 @@
           rev = "46632ab9652dacad56fd961cd6def25a015170ae";
           sha256 = "1y538siabcf1n00wr4iz5gbxfndw661kx2mn9w1g4lg7yi4n0h0h";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/083fb071191bccd6feb3fb84569373a597440fb1/recipes/popup";
           sha256 = "151g00h9rkid76qf6c53n8bncsfaikmhj8fqcb3r3a6mbngcd5k2";
-          name = "popup";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -30382,8 +38130,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    popup-complete = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, popup }:
-    melpaBuild {
+    popup-complete = callPackage ({ fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild
+                                  , popup }:
+      melpaBuild {
         pname = "popup-complete";
         version = "0.2";
         src = fetchFromGitHub {
@@ -30392,10 +38144,10 @@
           rev = "e362d4a005b36646ffbaa6be604e9e31bc406ca9";
           sha256 = "084hb3zn1aiabbyxgaalszb2qjf9z64z960ks5fvz8nh7n6y7ny4";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b43b85f90c476a3b88f94927a7db90bdc72cd171/recipes/popup-complete";
           sha256 = "04bpm31zx87j390r2xi1yl4kyqgalmyqc48xarsm67zfww9fw9c1";
-          name = "popup-complete";
+          name = "recipe";
         };
         packageRequires = [ popup ];
         meta = {
@@ -30403,8 +38155,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    popup-imenu = callPackage ({ dash, fetchFromGitHub, fetchurl, flx-ido, lib, melpaBuild, popup }:
-    melpaBuild {
+    popup-imenu = callPackage ({ dash
+                               , fetchFromGitHub
+                               , fetchurl
+                               , flx-ido
+                               , lib
+                               , melpaBuild
+                               , popup }:
+      melpaBuild {
         pname = "popup-imenu";
         version = "0.6";
         src = fetchFromGitHub {
@@ -30413,10 +38171,10 @@
           rev = "c5e2e69adbd3a630e4cb750965a1aee8c10c1f09";
           sha256 = "0vn0jli0ya7xnapifkgzynbnh3rpnzb82j5k9bla2j4miqfc6cg8";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5ca5d65d6a9c7ef3fa2684271fe087dc132d3a61/recipes/popup-imenu";
           sha256 = "0lxwfaa9vhdn55dj3idp8c3fg1g26qsqq46y5bimfd0s89bjbaxn";
-          name = "popup-imenu";
+          name = "recipe";
         };
         packageRequires = [ dash flx-ido popup ];
         meta = {
@@ -30424,8 +38182,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    popwin = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    popwin = callPackage ({ fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "popwin";
         version = "1.0.0";
         src = fetchFromGitHub {
@@ -30434,10 +38195,10 @@
           rev = "95dea14c60019d6cccf9a3b33e0dec4e1f22c304";
           sha256 = "0nips9npm4zmz3f37vvb4s0g1ci0p9cl6w0z4sc6agg4rybjhpdp";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2b3d6a8b734e0820fd904c215a83fe5519496dc3/recipes/popwin";
           sha256 = "1zp54nv8rh0b3g8y5aj4793miiw2r1ijwbzq31lkwmbdr09mixmf";
-          name = "popwin";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -30445,8 +38206,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    pos-tip = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    pos-tip = callPackage ({ fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "pos-tip";
         version = "0.4.6";
         src = fetchFromGitHub {
@@ -30455,10 +38219,10 @@
           rev = "1b81694d1dc29253db0e855b82563f84a32b38d4";
           sha256 = "0w8bnspnk871qndp18hs0wk4x9x31xr9rwbvf5dc8mcbnj29ch33";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/306e9978d2a071548cc9d8c531a1ce6c6c6b99aa/recipes/pos-tip";
           sha256 = "13qjz112qlrnq34lr70087gshzq8m44knfl6694hfprzjgix84vh";
-          name = "pos-tip";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -30466,8 +38230,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    powerline = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    powerline = callPackage ({ cl-lib ? null
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "powerline";
         version = "2.4";
         src = fetchFromGitHub {
@@ -30476,10 +38244,10 @@
           rev = "d3dcfc57a36111d8e0b037d90c6ffce85ce071b2";
           sha256 = "1hp3xp18943n0rlggz55150020ivw8gvi1vyxkr4z8xhpwq4gaar";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f805053cd4dd9ed53ee0df17ad69429bc62325bb/recipes/powerline";
           sha256 = "0gsffr6ilmckrzifsmhwd42vr85vs42pc26f1205pbxb7ma34dhx";
-          name = "powerline";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -30487,20 +38255,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    powershell = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    powershell = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "powershell";
         version = "0.1";
         src = fetchFromGitHub {
           owner = "jschaf";
           repo = "powershell.el";
-          rev = "7316f44d0b528552f5a0692f778e5f0efd964299";
-          sha256 = "010b151wblgxlfpy590yanbl2r8qhpbqgi02v0pyir340frm9ngn";
+          rev = "4865dff0d20a8b36569f7f5d2634a7e27e8f3a65";
+          sha256 = "1zqsnyfkxvaagrasxm86pxyv6qz9h3149p3k61nq1095b9c3sgqf";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7002c50f2734675134791916aa9d8b82b4582fcb/recipes/powershell";
           sha256 = "162k8y9k2n48whaq93sqk86zy3p9qvsfxgyfv9n1nvk4l5wn70wk";
-          name = "powershell";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -30508,8 +38279,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    ppd-sr-speedbar = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, project-persist-drawer, sr-speedbar }:
-    melpaBuild {
+    ppd-sr-speedbar = callPackage ({ fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild
+                                   , project-persist-drawer
+                                   , sr-speedbar }:
+      melpaBuild {
         pname = "ppd-sr-speedbar";
         version = "0.0.6";
         src = fetchFromGitHub {
@@ -30518,10 +38294,10 @@
           rev = "19d3e924407f40a6bb38c8fe427a159af755adce";
           sha256 = "0pv671j8g09pn61kkfb3pa9axfa9zd2jdrkgr81rm2gqb2vh1hsq";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f930f54048d06f6a97824b66fbb74649eed40b54/recipes/ppd-sr-speedbar";
           sha256 = "1m2918hqvb9c6rgb5szs95ds99gdjdxggcbdfqzmbb5sz2936av8";
-          name = "ppd-sr-speedbar";
+          name = "recipe";
         };
         packageRequires = [ project-persist-drawer sr-speedbar ];
         meta = {
@@ -30529,8 +38305,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    prassee-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    prassee-theme = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "prassee-theme";
         version = "1.0";
         src = fetchFromGitHub {
@@ -30539,10 +38318,10 @@
           rev = "9850c806d39acffdef8e91e1a31b54a7620cbae3";
           sha256 = "1agghimrmh4kh71y51l6lzampjl15ac6jxrrhdviw95c3rxfll4x";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/15425b576045af1c508912e2091daf475b80b429/recipes/prassee-theme";
           sha256 = "1j0817hxxri6mq9pplgwf5jp2dagk6hay7g1a1lgz4qgkf5jnshs";
-          name = "prassee-theme";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -30550,8 +38329,62 @@
           license = lib.licenses.free;
         };
       }) {};
-    pretty-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    prescient = callPackage ({ emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
+        pname = "prescient";
+        version = "2.0";
+        src = fetchFromGitHub {
+          owner = "raxod502";
+          repo = "prescient.el";
+          rev = "515959a2523b43608c9d06dcf8adde8911ce42b9";
+          sha256 = "1k8xk154sql3b2b7hpyxslcgl88aaxq5ak2sr760jsq2qk7878bw";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/ec02349e31531c347e4a43fbde56ae4386898cc6/recipes/prescient";
+          sha256 = "04js3hblavfrc6kqp942x5yjdl3ndazf3n64p83423ldsmhbip6s";
+          name = "recipe";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/prescient";
+          license = lib.licenses.free;
+        };
+      }) {};
+    presentation = callPackage ({ cl-lib ? null
+                                , emacs
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
+        pname = "presentation";
+        version = "0.1.1";
+        src = fetchFromGitHub {
+          owner = "zonuexe";
+          repo = "emacs-presentation-mode";
+          rev = "e9e402d05a8b6d9e1e7fe853503c92fea4cf65cb";
+          sha256 = "10pvjdnb48fk663232qvh4gapk2yiz4iawpffzjrbs3amxh50bi7";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/747afd0339215528bf104f778a13edacbac510b7/recipes/presentation";
+          sha256 = "0zdpfvg6kbvi6b4lb7vbdjrkgk0j1q6gzyd0s2b0603fnyy4sqdg";
+          name = "recipe";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/presentation";
+          license = lib.licenses.free;
+        };
+      }) {};
+    pretty-mode = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "pretty-mode";
         version = "2.0.3";
         src = fetchFromGitHub {
@@ -30560,10 +38393,10 @@
           rev = "4ba8fceb7dd733361ed975d80ac2caa3612fa78b";
           sha256 = "013fig9i4fyx16krp2vfv953p3rwdzr38zs6i50af4pqz4vrcfvh";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4a2fe9feae4c1f007e51272a97917a63dcf6bbe5/recipes/pretty-mode";
           sha256 = "1zxi4nj7vnchiiz1ndx17b719a1wipiqniykzn4pa1w7dsnqg21f";
-          name = "pretty-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -30571,8 +38404,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    processing-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
-    melpaBuild {
+    processing-mode = callPackage ({ fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild
+                                   , yasnippet }:
+      melpaBuild {
         pname = "processing-mode";
         version = "1.0";
         src = fetchFromGitHub {
@@ -30581,10 +38418,10 @@
           rev = "228bc56369675787d60f637223b50ce3a1afebbd";
           sha256 = "08ljf39jfmfpdk36nws2dnwpm7y8252zsdprsc85hr1h1ig5xy15";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ba59561e8a2f259fde170a79844af5e1ef5ed34f/recipes/processing-mode";
           sha256 = "184yg9z14ighz9djg53ji5dgnb98dnxkkwx55m8f0f879x31i89m";
-          name = "processing-mode";
+          name = "recipe";
         };
         packageRequires = [ yasnippet ];
         meta = {
@@ -30592,8 +38429,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    processing-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    processing-snippets = callPackage ({ fetchFromGitHub
+                                       , fetchurl
+                                       , lib
+                                       , melpaBuild }:
+      melpaBuild {
         pname = "processing-snippets";
         version = "1.0";
         src = fetchFromGitHub {
@@ -30613,8 +38453,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    prodigy = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    prodigy = callPackage ({ dash
+                           , emacs
+                           , f
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild
+                           , s }:
+      melpaBuild {
         pname = "prodigy";
         version = "0.7.0";
         src = fetchFromGitHub {
@@ -30623,10 +38470,10 @@
           rev = "3bacca898db9b3493883c95f923a87eb1ce807eb";
           sha256 = "1whnk1902f8q03clm9xlfl47gkpsywf3mx0ykp70c1q496ab39qj";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/prodigy";
           sha256 = "0lfxb80jqjnzssjs6l511jcsmhkpzb5rh5czrb16dkqcz0cl5b2p";
-          name = "prodigy";
+          name = "recipe";
         };
         packageRequires = [ dash emacs f s ];
         meta = {
@@ -30634,8 +38481,41 @@
           license = lib.licenses.free;
         };
       }) {};
-    project-explorer = callPackage ({ cl-lib ? null, emacs, es-lib, es-windows, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    prog-fill = callPackage ({ cl-lib ? null
+                             , emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
+        pname = "prog-fill";
+        version = "1.0.0";
+        src = fetchFromGitHub {
+          owner = "ahungry";
+          repo = "prog-fill";
+          rev = "3fbf7da6dd826e95c9077d659566ee29814a31d8";
+          sha256 = "167is1hbv3nsskz26g9q3zdndqsw9d3rwhbasj0r7a3wabpr8j4r";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/90d680ed481688c9899adb28fbd9a22a17fa8943/recipes/prog-fill";
+          sha256 = "0wnqzkzhaywcyw93z86pngpycsrd1mi79psmck6qbhms1aia79p3";
+          name = "recipe";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/prog-fill";
+          license = lib.licenses.free;
+        };
+      }) {};
+    project-explorer = callPackage ({ cl-lib ? null
+                                    , emacs
+                                    , es-lib
+                                    , es-windows
+                                    , fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "project-explorer";
         version = "0.14.3";
         src = fetchFromGitHub {
@@ -30644,10 +38524,10 @@
           rev = "7c2cc86a81f679dda355110f916366b64893a5d4";
           sha256 = "1hv8ifrpwn434sm41vkgbwni21ma5kfybkwasi6zp0f2b5i9ziw7";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c2e5d686b8a18c7a17965ff6c5af8f5817b7ab31/recipes/project-explorer";
           sha256 = "076lzmyi1n7yrgdgyh9qinq271qk6k64x0msbzarihr3p4psrn8m";
-          name = "project-explorer";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs es-lib es-windows ];
         meta = {
@@ -30655,8 +38535,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    project-persist = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    project-persist = callPackage ({ fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "project-persist";
         version = "0.3.2";
         src = fetchFromGitHub {
@@ -30665,10 +38548,10 @@
           rev = "a4e5de1833edb60656d8a04357c527d34e81d27c";
           sha256 = "1x7hwda1w59b8hvzxyk996wdz6phs6rchh3f1ydf0ab6x7m7xvjr";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bd81d1f8a30ed951ed94b9a4db13a2f7735ea878/recipes/project-persist";
           sha256 = "0csjwj0qaw0hz2qrj8kxgxlixh2hi3aqib98vm19sr3f1b8qab24";
-          name = "project-persist";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -30676,8 +38559,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    project-persist-drawer = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, project-persist }:
-    melpaBuild {
+    project-persist-drawer = callPackage ({ fetchFromGitHub
+                                          , fetchurl
+                                          , lib
+                                          , melpaBuild
+                                          , project-persist }:
+      melpaBuild {
         pname = "project-persist-drawer";
         version = "0.0.4";
         src = fetchFromGitHub {
@@ -30686,10 +38573,10 @@
           rev = "35bbe132a4fab6a0fec15ce6c0fd2fe6a4aa9626";
           sha256 = "1nq320ph8fs9a197ji4mnw2xa24dld0r1nka476yvkg4azmcc9x8";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/23084af52d2243016eee73a5ee0cd3e945eec71d/recipes/project-persist-drawer";
           sha256 = "1jv2y2hcqakyvfibclzm7g4diw0bvsv3a8fa43yf19wb64jm8hdb";
-          name = "project-persist-drawer";
+          name = "recipe";
         };
         packageRequires = [ project-persist ];
         meta = {
@@ -30697,8 +38584,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    project-root = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    project-root = callPackage ({ fetchhg
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "project-root";
         version = "0.7";
         src = fetchhg {
@@ -30717,8 +38607,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    projectile = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }:
-    melpaBuild {
+    projectile = callPackage ({ dash
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild
+                              , pkg-info }:
+      melpaBuild {
         pname = "projectile";
         version = "0.14.0";
         src = fetchFromGitHub {
@@ -30727,10 +38622,10 @@
           rev = "19fb9fa6590e1dc49afc3c8c5bd69cff6cf743a7";
           sha256 = "1kp0y81csmjxwyrdbj60f89phw3gkg3hm5xp3k4fvymzsrxrhm9l";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ca7bf43ef8893bf04e9658390e306ef69e80a156/recipes/projectile";
           sha256 = "1kf8hql59nwiy13q0p6p6rf5agjvah43f0sflflfqsrxbihshvdn";
-          name = "projectile";
+          name = "recipe";
         };
         packageRequires = [ dash pkg-info ];
         meta = {
@@ -30738,20 +38633,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    projectile-git-autofetch = callPackage ({ alert, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }:
-    melpaBuild {
+    projectile-git-autofetch = callPackage ({ alert
+                                            , fetchFromGitHub
+                                            , fetchurl
+                                            , lib
+                                            , melpaBuild
+                                            , projectile }:
+      melpaBuild {
         pname = "projectile-git-autofetch";
-        version = "0.1.0";
+        version = "0.1.1";
         src = fetchFromGitHub {
           owner = "andrmuel";
           repo = "projectile-git-autofetch";
-          rev = "9692ed2a3935ee7b56e59af8b986e532839597dd";
-          sha256 = "0vg0d8alxzzzkk8s564wzbb71laj48gkpbpk3qnwj5hfk14jzaqv";
+          rev = "da02069d906e6e7f28ea1dd6a9196529315a5cba";
+          sha256 = "106kj49rxsrdh6awvql3zyr3ramdcn0aaq4rmbmd45hz9ij7x1wh";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fdfdeb69fd78fc1bb2c62392f860a8c434f1762/recipes/projectile-git-autofetch";
           sha256 = "0m0raddsw5yvjrw2v6bdaswffmva8y9hxksdgf9axpvrd3rzlk9n";
-          name = "projectile-git-autofetch";
+          name = "recipe";
         };
         packageRequires = [ alert projectile ];
         meta = {
@@ -30759,8 +38659,17 @@
           license = lib.licenses.free;
         };
       }) {};
-    projectile-rails = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, inf-ruby, inflections, lib, melpaBuild, projectile, rake }:
-    melpaBuild {
+    projectile-rails = callPackage ({ emacs
+                                    , f
+                                    , fetchFromGitHub
+                                    , fetchurl
+                                    , inf-ruby
+                                    , inflections
+                                    , lib
+                                    , melpaBuild
+                                    , projectile
+                                    , rake }:
+      melpaBuild {
         pname = "projectile-rails";
         version = "0.16.0";
         src = fetchFromGitHub {
@@ -30769,10 +38678,10 @@
           rev = "31c9f90d472e07cb8e49fa8992b187b67c9c9a71";
           sha256 = "0j38zbprkga3iq5wb77zvfa5r3sj3sqv8qh0ab62wm68qy60d6g3";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b16532bb8d08f7385bca4b83ab4e030d7b453524/recipes/projectile-rails";
           sha256 = "0fgvignqdqh0ma91z9385782l89mvwfn77rp1gmy8cbkwi3b7fkq";
-          name = "projectile-rails";
+          name = "recipe";
         };
         packageRequires = [ emacs f inf-ruby inflections projectile rake ];
         meta = {
@@ -30780,8 +38689,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    projectile-ripgrep = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, projectile, ripgrep }:
-    melpaBuild {
+    projectile-ripgrep = callPackage ({ fetchFromGitHub
+                                      , fetchurl
+                                      , lib
+                                      , melpaBuild
+                                      , projectile
+                                      , ripgrep }:
+      melpaBuild {
         pname = "projectile-ripgrep";
         version = "0.4.0";
         src = fetchFromGitHub {
@@ -30790,10 +38704,10 @@
           rev = "73595f1364f2117db49e1e4a49290bd6d430e345";
           sha256 = "1a5rdpmvsgsjlc9sywism9pq7jd6n9qbcdsvpbfkq1npwhpifkbj";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/195f340855b403128645b59c8adce1b45e90cd18/recipes/projectile-ripgrep";
           sha256 = "1iczizyayql40wcljvpc1mvfvn9r28b1dkrkcmdxif732gd01jjg";
-          name = "projectile-ripgrep";
+          name = "recipe";
         };
         packageRequires = [ projectile ripgrep ];
         meta = {
@@ -30801,8 +38715,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    projectile-sift = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, projectile, sift }:
-    melpaBuild {
+    projectile-sift = callPackage ({ fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild
+                                   , projectile
+                                   , sift }:
+      melpaBuild {
         pname = "projectile-sift";
         version = "0.2.0";
         src = fetchFromGitHub {
@@ -30811,10 +38730,10 @@
           rev = "8c3f3d14a351a2394027d72ee0599aa73b9f0d13";
           sha256 = "1ma6djvhvjai07v1g9a36lfa3nw8zsy6x5vliwcdnkf44gs287ra";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a730e1331b0486c4bd2d309b85d2f8810489eb47/recipes/projectile-sift";
           sha256 = "1wbgpwq9yy3v7hqidaczrvvsw5ajj7m3n4gsy3b169xv5h673a0i";
-          name = "projectile-sift";
+          name = "recipe";
         };
         packageRequires = [ projectile sift ];
         meta = {
@@ -30822,8 +38741,17 @@
           license = lib.licenses.free;
         };
       }) {};
-    projectile-trailblazer = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, inf-ruby, inflections, lib, melpaBuild, projectile, rake }:
-    melpaBuild {
+    projectile-trailblazer = callPackage ({ emacs
+                                          , f
+                                          , fetchFromGitHub
+                                          , fetchurl
+                                          , inf-ruby
+                                          , inflections
+                                          , lib
+                                          , melpaBuild
+                                          , projectile
+                                          , rake }:
+      melpaBuild {
         pname = "projectile-trailblazer";
         version = "0.2.0";
         src = fetchFromGitHub {
@@ -30832,10 +38760,10 @@
           rev = "79299498d74876f2ac3fe8075716b39a5bdd04cd";
           sha256 = "1lkj9jdr3g7nl80fxvic6g5cn7vbkyxys7m3kcmd6xa9mq7nvci4";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f9c6f2f92ff99e7a3241003dc396f978f3916c8a/recipes/projectile-trailblazer";
           sha256 = "18cijb5c1ym5kn2g2apbijbfd3aqhrraki8vv9bk8rvi7wmm6qj4";
-          name = "projectile-trailblazer";
+          name = "recipe";
         };
         packageRequires = [ emacs f inf-ruby inflections projectile rake ];
         meta = {
@@ -30843,8 +38771,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    projectile-variable = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    projectile-variable = callPackage ({ cl-lib ? null
+                                       , emacs
+                                       , fetchFromGitHub
+                                       , fetchurl
+                                       , lib
+                                       , melpaBuild }:
+      melpaBuild {
         pname = "projectile-variable";
         version = "0.0.2";
         src = fetchFromGitHub {
@@ -30853,10 +38786,10 @@
           rev = "8d348ac70bdd6dc320c13a12941b32b38140e264";
           sha256 = "0l38nldx6lwjb7mxixykiyj10xwb35249dxfg0k2wkmb2vy1fkxs";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/eb13cb0dba1696cc51132cd1ff723fa17f892a7c/recipes/projectile-variable";
           sha256 = "15qc5n91nxyfvb100iyihfmrdr57qgw6098yv3nfqgw3zx1qchdw";
-          name = "projectile-variable";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -30864,8 +38797,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    projekt = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    projekt = callPackage ({ emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "projekt";
         version = "0.1";
         src = fetchFromGitHub {
@@ -30874,10 +38811,10 @@
           rev = "107232c191375b59d065354470d0af83062e2a4c";
           sha256 = "1rw55w2fpb3rw7j136kclkhppz21f7d7di4cvlv7zj5zpdl5zz88";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e2a854ed4fef114861bcc7814cd064c16d3c074c/recipes/projekt";
           sha256 = "1bhb24701flihl54w8xrj6yxhynpq4dk0fp5ciac7k28n4930lw8";
-          name = "projekt";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -30885,20 +38822,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    prompt-text = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    prompt-text = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "prompt-text";
         version = "0.1.0";
         src = fetchFromGitHub {
           owner = "10sr";
           repo = "prompt-text-el";
-          rev = "bb9265ebfada42d0e3c67c809665e1e5d980691e";
-          sha256 = "1hq8426i8rpb3qzkd5akv3i08pa4jsp9lwsskn38bfgp71pwild2";
+          rev = "3cc486c070b7a7c806c8d6002f9ba4979f56107d";
+          sha256 = "1hv4p1x5sli5lplm8hl6frxmwvbc1vmamgj9m2ryk17ykqmr05r5";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/17d2bc3e53865fe8c98aabb6ef0ad1d10fcb1061/recipes/prompt-text";
           sha256 = "1b9sj9kzx5ydq2zsfmkwsx78pzg0vsvrn92397js6b2cm24vrwwc";
-          name = "prompt-text";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -30906,8 +38846,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    prop-menu = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    prop-menu = callPackage ({ cl-lib ? null
+                             , emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "prop-menu";
         version = "0.1.2";
         src = fetchFromGitHub {
@@ -30916,10 +38861,10 @@
           rev = "50b102c1c0935fd3e0c465feed7f27d66b21cdf3";
           sha256 = "18ap2liz5r5a8ja2zz9182fnfm47jnsbyblpq859zks356k37iwc";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3d3a013cc9c489987fe689c8d73bbaa3445bdeb3/recipes/prop-menu";
           sha256 = "0dhy52fxxpa058mhhx0slw3sly3dlxm9vkax6fd1sap6f6v00p5i";
-          name = "prop-menu";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -30927,20 +38872,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    protobuf-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    protobuf-mode = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "protobuf-mode";
-        version = "3.5.2";
+        version = "3.6.0.1";
         src = fetchFromGitHub {
           owner = "google";
           repo = "protobuf";
-          rev = "b5fbb742af122b565925987e65c08957739976a7";
-          sha256 = "14gq6rnv03zvcb5hym240z4yqiphrmd5y4zx9a77n37rwvfgx5qy";
+          rev = "4674cc7c073f1b8d5efd2a42ffcf3ca30a907bfe";
+          sha256 = "0sspwvwxyqq9aibf3piv6cp5vb28w2fnfk6x7wkmaiy7a4gcklcv";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/protobuf-mode";
           sha256 = "1hh0w93fg6mfwsbb9wvp335ry8kflj50k8hybchpjcn6f4x39xsj";
-          name = "protobuf-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -30948,8 +38896,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    protocols = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    protocols = callPackage ({ cl-lib ? null
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "protocols";
         version = "1.6";
         src = fetchFromGitHub {
@@ -30958,10 +38910,10 @@
           rev = "f5549f5d873a683af45a0e19c732524d5b964026";
           sha256 = "0v9is6r307814gvrnch2d3mvikd7j8lnmsqb2c3gj6gvfj4p9y7r";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9c9a75671a00e9196d00b08911232aac87fd8c83/recipes/protocols";
           sha256 = "1wg3qh8a1ms82lkzz4i1bk787147a8agcj8rszj1zfvwg0ckqq1a";
-          name = "protocols";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -30969,8 +38921,16 @@
           license = lib.licenses.free;
         };
       }) {};
-    psci = callPackage ({ dash, deferred, f, fetchFromGitHub, fetchurl, lib, melpaBuild, purescript-mode, s }:
-    melpaBuild {
+    psci = callPackage ({ dash
+                        , deferred
+                        , f
+                        , fetchFromGitHub
+                        , fetchurl
+                        , lib
+                        , melpaBuild
+                        , purescript-mode
+                        , s }:
+      melpaBuild {
         pname = "psci";
         version = "0.0.6";
         src = fetchFromGitHub {
@@ -30979,10 +38939,10 @@
           rev = "8c2d5a0ba604ec593f83f632b2830a87f41f84d4";
           sha256 = "0wgxrwl7dpy084sc76wiwpixycb171g7xwc66m5gnlrv79qyac73";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3451719ce5096383db082917716a5ed8346fc186/recipes/psci";
           sha256 = "1iwkr58b910vrwwxyk00psy74vp201vmm3b0cm4k5fh3glr31vp9";
-          name = "psci";
+          name = "recipe";
         };
         packageRequires = [ dash deferred f purescript-mode s ];
         meta = {
@@ -30990,20 +38950,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    psession = callPackage ({ async, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    psession = callPackage ({ async
+                            , cl-lib ? null
+                            , emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "psession";
-        version = "1.4";
+        version = "1.5";
         src = fetchFromGitHub {
           owner = "thierryvolpiatto";
           repo = "psession";
-          rev = "c48b0574e1477437b4427e78d018f858b49fd0ff";
-          sha256 = "1ffgnkdvrryc84cw1m5k37zx22dd5l7z882zgfh1p3dfzh8rqpqb";
+          rev = "702d20897c0839568201bc6921d5f0f80b8778c0";
+          sha256 = "0ynd69fyjpgs6rs3kkznpx19kmdmd25wb46bj9zq61gj138b6p33";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/669342d2b3e6cb622f196571d776a98ec8f3b1d3/recipes/psession";
           sha256 = "18va6kvpia5an74vkzccs72z02vg4vq9mjzr5ih7xbcqxna7yv3a";
-          name = "psession";
+          name = "recipe";
         };
         packageRequires = [ async cl-lib emacs ];
         meta = {
@@ -31011,8 +38977,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    psysh = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    psysh = callPackage ({ emacs
+                         , f
+                         , fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild
+                         , s }:
+      melpaBuild {
         pname = "psysh";
         version = "0.0.4";
         src = fetchFromGitHub {
@@ -31021,10 +38993,10 @@
           rev = "f72d6fe41af2d9566d41b167cda66e97efdf8cfa";
           sha256 = "0hr8nlxcqfas9wl5ahz9hmvpa8b6k35n4f7iv9dx6zwf5q48q7y7";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/eb13cb0dba1696cc51132cd1ff723fa17f892a7c/recipes/psysh";
           sha256 = "00rzfw8nlbcmfbjnzbfl08136dhgvrrn9g1s9l623xgpbcay63sg";
-          name = "psysh";
+          name = "recipe";
         };
         packageRequires = [ emacs f s ];
         meta = {
@@ -31032,8 +39004,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    pt = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    pt = callPackage ({ fetchFromGitHub
+                      , fetchurl
+                      , lib
+                      , melpaBuild }:
+      melpaBuild {
         pname = "pt";
         version = "0.0.3";
         src = fetchFromGitHub {
@@ -31042,10 +39017,10 @@
           rev = "a539dc11ecb2d69760ff50f76c96f49895ce1e1e";
           sha256 = "1p0k770h96iw8bxm8ssi0a91m050s615q036870lrlsz35mzc5kw";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/34c51783af154f203489f5f7df7012ca61932caa/recipes/pt";
           sha256 = "0zmz1hcr4ajc2ydvpdxhy1dlhp7hvlkv6y6w1b79ffvq6acdd5mj";
-          name = "pt";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -31053,8 +39028,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    pug-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    pug-mode = callPackage ({ cl-lib ? null
+                            , emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "pug-mode";
         version = "1.0.7";
         src = fetchFromGitHub {
@@ -31063,10 +39043,10 @@
           rev = "96718f802dad3acd5a3f770b1452b81e39f77d92";
           sha256 = "1jqj3qfc4686v09am869ls1k3jwy397646cql4a8dg7crjdpf023";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b3710aac9f3df3a23238af1f969c462b3692f260/recipes/pug-mode";
           sha256 = "1njhr95y2rx7inpl9phxxz580844p2iadqlga1kj7xzvjz698x85";
-          name = "pug-mode";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -31074,20 +39054,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    punctuality-logger = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    punctuality-logger = callPackage ({ fetchFromGitLab
+                                      , fetchurl
+                                      , lib
+                                      , melpaBuild }:
+      melpaBuild {
         pname = "punctuality-logger";
         version = "0.8";
         src = fetchFromGitLab {
           owner = "elzair";
           repo = "punctuality-logger";
           rev = "708cae8e67dbae293c7c4be0ca5e49d76fac6714";
-          sha256 = "1bkkgs2agy00wivilljkj3a9fsb2ba935icjmhbk46zjc6yf3y6q";
+          sha256 = "1v48i37iqrrwbyy3bscicfq66vbbml4sg0f0n950bnk0qagjx8py";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/76ac7178ee5381e08ae881f3fc6061106eeb1c1d/recipes/punctuality-logger";
           sha256 = "0q9s74hkfqvcx67xpq9rlvh38nyjnz230bll6ks7y5yzxvl4qhcm";
-          name = "punctuality-logger";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -31095,8 +39078,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    pungi = callPackage ({ fetchFromGitHub, fetchurl, jedi, lib, melpaBuild, pyvenv }:
-    melpaBuild {
+    pungi = callPackage ({ fetchFromGitHub
+                         , fetchurl
+                         , jedi
+                         , lib
+                         , melpaBuild
+                         , pyvenv }:
+      melpaBuild {
         pname = "pungi";
         version = "1.1";
         src = fetchFromGitHub {
@@ -31105,10 +39093,10 @@
           rev = "41c9f8b7795e083bfd63ba0d06c789c250998723";
           sha256 = "012lv7hrwlhvins81vw3yjkhdwbpi6g1dx55i101qyrpzv5ifngm";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d504c6028c029268d380c0eac25b1c4886aa6e98/recipes/pungi";
           sha256 = "1v9fsd764z5wdcips63z53rcipdz7bha4q6s4pnn114jn3a93ls1";
-          name = "pungi";
+          name = "recipe";
         };
         packageRequires = [ jedi pyvenv ];
         meta = {
@@ -31116,8 +39104,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    puppet-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }:
-    melpaBuild {
+    puppet-mode = callPackage ({ cl-lib ? null
+                               , emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild
+                               , pkg-info }:
+      melpaBuild {
         pname = "puppet-mode";
         version = "0.3";
         src = fetchFromGitHub {
@@ -31126,10 +39120,10 @@
           rev = "d943149691abd7b66c85d58aee9657bfcf822c02";
           sha256 = "0xr3s56p6fbm6wgw17galsl3kqvv8c7l1l1qvbhbay39yzs4ff14";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1de94f0ab39ab18dfd0b050e337f502d894fb3ad/recipes/puppet-mode";
           sha256 = "1qn71j6fkwnrsq1s6fhfcxhic3rbspg5cy9n7jv451ji7ywyhakf";
-          name = "puppet-mode";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs pkg-info ];
         meta = {
@@ -31137,8 +39131,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    purescript-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    purescript-mode = callPackage ({ fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "purescript-mode";
         version = "13.10";
         src = fetchFromGitHub {
@@ -31147,10 +39144,10 @@
           rev = "6a4d4bdd178c65183a715c7729941a0b8fe5f253";
           sha256 = "1wk319akv0scvyyjsd48pisi2i1gkahhsan9hfszrs6xx3anvfd9";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/77175fa470e517fa134751fbb38e144eb5b979ff/recipes/purescript-mode";
           sha256 = "00gz752mh7144nsaka5q3q4681jp845kc5vcy2nbfnqp9b24l55m";
-          name = "purescript-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -31158,8 +39155,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    pushbullet = callPackage ({ fetchFromGitHub, fetchurl, grapnel, json ? null, lib, melpaBuild }:
-    melpaBuild {
+    pushbullet = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , grapnel
+                              , json ? null
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "pushbullet";
         version = "0.5.2";
         src = fetchFromGitHub {
@@ -31168,10 +39170,10 @@
           rev = "73c59a0f1dc04875b3e5a2c8afbc26c32128e445";
           sha256 = "03ivg3ddhy5zh410wgwxa17m98wywqhk62jgijhjd00b6l8i4aym";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a2649d60dd1ed3b3171ff1448b89967c5f7759a0/recipes/pushbullet";
           sha256 = "1swzl25rcw7anl7q099qh14yhnwlbn3m20ib9kis0l1rv59kkarl";
-          name = "pushbullet";
+          name = "recipe";
         };
         packageRequires = [ grapnel json ];
         meta = {
@@ -31179,8 +39181,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    py-autopep8 = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    py-autopep8 = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "py-autopep8";
         version = "2016.1";
         src = fetchFromGitHub {
@@ -31189,10 +39194,10 @@
           rev = "68e12d8788c91c7ec53a68acf1d23adb2ffa4788";
           sha256 = "16fmym6hvi2lx0mmbrrhld1vzki5iqfqx2m0xa9021gjjzb33lw6";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c400e0f3cfe70821e621fe85d239b4f6596d5171/recipes/py-autopep8";
           sha256 = "1argjdmh0x9c90zkb6cr4z3zkpgjp2mkpsw0dr4v6gg83jcggfpp";
-          name = "py-autopep8";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -31200,8 +39205,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    py-isort = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    py-isort = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "py-isort";
         version = "2016.1";
         src = fetchFromGitHub {
@@ -31210,10 +39218,10 @@
           rev = "e67306f459c47c53a65604e4eea88a3914596560";
           sha256 = "08i55gv392wc12x8v3dca0dmz8a8p9ljsqhyajsb6qv1k120wqhx";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/44377d11da07b49c8dc6887c948cc5ddfc065bd2/recipes/py-isort";
           sha256 = "0k5gn3bjn5pv6dn6p0m9xghn0sx3m29bj3pfrmyh6gd5ic0l00yb";
-          name = "py-isort";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -31221,8 +39229,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    py-yapf = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    py-yapf = callPackage ({ fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "py-yapf";
         version = "2016.1";
         src = fetchFromGitHub {
@@ -31231,10 +39242,10 @@
           rev = "a878304202ad827a1f3de3dce1badd9ca8731146";
           sha256 = "1mmzqdigxx46my0h9497l25cjydy3vykg6slxkch4dzvhhlbap48";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3306c6906d4b21868b9407de27fbebdaed3d00d5/recipes/py-yapf";
           sha256 = "1381x0ffpllxwgkr2d8xxbv1nd4k475m1aff8l5qijw7d1fqga2f";
-          name = "py-yapf";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -31242,8 +39253,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    pycarddavel = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
-    melpaBuild {
+    pycarddavel = callPackage ({ emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , helm
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "pycarddavel";
         version = "1.0.1";
         src = fetchFromGitHub {
@@ -31252,10 +39268,10 @@
           rev = "6ead921066fa0156f20155b7126e5875ce11c328";
           sha256 = "0qg1kjzsv2mcvlsivqy8ys3djbs5yala37r9h2zcxdicl88q0l11";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9b3d2cd943f26dcff322efb16d55dd3bd71dea07/recipes/pycarddavel";
           sha256 = "12k2mnzkd8yv17csfhclsnd479vcabawmac23yw6dsw7ic53jf1a";
-          name = "pycarddavel";
+          name = "recipe";
         };
         packageRequires = [ emacs helm ];
         meta = {
@@ -31263,8 +39279,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    pydoc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    pydoc = callPackage ({ fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "pydoc";
         version = "0.1";
         src = fetchFromGitHub {
@@ -31273,10 +39292,10 @@
           rev = "5392248e33d83ef05d3b2809b0c6b207786b2644";
           sha256 = "1m0jb5pk1a1ww5jx2y5nz21by4dh7nlnhdn6bigz53ra449rrxii";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5c4988a66040ddf659492bdb0ae2b9617c342c69/recipes/pydoc";
           sha256 = "0sf52cb80yiridsl1pffdr3wpbgxrn2l8vnq03l70djckild477n";
-          name = "pydoc";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -31284,8 +39303,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    pyenv-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, pythonic }:
-    melpaBuild {
+    pyenv-mode = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild
+                              , pythonic }:
+      melpaBuild {
         pname = "pyenv-mode";
         version = "0.1.0";
         src = fetchFromGitHub {
@@ -31294,10 +39317,10 @@
           rev = "b96c15fa1b83cad855e472eda06319ad35e34513";
           sha256 = "1y3q1k195wp2kgp00a1y34i20zm80wdv2kxigh6gbn2r6qzkqrar";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/acc9b816796b9f142c53f90593952b43c962d2d8/recipes/pyenv-mode";
           sha256 = "00yqrk92knv9gq1m9xcg78gavv70jsjlwzkllzxl63iva9qrch59";
-          name = "pyenv-mode";
+          name = "recipe";
         };
         packageRequires = [ pythonic ];
         meta = {
@@ -31305,8 +39328,16 @@
           license = lib.licenses.free;
         };
       }) {};
-    pyim = callPackage ({ async, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, pyim-basedict }:
-    melpaBuild {
+    pyim = callPackage ({ async
+                        , cl-lib ? null
+                        , emacs
+                        , fetchFromGitHub
+                        , fetchurl
+                        , lib
+                        , melpaBuild
+                        , popup
+                        , pyim-basedict }:
+      melpaBuild {
         pname = "pyim";
         version = "1.7";
         src = fetchFromGitHub {
@@ -31315,10 +39346,10 @@
           rev = "3b1c5fbdf3b910f96771935785e28cf33d8d54cc";
           sha256 = "1ijfsnjvyys941kgcq00d5dgnkbzj14gb7c9pks0x11bsdl0vr6p";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/151a0af91a58e27f724854d85d5dd9668229fe8d/recipes/pyim";
           sha256 = "1ly4xhfr3irlrwvv20j3kyz98g7barridi9n8jppc0brh2dlv98j";
-          name = "pyim";
+          name = "recipe";
         };
         packageRequires = [ async cl-lib emacs popup pyim-basedict ];
         meta = {
@@ -31326,8 +39357,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    pyim-basedict = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    pyim-basedict = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "pyim-basedict";
         version = "0.3.1";
         src = fetchFromGitHub {
@@ -31336,10 +39370,10 @@
           rev = "f71d0ffd9d2421f2b51cd0ccb89fd9eb43c09585";
           sha256 = "0576r8ap9gp91ycjf1d47pn13kxp0f9fysn09zlq44hr0s1y2y5d";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/151a0af91a58e27f724854d85d5dd9668229fe8d/recipes/pyim-basedict";
           sha256 = "1y8cmccli3im5bvws2h582z7k4nj6p8brgypl8h09y3na6yjy2z9";
-          name = "pyim-basedict";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -31347,8 +39381,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    pyim-wbdict = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, pyim }:
-    melpaBuild {
+    pyim-wbdict = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild
+                               , pyim }:
+      melpaBuild {
         pname = "pyim-wbdict";
         version = "0.1";
         src = fetchFromGitHub {
@@ -31357,10 +39395,10 @@
           rev = "114489ed97e825ae11a8d09da6e873820cf23106";
           sha256 = "187wx418pj4h8p8baf4943v9dsb6mfbn0n19r8xiil1z2cmm4ygc";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ab1cb8bc623d1f12f78fa42ce8b16514e5b07c51/recipes/pyim-wbdict";
           sha256 = "1s0i9xcnpy8kxqhsv7rqxabv5vnxsciyng398mn32mknib03315i";
-          name = "pyim-wbdict";
+          name = "recipe";
         };
         packageRequires = [ pyim ];
         meta = {
@@ -31368,20 +39406,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    pyimport = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    pyimport = callPackage ({ dash
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild
+                            , s }:
+      melpaBuild {
         pname = "pyimport";
         version = "1.0";
         src = fetchFromGitHub {
           owner = "Wilfred";
           repo = "pyimport";
-          rev = "2c05712748f6b6624b15d524323f6391612683f4";
-          sha256 = "0p9fsbb7c1kr8916vlk1ngq7xmm158a47v6ja5j5n57b505ssy8q";
+          rev = "c99d2fd9ca3963deac13a51ce0123f70d303af27";
+          sha256 = "19gxiaikwwfjz65nbbbrwgh91d66s76yzrkls58jzjwghz56pbv3";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/71bc39b06cee37814960ef31c6a2056261b802fb/recipes/pyimport";
           sha256 = "1qwigplawknykw1kbm5babyyknzn43ddhbdpahvzh4wy3kycn6n8";
-          name = "pyimport";
+          name = "recipe";
         };
         packageRequires = [ dash s ];
         meta = {
@@ -31389,8 +39432,16 @@
           license = lib.licenses.free;
         };
       }) {};
-    pynt = callPackage ({ deferred, ein, emacs, epc, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
-    melpaBuild {
+    pynt = callPackage ({ deferred
+                        , ein
+                        , emacs
+                        , epc
+                        , fetchFromGitHub
+                        , fetchurl
+                        , helm
+                        , lib
+                        , melpaBuild }:
+      melpaBuild {
         pname = "pynt";
         version = "1.0.0";
         src = fetchFromGitHub {
@@ -31399,10 +39450,10 @@
           rev = "bc750cd244141005ea3b7bb87f75c6f6c5a5778f";
           sha256 = "0mj8lkc40iv8d6afl4dba7gsbi0mgnx9ivanvczq6pxp5d4kgfsn";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fdb297084188a957a46dcd036e65d9d893044bea/recipes/pynt";
           sha256 = "07c0zc68r3pskn3bac3a8x5nrsykl90a1h22865g3i5vil76vvg3";
-          name = "pynt";
+          name = "recipe";
         };
         packageRequires = [ deferred ein emacs epc helm ];
         meta = {
@@ -31410,8 +39461,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    python-environment = callPackage ({ deferred, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    python-environment = callPackage ({ deferred
+                                      , fetchFromGitHub
+                                      , fetchurl
+                                      , lib
+                                      , melpaBuild }:
+      melpaBuild {
         pname = "python-environment";
         version = "0.0.2";
         src = fetchFromGitHub {
@@ -31420,10 +39475,10 @@
           rev = "401006584e32864a10c69d29f14414828909362e";
           sha256 = "0q6bib9nr6xiq6npzbngyfcjk87yyvwzq1zirr3z1h5wadm34lsk";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/283155ad56cd8eda416c83a9b7f8d43d4d1570c2/recipes/python-environment";
           sha256 = "1pq16rddw76ic5d02j5bswl9qcydi47hqmhs7r06jk46vsfzxpl7";
-          name = "python-environment";
+          name = "recipe";
         };
         packageRequires = [ deferred ];
         meta = {
@@ -31431,20 +39486,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    python-mode = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    python-mode = callPackage ({ fetchFromGitLab
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "python-mode";
         version = "6.2.3";
         src = fetchFromGitLab {
           owner = "python-mode-devs";
           repo = "python-mode";
           rev = "a0a534639bc6142c2c2f44bd7ca5878ad5f79518";
-          sha256 = "173i3k0nvjri1g1mkgkc2i9c9mpnsvxf1ldmm12yhadl5gl2ah07";
+          sha256 = "0sj2hfjwpcdg9djsgl3y5aa3gnvl4s87477x6a9d14m11db3p7ml";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/82861e1ab114451af5e1106d53195afd3605448a/recipes/python-mode";
           sha256 = "1m7c6c97xpr5mrbyzhcl2cy7ykdz5yjj90mrakd4lknnsbcq205k";
-          name = "python-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -31452,8 +39510,17 @@
           license = lib.licenses.free;
         };
       }) {};
-    python-pytest = callPackage ({ dash, dash-functional, emacs, fetchFromGitHub, fetchurl, lib, magit-popup, melpaBuild, projectile, s }:
-    melpaBuild {
+    python-pytest = callPackage ({ dash
+                                 , dash-functional
+                                 , emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , magit-popup
+                                 , melpaBuild
+                                 , projectile
+                                 , s }:
+      melpaBuild {
         pname = "python-pytest";
         version = "0.3.1";
         src = fetchFromGitHub {
@@ -31462,10 +39529,10 @@
           rev = "6772ecfaa86f0f4a1a66bfd3a454c9b11956de70";
           sha256 = "086jjygzdrcjfp7j70xs8jh8nq0xv496kza6iap7lyc3qf16b4kk";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d95442748827911e082a55f4fd7c348a3757e274/recipes/python-pytest";
           sha256 = "0n97akqq7dss7rsww311ljh9w1hyc4j64wjmpxjlc9lg5aqwjbh4";
-          name = "python-pytest";
+          name = "recipe";
         };
         packageRequires = [
           dash
@@ -31480,20 +39547,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    python-x = callPackage ({ fetchFromGitHub, fetchurl, folding, lib, melpaBuild, python ? null }:
-    melpaBuild {
+    python-x = callPackage ({ fetchFromGitLab
+                            , fetchurl
+                            , folding
+                            , lib
+                            , melpaBuild
+                            , python ? null }:
+      melpaBuild {
         pname = "python-x";
         version = "1.0";
-        src = fetchFromGitHub {
+        src = fetchFromGitLab {
           owner = "wavexx";
           repo = "python-x.el";
           rev = "e606469aafec2e6beda8c589540b88a5a6f6f33f";
           sha256 = "00i7cc4r7275l22k3708xi4hqw2j44yivdb1madzrpf314v3kabr";
         };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/87ed5ea4868945df1bf92d1eae5d3ebb83ece117/recipes/python-x";
-          sha256 = "115mvhqfa0fa8kdk64biba7ri4xjk74qqi6vm1a5z3psam9mjcmn";
-          name = "python-x";
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/c1cf98dff029d494007fe25d29bd8bcfecc5b8e6/recipes/python-x";
+          sha256 = "03px1z27yhvc9084h9j2p0khvhkwmfxdskf0ndvz79ywp6nl7mb6";
+          name = "recipe";
         };
         packageRequires = [ folding python ];
         meta = {
@@ -31501,20 +39573,28 @@
           license = lib.licenses.free;
         };
       }) {};
-    pythonic = callPackage ({ cl-lib ? null, dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    pythonic = callPackage ({ cl-lib ? null
+                            , dash
+                            , emacs
+                            , f
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild
+                            , s }:
+      melpaBuild {
         pname = "pythonic";
-        version = "0.1.0";
+        version = "0.1.1";
         src = fetchFromGitHub {
           owner = "proofit404";
           repo = "pythonic";
-          rev = "959b3f5d5607eb41ef26ad61d7ec15ceecb8e37a";
-          sha256 = "1af9cd8l5ac58mj92xc7a3diy995cv29abnbb3fl6x4208l4xs3c";
+          rev = "c59a158942634d3c07e506b2376d96e8d5d1466f";
+          sha256 = "0219s900kdpi3cxllvmwm8hb2lwqzikplq578f7pyxhzljjh2lma";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5589c55d459f15717914061d0f0f4caa32caa13c/recipes/pythonic";
           sha256 = "1hq0r3vg8vmgw89wfjdqknwm76pimlk0dy56wmh9vffh06gqsb51";
-          name = "pythonic";
+          name = "recipe";
         };
         packageRequires = [ cl-lib dash emacs f s ];
         meta = {
@@ -31522,20 +39602,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    pyvenv = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    pyvenv = callPackage ({ fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "pyvenv";
-        version = "1.13";
+        version = "1.16";
         src = fetchFromGitHub {
           owner = "jorgenschaefer";
           repo = "pyvenv";
-          rev = "70a755d79b04964bdb969e41166f2473e21f277e";
-          sha256 = "1sim74ccvwifradjdq726jbfcbw52cizbj1vh8q7c75qis6nhb7x";
+          rev = "c1123def7e0d9da57d034d3a6bd3044a738aa8db";
+          sha256 = "0mi86m5z3hig65yd0k224wx6x9i0nz9fcv91njy0ypifxh5hcd8v";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e37236b89b9705ba7a9d134b1fb2c3c003953a9b/recipes/pyvenv";
           sha256 = "0gai9idss1wvryxyqk3pv854mc2xg9hd0r55r2blql8n5rd2yv8v";
-          name = "pyvenv";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -31543,20 +39626,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    qiita = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    qiita = callPackage ({ fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "qiita";
         version = "0.0.1";
         src = fetchFromGitHub {
           owner = "gongo";
           repo = "qiita-el";
-          rev = "33b6d3450bb4b3d0186c2475f6c78269c71fd1ff";
-          sha256 = "110z27n3h7p2yalicfhnv832ikfcf7p0hrf5qkryz1sdmz79wb3f";
+          rev = "542be60f1dbc67e8ec778e5d7790b863d3dbc151";
+          sha256 = "0hp7c51d9d8l0cx0wdq7003clyf3k61dq8ns8zq6lfpbvaliq7yq";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d8065a58e297c50c031de97d2d80bce5857bd803/recipes/qiita";
           sha256 = "1kzk7pc68ks9gxm2l2d28al23gxh56z0cmkl80qwg7sh4gsmhyxl";
-          name = "qiita";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -31564,20 +39650,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    ql = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ql = callPackage ({ emacs
+                      , fetchFromGitHub
+                      , fetchurl
+                      , lib
+                      , melpaBuild }:
+      melpaBuild {
         pname = "ql";
-        version = "1.0";
+        version = "1.1";
         src = fetchFromGitHub {
           owner = "ieure";
           repo = "ql-el";
-          rev = "c885d125d8972374b408f6eddf031e44dc6fa0c6";
-          sha256 = "1l1jdvz1913m03ikcf9g3dsraaajqac1kzfy9c9xhzx8w7bbl80c";
+          rev = "d976414ba6aa576ad524b5ee5bfa620efd072258";
+          sha256 = "138h4ndnzpphsmi4b8yw53mxc3rnqrj1c3jp8njx5pkmiqkp1q00";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/475bd8fd66c6d5b5c7e74aa2c4e094d313cc8303/recipes/ql";
           sha256 = "0wxjblqacs5nx2hyh7r6rlv1yngbhn6phn5rni4dw2dms98zj34z";
-          name = "ql";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -31585,8 +39675,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    qml-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    qml-mode = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "qml-mode";
         version = "0.4";
         src = fetchFromGitHub {
@@ -31595,10 +39688,10 @@
           rev = "6c5f33ba88ae010bf201a80ee8095e20a724558c";
           sha256 = "1sncsvzjfgmhp4m8w5jd4y51k24n2jfpgvrkd64wlhhzbj3wb947";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f3abc88ddbb6b8ecafa45e75ceba9a1294ad88d4/recipes/qml-mode";
           sha256 = "123mlibviplzra558x87da4zx0kpbhsgfigjjgjgp3mdg897084n";
-          name = "qml-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -31606,20 +39699,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    qt-pro-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    qt-pro-mode = callPackage ({ emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "qt-pro-mode";
         version = "1.0.0";
         src = fetchFromGitHub {
           owner = "EricCrosson";
           repo = "qt-pro-mode";
-          rev = "66601441cc728a609765b149ee0d7dcfb74dc8bf";
-          sha256 = "0azx8a7kwgn5byijgwar2rib9xv2p9w7w3yyb5bk19g3id2f8gdw";
+          rev = "1e0052fcfb89c15cb47714c1546d4e8ec6e01ae6";
+          sha256 = "11bwxq4nwfbnlk4clg0m8jh2xz0ldv4ggyaw645sy7hprvwkp8y4";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e9af710be77ccde8ffa5f22168d2c8a06b73dd6a/recipes/qt-pro-mode";
           sha256 = "1k3ph9bqvvg6i6n623qrwdpsffs8w9rv9nihmlggb4w30dwqc9nf";
-          name = "qt-pro-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -31627,8 +39724,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    quasi-monochrome-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    quasi-monochrome-theme = callPackage ({ fetchFromGitHub
+                                          , fetchurl
+                                          , lib
+                                          , melpaBuild }:
+      melpaBuild {
         pname = "quasi-monochrome-theme";
         version = "1.1";
         src = fetchFromGitHub {
@@ -31637,10 +39737,10 @@
           rev = "7d3afe41c2696ee25e3e4bcce987af1f589208d6";
           sha256 = "0bn1yzxzj6r1k3xcp45l04flq4avzlh0sbjfyiw4nglfhliyvwcf";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a9c8498e4bcca19c4c24b2fd0db035c3da477e2a/recipes/quasi-monochrome-theme";
           sha256 = "0h5pqrklyga40jg8qc47lwmf8khn0vcs5jx2sdycl2ipy0ikmfs0";
-          name = "quasi-monochrome-theme";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -31648,8 +39748,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    quickrun = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    quickrun = callPackage ({ emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "quickrun";
         version = "2.2.8";
         src = fetchFromGitHub {
@@ -31658,10 +39762,10 @@
           rev = "70e93e06778f44113f405aedec6187b925311d57";
           sha256 = "0swbgsidq11w7vyjhf06dn8vsj06j9scj8n2dm9m7fasj0yh3ghw";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/81f0f525680fea98e804f39dbde1dada887e8821/recipes/quickrun";
           sha256 = "0f989d6niw6ghf9mq454kqyp0gy7gj34vx5l6krwc52agckyfacy";
-          name = "quickrun";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -31669,8 +39773,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    quiz = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    quiz = callPackage ({ cl-lib ? null
+                        , emacs
+                        , fetchFromGitHub
+                        , fetchurl
+                        , lib
+                        , melpaBuild }:
+      melpaBuild {
         pname = "quiz";
         version = "1.4";
         src = fetchFromGitHub {
@@ -31679,10 +39788,10 @@
           rev = "69629937eaf994a51dad39c26355e1a56b9dcb95";
           sha256 = "06k1kv9ijg9gx8c5jid8ckbmjkviyzh59rygp9drbkpihwdwyfmj";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/23d547c0d69d8f5d1e9983e3669a63dffaede2b3/recipes/quiz";
           sha256 = "0pcjfhk109ifi834jw8lndwhpfcv764wym1dhiqhp5qd2vf431kg";
-          name = "quiz";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -31690,8 +39799,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    r-autoyas = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    r-autoyas = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "r-autoyas";
         version = "0.28";
         src = fetchFromGitHub {
@@ -31700,10 +39812,10 @@
           rev = "563254f01ce530ca4c9be1f23395e3fd7d520ff9";
           sha256 = "02bddznlqys37fnhdpp2g9xa9m7kfgrj1vl0hc5kr42hggk9wwmg";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3a095d3a687055c6ac43a4338826542d14a25127/recipes/r-autoyas";
           sha256 = "18zifadsgbwnga205jvpx61wa2dvjxmxs5v7cjqhny45a524nbv4";
-          name = "r-autoyas";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -31711,20 +39823,28 @@
           license = lib.licenses.free;
         };
       }) {};
-    racer = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, rust-mode, s }:
-    melpaBuild {
+    racer = callPackage ({ dash
+                         , emacs
+                         , f
+                         , fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild
+                         , rust-mode
+                         , s }:
+      melpaBuild {
         pname = "racer";
         version = "1.2";
         src = fetchFromGitHub {
           owner = "racer-rust";
           repo = "emacs-racer";
-          rev = "8ad54e7674e49735390d63e3aea828a4d4bcddd0";
-          sha256 = "0xj5iki10cg8j8vvqjlw6lfx97k3agwirhchcjnzbnkry48x9qi6";
+          rev = "10aa2119c47584959fd1abe6cfa770818852d3b4";
+          sha256 = "0rl8rnchd1pch1ndgs9s0rrcmn8kq9xxk1wqkb50lyspv64dl46d";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/97b97037c19655a3ddffee9a86359961f26c155c/recipes/racer";
           sha256 = "1091y5pisbf73i6zg5d7yny2d5yckkjg0z6fpjpmz5qjs3xcm9wi";
-          name = "racer";
+          name = "recipe";
         };
         packageRequires = [ dash emacs f rust-mode s ];
         meta = {
@@ -31732,8 +39852,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    railscasts-reloaded-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    railscasts-reloaded-theme = callPackage ({ fetchFromGitHub
+                                             , fetchurl
+                                             , lib
+                                             , melpaBuild }:
+      melpaBuild {
         pname = "railscasts-reloaded-theme";
         version = "1.5.0";
         src = fetchFromGitHub {
@@ -31742,10 +39865,10 @@
           rev = "077af9cb791d9eba4c561cd7cb3b10d2fcfc39d2";
           sha256 = "1wd6j7m3w81rks6q8mrq5n6p6in0bc93szksds7sx2j2rz6vhfkn";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9817851bd06cbae30fb8f429401f1bbc0dc7be09/recipes/railscasts-reloaded-theme";
           sha256 = "1iy30mnm3s7p7qigrm3lvv7xjgwvinwg6yg0hry2aifwn88cnwmz";
-          name = "railscasts-reloaded-theme";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -31753,8 +39876,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    rainbow-blocks = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    rainbow-blocks = callPackage ({ fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "rainbow-blocks";
         version = "1.0.0";
         src = fetchFromGitHub {
@@ -31763,10 +39889,10 @@
           rev = "8335993563aadd4290c5fa09dd7a6a81691b0690";
           sha256 = "02x5ciyafqwak06yk813kl8p92hq03wjsk1882q8axr9q231100c";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/rainbow-blocks";
           sha256 = "1zf1z1hnp8q0s9za7nnpq83isbpmz26l8hxafz0h0b5dz1w2vlvs";
-          name = "rainbow-blocks";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -31774,8 +39900,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    rainbow-delimiters = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    rainbow-delimiters = callPackage ({ fetchFromGitHub
+                                      , fetchurl
+                                      , lib
+                                      , melpaBuild }:
+      melpaBuild {
         pname = "rainbow-delimiters";
         version = "2.1.3";
         src = fetchFromGitHub {
@@ -31784,10 +39913,10 @@
           rev = "93cd2dc873e7fedca7abc599cd97d46db4376ac7";
           sha256 = "0vs9pf8lqq5p5qz1770pxgw47ym4xj8axxmwamn66br59mykdhv0";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d2cf11dbff76f0e3581b865f48bb44a307aa7f23/recipes/rainbow-delimiters";
           sha256 = "132nslbnszvbgkl0819z811yar3lms1hp5na4ybi9gkmnb7bg4rg";
-          name = "rainbow-delimiters";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -31795,8 +39924,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    rainbow-identifiers = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    rainbow-identifiers = callPackage ({ emacs
+                                       , fetchFromGitHub
+                                       , fetchurl
+                                       , lib
+                                       , melpaBuild }:
+      melpaBuild {
         pname = "rainbow-identifiers";
         version = "0.2.2";
         src = fetchFromGitHub {
@@ -31805,10 +39938,10 @@
           rev = "19fbfded1baa98d12335f26f6d7b20e5ae44ce2e";
           sha256 = "05i0jpmxzsj2lsj48cafn3v93z37l7k5kaza2ik3yirdpjdibyrh";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/975aadd9fe1faf9ad617ba6200ca77185b87e7c0/recipes/rainbow-identifiers";
           sha256 = "0lw790ymrgpyh0sxwmzinl2ik5vl5vggbg14cd0cx5yagkw5y3mp";
-          name = "rainbow-identifiers";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -31816,8 +39949,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    rake = callPackage ({ cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    rake = callPackage ({ cl-lib ? null
+                        , dash
+                        , f
+                        , fetchFromGitHub
+                        , fetchurl
+                        , lib
+                        , melpaBuild }:
+      melpaBuild {
         pname = "rake";
         version = "0.4.1";
         src = fetchFromGitHub {
@@ -31826,10 +39965,10 @@
           rev = "e680f1a8f2591af7c80cad188340601b101b5ddc";
           sha256 = "1dk2clsnmjy3bfv6laxf8sslvdajjbwpk83ss8v9xm55dcxjvd7n";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bf0f84698dda02a5b84a244ee29a23a6faa9de68/recipes/rake";
           sha256 = "0cw47g6cjnkh3z4hbwwq1f8f5vrvs84spn06k53bx898brqdh8ns";
-          name = "rake";
+          name = "recipe";
         };
         packageRequires = [ cl-lib dash f ];
         meta = {
@@ -31837,8 +39976,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    ranger = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ranger = callPackage ({ emacs
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "ranger";
         version = "0.9.8.5";
         src = fetchFromGitHub {
@@ -31847,10 +39990,10 @@
           rev = "584e4ae8cce1c54a44b40dd4c77fbb2f06d73ecb";
           sha256 = "01rphv92g1r0cw5bwkbrh02s0na7fjrddxx1dckk2y7qr97s7l8j";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0207e754f424823fb48e9c065c3ed9112a0c445b/recipes/ranger";
           sha256 = "14g4r4iaz0nzfsklslrswsik670pvfd0605xfjghvpngn2a8ych4";
-          name = "ranger";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -31858,8 +40001,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    rase = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    rase = callPackage ({ fetchFromGitHub
+                        , fetchurl
+                        , lib
+                        , melpaBuild }:
+      melpaBuild {
         pname = "rase";
         version = "1.1";
         src = fetchFromGitHub {
@@ -31868,10 +40014,10 @@
           rev = "59b5f7e8102570b65040e8d55781c7ea28de7338";
           sha256 = "1i16361klpdsxphcjdpxqswab3ing69j1wb9nygws7ghil85h0bx";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/334419debe065c34665bb0207574d1d4dfb9e8ae/recipes/rase";
           sha256 = "1g7v2z7l4csl5by64hc3zg4kgrkvv81iq30mfqq4nvy1jc0xa6j0";
-          name = "rase";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -31879,8 +40025,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    rats = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild, s }:
-    melpaBuild {
+    rats = callPackage ({ cl-lib ? null
+                        , fetchFromGitHub
+                        , fetchurl
+                        , go-mode
+                        , lib
+                        , melpaBuild
+                        , s }:
+      melpaBuild {
         pname = "rats";
         version = "0.2.0";
         src = fetchFromGitHub {
@@ -31889,10 +40041,10 @@
           rev = "8ad4023a4b9b00c1224b10b0060f6dc60b4814a4";
           sha256 = "0rwgwz1x9w447y8mxy9hrx1rzi3ac9dwk2y5yg1p08z5b7dy6vcz";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a62cbae1b2d9af2322bb6a27949de8c8bfddc2b7/recipes/rats";
           sha256 = "0jhwiq9yzwpyqhk3c32vqx8nryingzh58psxbzjl3812b7xdqphr";
-          name = "rats";
+          name = "recipe";
         };
         packageRequires = [ cl-lib go-mode s ];
         meta = {
@@ -31900,8 +40052,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    rbenv = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    rbenv = callPackage ({ fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "rbenv";
         version = "0.0.3";
         src = fetchFromGitHub {
@@ -31910,10 +40065,10 @@
           rev = "a613ee1941efa48ef5321bad39ac1ed8ad1540b8";
           sha256 = "09c6v4lnv6vm2cckbdpx2fdi9xkz9l68qvhx35vaawxhrkgvypzp";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/rbenv";
           sha256 = "1skh1v8dgwl1f9m3pmy2s3rnzp8n3cydi3579fgjv4mzi81k3d5q";
-          name = "rbenv";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -31921,8 +40076,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    rc-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    rc-mode = callPackage ({ fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "rc-mode";
         version = "1.0.13";
         src = fetchFromGitHub {
@@ -31931,10 +40089,10 @@
           rev = "fe2e0570bf9c19a292e16b18fd4b0a256df5d93f";
           sha256 = "0skjg3l3ss8nlrpnpjjflmf7wjib4jfarkmx4438nc6vm6553fmn";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d8062b2e5b2744a6e614b389cca7e7f21b582f6f/recipes/rc-mode";
           sha256 = "0p77mckw8jyxcwspj1ffm8mz0k01ddm67hh9j8rw812wddwnj7qf";
-          name = "rc-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -31942,8 +40100,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    rcirc-styles = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    rcirc-styles = callPackage ({ cl-lib ? null
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "rcirc-styles";
         version = "1.3.2";
         src = fetchFromGitHub {
@@ -31952,10 +40114,10 @@
           rev = "f313bf6a7470bed314b27c7a40558cb787d7bc67";
           sha256 = "1kwn33rxaqik5jls66c2indvswhwmxdmd60n7a1h9siqm5qhy9d6";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/10771a996c8a9dc1eb211cddff53db7b2b01e00b/recipes/rcirc-styles";
           sha256 = "01dxhnzsnljig769dk9axdi970b3lw2s6p1z3ljf29qlb5j4548r";
-          name = "rcirc-styles";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -31963,8 +40125,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    rdf-prefix = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    rdf-prefix = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "rdf-prefix";
         version = "1.10";
         src = fetchFromGitHub {
@@ -31973,10 +40138,10 @@
           rev = "164136d05505275d42d1ca3a390f55fcc89694b8";
           sha256 = "18jp3yynnk2248mzwf8h62awfw8fh25m5ah5di0dg62xw56l9nig";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5f083bd629697038ea6391c7a4eeedc909a5231/recipes/rdf-prefix";
           sha256 = "1vxgn5f2kws17ndfdv1vj5p9ks3rp6sikzpc258j07bhsfpjz5qm";
-          name = "rdf-prefix";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -31984,8 +40149,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    react-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
-    melpaBuild {
+    react-snippets = callPackage ({ fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild
+                                  , yasnippet }:
+      melpaBuild {
         pname = "react-snippets";
         version = "0.1";
         src = fetchFromGitHub {
@@ -31994,10 +40163,10 @@
           rev = "bfc4b68b81374a6a080240592641091a7e8a6d61";
           sha256 = "1wna4v8l3j0ppjv4nj72lhp0yh6vbka6bvl1paqqfvay300kiqjb";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3720192fdfa45f9b83259ab39356f469c5ac85b4/recipes/react-snippets";
           sha256 = "0chs0h41nb2fdz02hdsaynz7ma8fg66a8m1q1np0464skrsdaj73";
-          name = "react-snippets";
+          name = "recipe";
         };
         packageRequires = [ yasnippet ];
         meta = {
@@ -32005,20 +40174,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    real-auto-save = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    real-auto-save = callPackage ({ fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "real-auto-save";
         version = "0.4";
         src = fetchFromGitHub {
           owner = "chillaranand";
           repo = "real-auto-save";
-          rev = "879144ca7e9bfa09a4fb57d5fe92a80250311f1e";
-          sha256 = "1ka5q2q18hgh7wl5yn04489121bq4nx369rz8nb7dr5l14cas0xm";
+          rev = "2775cf497cce60335091817f9fea14f838cd725f";
+          sha256 = "0s19qy5idnzhd7aq0v538x3ysqh7lzddm98mkf8wmqf4xpws6h3j";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/525039a3dc29190829bf50d608ef09bc4a8557af/recipes/real-auto-save";
           sha256 = "03dbbizpyg62v6zbq8hd16ikrifz8m2bdlbb3g67f2834xqmxha8";
-          name = "real-auto-save";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -32026,8 +40198,16 @@
           license = lib.licenses.free;
         };
       }) {};
-    realgud = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, load-relative, loc-changes, melpaBuild, test-simple }:
-    melpaBuild {
+    realgud = callPackage ({ cl-lib ? null
+                           , emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , load-relative
+                           , loc-changes
+                           , melpaBuild
+                           , test-simple }:
+      melpaBuild {
         pname = "realgud";
         version = "1.4.5";
         src = fetchFromGitHub {
@@ -32036,10 +40216,10 @@
           rev = "09431a4561921bece36a6083b6e27ac4dc82432d";
           sha256 = "00dgdiiwnwynlyyh6pfhljrl363s8zd5ynbx9mhd2y8c3gmvfab0";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7ca56f05df6c8430a5cbdc55caac58ba79ed6ce5/recipes/realgud";
           sha256 = "0qmvd35ng1aqclwj3pskn58c0fi98kvx9666wp3smgj3n88vgy15";
-          name = "realgud";
+          name = "recipe";
         };
         packageRequires = [
           cl-lib
@@ -32053,8 +40233,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    reason-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    reason-mode = callPackage ({ emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "reason-mode";
         version = "0.3.0";
         src = fetchFromGitHub {
@@ -32063,10 +40247,10 @@
           rev = "6b53815a0405be1f364a082d22fe5c900409a01a";
           sha256 = "1433bgakbfyf5d5vq69rwj4zg1h0xwjy9qsryvd9r1ssax2hzi7r";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f9f1a18c13601f3a4fd7b1bbfe7d5da07746e492/recipes/reason-mode";
           sha256 = "07sirgj8bs9yv7pbx1lahwslvjd2aadkzkz7lsyw6xflj5fxpggr";
-          name = "reason-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -32074,8 +40258,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    rebecca-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    rebecca-theme = callPackage ({ emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "rebecca-theme";
         version = "1.2.1";
         src = fetchFromGitHub {
@@ -32084,10 +40272,10 @@
           rev = "239115183e0a354ccd5c2cb299893b558fbde05c";
           sha256 = "0n6xf9s39frnyvchk40zzxbkn0hyga5ridkxbf50n7hr5j19yrmb";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/19f40f30113c7dabd76a2d0e52898e6d6be69a35/recipes/rebecca-theme";
           sha256 = "1m72jqyqx18i1vpj07v3vkbi0di9dks5sz46wb2h0f23xqyx00md";
-          name = "rebecca-theme";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -32095,20 +40283,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    recover-buffers = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    recover-buffers = callPackage ({ fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "recover-buffers";
         version = "1.0";
         src = fetchFromGitHub {
           owner = "tripleee";
           repo = "recover-buffers";
-          rev = "a1db7f084977697081da3497628e3514e032b966";
-          sha256 = "114ssmby614xjs7mrpbbsdd4gj5ra6klfh8h6z8iij8xn3kii83q";
+          rev = "fa602e32f73dcec2d90e4bb8e0f72f3240cfdb45";
+          sha256 = "04vmmda2dj8madhlrkmyqw34vsx4pvb0szv3sjvfwqq1z17lsixi";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/43b33cfb794c35de78fde6eabb71ffe01049d23d/recipes/recover-buffers";
           sha256 = "0g40d7440hzlc9b45v63ng0anvmgip4dhbd9wcm2sn8qjfr4w11b";
-          name = "recover-buffers";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -32116,8 +40307,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    rect-plus = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    rect-plus = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "rect-plus";
         version = "1.0.10";
         src = fetchFromGitHub {
@@ -32126,10 +40320,10 @@
           rev = "299b742faa0bc4448e0d5fe9cb98ab1eb93b8dcc";
           sha256 = "1vpsihrl03hkd6n6b7mrjccm0a023qf3154a8rw4chihikxw27pj";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c8c1cd81f0e764a7cfc2f3f96574898ff414beb4/recipes/rect+";
           sha256 = "0vk0jwpl6yp2md9nh0ghp2qn883a8lr3cq8c9mgq0g552dwdiv5m";
-          name = "rect-plus";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -32137,8 +40331,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    rectangle-utils = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    rectangle-utils = callPackage ({ cl-lib ? null
+                                   , emacs
+                                   , fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "rectangle-utils";
         version = "1.1";
         src = fetchFromGitHub {
@@ -32147,10 +40346,10 @@
           rev = "6fe38fdd48ef5305a908b94a043a966ac3f2053a";
           sha256 = "08n3ah40gfgkbriwj2z3y0751vpvgz86qjdn6dxs4mghjrwr2545";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1852b75c82822e97c39b7c7caeb2a32246171be4/recipes/rectangle-utils";
           sha256 = "1w5z2gykydsfp30ahqjihpvq04c5v0cfslbrrg429hycys8apws7";
-          name = "rectangle-utils";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -32158,8 +40357,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    redpen-paragraph = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }:
-    melpaBuild {
+    redpen-paragraph = callPackage ({ cl-lib ? null
+                                    , emacs
+                                    , fetchFromGitHub
+                                    , fetchurl
+                                    , json ? null
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "redpen-paragraph";
         version = "0.42";
         src = fetchFromGitHub {
@@ -32168,10 +40373,10 @@
           rev = "f9569bc8e2993dea0f83cba5738a35ce32f82424";
           sha256 = "087dq9h8i8cjwm8x2s33xrwnnxjpjcmddy2624z00s1ip0dh5ham";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7e6b187bfc14f3affbe2d8d1cb854abe69deb15b/recipes/redpen-paragraph";
           sha256 = "0jr707ik6fhznq0q421l986w85ah0n9b4is91zrgbk1v6miqrhca";
-          name = "redpen-paragraph";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs json ];
         meta = {
@@ -32179,20 +40384,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    redprl = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    redprl = callPackage ({ emacs
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "redprl";
         version = "0.1.0";
         src = fetchFromGitHub {
           owner = "RedPRL";
           repo = "sml-redprl";
-          rev = "d06d39486348a74981b2c4c4c2ed3af95b01d5ca";
-          sha256 = "0k3f7pa332d0fs1js8hi7zszcirir1943bhkgwfxzsqx17m26x3n";
+          rev = "c26dcea5896d199c3d0a53b792807a09c98222f5";
+          sha256 = "0iacmk79wl97h9q47hzz60xzxnd2xs0yv4gxzdpmmzw2mbkvs4p6";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06e7371d703ffdc5b6ea555f2ed289e57e71e377/recipes/redprl";
           sha256 = "1zinzs3vzf2alsnxf5k71i7lp90fm26wv4y20ci52n0hnh5nz861";
-          name = "redprl";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -32200,20 +40409,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    redtick = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    redtick = callPackage ({ emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "redtick";
         version = "0.1.1";
         src = fetchFromGitHub {
           owner = "ferfebles";
           repo = "redtick";
-          rev = "14e3a07c229d1f660ca5129d6e8a52a8c68db94d";
-          sha256 = "0q4a4iznk6xk680xnvly69j8w1dac79qxlycwrfki6msnkagyn9p";
+          rev = "ff3a83974dfa2a6e9959baecc2d523cae8ddcda4";
+          sha256 = "177bbpkkk3b7ljn9rv05774yxmbglkhyqm68bvlrgl75vnmm7jdz";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3187bd436541e2a5c2b28de67c62f5d5165af737/recipes/redtick";
           sha256 = "1a9rviz0hg6vlh2jc04g6vslyf9n89xglcz9cb79vf10hhr6igrb";
-          name = "redtick";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -32221,8 +40434,16 @@
           license = lib.licenses.free;
         };
       }) {};
-    refine = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, list-utils, loop, melpaBuild, s }:
-    melpaBuild {
+    refine = callPackage ({ dash
+                          , emacs
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , list-utils
+                          , loop
+                          , melpaBuild
+                          , s }:
+      melpaBuild {
         pname = "refine";
         version = "0.3";
         src = fetchFromGitHub {
@@ -32231,10 +40452,10 @@
           rev = "9760e56ab849a4827e6c9425fdef6f5a7784c967";
           sha256 = "1b4n0mfplh6vj87p3124c2fw24fj0vm9jvcaxrvccfq3sida4sf3";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b111879ea0685cda88c758b270304d9e913c1391/recipes/refine";
           sha256 = "1sk6rsd92pix7k8snnqm3hsimjzaihzjgac0g5h3a2zm9dabf4py";
-          name = "refine";
+          name = "recipe";
         };
         packageRequires = [ dash emacs list-utils loop s ];
         meta = {
@@ -32242,20 +40463,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    region-convert = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    region-convert = callPackage ({ fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "region-convert";
         version = "0.0.1";
         src = fetchFromGitHub {
           owner = "zonuexe";
           repo = "right-click-context";
-          rev = "31d370fce60d8cda04e1b9e4fe0e5d268fd37fe5";
-          sha256 = "0bbfgz2n00dgqbij6c4kmlp3rnmf7jcjq56cmjck4nd81lkwk6j7";
+          rev = "4391dd89616584dc34773d7c304a7db93f9b63a4";
+          sha256 = "0kqgznjrdg70y5zcz7y9fxssddib6m1wrgfqza2g97g4gl1m91vf";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ddcf4612cccb9a53425c5f0324206d70549d9d9e/recipes/region-convert";
           sha256 = "0daghvxc6gxgric1aa1gw036gbpbzilqz72gr1inqy92hz7xrxfm";
-          name = "region-convert";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -32263,8 +40487,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    relax = callPackage ({ fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }:
-    melpaBuild {
+    relax = callPackage ({ fetchFromGitHub
+                         , fetchurl
+                         , json ? null
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "relax";
         version = "0.2";
         src = fetchFromGitHub {
@@ -32273,10 +40501,10 @@
           rev = "6e33892623ab87833082262321dc8e1977209626";
           sha256 = "0lqbhwi1f8b4sv9p1rf0gyjllk0l7g6v6mlws496079wxx1n5j66";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/67247451b39461db4a5fcff3827a09f53f9fc8ec/recipes/relax";
           sha256 = "0gfr4ym6aakawhkfz40ar2n0rfz503hq428yj6rbf7jmq3ajaysk";
-          name = "relax";
+          name = "recipe";
         };
         packageRequires = [ json ];
         meta = {
@@ -32284,8 +40512,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    repeatable-motion = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    repeatable-motion = callPackage ({ emacs
+                                     , fetchFromGitHub
+                                     , fetchurl
+                                     , lib
+                                     , melpaBuild }:
+      melpaBuild {
         pname = "repeatable-motion";
         version = "0.2";
         src = fetchFromGitHub {
@@ -32294,10 +40526,10 @@
           rev = "e664b0a4a3e39c4085378a28b5136b349a0afb22";
           sha256 = "007lqahjbig6yygqik6fgbq114784z6l40a3vrc4qs9361zqizck";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0dd56ebaea098715b9c201f07e6196c38977f8e3/recipes/repeatable-motion";
           sha256 = "12z4z8apd8ksf6dfvqm54l71mx68j0yg4hrjypa9p77fpcd6p0zw";
-          name = "repeatable-motion";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -32305,20 +40537,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    repl-toggle = callPackage ({ fetchFromGitHub, fetchurl, fullframe, lib, melpaBuild }:
-    melpaBuild {
+    repl-toggle = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , fullframe
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "repl-toggle";
-        version = "0.4.0";
+        version = "0.5.0";
         src = fetchFromGitHub {
           owner = "tomterl";
           repo = "repl-toggle";
-          rev = "bd2d28738368a047d5f407034f78839a7e514489";
-          sha256 = "1h58a2darz4k1aj480xahhp29gh2cg41pymidymjx4wi2ygic4pr";
+          rev = "934f59478a5c5577795f9507e945d564be368510";
+          sha256 = "13pgfqijfp0ad9h1rpcf0blppq3jv31wdgvpjndgi213vwrkk79j";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/repl-toggle";
           sha256 = "16k9fk1nl2llk9qli52kiirlx9rlz8yhjh3cy6v5y2b3k0y1cf0b";
-          name = "repl-toggle";
+          name = "recipe";
         };
         packageRequires = [ fullframe ];
         meta = {
@@ -32326,8 +40562,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    replace-symbol = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    replace-symbol = callPackage ({ fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "replace-symbol";
         version = "1.1";
         src = fetchFromGitHub {
@@ -32336,10 +40575,10 @@
           rev = "baf949e528aee1881f455f9c84e67718bedcb3f6";
           sha256 = "178y1cmpdb2r72igx8j4l7pyhs1idw56j6hg5h8r9a2p99lkgjjc";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/377b6ff2b785f6d87adf1e23a5b0ce02881fc5c9/recipes/replace-symbol";
           sha256 = "07ljmw6aw9hsqffhwmiq2pvhry27acg6f4vgxgi91vjr8jj3r4ng";
-          name = "replace-symbol";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -32347,8 +40586,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    replace-with-inflections = callPackage ({ fetchFromGitHub, fetchurl, inflections, lib, melpaBuild, string-inflection }:
-    melpaBuild {
+    replace-with-inflections = callPackage ({ fetchFromGitHub
+                                            , fetchurl
+                                            , inflections
+                                            , lib
+                                            , melpaBuild
+                                            , string-inflection }:
+      melpaBuild {
         pname = "replace-with-inflections";
         version = "0.3.0";
         src = fetchFromGitHub {
@@ -32357,10 +40601,10 @@
           rev = "e0486653abf7c248024800132df23993cd617892";
           sha256 = "1fygsr3vjpy0crxlyawwk6k21h1w3svgk79rm7fqg5xzilg6kf25";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7892eb506b8f4260bde4be2805bf3b2d594ab640/recipes/replace-with-inflections";
           sha256 = "1pqpin5ipm3g74zjh1kh6s1gh0aan6202p0y2q00d4ywbz9kn5s0";
-          name = "replace-with-inflections";
+          name = "recipe";
         };
         packageRequires = [ inflections string-inflection ];
         meta = {
@@ -32368,20 +40612,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    repo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    repo = callPackage ({ emacs
+                        , fetchFromGitHub
+                        , fetchurl
+                        , lib
+                        , melpaBuild }:
+      melpaBuild {
         pname = "repo";
         version = "0.1.3";
         src = fetchFromGitHub {
           owner = "canatella";
           repo = "repo-el";
-          rev = "d7b87cd515bad8a67d3a892a46a23f5fe81e08de";
-          sha256 = "0rbvcvm7bfr6ncji7cllfxyyr6x7n9fx863byp243phsj3n93adz";
+          rev = "9f03c0d90c9036b96e531c17d529f3855364d47a";
+          sha256 = "1ggxs40mbk50aqhqqfdcz6izvlvsz53s93dj3ndxvgdxkpkxr6yn";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1729d4ea9498549fff3594b971fcde5f81592f84/recipes/repo";
           sha256 = "0z4lcswh0c6xnsxlv33bsxh0nh26ydzfl8sv8xabdp5a2gk6bhpb";
-          name = "repo";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -32389,8 +40637,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    req-package = callPackage ({ dash, fetchFromGitHub, fetchurl, ht, lib, log4e, melpaBuild, use-package }:
-    melpaBuild {
+    req-package = callPackage ({ dash
+                               , fetchFromGitHub
+                               , fetchurl
+                               , ht
+                               , lib
+                               , log4e
+                               , melpaBuild
+                               , use-package }:
+      melpaBuild {
         pname = "req-package";
         version = "1.2";
         src = fetchFromGitHub {
@@ -32399,10 +40654,10 @@
           rev = "0c0ac7451149dac6bfda2adfe959d1df1c273de6";
           sha256 = "0sx3kw1gpliifbc0gh2z1lvig68v3gwqjbj0izgn77js8kqxad84";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f58a801f0791566d0c39493a5f82ff0d15d7ab41/recipes/req-package";
           sha256 = "1438f60dnmc3a2dh6hd0wslrh25nd3af797aif70kv6qc71h87vf";
-          name = "req-package";
+          name = "recipe";
         };
         packageRequires = [ dash ht log4e use-package ];
         meta = {
@@ -32410,8 +40665,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    request = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    request = callPackage ({ emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "request";
         version = "0.3.0";
         src = fetchFromGitHub {
@@ -32420,10 +40679,10 @@
           rev = "a3d080e57eb8be606fbf39d1baff94e1b16e1fb8";
           sha256 = "0wyxqbb35yqf6ci47531lk32d6fppamx9d8826kdz983vm87him7";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8d113615dde757a60ce91e156f0714a1394c4bfc/recipes/request";
           sha256 = "0h4jqg98px9dqqvjp08vi2z1lhmk0ca59lnrcl96bi7gkkj3jiji";
-          name = "request";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -32431,20 +40690,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    request-deferred = callPackage ({ deferred, fetchFromGitHub, fetchurl, lib, melpaBuild, request }:
-    melpaBuild {
+    request-deferred = callPackage ({ deferred
+                                    , fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild
+                                    , request }:
+      melpaBuild {
         pname = "request-deferred";
         version = "0.3.0";
         src = fetchFromGitHub {
           owner = "tkf";
           repo = "emacs-request";
-          rev = "a3d080e57eb8be606fbf39d1baff94e1b16e1fb8";
-          sha256 = "0wyxqbb35yqf6ci47531lk32d6fppamx9d8826kdz983vm87him7";
+          rev = "aeae9028de5c489b07a5f5df29682eff47f80f6b";
+          sha256 = "002blp30bvi8l9b9mzjk8ib6xv3fps3j8cqrvbdj6dw2yvrcfl1g";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8d113615dde757a60ce91e156f0714a1394c4bfc/recipes/request-deferred";
           sha256 = "1dcxqnzmvddk61dzmfx8vjbzd8m44lscr3pjdp3r7211zhwfk40n";
-          name = "request-deferred";
+          name = "recipe";
         };
         packageRequires = [ deferred request ];
         meta = {
@@ -32452,20 +40716,27 @@
           license = lib.licenses.free;
         };
       }) {};
-    requirejs = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, popup, s }:
-    melpaBuild {
+    requirejs = callPackage ({ cl-lib ? null
+                             , fetchFromGitHub
+                             , fetchurl
+                             , js2-mode
+                             , lib
+                             , melpaBuild
+                             , popup
+                             , s }:
+      melpaBuild {
         pname = "requirejs";
         version = "1.1";
         src = fetchFromGitHub {
           owner = "joeheyming";
           repo = "requirejs-emacs";
-          rev = "7d73453653b6b97cca59fcde8d529b5a228fbc01";
-          sha256 = "1b832r7779rmr6rhzj7klc0l5xzwc4rids87g2hczpb5dhqnchca";
+          rev = "ba99f27f97c0552f724aac822ff4e507f801b916";
+          sha256 = "0s38b25jpf9l55c7z42zw5z86rihsymc48l0wp2n61ansafsalkk";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a6a710c0d5ab34c52498c4154deebb779052aa01/recipes/requirejs";
           sha256 = "09z6r9wcag3gj075wq215zcslyknl1izap595rn48xvizxi06c6k";
-          name = "requirejs";
+          name = "recipe";
         };
         packageRequires = [ cl-lib js2-mode popup s ];
         meta = {
@@ -32473,20 +40744,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    resize-window = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    resize-window = callPackage ({ cl-lib ? null
+                                 , emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "resize-window";
         version = "0.7";
         src = fetchFromGitHub {
           owner = "dpsutton";
           repo = "resize-window";
-          rev = "dcbbd30f4f4435070a66a22c5a169b752ca9f904";
-          sha256 = "0x2kkf7bdj9s3993kdz74igi80rqma0w3hi7aggf0zwllqdcnzvk";
+          rev = "e281aca5a1b371aff20d7bfc6abc456de22e19dd";
+          sha256 = "1d8jzhwif80bgj5pxa36hbavjrlmjg12yzxypl40d1wrjamq854c";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/601a8d8f9046db6c4d50af983a11fa2501304028/recipes/resize-window";
           sha256 = "0h1hlj50hc97wxqpnmvg6w3qhdd9nbnb8r8v39ylv87zqjcmlp8l";
-          name = "resize-window";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -32494,8 +40770,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    restart-emacs = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    restart-emacs = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "restart-emacs";
         version = "0.1.1";
         src = fetchFromGitHub {
@@ -32504,10 +40783,10 @@
           rev = "e9292fe88d8be7d0ecf9f4f30ed98ffbc6bd689b";
           sha256 = "0y4ga1lj2x2f0r535ivs09m2l0q76iz72w42wknhsw9lmdsyl5nz";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b9faeb6d910d686cbcafe7d12e0bcf62a85689bd/recipes/restart-emacs";
           sha256 = "03aabz7fmy99nwimvjn7qz6pvc94i470hfgiwmjz3348cw02k0n6";
-          name = "restart-emacs";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -32515,8 +40794,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    restclient-test = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, restclient }:
-    melpaBuild {
+    restclient-test = callPackage ({ emacs
+                                   , fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild
+                                   , restclient }:
+      melpaBuild {
         pname = "restclient-test";
         version = "0.2";
         src = fetchFromGitHub {
@@ -32525,10 +40809,10 @@
           rev = "a21e41b905b423e762eeb4da3a236c8b1aea8c49";
           sha256 = "1lan49723rpzg1q7w8x3iggazwl4zirq5l8nhpb8m5hmg21a4kih";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/82e3078fc1f96d276fd288c3d7b91df5df4717a6/recipes/restclient-test";
           sha256 = "0g26z5p9fq7fm6bgrwaszya5xmhsgzcn1p7zqr83w74fbw6bcl39";
-          name = "restclient-test";
+          name = "recipe";
         };
         packageRequires = [ emacs restclient ];
         meta = {
@@ -32536,8 +40820,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    reveal-in-osx-finder = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    reveal-in-osx-finder = callPackage ({ fetchFromGitHub
+                                        , fetchurl
+                                        , lib
+                                        , melpaBuild }:
+      melpaBuild {
         pname = "reveal-in-osx-finder";
         version = "0.3.3";
         src = fetchFromGitHub {
@@ -32546,10 +40833,10 @@
           rev = "5710e5936e47139a610ec9a06899f72e77ddc7bc";
           sha256 = "1q13cgpz4wzhnqv84ablawy3y2wgdwy46sp7454mmfx9m77jzb2v";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2bf40285279b761b0efd6bc8542ae9aad4b329e1/recipes/reveal-in-osx-finder";
           sha256 = "00jgrmh5s3vlpj1jjf8l3c3h4hjk5x781m95sidw6chimizvfmfc";
-          name = "reveal-in-osx-finder";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -32557,20 +40844,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    reverse-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    reverse-theme = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "reverse-theme";
         version = "0.3";
         src = fetchFromGitHub {
           owner = "syohex";
           repo = "emacs-reverse-theme";
-          rev = "3105c950bcb51c662c79b59ca102ef662c2b0be0";
-          sha256 = "15xnz4fi22wsximimwmirlz11v4ksfj8nilyjfw6acd92yrhzg6h";
+          rev = "13d0821a4ec5ece7e6a81f50d2a1a7e7ad21394d";
+          sha256 = "1sfl0rm4sxjkcjki0hmkkcicr24qr2q7gmficg9bi5q6vlrid1pn";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/81f0f525680fea98e804f39dbde1dada887e8821/recipes/reverse-theme";
           sha256 = "163kk5qnz9bk3l2fam79n264s764jfxbwqbiwgid8kw9cmk0v776";
-          name = "reverse-theme";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -32578,20 +40868,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    rg = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    rg = callPackage ({ cl-lib ? null
+                      , emacs
+                      , fetchFromGitHub
+                      , fetchurl
+                      , lib
+                      , melpaBuild
+                      , s }:
+      melpaBuild {
         pname = "rg";
         version = "1.5.0";
         src = fetchFromGitHub {
           owner = "dajva";
           repo = "rg.el";
-          rev = "d50bd106275f3ef7f77d0147857412fb065eef47";
-          sha256 = "0zjhak534j1n03z6p9wjmgc48yy40icrp2x8y9vbvg4hgx8xh9lm";
+          rev = "943226043dc9055b282d0c035fd1e1cbdd562b22";
+          sha256 = "0hm25x1zym4xdc4w1ayn1an4nrg1qwyh12vb9sxas3fplapm500k";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9ce1f721867383a841957370946f283f996fa76f/recipes/rg";
           sha256 = "0i78qvqdznh1z3b0mnzihv07j8b9r86dc1lsa1qlzacv6a2i9sbm";
-          name = "rg";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs s ];
         meta = {
@@ -32599,8 +40895,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    rib-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    rib-mode = callPackage ({ emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "rib-mode";
         version = "1.0.2";
         src = fetchFromGitHub {
@@ -32609,10 +40909,10 @@
           rev = "4172e902fd66f235184c0eb6db7fd4a73dbd0866";
           sha256 = "0s9dyqv4yh0zxngay951g98g07029h51m4r2fc7ib2arw6srfram";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c38c18f3eb75d559752fcd9956464fef890be728/recipes/rib-mode";
           sha256 = "0qgbzrwbbgg4mzjb7yw85qs83b6hpldazip1cigywr46w7f81587";
-          name = "rib-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -32620,20 +40920,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    rich-minority = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    rich-minority = callPackage ({ cl-lib ? null
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "rich-minority";
         version = "1.0.2";
         src = fetchFromGitHub {
           owner = "Malabarba";
           repo = "rich-minority";
-          rev = "3201f6e1769beb9f6cbbda392bef99fce337acf4";
-          sha256 = "1qa447k3qq2x1i2nxbm60wzr8kaysk3cifl09c13sv97n4yq3x2b";
+          rev = "333e4669f76a0fb68b433117d377711e418a525e";
+          sha256 = "0ms42fnfis6y2h717cqhngzv7ysgf8340rsfm2i7rx2gbdynr1ic";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/rich-minority";
           sha256 = "11xd76w5k3b3q5bxqjb55vi6dsal9drvyc1nh7z83awm59hvgczc";
-          name = "rich-minority";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -32641,20 +40945,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    rigid-tabs = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    rigid-tabs = callPackage ({ emacs
+                              , fetchFromGitLab
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "rigid-tabs";
         version = "1.0";
-        src = fetchFromGitHub {
+        src = fetchFromGitLab {
           owner = "wavexx";
           repo = "rigid-tabs.el";
           rev = "c7c6b726806df7e8cb25a41b213a207850c91cb7";
           sha256 = "0p044wg9d4i6f5x7bdshmisgwvw424y16lixac93q6v5bh3xmab5";
         };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/689b0060ee5db505fc0ed4603aca204b2d3c63a2/recipes/rigid-tabs";
-          sha256 = "06n0bcvc3nnp84pcq3lywwga7l92jz8hnkilhbq59kydf5zbjldp";
-          name = "rigid-tabs";
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/c1cf98dff029d494007fe25d29bd8bcfecc5b8e6/recipes/rigid-tabs";
+          sha256 = "0623hhhykrxq702871s5p4vddkvx7jpj6hg5q0c9jkbvflz9n9y8";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -32662,20 +40970,27 @@
           license = lib.licenses.free;
         };
       }) {};
-    rinari = callPackage ({ fetchFromGitHub, fetchurl, inf-ruby, jump, lib, melpaBuild, ruby-compilation, ruby-mode ? null }:
-    melpaBuild {
+    rinari = callPackage ({ fetchFromGitHub
+                          , fetchurl
+                          , inf-ruby
+                          , jump
+                          , lib
+                          , melpaBuild
+                          , ruby-compilation
+                          , ruby-mode ? null }:
+      melpaBuild {
         pname = "rinari";
         version = "2.11";
         src = fetchFromGitHub {
           owner = "eschulte";
           repo = "rinari";
-          rev = "e2ed2fa55ac3435a86b1cf6a4f2d29aebc309135";
-          sha256 = "1wqhqv2fc5h10igv1php51bayx0s7qw4m9gzx9by80dab8lwa0vk";
+          rev = "7a146b23f80ac672005adc74d3d71aae83383a21";
+          sha256 = "19f5n44f9qh7agvyhmwqmdh86y4vf1sn41h2afm85l2a8xq6r7rh";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4b243a909faa71e14ee7ca4f307df8e8136e5d7c/recipes/rinari";
           sha256 = "0qknicg3vzl7zbkwsdvp10hrvlng6mbi8hgslx4ir522dflrf9p0";
-          name = "rinari";
+          name = "recipe";
         };
         packageRequires = [ inf-ruby jump ruby-compilation ruby-mode ];
         meta = {
@@ -32683,8 +40998,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    ripgrep = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ripgrep = callPackage ({ fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "ripgrep";
         version = "0.4.0";
         src = fetchFromGitHub {
@@ -32693,10 +41011,10 @@
           rev = "73595f1364f2117db49e1e4a49290bd6d430e345";
           sha256 = "1a5rdpmvsgsjlc9sywism9pq7jd6n9qbcdsvpbfkq1npwhpifkbj";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e8d789818876e959a1a59690f1dd7d4efa6d608b/recipes/ripgrep";
           sha256 = "1j9c3mhcyhs4xf44z6fnlvmb81pps25bp43gdqvp0954i068mgah";
-          name = "ripgrep";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -32704,8 +41022,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    rjsx-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild }:
-    melpaBuild {
+    rjsx-mode = callPackage ({ emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , js2-mode
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "rjsx-mode";
         version = "0.4.0";
         src = fetchFromGitHub {
@@ -32714,10 +41037,10 @@
           rev = "f7d31589acd8a2dfcf4ca8851d2384e4f90364d0";
           sha256 = "057pgylflzd69ydqz41g8wisvixypdrfn8yv81mfixh3iyq740y8";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b83be7efdef2457e1320fe3dec46484fbd20263c/recipes/rjsx-mode";
           sha256 = "0w3ij8k8058pfw443chm1kn30ia0f5rfbg03w9ddw86xb3wa2q0b";
-          name = "rjsx-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs js2-mode ];
         meta = {
@@ -32725,8 +41048,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    robe = callPackage ({ emacs, fetchFromGitHub, fetchurl, inf-ruby, lib, melpaBuild }:
-    melpaBuild {
+    robe = callPackage ({ emacs
+                        , fetchFromGitHub
+                        , fetchurl
+                        , inf-ruby
+                        , lib
+                        , melpaBuild }:
+      melpaBuild {
         pname = "robe";
         version = "0.8.1";
         src = fetchFromGitHub {
@@ -32735,10 +41063,10 @@
           rev = "22457d6855fb39b8aedf068556d0e2fbd2874d5b";
           sha256 = "0ll7ivxqnglfb0i70ly6qq2yfw9cyi3vq3lmj4s6h6c1c7rm3gcq";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/673f920d02fe761bc080b73db7d37dbf5b6d86d8/recipes/robe";
           sha256 = "19py2lwi7maya90kh1mgwqb16j72f7gm05dwla6xrzq1aks18wrk";
-          name = "robe";
+          name = "recipe";
         };
         packageRequires = [ emacs inf-ruby ];
         meta = {
@@ -32746,8 +41074,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    robots-txt-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    robots-txt-mode = callPackage ({ fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "robots-txt-mode";
         version = "0.0.2";
         src = fetchFromGitHub {
@@ -32756,10 +41087,10 @@
           rev = "edf1f8082c88cb2ff5a784ba00f92c535aaa1c7d";
           sha256 = "11ig771ck610glb6f3322ka026ikq0b072rlq5z6ymr3rbxagn6j";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/eb13cb0dba1696cc51132cd1ff723fa17f892a7c/recipes/robots-txt-mode";
           sha256 = "00hxz4mygcxg7d8m2i4cm0bl82v3hw8wb4m8vv7g7fqkjp32c9qc";
-          name = "robots-txt-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -32767,8 +41098,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    roguel-ike = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, popup }:
-    melpaBuild {
+    roguel-ike = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild
+                              , popup }:
+      melpaBuild {
         pname = "roguel-ike";
         version = "0.1.1";
         src = fetchFromGitHub {
@@ -32777,10 +41112,10 @@
           rev = "706dcb0687e8016d7d776f9d9e5ace9fdbbca43c";
           sha256 = "0rgv4y9aa5cc2ddz3y5z8d22xmr8kf5c60h0r3g8h91jmcw3rb4z";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2db1979e039e466268ca7c264988792d3046e19a/recipes/roguel-ike";
           sha256 = "1a7sa6nhgi0s4gjh55bhk5cg6q6s7564fk008ibmrm05gfq9wlg8";
-          name = "roguel-ike";
+          name = "recipe";
         };
         packageRequires = [ popup ];
         meta = {
@@ -32788,8 +41123,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    rope-read-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    rope-read-mode = callPackage ({ fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "rope-read-mode";
         version = "0.3.4";
         src = fetchFromGitHub {
@@ -32798,10 +41136,10 @@
           rev = "71e475ab35555e0a1eca26d73acf1ced911e422e";
           sha256 = "0x3mmf4gq4d0cqfqbkrrpwhayvmplacck0zc9nlzcn35y17jzpcz";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/14a674559aa485e92357a8b941304ae8167b9c3e/recipes/rope-read-mode";
           sha256 = "0grnn5k6rbck0hz4c6cadgj3a4dv62habyingznisg2kx9i3m0dw";
-          name = "rope-read-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -32809,20 +41147,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    rsense = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    rsense = callPackage ({ fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "rsense";
         version = "0.3";
         src = fetchFromGitHub {
           owner = "m2ym";
           repo = "rsense";
-          rev = "e4297052ef32d06237e8bd1534a0caf70a34ad28";
-          sha256 = "0mfkq8n28lal4lqwp6v0ilz8wrwgg61sbm0jggznwisjqqy3lzrh";
+          rev = "fbcfc00402742b0d8744a9bfd1bcdd869f4fb923";
+          sha256 = "178rnmhj3987dscsjkg5qcsw92s3b5rv51s0j7qcavx254h7xdf0";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e2149ce3baef9ac01d5b2e8b1a933a3e1206015f/recipes/rsense";
           sha256 = "1901xqlpc8fg4sl9j58jn40i2djs8s0cdcqcrzrq02lvk8ssfdf5";
-          name = "rsense";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -32830,8 +41171,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    rspec-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, ruby-mode ? null }:
-    melpaBuild {
+    rspec-mode = callPackage ({ cl-lib ? null
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild
+                              , ruby-mode ? null }:
+      melpaBuild {
         pname = "rspec-mode";
         version = "1.11";
         src = fetchFromGitHub {
@@ -32840,10 +41186,10 @@
           rev = "e289e52ec4b3aa1caf35957d721e5568eca2a3bb";
           sha256 = "0hrn5n7aaymwimk511kjij44vqaxbmhly1gwmlmsrnbvvma7f2mp";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cd83e61b10da20198de990aa081b47d3b0b44d43/recipes/rspec-mode";
           sha256 = "0nyib9rx9w9cbsgkcjx9n8fp77xkzxg923z0rdm3f9kc7njcn0zx";
-          name = "rspec-mode";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ruby-mode ];
         meta = {
@@ -32851,8 +41197,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    rtags = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    rtags = callPackage ({ fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "rtags";
         version = "2.18";
         src = fetchFromGitHub {
@@ -32861,10 +41210,10 @@
           rev = "98d668e85cf9ae84e775742752c5656dd2df2f17";
           sha256 = "0raqjbkl1ykga4ahgl9xw49cgh3cyqcf42z36z7d6fz1fw192kg0";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/rtags";
           sha256 = "0s5m4zjvnc1k4gkkizbs4ysvzzbfh45717pksg9bnyzwx5lcw5yd";
-          name = "rtags";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -32872,8 +41221,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    rubik = callPackage ({ calc, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    rubik = callPackage ({ calc
+                         , cl-lib ? null
+                         , emacs
+                         , fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "rubik";
         version = "1.2";
         src = fetchFromGitHub {
@@ -32882,10 +41237,10 @@
           rev = "7ec955639865ca8e99a941843e19b12be5015a47";
           sha256 = "0fdjg6gpg45m5myq517vkprmvh50xw10dqa8vwr9hfz2z8dy18ja";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/00946ed21b0f05b753c792863f6bcc99c26c32a3/recipes/rubik";
           sha256 = "07bbh5vjw3jdxf06lxqm45y8ijcai391mf97xw5c29z33vhqs267";
-          name = "rubik";
+          name = "recipe";
         };
         packageRequires = [ calc cl-lib emacs ];
         meta = {
@@ -32893,8 +41248,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    rubocop = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    rubocop = callPackage ({ emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "rubocop";
         version = "0.5.0";
         src = fetchFromGitHub {
@@ -32903,10 +41262,10 @@
           rev = "980bedb455e3551d35a212fae515c054888907c1";
           sha256 = "152ara2p59imry2ymfnk5mycbc07rblcmfmqjgm5fijb2x94xv8p";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/00f2cf3e8e28bce5c26c86aba54390ffff48d7da/recipes/rubocop";
           sha256 = "114azl0fasmnq0fxxyiif3363mpg8qz3ynx91in5acqzh902fa3q";
-          name = "rubocop";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -32914,8 +41273,37 @@
           license = lib.licenses.free;
         };
       }) {};
-    ruby-compilation = callPackage ({ fetchFromGitHub, fetchurl, inf-ruby, lib, melpaBuild }:
-    melpaBuild {
+    rubocopfmt = callPackage ({ cl-lib ? null
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
+        pname = "rubocopfmt";
+        version = "0.2.2";
+        src = fetchFromGitHub {
+          owner = "jimeh";
+          repo = "rubocopfmt.el";
+          rev = "34c69c9c923d0da223f7569a6ecc842095adcf85";
+          sha256 = "0aa683r16gvpv07i0gzbil81kgxbgk4pjn510xgalan3fk20nal4";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/ac01edffceea771d8fe41326e28dd9881f1661ab/recipes/rubocopfmt";
+          sha256 = "06ficv1r3axzi7q659pk1m3gbpf44nd2ir2ikmi8mr8rq44sqps0";
+          name = "recipe";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "https://melpa.org/#/rubocopfmt";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ruby-compilation = callPackage ({ fetchFromGitHub
+                                    , fetchurl
+                                    , inf-ruby
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "ruby-compilation";
         version = "2.11";
         src = fetchFromGitHub {
@@ -32924,10 +41312,10 @@
           rev = "e2ed2fa55ac3435a86b1cf6a4f2d29aebc309135";
           sha256 = "1wqhqv2fc5h10igv1php51bayx0s7qw4m9gzx9by80dab8lwa0vk";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ca7bf43ef8893bf04e9658390e306ef69e80a156/recipes/ruby-compilation";
           sha256 = "1x1vpkjpx95sfcjhkx4cafypj0nkbd1i0mzxx3lmcrsmg8iv0rjc";
-          name = "ruby-compilation";
+          name = "recipe";
         };
         packageRequires = [ inf-ruby ];
         meta = {
@@ -32935,8 +41323,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    ruby-electric = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ruby-electric = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "ruby-electric";
         version = "2.3.1";
         src = fetchFromGitHub {
@@ -32945,10 +41336,10 @@
           rev = "3553448a780a1ea5c3b0e9becd820d4762876593";
           sha256 = "0h47lfgxjcyyl8gb1w7l8j8h65s3lp1hsq742sl7a1gf5y6bbm3v";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5fd5fa797a813e02a6433ecbe2bca1270a383753/recipes/ruby-electric";
           sha256 = "02xskivi917l8xyhrij084dmzwjq3knjcn65l2iwz34s767fbwl2";
-          name = "ruby-electric";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -32956,8 +41347,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    ruby-end = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ruby-end = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "ruby-end";
         version = "0.4.1";
         src = fetchFromGitHub {
@@ -32966,10 +41360,10 @@
           rev = "648b81af136a581bcef387744d93c011d9cdf54b";
           sha256 = "1cpz9vkp57nk682c5xm20g7bfj5g2aq5ahpk4nhgx7pvd3xvr1ds";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/ruby-end";
           sha256 = "1cnmdlkhm8xsifbjs6ymvi92gdnxiaghb04h10qg41phj6v7m9mg";
-          name = "ruby-end";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -32977,8 +41371,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    ruby-hash-syntax = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ruby-hash-syntax = callPackage ({ fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "ruby-hash-syntax";
         version = "0.5";
         src = fetchFromGitHub {
@@ -32987,10 +41384,10 @@
           rev = "bc05c3130a5d3237f04c6064297e56de5f73887d";
           sha256 = "1jwvyj3kqchd40h37m75ydl0gjrbm873dhfn1grqg4sgk60hr414";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c7d21a43a4bf267507bdc746ec9d0fd82049c0af/recipes/ruby-hash-syntax";
           sha256 = "0bvwyagfh7mn457iibrpv1ay75089gp8pg608gbm24m0ix82xvb5";
-          name = "ruby-hash-syntax";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -32998,20 +41395,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    ruby-test-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ruby-test-mode = callPackage ({ fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "ruby-test-mode";
         version = "1.0";
         src = fetchFromGitHub {
           owner = "r0man";
           repo = "ruby-test-mode";
-          rev = "7d3c04b60721665af93ffb4abc2a7b3191926431";
-          sha256 = "008zj9rg2cmh0xd7g6kgx6snm5sspxs4jmfa8hd43wx5y9pmlb8f";
+          rev = "a8f41e63d9e9b031fcbad57911b0a28a444f6cdb";
+          sha256 = "1wck3n2lcsasrg14jimm9iiyxdsh9mr9293q1kx4l0jm0z1k8f43";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ruby-test-mode";
           sha256 = "06j1q9m08jkwlnkccppf2qlcs48nr8ic9sjdv90rnixc18bw7bpk";
-          name = "ruby-test-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -33019,8 +41419,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    ruby-tools = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ruby-tools = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "ruby-tools";
         version = "0.1.2";
         src = fetchFromGitHub {
@@ -33029,10 +41432,10 @@
           rev = "6e7fb376085bfa7010ecd3dfad63adacc6e2b4ac";
           sha256 = "1zvhq9l717rjgkm7bxz5gqkmh5i49cshwzlimb3h78kpjw3hxl2k";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/ruby-tools";
           sha256 = "0zpk55rkrqyangyyljxzf0n1icgqnpdzycwack5rji556h5grvjy";
-          name = "ruby-tools";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -33040,20 +41443,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    rufo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    rufo = callPackage ({ emacs
+                        , fetchFromGitHub
+                        , fetchurl
+                        , lib
+                        , melpaBuild }:
+      melpaBuild {
         pname = "rufo";
         version = "0.3.0";
         src = fetchFromGitHub {
           owner = "danielma";
           repo = "rufo.el";
-          rev = "4e7413fafd0320f30190ae9835ab021cf7a9ebdc";
-          sha256 = "10gwr479q4kd6ndp9r2nzj7rzap21q3f0l3icrviah9l5xzdx2x0";
+          rev = "550651cbb39bef875a994cbcda10ecd6f9ab1d6d";
+          sha256 = "0i0azjnrp4km9p5zmdzj9py7g0wg6h5dwi4pz0j5zj0a97qiqmhy";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/123b89e06a44ef45150ca7243afc41302dfb6c6e/recipes/rufo";
           sha256 = "0pxsifcxic3q54rqj0jbj20hq7f2s4icl57lligf9g0w23qzj239";
-          name = "rufo";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -33061,20 +41468,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    runner = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    runner = callPackage ({ fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "runner";
         version = "1.8";
         src = fetchFromGitHub {
           owner = "thamer";
           repo = "runner";
-          rev = "a211d57ddc600410d07a8b534920ba905b093d87";
-          sha256 = "1ddf5jydpc43wgvw4a669wifij71b4r8zfazcqfdpyfh1j4m591b";
+          rev = "e7394d7c9e886788a656a7085b4cf963d6fc318f";
+          sha256 = "0gpfszp6bqr3vdr32vr6l0nq9hnic31vnins68hc5hknli91bpsq";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f3a4e051ab45b8036b91aa0c50bd3f93cd85e9d0/recipes/runner";
           sha256 = "09apmk22swj05z77ziij31jj6b3g221qv3mw3mymffzxn5ap2rbx";
-          name = "runner";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -33082,8 +41492,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    russian-holidays = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    russian-holidays = callPackage ({ fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "russian-holidays";
         version = "0.4";
         src = fetchFromGitHub {
@@ -33092,10 +41505,10 @@
           rev = "b285a30f29d85c48e3ea4eb93972d34a090c167b";
           sha256 = "1mz842gvrscklg2w2r2q2wbj92qr31h895k700j3axqx6k30ni0h";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d4830900e371e7036225ea434c52204f4d2481a7/recipes/russian-holidays";
           sha256 = "0lawjwz296grbvb4a1mm1j754q7mpcanyfln1gqxr339kqx2aqd8";
-          name = "russian-holidays";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -33103,8 +41516,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    rust-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    rust-mode = callPackage ({ emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "rust-mode";
         version = "0.3.0";
         src = fetchFromGitHub {
@@ -33113,10 +41530,10 @@
           rev = "e32765893ce2efb2db6662f507fb9d33d5c1b61b";
           sha256 = "03i79iqhr8fzri018hx65rix1fsdxk38pkvbw5z6n5flbfr4m0k4";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8f6e5d990d699d571dccbdeb13327b33389bb113/recipes/rust-mode";
           sha256 = "1i1mw1v99nyikscg2s1m216b0h8svbzmf5kjvjgk9zjiba4cbqzc";
-          name = "rust-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -33124,20 +41541,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    rust-playground = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, rust-mode }:
-    melpaBuild {
+    rust-playground = callPackage ({ emacs
+                                   , fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild
+                                   , rust-mode }:
+      melpaBuild {
         pname = "rust-playground";
-        version = "0.1";
+        version = "0.2.1";
         src = fetchFromGitHub {
           owner = "grafov";
           repo = "rust-playground";
-          rev = "6a23f8956bce1deaa38f52c01f5571c5cff77445";
-          sha256 = "1aqcpmzzww4fd63l65rfyj0f8skdqh7j1vznwqnj71x65xlda0ys";
+          rev = "2f22ec74e4158984e0e70cf0bf728bbd42eb661b";
+          sha256 = "1p80zghdk3hsfj36z30sfkllqr3b4yi279zkg0la9kfg6785x2cg";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/rust-playground";
           sha256 = "0ml0zr9vz2vjd9wr0v706w4v4qqfzpa56rdzfak2kb5llx53j89v";
-          name = "rust-playground";
+          name = "recipe";
         };
         packageRequires = [ emacs rust-mode ];
         meta = {
@@ -33145,8 +41567,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    rvm = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    rvm = callPackage ({ fetchFromGitHub
+                       , fetchurl
+                       , lib
+                       , melpaBuild }:
+      melpaBuild {
         pname = "rvm";
         version = "1.4.0";
         src = fetchFromGitHub {
@@ -33155,10 +41580,10 @@
           rev = "8e45a9bad8e317ff195f384dab14d3402497dc79";
           sha256 = "0iblk0vagjcg3c8q9hlpwk7426ms7aq0s80izgvascfmyqycv6qm";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/rvm";
           sha256 = "08i7cmav2cz73jp88ww0ay2yjhk9dj8146836q4sij1bl1slbaf8";
-          name = "rvm";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -33166,8 +41591,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    s = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    s = callPackage ({ fetchFromGitHub
+                     , fetchurl
+                     , lib
+                     , melpaBuild }:
+      melpaBuild {
         pname = "s";
         version = "1.12.0";
         src = fetchFromGitHub {
@@ -33176,10 +41604,10 @@
           rev = "12f116d58ac03706496bd682c6449b452681874e";
           sha256 = "1g8mqd13llj007al4nlxxx4z2lcsg3wk970mgjn0avwrhjjgdmmv";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/s";
           sha256 = "0dars9212z0yv97mj4615h23vd22vy8b6cw2n433z9jhif3aybqa";
-          name = "s";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -33187,8 +41615,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    sackspace = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    sackspace = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "sackspace";
         version = "0.8.2";
         src = fetchFromGitHub {
@@ -33197,10 +41628,10 @@
           rev = "fd0480eaaf6d3d11fd30ac5feb2da2f4f7572708";
           sha256 = "06gqqbkn85l2p05whmr4wkg9axqyzb7r7sgm3r8wfshm99kgpxvl";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/073e92e05c4bd6197a5ad24f470b21a97f5bb7b8/recipes/sackspace";
           sha256 = "1m10iw83k6m7v7sg2dxzdy83zxq6svk8h9fh4ankyn3baqrdxg5z";
-          name = "sackspace";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -33208,8 +41639,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    sage-shell-mode = callPackage ({ cl-lib ? null, deferred, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }:
-    melpaBuild {
+    sage-shell-mode = callPackage ({ cl-lib ? null
+                                   , deferred
+                                   , emacs
+                                   , fetchFromGitHub
+                                   , fetchurl
+                                   , let-alist
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "sage-shell-mode";
         version = "0.3";
         src = fetchFromGitHub {
@@ -33218,10 +41656,10 @@
           rev = "e8bc089e8dfd76f688160e2ac77aee985afeade7";
           sha256 = "166plwg9ggivr3im0yfxw8k6m9ral37jzznnb06kb6g0zycb4aps";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/eb875c50c2f97919fd0027869c5d9970e1eaf373/recipes/sage-shell-mode";
           sha256 = "0ivqiigmp9cf88j4xapzanjpbx692r70wb4i25mnppqsi3jlwxdv";
-          name = "sage-shell-mode";
+          name = "recipe";
         };
         packageRequires = [ cl-lib deferred emacs let-alist ];
         meta = {
@@ -33229,8 +41667,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    salt-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, mmm-jinja2, mmm-mode, yaml-mode }:
-    melpaBuild {
+    salt-mode = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild
+                             , mmm-jinja2
+                             , mmm-mode
+                             , yaml-mode }:
+      melpaBuild {
         pname = "salt-mode";
         version = "0.1";
         src = fetchFromGitHub {
@@ -33239,10 +41683,10 @@
           rev = "e14ed8f2ce0ab7a783c4341879ec8c003e2b5c81";
           sha256 = "19gw35qv13f2r4wif5fgqfhrph2r320n81faxx8980zds28x2q0x";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9dcf1a93a06fc42581521c88cfd988b03bedc000/recipes/salt-mode";
           sha256 = "1n7i9d6qpjsdcgbzmbf63y4c7ggxh5wsim8fd0casnrq9bl7ssym";
-          name = "salt-mode";
+          name = "recipe";
         };
         packageRequires = [ mmm-jinja2 mmm-mode yaml-mode ];
         meta = {
@@ -33250,8 +41694,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    sass-mode = callPackage ({ fetchFromGitHub, fetchurl, haml-mode, lib, melpaBuild }:
-    melpaBuild {
+    sass-mode = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , haml-mode
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "sass-mode";
         version = "3.0.18";
         src = fetchFromGitHub {
@@ -33260,10 +41708,10 @@
           rev = "26a66e331b507fb420e3bb7d0a6a8fbb04294343";
           sha256 = "0lxrq3mzabkwj5bv0mgd7fnx3dsx8vxd5kjgb79rjfra0m7pfgln";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/sass-mode";
           sha256 = "1byjk5zpzjlyiwkp780c4kh7s9l56y686sxji89wc59d19rp8800";
-          name = "sass-mode";
+          name = "recipe";
         };
         packageRequires = [ haml-mode ];
         meta = {
@@ -33271,8 +41719,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    sauron = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    sauron = callPackage ({ fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "sauron";
         version = "0.10";
         src = fetchFromGitHub {
@@ -33281,10 +41732,10 @@
           rev = "a9877f0efa9418c41d25002b58d1c2f8c69ec975";
           sha256 = "1mcag7qad1npjn096byakb8pmmi2g64nlf2vcc12irzmwia85fml";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9d30dcc4715422133e1bb00ad7a8e25b060387e4/recipes/sauron";
           sha256 = "01fk1xfh7r16fb1xg5ibbs7gci9dja49msdlf7964hiq7pnnhxgb";
-          name = "sauron";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -33292,8 +41743,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    say-what-im-doing = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    say-what-im-doing = callPackage ({ fetchFromGitHub
+                                     , fetchurl
+                                     , lib
+                                     , melpaBuild }:
+      melpaBuild {
         pname = "say-what-im-doing";
         version = "0.2";
         src = fetchFromGitHub {
@@ -33302,10 +41756,10 @@
           rev = "4acc16360a29646040b51db158ba7fdeb711449d";
           sha256 = "1gkzgcnh5ib4j5206mx8gbwj5ykay19vqlfg9070m2r09d1a55qf";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4d22ddcd4ad9514fe0c36f299e7463a4b7e771d7/recipes/say-what-im-doing";
           sha256 = "1hgh842f7gs2sxy7s6zq57nsqy4jjlnjcga6hwzcx0kw3albgz7x";
-          name = "say-what-im-doing";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -33313,8 +41767,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    sayid = callPackage ({ cider, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    sayid = callPackage ({ cider
+                         , fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "sayid";
         version = "0.0.16";
         src = fetchFromGitHub {
@@ -33323,10 +41781,10 @@
           rev = "8ea70573e6eb1a0d1a450fd501f38c2cf26ce27f";
           sha256 = "02yp3h16yzys27lxcxn7qzb23z95vjdaxhinz0swdixgr5qwwc77";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2bd2e05f9c9328d8f9ae434c86697a4a04af8b0d/recipes/sayid";
           sha256 = "0chz46wmwmsn4ys59pn7lqs4assqy2hv43rvka7kq61jdl4g6fgs";
-          name = "sayid";
+          name = "recipe";
         };
         packageRequires = [ cider ];
         meta = {
@@ -33334,20 +41792,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    sbt-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    sbt-mode = callPackage ({ emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "sbt-mode";
-        version = "1.0.2";
+        version = "2.0.0";
         src = fetchFromGitHub {
           owner = "ensime";
           repo = "emacs-sbt-mode";
-          rev = "a70899661861cf40f54f773c3066fe5b5e9fb71d";
-          sha256 = "0gnqy88qi751pzpg8ga3j2yx0x9cz5inkqpv2451n5b0gjfps9yh";
+          rev = "e658af140547cbef495c33535c7f694a501d318c";
+          sha256 = "0lv9ridzk9x6rkf7lj21srnszypyq04vqg05vl10zhpz1yqlnbjd";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/364abdc3829fc12e19f00b534565227dbc30baad/recipes/sbt-mode";
           sha256 = "0v0n70czgkdijnw5jd4na41vlrmqcshvr8gdpv0bv55ilqhiihc8";
-          name = "sbt-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -33355,8 +41817,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    scala-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    scala-mode = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "scala-mode";
         version = "1.0.0";
         src = fetchFromGitHub {
@@ -33365,10 +41830,10 @@
           rev = "56cba2903cf6e12c715dbb5c99b34c97b2679379";
           sha256 = "13miqdn426cw9y1wqaz5smmf0wi3bzls95z6shcxzdz8cg50zmpg";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/564aa1637485192a97803af46b3a1f8e0d042c9a/recipes/scala-mode";
           sha256 = "12x377iw085fbkjb034dmcsbi7hma17zkkmbgrhkvfkz8pbgaic8";
-          name = "scala-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -33376,8 +41841,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    schrute = callPackage ({ emacs, fetchgit, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    schrute = callPackage ({ emacs
+                           , fetchgit
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "schrute";
         version = "0.2.2";
         src = fetchgit {
@@ -33385,10 +41854,10 @@
           rev = "08ab6565fa94f3a8016163fe6f7be1932af1156b";
           sha256 = "0l1k6wjjr569lk5k8ydwq13041kn889g20qbzf79qj1ws96rim4m";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/505fc4d26049d4e2973a54b24117ccaf4f2fb7e7/recipes/schrute";
           sha256 = "1sr49wr3738sqfzix7v9rj6bvv7q2a46qdkimn9z7rnsjys9i7zy";
-          name = "schrute";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -33396,8 +41865,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    scpaste = callPackage ({ fetchFromGitHub, fetchurl, htmlize, lib, melpaBuild }:
-    melpaBuild {
+    scpaste = callPackage ({ fetchFromGitHub
+                           , fetchurl
+                           , htmlize
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "scpaste";
         version = "0.6.5";
         src = fetchFromGitHub {
@@ -33406,10 +41879,10 @@
           rev = "cca8f4ee5402bbf9a4bbb24e81372067cb21bba4";
           sha256 = "13s8hp16wxd9fb8gf05dn0xr692kkgiqg7v49fgr00gas4xgpfpm";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9007fb32097bc63731c3615dae9342fcef2558a2/recipes/scpaste";
           sha256 = "02dqmx6v3jxdn5yz1z74624sc6sz2bm4qjyi78w9akhp2jplwlk1";
-          name = "scpaste";
+          name = "recipe";
         };
         packageRequires = [ htmlize ];
         meta = {
@@ -33417,8 +41890,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    scss-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    scss-mode = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "scss-mode";
         version = "0.5.0";
         src = fetchFromGitHub {
@@ -33427,10 +41903,10 @@
           rev = "d663069667d9b158d56e863b80dd4cc02984e49f";
           sha256 = "0zpjf9cp8g4rgnwgmhlpwnanf9lzqm3rm1mkihf0gk5qzxvwsdh9";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/scss-mode";
           sha256 = "1g27xnp6bjaicxjlb9m0njc6fg962j3hlvvzmxvmyk7gsdgcgpkv";
-          name = "scss-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -33438,8 +41914,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    search-web = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    search-web = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "search-web";
         version = "1.1";
         src = fetchFromGitHub {
@@ -33448,10 +41927,10 @@
           rev = "c4ae86ac1acfc572b81f3d78764bd9a54034c331";
           sha256 = "08yc67a4ji7z8s0zh500wiscziqsxi92i1d33fjla2mcr8sxxn0i";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1f1a3697649ccf69c8eb177c31ec4246b98f503b/recipes/search-web";
           sha256 = "0qqx9l8dn1as4gqpq80jfacn6lz0132m91pjzxv0fx6al2iz0m36";
-          name = "search-web";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -33459,8 +41938,16 @@
           license = lib.licenses.free;
         };
       }) {};
-    secretaria = callPackage ({ alert, emacs, f, fetchgit, fetchurl, lib, melpaBuild, org, s }:
-    melpaBuild {
+    secretaria = callPackage ({ alert
+                              , emacs
+                              , f
+                              , fetchgit
+                              , fetchurl
+                              , lib
+                              , melpaBuild
+                              , org
+                              , s }:
+      melpaBuild {
         pname = "secretaria";
         version = "0.2.7";
         src = fetchgit {
@@ -33468,10 +41955,10 @@
           rev = "1cd32d957864be1ba5c44a3f505f662832169a28";
           sha256 = "1xvwzmcfwfxsm9chbjnqjsipmv5pqpzk5d0ybw3rcdc47nag3jdg";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7b4c9ccbf2eeaa290f3b9d1e5eaaeb5b5547b365/recipes/secretaria";
           sha256 = "1a8jf91wplzazssh0s8ld0g8rp57gdfvxlsyn643w3mbp3ny8ybv";
-          name = "secretaria";
+          name = "recipe";
         };
         packageRequires = [ alert emacs f org s ];
         meta = {
@@ -33479,8 +41966,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    sekka = callPackage ({ cl-lib ? null, concurrent, fetchFromGitHub, fetchurl, lib, melpaBuild, popup }:
-    melpaBuild {
+    sekka = callPackage ({ cl-lib ? null
+                         , concurrent
+                         , fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild
+                         , popup }:
+      melpaBuild {
         pname = "sekka";
         version = "1.8.0";
         src = fetchFromGitHub {
@@ -33489,10 +41982,10 @@
           rev = "d1fd5d47aacba723631d5d374169a45ff2051c41";
           sha256 = "035rx863cj3hs1lhayff0810cpp6kv8nwc1c0y54gvdk1bb333x0";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/350bbb5761b5ba69aeb4acf6d7cdf2256dba95a6/recipes/sekka";
           sha256 = "1jj4ly9p7m3xvb31nfn171lbpm9y70y8cbf8p24w0fhv665dx0cp";
-          name = "sekka";
+          name = "recipe";
         };
         packageRequires = [ cl-lib concurrent popup ];
         meta = {
@@ -33500,8 +41993,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    select-themes = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    select-themes = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "select-themes";
         version = "0.1.4";
         src = fetchFromGitHub {
@@ -33510,10 +42006,10 @@
           rev = "236f54287519a3ea6dd7b3992d053e4f4ff5d0fe";
           sha256 = "1c9yv1kjcd0jrzgw99q9p4kzj980f261mjcsggbcw806wb0iw1xn";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e4e7d01da10a1a1f7fe563031af5d3f9694cea33/recipes/select-themes";
           sha256 = "18ydv7240vcqppg1i7n8sy18hy0lhpxz17947kxs7mvj4rl4wd84";
-          name = "select-themes";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -33521,8 +42017,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    selectric-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    selectric-mode = callPackage ({ fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "selectric-mode";
         version = "1.4.1";
         src = fetchFromGitHub {
@@ -33531,10 +42030,10 @@
           rev = "a35cb3815caceaf273ad7d16ac3b2dd3c7a3003e";
           sha256 = "04bj71080wqybznyx63dawhppq6x3p88x1j56gvl8kvxv2hwzgzf";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/08922071b9854142eab726302e75f1db2d326ec5/recipes/selectric-mode";
           sha256 = "1k4l0lr68rqyi37wvqp1cnfci6jfkz0gvrd1hwbgx04cjgmz56n4";
-          name = "selectric-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -33542,8 +42041,19 @@
           license = lib.licenses.free;
         };
       }) {};
-    servant = callPackage ({ ansi, commander, dash, epl, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s, shut-up, web-server }:
-    melpaBuild {
+    servant = callPackage ({ ansi
+                           , commander
+                           , dash
+                           , epl
+                           , f
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild
+                           , s
+                           , shut-up
+                           , web-server }:
+      melpaBuild {
         pname = "servant";
         version = "0.3.0";
         src = fetchFromGitHub {
@@ -33552,10 +42062,10 @@
           rev = "4d2aa8250b54b28e6e7ee4cd5ebd98a33db2c134";
           sha256 = "15lx6qvmq3vp84ys8dzbx1nzxcnzlq41whawc2yhrnd1dbq4mv2d";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/servant";
           sha256 = "0h8xsg37cvc5r8vkclf7d3gbf6gh4k5pmbiyhwpkbrxwjyl1sl21";
-          name = "servant";
+          name = "recipe";
         };
         packageRequires = [ ansi commander dash epl f s shut-up web-server ];
         meta = {
@@ -33563,8 +42073,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    serverspec = callPackage ({ dash, f, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }:
-    melpaBuild {
+    serverspec = callPackage ({ dash
+                              , f
+                              , fetchFromGitHub
+                              , fetchurl
+                              , helm
+                              , lib
+                              , melpaBuild
+                              , s }:
+      melpaBuild {
         pname = "serverspec";
         version = "0.0.7";
         src = fetchFromGitHub {
@@ -33573,10 +42090,10 @@
           rev = "b6dfe82af9869438de5e5d860ced196641f372c0";
           sha256 = "1h58q41wixjlapia1ggf83jxcllq7492k55mc0fq7hbx3hw1q1y2";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5a4f4757d8886d178a85d4bc8ac9399a99d8c4d4/recipes/serverspec";
           sha256 = "001d57yd0wmz4d7qmhnanac8g29wls0sqw194003hrgirakg82id";
-          name = "serverspec";
+          name = "recipe";
         };
         packageRequires = [ dash f helm s ];
         meta = {
@@ -33584,8 +42101,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    services = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    services = callPackage ({ cl-lib ? null
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "services";
         version = "1.7";
         src = fetchFromGitHub {
@@ -33594,10 +42115,10 @@
           rev = "514e4095e8964c4d0f38c4f3ad6c692e86d12faa";
           sha256 = "1k6w2ghi1iczh65bbln5ryxwnxmkkjm3p0p54s155q9sjidiqlwb";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/beb91b4397f6e35a1d5c73a127d8cd7fc9201935/recipes/services";
           sha256 = "02lgmpbw52ps6z4p9gwzvh9iaxisq5mb0n9aml9ajxac1473vpcd";
-          name = "services";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -33605,8 +42126,36 @@
           license = lib.licenses.free;
         };
       }) {};
-    session = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    sesman = callPackage ({ emacs
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
+        pname = "sesman";
+        version = "0.1.1";
+        src = fetchFromGitHub {
+          owner = "vspinu";
+          repo = "sesman";
+          rev = "0d8d1bef455b58439df333f2a0a0693543b8f098";
+          sha256 = "1hgl1djfxiajcc5rnwq7rlli6fhim57mbmabxdsc78p18c1azxhz";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/31110e9bd82ad9c817e6cb597fa9c26c4cdc93ed/recipes/sesman";
+          sha256 = "106jcdsp7rhkr4bbyprcld5fxcnimfcyx0cwcpzhd0b4vh3v3qvg";
+          name = "recipe";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/sesman";
+          license = lib.licenses.free;
+        };
+      }) {};
+    session = callPackage ({ fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "session";
         version = "2.3.1";
         src = fetchFromGitHub {
@@ -33615,10 +42164,10 @@
           rev = "19ea0806873daac3539a4b956e15655e99e3dd6c";
           sha256 = "0sp952abz7dkq8b8kkzzmnwnkq5w15zsx5dr3h8lzxb92lnank9v";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5f2a50f62475639af011c99c6cc38928b74b3b0a/recipes/session";
           sha256 = "0fghxbnf1d5iyrx1q8xd0lbw9nvkdgg2v2f89j6apnawisrsbhwx";
-          name = "session";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -33626,8 +42175,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    sexp-move = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    sexp-move = callPackage ({ fetchFromGitLab
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "sexp-move";
         version = "0.2.6";
         src = fetchFromGitLab {
@@ -33636,10 +42188,10 @@
           rev = "117f7a91ab7c25e438413753e916570122011ce7";
           sha256 = "11h5z2gmwq07c4gqzj2c9apksvqk3k8kpbb9kg78bbif2xfajr3m";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/sexp-move";
           sha256 = "0sdm3kr4594fy9hk8yljj2iwa40bgs8nqpwwl2a60r060spz54z9";
-          name = "sexp-move";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -33647,8 +42199,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    sexy-monochrome-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    sexy-monochrome-theme = callPackage ({ fetchFromGitHub
+                                         , fetchurl
+                                         , lib
+                                         , melpaBuild }:
+      melpaBuild {
         pname = "sexy-monochrome-theme";
         version = "3.1";
         src = fetchFromGitHub {
@@ -33657,10 +42212,10 @@
           rev = "f64714a176d9212c9fa82355dd8ec89587ce13f0";
           sha256 = "17ahrdyk2v7vz13b4934xn8xjza4b7bfrkq8n42frq3pc8mgwqfd";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/dfd5ae9a93e036d11899c7adffdf6b63c2b21381/recipes/sexy-monochrome-theme";
           sha256 = "0rlx4029zxrnzzqspn8zrp3q6w0n46q24qk7za46hvxdsmgdpxbq";
-          name = "sexy-monochrome-theme";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -33668,8 +42223,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    shackle = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    shackle = callPackage ({ cl-lib ? null
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "shackle";
         version = "1.0.1";
         src = fetchFromGitHub {
@@ -33678,10 +42237,10 @@
           rev = "4189c1c773aab533969b587f7801ffbcd1d7d613";
           sha256 = "1gh30sryh884mpwxpkf0ngkcvixjrxxf4bgq4nqm9n969sr5bhsq";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/806e7d00f763f3fc4e3b8ebd483070ac6c5d0f21/recipes/shackle";
           sha256 = "159z0cwg7afrmym0xk902d8z093sqv39jig25ds7z4a224yrv5w6";
-          name = "shackle";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -33689,20 +42248,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    shakespeare-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    shakespeare-mode = callPackage ({ fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "shakespeare-mode";
-        version = "0.0.1";
+        version = "0.0.2";
         src = fetchFromGitHub {
           owner = "CodyReichert";
           repo = "shakespeare-mode";
-          rev = "4bff63eeac2b7ec1220f17e8bbcddbea4c11cb02";
-          sha256 = "0vkxl3w4y4yacs1s4v0gwggvzrss8g74d3dgk8h3gphl4dlgx496";
+          rev = "c442eeea9d585e1b1fbb8813e33d47feec348a57";
+          sha256 = "1ba9xy5jwn8ni8fi2k144j669jp95k2qf9ip77r16rsiy7divl0y";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/shakespeare-mode";
           sha256 = "1sg8n4ifpi36zmf6b6s0swq7k3r038cmj8kxjm7hpgxq6f9qnk9x";
-          name = "shakespeare-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -33710,20 +42272,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    shampoo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    shampoo = callPackage ({ fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "shampoo";
         version = "0.0.1";
         src = fetchFromGitHub {
           owner = "dmatveev";
           repo = "shampoo-emacs";
-          rev = "9bf488ad4025beef6eef63d2d5b72bc1c9b9e142";
-          sha256 = "11g9lsgakq8nf689k49p9l536ffi62g3bh11mh9ix1l058xamqw2";
+          rev = "be20737f2b870670ce8889a34ad5db0657e7a153";
+          sha256 = "1dfjxphh3i9dwyjdj708ddi2mw7r90bxqzhc9inqkknfabycdw1r";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/19f145113a0698466e706a6a4c55d63cec512706/recipes/shampoo";
           sha256 = "01ssgw4cnnx8d86g3r1d5hqcib4qyhmpqvcvx47xs7zh0jscps61";
-          name = "shampoo";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -33731,8 +42296,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    shell-pop = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    shell-pop = callPackage ({ cl-lib ? null
+                             , emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "shell-pop";
         version = "0.64";
         src = fetchFromGitHub {
@@ -33741,10 +42311,10 @@
           rev = "4a3a9d093ad1add792bba764c601aa28de302b34";
           sha256 = "1ybvg048jvijcg9jjfrbllf59pswmp0fd5zwq5x6nwg5wmggplzd";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/44150bddc9b276ab9fb2ab6a92a11383a3ed03b0/recipes/shell-pop";
           sha256 = "02s17ln0hbi9gy3di8fksp3mqc7d8ahhf5vwyz4vrc1bg77glxw8";
-          name = "shell-pop";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -33752,20 +42322,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    shell-split-string = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    shell-split-string = callPackage ({ fetchFromGitHub
+                                      , fetchurl
+                                      , lib
+                                      , melpaBuild }:
+      melpaBuild {
         pname = "shell-split-string";
         version = "0.1";
         src = fetchFromGitHub {
           owner = "10sr";
           repo = "shell-split-string-el";
-          rev = "6d01c9249853fe1f8fd925ee80f97232d4e3e5eb";
-          sha256 = "0mcxp74sk9bn36gbhhimgns07iqa4dgbq2pvpqy41igqwb84w306";
+          rev = "062b85f333a0a60ae09207530544a95d9b001581";
+          sha256 = "18k7asrisxaa5kh3y849hxpk419429cnr2109cs6bnnzr3wya0r3";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/84e20f4d02c69f8caf39cd20a581be3b9fa79931/recipes/shell-split-string";
           sha256 = "1yj1h7za4ylxh2nikj7s1qqlilpsk05x9571a2fymfyznm3iq77m";
-          name = "shell-split-string";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -33773,8 +42346,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    shell-switcher = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    shell-switcher = callPackage ({ fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "shell-switcher";
         version = "1.0.1";
         src = fetchFromGitHub {
@@ -33783,10 +42359,10 @@
           rev = "2c5575ae859a82041a4bacd1793b844bfc24c34f";
           sha256 = "0ia7sdip4hl27avckv3qpqgm3k4ynvp3xxq1cy53bqfzzx0gcria";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a16194f6ddc05350b9875f4e0a3a0383c79e650e/recipes/shell-switcher";
           sha256 = "07g9naiv2jk9jxwjywrbb05dy0pbfdx6g8pkra38rn3vqrjzvhyx";
-          name = "shell-switcher";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -33794,8 +42370,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    shell-toggle = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    shell-toggle = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "shell-toggle";
         version = "1.3.1";
         src = fetchFromGitHub {
@@ -33804,10 +42383,10 @@
           rev = "9820b0ad6f22c700759555aae8a454a7dc5a46b3";
           sha256 = "0wvaa5nrbblayjvzjyj6cd942ywg7xz5d8fqaffxcvwlcdihvm7q";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/95873d90886d2db5cc1d83d4bcb8dd5c2e65bc3e/recipes/shell-toggle";
           sha256 = "1ai0ks7smr8b221j9hmsikswpxqraa9b13fpwv4wwagavnlah446";
-          name = "shell-toggle";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -33815,8 +42394,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    shelldoc = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    shelldoc = callPackage ({ cl-lib ? null
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild
+                            , s }:
+      melpaBuild {
         pname = "shelldoc";
         version = "0.0.5";
         src = fetchFromGitHub {
@@ -33825,10 +42409,10 @@
           rev = "1d40c73969347586906ca1dde2adb50afcd73b1b";
           sha256 = "1nli26llyfkj1cz2dwn18c5pz1pnpz3866hapfibvdmwrg4z6cax";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/551623175e55629be6cfe44a595f25f09bd889e8/recipes/shelldoc";
           sha256 = "1xlp03aaidp7dp8349v8drzhl4lcngvxgdrwwn9cahfqlrvvbbbx";
-          name = "shelldoc";
+          name = "recipe";
         };
         packageRequires = [ cl-lib s ];
         meta = {
@@ -33836,20 +42420,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    shelltest-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    shelltest-mode = callPackage ({ fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "shelltest-mode";
         version = "1.1";
         src = fetchFromGitHub {
           owner = "rtrn";
           repo = "shelltest-mode";
-          rev = "fead97c7ff1b39715ec033a793de41176f1788f5";
-          sha256 = "0mn7bwvj1yv75a2531jp929j6ypckdfqdg6b5ig0kkbcrrwb7kxs";
+          rev = "b7f5cbb5eb64941afc9a3bf19ea3757b8e60cc18";
+          sha256 = "1k26krij8vz2582cs194paiyzyjjns87w8syicm58fx6z0s6zrad";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/af6dcd4fc0663a255bd85b247bbdf57d425efdb7/recipes/shelltest-mode";
           sha256 = "1inb0vq34fbwkr0jg4dv2lljag8djggi8kyssrzhfawri50m81nh";
-          name = "shelltest-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -33857,8 +42444,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    shen-elisp = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    shen-elisp = callPackage ({ emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "shen-elisp";
         version = "0.1";
         src = fetchFromGitHub {
@@ -33867,10 +42458,10 @@
           rev = "ffe17dee05f75539cf5e4c59395e4c7400ececaa";
           sha256 = "10dq3qj1q8i6f604zws97xrvjxwrdcjj3ygh6xpna00cvf40llc2";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/shen-elisp";
           sha256 = "045nawzyqaxd3g5f56fxfy680pl18x67w0wi28nrq4l4681w9xyq";
-          name = "shen-elisp";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -33878,8 +42469,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    shift-number = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    shift-number = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "shift-number";
         version = "0.1";
         src = fetchFromGitHub {
@@ -33888,10 +42482,10 @@
           rev = "ba3c1f2e6b01bf14aa1433c2a49098af1c025f7c";
           sha256 = "0zlwmzsxkv4mkggylxfx2fkrwgz7dz3zbg2gkn2rxcpy2k2gla64";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b06be6b25078ddfabc1ef1145c817552f679c41c/recipes/shift-number";
           sha256 = "1sbzkmd336d0dcdpk29pzk2b5bhlahrn083x62l6m150n2xzxn4p";
-          name = "shift-number";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -33899,20 +42493,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    shm = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    shm = callPackage ({ fetchFromGitHub
+                       , fetchurl
+                       , lib
+                       , melpaBuild }:
+      melpaBuild {
         pname = "shm";
         version = "1.0.20";
         src = fetchFromGitHub {
           owner = "chrisdone";
           repo = "structured-haskell-mode";
-          rev = "8abc5cd73e59ea85bef906e14e87dc388c4f350f";
-          sha256 = "1vf766ja8f4xp1f5pmwgz6a85km0nxvc5dn571lwidfrrdbr9rkk";
+          rev = "bbdefb56cd341256628a19d1b2d7b0abe5da4b0e";
+          sha256 = "12svprs5r2sbdgmp7cslr7xlwaqzjw386dzf6imf5d9m7rnlylck";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/68a2fddb7e000487f022b3827a7de9808ae73e2a/recipes/shm";
           sha256 = "1qmp8cc83dcz25xbyqd4987i0d8ywvh16wq2wfs4km3ia8a2vi3c";
-          name = "shm";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -33920,8 +42517,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    showtip = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    showtip = callPackage ({ fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "showtip";
         version = "0.1";
         src = fetchFromGitHub {
@@ -33930,10 +42530,10 @@
           rev = "930da302809a4257e8d69425455b29e1cc91949b";
           sha256 = "01zak0zhha6dp7a2hm28d065gjnc462iwpsfyxhbxgfzcdlicqc7";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ae489be43b1aee93614e40f492ebdf0b98a3fbc1/recipes/showtip";
           sha256 = "1d5ckka2z0ffwyk9g3h91n3waijj2v7n8kvdks35gcr2yl3yk780";
-          name = "showtip";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -33941,8 +42541,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    shpec-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    shpec-mode = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "shpec-mode";
         version = "0.1.0";
         src = fetchFromGitHub {
@@ -33951,10 +42554,10 @@
           rev = "76bccd63e3b70233a6c9ca0798dd03550952cc76";
           sha256 = "09454mcjd8n1090pjc5mk1dc6bn3bgh60ddpnv9hkajkzpcjxx4h";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/dd1bfe85b430c3bbb5a7baf11bb9699dad417f60/recipes/shpec-mode";
           sha256 = "155hc1nym3fsvflps8d3ixaqw1cafqp97zcaywdppp47n7vj8zjl";
-          name = "shpec-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -33962,8 +42565,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    shr-tag-pre-highlight = callPackage ({ emacs, fetchFromGitHub, fetchurl, language-detection, lib, melpaBuild }:
-    melpaBuild {
+    shr-tag-pre-highlight = callPackage ({ emacs
+                                         , fetchFromGitHub
+                                         , fetchurl
+                                         , language-detection
+                                         , lib
+                                         , melpaBuild }:
+      melpaBuild {
         pname = "shr-tag-pre-highlight";
         version = "2";
         src = fetchFromGitHub {
@@ -33972,10 +42580,10 @@
           rev = "63eb0b2a4c1caf1004bac8e002ff8b7477871e36";
           sha256 = "14b398k7rd0c2ymvg8wyq65fhggkm0camgvqr7j6ia2y0kairxba";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7be3c139bee02e8bd9a9830026cbfdd17629ac4d/recipes/shr-tag-pre-highlight";
           sha256 = "1v8fqx8bd5504r2mflq6x8xs3k0py3bgsnadz3bjs68yhaxacj3v";
-          name = "shr-tag-pre-highlight";
+          name = "recipe";
         };
         packageRequires = [ emacs language-detection ];
         meta = {
@@ -33983,29 +42591,38 @@
           license = lib.licenses.free;
         };
       }) {};
-    shrink-path = callPackage ({ dash, emacs, f, fetchFromGitLab, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    shrink-path = callPackage ({ dash
+                               , f
+                               , fetchFromGitLab
+                               , fetchurl
+                               , lib
+                               , melpaBuild
+                               , s }:
+      melpaBuild {
         pname = "shrink-path";
         version = "0.3.1";
         src = fetchFromGitLab {
           owner = "bennya";
           repo = "shrink-path.el";
           rev = "9b8cfb59a2dcee8b39b680ab9adad5ecb1f53c0b";
-          sha256 = "021bpgpzysag1s11m9pyq2bk6a0mf9ayx10yxhf5cw56x3d0jj1b";
+          sha256 = "0kx0c4syd7k6ff9j463bib32pz4wq0rzjlg6b0yqnymlzfr1mbki";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/86b0d105e8a57d5f0bcde779441dc80b85e170ea/recipes/shrink-path";
           sha256 = "0fq13c6g7qbq6f2ry9dzdyg1f6p41wimkjcdaj177rnilz77alzb";
-          name = "shrink-path";
+          name = "recipe";
         };
-        packageRequires = [ dash emacs f s ];
+        packageRequires = [ dash f s ];
         meta = {
           homepage = "https://melpa.org/#/shrink-path";
           license = lib.licenses.free;
         };
       }) {};
-    shrink-whitespace = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    shrink-whitespace = callPackage ({ fetchFromGitHub
+                                     , fetchurl
+                                     , lib
+                                     , melpaBuild }:
+      melpaBuild {
         pname = "shrink-whitespace";
         version = "0.0.1";
         src = fetchFromGitHub {
@@ -34014,10 +42631,10 @@
           rev = "24518d58e8e692fa98a73d5e7cd44c1536ab4e42";
           sha256 = "050gmxdk88zlfjwi07jsj2mvsfcv5imhzcpa6ip3cqkzpmw3pl32";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/shrink-whitespace";
           sha256 = "0baqv4wr1wi4wd7cfhqf4y24qkpd72lax596z5lj934ihwf3gggw";
-          name = "shrink-whitespace";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -34025,8 +42642,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    shut-up = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    shut-up = callPackage ({ cl-lib ? null
+                           , emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "shut-up";
         version = "0.3.2";
         src = fetchFromGitHub {
@@ -34035,10 +42657,10 @@
           rev = "dccd8f7d6af2dde96718f557b37bc25adc61dd12";
           sha256 = "103yvfgkj78i4bnv1fwk76izsa8h4wyj3vwj1vq7xggj607hkxzq";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/297d3d88a1dad694d5903072adb679f2194ce444/recipes/shut-up";
           sha256 = "1bcqrnnafnimfcg1s7vrgq4cb4rxi5sgpd92jj7xywvkalr3kh26";
-          name = "shut-up";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -34046,20 +42668,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    shx = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    shx = callPackage ({ emacs
+                       , fetchFromGitHub
+                       , fetchurl
+                       , lib
+                       , melpaBuild }:
+      melpaBuild {
         pname = "shx";
-        version = "0.0.14";
+        version = "0.0.16";
         src = fetchFromGitHub {
           owner = "riscy";
           repo = "shx-for-emacs";
-          rev = "b33b23097ad34177e4179e9d3731ec5db30c6391";
-          sha256 = "0vlgm1aix074ifi9gvp4c0ygdmzplydj4gdsl46173qbd8lfi2rj";
+          rev = "207e6cd292a26fb1162072e2e20df9aa5efd61ef";
+          sha256 = "1hnjmnnmg6axgw4z57rmc8h8wpnbi2rwyr4bv2sdrkk12d3i2kp5";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7a2ff78ae3c4289ebf9e06cdfd8f8082c395a16f/recipes/shx";
           sha256 = "0h5ldglx4y85lm0pfilasnch2k82mlr7rb20qvarzwd41hb1az1k";
-          name = "shx";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -34067,8 +42693,36 @@
           license = lib.licenses.free;
         };
       }) {};
-    sift = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    side-notes = callPackage ({ emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
+        pname = "side-notes";
+        version = "0.1.1";
+        src = fetchFromGitHub {
+          owner = "rnkn";
+          repo = "side-notes";
+          rev = "981ac308b9b5d58e2af20485377e693d2a6e15aa";
+          sha256 = "1hjj6pkl83b9fldzf2bixdny85l5mn81a9kf25kyp0cc6apvwsqr";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/24a71c493adfb79bcd5172d65aa0751e9a6ab556/recipes/side-notes";
+          sha256 = "07hrrplgvp3fvl10fsmxifnim8wz34w7fhzzzkxpdj1zlwls6h83";
+          name = "recipe";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/side-notes";
+          license = lib.licenses.free;
+        };
+      }) {};
+    sift = callPackage ({ fetchFromGitHub
+                        , fetchurl
+                        , lib
+                        , melpaBuild }:
+      melpaBuild {
         pname = "sift";
         version = "0.2.0";
         src = fetchFromGitHub {
@@ -34077,10 +42731,10 @@
           rev = "8c3f3d14a351a2394027d72ee0599aa73b9f0d13";
           sha256 = "1ma6djvhvjai07v1g9a36lfa3nw8zsy6x5vliwcdnkf44gs287ra";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/sift";
           sha256 = "1kr5rxza5li3zrkfvs91y7dxmn213z0zf836rkwkmwg2b9rmqxvj";
-          name = "sift";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -34088,20 +42742,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    silkworm-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    silkworm-theme = callPackage ({ emacs
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "silkworm-theme";
         version = "0.1";
         src = fetchFromGitHub {
           owner = "mswift42";
           repo = "silkworm-theme";
-          rev = "7951b53e5caf9daf6a5a15a57ae3a668cb78bd7b";
-          sha256 = "1q21886qsam8y3s60zlfh48w0jl67q14qg9pzda7j2jcbj1q6r91";
+          rev = "ffb3d6d26191dec696ebb2ba4dc5fddfb38b9e0b";
+          sha256 = "0g9672gfinlgmfi23c7zizf3sgpmjm5imzfhx3j77yw5l7zdx8ak";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9451d247693c3e991f79315868c73808c0a664d4/recipes/silkworm-theme";
           sha256 = "1zbrjqmhf80qs3i910sixirrv42rxkqdrg2z03gnz1g885gpcn13";
-          name = "silkworm-theme";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -34109,8 +42767,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    simple-bookmarks = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    simple-bookmarks = callPackage ({ cl-lib ? null
+                                    , fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "simple-bookmarks";
         version = "1.8";
         src = fetchFromGitHub {
@@ -34119,10 +42781,10 @@
           rev = "e89e8163a0705e28e9346320a1ee13c1aae249af";
           sha256 = "0bx8inaihfs48rzi01nlr3wp2iw0bnk318hhgpd4zg64ap3sgdsv";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a60dd50c388a75ce21a5aec9acf938835d7afdbc/recipes/simple-bookmarks";
           sha256 = "0jn5wzm9y4054mr9czd3224s5kbrqpcpcfmj6fi62yhy3p1ys9rb";
-          name = "simple-bookmarks";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -34130,20 +42792,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    simple-httpd = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    simple-httpd = callPackage ({ cl-lib ? null
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "simple-httpd";
-        version = "1.4.6";
+        version = "1.5.1";
         src = fetchFromGitHub {
           owner = "skeeto";
           repo = "emacs-web-server";
-          rev = "b191b07c942e44c946a22a826c4d9c9a0475fd7e";
-          sha256 = "1qmkc0w28l53zzf5yd2grrk1sq222g5qnsm35ph25s1cfvc1qb2g";
+          rev = "a5eb49a6567e33586fba15dd649d63ca6e964314";
+          sha256 = "0dpn92rg813c4pq7a1vzj3znyxzp2lmvxqz6pzcqi0l2xn5r3wvb";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/simple-httpd";
           sha256 = "1g9m8dx62pql6dqz490pifcli96i5pv6sar18w4lwrfgpfisfz8c";
-          name = "simple-httpd";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -34151,8 +42817,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    simpleclip = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    simpleclip = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "simpleclip";
         version = "1.0.4";
         src = fetchFromGitHub {
@@ -34161,10 +42830,10 @@
           rev = "d461c462c237cd896553adb468cd77499d0d26ad";
           sha256 = "1dfa1sa7rbadj36nbzyxbpbvkdlh1s5n0mx6hxn52psqin1ra6yn";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7c921e27d6aafc1b82d37f6beb8407840034377a/recipes/simpleclip";
           sha256 = "07qkfwlg8vw5kb097qbsv082hxir047q2bcvc8scbak2dr6pl12s";
-          name = "simpleclip";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -34172,8 +42841,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    simplenote2 = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, request-deferred }:
-    melpaBuild {
+    simplenote2 = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild
+                               , request-deferred }:
+      melpaBuild {
         pname = "simplenote2";
         version = "3.0.0";
         src = fetchFromGitHub {
@@ -34182,10 +42855,10 @@
           rev = "070aa311b0a08b530394c53d0c52c6438efbc20c";
           sha256 = "0zx49kd3wrqx6f52nk8rzqx3ay3qbcygibcidw6w7drvxnxjgd04";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1ac16abd2ce075a8bed4b7b52aed71cb12b38518/recipes/simplenote2";
           sha256 = "1qdzbwhzmsga65wmrd0mb3rbs71nlyqqb6f4v7kvfxzyis50cswm";
-          name = "simplenote2";
+          name = "recipe";
         };
         packageRequires = [ request-deferred ];
         meta = {
@@ -34193,8 +42866,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    simplezen = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    simplezen = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "simplezen";
         version = "0.1.1";
         src = fetchFromGitHub {
@@ -34203,10 +42879,10 @@
           rev = "c0ddaefbb38fcc1c9775434f734f89227d246a30";
           sha256 = "1p1771qm3jndnf4rdhb1bri5cjiksvxizagi7vfb7mjmsmx18w61";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/eddd3de86e14f56b59fa6f9a08fc89288e0bdbc1/recipes/simplezen";
           sha256 = "13f2anhfsxmx1vdd209gxkhpywsi3nn6pazhc6bkswmn27yiig7j";
-          name = "simplezen";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -34214,20 +42890,29 @@
           license = lib.licenses.free;
         };
       }) {};
-    skeletor = callPackage ({ cl-lib ? null, dash, emacs, f, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, s }:
-    melpaBuild {
+    skeletor = callPackage ({ cl-lib ? null
+                            , dash
+                            , emacs
+                            , f
+                            , fetchFromGitHub
+                            , fetchurl
+                            , let-alist
+                            , lib
+                            , melpaBuild
+                            , s }:
+      melpaBuild {
         pname = "skeletor";
         version = "1.6.1";
         src = fetchFromGitHub {
           owner = "chrisbarrett";
           repo = "skeletor.el";
-          rev = "d986806559628623b591542143707de8d76347d0";
-          sha256 = "101xn4glqi7b5vhdqqahj2ib4pm30pzq8sad7zagxw9csihcri3q";
+          rev = "91cd3a81b5881e7bef8024177bd0d9c5501d1d79";
+          sha256 = "1a3yx3bg61kk1xpwzrn4b0wiavnms1myc1fy48xf9awfqfi78zxd";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1e63aefc869900c2af6f958dc138f9c72c63e2b8/recipes/skeletor";
           sha256 = "1vfvg5l12dzksr24dxwc6ngawsqzpxjs97drw48qav9dy1vyl10v";
-          name = "skeletor";
+          name = "recipe";
         };
         packageRequires = [ cl-lib dash emacs f let-alist s ];
         meta = {
@@ -34235,8 +42920,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    skewer-less = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, skewer-mode }:
-    melpaBuild {
+    skewer-less = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild
+                               , skewer-mode }:
+      melpaBuild {
         pname = "skewer-less";
         version = "0.2";
         src = fetchFromGitHub {
@@ -34245,10 +42934,10 @@
           rev = "593001930f1d68c85233f34c5f6fb04173fc98d6";
           sha256 = "0g5sapd76pjnfhxlw149zj0fpn6l3pz3l8qlcn2c237vm8vn6qv3";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fb63f7417f39bd718972f54e57360708eb48b977/recipes/skewer-less";
           sha256 = "0fhv5cnp5bgw3krfmb0jl18kw2hzx2p81falj57lg3p8rn23dryl";
-          name = "skewer-less";
+          name = "recipe";
         };
         packageRequires = [ skewer-mode ];
         meta = {
@@ -34256,20 +42945,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    skewer-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, simple-httpd }:
-    melpaBuild {
+    skewer-mode = callPackage ({ emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , js2-mode
+                               , lib
+                               , melpaBuild
+                               , simple-httpd }:
+      melpaBuild {
         pname = "skewer-mode";
-        version = "1.7.0";
+        version = "1.8.0";
         src = fetchFromGitHub {
           owner = "skeeto";
           repo = "skewer-mode";
-          rev = "51f3bbeafea6701de78190a395f6376a9974f1e5";
-          sha256 = "0k8yc75d7hly4qiqxvg027cwmcck63nmbyr75qyjq8kc0vk0x5mr";
+          rev = "a10955db9ef95b0243ee31bcd30a6fb07ce5302b";
+          sha256 = "1ha7jl7776pk1bki5zj2q0jy66450mn8xr3aqjc0m9kj3gc9qxgw";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/10fba4f7935c78c4fc5eee7dbb161173dea884ba/recipes/skewer-mode";
           sha256 = "1zp4myi9f7pw6zkgc0xg12585iihn7khcsf20pvqyc0vn4ajdwqm";
-          name = "skewer-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs js2-mode simple-httpd ];
         meta = {
@@ -34277,8 +42972,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    sl = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    sl = callPackage ({ cl-lib ? null
+                      , fetchFromGitHub
+                      , fetchurl
+                      , lib
+                      , melpaBuild }:
+      melpaBuild {
         pname = "sl";
         version = "0.2";
         src = fetchFromGitHub {
@@ -34287,10 +42986,10 @@
           rev = "51d92f820f3e93776fff6cdb9690458816888bdc";
           sha256 = "1faklr7jz1s6hs1xrzhvddlibhbjbqwxsb8iz6i5c8dg9sj3hw45";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7188a93d33e38f360930b5090c6ef872116f8a7c/recipes/sl";
           sha256 = "0h90ajikr6kclsy73vs9f50jg8z3d6kqbpanm9ryh2pw3sd4rnii";
-          name = "sl";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -34298,20 +42997,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    slideview = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    slideview = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "slideview";
         version = "0.6.1";
         src = fetchFromGitHub {
           owner = "mhayashi1120";
           repo = "Emacs-slideview";
-          rev = "ec2340e7b0e74201206d14e3eaef1e77149f122d";
-          sha256 = "0rk12am1dq52khwkwrmg70zarhni2avj4sy44jqckb4x7sv7djfk";
+          rev = "b0572c757115ba703f471e83135b2c8cc86d7f8f";
+          sha256 = "0yrmm514b2sq86njc1pi7qnngfy5izz3nnpfk9nxsqar1vmdbdzb";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b250f977f44a08346ee9715b416c9706375227a1/recipes/slideview";
           sha256 = "0zr08yrnrz49zds1651ysmgjqgbnhfdcqbg90sbsb086iw89rxl1";
-          name = "slideview";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -34319,8 +43021,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    slim-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    slim-mode = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "slim-mode";
         version = "1.1";
         src = fetchFromGitHub {
@@ -34329,10 +43034,10 @@
           rev = "fe8abb644b7b9cc0ed1e76d9ca8d6c01edccbdb8";
           sha256 = "1cl8amk1kc7a953l1khjms04j40mfkpnbsjz3qa123msgachrsg7";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6a3b59bdbc53d7c0b4c4d6434689f7aab2546678/recipes/slim-mode";
           sha256 = "1hip0r22irr9sah3b65ky71ic508bhqvj9hj95a81qvy1zi9rcac";
-          name = "slim-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -34340,20 +43045,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    slime = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, macrostep, melpaBuild }:
-    melpaBuild {
+    slime = callPackage ({ cl-lib ? null
+                         , fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , macrostep
+                         , melpaBuild }:
+      melpaBuild {
         pname = "slime";
-        version = "2.20";
+        version = "2.21";
         src = fetchFromGitHub {
           owner = "slime";
           repo = "slime";
-          rev = "f223388c78ea51ce7717e9bbae14c50ad2386c2c";
-          sha256 = "07jks9fnqjv2i9sjfpgj7r3a7g5aha4aipsffjbnw1qd930ygw83";
+          rev = "e6d215d77148079799d2fc3253ef402b5d9ed4d7";
+          sha256 = "1zgbl5462zpgqrrk87k0w5a4c99hr99kn33jsrs2x37jmzirsxfn";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/14c60acbfde13d5e9256cea83d4d0d33e037d4b9/recipes/slime";
           sha256 = "04zcvjg0bbx5mdbsk9yn7rlprakl89dq6jmnq5v2g0n6q0mh6ign";
-          name = "slime";
+          name = "recipe";
         };
         packageRequires = [ cl-lib macrostep ];
         meta = {
@@ -34361,8 +43071,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    slime-company = callPackage ({ company, fetchFromGitHub, fetchurl, lib, melpaBuild, slime }:
-    melpaBuild {
+    slime-company = callPackage ({ company
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild
+                                 , slime }:
+      melpaBuild {
         pname = "slime-company";
         version = "1.1";
         src = fetchFromGitHub {
@@ -34371,10 +43086,10 @@
           rev = "6c244690c80387a32b0cb984843e00c8b75ad6bb";
           sha256 = "1hl1hqkc1pxga9k2k8k15d7dip7sfsmwf4wm4sh346m6nj606q8g";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/abe5036c6de996a723bc800e0f031314e1188660/recipes/slime-company";
           sha256 = "195s5fi2dl3h2jyy4d45q22jac35sciz81n13b4lgw94mkxx4rq2";
-          name = "slime-company";
+          name = "recipe";
         };
         packageRequires = [ company slime ];
         meta = {
@@ -34382,8 +43097,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    slime-docker = callPackage ({ cl-lib ? null, docker-tramp, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, slime }:
-    melpaBuild {
+    slime-docker = callPackage ({ cl-lib ? null
+                                , docker-tramp
+                                , emacs
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild
+                                , slime }:
+      melpaBuild {
         pname = "slime-docker";
         version = "0.7";
         src = fetchFromGitHub {
@@ -34392,10 +43114,10 @@
           rev = "1ba41c2d86540a84b47466b0b6957f8063f23aa8";
           sha256 = "168s5xsf7l6s8x5hcmzmk5j9d8a3wpr4s3dlm697dg2n1717gl2z";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/15ec3f7208287161571c8fc3b29369ceabb44e5f/recipes/slime-docker";
           sha256 = "13zkkrpww51ndsblpyz2msiwrjnaz6yrk61jbzrwp0r7a2v0djsa";
-          name = "slime-docker";
+          name = "recipe";
         };
         packageRequires = [ cl-lib docker-tramp emacs slime ];
         meta = {
@@ -34403,8 +43125,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    slime-volleyball = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    slime-volleyball = callPackage ({ fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "slime-volleyball";
         version = "1.1";
         src = fetchFromGitHub {
@@ -34413,10 +43138,10 @@
           rev = "159b5c0f40b109e3854e94b89ec5383854c46ae3";
           sha256 = "00v4mh04affd8kkw4rn51djpyga2rb8f63mgy86napglqnkz40r3";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/853f47f469e372bdbae40f3cea60d9598e966fab/recipes/slime-volleyball";
           sha256 = "1dzvj8z3l5l9ixjl3nc3c7zzi23zc2300r7jzw2l3bvg64cfbdg7";
-          name = "slime-volleyball";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -34424,8 +43149,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    slstats = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    slstats = callPackage ({ cl-lib ? null
+                           , emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "slstats";
         version = "1.10";
         src = fetchFromGitHub {
@@ -34434,10 +43164,10 @@
           rev = "e9696066abf3f2b7b818a57c062530dfd9377033";
           sha256 = "1mjzr6lqcyx3clp3bxq77k2rpkaglnq407xdk05xkaqissirpc83";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fe7c8c241cc6920bbedb6711db63ea28ed633327/recipes/slstats";
           sha256 = "0z5y2fmb3v16g5gf87c9gll04wbjp3d1cf7gm5cxi4w3y1kw4r7q";
-          name = "slstats";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -34445,20 +43175,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    sly = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    sly = callPackage ({ fetchFromGitHub
+                       , fetchurl
+                       , lib
+                       , melpaBuild }:
+      melpaBuild {
         pname = "sly";
         version = "2.14";
         src = fetchFromGitHub {
           owner = "capitaomorte";
           repo = "sly";
-          rev = "1942c53fc40fd6ace0e822b5c9bf551f59061f32";
-          sha256 = "1aihr5pbdqjb5j6xsghi7qbrmp46kddv76xmyx5z98m93n70wzqf";
+          rev = "9dfa53bbaa33c4e91fc58f816d0a766ae94f47c9";
+          sha256 = "0bw6rvpkfpv5shih0ywjw6pa5h2a8v1xpvkxbijqd4dpdj3dlyj9";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/79e7213183df892c5058a766b5805a1854bfbaec/recipes/sly";
           sha256 = "1pmyqjk8fdlzwvrlx8h6fq0savksfny78fhmr8r7b07pi20y6n9l";
-          name = "sly";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -34466,29 +43199,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    sly-company = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, sly }:
-    melpaBuild {
-        pname = "sly-company";
-        version = "0.8";
-        src = fetchFromGitHub {
-          owner = "capitaomorte";
-          repo = "sly-company";
-          rev = "930e14fee9cdc837ae26299c7f5e379c53cee1af";
-          sha256 = "11p89pz6zmnjng5177w31ilcmifvnhv9mfjy79ic7amg01h09hsr";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/sly-company";
-          sha256 = "1n8bx0qis2bs49c589cbh59xcv06r8sx6y4lxprc9pfpycx7h6v2";
-          name = "sly-company";
-        };
-        packageRequires = [ company emacs sly ];
-        meta = {
-          homepage = "https://melpa.org/#/sly-company";
-          license = lib.licenses.free;
-        };
-      }) {};
-    smart-mode-line = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, rich-minority }:
-    melpaBuild {
+    smart-mode-line = callPackage ({ emacs
+                                   , fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild
+                                   , rich-minority }:
+      melpaBuild {
         pname = "smart-mode-line";
         version = "2.11.0";
         src = fetchFromGitHub {
@@ -34497,10 +43214,10 @@
           rev = "5aca51956fae55d7310c1f96b5d128201087864a";
           sha256 = "1wpavjkxszq1xr49q0qvqniq751s69axgnsdv37n73k3zl527vqw";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/smart-mode-line";
           sha256 = "0qmhzlkc6mfqyaw4jaw6195b8sw0wg9pfjcijb4p0mlywf5mh5q6";
-          name = "smart-mode-line";
+          name = "recipe";
         };
         packageRequires = [ emacs rich-minority ];
         meta = {
@@ -34508,20 +43225,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    smart-mode-line-powerline-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, powerline, smart-mode-line }:
-    melpaBuild {
+    smart-mode-line-powerline-theme = callPackage ({ emacs
+                                                   , fetchFromGitHub
+                                                   , fetchurl
+                                                   , lib
+                                                   , melpaBuild
+                                                   , powerline
+                                                   , smart-mode-line }:
+      melpaBuild {
         pname = "smart-mode-line-powerline-theme";
         version = "2.11.0";
         src = fetchFromGitHub {
           owner = "Malabarba";
           repo = "smart-mode-line";
-          rev = "5aca51956fae55d7310c1f96b5d128201087864a";
-          sha256 = "1wpavjkxszq1xr49q0qvqniq751s69axgnsdv37n73k3zl527vqw";
+          rev = "558251e200cc555df137e60326295f2bd640fd6a";
+          sha256 = "1xh1qcxw0r3j8hx8k8hsx0cl82wps5x755j4kbn01m7srzv6v167";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/60072b183151e519d141ec559b4902d20c87904c/recipes/smart-mode-line-powerline-theme";
           sha256 = "0hv3mx39m3l35xhz351zp98321ilr6qq9wzwn1f0ziiv814khcn4";
-          name = "smart-mode-line-powerline-theme";
+          name = "recipe";
         };
         packageRequires = [ emacs powerline smart-mode-line ];
         meta = {
@@ -34529,20 +43252,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    smart-semicolon = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    smart-semicolon = callPackage ({ emacs
+                                   , fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "smart-semicolon";
         version = "0.2.1";
         src = fetchFromGitHub {
           owner = "iquiw";
           repo = "smart-semicolon";
-          rev = "c11096679dbed3875c37413337ee490ee7951b63";
-          sha256 = "1v6z3a1f6nxc62n7595qnji39ywdsz7xy5bkl2218v3y7gkbc518";
+          rev = "94cf665aed45c5882e94afe465704fed6326e92e";
+          sha256 = "16nkxf8phxi240fd9ksazxmjs91j0xplny6890a06kx4r8s61p9f";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fe339b95636b02ceb157294055d2f5f4c4b0b8cf/recipes/smart-semicolon";
           sha256 = "1vq6l3vc615w0p640wy226z5i7dky666sgzczkngv07kag0iwqp0";
-          name = "smart-semicolon";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -34550,8 +43277,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    smart-tabs-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    smart-tabs-mode = callPackage ({ fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "smart-tabs-mode";
         version = "1.0";
         src = fetchFromGitHub {
@@ -34560,10 +43290,10 @@
           rev = "8b196d596b331f03fba0efdb4e31d2fd0752c4a7";
           sha256 = "1kfihh4s8578cwqyzn5kp3iib7f9vvg6rfc3klqzgads187ryd4z";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d712f0fb9538945713faf773772bb359fe6f509f/recipes/smart-tabs-mode";
           sha256 = "1fmbi0ypzhsizzb1vm92hfaq23swiyiqvg0pmibavzqyc9lczhhl";
-          name = "smart-tabs-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -34571,8 +43301,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    smartparens = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    smartparens = callPackage ({ cl-lib ? null
+                               , dash
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "smartparens";
         version = "1.11.0";
         src = fetchFromGitHub {
@@ -34581,10 +43316,10 @@
           rev = "4873352b5d0a1c5142658122de1b6950b8fe7e4d";
           sha256 = "0zij2f2rjjym98w68jkp10n1ckpfprlkk217c3fg16hz5nq4vnm6";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bd98f85461ef7134502d4f2aa8ce1bc764f3bda3/recipes/smartparens";
           sha256 = "025nfrfw0992024i219jzm4phwf29smc5hib45s6h1s67942mqh6";
-          name = "smartparens";
+          name = "recipe";
         };
         packageRequires = [ cl-lib dash ];
         meta = {
@@ -34592,8 +43327,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    smartrep = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    smartrep = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "smartrep";
         version = "1.0.0";
         src = fetchFromGitHub {
@@ -34602,10 +43340,10 @@
           rev = "0b73bf3d1a3c795671bfee0a36cecfaa54729446";
           sha256 = "0j5lg9gryl8vbzw8d3r2fl0c9wxa0c193mcvdfidd25b98wccc3f";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/81cb649dc49767c21f79668d6bee950567b05aa0/recipes/smartrep";
           sha256 = "1ypls52d51lcqhz737rqg73c6jwl6q8b3bwb29z51swyamf37rbn";
-          name = "smartrep";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -34613,8 +43351,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    smartscan = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    smartscan = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "smartscan";
         version = "0.2";
         src = fetchFromGitHub {
@@ -34623,10 +43364,10 @@
           rev = "13c9fd6c0e38831f78dec55051e6b4a643963176";
           sha256 = "1sd7dh9114mvr4xnp43xx4b7qmwkaj1a1fv7pwc28fhiy89d2md4";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/smartscan";
           sha256 = "1q0lqms16g7avln1pbxzb49z3w96kv1r7lbh61ijlnz3jips098w";
-          name = "smartscan";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -34634,8 +43375,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    smbc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    smbc = callPackage ({ fetchFromGitHub
+                        , fetchurl
+                        , lib
+                        , melpaBuild }:
+      melpaBuild {
         pname = "smbc";
         version = "0.2.1";
         src = fetchFromGitHub {
@@ -34644,10 +43388,10 @@
           rev = "c377b806118d82140197d9cb1095548477e00497";
           sha256 = "16cj6jsy1psmcjshxb46i44sf1zb9s4mfiagl5cr22njy01ajq1h";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/05b4f16cd8028edc758ada842432df11c8276fd3/recipes/smbc";
           sha256 = "0aviqa8mk8dxxnddfskq9jgz3knqhf0frj7gq7nk6ckxkrxrgqn4";
-          name = "smbc";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -34655,8 +43399,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    smeargle = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    smeargle = callPackage ({ emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "smeargle";
         version = "0.3";
         src = fetchFromGitHub {
@@ -34665,10 +43413,10 @@
           rev = "0665b1ff5109731898bc4a0ca6d939933b804777";
           sha256 = "0p0kxmjdr02l9injlyyrnnzqdbb7mirz1xx79c3lw1rgpalf0jnf";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c5b985b24a23499454dc61bf071073df325de571/recipes/smeargle";
           sha256 = "1dy87ah1w21csvrkq5icnx7g7g7nxqkcyggxyazqwwxvh2silibd";
-          name = "smeargle";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -34676,8 +43424,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    smex = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    smex = callPackage ({ fetchFromGitHub
+                        , fetchurl
+                        , lib
+                        , melpaBuild }:
+      melpaBuild {
         pname = "smex";
         version = "3.0";
         src = fetchFromGitHub {
@@ -34686,10 +43437,10 @@
           rev = "97b4a4d82a4449e3f1a3fa8a93387d6eb0ef9c26";
           sha256 = "1hcjh577xz3inx28r8wb4g2b1424ccw8pffvgdmpf80xp1llldj5";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/smex";
           sha256 = "1rwyi7gdzswafkwpfqd6zkxka1mrf4xz17kld95d2ram6cxl6zda";
-          name = "smex";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -34697,8 +43448,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    smmry = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    smmry = callPackage ({ fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "smmry";
         version = "0.0.3";
         src = fetchFromGitHub {
@@ -34707,10 +43461,10 @@
           rev = "b7ee765337fa627a6c59eb4f2a91df5d280ac6df";
           sha256 = "0hzs8xi7n3bsqwm3nlm3vk8p2p33ydwxpwk9wp3325g03jl921in";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ba2d4be4dd4d6c378eabd833f05a944afa21817b/recipes/smmry";
           sha256 = "05ikcvyr74jy3digd0ad443h5kf11w29hgnmb71bclm3mfslh5wn";
-          name = "smmry";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -34718,8 +43472,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    smooth-scroll = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    smooth-scroll = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "smooth-scroll";
         version = "1.2";
         src = fetchFromGitHub {
@@ -34728,10 +43485,10 @@
           rev = "02320f28abb5cae28b3a18f6b9ce93129bdbfc45";
           sha256 = "1kkg7qhb2lmwr4siiazqny9w2z9nk799lzl5i159lfivlxcgixmk";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4ad6411f76281232848c870e8f4f5bb78e6cf328/recipes/smooth-scroll";
           sha256 = "1b0mjpd4dqgk7ij37145ry2jqbn1msf8rrvymn7zyckbccg83zsf";
-          name = "smooth-scroll";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -34739,8 +43496,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    smooth-scrolling = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    smooth-scrolling = callPackage ({ fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "smooth-scrolling";
         version = "2.0.0";
         src = fetchFromGitHub {
@@ -34749,10 +43509,10 @@
           rev = "6a1420be510decde0a5eabc56cff229ae554417e";
           sha256 = "1dkqix0iyjyiqf34h3p8faqcpffc0pwkxqqn80ys9jvj4f27kkrg";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e156f146649a51f6ee636aef95214944a8079a27/recipes/smooth-scrolling";
           sha256 = "0zy2xsmr05l2narslfgril36d7qfb55f52qm2ki6fy1r18lfiyc6";
-          name = "smooth-scrolling";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -34760,8 +43520,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    snakemake-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, magit-popup, melpaBuild }:
-    melpaBuild {
+    snakemake-mode = callPackage ({ cl-lib ? null
+                                  , emacs
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , magit-popup
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "snakemake-mode";
         version = "1.3.0";
         src = fetchFromGitHub {
@@ -34770,10 +43536,10 @@
           rev = "6cf6d20db2e5253ce3f86e302651faa28f220aa7";
           sha256 = "0dmvd5f5rb5kkzjkhzz17b40hlld23sy5wyzr8vq763f6pzs37kk";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c3a5b51fee1c9e6ce7e21555faa355d118d34b8d/recipes/snakemake-mode";
           sha256 = "1xxd3dms5vgvpn18a70wjprka5xvri2pj9cw8qz09s640f5jf3r4";
-          name = "snakemake-mode";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs magit-popup ];
         meta = {
@@ -34781,8 +43547,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    snapshot-timemachine-rsnapshot = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, seq, snapshot-timemachine }:
-    melpaBuild {
+    snapshot-timemachine-rsnapshot = callPackage ({ fetchFromGitHub
+                                                  , fetchurl
+                                                  , lib
+                                                  , melpaBuild
+                                                  , seq
+                                                  , snapshot-timemachine }:
+      melpaBuild {
         pname = "snapshot-timemachine-rsnapshot";
         version = "0.4";
         src = fetchFromGitHub {
@@ -34791,10 +43562,10 @@
           rev = "72b0b700d80f1a0442e62bbbb6a0c8c59182f97f";
           sha256 = "1bdy7p0bjfdlv6l6yih6fvvi7xpldal4rj8l2ajpc6sgby24h8bb";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/94358fb8d1486491903c331d9e90ba5198117aa8/recipes/snapshot-timemachine-rsnapshot";
           sha256 = "0fxijd94p961ab0p4ddmhja4bfrif2d87v32g4c41amc1klyf25r";
-          name = "snapshot-timemachine-rsnapshot";
+          name = "recipe";
         };
         packageRequires = [ seq snapshot-timemachine ];
         meta = {
@@ -34802,20 +43573,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    snazzy-theme = callPackage ({ base16-theme, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    snazzy-theme = callPackage ({ base16-theme
+                                , emacs
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "snazzy-theme";
         version = "1.0";
         src = fetchFromGitHub {
           owner = "weijiangan";
           repo = "emacs-snazzy";
-          rev = "578d7ebc4ed91c0a630b652c4b6fdd54d9ae16cd";
-          sha256 = "0gykymah4ap7zgjr7fkir21avcdhgy6n88nwxl1iynim3vkq441v";
+          rev = "8729d10b5c1edf1053800170dab1ffd820b6fff2";
+          sha256 = "1c07yggr6cnbca2iag1rjjsp1hiaccix222wzybxrphb72fn93wq";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/18c89a612418e0f49b7e6ae29a678d2fc1ffaf3d/recipes/snazzy-theme";
           sha256 = "0srmhwhqrp1s01p1znhjzs254l3r2i6c91v7cnlwlvrls1sbh32k";
-          name = "snazzy-theme";
+          name = "recipe";
         };
         packageRequires = [ base16-theme emacs ];
         meta = {
@@ -34823,8 +43599,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    snoopy = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    snoopy = callPackage ({ cl-lib ? null
+                          , emacs
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "snoopy";
         version = "0.2.0";
         src = fetchFromGitHub {
@@ -34833,10 +43614,10 @@
           rev = "ec4123bdebfe0bb7bf4feaac2dc02b59caffe386";
           sha256 = "01l44lshw0zvykay9886s1vqryanagkd4ciw3ramchn0baqz11vl";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4a882cd92964ac195a09469006c9a44dc202f000/recipes/snoopy";
           sha256 = "1wa8jykqyj6rxqfhwbiyli6yh8s7n0pqv7fc9sfaymarda93zbgi";
-          name = "snoopy";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -34844,20 +43625,27 @@
           license = lib.licenses.free;
         };
       }) {};
-    socyl = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, s }:
-    melpaBuild {
+    socyl = callPackage ({ cl-lib ? null
+                         , dash
+                         , fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild
+                         , pkg-info
+                         , s }:
+      melpaBuild {
         pname = "socyl";
         version = "0.3.0";
         src = fetchFromGitHub {
           owner = "nlamirault";
           repo = "socyl";
-          rev = "fcc0deda5b6c39d25e48e7da2a0ae73295193ea8";
-          sha256 = "1a8qd9hcmp4xl6hyvlq116nr9cn392bmrrda8vqkvjpd8rm8i776";
+          rev = "38157e3bb0d7afa8b90b744648f63c85b4edb230";
+          sha256 = "1ha0827zcdkl1ih8c7018cpbiw2k1b8ik4h7p6asw7pg0n5xf1c6";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/774b3006f5b6b781594257f1d9819068becbbcc1/recipes/socyl";
           sha256 = "00b7x247cyjh4gci101fq1j6708vbcz1g9ls3845w863wjf6m5sz";
-          name = "socyl";
+          name = "recipe";
         };
         packageRequires = [ cl-lib dash pkg-info s ];
         meta = {
@@ -34865,20 +43653,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    solaire-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    solaire-mode = callPackage ({ cl-lib ? null
+                                , emacs
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "solaire-mode";
-        version = "1.0.4";
+        version = "1.0.6";
         src = fetchFromGitHub {
           owner = "hlissner";
           repo = "emacs-solaire-mode";
-          rev = "dd93cfd6c02e4575e6c7048ecf9dac8c09864bf2";
-          sha256 = "1afbkz93xa6f0453n7n1mrm0ng5jrdi06mh0s105gkzcfxqjc0gd";
+          rev = "abf2ce4da77d0877efb4a035687390ce921eda4f";
+          sha256 = "15wszz841vd9i59gq2xxh8rk7bh7agwglh2dwhxgs70m24hsp3p4";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/52c69070eef3003eb53e1436c538779c74670ce6/recipes/solaire-mode";
           sha256 = "0pvgip12xl16rwz4wqmqjd8nhh3a299aknfsghazmxigamlmlsl5";
-          name = "solaire-mode";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -34886,8 +43679,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    solarized-theme = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    solarized-theme = callPackage ({ dash
+                                   , fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "solarized-theme";
         version = "1.2.2";
         src = fetchFromGitHub {
@@ -34896,10 +43693,10 @@
           rev = "210dbef0186f87048d50face41d1d374d6154b3a";
           sha256 = "0zcj9jf8nlsj9vms888z2vs76q54n8g8r9sh381xad3x8d6lrlb3";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/solarized-theme";
           sha256 = "15d8k32sj8i11806byvf7r57rivz391ljr0zb4dx8n8vjjkyja12";
-          name = "solarized-theme";
+          name = "recipe";
         };
         packageRequires = [ dash ];
         meta = {
@@ -34907,8 +43704,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    solidity-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    solidity-mode = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "solidity-mode";
         version = "0.1.9";
         src = fetchFromGitHub {
@@ -34917,10 +43717,10 @@
           rev = "d0ff4dea49540f37301d869f2797fca2492f55d5";
           sha256 = "1wcy5z4wggn3zs9h1kyvm0ji51ppjcqdmym3mmxbrhan6a0kq724";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bb9df5ec0692352b6494d435d11166f4ea26c99e/recipes/solidity-mode";
           sha256 = "1qdzdivrf5yaa80p61b9r1gryw112v5l2m2jkvkc7glhkhrcvwsx";
-          name = "solidity-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -34928,8 +43728,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    sos = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
-    melpaBuild {
+    sos = callPackage ({ fetchFromGitHub
+                       , fetchurl
+                       , lib
+                       , melpaBuild
+                       , org }:
+      melpaBuild {
         pname = "sos";
         version = "0.1";
         src = fetchFromGitHub {
@@ -34938,10 +43742,10 @@
           rev = "c3906ca6872f460c0bdd276410519308626313f1";
           sha256 = "0b5w3vdr8llg3hqd22gnc6b6y089lq6vfk0ajkws6gfldz2gg2v1";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/36e02223b4ff9c0be4662991d734ca4a4e756f4b/recipes/sos";
           sha256 = "1gkd0plx7152s3dj8a9lwlwh8bgs1m006s80l10agclx6aay8rvb";
-          name = "sos";
+          name = "recipe";
         };
         packageRequires = [ org ];
         meta = {
@@ -34949,8 +43753,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    sotclojure = callPackage ({ cider, clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, sotlisp }:
-    melpaBuild {
+    sotclojure = callPackage ({ cider
+                              , clojure-mode
+                              , emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild
+                              , sotlisp }:
+      melpaBuild {
         pname = "sotclojure";
         version = "1.3.1";
         src = fetchFromGitHub {
@@ -34959,10 +43770,10 @@
           rev = "ceac82aa691e8d98946471be6aaff9c9a4603c32";
           sha256 = "1a6riq7ksk5m76dsgc75d8b992nyr50l48l8cpms9064m6b0r9jv";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3a2ccef8af91eada4449d9cd4bda6bd28272722e/recipes/sotclojure";
           sha256 = "12byqjzg0pffqyq958265qq8yxxmf3iyy4m7zib492qcj8ccy090";
-          name = "sotclojure";
+          name = "recipe";
         };
         packageRequires = [ cider clojure-mode emacs sotlisp ];
         meta = {
@@ -34970,8 +43781,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    sotlisp = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    sotlisp = callPackage ({ emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "sotlisp";
         version = "1.6.2";
         src = fetchFromGitHub {
@@ -34980,10 +43795,10 @@
           rev = "fffe8d0b42b143a2e7df0470d9049fa57b6ecac5";
           sha256 = "0j5zwb1ypqps30126w2684lmjh8ia4qxg8inlajcbv8i3pbai7k6";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/sotlisp";
           sha256 = "0zjnn6hhwy6cjvc5rhvhxcq5pmrhcyil14a48fcgwvg4lv7fbljk";
-          name = "sotlisp";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -34991,8 +43806,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    sound-wav = callPackage ({ cl-lib ? null, deferred, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    sound-wav = callPackage ({ cl-lib ? null
+                             , deferred
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "sound-wav";
         version = "0.2";
         src = fetchFromGitHub {
@@ -35001,10 +43821,10 @@
           rev = "2a8c8a9bd797dfbf4a0aa1c023a464b803227ff8";
           sha256 = "1ba1r359cb1dms24ajn0xfrqn8c9y08m6m7dwgxpylyyjwh1096y";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8333470e3d84d5433be489a23e065c876bed2ab2/recipes/sound-wav";
           sha256 = "1vrwzk6zqma7r0w5ivbx16shys6hsifj52fwlf5rxs6jg1gqdb4f";
-          name = "sound-wav";
+          name = "recipe";
         };
         packageRequires = [ cl-lib deferred ];
         meta = {
@@ -35012,8 +43832,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    sourcekit = callPackage ({ dash, dash-functional, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }:
-    melpaBuild {
+    sourcekit = callPackage ({ dash
+                             , dash-functional
+                             , emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild
+                             , request }:
+      melpaBuild {
         pname = "sourcekit";
         version = "0.2.0";
         src = fetchFromGitHub {
@@ -35022,10 +43849,10 @@
           rev = "8ba62ac25bf533b7f148f333bcb5c1db799f749b";
           sha256 = "01dh0wdaydiai4v13r8g05rpiwqr5qqi34wif8vbk2mrr25wc7i9";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/45969cd5cd936ea61fbef4722843b0b0092d7b72/recipes/sourcekit";
           sha256 = "1lvk3m86awlinivpg89h6zvrwrdqa5ljdp563k3i4h9384w82pks";
-          name = "sourcekit";
+          name = "recipe";
         };
         packageRequires = [ dash dash-functional emacs request ];
         meta = {
@@ -35033,8 +43860,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    sourcemap = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    sourcemap = callPackage ({ emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "sourcemap";
         version = "0.3";
         src = fetchFromGitHub {
@@ -35043,10 +43874,10 @@
           rev = "64c89d296186f48d9135fb8aad501de19f64bceb";
           sha256 = "115g2mfpbfywp8xnag4gsb50klfvplqfh928a5mabb5s8v4a3582";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/557d18259543263932fccdbaf44c4e7986bd277b/recipes/sourcemap";
           sha256 = "0cjg90y6a0l59a9v7d7p12pgmr21gwd7x5msil3h6xkm15f0qcc5";
-          name = "sourcemap";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -35054,8 +43885,16 @@
           license = lib.licenses.free;
         };
       }) {};
-    spaceline = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, powerline, s }:
-    melpaBuild {
+    spaceline = callPackage ({ cl-lib ? null
+                             , dash
+                             , emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild
+                             , powerline
+                             , s }:
+      melpaBuild {
         pname = "spaceline";
         version = "2.0.1";
         src = fetchFromGitHub {
@@ -35064,10 +43903,10 @@
           rev = "2d1a7bfb5bdaf24958f50b4bf93182847916af85";
           sha256 = "1q8r95zfrh0vxna5ml2pq9b9f66clfqcl4d2qy2aizkvzyxg6skl";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/46e4c876aeeb0bb0d0e81dcbb8363a5db9c3ff61/recipes/spaceline";
           sha256 = "0jpcj0i8ckdylrisx9b4l9kam6kkjzhhv1s7mwwi4b744rx942iw";
-          name = "spaceline";
+          name = "recipe";
         };
         packageRequires = [ cl-lib dash emacs powerline s ];
         meta = {
@@ -35075,8 +43914,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    spaceline-all-the-icons = callPackage ({ all-the-icons, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, memoize, spaceline }:
-    melpaBuild {
+    spaceline-all-the-icons = callPackage ({ all-the-icons
+                                           , emacs
+                                           , fetchFromGitHub
+                                           , fetchurl
+                                           , lib
+                                           , melpaBuild
+                                           , memoize
+                                           , spaceline }:
+      melpaBuild {
         pname = "spaceline-all-the-icons";
         version = "1.4.0";
         src = fetchFromGitHub {
@@ -35085,10 +43931,10 @@
           rev = "7eafe2d7a81f8d10e03498bdcc3bec0ea50f905d";
           sha256 = "186v71d8n1iy73drayyf57pyzlz973q74mazkyvb8w3fj8bb3llm";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d039e057c1d441592da8f54e6d524b395b030375/recipes/spaceline-all-the-icons";
           sha256 = "1h6clkr2f29k2vw0jcrmnfbjpphaxm7s3zai6pn6qag32bgm3jq6";
-          name = "spaceline-all-the-icons";
+          name = "recipe";
         };
         packageRequires = [ all-the-icons emacs memoize spaceline ];
         meta = {
@@ -35096,8 +43942,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    sparkline = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    sparkline = callPackage ({ cl-lib ? null
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "sparkline";
         version = "1.0.2";
         src = fetchFromGitHub {
@@ -35106,10 +43956,10 @@
           rev = "e44498cf1a58fb165991198fe5104d51c92ea904";
           sha256 = "1gmmmkzxxlpz2ml6qk24vndlrbyl55r5cba76jn342zrxvb357ny";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7278ca31ee3c035c8ec754af152127776f04792e/recipes/sparkline";
           sha256 = "081jzaxjb32nydvr1kmyafxqxi610n0yf8lwz9vldm84famf3g7y";
-          name = "sparkline";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -35117,8 +43967,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    sparql-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    sparql-mode = callPackage ({ cl-lib ? null
+                               , emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "sparql-mode";
         version = "4.0.2";
         src = fetchFromGitHub {
@@ -35127,10 +43982,10 @@
           rev = "2837b97244111515c61fb3823c1479bc126a458b";
           sha256 = "0hqp8r24wvzrkl630wbm0lynrcrnawv2yn2a3xgwqwwhwgva35rn";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c3d729130a41903bb01465d0f01c34fbc508b56e/recipes/sparql-mode";
           sha256 = "1xicrfmgxpb31lz30qj450w8v7dl4ipjp7b2wz54s4kn88nsfj7d";
-          name = "sparql-mode";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -35138,20 +43993,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    speech-tagger = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    speech-tagger = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "speech-tagger";
         version = "0.0.0";
         src = fetchFromGitHub {
           owner = "cosmicexplorer";
           repo = "speech-tagger";
-          rev = "e6595bd0eea93ede1534c536c1746c9cf763b73c";
-          sha256 = "1k6c7450v0ln6l9b8z1hib2s2b4rmjbskynvwwyilgdnvginfhi3";
+          rev = "f5b9d4c0bca82dec6b70a2d6ec933cd189ef553a";
+          sha256 = "0jcax2867nps9xfb85xwz7zx9mlfgxmkmw6nprivmm1hd3wm8dpd";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/db80aa5d95846ee02a9d762aa68325ab5e37dcf7/recipes/speech-tagger";
           sha256 = "0sqil949ny9qjxq7kpb4zmjd7770r0qvq4sz80agw6a27mqnaajc";
-          name = "speech-tagger";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -35159,20 +44017,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    speed-type = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    speed-type = callPackage ({ cl-lib ? null
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "speed-type";
         version = "1.1";
         src = fetchFromGitHub {
           owner = "parkouss";
           repo = "speed-type";
-          rev = "5d691f57743304db63b6afdc5bd79dabd282d390";
-          sha256 = "08qp2b80rh9k8h5vv141lfsg73rqqikhh7ygal789rr278ai1rjf";
+          rev = "f87399c523a2d0c6c98549f507006f1313d9cd6c";
+          sha256 = "069rc8fjh5ic7b66x1gxfss4vki6j1pcvqjs8680wj3mxw5vbfw1";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d6c33b5bd15875baea0fd2f24ee8ec9414a6f7aa/recipes/speed-type";
           sha256 = "0lsbi3b6v7fiwpvydgwcqx3y5i7bysfjammly22qpz3kcjmlvi06";
-          name = "speed-type";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -35180,8 +44042,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    sphinx-doc = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    sphinx-doc = callPackage ({ cl-lib ? null
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild
+                              , s }:
+      melpaBuild {
         pname = "sphinx-doc";
         version = "0.1.0";
         src = fetchFromGitHub {
@@ -35190,10 +44057,10 @@
           rev = "b3459ecb9e6d3fffdee3cb7342563a56a32ce666";
           sha256 = "1q6v0xfdxm57lyj4zxyqv6n5ik5w9drk7yf9w8spb5r22jg0dg8c";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a3b80d346ad4fb415970beddb5f02ae795fbf1b4/recipes/sphinx-doc";
           sha256 = "00h3wx2p5hzbw6sggggdrzv4jrn1wc051iqql5y2m1hsh772ic5z";
-          name = "sphinx-doc";
+          name = "recipe";
         };
         packageRequires = [ cl-lib s ];
         meta = {
@@ -35201,8 +44068,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    sphinx-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    sphinx-mode = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "sphinx-mode";
         version = "0.1.1";
         src = fetchFromGitHub {
@@ -35211,10 +44081,10 @@
           rev = "3d6e3059350593dc077f06f54c33869b9e28f7bc";
           sha256 = "0l3a8swmf3sm54ayk2ahh1i5j1hf0hd822dfmx50kgwi4wpv48sp";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/sphinx-mode";
           sha256 = "0f5xkaqsmxc4bfz80njlc395dcw2dbvmzx6h9fw31mylshzbmrys";
-          name = "sphinx-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -35222,20 +44092,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    splitjoin = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    splitjoin = callPackage ({ cl-lib ? null
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "splitjoin";
         version = "0.1";
         src = fetchFromGitHub {
           owner = "syohex";
           repo = "emacs-splitjoin";
-          rev = "0eb91e7beec915065cd6c00ceaca180a64d85cda";
-          sha256 = "17qsmjsbk8aq3azjxid6h9fzz77bils74scp21sqn8vdnijx8991";
+          rev = "7e3a37e6700cda6a7ed6e3f1b97b85704c071f89";
+          sha256 = "1bir7vvvd2zx2rf79cnmry30hi5xdn92yzg926mahfjdksbh2rhx";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/51e172f46045fbb71b6a13b3521b502339a4a02b/recipes/splitjoin";
           sha256 = "0l1x98fvvia8qx8g125h4d76slv0xnb3h1zxiq9xb5qh7a1h069l";
-          name = "splitjoin";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -35243,8 +44117,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    spotify = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    spotify = callPackage ({ cl-lib ? null
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "spotify";
         version = "0.3.3";
         src = fetchFromGitHub {
@@ -35253,10 +44131,10 @@
           rev = "472f6e61d732a7e700f5505e2a445fc0b030916a";
           sha256 = "0kc17ijjd8ygwjji23ndhq75kqjyxlb8kg9q0ij0l38q3b903fhi";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/spotify";
           sha256 = "07y6d3cz3nziasza3znysvcnx3kw156ab78kw5y0pdll45nw210x";
-          name = "spotify";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -35264,8 +44142,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    sprintly-mode = callPackage ({ fetchFromGitHub, fetchurl, furl, lib, melpaBuild }:
-    melpaBuild {
+    sprintly-mode = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , furl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "sprintly-mode";
         version = "0.0.4";
         src = fetchFromGitHub {
@@ -35274,10 +44156,10 @@
           rev = "6695892bae5860b5268bf3ae62be990ee9b63c11";
           sha256 = "06rk07h92s5sljprs41y3q31q64cprx9kgs56c2j6v4c8cmsq5h6";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8730956d3f00e030e06ef54c3f2aecc10bb40f9d/recipes/sprintly-mode";
           sha256 = "15i3rrv27ccpn12wwj9raaxpj7nlnrrj3lsp8vdfwph6ydvnfza4";
-          name = "sprintly-mode";
+          name = "recipe";
         };
         packageRequires = [ furl ];
         meta = {
@@ -35285,8 +44167,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    sprunge = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, request }:
-    melpaBuild {
+    sprunge = callPackage ({ cl-lib ? null
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild
+                           , request }:
+      melpaBuild {
         pname = "sprunge";
         version = "0.1.1";
         src = fetchFromGitHub {
@@ -35295,10 +44182,10 @@
           rev = "0fd386b8b29c4175022a04ad70ea5643185b6726";
           sha256 = "03wjzk1ljclfjgqzkg6m7v8saaajgavyd0xskd8fg8rdkx13ki0l";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f7b9f8cc2f2f8f8e1cf80b3e76c89b9f12cacf95/recipes/sprunge";
           sha256 = "199vfl6i881aks8fi9d9w4w7mnc7n443h79p3s4srcpmbyfg6g3w";
-          name = "sprunge";
+          name = "recipe";
         };
         packageRequires = [ cl-lib request ];
         meta = {
@@ -35306,8 +44193,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    sql-impala = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    sql-impala = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "sql-impala";
         version = "1.0";
         src = fetchFromGitHub {
@@ -35316,10 +44206,10 @@
           rev = "68248e9851b153850542ed1f709298bb9ab59610";
           sha256 = "12zyw8b8s3jga560wv141gc4yvlbldvfcmpibns8wrpx2w8aivfj";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/sql-impala";
           sha256 = "1mh36ycqgr07r0hknkr6vb4k0r5b2h8bqd7m5faz9p56qbisgvvh";
-          name = "sql-impala";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -35327,8 +44217,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    sqlup-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    sqlup-mode = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "sqlup-mode";
         version = "0.8.0";
         src = fetchFromGitHub {
@@ -35337,10 +44230,10 @@
           rev = "04970977b4abb4d44301651618bbf1cdb0b263dd";
           sha256 = "14s66xrabj269z7f94iynsla96bka7zac011psrbcfyy4m8mlamz";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/sqlup-mode";
           sha256 = "0ngs58iri3fwv5ny707kvb6xjq98x19pzak8c9nq4qnpw3nkr83b";
-          name = "sqlup-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -35348,8 +44241,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    sr-speedbar = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    sr-speedbar = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "sr-speedbar";
         version = "20140914.2339";
         src = fetchFromGitHub {
@@ -35358,10 +44254,10 @@
           rev = "4f816528a32eb421197a768d6dcf3a05de83f642";
           sha256 = "1x9wizd0fzcmpf8ff7c3rcfxk64diy9jmzzvxa7d5a3k8vvpdhg3";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ae489be43b1aee93614e40f492ebdf0b98a3fbc1/recipes/sr-speedbar";
           sha256 = "1v90jbqdw39yrfcsnyqas8c5g09rcf1db65q2m2rw7rik8cgb052";
-          name = "sr-speedbar";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -35369,20 +44265,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    srcery-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    srcery-theme = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "srcery-theme";
         version = "0.1.0";
         src = fetchFromGitHub {
-          owner = "roosta";
-          repo = "emacs-srcery";
-          rev = "385809e78a2494ee617782430415048d91a11444";
-          sha256 = "1r6k042jipqz04nlr9gfpq6p80k33k4aqxsn03p1sicnpakzpixg";
+          owner = "srcery-colors";
+          repo = "srcery-emacs";
+          rev = "8e4627430abcedc0ed320f620c4411985c9913e1";
+          sha256 = "0lh9hp4aypfwhc6bgywlqxcwyms27yjw71yfcq48iwnqzafpdnkr";
         };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1df48441ecf6abd272ff154722b9ce0e2546c284/recipes/srcery-theme";
-          sha256 = "1r8srxhznli3sskwppk7fyapyx0qixagkwm0fllgsbm4nwkzq9pn";
-          name = "srcery-theme";
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/2654fc05f55c7fab7d550b7db1d187edc9ff0f42/recipes/srcery-theme";
+          sha256 = "1bnvf9v7g2mpx8519lh73fphhr4cqd33qlw22qyxnqiz5cz93lsp";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -35390,8 +44289,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    srefactor = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    srefactor = callPackage ({ emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "srefactor";
         version = "0.5";
         src = fetchFromGitHub {
@@ -35400,10 +44303,10 @@
           rev = "ecd40713f736b243285c07f4cfd77113794d4f9f";
           sha256 = "0wx8l8gkh8rbf2g149f35gpnmkk45s9x4r844aqw5by4zkvix4rc";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e23115ab231ab108678608f2ad0a864f896cd0f2/recipes/srefactor";
           sha256 = "01cd40jm4h00c5q2ix7cskp7klbkcd3n5763y5lqfv59bjxwdqd2";
-          name = "srefactor";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -35411,20 +44314,50 @@
           license = lib.licenses.free;
         };
       }) {};
-    ssh-agency = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ssass-mode = callPackage ({ emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
+        pname = "ssass-mode";
+        version = "0.2";
+        src = fetchFromGitHub {
+          owner = "AdamNiederer";
+          repo = "ssass-mode";
+          rev = "5f36a169a1ad497f1d7a465be386ffb5e1f80bcf";
+          sha256 = "1n1q26p52i6c6i8svkr0bn91hliqm540y1fcz3jci8w2ws0s5x11";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/3137f98aaa871a52f477b63d9c3b7b63f7271344/recipes/ssass-mode";
+          sha256 = "07aym4a7l70f1lb6yvwxkhsykrwbf0lcpwlwgcn5n44kavvdbzxm";
+          name = "recipe";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/ssass-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ssh-agency = callPackage ({ dash
+                              , emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "ssh-agency";
-        version = "0.3";
+        version = "0.4";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "ssh-agency";
-          rev = "94abffa716aff963175196066526c7ee8b4efae7";
-          sha256 = "1r41hgh0kaf9x56jllqjz7f9ypzgyf9pqqpm3r49xyi8fr1drbxc";
+          rev = "d9dbedd773ad3a831e02e162c47936d6814a850a";
+          sha256 = "0895n7bss4wdydic1gflr03f2cwdyqywl16gvb599lpn288jhwvz";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b9a9e4bd0205908bfb99762c7daaf3be276bb03a/recipes/ssh-agency";
           sha256 = "0lci3fhl2p9mwilvq1njzy13dkq5cp5ighymf3zs4gzm3w0ih3h8";
-          name = "ssh-agency";
+          name = "recipe";
         };
         packageRequires = [ dash emacs ];
         meta = {
@@ -35432,20 +44365,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    ssh-deploy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ssh-deploy = callPackage ({ emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "ssh-deploy";
-        version = "1.5";
+        version = "1.6";
         src = fetchFromGitHub {
           owner = "cjohansson";
           repo = "emacs-ssh-deploy";
-          rev = "aef539bb4feefe927fa48d01736dfadb7b3d7930";
-          sha256 = "0vra7y2icid9sdyp7iygwkp4xaas249nm1lcbcyfpaad250g2pn4";
+          rev = "b17f543fe56947d472659675de53757e29ad2fc0";
+          sha256 = "1c78qf589vxs45l0d6s4w9ng9nd4k60shj3bz8mxn7038kch2pb4";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ssh-deploy";
           sha256 = "1ys3cc5fz8y4rsiq3daqgcpa14ssv1q4cw0pqbfscql6mps0mjdm";
-          name = "ssh-deploy";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -35453,8 +44390,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    stan-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    stan-mode = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "stan-mode";
         version = "9.2.0";
         src = fetchFromGitHub {
@@ -35463,10 +44403,10 @@
           rev = "45b8242611fe0437fcff48f5f4f7d8f0552531ac";
           sha256 = "14yv57grsw3zyjcqasaanx8g2skix0i3w1f5r1fng3sgwclwbkdw";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/67a44a0abe675238b10decdd612b67e418caf34b/recipes/stan-mode";
           sha256 = "17ph5khwwrcpyl96xnp3rsbmnk7mpwmgskxka3cfgkm190qihfqy";
-          name = "stan-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -35474,8 +44414,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    stan-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, stan-mode, yasnippet }:
-    melpaBuild {
+    stan-snippets = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild
+                                 , stan-mode
+                                 , yasnippet }:
+      melpaBuild {
         pname = "stan-snippets";
         version = "9.2.0";
         src = fetchFromGitHub {
@@ -35484,10 +44429,10 @@
           rev = "45b8242611fe0437fcff48f5f4f7d8f0552531ac";
           sha256 = "14yv57grsw3zyjcqasaanx8g2skix0i3w1f5r1fng3sgwclwbkdw";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/eda8539b7d8da3a458a38f7536ed03580f9088c3/recipes/stan-snippets";
           sha256 = "021skkvak645483s7haz1hsz98q3zd8hqi9k5zdzaqlabwdjwh85";
-          name = "stan-snippets";
+          name = "recipe";
         };
         packageRequires = [ stan-mode yasnippet ];
         meta = {
@@ -35495,8 +44440,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    stash = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    stash = callPackage ({ fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "stash";
         version = "0.4.1";
         src = fetchFromGitHub {
@@ -35505,10 +44453,10 @@
           rev = "638ae8a4f6d33af54fe77d57c2c0eb1800dd2e19";
           sha256 = "0igqifws73cayvjnhhrsqpy14sr27avymfhaqzrpj76m2fsh6fj4";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d3837ac3f1ac82e08a5ad7193766074a4d1bfa3d/recipes/stash";
           sha256 = "116k40ispv7sq3jskwc1lvmhmk3jjz4j967r732s07f5h11vk1z9";
-          name = "stash";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -35516,8 +44464,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    status = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    status = callPackage ({ fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "status";
         version = "0.3";
         src = fetchFromGitHub {
@@ -35526,10 +44477,10 @@
           rev = "b62c74bf272566f82a68622f29fb9edafea0f241";
           sha256 = "0jpxmzfvg4k5q3h3gn6lrg891wjzlcps2kkij1jbdjk4jkgq386i";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/dca8976de7060fcfc37a1623280869e0cef7b0a2/recipes/status";
           sha256 = "0a9lqa7a5nki5711bjrmx214kah5ndqpwh3i240gdd08mcm07ps3";
-          name = "status";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -35537,20 +44488,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    stgit = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    stgit = callPackage ({ fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "stgit";
         version = "0.18";
         src = fetchFromGitHub {
           owner = "ctmarinas";
           repo = "stgit";
-          rev = "3df606d14f6673fede6cdf5fad921a664c03e108";
-          sha256 = "0ydgg744m671nkhg7h4q2z3b9vpbc9914rbc0wcgimqfqsxkxx2y";
+          rev = "25a7ad1bbe8d529ab6c5bb8557d39650d0b2378f";
+          sha256 = "17m3nb64wckh8jzcxah284cd8fakd4ja1mhix6v8nm9kknqic6xc";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/726da64b7baea1735a916b826bdfb8f575860e21/recipes/stgit";
           sha256 = "1gbr0pvvig2vg94svy1r6zp57rhyg6n9yp7qvlkfal1z2lhzhs0g";
-          name = "stgit";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -35558,8 +44512,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    string-edit = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    string-edit = callPackage ({ dash
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "string-edit";
         version = "0.1.0";
         src = fetchFromGitHub {
@@ -35568,10 +44526,10 @@
           rev = "9f9c9cd659156fd2217be814eb4e91da48d44647";
           sha256 = "15gdcpbba3h84s7xnpk69nav6bixdixnirdh5n1rly010q0m5s5x";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/20fd24f22ef734fe064c66692bf3e18eb896f1ac/recipes/string-edit";
           sha256 = "1l1hqsfyi6pp4x4g1rk4s7x9zjc03wfmhy16izia8nkjhzz88fi8";
-          name = "string-edit";
+          name = "recipe";
         };
         packageRequires = [ dash ];
         meta = {
@@ -35579,20 +44537,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    string-inflection = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    string-inflection = callPackage ({ fetchFromGitHub
+                                     , fetchurl
+                                     , lib
+                                     , melpaBuild }:
+      melpaBuild {
         pname = "string-inflection";
-        version = "1.0.6";
+        version = "1.0.7";
         src = fetchFromGitHub {
           owner = "akicho8";
           repo = "string-inflection";
-          rev = "a150e7bdda60b7824d3a936750ce23f73b0e4edd";
-          sha256 = "1k0sm552iawi49v4zis6dbb81d1rzgky9v0dpv7nj31gnb7bmy7k";
+          rev = "a9de404b2ece932da9b1c9aa1c29dbf7cf506e76";
+          sha256 = "1km8xxb0zc3yll1yzlsrrz14ch3inblpq2nhglwp1wskqwdhwly5";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5c2e2b6dba8686236c2595475cfddac5fd700e60/recipes/string-inflection";
           sha256 = "1vrjcg1fa5adw16s4v9dq0fid0gfazxk15z9cawz0kmnpyzz3fg2";
-          name = "string-inflection";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -35600,8 +44561,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    string-utils = callPackage ({ fetchFromGitHub, fetchurl, lib, list-utils, melpaBuild }:
-    melpaBuild {
+    string-utils = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , list-utils
+                                , melpaBuild }:
+      melpaBuild {
         pname = "string-utils";
         version = "0.3.2";
         src = fetchFromGitHub {
@@ -35610,10 +44575,10 @@
           rev = "3ae530143899f533a9ef5e1f26f28b577ebe72ee";
           sha256 = "03azfs6z0jg66ppalijcxl973vdbhj4c3g84sm5dm8xv6rnxrv2s";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c9db386ab3910940addae6e925b2ac17e64e0f87/recipes/string-utils";
           sha256 = "1vsvxc06fd3wardldb83i5hjfibvmiqnxvcgdns7i5i8qlsrsx4v";
-          name = "string-utils";
+          name = "recipe";
         };
         packageRequires = [ list-utils ];
         meta = {
@@ -35621,8 +44586,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    stripe-buffer = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    stripe-buffer = callPackage ({ cl-lib ? null
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "stripe-buffer";
         version = "0.2.5";
         src = fetchFromGitHub {
@@ -35631,10 +44600,10 @@
           rev = "d9f009b92cf16fe2c40cd92b8f842a3872e6c190";
           sha256 = "035ym1c1vzg6hjsnd258z4dkrfc11lj4c0y4gpgybhk54dq3w9dk";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/stripe-buffer";
           sha256 = "1kjib1kf9xqdirryr16wlvc95701hq8s4h8hz4dqzg3wzyb8287b";
-          name = "stripe-buffer";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -35642,19 +44611,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    stumpwm-mode = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    stumpwm-mode = callPackage ({ fetchgit
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "stumpwm-mode";
         version = "0.9.8";
         src = fetchgit {
           url = "https://git.savannah.nongnu.org/git/stumpwm.git";
-          rev = "4d0603e52b5bab993b3be63e3654c74f641e677d";
-          sha256 = "0pn3xjz433b0djcys25a8fv775yqmj3qgg0hyghgxjpzsh6k2a4f";
+          rev = "a920d31bac148e7f6afa98c05f98920135de8b89";
+          sha256 = "0hg2dhgph1fz8z6c79ia2j36wnbqgi6a7fjiz3wngslhbwy28xq7";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/stumpwm-mode";
           sha256 = "11yk7xmmccgv7hin5qd1ibcsm1za01xfwsxa25q7vqwk6svnb0sf";
-          name = "stumpwm-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -35662,20 +44634,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    stylus-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, sws-mode }:
-    melpaBuild {
+    stylus-mode = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild
+                               , sws-mode }:
+      melpaBuild {
         pname = "stylus-mode";
         version = "1.0.0";
         src = fetchFromGitHub {
           owner = "brianc";
           repo = "jade-mode";
-          rev = "4e7a20db492719062f40b225ed730ed50be5db56";
-          sha256 = "0krbd1qa2408a97pqhl7fv0x8x1n2l3qq33zzj4w4vv0c55jk43n";
+          rev = "73893e8d8f1bcaf9f0252c6f020cdb3741d7125c";
+          sha256 = "0fiihkwq4s8lkqx5fp3csmnaf0blnm6kpl4hfkwsb8rywgvzh7lk";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/877b5a3e612e1b1d6d51e60c66b0b79f231abdb2/recipes/stylus-mode";
           sha256 = "152k74q6qn2xa38v2zyd5y7ya5n26nvai5v7z5fmq7jrcndp27r5";
-          name = "stylus-mode";
+          name = "recipe";
         };
         packageRequires = [ sws-mode ];
         meta = {
@@ -35683,8 +44659,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    subatomic-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    subatomic-theme = callPackage ({ fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "subatomic-theme";
         version = "1.8.1";
         src = fetchFromGitHub {
@@ -35693,10 +44672,10 @@
           rev = "6a4086af748b1ecb27f6ba2aa2614988db16d594";
           sha256 = "1j63rzxnrzzqizh7fpd99dcgsy5hd7w4d2lpwl5armmixlycl5m8";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/de7f6009bab3e9a5b14b7b96ab16557e81e7f078/recipes/subatomic-theme";
           sha256 = "0mqas67qms492n3hn74c5nrkjpsgf9b42lp02s2dh366c075dpqc";
-          name = "subatomic-theme";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -35704,20 +44683,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    subemacs = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    subemacs = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "subemacs";
         version = "1.0";
         src = fetchFromGitHub {
           owner = "kbauer";
           repo = "subemacs";
-          rev = "24f0896f1995a3ea42a58b0452d250dcc6802944";
-          sha256 = "189547d0g9ax0nr221bkdchlfcj60dsy8lgbbrvq3n3xrmlvl362";
+          rev = "c053ccae8b1d5317651f131a63210eb20f590c93";
+          sha256 = "0jfdw6i3qjsil0myhrddqchg39vrnd94qci4k1z37k2323vszy3m";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/18714a6b5ca4dcc51fa509fee1dc9afb0595c707/recipes/subemacs";
           sha256 = "0sqh80jhh3v37l5af7w6k9lqvj39bd91pn6a9rwdlfk389hp90zm";
-          name = "subemacs";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -35725,8 +44707,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    sublimity = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    sublimity = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "sublimity";
         version = "20160629";
         src = fetchFromGitHub {
@@ -35735,10 +44720,10 @@
           rev = "ee9c9fbb92b8fc0c191e5e8640477e251b602bf9";
           sha256 = "1kpq7kpmhgq3vjd62rr4qsc824qcyjxm50m49r7invgnmgd78h4x";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c1e78cd1e5366a9b6d04237e9bf6a7e73424be52/recipes/sublimity";
           sha256 = "1xwggaalad65cxcfvmy30f141bxhpzc3fgvwziwbzi8fygbdv4nw";
-          name = "sublimity";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -35746,8 +44731,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    sudden-death = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    sudden-death = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "sudden-death";
         version = "0.2.1";
         src = fetchFromGitHub {
@@ -35756,10 +44744,10 @@
           rev = "791a63d3f4df192e71f4232a9a4c5588f4b43dfb";
           sha256 = "0z3adwd6ymapkdniny3ax2i3wzxp11g6in4bghbcr9bfdxcsf7ps";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3f20f389a2d7ddf49ca64d945b41584a7c120faf/recipes/sudden-death";
           sha256 = "1wrhb3d27j07i64hvjggyajm752w4mhrhq09lfvyhz6ykp1ly3fh";
-          name = "sudden-death";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -35767,8 +44755,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    sudo-edit = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    sudo-edit = callPackage ({ cl-lib ? null
+                             , emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "sudo-edit";
         version = "0.1.0";
         src = fetchFromGitHub {
@@ -35777,10 +44770,10 @@
           rev = "bcb12aaa0da0c56d851cfa2f1b3ea4afdd2a755b";
           sha256 = "1k6sx8k304dw9dlidnxcln9ip9cj3b6i196z98g9n0kcd1js9f99";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3b08d4bbdb23b988db5ed7cb5a2a925b7c2e242e/recipes/sudo-edit";
           sha256 = "10vz7q8m0l2dyhiy9r9nj17qlwyv032glshzljzhm1n20w8y1fq4";
-          name = "sudo-edit";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -35788,8 +44781,16 @@
           license = lib.licenses.free;
         };
       }) {};
-    suggest = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, loop, melpaBuild, s }:
-    melpaBuild {
+    suggest = callPackage ({ dash
+                           , emacs
+                           , f
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , loop
+                           , melpaBuild
+                           , s }:
+      melpaBuild {
         pname = "suggest";
         version = "0.5";
         src = fetchFromGitHub {
@@ -35798,10 +44799,10 @@
           rev = "05beef9ecf94107d72d0070fa092a8392505b012";
           sha256 = "008d9kk8vb90n8j5dvw1rslfny66q012022na03dzbnmq3f73k7a";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b9fd27e812549587dc2ec26bb58974177ff263ff/recipes/suggest";
           sha256 = "12vvakqqzmmqq5yynpd4wf4lnb0yvcnz065kni996sy7rv7rh83q";
-          name = "suggest";
+          name = "recipe";
         };
         packageRequires = [ dash emacs f loop s ];
         meta = {
@@ -35809,8 +44810,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    suomalainen-kalenteri = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    suomalainen-kalenteri = callPackage ({ fetchFromGitHub
+                                         , fetchurl
+                                         , lib
+                                         , melpaBuild }:
+      melpaBuild {
         pname = "suomalainen-kalenteri";
         version = "2017.8.1";
         src = fetchFromGitHub {
@@ -35819,10 +44823,10 @@
           rev = "c702e33cb6e13cb28bd761844e95be112a3c04f3";
           sha256 = "13avc3ba6vhysmhrcxfpkamggfpal479gn7k9n7509dpwp06dv8h";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/181adf1b16253481674663fd28b195172231b7da/recipes/suomalainen-kalenteri";
           sha256 = "1wzijbgcr3jc47ccr7nrdkqha16s6gw0xiccnmdczi48cvnvvlkh";
-          name = "suomalainen-kalenteri";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -35830,8 +44834,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    super-save = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    super-save = callPackage ({ emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "super-save";
         version = "0.2.0";
         src = fetchFromGitHub {
@@ -35840,10 +44848,10 @@
           rev = "73397501fa5b01c02b9ae94f82a8cb37d1ed105f";
           sha256 = "0cw3yf2npy2ah00q2whpn52kaybbccw1qvfzsww0x4zshlrwvvvq";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9730b65787b26d3909952cf246a01bd349e5fbab/recipes/super-save";
           sha256 = "0ikfw7n2rvm3xcgnj1si92ly8w75x26071ki551ims7a8sawh52p";
-          name = "super-save";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -35851,8 +44859,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    svg-mode-line-themes = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, xmlgen }:
-    melpaBuild {
+    svg-mode-line-themes = callPackage ({ fetchFromGitHub
+                                        , fetchurl
+                                        , lib
+                                        , melpaBuild
+                                        , xmlgen }:
+      melpaBuild {
         pname = "svg-mode-line-themes";
         version = "0.1.3";
         src = fetchFromGitHub {
@@ -35861,10 +44873,10 @@
           rev = "80a0e01839cafbd66899202e7764c33231974259";
           sha256 = "14h40s0arc2i898r9yysn256z6l8jkrnmqvrdg7p7658c0klz5ic";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2ca54d78b5e87c3bb582b178e4892af2bf447d1e/recipes/svg-mode-line-themes";
           sha256 = "12lnszcb9bl32n9wir7vf8xiyyv7njw4xg21aj9x4dasmidyx506";
-          name = "svg-mode-line-themes";
+          name = "recipe";
         };
         packageRequires = [ xmlgen ];
         meta = {
@@ -35872,8 +44884,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    swagger-to-org = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }:
-    melpaBuild {
+    swagger-to-org = callPackage ({ cl-lib ? null
+                                  , emacs
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , json ? null
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "swagger-to-org";
         version = "0.0.2";
         src = fetchFromGitHub {
@@ -35882,10 +44900,10 @@
           rev = "181357c71ea24bede263f5706d8781ad65e16877";
           sha256 = "0x1mxxvlhhs34j869cy68gy5pgmvpfliyl9vlrlwm3z8apbip9gp";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4d5a7f017593e73ea48c0e535ecf3809536bcde5/recipes/swagger-to-org";
           sha256 = "1m40f5njxcxmc2snaz2q43b4scwgp51y761kq6klixjvafi0pv86";
-          name = "swagger-to-org";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs json ];
         meta = {
@@ -35893,8 +44911,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    sweetgreen = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, request }:
-    melpaBuild {
+    sweetgreen = callPackage ({ cl-lib ? null
+                              , dash
+                              , fetchFromGitHub
+                              , fetchurl
+                              , helm
+                              , lib
+                              , melpaBuild
+                              , request }:
+      melpaBuild {
         pname = "sweetgreen";
         version = "0.5";
         src = fetchFromGitHub {
@@ -35903,10 +44928,10 @@
           rev = "e40d2821ff941695e50a9b003a8c96d32c19bfdc";
           sha256 = "1gw09x5d4yqlmknjsrhgygp9bch315cnmyqp3679i3hza0l7fds6";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/63812707948e6dcc00e00ebc3c423469593e80fd/recipes/sweetgreen";
           sha256 = "1v75wk0gq5fkz8i1r8pl4gqnxbv1d80isyn48w2hxj2fmdn2xhpy";
-          name = "sweetgreen";
+          name = "recipe";
         };
         packageRequires = [ cl-lib dash helm request ];
         meta = {
@@ -35914,20 +44939,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    swift-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }:
-    melpaBuild {
+    swift-mode = callPackage ({ emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild
+                              , seq }:
+      melpaBuild {
         pname = "swift-mode";
-        version = "4.1.1";
+        version = "5.0.0";
         src = fetchFromGitHub {
           owner = "chrisbarrett";
           repo = "swift-mode";
-          rev = "4e2227906c90631bfe5109df3e7f57bc1e70ac29";
-          sha256 = "02xpb453jdaqwx8rsc3zg2fnxzfv8fs993kw1bk45s4dja1f95p4";
+          rev = "7ea1d4e3b0430644b2e2b2e1025f442a10bfa523";
+          sha256 = "179wiwdxpkw7kbx2yss193l68cbmy93xdabw5sm35mv8px809j17";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/19cb133191cd6f9623e99e958d360113595e756a/recipes/swift-mode";
           sha256 = "1imr53f8agfza9zxs1h1mwyhg7yaywqqffd1lsvm1m84nvxvri2d";
-          name = "swift-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs seq ];
         meta = {
@@ -35935,8 +44965,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    swift3-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    swift3-mode = callPackage ({ emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "swift3-mode";
         version = "2.1.1";
         src = fetchFromGitHub {
@@ -35945,10 +44979,10 @@
           rev = "ea34d46bf9a4293e75ffdac9500d34989316d9e9";
           sha256 = "1hwc3fxv87hmw0a0mgl8khfzf1p7yp2izkc02z8f1vbkaibmmawp";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0ca9071199230d3c4c1b2e3a501736df87095fd3/recipes/swift3-mode";
           sha256 = "14vm05p8ix09v73dkmf03i56yib8yk6h2r1zc9m4ym80fki4f520";
-          name = "swift3-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -35956,8 +44990,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    swiper = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
-    melpaBuild {
+    swiper = callPackage ({ emacs
+                          , fetchFromGitHub
+                          , fetchurl
+                          , ivy
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "swiper";
         version = "0.10.0";
         src = fetchFromGitHub {
@@ -35966,10 +45005,10 @@
           rev = "4a2cee03519f98cf95b29905dec2566a39ff717e";
           sha256 = "14vnigqb5c3yi4q9ysw1fiwdqyqwyklqpb9wnjf81chm7s2mshnr";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/swiper";
           sha256 = "0qaia5pgsjsmrfmcdj72jmj39zq82wg4i5l2mb2z6jlf1jpbk6y9";
-          name = "swiper";
+          name = "recipe";
         };
         packageRequires = [ emacs ivy ];
         meta = {
@@ -35977,8 +45016,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    swiper-helm = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, swiper }:
-    melpaBuild {
+    swiper-helm = callPackage ({ emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , helm
+                               , lib
+                               , melpaBuild
+                               , swiper }:
+      melpaBuild {
         pname = "swiper-helm";
         version = "0.2.0";
         src = fetchFromGitHub {
@@ -35987,10 +45032,10 @@
           rev = "93fb6db87bc6a5967898b5fd3286954cc72a0008";
           sha256 = "05n4h20lfyg1kis5rig72ajbz680ml5fmsy6l1w4g9jx2xybpll2";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/674c709490e13267e09417e08953ff76bfbaddb7/recipes/swiper-helm";
           sha256 = "011ln6vny7z5vw67cpzldxf5n6sk2hjdkllyf7v6sf4m62ws93ph";
-          name = "swiper-helm";
+          name = "recipe";
         };
         packageRequires = [ emacs helm swiper ];
         meta = {
@@ -35998,20 +45043,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    switch-buffer-functions = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    switch-buffer-functions = callPackage ({ fetchFromGitHub
+                                           , fetchurl
+                                           , lib
+                                           , melpaBuild }:
+      melpaBuild {
         pname = "switch-buffer-functions";
         version = "0.0.1";
         src = fetchFromGitHub {
           owner = "10sr";
           repo = "switch-buffer-functions-el";
-          rev = "e1bccfff2d123b6218efab16c486215cedb9a108";
-          sha256 = "0pq53b8wrjbrxd5hnrcdi0z7mffp4bax55hn90k9ca3j76lhbn1k";
+          rev = "701caf97c977903c9afae6ef305241d068c5d9ac";
+          sha256 = "1j6m3alk6y31zkq8h3fkha39fnvad7wmpa7kj4cwva0r5cd40l5a";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d37ebd28f4a2f770958bd9a2669cce86cc76cbe7/recipes/switch-buffer-functions";
           sha256 = "1b93p8q07zncqq3nw829gddc615rwaan1ds5vgfhdb1l7bh9f37l";
-          name = "switch-buffer-functions";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -36019,41 +45067,48 @@
           license = lib.licenses.free;
         };
       }) {};
-    switch-window = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    switch-window = callPackage ({ emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "switch-window";
-        version = "1.5.1";
+        version = "1.6.1";
         src = fetchFromGitHub {
           owner = "dimitri";
           repo = "switch-window";
-          rev = "f4e3fde4d4717b75716f287577e84b7ee4f33d8d";
-          sha256 = "15ks1x62rn0q8lgy4x749mizvanzl9lkzgrsasrdx0v4ydmj3n7c";
+          rev = "40565f7bdf11e86d882185fa4c4ec77b96dcc21c";
+          sha256 = "047qx4vk86b9jbvv5w477215mkmqpdwl5wd4n9fhp5xjni11jnhx";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7d2204e3b53ade1e400e143ac219f3c7ab63a1e9/recipes/switch-window";
           sha256 = "02f0zjvlzms66w1ryhk1cbr4rqwklzvgcjfiicj0lcnqqx61m2k2";
-          name = "switch-window";
+          name = "recipe";
         };
-        packageRequires = [ cl-lib ];
+        packageRequires = [ emacs ];
         meta = {
           homepage = "https://melpa.org/#/switch-window";
           license = lib.licenses.free;
         };
       }) {};
-    sws-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    sws-mode = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "sws-mode";
         version = "1.0.0";
         src = fetchFromGitHub {
           owner = "brianc";
           repo = "jade-mode";
-          rev = "4e7a20db492719062f40b225ed730ed50be5db56";
-          sha256 = "0krbd1qa2408a97pqhl7fv0x8x1n2l3qq33zzj4w4vv0c55jk43n";
+          rev = "03486dce6990c96e85e53c18b8fcb35fbb8509f5";
+          sha256 = "10w73i4sh6mn108lcnm6sv4xr1w0avbfw05kid28c33583h80vpm";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/877b5a3e612e1b1d6d51e60c66b0b79f231abdb2/recipes/sws-mode";
           sha256 = "0b12dsad0piih1qygjj0n7rni0pl8cizbzwqm9h1dr8imy53ak4i";
-          name = "sws-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -36061,8 +45116,16 @@
           license = lib.licenses.free;
         };
       }) {};
-    sx = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, json ? null, let-alist, lib, markdown-mode, melpaBuild }:
-    melpaBuild {
+    sx = callPackage ({ cl-lib ? null
+                      , emacs
+                      , fetchFromGitHub
+                      , fetchurl
+                      , json ? null
+                      , let-alist
+                      , lib
+                      , markdown-mode
+                      , melpaBuild }:
+      melpaBuild {
         pname = "sx";
         version = "0.4";
         src = fetchFromGitHub {
@@ -36071,10 +45134,10 @@
           rev = "4892f45746fb217d059f4fa074a237c5bac7dd6c";
           sha256 = "02f63k8rzb3bcch6vj6w5c5ncccqg83siqnc8hyi0lhy1bfx240p";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f16958a09820233fbe2abe403561fd9a012d0046/recipes/sx";
           sha256 = "1ml1rkhhk3hkd16ij2zwng591rxs2yppsfq9gwd4ppk02if4v517";
-          name = "sx";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs json let-alist markdown-mode ];
         meta = {
@@ -36082,20 +45145,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    symbolword-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    symbolword-mode = callPackage ({ fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "symbolword-mode";
         version = "1.0";
         src = fetchFromGitHub {
           owner = "ncaq";
           repo = "symbolword-mode";
-          rev = "273dece5b04f7abc4c35048b2f64f04b33774b87";
-          sha256 = "0gpm0zy1kwqxkakvfdgh1lylp99msyamwvi19c53g9jl01m9avyd";
+          rev = "14a2e4429229d073d48d77c81b3551d60256c545";
+          sha256 = "1p92xxclzyfpxl3g12s3651y5rx4a6hf9zy232mxzlxjy0adic2v";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/be2018e0206c3f39c1b67e83000b030d70a72ceb/recipes/symbolword-mode";
           sha256 = "1fs1irnmlbrn76b4gdsy0v65nz8av85iqm0b7g9nm2rm8azcr050";
-          name = "symbolword-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -36103,8 +45169,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    symon = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    symon = callPackage ({ fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "symon";
         version = "20160630";
         src = fetchFromGitHub {
@@ -36113,10 +45182,10 @@
           rev = "7beeedd70dc37f5904c781fb697c8df056196ee9";
           sha256 = "1q7di9s8k710nx98wnqnbkkhdimrn0jf6z4xkm4c78l6s5idjwlz";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3f4bbc6b3d7b2e2a9fbe7ff7f1d47cda9c859cc0/recipes/symon";
           sha256 = "11llnvngyc3xz8nd6nj86ism0hhs8p54wkscvs4yycbakbyn61lz";
-          name = "symon";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -36124,20 +45193,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    syndicate = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    syndicate = callPackage ({ evil
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "syndicate";
         version = "1.0";
         src = fetchFromGitHub {
           owner = "KNX32542";
           repo = "syndicate";
-          rev = "b839aaba0c8583a3254476b53976e3caac4f89a9";
-          sha256 = "01bymbsvbisnpb2wpqxhrvqx6cj57nh4xvpsbsr5rr1h4pm5jkzl";
+          rev = "38b78e18442b1fd028ef3c44053c97bd6020a5b8";
+          sha256 = "0iycq74liddjgah9xhb562rr7a8s2c99mbw22r34gvl7rqhn6c2j";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/626bda1691d9c7a97fcf549f7a3f0d41d832cfde/recipes/syndicate";
           sha256 = "06nmldcw5dy2shhpk6nyix7gs57gsr5s9ksj57xgg8y2j3j0da95";
-          name = "syndicate";
+          name = "recipe";
         };
         packageRequires = [ evil ];
         meta = {
@@ -36145,20 +45218,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    synosaurus = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    synosaurus = callPackage ({ cl-lib ? null
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "synosaurus";
         version = "0.1.0";
         src = fetchFromGitHub {
           owner = "hpdeifel";
           repo = "synosaurus";
-          rev = "56efdc38952b9bd56a445591fcdeb626aede8678";
-          sha256 = "0hi2jflrlpp7xkbj852vp9hcl8bfmf04jqw1hawxrw4bxdp95jh2";
+          rev = "93f8e0bdddc94426730bfcdf736522e378af508f";
+          sha256 = "0gq9gq3a2x7ysmxil4fg6srnm424digpfp8gc2iqvhkdrhmygg3y";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/synosaurus";
           sha256 = "06a48ajpickf4qr1bc14skfr8khnjjph7c35b7ajfy8jw2zwavpn";
-          name = "synosaurus";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -36166,8 +45243,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    syntactic-sugar = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    syntactic-sugar = callPackage ({ fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "syntactic-sugar";
         version = "0.9.4";
         src = fetchFromGitHub {
@@ -36176,10 +45256,10 @@
           rev = "06d943c6ad9507603bb6ab6d37be2d359d0763a9";
           sha256 = "1pn69f4w48jdj3wd1myj6qq2mhvygmlzbq2dws2qkjlp3kbwa6da";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b32b9b3b3e820e498d7531a1f82da36e5e8f4e74/recipes/syntactic-sugar";
           sha256 = "12b2vpvz5h4wzxrk8jrbgc8v0w6bzzvxcyfs083fi1791qq1rw7r";
-          name = "syntactic-sugar";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -36187,8 +45267,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    syntax-subword = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    syntax-subword = callPackage ({ fetchhg
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "syntax-subword";
         version = "0.2";
         src = fetchhg {
@@ -36207,29 +45290,36 @@
           license = lib.licenses.free;
         };
       }) {};
-    system-packages = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    system-packages = callPackage ({ emacs
+                                   , fetchFromGitLab
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "system-packages";
-        version = "1.0.2";
-        src = fetchFromGitHub {
+        version = "1.0.5";
+        src = fetchFromGitLab {
           owner = "jabranham";
           repo = "system-packages";
-          rev = "fff67d190440fb076104f0f52d55a5e098207e31";
-          sha256 = "0ia4nnyhk84dkahsan8l8dslmqiv0afs5abc1w2fnql7zhsiac6q";
+          rev = "7b87f7dbd53d7bd365157d831893f7a70ae67910";
+          sha256 = "02h3qf455y3dpmf4f312x9dvxrndp9dkyyvs1vw6g9aqahrr4vys";
         };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/8c423d8c1ff251bd34df20bdb8b425c2f55ae1b1/recipes/system-packages";
-          sha256 = "0cq1vb4m8phdmv3c0dj6m76fss5vp1a0hikn7a1q5l2mmns40wj1";
-          name = "system-packages";
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/7d3c7af03e0bca3f834c32827cbcca29e29ef4db/recipes/system-packages";
+          sha256 = "13nk3m8gw9kqjllk7hgkmpxsx9y5h03f0l7zydg388wc7cxsiy3l";
+          name = "recipe";
         };
-        packageRequires = [ cl-lib ];
+        packageRequires = [ emacs ];
         meta = {
           homepage = "https://melpa.org/#/system-packages";
           license = lib.licenses.free;
         };
       }) {};
-    system-specific-settings = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    system-specific-settings = callPackage ({ fetchFromGitHub
+                                            , fetchurl
+                                            , lib
+                                            , melpaBuild }:
+      melpaBuild {
         pname = "system-specific-settings";
         version = "0.2";
         src = fetchFromGitHub {
@@ -36238,10 +45328,10 @@
           rev = "0050d85b2175095aa5ecf580a2fe43c069b0eef3";
           sha256 = "1hixilnnybv2v3p1wpn7a0ybwah17grawszs3jycsjgzahpgckv7";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3f52c584d7435c836ba3c95c598306ba0f5c06da/recipes/system-specific-settings";
           sha256 = "1ydmxi8aw2lf78wv4m39yswbqkmcadqg0wmzg9s8b5h9bxxwvppp";
-          name = "system-specific-settings";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -36249,8 +45339,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    systemd = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    systemd = callPackage ({ emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "systemd";
         version = "1.6";
         src = fetchFromGitHub {
@@ -36259,10 +45353,10 @@
           rev = "1e7567a9973bf80cab0d7e0355656a84bee7ca96";
           sha256 = "0ylgnvpfindg4cxccbqy02ic7p0i9rygf1w16dm1filwhbqvjplq";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ca810e512c357d1d0130aeeb9b46b38c595e3351/recipes/systemd";
           sha256 = "1ykvm8mfi3fjvrkfcy9qn0sr9mhwm9x1svrmrd0gyqk418clk5i3";
-          name = "systemd";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -36270,8 +45364,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    ta = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ta = callPackage ({ cl-lib ? null
+                      , emacs
+                      , fetchFromGitHub
+                      , fetchurl
+                      , lib
+                      , melpaBuild }:
+      melpaBuild {
         pname = "ta";
         version = "1.5";
         src = fetchFromGitHub {
@@ -36280,10 +45379,10 @@
           rev = "9226afbe7abbefb825844ef3ba4ca15f1934cfc2";
           sha256 = "09nndx83ws5v2i9x0dzk6l1a0lq29ffzh3y05n0n64nf5j0a7zvk";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/847693b5952e99597bd77223e1058536d1beeb5c/recipes/ta";
           sha256 = "0kn2k4n0xfwsrniaqb36v3rxj2pf2sai3bmjksbn1g2kf5g156ll";
-          name = "ta";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -36291,8 +45390,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    tabbar-ruler = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, tabbar }:
-    melpaBuild {
+    tabbar-ruler = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild
+                                , tabbar }:
+      melpaBuild {
         pname = "tabbar-ruler";
         version = "0.45";
         src = fetchFromGitHub {
@@ -36301,10 +45404,10 @@
           rev = "7df2e4814018e84ef9261d04a2ade8168a44e3d7";
           sha256 = "1xd67s92gyr49v73j7r7cbhsc40bkw8aqh21whgbypdgzpyc7azc";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1d69d1ef8dbab8394be01153cf9ebe8e49bf9912/recipes/tabbar-ruler";
           sha256 = "10dwjj6r74g9rzdd650wa1wxhqc0q6dmff4j0qbbhmjsxvsr3y0d";
-          name = "tabbar-ruler";
+          name = "recipe";
         };
         packageRequires = [ tabbar ];
         meta = {
@@ -36312,8 +45415,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    tablist = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    tablist = callPackage ({ emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "tablist";
         version = "0.70";
         src = fetchFromGitHub {
@@ -36322,10 +45429,10 @@
           rev = "ef38312867bc0268b1584dd890b1c420bb77ec11";
           sha256 = "0gy9hxm7bca0l1hfy2pzn86avpifrz3bs8xzpicj4kxw5wi4ygns";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5fc0c6c02d609fb22710560337bd577f4b1e0c8f/recipes/tablist";
           sha256 = "0c10g86xjhzpmc2sqjmzcmi393qskyw6d9bydqzjk3ffjzklm45p";
-          name = "tablist";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -36333,8 +45440,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    tagedit = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    tagedit = callPackage ({ dash
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild
+                           , s }:
+      melpaBuild {
         pname = "tagedit";
         version = "1.4.0";
         src = fetchFromGitHub {
@@ -36343,10 +45455,10 @@
           rev = "3fcf54b824b75c5ad68f5438d5638103049a389f";
           sha256 = "0kq40g46s8kgiafrhdq99h79rz9h5fvgz59k7ralmf86bl4sdmdb";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8968e2cd0bd49d54a5479b2467bd4f0a97d7a969/recipes/tagedit";
           sha256 = "0vfkbrxmrw4fwdz324s734zxdxm2nj3df6i8m6lgb9pizqyp2g6z";
-          name = "tagedit";
+          name = "recipe";
         };
         packageRequires = [ dash s ];
         meta = {
@@ -36354,29 +45466,61 @@
           license = lib.licenses.free;
         };
       }) {};
-    tawny-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    tawny-mode = callPackage ({ cider
+                              , emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "tawny-mode";
-        version = "1.5.0";
+        version = "2.0.0";
         src = fetchFromGitHub {
           owner = "phillord";
           repo = "tawny-owl";
-          rev = "5666b34900a39c6da73d9a1efe11bddf94136a04";
-          sha256 = "0amsz28n0syqqkxlmzsndm0ayvzc9kgzk8brs9ihskv0j5b3pdcq";
+          rev = "9f11bb428a255a605c725dfbd23cc082c5d258af";
+          sha256 = "0l419pvvnj850c6byr7njnjki171mcsvlqj8g2d4qk16j504n34m";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ea9a114ff739f7d6f5d4c3167f5635ddf79bf60c/recipes/tawny-mode";
           sha256 = "1xaw1six1n6rw1283fdyl15xcf6m7ngvq6gqlz0xzpf232c4b0kr";
-          name = "tawny-mode";
+          name = "recipe";
         };
-        packageRequires = [];
+        packageRequires = [ cider emacs ];
         meta = {
           homepage = "https://melpa.org/#/tawny-mode";
           license = lib.licenses.free;
         };
       }) {};
-    telepathy = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    tdd-status-mode-line = callPackage ({ fetchFromGitHub
+                                        , fetchurl
+                                        , lib
+                                        , melpaBuild }:
+      melpaBuild {
+        pname = "tdd-status-mode-line";
+        version = "0.1.2";
+        src = fetchFromGitHub {
+          owner = "algernon";
+          repo = "tdd-status-mode-line";
+          rev = "9b3c35b0a972772640e9fee653eab6a76e06416a";
+          sha256 = "0bvxc926kaxvqnppaw4y6gp814qc0krvidn5qg761z4qwz023rax";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/25b445a1dea5e8f1042bed6b5372471c25129fd8/recipes/tdd-status-mode-line";
+          sha256 = "1i0s7f4y4v8681mymcmjlcbq0jfghgmdzrs167c453mb5ssz8yxg";
+          name = "recipe";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/tdd-status-mode-line";
+          license = lib.licenses.free;
+        };
+      }) {};
+    telepathy = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "telepathy";
         version = "1.0";
         src = fetchFromGitHub {
@@ -36385,10 +45529,10 @@
           rev = "211d785b02a29ddc254422fdcc3db45262582f8c";
           sha256 = "16kr1p4lzi1ysd5r2dh0mxk60zsm5fvwa9345nfyrgdic340yscc";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/485ef1745f07f29c45bf0d489eeb4fcdfda80b33/recipes/telepathy";
           sha256 = "0c3d6vk7d6vqzjndlym2kk7d2zm0b15ac4142ir03p6f19rqq9pr";
-          name = "telepathy";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -36396,8 +45540,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    telephone-line = callPackage ({ cl-generic, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }:
-    melpaBuild {
+    telephone-line = callPackage ({ cl-generic
+                                  , cl-lib ? null
+                                  , emacs
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild
+                                  , seq }:
+      melpaBuild {
         pname = "telephone-line";
         version = "0.4";
         src = fetchFromGitHub {
@@ -36406,10 +45557,10 @@
           rev = "a83dcda21b0f6e10e51c3cded7da9a5d2ead5f34";
           sha256 = "1cg34l6jq75mcqnb3p93z0kv1arvnswm8nkk39fmryand2yygnl9";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9c998b70365fb0a210c3b9639db84034c7d45097/recipes/telephone-line";
           sha256 = "0dyh9h1yk9y0217b6rxsm7m372n910vpfgw5w23lkkrwa8x8qpx3";
-          name = "telephone-line";
+          name = "recipe";
         };
         packageRequires = [ cl-generic cl-lib emacs seq ];
         meta = {
@@ -36417,8 +45568,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    ten-hundred-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ten-hundred-mode = callPackage ({ cl-lib ? null
+                                    , fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "ten-hundred-mode";
         version = "1.0.1";
         src = fetchFromGitHub {
@@ -36427,10 +45582,10 @@
           rev = "bdcfda49b1819e82d61fe90947e50bb948cf7933";
           sha256 = "11nsh6dkd3i489lrqpd9xhr4c0ai51364rlrd6slm54720by9jql";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4a0534044ff9ce0740414bf5dc3b104bbdbdacce/recipes/ten-hundred-mode";
           sha256 = "17v38h33ka70ynq72mvma2chvlnm1k2amyvk62c65iv67rwilky3";
-          name = "ten-hundred-mode";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -36438,8 +45593,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    term-alert = callPackage ({ alert, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, term-cmd }:
-    melpaBuild {
+    term-alert = callPackage ({ alert
+                              , emacs
+                              , f
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild
+                              , term-cmd }:
+      melpaBuild {
         pname = "term-alert";
         version = "1.2";
         src = fetchFromGitHub {
@@ -36448,10 +45610,10 @@
           rev = "47af9e6fe483ef0d393098c145f499362a33292a";
           sha256 = "1nv8ma8x9xkgsl95z7yysy8q1lb3xr0pd8a5sb01nlx8ks3clad4";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0d77aee0b1b2eb7834436bdfa339f95cb97da140/recipes/term-alert";
           sha256 = "02qvfhklysfk1fd4ibdngf4crp9k5ab11zgg90hi1sp429a53f3m";
-          name = "term-alert";
+          name = "recipe";
         };
         packageRequires = [ alert emacs f term-cmd ];
         meta = {
@@ -36459,8 +45621,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    term-cmd = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    term-cmd = callPackage ({ dash
+                            , emacs
+                            , f
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "term-cmd";
         version = "1.1";
         src = fetchFromGitHub {
@@ -36469,10 +45637,10 @@
           rev = "6c9cbc659b70241d2ed1601eea34aeeca0646dac";
           sha256 = "08qiipjsqc9dfbha6r2yijjbrg2s4i2mkn6zn5616086550v3kpj";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e08ea89cf193414cce5073fc9c312f2b382bc842/recipes/term-cmd";
           sha256 = "0pbz9fy9rjfpzspwq78ggf1wcvjslwvj8fvc05w4g56ydza0gqi4";
-          name = "term-cmd";
+          name = "recipe";
         };
         packageRequires = [ dash emacs f ];
         meta = {
@@ -36480,20 +45648,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    term-manager = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    term-manager = callPackage ({ dash
+                                , emacs
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "term-manager";
         version = "0.1.1";
         src = fetchFromGitHub {
           owner = "IvanMalison";
           repo = "term-manager";
-          rev = "0bca2e7e3b6e906ec67696bc0be952988ca7f733";
-          sha256 = "0ybmszjb2lrgqp3zixpxy0lp2l9axw3mz2d4n2kmajh8ckbr576v";
+          rev = "bbf64e7d840bc60242dd1d4943f6f5acee1478c2";
+          sha256 = "1p11zrig6f01hyxx0adrz57i8zq4c61myiak3kd80v4j3aa8d7ng";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0b2f7d8c8fcbb535432f8e70729d69a572e49a1a/recipes/term-manager";
           sha256 = "0ab388ki7vr1wpz81bvbl2fskq9zz5bicdf5gqfg01qzv5l75iza";
-          name = "term-manager";
+          name = "recipe";
         };
         packageRequires = [ dash emacs ];
         meta = {
@@ -36501,8 +45674,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    term-projectile = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, projectile, term-manager }:
-    melpaBuild {
+    term-projectile = callPackage ({ fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild
+                                   , projectile
+                                   , term-manager }:
+      melpaBuild {
         pname = "term-projectile";
         version = "0.1.1";
         src = fetchFromGitHub {
@@ -36511,10 +45689,10 @@
           rev = "0bca2e7e3b6e906ec67696bc0be952988ca7f733";
           sha256 = "0ybmszjb2lrgqp3zixpxy0lp2l9axw3mz2d4n2kmajh8ckbr576v";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5260876280148fae28a459f07932cebb059b560e/recipes/term-projectile";
           sha256 = "1mzyzjxkdfvf1kq9m3c1f6y6xzj1qq53rixawmnzmil5cmznvwag";
-          name = "term-projectile";
+          name = "recipe";
         };
         packageRequires = [ projectile term-manager ];
         meta = {
@@ -36522,8 +45700,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    term-run = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    term-run = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "term-run";
         version = "0.1.5";
         src = fetchFromGitHub {
@@ -36532,10 +45713,10 @@
           rev = "54650dbbabb13cb2a6c0670ff6b24b29717a6a8b";
           sha256 = "149pl3zxg5kriydk5h6j95jyly6i23w4w4g4a99s4zi6ljiny6c6";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7cad6343104bfe5724e068660af79a6249010164/recipes/term-run";
           sha256 = "1bx3s68rgr9slsw9k01gfg7sxd4z7sarg4pi2ivril7108mhg2cs";
-          name = "term-run";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -36543,8 +45724,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    termbright-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    termbright-theme = callPackage ({ emacs
+                                    , fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "termbright-theme";
         version = "1.0";
         src = fetchFromGitHub {
@@ -36553,10 +45738,10 @@
           rev = "bec6ab14336c0611e85f45486276004f16d20607";
           sha256 = "0gfsqpza8phvma5y3ck0n6p197x1i33w39m3c7jmja4ml121n73d";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a7151773de39fe570e3e9b351daad89db9dd267f/recipes/termbright-theme";
           sha256 = "14q88qdbnyzxr8sr8i5glj674sb4150b9y6nag0dqrxs629is6xj";
-          name = "termbright-theme";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -36564,8 +45749,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    terminal-here = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    terminal-here = callPackage ({ cl-lib ? null
+                                 , emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "terminal-here";
         version = "1.0";
         src = fetchFromGitHub {
@@ -36574,10 +45764,10 @@
           rev = "e176d1675dc5c41b6aebd05122fb2efc44b6cff0";
           sha256 = "0dj3z8czvziszb20sizgf1yriv4im811rcfadm7ga9zs2al56kqy";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f8df6f7e23476eb52e7fdfbf9de277d3b44db978/recipes/terminal-here";
           sha256 = "1w64r3y88lspxxcqcqfwhakk8p9vl7q3z610dykfbqwqx61a6adj";
-          name = "terminal-here";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -36585,20 +45775,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    tern = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }:
-    melpaBuild {
+    tern = callPackage ({ cl-lib ? null
+                        , emacs
+                        , fetchFromGitHub
+                        , fetchurl
+                        , json ? null
+                        , lib
+                        , melpaBuild }:
+      melpaBuild {
         pname = "tern";
         version = "0.21.0";
         src = fetchFromGitHub {
           owner = "ternjs";
           repo = "tern";
-          rev = "e6a7777f273050098fa7074577ac196bae59d80b";
-          sha256 = "0qyw5zzqqbbah7k3axyqyk78iy9h6ndw5rmajsm033nj9a9d8rxv";
+          rev = "f9bde5792b7a19ac63c344219e0b0c6bd5a41d35";
+          sha256 = "0pdpchnpsy7iwafr2gawy4sm8kfhh101k8yijkckpnk8ir1lw1jw";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/eaecd67af24050c72c5df73c3a12e717f95d5059/recipes/tern";
           sha256 = "1am97ssslkyijpvgk4nldi67ws48g1kpj6gisqzajrrlw5q93wvd";
-          name = "tern";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs json ];
         meta = {
@@ -36606,20 +45802,27 @@
           license = lib.licenses.free;
         };
       }) {};
-    tern-auto-complete = callPackage ({ auto-complete, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, tern }:
-    melpaBuild {
+    tern-auto-complete = callPackage ({ auto-complete
+                                      , cl-lib ? null
+                                      , emacs
+                                      , fetchFromGitHub
+                                      , fetchurl
+                                      , lib
+                                      , melpaBuild
+                                      , tern }:
+      melpaBuild {
         pname = "tern-auto-complete";
         version = "0.21.0";
         src = fetchFromGitHub {
           owner = "ternjs";
           repo = "tern";
-          rev = "e6a7777f273050098fa7074577ac196bae59d80b";
-          sha256 = "0qyw5zzqqbbah7k3axyqyk78iy9h6ndw5rmajsm033nj9a9d8rxv";
+          rev = "dcd808f985e7b0f562467e2145dcd1e901347999";
+          sha256 = "1wwf9h6inv3gvp8g7n98dqvjmn01i8sx3n3h3ilqq3cbsy58yjvg";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/eaecd67af24050c72c5df73c3a12e717f95d5059/recipes/tern-auto-complete";
           sha256 = "1i99b4awph50ygcqsnppm1h48hbf8cpq1ppd4swakrwgmcy2mn26";
-          name = "tern-auto-complete";
+          name = "recipe";
         };
         packageRequires = [ auto-complete cl-lib emacs tern ];
         meta = {
@@ -36627,20 +45830,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    tern-context-coloring = callPackage ({ context-coloring, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, tern }:
-    melpaBuild {
+    tern-context-coloring = callPackage ({ context-coloring
+                                         , emacs
+                                         , fetchFromGitHub
+                                         , fetchurl
+                                         , lib
+                                         , melpaBuild
+                                         , tern }:
+      melpaBuild {
         pname = "tern-context-coloring";
         version = "1.0.1";
         src = fetchFromGitHub {
           owner = "jacksonrayhamilton";
           repo = "tern-context-coloring";
-          rev = "3a8e979d6cc83aabcb3dda3f5f31a6422532efba";
-          sha256 = "1rq5aqmsd7jqvwypafad9gmfcwjqjah00j7cws46k5f0dirjaa1y";
+          rev = "db0466c650ed4f7e6621a48dfdc53eaf5e127be9";
+          sha256 = "093mdq97gc0ljw6islhm7y1yl3yf7w4gf205s96bnsnb1v952n63";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/db2119d2c2d167d771ee02c2735b435d59991b93/recipes/tern-context-coloring";
           sha256 = "0wkb7gn2ma6mz495bgphcjs5p0c6a869zk4a8mnm0spq41xbw4gi";
-          name = "tern-context-coloring";
+          name = "recipe";
         };
         packageRequires = [ context-coloring emacs tern ];
         meta = {
@@ -36648,20 +45857,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    tern-django = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, tern }:
-    melpaBuild {
+    tern-django = callPackage ({ emacs
+                               , f
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild
+                               , tern }:
+      melpaBuild {
         pname = "tern-django";
         version = "0.1.0";
         src = fetchFromGitHub {
           owner = "proofit404";
           repo = "tern-django";
-          rev = "6d616c5f802d3432c4065dc306d7977d254df49f";
-          sha256 = "0l63lzm96gg3ihgc4l671i342qxigwdbn4xfkbxnarb0206gnb5p";
+          rev = "3b779469ba7f0249dec17d91b219dc0badf98774";
+          sha256 = "0k9fra8nf1zpa59rznw93pa0pg9h98sq6896wdhahcm9z3x0rlhn";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e9e128a795e4949e3d4c2f01db0161a34935f635/recipes/tern-django";
           sha256 = "1pjaaffadaw8h2n7yv01ks19gw59dmh8bp8vw51hx1082r3yfvv0";
-          name = "tern-django";
+          name = "recipe";
         };
         packageRequires = [ emacs f tern ];
         meta = {
@@ -36669,8 +45884,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    terraform-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, hcl-mode, lib, melpaBuild }:
-    melpaBuild {
+    terraform-mode = callPackage ({ emacs
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , hcl-mode
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "terraform-mode";
         version = "0.6";
         src = fetchFromGitHub {
@@ -36679,10 +45899,10 @@
           rev = "6286aa42132a7fcad49271d63be33deeeb8d4efc";
           sha256 = "05hn8kskx9lcgn7bzgam99c629zlryir2pickwrqndacjrqpdykx";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/93e06adf34bc613edf95feaca64c69a0a2a4b567/recipes/terraform-mode";
           sha256 = "1m3s390mn4pba7zk17xfk045dqr4rrpv5gw63jm18fyqipsi6scn";
-          name = "terraform-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs hcl-mode ];
         meta = {
@@ -36690,8 +45910,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    test-case-mode = callPackage ({ fetchFromGitHub, fetchurl, fringe-helper, lib, melpaBuild }:
-    melpaBuild {
+    test-case-mode = callPackage ({ fetchFromGitHub
+                                  , fetchurl
+                                  , fringe-helper
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "test-case-mode";
         version = "1.0";
         src = fetchFromGitHub {
@@ -36700,10 +45924,10 @@
           rev = "26e397c0f930b7eb0be413ef7dd257b1da052bec";
           sha256 = "108csr1d7w0105rb6brzgbksb9wmq1p573vxbq0miv5k894j447f";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d2e0bf342713cbdf30cf98d0bbc7476b0abeb7f5/recipes/test-case-mode";
           sha256 = "1iba97yvbi5vr7gvc58gq2ah6jg2s7apc9ssq7mdzki823n8z2qi";
-          name = "test-case-mode";
+          name = "recipe";
         };
         packageRequires = [ fringe-helper ];
         meta = {
@@ -36711,8 +45935,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    test-kitchen = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    test-kitchen = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "test-kitchen";
         version = "0.3.0";
         src = fetchFromGitHub {
@@ -36721,10 +45948,10 @@
           rev = "ddbcb964ac4700973eaf30ae366f086e3319e51f";
           sha256 = "004rd6jkaklsbgka9mf2zi5qzxsl2shwl1kw0vgb963xkmk9zaz8";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/420d18c76f593338fb28807fcbe3b884be5b1634/recipes/test-kitchen";
           sha256 = "1bl3yvj56dq147yplrcwphcxiwvmx5n97y4qpkm9imiv8cnjm1g0";
-          name = "test-kitchen";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -36732,8 +45959,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    test-simple = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    test-simple = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "test-simple";
         version = "1.0";
         src = fetchFromGitHub {
@@ -36742,10 +45972,10 @@
           rev = "75eea25bae04d8e5e3e835a2770f02f0ff4602c4";
           sha256 = "08g7fan1y3wi4w7cdij14awadqss6prqg3k7qzf0wrnbm13dzhmk";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a4b76e053faee299f5b770a0e41aa615bf5fbf10/recipes/test-simple";
           sha256 = "1l6y77fqd0l0mh2my23psi66v5ya6pbr2hgvcbsaqjnpmfm90w3g";
-          name = "test-simple";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -36753,20 +45983,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    textmate = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    textmate = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "textmate";
         version = "1";
         src = fetchFromGitHub {
           owner = "defunkt";
           repo = "textmate.el";
-          rev = "484845493a3c9b570799aea5195a5435a5a01b76";
-          sha256 = "1a0fzn66gv421by0x6wj3z6bvzv274a9p8c2aaax0dskncl5lgk1";
+          rev = "17b699fc96849958f9a09003d11da73020ffb7be";
+          sha256 = "14bxpbswwpzbz6g8z3imgk2nsig0xllxmf71w0i83cdhh7ql1f3h";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ad3923ac8948de75a159e916ecc22005a17458ad/recipes/textmate";
           sha256 = "119w944pwarpqzcr9vys17svy1rkfs9hiln8903q9ff4lnjkpf1v";
-          name = "textmate";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -36774,8 +46007,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    textmate-to-yas = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    textmate-to-yas = callPackage ({ fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "textmate-to-yas";
         version = "0.21";
         src = fetchFromGitHub {
@@ -36784,10 +46020,10 @@
           rev = "8805e5159329e1b74629b7b584373fc446f57d31";
           sha256 = "0fjapb7naysf34g4ac5gsa90b2s2ss7qgpyd9mfv3mdqrsp2dyw7";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/487c461bf658d50135428d72fbfbb2573a00eb7d/recipes/textmate-to-yas";
           sha256 = "04agz4a41h0givfdw88qjd3c7pd418qyigsij4la5f37j5rh338l";
-          name = "textmate-to-yas";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -36795,8 +46031,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    textx-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    textx-mode = callPackage ({ emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "textx-mode";
         version = "0.0.2";
         src = fetchFromGitHub {
@@ -36805,10 +46045,10 @@
           rev = "72f9f0c5855b382024f0da8f56833c22a70a5cb3";
           sha256 = "1lr9v7dk0pnmpvdvs4m5d9yvxlii0xzr8b3akknm25gvbw1y1q8k";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/dada0378af342e0798c418032a8dcc7dfd80d600/recipes/textx-mode";
           sha256 = "10y95m6fskvdb2gh078ifa70nc48shkvw0223iyqbyjys35h53bn";
-          name = "textx-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -36816,8 +46056,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    theme-changer = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    theme-changer = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "theme-changer";
         version = "2.1.0";
         src = fetchFromGitHub {
@@ -36826,10 +46069,10 @@
           rev = "d3d9c9f62a138958262ac5dd61837df427268611";
           sha256 = "09vf3qs949n4iqzd14iq2kgvypwdwdv8ii8l5jcqfppgspd8m8yd";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d08b24a2aec1012751054c68f7d55bac1bd1fd11/recipes/theme-changer";
           sha256 = "1qbmsghkl5gs728q0gaalc7p8q7nzv3l045jc0jdxxnb7na3gc5w";
-          name = "theme-changer";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -36837,8 +46080,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    theme-looper = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    theme-looper = callPackage ({ cl-lib ? null
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "theme-looper";
         version = "1.0.0";
         src = fetchFromGitHub {
@@ -36847,10 +46094,10 @@
           rev = "5e3a3ea7ad31d4b38efa2cc08f0063b230736da9";
           sha256 = "06khrrjlhnzckr2zisdbx4pj6r8kmv7dbdzvzh74qz79x337lvzn";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/theme-looper";
           sha256 = "018bixcbzri3zsasy1pp2qfvgd679ylpi9gq26qv9iwlfhlrpwgf";
-          name = "theme-looper";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -36858,8 +46105,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    thinks = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    thinks = callPackage ({ cl-lib ? null
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "thinks";
         version = "1.12";
         src = fetchFromGitHub {
@@ -36868,10 +46119,10 @@
           rev = "7bdc418ff946d0cc9ea4cc73d38b3c71ffaa838d";
           sha256 = "0wf3nikpnn0yivlmp6plyaiydm56mp3f91lljb1kay64nqgnfq65";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/439957cabf379651dc243219a83c3c96bae6f8cf/recipes/thinks";
           sha256 = "11vj9mjfzmqwdmkq97aqns3fh8hkgx9scnki6c2iag5lj0av2vcq";
-          name = "thinks";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -36879,20 +46130,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    thrift = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    thrift = callPackage ({ fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "thrift";
         version = "0.11.0";
         src = fetchFromGitHub {
           owner = "apache";
           repo = "thrift";
-          rev = "327ebb6c2b6df8bf075da02ef45a2a034e9b79ba";
-          sha256 = "1scv403g5a2081awg5za5d3parj1lg63llnnac11d6fn7j7ms99p";
+          rev = "98bebac1520bcf1dd5392535e06a751d7b2af58e";
+          sha256 = "185hrigx5q15c2jimzbklmi4z6kzigsarqwr805llsmsmg9pp3wi";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/857ab7e3a5c290265d88ebacb9685b3faee586e5/recipes/thrift";
           sha256 = "0p1hxmm7gvhyigz8aylncgqbhk6cyf75rbcqis7x552g605mhiy9";
-          name = "thrift";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -36900,8 +46154,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    tickscript-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    tickscript-mode = callPackage ({ emacs
+                                   , fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "tickscript-mode";
         version = "0.4.1";
         src = fetchFromGitHub {
@@ -36910,10 +46168,10 @@
           rev = "6e7564593d7735acc9f3fa670ec6512991cb73a1";
           sha256 = "173zk9nzjds0rkypmaq8xv5qianivgk16jpzgk0msdsn9kjbd8s9";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c60ee1839f728c5041bde1fe4fa62c4d41c746ef/recipes/tickscript-mode";
           sha256 = "0wnck6j377idx7h7csmfdhp6napv3zs4sd24lknfclafhslllp54";
-          name = "tickscript-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -36921,20 +46179,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    tidal = callPackage ({ emacs, fetchFromGitHub, fetchurl, haskell-mode, lib, melpaBuild }:
-    melpaBuild {
+    tidal = callPackage ({ emacs
+                         , fetchFromGitHub
+                         , fetchurl
+                         , haskell-mode
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "tidal";
         version = "0.9.8";
         src = fetchFromGitHub {
           owner = "tidalcycles";
           repo = "Tidal";
-          rev = "f8af7bdbda547ebd12cf5c0ee1327f33cd9aa93f";
-          sha256 = "0y7a4bxsgpbg1sbsi4xdp4k9x3l0vh7acm5i3k87acpcpfb9aq5y";
+          rev = "ef658d3df0604f3dec955a150509ec1cc68fbd98";
+          sha256 = "1ild1gnbcrw830b8d3byvqlmgm27609dgailmxgin6z7g1pg4r7z";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/16a26659a16199b5bb066be6e5c4a40419bda018/recipes/tidal";
           sha256 = "0im0qbavpykacrwww3y0mlbhf5yfx8afcyvsq5pmjjp0aw245w6a";
-          name = "tidal";
+          name = "recipe";
         };
         packageRequires = [ emacs haskell-mode ];
         meta = {
@@ -36942,20 +46205,28 @@
           license = lib.licenses.free;
         };
       }) {};
-    tide = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, s, typescript-mode }:
-    melpaBuild {
+    tide = callPackage ({ cl-lib ? null
+                        , dash
+                        , fetchFromGitHub
+                        , fetchurl
+                        , flycheck
+                        , lib
+                        , melpaBuild
+                        , s
+                        , typescript-mode }:
+      melpaBuild {
         pname = "tide";
-        version = "2.8.1";
+        version = "2.8.3.1";
         src = fetchFromGitHub {
           owner = "ananthakumaran";
           repo = "tide";
-          rev = "0db094ba1748e3add4e152fa34d64b25eb07bdd2";
-          sha256 = "113lg22aaagh3bbabxp65460cfwa9whjg3yzafd5n8azkinq8s6k";
+          rev = "0c624e7f02fb8f5b78ec35436d7b2f3f42d46dea";
+          sha256 = "0pcxfdql98nnfckjzpykr619p8qsy87wnhyqjajgqxh6ad5rq6si";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a21e063011ebbb03ac70bdcf0a379f9e383bdfab/recipes/tide";
           sha256 = "1z2xr25s23sz6nrzzw2xg1l2j8jvjhxi53qh7nvxmmq6n6jjpwg1";
-          name = "tide";
+          name = "recipe";
         };
         packageRequires = [ cl-lib dash flycheck s typescript-mode ];
         meta = {
@@ -36963,20 +46234,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    timer-revert = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    timer-revert = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "timer-revert";
         version = "0.1";
         src = fetchFromGitHub {
           owner = "yyr";
           repo = "timer-revert";
-          rev = "31ad8d94b85807cd9f63fcba0c90c3e9a9515fa2";
-          sha256 = "1vq5yp6pyjam2csz22mcp353a4d5r7f9m6bsjizfmgr2ld7bwhx7";
+          rev = "6c67f09d4c8349f2883ee870097ec68be0033291";
+          sha256 = "0b9sar8crzh3rzsscvqj45gkr2kfxp7w1fzq7y1d631d45wn41zq";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/991e68c59d1fbaef06ba2583f07499ecad05586d/recipes/timer-revert";
           sha256 = "0lvm2irfx9rb5psm1lf53fv2jjx745n1c172xmyqip5xwgmf6msy";
-          name = "timer-revert";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -36984,8 +46258,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    timesheet = callPackage ({ auctex, fetchFromGitHub, fetchurl, lib, melpaBuild, org, s }:
-    melpaBuild {
+    timesheet = callPackage ({ auctex
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild
+                             , org
+                             , s }:
+      melpaBuild {
         pname = "timesheet";
         version = "0.4.0";
         src = fetchFromGitHub {
@@ -36994,10 +46274,10 @@
           rev = "2ed6fea9b508eb7eaff659d9a34a09ba064d4df8";
           sha256 = "028d1sn29idznzsc95w2c1sdz3rpmf3vgk2365li0vvs99s51hi2";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/40009ef2f6845c83242ca5d0a8c9c2c1e4ef8a9d/recipes/timesheet";
           sha256 = "1gy6bf4wqvp8cw2wjnrr9ijnzwav3p7j46m7qrn6l0517shwl506";
-          name = "timesheet";
+          name = "recipe";
         };
         packageRequires = [ auctex org s ];
         meta = {
@@ -37005,8 +46285,17 @@
           license = lib.licenses.free;
         };
       }) {};
-    timonier = callPackage ({ all-the-icons, dash, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild, pkg-info, request, s }:
-    melpaBuild {
+    timonier = callPackage ({ all-the-icons
+                            , dash
+                            , fetchFromGitHub
+                            , fetchurl
+                            , hydra
+                            , lib
+                            , melpaBuild
+                            , pkg-info
+                            , request
+                            , s }:
+      melpaBuild {
         pname = "timonier";
         version = "0.1.0";
         src = fetchFromGitHub {
@@ -37015,10 +46304,10 @@
           rev = "33ca5887a1d1b63349177237e9edfb73546511a5";
           sha256 = "0z6s26kc50rbmgkkbxzpasphi8hcwhixmi8ksqzrclayccjjj7ar";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a31b0c177fd83bdeb1842a6ec3095de143bb4eae/recipes/timonier";
           sha256 = "0vb83kv2dkca2bq876icxs8iivv9qgkzmzrsxfpnvbv752b220b0";
-          name = "timonier";
+          name = "recipe";
         };
         packageRequires = [ all-the-icons dash hydra pkg-info request s ];
         meta = {
@@ -37026,8 +46315,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    toc-org = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    toc-org = callPackage ({ fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "toc-org";
         version = "1.0.1";
         src = fetchFromGitHub {
@@ -37036,10 +46328,10 @@
           rev = "a0e8ca05e806e5074b8603985da7f18b92c15856";
           sha256 = "1sv9y5dln4ai9w3mgg8p4a3s05hflfqh0k7k8isjqikydbv85m2k";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1305d88eca984a66039444da1ea64f29f1950206/recipes/toc-org";
           sha256 = "06mx2b0zjck82vp3i4bwbqlrzn05i2rkf8080cn34nkizi59wlbs";
-          name = "toc-org";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -37047,8 +46339,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    total-lines = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    total-lines = callPackage ({ emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "total-lines";
         version = "0.2.0";
         src = fetchFromGitHub {
@@ -37057,10 +46353,10 @@
           rev = "58a9fb0ffca63e3dfb3b27c7d91b4630e422903b";
           sha256 = "0ajbqrkg3v0yn8mj7dsv12w9zzcwjkabd776fabxamhcj6zbvza3";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1b6455dd89167a854477a00284f64737905b54d8/recipes/total-lines";
           sha256 = "0zpli7gsb56fc3pzb3b2bs7dzr9glkixbzgl4p2kc249vz3jqajh";
-          name = "total-lines";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -37068,20 +46364,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    tox = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    tox = callPackage ({ fetchFromGitHub
+                       , fetchurl
+                       , lib
+                       , melpaBuild }:
+      melpaBuild {
         pname = "tox";
         version = "0.4.0";
         src = fetchFromGitHub {
           owner = "chmouel";
           repo = "tox.el";
-          rev = "7655eb254038d5e34433e8a9d66b3ffc9c72e40c";
-          sha256 = "1212b7s00kw9hk5gc2jx88hqd825rvkz1ss7phnxkrz833l062ki";
+          rev = "27a074b21238855ce3c33d22e42d69e2c2921205";
+          sha256 = "1m3f0i6vrkrncd7xsgz65m6595iv6yr4gbbzlis8p01kd98wbxfk";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/08a7433e16f2a9a2c04168600a9c99bc21c68ddf/recipes/tox";
           sha256 = "1z81x8fs5q6r19hpqphsilk8wdwwnfr8w78x5x298x74s9mcsywl";
-          name = "tox";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -37089,8 +46388,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    toxi-theme = callPackage ({ emacs, fetchhg, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    toxi-theme = callPackage ({ emacs
+                              , fetchhg
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "toxi-theme";
         version = "0.1.2";
         src = fetchhg {
@@ -37109,20 +46412,60 @@
           license = lib.licenses.free;
         };
       }) {};
-    tracking = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    traad = callPackage ({ dash
+                         , deferred
+                         , fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild
+                         , popup
+                         , request
+                         , request-deferred
+                         , virtualenvwrapper }:
+      melpaBuild {
+        pname = "traad";
+        version = "3.1.1";
+        src = fetchFromGitHub {
+          owner = "abingham";
+          repo = "emacs-traad";
+          rev = "1f05cb4e5e96a90d2fb2bbc93093084327c40cf2";
+          sha256 = "14qg8aczcdf51w618zdzx3d48y9n4skjrg72yhgcm9a9lrs5v8y1";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/2b3eb31c077fcaff94b74b757c1ce17650333943/recipes/traad";
+          sha256 = "08gxh5c01xfbbj9g4992jah494rw3d3bbs8j79r3mpqxllkp2znf";
+          name = "recipe";
+        };
+        packageRequires = [
+          dash
+          deferred
+          popup
+          request
+          request-deferred
+          virtualenvwrapper
+        ];
+        meta = {
+          homepage = "https://melpa.org/#/traad";
+          license = lib.licenses.free;
+        };
+      }) {};
+    tracking = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "tracking";
-        version = "2.7";
+        version = "2.10";
         src = fetchFromGitHub {
           owner = "jorgenschaefer";
           repo = "circe";
-          rev = "661a2cdb3a3d9bc11ee511a4f90116c88e0d3484";
-          sha256 = "19fcvmm915dz9l2w1rna4yik96rb3hrk7042012g961xn4sgs0ih";
+          rev = "571853c1f5ece6777fe745489b34d3ad7c3cb0ba";
+          sha256 = "1l2zhszwg7cg96vlyi33bykk4mmig38xmasgpp02xypa4j4p11sw";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a2b295656d53fddc76cacc86b239e5648e49e3a4/recipes/tracking";
           sha256 = "096h5bl7jcwz5hpbm2139bf8a784hijfy40vzf42y1c9794al46z";
-          name = "tracking";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -37130,8 +46473,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    transmission = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }:
-    melpaBuild {
+    transmission = callPackage ({ emacs
+                                , fetchFromGitHub
+                                , fetchurl
+                                , let-alist
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "transmission";
         version = "0.12.1";
         src = fetchFromGitHub {
@@ -37140,10 +46488,10 @@
           rev = "03a36853f141387654b7cb9217c7417db096a083";
           sha256 = "0kvg2gawsgy440x1fsl2c4pkxwp3zirq9rzixanklk0ryijhd3ry";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9ed7e414687c0bd82b140a1bd8044084d094d18f/recipes/transmission";
           sha256 = "0w0hlr4y4xpcrpvclqqqasggkgrwnzrdib51mhkh3f3mqyiw8gs9";
-          name = "transmission";
+          name = "recipe";
         };
         packageRequires = [ emacs let-alist ];
         meta = {
@@ -37151,8 +46499,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    travis = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, request, s }:
-    melpaBuild {
+    travis = callPackage ({ dash
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild
+                          , pkg-info
+                          , request
+                          , s }:
+      melpaBuild {
         pname = "travis";
         version = "0.6.0";
         src = fetchFromGitHub {
@@ -37161,10 +46516,10 @@
           rev = "c8769d3db10ed4604969049e3bd276afa0a0138e";
           sha256 = "1jd7xsvs4m55fscp62a9lk59ip4sgifv4kazl55b7543nz1i31bz";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c064a0dc7922cbe4cff2ae65665c4f10e6dbff27/recipes/travis";
           sha256 = "1km496cq1vni9gy2d3z4c9524q62750ywz745rjz4r7178ip9mix";
-          name = "travis";
+          name = "recipe";
         };
         packageRequires = [ dash pkg-info request s ];
         meta = {
@@ -37172,20 +46527,32 @@
           license = lib.licenses.free;
         };
       }) {};
-    treemacs = callPackage ({ ace-window, cl-lib ? null, dash, emacs, f, fetchFromGitHub, fetchurl, ht, hydra, lib, melpaBuild, pfuture, s }:
-    melpaBuild {
+    treemacs = callPackage ({ ace-window
+                            , cl-lib ? null
+                            , dash
+                            , emacs
+                            , f
+                            , fetchFromGitHub
+                            , fetchurl
+                            , ht
+                            , hydra
+                            , lib
+                            , melpaBuild
+                            , pfuture
+                            , s }:
+      melpaBuild {
         pname = "treemacs";
-        version = "1.18.1";
+        version = "2.2";
         src = fetchFromGitHub {
           owner = "Alexander-Miller";
           repo = "treemacs";
-          rev = "e8be02971ad6c7a9c33ec544fa41b4b2f6827a35";
-          sha256 = "0fk45jmnx34azldxa4yrv6lqmkaxkpkqbnwnn29q7y4ld0ljghs0";
+          rev = "9b1129ee3152994b033a877fc49777bfe02e315a";
+          sha256 = "08ias1nixz7ma8g6v3v4dqdnd87sqdhplsp5v5wvr3w58szlia5b";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/91038c1ab2f463102263dcc3701c0fdaad55de4c/recipes/treemacs";
           sha256 = "1wcsn0kzrbawyyhxmsmrsxr1vp0llkxw6r7zx53pwyc82ia64nlv";
-          name = "treemacs";
+          name = "recipe";
         };
         packageRequires = [ ace-window cl-lib dash emacs f ht hydra pfuture s ];
         meta = {
@@ -37193,20 +46560,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    treemacs-evil = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild, treemacs }:
-    melpaBuild {
+    treemacs-evil = callPackage ({ evil
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild
+                                 , treemacs }:
+      melpaBuild {
         pname = "treemacs-evil";
-        version = "1.18.1";
+        version = "2.2";
         src = fetchFromGitHub {
           owner = "Alexander-Miller";
           repo = "treemacs";
-          rev = "e8be02971ad6c7a9c33ec544fa41b4b2f6827a35";
-          sha256 = "0fk45jmnx34azldxa4yrv6lqmkaxkpkqbnwnn29q7y4ld0ljghs0";
+          rev = "d0f874c90990400c02a8029d4efe815d3548ba5c";
+          sha256 = "0hclgsv96gr50z9cqj97rp45c5r50q2zb6hq5jcx3xmlw12k9pk7";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/91038c1ab2f463102263dcc3701c0fdaad55de4c/recipes/treemacs-evil";
           sha256 = "1i2mxqwnqb2jz775qg3z4lf7pk4mgi646fyyi2la5gdcnq6a46mg";
-          name = "treemacs-evil";
+          name = "recipe";
         };
         packageRequires = [ evil treemacs ];
         meta = {
@@ -37214,20 +46586,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    treemacs-projectile = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, projectile, treemacs }:
-    melpaBuild {
+    treemacs-projectile = callPackage ({ fetchFromGitHub
+                                       , fetchurl
+                                       , lib
+                                       , melpaBuild
+                                       , projectile
+                                       , treemacs }:
+      melpaBuild {
         pname = "treemacs-projectile";
-        version = "1.18.1";
+        version = "2.2";
         src = fetchFromGitHub {
           owner = "Alexander-Miller";
           repo = "treemacs";
-          rev = "e8be02971ad6c7a9c33ec544fa41b4b2f6827a35";
-          sha256 = "0fk45jmnx34azldxa4yrv6lqmkaxkpkqbnwnn29q7y4ld0ljghs0";
+          rev = "cbc75759fd54a772fcb67bd8babacf1b2020ba88";
+          sha256 = "18aafgiircgb5max35zqzdfb0yjmgjqacax9sfy39ihh9x9z0vc1";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/91038c1ab2f463102263dcc3701c0fdaad55de4c/recipes/treemacs-projectile";
           sha256 = "1vyifik30673bwlfvbmw8pzz7f3wd4q6zzssvbj8d23zhk8kh8vc";
-          name = "treemacs-projectile";
+          name = "recipe";
         };
         packageRequires = [ projectile treemacs ];
         meta = {
@@ -37235,8 +46612,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    treepy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    treepy = callPackage ({ emacs
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "treepy";
         version = "1.0.0";
         src = fetchFromGitHub {
@@ -37245,10 +46626,10 @@
           rev = "282fbc94747fe2a00d36e2a74d147c8fa0ac4be7";
           sha256 = "0acw6c073h2a0fy8gx2xc2d1fw0yhaqikqrvs2iq53fqcqrrq81r";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/63c94a703841f8c11948200d86d98145bc62162c/recipes/treepy";
           sha256 = "0jfah4vywi1b6c86h7vh8fspmklhs790qzkl51i9p7yckfggwp72";
-          name = "treepy";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -37256,8 +46637,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    trr = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    trr = callPackage ({ fetchFromGitHub
+                       , fetchurl
+                       , lib
+                       , melpaBuild }:
+      melpaBuild {
         pname = "trr";
         version = "2.0.0";
         src = fetchFromGitHub {
@@ -37266,10 +46650,10 @@
           rev = "7500ae0a05a3e26888949208afcd0185cc1b1404";
           sha256 = "0x1knf2jqkd1sdswv1w902jnlppih2yw6z028268nizl0c9q92yn";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/56fa3c0b65e4e300f01804df7779ba6f1cb18cec/recipes/trr";
           sha256 = "068vqsyx8riqzfrmjk8wr81f68r2y2b6ymc2vvl6vka9rprvsfwr";
-          name = "trr";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -37277,8 +46661,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    truthy = callPackage ({ fetchFromGitHub, fetchurl, lib, list-utils, melpaBuild }:
-    melpaBuild {
+    truthy = callPackage ({ fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , list-utils
+                          , melpaBuild }:
+      melpaBuild {
         pname = "truthy";
         version = "0.2.8";
         src = fetchFromGitHub {
@@ -37287,10 +46675,10 @@
           rev = "276a7e6b13606d28e4f2e423bb1ea30904c5def3";
           sha256 = "18na22fhwqz80qinmnpsvp6ghc9irva1scixi6s4q6plmgr4m397";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f7a7e319dbe17e2b31353e7d7cab51d557d86e9d/recipes/truthy";
           sha256 = "1a56zmqars9fd03bkqzwpvgblq5fvq19n4jw04c4hpga92sq8wqg";
-          name = "truthy";
+          name = "recipe";
         };
         packageRequires = [ list-utils ];
         meta = {
@@ -37298,8 +46686,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    try = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    try = callPackage ({ emacs
+                       , fetchFromGitHub
+                       , fetchurl
+                       , lib
+                       , melpaBuild }:
+      melpaBuild {
         pname = "try";
         version = "0.0.1";
         src = fetchFromGitHub {
@@ -37308,10 +46700,10 @@
           rev = "271b0a362cadf44d0694628b9e213f54516ef913";
           sha256 = "1fvpi02c6awyrwg2yqjapvcv4132qvmvd9bkbwpjmndxpicsann3";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/13c0ed40ad02fa0893cbf4dd9617dccb624f064b/recipes/try";
           sha256 = "0dv0i77agva215bf1gj1x1k7f7g3pvccyyd7vslapf9z8brccn7n";
-          name = "try";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -37319,20 +46711,27 @@
           license = lib.licenses.free;
         };
       }) {};
-    tss = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, json-mode, lib, log4e, melpaBuild, yaxception }:
-    melpaBuild {
+    tss = callPackage ({ auto-complete
+                       , fetchFromGitHub
+                       , fetchurl
+                       , json-mode
+                       , lib
+                       , log4e
+                       , melpaBuild
+                       , yaxception }:
+      melpaBuild {
         pname = "tss";
         version = "0.6.0";
         src = fetchFromGitHub {
           owner = "aki2o";
           repo = "emacs-tss";
-          rev = "1f302deea3d74462c71a9c62031f48b753e8915f";
-          sha256 = "1ma3k9bbw427cj1n2gjajbqii482jhs2lgjggz9clpc21bn5wqfb";
+          rev = "140ae681828469b1415ae51a39ac4fdfaa84e4c3";
+          sha256 = "113qs1frz1rfvswgw5wrvmxd7q6zbpp6rdz35hr1wmpfj546z1kw";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d52e20f5ca38ed399d19f18f778b8601baf78460/recipes/tss";
           sha256 = "0d16x5r2xfy6mrwy0mqzpr9b3inqmyyxgawrxlfh83j1xb903dhm";
-          name = "tss";
+          name = "recipe";
         };
         packageRequires = [ auto-complete json-mode log4e yaxception ];
         meta = {
@@ -37340,20 +46739,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    tuareg = callPackage ({ caml, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    tuareg = callPackage ({ caml
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "tuareg";
         version = "2.1.0";
         src = fetchFromGitHub {
           owner = "ocaml";
           repo = "tuareg";
-          rev = "92c1dea250038d1590ab6ce76a6e099fef10d450";
-          sha256 = "187z651w2ngj29bgvw0435c88ky8jvczgvglja9491vprp1zfypc";
+          rev = "927a309b1ad8559be33e6a1d7951214a66f7c130";
+          sha256 = "05rsid1g3vrg10qiws7dd1rpd6wva9mqldwfyrrhg088k4v2a0q5";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/01fb6435a1dfeebdf4e7fa3f4f5928bc75526809/recipes/tuareg";
           sha256 = "0wx723dmjlpm86xdabl9n8p22zbbxpapyfn6ifz0b0pvhh49ip7q";
-          name = "tuareg";
+          name = "recipe";
         };
         packageRequires = [ caml ];
         meta = {
@@ -37361,8 +46764,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    tumble = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    tumble = callPackage ({ fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "tumble";
         version = "1.5";
         src = fetchFromGitHub {
@@ -37371,10 +46777,10 @@
           rev = "a1db6dac5720b9f468a79e0efce04f77c0a458e3";
           sha256 = "0ihjjw5wxz5ybl3600k937pszw3442cijs4gbqqip9vhd5y9m8gy";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/579a441d153c4c7d9f8172be94983a632d6fab8f/recipes/tumble";
           sha256 = "1c9ybq0mb2a0pw15fmm13vfwcnr2h9fb1xsm5nrff1cg7913pgv9";
-          name = "tumble";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -37382,8 +46788,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    tup-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    tup-mode = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "tup-mode";
         version = "1.3.1";
         src = fetchFromGitHub {
@@ -37392,10 +46801,10 @@
           rev = "945af9c8e6c402e10cd3bf8e28a9591174023d6d";
           sha256 = "0asd024n5v23wdsg1959sszq568wg3a1bp4jrk0cllfji1z0n78y";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bda3260dad1c766c5b6ae9124f966bf441e24f2f/recipes/tup-mode";
           sha256 = "0pzpn1ljfcc2dl9fg7jc8lmjwz2baays4axjqk1qsbj0kqbc8j0l";
-          name = "tup-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -37403,8 +46812,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    turing-machine = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    turing-machine = callPackage ({ emacs
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "turing-machine";
         version = "0.2.0";
         src = fetchFromGitHub {
@@ -37413,10 +46826,10 @@
           rev = "ad1dccc9c445f9e4465e1c67cbbfea9583153047";
           sha256 = "0qaz4r5ahg2fxsfyxilb8c9956i5ra9vg80l82slm8vrnsinzll6";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a003b40a52a92b3ab4d1ffc003f570d4fa6bfbde/recipes/turing-machine";
           sha256 = "1ndy953q9hr1psqqkkqsffyvj800cnqdxcrixqiw0ls77f2kczcn";
-          name = "turing-machine";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -37424,8 +46837,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    twilight-anti-bright-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    twilight-anti-bright-theme = callPackage ({ fetchFromGitHub
+                                              , fetchurl
+                                              , lib
+                                              , melpaBuild }:
+      melpaBuild {
         pname = "twilight-anti-bright-theme";
         version = "0.3.0";
         src = fetchFromGitHub {
@@ -37434,10 +46850,10 @@
           rev = "16d4ff2606789b506f0d2f53d12f02d5b1b64f9b";
           sha256 = "0glw5lns7hwp8jznnfm6dyjw454sv2n84gy07ma7s1q3yczhq5bc";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/twilight-anti-bright-theme";
           sha256 = "1wfj570l5k0ygqi9dwjskc78rpnxw6080bkw1zd1a8kl3fa28n2k";
-          name = "twilight-anti-bright-theme";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -37445,20 +46861,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    twittering-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    twittering-mode = callPackage ({ fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "twittering-mode";
         version = "3.0.0";
         src = fetchFromGitHub {
           owner = "hayamiz";
           repo = "twittering-mode";
-          rev = "27e7f3aab238bd0788fd3b471c645c3ceceb0f13";
-          sha256 = "193v98i84xybm3n0f30jin5q10i87vbcnbdhl4zqi7jij9p5v98z";
+          rev = "fa40325328bc8c2aa40eff6ed1954d5c07436152";
+          sha256 = "1bpzcljg81igldjjglgn0vxy9i89i802kx2jgvcr16c1vway7cm9";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/twittering-mode";
           sha256 = "0v9ijxw5jazh2hc0qab48y71za2l9ryff0mpkxhr3f79irlqy0a1";
-          name = "twittering-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -37466,20 +46885,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    typed-clojure-mode = callPackage ({ cider, clojure-mode, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    typed-clojure-mode = callPackage ({ cider
+                                      , clojure-mode
+                                      , fetchFromGitHub
+                                      , fetchurl
+                                      , lib
+                                      , melpaBuild }:
+      melpaBuild {
         pname = "typed-clojure-mode";
         version = "1.0.0";
         src = fetchFromGitHub {
           owner = "typedclojure";
           repo = "typed-clojure-mode";
-          rev = "00bc20db78901204a67722ab47482660e36d0463";
-          sha256 = "1risfbsaafh760vnl4ryys91g4k78g0fxj2zlcndpxxv34gwkhy7";
+          rev = "03f01f5bfa93247f8f7958a8a45cf83604f7d96e";
+          sha256 = "0d6i5n3s6b0q0c06ix7vm7iwx5zi4j7h2yygcsbzwyza1z284ry5";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/961471c194b508a5025f00a5be02d316b26f330a/recipes/typed-clojure-mode";
           sha256 = "1579zkhk2lwl5ij7dm9n2drggs5fmhpljrshc4ghhvig7nlyqjy3";
-          name = "typed-clojure-mode";
+          name = "recipe";
         };
         packageRequires = [ cider clojure-mode ];
         meta = {
@@ -37487,20 +46911,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    typescript-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    typescript-mode = callPackage ({ fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
         pname = "typescript-mode";
-        version = "0.2";
+        version = "0.3";
         src = fetchFromGitHub {
           owner = "ananthakumaran";
           repo = "typescript.el";
-          rev = "f25f4751fea12298905c811a1f469a6b0a169ef1";
-          sha256 = "1s4qzhi8bd45l824pwzh97i9npf7j4ai6wkbhf28q2nd1hiv29hw";
+          rev = "7a5c74d88e3c5513cc4431a837003736f905a75e";
+          sha256 = "002f1xfhq43fjaqliwrgxspryfahpa82va5dw3p8kwil2xwvc6mh";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d3f534a1e2cee4ad2e32e32802c5080207417b3d/recipes/typescript-mode";
           sha256 = "01jyqy44ir59n9c2f6gh4xzwfmzdpnys1lw4lnsy6kirqgbsq9ha";
-          name = "typescript-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -37508,8 +46935,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    typit = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, mmt }:
-    melpaBuild {
+    typit = callPackage ({ emacs
+                         , f
+                         , fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild
+                         , mmt }:
+      melpaBuild {
         pname = "typit";
         version = "0.2.1";
         src = fetchFromGitHub {
@@ -37518,10 +46951,10 @@
           rev = "a4e3147dedac5535bdc8b06aca00f34f14f26e35";
           sha256 = "0hbnwrhxj9wwjvxsk372ffgjqfkb3ljxhgi5h7wps2r15dxfvf3w";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d17d019155e19c156f123dcd702f18cfba488701/recipes/typit";
           sha256 = "05m7ymcq6fgbhh93ninrf3qi7csdnf2ahhf01mkm8gxxyaqq6m4n";
-          name = "typit";
+          name = "recipe";
         };
         packageRequires = [ emacs f mmt ];
         meta = {
@@ -37529,8 +46962,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    typo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    typo = callPackage ({ fetchFromGitHub
+                        , fetchurl
+                        , lib
+                        , melpaBuild }:
+      melpaBuild {
         pname = "typo";
         version = "1.1";
         src = fetchFromGitHub {
@@ -37539,10 +46975,10 @@
           rev = "e72171e4eb0b9ec80b9dabc3198d137d9fb4f972";
           sha256 = "1jhd4grch5iz12gyxwfbsgh4dmz5hj4bg4gnvphccg8dsnni05k2";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/typo";
           sha256 = "1p8is1n525lmzq588hj6vazmhl9wi6rairnfx1g1p6g6ijdycd4h";
-          name = "typo";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -37550,8 +46986,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    ubuntu-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ubuntu-theme = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "ubuntu-theme";
         version = "4.2";
         src = fetchFromGitHub {
@@ -37560,10 +46999,10 @@
           rev = "41f09ca6c203da93bdadb2077556efd48e3b5d5a";
           sha256 = "0k41hwb6jgv3hngfrphlyhmfhvy4k05mvn0brm64xk7lj56y8q2c";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/ubuntu-theme";
           sha256 = "160z59aaxb2v6c24nki6bn7pjm9r4jl1mgxs4h4sivzxkaw811s2";
-          name = "ubuntu-theme";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -37571,8 +47010,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    ucs-utils = callPackage ({ fetchFromGitHub, fetchurl, lib, list-utils, melpaBuild, pcache, persistent-soft }:
-    melpaBuild {
+    ucs-utils = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , list-utils
+                             , melpaBuild
+                             , pcache
+                             , persistent-soft }:
+      melpaBuild {
         pname = "ucs-utils";
         version = "0.8.4";
         src = fetchFromGitHub {
@@ -37581,10 +47026,10 @@
           rev = "cbfd42f822bf5717934fa2d92060e6e24a813433";
           sha256 = "0qw9vwl1p0pjw1xmshxar1a8kn6gmin5rdvvnnly8b5z9hpkjf3m";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c9db386ab3910940addae6e925b2ac17e64e0f87/recipes/ucs-utils";
           sha256 = "111fwg2cqqzpa79rcqxidppb12c8g12zszppph2ydfvkgkryb6z2";
-          name = "ucs-utils";
+          name = "recipe";
         };
         packageRequires = [ list-utils pcache persistent-soft ];
         meta = {
@@ -37592,8 +47037,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    undercover = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, shut-up }:
-    melpaBuild {
+    undercover = callPackage ({ dash
+                              , emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild
+                              , shut-up }:
+      melpaBuild {
         pname = "undercover";
         version = "0.6.1";
         src = fetchFromGitHub {
@@ -37602,10 +47053,10 @@
           rev = "86f856c799aacfd48d2eb42d1a6afda0e6e49845";
           sha256 = "080bmfwyfi8663y8x594770hqz7mff7zvj2v03qdfwbhdr9w9y29";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d58ad9eb863494f609114e3c6af8c14c891b83a5/recipes/undercover";
           sha256 = "1s30c3i6y4r3mgrrs3lda3rrwmy9ff11ihdmshyziv9v5879sdjf";
-          name = "undercover";
+          name = "recipe";
         };
         packageRequires = [ dash emacs shut-up ];
         meta = {
@@ -37613,8 +47064,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    underline-with-char = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    underline-with-char = callPackage ({ emacs
+                                       , fetchFromGitHub
+                                       , fetchurl
+                                       , lib
+                                       , melpaBuild }:
+      melpaBuild {
         pname = "underline-with-char";
         version = "3.0.0";
         src = fetchFromGitHub {
@@ -37623,10 +47078,10 @@
           rev = "c2f4870aff70efe70a8d1b089e56d3a2d6d048b9";
           sha256 = "0i6jfr4l7mr8gpavmfblr5d41ck8aqzaf4iv1qk5fyzsb6yi0nla";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e24888ccf61ac05eba5c30a47d35653f2badf019/recipes/underline-with-char";
           sha256 = "0la24nvyqinla40c2f3f4a63mjjsg58096hyw3pvp0mwiff7rxyd";
-          name = "underline-with-char";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -37634,8 +47089,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    underwater-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    underwater-theme = callPackage ({ fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "underwater-theme";
         version = "1.1.0";
         src = fetchFromGitHub {
@@ -37644,10 +47102,10 @@
           rev = "1fbd4ecd4538256c6c46f9638f883072c73ac927";
           sha256 = "1g1ldyz42q3i2xlgvhd4s93cvkh0fm8m3l344zjcw8rvqaisyphj";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e7dccc77d082181629b8f0c45404ac5d8bd97590/recipes/underwater-theme";
           sha256 = "0ab2bcqfdi9ml3z9d511pbfwcbp8hkkd36xxp61k36gkyi3acvlr";
-          name = "underwater-theme";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -37655,20 +47113,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    unfill = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    unfill = callPackage ({ fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "unfill";
         version = "0.2";
         src = fetchFromGitHub {
           owner = "purcell";
           repo = "unfill";
-          rev = "88186dce0de69e8f4aeaf2bfdc77d62210f19cd8";
-          sha256 = "0wyradin5igp25nsd3n22i2ppxhmy49ac1iq1w2715v8pfmiydnc";
+          rev = "234fee7351cafdcfa68a2b1fc603744b03e0e16b";
+          sha256 = "0i25kr4anszl48w29vlxwfg3dq1baa81qj91v4iw3wsnmc40n7ww";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2ade389a20419b3e29a613409ac73a16b7c5bddb/recipes/unfill";
           sha256 = "0b21dk45vbz4vqdbdx0n6wx30rm38w1jjqbsxfj7b96p3i5shwqv";
-          name = "unfill";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -37676,8 +47137,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    unicode-enbox = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, pcache, persistent-soft, string-utils, ucs-utils }:
-    melpaBuild {
+    unicode-enbox = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild
+                                 , pcache
+                                 , persistent-soft
+                                 , string-utils
+                                 , ucs-utils }:
+      melpaBuild {
         pname = "unicode-enbox";
         version = "0.1.4";
         src = fetchFromGitHub {
@@ -37686,10 +47154,10 @@
           rev = "ff313f6778bb96481c0ee3291b07a7db46f21ff5";
           sha256 = "0n06dvf6r7qblz8vz38qc37xrn29wa1c0jyzis1qw9zzf6hmmzj7";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c9db386ab3910940addae6e925b2ac17e64e0f87/recipes/unicode-enbox";
           sha256 = "1phb2qq3pg6z6bl96kl9yfq4jxhgardjpaa4lhgqbxymmqdm7gzv";
-          name = "unicode-enbox";
+          name = "recipe";
         };
         packageRequires = [ pcache persistent-soft string-utils ucs-utils ];
         meta = {
@@ -37697,20 +47165,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    unicode-escape = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, names }:
-    melpaBuild {
+    unicode-escape = callPackage ({ dash
+                                  , emacs
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild
+                                  , names }:
+      melpaBuild {
         pname = "unicode-escape";
         version = "1.1";
         src = fetchFromGitHub {
           owner = "kosh04";
           repo = "unicode-escape.el";
-          rev = "b9cee7af45be62119b97033dc639bd1b5ed858f3";
-          sha256 = "09dgxb1z9kdbs8wri9sl5daygp1bgqcng40vyfv5y0ic50w08ksf";
+          rev = "04c7f22f90c96e93f998f084089ab08dc7f4fdd6";
+          sha256 = "01i5cq7yan9z1kr6pvp4bwzsnxs0bpqsaglfbvy7v6jfp923bvdm";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b2ae00434b80357dc62cd0177dbd714b25fb3ac7/recipes/unicode-escape";
           sha256 = "0gcwkv7qbdnvak10jfzj9irb7nkfqsfxv2n5fi8vvrk90j1a2i2k";
-          name = "unicode-escape";
+          name = "recipe";
         };
         packageRequires = [ dash emacs names ];
         meta = {
@@ -37718,8 +47192,16 @@
           license = lib.licenses.free;
         };
       }) {};
-    unicode-fonts = callPackage ({ fetchFromGitHub, fetchurl, font-utils, lib, list-utils, melpaBuild, pcache, persistent-soft, ucs-utils }:
-    melpaBuild {
+    unicode-fonts = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , font-utils
+                                 , lib
+                                 , list-utils
+                                 , melpaBuild
+                                 , pcache
+                                 , persistent-soft
+                                 , ucs-utils }:
+      melpaBuild {
         pname = "unicode-fonts";
         version = "0.4.8";
         src = fetchFromGitHub {
@@ -37728,10 +47210,10 @@
           rev = "a36597d83e0248bd0e6b2c1d5fb95bff72add527";
           sha256 = "0fbwncna6gxlynq9196djpkjhayzk8kxlsxg0gasdgqx1nyxl0mk";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/83459421dd2eb3d60ec668c3d5bb38d99ee64aff/recipes/unicode-fonts";
           sha256 = "0plipwb30qqay8691qzqdyg6smpbs9dsxxi49psb8sq0xnxl84q3";
-          name = "unicode-fonts";
+          name = "recipe";
         };
         packageRequires = [
           font-utils
@@ -37745,8 +47227,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    unicode-progress-reporter = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pcache, persistent-soft, ucs-utils }:
-    melpaBuild {
+    unicode-progress-reporter = callPackage ({ emacs
+                                             , fetchFromGitHub
+                                             , fetchurl
+                                             , lib
+                                             , melpaBuild
+                                             , pcache
+                                             , persistent-soft
+                                             , ucs-utils }:
+      melpaBuild {
         pname = "unicode-progress-reporter";
         version = "0.5.4";
         src = fetchFromGitHub {
@@ -37755,10 +47244,10 @@
           rev = "f4705332412b12fc72ca868b77c78465561bda75";
           sha256 = "0qy1hla7vf674ynqdzsaw2cnk92nhpcimww5q94rc0a95pzw64wd";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/83459421dd2eb3d60ec668c3d5bb38d99ee64aff/recipes/unicode-progress-reporter";
           sha256 = "03z7p27470fqy3gd356l9cpp44a35sfrxz94dxmx388rzlygk7y7";
-          name = "unicode-progress-reporter";
+          name = "recipe";
         };
         packageRequires = [ emacs pcache persistent-soft ucs-utils ];
         meta = {
@@ -37766,8 +47255,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    unicode-whitespace = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, pcache, persistent-soft, ucs-utils }:
-    melpaBuild {
+    unicode-whitespace = callPackage ({ fetchFromGitHub
+                                      , fetchurl
+                                      , lib
+                                      , melpaBuild
+                                      , pcache
+                                      , persistent-soft
+                                      , ucs-utils }:
+      melpaBuild {
         pname = "unicode-whitespace";
         version = "0.2.4";
         src = fetchFromGitHub {
@@ -37776,10 +47271,10 @@
           rev = "6d29f25d46b3344c74ce289fc80b3d4fc17ed6db";
           sha256 = "0q7cbl89yg3fjxaxsqsksxhw7ibdslbb004z5y1m579n7zgcrljy";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f9892a826f3ac335d12bd1a07202334e28a44f40/recipes/unicode-whitespace";
           sha256 = "1b3jgha8va42b89pdp41sab2w9wllp7dicqg4lxl67bg6wn147wy";
-          name = "unicode-whitespace";
+          name = "recipe";
         };
         packageRequires = [ pcache persistent-soft ucs-utils ];
         meta = {
@@ -37787,8 +47282,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    unify-opening = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    unify-opening = callPackage ({ emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "unify-opening";
         version = "2.1.0";
         src = fetchFromGitHub {
@@ -37797,10 +47296,10 @@
           rev = "502469ddba6d8d52159f53976265f7d956b6b17c";
           sha256 = "0mni9vnbs50wvgnwfjwgzlwfff38h3wbrpr20nv84dmfh8ac0v61";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0a2faab13744262ef4d12750f70b300b3afd2835/recipes/unify-opening";
           sha256 = "1gpmklbdbmv8va8d3yr94r1ydkcyvdzcgxv56rp0bxwbcgmk0as8";
-          name = "unify-opening";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -37808,20 +47307,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    unkillable-scratch = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    unkillable-scratch = callPackage ({ fetchFromGitHub
+                                      , fetchurl
+                                      , lib
+                                      , melpaBuild }:
+      melpaBuild {
         pname = "unkillable-scratch";
         version = "0.1";
         src = fetchFromGitHub {
           owner = "EricCrosson";
           repo = "unkillable-scratch";
-          rev = "4451f82eb98f9b159745ca1a79ac60b9d224fd5b";
-          sha256 = "1w2w0gmyr0nbq8kv3ldj30h9xma76gi1khbdia1y30kss677rr8m";
+          rev = "85e01b6da499a05bc920ca7958f0642c76dd9ce2";
+          sha256 = "0j513ia8mfa4i8h1z0m00k65g89fdcdp6h37bdm2ymy4g26wbk6n";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/822ac5610f333e41b676a29ef45a6f8bfea3162e/recipes/unkillable-scratch";
           sha256 = "0ghbpa9pf7k6vd2mjxkpqg2qfl4sd40ir6mrk1rxr1rv8s0afkf7";
-          name = "unkillable-scratch";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -37829,8 +47331,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    uptimes = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    uptimes = callPackage ({ cl-lib ? null
+                           , emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "uptimes";
         version = "3.6";
         src = fetchFromGitHub {
@@ -37839,10 +47346,10 @@
           rev = "5e81f8bb419836602819045e7d5a74b76ad3e69c";
           sha256 = "04l452k249s3ilfj0da0k7rrfyjnxxdsipa2al46xqjds8l3h2rn";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/72099e35ce3e34ec6afc6a3f87a4da07ec91499a/recipes/uptimes";
           sha256 = "0r8s5c2hdcb1ly7rnhzar4qzf1c9d49gd914ndnc3mg9yb9gyy5h";
-          name = "uptimes";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -37850,8 +47357,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    use-package = callPackage ({ bind-key, diminish, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    use-package = callPackage ({ bind-key
+                               , diminish
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "use-package";
         version = "2.3";
         src = fetchFromGitHub {
@@ -37860,10 +47372,10 @@
           rev = "cd58b268a8a025451c11c3cb1ba18d4f27f245da";
           sha256 = "14x01dg7fgj4icf8l8w90pksazc0sn6qrrd0k3xjr2zg1wzdcang";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/51a19a251c879a566d4ae451d94fcb35e38a478b/recipes/use-package";
           sha256 = "0d0zpgxhj6crsdi9sfy30fn3is036apm1kz8fhjg1yzdapf1jdyp";
-          name = "use-package";
+          name = "recipe";
         };
         packageRequires = [ bind-key diminish ];
         meta = {
@@ -37871,8 +47383,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    use-package-el-get = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, use-package }:
-    melpaBuild {
+    use-package-el-get = callPackage ({ fetchFromGitHub
+                                      , fetchurl
+                                      , lib
+                                      , melpaBuild
+                                      , use-package }:
+      melpaBuild {
         pname = "use-package-el-get";
         version = "0.1";
         src = fetchFromGitHub {
@@ -37881,10 +47397,10 @@
           rev = "f33c448ed43ecb003b60ff601ee7ef9b08cff947";
           sha256 = "1wzn3h8k7aydj3hxxws64b0v4cr3b77cf7z128xh3v6xz2w62m4z";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ee4a96cf467bcab171a0adfd4ef754abec1a9971/recipes/use-package-el-get";
           sha256 = "0sg9ijkjax6w25p0q7rw5rjn8r2i83z5jfzjkvy8pxil5cg8zyh0";
-          name = "use-package-el-get";
+          name = "recipe";
         };
         packageRequires = [ use-package ];
         meta = {
@@ -37892,8 +47408,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    usql = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    usql = callPackage ({ emacs
+                        , fetchFromGitHub
+                        , fetchurl
+                        , lib
+                        , melpaBuild }:
+      melpaBuild {
         pname = "usql";
         version = "0.0.3";
         src = fetchFromGitHub {
@@ -37902,10 +47422,10 @@
           rev = "bfaf428b366a9a185eef84f0d645a98dc918fe3d";
           sha256 = "00b1g30l86abg65wc9f4vcn4ccqa2zmn2mi33vdjrq3phw17d2ks";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c8f6b968312a09d062fcc8f942d29c93df2a5a3c/recipes/usql";
           sha256 = "10ks164kcly5gkb2qmn700a51kph2sry4a64jwn60p5xl7w7af84";
-          name = "usql";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -37913,20 +47433,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    utop = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    utop = callPackage ({ emacs
+                        , fetchFromGitHub
+                        , fetchurl
+                        , lib
+                        , melpaBuild }:
+      melpaBuild {
         pname = "utop";
-        version = "2.1.0";
+        version = "2.2.0";
         src = fetchFromGitHub {
           owner = "diml";
           repo = "utop";
-          rev = "1b4bd052c6513d38f6cc626c24665637d25fdc07";
-          sha256 = "05pv6nj88im1jf9nngv56z362wrp9pmkzrjn3nm846rdzbc5f21j";
+          rev = "48100fcf769bdaeb4a6c93bbb33c37b85c1dcb10";
+          sha256 = "1cr1i5ywn9abqbrl4iq1c82vdjwrbh43v67zv1a8i4fvh99yzlv1";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/30489fe52b4031184e54f994770aa3291257bc9d/recipes/utop";
           sha256 = "0lv16kl29gc9hdcpn04l85pf7x93vkl41s4mgqp678cllzyr0cq7";
-          name = "utop";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -37934,20 +47458,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    v2ex-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, request }:
-    melpaBuild {
+    v2ex-mode = callPackage ({ cl-lib ? null
+                             , fetchFromGitHub
+                             , fetchurl
+                             , let-alist
+                             , lib
+                             , melpaBuild
+                             , request }:
+      melpaBuild {
         pname = "v2ex-mode";
         version = "0.2";
         src = fetchFromGitHub {
           owner = "aborn";
           repo = "v2ex-mode";
-          rev = "7a59ac3be2b08d873ec271ec7a3d5ace309c1407";
-          sha256 = "0f4y0s0zhqlb3n56yqp2w1krhrar5l4axl7dfn595hmwhhgxvvra";
+          rev = "e871c4872a4970bf76e6132d77ef0ef7b11536fe";
+          sha256 = "0sc0ix8d5knsm8p6z819j7iwkp2d6lrq0d8l94x4a8dgh4mapls8";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b27b7d777415aa350c8c30822e239b9a4c02e77d/recipes/v2ex-mode";
           sha256 = "04frd6jbnf9g7ak2fdbik9iji7b0903cpbg1hx7rai1853af7gh1";
-          name = "v2ex-mode";
+          name = "recipe";
         };
         packageRequires = [ cl-lib let-alist request ];
         meta = {
@@ -37955,8 +47485,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    vagrant = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    vagrant = callPackage ({ fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "vagrant";
         version = "0.6.1";
         src = fetchFromGitHub {
@@ -37965,10 +47498,10 @@
           rev = "ef3022d290ee26597e21b17ab87acbd8d4f1071f";
           sha256 = "1661fwfx2gpxjriy3ngi9raz8c2kkk3rgg51irdi591jr2zqmw6s";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/vagrant";
           sha256 = "0g6sqzsx3lixcn09fkxhhcfp45qnqgf1ms0l7nkzyljavb7151cf";
-          name = "vagrant";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -37976,8 +47509,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    vbasense = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, lib, log4e, melpaBuild, yaxception }:
-    melpaBuild {
+    vbasense = callPackage ({ auto-complete
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , log4e
+                            , melpaBuild
+                            , yaxception }:
+      melpaBuild {
         pname = "vbasense";
         version = "0.1.1";
         src = fetchFromGitHub {
@@ -37986,10 +47525,10 @@
           rev = "8c61a492d7c15218ae1a96e2aebfe6f78bfff6db";
           sha256 = "19j5q2f6pybvjq3ryjcyihzlw348hqyjhfcy3qflry6w786dqcgn";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8e7dd1e985d55149f48e4f93a31fb28ec01a4add/recipes/vbasense";
           sha256 = "1440q2bi4arpl5lbqh7zscg7v3884clqx54p2fdfcfkz47ky4z9n";
-          name = "vbasense";
+          name = "recipe";
         };
         packageRequires = [ auto-complete log4e yaxception ];
         meta = {
@@ -37997,8 +47536,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    vc-msg = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, popup }:
-    melpaBuild {
+    vc-msg = callPackage ({ emacs
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild
+                          , popup }:
+      melpaBuild {
         pname = "vc-msg";
         version = "0.0.4";
         src = fetchFromGitHub {
@@ -38007,10 +47551,10 @@
           rev = "091f3cf15ecb35bb4dc5de1ef7229f78735d9aee";
           sha256 = "0s129fzxhrr8pp4h0hkmxapnman67r0bdmbj8ys6r361na7h16hf";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/59ad4e80b49c78decd7b5794565313f65550384e/recipes/vc-msg";
           sha256 = "16pgx8pg3djhkmhf1fihgjk7c6nb2nsqj58888bwg7385mlwc7g9";
-          name = "vc-msg";
+          name = "recipe";
         };
         packageRequires = [ emacs popup ];
         meta = {
@@ -38018,8 +47562,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    vcomp = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    vcomp = callPackage ({ fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "vcomp";
         version = "0.3.1";
         src = fetchFromGitHub {
@@ -38028,10 +47575,10 @@
           rev = "a12363c3a66576b68955abcadf7280de32eaa051";
           sha256 = "07dx3dyvkwcin0gb6j4jx0ldfxs4rqhygl56a8i81yy05adkaq2x";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/561442ea9f75ebe8444db1a0c40f7756fcbca482/recipes/vcomp";
           sha256 = "02cj2nlyxvgvl2rjfgacljvcsnfm9crmmkhcm2pznj9xw10y8pq0";
-          name = "vcomp";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -38039,8 +47586,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    vdiff = callPackage ({ emacs, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild }:
-    melpaBuild {
+    vdiff = callPackage ({ emacs
+                         , fetchFromGitHub
+                         , fetchurl
+                         , hydra
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "vdiff";
         version = "0.2.2";
         src = fetchFromGitHub {
@@ -38049,10 +47601,10 @@
           rev = "f55acdbfcbb14e463d0850cfd041614c7002669e";
           sha256 = "0dlhisvnlzkzlilg456lxi0m5wh4a8681n142684hmk8vaw3wx2k";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e90f19c8fa4b0d267d269b76f117995e812e899c/recipes/vdiff";
           sha256 = "11gw0l63fssbiyhngqb7ykrp7m1vy55wlf27ybhh2dkwh1cpkr4l";
-          name = "vdiff";
+          name = "recipe";
         };
         packageRequires = [ emacs hydra ];
         meta = {
@@ -38060,20 +47612,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    vdiff-magit = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild, vdiff }:
-    melpaBuild {
+    vdiff-magit = callPackage ({ emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , magit
+                               , melpaBuild
+                               , vdiff }:
+      melpaBuild {
         pname = "vdiff-magit";
         version = "0.3.1";
         src = fetchFromGitHub {
           owner = "justbur";
           repo = "emacs-vdiff-magit";
-          rev = "5e245b6a078860d3b0f58436efec8ff6b4f485db";
-          sha256 = "0rz06jh5ayg0w6a19w9jyyn6jw27ri3cydynflxygk9364zvj59p";
+          rev = "31019a8537241fe106ee270c0d757fdd87fde092";
+          sha256 = "0j2kpaql0j77r1yj31xbykg3jwipdy0rsps20sq50g2chljqfdpf";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2159275fabde8ec8b297f6635546b1314d519b8b/recipes/vdiff-magit";
           sha256 = "1vjc1r5xfdg9bmscgppx1fps1w5bd0zpp6ab5z5dxlg2zx2vdldw";
-          name = "vdiff-magit";
+          name = "recipe";
         };
         packageRequires = [ emacs magit vdiff ];
         meta = {
@@ -38081,20 +47639,27 @@
           license = lib.licenses.free;
         };
       }) {};
-    vdirel = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, org-vcard, seq }:
-    melpaBuild {
+    vdirel = callPackage ({ emacs
+                          , fetchFromGitHub
+                          , fetchurl
+                          , helm
+                          , lib
+                          , melpaBuild
+                          , org-vcard
+                          , seq }:
+      melpaBuild {
         pname = "vdirel";
         version = "0.2.0";
         src = fetchFromGitHub {
           owner = "DamienCassou";
           repo = "vdirel";
-          rev = "4232676e93ca5ace8e51f6605bec223c3205beea";
-          sha256 = "0jdjg50f6my9952frl6asi8zk0i8b4hva26wm7pi8zk423pydr30";
+          rev = "58b0b6e6f0913a782691373b3996ca6bb6d1ba54";
+          sha256 = "0rkj9w1jbagx1515xs1jwh6fi0cx0nj7gym30c99c8v8asq63ds2";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/72b5ea3f4444c3de73d986a28e1d12bf47c40246/recipes/vdirel";
           sha256 = "11cc7bw7x5h3bwnlsjyhw6k5fh2fk7wffarrcny562v4cmr013cj";
-          name = "vdirel";
+          name = "recipe";
         };
         packageRequires = [ emacs helm org-vcard seq ];
         meta = {
@@ -38102,8 +47667,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    vector-utils = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    vector-utils = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "vector-utils";
         version = "0.1.2";
         src = fetchFromGitHub {
@@ -38112,10 +47680,10 @@
           rev = "2bd63c8ade1a2b6f8aac403c5f25adda2215a685";
           sha256 = "0lzq31zqnk32vfp3kicnvgfr3nkv8amjzxmk9nrz1kwgmq7gvkjk";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/081aa3e1d50c2c9e5a9b9ce0716258a93279f605/recipes/vector-utils";
           sha256 = "07armr23pq5pd47lqhir6a59r86c84zikbc51d8vfcaw8y71yr5n";
-          name = "vector-utils";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -38123,8 +47691,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    vertigo = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    vertigo = callPackage ({ dash
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "vertigo";
         version = "1.0";
         src = fetchFromGitHub {
@@ -38133,10 +47705,10 @@
           rev = "ebfa068d9e2fc39ba6d1744618c4e31dad6f629b";
           sha256 = "1yk7qqg8i3970kpfk34wvi0gh16qf0b0sfnf18g3s21dd4gk5a6g";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f1957e7fa03b6b8eb2f3250bd814d707bce3cfa3/recipes/vertigo";
           sha256 = "0x0wy1z601sk1x96bl2xx18qm4avd77iybq1a3ss8x8ykwqlgf83";
-          name = "vertigo";
+          name = "recipe";
         };
         packageRequires = [ dash ];
         meta = {
@@ -38144,20 +47716,27 @@
           license = lib.licenses.free;
         };
       }) {};
-    vhdl-tools = callPackage ({ emacs, fetchFromGitHub, fetchurl, ggtags, helm, lib, melpaBuild, outshine }:
-    melpaBuild {
+    vhdl-tools = callPackage ({ emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , ggtags
+                              , helm
+                              , lib
+                              , melpaBuild
+                              , outshine }:
+      melpaBuild {
         pname = "vhdl-tools";
-        version = "5.8";
+        version = "5.9";
         src = fetchFromGitHub {
           owner = "csantosb";
           repo = "vhdl-tools";
-          rev = "6bbcbdfbff7154517178290371b0182a176c09b5";
-          sha256 = "16k2h8n85ldfjb4zh7f202q370zs0rmmjhgf2jr4xfrvbdmgr8pa";
+          rev = "4e9df06c3519be22f1f713d18c80d325a5b0c3d2";
+          sha256 = "0n6mmbg8g3ip3dkbc4kxqxsd4p1h7jry25n1cqvzm24x1adwlcfm";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/69fe2f8fb98ac1af1d3185f62ae1c89e646cfebf/recipes/vhdl-tools";
           sha256 = "006d9xv60a90xalagczkziiimwsr1np9nn25zvnc4nlbf8j3fbbw";
-          name = "vhdl-tools";
+          name = "recipe";
         };
         packageRequires = [ emacs ggtags helm outshine ];
         meta = {
@@ -38165,8 +47744,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    vim-region = callPackage ({ expand-region, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    vim-region = callPackage ({ expand-region
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "vim-region";
         version = "0.3.0";
         src = fetchFromGitHub {
@@ -38175,10 +47758,10 @@
           rev = "e5359cc584a0cfa9270a76866a5eff7d3f44eb3d";
           sha256 = "1750gx65ymibam8ahx5blfv5jc26f3mzbklk1jrmfwpsalyghdd9";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/23249b485ca8e66a21f858712f46aa76b8554f28/recipes/vim-region";
           sha256 = "1dcnx799lpjsdnnjxqzgskkfj2nx7f4kwf0xjhbg35ny4nyn81dx";
-          name = "vim-region";
+          name = "recipe";
         };
         packageRequires = [ expand-region ];
         meta = {
@@ -38186,8 +47769,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    vimish-fold = callPackage ({ cl-lib ? null, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    vimish-fold = callPackage ({ cl-lib ? null
+                               , emacs
+                               , f
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "vimish-fold";
         version = "0.2.3";
         src = fetchFromGitHub {
@@ -38196,10 +47785,10 @@
           rev = "e631352fbf910f692807afe38a2b6a7882a403a8";
           sha256 = "152w1wqxj7yzm3d12lknzz1aix4h8cb571sjns3m1s7azsr3vfbq";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b4862b0a3d43f073e645803cbbf11d973a4b51d5/recipes/vimish-fold";
           sha256 = "017by9w53d8pqlsazfycmhdv16yylks308p5vxp1rcw2qacpc5m3";
-          name = "vimish-fold";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs f ];
         meta = {
@@ -38207,8 +47796,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    virtualenvwrapper = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    virtualenvwrapper = callPackage ({ dash
+                                     , fetchFromGitHub
+                                     , fetchurl
+                                     , lib
+                                     , melpaBuild
+                                     , s }:
+      melpaBuild {
         pname = "virtualenvwrapper";
         version = "0.1.0";
         src = fetchFromGitHub {
@@ -38217,10 +47811,10 @@
           rev = "5649028ea0c049cb7dfa2105285dee9c00d189fb";
           sha256 = "1xcjjs394vlaz94xh52kqaq94gkbmmjqmxlg7wly8vfn9vh34mws";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/acc9b816796b9f142c53f90593952b43c962d2d8/recipes/virtualenvwrapper";
           sha256 = "0rn5vwncx8z69xp8hspr06nzkf28l9flchpb2936c2nalmhx6m8i";
-          name = "virtualenvwrapper";
+          name = "recipe";
         };
         packageRequires = [ dash s ];
         meta = {
@@ -38228,20 +47822,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    visible-mark = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    visible-mark = callPackage ({ fetchFromGitLab
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "visible-mark";
         version = "0.1";
         src = fetchFromGitLab {
           owner = "iankelling";
           repo = "visible-mark";
           rev = "c1852e13b6b61982738b56977a452ec9026faf1b";
-          sha256 = "1rsi9irv9i03627cmfaqz03f9cvpm7555ga8n2gs622lzp6bb3jf";
+          sha256 = "15zdbvv6c114mv6hdq375l7ax70sss06p9d7m86hgssc3kiv9vsv";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/76ac7178ee5381e08ae881f3fc6061106eeb1c1d/recipes/visible-mark";
           sha256 = "1rp0gnz28m1drwb1hhsf0mwxzdppdi88hscf788qw8cw65gckv80";
-          name = "visible-mark";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -38249,8 +47846,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    visual-fill-column = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    visual-fill-column = callPackage ({ emacs
+                                      , fetchFromGitHub
+                                      , fetchurl
+                                      , lib
+                                      , melpaBuild }:
+      melpaBuild {
         pname = "visual-fill-column";
         version = "1.11";
         src = fetchFromGitHub {
@@ -38259,10 +47860,10 @@
           rev = "57c2a72d46900117ea92e0a01b97e19481800503";
           sha256 = "086zfx4lh168rg50ndg8qzdh8vzc6sgfii7qzcn4mg4wa74hnp9y";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c7628c805840c4687686d0b9dc5007342864721e/recipes/visual-fill-column";
           sha256 = "19y0pwaybjal2rc7migdbnafpi4dfbxvrzgfqr8dlvd9q68v08y5";
-          name = "visual-fill-column";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -38270,8 +47871,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    visual-regexp = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    visual-regexp = callPackage ({ cl-lib ? null
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "visual-regexp";
         version = "1.1.1";
         src = fetchFromGitHub {
@@ -38280,10 +47885,10 @@
           rev = "b3096c2d391ff4e28a2a4e8cd82efbf11071ea85";
           sha256 = "12zpmzwyp85dzsjpxd3279kpfi9yz3jwc1k9fnb3xv3pjiil5svg";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/visual-regexp";
           sha256 = "16bdqq2j7pnjq3j6qa4rhxzidqdhyg80c7nazd93smis8rcv5d0z";
-          name = "visual-regexp";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -38291,8 +47896,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    visual-regexp-steroids = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, visual-regexp }:
-    melpaBuild {
+    visual-regexp-steroids = callPackage ({ fetchFromGitHub
+                                          , fetchurl
+                                          , lib
+                                          , melpaBuild
+                                          , visual-regexp }:
+      melpaBuild {
         pname = "visual-regexp-steroids";
         version = "1.1.0";
         src = fetchFromGitHub {
@@ -38301,10 +47910,10 @@
           rev = "a6420b25ec0fbba43bf57875827092e1196d8a9e";
           sha256 = "1isqa4ck6pm4ykcrkr0g1qj8664jkpcsrq0f8dlb0sksns2dqkwj";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7f105ebce741956b7becc86e4bdfcafecf59af74/recipes/visual-regexp-steroids";
           sha256 = "1xkrzyyll8wmb67m75lfm9k8qcm068km8r1k8hcsadpkd01bx1lr";
-          name = "visual-regexp-steroids";
+          name = "recipe";
         };
         packageRequires = [ visual-regexp ];
         meta = {
@@ -38312,20 +47921,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    vlf = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    vlf = callPackage ({ fetchFromGitHub
+                       , fetchurl
+                       , lib
+                       , melpaBuild }:
+      melpaBuild {
         pname = "vlf";
         version = "1.7.1";
         src = fetchFromGitHub {
           owner = "m00natic";
           repo = "vlfi";
-          rev = "a01e9ed416cd81ccddebebbf05d4ca80060b07dc";
-          sha256 = "0ziz08ylhkqwj2rp6h1z1yi309f6791b9r91nvr255l2331481pm";
+          rev = "df677c128f8abc764b51d2a0ed26071618e686de";
+          sha256 = "1fx2ngjh3y69ynih328jiy8132z9y7q7s91rzw8mgpf3hnfmaqly";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9116b11eb513dd9e1dc9542d274dd60f183b24c4/recipes/vlf";
           sha256 = "1ipkv5kmda0l39xwbf7ns9p0mx3kb781mxsm9vmbkhr5x577s2j8";
-          name = "vlf";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -38333,8 +47945,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    voca-builder = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    voca-builder = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "voca-builder";
         version = "0.2.0";
         src = fetchFromGitHub {
@@ -38343,10 +47958,10 @@
           rev = "224402532da28e45edd398fda61ecbddb97d22d3";
           sha256 = "0q1rwqjwqcnsr57s531pwlm464q8wx5vvdm5rj2xy9b3yi6phis1";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/42a930e024ce525b2890ccd5a1eb4844859faafd/recipes/voca-builder";
           sha256 = "0mbw87mpbb8rw7xzhmg6yjla2c80x9820kw4q00x00ny5rbhm76y";
-          name = "voca-builder";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -38354,8 +47969,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    volatile-highlights = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    volatile-highlights = callPackage ({ fetchFromGitHub
+                                       , fetchurl
+                                       , lib
+                                       , melpaBuild }:
+      melpaBuild {
         pname = "volatile-highlights";
         version = "1.11";
         src = fetchFromGitHub {
@@ -38364,10 +47982,10 @@
           rev = "fb2abc2d4d4051a9a6b7c8de2fe7564161f01f24";
           sha256 = "1v0chqj5jir4685jd8ahw86g9zdmi6xd05wmzhyw20rbk924fcqf";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/volatile-highlights";
           sha256 = "1r6in919aqdziv6bgzp4k7jqa87bd287pacq615sd5m1nzva1a4d";
-          name = "volatile-highlights";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -38375,20 +47993,51 @@
           license = lib.licenses.free;
         };
       }) {};
-    vue-mode = callPackage ({ edit-indirect, fetchFromGitHub, fetchurl, lib, melpaBuild, mmm-mode, ssass-mode, vue-html-mode }:
-    melpaBuild {
+    vue-html-mode = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
+        pname = "vue-html-mode";
+        version = "0.2";
+        src = fetchFromGitHub {
+          owner = "AdamNiederer";
+          repo = "vue-html-mode";
+          rev = "361a9fa117f044c3072dc5a7344ff7be31725849";
+          sha256 = "1z1pphxli8fcahw9fhmxls1v9nyd34pz51jwwa6g468zvdmcjb77";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/48588b163ab76204b9054340071e758045480e19/recipes/vue-html-mode";
+          sha256 = "1f4pjfp4298jkvhacxygddg557hhyivgnm5x3yhjipfv6fjkgl2s";
+          name = "recipe";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/vue-html-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    vue-mode = callPackage ({ edit-indirect
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild
+                            , mmm-mode
+                            , ssass-mode
+                            , vue-html-mode }:
+      melpaBuild {
         pname = "vue-mode";
-        version = "0.3.1";
+        version = "0.4";
         src = fetchFromGitHub {
           owner = "CodeFalling";
           repo = "vue-mode";
-          rev = "fe501dba780025066dcdcd2055e772d06c2abdbc";
-          sha256 = "0k67kzrh2fjhjiqcy1yq5cmcwjpx85yd2xxvkqvv4791q58f7c4z";
+          rev = "48ff04657613f39848d0e66e9dd367aa2dc19e89";
+          sha256 = "014vx8jkscj1c614v78dqlqlg7n0zc3c2db3dqvxvaz417i5mxq0";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2e5e0a9fff332aeec09f6d3d758e2b67dfdf8397/recipes/vue-mode";
           sha256 = "0gy7a5sliaijq0666l55vbkg15anrw7k1828szdn1ppkraw14bn0";
-          name = "vue-mode";
+          name = "recipe";
         };
         packageRequires = [ edit-indirect mmm-mode ssass-mode vue-html-mode ];
         meta = {
@@ -38396,8 +48045,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    w32-browser = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    w32-browser = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "w32-browser";
         version = "235";
         src = fetchFromGitHub {
@@ -38406,10 +48058,10 @@
           rev = "a8126b60bf18193e8e4ec6f699b5694b6f71a062";
           sha256 = "13wjvzsas7in8f09sc2qj17dz25wizg1l0r2krgp1zymy92p8f97";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ae489be43b1aee93614e40f492ebdf0b98a3fbc1/recipes/w32-browser";
           sha256 = "16sp0gn4yv7iaa55i2kvfsqw3610gr3x31l9lqa14r9xmfhda1rn";
-          name = "w32-browser";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -38417,8 +48069,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    wacspace = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    wacspace = callPackage ({ cl-lib ? null
+                            , dash
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "wacspace";
         version = "0.4.2";
         src = fetchFromGitHub {
@@ -38427,10 +48084,10 @@
           rev = "b951995c204ff23699d2bda515a96221147a725d";
           sha256 = "0jl3n79wmbxnrbf83qjq0v5pzhvv67i9r5sp2zj8nc86hh7dvjsd";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/58e5ff4c5853c5350d0534894ddb358daa83cee9/recipes/wacspace";
           sha256 = "1xy0mprvyi37zmgj1yrlh5ni08j47lpag1jm3a76cgghgmlfjxrl";
-          name = "wacspace";
+          name = "recipe";
         };
         packageRequires = [ cl-lib dash ];
         meta = {
@@ -38438,8 +48095,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    wandbox = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request, s }:
-    melpaBuild {
+    wandbox = callPackage ({ emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild
+                           , request
+                           , s }:
+      melpaBuild {
         pname = "wandbox";
         version = "0.6.4";
         src = fetchFromGitHub {
@@ -38448,10 +48111,10 @@
           rev = "e002fe41f2cd9b4ce2b1dc80b83301176e9117f1";
           sha256 = "0fnbj3k21lisgs94pf8z13cdymmclgpn994xq3xly4gq6l8k0an5";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/wandbox";
           sha256 = "0myyln82nx462bj79acvqxwvmblxild4vbygcrzw5chcwy6crvlz";
-          name = "wandbox";
+          name = "recipe";
         };
         packageRequires = [ emacs request s ];
         meta = {
@@ -38459,8 +48122,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    wc-goal-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    wc-goal-mode = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "wc-goal-mode";
         version = "2.1";
         src = fetchFromGitHub {
@@ -38469,10 +48135,10 @@
           rev = "a8aa227b1a692dd6399855add84b5e37f6c5d9cb";
           sha256 = "0mnfk2ys8axjh696cq5msr5cdr91icl1i3mi0dd2y00lvh6sbm7w";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6f003b6d6bc91e6f9e510de8f5f5f9189d1c7334/recipes/wc-goal-mode";
           sha256 = "0l3gh96njjldp7n13jn1zjrp17h7ivjak102j6wwspgg6v2h5419";
-          name = "wc-goal-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -38480,8 +48146,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    wc-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    wc-mode = callPackage ({ fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "wc-mode";
         version = "1.3";
         src = fetchFromGitHub {
@@ -38490,10 +48159,10 @@
           rev = "122f90bd1d422a84cc50acabd350d44d39ddeb69";
           sha256 = "0pjlxv46zzqdq6q131jb306vqlg4sfqls1x8vag7mmfw462hafqp";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0fda2b54a0ff0b6fc3bd6d20cfcbbf63cae5380f/recipes/wc-mode";
           sha256 = "191dmxfpqnj7d43cr0fhdmj5ldfs7w9zg5pb2lv9wvlfl7asdid6";
-          name = "wc-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -38501,8 +48170,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    wcheck-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    wcheck-mode = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "wcheck-mode";
         version = "2016.1.30";
         src = fetchFromGitHub {
@@ -38511,10 +48183,10 @@
           rev = "adb9dd9f39cb0bd0000d140d6e778c4864dfde08";
           sha256 = "113prlamr2j6y6n0w43asffawwa4qiq63mgwm85v04h6pr8bd90l";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5d10b59f568fdedf248c2e8eaa06c4a74032ca56/recipes/wcheck-mode";
           sha256 = "0cmdvhgax6r5svn3wkwll4j271qj70g8182c58riwnkhiajxmn3k";
-          name = "wcheck-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -38522,8 +48194,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    weather-metno = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    weather-metno = callPackage ({ cl-lib ? null
+                                 , emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "weather-metno";
         version = "0.1.0";
         src = fetchFromGitHub {
@@ -38532,10 +48209,10 @@
           rev = "b59680c1ab908b32513954034ba894dfb8564dd8";
           sha256 = "0qx92jqzsimjk92pql2h8pzhq66mqijwqgjqwp7rmq5b6k0nvx1z";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/75beac314565b9becb701ddd9bc85660e268c3ae/recipes/weather-metno";
           sha256 = "0h7p4l8y75h27pgk45f0mk3gjd43jk8q97gjf85a9b0afd63d3f6";
-          name = "weather-metno";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -38543,8 +48220,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    web-beautify = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    web-beautify = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "web-beautify";
         version = "0.3.2";
         src = fetchFromGitHub {
@@ -38553,10 +48233,10 @@
           rev = "aa95055224c24f38736716809fec487cd817c38d";
           sha256 = "0vms7zz3ym53wf1zdrkbf2ky2xjr1v134ngsd0jr8azyi8siw84d";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0d528d3e20b1656dff40860cac0e0fa9dc1a3e87/recipes/web-beautify";
           sha256 = "06ky2svhca8hjgmvxrg3h6ya7prl72q1r88x967yc6b0qq3r7g0f";
-          name = "web-beautify";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -38564,8 +48244,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    web-completion-data = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    web-completion-data = callPackage ({ fetchFromGitHub
+                                       , fetchurl
+                                       , lib
+                                       , melpaBuild }:
+      melpaBuild {
         pname = "web-completion-data";
         version = "0.2";
         src = fetchFromGitHub {
@@ -38574,10 +48257,10 @@
           rev = "c272c94e8a71b779c29653a532f619acad433a4f";
           sha256 = "19nzjgvd2i5745283ck3k2vylrr6lnk9h3ggzwrwdhyd3m9433vm";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/604f155a3ce7e5375dcf8b9c149c5af403ef48bd/recipes/web-completion-data";
           sha256 = "1zzdmhyn6bjaidk808s4pdk25a5rn4287949ps5vbpyniaf6gny9";
-          name = "web-completion-data";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -38585,8 +48268,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    web-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    web-mode = callPackage ({ emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "web-mode";
         version = "16";
         src = fetchFromGitHub {
@@ -38595,10 +48282,10 @@
           rev = "3ff506aae50a47b277f2b95ff7b7a7c596664e6a";
           sha256 = "17dw6a8d0p304f2sa4f9zwd8r48w2wbkc3fvbmxwlg4w12h7cwf0";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6f0565555eaa356141422c5175d6cca4e9eb5c00/recipes/web-mode";
           sha256 = "1vyhyc5nf4yj2m63inpwmcqvlsihaqw8nn8xvfdg44nhl6vjz97i";
-          name = "web-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -38606,8 +48293,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    web-mode-edit-element = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, web-mode }:
-    melpaBuild {
+    web-mode-edit-element = callPackage ({ emacs
+                                         , fetchFromGitHub
+                                         , fetchurl
+                                         , lib
+                                         , melpaBuild
+                                         , web-mode }:
+      melpaBuild {
         pname = "web-mode-edit-element";
         version = "2.1";
         src = fetchFromGitHub {
@@ -38616,10 +48308,10 @@
           rev = "8b8ac07aa8c920dafd94c96a51effb0d6c0ed1ce";
           sha256 = "0aj1ibmnrbaxrkwjf1fac2qzazrj39pql3prcibnchc2bmp191aa";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/web-mode-edit-element";
           sha256 = "1kcycsjjv1bzfn93aq3cdh5d913izrr8cdxmknbyriyipsqryh3l";
-          name = "web-mode-edit-element";
+          name = "recipe";
         };
         packageRequires = [ emacs web-mode ];
         meta = {
@@ -38627,8 +48319,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    web-search = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    web-search = callPackage ({ emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "web-search";
         version = "0.1.1";
         src = fetchFromGitHub {
@@ -38637,10 +48333,10 @@
           rev = "72fea0e7429ed3d6932a497b568335316d8ef283";
           sha256 = "1f2g6r24482k1dra1z92yahwvqiryc8p5p1v2naxv16ysa461a34";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/503ef2042cc14dbe53e7121b8d0b5ccbdf6c882b/recipes/web-search";
           sha256 = "08iflbp6rmsxsy2lahsdjj9ki70ixqhsas0vxzawz5pi5vk2x9gj";
-          name = "web-search";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -38648,8 +48344,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    webpaste = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }:
-    melpaBuild {
+    webpaste = callPackage ({ cl-lib ? null
+                            , emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild
+                            , request }:
+      melpaBuild {
         pname = "webpaste";
         version = "2.1.0";
         src = fetchFromGitHub {
@@ -38658,10 +48360,10 @@
           rev = "2da60b8857d107721b089346121a7d51296a58bf";
           sha256 = "1r945qz7z5z80qvzlqvz985mz51zy3pj3fk36y0flc380y4ap6hd";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/13847d91c1780783e516943adee8a3530c757e17/recipes/webpaste";
           sha256 = "1pqqapslb5wxfrf1ykrj5jxcl43pix17lawgdqrqkv5fyxbhmfpm";
-          name = "webpaste";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs request ];
         meta = {
@@ -38669,20 +48371,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    websocket = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    websocket = callPackage ({ cl-lib ? null
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "websocket";
-        version = "1.9";
+        version = "1.10";
         src = fetchFromGitHub {
           owner = "ahyatt";
           repo = "emacs-websocket";
-          rev = "7d2adf218743c52578c8e8fd5584a5e54732e256";
-          sha256 = "0k8n710ip4av51n6l9ap1254qkifj987a6k86pgj3y6bw76ry08f";
+          rev = "0d96ba2ff5a25c6cd6c66f417cc9b5f38a4308ba";
+          sha256 = "1dgrf7na6r6mmkknphzshlbd5fnzisg0qn0j7vfpa38wgsymaq52";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/websocket";
           sha256 = "1v8jlpahp30lihz7mdznwl6pyrbsdbqznli2wb5gfblnlxil04lg";
-          name = "websocket";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -38690,20 +48396,27 @@
           license = lib.licenses.free;
         };
       }) {};
-    weechat = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, tracking }:
-    melpaBuild {
+    weechat = callPackage ({ cl-lib ? null
+                           , emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild
+                           , s
+                           , tracking }:
+      melpaBuild {
         pname = "weechat";
         version = "0.4.0";
         src = fetchFromGitHub {
           owner = "the-kenny";
           repo = "weechat.el";
-          rev = "a1bda40513f0ea94a8a85ee122a475475a03f6ef";
-          sha256 = "05jnfrjrf1da038jkypvx3slyk39xlpak4n9s5vwmx7mgf4zg06y";
+          rev = "a0d81074088d313dd596af6602e51d4253a55ca5";
+          sha256 = "08ibyabvdlmp74xa950al3axmzsqpcal30313ab5wgb746sh3dvm";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e38255a31a4ca31541c97a506a55f82e2670abe6/recipes/weechat";
           sha256 = "0sxrms5024bi4irv8x8s8j1zcyd62cpqm0zv4dgpm65wnpc7xc46";
-          name = "weechat";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs s tracking ];
         meta = {
@@ -38711,8 +48424,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    weibo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    weibo = callPackage ({ fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "weibo";
         version = "1.0";
         src = fetchFromGitHub {
@@ -38721,10 +48437,10 @@
           rev = "a8af467e5660a35342029c2796de99cd551454b2";
           sha256 = "14vmgfz45wmpjfhfx3pfjn3bak8qvj1zk1w4xc5w1cfl6vnij6hv";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/21f4c1b34f86331ecbcdbdc39858a191232902f2/recipes/weibo";
           sha256 = "1ndgfqqb0gvy8p2fisi57s9bsa2nrnv80smg78m89i4cwagbz6yd";
-          name = "weibo";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -38732,20 +48448,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    wgrep = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    wgrep = callPackage ({ fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "wgrep";
         version = "2.1.10";
         src = fetchFromGitHub {
           owner = "mhayashi1120";
           repo = "Emacs-wgrep";
-          rev = "7ef26c51feaef8a5ec0929737130ab8ba326983c";
-          sha256 = "075z0glain0dp56d0cp468y5y88wn82ab26aapsrdzq8hmlshwn4";
+          rev = "3028e9b31427c528d9343d458abcb2222813410f";
+          sha256 = "1gc3xwj7dffwpmjq1189x27ij25v2pp909xpdxc69a01yx5474i1";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9648e3df896fcd97b3757a727108bc78261973cc/recipes/wgrep";
           sha256 = "09xs420lvbsmz5z28rf6f1iwa0ixkk0w24qbj6zhl9hidh4mv9y4";
-          name = "wgrep";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -38753,20 +48472,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    wgrep-ack = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, wgrep }:
-    melpaBuild {
+    wgrep-ack = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild
+                             , wgrep }:
+      melpaBuild {
         pname = "wgrep-ack";
         version = "2.1.10";
         src = fetchFromGitHub {
           owner = "mhayashi1120";
           repo = "Emacs-wgrep";
-          rev = "7ef26c51feaef8a5ec0929737130ab8ba326983c";
-          sha256 = "075z0glain0dp56d0cp468y5y88wn82ab26aapsrdzq8hmlshwn4";
+          rev = "9448a9d597bd089ae61e58add2c5dbecb0aa2b8f";
+          sha256 = "0x27h0ccq93avsmb8gim43zklbsb4ghfw30a7hjvz0ilfx02gdca";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9648e3df896fcd97b3757a727108bc78261973cc/recipes/wgrep-ack";
           sha256 = "03l1a681cwnn06m77xg0a547892gy8mh415v9rg3h6lkxwcld8wh";
-          name = "wgrep-ack";
+          name = "recipe";
         };
         packageRequires = [ wgrep ];
         meta = {
@@ -38774,20 +48497,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    wgrep-ag = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, wgrep }:
-    melpaBuild {
+    wgrep-ag = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild
+                            , wgrep }:
+      melpaBuild {
         pname = "wgrep-ag";
         version = "2.1.10";
         src = fetchFromGitHub {
           owner = "mhayashi1120";
           repo = "Emacs-wgrep";
-          rev = "7ef26c51feaef8a5ec0929737130ab8ba326983c";
-          sha256 = "075z0glain0dp56d0cp468y5y88wn82ab26aapsrdzq8hmlshwn4";
+          rev = "9448a9d597bd089ae61e58add2c5dbecb0aa2b8f";
+          sha256 = "0x27h0ccq93avsmb8gim43zklbsb4ghfw30a7hjvz0ilfx02gdca";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2c50b704343c4cac5e2a62a67e284ba6d8e15f8a/recipes/wgrep-ag";
           sha256 = "1b2mj06kws29ha7g16l5d1s3p3nwyw8rprbpaiijdk9nxqcm0a8a";
-          name = "wgrep-ag";
+          name = "recipe";
         };
         packageRequires = [ wgrep ];
         meta = {
@@ -38795,20 +48522,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    wgrep-helm = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, wgrep }:
-    melpaBuild {
+    wgrep-helm = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild
+                              , wgrep }:
+      melpaBuild {
         pname = "wgrep-helm";
         version = "2.1.10";
         src = fetchFromGitHub {
           owner = "mhayashi1120";
           repo = "Emacs-wgrep";
-          rev = "7ef26c51feaef8a5ec0929737130ab8ba326983c";
-          sha256 = "075z0glain0dp56d0cp468y5y88wn82ab26aapsrdzq8hmlshwn4";
+          rev = "976eb41327e9c15c3be860a9d9962b3c3df9712e";
+          sha256 = "1nh9gl1k54w7402fkphgw35bq3lljhv1alaaig2xfrjcm5x2phwv";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9648e3df896fcd97b3757a727108bc78261973cc/recipes/wgrep-helm";
           sha256 = "1hh7isc9xifkrdfw88jw0z0xmfazrbcis6d355bcaxlnjy6fzm8b";
-          name = "wgrep-helm";
+          name = "recipe";
         };
         packageRequires = [ wgrep ];
         meta = {
@@ -38816,20 +48547,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    wgrep-pt = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, wgrep }:
-    melpaBuild {
+    wgrep-pt = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild
+                            , wgrep }:
+      melpaBuild {
         pname = "wgrep-pt";
         version = "2.1.10";
         src = fetchFromGitHub {
           owner = "mhayashi1120";
           repo = "Emacs-wgrep";
-          rev = "7ef26c51feaef8a5ec0929737130ab8ba326983c";
-          sha256 = "075z0glain0dp56d0cp468y5y88wn82ab26aapsrdzq8hmlshwn4";
+          rev = "cd8df1be69257da2e48dc3eae4badc674468b61c";
+          sha256 = "1df7lal4c0zsinrfjp4qv2k3xi1kbl66d36in47pmiam1kkqs9fs";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c39faef3b9c2e1867cd48341d9878b714dbed4eb/recipes/wgrep-pt";
           sha256 = "1gphdf85spsywj3s3ypb7dwrqh0zd70n2vrbgjqkbnfbwqjp9qbg";
-          name = "wgrep-pt";
+          name = "recipe";
         };
         packageRequires = [ wgrep ];
         meta = {
@@ -38837,20 +48572,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    which-key = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    which-key = callPackage ({ emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "which-key";
-        version = "3.1.0";
+        version = "3.3.0";
         src = fetchFromGitHub {
           owner = "justbur";
           repo = "emacs-which-key";
-          rev = "7559a79e95aada65601f7413a1c3f08bfa34557b";
-          sha256 = "1l9m04hypk8j5qkg7rlhsknj9hx5l3zjy97s3kv7wbcwvcx3yxhz";
+          rev = "ff79dfff66f880885c5893dd6fd05dc51173a476";
+          sha256 = "0x9bmm4s5gq9k9x1rkwxr8zz8p2hgsxvzpji138m8m4j809l6cn4";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/315865a3df97c0694f648633d44b8b34df1ac76d/recipes/which-key";
           sha256 = "0vqbhfzcv9m58w41zdhpiymhgl38n15c6d7ffd99narxlkckcj59";
-          name = "which-key";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -38858,8 +48597,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    whitaker = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    whitaker = callPackage ({ dash
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "whitaker";
         version = "0.3";
         src = fetchFromGitHub {
@@ -38868,10 +48611,10 @@
           rev = "28172edce0f727f0f7f17d8ba71d5510d877bb45";
           sha256 = "01fwhrfi92pcrwc4yn03pflc9wj07mhzj0a0i5amar4f9bj6m5b4";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4b5d717e2eaf35ce33b26be049a39f2f75a7de72/recipes/whitaker";
           sha256 = "17fnvb3jh6fi4wddn5qnp6i6ndidg8jf9ac69q9j032c2msr07nj";
-          name = "whitaker";
+          name = "recipe";
         };
         packageRequires = [ dash ];
         meta = {
@@ -38879,8 +48622,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    whitespace-cleanup-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    whitespace-cleanup-mode = callPackage ({ fetchFromGitHub
+                                           , fetchurl
+                                           , lib
+                                           , melpaBuild }:
+      melpaBuild {
         pname = "whitespace-cleanup-mode";
         version = "0.10";
         src = fetchFromGitHub {
@@ -38889,10 +48635,10 @@
           rev = "e1e250aa6f5b1a526778c7a501cdec98ba29c0a4";
           sha256 = "0xmwhybb8x6wwfr55ym5xg4dhy1aqx1abxy9qskn7h3zf1z4pgg2";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b461cfe450d7ce6bd0c14be3460cacffc1a32e6f/recipes/whitespace-cleanup-mode";
           sha256 = "1fhdjrxxyfx4xsgfjqq9p7vhj98wmqf2r00mv8k27vdaxwsnm5p3";
-          name = "whitespace-cleanup-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -38900,20 +48646,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    whizzml-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    whizzml-mode = callPackage ({ emacs
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
         pname = "whizzml-mode";
-        version = "0.2.2";
+        version = "0.3.0";
         src = fetchFromGitHub {
           owner = "whizzml";
           repo = "whizzml-mode";
-          rev = "9060fdce07c137abc2c494cb72641b9b9d6fbe22";
-          sha256 = "10yi3n6pyqirlzxdkv7nvp0d0n1fkjrgwhn0kp5i27dnp3fi0i2b";
+          rev = "eca56d0fd51c5f41ef3e84e363f66d717ea5b160";
+          sha256 = "0rli8jc9fig32dx7icvmwmmdzkvar12323xy25vh296xzcyjrgba";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/11f26b15c326c3b8541bac510579b32493916042/recipes/whizzml-mode";
           sha256 = "0gas9xfpz5v9fbhjxhd4msihwz9w4a05l5icsaclxvh06f92wcyk";
-          name = "whizzml-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -38921,8 +48671,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    whole-line-or-region = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    whole-line-or-region = callPackage ({ fetchFromGitHub
+                                        , fetchurl
+                                        , lib
+                                        , melpaBuild }:
+      melpaBuild {
         pname = "whole-line-or-region";
         version = "1.3.1";
         src = fetchFromGitHub {
@@ -38931,10 +48684,10 @@
           rev = "a60e022b30c2f4d3118bcaef1adb77b90e0ca941";
           sha256 = "0ip0vkqb4dm88xqzgwc9yaxzf4sc4x006m6z73a3lbfmrncy2c1d";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/whole-line-or-region";
           sha256 = "0zz9i1jxayw2p6ggfxjvhb1mc3ly9iy4jvk23ycndz9lnnzkch0y";
-          name = "whole-line-or-region";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -38942,8 +48695,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    widget-mvc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    widget-mvc = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "widget-mvc";
         version = "0.0.2";
         src = fetchFromGitHub {
@@ -38952,10 +48708,10 @@
           rev = "2576e6f0c35d8dedfa9c2cd6ea4fb4c14cb72b63";
           sha256 = "0fqv63m8z5m5ghh4j8ccdnmgcdkvi4jqpg9z7lp17g4p9pq3xfjf";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/76d3c38e205076a22628f490d8e8ddd80d091eab/recipes/widget-mvc";
           sha256 = "0njzvdlxb7z480r6dvmksgivhz7rvnil517aj86qx0jbc5mr3l2f";
-          name = "widget-mvc";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -38963,20 +48719,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    wiki-nav = callPackage ({ button-lock, fetchFromGitHub, fetchurl, lib, melpaBuild, nav-flash }:
-    melpaBuild {
+    wiki-nav = callPackage ({ button-lock
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild
+                            , nav-flash }:
+      melpaBuild {
         pname = "wiki-nav";
         version = "1.0.2";
         src = fetchFromGitHub {
           owner = "rolandwalker";
           repo = "button-lock";
-          rev = "cd0bf4a3c2f224d851e6ed8a54a6e80c129b225f";
-          sha256 = "1kqcc1d56jz107bswlzvdng6ny6qwp93yck2i2j921msn62qvbb2";
+          rev = "86c514d20b9b67c1e87112a574f65c7d53aec2ec";
+          sha256 = "0yy4z9k30prsjaig39x20f925dbl2svs8n3lgshcbv5aijffkq07";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/baa49e7d2d5c07ebf77e7941c240b88fcfd0fc8b/recipes/wiki-nav";
           sha256 = "19mabz0y3fcqsm68ijwwbbqylxgp71anc0a31zgc1blha9jivvwy";
-          name = "wiki-nav";
+          name = "recipe";
         };
         packageRequires = [ button-lock nav-flash ];
         meta = {
@@ -38984,8 +48745,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    win-switch = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    win-switch = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "win-switch";
         version = "1.1.4";
         src = fetchFromGitHub {
@@ -38994,10 +48758,10 @@
           rev = "954eb5e4c5737f0c06368c42a7f1c3dd374d782f";
           sha256 = "1xpx4sc1g1w8w0yc39k2dys83m8skrpvi745bfrzdl47jngrf54h";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/win-switch";
           sha256 = "1s6inp5kf763rngn58r02fd7n7z3dd55j6hb7s9dgvc856d5z3my";
-          name = "win-switch";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -39005,8 +48769,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    window-end-visible = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    window-end-visible = callPackage ({ fetchFromGitHub
+                                      , fetchurl
+                                      , lib
+                                      , melpaBuild }:
+      melpaBuild {
         pname = "window-end-visible";
         version = "0.1.0";
         src = fetchFromGitHub {
@@ -39015,10 +48782,10 @@
           rev = "bdc3d182e5f76e75f1b8cc49357194b36e48b67c";
           sha256 = "049bwa5g0z1b9nrsc1vc4511aqcq9fvl16xg493wj651g6q9qigb";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c9db386ab3910940addae6e925b2ac17e64e0f87/recipes/window-end-visible";
           sha256 = "1p78n7yysj18404cdc6vahfrzwn5pixyfnja8ch48rj4fm4jbxwq";
-          name = "window-end-visible";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -39026,8 +48793,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    window-layout = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    window-layout = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "window-layout";
         version = "1.4";
         src = fetchFromGitHub {
@@ -39036,10 +48806,10 @@
           rev = "cd2e4f967b610c2bbef53182829e47250d027056";
           sha256 = "0wgqi8r844lbx52fn6az8c1n8m681rp6dkfzd54wmdk1ka7zmvv6";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/window-layout";
           sha256 = "061mvxcj4mg2pmkln7nn6gyscs08aid4cfc6xck0x5gzr1snr639";
-          name = "window-layout";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -39047,8 +48817,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    window-numbering = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    window-numbering = callPackage ({ fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
         pname = "window-numbering";
         version = "1.1.2";
         src = fetchFromGitHub {
@@ -39057,10 +48830,10 @@
           rev = "653afce73854d629c2b9d63dad73126032d6a24c";
           sha256 = "1rz2a1l3apavsknlfy0faaivqgpj4x9jz3hbysbg9pydpcwqgf64";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ce1dc80f69894736b276885e4ec3ce571a8612c9/recipes/window-numbering";
           sha256 = "0x3n0ni16q69lfpyjz61spqghmhvc3cwa4aj80ihii3pk80f769x";
-          name = "window-numbering";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -39068,8 +48841,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    window-purpose = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, imenu-list, let-alist, lib, melpaBuild }:
-    melpaBuild {
+    window-purpose = callPackage ({ cl-lib ? null
+                                  , emacs
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , imenu-list
+                                  , let-alist
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "window-purpose";
         version = "1.6";
         src = fetchFromGitHub {
@@ -39078,10 +48858,10 @@
           rev = "00c253778d8e845bdc17a350c22ea157c5871b41";
           sha256 = "11hv2rrcirswzgx0l52kwav5dilr3yksky9a3vg1pghgqhmm59hv";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5813120ab674f6db7d0a486433d8faa6cfec1727/recipes/window-purpose";
           sha256 = "1y70jrba3gf9fyf2qdihfshbsblzb88yv9fkcswdzrpq5kmgwp84";
-          name = "window-purpose";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs imenu-list let-alist ];
         meta = {
@@ -39089,8 +48869,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    windsize = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    windsize = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "windsize";
         version = "0.1";
         src = fetchFromGitHub {
@@ -39099,10 +48882,10 @@
           rev = "014b0836f9ffe45fa7e0ccc84576fbef74815a59";
           sha256 = "1f4v0xd341qs4kfnjqhgf8j26valvg6pz4rwcz0zj0s23niy2yil";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/windsize";
           sha256 = "1fzqf86d7pimnc87xdgvpv4hnv7j6ngmk1sjvazj6726xygswkyv";
-          name = "windsize";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -39110,8 +48893,37 @@
           license = lib.licenses.free;
         };
       }) {};
-    winum = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    winring = callPackage ({ fetchFromGitLab
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
+        pname = "winring";
+        version = "5.1";
+        src = fetchFromGitLab {
+          owner = "warsaw";
+          repo = "winring";
+          rev = "f2d072bd446b73e93b127523f19ea82b99b9267f";
+          sha256 = "1j0g52panhx91hqw5glnlv5vnnpnjyx49xc8xif8mjf0m27723fv";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/2476a28c33502f908b7161c5a9c63c86b8d7b57d/recipes/winring";
+          sha256 = "1mgr5z4h7mf677xx8md3pqd31k17qs62z9iamfih206fcwgh24k4";
+          name = "recipe";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/winring";
+          license = lib.licenses.free;
+        };
+      }) {};
+    winum = callPackage ({ cl-lib ? null
+                         , dash
+                         , fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "winum";
         version = "2.0.0";
         src = fetchFromGitHub {
@@ -39120,10 +48932,10 @@
           rev = "c56d1cdb8d1723eb4c0d7a7eb3ecd2697739146c";
           sha256 = "09jd5srlnd4060hs719qil84ssmnvq196bz7ywaswgapv1gs1h6r";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c1caa7a54a910a44322fdee300e8cce6ddcde071/recipes/winum";
           sha256 = "0yyvjmvqif6glh9ri6049nxcmgib9mxdhy6816kjhsaqr570f9pw";
-          name = "winum";
+          name = "recipe";
         };
         packageRequires = [ cl-lib dash ];
         meta = {
@@ -39131,8 +48943,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    wisp-mode = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    wisp-mode = callPackage ({ fetchhg
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "wisp-mode";
         version = "0.9.8";
         src = fetchhg {
@@ -39151,8 +48966,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    wispjs-mode = callPackage ({ clojure-mode, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    wispjs-mode = callPackage ({ clojure-mode
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "wispjs-mode";
         version = "0.2.0";
         src = fetchFromGitHub {
@@ -39161,10 +48980,10 @@
           rev = "be094c3c3223c07b26b5d8bb8fa7aa6866369b3f";
           sha256 = "188h1sy4mxzrkwi3zgiw108c5f71rkj5agdkf9yy9v8c1bkawm4x";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a628330ee8deeab2bd5c2d4b61b33f119c4549d8/recipes/wispjs-mode";
           sha256 = "0qzm0dcvjndasnbqpkdc56f1qv66gxv8dfgfcwq5l1bp5wyx813p";
-          name = "wispjs-mode";
+          name = "recipe";
         };
         packageRequires = [ clojure-mode ];
         meta = {
@@ -39172,20 +48991,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    with-editor = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    with-editor = callPackage ({ async
+                               , emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "with-editor";
-        version = "2.7.2";
+        version = "2.7.3";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "with-editor";
-          rev = "ff3e96929d4532e33422a5980a6e3ca9f2fcf032";
-          sha256 = "1fhn2wd0wszbnfpvnjmlw8gxqzy8f4q7dg7r16jpa1cmk0fpcdi0";
+          rev = "ad5bb005ed3afec2d8b9b2bc1df19fb9b5e2dd84";
+          sha256 = "0hq2dy8djxf45ajk9di1grhgzly0qrijcjfdah8xj5zkwvn9cvlh";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8c52c840dc35f3fd17ec660e113ddbb53aa99076/recipes/with-editor";
           sha256 = "1wsl1vwvywlc32r5pcc9jqd0pbzq1sn4fppxk3vwl0s5h40v8rnb";
-          name = "with-editor";
+          name = "recipe";
         };
         packageRequires = [ async emacs ];
         meta = {
@@ -39193,8 +49017,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    with-simulated-input = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, seq }:
-    melpaBuild {
+    with-simulated-input = callPackage ({ emacs
+                                        , fetchFromGitHub
+                                        , fetchurl
+                                        , lib
+                                        , melpaBuild
+                                        , s
+                                        , seq }:
+      melpaBuild {
         pname = "with-simulated-input";
         version = "2.2";
         src = fetchFromGitHub {
@@ -39203,10 +49033,10 @@
           rev = "9efeb236c8f6887a8591d6241962c37266d8e726";
           sha256 = "1v8c85ahsk9pz3zndh0c9xba4c78f4b1j97hbv62jirvr75b079g";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e4ddf16e19f5018106a423327ddc7e7499cf9248/recipes/with-simulated-input";
           sha256 = "0113la76nbp18vaffsd7w7wcw5k2sqwgnjq1gslf4khdfqghrkwk";
-          name = "with-simulated-input";
+          name = "recipe";
         };
         packageRequires = [ emacs s seq ];
         meta = {
@@ -39214,8 +49044,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    wn-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    wn-mode = callPackage ({ emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "wn-mode";
         version = "1.4";
         src = fetchFromGitHub {
@@ -39224,10 +49058,10 @@
           rev = "6e7029b0d5773a79914a289937be068784931cad";
           sha256 = "0nmzh6dynbm8vglp4pqz81s2z68jbnasvamvi1x1iawf8g9zfyix";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6213c01e6954985daff8cd1a5a3ef004431f0477/recipes/wn-mode";
           sha256 = "1qy1pkfdnm4pska4cnff9cx2c812ilymajhpmsfc9jdbvhzwrwg3";
-          name = "wn-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -39235,8 +49069,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    wolfram = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    wolfram = callPackage ({ fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "wolfram";
         version = "1.1.1";
         src = fetchFromGitHub {
@@ -39245,10 +49082,10 @@
           rev = "6b5dceae3fd6cdb4d7562510deeafa02c93c010b";
           sha256 = "1ijyjw2793i7n00i30ma8lw4fzi9w63m6k0xgjx6j78r5y7pfj2g";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/785b5b1ec73e6376f2f2bb405707a1078398fa3a/recipes/wolfram";
           sha256 = "02xp1916v9rydh0586jkx71v256qdg63f87s3m0agc2znnrni9h4";
-          name = "wolfram";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -39256,8 +49093,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    wonderland = callPackage ({ dash, dash-functional, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, multi }:
-    melpaBuild {
+    wonderland = callPackage ({ dash
+                              , dash-functional
+                              , emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild
+                              , multi }:
+      melpaBuild {
         pname = "wonderland";
         version = "0.1.1";
         src = fetchFromGitHub {
@@ -39266,10 +49110,10 @@
           rev = "28cf6b37000c395ece9519db53147fb826a42bc4";
           sha256 = "018r35dz8z03wcrx9s28pjisayy21549i232mp6wy9mxkrkxbzpc";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ed02d5e4cba10023ebc7c26f90ba8d1e8ee32a08/recipes/wonderland";
           sha256 = "1b4p49mbzqffm2b2y8sbbi56vnkxap2jscsmla9l6l8brybqjppi";
-          name = "wonderland";
+          name = "recipe";
         };
         packageRequires = [ dash dash-functional emacs multi ];
         meta = {
@@ -39277,8 +49121,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    wordgen = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    wordgen = callPackage ({ cl-lib ? null
+                           , emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "wordgen";
         version = "0.1.4";
         src = fetchFromGitHub {
@@ -39287,10 +49136,10 @@
           rev = "aacad928ae99a953e034a831dfd0ebdf7d52ac1d";
           sha256 = "06vbc9ycz1nbjwjkg99y3lj6jwb6lnwnmkqf09yr00jjrrfhfash";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5cfdc64a9aa79575dad8057c4cd747d2cdd460aa/recipes/wordgen";
           sha256 = "0vlrplm3pmpwwa8p8j6lck97b875gzzm7vxxc8l9l18vs237cz1m";
-          name = "wordgen";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -39298,20 +49147,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    wordsmith-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    wordsmith-mode = callPackage ({ fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "wordsmith-mode";
         version = "1.0.0";
         src = fetchFromGitHub {
           owner = "istib";
           repo = "wordsmith-mode";
-          rev = "41b10f2fe3589da9812395cb417c3dcf906f0969";
-          sha256 = "0s3mjmfjiidn3spklndw0dvcwbb9x034xyphp60aad8vjaflbchs";
+          rev = "45df3bca3b49f7ee9d59278e4f6662d63d1dec33";
+          sha256 = "0yxhw6kv12ny1fg5k0j9k7z3f54hnaq6h6b454197lssm9xjgg2b";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3b5fda506e5b388cd6824d433b89032ed46858dc/recipes/wordsmith-mode";
           sha256 = "0s6b6dfqn31jdcgs2mlmvwgpr5a4zs4xi8m002ly11c6sn035xb1";
-          name = "wordsmith-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -39319,8 +49171,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    worf = callPackage ({ ace-link, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild, swiper }:
-    melpaBuild {
+    worf = callPackage ({ ace-link
+                        , fetchFromGitHub
+                        , fetchurl
+                        , hydra
+                        , lib
+                        , melpaBuild
+                        , swiper }:
+      melpaBuild {
         pname = "worf";
         version = "0.1.0";
         src = fetchFromGitHub {
@@ -39329,10 +49187,10 @@
           rev = "f36755447b588b739b2bf6ab0fb5eb5f4d8db3df";
           sha256 = "0l2n3vwk251ba06xdrs9z0bp4ligfdjd259a84ap2z3sqdfa98x4";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f00f8765e35c21dd1a4b5c01c239ed4d15170ab7/recipes/worf";
           sha256 = "1fkb2ddl684dijsb0cqgmfbg1nz4xv43rb7g5rah05rchy5sgkpi";
-          name = "worf";
+          name = "recipe";
         };
         packageRequires = [ ace-link hydra swiper ];
         meta = {
@@ -39340,8 +49198,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    wrap-region = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    wrap-region = callPackage ({ dash
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "wrap-region";
         version = "0.7.3";
         src = fetchFromGitHub {
@@ -39350,10 +49212,10 @@
           rev = "5a910ad23ebb0649e644bf62ad042587341da5da";
           sha256 = "03hjwm51sngkh7jjiwnqhflllqq6i99ib47rm2ja9ii0qyhj1qa0";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/wrap-region";
           sha256 = "058518smxj3j3mr6ljzh7c9x5g23d24104p58sl9nhpw0cq9k28i";
-          name = "wrap-region";
+          name = "recipe";
         };
         packageRequires = [ dash ];
         meta = {
@@ -39361,20 +49223,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    writegood-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    writegood-mode = callPackage ({ fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "writegood-mode";
-        version = "2.0.2";
+        version = "2.0.3";
         src = fetchFromGitHub {
           owner = "bnbeckwith";
           repo = "writegood-mode";
-          rev = "4302169c1563cab9319745083f9b9a7f5f4af0bd";
-          sha256 = "1nnjn1r669hvvzfycllwap4w04m8rfsk4nzcg8057m1f263kj31b";
+          rev = "b71757ec337e226909fb0422f0224e31acc71733";
+          sha256 = "038gliy6l931r02bf2dbhmp188sgk1rq46ngg9nhf5q5rkf3pi8p";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/75c5a4304999fc3f5a02235a1c2c904238d2ce4f/recipes/writegood-mode";
           sha256 = "1lxammisaj04g5vr5lwms64ywf39w8knrq72x4i94wwzwx5ywi1d";
-          name = "writegood-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -39382,8 +49247,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    writeroom-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, visual-fill-column }:
-    melpaBuild {
+    writeroom-mode = callPackage ({ emacs
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild
+                                  , visual-fill-column }:
+      melpaBuild {
         pname = "writeroom-mode";
         version = "3.7";
         src = fetchFromGitHub {
@@ -39392,10 +49262,10 @@
           rev = "d3252f54c8f9f37a19d6a21fb2291c3da7a7121a";
           sha256 = "13nbls5qxz5z8firjxaip8m9vzfbbpxmwrmr01njbk4axpwrpj0z";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/writeroom-mode";
           sha256 = "1kpsrp3agw8bg3qbf5rf5k1a7ww30q5xsa8z5ywxajsaywjzx1bk";
-          name = "writeroom-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs visual-fill-column ];
         meta = {
@@ -39403,8 +49273,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    ws-butler = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ws-butler = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "ws-butler";
         version = "0.6";
         src = fetchFromGitHub {
@@ -39413,10 +49286,10 @@
           rev = "323b651dd70ee40a25accc940b8f80c3a3185205";
           sha256 = "1a4b0lsmwq84qfx51c5xy4fryhb1ysld4fhgw2vr37izf53379sb";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ws-butler";
           sha256 = "1k5nhj37r51i0czrlafra53wir73p0nbq83jjccqmw4p4xk6axl3";
-          name = "ws-butler";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -39424,8 +49297,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    wsd-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    wsd-mode = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "wsd-mode";
         version = "0.5.0";
         src = fetchFromGitHub {
@@ -39434,10 +49310,10 @@
           rev = "b5e8ea0daeaa52f2ea6349e09902bd3216e96258";
           sha256 = "1ibvcc54y2w72d3yvcczvzywribiwmkhlb1b08g4pyb1arclw393";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/wsd-mode";
           sha256 = "07vclmnj18wx9wlrcnsl99f9jlk3sb9g6pcdv8x1smk84gccpakc";
-          name = "wsd-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -39445,20 +49321,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    wttrin = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, xterm-color }:
-    melpaBuild {
+    wttrin = callPackage ({ emacs
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild
+                          , xterm-color }:
+      melpaBuild {
         pname = "wttrin";
         version = "0.1.0";
         src = fetchFromGitHub {
           owner = "bcbcarl";
           repo = "emacs-wttrin";
-          rev = "d595240d92788791da2218d12efd6a77eee06217";
-          sha256 = "0mbc3ndggv2rbmfcfhw8bsx3qw6jy684hxz5dqa88lfb6vs5knzc";
+          rev = "36375c46220aae42aa2c3fe20cf1c252e8ecad87";
+          sha256 = "1vjcfqqm6xwinwmi973n45jillc5j77da436wlv1ax0095xck4nl";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1b2b6876562f1fadd4af1ea9b279ac4dc1b21660/recipes/wttrin";
           sha256 = "0msp8lja9nz6khz3dkasv8hnhkaayqxd7m58kma03hpkcjxnaxil";
-          name = "wttrin";
+          name = "recipe";
         };
         packageRequires = [ emacs xterm-color ];
         meta = {
@@ -39466,20 +49347,25 @@
           license = lib.licenses.free;
         };
       }) {};
-    x86-lookup = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    x86-lookup = callPackage ({ cl-lib ? null
+                              , emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "x86-lookup";
-        version = "1.1.1";
+        version = "1.2.0";
         src = fetchFromGitHub {
           owner = "skeeto";
           repo = "x86-lookup";
-          rev = "208810ea93214491e6e2329cdbf81de85437939a";
-          sha256 = "0whhi05mg7xirzfcz7fzn4hkqq0qbrhqi77myrgdhwgs123cd9bj";
+          rev = "609b2ba70dc5a246ac9b4b5f89eb5ef4331519bf";
+          sha256 = "19zgq7mcc3wx847xc911fibvphbsws99m2l3k54xdjp8mb5qfdzm";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/27757b9b5673f5581e678e8cad719138db654415/recipes/x86-lookup";
           sha256 = "1clv1npvdkzsy0a08xrb880yflwzl4d5cc2c5xrs7b837mqpj8hd";
-          name = "x86-lookup";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -39487,8 +49373,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    xbm-life = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    xbm-life = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "xbm-life";
         version = "0.1.3";
         src = fetchFromGitHub {
@@ -39497,10 +49386,10 @@
           rev = "bde2b3730a02d237f7d95a8e3f3722f23f2d9201";
           sha256 = "154xnfcmil9xjjmq4cyrfpir4ga4mgcmmbd7dja1m7rpk1734xk6";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6cb4c55583338dafee61fd9c266d2ee7cae2b1ed/recipes/xbm-life";
           sha256 = "1pglxjd4cs630sayx17ai1xflpbyj3hry3156682bgwhqs1vw68q";
-          name = "xbm-life";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -39508,8 +49397,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    xcode-project = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    xcode-project = callPackage ({ emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "xcode-project";
         version = "1.0.0";
         src = fetchFromGitHub {
@@ -39518,10 +49411,10 @@
           rev = "f5548a26a1afc0b0d873556c25f6d8b6b9c2aa8c";
           sha256 = "0xb1cvjaw7zjnw6c5aq315vvlc3cncris62jis44jb8s5r8gxcrv";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/49b866ebf7e707bc74525f83dd5038e6e860fcef/recipes/xcode-project";
           sha256 = "0igp30f6ypmp4l8zmdfpa5bza4avm7mq2gj8v7b3ii655v91n6vi";
-          name = "xcode-project";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -39529,8 +49422,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    xcscope = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    xcscope = callPackage ({ fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "xcscope";
         version = "1.3";
         src = fetchFromGitHub {
@@ -39539,10 +49435,10 @@
           rev = "1e4c8e60eb841a3ecb56ff4115b6a8ae5c0bf779";
           sha256 = "1cc3bmi4fxlgqha7sxswn9lcc126xnr2j8xz6wszjnqh5w274fpp";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/068c7846e70b91ce7e88330937fc64a60281802a/recipes/xcscope";
           sha256 = "06xh29cm5v3b5xwj32y0i0h0kvvy995840db4hvab2wn9jw68m8w";
-          name = "xcscope";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -39550,8 +49446,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    xkcd = callPackage ({ fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }:
-    melpaBuild {
+    xkcd = callPackage ({ fetchFromGitHub
+                        , fetchurl
+                        , json ? null
+                        , lib
+                        , melpaBuild }:
+      melpaBuild {
         pname = "xkcd";
         version = "1.1";
         src = fetchFromGitHub {
@@ -39560,10 +49460,10 @@
           rev = "2c538d41a9728939cc5e8292faa78ed50997877d";
           sha256 = "0p9p3w8i5w1pzh3y3yxz0rg5gywfq4m5anbiyrdn84vdd42jij4x";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/xkcd";
           sha256 = "0gy2952zg1rq5gl10x7iwbchz5jibfcvikd3chifqbmil80wh6b5";
-          name = "xkcd";
+          name = "recipe";
         };
         packageRequires = [ json ];
         meta = {
@@ -39571,8 +49471,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    xml-rpc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    xml-rpc = callPackage ({ fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "xml-rpc";
         version = "1.6.12";
         src = fetchFromGitHub {
@@ -39581,10 +49484,10 @@
           rev = "0ab093d60140d19e31d217c8abdc7dbdac944486";
           sha256 = "0g52bmamcd54acyk6i47ar5jawad6ycvm9g656inb994wprnjin9";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/547d773e07d6229d2135d1b081b5401039ffad39/recipes/xml-rpc";
           sha256 = "14r6xgnpqsb2jlv52vgrhqf3qw8a6gmdyap3ylhilyxw71lxf1js";
-          name = "xml-rpc";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -39592,8 +49495,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    xmlgen = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    xmlgen = callPackage ({ fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "xmlgen";
         version = "0.5";
         src = fetchFromGitHub {
@@ -39602,10 +49508,10 @@
           rev = "dba66681f0c5e621a9e70e8afb34903c9ffe93c4";
           sha256 = "096i29v0badx0a6339h9ckdz78zj59gbjdp7vj7vhkq9d830392s";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/xmlgen";
           sha256 = "0c77la6kl02qkapfzbjmhac60f8p837kwg8bp0686ylxh5s31zsh";
-          name = "xmlgen";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -39613,8 +49519,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    xquery-tool = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    xquery-tool = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "xquery-tool";
         version = "0.1.10";
         src = fetchFromGitHub {
@@ -39623,10 +49532,10 @@
           rev = "b81b5862e8541aca5231840eb176afad7ab55cf3";
           sha256 = "0dv3gl9djs9sbsg5mhdfnnv61ir9xccqijh7i2b82gq2j3lqhibm";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cc71e5ea4a0ecb006f62617f5b6caadc9b3c77b2/recipes/xquery-tool";
           sha256 = "069injmvv9zzcbqbms94qx5wjj740jnik6sf3b4xjhln7z1yskp0";
-          name = "xquery-tool";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -39634,8 +49543,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    xref-js2 = callPackage ({ emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild }:
-    melpaBuild {
+    xref-js2 = callPackage ({ emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , js2-mode
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "xref-js2";
         version = "1.5";
         src = fetchFromGitHub {
@@ -39644,10 +49558,10 @@
           rev = "7e2bc6a8dad08a493d11d3554f6374584846b9e6";
           sha256 = "1mmd27miv32sl8cj7qhy09yfh7v1zgw7rv4fdwk96msvd4qfdkqd";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b5dab444ead98210b4ab3a6f9a61d013aed6d5b7/recipes/xref-js2";
           sha256 = "1mfyszdi1wx2lqd9fyqm0ra227dcsjs8asc1dw2li0alwh7n4xs3";
-          name = "xref-js2";
+          name = "recipe";
         };
         packageRequires = [ emacs js2-mode ];
         meta = {
@@ -39655,8 +49569,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    xterm-color = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    xterm-color = callPackage ({ cl-lib ? null
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "xterm-color";
         version = "1.7";
         src = fetchFromGitHub {
@@ -39665,10 +49583,10 @@
           rev = "42374a98f1039e105cad9f16ce585dffc96a3f1c";
           sha256 = "09mzzql76z3gn39qnfjspm8waps8msbkilmlk3n2zrizpbps6crj";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b34a42f1bf5641871da8ce2b688325023262b643/recipes/xterm-color";
           sha256 = "0bvzi1mkxgm4vbq2va1sr0k9h3fdmppq79hkvbizc2xgk72sazpj";
-          name = "xterm-color";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -39676,8 +49594,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    xtest = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    xtest = callPackage ({ cl-lib ? null
+                         , fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "xtest";
         version = "1.1.0";
         src = fetchFromGitHub {
@@ -39686,10 +49608,10 @@
           rev = "b227414d714e7baddef79bd306a43024b9a34d45";
           sha256 = "1wqx6hlqcmqiljydih5fx89dw06g8w728pyn4iqsap8jwgjngb09";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/378fe14c66072ecb899a074c56f95077dfc9667e/recipes/xtest";
           sha256 = "1vbs4sb4frzg8d3l96ip9cc6lc86nbj50vpdfqazvxmdfd1sg4i7";
-          name = "xtest";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -39697,8 +49619,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    yafolding = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    yafolding = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "yafolding";
         version = "0.4.0";
         src = fetchFromGitHub {
@@ -39707,10 +49632,10 @@
           rev = "57c015ddd7c3454571c80825bc5391d7a10fa1d7";
           sha256 = "144v8nn4l8ngfdrsgj5nrxp09391gnfrqf950y956cbmqvnlw7z8";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/yafolding";
           sha256 = "1yb1rlxa5f1y1xjqs7ndr5jnf9j5cv0ccqdpbrx4l9xkm3npw9zl";
-          name = "yafolding";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -39718,8 +49643,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    yagist = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    yagist = callPackage ({ cl-lib ? null
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "yagist";
         version = "0.8.12";
         src = fetchFromGitHub {
@@ -39728,10 +49657,10 @@
           rev = "97723a34750ccab5439eb9f6a2f67e4e0e234167";
           sha256 = "0l9b888wv72j4hhkcfzsh09iqjxp2qjbjcjcfmvfhxf7il11pv8h";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/97ea1250ffbf159d7870710b9348ef26616dbedb/recipes/yagist";
           sha256 = "1mz86fq0pb4w54c66vd19m2492mkrzq2qi6ssnn2xwmn8vv02wdd";
-          name = "yagist";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -39739,8 +49668,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    yaml-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    yaml-mode = callPackage ({ emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "yaml-mode";
         version = "0.0.13";
         src = fetchFromGitHub {
@@ -39749,10 +49682,10 @@
           rev = "2ace378bef2047a980fba0e42e3e6b5d990f2c66";
           sha256 = "1wx4gqkg0v0mcykimiihrp4lg2s9qac31w8rw5frbs1r37v3l8x7";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/yaml-mode";
           sha256 = "0afp83xcr8h153cayyaszwkgpap0iyk351dlykmv6bv9d2m774mc";
-          name = "yaml-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -39760,8 +49693,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    yang-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    yang-mode = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "yang-mode";
         version = "0.9.8";
         src = fetchFromGitHub {
@@ -39770,10 +49706,10 @@
           rev = "340aec635e359609b22f7e94df15af1af2b070f6";
           sha256 = "0795z6s71vlb709n5lpx2f9adfjndafg1h5860zvy1qc4m1054rz";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bb42ab9b5f118baaf6766c478046552b686981a1/recipes/yang-mode";
           sha256 = "0rl90xbcf3383ls95g1dixh2dr02kc4g60d324cqbb4h59wffp40";
-          name = "yang-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -39781,8 +49717,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    yankpad = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    yankpad = callPackage ({ fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "yankpad";
         version = "1.6";
         src = fetchFromGitHub {
@@ -39791,10 +49730,10 @@
           rev = "d2ea6920a2444f1ce6f53947640446b8e16f84b7";
           sha256 = "1lw2d25rwszk35bi3gm3bg0cb30b8c2bf3p32b89shnsmwylw52m";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e64746d10f9e0158621a7c4dc41dc2eca6ad573c/recipes/yankpad";
           sha256 = "1w5r9zk33cjgsmk45znfg32ym06nyqj5q3knr59jmn1fafx7a3z4";
-          name = "yankpad";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -39802,8 +49741,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    yapfify = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    yapfify = callPackage ({ fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
         pname = "yapfify";
         version = "0.0.6";
         src = fetchFromGitHub {
@@ -39812,10 +49754,10 @@
           rev = "9e63a9135bd8dbfbee55819837a3aa0d119c5e6f";
           sha256 = "1bf09hah2g8x0jbrdh4fm1v01qjymiv38yvv8a5qmfpv5k93lcrc";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/060c32d8e9fdc56fe702d265a935d74d76082f86/recipes/yapfify";
           sha256 = "0scl8lk1c5i7jp1qj5gg8zf3zyi8lkb57ijkmvcs4czzlyv3y9bm";
-          name = "yapfify";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -39823,20 +49765,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    yard-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    yard-mode = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "yard-mode";
         version = "0.1";
         src = fetchFromGitHub {
           owner = "pd";
           repo = "yard-mode.el";
-          rev = "78792f6a6fbff4f1bc955f494fdb11378e7f8095";
-          sha256 = "096ay60hrd14b459cyxxcf9g7i1ivsxg6yhc0q162px6kl1x0m2y";
+          rev = "28015f600c38efed37df025b76705f7edbf963ea";
+          sha256 = "1p1f1cdq1km2zlk1z8s2yhw9mgf3kdx48pgp7bhd0l2ybxh5kc85";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/afad2677f901b8d27922389afb1d235d5c8edc39/recipes/yard-mode";
           sha256 = "0jmlcba8qapjwaaliz9gzs99if3wglkhmlpjzcdy3icx18sw8kzx";
-          name = "yard-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -39844,8 +49789,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    yarn-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    yarn-mode = callPackage ({ emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "yarn-mode";
         version = "1.0";
         src = fetchFromGitHub {
@@ -39854,10 +49803,10 @@
           rev = "99891000efe31214b065fa9446cd5e68c5c42ed8";
           sha256 = "0cg06ba9yfgjzprq78cvhvvl06av0p2vhnmynddzbpgjgjnwskfy";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/860fa2a8fdb22be374fa64a5277af3ab484a047a/recipes/yarn-mode";
           sha256 = "08a3lrz670jsf531mn1hwhh7fg5dby6i749cscd6d4dyvkzpz5dg";
-          name = "yarn-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -39865,8 +49814,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    yascroll = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    yascroll = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "yascroll";
         version = "0.1";
         src = fetchFromGitHub {
@@ -39875,10 +49827,10 @@
           rev = "0a8b531b3a3c8afe7235c8c212e08bfe2021a629";
           sha256 = "007837w6gd7k253h7g2in6l3ihcbwv733yiffs26pnymgk21xdqz";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/yascroll";
           sha256 = "11g7wn4hgdwnx3n7ra0sh8gk6rykwvrg9g2cihvcv7mjbqgcv53f";
-          name = "yascroll";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -39886,20 +49838,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    yasnippet = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    yasnippet = callPackage ({ cl-lib ? null
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "yasnippet";
-        version = "0.12.2";
+        version = "0.13.0";
         src = fetchFromGitHub {
           owner = "joaotavora";
           repo = "yasnippet";
-          rev = "89eb7ab64d67e96646576dc0d551e8c23d50438a";
-          sha256 = "1wr0d14yl3440hkdr436zxl9pk7nqhl76n9m3b3ia4lp6z5aj4jc";
+          rev = "5a29fe67d70de3749e30ebb37206395b4d1a51a8";
+          sha256 = "0fkkplycrw8f8r30hjjxl1wm7p2irq2ipzzc1g7cc52abaal796p";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5d1927dc3351d3522de1baccdc4ce200ba52bd6e/recipes/yasnippet";
           sha256 = "1r37vz5b8nj6hr6c2ki9fdbrs3kkb4zwimh8r4ixm10kdkk5jqds";
-          name = "yasnippet";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -39907,20 +49863,50 @@
           license = lib.licenses.free;
         };
       }) {};
-    yatemplate = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
-    melpaBuild {
+    yasnippet-snippets = callPackage ({ fetchFromGitHub
+                                      , fetchurl
+                                      , lib
+                                      , melpaBuild
+                                      , yasnippet }:
+      melpaBuild {
+        pname = "yasnippet-snippets";
+        version = "0.5";
+        src = fetchFromGitHub {
+          owner = "AndreaCrotti";
+          repo = "yasnippet-snippets";
+          rev = "d153af6d1d8ab8dfbc57f4065cee72f86d5cd2c4";
+          sha256 = "0dkhac40kiyqnq42c2fcdb1jzshgakabq4rq796qfhjpc5j8x5wk";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/42490bbdac871bce302fbc9a0488ff7de354627e/recipes/yasnippet-snippets";
+          sha256 = "0daawvlw78ya38bbi95swjq8qk5jf5shsyv164m81y2gd8i5c183";
+          name = "recipe";
+        };
+        packageRequires = [ yasnippet ];
+        meta = {
+          homepage = "https://melpa.org/#/yasnippet-snippets";
+          license = lib.licenses.free;
+        };
+      }) {};
+    yatemplate = callPackage ({ emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild
+                              , yasnippet }:
+      melpaBuild {
         pname = "yatemplate";
         version = "3.0";
         src = fetchFromGitHub {
           owner = "mineo";
           repo = "yatemplate";
-          rev = "c1de31d2b16d98af197a4392b6481346ab4e8d57";
-          sha256 = "0lp5ym2smmvmlxpdyv4kh75qsz8dsdz9afd8nxaq8y4fazzabblx";
+          rev = "caa8734afc559a28eb4ec5dc3f240434e51cafc9";
+          sha256 = "0zzmhkadyyw56j1z6dgj3x81sb5mxd0s2r20vy5mrfm18cyvsdd1";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8ba3cdb74f121cbf36b6d9d5a434c363905ce526/recipes/yatemplate";
           sha256 = "05gd9sxdiqpw2p1kdagwgxd94wiw1fmmcsp9v4p74i9sqmf6qn6q";
-          name = "yatemplate";
+          name = "recipe";
         };
         packageRequires = [ emacs yasnippet ];
         meta = {
@@ -39928,7 +49914,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    yatex = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild {
+    yatex = callPackage ({ fetchhg
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
         pname = "yatex";
         version = "1.80";
         src = fetchhg {
@@ -39947,20 +49937,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    yaxception = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    yaxception = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
         pname = "yaxception";
         version = "0.3.3";
         src = fetchFromGitHub {
           owner = "aki2o";
           repo = "yaxception";
-          rev = "4e94cf3e0b9b5631b0e90eb4b7de597ee7185875";
-          sha256 = "0nqyn1b01v1qxv7rcf46qypca61lmpm8d7kqv63jazw3n05qdnj8";
+          rev = "21a36020c6a5319ea6461f4524aa3a0589df3bbd";
+          sha256 = "06fnm2c17hmlfp40mq8lxk1blmcy10z0xxdpy8ykyv1r1r6syjf8";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1da5261081fc66910d935b81e52391c071e52379/recipes/yaxception";
           sha256 = "18n2kjbgfhkhcwigxmv8dk72jp57vsqqd20lc26v5amx6mrhgh58";
-          name = "yaxception";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -39968,8 +49961,20 @@
           license = lib.licenses.free;
         };
       }) {};
-    ycmd = callPackage ({ cl-lib ? null, dash, deferred, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pkg-info, request, request-deferred, s }:
-    melpaBuild {
+    ycmd = callPackage ({ cl-lib ? null
+                        , dash
+                        , deferred
+                        , emacs
+                        , fetchFromGitHub
+                        , fetchurl
+                        , let-alist
+                        , lib
+                        , melpaBuild
+                        , pkg-info
+                        , request
+                        , request-deferred
+                        , s }:
+      melpaBuild {
         pname = "ycmd";
         version = "1.2";
         src = fetchFromGitHub {
@@ -39978,10 +49983,10 @@
           rev = "d042a673b4d717c3ca9d641f120bfe16c994c740";
           sha256 = "0rxw86xi9xgr0fp6wmd6hgqgqr9flk7p4lcr0052jhlwknj1nrx0";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4b25378540c64d0214797348579671bf2b8cc696/recipes/ycmd";
           sha256 = "10jqr6xz2fnrd1ihips9jmbcd28zha432h4pxjpswz3ivwjqhxna";
-          name = "ycmd";
+          name = "recipe";
         };
         packageRequires = [
           cl-lib
@@ -39999,20 +50004,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    ydk-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    ydk-mode = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
         pname = "ydk-mode";
         version = "1.0.0";
         src = fetchFromGitHub {
           owner = "jacksonrayhamilton";
           repo = "ydk-mode";
-          rev = "f3f125b29408e0b0a34fec27dcb7c02c5dbfd04e";
-          sha256 = "0ndmbswrv8vyw18zhbmjr11400l546zqaj7dzfvwb5rhdv2d0abi";
+          rev = "3de9ef27dbdf5887f05092895e4ba93e7659e0ec";
+          sha256 = "1kc1qsblfxfxrbgv3ksqf87gzic463136k2v7ryaj3x2r9mc0j3l";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/865b9ee86ca28fc1cedc0a432a292400184711ae/recipes/ydk-mode";
           sha256 = "1z9digf39d7dd736svp0cy6773l3nklzc263q23gwfcg0jswbdyg";
-          name = "ydk-mode";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -40020,8 +50028,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    yesql-ghosts = callPackage ({ cider, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
-    melpaBuild {
+    yesql-ghosts = callPackage ({ cider
+                                , dash
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild
+                                , s }:
+      melpaBuild {
         pname = "yesql-ghosts";
         version = "0.1.0";
         src = fetchFromGitHub {
@@ -40030,10 +50044,10 @@
           rev = "bd834e97f263f9f981758c1462bc6297a83ca852";
           sha256 = "0yvz7lmid4jcikb9jmc7h2lcry3fdyy809k25nyasj2bk41xqqsd";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3c652657be0f9b9dcb236e01c3abd2fd717190d7/recipes/yesql-ghosts";
           sha256 = "1hxzbnfd15f0ifdqjbw9nhxd0z46x705v2bc0xl71nav78fgpswf";
-          name = "yesql-ghosts";
+          name = "recipe";
         };
         packageRequires = [ cider dash s ];
         meta = {
@@ -40041,8 +50055,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    yoshi-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    yoshi-theme = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "yoshi-theme";
         version = "6.1.0";
         src = fetchFromGitHub {
@@ -40051,10 +50068,10 @@
           rev = "b140d3adce4e8e7ff7b0daaa6684bd7065e4819b";
           sha256 = "19a47780h0x1rdicr8i7356kvamkbkcwp31skdpp5cxgysvi3d9s";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6e9a549e31c4097ee24b4bff12ec5d20d3beac68/recipes/yoshi-theme";
           sha256 = "1kzdjs3rzg9rxrjgsk0wk75rwvbip6ixg1apcxv2c1a6biqqf2hv";
-          name = "yoshi-theme";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -40062,8 +50079,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    youdao-dictionary = callPackage ({ chinese-word-at-point, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, names, popup }:
-    melpaBuild {
+    youdao-dictionary = callPackage ({ chinese-word-at-point
+                                     , emacs
+                                     , fetchFromGitHub
+                                     , fetchurl
+                                     , lib
+                                     , melpaBuild
+                                     , names
+                                     , popup }:
+      melpaBuild {
         pname = "youdao-dictionary";
         version = "0.4";
         src = fetchFromGitHub {
@@ -40072,10 +50096,10 @@
           rev = "a6e44e4fb93cc1b9f1067f10cf854b0bfc3fe732";
           sha256 = "1m4zri7kiw70062w2sp4fdqmmx2vmjisamjwmjdg6669dzvnpawq";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/712bdf83f71c2105754f9b549a889ffc5b7ba565/recipes/youdao-dictionary";
           sha256 = "1qfk7s18br9jask1bpida0cjxks098qpz0ssmw8misi3bjax0fym";
-          name = "youdao-dictionary";
+          name = "recipe";
         };
         packageRequires = [ chinese-word-at-point emacs names popup ];
         meta = {
@@ -40083,8 +50107,37 @@
           license = lib.licenses.free;
         };
       }) {};
-    zenburn-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    zel = callPackage ({ emacs
+                       , fetchFromGitHub
+                       , fetchurl
+                       , frecency
+                       , lib
+                       , melpaBuild }:
+      melpaBuild {
+        pname = "zel";
+        version = "0.1.2";
+        src = fetchFromGitHub {
+          owner = "rudolfochrist";
+          repo = "zel";
+          rev = "1d938ac01a42e7a985a3f92f5e97bc09e057676e";
+          sha256 = "1hk84x4aqcfd3jggk9san1v4kr58v2zhikbv9sh3dcii6x5w2nv0";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/25b445a1dea5e8f1042bed6b5372471c25129fd8/recipes/zel";
+          sha256 = "0fwc1fghsw2rg4fv10kgc9d6rhbq20xa9diqcvp1f1cqs12rfhpd";
+          name = "recipe";
+        };
+        packageRequires = [ emacs frecency ];
+        meta = {
+          homepage = "https://melpa.org/#/zel";
+          license = lib.licenses.free;
+        };
+      }) {};
+    zenburn-theme = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
         pname = "zenburn-theme";
         version = "2.5";
         src = fetchFromGitHub {
@@ -40093,10 +50146,10 @@
           rev = "f031c785b469cf4356fddb997eccf60399e34235";
           sha256 = "029955wp29wdrk1ddmhxixd76vhkp2li3mjaknw9d8iqz819vshc";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/zenburn-theme";
           sha256 = "1kb371j9aissj0vy07jw4ydfn554blc8b2rbi0x1dvfksr2rhsn9";
-          name = "zenburn-theme";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -40104,20 +50157,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    zephir-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    zephir-mode = callPackage ({ emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "zephir-mode";
         version = "0.3.3";
         src = fetchFromGitHub {
           owner = "sergeyklay";
           repo = "zephir-mode";
-          rev = "243f0fb7fd1dfebf0f0bdf94046b72d1bea4f66c";
-          sha256 = "0jydy2zcbksi7db7bvfhgdh08np8k4a1yd6q2wq6m3ll2y3zd0w2";
+          rev = "b031c56753cef349484d53d2f3f29bd8080f4dc5";
+          sha256 = "1gxz2khyl14z4hg1gxscv14gsqgnrz0343yy3lla0cc9i64c65ih";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5bd901c93ce7f64de6082e801327adbd18fd4517/recipes/zephir-mode";
           sha256 = "0nxm6w7z89q2vvf3bp1p6hb6f2axv9ha85jyiv4k02l46sjprf4j";
-          name = "zephir-mode";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -40125,8 +50182,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    zerodark-theme = callPackage ({ all-the-icons, fetchFromGitHub, fetchurl, flycheck, lib, magit, melpaBuild }:
-    melpaBuild {
+    zerodark-theme = callPackage ({ all-the-icons
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , flycheck
+                                  , lib
+                                  , magit
+                                  , melpaBuild }:
+      melpaBuild {
         pname = "zerodark-theme";
         version = "4.5";
         src = fetchFromGitHub {
@@ -40135,10 +50198,10 @@
           rev = "ceb46240636865e86f3fe26906957943ba7bd73c";
           sha256 = "0nnlxzsmhsbszqigcyxak9i1a0digrd13gv6v18ck4h760mihh1m";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d00b78ead693e844e35c760fe2c39b8ed6cb0d81/recipes/zerodark-theme";
           sha256 = "1nqzswmnq6h0av4rivqm237h7ghp7asa2nvls7nz4ma467p9qhp9";
-          name = "zerodark-theme";
+          name = "recipe";
         };
         packageRequires = [ all-the-icons flycheck magit ];
         meta = {
@@ -40146,20 +50209,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    zombie-trellys-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, haskell-mode, lib, melpaBuild }:
-    melpaBuild {
+    zombie-trellys-mode = callPackage ({ cl-lib ? null
+                                       , emacs
+                                       , fetchFromGitHub
+                                       , fetchurl
+                                       , haskell-mode
+                                       , lib
+                                       , melpaBuild }:
+      melpaBuild {
         pname = "zombie-trellys-mode";
         version = "0.2.1";
         src = fetchFromGitHub {
           owner = "david-christiansen";
           repo = "zombie-trellys-mode";
-          rev = "9e99d444a387dd1634cab62ef802683f5bf5d907";
-          sha256 = "1ksjd3askc3k1l0b3nia5mzkxa74bidh2x0xlrj4qs4im5445vnz";
+          rev = "03b8d3635f65dbf38f9a19b5d1a8dfdcb38ba423";
+          sha256 = "0rp615k41v5v9m9g3ydyzgwr6a7wqrmsdkz3pc2frl1zij8jpjm4";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e66db80ab82a69542688cd57c9e0ec10e6616c87/recipes/zombie-trellys-mode";
           sha256 = "19xzvppw7f35s82hm0y7sga8dyjjyy0dxy6vji4hxdpjziz7lggv";
-          name = "zombie-trellys-mode";
+          name = "recipe";
         };
         packageRequires = [ cl-lib emacs haskell-mode ];
         meta = {
@@ -40167,8 +50236,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    zone-nyan = callPackage ({ esxml, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    zone-nyan = callPackage ({ esxml
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "zone-nyan";
         version = "0.2.2";
         src = fetchFromGitHub {
@@ -40177,10 +50250,10 @@
           rev = "e36875d83ad3dce14f23864688959fa0d98ba410";
           sha256 = "1lrgirfvcvbir7csshkhhwj99jj1x5aprhw7xfiicv7nan9m6gjy";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/zone-nyan";
           sha256 = "1g7i5p26gb9gny64b84x6zqml7fly5q9aykmc6l6c1kfl6pqxs94";
-          name = "zone-nyan";
+          name = "recipe";
         };
         packageRequires = [ esxml ];
         meta = {
@@ -40188,8 +50261,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    zoom = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    zoom = callPackage ({ emacs
+                        , fetchFromGitHub
+                        , fetchurl
+                        , lib
+                        , melpaBuild }:
+      melpaBuild {
         pname = "zoom";
         version = "0.2.1";
         src = fetchFromGitHub {
@@ -40198,10 +50275,10 @@
           rev = "85deb722abb89f1758a24969680fc13b51344cb2";
           sha256 = "1a7dlfi1w0rh6iphvflip3798xg7sac916qwjmqzz4inw9wdh3ga";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe094c99756ad29eda9bc51f31bb70c4ddc4131/recipes/zoom";
           sha256 = "09bk0nnfj72an2b3rravd6qp21gdgcm1m55qnf2r8rzbgqymq5ls";
-          name = "zoom";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -40209,8 +50286,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    zoom-window = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    zoom-window = callPackage ({ emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "zoom-window";
         version = "0.5";
         src = fetchFromGitHub {
@@ -40219,10 +50300,10 @@
           rev = "eefe36d26e04a9f89aad27671d1f06e9d4736ac6";
           sha256 = "08splg49ncgfsap3ivpc974wmg22ikshwv33l0i6advjjv9cskhm";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8a55cc66cc0deb1c24023f638b8e920c9d975859/recipes/zoom-window";
           sha256 = "0l9683nk2bdm49likk9c55c23qfy6f1pn04drqwd1vhpanz4l4b3";
-          name = "zoom-window";
+          name = "recipe";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -40230,8 +50311,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    zop-to-char = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    zop-to-char = callPackage ({ cl-lib ? null
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "zop-to-char";
         version = "1.1";
         src = fetchFromGitHub {
@@ -40240,10 +50325,10 @@
           rev = "816ea90337db0545a2f0a5079f4d7b3a2822af7d";
           sha256 = "14waf3g7b92k3qd5088w4pn0wcspxjfkbswlzf7nnkjliw1yh0kf";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b0a9277f1a5f1aef8886e739c73dea91d3f81dc5/recipes/zop-to-char";
           sha256 = "0jnspvqqvnaplld083j7cqqxw122qazh88ab7hymci36m3ka9hga";
-          name = "zop-to-char";
+          name = "recipe";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -40251,8 +50336,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    zotelo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    zotelo = callPackage ({ fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
         pname = "zotelo";
         version = "1.3";
         src = fetchFromGitHub {
@@ -40261,10 +50349,10 @@
           rev = "56eaaa76f80bd15710e68af4a1e585394af987d3";
           sha256 = "0qwdbzfi8mddmchdd9ab9ms1ynlc8dx08i6g2mf3za1sbcivdqsr";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/zotelo";
           sha256 = "0y6s5ma7633h5pf9zj7vkazidlf211va7nk47ppb1q0iyfkyln36";
-          name = "zotelo";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -40272,20 +50360,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    zotxt = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild, request-deferred }:
-    melpaBuild {
+    zotxt = callPackage ({ fetchFromGitLab
+                         , fetchurl
+                         , lib
+                         , melpaBuild
+                         , request-deferred }:
+      melpaBuild {
         pname = "zotxt";
         version = "0.1.34";
         src = fetchFromGitLab {
           owner = "egh";
           repo = "zotxt-emacs";
           rev = "43c0c6d23b31126bac6b14bb85608180fd9c866f";
-          sha256 = "1hz1m4190yi6knz3y088ql8wy3pmsl8lsznqby2vpnn9p74fvl37";
+          sha256 = "0qksa67aazs9vx7v14nlakr34z6l0h6mhfzi2c0vhrr0c210r6hp";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b633453e77a719f6b6b6564e66c1c1260db38aa6/recipes/zotxt";
           sha256 = "18jla05g2k8zfrmp7q9kpr1mpw6smxzdyn8nfghm306wvv9ff8y5";
-          name = "zotxt";
+          name = "recipe";
         };
         packageRequires = [ request-deferred ];
         meta = {
@@ -40293,8 +50385,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    zygospore = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    zygospore = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
         pname = "zygospore";
         version = "0.0.3";
         src = fetchFromGitHub {
@@ -40303,10 +50398,10 @@
           rev = "1af5ee663f5a7aa08d96a77cacff834dcdf55ea8";
           sha256 = "0v73fgb0gf81vlihiicy32v6x86rr2hv0bxlpw7d3pk4ng1a0l3z";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/zygospore";
           sha256 = "0n9qs6fymdjly0i4rmx87y8gapfn5sqivsivcffi42vcb5f17kxj";
-          name = "zygospore";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -40314,8 +50409,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    zzz-to-char = callPackage ({ avy, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    zzz-to-char = callPackage ({ avy
+                               , cl-lib ? null
+                               , emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
         pname = "zzz-to-char";
         version = "0.1.2";
         src = fetchFromGitHub {
@@ -40324,10 +50425,10 @@
           rev = "b62414b155fe2e09d91b70059a909d1403d89acf";
           sha256 = "07a086s3fpncr4plkmr89vghn7xwji9k69m64ri7i1vhnnl6q4zj";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7063cbc1f1501ce81552d7ef1d42d1309f547c42/recipes/zzz-to-char";
           sha256 = "16vwp0krshmn5x3ry1j512g4kydx39znjqzri4j7wgg49bz1n7vh";
-          name = "zzz-to-char";
+          name = "recipe";
         };
         packageRequires = [ avy cl-lib emacs ];
         meta = {
diff --git a/pkgs/applications/editors/emacs-modes/org-generated.nix b/pkgs/applications/editors/emacs-modes/org-generated.nix
index c0223e17a56..54027073f01 100644
--- a/pkgs/applications/editors/emacs-modes/org-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/org-generated.nix
@@ -1,10 +1,12 @@
-{ callPackage }: {
-    org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+{ callPackage }:
+  {
+    org = callPackage ({ elpaBuild, fetchurl, lib }:
+      elpaBuild {
         pname = "org";
-        version = "20180416";
+        version = "20180716";
         src = fetchurl {
-          url = "https://orgmode.org/elpa/org-20180416.tar";
-          sha256 = "05rbkrs93zd9kvldwvypb8fwwaysajy5n7b2k9c8xm2cx2nayv8m";
+          url = "http://orgmode.org/elpa/org-20180716.tar";
+          sha256 = "0gr57nfdncnxrxxzw87ni5i6zjh1mdxl9h8pw96msh1c47xhpk2d";
         };
         packageRequires = [];
         meta = {
@@ -12,12 +14,13 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-plus-contrib = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+    org-plus-contrib = callPackage ({ elpaBuild, fetchurl, lib }:
+      elpaBuild {
         pname = "org-plus-contrib";
-        version = "20180416";
+        version = "20180716";
         src = fetchurl {
-          url = "https://orgmode.org/elpa/org-plus-contrib-20180416.tar";
-          sha256 = "1f5zdfsa1fcf66hk3w57wh5385069yg0b86h57jgkcbmxkcmj6ij";
+          url = "http://orgmode.org/elpa/org-plus-contrib-20180716.tar";
+          sha256 = "0j4r3bcy96kcaab7cv2a5qd0mv8ddkr1qlihijk79l9nhsh2y4hm";
         };
         packageRequires = [];
         meta = {
diff --git a/pkgs/applications/editors/emacs-modes/thingatpt-plus/default.nix b/pkgs/applications/editors/emacs-modes/thingatpt-plus/default.nix
index b09b6dd0e4d..d68feaec293 100644
--- a/pkgs/applications/editors/emacs-modes/thingatpt-plus/default.nix
+++ b/pkgs/applications/editors/emacs-modes/thingatpt-plus/default.nix
@@ -10,7 +10,7 @@ melpaBuild {
     name = "thingatpt+.el";
   };
 
-  recipeFile = fetchurl {
+  recipe = fetchurl {
     url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/thingatpt+";
     sha256 = "0w031lzjl5phvzsmbbxn2fpziwkmdyxsn08h6b9lxbss1prhx7aa";
     name = "thingatpt-plus";
diff --git a/pkgs/build-support/emacs/melpa.nix b/pkgs/build-support/emacs/melpa.nix
index 3b8a23d8c2a..f55c91f82c7 100644
--- a/pkgs/build-support/emacs/melpa.nix
+++ b/pkgs/build-support/emacs/melpa.nix
@@ -1,35 +1,19 @@
 # builder for Emacs packages built for packages.el
 # using MELPA package-build.el
 
-{ lib, stdenv, fetchurl, emacs, texinfo }:
+{ lib, stdenv, fetchurl, fetchFromGitHub, emacs, texinfo }:
 
 with lib;
 
 { pname
 , version
-
-, recipeFile ? null
-
-, files ? null
-, fileSpecs ? [ "*.el" "*.el.in" "dir"
-                "*.info" "*.texi" "*.texinfo"
-                "doc/dir" "doc/*.info" "doc/*.texi" "doc/*.texinfo"
-              ]
-
+, recipe
 , meta ? {}
-
 , ...
 }@args:
 
 let
 
-  packageBuild = fetchurl {
-    url = https://raw.githubusercontent.com/milkypostman/melpa/2b3eb31c077fcaff94b74b757c1ce17650333943/package-build.el;
-    sha256 = "1biwg2pqmmdz5iwqbjdszljazqymvgyyjcnc255nr6qz8mhnx67j";
-  };
-
-  targets = concatStringsSep " " (if files == null then fileSpecs else files);
-
   defaultMeta = {
     homepage = args.src.meta.homepage or "http://melpa.org/#/${pname}";
   };
@@ -37,33 +21,58 @@ let
 in
 
 import ./generic.nix { inherit lib stdenv emacs texinfo; } ({
-  inherit packageBuild;
 
-  buildPhase =
-    if recipeFile == null
-      then ''
-        runHook preBuild
+  melpa = fetchFromGitHub {
+    owner = "melpa";
+    repo = "melpa";
+    rev = "7103313a7c31bb1ebb71419e365cd2e279ee4609";
+    sha256 = "0m10f83ix0mzjk0vjd4kkb1m1p4b8ha0ll2yjsgk9bqjd7fwapqb";
+  };
 
-        export archive=$(emacs --batch -Q -l $packageBuild -l ${./melpa2nix.el} \
-            -f melpa2nix-build-package \
-            ${pname} ${version} ${targets})
+  elpa2nix = ./elpa2nix.el;
+  melpa2nix = ./melpa2nix.el;
 
-        runHook postBuild
-      ''
-      else ''
-        runHook preBuild
+  preUnpack = ''
+    mkdir -p "$NIX_BUILD_TOP/recipes"
+    if [ -n "$recipe" ]; then
+      cp "$recipe" "$NIX_BUILD_TOP/recipes/$pname"
+    fi
 
-        export archive=$(emacs --batch -Q -l $packageBuild -l ${./melpa2nix.el} \
-            -f melpa2nix-build-package-from-recipe \
-            ${recipeFile} ${version})
+    ln -s "$melpa/package-build" "$NIX_BUILD_TOP/package-build"
 
-        runHook postBuild
-      '';
+    mkdir -p "$NIX_BUILD_TOP/packages"
+  '';
+
+  postUnpack = ''
+    mkdir -p "$NIX_BUILD_TOP/working"
+    ln -s "$NIX_BUILD_TOP/$sourceRoot" "$NIX_BUILD_TOP/working/$pname"
+  '';
+
+  buildPhase =
+    ''
+      runHook preBuild
+
+      cd "$NIX_BUILD_TOP"
+
+      emacs --batch -Q \
+          -L "$melpa/package-build" \
+          -l "$melpa2nix" \
+          -f melpa2nix-build-package \
+          $pname $version
+
+      runHook postBuild
+    '';
 
   installPhase = ''
     runHook preInstall
 
-    emacs --batch -Q -l ${./elpa2nix.el} \
+    archive="$NIX_BUILD_TOP/packages/$pname-$version.el"
+    if [ ! -f "$archive" ]; then
+        archive="$NIX_BUILD_TOP/packages/$pname-$version.tar"
+    fi
+
+    emacs --batch -Q \
+        -l "$elpa2nix" \
         -f elpa2nix-install-package \
         "$archive" "$out/share/emacs/site-lisp/elpa"
 
@@ -73,6 +82,4 @@ import ./generic.nix { inherit lib stdenv emacs texinfo; } ({
   meta = defaultMeta // meta;
 }
 
-// removeAttrs args [ "files" "fileSpecs"
-                      "meta"
-                    ])
+// removeAttrs args [ "meta" ])
diff --git a/pkgs/build-support/emacs/melpa2nix.el b/pkgs/build-support/emacs/melpa2nix.el
index 3cd5bbdb954..99c755e2afc 100644
--- a/pkgs/build-support/emacs/melpa2nix.el
+++ b/pkgs/build-support/emacs/melpa2nix.el
@@ -1,42 +1,16 @@
 (require 'package)
 (package-initialize)
 
+(require 'package-recipe)
 (require 'package-build)
 
-(setq package-build-working-dir (expand-file-name ".")
-      package-build-archive-dir (expand-file-name "."))
+(setq package-build-working-dir (expand-file-name "working/"))
+(setq package-build-archive-dir (expand-file-name "packages/"))
+(setq package-build-recipes-dir (expand-file-name "recipes/"))
 
 (defun melpa2nix-build-package ()
   (if (not noninteractive)
       (error "`melpa2nix-build-package' is to be used only with -batch"))
   (pcase command-line-args-left
-    (`(,package ,version . ,files)
-     (melpa2nix-package-build-archive package version files))))
-
-(defun melpa2nix-build-package-from-recipe ()
-  (if (not noninteractive)
-      (error "`melpa2nix-build-package' is to be used only with -batch"))
-  (pcase command-line-args-left
-    (`(,recipe-file ,version)
-     (let* ((recipe (package-build--read-from-file recipe-file))
-            (rcp (cdr recipe))
-            (package (car recipe))
-            (files (package-build--config-file-list rcp)))
-       (melpa2nix-package-build-archive package version files)))))
-
-(defun melpa2nix-package-build-archive (name version files)
-  "Build a package archive for package NAME."
-  (package-build--message "\n;;; %s\n" name)
-  (let* ((start-time (current-time))
-         (archive-entry (package-build-package name
-                                               version
-                                               files
-                                               package-build-working-dir
-                                               package-build-archive-dir))
-         (archive-file (package-build--archive-file-name archive-entry)))
-
-    (progn
-      (package-build--message "Built in %.3fs, finished at %s"
-                            (time-to-seconds (time-since start-time))
-                            (current-time-string))
-      (princ (format "%s\n" archive-file)))))
+    (`(,package ,version)
+     (package-build--package (package-recipe-lookup package) version))))
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 644f5d821e6..46d0e93752f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15891,7 +15891,7 @@ with pkgs;
   emacsPackagesNgGen = emacs: import ./emacs-packages.nix {
     inherit lib newScope stdenv;
     inherit fetchFromGitHub fetchgit fetchhg fetchurl fetchpatch;
-    inherit emacs texinfo makeWrapper runCommand;
+    inherit emacs texinfo makeWrapper runCommand writeText;
     inherit (xorg) lndir;
 
     trivialBuild = callPackage ../build-support/emacs/trivial.nix {
diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix
index c4c264c811a..1d522f0e9e8 100644
--- a/pkgs/top-level/emacs-packages.nix
+++ b/pkgs/top-level/emacs-packages.nix
@@ -32,7 +32,7 @@
 #   `meta` with `platforms` and `homepage` set to something you are
 #   unlikely to want to override for most packages
 
-{ lib, newScope, stdenv, fetchurl, fetchgit, fetchFromGitHub, fetchhg, fetchpatch, runCommand
+{ lib, newScope, stdenv, fetchurl, fetchgit, fetchFromGitHub, fetchhg, fetchpatch, runCommand, writeText
 
 , emacs, texinfo, lndir, makeWrapper
 , trivialBuild
@@ -99,7 +99,11 @@ let
     nativeBuildInputs = [ external.pkgconfig ];
     buildInputs = with external; [ autoconf automake libpng zlib poppler ];
     preBuild = "make server/epdfinfo";
-    fileSpecs = [ "lisp/pdf-*.el" "server/epdfinfo" ];
+    recipe = writeText "recipe" ''
+      (pdf-tools
+       :repo "politza/pdf-tools" :fetcher github
+       :files ("lisp/pdf-*.el" "server/epdfinfo"))
+    '';
     packageRequires = [ tablist let-alist ];
     meta = {
       description = "Emacs support library for PDF files";
@@ -118,7 +122,12 @@ let
     };
     buildInputs = [ external.libffi ];
     preBuild = "make";
-    files = [ "ffi-glue" "ffi.el" ];
+    recipe = writeText "recipe" ''
+      (elisp-ffi
+      :repo "skeeto/elisp-ffi"
+      :fetcher github
+      :files ("ffi-glue" "ffi.el"))
+    '';
     meta = {
       description = "Emacs Lisp Foreign Function Interface";
       longDescription = ''
@@ -163,6 +172,9 @@ let
       rev    = "39ea47c73f040ce8dcc1c2d2639ebc0eb57ab8c8";
       sha256 = "0q3av1qv4m6aj4bil608f688hjpr5px8zqnnrdqx784nz98rpjrs";
     };
+    recipe = writeText "recipe" ''
+      (elpy :repo "jorgenschaefer/elpy" :fetcher github)
+    '';
 
     patchPhase = ''
       for file in elpy.el elpy-pkg.el; do
@@ -203,6 +215,9 @@ let
       rev    = "fcadf2d93aaea3ba88a2ae63a860b9c1f0568167";
       sha256 = "0axx6cc9z9c1wh7qgm6ya54dsp3bn82bnb0cwj1rpv509qqmwgsj";
     };
+    recipe = writeText "recipe" ''
+      (evil-jumper :repo "bling/evil-jumper" :fetcher github)
+    '';
     packageRequires = [ evil ];
     meta = {
       description = "Jump across buffer boundaries and revive dead buffers if necessary";
@@ -222,6 +237,11 @@ let
       rev    = "53a8d8174f915d9dcf5ac6954b1c0cae61266177";
       sha256 = "0wky8vqg08iw34prbz04bqmhfhj82y93swb8zkz6la2vf9da0gmd";
     };
+    recipe = writeText "recipe" ''
+      (find-file-in-project
+       :repo "technomancy/find-file-in-project"
+       :fetcher github)
+    '';
     meta = {
       description = "Quick access to project files in Emacs";
       longDescription = ''
@@ -243,6 +263,9 @@ let
     src = external.ghc-mod.src;
     packageRequires = [ haskell-mode ];
     propagatedUserEnvPkgs = [ external.ghc-mod ];
+    recipe = writeText "recipe" ''
+      (ghc-mod :repo "DanielG/ghc-mod" :fetcher github :files ("elisp/*.el"))
+    '';
     fileSpecs = [ "elisp/*.el" ];
     meta = {
       description = "An extension of haskell-mode that provides completion of symbols and documentation browsing";
@@ -259,6 +282,11 @@ let
       rev = "d8d168148c187ed19350bb7a1a190217c2915a63";
       sha256 = "09b7bg2s9aa4s8f2kdqs4xps3jxkq5wsvbi87ih8b6id38blhf78";
     };
+    recipe = writeText "recipe" ''
+      (haskell-unicode-input-method
+       :repo "roelvandijk/emacs-haskell-unicode-input-method"
+       :fetcher github)
+    '';
     packageRequires = [];
     meta = {
       homepage = "https://melpa.org/#haskell-unicode-input-method/";
@@ -278,7 +306,11 @@ let
     src = external.hindent.src;
     packageRequires = [ haskell-mode ];
     propagatedUserEnvPkgs = [ external.hindent ];
-    fileSpecs = [ "elisp/*.el" ];
+    recipe = writeText "recipe" ''
+      (hindent
+       :repo "commercialhaskell/hindent" :fetcher github
+       :files ("elisp/*.el"))
+    '';
     meta = {
       description = "Indent haskell code using the \"hindent\" program";
       license = bsd3;
@@ -297,7 +329,11 @@ let
     configurePhase = ":";
 
     propagatedUserEnvPkgs = [ external.rtags ];
-    fileSpecs = [ "src/*.el" ];
+    recipe = writeText "recipe" ''
+      (rtags
+       :repo "andersbakken/rtags" :fetcher github
+       :files ("src/*.el"))
+    '';
     inherit (external.rtags) meta;
   };
 
@@ -305,7 +341,9 @@ let
     pname   = "lcs";
     version = circe.version;
     src     = circe.src;
-    fileSpecs = [ "lcs.el" ];
+    recipe  = writeText "recipe" ''
+      (lcs :repo "jorgenschaefer/circe" :fetcher github :files ("lcs.el"))
+    '';
     meta = {
       description = "Longest Common Sequence (LCS) library for Emacs";
       license = gpl3Plus;
@@ -320,7 +358,9 @@ let
     version = circe.version;
     src     = circe.src;
     packageRequires = [ tracking ];
-    fileSpecs = [ "lui*.el" ];
+    recipe  = writeText "recipe" ''
+      (lcs :repo "jorgenschaefer/circe" :fetcher github :files ("lui*.el"))
+    '';
     meta = {
       description = "User interface library for Emacs";
       license = gpl3Plus;
@@ -345,7 +385,9 @@ let
     pname   = "shorten";
     version = circe.version;
     src     = circe.src;
-    fileSpecs = [ "shorten.el" ];
+    recipe  = writeText "recipe" ''
+      (shorten :repo "jorgenschaefer/circe" :fetcher github :files ("shorten.el"))
+    '';
     meta = {
       description = "String shortening to unique prefix library for Emacs";
       license = gpl3Plus;
@@ -354,20 +396,10 @@ let
 
   stgit = callPackage ../applications/editors/emacs-modes/stgit { };
 
-  structured-haskell-mode = melpaBuild rec {
-    pname = "shm";
-    version = external.structured-haskell-mode.version;
-    src = external.structured-haskell-mode.src;
-    packageRequires = [ haskell-mode ];
-    fileSpecs = [ "elisp/*.el" ];
+  structured-haskell-mode = self.shm;
+  shm = (melpaPackages self).shm.overrideAttrs (attrs: {
     propagatedUserEnvPkgs = [ external.structured-haskell-mode ];
-
-    meta = {
-      description = "Structured editing Emacs mode for Haskell";
-      license = bsd3;
-      platforms = external.structured-haskell-mode.meta.platforms;
-    };
-  };
+  });
 
   thingatpt-plus = callPackage ../applications/editors/emacs-modes/thingatpt-plus { };
 
@@ -386,6 +418,9 @@ let
       rm weechat-sauron.el weechat-secrets.el
     '';
     packageRequires = [ s ];
+    recipe = writeText "recipe" ''
+      (weechat :repo "the-kenny/weechat" :fetcher github)
+    '';
     meta = {
       description = "A weechat IRC client frontend for Emacs";
       license = gpl3Plus;
-- 
GitLab


From 0103ae2f6db2835708bf754d6332bbb740640b5d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9-Patrick=20Bubel?= <code@apb.name>
Date: Thu, 5 Jul 2018 03:07:17 +0200
Subject: [PATCH 021/297] licenses: Add CC-BY-NC-4.0

---
 lib/licenses.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/lib/licenses.nix b/lib/licenses.nix
index c4ccea457e2..1c953a2ba84 100644
--- a/lib/licenses.nix
+++ b/lib/licenses.nix
@@ -143,6 +143,12 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
     free = false;
   };
 
+  cc-by-nc-40 = spdx {
+    spdxId = "CC-BY-NC-4.0";
+    fullName = "Creative Commons Attribution Non Commercial 4.0 International";
+    free = false;
+  };
+
   cc-by-nd-30 = spdx {
     spdxId = "CC-BY-ND-3.0";
     fullName = "Creative Commons Attribution-No Derivative Works v3.00";
-- 
GitLab


From fe69ee86c8a7659c6bd961827ff1f952abdabfcd Mon Sep 17 00:00:00 2001
From: Michael Hoang <enzime@users.noreply.github.com>
Date: Sat, 14 Jul 2018 22:33:24 +1000
Subject: [PATCH 022/297] Fix Synergy building on macOS

Update gtest and gmock to fix clang compiler issues, as well as patch
CMakeLists.txt in multiple places to fix other issues on macOS.
---
 pkgs/applications/misc/synergy/default.nix    |  46 +++--
 .../misc/synergy/respect_macos_arch.patch     |  61 +++++++
 .../misc/synergy/update_gtest_gmock.patch     | 158 ++++++++++++++++++
 pkgs/top-level/all-packages.nix               |   5 +-
 4 files changed, 254 insertions(+), 16 deletions(-)
 create mode 100644 pkgs/applications/misc/synergy/respect_macos_arch.patch
 create mode 100644 pkgs/applications/misc/synergy/update_gtest_gmock.patch

diff --git a/pkgs/applications/misc/synergy/default.nix b/pkgs/applications/misc/synergy/default.nix
index ee3cb9cd8ed..5f12bdb4dfc 100644
--- a/pkgs/applications/misc/synergy/default.nix
+++ b/pkgs/applications/misc/synergy/default.nix
@@ -1,7 +1,6 @@
-{ stdenv, fetchFromGitHub, fetchpatch, cmake, xlibsWrapper, libX11, libXi, libXtst, libXrandr
-, xinput, curl, openssl, unzip }:
-
-with stdenv.lib;
+{ stdenv, lib, fetchFromGitHub, fetchpatch, fetchurl, cmake, xlibsWrapper
+, ApplicationServices, Carbon, Cocoa, CoreServices, ScreenSaver
+, libX11, libXi, libXtst, libXrandr, xinput, curl, openssl, unzip }:
 
 stdenv.mkDerivation rec {
   name = "synergy-${version}";
@@ -14,17 +13,33 @@ stdenv.mkDerivation rec {
     sha256 = "0ksgr9hkf09h54572p7k7b9zkfhcdb2g2d5x7ixxn028y8i3jyp3";
   };
 
-  patches = [ ./openssl-1.1.patch ];
+  patches = [./openssl-1.1.patch ./update_gtest_gmock.patch
+  ] ++ lib.optional stdenv.isDarwin ./respect_macos_arch.patch;
 
   patch_gcc6 = fetchpatch {
     url = https://raw.githubusercontent.com/gentoo/gentoo/20e2bff3697ebf5f291e9907b34aae3074a36b53/dev-cpp/gmock/files/gmock-1.7.0-gcc6.patch;
     sha256 = "0j3f381x1lf8qci9pfv6mliggl8qs2w05v5lw3rs3gn7aibg174d";
   };
 
+  # Due to the included gtest and gmock not supporting clang
+  # we replace it with 1.7.0 for synergy-1.8.8. This should
+  # become unnecessary when we update to a newer version of Synergy.
+  gmock_zip = fetchurl {
+    url = https://github.com/google/googlemock/archive/release-1.7.0.zip;
+    sha256 = "11bd04098rzamv7f9y01zaf9c8zrmzdk6g1qrlwq780pxzlr4ya0";
+  };
+
+  gtest_zip = fetchurl {
+    url = https://github.com/google/googletest/archive/release-1.7.0.zip;
+    sha256 = "1l5n6kzdypjzjrz2jh14ylzrx735lccfx2p3s4ccgci8g9abg35m";
+  };
+
   postPatch = ''
-    ${unzip}/bin/unzip -d ext/gmock-1.6.0 ext/gmock-1.6.0.zip
-    ${unzip}/bin/unzip -d ext/gtest-1.6.0 ext/gtest-1.6.0.zip
-    patch -d ext/gmock-1.6.0 -p1 -i ${patch_gcc6}
+    ${unzip}/bin/unzip -d ext/ ${gmock_zip}
+    ${unzip}/bin/unzip -d ext/ ${gtest_zip}
+    mv ext/googlemock-release-1.7.0 ext/gmock-1.7.0
+    mv ext/googletest-release-1.7.0 ext/gtest-1.7.0
+    patch -d ext/gmock-1.7.0 -p1 -i ${patch_gcc6}
   ''
     # We have XRRNotifyEvent (libXrandr), but with the upstream CMakeLists.txt
     # it's not able to find it (it's trying to search the store path of libX11
@@ -38,15 +53,19 @@ stdenv.mkDerivation rec {
     #   Looking for XRRNotifyEvent - not found
     #
     # So let's force it:
-  + optionalString stdenv.isLinux ''
+  + lib.optionalString stdenv.isLinux ''
     sed -i -e '/HAVE_X11_EXTENSIONS_XRANDR_H/c \
       set(HAVE_X11_EXTENSIONS_XRANDR_H true)
     ' CMakeLists.txt
   '';
 
+  cmakeFlags = lib.optionals stdenv.isDarwin [ "-DOSX_TARGET_MAJOR=10" "-DOSX_TARGET_MINOR=7" ];
+
   buildInputs = [
-    cmake xlibsWrapper libX11 libXi libXtst libXrandr xinput curl openssl
-  ];
+    cmake curl openssl
+  ] ++ lib.optionals stdenv.isDarwin [
+    ApplicationServices Carbon Cocoa CoreServices ScreenSaver
+  ] ++ lib.optionals stdenv.isLinux [ xlibsWrapper libX11 libXi libXtst libXrandr xinput ];
 
   installPhase = ''
     mkdir -p $out/bin
@@ -58,12 +77,11 @@ stdenv.mkDerivation rec {
   doCheck = true;
   checkPhase = "../bin/unittests";
 
-  meta = {
+  meta = with lib; {
     description = "Share one mouse and keyboard between multiple computers";
     homepage = http://synergy-project.org/;
     license = licenses.gpl2;
-    maintainers = [ maintainers.aszlig ];
+    maintainers = with maintainers; [ aszlig enzime ];
     platforms = platforms.all;
-    broken = stdenv.isDarwin;
   };
 }
diff --git a/pkgs/applications/misc/synergy/respect_macos_arch.patch b/pkgs/applications/misc/synergy/respect_macos_arch.patch
new file mode 100644
index 00000000000..003d7d22421
--- /dev/null
+++ b/pkgs/applications/misc/synergy/respect_macos_arch.patch
@@ -0,0 +1,61 @@
+From 944177c76d4c7ff5ef3460eab28286a45344a0e7 Mon Sep 17 00:00:00 2001
+From: Michael Hoang <enzime@users.noreply.github.com>
+Date: Sat, 14 Jul 2018 21:56:59 +1000
+Subject: [PATCH 2/2] Make sure CMake respects the current arch on macOS
+
+Only set the macOS architecture if not defined by the user. Use the
+OpenSSL libraries and headers from Nix on macOS to prevent architecture
+mismatches.
+---
+ CMakeLists.txt     |  2 +-
+ src/CMakeLists.txt | 14 +-------------
+ 2 files changed, 2 insertions(+), 14 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 2f37424d..c7217e28 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -172,7 +172,7 @@ if (UNIX)
+ 			# <= 10.5: 32-bit Intel and PowerPC
+ 			set(CMAKE_OSX_ARCHITECTURES "ppc;i386"
+ 				CACHE STRING "" FORCE)
+-		else()
++		elseif (NOT CMAKE_OSX_ARCHITECTURES)
+ 			# >= 10.6: Intel only
+ 			set(CMAKE_OSX_ARCHITECTURES "i386"
+ 				CACHE STRING "" FORCE)
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 237ba484..04428636 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -23,11 +23,6 @@ if (WIN32)
+ 	set(OPENSSL_INCLUDE ${CMAKE_SOURCE_DIR}/ext/${OPENSSL_PLAT_DIR}/inc32)
+ endif()
+ 
+-if (APPLE)
+-	set(OPENSSL_PLAT_DIR openssl-osx)
+-	set(OPENSSL_INCLUDE ${CMAKE_SOURCE_DIR}/ext/${OPENSSL_PLAT_DIR}/include)
+-endif()
+-
+ if (WIN32)
+ 	set(OPENSSL_LIBS
+ 		${CMAKE_SOURCE_DIR}/ext/${OPENSSL_PLAT_DIR}/out32dll/libeay32.lib
+@@ -36,14 +31,7 @@ if (WIN32)
+ endif()
+ 
+ if (UNIX)
+-	if (APPLE)
+-		set(OPENSSL_LIBS
+-		${CMAKE_SOURCE_DIR}/ext/${OPENSSL_PLAT_DIR}/libssl.a
+-		${CMAKE_SOURCE_DIR}/ext/${OPENSSL_PLAT_DIR}/libcrypto.a
+-		)
+-	else()
+-		set(OPENSSL_LIBS ssl crypto)
+-	endif()
++	set(OPENSSL_LIBS ssl crypto)
+ endif()
+ 
+ add_subdirectory(lib)
+-- 
+2.17.1
+
diff --git a/pkgs/applications/misc/synergy/update_gtest_gmock.patch b/pkgs/applications/misc/synergy/update_gtest_gmock.patch
new file mode 100644
index 00000000000..87b53e78585
--- /dev/null
+++ b/pkgs/applications/misc/synergy/update_gtest_gmock.patch
@@ -0,0 +1,158 @@
+From eea85dbf4bbde545d8cb07d7ee9fbdca3dcf48fd Mon Sep 17 00:00:00 2001
+From: Michael Hoang <enzime@users.noreply.github.com>
+Date: Sat, 14 Jul 2018 22:07:39 +1000
+Subject: [PATCH 1/2] Update gtest and gmock to version 1.7.0
+
+Fixes compilation under clang on macOS as <tr1/tuple> is now found under
+<tuple>.
+---
+ CMakeLists.txt                     |  2 +-
+ ext/toolchain/commands1.py         |  4 ++--
+ src/lib/platform/CMakeLists.txt    |  2 +-
+ src/lib/server/CMakeLists.txt      |  2 +-
+ src/lib/shared/CMakeLists.txt      |  2 +-
+ src/lib/synergy/CMakeLists.txt     |  2 +-
+ src/test/CMakeLists.txt            | 12 ++++++------
+ src/test/integtests/CMakeLists.txt |  4 ++--
+ src/test/unittests/CMakeLists.txt  |  4 ++--
+ 9 files changed, 17 insertions(+), 17 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 94c474e8..2f37424d 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -178,7 +178,7 @@ if (UNIX)
+ 				CACHE STRING "" FORCE)
+ 		endif()
+ 		
+-		set(CMAKE_CXX_FLAGS "--sysroot ${CMAKE_OSX_SYSROOT} ${CMAKE_CXX_FLAGS} -DGTEST_USE_OWN_TR1_TUPLE=1")
++		set(CMAKE_CXX_FLAGS "--sysroot ${CMAKE_OSX_SYSROOT} ${CMAKE_CXX_FLAGS}")
+ 
+ 		find_library(lib_ScreenSaver ScreenSaver)
+ 		find_library(lib_IOKit IOKit)
+diff --git a/ext/toolchain/commands1.py b/ext/toolchain/commands1.py
+index f32ec483..bf997cf6 100644
+--- a/ext/toolchain/commands1.py
++++ b/ext/toolchain/commands1.py
+@@ -251,10 +251,10 @@ class InternalCommands:
+ 	macIdentity = None
+ 	
+ 	# gtest dir with version number
+-	gtestDir = 'gtest-1.6.0'
++	gtestDir = 'gtest-1.7.0'
+ 	
+ 	# gmock dir with version number
+-	gmockDir = 'gmock-1.6.0'
++	gmockDir = 'gmock-1.7.0'
+ 
+ 	win32_generators = {
+ 		1 : VisualStudioGenerator('10'),
+diff --git a/src/lib/platform/CMakeLists.txt b/src/lib/platform/CMakeLists.txt
+index 481d8ef9..1ce67eca 100644
+--- a/src/lib/platform/CMakeLists.txt
++++ b/src/lib/platform/CMakeLists.txt
+@@ -31,7 +31,7 @@ endif()
+ 
+ include_directories(
+ 	../
+-	../../../ext/gtest-1.6.0/include
++	../../../ext/gtest-1.7.0/include
+ )
+ 
+ if (UNIX)
+diff --git a/src/lib/server/CMakeLists.txt b/src/lib/server/CMakeLists.txt
+index 3cb582ec..0525d627 100644
+--- a/src/lib/server/CMakeLists.txt
++++ b/src/lib/server/CMakeLists.txt
+@@ -24,7 +24,7 @@ endif()
+ include_directories(
+ 	../
+ 	../../../ext
+-	../../../ext/gtest-1.6.0/include
++	../../../ext/gtest-1.7.0/include
+ )
+ 
+ if (UNIX)
+diff --git a/src/lib/shared/CMakeLists.txt b/src/lib/shared/CMakeLists.txt
+index 891f4aa7..16c8b04a 100644
+--- a/src/lib/shared/CMakeLists.txt
++++ b/src/lib/shared/CMakeLists.txt
+@@ -25,7 +25,7 @@ add_library(shared STATIC ${sources})
+ include_directories(
+ 	../
+ 	../../../ext
+-	../../../ext/gtest-1.6.0/include
++	../../../ext/gtest-1.7.0/include
+ )
+ 
+ target_link_libraries(shared arch base)
+diff --git a/src/lib/synergy/CMakeLists.txt b/src/lib/synergy/CMakeLists.txt
+index 0972be8c..e19fcce5 100644
+--- a/src/lib/synergy/CMakeLists.txt
++++ b/src/lib/synergy/CMakeLists.txt
+@@ -36,7 +36,7 @@ endif()
+ include_directories(
+ 	../
+ 	../../../ext
+-	../../../ext/gtest-1.6.0/include
++	../../../ext/gtest-1.7.0/include
+ )
+ 
+ if (UNIX)
+diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt
+index 8812150a..04cdfc50 100644
+--- a/src/test/CMakeLists.txt
++++ b/src/test/CMakeLists.txt
+@@ -15,13 +15,13 @@
+ # along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ 
+ include_directories(
+-	../../ext/gtest-1.6.0
+-	../../ext/gtest-1.6.0/include
+-	../../ext/gmock-1.6.0
+-	../../ext/gmock-1.6.0/include)
++	../../ext/gtest-1.7.0
++	../../ext/gtest-1.7.0/include
++	../../ext/gmock-1.7.0
++	../../ext/gmock-1.7.0/include)
+ 	
+-add_library(gtest STATIC ../../ext/gtest-1.6.0/src/gtest-all.cc)
+-add_library(gmock STATIC ../../ext/gmock-1.6.0/src/gmock-all.cc)
++add_library(gtest STATIC ../../ext/gtest-1.7.0/src/gtest-all.cc)
++add_library(gmock STATIC ../../ext/gmock-1.7.0/src/gmock-all.cc)
+ 
+ if (UNIX)
+ 	# ignore warnings in gtest and gmock
+diff --git a/src/test/integtests/CMakeLists.txt b/src/test/integtests/CMakeLists.txt
+index 2f1ca7f3..6ddbd29a 100644
+--- a/src/test/integtests/CMakeLists.txt
++++ b/src/test/integtests/CMakeLists.txt
+@@ -56,8 +56,8 @@ endif()
+ include_directories(
+ 	../../
+ 	../../lib/
+-	../../../ext/gtest-1.6.0/include
+-	../../../ext/gmock-1.6.0/include
++	../../../ext/gtest-1.7.0/include
++	../../../ext/gmock-1.7.0/include
+ )
+ 
+ if (UNIX)
+diff --git a/src/test/unittests/CMakeLists.txt b/src/test/unittests/CMakeLists.txt
+index 3e49dc3c..5f6c4fac 100644
+--- a/src/test/unittests/CMakeLists.txt
++++ b/src/test/unittests/CMakeLists.txt
+@@ -51,8 +51,8 @@ list(APPEND headers ${platform_sources})
+ include_directories(
+ 	../../
+ 	../../lib/
+-	../../../ext/gtest-1.6.0/include
+-	../../../ext/gmock-1.6.0/include
++	../../../ext/gtest-1.7.0/include
++	../../../ext/gmock-1.7.0/include
+ 	../../../ext
+ )
+ 
+-- 
+2.17.1
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6e19059be2a..94cc7c9b650 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18416,8 +18416,9 @@ with pkgs;
 
   syncthing-tray = callPackage ../applications/misc/syncthing-tray { };
 
-  # linux only by now
-  synergy = callPackage ../applications/misc/synergy { };
+  synergy = callPackage ../applications/misc/synergy {
+    inherit (darwin.apple_sdk.frameworks) ApplicationServices Carbon Cocoa CoreServices ScreenSaver;
+  };
 
   tabbed = callPackage ../applications/window-managers/tabbed {
     # if you prefer a custom config, write the config.h in tabbed.config.h
-- 
GitLab


From 585d1175a3409687eecb4ad3a6e4e562a2e0b53c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <git@kchr.de>
Date: Mon, 16 Jul 2018 16:01:18 +0200
Subject: [PATCH 023/297] kde-frameworks: 5.47 -> 5.48

---
 .../extra-cmake-modules/nix-lib-path.patch    |  14 +-
 .../libraries/kde-frameworks/fetch.sh         |   2 +-
 .../libraries/kde-frameworks/srcs.nix         | 624 +++++++++---------
 3 files changed, 321 insertions(+), 319 deletions(-)

diff --git a/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/nix-lib-path.patch b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/nix-lib-path.patch
index a74340a6dc9..66f10f4abc1 100644
--- a/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/nix-lib-path.patch
+++ b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/nix-lib-path.patch
@@ -1,21 +1,23 @@
-Index: extra-cmake-modules-5.18.0/kde-modules/KDEInstallDirs.cmake
-===================================================================
---- extra-cmake-modules-5.18.0.orig/kde-modules/KDEInstallDirs.cmake
-+++ extra-cmake-modules-5.18.0/kde-modules/KDEInstallDirs.cmake
-@@ -200,32 +200,6 @@
+diff --git a/kde-modules/KDEInstallDirs.cmake b/kde-modules/KDEInstallDirs.cmake
+index 52b2eb2..a04596c 100644
+--- a/kde-modules/KDEInstallDirs.cmake
++++ b/kde-modules/KDEInstallDirs.cmake
+@@ -232,34 +232,6 @@
  # GNUInstallDirs code deals with re-configuring, but that is dealt with
  # by the _define_* macros in this module).
  set(_LIBDIR_DEFAULT "lib")
 -# Override this default 'lib' with 'lib64' iff:
 -#  - we are on a Linux, kFreeBSD or Hurd system but NOT cross-compiling
 -#  - we are NOT on debian
+-#  - we are NOT on flatpak
 -#  - we are on a 64 bits system
 -# reason is: amd64 ABI: http://www.x86-64.org/documentation/abi.pdf
 -# For Debian with multiarch, use 'lib/${CMAKE_LIBRARY_ARCHITECTURE}' if
 -# CMAKE_LIBRARY_ARCHITECTURE is set (which contains e.g. "i386-linux-gnu"
 -# See http://wiki.debian.org/Multiarch
 -if((CMAKE_SYSTEM_NAME MATCHES "Linux|kFreeBSD" OR CMAKE_SYSTEM_NAME STREQUAL "GNU")
--   AND NOT CMAKE_CROSSCOMPILING)
+-   AND NOT CMAKE_CROSSCOMPILING
+-   AND NOT DEFINED ENV{FLATPAK_ID})
 -  if (EXISTS "/etc/debian_version") # is this a debian system ?
 -    if(CMAKE_LIBRARY_ARCHITECTURE)
 -      set(_LIBDIR_DEFAULT "lib/${CMAKE_LIBRARY_ARCHITECTURE}")
diff --git a/pkgs/development/libraries/kde-frameworks/fetch.sh b/pkgs/development/libraries/kde-frameworks/fetch.sh
index 9b4f26a9063..1d389f914dd 100644
--- a/pkgs/development/libraries/kde-frameworks/fetch.sh
+++ b/pkgs/development/libraries/kde-frameworks/fetch.sh
@@ -1 +1 @@
-WGET_ARGS=( https://download.kde.org/stable/frameworks/5.47/ -A '*.tar.xz' )
+WGET_ARGS=( https://download.kde.org/stable/frameworks/5.48/ -A '*.tar.xz' )
diff --git a/pkgs/development/libraries/kde-frameworks/srcs.nix b/pkgs/development/libraries/kde-frameworks/srcs.nix
index d0db2284509..1ad2254ccf8 100644
--- a/pkgs/development/libraries/kde-frameworks/srcs.nix
+++ b/pkgs/development/libraries/kde-frameworks/srcs.nix
@@ -3,627 +3,627 @@
 
 {
   attica = {
-    version = "5.47.0";
+    version = "5.48.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.47/attica-5.47.0.tar.xz";
-      sha256 = "17i580hhi9rpd6d4nf408snlnf8xivwskkzbjja0snajx0nrd8bj";
-      name = "attica-5.47.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.48/attica-5.48.0.tar.xz";
+      sha256 = "1q2133gmhfi3wd9978556syzzqc1s6zgjc0p1353w6dmfwxfyzq8";
+      name = "attica-5.48.0.tar.xz";
     };
   };
   baloo = {
-    version = "5.47.0";
+    version = "5.48.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.47/baloo-5.47.0.tar.xz";
-      sha256 = "15jpbl47pr86h5ji2x3079b6x38fchc2pf03rjqlf5mgkabdpafq";
-      name = "baloo-5.47.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.48/baloo-5.48.0.tar.xz";
+      sha256 = "0rgz2gx99c1k8vgfskx7w6q1sjf98wcvybv88djdlj2s6h2qn8lj";
+      name = "baloo-5.48.0.tar.xz";
     };
   };
   bluez-qt = {
-    version = "5.47.0";
+    version = "5.48.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.47/bluez-qt-5.47.0.tar.xz";
-      sha256 = "1pqgvpgr9xmgv8cxgvqx08jnabgmgzh2skkhwc9d9rdc2i4g7b1k";
-      name = "bluez-qt-5.47.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.48/bluez-qt-5.48.0.tar.xz";
+      sha256 = "149px5gnplk0y7cl3cz258qks3rq5p0kkk9rc48y59zvlxiyy949";
+      name = "bluez-qt-5.48.0.tar.xz";
     };
   };
   breeze-icons = {
-    version = "5.47.0";
+    version = "5.48.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.47/breeze-icons-5.47.0.tar.xz";
-      sha256 = "0fyzk196r8r0mzvijs9ws8ldh5vrw4yrgnvd1szb57vyy1agnnd7";
-      name = "breeze-icons-5.47.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.48/breeze-icons-5.48.0.tar.xz";
+      sha256 = "1p0krrxfz6p0qhy79lnjyi0xsrprw1q4z65xah89kj0wmfriiyqh";
+      name = "breeze-icons-5.48.0.tar.xz";
     };
   };
   extra-cmake-modules = {
-    version = "5.47.0";
+    version = "5.48.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.47/extra-cmake-modules-5.47.0.tar.xz";
-      sha256 = "1591d27r6a2b7jn6zi2ik0i195pvl014dwxfpxv974hbbb8qnvcp";
-      name = "extra-cmake-modules-5.47.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.48/extra-cmake-modules-5.48.0.tar.xz";
+      sha256 = "1675xnc9hv8z8gp95ici2zqmbv7i6f65g0kln4fskxmlxnfplnzw";
+      name = "extra-cmake-modules-5.48.0.tar.xz";
     };
   };
   frameworkintegration = {
-    version = "5.47.0";
+    version = "5.48.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.47/frameworkintegration-5.47.0.tar.xz";
-      sha256 = "0iwdfa7q8ryszsl2w3bgix8bxkn3jj2lfdlcicfz9qh6av76p4yf";
-      name = "frameworkintegration-5.47.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.48/frameworkintegration-5.48.0.tar.xz";
+      sha256 = "1na913ndc55nlmfc61122b1p29h4prxnpc5pqvh6drsgfyacnm8y";
+      name = "frameworkintegration-5.48.0.tar.xz";
     };
   };
   kactivities = {
-    version = "5.47.0";
+    version = "5.48.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.47/kactivities-5.47.0.tar.xz";
-      sha256 = "01h5a4m0wkgz1gafhbqdidxdr2x6g5siwcx4csv9293pc5xf0qcd";
-      name = "kactivities-5.47.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.48/kactivities-5.48.0.tar.xz";
+      sha256 = "1zxdzwz8j43hh8d7v1qfihf95kwxvsbqki0zgdhlnj7s0xds0yz8";
+      name = "kactivities-5.48.0.tar.xz";
     };
   };
   kactivities-stats = {
-    version = "5.47.0";
+    version = "5.48.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.47/kactivities-stats-5.47.0.tar.xz";
-      sha256 = "0linsga4d7lincnpj747wnbgidp2x7xk3jzh31lpfq8izkmqz1q5";
-      name = "kactivities-stats-5.47.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.48/kactivities-stats-5.48.0.tar.xz";
+      sha256 = "11r61qnrjpc4ls18apb4a13j1lizjq48bxfw3f8p8hjxxxh8z0j6";
+      name = "kactivities-stats-5.48.0.tar.xz";
     };
   };
   kapidox = {
-    version = "5.47.0";
+    version = "5.48.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.47/kapidox-5.47.0.tar.xz";
-      sha256 = "1z2ka5fnwqsmjhxdbahk7gkjmhgzndg3lq6196dmpws1zjqf14vq";
-      name = "kapidox-5.47.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.48/kapidox-5.48.0.tar.xz";
+      sha256 = "1b22np0lygnm2r2q1anh0f4b7dh2h0lccx767g4r2w0fw5r1bbb4";
+      name = "kapidox-5.48.0.tar.xz";
     };
   };
   karchive = {
-    version = "5.47.0";
+    version = "5.48.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.47/karchive-5.47.0.tar.xz";
-      sha256 = "0r8xxfg1wsnpzyfggpzhxap853gqfsnmbci1al6xyd0pslgcsb5r";
-      name = "karchive-5.47.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.48/karchive-5.48.0.tar.xz";
+      sha256 = "10qbx8k1yqqfp1pq5yj8ln3gpj2wnfnlln99gczf99f51fqd65p6";
+      name = "karchive-5.48.0.tar.xz";
     };
   };
   kauth = {
-    version = "5.47.0";
+    version = "5.48.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.47/kauth-5.47.0.tar.xz";
-      sha256 = "1s80grzkxvbkw39z5xida50ijb0k3aqy80k5h0025m9rqpbc7ir9";
-      name = "kauth-5.47.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.48/kauth-5.48.0.tar.xz";
+      sha256 = "00mpbs24dm9ycabpcm2wwlv1vdq4dq5qr2zw6bbqpgj3jplakbs7";
+      name = "kauth-5.48.0.tar.xz";
     };
   };
   kbookmarks = {
-    version = "5.47.0";
+    version = "5.48.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.47/kbookmarks-5.47.0.tar.xz";
-      sha256 = "0b4b2yp3pvlisf0g1gwnisn2rc94wn874aad3dlg0607kd11xmwk";
-      name = "kbookmarks-5.47.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.48/kbookmarks-5.48.0.tar.xz";
+      sha256 = "11ics7gbdkx1f0pxryf2xwjq4fyqh6a3gzcizymm1m7gmygggqar";
+      name = "kbookmarks-5.48.0.tar.xz";
     };
   };
   kcmutils = {
-    version = "5.47.0";
+    version = "5.48.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.47/kcmutils-5.47.0.tar.xz";
-      sha256 = "0qpsjijd51cxmp3y8knr6k6bx8bg5hhngsh63nr8yskpms38kj5d";
-      name = "kcmutils-5.47.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.48/kcmutils-5.48.0.tar.xz";
+      sha256 = "0nvlzvv2gmc2hz11w6bixz4mccnj09g69byrnvsrwh0psf1kqlmw";
+      name = "kcmutils-5.48.0.tar.xz";
     };
   };
   kcodecs = {
-    version = "5.47.0";
+    version = "5.48.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.47/kcodecs-5.47.0.tar.xz";
-      sha256 = "1qhdj54cx98dqdy8bqkxm8jgq8mm2i7l3h9vyd2bvvzc8nzhd1hv";
-      name = "kcodecs-5.47.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.48/kcodecs-5.48.0.tar.xz";
+      sha256 = "1pz0s3krb4vv01hvpjdr5ngnw1ndxgsfln944fm9pfj0pmk7p92n";
+      name = "kcodecs-5.48.0.tar.xz";
     };
   };
   kcompletion = {
-    version = "5.47.0";
+    version = "5.48.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.47/kcompletion-5.47.0.tar.xz";
-      sha256 = "1wdw434bi90ldmdxw8wpkgszligqapy19klpnn528vh3gv5is00p";
-      name = "kcompletion-5.47.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.48/kcompletion-5.48.0.tar.xz";
+      sha256 = "129mmh46y0r6dcnbxf5yswsr48qj5l25n930nlx7wzaav28y55lp";
+      name = "kcompletion-5.48.0.tar.xz";
     };
   };
   kconfig = {
-    version = "5.47.0";
+    version = "5.48.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.47/kconfig-5.47.0.tar.xz";
-      sha256 = "0ifv7i6w7jz221rw07vb40sljx95kdjhxd7l9nfx95dbd5bjb0nq";
-      name = "kconfig-5.47.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.48/kconfig-5.48.0.tar.xz";
+      sha256 = "1g640cnd9j2jp35bb5zgjfxskbg3fj9p03r0yf3dkm1d1681x9a3";
+      name = "kconfig-5.48.0.tar.xz";
     };
   };
   kconfigwidgets = {
-    version = "5.47.0";
+    version = "5.48.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.47/kconfigwidgets-5.47.0.tar.xz";
-      sha256 = "05pxa7519f0730wrbh2bsqzfvc9dwvrh8l9vjh24rkaiaxnzhd6k";
-      name = "kconfigwidgets-5.47.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.48/kconfigwidgets-5.48.0.tar.xz";
+      sha256 = "0xlnbw34zbmy7fwsi9iks4iv7shki4fqs7wd3yblmyxa2l18ldh9";
+      name = "kconfigwidgets-5.48.0.tar.xz";
     };
   };
   kcoreaddons = {
-    version = "5.47.0";
+    version = "5.48.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.47/kcoreaddons-5.47.0.tar.xz";
-      sha256 = "0ihbggv5ziazhv66cnc6d4h4m2bci0cgwh498k49phaagrsh9zs0";
-      name = "kcoreaddons-5.47.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.48/kcoreaddons-5.48.0.tar.xz";
+      sha256 = "157k4l67iswny5krinfigfc6pabqfyfzya6hc5gcjrdplmnccy1f";
+      name = "kcoreaddons-5.48.0.tar.xz";
     };
   };
   kcrash = {
-    version = "5.47.0";
+    version = "5.48.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.47/kcrash-5.47.0.tar.xz";
-      sha256 = "15wn4g7c26f3cpk7q2imci7p8pmcksw47h6csihyvlpi3b6ykqg9";
-      name = "kcrash-5.47.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.48/kcrash-5.48.0.tar.xz";
+      sha256 = "0qqwdx7piz4wfm4lh41kknfcyw5saw17qh07ghhi7j80whpkazk8";
+      name = "kcrash-5.48.0.tar.xz";
     };
   };
   kdbusaddons = {
-    version = "5.47.0";
+    version = "5.48.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.47/kdbusaddons-5.47.0.tar.xz";
-      sha256 = "04270rnfmasb9cq7kj40wny7vgkb7hksjnhr4sgyg4v2p8v5dmib";
-      name = "kdbusaddons-5.47.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.48/kdbusaddons-5.48.0.tar.xz";
+      sha256 = "0vpd4cij52v43fsifbk3nnmi5csik8h4avima6jw0b09s8xdz8rr";
+      name = "kdbusaddons-5.48.0.tar.xz";
     };
   };
   kdeclarative = {
-    version = "5.47.0";
+    version = "5.48.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.47/kdeclarative-5.47.0.tar.xz";
-      sha256 = "183l926yyhdw270rcwqh2lf1rjd4a9vbkcjlqyss2k7d79mj6m9s";
-      name = "kdeclarative-5.47.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.48/kdeclarative-5.48.0.tar.xz";
+      sha256 = "09nfp6vrj6dc3kfknicr8629ifz976wi4wxdh5bfx15z9296l8pd";
+      name = "kdeclarative-5.48.0.tar.xz";
     };
   };
   kded = {
-    version = "5.47.0";
+    version = "5.48.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.47/kded-5.47.0.tar.xz";
-      sha256 = "0z5xsxalxasnyhhkvy247a08l37012fiaahwyy0477p7p5x3c845";
-      name = "kded-5.47.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.48/kded-5.48.0.tar.xz";
+      sha256 = "13527iv6cf44wgxpqfhmkhryihjfi02fi78lf2bnvgwmhd2nl954";
+      name = "kded-5.48.0.tar.xz";
     };
   };
   kdelibs4support = {
-    version = "5.47.0";
+    version = "5.48.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.47/portingAids/kdelibs4support-5.47.0.tar.xz";
-      sha256 = "1rij23ns9axlwi2fvbiz2wv3y3vh1p9cm3nxkkrj3axc0hs39n20";
-      name = "kdelibs4support-5.47.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.48/portingAids/kdelibs4support-5.48.0.tar.xz";
+      sha256 = "058s5h6sfhi1i3pa59hwpyxzd01jgpb8r68nnbphmryimi5nazqf";
+      name = "kdelibs4support-5.48.0.tar.xz";
     };
   };
   kdesignerplugin = {
-    version = "5.47.0";
+    version = "5.48.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.47/kdesignerplugin-5.47.0.tar.xz";
-      sha256 = "0ijdjjfqj2wpl0jrr2n90i74d378986lkqwdicig2rwkylsivr1g";
-      name = "kdesignerplugin-5.47.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.48/kdesignerplugin-5.48.0.tar.xz";
+      sha256 = "1kswvxgjpyi1p1kg4z5x5df8yqhrwhcpavzx4a83dg6hp5xk0l2l";
+      name = "kdesignerplugin-5.48.0.tar.xz";
     };
   };
   kdesu = {
-    version = "5.47.0";
+    version = "5.48.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.47/kdesu-5.47.0.tar.xz";
-      sha256 = "1rc2v13d4i0wwzmgrbwf6i6khcd4wfa79flq764cvx62flingfvr";
-      name = "kdesu-5.47.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.48/kdesu-5.48.0.tar.xz";
+      sha256 = "14ka3h06xbfv357z29zgbwnjcfwspi42f0fm3m7lszqhz9skj4v5";
+      name = "kdesu-5.48.0.tar.xz";
     };
   };
   kdewebkit = {
-    version = "5.47.0";
+    version = "5.48.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.47/kdewebkit-5.47.0.tar.xz";
-      sha256 = "1yg4lydz03y6cc1f44larfd4xnvnbnzpkfa97qxjzvvrk06hdxx3";
-      name = "kdewebkit-5.47.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.48/kdewebkit-5.48.0.tar.xz";
+      sha256 = "0wf2prv85sayz1mqq0ymrqw3p0f3ikakhgzy01pixrp7qgwqkkrv";
+      name = "kdewebkit-5.48.0.tar.xz";
     };
   };
   kdnssd = {
-    version = "5.47.0";
+    version = "5.48.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.47/kdnssd-5.47.0.tar.xz";
-      sha256 = "0xgv4fvhyr3gk99vaicq45zqf5mnbc4xpyz66jfhsk1w655bqijp";
-      name = "kdnssd-5.47.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.48/kdnssd-5.48.0.tar.xz";
+      sha256 = "01hra59b0sm82j7ry78f3clrypc80q59vx9h0ahacbab4pzq41p5";
+      name = "kdnssd-5.48.0.tar.xz";
     };
   };
   kdoctools = {
-    version = "5.47.0";
+    version = "5.48.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.47/kdoctools-5.47.0.tar.xz";
-      sha256 = "06zlk04ldi9cq3ricni74s3737gmvs73g2k9mgfkdjq5grcsw177";
-      name = "kdoctools-5.47.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.48/kdoctools-5.48.0.tar.xz";
+      sha256 = "0v8x198kfgz2p56nyy9cb6lks5yazdbdg55c4ps5bw36dbmpd3v8";
+      name = "kdoctools-5.48.0.tar.xz";
     };
   };
   kemoticons = {
-    version = "5.47.0";
+    version = "5.48.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.47/kemoticons-5.47.0.tar.xz";
-      sha256 = "1hg72mf629g67wll5b80rw9k85qia1jdfhabg64vy7n7i9fm912y";
-      name = "kemoticons-5.47.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.48/kemoticons-5.48.0.tar.xz";
+      sha256 = "166sjwrn9dm4km8sypdwcfsylcamhl1gfl28h8hrv498zhnyrfb9";
+      name = "kemoticons-5.48.0.tar.xz";
     };
   };
   kfilemetadata = {
-    version = "5.47.0";
+    version = "5.48.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.47/kfilemetadata-5.47.0.tar.xz";
-      sha256 = "0ywp45akvn0cky757azkf6p4ql2l02xy7fplbhv7j6qz39s0p2vm";
-      name = "kfilemetadata-5.47.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.48/kfilemetadata-5.48.0.tar.xz";
+      sha256 = "0krn53a2s950fb980gdap5hwf994kxfd4h8zk7a4s9cick957z5f";
+      name = "kfilemetadata-5.48.0.tar.xz";
     };
   };
   kglobalaccel = {
-    version = "5.47.0";
+    version = "5.48.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.47/kglobalaccel-5.47.0.tar.xz";
-      sha256 = "1lcac55kanddpn6nphmyixp33mk8zmhfih7p9vzhnxvrc5k9r6hb";
-      name = "kglobalaccel-5.47.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.48/kglobalaccel-5.48.0.tar.xz";
+      sha256 = "15dlpm69d38bsgl6hc7f1mjjq8qyxac010whx4rcsk4vsrwdfnm7";
+      name = "kglobalaccel-5.48.0.tar.xz";
     };
   };
   kguiaddons = {
-    version = "5.47.0";
+    version = "5.48.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.47/kguiaddons-5.47.0.tar.xz";
-      sha256 = "14pivzmpsmmqrhvmvlc10fc7mc6gdq214qy27r4dsxmjdvgljhhj";
-      name = "kguiaddons-5.47.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.48/kguiaddons-5.48.0.tar.xz";
+      sha256 = "0viqq9qg448fh12isc1kkmzcnnsjqw5fx4wlshyza19gfr4ym0dz";
+      name = "kguiaddons-5.48.0.tar.xz";
     };
   };
   kholidays = {
-    version = "5.47.0";
+    version = "5.48.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.47/kholidays-5.47.0.tar.xz";
-      sha256 = "001misp4bdd4q05ns4bch7gx1j8h2wpa2is7zdazqy0bp1blsfwb";
-      name = "kholidays-5.47.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.48/kholidays-5.48.0.tar.xz";
+      sha256 = "04vjp2jm2c6qgj50jbqkkgqh8b759pd4dpsczfkyq30p03vybxr4";
+      name = "kholidays-5.48.0.tar.xz";
     };
   };
   khtml = {
-    version = "5.47.0";
+    version = "5.48.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.47/portingAids/khtml-5.47.0.tar.xz";
-      sha256 = "1c9fja1mb2jrlrial2mz2bvw004s14kn7jnakawqg0d19fhlqg1h";
-      name = "khtml-5.47.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.48/portingAids/khtml-5.48.0.tar.xz";
+      sha256 = "1zrilnvvvvjq82hm6gbh5pvzfygy8w7a0140d3l74jjgy01394m1";
+      name = "khtml-5.48.0.tar.xz";
     };
   };
   ki18n = {
-    version = "5.47.0";
+    version = "5.48.1";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.47/ki18n-5.47.0.tar.xz";
-      sha256 = "1a190wf2ms09cwzpk1ylx7kjfz8yvzv2p14fjwyld6vf32hgl9r6";
-      name = "ki18n-5.47.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.48/ki18n-5.48.1.tar.xz";
+      sha256 = "0m9x6bagviqrnm0hx7ykggqiykxv3qi11bmi0xz2f02y78q89f3h";
+      name = "ki18n-5.48.1.tar.xz";
     };
   };
   kiconthemes = {
-    version = "5.47.0";
+    version = "5.48.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.47/kiconthemes-5.47.0.tar.xz";
-      sha256 = "14j8d1glrcd6a9xn86jxa7wx80bpf5wax5vkv09swcbbshp7vqdp";
-      name = "kiconthemes-5.47.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.48/kiconthemes-5.48.0.tar.xz";
+      sha256 = "1xqbg10qlk1zdha4kfyya1471r35gnz63iyj0ks3gzyfjvbivpy4";
+      name = "kiconthemes-5.48.0.tar.xz";
     };
   };
   kidletime = {
-    version = "5.47.0";
+    version = "5.48.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.47/kidletime-5.47.0.tar.xz";
-      sha256 = "0dirflwwnq83nxml66kk4bf70nl04dhrg8pvh9md3hip5cn6mq2f";
-      name = "kidletime-5.47.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.48/kidletime-5.48.0.tar.xz";
+      sha256 = "184b1qdh4bwsdg9lyl4d8rcs833fqcmfvbb5qmdd3mqvvg8xv9mm";
+      name = "kidletime-5.48.0.tar.xz";
     };
   };
   kimageformats = {
-    version = "5.47.0";
+    version = "5.48.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.47/kimageformats-5.47.0.tar.xz";
-      sha256 = "19j6wdfv9yncdgcm5ij0rz5rv0a3jlgdnwmyrw1gjyz5isv2qp4f";
-      name = "kimageformats-5.47.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.48/kimageformats-5.48.0.tar.xz";
+      sha256 = "1myxp583gw5d50ddkkv6ipbdzf6k3sdk9gambklay1dzmy4b91sc";
+      name = "kimageformats-5.48.0.tar.xz";
     };
   };
   kinit = {
-    version = "5.47.0";
+    version = "5.48.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.47/kinit-5.47.0.tar.xz";
-      sha256 = "1rc0ig4gw7lkvkpwcik6krn5w1zqj6y710c58i9kr9vxxpffj170";
-      name = "kinit-5.47.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.48/kinit-5.48.0.tar.xz";
+      sha256 = "08sf3j1bpxzqjim777d6znn8f7rzs5vpm4wz21s1ng3f32z2km9a";
+      name = "kinit-5.48.0.tar.xz";
     };
   };
   kio = {
-    version = "5.47.0";
+    version = "5.48.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.47/kio-5.47.0.tar.xz";
-      sha256 = "0847dxrhdywrx2v6knf6l70slm8dfz4n4j1c1si13jrj1fp2w4ji";
-      name = "kio-5.47.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.48/kio-5.48.0.tar.xz";
+      sha256 = "0am03nwbfidb5dxs8j8qaan4mcs7xv75sk135rslwfp5q56v1fa0";
+      name = "kio-5.48.0.tar.xz";
     };
   };
   kirigami2 = {
-    version = "5.47.0";
+    version = "5.48.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.47/kirigami2-5.47.0.tar.xz";
-      sha256 = "1mdahdb5z0i9bf63480b2j6xm7cgsh1anx0cljn2hivglpixjbgd";
-      name = "kirigami2-5.47.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.48/kirigami2-5.48.0.tar.xz";
+      sha256 = "0f01rnzzv2w7mmb0war8kph46c3wbdbz7s9i6rwh6g7kg6zvzn52";
+      name = "kirigami2-5.48.0.tar.xz";
     };
   };
   kitemmodels = {
-    version = "5.47.0";
+    version = "5.48.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.47/kitemmodels-5.47.0.tar.xz";
-      sha256 = "0151arf7s5ns2qadn86z385i9v9z8rga0jcj8pnw329k4pjpc2ks";
-      name = "kitemmodels-5.47.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.48/kitemmodels-5.48.0.tar.xz";
+      sha256 = "13b0fqy4yg4zahqq8376gnna36mfg94yb5d1fz0cgw7fk9d920gf";
+      name = "kitemmodels-5.48.0.tar.xz";
     };
   };
   kitemviews = {
-    version = "5.47.0";
+    version = "5.48.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.47/kitemviews-5.47.0.tar.xz";
-      sha256 = "0dnk7y50d5wxpl4fppb0hdzy5w6xa04a178y49zggpjm5x048mp5";
-      name = "kitemviews-5.47.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.48/kitemviews-5.48.0.tar.xz";
+      sha256 = "0cdyw0gy67yhhxv44j1bhhd4qnj7rwi0fjzf275532bf3js1j12w";
+      name = "kitemviews-5.48.0.tar.xz";
     };
   };
   kjobwidgets = {
-    version = "5.47.0";
+    version = "5.48.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.47/kjobwidgets-5.47.0.tar.xz";
-      sha256 = "05vgqm3nfpbwbnv46ajb8hc5wzs1444513ahay1qn8vpah4kqbpp";
-      name = "kjobwidgets-5.47.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.48/kjobwidgets-5.48.0.tar.xz";
+      sha256 = "0a5awpbka6mk4r4m5if7s9i5ybysykpcmlj69liabzcv0k1x5y6w";
+      name = "kjobwidgets-5.48.0.tar.xz";
     };
   };
   kjs = {
-    version = "5.47.0";
+    version = "5.48.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.47/portingAids/kjs-5.47.0.tar.xz";
-      sha256 = "1rhvmdwmsr48ih0qrpwphiwcl25af8shwj8nrkq619krc549gf8q";
-      name = "kjs-5.47.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.48/portingAids/kjs-5.48.0.tar.xz";
+      sha256 = "0ysbf6m63cw2iywwr7p5ngsh7s7ml9sc1sqkhnbh7racn0pzc1l4";
+      name = "kjs-5.48.0.tar.xz";
     };
   };
   kjsembed = {
-    version = "5.47.0";
+    version = "5.48.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.47/portingAids/kjsembed-5.47.0.tar.xz";
-      sha256 = "104nv33zpqh78zxqj1z9sj6cyliv0l9gzgmsc4n9nq9fcr1f2hdd";
-      name = "kjsembed-5.47.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.48/portingAids/kjsembed-5.48.0.tar.xz";
+      sha256 = "0j74g3xb23k55pixk76z2ib6yyc7f2iwvwqvvw1f907rn43g6qqx";
+      name = "kjsembed-5.48.0.tar.xz";
     };
   };
   kmediaplayer = {
-    version = "5.47.0";
+    version = "5.48.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.47/portingAids/kmediaplayer-5.47.0.tar.xz";
-      sha256 = "0cz0m2sa48893p6vq4pm92xmvq2aqqgfmijlskzdpd3gp3x9l1qw";
-      name = "kmediaplayer-5.47.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.48/portingAids/kmediaplayer-5.48.0.tar.xz";
+      sha256 = "1kw35c5dmwsrkinfgmylzgvw3zcg0yimlfcl52bhdg0x7sgdbjkq";
+      name = "kmediaplayer-5.48.0.tar.xz";
     };
   };
   knewstuff = {
-    version = "5.47.0";
+    version = "5.48.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.47/knewstuff-5.47.0.tar.xz";
-      sha256 = "04zn4iy0gy00d835qjfmb0prm802ggphj4aw328v29474nqs14nf";
-      name = "knewstuff-5.47.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.48/knewstuff-5.48.0.tar.xz";
+      sha256 = "0g2sxk6wqqgynmqgz6jxknlrsmpj4y94cn7vpw84isd9brsr5hfv";
+      name = "knewstuff-5.48.0.tar.xz";
     };
   };
   knotifications = {
-    version = "5.47.0";
+    version = "5.48.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.47/knotifications-5.47.0.tar.xz";
-      sha256 = "08cm2aks35lzspchyb6p25bfk4mrljb6wf7yi29674k4kg7gr6sv";
-      name = "knotifications-5.47.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.48/knotifications-5.48.0.tar.xz";
+      sha256 = "11p03jgkw8zvfsal6q3yxz5shkpxiknnryw2a120sjmsab87imzb";
+      name = "knotifications-5.48.0.tar.xz";
     };
   };
   knotifyconfig = {
-    version = "5.47.0";
+    version = "5.48.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.47/knotifyconfig-5.47.0.tar.xz";
-      sha256 = "0zava15sabmxc38ngmw9yylwnm27h8ah8df0jadxbqjpaaf0jssl";
-      name = "knotifyconfig-5.47.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.48/knotifyconfig-5.48.0.tar.xz";
+      sha256 = "1rlzmp1lzrniav2d5sjzh43mdm47i5dpa2rlsqppqq5887wjphcm";
+      name = "knotifyconfig-5.48.0.tar.xz";
     };
   };
   kpackage = {
-    version = "5.47.0";
+    version = "5.48.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.47/kpackage-5.47.0.tar.xz";
-      sha256 = "1pwlvcmn9crjgqf1ccwb86zq962jnwavx6h6dcx7vb982z772j98";
-      name = "kpackage-5.47.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.48/kpackage-5.48.0.tar.xz";
+      sha256 = "18q6gp1gmzjyid803j7mcm9dbqg4bcd059qlp6sb6rkllygv4pcr";
+      name = "kpackage-5.48.0.tar.xz";
     };
   };
   kparts = {
-    version = "5.47.0";
+    version = "5.48.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.47/kparts-5.47.0.tar.xz";
-      sha256 = "1b21kmn8bjq69qhldacqpby9pa56c4y8j84kkwailylk3nngilsf";
-      name = "kparts-5.47.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.48/kparts-5.48.0.tar.xz";
+      sha256 = "1p4xdrxfvq5xj17zf8gfxc0c9lryp8n9ahinardlb3rnb1wcw4hv";
+      name = "kparts-5.48.0.tar.xz";
     };
   };
   kpeople = {
-    version = "5.47.0";
+    version = "5.48.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.47/kpeople-5.47.0.tar.xz";
-      sha256 = "13x1f5jwxhmdq5qq43qzfmxm20j95dwa0fck1ns1rg8k7gazmdqb";
-      name = "kpeople-5.47.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.48/kpeople-5.48.0.tar.xz";
+      sha256 = "1gddld3phsqknm3x0k0wnhgqid5dqsqbw06v91vbl8746np04zf7";
+      name = "kpeople-5.48.0.tar.xz";
     };
   };
   kplotting = {
-    version = "5.47.0";
+    version = "5.48.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.47/kplotting-5.47.0.tar.xz";
-      sha256 = "0sw448g5wa2gz6krzp7d8q1ryh6qs51hgxv432fjpblijnwzb6xx";
-      name = "kplotting-5.47.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.48/kplotting-5.48.0.tar.xz";
+      sha256 = "17f78wppaj433x6fm108z5zw849qvnjsxisa92rxmkm9c64wzijg";
+      name = "kplotting-5.48.0.tar.xz";
     };
   };
   kpty = {
-    version = "5.47.0";
+    version = "5.48.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.47/kpty-5.47.0.tar.xz";
-      sha256 = "1q4hkm701ridf07a4m93zvifi1sk6vn8z1h0b1rz5srxasaxnxlh";
-      name = "kpty-5.47.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.48/kpty-5.48.0.tar.xz";
+      sha256 = "0ywkiw7gpqx7zrj6wrvfsn2sjkyxzsmqn8p91z0kz1s3id2s04fk";
+      name = "kpty-5.48.0.tar.xz";
     };
   };
   kross = {
-    version = "5.47.0";
+    version = "5.48.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.47/portingAids/kross-5.47.0.tar.xz";
-      sha256 = "13nav8fihj1pammiwz8na482qpsmcxmyxd47rqhwldvxz1z0kbq1";
-      name = "kross-5.47.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.48/portingAids/kross-5.48.0.tar.xz";
+      sha256 = "0zxhn8wai71ll1113k47xmcspbp16iz1rybm6m2qs6f4j5ghif8q";
+      name = "kross-5.48.0.tar.xz";
     };
   };
   krunner = {
-    version = "5.47.0";
+    version = "5.48.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.47/krunner-5.47.0.tar.xz";
-      sha256 = "0j3j6831y5j96cl19jdwcnd9h4rl95ymj3gy5sxilazgafzfihbd";
-      name = "krunner-5.47.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.48/krunner-5.48.0.tar.xz";
+      sha256 = "0mdwyvx656ba8pwvg4qw8jr268iffqrp9ipr28m71hkx0sh7k6hn";
+      name = "krunner-5.48.0.tar.xz";
     };
   };
   kservice = {
-    version = "5.47.0";
+    version = "5.48.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.47/kservice-5.47.0.tar.xz";
-      sha256 = "0ryipmvydh924zjpfzmwivwagaad9dicnfcfa4drrygbwnm60bd9";
-      name = "kservice-5.47.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.48/kservice-5.48.0.tar.xz";
+      sha256 = "1r5d3cdvmbyqn8hm2hjalgg1ncnpdh1w7fd5rr0k97j5qj29ypis";
+      name = "kservice-5.48.0.tar.xz";
     };
   };
   ktexteditor = {
-    version = "5.47.0";
+    version = "5.48.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.47/ktexteditor-5.47.0.tar.xz";
-      sha256 = "1k089k9ssk06734wnjyfmvlgxy2hqxh7fgy5qiyjvp807kmf4jkb";
-      name = "ktexteditor-5.47.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.48/ktexteditor-5.48.0.tar.xz";
+      sha256 = "1fnq6d3ky277rbg3ngq55gdswrgfxsn19c43s23xcbfaymmhapj7";
+      name = "ktexteditor-5.48.0.tar.xz";
     };
   };
   ktextwidgets = {
-    version = "5.47.0";
+    version = "5.48.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.47/ktextwidgets-5.47.0.tar.xz";
-      sha256 = "19w84d6v8yrci4fb6c7m91q2ykc9p24cf85cnm6lsb8ggis4dsyr";
-      name = "ktextwidgets-5.47.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.48/ktextwidgets-5.48.0.tar.xz";
+      sha256 = "0hf4rpnkc9qfpnpfm6bsrrjrvvkr6785pnakqyfbjcgbyavp58hg";
+      name = "ktextwidgets-5.48.0.tar.xz";
     };
   };
   kunitconversion = {
-    version = "5.47.0";
+    version = "5.48.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.47/kunitconversion-5.47.0.tar.xz";
-      sha256 = "0avm3g78zfzrh4h6ampf54n9j715ii5cra8praq0waiy94idn7cq";
-      name = "kunitconversion-5.47.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.48/kunitconversion-5.48.0.tar.xz";
+      sha256 = "0hipqjj82zkq8ysvg304m5jblxxrvjh8vfc3wgl93zvj0mwx06db";
+      name = "kunitconversion-5.48.0.tar.xz";
     };
   };
   kwallet = {
-    version = "5.47.0";
+    version = "5.48.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.47/kwallet-5.47.0.tar.xz";
-      sha256 = "0hy3kzkcqbzkjkvnaaanfdcnwcidnbw6j14ifvhlh2padql7kyix";
-      name = "kwallet-5.47.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.48/kwallet-5.48.0.tar.xz";
+      sha256 = "047jp26igla05isq6hg5bq9l3xd3dfa3v8dq3rz4im7dwa10hshr";
+      name = "kwallet-5.48.0.tar.xz";
     };
   };
   kwayland = {
-    version = "5.47.0";
+    version = "5.48.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.47/kwayland-5.47.0.tar.xz";
-      sha256 = "0j15xzlzxqi0g8lj5k9w0lbnvx26h6bblgz8rhqlkl80ml2wzgfv";
-      name = "kwayland-5.47.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.48/kwayland-5.48.0.tar.xz";
+      sha256 = "1qcb2kg1a23fvl6i0xky6mzmn3f6pqkvpv0dy245bd01x7q4csg4";
+      name = "kwayland-5.48.0.tar.xz";
     };
   };
   kwidgetsaddons = {
-    version = "5.47.0";
+    version = "5.48.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.47/kwidgetsaddons-5.47.0.tar.xz";
-      sha256 = "0d2sxh6g7igjdsgj9agknx8zvymyvq9rb0xkfbr044vg5q0g99js";
-      name = "kwidgetsaddons-5.47.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.48/kwidgetsaddons-5.48.0.tar.xz";
+      sha256 = "079f28ifadxhvk4miwlnhw3dvg7bmb6gjiqcg2w65bmp21rsywb7";
+      name = "kwidgetsaddons-5.48.0.tar.xz";
     };
   };
   kwindowsystem = {
-    version = "5.47.0";
+    version = "5.48.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.47/kwindowsystem-5.47.0.tar.xz";
-      sha256 = "1hfbjy17b6iw6443a3zw304syi4j0vid7nmm5hqdv8685lnp4wx6";
-      name = "kwindowsystem-5.47.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.48/kwindowsystem-5.48.0.tar.xz";
+      sha256 = "1b6cvx3yqkqmvji2y7ys421hmj98xhww1rlgphfdvrdaqzl4579n";
+      name = "kwindowsystem-5.48.0.tar.xz";
     };
   };
   kxmlgui = {
-    version = "5.47.0";
+    version = "5.48.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.47/kxmlgui-5.47.0.tar.xz";
-      sha256 = "194linh0px5mk404hbgrzcfx9zblk4q835nvj4lrbl62nffzwnlp";
-      name = "kxmlgui-5.47.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.48/kxmlgui-5.48.0.tar.xz";
+      sha256 = "0n38bxxip1c4fgj00jvph98qhb11ifx40z4m0pjafm52bg0kaa2h";
+      name = "kxmlgui-5.48.0.tar.xz";
     };
   };
   kxmlrpcclient = {
-    version = "5.47.0";
+    version = "5.48.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.47/kxmlrpcclient-5.47.0.tar.xz";
-      sha256 = "1wmsycpg5yljdpa0slv47baqpag6jzg75g0l2jddl3knznp7br8i";
-      name = "kxmlrpcclient-5.47.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.48/kxmlrpcclient-5.48.0.tar.xz";
+      sha256 = "0s0xrx2p0jngk83zb8zjn4vkwnj46wzbxzj904g71ca428nmfx40";
+      name = "kxmlrpcclient-5.48.0.tar.xz";
     };
   };
   modemmanager-qt = {
-    version = "5.47.0";
+    version = "5.48.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.47/modemmanager-qt-5.47.0.tar.xz";
-      sha256 = "00wxsc4wz5fflld4h1w77726w1c06g1ql5qld2r30yibx1fb2slb";
-      name = "modemmanager-qt-5.47.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.48/modemmanager-qt-5.48.0.tar.xz";
+      sha256 = "17pnzpv3g3g25vnh9jjjk3fk6i3lhk6icl56ifcsmpj09nlw41im";
+      name = "modemmanager-qt-5.48.0.tar.xz";
     };
   };
   networkmanager-qt = {
-    version = "5.47.0";
+    version = "5.48.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.47/networkmanager-qt-5.47.0.tar.xz";
-      sha256 = "02c2d1jm3azzbwd52awq6ikjsgfg9f2dc12dkw14zkz41r87gcyh";
-      name = "networkmanager-qt-5.47.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.48/networkmanager-qt-5.48.0.tar.xz";
+      sha256 = "15qikndykampl63bnp6rik1vkmwpivqf1krbsb0r29fmwyzhy38v";
+      name = "networkmanager-qt-5.48.0.tar.xz";
     };
   };
   oxygen-icons5 = {
-    version = "5.47.0";
+    version = "5.48.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.47/oxygen-icons5-5.47.0.tar.xz";
-      sha256 = "19w7ab5b7qdhj3j0pg8378k918kwjd1m5lm13jdg2kkn1f4j0j4m";
-      name = "oxygen-icons5-5.47.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.48/oxygen-icons5-5.48.0.tar.xz";
+      sha256 = "08y1gy2xgzby9wxbh90cfzly1aym9nym5r8m7z848a4v7chp0wpw";
+      name = "oxygen-icons5-5.48.0.tar.xz";
     };
   };
   plasma-framework = {
-    version = "5.47.0";
+    version = "5.48.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.47/plasma-framework-5.47.0.tar.xz";
-      sha256 = "1d3f2k5y966jnwrjps1x5lx9scpakq3ri3111m5h0vidkrlvnhsa";
-      name = "plasma-framework-5.47.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.48/plasma-framework-5.48.0.tar.xz";
+      sha256 = "1hl1q1v8kmq20bzm2bfrpjx1f1rljg2akib0sc65nw6vclrcgh82";
+      name = "plasma-framework-5.48.0.tar.xz";
     };
   };
   prison = {
-    version = "5.47.0";
+    version = "5.48.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.47/prison-5.47.0.tar.xz";
-      sha256 = "17j12mg11fnjnlj04fzxd5x95cs2f34xc2lk09hjlm7ihkw932xh";
-      name = "prison-5.47.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.48/prison-5.48.0.tar.xz";
+      sha256 = "04asjh9k6qhz6mzqvcw5famjh8fdfrjj5gwhar9lpzvl53k9236q";
+      name = "prison-5.48.0.tar.xz";
     };
   };
   purpose = {
-    version = "5.47.0";
+    version = "5.48.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.47/purpose-5.47.0.tar.xz";
-      sha256 = "1symzvzk50d3szz2rh7c9jd60hzpvlv6d8n7r6j9rzrplvshk879";
-      name = "purpose-5.47.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.48/purpose-5.48.0.tar.xz";
+      sha256 = "015dcsz2pybfl13dq0fhja7j05bvchjd6bcwmniq8cwc2dg2qxyp";
+      name = "purpose-5.48.0.tar.xz";
     };
   };
   qqc2-desktop-style = {
-    version = "5.47.0";
+    version = "5.48.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.47/qqc2-desktop-style-5.47.0.tar.xz";
-      sha256 = "1w897ixs0bfhzrzq8v4yg3rsrd8zmb08j5xh52ysb4mp7zs8jcyk";
-      name = "qqc2-desktop-style-5.47.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.48/qqc2-desktop-style-5.48.0.tar.xz";
+      sha256 = "1wc4vxjipdw3zq1lqwz3s7f0gzrcvs8svy9ip5r40qcz2w55s4an";
+      name = "qqc2-desktop-style-5.48.0.tar.xz";
     };
   };
   solid = {
-    version = "5.47.0";
+    version = "5.48.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.47/solid-5.47.0.tar.xz";
-      sha256 = "041fvxxlazbpdl5ncdpxzj8jq48rk31kd1nqsm8p5wqglzrz6dsl";
-      name = "solid-5.47.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.48/solid-5.48.0.tar.xz";
+      sha256 = "0fy070kbqs9hvi1ngmqzfz8a9vnry0mrin51z1yfdc44806bk2ns";
+      name = "solid-5.48.0.tar.xz";
     };
   };
   sonnet = {
-    version = "5.47.0";
+    version = "5.48.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.47/sonnet-5.47.0.tar.xz";
-      sha256 = "14nfrv1z1lpjhxsxhjx8bi88yp1qx4dzwf6v22w0mk71qc6z2rgr";
-      name = "sonnet-5.47.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.48/sonnet-5.48.0.tar.xz";
+      sha256 = "1mzl2a61jrqflnlkkrp079z428sf2bc811qwfx0rdh0jp7bc7sq4";
+      name = "sonnet-5.48.0.tar.xz";
     };
   };
   syntax-highlighting = {
-    version = "5.47.0";
+    version = "5.48.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.47/syntax-highlighting-5.47.0.tar.xz";
-      sha256 = "0bv25cv3xvhl9v23dn3yxhdcv5ag2i1zhvna6gnng6k30n316v0c";
-      name = "syntax-highlighting-5.47.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.48/syntax-highlighting-5.48.0.tar.xz";
+      sha256 = "03cfljg90iszpxmx6f0dv1w1r451yqzi9bk27x56s5xzsghj8bv5";
+      name = "syntax-highlighting-5.48.0.tar.xz";
     };
   };
   threadweaver = {
-    version = "5.47.0";
+    version = "5.48.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.47/threadweaver-5.47.0.tar.xz";
-      sha256 = "0h48b6mvgq3igbs6jzngj1iad7m5kgkird17shk86ma79k6igriz";
-      name = "threadweaver-5.47.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.48/threadweaver-5.48.0.tar.xz";
+      sha256 = "0pks8sddqdhlcrqgb106b6jy0gh3gfcss2rdavqfck6d9780v125";
+      name = "threadweaver-5.48.0.tar.xz";
     };
   };
 }
-- 
GitLab


From b5f262ba9176596a590ab9b204bd78764cbed98d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <git@kchr.de>
Date: Mon, 16 Jul 2018 16:02:47 +0200
Subject: [PATCH 024/297] kde-applications: 18.04.2 -> 18.04.3

---
 pkgs/applications/kde/fetch.sh |    2 +-
 pkgs/applications/kde/srcs.nix | 1696 ++++++++++++++++----------------
 2 files changed, 849 insertions(+), 849 deletions(-)

diff --git a/pkgs/applications/kde/fetch.sh b/pkgs/applications/kde/fetch.sh
index 5472b3523a6..181bf54ce8c 100644
--- a/pkgs/applications/kde/fetch.sh
+++ b/pkgs/applications/kde/fetch.sh
@@ -1 +1 @@
-WGET_ARGS=( https://download.kde.org/stable/applications/18.04.2/ -A '*.tar.xz' )
+WGET_ARGS=( https://download.kde.org/stable/applications/18.04.3/ -A '*.tar.xz' )
diff --git a/pkgs/applications/kde/srcs.nix b/pkgs/applications/kde/srcs.nix
index 8275a8a83b1..f50afbcc371 100644
--- a/pkgs/applications/kde/srcs.nix
+++ b/pkgs/applications/kde/srcs.nix
@@ -3,1699 +3,1699 @@
 
 {
   akonadi = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/akonadi-18.04.2.tar.xz";
-      sha256 = "1kwaq91kimvpv4hr0n8bavfpwnd3c80z7bi3wc0hw07r86plxg35";
-      name = "akonadi-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/akonadi-18.04.3.tar.xz";
+      sha256 = "0x232a4rm8vz0vqs1v08p77zmcdjhjn9aicb3pvn4mqlgzz2q8x5";
+      name = "akonadi-18.04.3.tar.xz";
     };
   };
   akonadi-calendar = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/akonadi-calendar-18.04.2.tar.xz";
-      sha256 = "0sbdkfd5n9apdw65nhl028k6s4qml25lqif6gg01z228ibwr63h2";
-      name = "akonadi-calendar-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/akonadi-calendar-18.04.3.tar.xz";
+      sha256 = "1jaigydsk1albvgqblrj0chxqzgpg3nmxihy7yf5wdmnkrkzpqlm";
+      name = "akonadi-calendar-18.04.3.tar.xz";
     };
   };
   akonadi-calendar-tools = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/akonadi-calendar-tools-18.04.2.tar.xz";
-      sha256 = "1xa33lc95brpc73y0464x9a4vx90np85r9k5pb8489mqhh1nmhf2";
-      name = "akonadi-calendar-tools-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/akonadi-calendar-tools-18.04.3.tar.xz";
+      sha256 = "06azzv80gisiiq1g8a1lm0hmadck38zsvylz8mwwir5s8nah9v09";
+      name = "akonadi-calendar-tools-18.04.3.tar.xz";
     };
   };
   akonadiconsole = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/akonadiconsole-18.04.2.tar.xz";
-      sha256 = "1njyncsn3icgjsw73a3hylaqfw049pxjqv7rnaw1qzwpk2sz8rfd";
-      name = "akonadiconsole-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/akonadiconsole-18.04.3.tar.xz";
+      sha256 = "12yl23hdyyj3k5b59nkmj1ykr79srx901x16jakwqzx4n07nc30x";
+      name = "akonadiconsole-18.04.3.tar.xz";
     };
   };
   akonadi-contacts = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/akonadi-contacts-18.04.2.tar.xz";
-      sha256 = "04v9ncy0vmx1zl345z8sx8asb0spnzzh7qrrqa59wypqki7ndhbr";
-      name = "akonadi-contacts-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/akonadi-contacts-18.04.3.tar.xz";
+      sha256 = "0g6vq1k95lvzljl54zafgcg3wmjayn49ihzpyyyxv1dxn7nfdngq";
+      name = "akonadi-contacts-18.04.3.tar.xz";
     };
   };
   akonadi-import-wizard = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/akonadi-import-wizard-18.04.2.tar.xz";
-      sha256 = "0yg3w34j3c0pcxsffpwz2f3fpsy1wg0jd8j9s0nvlq1cmmlglsh9";
-      name = "akonadi-import-wizard-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/akonadi-import-wizard-18.04.3.tar.xz";
+      sha256 = "0by9h35gag4ygxna661gg72hmnng235dhc2q1pl6x5mb5gkpnwmp";
+      name = "akonadi-import-wizard-18.04.3.tar.xz";
     };
   };
   akonadi-mime = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/akonadi-mime-18.04.2.tar.xz";
-      sha256 = "1rsymy2fljriwzwiacwxnmkgwm95hmhnbhg8rbrxblyinbnyrjhy";
-      name = "akonadi-mime-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/akonadi-mime-18.04.3.tar.xz";
+      sha256 = "1kk5nxh0dn1rmi1qasqf6kpa9ihg0lkajkj6r7widkh14ssz8sn0";
+      name = "akonadi-mime-18.04.3.tar.xz";
     };
   };
   akonadi-notes = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/akonadi-notes-18.04.2.tar.xz";
-      sha256 = "1pa109cq2nl9fbxc4d0p2dybby70six6nbfcfsxmi42yskc107sw";
-      name = "akonadi-notes-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/akonadi-notes-18.04.3.tar.xz";
+      sha256 = "0dir0mlch002l9wx6cgzkywh9nkjgvwm09gzpiz9h9d62q8a5wzc";
+      name = "akonadi-notes-18.04.3.tar.xz";
     };
   };
   akonadi-search = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/akonadi-search-18.04.2.tar.xz";
-      sha256 = "0kjcmg2yyfx3qs140rmwjajwc197l6b3c1d3d0ryh00incmd4j9k";
-      name = "akonadi-search-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/akonadi-search-18.04.3.tar.xz";
+      sha256 = "15a94g4zrq021zaabsi97lcb5lrm9nar9wjakga8xgy9jf48fq23";
+      name = "akonadi-search-18.04.3.tar.xz";
     };
   };
   akregator = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/akregator-18.04.2.tar.xz";
-      sha256 = "1fdgnrl9pbrrpfj73rsvz0xhp67lzr88px4dkkh8msczq7cv3wrc";
-      name = "akregator-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/akregator-18.04.3.tar.xz";
+      sha256 = "0xhsrx0yf4kggi4cjrg5g3if5n1m3injqfy9zyy891kzgfsybnaj";
+      name = "akregator-18.04.3.tar.xz";
     };
   };
   analitza = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/analitza-18.04.2.tar.xz";
-      sha256 = "1m9zg2axi9fnkpl3lqn9s9hmvjh2zcafc5mpgk3lfd2v1v410nd3";
-      name = "analitza-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/analitza-18.04.3.tar.xz";
+      sha256 = "1yva0j9c8wagzp68qi4hg7lniigz1b61jr6jayw98lnkdvsg7y5f";
+      name = "analitza-18.04.3.tar.xz";
     };
   };
   ark = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/ark-18.04.2.tar.xz";
-      sha256 = "08ld389whnp94p27m4bh9y65ja02502gc4n05h1cwjx8rkl1z2q8";
-      name = "ark-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/ark-18.04.3.tar.xz";
+      sha256 = "02dv1mv8sim2qb1xm7nni5z6nx4jsdihagmj2y5v48nlvf229k75";
+      name = "ark-18.04.3.tar.xz";
     };
   };
   artikulate = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/artikulate-18.04.2.tar.xz";
-      sha256 = "1k41jmczw55difdsqq8rwlmpshli8ckxq969yinysy59c8b29c4a";
-      name = "artikulate-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/artikulate-18.04.3.tar.xz";
+      sha256 = "1dvinnbcm6lgjsjjsv9gl1s99xgcgpld10v3nn32ak8h7v89in9m";
+      name = "artikulate-18.04.3.tar.xz";
     };
   };
   audiocd-kio = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/audiocd-kio-18.04.2.tar.xz";
-      sha256 = "0hvlg3vricnn3shrqzr71im7c3ixzidrqv5cm0c189mir3ys5965";
-      name = "audiocd-kio-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/audiocd-kio-18.04.3.tar.xz";
+      sha256 = "08kzy6nj14qwm3gd7m6idn3s34i7bx5galhbish0xqmg6wnfxpzl";
+      name = "audiocd-kio-18.04.3.tar.xz";
     };
   };
   baloo-widgets = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/baloo-widgets-18.04.2.tar.xz";
-      sha256 = "0hsrc1vf4mscf0yxhafbh775lidyrq3ihlcb018j1gnk190b3pxr";
-      name = "baloo-widgets-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/baloo-widgets-18.04.3.tar.xz";
+      sha256 = "01qx2wyiaa00ixyfy0mak8xz7cnpqrxnxn5hzhrf8v9zar1d04ap";
+      name = "baloo-widgets-18.04.3.tar.xz";
     };
   };
   blinken = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/blinken-18.04.2.tar.xz";
-      sha256 = "0fq3ai0ymxlz4jrn9h0nd3kgc0dnzih058jmdwnar42r85dhb9cy";
-      name = "blinken-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/blinken-18.04.3.tar.xz";
+      sha256 = "0rv9v678cqhnamz46996pwgw9d4nwa2kg92d2mpvyd790ax5fdrz";
+      name = "blinken-18.04.3.tar.xz";
     };
   };
   bomber = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/bomber-18.04.2.tar.xz";
-      sha256 = "194bqr0rk2v62ax1blxvjzyr8qs61h0z8vzcwzh92mws0dbd3zyz";
-      name = "bomber-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/bomber-18.04.3.tar.xz";
+      sha256 = "0a7l103ddgn648ijlwf1fgvvma7mg0vz7pqdy50k1vm3gkkvqh03";
+      name = "bomber-18.04.3.tar.xz";
     };
   };
   bovo = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/bovo-18.04.2.tar.xz";
-      sha256 = "0f5v8gcb0kj5bcrir2697v10pj0xzjyc1ynq3djbj2k9n76nd85p";
-      name = "bovo-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/bovo-18.04.3.tar.xz";
+      sha256 = "047f4k6h3z7yl4f5ggs3jlrcpgp5li4kgkssa2vcy93jsgb4a8wz";
+      name = "bovo-18.04.3.tar.xz";
     };
   };
   calendarsupport = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/calendarsupport-18.04.2.tar.xz";
-      sha256 = "1jp9bkabq267kznjn2dd9h6a33rynlcaak9i2s07jvm0r2wpp8ka";
-      name = "calendarsupport-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/calendarsupport-18.04.3.tar.xz";
+      sha256 = "14rasrmxsx4d3ap4ifihfd8nm9bydng753xi59xkx86fvxb3qg5r";
+      name = "calendarsupport-18.04.3.tar.xz";
     };
   };
   cantor = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/cantor-18.04.2.tar.xz";
-      sha256 = "039jphc9l6sh85j348hjld09ls2wd0dm784c52pzmpf32bjnmfda";
-      name = "cantor-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/cantor-18.04.3.tar.xz";
+      sha256 = "0ix8vcjrdw1bssmhhc5a0vp8ywfrznhqpfcxvs9d1p4bxl48bblc";
+      name = "cantor-18.04.3.tar.xz";
     };
   };
   cervisia = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/cervisia-18.04.2.tar.xz";
-      sha256 = "0p80prz7ql14pgfa9mj34i78qa1jm7dbyjdvqv3f7d5dfqnqd3m9";
-      name = "cervisia-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/cervisia-18.04.3.tar.xz";
+      sha256 = "0lbcdjjpr56vq14m8zk3fzna6mcz74dqzlkmc1zxn6gijjv89zqf";
+      name = "cervisia-18.04.3.tar.xz";
     };
   };
   dolphin = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/dolphin-18.04.2.tar.xz";
-      sha256 = "0gk8m05xfpp8fal7rhw51nx03y39sj1z2ngx5s7xhf26hv2cyzmj";
-      name = "dolphin-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/dolphin-18.04.3.tar.xz";
+      sha256 = "1im39knramhxdpw7bsnm2f533iz81fb47lac99vq9jc3c9zn7za1";
+      name = "dolphin-18.04.3.tar.xz";
     };
   };
   dolphin-plugins = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/dolphin-plugins-18.04.2.tar.xz";
-      sha256 = "11mqb0jcjm5lr9jqr8nlm1316mirl5sls45p1fa6gyyqbxps2iyv";
-      name = "dolphin-plugins-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/dolphin-plugins-18.04.3.tar.xz";
+      sha256 = "1fccbnr1b05sbqmfz6v09sq1v8dvbkw2jzyk8nqd9cmc2zbymwga";
+      name = "dolphin-plugins-18.04.3.tar.xz";
     };
   };
   dragon = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/dragon-18.04.2.tar.xz";
-      sha256 = "0zcg6k9bqcvld2hjf3aa4fh7xm7nikf9xk739wp9dln67lrbw2hm";
-      name = "dragon-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/dragon-18.04.3.tar.xz";
+      sha256 = "1dhzbyk87xd0bm89b1rs540rrixh16z9pm26003xl640imwbwy57";
+      name = "dragon-18.04.3.tar.xz";
     };
   };
   eventviews = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/eventviews-18.04.2.tar.xz";
-      sha256 = "1ffd7lxs48jypjj6q46p8lzw4ppc5xa2f16cxhnaflkdkdnmp8gl";
-      name = "eventviews-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/eventviews-18.04.3.tar.xz";
+      sha256 = "02v57ini7qi9y5ijljhxfsq2b5hqg9jdbgihdkq8vy2dlcg30mfd";
+      name = "eventviews-18.04.3.tar.xz";
     };
   };
   ffmpegthumbs = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/ffmpegthumbs-18.04.2.tar.xz";
-      sha256 = "01law0kav378y7id85717y456lwbn4p7ymjp23k5psh12yd6m3k7";
-      name = "ffmpegthumbs-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/ffmpegthumbs-18.04.3.tar.xz";
+      sha256 = "0wj403wahlirr2nv380z2s4fcgny446frv5xdxlqgg3b176ydcp6";
+      name = "ffmpegthumbs-18.04.3.tar.xz";
     };
   };
   filelight = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/filelight-18.04.2.tar.xz";
-      sha256 = "1i0wzfwl4gqvpzd13m1aa135laq5f5vkf5sji2ld8f4xa97ipgy2";
-      name = "filelight-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/filelight-18.04.3.tar.xz";
+      sha256 = "1m02si6pz6rb8arjd50s277xnj5f8alkl8r3p8f4cgmx2gs3rymn";
+      name = "filelight-18.04.3.tar.xz";
     };
   };
   granatier = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/granatier-18.04.2.tar.xz";
-      sha256 = "1kkh06slfs5g1gzlzlmw4fi8ma4nbkk3qnb4f46m8qzczymcj68y";
-      name = "granatier-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/granatier-18.04.3.tar.xz";
+      sha256 = "0i7f4pbj43vcav9ncxznddhvy0fph0z8xv3hb1wf5rncfxbc0kh0";
+      name = "granatier-18.04.3.tar.xz";
     };
   };
   grantlee-editor = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/grantlee-editor-18.04.2.tar.xz";
-      sha256 = "0niky7v12s00x954zvmlqg6833hmvabr36a7b7i85w7k5qs9r2gq";
-      name = "grantlee-editor-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/grantlee-editor-18.04.3.tar.xz";
+      sha256 = "0796ihix37igawic7bpva1ca3hzhcz89k7aqd3pwcz220ky6y0fy";
+      name = "grantlee-editor-18.04.3.tar.xz";
     };
   };
   grantleetheme = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/grantleetheme-18.04.2.tar.xz";
-      sha256 = "09d0yy3b7d3d64r46hwq21n5ik8ksn385i41biqr85cnl4is7pd7";
-      name = "grantleetheme-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/grantleetheme-18.04.3.tar.xz";
+      sha256 = "1n69wmxs9bsa37swxv8gl1ji6w696mxpg9g5z945il7ai6zwi8av";
+      name = "grantleetheme-18.04.3.tar.xz";
     };
   };
   gwenview = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/gwenview-18.04.2.tar.xz";
-      sha256 = "1kic82x3ixy0jrxf37aaxb2dncxvwagmw6c3hc1zyb8fi0n9hhw4";
-      name = "gwenview-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/gwenview-18.04.3.tar.xz";
+      sha256 = "187l75ppnsnl7bi9p6zyxg95qm3syhpmga6zl22ky0g9mqz6s3nx";
+      name = "gwenview-18.04.3.tar.xz";
     };
   };
   incidenceeditor = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/incidenceeditor-18.04.2.tar.xz";
-      sha256 = "00dd6qnhwf153d14jpv8idnfw55hyfwqfxj13wzaqpkv7pgip56a";
-      name = "incidenceeditor-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/incidenceeditor-18.04.3.tar.xz";
+      sha256 = "0zwrr6rgvardpxr5czh1jwrb2wvnxyfk3psgk6marr2sg5nm10km";
+      name = "incidenceeditor-18.04.3.tar.xz";
     };
   };
   juk = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/juk-18.04.2.tar.xz";
-      sha256 = "0p73xmymjkzi9pab9lia3bkz4xk0lcdnjgr9kkx4n0rrwj2dccpd";
-      name = "juk-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/juk-18.04.3.tar.xz";
+      sha256 = "1zbh03mckj32003padxzlghpc6dqry8z72aflv873if986wzw0dk";
+      name = "juk-18.04.3.tar.xz";
     };
   };
   k3b = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/k3b-18.04.2.tar.xz";
-      sha256 = "1yy6i9ca4y04vzb1ykdvvbmds5gb15a1hrsib3qj294mw8gfrhyn";
-      name = "k3b-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/k3b-18.04.3.tar.xz";
+      sha256 = "0wh0l7f9ngyq40p506pmnb3a8irb7wzz8pcncy6br3lcgg9yx0wx";
+      name = "k3b-18.04.3.tar.xz";
     };
   };
   kaccounts-integration = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/kaccounts-integration-18.04.2.tar.xz";
-      sha256 = "1ijsjaxdiqkd0jjj6wkaf4y1a064mx0xch1prqvjjfx5g2ja2k1b";
-      name = "kaccounts-integration-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/kaccounts-integration-18.04.3.tar.xz";
+      sha256 = "0883l8dzs21h8y2xw8vxnln3m4fwp01ifncmwb7vil9yllf6c6jw";
+      name = "kaccounts-integration-18.04.3.tar.xz";
     };
   };
   kaccounts-providers = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/kaccounts-providers-18.04.2.tar.xz";
-      sha256 = "1hpn7vpdpj7swm9xkdc1kr7qhbcljbswl87c1nrg39lfw44w0iyw";
-      name = "kaccounts-providers-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/kaccounts-providers-18.04.3.tar.xz";
+      sha256 = "0nvwdmmz3lajaj0p624mqi0mpnqv23npk2sbcxhc504gp25bki9i";
+      name = "kaccounts-providers-18.04.3.tar.xz";
     };
   };
   kaddressbook = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/kaddressbook-18.04.2.tar.xz";
-      sha256 = "0mg1g5x5hg3cdpxg5qf08l1d0ds3q5dm6xmkrripq5adgz77mqgr";
-      name = "kaddressbook-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/kaddressbook-18.04.3.tar.xz";
+      sha256 = "02rqcmbcvl4brzy33vljppad3k50hxsm7g0j96wjrlaj06p2rmfl";
+      name = "kaddressbook-18.04.3.tar.xz";
     };
   };
   kajongg = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/kajongg-18.04.2.tar.xz";
-      sha256 = "1zv5g7q8sjhjzb16f52k2129awz5v5m15vkj06rnn3yvhhm694kn";
-      name = "kajongg-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/kajongg-18.04.3.tar.xz";
+      sha256 = "1f16w02sqzsmjcfvqijgrvgpjmym7nf9hgc1rxldc1hwi772kcgq";
+      name = "kajongg-18.04.3.tar.xz";
     };
   };
   kalarm = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/kalarm-18.04.2.tar.xz";
-      sha256 = "18mh380kwg4pgphk0854san2v3iccra5fsydyjlh9g3mi4wkf6fj";
-      name = "kalarm-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/kalarm-18.04.3.tar.xz";
+      sha256 = "1dlf25p66kcw55vk0xmrcd900ar2wxn9416qqji711n6wnx3xqrf";
+      name = "kalarm-18.04.3.tar.xz";
     };
   };
   kalarmcal = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/kalarmcal-18.04.2.tar.xz";
-      sha256 = "0ks9k5yrf8nld5x31hlfhdhypy7hi7h62kyqp707kpijhbjb32r6";
-      name = "kalarmcal-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/kalarmcal-18.04.3.tar.xz";
+      sha256 = "1blzbccdk3zf5fgy4n5l59c5cagy1v7rjs53npjxgmdng7lxb8kl";
+      name = "kalarmcal-18.04.3.tar.xz";
     };
   };
   kalgebra = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/kalgebra-18.04.2.tar.xz";
-      sha256 = "1vn3qcw8af32njpvg4gpqxx5k0v9wzs67c43var0pa190b6bsjhw";
-      name = "kalgebra-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/kalgebra-18.04.3.tar.xz";
+      sha256 = "0x1a24k2p02s755kmpv0zanfv7ys50kkwyvc68g76b9z1yjb02dc";
+      name = "kalgebra-18.04.3.tar.xz";
     };
   };
   kalzium = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/kalzium-18.04.2.tar.xz";
-      sha256 = "12qivsw7pq85z09100bbzca24ag7wdl5ywjf8whi3m1w05xasl61";
-      name = "kalzium-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/kalzium-18.04.3.tar.xz";
+      sha256 = "1lqw77xcxjkc3a1g046i1rdb0bk29p0kcnqfyjkm03kp8819gbgg";
+      name = "kalzium-18.04.3.tar.xz";
     };
   };
   kamera = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/kamera-18.04.2.tar.xz";
-      sha256 = "02c7nf9f43lxzk88i4y5laj60m7b4062n7lz5jvdiwvlsd9hqkm8";
-      name = "kamera-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/kamera-18.04.3.tar.xz";
+      sha256 = "11b2b3fgi73f2vw97qdvh8kk92bcn7h513plcvpiv2vw1qh6bwm7";
+      name = "kamera-18.04.3.tar.xz";
     };
   };
   kamoso = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/kamoso-18.04.2.tar.xz";
-      sha256 = "1gwq6gairy4zm8vqdq3x9r3rx81ybq5rg7cncyrxhyiyk65w4fb6";
-      name = "kamoso-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/kamoso-18.04.3.tar.xz";
+      sha256 = "0vjhdkx874v9gzm7yla7pxwiphdrf8aj21641xslf5qn4kcx55p1";
+      name = "kamoso-18.04.3.tar.xz";
     };
   };
   kanagram = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/kanagram-18.04.2.tar.xz";
-      sha256 = "09l9inx079hbhil47k3w7gkx455z42nqy4jisvs7m8l7c7d7ns3x";
-      name = "kanagram-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/kanagram-18.04.3.tar.xz";
+      sha256 = "033mzwirfc7p7xphvyh9h135pq17rqnz5vw8d7rn893z1lwzm8xj";
+      name = "kanagram-18.04.3.tar.xz";
     };
   };
   kapman = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/kapman-18.04.2.tar.xz";
-      sha256 = "0bj6zd6jyjwj4lswn7xyq2gl09ki8iykrjjpy2m1ywm339x8q96v";
-      name = "kapman-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/kapman-18.04.3.tar.xz";
+      sha256 = "0w6xcp5lqzlcmgyvr76mgnbnvhabzhmjmlkab6zfgrrph0w4lnba";
+      name = "kapman-18.04.3.tar.xz";
     };
   };
   kapptemplate = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/kapptemplate-18.04.2.tar.xz";
-      sha256 = "1d5z2ghwlkkz7i7hfpsybrblcadini0m1lml2iyiyb75hl1fprmc";
-      name = "kapptemplate-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/kapptemplate-18.04.3.tar.xz";
+      sha256 = "0gsv6mam7jmix7wx7rq3xyqs1c0c15kcpbcj1ps6qzbf33w73crl";
+      name = "kapptemplate-18.04.3.tar.xz";
     };
   };
   kate = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/kate-18.04.2.tar.xz";
-      sha256 = "10684wzvzm7mrr69lrnpk3dnjkhqwrxv0mimq0927c1ln76sqy0n";
-      name = "kate-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/kate-18.04.3.tar.xz";
+      sha256 = "1w1bn0qbj8hxkh9cn6zx2h6hm82y07czzzvjm6gak90wi23lbb74";
+      name = "kate-18.04.3.tar.xz";
     };
   };
   katomic = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/katomic-18.04.2.tar.xz";
-      sha256 = "0v000v98xsy9x9ka5w1maprgj4pma97v3y07x39l2a96wkinh1k0";
-      name = "katomic-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/katomic-18.04.3.tar.xz";
+      sha256 = "0928xwbm7c3d0jc5zg5nkdkl7kfrsn441i40b7z2np4v13y7bf1i";
+      name = "katomic-18.04.3.tar.xz";
     };
   };
   kbackup = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/kbackup-18.04.2.tar.xz";
-      sha256 = "1py7b2mjf1lhpg3hpwy8agjh7wcql67myv3jx2j6r660ni8rbf66";
-      name = "kbackup-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/kbackup-18.04.3.tar.xz";
+      sha256 = "0m4dxrlm5807azm7bvy06r0nj1pfbfy31gkl37m7pg4z9svx5hp9";
+      name = "kbackup-18.04.3.tar.xz";
     };
   };
   kblackbox = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/kblackbox-18.04.2.tar.xz";
-      sha256 = "1xllh7sds3pm8hjs1l88i8w7xzizl3kv9bdvznih0f61mwrwhwph";
-      name = "kblackbox-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/kblackbox-18.04.3.tar.xz";
+      sha256 = "08sm7h7d16l79isqi2hwr54dsnv3lbikj1zcyq0bwngkyqr49cmh";
+      name = "kblackbox-18.04.3.tar.xz";
     };
   };
   kblocks = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/kblocks-18.04.2.tar.xz";
-      sha256 = "0gnj8lflm7jmqz8i5ymy5gmb11d0v1483bpllvmhsjylk7v7qzal";
-      name = "kblocks-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/kblocks-18.04.3.tar.xz";
+      sha256 = "1bf4d8s9xm28qn4qv2i18gwh25fi0f06h03blk7bjw9hvr7wfaja";
+      name = "kblocks-18.04.3.tar.xz";
     };
   };
   kblog = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/kblog-18.04.2.tar.xz";
-      sha256 = "17yh6599k50nayw2b0lx80hkkz7c46xwn389g674c0zyj768pbxl";
-      name = "kblog-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/kblog-18.04.3.tar.xz";
+      sha256 = "1fh96i9y45abp4cp2bjhkldxax9qjgsxb14ahqivp2qam41rpnnz";
+      name = "kblog-18.04.3.tar.xz";
     };
   };
   kbounce = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/kbounce-18.04.2.tar.xz";
-      sha256 = "10bipg1ny6997xyqh8d7346xf1j7g4p9bzzmappzs6mx1bsm7hgl";
-      name = "kbounce-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/kbounce-18.04.3.tar.xz";
+      sha256 = "025nfdnv8ssmln0q6lwkd8ppflv2cimd1x8yf6kqh5jd5ynx73vh";
+      name = "kbounce-18.04.3.tar.xz";
     };
   };
   kbreakout = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/kbreakout-18.04.2.tar.xz";
-      sha256 = "0y40d36ms3xzch4c2f30gfawr12zzmjgdfh603yy52x81z866svf";
-      name = "kbreakout-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/kbreakout-18.04.3.tar.xz";
+      sha256 = "11pbd76h5cll7kcb7dcnhckmknj5gm0igq0w1dx2pxdpna1i4p6z";
+      name = "kbreakout-18.04.3.tar.xz";
     };
   };
   kbruch = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/kbruch-18.04.2.tar.xz";
-      sha256 = "1xr6rwdsnxq6as8f1yc48l2997795xgc2py80df84v1gpk0hhm2n";
-      name = "kbruch-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/kbruch-18.04.3.tar.xz";
+      sha256 = "0d888539cmhxrcyy90iqw83aa8x1w2v5r351xncqw34gfq1k1nj3";
+      name = "kbruch-18.04.3.tar.xz";
     };
   };
   kcachegrind = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/kcachegrind-18.04.2.tar.xz";
-      sha256 = "1bkqb39a0q0di17j0qxg907fm47002vj24j19pmg94qm6nl4b2i4";
-      name = "kcachegrind-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/kcachegrind-18.04.3.tar.xz";
+      sha256 = "1zdcarqgb1yxql6z3hmnmam2abg44r3z7sy33y9yqa9wimzq4w13";
+      name = "kcachegrind-18.04.3.tar.xz";
     };
   };
   kcalc = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/kcalc-18.04.2.tar.xz";
-      sha256 = "19ryii9jvyssa6676an2m09mgdz18340p6jv067qscg0sw5ka3fv";
-      name = "kcalc-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/kcalc-18.04.3.tar.xz";
+      sha256 = "02kadbv874azlqm1i52y680iyp29jg683cjnjw3bgh1p6la7ssrx";
+      name = "kcalc-18.04.3.tar.xz";
     };
   };
   kcalcore = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/kcalcore-18.04.2.tar.xz";
-      sha256 = "0ailxkviabv5qg02wl2phfx06znbs5dxncb6nzl87qrzck4myj31";
-      name = "kcalcore-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/kcalcore-18.04.3.tar.xz";
+      sha256 = "1l2g8m35dahmpwnrhmq1dr7iqcdw9pg51v4q5a39ashcsvv1bpzj";
+      name = "kcalcore-18.04.3.tar.xz";
     };
   };
   kcalutils = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/kcalutils-18.04.2.tar.xz";
-      sha256 = "1z3bzx78n4p88p0a3w1m2a984pcqmi8aph28d3h2isiinlfwgak2";
-      name = "kcalutils-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/kcalutils-18.04.3.tar.xz";
+      sha256 = "1mycr1nhy2b2nk2izka8ck3sfyblfjqqjqn40g3lhssn4ps2z2jb";
+      name = "kcalutils-18.04.3.tar.xz";
     };
   };
   kcharselect = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/kcharselect-18.04.2.tar.xz";
-      sha256 = "0n71jy1a6hsabzzhvrg46067drb97aa095159bxma1x9xjgbdq14";
-      name = "kcharselect-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/kcharselect-18.04.3.tar.xz";
+      sha256 = "1yqrsiq68kzx4incb5imra7s49byln85bq047w6r7fmp2ypyxklm";
+      name = "kcharselect-18.04.3.tar.xz";
     };
   };
   kcolorchooser = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/kcolorchooser-18.04.2.tar.xz";
-      sha256 = "0m0izh28h2n0dja5rwdqg88g0v9v9nz8gmv73zhz72mi4p7vq2h2";
-      name = "kcolorchooser-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/kcolorchooser-18.04.3.tar.xz";
+      sha256 = "1ilgsgy5zdfmx8bgdsf9s9wxpl3pmgjb6jh96sy1gca0d4kbkrnv";
+      name = "kcolorchooser-18.04.3.tar.xz";
     };
   };
   kcontacts = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/kcontacts-18.04.2.tar.xz";
-      sha256 = "03mzacymwxj50873vs0rla2bxm29kfc9d7sv692nzmccv00r21mj";
-      name = "kcontacts-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/kcontacts-18.04.3.tar.xz";
+      sha256 = "0rwh1p98hx3ybf4gxxp1dkgkrhmzli23fi9hk8m9k2mgr97yiqni";
+      name = "kcontacts-18.04.3.tar.xz";
     };
   };
   kcron = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/kcron-18.04.2.tar.xz";
-      sha256 = "1nwpsq4qhrlggdcn9snfl124g355h3c69360ngziwj66dnnwwcm7";
-      name = "kcron-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/kcron-18.04.3.tar.xz";
+      sha256 = "0m0pna8hqkk2ab78yxchyc3pjzgrb37ldkhwa5r2zwg2n9y4k0xq";
+      name = "kcron-18.04.3.tar.xz";
     };
   };
   kdav = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/kdav-18.04.2.tar.xz";
-      sha256 = "0m3lf2mjmcblnlqsp9jrv508c8nkhvbrbpcp0hw9sdw8qaplb6x3";
-      name = "kdav-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/kdav-18.04.3.tar.xz";
+      sha256 = "0m987fbbnm6xwagsmsn4x6v5zm4b7d0jzab5gi5vw97qkx9rs82h";
+      name = "kdav-18.04.3.tar.xz";
     };
   };
   kdebugsettings = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/kdebugsettings-18.04.2.tar.xz";
-      sha256 = "0k60nld8r7g5wxj8l14m5pdkzwjhyqgznd4kjfx3vn63xx002ysp";
-      name = "kdebugsettings-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/kdebugsettings-18.04.3.tar.xz";
+      sha256 = "0c7fgfp31kj5mar2pmjnfhxb16f33xhp22iwk1vkagy07bl145r9";
+      name = "kdebugsettings-18.04.3.tar.xz";
     };
   };
   kde-dev-scripts = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/kde-dev-scripts-18.04.2.tar.xz";
-      sha256 = "08a9d9ib8wcqgi4kyfh8adzrnf804vjlcdha97wkypz4qk6bilw2";
-      name = "kde-dev-scripts-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/kde-dev-scripts-18.04.3.tar.xz";
+      sha256 = "0azf5xcnwzyqc5bwxwjnakf7vln74faxq40myhj12hhhg5vckz06";
+      name = "kde-dev-scripts-18.04.3.tar.xz";
     };
   };
   kde-dev-utils = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/kde-dev-utils-18.04.2.tar.xz";
-      sha256 = "0cwfh0innaskb3wipij3pzcx4a6dvgjq1slvz2kvcp7cqx9bmhhs";
-      name = "kde-dev-utils-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/kde-dev-utils-18.04.3.tar.xz";
+      sha256 = "172479qp82vrlnlqnbbl01xkap6v0gva78qcbzmizww0b085q4vk";
+      name = "kde-dev-utils-18.04.3.tar.xz";
     };
   };
   kdeedu-data = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/kdeedu-data-18.04.2.tar.xz";
-      sha256 = "03qklcwvjqdgmh8gdz9l98dqmn2yvvs48ha5qlj141jw0cla8lss";
-      name = "kdeedu-data-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/kdeedu-data-18.04.3.tar.xz";
+      sha256 = "0qg79cv5lkpswhywcgixbmyqfbviwb3yj3nc1iwsrwn4gqff082g";
+      name = "kdeedu-data-18.04.3.tar.xz";
     };
   };
   kdegraphics-mobipocket = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/kdegraphics-mobipocket-18.04.2.tar.xz";
-      sha256 = "1pmqxwlaxxabv8vl6rq7zch1zlizcijvamxfdil49h603jrpspqm";
-      name = "kdegraphics-mobipocket-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/kdegraphics-mobipocket-18.04.3.tar.xz";
+      sha256 = "06c8vn5ga7xkxzsashri86ic14dcpa15c79kb57p4qm168afm8vi";
+      name = "kdegraphics-mobipocket-18.04.3.tar.xz";
     };
   };
   kdegraphics-thumbnailers = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/kdegraphics-thumbnailers-18.04.2.tar.xz";
-      sha256 = "1n5a43d80qdm7gp8k58h3kkp5kbbwg532arj66gfglcimvyw7ybl";
-      name = "kdegraphics-thumbnailers-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/kdegraphics-thumbnailers-18.04.3.tar.xz";
+      sha256 = "1p8dfmh7hi3sxlqpahkcpl06x0flf94jam85l3n8r8f00kb9rq5a";
+      name = "kdegraphics-thumbnailers-18.04.3.tar.xz";
     };
   };
   kdenetwork-filesharing = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/kdenetwork-filesharing-18.04.2.tar.xz";
-      sha256 = "08rg7lw07xi9iskqi09nkw00kgim437a9wm7svcm1nhwnln45bas";
-      name = "kdenetwork-filesharing-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/kdenetwork-filesharing-18.04.3.tar.xz";
+      sha256 = "1wg2c4a4p3h3i6pqisrjhicllzm3vxd3qp1sxvny54algywqyz66";
+      name = "kdenetwork-filesharing-18.04.3.tar.xz";
     };
   };
   kdenlive = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/kdenlive-18.04.2.tar.xz";
-      sha256 = "08dy8fww0aq1g69pznwach2yykj7izyp2z8axx724drmqh4jifri";
-      name = "kdenlive-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/kdenlive-18.04.3.tar.xz";
+      sha256 = "0ps33l6wq594p7x82c03hd959bmifhfwq34ghqmr6629bwpaq1cm";
+      name = "kdenlive-18.04.3.tar.xz";
     };
   };
   kdepim-addons = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/kdepim-addons-18.04.2.tar.xz";
-      sha256 = "0g3rbq8129pa1qq2vrxlh049nfqrl7k3zqnqbhavb9kggvgfx151";
-      name = "kdepim-addons-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/kdepim-addons-18.04.3.tar.xz";
+      sha256 = "04cjwql3mc1arm55v8h8r3fwrq42sa5cpfqqwwyhlpcbbh917hvv";
+      name = "kdepim-addons-18.04.3.tar.xz";
     };
   };
   kdepim-apps-libs = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/kdepim-apps-libs-18.04.2.tar.xz";
-      sha256 = "000qgbr3lvpcx4p42r0f7bl8wlhf3sc320svf2mx4vpgbi28fm7y";
-      name = "kdepim-apps-libs-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/kdepim-apps-libs-18.04.3.tar.xz";
+      sha256 = "1lizw9x5z9byg88s3dpj6hbx89sn8sjaywa3l79h03v5hc5wxi7l";
+      name = "kdepim-apps-libs-18.04.3.tar.xz";
     };
   };
   kdepim-runtime = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/kdepim-runtime-18.04.2.tar.xz";
-      sha256 = "18sxzdm2drn16zk0wmsa1sxabag04x50sn72x4arjr32b9pgr8fp";
-      name = "kdepim-runtime-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/kdepim-runtime-18.04.3.tar.xz";
+      sha256 = "16xi4i7f9hh9wgbqi4dp6vha278mhkgmxr884d0p9bpa7rcriwb5";
+      name = "kdepim-runtime-18.04.3.tar.xz";
     };
   };
   kdesdk-kioslaves = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/kdesdk-kioslaves-18.04.2.tar.xz";
-      sha256 = "1csvzwq4hd9r36w5kms7w4zadwd8g10p1mhaq5p9afdg531x5zza";
-      name = "kdesdk-kioslaves-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/kdesdk-kioslaves-18.04.3.tar.xz";
+      sha256 = "0f3xjklc4h3ly6lcvaywh3gi8mlyffbhknpqn1b4g0arvvnymlsl";
+      name = "kdesdk-kioslaves-18.04.3.tar.xz";
     };
   };
   kdesdk-thumbnailers = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/kdesdk-thumbnailers-18.04.2.tar.xz";
-      sha256 = "0k797w3qm4phvfmaqvhqds79sx340frli9jklsjjkmb1zv3yzz3f";
-      name = "kdesdk-thumbnailers-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/kdesdk-thumbnailers-18.04.3.tar.xz";
+      sha256 = "1rq1g0wwnmp1hzid4g8b36liyl7nd8qp85cmikli6x1ph5g93zi6";
+      name = "kdesdk-thumbnailers-18.04.3.tar.xz";
     };
   };
   kdf = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/kdf-18.04.2.tar.xz";
-      sha256 = "1dwvn5rb3jpz4vl2msxm88a1lcb7sb72v0s2161hxrk8xhnxngr3";
-      name = "kdf-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/kdf-18.04.3.tar.xz";
+      sha256 = "0nqw3ahhigsyp15r7blm3nijn6dil1awqi7y11sszl1kr3wln1nz";
+      name = "kdf-18.04.3.tar.xz";
     };
   };
   kdialog = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/kdialog-18.04.2.tar.xz";
-      sha256 = "0bfvndacp7hbmgkq33kxl64c5kgi4a7m5i4bb5r5bw7d5mdqzrkn";
-      name = "kdialog-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/kdialog-18.04.3.tar.xz";
+      sha256 = "178xp72yd5wm5aanvkv2mxqzcganxw2z9q0aribs2x54z3ccj27c";
+      name = "kdialog-18.04.3.tar.xz";
     };
   };
   kdiamond = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/kdiamond-18.04.2.tar.xz";
-      sha256 = "0hqkbjdc0ndflwiqg2m1f4zzvz3cgwmxkxc8zxyavl50br471aji";
-      name = "kdiamond-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/kdiamond-18.04.3.tar.xz";
+      sha256 = "1ikha8fpxmcbm3kncv0jb6hzm0413w3v0yrk0y7866xdaanb5491";
+      name = "kdiamond-18.04.3.tar.xz";
     };
   };
   keditbookmarks = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/keditbookmarks-18.04.2.tar.xz";
-      sha256 = "1dfc97vvknywb833ndxilynhxhna6qsfq9rd2fapz5jwk0y7cdnj";
-      name = "keditbookmarks-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/keditbookmarks-18.04.3.tar.xz";
+      sha256 = "1y0y668ablpp596x77rxblw89pfx2ak533yhdj8khlj1mhzkagiq";
+      name = "keditbookmarks-18.04.3.tar.xz";
     };
   };
   kfind = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/kfind-18.04.2.tar.xz";
-      sha256 = "0j5awrlyf6f9z9xybssq0s4yvygxni90zsmqi35rm4vjd38rixjd";
-      name = "kfind-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/kfind-18.04.3.tar.xz";
+      sha256 = "1f0civprab0y5f76kn1zs1g9iz0xhs4p633x2jh0s2nhb79m5p4a";
+      name = "kfind-18.04.3.tar.xz";
     };
   };
   kfloppy = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/kfloppy-18.04.2.tar.xz";
-      sha256 = "08pd9qq9syw7mf5d21y1306k0l540zk5dqjn380mng7rmiddnchb";
-      name = "kfloppy-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/kfloppy-18.04.3.tar.xz";
+      sha256 = "0q6z0ppxmllzcwz6fsjfz8qq1a12ya62j526pnfy22fvqw4qwyjw";
+      name = "kfloppy-18.04.3.tar.xz";
     };
   };
   kfourinline = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/kfourinline-18.04.2.tar.xz";
-      sha256 = "02dsip9cjbygjc7palb1dr9w4g32c4n5krhwf3p0mnmwyhnqbqv3";
-      name = "kfourinline-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/kfourinline-18.04.3.tar.xz";
+      sha256 = "1img467nzvpzqr0piji76ykvz2r0ji05gp3cfpxp7vjn8mbzwc00";
+      name = "kfourinline-18.04.3.tar.xz";
     };
   };
   kgeography = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/kgeography-18.04.2.tar.xz";
-      sha256 = "0sm6sw1ibmsf8n704a114244dbj0387bzjrcblfa0j1zcyf6k9bg";
-      name = "kgeography-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/kgeography-18.04.3.tar.xz";
+      sha256 = "1vkyghvibnslp45pabld063f762g4g9y0l7kxs287c3fblwpj23m";
+      name = "kgeography-18.04.3.tar.xz";
     };
   };
   kget = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/kget-18.04.2.tar.xz";
-      sha256 = "0i01z7nic11qh9g41dva9vsip02qy0r7axysj53p5yx1syf5brwi";
-      name = "kget-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/kget-18.04.3.tar.xz";
+      sha256 = "1j6p8rwjsb34919rlf1i236xc2r0yf5pl432bkpxrcavxvp3f565";
+      name = "kget-18.04.3.tar.xz";
     };
   };
   kgoldrunner = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/kgoldrunner-18.04.2.tar.xz";
-      sha256 = "1rangxnzfs83f0hx6k39dc9yiaqn1jr6yznf51zdzb23k4jcczm4";
-      name = "kgoldrunner-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/kgoldrunner-18.04.3.tar.xz";
+      sha256 = "1xj0269qk2pdxah5lk6cp0lgssi6qlczgsxcm97idyp3knrmnxr0";
+      name = "kgoldrunner-18.04.3.tar.xz";
     };
   };
   kgpg = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/kgpg-18.04.2.tar.xz";
-      sha256 = "1r2jsm1klgnzprx342qlj429jbvpa4gnk69b9bfxz8la0lfv71n4";
-      name = "kgpg-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/kgpg-18.04.3.tar.xz";
+      sha256 = "1a1kc1nin0agrrqh4wysm019p02gcyj75xw0rx53db96xim1iczx";
+      name = "kgpg-18.04.3.tar.xz";
     };
   };
   khangman = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/khangman-18.04.2.tar.xz";
-      sha256 = "1vyim621gqbfq3wmlr864nm7c4mrn01bpz2m0sn33n7hbnpzb1rw";
-      name = "khangman-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/khangman-18.04.3.tar.xz";
+      sha256 = "1yi1b15kh5z24bp10af2pgl029bbbgkn8gyzh3p5jy7qrykxqxj1";
+      name = "khangman-18.04.3.tar.xz";
     };
   };
   khelpcenter = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/khelpcenter-18.04.2.tar.xz";
-      sha256 = "13va6h9z0s21dm7jgddka0x7i5llrr398mk7v4kmdr9zbzd6727c";
-      name = "khelpcenter-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/khelpcenter-18.04.3.tar.xz";
+      sha256 = "079yjhsi9nihn792ab03rg4far8l66v6ky7dhfrvrk78rv974ww6";
+      name = "khelpcenter-18.04.3.tar.xz";
     };
   };
   kidentitymanagement = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/kidentitymanagement-18.04.2.tar.xz";
-      sha256 = "1rjmafsbblchqpl865ah7m7arf5kz30cc8sk2z4ps5c8lqzn8gql";
-      name = "kidentitymanagement-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/kidentitymanagement-18.04.3.tar.xz";
+      sha256 = "0yz435r86vm2w3b6bwdwxn7shwafpam0fh7qs3slmdlli60wgw8z";
+      name = "kidentitymanagement-18.04.3.tar.xz";
     };
   };
   kig = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/kig-18.04.2.tar.xz";
-      sha256 = "0i8jkbaxskgxwvsnjqysvmdm5a6yq3v0w6h3fmrk9jsp5gf120gw";
-      name = "kig-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/kig-18.04.3.tar.xz";
+      sha256 = "0d459jkpc5x54w4gsrny7sx2103y5kpx6hm0zfyq7fiq1vsy57r4";
+      name = "kig-18.04.3.tar.xz";
     };
   };
   kigo = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/kigo-18.04.2.tar.xz";
-      sha256 = "1fkrx9fhxijw0sd861pn2ihphspyhx6i79z2816gv3riqa0a9j51";
-      name = "kigo-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/kigo-18.04.3.tar.xz";
+      sha256 = "1w4z04h072c7kf190r8h50rv3q7h6fwqcmckn83mfi9z0lbr9mqc";
+      name = "kigo-18.04.3.tar.xz";
     };
   };
   killbots = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/killbots-18.04.2.tar.xz";
-      sha256 = "0ppg1n2m5cd3rgl0ixvga7i9j0f2v97cfxzpwqhbymwz4970cxqz";
-      name = "killbots-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/killbots-18.04.3.tar.xz";
+      sha256 = "0vi2i1zaqfnni6608j46ppxsmzi44wcawbpp0l8cdb8bgbjbd1xd";
+      name = "killbots-18.04.3.tar.xz";
     };
   };
   kimagemapeditor = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/kimagemapeditor-18.04.2.tar.xz";
-      sha256 = "1nl0am3kww53bg0wds1p8bmw8hbn79zrnh06bhk9f6p0n5n817jc";
-      name = "kimagemapeditor-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/kimagemapeditor-18.04.3.tar.xz";
+      sha256 = "1cdgfb4r4r3xpyw1dbk1alfyzgqdi718c2nrg30a1g8f450zh2zb";
+      name = "kimagemapeditor-18.04.3.tar.xz";
     };
   };
   kimap = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/kimap-18.04.2.tar.xz";
-      sha256 = "0fxx24nxm055vkdgyisfx648n2ayxrgacmkv519bham9v9qg32zd";
-      name = "kimap-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/kimap-18.04.3.tar.xz";
+      sha256 = "13k46xna99gg5h445xxkipv3dhyi8d1daj6c6kf28x8lvwrxpf1c";
+      name = "kimap-18.04.3.tar.xz";
     };
   };
   kio-extras = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/kio-extras-18.04.2.tar.xz";
-      sha256 = "1kmnfxh5dbgxismz03rbkf7pdgl187ddnr5k3gr547fdid9caphn";
-      name = "kio-extras-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/kio-extras-18.04.3.tar.xz";
+      sha256 = "0k034a684wajs7b0j9vhkhd6aabn5b34y050m0s9xlnmi6xk2agj";
+      name = "kio-extras-18.04.3.tar.xz";
     };
   };
   kiriki = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/kiriki-18.04.2.tar.xz";
-      sha256 = "0apaa8ki57i3n1lnmgkqjccdx8vp4bwf020nvyxx7vwm8kqpm1hy";
-      name = "kiriki-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/kiriki-18.04.3.tar.xz";
+      sha256 = "1vz9br7qi4amcpp1g0lxn90822n4da9n4svxm2inj70p0mr59bpf";
+      name = "kiriki-18.04.3.tar.xz";
     };
   };
   kiten = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/kiten-18.04.2.tar.xz";
-      sha256 = "0bj6fb00wnvza5hwlxk6b2vhpp7vwsna184ghizx03cl242ig1c9";
-      name = "kiten-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/kiten-18.04.3.tar.xz";
+      sha256 = "1k21pwxg4wb6jph9a6srgas55xxfkix66qqz4hrpnapc7c18qh6p";
+      name = "kiten-18.04.3.tar.xz";
     };
   };
   kjumpingcube = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/kjumpingcube-18.04.2.tar.xz";
-      sha256 = "0ll38kbm8yf2pnph3rbhh9ydx4ms7mr49y95k6azkxjbvn8hf4wg";
-      name = "kjumpingcube-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/kjumpingcube-18.04.3.tar.xz";
+      sha256 = "0927j5k4pk03j2a7zf07w0594g5dagcb2hraf7b8dpjpzqxrjpv9";
+      name = "kjumpingcube-18.04.3.tar.xz";
     };
   };
   kldap = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/kldap-18.04.2.tar.xz";
-      sha256 = "1jlqr06y0bs3mzzbqf49hzwqyavs39rwc61mzgydm0951kalh2zs";
-      name = "kldap-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/kldap-18.04.3.tar.xz";
+      sha256 = "1vjwial1v15f30bsjsi9z6hyr7a833z5hi6d2wim1cc7h1cl1p2v";
+      name = "kldap-18.04.3.tar.xz";
     };
   };
   kleopatra = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/kleopatra-18.04.2.tar.xz";
-      sha256 = "0c66j35zjg2hfknc3fqqh6x5ynfw0whgzi1q74hiv9225zbzb80a";
-      name = "kleopatra-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/kleopatra-18.04.3.tar.xz";
+      sha256 = "0v70rqag7ljgcmny1fa6hlhmsc1g6965gh39gmcz1li61k6hb1ib";
+      name = "kleopatra-18.04.3.tar.xz";
     };
   };
   klettres = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/klettres-18.04.2.tar.xz";
-      sha256 = "0wilxlfhgyj8pbq87kl4vx97f39kc9bpqcchc09qgc3ack40rakv";
-      name = "klettres-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/klettres-18.04.3.tar.xz";
+      sha256 = "0hky4wallpi2a8klwrmc2ln9lh5d3cnvdrn7kmw6prb7j7pwnm6g";
+      name = "klettres-18.04.3.tar.xz";
     };
   };
   klickety = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/klickety-18.04.2.tar.xz";
-      sha256 = "0w9ajwqsklq2chj491rmph05vg4y4ibvbjwic9l99i8ybp89x00k";
-      name = "klickety-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/klickety-18.04.3.tar.xz";
+      sha256 = "0d53d4ajh1lpban2jp06bjhrvrmg2fl7jg40mdga9wwrv8g01bs1";
+      name = "klickety-18.04.3.tar.xz";
     };
   };
   klines = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/klines-18.04.2.tar.xz";
-      sha256 = "1wdn3s4r3301ps84v7mw61zmwvlb8rdsvfgxbgrs46am052dszgg";
-      name = "klines-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/klines-18.04.3.tar.xz";
+      sha256 = "0hz3id6sf85cdram42niqzrpynnx8xc4bj7imnl5dylhwdbxphhw";
+      name = "klines-18.04.3.tar.xz";
     };
   };
   kmag = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/kmag-18.04.2.tar.xz";
-      sha256 = "1fikna4rrsbzgdq9qiwpp1j48rimpf0frrnzgnjq8lnc61csfcjn";
-      name = "kmag-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/kmag-18.04.3.tar.xz";
+      sha256 = "00rs414p40002y68py1bdf08xcdib3x9zsinkv1iq07mbmr6smb1";
+      name = "kmag-18.04.3.tar.xz";
     };
   };
   kmahjongg = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/kmahjongg-18.04.2.tar.xz";
-      sha256 = "1a19r3kbysx7pzy96wl9sq8c03lwp105nqf9gzbhabm0kyx945hc";
-      name = "kmahjongg-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/kmahjongg-18.04.3.tar.xz";
+      sha256 = "05bzk6rsfvpis0gqrxqhlwc77jclk6xhljlzyhs07qbm3ii7jmpc";
+      name = "kmahjongg-18.04.3.tar.xz";
     };
   };
   kmail = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/kmail-18.04.2.tar.xz";
-      sha256 = "0miqwi55rc1zq1zfz75r8pzz4q3c81z61wp6w53zjhib50caa66i";
-      name = "kmail-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/kmail-18.04.3.tar.xz";
+      sha256 = "09a2s8w5i80x7h1rigl5a642fqp2xsmv53qm4hfajawn66mqfyz5";
+      name = "kmail-18.04.3.tar.xz";
     };
   };
   kmail-account-wizard = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/kmail-account-wizard-18.04.2.tar.xz";
-      sha256 = "1vj0bn0z4il34v3nadbw4ldp15yd0afisdriiw3nsyq5v8yp75h9";
-      name = "kmail-account-wizard-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/kmail-account-wizard-18.04.3.tar.xz";
+      sha256 = "09g4r10vbkzz9gab4ihz95bah7qba10zbm57m8wdjbfr4nxm09sc";
+      name = "kmail-account-wizard-18.04.3.tar.xz";
     };
   };
   kmailtransport = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/kmailtransport-18.04.2.tar.xz";
-      sha256 = "1zc1q19xdb59pcqc2n850f4fh107b3f5nj31mhii8496mzz1nk0j";
-      name = "kmailtransport-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/kmailtransport-18.04.3.tar.xz";
+      sha256 = "0anmzg87amrxig58ax4jqv7m976cm5x8dr3cwcxwv5mwgp9zczz2";
+      name = "kmailtransport-18.04.3.tar.xz";
     };
   };
   kmbox = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/kmbox-18.04.2.tar.xz";
-      sha256 = "0dwd7mkflggj4xdk65qpjlvzb15k6agz6pfmbx426xgpm0dq4bwc";
-      name = "kmbox-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/kmbox-18.04.3.tar.xz";
+      sha256 = "1mdshr9xll1sw5dr99jl4rfcwvghj4c2f39fs4x4c72dnkrijrw5";
+      name = "kmbox-18.04.3.tar.xz";
     };
   };
   kmime = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/kmime-18.04.2.tar.xz";
-      sha256 = "02h2bpcf4mz4wfv1r2lj9xm01bbglwz23r4ay7373gilxjgcxx5h";
-      name = "kmime-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/kmime-18.04.3.tar.xz";
+      sha256 = "1gf6a9kn88jnqrj7kj556yjk25anlaqcz8xrlffvg7b1y813wpcq";
+      name = "kmime-18.04.3.tar.xz";
     };
   };
   kmines = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/kmines-18.04.2.tar.xz";
-      sha256 = "0p1hg5nvpkyijl6nzshp136chiqvkwbbmniq7w9gdmf3ch7hr7ba";
-      name = "kmines-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/kmines-18.04.3.tar.xz";
+      sha256 = "0659cxj89mb1gd7ikxqrghb3ylp8wsp07jcp2hbj842zmgy0wl65";
+      name = "kmines-18.04.3.tar.xz";
     };
   };
   kmix = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/kmix-18.04.2.tar.xz";
-      sha256 = "1l2gqwxrhnbm9hxyyb0bsn8dxv2c52ha3576j5h62j4rwxzh5mm7";
-      name = "kmix-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/kmix-18.04.3.tar.xz";
+      sha256 = "0gcfy4p4csxdqscyclm3z5ahbrlpyrlbw8p7kci6h0gjpv605fv1";
+      name = "kmix-18.04.3.tar.xz";
     };
   };
   kmousetool = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/kmousetool-18.04.2.tar.xz";
-      sha256 = "0ivhdrdpn8fkws9lghj4iakd3qdrvyd6mp0v3zacdi2mccgcsclg";
-      name = "kmousetool-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/kmousetool-18.04.3.tar.xz";
+      sha256 = "106hqam2fhnhdzvsb79171v3fjw8rlcb04j9w5xs7q3j9avwk044";
+      name = "kmousetool-18.04.3.tar.xz";
     };
   };
   kmouth = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/kmouth-18.04.2.tar.xz";
-      sha256 = "0zyjh1fbjkg2p0wwc5nw8mh26wbngm0c2vacxv1zx1xdhdwa4mbw";
-      name = "kmouth-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/kmouth-18.04.3.tar.xz";
+      sha256 = "0hffqqcz4j3mp4vp5kc280ywq36r3y80q24i37swiqdd3fzyrlzq";
+      name = "kmouth-18.04.3.tar.xz";
     };
   };
   kmplot = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/kmplot-18.04.2.tar.xz";
-      sha256 = "0k2qpcwd6s34zx049na1i429ans8js6bgwynkz7fmva0fpc1kgwh";
-      name = "kmplot-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/kmplot-18.04.3.tar.xz";
+      sha256 = "0j9ax6b2v0w7crjy8c9a84a2zcph7zx0ap0wwq7lnw45xwhynllv";
+      name = "kmplot-18.04.3.tar.xz";
     };
   };
   knavalbattle = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/knavalbattle-18.04.2.tar.xz";
-      sha256 = "1l846gak5gb3r4sf38410c7lfpwna89x285ql5fhlgzr311xkhqm";
-      name = "knavalbattle-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/knavalbattle-18.04.3.tar.xz";
+      sha256 = "1i6c5i0r2icpbn010k5jc6cb45ha7dgqhhvbbcgcsdqjcq042czx";
+      name = "knavalbattle-18.04.3.tar.xz";
     };
   };
   knetwalk = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/knetwalk-18.04.2.tar.xz";
-      sha256 = "0vvc2kkn9szgknxhcc5mphbsk0h121i0kaljr0330ggpxj0n6kfi";
-      name = "knetwalk-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/knetwalk-18.04.3.tar.xz";
+      sha256 = "1r17c8hfj6qh1rx7apmpmb0cca0gsnq7jvjhz98if3kyy9m1fk50";
+      name = "knetwalk-18.04.3.tar.xz";
     };
   };
   knotes = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/knotes-18.04.2.tar.xz";
-      sha256 = "0x20j9ln4gmi407avmkpn5snhsjfa70q7ica2z4l15yb43ds2viv";
-      name = "knotes-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/knotes-18.04.3.tar.xz";
+      sha256 = "02lx0vm34kcr6mix5d1i0dcaf229yafx58b915y3vjwml8n5v17w";
+      name = "knotes-18.04.3.tar.xz";
     };
   };
   kolf = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/kolf-18.04.2.tar.xz";
-      sha256 = "0cbl5as62qidi1i2902767apy8yyx7lkpbwm4hp681v8m34kwi6y";
-      name = "kolf-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/kolf-18.04.3.tar.xz";
+      sha256 = "1k3z3nk6bgl9rlwjvc9jxwpyhd88amc2l1yg8f4rs6w0pbaldmwb";
+      name = "kolf-18.04.3.tar.xz";
     };
   };
   kollision = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/kollision-18.04.2.tar.xz";
-      sha256 = "0065p658792n03n0q0fmmgs6h2h31sczff25y0ka7xyky49452vs";
-      name = "kollision-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/kollision-18.04.3.tar.xz";
+      sha256 = "11czb7j0dzla5c9c4nk1qb5ljgci7x6ggyn6ffm2wvff4lm880m8";
+      name = "kollision-18.04.3.tar.xz";
     };
   };
   kolourpaint = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/kolourpaint-18.04.2.tar.xz";
-      sha256 = "03rrhy1idhj39wfncxpbnrj7wji8lv39msv80zw1k394wdxz713r";
-      name = "kolourpaint-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/kolourpaint-18.04.3.tar.xz";
+      sha256 = "17jkyih99pqs2nqsf0rq35iks3y2kmnya71ihnw8930qgjakggxp";
+      name = "kolourpaint-18.04.3.tar.xz";
     };
   };
   kompare = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/kompare-18.04.2.tar.xz";
-      sha256 = "0b90varbdq87apsxmp7rk8nbwk57wy6ivl2xc5cpi2p0r09f5bc9";
-      name = "kompare-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/kompare-18.04.3.tar.xz";
+      sha256 = "1csjhnsic7h943kjrzixc0k79kn6w9ck29kw9qaz29khpi5bmn6v";
+      name = "kompare-18.04.3.tar.xz";
     };
   };
   konqueror = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/konqueror-18.04.2.tar.xz";
-      sha256 = "1wy2gf20p7jlsq3dw1xf72pssfhmsbg50wgvbndsr9a9mylj3d4h";
-      name = "konqueror-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/konqueror-18.04.3.tar.xz";
+      sha256 = "08sw3vz57klr6wp1k2kjfj8hj02k4si39ncngvy005x2dkprkgc2";
+      name = "konqueror-18.04.3.tar.xz";
     };
   };
   konquest = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/konquest-18.04.2.tar.xz";
-      sha256 = "07pdakv1snnwy0q0afc1qydy26vw65c7wy2dbh0hl57df9m095i4";
-      name = "konquest-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/konquest-18.04.3.tar.xz";
+      sha256 = "0pd3yxj3fmjp9p4gm4a3r107cx0rwgqg2pnwyfrdlrvppcc4is0g";
+      name = "konquest-18.04.3.tar.xz";
     };
   };
   konsole = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/konsole-18.04.2.tar.xz";
-      sha256 = "0rqrb9xdp6m2fyknk346iqbfcgz5qizdsa7n450gwinjki14yksx";
-      name = "konsole-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/konsole-18.04.3.tar.xz";
+      sha256 = "00m0z9fjprnnnp7blr9nyz8s8xb781ry7qxd68c261ar5fajys1p";
+      name = "konsole-18.04.3.tar.xz";
     };
   };
   kontact = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/kontact-18.04.2.tar.xz";
-      sha256 = "0g2sz9rmzscwwm6frxz2x5z17imwh5h9kb64iz0lffjzg8d9fjmq";
-      name = "kontact-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/kontact-18.04.3.tar.xz";
+      sha256 = "1h8a9mdldq8hai3f2al56rs063s46lnsnmgbvd8dyk51si084aab";
+      name = "kontact-18.04.3.tar.xz";
     };
   };
   kontactinterface = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/kontactinterface-18.04.2.tar.xz";
-      sha256 = "076pbxxsr38q2h0s3xcgszpvdsgfrx7njh37zrv3frn5ns928dxw";
-      name = "kontactinterface-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/kontactinterface-18.04.3.tar.xz";
+      sha256 = "194g0y5kkax4c9ivc5yll5rqzpvd97s897agkzmr05wvk82gjrz6";
+      name = "kontactinterface-18.04.3.tar.xz";
     };
   };
   kopete = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/kopete-18.04.2.tar.xz";
-      sha256 = "1s6js1xbm6n7prcjz66rk21lyzj7l76hhghvby0aak6rd77qdhpd";
-      name = "kopete-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/kopete-18.04.3.tar.xz";
+      sha256 = "0c2s3qq9k4654q38q4gy6j3mkj1nnrc6jb4sk04hz3w5d9i6c82b";
+      name = "kopete-18.04.3.tar.xz";
     };
   };
   korganizer = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/korganizer-18.04.2.tar.xz";
-      sha256 = "06n4npcwf76nwrzbzjqr14pcmrqn46sriyasgqzd1iqmx1120lb5";
-      name = "korganizer-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/korganizer-18.04.3.tar.xz";
+      sha256 = "1bcmqki7491g8q9gaif346afrsn5k2zxp6xzwllaifxrbckzqaj1";
+      name = "korganizer-18.04.3.tar.xz";
     };
   };
   kpat = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/kpat-18.04.2.tar.xz";
-      sha256 = "0nqgqd4i459m0z0bhavx08igap9lqx4rcc6yx63ina67nbx114k6";
-      name = "kpat-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/kpat-18.04.3.tar.xz";
+      sha256 = "0adx0720k296k0fzzsv4k32i0yii9snczsiir8gl3jj5ngk5hias";
+      name = "kpat-18.04.3.tar.xz";
     };
   };
   kpimtextedit = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/kpimtextedit-18.04.2.tar.xz";
-      sha256 = "1scd58mzh3mddp0nsjp7wjfclz2ylvxqksa4q4md9rbxnc3zl6fn";
-      name = "kpimtextedit-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/kpimtextedit-18.04.3.tar.xz";
+      sha256 = "0fqlf4l05iybdnrzpp48wrg7qj9x303cfq2105d3p2zvwwkyrr41";
+      name = "kpimtextedit-18.04.3.tar.xz";
     };
   };
   kqtquickcharts = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/kqtquickcharts-18.04.2.tar.xz";
-      sha256 = "1pxaj7wpnkwygilkj0bg4sd5m2w6jlpc2yaliaswzfy3vshrb2nl";
-      name = "kqtquickcharts-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/kqtquickcharts-18.04.3.tar.xz";
+      sha256 = "0zjy05kvl30j8nlwfpqyf4qqimbfagk9s3f92b9bxk7njnxjzhd9";
+      name = "kqtquickcharts-18.04.3.tar.xz";
     };
   };
   krdc = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/krdc-18.04.2.tar.xz";
-      sha256 = "0aziq34snf0bbp9zzbag9hjv9an4b24qslmxkn002ifq9c1jww7k";
-      name = "krdc-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/krdc-18.04.3.tar.xz";
+      sha256 = "0r57nfskwn1gwm4ig7z6cv04y4rhy5mq9bdd4ci8d9gq0s1rc13x";
+      name = "krdc-18.04.3.tar.xz";
     };
   };
   kreversi = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/kreversi-18.04.2.tar.xz";
-      sha256 = "1436cr72snpn6aqjsc9nm3arc7ycdimlliky922mzdsl4n3absg2";
-      name = "kreversi-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/kreversi-18.04.3.tar.xz";
+      sha256 = "09zcl0vzzwc4crzlrrvi7kmbk9xh0h5hy9yyv9bk661pw66nv980";
+      name = "kreversi-18.04.3.tar.xz";
     };
   };
   krfb = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/krfb-18.04.2.tar.xz";
-      sha256 = "1niwg04ziqwyphw3r54909rwcqc39iv6ni8aqqsm1wfx5iqyg1sa";
-      name = "krfb-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/krfb-18.04.3.tar.xz";
+      sha256 = "0i36lj7lggl83khds009wp12d21rin60ai2a24isyplvcq8p2slk";
+      name = "krfb-18.04.3.tar.xz";
     };
   };
   kross-interpreters = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/kross-interpreters-18.04.2.tar.xz";
-      sha256 = "1n6r1wn6qw9rf1zrszq30sqkavn46b1151ak99kf3nc3c6fk225q";
-      name = "kross-interpreters-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/kross-interpreters-18.04.3.tar.xz";
+      sha256 = "04wrary04sznjaw2n3d2fjnnhzf1fykj9l3r9dry1irj9ysx45yd";
+      name = "kross-interpreters-18.04.3.tar.xz";
     };
   };
   kruler = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/kruler-18.04.2.tar.xz";
-      sha256 = "0ynq8vvgbmrgc8na0bj7nf98qr0kis59wrq8jygllgybrvm8wxb4";
-      name = "kruler-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/kruler-18.04.3.tar.xz";
+      sha256 = "014c0m388kjfpynvh14m463jl3vj288lcdiz3xfphlmxqlhhvhcd";
+      name = "kruler-18.04.3.tar.xz";
     };
   };
   kshisen = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/kshisen-18.04.2.tar.xz";
-      sha256 = "1psvdcylr8c81252cmd7ky1f62bh82kpnbvfcvwkg2kfwwr9ril3";
-      name = "kshisen-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/kshisen-18.04.3.tar.xz";
+      sha256 = "04xzg2v957wx68wmf1ri30vajd5pr9xz2fh7f5xg394m134cxc9r";
+      name = "kshisen-18.04.3.tar.xz";
     };
   };
   ksirk = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/ksirk-18.04.2.tar.xz";
-      sha256 = "1zl5riig9rmcs3sn4fj51fhxlcgs709x4ahdgcjrncafvxb9b1xg";
-      name = "ksirk-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/ksirk-18.04.3.tar.xz";
+      sha256 = "1p08f9w3vi1z31fydnvp9d069z82kv8fn9lwlw1mxkqaggv54jhs";
+      name = "ksirk-18.04.3.tar.xz";
     };
   };
   ksmtp = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/ksmtp-18.04.2.tar.xz";
-      sha256 = "16q7f5b87mxzz05d8vfra3m2fj0n2h62askcmp5p8zfc9am07991";
-      name = "ksmtp-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/ksmtp-18.04.3.tar.xz";
+      sha256 = "0p8rnqpb0q26iwjk4k9pj4krfqipijg90bv0hd4wa3d2plkvzmcy";
+      name = "ksmtp-18.04.3.tar.xz";
     };
   };
   ksnakeduel = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/ksnakeduel-18.04.2.tar.xz";
-      sha256 = "119jgihx1qdk6aa8xkjh5q3zcqsybbs8vn3hjnwcy2dzkyc04v7a";
-      name = "ksnakeduel-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/ksnakeduel-18.04.3.tar.xz";
+      sha256 = "1mhgdd0hnv0y36af3rikdibc0hgp1sjdxbx543vlxi25l8dfsw6q";
+      name = "ksnakeduel-18.04.3.tar.xz";
     };
   };
   kspaceduel = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/kspaceduel-18.04.2.tar.xz";
-      sha256 = "08g1h7j1bl7sfiz2vk05df16yjp0dwzvdn7ymr74il6m6ln65a9w";
-      name = "kspaceduel-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/kspaceduel-18.04.3.tar.xz";
+      sha256 = "06mzg1hmhwisd0vc99qdrxp7jgay4cqda2x142i2a1v5qs48ilk4";
+      name = "kspaceduel-18.04.3.tar.xz";
     };
   };
   ksquares = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/ksquares-18.04.2.tar.xz";
-      sha256 = "1xc82gc4bszsfd3y7xgfaxj4flnflr1v0wv8m1jgk3xzka889wq2";
-      name = "ksquares-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/ksquares-18.04.3.tar.xz";
+      sha256 = "1w4x8br9g5dlw7mc8n118lqq0g5p4n2lqijp17xcgznbllivf79g";
+      name = "ksquares-18.04.3.tar.xz";
     };
   };
   ksudoku = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/ksudoku-18.04.2.tar.xz";
-      sha256 = "0fhbf7d3bb7cad7wd44hslx7ak5l6nx1d0r3dh38y51c7jwwy2nl";
-      name = "ksudoku-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/ksudoku-18.04.3.tar.xz";
+      sha256 = "095i8s3ggl51xncra66vhdrz494r5q55d57j53pqnc4cwnfl5glj";
+      name = "ksudoku-18.04.3.tar.xz";
     };
   };
   ksystemlog = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/ksystemlog-18.04.2.tar.xz";
-      sha256 = "0qx1wg4a8cpp3vd89xqcbfl7hzg3frcv37bsmdc44l988m9l44x3";
-      name = "ksystemlog-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/ksystemlog-18.04.3.tar.xz";
+      sha256 = "117gxwlimqp7sslrkaf6jazhprplqqkbqrfrjdwm54l84dldfi34";
+      name = "ksystemlog-18.04.3.tar.xz";
     };
   };
   kteatime = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/kteatime-18.04.2.tar.xz";
-      sha256 = "1bmirc40prg5f4rlyrz8xbgwrm8nrcxvmbpk8399szb41m3p031c";
-      name = "kteatime-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/kteatime-18.04.3.tar.xz";
+      sha256 = "12fikkj87yz8xj8l3girsfqkbngvg0jjw661hihgnjz6jg7jdq0k";
+      name = "kteatime-18.04.3.tar.xz";
     };
   };
   ktimer = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/ktimer-18.04.2.tar.xz";
-      sha256 = "1djb5r7wwrc0hzv76lqf602gy9ijz4zw1j1z6n19yhvy9baz5ix6";
-      name = "ktimer-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/ktimer-18.04.3.tar.xz";
+      sha256 = "1bf3r4kfg85hgmsszpz57fhws7mw79wxkb6qigfcq4vv165axjd2";
+      name = "ktimer-18.04.3.tar.xz";
     };
   };
   ktnef = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/ktnef-18.04.2.tar.xz";
-      sha256 = "03m7gqgz8bpjig8xh04pmzs3yyfiajksqq43hsh3hlck1fmycmvq";
-      name = "ktnef-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/ktnef-18.04.3.tar.xz";
+      sha256 = "08zdl982gkk619gi05xvs28q26xjsrvawgpbmrmkwikj5m80asf4";
+      name = "ktnef-18.04.3.tar.xz";
     };
   };
   ktouch = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/ktouch-18.04.2.tar.xz";
-      sha256 = "0x16m27l8hc2kk2bfc7r98y45vwkdqs7mk3g1i7ys4rf4rdcf62h";
-      name = "ktouch-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/ktouch-18.04.3.tar.xz";
+      sha256 = "1j6byxhprwrsd4bb3g3mwps5v1cc73h447dxzrd84ghk3jv687jl";
+      name = "ktouch-18.04.3.tar.xz";
     };
   };
   ktp-accounts-kcm = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/ktp-accounts-kcm-18.04.2.tar.xz";
-      sha256 = "1wfy4p8w1rzq6mnq9axcx6b0v0hsjjlzysn7gvgqnyvnqzfn31gg";
-      name = "ktp-accounts-kcm-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/ktp-accounts-kcm-18.04.3.tar.xz";
+      sha256 = "0dlgammp5j1idlmv69dq54fyc2dm6cd2gv5spimydznxp5bcfl3v";
+      name = "ktp-accounts-kcm-18.04.3.tar.xz";
     };
   };
   ktp-approver = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/ktp-approver-18.04.2.tar.xz";
-      sha256 = "1irhid13c2nblfs1qkkpkiwk7559zd3hh4397v9d9h2952gadf2r";
-      name = "ktp-approver-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/ktp-approver-18.04.3.tar.xz";
+      sha256 = "0f2y86khv4ps2xnh8aizf3q52s0c1nxnvkrpii5qm9vk8agp8yfz";
+      name = "ktp-approver-18.04.3.tar.xz";
     };
   };
   ktp-auth-handler = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/ktp-auth-handler-18.04.2.tar.xz";
-      sha256 = "01wmnd63zjc37yknfjqqsgninqpwrh2w6df4rydxbk3p1mqv1g6x";
-      name = "ktp-auth-handler-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/ktp-auth-handler-18.04.3.tar.xz";
+      sha256 = "07apdk2zf0mqii8khphf6whblwals8p1yqjs6vxry89mmr5znni7";
+      name = "ktp-auth-handler-18.04.3.tar.xz";
     };
   };
   ktp-call-ui = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/ktp-call-ui-18.04.2.tar.xz";
-      sha256 = "1q9h89ng2r85is18lkxpsbapd0j0ac4gb8jyq333c7lahflr6qfw";
-      name = "ktp-call-ui-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/ktp-call-ui-18.04.3.tar.xz";
+      sha256 = "1zkvkskfparc1bfvn1xhymz2pm50iws6k098bxrz86a6cgrqxw75";
+      name = "ktp-call-ui-18.04.3.tar.xz";
     };
   };
   ktp-common-internals = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/ktp-common-internals-18.04.2.tar.xz";
-      sha256 = "13mi1l8xwhr7h5sc332b91nsrq211q2m8xxvdizmlmyf4kss02b2";
-      name = "ktp-common-internals-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/ktp-common-internals-18.04.3.tar.xz";
+      sha256 = "1j5avk09xakh0g84lnxz3p11fhjb5lf1sxic423hamwgwlr181nl";
+      name = "ktp-common-internals-18.04.3.tar.xz";
     };
   };
   ktp-contact-list = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/ktp-contact-list-18.04.2.tar.xz";
-      sha256 = "0n8aj9m7vq62amrv1smfq39lmbjzlbcz4zdbk529j0iqryvm4ycr";
-      name = "ktp-contact-list-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/ktp-contact-list-18.04.3.tar.xz";
+      sha256 = "0zyl1d4k74lrdx3hsib7miijjk2zj3x1yakryrym4lk3pmllrd78";
+      name = "ktp-contact-list-18.04.3.tar.xz";
     };
   };
   ktp-contact-runner = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/ktp-contact-runner-18.04.2.tar.xz";
-      sha256 = "0zjsvsxdd2w4vijj9bqifl88wf0bkkdiqrpzpdm71zwvpp8dp6pj";
-      name = "ktp-contact-runner-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/ktp-contact-runner-18.04.3.tar.xz";
+      sha256 = "1nzz88m8mb2xwpl5fzh7srslzrci2265n759kczjlzj7w1wym504";
+      name = "ktp-contact-runner-18.04.3.tar.xz";
     };
   };
   ktp-desktop-applets = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/ktp-desktop-applets-18.04.2.tar.xz";
-      sha256 = "19qdpgp6qqfzqv5xli1jk63d2nz1pr8kaggssfxmygc02vjq39wg";
-      name = "ktp-desktop-applets-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/ktp-desktop-applets-18.04.3.tar.xz";
+      sha256 = "1y0g3922km9a71splnx91nhvpwi2gj1jqxbzzsqsckblh2gzf0m3";
+      name = "ktp-desktop-applets-18.04.3.tar.xz";
     };
   };
   ktp-filetransfer-handler = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/ktp-filetransfer-handler-18.04.2.tar.xz";
-      sha256 = "1ygnm5n9sykyr9vi9c131xhrbrb54s9qbm4kmvxnrw8bl40vpdj5";
-      name = "ktp-filetransfer-handler-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/ktp-filetransfer-handler-18.04.3.tar.xz";
+      sha256 = "165mfk1ld1py2rp3j0xah1zi2f5b73ic53a043mmhs4lws5fw3f9";
+      name = "ktp-filetransfer-handler-18.04.3.tar.xz";
     };
   };
   ktp-kded-module = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/ktp-kded-module-18.04.2.tar.xz";
-      sha256 = "11x559k1cqgzhpm7b44ybi47n1086jmd38pw0nmivj0j0qgssypm";
-      name = "ktp-kded-module-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/ktp-kded-module-18.04.3.tar.xz";
+      sha256 = "1z2103q6lx4f51ipm2kmla5h8civhf0wy0yk0zg4akynshqjhr6n";
+      name = "ktp-kded-module-18.04.3.tar.xz";
     };
   };
   ktp-send-file = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/ktp-send-file-18.04.2.tar.xz";
-      sha256 = "15izy3ziwm2170lg5c4irvypyafzwa4idxjr1pvf1j5z4rs0vj29";
-      name = "ktp-send-file-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/ktp-send-file-18.04.3.tar.xz";
+      sha256 = "1d1ha9nigipr7khaymp7jiixj27d18qk7ghf1zaywyrrf2sav286";
+      name = "ktp-send-file-18.04.3.tar.xz";
     };
   };
   ktp-text-ui = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/ktp-text-ui-18.04.2.tar.xz";
-      sha256 = "0vfi1dsax99gr7qzpk40vpa0da4hqncxjgwxa6h1srf5l0hbvc1r";
-      name = "ktp-text-ui-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/ktp-text-ui-18.04.3.tar.xz";
+      sha256 = "0xglzifmqcrjxd3iz0v8a0rv2kaldsz12rn0hjh905j53s69xqic";
+      name = "ktp-text-ui-18.04.3.tar.xz";
     };
   };
   ktuberling = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/ktuberling-18.04.2.tar.xz";
-      sha256 = "1c82gnjlsp1dblmdavhrz43yzv2h3nvjafna7f53js6d5ggsxm2q";
-      name = "ktuberling-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/ktuberling-18.04.3.tar.xz";
+      sha256 = "0a7i3k386nr5gmmgpqp2gjpca8qh6w30x69w2w46mcw9qffm3s4b";
+      name = "ktuberling-18.04.3.tar.xz";
     };
   };
   kturtle = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/kturtle-18.04.2.tar.xz";
-      sha256 = "09fy1q40iwj7ds521ffzc5hmsbh7qb481ykq6ixfqbxzys4yjxm8";
-      name = "kturtle-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/kturtle-18.04.3.tar.xz";
+      sha256 = "1iaklkzfcrqhxh7jwgxg8kvpcxhia8l0hm6q14wc4nf3k72cgz8l";
+      name = "kturtle-18.04.3.tar.xz";
     };
   };
   kubrick = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/kubrick-18.04.2.tar.xz";
-      sha256 = "1z7yym9sc2i35sw32sjc5qqip99vmf5grwxmha50ra6qvxqgljmq";
-      name = "kubrick-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/kubrick-18.04.3.tar.xz";
+      sha256 = "1da3n4sgpx1k90cn90558yjfqp8wyirvmi1dzicy8l0jfl4rwr1d";
+      name = "kubrick-18.04.3.tar.xz";
     };
   };
   kwalletmanager = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/kwalletmanager-18.04.2.tar.xz";
-      sha256 = "0lijv2s9213d0wnk0j23qfd1f7f77kdypj2b9pmpi4ng1sf77bwp";
-      name = "kwalletmanager-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/kwalletmanager-18.04.3.tar.xz";
+      sha256 = "1n5f150mxx4i3aq62xi67c99p68nwwsiih3i36i1rrmy87w44iyi";
+      name = "kwalletmanager-18.04.3.tar.xz";
     };
   };
   kwave = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/kwave-18.04.2.tar.xz";
-      sha256 = "04crj0qkbnzc7abfa920s9csdpy4rhw49qq1x3sq09mqagbd04fw";
-      name = "kwave-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/kwave-18.04.3.tar.xz";
+      sha256 = "1h6lqyxzccbsprap2lypan2bs451vyp1z0d4ipbim1ayqyqi5zw9";
+      name = "kwave-18.04.3.tar.xz";
     };
   };
   kwordquiz = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/kwordquiz-18.04.2.tar.xz";
-      sha256 = "07dyzq9l4v2bymkc8jjm1i76y3nka98py2nf4ids0lpgxvkdx197";
-      name = "kwordquiz-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/kwordquiz-18.04.3.tar.xz";
+      sha256 = "0vl8afd3186w51p3bhlqzi0wipm0p6bl40vm298473ixgpbxbaj6";
+      name = "kwordquiz-18.04.3.tar.xz";
     };
   };
   libgravatar = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/libgravatar-18.04.2.tar.xz";
-      sha256 = "1yzai7azdqa16vndifj7smzxkw2sdkx1j8jfbcqsrs1rmn4p8f0f";
-      name = "libgravatar-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/libgravatar-18.04.3.tar.xz";
+      sha256 = "0s8y6v5b6b5lmyjxwhwl3fnn94z8v17q765xiq0g73i7lp5jz0bq";
+      name = "libgravatar-18.04.3.tar.xz";
     };
   };
   libkcddb = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/libkcddb-18.04.2.tar.xz";
-      sha256 = "053dgcxva3qphifhk08146gmnnnxnkay64p81bcrxgjbd5lf7vak";
-      name = "libkcddb-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/libkcddb-18.04.3.tar.xz";
+      sha256 = "0nk7d6apl57rdnfma525yn3xrgw01hhj08gb3cylvysl5nf8nn0m";
+      name = "libkcddb-18.04.3.tar.xz";
     };
   };
   libkcompactdisc = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/libkcompactdisc-18.04.2.tar.xz";
-      sha256 = "0l3nd8px0w0bl0kjr5gk1rbakzgff8bbzvqrfhqfswx7iqdghlav";
-      name = "libkcompactdisc-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/libkcompactdisc-18.04.3.tar.xz";
+      sha256 = "00xw6ggc4lgyw88jv52wxw2kig7ass1f7fbdd644cbhq2dvx7khd";
+      name = "libkcompactdisc-18.04.3.tar.xz";
     };
   };
   libkdcraw = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/libkdcraw-18.04.2.tar.xz";
-      sha256 = "116db7f69972kbjc3p5mh81cv3iq76y9a53v965idx1manw6p17b";
-      name = "libkdcraw-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/libkdcraw-18.04.3.tar.xz";
+      sha256 = "1mkrr0bb89k13chy1y9r6aqsjrdvm125k0ms3pjf7gc3xa6g7vk7";
+      name = "libkdcraw-18.04.3.tar.xz";
     };
   };
   libkdegames = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/libkdegames-18.04.2.tar.xz";
-      sha256 = "130fj578bgkwg6anm0sbnhvw9wvlwv5m5mmqnfnw9aha16yd6w12";
-      name = "libkdegames-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/libkdegames-18.04.3.tar.xz";
+      sha256 = "0nnr9rnsgpc13hj4ii126lpss8d7d18wnrr9n85yf6ngcg9h3gk7";
+      name = "libkdegames-18.04.3.tar.xz";
     };
   };
   libkdepim = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/libkdepim-18.04.2.tar.xz";
-      sha256 = "1rsyd06dqkfhx1s1zjzlg3n75pkhw754iai2758a8rxzs6bq6plg";
-      name = "libkdepim-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/libkdepim-18.04.3.tar.xz";
+      sha256 = "0mqrjhmv1g2ch4jgihcg1d8fn7qxjkxnw2fh6a2cnn4b827n3v2l";
+      name = "libkdepim-18.04.3.tar.xz";
     };
   };
   libkeduvocdocument = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/libkeduvocdocument-18.04.2.tar.xz";
-      sha256 = "17bgsj9jf1a0108nrm17cp0fjli9jpbsci28yllda2kavcdr1izm";
-      name = "libkeduvocdocument-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/libkeduvocdocument-18.04.3.tar.xz";
+      sha256 = "1x2dpbpd7f71ws11zrrinyydg25728niglypa4dwvl09d5v0lhwz";
+      name = "libkeduvocdocument-18.04.3.tar.xz";
     };
   };
   libkexiv2 = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/libkexiv2-18.04.2.tar.xz";
-      sha256 = "1cqp8cbqmqxnjkhiv8yjd047vppnym5dqy3yr01ppv9jlivyqzpk";
-      name = "libkexiv2-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/libkexiv2-18.04.3.tar.xz";
+      sha256 = "095ijxk55zw07j5y678dz1pipd0va4p57r9zvkqlfzd41bsi0a3c";
+      name = "libkexiv2-18.04.3.tar.xz";
     };
   };
   libkgapi = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/libkgapi-18.04.2.tar.xz";
-      sha256 = "1axnn3634h2cjiky1km8c88ip8wnascxc1z4rdbxwk013hkbd4fh";
-      name = "libkgapi-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/libkgapi-18.04.3.tar.xz";
+      sha256 = "0ixpnmli4z8qahw9br931b6py3wybqzlrnm3n7gms287phc11yjc";
+      name = "libkgapi-18.04.3.tar.xz";
     };
   };
   libkgeomap = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/libkgeomap-18.04.2.tar.xz";
-      sha256 = "1rx2ksp07nsny4dr7dmjlbd5v9agnnnnz38r4kf4cqdr7w3ymhhd";
-      name = "libkgeomap-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/libkgeomap-18.04.3.tar.xz";
+      sha256 = "0kicd6s6gfz3q1q45adnp6ri03sd69phs7ag3pnssyagk0y51igl";
+      name = "libkgeomap-18.04.3.tar.xz";
     };
   };
   libkipi = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/libkipi-18.04.2.tar.xz";
-      sha256 = "1bddsblrq45v7id41cr8bxss9sdlznk50mwkc03nc9xq1dlhsw0n";
-      name = "libkipi-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/libkipi-18.04.3.tar.xz";
+      sha256 = "1lyh9kg9s17nrc61bv6xzal5fd5y2shwn2d69xrlxh17akajbi7i";
+      name = "libkipi-18.04.3.tar.xz";
     };
   };
   libkleo = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/libkleo-18.04.2.tar.xz";
-      sha256 = "0m57klq8dlmibw5j8ah14q18cxl4sy7kjkrckmaydkhi45lc6j8m";
-      name = "libkleo-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/libkleo-18.04.3.tar.xz";
+      sha256 = "0m9sgksxr47lhh7810n3fprj08vk62cradl5zwf0c89dsbicap5a";
+      name = "libkleo-18.04.3.tar.xz";
     };
   };
   libkmahjongg = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/libkmahjongg-18.04.2.tar.xz";
-      sha256 = "0gbzrsc837h5xh72c89zj98ydly08799kl3g4fpai7w2ak1hmcf4";
-      name = "libkmahjongg-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/libkmahjongg-18.04.3.tar.xz";
+      sha256 = "16m1jid7d920bn1s1zbd44mhl07db4n921fcxv95j5rswndb7lwn";
+      name = "libkmahjongg-18.04.3.tar.xz";
     };
   };
   libkomparediff2 = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/libkomparediff2-18.04.2.tar.xz";
-      sha256 = "0m3r45mzipvglv6llkmfryr023yya07xilkxksp672lb46w8x047";
-      name = "libkomparediff2-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/libkomparediff2-18.04.3.tar.xz";
+      sha256 = "1ks9cajyvwnfxr829arkz8ajf3j2vw2rqfj2mfha6l0hap6ha6p1";
+      name = "libkomparediff2-18.04.3.tar.xz";
     };
   };
   libksane = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/libksane-18.04.2.tar.xz";
-      sha256 = "0flc1azdjjby27lbi5kgcghh7imry4m37jxsnnwyhnhdfm3py1dy";
-      name = "libksane-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/libksane-18.04.3.tar.xz";
+      sha256 = "0qfal3d8bbq61v7zfcb8hqiki6z6qx7p59xnkbgqfaif77nhnwwj";
+      name = "libksane-18.04.3.tar.xz";
     };
   };
   libksieve = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/libksieve-18.04.2.tar.xz";
-      sha256 = "0sml8x0462s13g4wjrvsswsz5fl97zyz1ps9c6v8prc0hyann81p";
-      name = "libksieve-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/libksieve-18.04.3.tar.xz";
+      sha256 = "0ckncvccf02agvs0m7s9xxjmcjwh3fpywig25pk2ji8va1y5z5yl";
+      name = "libksieve-18.04.3.tar.xz";
     };
   };
   lokalize = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/lokalize-18.04.2.tar.xz";
-      sha256 = "0nzrvbbv61nl3mxgnx2kv4qc9pgky85jxgw7i9w4alizz491xzlp";
-      name = "lokalize-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/lokalize-18.04.3.tar.xz";
+      sha256 = "052aqw0z3ap34c9r7r0imidn9iqn0fd2vg7yjpqvi4yy3zv8wjc4";
+      name = "lokalize-18.04.3.tar.xz";
     };
   };
   lskat = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/lskat-18.04.2.tar.xz";
-      sha256 = "0qywkf6bl8mgjwhmcpmhrlfk316ds3afyf2ibgcb15cixv72amw1";
-      name = "lskat-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/lskat-18.04.3.tar.xz";
+      sha256 = "1qi8d06qjjz16ra6svmcl6dfvknls0r42man20nm439nchk4m58y";
+      name = "lskat-18.04.3.tar.xz";
     };
   };
   mailcommon = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/mailcommon-18.04.2.tar.xz";
-      sha256 = "1aszv65xp07gvx98sx2j8dp6m429c1a5g71n825lvj42j2v4221p";
-      name = "mailcommon-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/mailcommon-18.04.3.tar.xz";
+      sha256 = "0g2skri3kajyb5hh0c6qakhbqapnd1zh5labrpi38cygq8b6pnfh";
+      name = "mailcommon-18.04.3.tar.xz";
     };
   };
   mailimporter = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/mailimporter-18.04.2.tar.xz";
-      sha256 = "17fvrnwmd3bs7r87ysab6blnwn3p7vanlbwb1zzlhqw8m4q8f015";
-      name = "mailimporter-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/mailimporter-18.04.3.tar.xz";
+      sha256 = "1pzib2m8048x174wzf1r67x0mjqwhpkv2jsbirlvwiwsyvvia7ix";
+      name = "mailimporter-18.04.3.tar.xz";
     };
   };
   marble = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/marble-18.04.2.tar.xz";
-      sha256 = "0a4i8jbkibjm24zcldzn1nsr3d2kqwjdzj4anchyhfzyk22ac8hd";
-      name = "marble-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/marble-18.04.3.tar.xz";
+      sha256 = "1psg2qyzmqg1yvxn33rb10ybby0fs3njmrcjbjw58yvqv9q78lkz";
+      name = "marble-18.04.3.tar.xz";
     };
   };
   mbox-importer = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/mbox-importer-18.04.2.tar.xz";
-      sha256 = "1ymmwgc7m5k2bg99zfik319zdmx2dw8ni56cqjid1yx5iqmghyl6";
-      name = "mbox-importer-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/mbox-importer-18.04.3.tar.xz";
+      sha256 = "0jjdrl5a1jp3al2vqilaba5239vi3l3s5f0rwk853k0c2gqsm79j";
+      name = "mbox-importer-18.04.3.tar.xz";
     };
   };
   messagelib = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/messagelib-18.04.2.tar.xz";
-      sha256 = "0hjk08na1w943y3pi65a7g8q7m66r7scabbs8cvj3sp31c2f9hfw";
-      name = "messagelib-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/messagelib-18.04.3.tar.xz";
+      sha256 = "025b2ldpayasa6hyfd0zy5hca1cq6xs3pc7j992rv9xwkgmb47wn";
+      name = "messagelib-18.04.3.tar.xz";
     };
   };
   minuet = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/minuet-18.04.2.tar.xz";
-      sha256 = "039la5ifyhv1h7kr1g8zgrkkgvi522d32snxx3cqchyj0dy22ays";
-      name = "minuet-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/minuet-18.04.3.tar.xz";
+      sha256 = "1r4ipkda2jibs0p1xq1s8aggzr5fz0sll94dqrqb7hgfihhmz052";
+      name = "minuet-18.04.3.tar.xz";
     };
   };
   okular = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/okular-18.04.2.tar.xz";
-      sha256 = "1jcrk6czwgpbfi4l6cvsnyxcf0s4jnkiw0py7np7yvycwsf4x7mz";
-      name = "okular-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/okular-18.04.3.tar.xz";
+      sha256 = "0jjmqbwwbrg2svy487dln1lgc0ch80qpnsx8z1ksai3i015ns7f5";
+      name = "okular-18.04.3.tar.xz";
     };
   };
   palapeli = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/palapeli-18.04.2.tar.xz";
-      sha256 = "0fbn1sv6pznl2s3ps1g2f4y400zjxk9ia42120rz1i695v9xcp2f";
-      name = "palapeli-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/palapeli-18.04.3.tar.xz";
+      sha256 = "08llmn4g119fr0ar733xsjwfznk62qz0d0cxjz5h06nz4l06rzzz";
+      name = "palapeli-18.04.3.tar.xz";
     };
   };
   parley = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/parley-18.04.2.tar.xz";
-      sha256 = "0cbab4kqh80gfqvm4iihf78shbkkryg59q3qb5h8m86i22kzf0hv";
-      name = "parley-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/parley-18.04.3.tar.xz";
+      sha256 = "1ynwlzj20vybzmgxb50v7dxkm7hjjc58lw82lvwhh94igklq6mjv";
+      name = "parley-18.04.3.tar.xz";
     };
   };
   picmi = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/picmi-18.04.2.tar.xz";
-      sha256 = "0xs4a0dv3kyl2rkl8whlrhfhs05wzvab2q3k9bdmjn3vkcg6w3kc";
-      name = "picmi-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/picmi-18.04.3.tar.xz";
+      sha256 = "0x3mg8s0dm0p2vzqvcc9ini7af8pdg3y28y02bqs7v2z9gml0hfl";
+      name = "picmi-18.04.3.tar.xz";
     };
   };
   pimcommon = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/pimcommon-18.04.2.tar.xz";
-      sha256 = "0xdng2vrv0mdzxnlcysrhrjkbkv9vmkck20xc9p3kr2qzjl4v4n3";
-      name = "pimcommon-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/pimcommon-18.04.3.tar.xz";
+      sha256 = "0v3glgpvymddmdkfs1gcqmlh4ifk9kyhsqz2nyvyr7b8f38drjdj";
+      name = "pimcommon-18.04.3.tar.xz";
     };
   };
   pim-data-exporter = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/pim-data-exporter-18.04.2.tar.xz";
-      sha256 = "0si2wss4la5d8w0axcv4j8gnx1x4cy0ja8raz77m2ffnwi27rj43";
-      name = "pim-data-exporter-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/pim-data-exporter-18.04.3.tar.xz";
+      sha256 = "1ky6igdfr15vhfpjg1nv60zbc4fwi8b5vwkign911qimk9alga7j";
+      name = "pim-data-exporter-18.04.3.tar.xz";
     };
   };
   pim-sieve-editor = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/pim-sieve-editor-18.04.2.tar.xz";
-      sha256 = "152qrdi48kcjnfhnhk7pa2950bmlww7w2i840zngfr3q7s09kacs";
-      name = "pim-sieve-editor-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/pim-sieve-editor-18.04.3.tar.xz";
+      sha256 = "1pa4z67chyacds6adi53ccdfmr5jhsd3vgpgk0wdmkn82353nvzn";
+      name = "pim-sieve-editor-18.04.3.tar.xz";
     };
   };
   poxml = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/poxml-18.04.2.tar.xz";
-      sha256 = "15nhdkrmyqqcs2lh9c6xn3ny5rb40b97igmicyxw677divlc0aib";
-      name = "poxml-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/poxml-18.04.3.tar.xz";
+      sha256 = "0wi7m1021vj2lama6iqkpsdzx5d4s5h0sbwnf7y5p5k59g7la7rf";
+      name = "poxml-18.04.3.tar.xz";
     };
   };
   print-manager = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/print-manager-18.04.2.tar.xz";
-      sha256 = "1kd7mj9qrf1a24lna9jl7rgc1889hgpr97wasq8542g1wdqwdng9";
-      name = "print-manager-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/print-manager-18.04.3.tar.xz";
+      sha256 = "1ml3jdpz60dhgrcpd05bzs736a65mqkglvvzikkaai0r9wwv4n3k";
+      name = "print-manager-18.04.3.tar.xz";
     };
   };
   rocs = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/rocs-18.04.2.tar.xz";
-      sha256 = "1c0rixfxama65rdd120njgvjan2hj32j5zc7y012yvns495mai5p";
-      name = "rocs-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/rocs-18.04.3.tar.xz";
+      sha256 = "1wx5h09vkpkyg4h3wcnkq8ks6mg9f1h7l5dzv1dpq8shyr9bnnr8";
+      name = "rocs-18.04.3.tar.xz";
     };
   };
   signon-kwallet-extension = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/signon-kwallet-extension-18.04.2.tar.xz";
-      sha256 = "1q2nmprypaybpk59m1r5qxj9daycw1dxj62x6cc4gj4cxkw9q0bw";
-      name = "signon-kwallet-extension-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/signon-kwallet-extension-18.04.3.tar.xz";
+      sha256 = "1f8x0lf0zy18mxkjc11k1j0llqnc3mrn0fnd4ag6qfvx7bhz16fd";
+      name = "signon-kwallet-extension-18.04.3.tar.xz";
     };
   };
   spectacle = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/spectacle-18.04.2.tar.xz";
-      sha256 = "1dyzpqkswl4dlc9ch38r7qh346vm0bj5vb173yf1x40dy4yp2q1n";
-      name = "spectacle-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/spectacle-18.04.3.tar.xz";
+      sha256 = "1qjvq5df0syl7syqdwfl3xh38gz1fysib2a0mnigv1hnln1w0p2b";
+      name = "spectacle-18.04.3.tar.xz";
     };
   };
   step = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/step-18.04.2.tar.xz";
-      sha256 = "0z4k9qaxv066dqmbfwxjfwkc3c8jvl77y6gix8qq181hrz71wcw4";
-      name = "step-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/step-18.04.3.tar.xz";
+      sha256 = "0a370sp71xk8s091qsal3jg4f23wydfy4fccf38craz0wdy6km4q";
+      name = "step-18.04.3.tar.xz";
     };
   };
   svgpart = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/svgpart-18.04.2.tar.xz";
-      sha256 = "1pny7rljyig2fpdxfydnv7i2mja40v0xi9z87w52q43jgnrz71jy";
-      name = "svgpart-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/svgpart-18.04.3.tar.xz";
+      sha256 = "1c2j3p2blvzwlaipgjby7pzaflpzp0pbnnda81lgwbh7blin9k0k";
+      name = "svgpart-18.04.3.tar.xz";
     };
   };
   sweeper = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/sweeper-18.04.2.tar.xz";
-      sha256 = "1dz1a07kdynz405hn78ldn0gi3hn67qp1fl9amzb42r6akzlbzn3";
-      name = "sweeper-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/sweeper-18.04.3.tar.xz";
+      sha256 = "0v86pil9krziz2wbvzj6x7ivq505iy4lx4zjrgpxw2dxmyyp338c";
+      name = "sweeper-18.04.3.tar.xz";
     };
   };
   syndication = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/syndication-18.04.2.tar.xz";
-      sha256 = "05cm4k1zd3jj6v1pbdmpfrky1fyrmwamsihncqn1bw8hx01dzmxp";
-      name = "syndication-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/syndication-18.04.3.tar.xz";
+      sha256 = "1gfimm9x1j079j4q4d51z9nz4x3khlwzjywrip2paxmfrsjcca0g";
+      name = "syndication-18.04.3.tar.xz";
     };
   };
   umbrello = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/umbrello-18.04.2.tar.xz";
-      sha256 = "0gi4ndvh15hvx10by8jk0viqh66ns1hpdd8zabwf9qg8n5gf7b5d";
-      name = "umbrello-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/umbrello-18.04.3.tar.xz";
+      sha256 = "1w46dys13cl29xh3d1fjp2xh09vmsq45bdifwsa1zjlqi0iiw0h1";
+      name = "umbrello-18.04.3.tar.xz";
     };
   };
   zeroconf-ioslave = {
-    version = "18.04.2";
+    version = "18.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.2/src/zeroconf-ioslave-18.04.2.tar.xz";
-      sha256 = "07pnsld72i6i8dx342llw53zjgb91lxh43fl2b7zc3vaxr7vzs62";
-      name = "zeroconf-ioslave-18.04.2.tar.xz";
+      url = "${mirror}/stable/applications/18.04.3/src/zeroconf-ioslave-18.04.3.tar.xz";
+      sha256 = "0mi0kx6gklddj37qzz04n399ijqpzl536z9x1al427mxi53h1xbw";
+      name = "zeroconf-ioslave-18.04.3.tar.xz";
     };
   };
 }
-- 
GitLab


From 553fd39e538cb6abfd5b987c4c1f87f7ce8042d6 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Mon, 16 Jul 2018 10:55:13 -0500
Subject: [PATCH 025/297] hub: 2.4.0 -> 2.5.0

---
 .../version-management/git-and-tools/hub/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/hub/default.nix b/pkgs/applications/version-management/git-and-tools/hub/default.nix
index c9f666390b5..645b12220bd 100644
--- a/pkgs/applications/version-management/git-and-tools/hub/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/hub/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "hub-${version}";
-  version = "2.4.0";
+  version = "2.5.0";
 
   goPackagePath = "github.com/github/hub";
 
@@ -10,7 +10,7 @@ buildGoPackage rec {
     owner = "github";
     repo = "hub";
     rev = "v${version}";
-    sha256 = "1lr6vg0zhg2air9bnzcl811g97jraxq05l3cs46wqqflwy57xpz2";
+    sha256 = "03nj3b17m700l3pib9jlzxz2vh8w54srv6x63l53sb4dff3izfsz";
   };
 
   buildInputs = [ groff ronn ruby utillinux ] ++
-- 
GitLab


From a5f026f77855c6b2ea782e56b54544ad7095902a Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Mon, 16 Jul 2018 05:34:03 -0500
Subject: [PATCH 026/297] emacsPackagesNg.magit: find Git during build

---
 .../editors/emacs-modes/melpa-packages.nix        | 15 ++++++++++-----
 .../editors/emacs-modes/melpa-stable-packages.nix | 13 ++++++++++++-
 pkgs/top-level/all-packages.nix                   |  3 ++-
 pkgs/top-level/emacs-packages.nix                 |  2 +-
 4 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
index c21db447e39..3d432158651 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
@@ -124,11 +124,16 @@ self:
       # upstream issue: missing file header
       maxframe = markBroken super.maxframe;
 
-      # version of magit-popup needs to match magit
-      # https://github.com/magit/magit/issues/3286
-      magit = super.magit.override {
-        inherit (self.melpaPackages) magit-popup;
-      };
+      magit =
+        (super.magit.override {
+          # version of magit-popup needs to match magit
+          # https://github.com/magit/magit/issues/3286
+          inherit (self.melpaPackages) magit-popup;
+        }).overrideAttrs (attrs: {
+          # searches for Git at build time
+          nativeBuildInputs =
+            (attrs.nativeBuildInputs or []) ++ [ external.git ];
+        });
 
       # missing OCaml
       merlin = markBroken super.merlin;
diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix
index 33473ecad3f..bf0d5036897 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix
@@ -13,7 +13,7 @@ To update the list of packages from MELPA,
 
 */
 
-{ lib }:
+{ lib, external }:
 
 self:
 
@@ -132,6 +132,17 @@ self:
       # upstream issue: missing file header
       maxframe = markBroken super.maxframe;
 
+      magit =
+        (super.magit.override {
+          # version of magit-popup needs to match magit
+          # https://github.com/magit/magit/issues/3286
+          inherit (self.melpaStablePackages) magit-popup;
+        }).overrideAttrs (attrs: {
+          # searches for Git at build time
+          nativeBuildInputs =
+            (attrs.nativeBuildInputs or []) ++ [ external.git ];
+        });
+
       # missing OCaml
       merlin = markBroken super.merlin;
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 46d0e93752f..6bb369adb7c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15905,7 +15905,8 @@ with pkgs;
     external = {
       inherit (haskellPackages) ghc-mod structured-haskell-mode Agda hindent;
       inherit (pythonPackages) elpy;
-      inherit rtags libffi autoconf automake libpng zlib poppler pkgconfig w3m;
+      inherit
+        autoconf automake git libffi libpng pkgconfig poppler rtags w3m zlib;
     };
   };
 
diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix
index 1d522f0e9e8..f6c992d5bd5 100644
--- a/pkgs/top-level/emacs-packages.nix
+++ b/pkgs/top-level/emacs-packages.nix
@@ -50,7 +50,7 @@ let
   };
 
   melpaStablePackages = import ../applications/editors/emacs-modes/melpa-stable-packages.nix {
-    inherit lib;
+    inherit external lib;
   };
 
   melpaPackages = import ../applications/editors/emacs-modes/melpa-packages.nix {
-- 
GitLab


From 30585139410578e9cbf3091a3f930dcd22de1ebc Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Mon, 16 Jul 2018 22:45:07 +0200
Subject: [PATCH 027/297] fetchpatch: add option to revert a patch

---
 .../math/sage/patches/revert-269c1e1551285.patch   | 14 --------------
 pkgs/applications/science/math/sage/sage-src.nix   |  7 ++++++-
 pkgs/build-support/fetchpatch/default.nix          | 11 +++++++----
 3 files changed, 13 insertions(+), 19 deletions(-)
 delete mode 100644 pkgs/applications/science/math/sage/patches/revert-269c1e1551285.patch

diff --git a/pkgs/applications/science/math/sage/patches/revert-269c1e1551285.patch b/pkgs/applications/science/math/sage/patches/revert-269c1e1551285.patch
deleted file mode 100644
index b57e48b86de..00000000000
--- a/pkgs/applications/science/math/sage/patches/revert-269c1e1551285.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-reverted:
---- b/src/sage/geometry/polyhedron/backend_cdd.py
-+++ a/src/sage/geometry/polyhedron/backend_cdd.py
-@@ -154,7 +154,9 @@
-             ...    [0.62, -1.38, 0.38],[0.144, -1.04, 0.04],
-             ...    [0.1309090909, -1.0290909091, 0.04]]
-             sage: Polyhedron(point_list)
-+            Traceback (most recent call last):
-+            ...
-+            ValueError: *Error: Numerical inconsistency is found.  Use the GMP exact arithmetic.
--            A 3-dimensional polyhedron in RDF^3 defined as the convex hull of 14 vertices
-             sage: Polyhedron(point_list, base_ring=QQ)
-             A 3-dimensional polyhedron in QQ^3 defined as the convex hull of 14 vertices
-         """
diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix
index 348adf5d509..a785c310bd3 100644
--- a/pkgs/applications/science/math/sage/sage-src.nix
+++ b/pkgs/applications/science/math/sage/sage-src.nix
@@ -156,7 +156,12 @@ stdenv.mkDerivation rec {
       sha256 = "0fmw7pzbaxs2dshky6iw9pr8i23p9ih2y2lw661qypdrxh5xw03k";
       stripLen = 1;
     })
-    ./patches/revert-269c1e1551285.patch
+    (fetchpatch {
+      name = "revert-cddlib-doctest-changes.patch";
+      url = "https://git.sagemath.org/sage.git/patch/?id=269c1e1551285566b8ba7a2b890989e5590e9f11";
+      sha256 = "12bcjhq7hm2pmmj2bgjvcffjyls2x7q61ivlnaj5v5bsvhc183iy";
+      revert = true;
+    })
 
 
     # Only formatting changes.
diff --git a/pkgs/build-support/fetchpatch/default.nix b/pkgs/build-support/fetchpatch/default.nix
index 1e231d649b3..40a7675b7ac 100644
--- a/pkgs/build-support/fetchpatch/default.nix
+++ b/pkgs/build-support/fetchpatch/default.nix
@@ -5,7 +5,7 @@
 # stripLen acts as the -p parameter when applying a patch.
 
 { lib, fetchurl, patchutils }:
-{ stripLen ? 0, extraPrefix ? null, excludes ? [], includes ? [], ... }@args:
+{ stripLen ? 0, extraPrefix ? null, excludes ? [], includes ? [], revert ? false, ... }@args:
 
 fetchurl ({
   postFetch = ''
@@ -37,7 +37,7 @@ fetchurl ({
       ${builtins.toString (builtins.map (x: "-x ${lib.escapeShellArg x}") excludes)} \
       ${builtins.toString (builtins.map (x: "-i ${lib.escapeShellArg x}") includes)} \
       "$tmpfile" > "$out"
-    ${args.postFetch or ""}
+
     if [ ! -s "$out" ]; then
       echo "error: Filtered patch '$out$' is empty (while the original patch file was not)!" 1>&2
       echo "Check your includes and excludes." 1>&2
@@ -45,6 +45,9 @@ fetchurl ({
       cat "$tmpfile" 1>&2
       exit 1
     fi
-  '';
+  '' + lib.optionalString revert ''
+    ${patchutils}/bin/interdiff "$out" /dev/null > "$tmpfile"
+    mv "$tmpfile" "$out"
+  '' + (args.postFetch or "");
   meta.broken = excludes != [] && includes != [];
-} // builtins.removeAttrs args ["stripLen" "extraPrefix" "excludes" "includes" "postFetch"])
+} // builtins.removeAttrs args ["stripLen" "extraPrefix" "excludes" "includes" "revert" "postFetch"])
-- 
GitLab


From e2cbbbb28965784f1226167f8768dc4d08dfa458 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Mon, 16 Jul 2018 21:24:57 -0500
Subject: [PATCH 028/297] whois: 5.3.1 -> 5.3.2

> whois (5.3.2) unstable; urgency=medium
>
>   * Added the .ge TLD server.
>   * Updated the charset for whois.nic.cl. (Closes: #900047)
>   * Updated the list of new gTLDs.
---
 pkgs/tools/networking/whois/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/whois/default.nix b/pkgs/tools/networking/whois/default.nix
index e644578b664..b11d149da88 100644
--- a/pkgs/tools/networking/whois/default.nix
+++ b/pkgs/tools/networking/whois/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, perl, gettext, pkgconfig, libidn2, libiconv }:
 
 stdenv.mkDerivation rec {
-  version = "5.3.1";
+  version = "5.3.2";
   name = "whois-${version}";
 
   src = fetchFromGitHub {
     owner = "rfc1036";
     repo = "whois";
     rev = "v${version}";
-    sha256 = "1xqvcsh70590bwmy37kwlwyl0rvnlqx987km3mnij93q4kvabg5n";
+    sha256 = "1sd6jl349kz3bjwm8rx9kihxyd3d35cac4swla843vwzdpczsk5f";
   };
 
   nativeBuildInputs = [ perl gettext pkgconfig ];
-- 
GitLab


From d23e72ebf7f9b41a9e908dd1d02e7dc23c0fc53d Mon Sep 17 00:00:00 2001
From: Mathieu Boespflug <m@tweag.io>
Date: Thu, 28 Jun 2018 18:05:32 +0200
Subject: [PATCH 029/297] bazel: 0.13.0 -> 0.15.0

Upgrade to latest Bazel.
---
 pkgs/development/tools/build-managers/bazel/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix
index 0441ba0c665..6c41e4aa0b8 100644
--- a/pkgs/development/tools/build-managers/bazel/default.nix
+++ b/pkgs/development/tools/build-managers/bazel/default.nix
@@ -8,7 +8,7 @@
 
 stdenv.mkDerivation rec {
 
-  version = "0.13.0";
+  version = "0.15.0";
 
   meta = with stdenv.lib; {
     homepage = "https://github.com/bazelbuild/bazel/";
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip";
-    sha256 = "143nd9dmw2x88azf8spinl2qnvw9m8lqlqc765l9q2v6hi807sc2";
+    sha256 = "00mnlzcflnsdah8dvpaq0jqawmhgmv9mrjah6cr8qssycbk1ddy3";
   };
 
   sourceRoot = ".";
-- 
GitLab


From 62f3bf75092288aa2753d24a8f5d9e5bb64cf211 Mon Sep 17 00:00:00 2001
From: Mathieu Boespflug <m@tweag.io>
Date: Sun, 15 Jul 2018 22:54:26 +0200
Subject: [PATCH 030/297] bazel: make the build --sandbox compatible by
 building extra deps separately.

---
 .../tools/build-managers/bazel/default.nix       | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix
index 6c41e4aa0b8..6ba6732f69f 100644
--- a/pkgs/development/tools/build-managers/bazel/default.nix
+++ b/pkgs/development/tools/build-managers/bazel/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, jdk, zip, unzip, bash, writeCBin, coreutils, makeWrapper, which, python, gnused
+{ stdenv, lib, fetchurl, runCommand, jdk, zip, unzip, bash, writeCBin, coreutils, makeWrapper, which, python, gnused
 # Always assume all markers valid (don't redownload dependencies).
 # Also, don't clean up environment variables.
 , enableNixHacks ? false
@@ -6,6 +6,17 @@
 , libcxx, CoreFoundation, CoreServices, Foundation
 }:
 
+let srcDeps = stdenv.lib.singleton (
+      fetchurl {
+        url = "https://github.com/google/desugar_jdk_libs/archive/f5e6d80c6b4ec6b0a46603f72b015d45cf3c11cd.zip";
+        sha256 = "c80f3f3d442d8a6ca7adc83f90ecd638c3864087fdd6787ffac070b6f1cc8f9b";
+      }
+    );
+    distDir = runCommand "bazel-deps" {} ''
+      mkdir -p $out
+      for i in ${builtins.toString srcDeps}; do cp $i $out/$(stripHash $i); done
+    '';
+in
 stdenv.mkDerivation rec {
 
   version = "0.15.0";
@@ -67,6 +78,9 @@ stdenv.mkDerivation rec {
     # Fixup scripts that generate scripts. Not fixed up by patchShebangs below.
     substituteInPlace scripts/bootstrap/compile.sh \
         --replace /bin/sh ${customBash}/bin/bash
+
+    echo "build --experimental_distdir=${distDir}" >> .bazelrc
+    echo "fetch --experimental_distdir=${distDir}" >> .bazelrc
     echo "build --copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --copt=\"/g')\"" >> .bazelrc
     echo "build --host_copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --host_copt=\"/g')\"" >> .bazelrc
     echo "build --linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --linkopt=\"-Wl,/g')\"" >> .bazelrc
-- 
GitLab


From 75942f96b3f7136cdc9cc7d9704824f17fabec02 Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Mon, 16 Jul 2018 19:58:49 +0200
Subject: [PATCH 031/297] bazel: 0.15 -> 0.15.1

---
 pkgs/development/tools/build-managers/bazel/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix
index 6ba6732f69f..b4e3dfa0e0f 100644
--- a/pkgs/development/tools/build-managers/bazel/default.nix
+++ b/pkgs/development/tools/build-managers/bazel/default.nix
@@ -19,7 +19,7 @@ let srcDeps = stdenv.lib.singleton (
 in
 stdenv.mkDerivation rec {
 
-  version = "0.15.0";
+  version = "0.15.1";
 
   meta = with stdenv.lib; {
     homepage = "https://github.com/bazelbuild/bazel/";
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip";
-    sha256 = "00mnlzcflnsdah8dvpaq0jqawmhgmv9mrjah6cr8qssycbk1ddy3";
+    sha256 = "0v7wdwbxy4bcx488lm1glf4iv3wfdwbkg8fh6kmmmfn1lhgkaay6";
   };
 
   sourceRoot = ".";
-- 
GitLab


From 69affb8d263c186665300824175610733a374330 Mon Sep 17 00:00:00 2001
From: Igor Tarasov <i.s.tarasov@gmail.com>
Date: Tue, 17 Jul 2018 12:45:56 +0300
Subject: [PATCH 032/297] qtcreator: 4.5.0 -> 4.6.2

---
 pkgs/development/tools/qtcreator/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/qtcreator/default.nix b/pkgs/development/tools/qtcreator/default.nix
index de94b7a8eff..38d385d1d55 100644
--- a/pkgs/development/tools/qtcreator/default.nix
+++ b/pkgs/development/tools/qtcreator/default.nix
@@ -6,8 +6,8 @@
 with stdenv.lib;
 
 let
-  baseVersion = "4.5";
-  revision = "0";
+  baseVersion = "4.6";
+  revision = "2";
 in
 
 stdenv.mkDerivation rec {
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://download.qt-project.org/official_releases/qtcreator/${baseVersion}/${version}/qt-creator-opensource-src-${version}.tar.xz";
-    sha256 = "1yfrfma23xxzz8hl43g7pk7ay5lg25l9lscjlih617lyv6jmc0hl";
+    sha256 = "1k23i1qsw6d06sy7g0vd699rbvwv6vbw211fy0nn0705a5zndbxv";
   };
 
   buildInputs = [ qtbase qtscript qtquickcontrols qtdeclarative ];
-- 
GitLab


From fa4c1eeae6e42205efd1d35884313c7da23beff4 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Tue, 17 Jul 2018 12:40:20 +0200
Subject: [PATCH 033/297] virtualbox: 5.2.12 -> 5.2.14

---
 pkgs/applications/virtualization/virtualbox/default.nix   | 8 ++++----
 .../virtualization/virtualbox/guest-additions/default.nix | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix
index 883cd1c867a..e7ab3aa251c 100644
--- a/pkgs/applications/virtualization/virtualbox/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/default.nix
@@ -21,10 +21,10 @@ let
   buildType = "release";
   # Manually sha256sum the extensionPack file, must be hex!
   # Do not forget to update the hash in ./guest-additions/default.nix!
-  extpack = "4c36d129f17dcab2bb37292022f1b1adfefa5f32a3161b0d5d40784bc8acf4d0";
-  extpackRev = "122591";
-  main = "0n1lip8lkz4qqq5ml47xldsx41919ncfh060i7yj51bhas604q6s";
-  version = "5.2.12";
+  extpack = "d90c1b0c89de19010f7c7fe7a675ac744067baf29a9966b034e97b5b2053b37e";
+  extpackRev = "123301";
+  main = "ee3af129a581ec4c1a3e777e98247f8943e976ce6edd24962bcaa5c53ed1f644";
+  version = "5.2.14";
 
   # See https://github.com/NixOS/nixpkgs/issues/672 for details
   extensionPack = requireFile rec {
diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
index 6ea0333936b..dcc58b04c8e 100644
--- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso";
-    sha256 = "b81d283d9ef88a44e7ac8983422bead0823c825cbfe80417423bd12de91b8046";
+    sha256 = "e149ff0876242204fe924763f9272f691242d6a6ad4538a128fb7dba770781de";
   };
 
   KERN_DIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build";
-- 
GitLab


From c17decb15cf15fe8c007d1e5e88b935c95e4725c Mon Sep 17 00:00:00 2001
From: Zack Grannan <zgrannan@gmail.com>
Date: Tue, 17 Jul 2018 19:24:13 +0800
Subject: [PATCH 034/297] markdown-pp: init at 1.4 (#43525)

* markdown-pp: init at 1.3

* Increment version, fix tests
---
 maintainers/maintainer-list.nix         |  5 +++++
 pkgs/tools/text/markdown-pp/default.nix | 24 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix         |  2 ++
 3 files changed, 31 insertions(+)
 create mode 100644 pkgs/tools/text/markdown-pp/default.nix

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 602cd5bdd94..67a03de4e6a 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -4420,6 +4420,11 @@
     email = "zef@zef.me";
     name = "Zef Hemel";
   };
+  zgrannan = {
+    email = "zgrannan@gmail.com";
+    github = "zgrannan";
+    name = "Zack Grannan";
+  };
   zimbatm = {
     email = "zimbatm@zimbatm.com";
     github = "zimbatm";
diff --git a/pkgs/tools/text/markdown-pp/default.nix b/pkgs/tools/text/markdown-pp/default.nix
new file mode 100644
index 00000000000..f479c221b65
--- /dev/null
+++ b/pkgs/tools/text/markdown-pp/default.nix
@@ -0,0 +1,24 @@
+{ fetchFromGitHub, pythonPackages, stdenv }:
+
+with pythonPackages;
+buildPythonApplication rec {
+  pname = "MarkdownPP";
+  version = "1.4";
+  propagatedBuildInputs = [ pillow watchdog ];
+  checkPhase = ''
+    cd test
+    PATH=$out/bin:$PATH ${python}/bin/${python.executable} test.py
+  '';
+  src = fetchFromGitHub {
+    owner = "jreese";
+    repo = "markdown-pp";
+    rev = "v${version}";
+    sha256 = "1xmc0cxvvf6jzr7p4f0hm8icysrd44sy2kgff9b99lr1agwkmysq";
+  };
+  meta = with stdenv.lib; {
+    description = "Preprocessor for Markdown files to generate a table of contents and other documentation needs";
+    license = licenses.mit;
+    homepage = "https://github.com/jreese/markdown-pp";
+    maintainers = with maintainers; [ zgrannan ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e276ebc706a..d61efc2be4a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17131,6 +17131,8 @@ with pkgs;
   marathon = callPackage ../applications/networking/cluster/marathon { };
   marathonctl = callPackage ../tools/virtualization/marathonctl { } ;
 
+  markdown-pp = callPackage ../tools/text/markdown-pp { };
+
   marp = callPackage ../applications/office/marp { };
 
   matchbox = callPackage ../applications/window-managers/matchbox { };
-- 
GitLab


From 325dd796d1811b32d4e0b0a5dc27e4b79abe4347 Mon Sep 17 00:00:00 2001
From: MarcFontaine <MarcFontaine@users.noreply.github.com>
Date: Mon, 16 Jul 2018 10:52:14 +0200
Subject: [PATCH 035/297] xlog: init at 2.0.15

---
 pkgs/applications/misc/xlog/default.nix | 29 +++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix         |  2 ++
 2 files changed, 31 insertions(+)
 create mode 100644 pkgs/applications/misc/xlog/default.nix

diff --git a/pkgs/applications/misc/xlog/default.nix b/pkgs/applications/misc/xlog/default.nix
new file mode 100644
index 00000000000..3ba7062b7bb
--- /dev/null
+++ b/pkgs/applications/misc/xlog/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchurl, glib, gtk2, pkgconfig, hamlib }:
+stdenv.mkDerivation rec {
+  name = "xlog-${version}";
+  version = "2.0.15";
+  
+  src = fetchurl {
+    url = "http://download.savannah.gnu.org/releases/xlog/${name}.tar.gz";
+    sha256 = "0an883wqw3zwpw8nqinm9cb17hp2xw9vf603k4l2345p61jqdw2j";
+  };
+
+  buildInputs = [ glib pkgconfig gtk2 hamlib ];
+
+  meta = with stdenv.lib; {
+    description = "An amateur radio logging program";
+    longDescription =
+      '' Xlog is an amateur radio logging program.
+         It supports cabrillo, ADIF, trlog (format also used by tlf),
+         and EDI (ARRL VHF/UHF contest format) and can import twlog, editest and OH1AA logbook files.
+         Xlog is able to do DXCC lookups and will display country information, CQ and ITU zone,
+         location in latitude and longitude and distance and heading in kilometers or miles,
+         both for short and long path. 
+      '';
+    homepage = http://www.nongnu.org/xlog;
+    maintainers = [ maintainers.mafo ];
+    license = licenses.gpl3;
+    platforms = platforms.unix;
+  };
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e0e4bfd4043..ddfbe5b89e3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21758,6 +21758,8 @@ with pkgs;
 
   xinput_calibrator = callPackage ../tools/X11/xinput_calibrator { };
 
+  xlog = callPackage ../applications/misc/xlog { };
+
   xmagnify = callPackage ../tools/X11/xmagnify { };
 
   xosd = callPackage ../misc/xosd { };
-- 
GitLab


From 7682a1f0ec0a6e0c63f6456b9e956255af62ca58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Tue, 17 Jul 2018 14:32:38 +0200
Subject: [PATCH 036/297] home-assistant: 0.73.1 -> 0.73.2

This fixes a security hole allowing man in the middle attacks.
See https://www.home-assistant.io/blog/2018/07/16/release-73-2/.
---
 pkgs/servers/home-assistant/component-packages.nix | 2 +-
 pkgs/servers/home-assistant/default.nix            | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index 9c645d59b2c..16084ca4ae4 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -2,7 +2,7 @@
 # Do not edit!
 
 {
-  version = "0.73.1";
+  version = "0.73.2";
   components = {
     "abode" = ps: with ps; [  ];
     "ads" = ps: with ps; [  ];
diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix
index 3642fb6b16d..e37da61958c 100644
--- a/pkgs/servers/home-assistant/default.nix
+++ b/pkgs/servers/home-assistant/default.nix
@@ -68,7 +68,7 @@ let
   extraBuildInputs = extraPackages py.pkgs;
 
   # Don't forget to run parse-requirements.py after updating
-  hassVersion = "0.73.1";
+  hassVersion = "0.73.2";
 
 in with py.pkgs; buildPythonApplication rec {
   pname = "homeassistant";
@@ -83,7 +83,7 @@ in with py.pkgs; buildPythonApplication rec {
     owner = "home-assistant";
     repo = "home-assistant";
     rev = version;
-    sha256 = "1hcxwsyj15qks2il06dbwk1ycwspz97pgrwydp00qgcraw0yafmp";
+    sha256 = "1hfxwm49hgikdh827jnlzgfz9h51rjz1gm841f5iz1vwz301l6sk";
   };
 
   propagatedBuildInputs = [
-- 
GitLab


From cf00b9aff4890dc5bbf091cd14f87a7e434004b6 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Mon, 16 Jul 2018 23:29:06 +0200
Subject: [PATCH 037/297] ksonnet: init at 0.11.0

closes #42596
---
 .../networking/cluster/ksonnet/default.nix    | 23 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 25 insertions(+)
 create mode 100644 pkgs/applications/networking/cluster/ksonnet/default.nix

diff --git a/pkgs/applications/networking/cluster/ksonnet/default.nix b/pkgs/applications/networking/cluster/ksonnet/default.nix
new file mode 100644
index 00000000000..b8bce931523
--- /dev/null
+++ b/pkgs/applications/networking/cluster/ksonnet/default.nix
@@ -0,0 +1,23 @@
+{ lib, buildGoPackage, fetchFromGitHub, ... }:
+
+buildGoPackage rec {
+  version = "0.11.0";
+  name = "ksonnet-${version}";
+
+  src = fetchFromGitHub {
+    owner = "ksonnet";
+    repo = "ksonnet";
+    rev = "v${version}";
+    sha256 = "0z7gkgcsiclm72bznmzv5jcgx5rblndcsiqc0r2mwhxhmv19bs04";
+  };
+
+  goPackagePath = "github.com/ksonnet/ksonnet";
+
+  meta = {
+    description = "A CLI-supported framework that streamlines writing and deployment of Kubernetes configurations to multiple clusters";
+    homepage = https://github.com/ksonnet/ksonnet;
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ flokli ];
+    platforms = lib.platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e0e4bfd4043..be5be205830 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16948,6 +16948,8 @@ with pkgs;
 
   ktorrent = libsForQt5.callPackage ../applications/networking/p2p/ktorrent { };
 
+  ksonnet = callPackage ../applications/networking/cluster/ksonnet { };
+
   kubecfg = callPackage ../applications/networking/cluster/kubecfg { };
 
   kubernetes = callPackage ../applications/networking/cluster/kubernetes {  };
-- 
GitLab


From 8aec1a4ba6ef9a1fedaca21a1066b028377786e8 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Tue, 17 Jul 2018 09:18:59 -0400
Subject: [PATCH 038/297] linux: 4.4.130 -> 4.4.141

---
 pkgs/os-specific/linux/kernel/linux-4.4.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix
index 2192cdeb9f8..b1a2c0982f7 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix
@@ -1,11 +1,11 @@
 { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
 
 buildLinux (args // rec {
-  version = "4.4.140";
+  version = "4.4.141";
   extraMeta.branch = "4.4";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1fy7hq438sqxcdgac5dw71qbb9g38z7bdqjyl79a1b0cvqy8yk0q";
+    sha256 = "08nbz4xg43v57h0x5zw69vnjkvddl9ppi0vwzwf6yxd3ism4p3ci";
   };
 } // (args.argsOverride or {}))
-- 
GitLab


From 9be6011fedaa86c77e3becaf416ea8b4d83d91a8 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Tue, 17 Jul 2018 09:19:07 -0400
Subject: [PATCH 039/297] linux: 4.9.112 -> 4.9.113

---
 pkgs/os-specific/linux/kernel/linux-4.9.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix
index c728137ccfb..7d92d8a7852 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.9.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix
@@ -1,11 +1,11 @@
 { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
 
 buildLinux (args // rec {
-  version = "4.9.112";
+  version = "4.9.113";
   extraMeta.branch = "4.9";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1pphyrqi20w8k9rg5mjkl0g3f2152c4gqzhgdi4hz8mad972kv30";
+    sha256 = "0yxwsaxnz0k03b1zj1l95ls8qm2rra9hygnjzh9z60sax56myn63";
   };
 } // (args.argsOverride or {}))
-- 
GitLab


From 4f2395ee2e4bd97cd81869519236ff01dca663a5 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Tue, 17 Jul 2018 09:19:15 -0400
Subject: [PATCH 040/297] linux: 4.14.55 -> 4.14.56

---
 pkgs/os-specific/linux/kernel/linux-4.14.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix
index 3249d6e272d..8d34e05b889 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.14.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "4.14.55";
+  version = "4.14.56";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1mq23s990bi8nmz9rgkiln6zfxzbhcjg0hh512flp36scgi32r47";
+    sha256 = "0b647c9zs7srrxhk48aaln0q92kq7xhq9gvjc6g38fnlqvx6rxfl";
   };
 } // (args.argsOverride or {}))
-- 
GitLab


From e73a01f3e969c71a1dc02d3251beff04caddcad2 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Tue, 17 Jul 2018 09:19:25 -0400
Subject: [PATCH 041/297] linux: 4.17.6 -> 4.17.7

---
 pkgs/os-specific/linux/kernel/linux-4.17.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-4.17.nix b/pkgs/os-specific/linux/kernel/linux-4.17.nix
index 133bcb4343c..90acca8a6d3 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.17.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.17.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "4.17.6";
+  version = "4.17.7";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "15b3k79cjlgrc4q39p1laxz2p102d6a7bpfq0mh9724qs64xd795";
+    sha256 = "16bbvxr4ncql7sk505g81c0i3bichqz11dfvgaji57d1yaknx4k4";
   };
 } // (args.argsOverride or {}))
-- 
GitLab


From da5383006d61f8f02f67daba529c533354ef75c5 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Tue, 17 Jul 2018 08:42:55 -0500
Subject: [PATCH 042/297] haskell-modules: only include glibc locales when
 using glibc

Fixes #43665.
Hopefully. :)
---
 pkgs/development/haskell-modules/generic-stack-builder.nix | 2 +-
 pkgs/development/haskell-modules/make-package-set.nix      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/haskell-modules/generic-stack-builder.nix b/pkgs/development/haskell-modules/generic-stack-builder.nix
index 9ea9dae02db..591de1236d4 100644
--- a/pkgs/development/haskell-modules/generic-stack-builder.nix
+++ b/pkgs/development/haskell-modules/generic-stack-builder.nix
@@ -27,7 +27,7 @@ in stdenv.mkDerivation (args // {
 
   buildInputs =
     buildInputs ++
-    optional stdenv.isLinux glibcLocales ++
+    optional (stdenv.hostPlatform.libc == "glibc") glibcLocales ++
     [ ghc pkgconfig stack ];
 
   STACK_PLATFORM_VARIANT="nix";
diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix
index 87ac65307aa..95dac230cc5 100644
--- a/pkgs/development/haskell-modules/make-package-set.nix
+++ b/pkgs/development/haskell-modules/make-package-set.nix
@@ -128,7 +128,7 @@ let
       preferLocalBuild = true;
       phases = ["installPhase"];
       LANG = "en_US.UTF-8";
-      LOCALE_ARCHIVE = pkgs.lib.optionalString buildPlatform.isLinux "${buildPackages.glibcLocales}/lib/locale/locale-archive";
+      LOCALE_ARCHIVE = pkgs.lib.optionalString (buildPlatform.libc == "glibc") "${buildPackages.glibcLocales}/lib/locale/locale-archive";
       installPhase = ''
         export HOME="$TMP"
         mkdir -p "$out"
-- 
GitLab


From 4bafaaff8abdce1dd5c43bc89a05aadab91b5747 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Sun, 8 Jul 2018 00:08:48 +0000
Subject: [PATCH 043/297] config.skipAliases: also disable vimPlugins, git,
 xfce and gnome3 aliases

---
 .../git-and-tools/default.nix                 |  12 +-
 pkgs/desktops/gnome-3/default.nix             |   3 +-
 pkgs/desktops/xfce/default.nix                |   3 +-
 pkgs/misc/vim-plugins/default.nix             | 231 +++++++++---------
 4 files changed, 128 insertions(+), 121 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix
index 24da6a71c58..07eab6a68c0 100644
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@@ -1,7 +1,7 @@
 /* All git-relates tools live here, in a separate attribute set so that users
  * can get a fast overview over what's available.
  */
-args @ {pkgs}: with args; with pkgs;
+args @ {config, lib, pkgs}: with args; with pkgs;
 let
   gitBase = callPackage ./git {
     texinfo = texinfo5;
@@ -17,8 +17,7 @@ let
     ];
   };
 
-in
-rec {
+  self = rec {
   # Try to keep this generally alphabetized
 
   bfg-repo-cleaner = callPackage ./bfg-repo-cleaner { };
@@ -48,7 +47,6 @@ rec {
   }));
 
   git-annex = pkgs.haskellPackages.git-annex;
-  gitAnnex = git-annex;
 
   git-annex-metadata-gui = libsForQt5.callPackage ./git-annex-metadata-gui {
     inherit (python3Packages) buildPythonApplication pyqt5 git-annex-adapter;
@@ -132,6 +130,10 @@ rec {
 
   transcrypt = callPackage ./transcrypt { };
 
+} // lib.optionalAttrs (config.skipAliases or false == false) (with self; {
   # aliases
+  gitAnnex = git-annex;
   svn_all_fast_export = svn-all-fast-export;
-}
+});
+in
+  self
diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix
index 5b4c6dd88b4..a6c8db1b886 100644
--- a/pkgs/desktops/gnome-3/default.nix
+++ b/pkgs/desktops/gnome-3/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, lib }:
+{ config, pkgs, lib }:
 
 lib.makeScope pkgs.newScope (self: with self; {
   # Convert a version to branch (3.26.18 → 3.26)
@@ -391,6 +391,7 @@ lib.makeScope pkgs.newScope (self: with self; {
 
   gnome-packagekit = callPackage ./misc/gnome-packagekit { };
 
+} // lib.optionalAttrs (config.skipAliases or false == false) {
 #### Legacy aliases
 
   evolution_data_server = evolution-data-server; # added 2018-02-25
diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix
index 67580c53072..47d42f4c4a2 100644
--- a/pkgs/desktops/xfce/default.nix
+++ b/pkgs/desktops/xfce/default.nix
@@ -1,4 +1,4 @@
-{ lib, pkgs }:
+{ config, lib, pkgs }:
 
 lib.makeScope pkgs.newScope (self: with self; {
   #### NixOS support
@@ -159,6 +159,7 @@ lib.makeScope pkgs.newScope (self: with self; {
 
   xfce4_power_manager_gtk3 = xfce4-power-manager.override { withGtk3 = true; };
 
+} // lib.optionalAttrs (config.skipAliases or false == false) {
   #### ALIASES - added 2018-01
 
   terminal = xfce4-terminal;
diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index 68d0bb69b34..6b626196a1b 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -1,5 +1,5 @@
 # TODO check that no license information gets lost
-{ fetchurl, stdenv, python, git, go, cmake, vim, vimUtils, perl, ruby
+{ config, lib, fetchurl, stdenv, python, git, go, cmake, vim, vimUtils, perl, ruby
 , which, fetchgit, llvmPackages, rustPlatform
 , xkb_switch, rustracerd, fzf, skim
 , python3, boost, icu, ncurses
@@ -14,9 +14,9 @@ let
 
   _skim = skim;
 
-inherit (vimUtils.override {inherit vim;}) rtpPath addRtp buildVimPlugin
-  buildVimPluginFrom2Nix vimHelpTags;
-in
+  inherit (vimUtils.override {inherit vim;}) rtpPath addRtp buildVimPlugin
+    buildVimPluginFrom2Nix vimHelpTags;
+
 
 # TL;DR
 # Add your plugin to ./vim-plugin-names
@@ -32,7 +32,7 @@ in
 # Documentation & usage see vim-utils.nix.
 # attribute names should be the same as used by vim-pi to make dependency
 # resolution work
-rec {
+  self = rec {
   # This is not a plugin, it provides bin/vim-open-buffer-with-plugins-derivations
   # which recreates this the following derivations based on ./vim-plugin-names
   pluginnames2nix = vimUtils.pluginnames2Nix {
@@ -53,114 +53,6 @@ rec {
   # Section II
   # Update with vimUtils.vimPlugins.pluginnames2Nix command
 
-  # aliasess
-  airline             = vim-airline;
-  alternative         = a-vim; # backwards compat, added 2014-10-21
-  bats                = bats-vim;
-  calendar            = calendar-vim;
-  coffee-script       = vim-coffee-script;
-  coffeeScript        = coffee-script; # backwards compat, added 2014-10-18
-  Solarized           = vim-colors-solarized;
-  solarized           = vim-colors-solarized;
-  colors-solarized    = vim-colors-solarized;
-  caw                 = caw-vim;
-  colorsamplerpack    = Colour_Sampler_Pack;
-  Colour_Sampler_Pack = Colour-Sampler-Pack;
-  command_T           = command-t; # backwards compat, added 2014-10-18
-  commentary          = vim-commentary;
-  committia           = committia-vim-git;
-  concealedyank       = concealedyank-vim;
-  context-filetype    = context_filetype-vim;
-  Cosco               = cosco-vim;
-  css_color_5056      = vim-css-color;
-  CSApprox            = csapprox;
-  csv                 = csv-vim;
-  ctrlp               = ctrlp-vim;
-  cute-python         = vim-cute-python-git;
-  denite              = denite-nvim;
-  easy-align          = vim-easy-align;
-  easygit             = vim-easygit;
-  easymotion          = vim-easymotion;
-  echodoc             = echodoc-vim;
-  eighties            = vim-eighties;
-  extradite           = vim-extradite;
-  fugitive            = vim-fugitive;
-  ghc-mod-vim         = ghcmod-vim;
-  ghcmod              = ghcmod-vim;
-  goyo                = goyo-vim;
-  Gist                = gist-vim;
-  gitgutter           = vim-gitgutter;
-  gundo               = gundo-vim;
-  Gundo               = gundo-vim; # backwards compat, added 2015-10-03
-  haskellConceal      = haskellconceal; # backwards compat, added 2014-10-18
-  haskellConcealPlus  = vim-haskellConcealPlus;
-  haskellconceal      = vim-haskellconceal;
-  hier                = vim-hier;
-  hlint-refactor      = hlint-refactor-vim;
-  hoogle              = vim-hoogle;
-  Hoogle              = vim-hoogle;
-  ipython             = vim-ipython;
-  latex-live-preview  = vim-latex-live-preview;
-  mayansmoke          = mayansmoke-git;
-  multiple-cursors    = vim-multiple-cursors;
-  necoGhc             = neco-ghc; # backwards compat, added 2014-10-18
-  neocomplete         = neocomplete-vim;
-  neoinclude          = neoinclude-vim;
-  neomru              = neomru-vim;
-  neosnippet          = neosnippet-vim;
-  neoyank             = neoyank-vim-git;
-  The_NERD_Commenter  = nerdcommenter;
-  The_NERD_tree       = nerdtree;
-  open-browser        = open-browser-vim;
-  pathogen            = vim-pathogen;
-  peskcolor           = peskcolor-vim-git;
-  polyglot            = vim-polyglot;
-  prettyprint         = vim-prettyprint;
-  quickrun            = vim-quickrun;
-  rainbow_parentheses = rainbow_parentheses-vim;
-  repeat              = vim-repeat;
-  riv                 = riv-vim;
-  rhubarb             = vim-rhubarb;
-  sensible            = vim-sensible;
-  signature           = vim-signature;
-  snipmate            = vim-snipmate;
-  sourcemap           = sourcemap-vim;
-  "sourcemap.vim"     = sourcemap-vim;
-  surround            = vim-surround;
-  sleuth              = vim-sleuth;
-  solidity            = vim-solidity;
-  stylish-haskell     = vim-stylish-haskell;
-  stylishHaskell      = stylish-haskell; # backwards compat, added 2014-10-18
-  Supertab            = supertab;
-  Syntastic           = syntastic;
-  SyntaxRange         = vim-SyntaxRange;
-  table-mode          = vim-table-mode;
-  taglist             = taglist-vim;
-  tabpagebuffer       = tabpagebuffer-vim;
-  tabpagecd           = vim-tabpagecd;
-  Tabular             = tabular;
-  Tagbar              = tagbar;
-  thumbnail           = thumbnail-vim;
-  tlib                = tlib_vim;
-  tmux-navigator      = vim-tmux-navigator;
-  tmuxNavigator       = tmux-navigator; # backwards compat, added 2014-10-18
-  tslime              = tslime-vim;
-  unite               = unite-vim;
-  UltiSnips           = ultisnips;
-  vim-grepper         = vim-grepper-git;
-  vim-test            = vim-test-git;
-  vimproc             = vimproc-vim;
-  vimshell            = vimshell-vim;
-  vinegar             = vim-vinegar;
-  watchdogs           = vim-watchdogs;
-  WebAPI              = webapi-vim;
-  wombat256           = wombat256-vim; # backwards compat, added 2015-7-8
-  yankring            = YankRing-vim;
-  Yankring            = YankRing-vim;
-  YouCompleteMe       = youcompleteme;
-  xterm-color-table   = xterm-color-table-vim;
-  zeavim              = zeavim-vim;
-
   fzfWrapper = buildVimPluginFrom2Nix {
     name = fzf.name;
     src = fzf.src;
@@ -3320,4 +3212,115 @@ rec {
     dependencies = [];
 
   };
-}
+
+} // lib.optionalAttrs (config.skipAliases or false == false) (with self; {
+
+  # aliasess
+  airline             = vim-airline;
+  alternative         = a-vim; # backwards compat, added 2014-10-21
+  bats                = bats-vim;
+  calendar            = calendar-vim;
+  coffee-script       = vim-coffee-script;
+  coffeeScript        = coffee-script; # backwards compat, added 2014-10-18
+  Solarized           = vim-colors-solarized;
+  solarized           = vim-colors-solarized;
+  colors-solarized    = vim-colors-solarized;
+  caw                 = caw-vim;
+  colorsamplerpack    = Colour_Sampler_Pack;
+  Colour_Sampler_Pack = Colour-Sampler-Pack;
+  command_T           = command-t; # backwards compat, added 2014-10-18
+  commentary          = vim-commentary;
+  committia           = committia-vim-git;
+  concealedyank       = concealedyank-vim;
+  context-filetype    = context_filetype-vim;
+  Cosco               = cosco-vim;
+  css_color_5056      = vim-css-color;
+  CSApprox            = csapprox;
+  csv                 = csv-vim;
+  ctrlp               = ctrlp-vim;
+  cute-python         = vim-cute-python-git;
+  denite              = denite-nvim;
+  easy-align          = vim-easy-align;
+  easygit             = vim-easygit;
+  easymotion          = vim-easymotion;
+  echodoc             = echodoc-vim;
+  eighties            = vim-eighties;
+  extradite           = vim-extradite;
+  fugitive            = vim-fugitive;
+  ghc-mod-vim         = ghcmod-vim;
+  ghcmod              = ghcmod-vim;
+  goyo                = goyo-vim;
+  Gist                = gist-vim;
+  gitgutter           = vim-gitgutter;
+  gundo               = gundo-vim;
+  Gundo               = gundo-vim; # backwards compat, added 2015-10-03
+  haskellConceal      = haskellconceal; # backwards compat, added 2014-10-18
+  haskellConcealPlus  = vim-haskellConcealPlus;
+  haskellconceal      = vim-haskellconceal;
+  hier                = vim-hier;
+  hlint-refactor      = hlint-refactor-vim;
+  hoogle              = vim-hoogle;
+  Hoogle              = vim-hoogle;
+  ipython             = vim-ipython;
+  latex-live-preview  = vim-latex-live-preview;
+  mayansmoke          = mayansmoke-git;
+  multiple-cursors    = vim-multiple-cursors;
+  necoGhc             = neco-ghc; # backwards compat, added 2014-10-18
+  neocomplete         = neocomplete-vim;
+  neoinclude          = neoinclude-vim;
+  neomru              = neomru-vim;
+  neosnippet          = neosnippet-vim;
+  neoyank             = neoyank-vim-git;
+  The_NERD_Commenter  = nerdcommenter;
+  The_NERD_tree       = nerdtree;
+  open-browser        = open-browser-vim;
+  pathogen            = vim-pathogen;
+  peskcolor           = peskcolor-vim-git;
+  polyglot            = vim-polyglot;
+  prettyprint         = vim-prettyprint;
+  quickrun            = vim-quickrun;
+  rainbow_parentheses = rainbow_parentheses-vim;
+  repeat              = vim-repeat;
+  riv                 = riv-vim;
+  rhubarb             = vim-rhubarb;
+  sensible            = vim-sensible;
+  signature           = vim-signature;
+  snipmate            = vim-snipmate;
+  sourcemap           = sourcemap-vim;
+  "sourcemap.vim"     = sourcemap-vim;
+  surround            = vim-surround;
+  sleuth              = vim-sleuth;
+  solidity            = vim-solidity;
+  stylish-haskell     = vim-stylish-haskell;
+  stylishHaskell      = stylish-haskell; # backwards compat, added 2014-10-18
+  Supertab            = supertab;
+  Syntastic           = syntastic;
+  SyntaxRange         = vim-SyntaxRange;
+  table-mode          = vim-table-mode;
+  taglist             = taglist-vim;
+  tabpagebuffer       = tabpagebuffer-vim;
+  tabpagecd           = vim-tabpagecd;
+  Tabular             = tabular;
+  Tagbar              = tagbar;
+  thumbnail           = thumbnail-vim;
+  tlib                = tlib_vim;
+  tmux-navigator      = vim-tmux-navigator;
+  tmuxNavigator       = tmux-navigator; # backwards compat, added 2014-10-18
+  tslime              = tslime-vim;
+  unite               = unite-vim;
+  UltiSnips           = ultisnips;
+  vim-grepper         = vim-grepper-git;
+  vim-test            = vim-test-git;
+  vimproc             = vimproc-vim;
+  vimshell            = vimshell-vim;
+  vinegar             = vim-vinegar;
+  watchdogs           = vim-watchdogs;
+  WebAPI              = webapi-vim;
+  wombat256           = wombat256-vim; # backwards compat, added 2015-7-8
+  yankring            = YankRing-vim;
+  Yankring            = YankRing-vim;
+  YouCompleteMe       = youcompleteme;
+  xterm-color-table   = xterm-color-table-vim;
+  zeavim              = zeavim-vim;
+});
+in self
-- 
GitLab


From 101df126bb309127f86b4aaf3d0e2a416ea788b0 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Thu, 12 Jul 2018 00:51:54 +0000
Subject: [PATCH 044/297] config.skipAliases -> config.allowAliases

---
 pkgs/applications/version-management/git-and-tools/default.nix | 2 +-
 pkgs/desktops/gnome-3/default.nix                              | 2 +-
 pkgs/desktops/xfce/default.nix                                 | 2 +-
 pkgs/misc/vim-plugins/default.nix                              | 2 +-
 pkgs/top-level/stage.nix                                       | 3 +--
 5 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix
index 07eab6a68c0..ba5486dc015 100644
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@@ -130,7 +130,7 @@ let
 
   transcrypt = callPackage ./transcrypt { };
 
-} // lib.optionalAttrs (config.skipAliases or false == false) (with self; {
+} // lib.optionalAttrs (config.allowAliases or true) (with self; {
   # aliases
   gitAnnex = git-annex;
   svn_all_fast_export = svn-all-fast-export;
diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix
index a6c8db1b886..be962b3e289 100644
--- a/pkgs/desktops/gnome-3/default.nix
+++ b/pkgs/desktops/gnome-3/default.nix
@@ -391,7 +391,7 @@ lib.makeScope pkgs.newScope (self: with self; {
 
   gnome-packagekit = callPackage ./misc/gnome-packagekit { };
 
-} // lib.optionalAttrs (config.skipAliases or false == false) {
+} // lib.optionalAttrs (config.allowAliases or true) {
 #### Legacy aliases
 
   evolution_data_server = evolution-data-server; # added 2018-02-25
diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix
index 47d42f4c4a2..abf03d4277b 100644
--- a/pkgs/desktops/xfce/default.nix
+++ b/pkgs/desktops/xfce/default.nix
@@ -159,7 +159,7 @@ lib.makeScope pkgs.newScope (self: with self; {
 
   xfce4_power_manager_gtk3 = xfce4-power-manager.override { withGtk3 = true; };
 
-} // lib.optionalAttrs (config.skipAliases or false == false) {
+} // lib.optionalAttrs (config.allowAliases or true) {
   #### ALIASES - added 2018-01
 
   terminal = xfce4-terminal;
diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index 6b626196a1b..0085e9280a9 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -3213,7 +3213,7 @@ let
 
   };
 
-} // lib.optionalAttrs (config.skipAliases or false == false) (with self; {
+} // lib.optionalAttrs (config.allowAliases or true) (with self; {
 
   # aliasess
   airline             = vim-airline;
diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix
index cc70950c497..5b802aea075 100644
--- a/pkgs/top-level/stage.nix
+++ b/pkgs/top-level/stage.nix
@@ -97,8 +97,7 @@ let
       res self;
     in res;
 
-  aliases = self: super: if config.skipAliases or false then {}
-                         else import ./aliases.nix lib self super;
+  aliases = self: super: lib.optionalAttrs (config.allowAliases or true) (import ./aliases.nix lib self super);
 
   # stdenvOverrides is used to avoid having multiple of versions
   # of certain dependencies that were used in bootstrapping the
-- 
GitLab


From c0da7fba97d605c93ac8ef1d7ab672c7dcd1f42e Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Tue, 17 Jul 2018 14:47:46 +0000
Subject: [PATCH 045/297] config.skipAliases -> config.allowAliases (rebase)

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 27e2686858c..b98b5b508cf 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -17909,7 +17909,7 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-} // stdenv.lib.optionalAttrs (config.skipAliases or false == false) {
+} // stdenv.lib.optionalAttrs (config.allowAliases or true) {
   autodie = null; # part of Perl
   AutoLoader = null; # part of Perl 5.22
   constant = null; # part of Perl 5.22
-- 
GitLab


From 9210adeb0dd43247d1261a9aad98ab3ce2aed98f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Tue, 17 Jul 2018 07:59:04 -0700
Subject: [PATCH 046/297] zimg: 2.7.4 -> 2.7.5

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/zimg/versions.
---
 pkgs/development/libraries/zimg/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/zimg/default.nix b/pkgs/development/libraries/zimg/default.nix
index f67964748dc..9d006527717 100644
--- a/pkgs/development/libraries/zimg/default.nix
+++ b/pkgs/development/libraries/zimg/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec{
   name = "zimg-${version}";
-  version = "2.7.4";
+  version = "2.7.5";
 
   src = fetchFromGitHub {
     owner  = "sekrit-twc";
     repo   = "zimg";
     rev    = "release-${version}";
-    sha256 = "1gpmf6algpl1g1z891jfnsici84scg2cq1kj4v90glgik9z99mci";
+    sha256 = "1f4iv99w1sn7kp8xlv2vr20m6qif7c8km1vqjfs9kf2305z5lxww";
   };
 
   nativeBuildInputs = [ autoreconfHook ];
-- 
GitLab


From 9ba3b39e44705bc5f0638acb30a4c3077a96f7d9 Mon Sep 17 00:00:00 2001
From: Yorick van Pelt <yorick@yorickvanpelt.nl>
Date: Tue, 17 Jul 2018 17:28:13 +0200
Subject: [PATCH 047/297] gputils: init at 1.5.0-1

---
 pkgs/development/tools/misc/gputils/default.nix | 16 ++++++++++++++++
 pkgs/top-level/all-packages.nix                 |  2 ++
 2 files changed, 18 insertions(+)
 create mode 100644 pkgs/development/tools/misc/gputils/default.nix

diff --git a/pkgs/development/tools/misc/gputils/default.nix b/pkgs/development/tools/misc/gputils/default.nix
new file mode 100644
index 00000000000..dc736e2e89c
--- /dev/null
+++ b/pkgs/development/tools/misc/gputils/default.nix
@@ -0,0 +1,16 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  version = "1.5.0-1";
+  name = "gputils-${version}";
+  src = fetchurl {
+    url = "mirror://sourceforge/gputils/${name}.tar.bz2";
+    sha256 = "055v83fdgqljprapf7rmh8x66mr13fj0qypj49xba5spx0ca123g";
+  };
+  meta = with stdenv.lib; {
+    homepage = http://sdcc.sourceforge.net/;
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.yorickvp ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d580ef14f6a..bb1b064990a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8163,6 +8163,8 @@ with pkgs;
 
   gotty = callPackage ../servers/gotty { };
 
+  gputils = callPackage ../development/tools/misc/gputils { };
+
   gradleGen = callPackage ../development/tools/build-managers/gradle { };
   gradle = self.gradleGen.gradle_latest;
   gradle_2_14 = self.gradleGen.gradle_2_14;
-- 
GitLab


From f969e426c05e53c805140bd9a6f043a7e0de0771 Mon Sep 17 00:00:00 2001
From: Yorick van Pelt <yorick@yorickvanpelt.nl>
Date: Tue, 17 Jul 2018 17:28:26 +0200
Subject: [PATCH 048/297] sdcc: update for added gputils, add disabled flag,
 adopt

---
 pkgs/development/compilers/sdcc/default.nix | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/compilers/sdcc/default.nix b/pkgs/development/compilers/sdcc/default.nix
index ec93ba79d44..f2b6e3af439 100644
--- a/pkgs/development/compilers/sdcc/default.nix
+++ b/pkgs/development/compilers/sdcc/default.nix
@@ -1,5 +1,9 @@
-{ stdenv, fetchurl, bison, flex, boost, texinfo, gputils ? null }:
-
+{ stdenv, fetchurl, bison, flex, boost, texinfo, autoconf, gputils ? null, disabled ? [] }:
+let
+  allDisabled = (if gputils == null then [ "pic14" "pic16" ] else []) ++ disabled;
+  # choices: mcs51 z80 z180 r2k r3ka gbz80 tlcs90 ds390 ds400 pic14 pic16 hc08 s08 stm8
+  inherit (stdenv) lib;
+in
 stdenv.mkDerivation rec {
   version = "3.7.0";
   name = "sdcc-${version}";
@@ -9,14 +13,13 @@ stdenv.mkDerivation rec {
     sha256 = "13llvx0j3v5qa7qd4fh7nix4j3alpd3ccprxvx163c4q8q4lfkc5";
   };
 
-  # TODO: remove this comment when gputils != null is tested
-  buildInputs = [ bison flex boost texinfo gputils ];
+  buildInputs = [ bison flex boost texinfo gputils autoconf ];
 
   configureFlags = ''
-    ${if gputils == null then "--disable-pic14-port --disable-pic16-port" else ""}
+    ${lib.concatMapStringsSep " " (f: "--disable-${f}-port") allDisabled}
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Small Device C Compiler";
     longDescription = ''
       SDCC is a retargettable, optimizing ANSI - C compiler suite that targets
@@ -29,6 +32,6 @@ stdenv.mkDerivation rec {
     homepage = http://sdcc.sourceforge.net/;
     license = licenses.gpl2;
     platforms = platforms.linux;
-    maintainers = [ maintainers.bjornfor ];
+    maintainers = [ maintainers.bjornfor maintainers.yorickvp ];
   };
 }
-- 
GitLab


From b3c3df40074eaae2621cf6f15dacdae308f51fb2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A1rton=20Boros?= <martonboros@gmail.com>
Date: Tue, 17 Jul 2018 18:47:55 +0300
Subject: [PATCH 049/297] keybase-gui: fix kbfs mount path check (#40080)

---
 pkgs/tools/security/keybase/gui.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/security/keybase/gui.nix b/pkgs/tools/security/keybase/gui.nix
index b53860e406d..1a7cf30b952 100644
--- a/pkgs/tools/security/keybase/gui.nix
+++ b/pkgs/tools/security/keybase/gui.nix
@@ -70,10 +70,9 @@ stdenv.mkDerivation rec {
       checkFailed
     fi
 
-    ${utillinuxMinimal}/bin/mountpoint /keybase &>/dev/null
-    if [ "\$?" -ne "0" ]; then
-      echo "Keybase is not mounted to /keybase." >&2
-      echo "You might need to run: kbfsfuse /keybase" >&2
+    if [ -z "\$(keybase status | grep kbfsfuse)" ]; then
+      echo "Could not find kbfsfuse client in keybase status." >&2
+      echo "You might need to run: kbfsfuse" >&2
       checkFailed
     fi
 
-- 
GitLab


From 072febaa922635bd048d683ef51c408c1873f348 Mon Sep 17 00:00:00 2001
From: Yegor Timoshenko <yegortimoshenko@riseup.net>
Date: Tue, 17 Jul 2018 19:05:15 +0300
Subject: [PATCH 050/297] sdcc: null out gputils by default

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bb1b064990a..c42510a5c8d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7074,7 +7074,9 @@ with pkgs;
 
   scalafmt = callPackage ../development/tools/scalafmt { };
 
-  sdcc = callPackage ../development/compilers/sdcc { };
+  sdcc = callPackage ../development/compilers/sdcc {
+    gputils = null;
+  };
 
   serpent = callPackage ../development/compilers/serpent { };
 
-- 
GitLab


From 4bd4c876f2607322cee7716a7a67c3e2e2e294c4 Mon Sep 17 00:00:00 2001
From: Yegor Timoshenko <yegortimoshenko@riseup.net>
Date: Tue, 17 Jul 2018 19:16:24 +0300
Subject: [PATCH 051/297] sdcc: clean up

---
 pkgs/development/compilers/sdcc/default.nix | 24 +++++++++++----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/compilers/sdcc/default.nix b/pkgs/development/compilers/sdcc/default.nix
index f2b6e3af439..0e9a348dd50 100644
--- a/pkgs/development/compilers/sdcc/default.nix
+++ b/pkgs/development/compilers/sdcc/default.nix
@@ -1,25 +1,27 @@
-{ stdenv, fetchurl, bison, flex, boost, texinfo, autoconf, gputils ? null, disabled ? [] }:
+{ stdenv, fetchurl, autoconf, bison, boost, flex, texinfo, gputils ? null
+, excludePorts ? [] }:
+
+with stdenv.lib;
+
 let
-  allDisabled = (if gputils == null then [ "pic14" "pic16" ] else []) ++ disabled;
   # choices: mcs51 z80 z180 r2k r3ka gbz80 tlcs90 ds390 ds400 pic14 pic16 hc08 s08 stm8
-  inherit (stdenv) lib;
+  excludedPorts = excludePorts ++ (optionals (gputils == null) [ "pic14" "pic16" ]);
 in
+
 stdenv.mkDerivation rec {
-  version = "3.7.0";
   name = "sdcc-${version}";
+  version = "3.7.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/sdcc/sdcc-src-${version}.tar.bz2";
     sha256 = "13llvx0j3v5qa7qd4fh7nix4j3alpd3ccprxvx163c4q8q4lfkc5";
   };
 
-  buildInputs = [ bison flex boost texinfo gputils autoconf ];
+  buildInputs = [ autoconf bison boost flex gputils texinfo ];
 
-  configureFlags = ''
-    ${lib.concatMapStringsSep " " (f: "--disable-${f}-port") allDisabled}
-  '';
+  configureFlags = map (f: "--disable-${f}-port") excludedPorts;
 
-  meta = with lib; {
+  meta = {
     description = "Small Device C Compiler";
     longDescription = ''
       SDCC is a retargettable, optimizing ANSI - C compiler suite that targets
@@ -30,8 +32,8 @@ stdenv.mkDerivation rec {
       PIC18 targets. It can be retargeted for other microprocessors.
     '';
     homepage = http://sdcc.sourceforge.net/;
-    license = licenses.gpl2;
+    license = with licenses; if (gputils == null) then unfreeRedistributable else gpl2;
+    maintainers = with maintainers; [ bjornfor yorickvp ];
     platforms = platforms.linux;
-    maintainers = [ maintainers.bjornfor maintainers.yorickvp ];
   };
 }
-- 
GitLab


From 879edd79be34563547c884d44fed0e05cc9a2266 Mon Sep 17 00:00:00 2001
From: Yegor Timoshenko <yegortimoshenko@riseup.net>
Date: Tue, 17 Jul 2018 19:17:03 +0300
Subject: [PATCH 052/297] sdcc: fix license condition

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

diff --git a/pkgs/development/compilers/sdcc/default.nix b/pkgs/development/compilers/sdcc/default.nix
index 0e9a348dd50..f7429933453 100644
--- a/pkgs/development/compilers/sdcc/default.nix
+++ b/pkgs/development/compilers/sdcc/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
       PIC18 targets. It can be retargeted for other microprocessors.
     '';
     homepage = http://sdcc.sourceforge.net/;
-    license = with licenses; if (gputils == null) then unfreeRedistributable else gpl2;
+    license = with licenses; if (gputils == null) then gpl2 else unfreeRedistributable;
     maintainers = with maintainers; [ bjornfor yorickvp ];
     platforms = platforms.linux;
   };
-- 
GitLab


From e6a721ed6076d900deb5644ac7d881220e3770ba Mon Sep 17 00:00:00 2001
From: Yegor Timoshenko <yegortimoshenko@riseup.net>
Date: Tue, 17 Jul 2018 19:19:01 +0300
Subject: [PATCH 053/297] gputils: clean up, fix homepage url

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

diff --git a/pkgs/development/tools/misc/gputils/default.nix b/pkgs/development/tools/misc/gputils/default.nix
index dc736e2e89c..aaaee20b81a 100644
--- a/pkgs/development/tools/misc/gputils/default.nix
+++ b/pkgs/development/tools/misc/gputils/default.nix
@@ -1,16 +1,18 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  version = "1.5.0-1";
   name = "gputils-${version}";
+  version = "1.5.0-1";
+
   src = fetchurl {
     url = "mirror://sourceforge/gputils/${name}.tar.bz2";
     sha256 = "055v83fdgqljprapf7rmh8x66mr13fj0qypj49xba5spx0ca123g";
   };
+
   meta = with stdenv.lib; {
-    homepage = http://sdcc.sourceforge.net/;
+    homepage = https://gputils.sourceforge.io/;
     license = licenses.gpl2;
+    maintainers = with maintainers; [ yorickvp ];
     platforms = platforms.linux;
-    maintainers = [ maintainers.yorickvp ];
   };
 }
-- 
GitLab


From bf23666022f1c0f097ad9aa276f3203c7e86271f Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Tue, 17 Jul 2018 20:02:49 +0200
Subject: [PATCH 054/297] androidStudioPackages.beta: 3.2.0.20 -> 3.2.0.21

---
 pkgs/applications/editors/android-studio/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix
index 60566a0fcf8..b7a23b589db 100644
--- a/pkgs/applications/editors/android-studio/default.nix
+++ b/pkgs/applications/editors/android-studio/default.nix
@@ -43,9 +43,9 @@ in rec {
   beta = mkStudio (latestVersion // {
     pname = "android-studio-preview";
     #pname = "android-studio-beta"; # TODO: Rename and provide symlink
-    version = "3.2.0.20"; # "Android Studio 3.2 Beta 3"
-    build = "181.4868252";
-    sha256Hash = "17r7gvy317vh2r56yvhnn7dym0q6gs8r04fdr7hx53s9rb79sd1j";
+    version = "3.2.0.21"; # "Android Studio 3.2 Beta 4"
+    build = "181.4886486";
+    sha256Hash = "1n4lcy0ng87fv45qjlpdb2zn3zl5lg6jwkbaijhbsm2rh4ljisr3";
 
     meta = stable.meta // {
       description = "The Official IDE for Android (beta channel)";
-- 
GitLab


From 4d6f88067c465c39539b7a4b47cdd6ac471a6292 Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Wed, 18 Jul 2018 03:13:41 +0900
Subject: [PATCH 055/297] oraclejdk: 8u171, 8u172 -> 8u181

---
 pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix | 10 +++++-----
 pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix b/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix
index bdd367ef352..55faf277b15 100644
--- a/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix
+++ b/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix
@@ -1,11 +1,11 @@
 import ./jdk-linux-base.nix {
   productVersion = "8";
-  patchVersion = "171";
+  patchVersion = "181";
   downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html;
-  sha256.i686-linux = "0dh5r02v40pinway952fflw2r0i1xi67hmyb87c278qfp4jn929p";
-  sha256.x86_64-linux = "10jr4z0bw9wcws5xgc4qkw101cadfx5bkyvcnc4l3v5axwvjipdn";
-  sha256.armv7l-linux = "1bqivmp1wfnypgg5bsfzi25yzl7vd2xncfap9mi8jn63aj633dw0";
-  sha256.aarch64-linux = "1016lf3g1syjsl29m58s2s2w9nkj4jkvxhqg4s35vy41cs2v77j7";
+  sha256.i686-linux = "0159q5wrlp24v8rc6m1cr3kq8nddpdjdprj3vsmf8z7vpwx052np";
+  sha256.x86_64-linux = "1lwiz44vlxn4hc5b43r9arad15lpjfbr7l6h5vafpgxzjmq5ci8q";
+  sha256.armv7l-linux = "0zpgb1hqf9zazic66c7nim036ac6ld3dhnsanx4ijlrl7kd3fbn7";
+  sha256.aarch64-linux = "191r926501cm6mz8p93ljdfxi0dgzw7ljjsrzsbmmxn4k0q2j0ad";
   jceName = "jce_policy-8.zip";
   jceDownloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html;
   sha256JCE = "0n8b6b8qmwb14lllk2lk1q1ahd3za9fnjigz5xn65mpg48whl0pk";
diff --git a/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix b/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix
index 901eea0f8f1..55faf277b15 100644
--- a/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix
+++ b/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix
@@ -1,11 +1,11 @@
 import ./jdk-linux-base.nix {
   productVersion = "8";
-  patchVersion = "172";
+  patchVersion = "181";
   downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html;
-  sha256.i686-linux = "0csskx8xis0dr1948j76fgrwwsj4gzdbjqfi7if4v4j62b9i0hqa";
-  sha256.x86_64-linux = "0inkx73rwv7cvn9lqcr3hmnm0sr89h1fh29yamikb4dn02a0p818";
-  sha256.armv7l-linux = "1576cb0rlc42dsnmh388gy1wjas7ac6g135s8h74x8sm4b56qpln";
-  sha256.aarch64-linux = "0zpkmq8zxmpifawj611fg67srki63haz02rm6xwfc5qm2lxx5g6s";
+  sha256.i686-linux = "0159q5wrlp24v8rc6m1cr3kq8nddpdjdprj3vsmf8z7vpwx052np";
+  sha256.x86_64-linux = "1lwiz44vlxn4hc5b43r9arad15lpjfbr7l6h5vafpgxzjmq5ci8q";
+  sha256.armv7l-linux = "0zpgb1hqf9zazic66c7nim036ac6ld3dhnsanx4ijlrl7kd3fbn7";
+  sha256.aarch64-linux = "191r926501cm6mz8p93ljdfxi0dgzw7ljjsrzsbmmxn4k0q2j0ad";
   jceName = "jce_policy-8.zip";
   jceDownloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html;
   sha256JCE = "0n8b6b8qmwb14lllk2lk1q1ahd3za9fnjigz5xn65mpg48whl0pk";
-- 
GitLab


From bf2a009380ab57f647f4c2e4cc531721aaa32847 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Tue, 17 Jul 2018 20:38:56 +0200
Subject: [PATCH 056/297] tdesktop: 1.3.7 -> 1.3.10

tdesktopPackages.preview: 1.3.7 -> 1.3.10

Without the patch the build will fail with the following error:

[ 15%] Building CXX object CMakeFiles/lib_export.dir/build/tdesktop/Telegram/SourceFiles/export/export_api_wrap.o
/build/tdesktop/Telegram/SourceFiles/export/export_api_wrap.cpp: In lambda function:
/build/tdesktop/Telegram/SourceFiles/export/export_api_wrap.cpp:712:56: internal compiler error: Segmentation fault
   if constexpr (MTPDphotos_photos::Is<decltype(data)>()) {
                                                        ^
Please submit a full bug report,
with preprocessed source if appropriate.
See <https://gcc.gnu.org/bugs/> for instructions.
make[2]: *** [CMakeFiles/lib_export.dir/build.make:77: CMakeFiles/lib_export.dir/build/tdesktop/Telegram/SourceFiles/export/export_api_wrap.o] Error 1
make[1]: *** [CMakeFiles/Makefile2:1101: CMakeFiles/lib_export.dir/all] Error 2
make: *** [Makefile:84: all] Error 2
---
 .../telegram/tdesktop/default.nix             |  8 +--
 .../fix-internal-compiler-error.patch         | 68 +++++++++++++++++++
 .../telegram/tdesktop/generic.nix             |  5 +-
 3 files changed, 76 insertions(+), 5 deletions(-)
 create mode 100644 pkgs/applications/networking/instant-messengers/telegram/tdesktop/fix-internal-compiler-error.patch

diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
index 3e0e60594f8..9354ae72821 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
@@ -4,11 +4,11 @@ let
   mkTelegram = args: qt5.callPackage (import ./generic.nix args) { };
   stableVersion = {
     stable = true;
-    version = "1.3.7";
-    sha256Hash = "1rwnqgla061icvyvw8gxqd7qki1jnq0f46hvyffp74ng5r1b6wjg";
+    version = "1.3.10";
+    sha256Hash = "0i1lzks8pf627658w6p7dz87d6cl4g98031qm166npkc40f89bpr";
     # svn log svn://svn.archlinux.org/community/telegram-desktop/trunk
-    archPatchesRevision = "310557";
-    archPatchesHash = "1v134dal3xiapgh3akfr61vh62j24m9vkb62kckwvap44iqb0hlk";
+    archPatchesRevision = "359861";
+    archPatchesHash = "15xybfs9k6dww747if8z6m9sh7anvqi76zsx2gxyna2j1z36i0r0";
   };
 in {
   stable = mkTelegram stableVersion;
diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/fix-internal-compiler-error.patch b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/fix-internal-compiler-error.patch
new file mode 100644
index 00000000000..1c79840d626
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/fix-internal-compiler-error.patch
@@ -0,0 +1,68 @@
+Date: Tue, 17 Jul 2018 20:29:49 +0200
+
+---
+ Telegram/SourceFiles/export/data/export_data_types.cpp | 9 ++++++---
+ Telegram/SourceFiles/export/export_api_wrap.cpp        | 6 ++++--
+ 2 files changed, 10 insertions(+), 5 deletions(-)
+
+diff --git a/Telegram/SourceFiles/export/data/export_data_types.cpp b/Telegram/SourceFiles/export/data/export_data_types.cpp
+index f835dc2f9..e811c27e8 100644
+--- a/Telegram/SourceFiles/export/data/export_data_types.cpp
++++ b/Telegram/SourceFiles/export/data/export_data_types.cpp
+@@ -221,7 +221,8 @@ Image ParseMaxImage(
+ 				result.width = data.vw.v;
+ 				result.height = data.vh.v;
+ 				result.file.location = ParseLocation(data.vlocation);
+-				if constexpr (MTPDphotoCachedSize::Is<decltype(data)>()) {
++				constexpr bool condition = MTPDphotoCachedSize::Is<decltype(data)>();
++				if constexpr (condition) {
+ 					result.file.content = data.vbytes.v;
+ 					result.file.size = result.file.content.size();
+ 				} else {
+@@ -409,7 +410,8 @@ Document ParseDocument(
+ 			result.width = data.vw.v;
+ 			result.height = data.vh.v;
+ 			result.file.location = ParseLocation(data.vlocation);
+-			if constexpr (MTPDphotoCachedSize::Is<decltype(data)>()) {
++			constexpr bool condition = MTPDphotoCachedSize::Is<decltype(data)>();
++			if constexpr (condition) {
+ 				result.file.content = data.vbytes.v;
+ 				result.file.size = result.file.content.size();
+ 			} else {
+@@ -1017,7 +1019,8 @@ Message ParseMessage(
+ 	auto result = Message();
+ 	data.match([&](const auto &data) {
+ 		result.id = data.vid.v;
+-		if constexpr (!MTPDmessageEmpty::Is<decltype(data)>()) {
++		constexpr bool condition = !MTPDmessageEmpty::Is<decltype(data)>();
++		if constexpr (condition) {
+ 			result.toId = ParsePeerId(data.vto_id);
+ 			const auto peerId = (!data.is_out()
+ 				&& data.has_from_id()
+diff --git a/Telegram/SourceFiles/export/export_api_wrap.cpp b/Telegram/SourceFiles/export/export_api_wrap.cpp
+index b618937f6..bb98647dd 100644
+--- a/Telegram/SourceFiles/export/export_api_wrap.cpp
++++ b/Telegram/SourceFiles/export/export_api_wrap.cpp
+@@ -709,7 +709,8 @@ void ApiWrap::handleUserpicsSlice(const MTPphotos_Photos &result) {
+ 	Expects(_userpicsProcess != nullptr);
+ 
+ 	result.match([&](const auto &data) {
+-		if constexpr (MTPDphotos_photos::Is<decltype(data)>()) {
++		constexpr bool condition = MTPDphotos_photos::Is<decltype(data)>();
++		if constexpr (condition) {
+ 			_userpicsProcess->lastSlice = true;
+ 		}
+ 		loadUserpicsFiles(Data::ParseUserpicsSlice(
+@@ -1141,7 +1142,8 @@ void ApiWrap::requestMessagesSlice() {
+ 		result.match([&](const MTPDmessages_messagesNotModified &data) {
+ 			error("Unexpected messagesNotModified received.");
+ 		}, [&](const auto &data) {
+-			if constexpr (MTPDmessages_messages::Is<decltype(data)>()) {
++			constexpr bool condition = MTPDmessages_messages::Is<decltype(data)>();
++			if constexpr (condition) {
+ 				_chatProcess->lastSlice = true;
+ 			}
+ 			loadMessagesFiles(Data::ParseMessagesSlice(
+-- 
+2.16.3
+
diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix
index 732ea95dd07..2d9a9d10aed 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix
@@ -28,7 +28,10 @@ mkDerivation rec {
   };
 
   # TODO: libtgvoip.patch no-gtk2.patch
-  patches = [ "${archPatches}/tdesktop.patch" ];
+  patches = [ "${archPatches}/tdesktop.patch" ]
+    # TODO: Only required to work around a compiler bug.
+    # This should be fixed in GCC 7.3.1 (or later?)
+    ++ [ ./fix-internal-compiler-error.patch ];
 
   postPatch = ''
     substituteInPlace Telegram/SourceFiles/platform/linux/linux_libs.cpp \
-- 
GitLab


From b835b8a95b7d644e645a50daf087cfe15fbe5968 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Tue, 17 Jul 2018 21:46:01 +0200
Subject: [PATCH 057/297] valkyrie: fix build

---
 pkgs/development/tools/analysis/valkyrie/default.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/tools/analysis/valkyrie/default.nix b/pkgs/development/tools/analysis/valkyrie/default.nix
index 1da6c6a1e86..a0ff2059369 100644
--- a/pkgs/development/tools/analysis/valkyrie/default.nix
+++ b/pkgs/development/tools/analysis/valkyrie/default.nix
@@ -8,7 +8,16 @@ stdenv.mkDerivation rec {
     sha256 = "0hwvsncf62mdkahwj9c8hpmm94c1wr5jn89370k6rj894kxry2x7";
   };
 
+  patchPhase = ''
+    sed -i '1s;^;#include <unistd.h>\n;' src/objects/tool_object.cpp
+    sed -i '1s;^;#include <unistd.h>\n;' src/utils/vk_config.cpp
+    sed -i '1s;^;#include <sys/types.h>\n;' src/utils/vk_config.cpp
+    sed -i '1s;^;#include <unistd.h>\n;' src/utils/vk_utils.cpp
+    sed -i '1s;^;#include <sys/types.h>\n;' src/utils/vk_utils.cpp
+  '';
+
   buildInputs = [ qt4 ];
+
   nativeBuildInputs = [ qmake4Hook ];
 
   meta = {
@@ -16,6 +25,5 @@ stdenv.mkDerivation rec {
     description = "Qt4-based GUI for the Valgrind 3.6.x series";
     license = stdenv.lib.licenses.gpl2;
     platforms = stdenv.lib.platforms.linux;
-    broken = true;
   };
 }
-- 
GitLab


From 1c702bb8a3b42d745dcc390484e208dcc26f695a Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Tue, 17 Jul 2018 21:47:29 +0200
Subject: [PATCH 058/297] valkyrie: add myself (pSub) as maintainer

---
 pkgs/development/tools/analysis/valkyrie/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/analysis/valkyrie/default.nix b/pkgs/development/tools/analysis/valkyrie/default.nix
index a0ff2059369..1ecdd9f32ce 100644
--- a/pkgs/development/tools/analysis/valkyrie/default.nix
+++ b/pkgs/development/tools/analysis/valkyrie/default.nix
@@ -20,10 +20,11 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ qmake4Hook ];
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://www.valgrind.org/;
     description = "Qt4-based GUI for the Valgrind 3.6.x series";
-    license = stdenv.lib.licenses.gpl2;
-    platforms = stdenv.lib.platforms.linux;
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ pSub ];
   };
 }
-- 
GitLab


From 90223e4a4a60556e7b706c69480593557b8a2fb9 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Tue, 17 Jul 2018 22:00:14 +0200
Subject: [PATCH 059/297] jdepend: add myself (pSub) as maintainer

---
 pkgs/development/tools/analysis/jdepend/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/tools/analysis/jdepend/default.nix b/pkgs/development/tools/analysis/jdepend/default.nix
index bf1d1357f5e..d2c27b9f485 100644
--- a/pkgs/development/tools/analysis/jdepend/default.nix
+++ b/pkgs/development/tools/analysis/jdepend/default.nix
@@ -30,5 +30,6 @@ stdenv.mkDerivation rec {
     homepage = http://www.clarkware.com/software/JDepend.html;
     license = licenses.bsd3;
     platforms = platforms.linux;
+    maintainers = with maintainers; [ pSub ];
   };
 }
-- 
GitLab


From d3d1b888737e7db53ad5d67a2585444fcc8cb7da Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Tue, 17 Jul 2018 22:59:21 +0200
Subject: [PATCH 060/297] pythonPackages.flask_cache: remove

The package is currently broken and most folks recommend to use
`flask-caching` (see
https://github.com/thadeusb/flask-cache/issues/171).

The only package in `nixpkgs` which remained to use `flask_cache`
(`graphite_api`) still builds with `pythonPackages.flask-caching`.

The removal and corresponding `graphite_api` change unbreaks several
Hydra builds (see https://hydra.nixos.org/build/76953777).
---
 pkgs/top-level/python-packages.nix | 19 +------------------
 1 file changed, 1 insertion(+), 18 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b7cac08d8e4..3ea8348314b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5499,23 +5499,6 @@ in {
 
   flask-babel = callPackage ../development/python-modules/flask-babel { };
 
-  flask_cache = buildPythonPackage rec {
-    name = "Flask-Cache-0.13.1";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/F/Flask-Cache/${name}.tar.gz";
-      sha256 = "90126ca9bc063854ef8ee276e95d38b2b4ec8e45fd77d5751d37971ee27c7ef4";
-    };
-
-    propagatedBuildInputs = with self; [ werkzeug flask ];
-
-    meta = {
-      homepage = https://github.com/thadeusb/flask-cache;
-      description = "Adds cache support to your Flask application";
-      license = "BSD";
-    };
-  };
-
   flask-caching = callPackage ../development/python-modules/flask-caching { };
 
   flask-common = callPackage ../development/python-modules/flask-common { };
@@ -15852,7 +15835,7 @@ EOF
 
     propagatedBuildInputs = with self; [
       flask
-      flask_cache
+      flask-caching
       cairocffi
       pyparsing
       pytz
-- 
GitLab


From ab418335c2ca73dd438d53d013fe39fa1f37ecce Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Tue, 17 Jul 2018 23:15:57 +0200
Subject: [PATCH 061/297] pythonPackages.trezor: disable build

It seems as recent versions of `trezor` don't work with python 2.x:

```
/build/trezor-0.9.1/dist /build/trezor-0.9.1
Processing ./trezor-0.9.1-py2-none-any.whl
trezor requires Python '>=3.3' but the running Python is 2.7.15
builder for '/nix/store/aqyxki0ckanjk4r1f0an4kj1w4s3kk4f-python2.7-trezor-0.9.1.drv' failed with exit code 1
cannot build derivation '/nix/store/gp4smkzc9r87lzajs17jnq4rh2ayc5q0-python2.7-keepkey-4.0.0.drv': 1 dependencies couldn't be built
```
---
 pkgs/development/python-modules/trezor/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/trezor/default.nix b/pkgs/development/python-modules/trezor/default.nix
index 9a6a3c39eec..0f96b100435 100644
--- a/pkgs/development/python-modules/trezor/default.nix
+++ b/pkgs/development/python-modules/trezor/default.nix
@@ -1,11 +1,13 @@
 { lib, fetchPypi, buildPythonPackage,
-  protobuf, hidapi, ecdsa, mnemonic, requests, pyblake2, click, libusb1, rlp
+  protobuf, hidapi, ecdsa, mnemonic, requests, pyblake2, click, libusb1, rlp, isPy3k
 }:
 
 buildPythonPackage rec {
   pname = "trezor";
   version = "0.9.1";
 
+  disabled = !isPy3k;
+
   src = fetchPypi {
     inherit pname version;
     sha256 = "a481191011bade98f1e9f1201e7c72a83945050657bbc90dc4ac32dc8b8b46a4";
-- 
GitLab


From 711c56dd67de03718367222cdcb46714da9e68b2 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Tue, 17 Jul 2018 17:37:50 -0400
Subject: [PATCH 062/297] pythonPackages.simpy: init at 3.0.11.

---
 .../python-modules/simpy/default.nix           | 18 ++++++++++++++++++
 pkgs/top-level/python-packages.nix             |  2 ++
 2 files changed, 20 insertions(+)
 create mode 100644 pkgs/development/python-modules/simpy/default.nix

diff --git a/pkgs/development/python-modules/simpy/default.nix b/pkgs/development/python-modules/simpy/default.nix
new file mode 100644
index 00000000000..981b6693f7d
--- /dev/null
+++ b/pkgs/development/python-modules/simpy/default.nix
@@ -0,0 +1,18 @@
+{ buildPythonPackage, fetchPypi, lib }:
+
+buildPythonPackage rec {
+  pname = "simpy";
+  version = "3.0.11";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0hqgxk3lggf21jq9lh8838cdl24mdkdnpzh0w4m28d0zn2wjb5nh";
+  };
+
+  meta = with lib; {
+    homepage = https://simpy.readthedocs.io/en/latest/;
+    description = "A process-based discrete-event simulation framework based on standard Python.";
+    license = [ licenses.mit ];
+    maintainers = with maintainers; [ shlevy ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b7cac08d8e4..9f0503c25dc 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -18036,6 +18036,8 @@ EOF
   qiskit = callPackage ../development/python-modules/qiskit { };
 
   qasm2image = callPackage ../development/python-modules/qasm2image { };
+
+  simpy = callPackage ../development/python-modules/simpy { };
 });
 
 in fix' (extends overrides packages)
-- 
GitLab


From c8f5d4708b73aadf6723f019e7c29e394b2f5461 Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Tue, 17 Jul 2018 23:01:02 +0000
Subject: [PATCH 063/297] xfce4-13.xfce4-power-manager: 1.6.0 -> 1.6.1 (#43626)

---
 pkgs/desktops/xfce4-13/xfce4-power-manager/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/xfce4-13/xfce4-power-manager/default.nix b/pkgs/desktops/xfce4-13/xfce4-power-manager/default.nix
index bf998d2e819..5389af66882 100644
--- a/pkgs/desktops/xfce4-13/xfce4-power-manager/default.nix
+++ b/pkgs/desktops/xfce4-13/xfce4-power-manager/default.nix
@@ -4,9 +4,9 @@
 mkXfceDerivation rec {
   category = "xfce";
   pname = "xfce4-power-manager";
-  version = "1.6.0";
+  version = "1.6.1";
 
-  sha256 = "1sh6ydn44j1yki8f020ljayp1fjcigkywcvjp38fsk7j25ni2wrp";
+  sha256 = "0b32m46v3dv1ln3xwlpqbnpflknm4gyfk2w6gn7xjx1k7igcjym3";
 
   nativeBuildInputs = [ automakeAddFlags exo ];
   buildInputs = [ gtk3 libnotify libxfce4ui libxfce4util upower xfconf ];
@@ -14,6 +14,6 @@ mkXfceDerivation rec {
   postPatch = ''
     substituteInPlace configure.ac.in --replace gio-2.0 gio-unix-2.0
     automakeAddFlags src/Makefile.am xfce4_power_manager_CFLAGS GIO_CFLAGS
-    automakeAddFlags src/Makefile.am xfce4_power_manager_settings_CFLAGS GIO_CFLAGS
+    automakeAddFlags settings/Makefile.am xfce4_power_manager_settings_CFLAGS GIO_CFLAGS
   '';
 }
-- 
GitLab


From 7adce5b870d60b9abe34439560671f79426eac3c Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Tue, 17 Jul 2018 23:05:54 +0000
Subject: [PATCH 064/297] xfce4-13.xfce4-panel: 4.13.2 -> 4.13.3 (#43628)

---
 .../desktops/xfce4-13/xfce4-panel/default.nix | 24 ++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/xfce4-13/xfce4-panel/default.nix b/pkgs/desktops/xfce4-13/xfce4-panel/default.nix
index 88ba2de49be..7960ee84e38 100644
--- a/pkgs/desktops/xfce4-13/xfce4-panel/default.nix
+++ b/pkgs/desktops/xfce4-13/xfce4-panel/default.nix
@@ -1,14 +1,32 @@
-{ mkXfceDerivation, exo, garcon, gtk2, gtk3, libxfce4ui, libxfce4util, libwnck3, xfconf }:
+{ mkXfceDerivation, makeWrapper, exo, garcon, gtk2, gtk3, gettext, glib-networking, libxfce4ui, libxfce4util, libwnck3, xfconf }:
 
 mkXfceDerivation rec {
   category = "xfce";
   pname = "xfce4-panel";
-  version = "4.13.2";
+  version = "4.13.3";
 
-  sha256 = "194pihmg7af4x81nia2fy3h7rls306a7c0bqny9ycqikvi6nmdmn";
+  sha256 = "00b2b16wqwzdbh1vsnpl2kasa7f9i1hr1wkkjmvzmy2v7bmkygr0";
 
+  nativeBuildInputs = [ makeWrapper ];
   buildInputs = [ exo garcon gtk2 gtk3 libxfce4ui libxfce4util libwnck3 xfconf ];
 
+  patches = [ ../../xfce/core/xfce4-panel-datadir.patch ];
+  patchFlags = "-p1";
+
+  postPatch = ''
+    for f in $(find . -name \*.sh); do
+      substituteInPlace $f --replace gettext ${gettext}/bin/gettext
+    done
+  '';
+
+  configureFlags = [ "--enable-gtk3" ];
+
+  postInstall = ''
+    wrapProgram "$out/bin/xfce4-panel" \
+      --prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH" \
+      --prefix GIO_EXTRA_MODULES : "${glib-networking}/lib/gio/modules"
+  '';
+
   meta =  {
     description = "Xfce's panel";
   };
-- 
GitLab


From c849e567909dec4e53977446abef721a36a39379 Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Tue, 17 Jul 2018 23:11:27 +0000
Subject: [PATCH 065/297] xfce4-13.exo: 0.11.5 -> 0.12.2 (#43630)

---
 pkgs/desktops/xfce4-13/exo/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/xfce4-13/exo/default.nix b/pkgs/desktops/xfce4-13/exo/default.nix
index e11309135dd..1ff1153d727 100644
--- a/pkgs/desktops/xfce4-13/exo/default.nix
+++ b/pkgs/desktops/xfce4-13/exo/default.nix
@@ -4,9 +4,9 @@
 mkXfceDerivation rec {
   category = "xfce";
   pname = "exo";
-  version = "0.11.5";
+  version = "0.12.2";
 
-  sha256 = "0zxv7cx1xbjls7q2blv8ir9zwzyq7r189n6q35jwasns7rxj256v";
+  sha256 = "1b4hl9yxvf8b8akqf2zngq3m93yqnqcmxqqds1dwzm9vm5sqydgh";
 
   nativeBuildInputs = [ libxslt perlPackages.URI ];
   buildInputs = [ gtk2 gtk3 libxfce4ui libxfce4util ];
-- 
GitLab


From c2e4b04d297562190b10a8c6d72ac1f3d1003964 Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Tue, 17 Jul 2018 23:13:40 +0000
Subject: [PATCH 066/297] xfce4-13.libxfce4ui: propagate libICE libSM (#43629)

backport #16227
---
 pkgs/desktops/xfce4-13/libxfce4ui/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/xfce4-13/libxfce4ui/default.nix b/pkgs/desktops/xfce4-13/libxfce4ui/default.nix
index 63df0b7cc9a..51f5fca8d1a 100644
--- a/pkgs/desktops/xfce4-13/libxfce4ui/default.nix
+++ b/pkgs/desktops/xfce4-13/libxfce4ui/default.nix
@@ -1,4 +1,4 @@
-{ lib, mkXfceDerivation, gobjectIntrospection, gtk2, gtk3
+{ lib, mkXfceDerivation, gobjectIntrospection, gtk2, gtk3, libICE, libSM
 , libstartup_notification ? null, libxfce4util, xfconf }:
 
 mkXfceDerivation rec {
@@ -9,7 +9,7 @@ mkXfceDerivation rec {
   sha256 = "0m9h3kvkk2nx8pxxmsg9sjnyp6ajwjrz9djjxxvranjsdw3ilydy";
 
   buildInputs =  [ gobjectIntrospection gtk2 gtk3 libstartup_notification xfconf ];
-  propagatedBuildInputs = [ libxfce4util ];
+  propagatedBuildInputs = [ libxfce4util libICE libSM ];
 
   meta = with lib; {
     description = "Widgets library for Xfce";
-- 
GitLab


From 03044459961206d878abf3ae3d990546c0067ae3 Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Tue, 17 Jul 2018 23:14:54 +0000
Subject: [PATCH 067/297] xfce.gtk-xfce-engine: fix build when withGtk3=true
 (#43621)

---
 pkgs/desktops/xfce/core/gtk-xfce-engine.nix | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/xfce/core/gtk-xfce-engine.nix b/pkgs/desktops/xfce/core/gtk-xfce-engine.nix
index c4b2366e787..0d69d4d2f32 100644
--- a/pkgs/desktops/xfce/core/gtk-xfce-engine.nix
+++ b/pkgs/desktops/xfce/core/gtk-xfce-engine.nix
@@ -1,4 +1,6 @@
-{ stdenv, fetchurl, pkgconfig, intltool, gtk, withGtk3 ? false, gtk3 }:
+{ stdenv, fetchurl, pkgconfig, intltool, gtk2, withGtk3 ? false, gtk3 ? null }:
+
+assert withGtk3 -> (gtk3 != null);
 
 stdenv.mkDerivation rec {
   p_name  = "gtk-xfce-engine";
@@ -12,8 +14,11 @@ stdenv.mkDerivation rec {
   name = "${p_name}-${ver_maj}.${ver_min}";
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ intltool gtk ] ++ stdenv.lib.optional withGtk3 gtk3;
-  
+  buildInputs = [ intltool gtk2 ] ++ stdenv.lib.optional withGtk3 gtk3;
+
+  # `glib-mkenums' is unhappy that some source files are not valid UTF-8
+  postPatch = ''find . -type f -name '*.[ch]' -exec sed -r -i 's/\xD6/O/g' {} +'';
+
   configureFlags = stdenv.lib.optional withGtk3 "--enable-gtk3";
 
   meta = {
-- 
GitLab


From 2391d1dbf315edc4be8bc1ae847b91376449bead Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <rschuetz17@gmail.com>
Date: Wed, 18 Jul 2018 01:16:57 +0200
Subject: [PATCH 068/297] esptool: 2.4.1 -> 2.5.0 (#43663)

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

diff --git a/pkgs/tools/misc/esptool/default.nix b/pkgs/tools/misc/esptool/default.nix
index 729b4cef03a..abb0b4edc17 100644
--- a/pkgs/tools/misc/esptool/default.nix
+++ b/pkgs/tools/misc/esptool/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, python3, openssl }:
 
 python3.pkgs.buildPythonApplication rec {
-  name = "esptool-${version}";
-  version = "2.4.1";
+  pname = "esptool";
+  version = "2.5.0";
 
   src = fetchFromGitHub {
     owner = "espressif";
     repo = "esptool";
     rev = "v${version}";
-    sha256 = "1djlmqdvcyqjqbj225xkn4ix9qr01b8pmsdija2h4nizx77xjyng";
+    sha256 = "0cvxapcln1xcz8hy0hidw6g8q61s5j3q03j3wrviagbh0zip8jdx";
   };
 
   checkInputs = with python3.pkgs; [ flake8 flake8-future-import flake8-import-order ];
-- 
GitLab


From e8e96e4b7290471f91f5828734d93945ec26ba2a Mon Sep 17 00:00:00 2001
From: Johannes Frankenau <johannes@frankenau.net>
Date: Wed, 18 Jul 2018 00:04:02 +0000
Subject: [PATCH 069/297] scantailor-advanced: 1.0.15 -> 1.0.16 (#43653)

---
 .../graphics/scantailor/advanced.nix          | 29 ++-----------------
 1 file changed, 3 insertions(+), 26 deletions(-)

diff --git a/pkgs/applications/graphics/scantailor/advanced.nix b/pkgs/applications/graphics/scantailor/advanced.nix
index 82a49896872..29e53683d1c 100644
--- a/pkgs/applications/graphics/scantailor/advanced.nix
+++ b/pkgs/applications/graphics/scantailor/advanced.nix
@@ -4,46 +4,23 @@
 
 stdenv.mkDerivation rec {
   name = "scantailor-advanced-${version}";
-  version = "1.0.15";
+  version = "1.0.16";
 
   src = fetchFromGitHub {
     owner = "4lex4";
     repo = "scantailor-advanced";
     rev = "v${version}";
-    sha256 = "031jqk64ig6lmscl5yg5lp116zwn0jl7xs9rlniqf6a8g4wfbjk9";
+    sha256 = "0lc9lzbpiy5hgimyhl4s4q67pb9gacpy985gl6iy8pl79zxhmcyp";
   };
 
   nativeBuildInputs = [ cmake qttools ];
   buildInputs = [ libjpeg libpng libtiff boost qtbase ];
 
-  postInstall = ''
-    mkdir -p $out/share/icons/hicolor/scalable/apps
-    cp $src/resources/appicon.svg $out/share/icons/hicolor/scalable/apps/scantailor.svg
-
-    mkdir -p $out/share/applications
-    cp $desktopItem/share/applications/* $out/share/applications/
-    for entry in $out/share/applications/*.desktop; do
-      substituteAllInPlace $entry
-    done
-  '';
-
-  desktopItem = makeDesktopItem {
-    name = "scantailor-advanced";
-    exec = "scantailor %f";
-    icon = "scantailor";
-    comment = meta.description;
-    desktopName = "Scan Tailor Advanced";
-    genericName = "Scan Processing Software";
-    mimeType = "image/png;image/tif;image/jpeg;";
-    categories = "Graphics;";
-    startupNotify = "true";
-  };
-
   meta = with stdenv.lib; {
     homepage = https://github.com/4lex4/scantailor-advanced;
     description = "Interactive post-processing tool for scanned pages";
     license = licenses.gpl3Plus;
     maintainers = with maintainers; [ jfrankenau ];
-    platforms = platforms.gnu ++ platforms.linux;
+    platforms = with platforms; gnu ++ linux ++ darwin;
   };
 }
-- 
GitLab


From f76e421c55cfc2d2411da14219b45f44600e405b Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 18 Jul 2018 03:00:42 +0200
Subject: [PATCH 070/297] =?UTF-8?q?volume=5Fkey:=200.3.10=20=E2=86=92=200.?=
 =?UTF-8?q?3.11?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../libraries/volume-key/default.nix          | 25 ++++++-------------
 1 file changed, 8 insertions(+), 17 deletions(-)

diff --git a/pkgs/development/libraries/volume-key/default.nix b/pkgs/development/libraries/volume-key/default.nix
index 4dd01f664d1..a8515975c35 100644
--- a/pkgs/development/libraries/volume-key/default.nix
+++ b/pkgs/development/libraries/volume-key/default.nix
@@ -1,36 +1,27 @@
-{ stdenv, fetchgit, fetchpatch, autoreconfHook, pkgconfig, gettext, python2
-, swig, glib, utillinux, cryptsetup, nss, gpgme
+{ stdenv, fetchgit, autoreconfHook, pkgconfig, gettext, python3
+, ncurses, swig, glib, utillinux, cryptsetup, nss, gpgme
 }:
 
 let
-  version = "0.3.10";
+  version = "0.3.11";
 in stdenv.mkDerivation rec {
   name = "volume_key-${version}";
 
   src = fetchgit {
     url = https://pagure.io/volume_key.git;
-    rev = "ece1ce305234da454e330905c615ec474d9781c5";
-    sha256 = "16qdi5s6ycsh0iyc362gly7ggrwamky8i0zgbd4ajp3ymk9vqdva";
+    rev = "volume_key-${version}";
+    sha256 = "1sqdbcih1c39bjiv4mm1m7acc3lfh2i2hf2r9i7rk8adfzq8awma";
   };
 
   outputs = [ "out" "man" "dev" "py" ];
 
-  nativeBuildInputs = [ autoreconfHook pkgconfig gettext python2 swig ];
+  nativeBuildInputs = [ autoreconfHook pkgconfig gettext python3 ncurses swig ];
 
   buildInputs = [ glib cryptsetup nss utillinux gpgme ];
 
-  patches = [
-    # Use pkg-config for locating Python.h
-    # https://pagure.io/volume_key/pull-request/12
-    (fetchpatch {
-      url = https://pagure.io/fork/cathay4t/volume_key/c/8eda66d3b734ea335e37cf9d7d173b9e8ebe2fd9.patch;
-      sha256 = "01lr1zijk0imkk681zynm4w5ad3y6c9vdrmrzaib7w7ima75iczr";
-    })
-  ];
-
   makeFlags = [
-    "pyexecdir=$(py)/${python2.sitePackages}"
-    "pythondir=$(py)/${python2.sitePackages}"
+    "pyexecdir=$(py)/${python3.sitePackages}"
+    "pythondir=$(py)/${python3.sitePackages}"
   ];
 
   meta = with stdenv.lib; {
-- 
GitLab


From caccc40ad01c4159a5a627b17d3db12ac67fa252 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@nix.build>
Date: Wed, 18 Jul 2018 02:42:27 +0200
Subject: [PATCH 071/297] vmTools: Fix BusyBox runtime error in initrd

With the recent update of BusyBox to version 1.29.0 in
d6aa506e3baa3565eb375bbf8a4e68c3e3134ec9 there is now a new dependency
on libresolv.

This now throws a runtime error when executing ash, eg. whenever we do
something like this:

nix-build -E 'with import ./. {}; vmTools.runInLinuxVM hello'

The resulting error will be:

  .../ash: error while loading shared libraries: libresolv.so.2: cannot
           open shared object file: No such file or directory

I tried to override BusyBox with enableStatic, but that still requires
parts of glibc:

  Static linking against glibc, can't use --gc-sections
  Trying libraries: crypt m resolv
   Library crypt is not needed, excluding it
   Library m is needed, can't exclude it (yet)
   Library resolv is needed, can't exclude it (yet)
   Library m is needed, can't exclude it (yet)
   Library resolv is needed, can't exclude it (yet)
  Final link with: m resolv

In the long term maybe switching to a more minimal C library such as
musl would make more sense, but for now I just added libresolv.so to the
initrd which fixes the runtime error.

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @edolstra, @rbvermaa
Signed-off-by: aszlig <aszlig@nix.build>
---
 pkgs/build-support/vm/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix
index 6a6deaa875a..221e19ca5ed 100644
--- a/pkgs/build-support/vm/default.nix
+++ b/pkgs/build-support/vm/default.nix
@@ -22,7 +22,6 @@ rec {
 
   hd = "vda"; # either "sda" or "vda"
 
-
   initrdUtils = runCommand "initrd-utils"
     { buildInputs = [ nukeReferences ];
       allowedReferences = [ "out" modulesClosure ]; # prevent accidents like glibc being included in the initrd
@@ -35,6 +34,7 @@ rec {
       cp -p ${pkgs.stdenv.glibc.out}/lib/ld-linux*.so.? $out/lib
       cp -p ${pkgs.stdenv.glibc.out}/lib/libc.so.* $out/lib
       cp -p ${pkgs.stdenv.glibc.out}/lib/libm.so.* $out/lib
+      cp -p ${pkgs.stdenv.glibc.out}/lib/libresolv.so.* $out/lib
 
       # Copy BusyBox.
       cp -pd ${pkgs.busybox}/bin/* $out/bin
-- 
GitLab


From 9fb190de50fabf597aaed9efbd09d8432c17941e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Tue, 17 Jul 2018 19:57:24 -0700
Subject: [PATCH 072/297] rcm: 1.3.1 -> 1.3.3

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/rcm/versions.
---
 pkgs/tools/misc/rcm/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/rcm/default.nix b/pkgs/tools/misc/rcm/default.nix
index db68fab75ab..11ac0fc1419 100644
--- a/pkgs/tools/misc/rcm/default.nix
+++ b/pkgs/tools/misc/rcm/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "rcm-${version}";
-  version = "1.3.1";
+  version = "1.3.3";
 
   src = fetchurl {
     url = "https://thoughtbot.github.io/rcm/dist/rcm-${version}.tar.gz";
-    sha256 = "9c8f92dba63ab9cb8a6b3d0ccf7ed8edf3f0fb388b044584d74778145fae7f8f";
+    sha256 = "1bqk7rrp1ckzvsvl9wghsr77m8xl3a7yc5gqdsisz492dx2j8mck";
   };
 
   patches = [ ./fix-rcmlib-path.patch ];
-- 
GitLab


From eba8679bc50e6f1ca6175b1a92eef2b104317605 Mon Sep 17 00:00:00 2001
From: Luke Adams <luke4450@gmail.com>
Date: Tue, 17 Jul 2018 22:21:57 -0500
Subject: [PATCH 073/297] cudnn*_cudatoolkit*: use public NVIDIA mirror
 (#31551)

* cudnn*_cudatoolkit*: use NVIDIA mirror instead of requireFile

* cudnn_cudatoolkit7: update hash since public mirror is different
---
 .../libraries/science/math/cudnn/default.nix       |  7 ++++---
 .../libraries/science/math/cudnn/generic.nix       | 14 ++++----------
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/libraries/science/math/cudnn/default.nix b/pkgs/development/libraries/science/math/cudnn/default.nix
index 1a98ecc8743..c89e9e4296c 100644
--- a/pkgs/development/libraries/science/math/cudnn/default.nix
+++ b/pkgs/development/libraries/science/math/cudnn/default.nix
@@ -9,10 +9,11 @@ in
 
 {
   cudnn_cudatoolkit_7 = generic rec {
-    version = "4.0";
+    # Old URL is v4 instead of v4.0 for some reason...
+    version = "4";
     cudatoolkit = cudatoolkit_7;
-    srcName = "cudnn-${cudatoolkit.majorVersion}-linux-x64-v${version}-prod.tgz";
-    sha256 = "0zgr6qdbc29qw6sikhrh6diwwz7150rqc8a49f2qf37j2rvyyr2f";
+    srcName = "cudnn-${cudatoolkit.majorVersion}-linux-x64-v4.0-prod.tgz";
+    sha256 = "01a4v5j4v9n2xjqcc4m28c3m67qrvsx87npvy7zhx7w8smiif2fd";
   };
 
   cudnn_cudatoolkit_7_5 = generic rec {
diff --git a/pkgs/development/libraries/science/math/cudnn/generic.nix b/pkgs/development/libraries/science/math/cudnn/generic.nix
index 51bda19cf13..bb1258655b5 100644
--- a/pkgs/development/libraries/science/math/cudnn/generic.nix
+++ b/pkgs/development/libraries/science/math/cudnn/generic.nix
@@ -5,24 +5,18 @@
 
 { stdenv
 , lib
-, requireFile
 , cudatoolkit
+, fetchurl
 }:
 
 stdenv.mkDerivation rec {
   name = "cudatoolkit-${cudatoolkit.majorVersion}-cudnn-${version}";
 
   inherit version;
-
-  src = requireFile rec {
-    name = srcName;
+  src = fetchurl {
+    # URL from NVIDIA docker containers: https://gitlab.com/nvidia/cuda/blob/centos7/7.0/runtime/cudnn4/Dockerfile
+    url = "https://developer.download.nvidia.com/compute/redist/cudnn/v${version}/${srcName}";
     inherit sha256;
-    message = ''
-      This nix expression requires that ${name} is already part of the store.
-      Register yourself to NVIDIA Accelerated Computing Developer Program, retrieve the cuDNN library
-      at https://developer.nvidia.com/cudnn, and run the following command in the download directory:
-      nix-prefetch-url file://\$PWD/${name}
-    '';
   };
 
   installPhase = ''
-- 
GitLab


From 6fd5287c36c8ce2fa12efae6cf171c6e46b41e87 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Mon, 16 Jul 2018 17:23:32 +0200
Subject: [PATCH 074/297] haskell: don't error if isLibrary = true and no
 libraries exist

If empty directory isn't deleted, referer depenedencies will
fail with:

cp: missing destination file operand after '/tmp/nix-build-cabal-helper-0.8.0.2.drv-0/setup-package.conf.d/'

This is currently only the case for cabal-install, as cabal2nix
doesn't handle well buildable=False flags due to long-standing bugs
in Cabal itself.
---
 pkgs/development/haskell-modules/generic-builder.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index c68d84bdb8a..80274f515c5 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -394,6 +394,9 @@ stdenv.mkDerivation ({
         local pkgId=$( ${gnused}/bin/sed -n -e 's|^id: ||p' $packageConfFile )
         mv $packageConfFile $packageConfDir/$pkgId.conf
       done
+
+      # delete confdir if there are no libraries
+      find $packageConfDir -maxdepth 0 -empty -delete;
     ''}
     ${optionalString isGhcjs ''
       for exeDir in "$out/bin/"*.jsexe; do
-- 
GitLab


From 9aff5fcd56f440ad6e10b92633f22523ce24478f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 17 Jul 2018 15:44:50 +0200
Subject: [PATCH 075/297] LTS Haskell 12.1

---
 .../configuration-hackage2nix.yaml            | 128 +++++++++---------
 1 file changed, 64 insertions(+), 64 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 1daaf3409b5..f50b02a7a95 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -43,7 +43,7 @@ core-packages:
 default-package-overrides:
   # Newer versions require contravariant-1.5.*, which many builds refuse at the moment.
   - base-compat-batteries ==0.10.1
-  # LTS Haskell 12.0
+  # LTS Haskell 12.1
   - abstract-deque ==0.3
   - abstract-deque-tests ==0.3
   - abstract-par ==0.3.3
@@ -217,7 +217,7 @@ default-package-overrides:
   - authenticate ==1.3.4
   - authenticate-oauth ==1.6
   - auto ==0.4.3.1
-  - autoexporter ==1.1.9
+  - autoexporter ==1.1.10
   - auto-update ==0.1.4
   - avro ==0.3.2.0
   - avwx ==0.3.0.2
@@ -232,7 +232,7 @@ default-package-overrides:
   - base64-string ==0.2
   - base-compat ==0.10.4
   - base-compat-batteries ==0.10.1
-  - basement ==0.0.7
+  - basement ==0.0.8
   - base-orphans ==0.7
   - base-prelude ==1.3
   - base-unicode-symbols ==0.2.2.4
@@ -302,7 +302,7 @@ default-package-overrides:
   - boundingboxes ==0.2.3
   - bower-json ==1.0.0.1
   - boxes ==0.1.5
-  - brick ==0.37.1
+  - brick ==0.37.2
   - brittany ==0.11.0.0
   - broadcast-chan ==0.1.1
   - bsb-http-chunked ==0.0.0.2
@@ -424,7 +424,7 @@ default-package-overrides:
   - composable-associations-aeson ==0.1.0.0
   - composition ==1.0.2.1
   - composition-extra ==2.0.0
-  - composition-prelude ==1.5.0.6
+  - composition-prelude ==1.5.0.8
   - compressed ==3.11
   - concise ==0.1.0.1
   - concurrency ==1.6.0.0
@@ -495,7 +495,7 @@ default-package-overrides:
   - crypto-random ==0.0.9
   - crypto-random-api ==0.2.0
   - crypt-sha512 ==0
-  - csg ==0.1.0.3
+  - csg ==0.1.0.4
   - csp ==1.4.0
   - css-syntax ==0.0.7
   - css-text ==0.1.3.0
@@ -557,13 +557,13 @@ default-package-overrides:
   - Decimal ==0.5.1
   - declarative ==0.5.2
   - deepseq-generics ==0.2.0.0
-  - dejafu ==1.11.0.1
+  - dejafu ==1.11.0.3
   - dependent-map ==0.2.4.0
   - dependent-sum ==0.4
   - dependent-sum-template ==0.0.0.6
   - deque ==0.2.1
-  - deriving-compat ==0.5
-  - derulo ==1.0.2
+  - deriving-compat ==0.5.1
+  - derulo ==1.0.3
   - detour-via-sci ==1.0.0
   - df1 ==0.1.1
   - dhall ==1.15.1
@@ -653,7 +653,7 @@ default-package-overrides:
   - elm-core-sources ==1.0.0
   - elm-export ==0.6.0.1
   - email-validate ==2.3.2.6
-  - enclosed-exceptions ==1.0.2
+  - enclosed-exceptions ==1.0.3
   - entropy ==0.4.1.1
   - enummapset ==0.5.2.2
   - enumset ==0.0.4.1
@@ -677,7 +677,7 @@ default-package-overrides:
   - eventful-sqlite ==0.2.0
   - eventful-test-helpers ==0.2.0
   - event-list ==0.1.2
-  - eventstore ==1.1.4
+  - eventstore ==1.1.5
   - every ==0.0.1
   - exact-combinatorics ==0.2.0.8
   - exact-pi ==0.4.1.3
@@ -695,7 +695,7 @@ default-package-overrides:
   - exp-pairs ==0.1.6.0
   - extensible ==0.4.9
   - extensible-exceptions ==0.1.1.4
-  - extra ==1.6.8
+  - extra ==1.6.9
   - extractable-singleton ==0.0.1
   - extrapolate ==0.3.1
   - facts ==0.0.1.0
@@ -729,7 +729,7 @@ default-package-overrides:
   - FindBin ==0.0.5
   - find-clumpiness ==0.2.3.1
   - fingertree ==0.1.4.1
-  - finite-typelits ==0.1.3.0
+  - finite-typelits ==0.1.4.2
   - first-class-patterns ==0.3.2.4
   - fixed ==0.2.1.1
   - fixed-length ==0.2
@@ -741,7 +741,7 @@ default-package-overrides:
   - flay ==0.4
   - flexible-defaults ==0.0.2
   - floatshow ==0.2.4
-  - flow ==1.0.13
+  - flow ==1.0.14
   - fmlist ==0.9.2
   - fn ==0.3.0.2
   - focus ==0.1.5.2
@@ -757,7 +757,7 @@ default-package-overrides:
   - forma ==1.1.0
   - format-numbers ==0.1.0.0
   - formatting ==6.3.6
-  - foundation ==0.0.20
+  - foundation ==0.0.21
   - free ==5.0.2
   - freenect ==1.2.1
   - freer-simple ==1.1.0.0
@@ -819,12 +819,12 @@ default-package-overrides:
   - ghcjs-codemirror ==0.0.0.2
   - ghc-parser ==0.2.0.2
   - ghc-paths ==0.1.0.9
-  - ghc-prof ==1.4.1.2
+  - ghc-prof ==1.4.1.3
   - ghc-syntax-highlighter ==0.0.2.0
   - ghc-tcplugins-extra ==0.3
-  - ghc-typelits-extra ==0.2.5
-  - ghc-typelits-knownnat ==0.5
-  - ghc-typelits-natnormalise ==0.6.1
+  - ghc-typelits-extra ==0.2.6
+  - ghc-typelits-knownnat ==0.5.1
+  - ghc-typelits-natnormalise ==0.6.2
   - ghost-buster ==0.1.1.0
   - gi-atk ==2.0.15
   - gi-cairo ==1.0.17
@@ -841,7 +841,7 @@ default-package-overrides:
   - gi-pango ==1.0.16
   - giphy-api ==0.6.0.1
   - github ==0.19
-  - github-release ==1.2.1
+  - github-release ==1.2.2
   - github-types ==0.2.1
   - github-webhooks ==0.10.0
   - gitrev ==1.3.1
@@ -888,7 +888,7 @@ default-package-overrides:
   - hamtsolo ==1.0.3
   - HandsomeSoup ==0.4.2
   - handwriting ==0.1.0.3
-  - hapistrano ==0.3.5.7
+  - hapistrano ==0.3.5.8
   - happstack-server ==7.5.1.1
   - happy ==1.19.9
   - hasbolt ==0.1.3.0
@@ -911,14 +911,14 @@ default-package-overrides:
   - haskell-src-exts-simple ==1.20.0.0
   - haskell-src-exts-util ==0.2.3
   - haskell-src-meta ==0.8.0.3
-  - haskell-tools-ast ==1.1.0.1
-  - haskell-tools-backend-ghc ==1.1.0.1
-  - haskell-tools-builtin-refactorings ==1.1.0.1
-  - haskell-tools-debug ==1.1.0.1
-  - haskell-tools-demo ==1.1.0.1
-  - haskell-tools-prettyprint ==1.1.0.1
-  - haskell-tools-refactor ==1.1.0.1
-  - haskell-tools-rewrite ==1.1.0.1
+  - haskell-tools-ast ==1.1.0.2
+  - haskell-tools-backend-ghc ==1.1.0.2
+  - haskell-tools-builtin-refactorings ==1.1.0.2
+  - haskell-tools-debug ==1.1.0.2
+  - haskell-tools-demo ==1.1.0.2
+  - haskell-tools-prettyprint ==1.1.0.2
+  - haskell-tools-refactor ==1.1.0.2
+  - haskell-tools-rewrite ==1.1.0.2
   - haskey ==0.3.0.2
   - haskey-btree ==0.3.0.0
   - haskey-mtl ==0.3.1.0
@@ -973,7 +973,7 @@ default-package-overrides:
   - hmpfr ==0.4.4
   - Hoed ==0.5.1
   - hoopl ==3.10.2.2
-  - hOpenPGP ==2.7
+  - hOpenPGP ==2.7.1
   - hopenpgp-tools ==0.21.1
   - hopfli ==0.2.2.1
   - hostname ==1.0
@@ -995,8 +995,8 @@ default-package-overrides:
   - hsdns ==1.7.1
   - hsebaysdk ==0.4.0.0
   - hsemail ==2
-  - HSet ==0.0.1
   - hset ==2.2.0
+  - HSet ==0.0.1
   - hsexif ==0.6.1.5
   - hs-functors ==0.1.2.0
   - hs-GeoIP ==0.3
@@ -1044,7 +1044,7 @@ default-package-overrides:
   - http2 ==1.6.3
   - http-api-data ==0.3.8.1
   - http-client ==0.5.13.1
-  - http-client-openssl ==0.2.1.1
+  - http-client-openssl ==0.2.2.0
   - http-client-tls ==0.3.5.3
   - http-common ==0.8.2.0
   - http-conduit ==2.3.2
@@ -1065,7 +1065,7 @@ default-package-overrides:
   - hw-conduit ==0.2.0.3
   - hw-diagnostics ==0.0.0.5
   - hweblib ==0.6.3
-  - hw-excess ==0.2.0.0
+  - hw-excess ==0.2.0.2
   - hw-fingertree-strict ==0.1.1.1
   - hw-hedgehog ==0.1.0.1
   - hw-hspec-hedgehog ==0.1.0.5
@@ -1127,7 +1127,7 @@ default-package-overrides:
   - IntervalMap ==0.6.0.0
   - intervals ==0.8.1
   - intro ==0.3.1.0
-  - invariant ==0.5
+  - invariant ==0.5.1
   - invertible ==0.2.0.5
   - invertible-grammar ==0.1.1
   - io-choice ==0.0.6
@@ -1164,7 +1164,7 @@ default-package-overrides:
   - js-flot ==0.8.3
   - js-jquery ==3.3.1
   - json ==0.9.2
-  - json-feed ==1.0.2
+  - json-feed ==1.0.3
   - json-rpc-client ==0.2.5.0
   - json-rpc-generic ==0.2.1.4
   - json-rpc-server ==0.2.6.0
@@ -1188,17 +1188,17 @@ default-package-overrides:
   - kraken ==0.1.0
   - l10n ==0.1.0.1
   - labels ==0.3.3
-  - lackey ==1.0.4
+  - lackey ==1.0.5
   - LambdaHack ==0.8.3.0
   - lame ==0.1.1
   - language-c ==0.8.1
   - language-c-quote ==0.12.2
-  - language-docker ==6.0.3
+  - language-docker ==6.0.4
   - language-ecmascript ==0.19
   - language-haskell-extract ==0.2.4
   - language-java ==0.2.9
   - language-javascript ==0.6.0.11
-  - language-puppet ==1.3.19
+  - language-puppet ==1.3.19.1
   - lapack-carray ==0.0.2
   - lapack-ffi ==0.0.2
   - lapack-ffi-tools ==0.1.0.1
@@ -1300,7 +1300,7 @@ default-package-overrides:
   - median-stream ==0.7.0.0
   - med-module ==0.1.1
   - megaparsec ==6.5.0
-  - mega-sdist ==0.3.3
+  - mega-sdist ==0.3.3.1
   - memory ==0.14.16
   - MemoTrie ==0.6.9
   - mercury-api ==0.1.0.1
@@ -1309,7 +1309,7 @@ default-package-overrides:
   - messagepack-rpc ==0.5.1
   - metrics ==0.4.1.1
   - mfsolve ==0.3.2.0
-  - microformats2-parser ==1.0.1.8
+  - microformats2-parser ==1.0.1.9
   - microlens ==0.4.9.1
   - microlens-aeson ==2.3.0
   - microlens-contra ==0.1.0.1
@@ -1505,7 +1505,7 @@ default-package-overrides:
   - pandoc-types ==1.17.5.1
   - pango ==0.13.5.0
   - papillon ==0.1.0.6
-  - parallel ==3.2.1.1
+  - parallel ==3.2.2.0
   - parallel-io ==0.3.3
   - parseargs ==0.2.0.8
   - parsec ==3.1.13.0
@@ -1610,7 +1610,7 @@ default-package-overrides:
   - prettyprinter-compat-wl-pprint ==1.0.0.1
   - prettyprinter-convert-ansi-wl-pprint ==1.1
   - pretty-show ==1.7
-  - pretty-simple ==2.1.0.0
+  - pretty-simple ==2.1.0.1
   - pretty-types ==0.2.3.1
   - primes ==0.2.1.0
   - primitive ==0.6.3.0
@@ -1676,10 +1676,10 @@ default-package-overrides:
   - rank2classes ==1.1.0.1
   - Rasterific ==0.7.3
   - rasterific-svg ==0.3.3.1
-  - ratel ==1.0.4
-  - ratel-wai ==1.0.2
+  - ratel ==1.0.5
+  - ratel-wai ==1.0.3
   - ratio-int ==0.1.2
-  - rattletrap ==4.1.1
+  - rattletrap ==4.1.2
   - rawfilepath ==0.2.4
   - rawstring-qm ==0.2.3.0
   - raw-strings-qq ==1.1
@@ -1713,7 +1713,7 @@ default-package-overrides:
   - regex-tdfa-text ==1.0.0.3
   - reinterpret-cast ==0.1.0
   - relational-query ==0.12.0.1
-  - relational-query-HDBC ==0.7.0.0
+  - relational-query-HDBC ==0.7.0.1
   - relational-record ==0.2.2.0
   - relational-schemas ==0.1.6.2
   - renderable ==0.2.0.1
@@ -1754,7 +1754,7 @@ default-package-overrides:
   - safe-money ==0.6
   - SafeSemaphore ==0.10.1
   - saltine ==0.1.0.1
-  - salve ==1.0.3
+  - salve ==1.0.4
   - sample-frame ==0.0.3
   - sample-frame-np ==0.0.4.1
   - sampling ==0.3.3
@@ -1762,8 +1762,8 @@ default-package-overrides:
   - sandman ==0.2.0.1
   - say ==0.1.0.0
   - sbp ==2.3.16
-  - SCalendar ==1.1.0
   - scalendar ==1.2.0
+  - SCalendar ==1.1.0
   - scalpel ==0.5.1
   - scalpel-core ==0.5.1
   - scanner ==0.2
@@ -1824,10 +1824,10 @@ default-package-overrides:
   - servant-tracing ==0.1.0.2
   - servant-websockets ==1.1.0
   - servant-yaml ==0.1.0.0
-  - serverless-haskell ==0.6.1
+  - serverless-haskell ==0.6.2
   - serversession ==1.0.1
   - serversession-frontend-wai ==1.0
-  - servius ==1.2.0.3
+  - servius ==1.2.1.0
   - ses-html ==0.4.0.0
   - set-cover ==0.0.9
   - setenv ==0.1.1.3
@@ -1887,7 +1887,7 @@ default-package-overrides:
   - speculation ==1.5.0.3
   - speedy-slice ==0.3.0
   - sphinx ==0.6.0.2
-  - Spintax ==0.3.2
+  - Spintax ==0.3.3
   - splice ==0.6.1.1
   - split ==0.2.3.3
   - splitmix ==0.0.1
@@ -1927,7 +1927,7 @@ default-package-overrides:
   - store ==0.5.0
   - store-core ==0.4.4
   - Strafunski-StrategyLib ==5.0.1.0
-  - stratosphere ==0.24.1
+  - stratosphere ==0.24.3
   - streaming ==0.2.1.0
   - streaming-attoparsec ==1.0.0
   - streaming-bytestring ==0.1.6
@@ -1947,7 +1947,7 @@ default-package-overrides:
   - string-qq ==0.0.2
   - stringsearch ==0.3.6.6
   - string-transform ==1.1.0
-  - strive ==5.0.5
+  - strive ==5.0.6
   - structs ==0.1.1
   - stylish-haskell ==0.9.2.0
   - summoner ==1.0.4
@@ -2184,7 +2184,7 @@ default-package-overrides:
   - vector-bytes-instances ==0.1.1
   - vector-instances ==3.4
   - vector-mmap ==0.0.3
-  - vector-sized ==1.0.3.0
+  - vector-sized ==1.0.4.0
   - vector-space ==0.13
   - vector-split ==1.0.0.2
   - vector-th-unbox ==0.2.1.6
@@ -2192,7 +2192,7 @@ default-package-overrides:
   - verbosity ==0.2.3.0
   - versions ==3.4.0.1
   - ViennaRNAParser ==1.3.3
-  - viewprof ==0.0.0.18
+  - viewprof ==0.0.0.19
   - vinyl ==0.8.1.1
   - vivid ==0.3.0.2
   - vivid-osc ==0.3.0.0
@@ -2205,7 +2205,7 @@ default-package-overrides:
   - wai-conduit ==3.0.0.4
   - wai-cors ==0.2.6
   - wai-eventsource ==3.0.0
-  - wai-extra ==3.0.22.1
+  - wai-extra ==3.0.23.0
   - wai-handler-launch ==3.0.2.4
   - wai-logger ==2.3.2
   - wai-middleware-caching ==0.1.0.2
@@ -2221,7 +2221,7 @@ default-package-overrides:
   - wai-slack-middleware ==0.2.0
   - wai-transformers ==0.1.0
   - wai-websockets ==3.0.1.2
-  - warp ==3.2.22
+  - warp ==3.2.23
   - warp-tls ==3.2.4.3
   - warp-tls-uid ==0.2.0.5
   - wave ==0.1.5
@@ -2269,7 +2269,7 @@ default-package-overrides:
   - writer-cps-mtl ==0.1.1.4
   - writer-cps-transformers ==0.1.1.3
   - ws ==0.0.4
-  - wuss ==1.1.9
+  - wuss ==1.1.10
   - X11 ==1.9
   - X11-xft ==0.3.1
   - x11-xim ==0.0.9.0
@@ -2303,22 +2303,22 @@ default-package-overrides:
   - xml-types ==0.3.6
   - xss-sanitize ==0.3.6
   - xxhash-ffi ==0.2.0.0
-  - yaml ==0.8.31.1
+  - yaml ==0.8.32
   - yeshql ==4.1.0.0
   - yeshql-core ==4.1.0.0
   - yeshql-hdbc ==4.1.0.0
   - yesod ==1.6.0
   - yesod-alerts ==0.1.2.0
-  - yesod-auth ==1.6.3
+  - yesod-auth ==1.6.4.1
   - yesod-auth-fb ==1.9.0
   - yesod-auth-hashdb ==1.7
   - yesod-bin ==1.6.0.3
-  - yesod-core ==1.6.5
+  - yesod-core ==1.6.6
   - yesod-csp ==0.2.4.0
   - yesod-eventsource ==1.6.0
   - yesod-fb ==0.5.0
-  - yesod-form ==1.6.1
-  - yesod-form-bootstrap4 ==1.0.0
+  - yesod-form ==1.6.2
+  - yesod-form-bootstrap4 ==1.0.2
   - yesod-gitrepo ==0.3.0
   - yesod-gitrev ==0.2.0.0
   - yesod-newsfeed ==1.6.1.0
@@ -2327,7 +2327,7 @@ default-package-overrides:
   - yesod-recaptcha2 ==0.2.4
   - yesod-sitemap ==1.6.0
   - yesod-static ==1.6.0
-  - yesod-test ==1.6.4
+  - yesod-test ==1.6.5
   - yesod-text-markdown ==0.1.10
   - yesod-websockets ==0.3.0
   - yes-precure5-command ==5.5.3
-- 
GitLab


From 194a2f05358a1c543a387cf3053d4abc3bf8ad7a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 17 Jul 2018 02:31:09 +0200
Subject: [PATCH 076/297] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.10.1 from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/12c327a1fbe9bf362b588315d28033d8632692dc.
---
 .../haskell-modules/hackage-packages.nix      | 1901 +++++------------
 1 file changed, 557 insertions(+), 1344 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index c8ae0ef4236..5816f295e0d 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -10135,8 +10135,8 @@ self: {
      }:
      mkDerivation {
        pname = "IPv6DB";
-       version = "0.2.6";
-       sha256 = "1dshvq3amnwfvf50g4gs93rc307sk1hi3snjhflzjz0dfn8xa2d4";
+       version = "0.3.0";
+       sha256 = "0dz0ar75nd04l1cbca7iz9laqv24mach7ajr4k5ibl2717kczkpa";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -10151,7 +10151,7 @@ self: {
        testHaskellDepends = [
          aeson base hspec http-client http-types vector
        ];
-       description = "A RESTful Web Service for IPv6-related data";
+       description = "A RESTful microService for IPv6-related data";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -13312,14 +13312,19 @@ self: {
      }) {};
 
   "OTP" = callPackage
-    ({ mkDerivation, base, Crypto, time }:
+    ({ mkDerivation, base, bytestring, cryptohash-sha1
+     , cryptohash-sha256, cryptohash-sha512, tasty, tasty-hunit, time
+     }:
      mkDerivation {
        pname = "OTP";
-       version = "0.0.0.1";
-       sha256 = "0vcxyfk1vx30cfngq5cv3lc34x0sxsirykhbi4ygw5pvd9ylzadb";
-       libraryHaskellDepends = [ base Crypto time ];
-       testHaskellDepends = [ base Crypto time ];
-       description = "HMAC-Based and Time-Based One-Time Passwords";
+       version = "0.1.0.0";
+       sha256 = "1r7vpc0bv89d70j6pc3z3vam93gahl4j0y5w8smknxwjliwqxkcb";
+       libraryHaskellDepends = [
+         base bytestring cryptohash-sha1 cryptohash-sha256 cryptohash-sha512
+         time
+       ];
+       testHaskellDepends = [ base bytestring tasty tasty-hunit time ];
+       description = "HMAC-Based and Time-Based One-Time Passwords (HOTP & TOTP)";
        license = stdenv.lib.licenses.mit;
      }) {};
 
@@ -16782,19 +16787,6 @@ self: {
      }) {};
 
   "Spintax" = callPackage
-    ({ mkDerivation, attoparsec, base, extra, mtl, mwc-random, text }:
-     mkDerivation {
-       pname = "Spintax";
-       version = "0.3.2";
-       sha256 = "0j7hkdskc66h02yxrw6aah1drqrwxdhq9c33w5mg0rg0gj0j1rpp";
-       libraryHaskellDepends = [
-         attoparsec base extra mtl mwc-random text
-       ];
-       description = "Random text generation based on spintax";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "Spintax_0_3_3" = callPackage
     ({ mkDerivation, attoparsec, base, extra, mtl, mwc-random, text }:
      mkDerivation {
        pname = "Spintax";
@@ -16805,7 +16797,6 @@ self: {
        ];
        description = "Random text generation based on spintax";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Spock" = callPackage
@@ -30317,20 +30308,6 @@ self: {
      }) {};
 
   "autoexporter" = callPackage
-    ({ mkDerivation, base, Cabal, directory, filepath }:
-     mkDerivation {
-       pname = "autoexporter";
-       version = "1.1.9";
-       sha256 = "0hm0njnfgjfbnpjjqmhim773zbzgkfq96caxckcv8vkrj78l839v";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [ base Cabal directory filepath ];
-       executableHaskellDepends = [ base Cabal directory filepath ];
-       description = "Automatically re-export modules";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "autoexporter_1_1_10" = callPackage
     ({ mkDerivation, base, Cabal, directory, filepath }:
      mkDerivation {
        pname = "autoexporter";
@@ -30342,7 +30319,6 @@ self: {
        executableHaskellDepends = [ base Cabal directory filepath ];
        description = "Automatically re-export modules";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "autom" = callPackage
@@ -32446,17 +32422,6 @@ self: {
      }) {};
 
   "basement" = callPackage
-    ({ mkDerivation, base, ghc-prim }:
-     mkDerivation {
-       pname = "basement";
-       version = "0.0.7";
-       sha256 = "0w2g4k9bs2ph00p0fgrmcrng8ypdz6xis0r10g380nzkg2rvj0dm";
-       libraryHaskellDepends = [ base ghc-prim ];
-       description = "Foundation scrap box of array & string";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "basement_0_0_8" = callPackage
     ({ mkDerivation, base, ghc-prim }:
      mkDerivation {
        pname = "basement";
@@ -32465,7 +32430,6 @@ self: {
        libraryHaskellDepends = [ base ghc-prim ];
        description = "Foundation scrap box of array & string";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "basen-bytestring" = callPackage
@@ -33272,8 +33236,8 @@ self: {
      }:
      mkDerivation {
        pname = "bench-graph";
-       version = "0.1.2";
-       sha256 = "055g038zp8px22dwb5h113fxms5m9g46b5x81h249nyybp258fyk";
+       version = "0.1.3";
+       sha256 = "15xsaqxms61p8d5r0lsxhlrdfh451ha6fpldcmh8vcw0q4yb1q47";
        libraryHaskellDepends = [
          base Chart Chart-diagrams csv directory filepath transformers
        ];
@@ -38166,8 +38130,8 @@ self: {
      }:
      mkDerivation {
        pname = "brick";
-       version = "0.37.1";
-       sha256 = "04rpiafw7a30drbk8gmp01m6l3iawayy1ma1hn8m257rh2zk66qy";
+       version = "0.37.2";
+       sha256 = "176rq7xpwww1c3h7hm6n6z7sxbd3wc2zhxvnk65llk9lipc6rf3w";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -40975,8 +40939,8 @@ self: {
      }:
      mkDerivation {
        pname = "cabal2nix";
-       version = "2.10.0";
-       sha256 = "1ry2zk81x7jd14ayi49vh8nan10sbphkbj6s5y15a6w0vs4wznn1";
+       version = "2.10.1";
+       sha256 = "1xwfr53flc2cv7gk583ycmiw7v9x93v1gvhiy6ilqw8a8915vncb";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -41019,6 +40983,27 @@ self: {
        maintainers = with stdenv.lib.maintainers; [ peti ];
      }) {};
 
+  "cabal2spec_2_2_0" = callPackage
+    ({ mkDerivation, base, Cabal, filepath, optparse-applicative, tasty
+     , tasty-golden, time
+     }:
+     mkDerivation {
+       pname = "cabal2spec";
+       version = "2.2.0";
+       sha256 = "0pcai2ikp6gna1h60dihclq7apj9jczwz4n0lnfc9fr176gzsprp";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base Cabal filepath time ];
+       executableHaskellDepends = [
+         base Cabal filepath optparse-applicative
+       ];
+       testHaskellDepends = [ base Cabal filepath tasty tasty-golden ];
+       description = "Convert Cabal files into rpm spec files";
+       license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       maintainers = with stdenv.lib.maintainers; [ peti ];
+     }) {};
+
   "cabalQuery" = callPackage
     ({ mkDerivation, base, Cabal, containers, directory, MissingH
      , pretty
@@ -49004,17 +48989,6 @@ self: {
      }) {};
 
   "composition-prelude" = callPackage
-    ({ mkDerivation, base }:
-     mkDerivation {
-       pname = "composition-prelude";
-       version = "1.5.0.6";
-       sha256 = "13rjy6i48nsy3nqk79b4cqgiapjg11knzkzajmxy6ps6iq308vjn";
-       libraryHaskellDepends = [ base ];
-       description = "Higher-order function combinators";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "composition-prelude_1_5_0_8" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "composition-prelude";
@@ -49023,7 +48997,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Higher-order function combinators";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "composition-tree" = callPackage
@@ -54188,8 +54161,8 @@ self: {
      }:
      mkDerivation {
        pname = "csg";
-       version = "0.1.0.3";
-       sha256 = "17ysbi3585ag7a098lv7wjr4xsjm8mm3zz5hfvz2ahis2g151ipx";
+       version = "0.1.0.4";
+       sha256 = "1dril9ayqng04s6jnh28r8by604kkygbjiblp2c4px0bqvz3g5cx";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -56629,8 +56602,8 @@ self: {
        pname = "data-interval";
        version = "1.3.0";
        sha256 = "1i00cci7lzvkxqd1l8dacn7i0mrnccbs23mdciz6nrhlvlgsfiy9";
-       revision = "1";
-       editedCabalFile = "09n6gklg64lgn4x1f48ga9ynssyl4fm8x376blls1mx1xg6kgbz6";
+       revision = "2";
+       editedCabalFile = "16frb3rlkca5z30lwhw8vpwi4g1y42scvg8v41lvih90jq82pg2s";
        libraryHaskellDepends = [
          base containers deepseq extended-reals hashable lattices
        ];
@@ -57167,10 +57140,8 @@ self: {
     ({ mkDerivation, base, hashable, unordered-containers }:
      mkDerivation {
        pname = "data-standards";
-       version = "0.1.0.0";
-       sha256 = "014fk5lsj35iax9amgcn0r9kifyr2ar3afi4zs651l1xl7csmywz";
-       revision = "1";
-       editedCabalFile = "0g4hlyzkski4zha53w6asanjnk9s2jp5dgql353szm4flldfsx07";
+       version = "0.1.0.1";
+       sha256 = "0nx8hgv653nh138f9s2x36hwv92sbj5wzl4isaylxn12qqlwx94d";
        libraryHaskellDepends = [ base hashable unordered-containers ];
        description = "A collection of standards representable by simple data types";
        license = stdenv.lib.licenses.mpl20;
@@ -59096,22 +59067,6 @@ self: {
      }) {};
 
   "dejafu" = callPackage
-    ({ mkDerivation, base, concurrency, containers, contravariant
-     , deepseq, exceptions, leancheck, profunctors, random, transformers
-     }:
-     mkDerivation {
-       pname = "dejafu";
-       version = "1.11.0.1";
-       sha256 = "04a4nnipb7qlw0kz4gy7flzndas3zppjxjbp8vvpcc7n5mqcj89x";
-       libraryHaskellDepends = [
-         base concurrency containers contravariant deepseq exceptions
-         leancheck profunctors random transformers
-       ];
-       description = "A library for unit-testing concurrent programs";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "dejafu_1_11_0_3" = callPackage
     ({ mkDerivation, base, concurrency, containers, contravariant
      , deepseq, exceptions, leancheck, profunctors, random, transformers
      }:
@@ -59125,7 +59080,6 @@ self: {
        ];
        description = "A library for unit-testing concurrent programs";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "deka" = callPackage
@@ -59655,30 +59609,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "deriving-compat" = callPackage
-    ({ mkDerivation, base, base-compat, base-orphans, containers
-     , ghc-boot-th, ghc-prim, hspec, hspec-discover, QuickCheck, tagged
-     , template-haskell, th-abstraction, transformers
-     , transformers-compat
+  "deriveJsonNoPrefix" = callPackage
+    ({ mkDerivation, aeson, base, hspec, template-haskell, text
+     , unordered-containers
      }:
      mkDerivation {
-       pname = "deriving-compat";
-       version = "0.5";
-       sha256 = "1777569bgb7p1xn9ch90jbg2mk4gph04mzmw3r8c6kq84db1484m";
-       libraryHaskellDepends = [
-         base containers ghc-boot-th ghc-prim template-haskell
-         th-abstraction transformers transformers-compat
-       ];
+       pname = "deriveJsonNoPrefix";
+       version = "0.1.0.1";
+       sha256 = "1zwk181c8fv0cv6w3daz3gyb0rwp2cm56piv19iz2vfv3jk9rqqs";
+       libraryHaskellDepends = [ aeson base template-haskell ];
        testHaskellDepends = [
-         base base-compat base-orphans hspec QuickCheck tagged
-         template-haskell transformers transformers-compat
+         aeson base hspec template-haskell text unordered-containers
        ];
-       testToolDepends = [ hspec-discover ];
-       description = "Backports of GHC deriving extensions";
-       license = stdenv.lib.licenses.bsd3;
+       description = "Derive ToJSON/FromJSON instances in a more prefix-friendly manner";
+       license = stdenv.lib.licenses.asl20;
      }) {};
 
-  "deriving-compat_0_5_1" = callPackage
+  "deriving-compat" = callPackage
     ({ mkDerivation, base, base-compat, base-orphans, containers
      , ghc-boot-th, ghc-prim, hspec, hspec-discover, QuickCheck, tagged
      , template-haskell, th-abstraction, transformers
@@ -59699,7 +59646,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Backports of GHC deriving extensions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "derp" = callPackage
@@ -59726,21 +59672,6 @@ self: {
      }) {};
 
   "derulo" = callPackage
-    ({ mkDerivation, base, doctest }:
-     mkDerivation {
-       pname = "derulo";
-       version = "1.0.2";
-       sha256 = "0kyh5fcbv6337baz2prghak5w4x29ms0ccybbp1qkq0cvmvfwrvq";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [ base ];
-       executableHaskellDepends = [ base ];
-       testHaskellDepends = [ base doctest ];
-       description = "Parse and render JSON simply";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "derulo_1_0_3" = callPackage
     ({ mkDerivation, base, doctest }:
      mkDerivation {
        pname = "derulo";
@@ -59753,7 +59684,6 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "Parse and render JSON simply";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "descrilo" = callPackage
@@ -62893,6 +62823,26 @@ self: {
        maintainers = with stdenv.lib.maintainers; [ peti ];
      }) {};
 
+  "distribution-opensuse" = callPackage
+    ({ mkDerivation, aeson, base, binary, bytestring, containers
+     , deepseq, Diff, extra, foldl, hashable, hsemail, mtl, parsec-class
+     , pretty, text, time, turtle
+     }:
+     mkDerivation {
+       pname = "distribution-opensuse";
+       version = "1.0.0";
+       sha256 = "0zy0whx8badksaqqkswslrgrz57mpx3pfjjhrqrvn7088anwb7rr";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base binary bytestring containers deepseq Diff extra foldl
+         hashable hsemail mtl parsec-class pretty text time turtle
+       ];
+       executableHaskellDepends = [ base containers text turtle ];
+       description = "Types, functions, and tools to manipulate the openSUSE distribution";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "distribution-plot" = callPackage
     ({ mkDerivation, base, Chart, Chart-cairo, colour, containers
      , data-default-class, distribution, lens
@@ -65902,6 +65852,30 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "edges" = callPackage
+    ({ mkDerivation, base, cereal, contravariant, deferred-folds, foldl
+     , monad-par, pointed, potoki, potoki-cereal, primitive
+     , primitive-extras, profunctors, QuickCheck, quickcheck-instances
+     , rerebase, semigroupoids, tasty, tasty-hunit, tasty-quickcheck
+     , text, vector
+     }:
+     mkDerivation {
+       pname = "edges";
+       version = "0.4.0.1";
+       sha256 = "1a599zi2im1ics8gnb0v0iv2rpzwzl8i2qfglgi1cxzdhcymn5sa";
+       libraryHaskellDepends = [
+         base cereal contravariant deferred-folds foldl monad-par pointed
+         potoki potoki-cereal primitive primitive-extras profunctors
+         QuickCheck semigroupoids text vector
+       ];
+       testHaskellDepends = [
+         cereal foldl QuickCheck quickcheck-instances rerebase tasty
+         tasty-hunit tasty-quickcheck
+       ];
+       description = "Tools for efficient immutable graphs";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "edis" = callPackage
     ({ mkDerivation, base, bytestring, cereal, hedis }:
      mkDerivation {
@@ -66315,8 +66289,8 @@ self: {
      }:
      mkDerivation {
        pname = "eigen";
-       version = "2.1.7";
-       sha256 = "080dv9hxjfqaarj0vzmaxjc382a3aqp4z69k6nl4vs09g2i1cfg4";
+       version = "3.3.4.1";
+       sha256 = "0kpbnl5yrsp9923al5g9x48yf88m4vsdryq69g8fmlh0wdqkdapa";
        libraryHaskellDepends = [
          base binary bytestring primitive transformers vector
        ];
@@ -67466,28 +67440,6 @@ self: {
      }) {inherit (pkgs) enchant;};
 
   "enclosed-exceptions" = callPackage
-    ({ mkDerivation, async, base, deepseq, hspec, lifted-base
-     , monad-control, QuickCheck, stm, transformers, transformers-base
-     }:
-     mkDerivation {
-       pname = "enclosed-exceptions";
-       version = "1.0.2";
-       sha256 = "1wc9h6zdnb5impvvml6vnjapajjanw7zgpnzg7c0v7115nwfm6vv";
-       revision = "1";
-       editedCabalFile = "0rjm8g2bm9a7qzklkp0rh5az4qh8nsl0hl119gjik671knygkdj0";
-       libraryHaskellDepends = [
-         base deepseq lifted-base monad-control transformers
-         transformers-base
-       ];
-       testHaskellDepends = [
-         async base deepseq hspec lifted-base monad-control QuickCheck stm
-         transformers transformers-base
-       ];
-       description = "Catching all exceptions from within an enclosed computation";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "enclosed-exceptions_1_0_3" = callPackage
     ({ mkDerivation, async, base, deepseq, hspec, lifted-base
      , monad-control, QuickCheck, stm, transformers, transformers-base
      }:
@@ -67505,7 +67457,6 @@ self: {
        ];
        description = "Catching all exceptions from within an enclosed computation";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "encode-string" = callPackage
@@ -68494,6 +68445,26 @@ self: {
        license = stdenv.lib.licenses.asl20;
      }) {};
 
+  "errors-ext_0_4_2" = callPackage
+    ({ mkDerivation, base, binary-ext, bytestring, conduit, errors
+     , exceptions, HUnit, monad-control, monad-loops, mtl, transformers
+     }:
+     mkDerivation {
+       pname = "errors-ext";
+       version = "0.4.2";
+       sha256 = "064nvpc8yy3n6nvc7cmxmgblmarg4wlvawj0k7bc3mj6h0rnavj0";
+       libraryHaskellDepends = [
+         base errors exceptions monad-control mtl transformers
+       ];
+       testHaskellDepends = [
+         base binary-ext bytestring conduit errors exceptions HUnit
+         monad-control monad-loops mtl transformers
+       ];
+       description = "`bracket`-like functions for `ExceptT` over `IO` monad";
+       license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ersaconcat" = callPackage
     ({ mkDerivation, base, directory, doctest, filepath, HTTP
      , network-uri, process, QuickCheck, tagsoup, template-haskell
@@ -69585,41 +69556,6 @@ self: {
      }) {};
 
   "eventstore" = callPackage
-    ({ mkDerivation, aeson, array, async, base, bifunctors, bytestring
-     , cereal, clock, connection, containers, dns, dotnet-timespan
-     , ekg-core, exceptions, fast-logger, hashable, http-client
-     , interpolate, lifted-async, lifted-base, machines, monad-control
-     , monad-logger, mono-traversable, mtl, protobuf, random
-     , safe-exceptions, semigroups, stm, stm-chans, tasty, tasty-hspec
-     , tasty-hunit, text, time, transformers-base, unordered-containers
-     , uuid
-     }:
-     mkDerivation {
-       pname = "eventstore";
-       version = "1.1.4";
-       sha256 = "0xhhw5dxq1h4w7dpngrhnaipzhfpzvs4y7jdvimzk86hvgv0mmfj";
-       libraryHaskellDepends = [
-         aeson array base bifunctors bytestring cereal clock connection
-         containers dns dotnet-timespan ekg-core exceptions fast-logger
-         hashable http-client interpolate lifted-async lifted-base machines
-         monad-control monad-logger mono-traversable mtl protobuf random
-         safe-exceptions semigroups stm stm-chans text time
-         transformers-base unordered-containers uuid
-       ];
-       testHaskellDepends = [
-         aeson async base bytestring cereal connection containers
-         dotnet-timespan exceptions fast-logger hashable lifted-async
-         lifted-base monad-control mono-traversable protobuf safe-exceptions
-         semigroups stm stm-chans tasty tasty-hspec tasty-hunit text time
-         transformers-base unordered-containers uuid
-       ];
-       description = "EventStore TCP Client";
-       license = stdenv.lib.licenses.bsd3;
-       platforms = [ "x86_64-darwin" "x86_64-linux" ];
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "eventstore_1_1_5" = callPackage
     ({ mkDerivation, aeson, array, async, base, bifunctors, bytestring
      , cereal, clock, connection, containers, dns, dotnet-timespan
      , ekg-core, exceptions, fast-logger, hashable, http-client
@@ -70595,6 +70531,8 @@ self: {
        pname = "extended-reals";
        version = "0.2.3.0";
        sha256 = "170nxxza6lkczh05qi2qxr8nbr3gmdjpfvl1m703gjq9xwrwg2kw";
+       revision = "1";
+       editedCabalFile = "114s55sx0wq0zq9mgxrhaz4kd87c80zf8s35ani3h4dh1bb33j9w";
        libraryHaskellDepends = [ base deepseq hashable ];
        testHaskellDepends = [
          base deepseq HUnit QuickCheck tasty tasty-hunit tasty-quickcheck
@@ -70750,22 +70688,6 @@ self: {
      }) {};
 
   "extra" = callPackage
-    ({ mkDerivation, base, clock, directory, filepath, process
-     , QuickCheck, time, unix
-     }:
-     mkDerivation {
-       pname = "extra";
-       version = "1.6.8";
-       sha256 = "1kngk46nkrjkpqaj845c6r823r8aawlk1ir693lr6rskhy1k7dlp";
-       libraryHaskellDepends = [
-         base clock directory filepath process time unix
-       ];
-       testHaskellDepends = [ base directory filepath QuickCheck unix ];
-       description = "Extra functions I use";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "extra_1_6_9" = callPackage
     ({ mkDerivation, base, clock, directory, filepath, process
      , QuickCheck, time, unix
      }:
@@ -70779,7 +70701,6 @@ self: {
        testHaskellDepends = [ base directory filepath QuickCheck unix ];
        description = "Extra functions I use";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "extract-dependencies" = callPackage
@@ -73319,8 +73240,8 @@ self: {
        pname = "finite-field";
        version = "0.9.0";
        sha256 = "026l5qrc7vsm2s19z10xx30lrsfkwwcymyznyy5hrcrwqj9wf643";
-       revision = "1";
-       editedCabalFile = "0npwa4gv94b87y4bam9valnjlsy3rbhk7n7hdc1mx1bwkn4acyds";
+       revision = "2";
+       editedCabalFile = "11zivn1cjwxc7xy8q50raz1wpfgl0b459ai0f4j304rv7yiwrhdp";
        libraryHaskellDepends = [
          base deepseq hashable singletons template-haskell
        ];
@@ -73334,17 +73255,6 @@ self: {
      }) {};
 
   "finite-typelits" = callPackage
-    ({ mkDerivation, base, deepseq }:
-     mkDerivation {
-       pname = "finite-typelits";
-       version = "0.1.3.0";
-       sha256 = "17a82djlpapdzw34afv79w99jrpy5nlbdw1k1xjs59bvvqv36wyv";
-       libraryHaskellDepends = [ base deepseq ];
-       description = "A type inhabited by finitely many values, indexed by type-level naturals";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "finite-typelits_0_1_4_2" = callPackage
     ({ mkDerivation, base, deepseq }:
      mkDerivation {
        pname = "finite-typelits";
@@ -73353,7 +73263,6 @@ self: {
        libraryHaskellDepends = [ base deepseq ];
        description = "A type inhabited by finitely many values, indexed by type-level naturals";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "firebase-database" = callPackage
@@ -74403,18 +74312,6 @@ self: {
      }) {};
 
   "flow" = callPackage
-    ({ mkDerivation, base, doctest, QuickCheck, template-haskell }:
-     mkDerivation {
-       pname = "flow";
-       version = "1.0.13";
-       sha256 = "0dg29g1d7xi14yf4yjxiy9cmslqgz5c4z141q4bzqn6ms0rwrxx7";
-       libraryHaskellDepends = [ base ];
-       testHaskellDepends = [ base doctest QuickCheck template-haskell ];
-       description = "Write more understandable Haskell";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "flow_1_0_14" = callPackage
     ({ mkDerivation, base, doctest, QuickCheck, template-haskell }:
      mkDerivation {
        pname = "flow";
@@ -74424,7 +74321,6 @@ self: {
        testHaskellDepends = [ base doctest QuickCheck template-haskell ];
        description = "Write more understandable Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "flow-er" = callPackage
@@ -75783,19 +75679,6 @@ self: {
      }) {};
 
   "foundation" = callPackage
-    ({ mkDerivation, base, basement, gauge, ghc-prim }:
-     mkDerivation {
-       pname = "foundation";
-       version = "0.0.20";
-       sha256 = "0bg4g0xf4pb2vmahnfp8c4f0a3v0av73lb5g8bwnp170khxfcsms";
-       libraryHaskellDepends = [ base basement ghc-prim ];
-       testHaskellDepends = [ base basement ];
-       benchmarkHaskellDepends = [ base basement gauge ];
-       description = "Alternative prelude with batteries and no dependencies";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "foundation_0_0_21" = callPackage
     ({ mkDerivation, base, basement, gauge, ghc-prim }:
      mkDerivation {
        pname = "foundation";
@@ -75806,7 +75689,6 @@ self: {
        benchmarkHaskellDepends = [ base basement gauge ];
        description = "Alternative prelude with batteries and no dependencies";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "foundation-edge" = callPackage
@@ -80725,27 +80607,6 @@ self: {
      }) {};
 
   "ghc-prof" = callPackage
-    ({ mkDerivation, attoparsec, base, containers, directory, filepath
-     , process, scientific, tasty, tasty-hunit, temporary, text, time
-     }:
-     mkDerivation {
-       pname = "ghc-prof";
-       version = "1.4.1.2";
-       sha256 = "0rippzp76g2zn8vhxfkvpf9r2l62lid6525ym6zz1pyq4xzsbqrf";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         attoparsec base containers scientific text time
-       ];
-       testHaskellDepends = [
-         attoparsec base containers directory filepath process tasty
-         tasty-hunit temporary text
-       ];
-       description = "Library for parsing GHC time and allocation profiling reports";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "ghc-prof_1_4_1_3" = callPackage
     ({ mkDerivation, attoparsec, base, containers, directory, filepath
      , process, scientific, tasty, tasty-hunit, temporary, text, time
      }:
@@ -80764,7 +80625,6 @@ self: {
        ];
        description = "Library for parsing GHC time and allocation profiling reports";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ghc-prof-aeson" = callPackage
@@ -80977,27 +80837,6 @@ self: {
      }) {};
 
   "ghc-typelits-extra" = callPackage
-    ({ mkDerivation, base, ghc, ghc-prim, ghc-tcplugins-extra
-     , ghc-typelits-knownnat, ghc-typelits-natnormalise, integer-gmp
-     , tasty, tasty-hunit, template-haskell, transformers
-     }:
-     mkDerivation {
-       pname = "ghc-typelits-extra";
-       version = "0.2.5";
-       sha256 = "0waznf99wryc0sjyk9xb5c0vsalmmhx0v5vbqsyf5q7r6cjcig4s";
-       libraryHaskellDepends = [
-         base ghc ghc-prim ghc-tcplugins-extra ghc-typelits-knownnat
-         ghc-typelits-natnormalise integer-gmp transformers
-       ];
-       testHaskellDepends = [
-         base ghc-typelits-knownnat ghc-typelits-natnormalise tasty
-         tasty-hunit template-haskell
-       ];
-       description = "Additional type-level operations on GHC.TypeLits.Nat";
-       license = stdenv.lib.licenses.bsd2;
-     }) {};
-
-  "ghc-typelits-extra_0_2_6" = callPackage
     ({ mkDerivation, base, ghc, ghc-prim, ghc-tcplugins-extra
      , ghc-typelits-knownnat, ghc-typelits-natnormalise, integer-gmp
      , tasty, tasty-hunit, template-haskell, transformers
@@ -81016,30 +80855,9 @@ self: {
        ];
        description = "Additional type-level operations on GHC.TypeLits.Nat";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ghc-typelits-knownnat" = callPackage
-    ({ mkDerivation, base, ghc, ghc-tcplugins-extra
-     , ghc-typelits-natnormalise, tasty, tasty-hunit, tasty-quickcheck
-     , template-haskell, transformers
-     }:
-     mkDerivation {
-       pname = "ghc-typelits-knownnat";
-       version = "0.5";
-       sha256 = "0mix7zgbnyc3216ykcrjl09rpidq5n2y886k03g8r5pziq1xki00";
-       libraryHaskellDepends = [
-         base ghc ghc-tcplugins-extra ghc-typelits-natnormalise
-         template-haskell transformers
-       ];
-       testHaskellDepends = [
-         base ghc-typelits-natnormalise tasty tasty-hunit tasty-quickcheck
-       ];
-       description = "Derive KnownNat constraints from other KnownNat constraints";
-       license = stdenv.lib.licenses.bsd2;
-     }) {};
-
-  "ghc-typelits-knownnat_0_5_1" = callPackage
     ({ mkDerivation, base, ghc, ghc-tcplugins-extra
      , ghc-typelits-natnormalise, tasty, tasty-hunit, tasty-quickcheck
      , template-haskell, transformers
@@ -81057,26 +80875,9 @@ self: {
        ];
        description = "Derive KnownNat constraints from other KnownNat constraints";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ghc-typelits-natnormalise" = callPackage
-    ({ mkDerivation, base, ghc, ghc-tcplugins-extra, integer-gmp, tasty
-     , tasty-hunit, template-haskell, transformers
-     }:
-     mkDerivation {
-       pname = "ghc-typelits-natnormalise";
-       version = "0.6.1";
-       sha256 = "0xzwlxcmd3vll86mdjk8pph6f0nw3vq0h3airzv7jagc4j3x9c7x";
-       libraryHaskellDepends = [
-         base ghc ghc-tcplugins-extra integer-gmp transformers
-       ];
-       testHaskellDepends = [ base tasty tasty-hunit template-haskell ];
-       description = "GHC typechecker plugin for types of kind GHC.TypeLits.Nat";
-       license = stdenv.lib.licenses.bsd2;
-     }) {};
-
-  "ghc-typelits-natnormalise_0_6_2" = callPackage
     ({ mkDerivation, base, ghc, ghc-tcplugins-extra, integer-gmp, tasty
      , tasty-hunit, template-haskell, transformers
      }:
@@ -81090,7 +80891,6 @@ self: {
        testHaskellDepends = [ base tasty tasty-hunit template-haskell ];
        description = "GHC typechecker plugin for types of kind GHC.TypeLits.Nat";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ghc-typelits-presburger" = callPackage
@@ -83092,29 +82892,6 @@ self: {
      }) {};
 
   "github-release" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, http-client
-     , http-client-tls, http-types, mime-types, optparse-generic, text
-     , unordered-containers, uri-templater
-     }:
-     mkDerivation {
-       pname = "github-release";
-       version = "1.2.1";
-       sha256 = "1q01yk6nl60iylsqzz1gzg3q1gpjn6bi13p5lddx1z5hd6hri80h";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson base bytestring http-client http-client-tls http-types
-         mime-types optparse-generic text unordered-containers uri-templater
-       ];
-       executableHaskellDepends = [
-         aeson base bytestring http-client http-client-tls http-types
-         mime-types optparse-generic text unordered-containers uri-templater
-       ];
-       description = "Upload files to GitHub releases";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "github-release_1_2_2" = callPackage
     ({ mkDerivation, aeson, base, bytestring, http-client
      , http-client-tls, http-types, mime-types, optparse-generic, text
      , unordered-containers, uri-templater
@@ -83135,7 +82912,6 @@ self: {
        ];
        description = "Upload files to GitHub releases";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "github-tools" = callPackage
@@ -89395,55 +89171,6 @@ self: {
      }) {};
 
   "hOpenPGP" = callPackage
-    ({ mkDerivation, aeson, asn1-encoding, attoparsec, base
-     , base16-bytestring, base64-bytestring, bifunctors, binary
-     , binary-conduit, bytestring, bzlib, conduit, conduit-extra
-     , containers, criterion, crypto-cipher-types, cryptonite, errors
-     , hashable, incremental-parser, ixset-typed, lens, memory
-     , monad-loops, nettle, network, network-uri, newtype
-     , openpgp-asciiarmor, prettyprinter, QuickCheck
-     , quickcheck-instances, resourcet, semigroups, split, tasty
-     , tasty-hunit, tasty-quickcheck, text, time, time-locale-compat
-     , transformers, unliftio-core, unordered-containers, zlib
-     }:
-     mkDerivation {
-       pname = "hOpenPGP";
-       version = "2.7";
-       sha256 = "0s4afs5s6sz2j9vkgz6xhx426dva72i6gk8804avjphjrfvvgdzg";
-       libraryHaskellDepends = [
-         aeson asn1-encoding attoparsec base base16-bytestring
-         base64-bytestring bifunctors binary binary-conduit bytestring bzlib
-         conduit conduit-extra containers crypto-cipher-types cryptonite
-         errors hashable incremental-parser ixset-typed lens memory
-         monad-loops nettle network-uri newtype openpgp-asciiarmor
-         prettyprinter resourcet semigroups split text time
-         time-locale-compat transformers unliftio-core unordered-containers
-         zlib
-       ];
-       testHaskellDepends = [
-         aeson asn1-encoding attoparsec base base16-bytestring bifunctors
-         binary binary-conduit bytestring bzlib conduit conduit-extra
-         containers crypto-cipher-types cryptonite errors hashable
-         incremental-parser ixset-typed lens memory monad-loops nettle
-         network network-uri newtype prettyprinter QuickCheck
-         quickcheck-instances resourcet semigroups split tasty tasty-hunit
-         tasty-quickcheck text time time-locale-compat transformers
-         unliftio-core unordered-containers zlib
-       ];
-       benchmarkHaskellDepends = [
-         aeson base base16-bytestring base64-bytestring bifunctors binary
-         binary-conduit bytestring bzlib conduit conduit-extra containers
-         criterion crypto-cipher-types cryptonite errors hashable
-         incremental-parser ixset-typed lens memory monad-loops nettle
-         network network-uri newtype openpgp-asciiarmor prettyprinter
-         resourcet semigroups split text time time-locale-compat
-         transformers unliftio-core unordered-containers zlib
-       ];
-       description = "native Haskell implementation of OpenPGP (RFC4880)";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "hOpenPGP_2_7_1" = callPackage
     ({ mkDerivation, aeson, asn1-encoding, attoparsec, base
      , base16-bytestring, base64-bytestring, bifunctors, binary
      , binary-conduit, bytestring, bzlib, conduit, conduit-extra
@@ -89490,7 +89217,6 @@ self: {
        ];
        description = "native Haskell implementation of OpenPGP (RFC4880)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hPDB" = callPackage
@@ -92289,32 +92015,6 @@ self: {
      }) {};
 
   "hapistrano" = callPackage
-    ({ mkDerivation, aeson, async, base, directory, filepath
-     , formatting, gitrev, hspec, mtl, optparse-applicative, path
-     , path-io, process, stm, temporary, time, transformers, yaml
-     }:
-     mkDerivation {
-       pname = "hapistrano";
-       version = "0.3.5.7";
-       sha256 = "0fis5g2fg0x5pw7r0p7qy090v90gzqza5qjnpzinnq1yipmr872p";
-       isLibrary = true;
-       isExecutable = true;
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         base filepath formatting gitrev mtl path process time transformers
-       ];
-       executableHaskellDepends = [
-         aeson async base formatting gitrev optparse-applicative path
-         path-io stm yaml
-       ];
-       testHaskellDepends = [
-         base directory filepath hspec mtl path path-io process temporary
-       ];
-       description = "A deployment library for Haskell applications";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "hapistrano_0_3_5_8" = callPackage
     ({ mkDerivation, aeson, async, base, directory, filepath
      , formatting, gitrev, hspec, mtl, optparse-applicative, path
      , path-io, process, stm, temporary, time, transformers, yaml
@@ -92338,7 +92038,6 @@ self: {
        ];
        description = "A deployment library for Haskell applications";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "happindicator" = callPackage
@@ -95458,22 +95157,6 @@ self: {
      }) {};
 
   "haskell-tools-ast" = callPackage
-    ({ mkDerivation, base, classyplate, ghc, mtl, pretty, references
-     , template-haskell, uniplate
-     }:
-     mkDerivation {
-       pname = "haskell-tools-ast";
-       version = "1.1.0.1";
-       sha256 = "1g450ikg2wi7whw46ibm9pc7jdnk5lng8l7lqryi0nigmrmgz355";
-       libraryHaskellDepends = [
-         base classyplate ghc mtl pretty references template-haskell
-         uniplate
-       ];
-       description = "Haskell AST for efficient tooling";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "haskell-tools-ast_1_1_0_2" = callPackage
     ({ mkDerivation, base, classyplate, ghc, mtl, pretty, references
      , template-haskell, uniplate
      }:
@@ -95487,7 +95170,6 @@ self: {
        ];
        description = "Haskell AST for efficient tooling";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-tools-ast-fromghc" = callPackage
@@ -95542,23 +95224,6 @@ self: {
      }) {};
 
   "haskell-tools-backend-ghc" = callPackage
-    ({ mkDerivation, base, bytestring, containers, ghc, ghc-boot-th
-     , haskell-tools-ast, mtl, references, safe, split, template-haskell
-     , transformers, uniplate
-     }:
-     mkDerivation {
-       pname = "haskell-tools-backend-ghc";
-       version = "1.1.0.1";
-       sha256 = "030ylilmgn4drp00d3683kwfyq9rky5i8ihpvmqjkphyq7bbwva4";
-       libraryHaskellDepends = [
-         base bytestring containers ghc ghc-boot-th haskell-tools-ast mtl
-         references safe split template-haskell transformers uniplate
-       ];
-       description = "Creating the Haskell-Tools AST from GHC's representations";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "haskell-tools-backend-ghc_1_1_0_2" = callPackage
     ({ mkDerivation, base, bytestring, containers, ghc, ghc-boot-th
      , haskell-tools-ast, mtl, references, safe, split, template-haskell
      , transformers, uniplate
@@ -95573,42 +95238,9 @@ self: {
        ];
        description = "Creating the Haskell-Tools AST from GHC's representations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-tools-builtin-refactorings" = callPackage
-    ({ mkDerivation, aeson, base, Cabal, classyplate, containers
-     , deepseq, directory, either, filepath, ghc, ghc-paths
-     , haskell-tools-ast, haskell-tools-backend-ghc
-     , haskell-tools-prettyprint, haskell-tools-refactor
-     , haskell-tools-rewrite, minisat-solver, mtl, portable-lines
-     , references, split, tasty, tasty-hunit, template-haskell, time
-     , transformers, uniplate
-     }:
-     mkDerivation {
-       pname = "haskell-tools-builtin-refactorings";
-       version = "1.1.0.1";
-       sha256 = "0xlcwyydspn73nv7yi1djncqhswszqn9skrm6hm96scfyqvvxbwa";
-       libraryHaskellDepends = [
-         aeson base Cabal classyplate containers deepseq directory filepath
-         ghc ghc-paths haskell-tools-ast haskell-tools-backend-ghc
-         haskell-tools-prettyprint haskell-tools-refactor
-         haskell-tools-rewrite minisat-solver mtl portable-lines references
-         split template-haskell transformers uniplate
-       ];
-       testHaskellDepends = [
-         base Cabal containers directory either filepath ghc ghc-paths
-         haskell-tools-ast haskell-tools-backend-ghc
-         haskell-tools-prettyprint haskell-tools-refactor
-         haskell-tools-rewrite mtl references split tasty tasty-hunit
-         template-haskell time transformers uniplate
-       ];
-       description = "Refactoring Tool for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "haskell-tools-builtin-refactorings_1_1_0_2" = callPackage
     ({ mkDerivation, aeson, base, Cabal, classyplate, containers
      , deepseq, directory, either, filepath, ghc, ghc-paths
      , haskell-tools-ast, haskell-tools-backend-ghc
@@ -95711,31 +95343,6 @@ self: {
      }) {};
 
   "haskell-tools-debug" = callPackage
-    ({ mkDerivation, base, classyplate, criterion, filepath, ghc
-     , ghc-paths, haskell-tools-ast, haskell-tools-backend-ghc
-     , haskell-tools-builtin-refactorings, haskell-tools-prettyprint
-     , haskell-tools-refactor, mtl, references, split, template-haskell
-     , uniplate
-     }:
-     mkDerivation {
-       pname = "haskell-tools-debug";
-       version = "1.1.0.1";
-       sha256 = "1l84y0pqwcq1y6509gg68flfa1ai5zl2psn57lp1nm17i7cddsjw";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base classyplate criterion filepath ghc ghc-paths haskell-tools-ast
-         haskell-tools-backend-ghc haskell-tools-builtin-refactorings
-         haskell-tools-prettyprint haskell-tools-refactor mtl references
-         split template-haskell uniplate
-       ];
-       executableHaskellDepends = [ base ];
-       description = "Debugging Tools for Haskell-tools";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "haskell-tools-debug_1_1_0_2" = callPackage
     ({ mkDerivation, base, classyplate, criterion, filepath, ghc
      , ghc-paths, haskell-tools-ast, haskell-tools-backend-ghc
      , haskell-tools-builtin-refactorings, haskell-tools-prettyprint
@@ -95761,37 +95368,6 @@ self: {
      }) {};
 
   "haskell-tools-demo" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, containers, directory
-     , filepath, ghc, ghc-paths, haskell-tools-ast
-     , haskell-tools-backend-ghc, haskell-tools-builtin-refactorings
-     , haskell-tools-prettyprint, haskell-tools-refactor, http-types
-     , HUnit, mtl, network, references, tasty, tasty-hunit, transformers
-     , wai, wai-websockets, warp, websockets
-     }:
-     mkDerivation {
-       pname = "haskell-tools-demo";
-       version = "1.1.0.1";
-       sha256 = "1rzpwy7fvc51vs9sqpxvja84bqjgrpj6943cc2p06d1ynl7vzmk5";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson base bytestring containers directory filepath ghc ghc-paths
-         haskell-tools-ast haskell-tools-backend-ghc
-         haskell-tools-builtin-refactorings haskell-tools-prettyprint
-         haskell-tools-refactor http-types mtl references transformers wai
-         wai-websockets warp websockets
-       ];
-       executableHaskellDepends = [ base ];
-       testHaskellDepends = [
-         aeson base bytestring directory filepath HUnit network tasty
-         tasty-hunit websockets
-       ];
-       description = "A web-based demo for Haskell-tools Refactor";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "haskell-tools-demo_1_1_0_2" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, directory
      , filepath, ghc, ghc-paths, haskell-tools-ast
      , haskell-tools-backend-ghc, haskell-tools-builtin-refactorings
@@ -95854,22 +95430,6 @@ self: {
      }) {};
 
   "haskell-tools-prettyprint" = callPackage
-    ({ mkDerivation, base, containers, ghc, haskell-tools-ast, mtl
-     , references, split, text, uniplate
-     }:
-     mkDerivation {
-       pname = "haskell-tools-prettyprint";
-       version = "1.1.0.1";
-       sha256 = "1x8zz8i66cfnvif991bj9nkidp2bwlhs9zfkxwlyhvhrlda45q8f";
-       libraryHaskellDepends = [
-         base containers ghc haskell-tools-ast mtl references split text
-         uniplate
-       ];
-       description = "Pretty printing of Haskell-Tools AST";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "haskell-tools-prettyprint_1_1_0_2" = callPackage
     ({ mkDerivation, base, containers, ghc, haskell-tools-ast, mtl
      , references, split, text, uniplate
      }:
@@ -95883,40 +95443,9 @@ self: {
        ];
        description = "Pretty printing of Haskell-Tools AST";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-tools-refactor" = callPackage
-    ({ mkDerivation, aeson, base, Cabal, containers, directory, either
-     , filepath, ghc, ghc-paths, haskell-tools-ast
-     , haskell-tools-backend-ghc, haskell-tools-prettyprint
-     , haskell-tools-rewrite, mtl, old-time, polyparse, references
-     , split, tasty, tasty-hunit, template-haskell, time, transformers
-     , uniplate
-     }:
-     mkDerivation {
-       pname = "haskell-tools-refactor";
-       version = "1.1.0.1";
-       sha256 = "0kfw41f4js9s6mf533q7vm7ym63hb289j77r2ypm08490bqjhi9g";
-       libraryHaskellDepends = [
-         aeson base Cabal containers directory filepath ghc ghc-paths
-         haskell-tools-ast haskell-tools-backend-ghc
-         haskell-tools-prettyprint haskell-tools-rewrite mtl references
-         split template-haskell transformers uniplate
-       ];
-       testHaskellDepends = [
-         base Cabal containers directory either filepath ghc ghc-paths
-         haskell-tools-ast haskell-tools-backend-ghc
-         haskell-tools-prettyprint haskell-tools-rewrite mtl old-time
-         polyparse references split tasty tasty-hunit template-haskell time
-         transformers uniplate
-       ];
-       description = "Refactoring Tool for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "haskell-tools-refactor_1_1_0_2" = callPackage
     ({ mkDerivation, aeson, base, Cabal, containers, directory, either
      , filepath, ghc, ghc-paths, haskell-tools-ast
      , haskell-tools-backend-ghc, haskell-tools-prettyprint
@@ -95947,28 +95476,6 @@ self: {
      }) {};
 
   "haskell-tools-rewrite" = callPackage
-    ({ mkDerivation, base, containers, directory, filepath, ghc
-     , haskell-tools-ast, haskell-tools-prettyprint, mtl, references
-     , tasty, tasty-hunit
-     }:
-     mkDerivation {
-       pname = "haskell-tools-rewrite";
-       version = "1.1.0.1";
-       sha256 = "0j1925x0qkkm8n0klqbawgd419ra9jrfl4y4hn75j3w4zxzh3v5j";
-       libraryHaskellDepends = [
-         base containers ghc haskell-tools-ast haskell-tools-prettyprint mtl
-         references
-       ];
-       testHaskellDepends = [
-         base directory filepath haskell-tools-ast haskell-tools-prettyprint
-         tasty tasty-hunit
-       ];
-       description = "Facilities for generating new parts of the Haskell-Tools AST";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "haskell-tools-rewrite_1_1_0_2" = callPackage
     ({ mkDerivation, base, containers, directory, filepath, ghc
      , haskell-tools-ast, haskell-tools-prettyprint, mtl, references
      , tasty, tasty-hunit
@@ -105742,7 +105249,7 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "hpack_0_29_4" = callPackage
+  "hpack_0_29_5" = callPackage
     ({ mkDerivation, aeson, base, bifunctors, bytestring, Cabal
      , containers, cryptonite, deepseq, directory, filepath, Glob, hspec
      , http-client, http-client-tls, http-types, HUnit, infer-license
@@ -105752,8 +105259,8 @@ self: {
      }:
      mkDerivation {
        pname = "hpack";
-       version = "0.29.4";
-       sha256 = "1d1kn4bzcwqmqkc6y9mp63674hgayx4mprv9fg8mrr29z3fl09hj";
+       version = "0.29.5";
+       sha256 = "1jm70x2d1d5la780aksq3088k5vj8s6j2srslij9slsfkw6mmv56";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -105818,8 +105325,8 @@ self: {
      }:
      mkDerivation {
        pname = "hpack-dhall";
-       version = "0.2.0";
-       sha256 = "0avkxcrpa1qgyw56wqna773404gcglvqxr81jmzr0hij406x4c8m";
+       version = "0.3.0";
+       sha256 = "0dplb37npz47cxya1c3dnj6bjcnprjph83yifb08a5qf6vnhcjyh";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -109148,6 +108655,30 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "hspec_2_5_5" = callPackage
+    ({ mkDerivation, base, call-stack, directory, hspec-core
+     , hspec-discover, hspec-expectations, hspec-meta, HUnit, QuickCheck
+     , stringbuilder, transformers
+     }:
+     mkDerivation {
+       pname = "hspec";
+       version = "2.5.5";
+       sha256 = "1yv4k5b5kkig2q3waj28587sq28wms7wfav5a3lq4dra6jybimfm";
+       libraryHaskellDepends = [
+         base call-stack hspec-core hspec-discover hspec-expectations HUnit
+         QuickCheck transformers
+       ];
+       testHaskellDepends = [
+         base call-stack directory hspec-core hspec-discover
+         hspec-expectations hspec-meta HUnit QuickCheck stringbuilder
+         transformers
+       ];
+       testToolDepends = [ hspec-discover ];
+       description = "A Testing Framework for Haskell";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hspec-attoparsec" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, hspec
      , hspec-expectations, text
@@ -109243,6 +108774,33 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "hspec-core_2_5_5" = callPackage
+    ({ mkDerivation, ansi-terminal, array, base, call-stack, clock
+     , deepseq, directory, filepath, hspec-expectations, hspec-meta
+     , HUnit, process, QuickCheck, quickcheck-io, random, setenv
+     , silently, stm, temporary, tf-random, transformers
+     }:
+     mkDerivation {
+       pname = "hspec-core";
+       version = "2.5.5";
+       sha256 = "1vfrqlpn32s9wiykmkxbnrnd5p56yznw20pf8fwzw78ar4wpz55x";
+       libraryHaskellDepends = [
+         ansi-terminal array base call-stack clock deepseq directory
+         filepath hspec-expectations HUnit QuickCheck quickcheck-io random
+         setenv stm tf-random transformers
+       ];
+       testHaskellDepends = [
+         ansi-terminal array base call-stack clock deepseq directory
+         filepath hspec-expectations hspec-meta HUnit process QuickCheck
+         quickcheck-io random setenv silently stm temporary tf-random
+         transformers
+       ];
+       testTarget = "--test-option=--skip --test-option='Test.Hspec.Core.Runner.hspecResult runs specs in parallel'";
+       description = "A Testing Framework for Haskell";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hspec-dirstream" = callPackage
     ({ mkDerivation, base, dirstream, filepath, hspec, hspec-core
      , pipes, pipes-safe, system-filepath, text
@@ -109298,6 +108856,25 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "hspec-discover_2_5_5" = callPackage
+    ({ mkDerivation, base, directory, filepath, hspec-meta, QuickCheck
+     }:
+     mkDerivation {
+       pname = "hspec-discover";
+       version = "2.5.5";
+       sha256 = "04aidzi91ccr9bygmfkjzshz34z9vh8wvqj4zinx2clxq6r7gqfz";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base directory filepath ];
+       executableHaskellDepends = [ base directory filepath ];
+       testHaskellDepends = [
+         base directory filepath hspec-meta QuickCheck
+       ];
+       description = "Automatically discover and run Hspec tests";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hspec-expectations" = callPackage
     ({ mkDerivation, base, call-stack, HUnit, nanospec }:
      mkDerivation {
@@ -111371,23 +110948,6 @@ self: {
      }) {};
 
   "http-client-openssl" = callPackage
-    ({ mkDerivation, base, HsOpenSSL, hspec, http-client, http-types
-     , network
-     }:
-     mkDerivation {
-       pname = "http-client-openssl";
-       version = "0.2.1.1";
-       sha256 = "173s2m73xcf6ramy680ky4zhxhmrymh98g2hv5xa2pnj489j7vi4";
-       libraryHaskellDepends = [ base HsOpenSSL http-client network ];
-       testHaskellDepends = [
-         base HsOpenSSL hspec http-client http-types
-       ];
-       doCheck = false;
-       description = "http-client backend using the OpenSSL library";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "http-client-openssl_0_2_2_0" = callPackage
     ({ mkDerivation, base, HsOpenSSL, hspec, http-client, http-types
      , network
      }:
@@ -111402,7 +110962,6 @@ self: {
        doCheck = false;
        description = "http-client backend using the OpenSSL library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "http-client-request-modifiers" = callPackage
@@ -113035,14 +112594,14 @@ self: {
 
   "hw-excess" = callPackage
     ({ mkDerivation, base, hspec, hw-bits, hw-prim, hw-rankselect-base
-     , QuickCheck, safe, storable-record, vector
+     , QuickCheck, safe, vector
      }:
      mkDerivation {
        pname = "hw-excess";
-       version = "0.2.0.0";
-       sha256 = "1ab1nl03pzqsxkp6xcxwfrjp7h7jrfxjaw6p01yk7c7mk1h4nypi";
+       version = "0.2.0.2";
+       sha256 = "1xm1nwab2zhlyd0n536pd5sny4miqr8p41pasl9mqvg89v6x0db7";
        libraryHaskellDepends = [
-         base hw-bits hw-prim hw-rankselect-base safe storable-record vector
+         base hw-bits hw-prim hw-rankselect-base safe vector
        ];
        testHaskellDepends = [
          base hspec hw-bits hw-prim QuickCheck vector
@@ -113499,6 +113058,35 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hw-simd" = callPackage
+    ({ mkDerivation, base, bits-extra, bytestring, c2hs, cassava
+     , containers, criterion, deepseq, directory, hedgehog, hspec
+     , hw-bits, hw-hspec-hedgehog, hw-prim, hw-rankselect
+     , hw-rankselect-base, mmap, text, vector
+     }:
+     mkDerivation {
+       pname = "hw-simd";
+       version = "0.0.0.3";
+       sha256 = "1kkaigvkh932gcdvn7ll93qkz332bp6ylg5wsf8saxnir1n1362k";
+       libraryHaskellDepends = [
+         base bits-extra bytestring deepseq hw-bits hw-prim hw-rankselect
+         hw-rankselect-base vector
+       ];
+       libraryToolDepends = [ c2hs ];
+       testHaskellDepends = [
+         base bits-extra bytestring deepseq directory hedgehog hspec hw-bits
+         hw-hspec-hedgehog hw-prim hw-rankselect hw-rankselect-base text
+         vector
+       ];
+       benchmarkHaskellDepends = [
+         base bits-extra bytestring cassava containers criterion deepseq
+         directory hw-bits hw-prim hw-rankselect hw-rankselect-base mmap
+         vector
+       ];
+       description = "SIMD library";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "hw-string-parse" = callPackage
     ({ mkDerivation, base, bytestring, hspec, QuickCheck, vector }:
      mkDerivation {
@@ -116713,6 +116301,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "indexation" = callPackage
+    ({ mkDerivation, base, bytestring, cereal, deferred-folds, focus
+     , foldl, hashable, list-t, potoki, potoki-cereal, profunctors
+     , stm-containers, text, transformers, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "indexation";
+       version = "0.2.0.2";
+       sha256 = "10wm6k8rjdk4pq9pypnbh9pbqzr0vxbfgmj66d18grpr9g2mk5j1";
+       libraryHaskellDepends = [
+         base bytestring cereal deferred-folds focus foldl hashable list-t
+         potoki potoki-cereal profunctors stm-containers text transformers
+         unordered-containers vector
+       ];
+       description = "Tools for entity indexation";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "indexed" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -118170,30 +117776,6 @@ self: {
      }) {};
 
   "invariant" = callPackage
-    ({ mkDerivation, array, base, bifunctors, comonad, containers
-     , contravariant, ghc-prim, hspec, profunctors, QuickCheck
-     , semigroups, StateVar, stm, tagged, template-haskell
-     , th-abstraction, transformers, transformers-compat
-     , unordered-containers
-     }:
-     mkDerivation {
-       pname = "invariant";
-       version = "0.5";
-       sha256 = "1zz9a5irmpma5qchvvp7qin1s7cfnhvpg3b452xxysgbxvmcmfw0";
-       revision = "2";
-       editedCabalFile = "01n0v2qmbyd44z3wvha6vmbf1nr3bar205nk1r8hsq9jsmrfzaj1";
-       libraryHaskellDepends = [
-         array base bifunctors comonad containers contravariant ghc-prim
-         profunctors semigroups StateVar stm tagged template-haskell
-         th-abstraction transformers transformers-compat
-         unordered-containers
-       ];
-       testHaskellDepends = [ base hspec QuickCheck template-haskell ];
-       description = "Haskell98 invariant functors";
-       license = stdenv.lib.licenses.bsd2;
-     }) {};
-
-  "invariant_0_5_1" = callPackage
     ({ mkDerivation, array, base, bifunctors, comonad, containers
      , contravariant, ghc-prim, hspec, hspec-discover, profunctors
      , QuickCheck, semigroups, StateVar, stm, tagged, template-haskell
@@ -118214,7 +117796,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Haskell98 invariant functors";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "invertible" = callPackage
@@ -119670,8 +119251,8 @@ self: {
      }:
      mkDerivation {
        pname = "ivory-backend-c";
-       version = "0.1.0.7";
-       sha256 = "1xj492gzlypwd66w71mz4ndvl27vx2c712nz61myp3i4lx4rnpay";
+       version = "0.1.0.8";
+       sha256 = "1zp5kddiczkb85ac7y6wn145bzx3hpvzzhincgq8f1ykcr23miz9";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base base-compat bytestring containers directory filepath ivory
@@ -119748,8 +119329,8 @@ self: {
     ({ mkDerivation, base, filepath, ivory, ivory-artifact }:
      mkDerivation {
        pname = "ivory-hw";
-       version = "0.1.0.5";
-       sha256 = "0h21r9ij3n49b0m3dcjx22vyxc68v4jifl6yv1wpyn1hgrzxlyck";
+       version = "0.1.0.6";
+       sha256 = "0az65nj7pl32gyffv2z2vmcgm36cm740y765n4r7389drls5lj5d";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base filepath ivory ivory-artifact ];
        description = "Ivory hardware model (STM32F4)";
@@ -120734,14 +120315,14 @@ self: {
     ({ mkDerivation, base, haskeline, hspec, HUnit }:
      mkDerivation {
        pname = "jord";
-       version = "0.1.0.0";
-       sha256 = "1dnjxlyclk1a1bghkg1c6wash37pq88grqpv8pr3gr6in3wkibc5";
+       version = "0.2.0.0";
+       sha256 = "0akf6jjijwgn4jsvlzvj7mh9fx9wx0p05gf7bara6hiqj58y6k65";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base ];
        executableHaskellDepends = [ base haskeline ];
        testHaskellDepends = [ base hspec HUnit ];
-       description = "Geographic position calculations on Great Circles";
+       description = "Geographical Position Calculations";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -121301,25 +120882,6 @@ self: {
      }) {};
 
   "json-feed" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, filepath, hspec
-     , mime-types, network-uri, tagsoup, text, time
-     }:
-     mkDerivation {
-       pname = "json-feed";
-       version = "1.0.2";
-       sha256 = "1485c4rljprf09nn8hd5fdpipjzpcylgmzz3ckw4nna5fhyx2n40";
-       libraryHaskellDepends = [
-         aeson base bytestring mime-types network-uri tagsoup text time
-       ];
-       testHaskellDepends = [
-         aeson base bytestring filepath hspec mime-types network-uri tagsoup
-         text time
-       ];
-       description = "JSON Feed";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "json-feed_1_0_3" = callPackage
     ({ mkDerivation, aeson, base, bytestring, filepath, hspec
      , mime-types, network-uri, tagsoup, text, time
      }:
@@ -121336,7 +120898,6 @@ self: {
        ];
        description = "JSON Feed";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "json-fu" = callPackage
@@ -123101,9 +122662,12 @@ self: {
      }:
      mkDerivation {
        pname = "keccak";
-       version = "0.1.1";
-       sha256 = "1mps3w7d9yq262anpw8zdrhni2xw0idfw9364jh5rjs3fv41h4l1";
+       version = "0.1.2";
+       sha256 = "0jrnx5w2nxxc47lmw71c57cqja3mynx8j3fr89rjwby6mym5yw4g";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base bytestring ];
+       executableHaskellDepends = [ base base16-bytestring bytestring ];
        testHaskellDepends = [
          base base16-bytestring bytestring cryptonite HUnit memory parsec
          QuickCheck quickcheck-instances test-framework test-framework-hunit
@@ -124387,18 +123951,6 @@ self: {
      }) {};
 
   "lackey" = callPackage
-    ({ mkDerivation, base, hspec, servant, servant-foreign, text }:
-     mkDerivation {
-       pname = "lackey";
-       version = "1.0.4";
-       sha256 = "1x0jrsk9jp7k0l6xz7nxrcdkglld1ab21kh6w1a253zklpwd3vz1";
-       libraryHaskellDepends = [ base servant servant-foreign text ];
-       testHaskellDepends = [ base hspec servant servant-foreign text ];
-       description = "Generate Ruby clients from Servant APIs";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "lackey_1_0_5" = callPackage
     ({ mkDerivation, base, hspec, servant, servant-foreign, text }:
      mkDerivation {
        pname = "lackey";
@@ -124408,7 +123960,6 @@ self: {
        testHaskellDepends = [ base hspec servant servant-foreign text ];
        description = "Generate Ruby clients from Servant APIs";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lacroix" = callPackage
@@ -125239,17 +124790,17 @@ self: {
   "language-ats" = callPackage
     ({ mkDerivation, alex, ansi-wl-pprint, array, base
      , composition-prelude, containers, cpphs, criterion, deepseq, happy
-     , hspec, hspec-dirstream, micro-recursion-schemes, microlens
-     , microlens-th, system-filepath, transformers
+     , hspec, hspec-dirstream, microlens, recursion-schemes
+     , system-filepath, transformers
      }:
      mkDerivation {
        pname = "language-ats";
-       version = "1.2.0.11";
-       sha256 = "1kz30k8fdmnrx5zcyy3kpvr81p50m7bwsxgp5qqjrhk2i1a1igfp";
+       version = "1.2.0.14";
+       sha256 = "13nafbk4h8z3vx12i6zs250795c3ipsgxq83bhgha2w0wjr49d18";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          ansi-wl-pprint array base composition-prelude containers deepseq
-         micro-recursion-schemes microlens microlens-th transformers
+         microlens recursion-schemes transformers
        ];
        libraryToolDepends = [ alex cpphs happy ];
        testHaskellDepends = [
@@ -125437,28 +124988,6 @@ self: {
      }) {};
 
   "language-docker" = callPackage
-    ({ mkDerivation, base, bytestring, containers, directory, filepath
-     , free, Glob, hspec, HUnit, megaparsec, mtl, prettyprinter, process
-     , QuickCheck, split, template-haskell, text, th-lift, time
-     }:
-     mkDerivation {
-       pname = "language-docker";
-       version = "6.0.3";
-       sha256 = "0rp94hgbh2knz8xn146shgaw0qp6lnp0skxzknsi0l6d3xzzr7qr";
-       libraryHaskellDepends = [
-         base bytestring containers free megaparsec mtl prettyprinter split
-         template-haskell text th-lift time
-       ];
-       testHaskellDepends = [
-         base bytestring containers directory filepath free Glob hspec HUnit
-         megaparsec mtl prettyprinter process QuickCheck split
-         template-haskell text th-lift time
-       ];
-       description = "Dockerfile parser, pretty-printer and embedded DSL";
-       license = stdenv.lib.licenses.gpl3;
-     }) {};
-
-  "language-docker_6_0_4" = callPackage
     ({ mkDerivation, base, bytestring, containers, directory, filepath
      , free, Glob, hspec, HUnit, megaparsec, mtl, prettyprinter, process
      , QuickCheck, split, template-haskell, text, th-lift, time
@@ -125478,7 +125007,6 @@ self: {
        ];
        description = "Dockerfile parser, pretty-printer and embedded DSL";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "language-dockerfile" = callPackage
@@ -126026,51 +125554,6 @@ self: {
      }) {};
 
   "language-puppet" = callPackage
-    ({ mkDerivation, aeson, ansi-wl-pprint, attoparsec, base
-     , base16-bytestring, bytestring, case-insensitive, containers
-     , cryptonite, directory, exceptions, filecache, filepath
-     , formatting, Glob, hashable, hruby, hslogger, hspec
-     , hspec-megaparsec, http-api-data, http-client, lens, lens-aeson
-     , megaparsec, memory, mtl, operational, optparse-applicative
-     , parallel-io, parsec, pcre-utils, process, protolude, random
-     , regex-pcre-builtin, scientific, servant, servant-client, split
-     , stm, strict-base-types, temporary, text, time, transformers, unix
-     , unordered-containers, vector, yaml
-     }:
-     mkDerivation {
-       pname = "language-puppet";
-       version = "1.3.19";
-       sha256 = "1g6b6dmjx1nk29r55qccvk6csbjig2yc493bmq0dlnqgbn0aiimp";
-       isLibrary = true;
-       isExecutable = true;
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         aeson ansi-wl-pprint attoparsec base base16-bytestring bytestring
-         case-insensitive containers cryptonite directory exceptions
-         filecache filepath formatting hashable hruby hslogger hspec
-         http-api-data http-client lens lens-aeson megaparsec memory mtl
-         operational parsec pcre-utils process protolude random
-         regex-pcre-builtin scientific servant servant-client split stm
-         strict-base-types text time transformers unix unordered-containers
-         vector yaml
-       ];
-       executableHaskellDepends = [
-         aeson ansi-wl-pprint base bytestring containers Glob hslogger
-         http-client lens megaparsec mtl optparse-applicative parallel-io
-         regex-pcre-builtin strict-base-types text transformers
-         unordered-containers vector yaml
-       ];
-       testHaskellDepends = [
-         base Glob hslogger hspec hspec-megaparsec lens megaparsec mtl
-         pcre-utils protolude scientific strict-base-types temporary text
-         transformers unordered-containers vector
-       ];
-       description = "Tools to parse and evaluate the Puppet DSL";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "x86_64-linux" ];
-     }) {};
-
-  "language-puppet_1_3_19_1" = callPackage
     ({ mkDerivation, aeson, ansi-wl-pprint, attoparsec, base
      , base16-bytestring, bytestring, case-insensitive, containers
      , cryptonite, directory, exceptions, filecache, filepath
@@ -126112,7 +125595,7 @@ self: {
        ];
        description = "Tools to parse and evaluate the Puppet DSL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = [ "x86_64-linux" ];
      }) {};
 
   "language-python" = callPackage
@@ -128538,8 +128021,8 @@ self: {
     ({ mkDerivation, base, bytestring, glib, gtk, libnotify }:
      mkDerivation {
        pname = "libnotify";
-       version = "0.2";
-       sha256 = "0nazjlilbz3l32fn11shwxjlabvd2kfpxa7vnirpfp1y6k406mk6";
+       version = "0.2.1";
+       sha256 = "0a55lmalnn840zbryva19k3z4y79fq2q2qjl88wii3im53x0mzmy";
        libraryHaskellDepends = [ base bytestring glib gtk ];
        librarySystemDepends = [ libnotify ];
        description = "Bindings to libnotify library";
@@ -134461,8 +133944,8 @@ self: {
      }:
      mkDerivation {
        pname = "mandrill";
-       version = "0.5.3.3";
-       sha256 = "0hhyif8lqq16i25bvpz7z54n2rmnq9q198pjdm4vssh02597lnn8";
+       version = "0.5.3.4";
+       sha256 = "0gaz5drb8wvlr12ynwag4rcgmsyzd713j0qgpv9ydy3jlk65nrf7";
        libraryHaskellDepends = [
          aeson base base64-bytestring blaze-html bytestring containers
          email-validate http-client http-client-tls http-types lens mtl
@@ -135223,15 +134706,15 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "math-functions_0_3_0_0" = callPackage
+  "math-functions_0_3_0_1" = callPackage
     ({ mkDerivation, base, data-default-class, deepseq, erf, HUnit
      , primitive, QuickCheck, test-framework, test-framework-hunit
      , test-framework-quickcheck2, vector, vector-th-unbox
      }:
      mkDerivation {
        pname = "math-functions";
-       version = "0.3.0.0";
-       sha256 = "19kbc0kyxfjb7lhs2kkla59gqj7ag96r2z8ba2rfhl2104n3709k";
+       version = "0.3.0.1";
+       sha256 = "1nrslskbgsy9yx0kzc5a0jdahch218qd16343j001pdxkygq21b2";
        libraryHaskellDepends = [
          base data-default-class deepseq primitive vector vector-th-unbox
        ];
@@ -136314,25 +135797,6 @@ self: {
      }) {};
 
   "mega-sdist" = callPackage
-    ({ mkDerivation, base, bytestring, conduit, conduit-extra
-     , http-conduit, optparse-simple, rio, rio-orphans, tar-conduit
-     , yaml
-     }:
-     mkDerivation {
-       pname = "mega-sdist";
-       version = "0.3.3";
-       sha256 = "0vwk3fq34f8nnviw7fxpyqx365v4khvjr45pzgxsgc7rfx7hcw9c";
-       isLibrary = false;
-       isExecutable = true;
-       executableHaskellDepends = [
-         base bytestring conduit conduit-extra http-conduit optparse-simple
-         rio rio-orphans tar-conduit yaml
-       ];
-       description = "Handles uploading to Hackage from mega repos";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "mega-sdist_0_3_3_1" = callPackage
     ({ mkDerivation, base, bytestring, conduit, conduit-extra
      , http-conduit, optparse-simple, rio, rio-orphans, tar-conduit
      , yaml
@@ -136349,7 +135813,6 @@ self: {
        ];
        description = "Handles uploading to Hackage from mega repos";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "megaparsec" = callPackage
@@ -136771,8 +136234,8 @@ self: {
        pname = "menoh";
        version = "0.1.1";
        sha256 = "0cbkhafibm65yn4222kfy8j6zkw6q6k3962hwjhbvp2n57avh789";
-       revision = "1";
-       editedCabalFile = "1mbn1aq24dvaa1amwypik69dmg1x8mm1dz1h4kadzvljc4ld870i";
+       revision = "2";
+       editedCabalFile = "1hfgg9n86cp3qa9ziycx2134zsvsn76ilkmwrqnc7yb50279dw1b";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -137264,43 +136727,6 @@ self: {
      }) {};
 
   "microformats2-parser" = callPackage
-    ({ mkDerivation, aeson, aeson-pretty, aeson-qq, attoparsec, base
-     , base-compat, blaze-html, blaze-markup, bytestring, containers
-     , data-default, either, errors, hspec
-     , hspec-expectations-pretty-diff, html-conduit, lens-aeson, mtl
-     , network, network-uri, options, pcre-heavy, raw-strings-qq, safe
-     , scotty, tagsoup, template-haskell, text, time, transformers
-     , unordered-containers, vector, wai-cli, wai-extra, xml-lens
-     , xss-sanitize
-     }:
-     mkDerivation {
-       pname = "microformats2-parser";
-       version = "1.0.1.8";
-       sha256 = "0hb5i60w369lngfw5a3bai5zvlgchcf1vvxshp9md77lyl7h49ar";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson aeson-qq attoparsec base base-compat blaze-markup bytestring
-         containers data-default either errors html-conduit lens-aeson
-         network-uri pcre-heavy safe tagsoup text time transformers
-         unordered-containers vector xml-lens xss-sanitize
-       ];
-       executableHaskellDepends = [
-         aeson aeson-pretty base base-compat blaze-html blaze-markup
-         data-default network network-uri options scotty text wai-cli
-         wai-extra
-       ];
-       testHaskellDepends = [
-         aeson-qq base base-compat bytestring data-default hspec
-         hspec-expectations-pretty-diff html-conduit mtl network-uri
-         raw-strings-qq template-haskell text time xml-lens
-       ];
-       description = "A Microformats 2 parser";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "microformats2-parser_1_0_1_9" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, aeson-qq, attoparsec, base
      , base-compat, blaze-html, blaze-markup, bytestring, containers
      , data-default, either, errors, hspec
@@ -145620,6 +145046,42 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "network-messagepack-rpc" = callPackage
+    ({ mkDerivation, base, bytestring, data-msgpack, safe-exceptions
+     , text, unordered-containers
+     }:
+     mkDerivation {
+       pname = "network-messagepack-rpc";
+       version = "0.1.0.0";
+       sha256 = "0yqisywmhl0y6f88ifpkv8dlldg5s2c2h8z8cv6mhhqj4qdzp1h3";
+       libraryHaskellDepends = [
+         base bytestring data-msgpack safe-exceptions text
+         unordered-containers
+       ];
+       description = "MessagePack RPC";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "network-messagepack-rpc-websocket" = callPackage
+    ({ mkDerivation, async, base, bytestring, data-msgpack, envy, hspec
+     , network-messagepack-rpc, QuickCheck, skews, text, websockets
+     , wss-client
+     }:
+     mkDerivation {
+       pname = "network-messagepack-rpc-websocket";
+       version = "0.1.0.0";
+       sha256 = "1q7ckch5z08wxrdsv62z07ivdihqvmcwfg2pgcbf66dhgc9bq4f6";
+       libraryHaskellDepends = [
+         base network-messagepack-rpc text websockets wss-client
+       ];
+       testHaskellDepends = [
+         async base bytestring data-msgpack envy hspec
+         network-messagepack-rpc QuickCheck skews text wss-client
+       ];
+       description = "WebSocket backend for MessagePack RPC";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "network-metrics" = callPackage
     ({ mkDerivation, base, binary, bytestring, data-default, network
      , random, time
@@ -151742,6 +151204,55 @@ self: {
        maintainers = with stdenv.lib.maintainers; [ peti ];
      }) {};
 
+  "pandoc_2_2_2" = callPackage
+    ({ mkDerivation, aeson, aeson-pretty, base, base64-bytestring
+     , binary, blaze-html, blaze-markup, bytestring, Cabal
+     , case-insensitive, cmark-gfm, containers, criterion, data-default
+     , deepseq, Diff, directory, doctemplates, exceptions
+     , executable-path, filepath, Glob, haddock-library, hslua
+     , hslua-module-text, HsYAML, HTTP, http-client, http-client-tls
+     , http-types, JuicyPixels, mtl, network, network-uri, pandoc-types
+     , parsec, process, QuickCheck, random, safe, SHA, skylighting
+     , split, syb, tagsoup, tasty, tasty-golden, tasty-hunit
+     , tasty-quickcheck, temporary, texmath, text, time, unix
+     , unordered-containers, vector, weigh, xml, zip-archive, zlib
+     }:
+     mkDerivation {
+       pname = "pandoc";
+       version = "2.2.2";
+       sha256 = "0rbr6mjm7kfzxrjbglqj6bgz1l1zlbiiff3pi59nhqava3nindqc";
+       configureFlags = [ "-fhttps" "-f-trypandoc" ];
+       isLibrary = true;
+       isExecutable = true;
+       enableSeparateDataOutput = true;
+       setupHaskellDepends = [ base Cabal ];
+       libraryHaskellDepends = [
+         aeson aeson-pretty base base64-bytestring binary blaze-html
+         blaze-markup bytestring case-insensitive cmark-gfm containers
+         data-default deepseq directory doctemplates exceptions filepath
+         Glob haddock-library hslua hslua-module-text HsYAML HTTP
+         http-client http-client-tls http-types JuicyPixels mtl network
+         network-uri pandoc-types parsec process random safe SHA skylighting
+         split syb tagsoup temporary texmath text time unix
+         unordered-containers vector xml zip-archive zlib
+       ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [
+         base base64-bytestring bytestring containers Diff directory
+         executable-path filepath Glob hslua pandoc-types process QuickCheck
+         tasty tasty-golden tasty-hunit tasty-quickcheck temporary text time
+         xml zip-archive
+       ];
+       benchmarkHaskellDepends = [
+         base bytestring containers criterion mtl text time weigh
+       ];
+       doCheck = false;
+       description = "Conversion between markup formats";
+       license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       maintainers = with stdenv.lib.maintainers; [ peti ];
+     }) {};
+
   "pandoc-citeproc" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring
      , Cabal, containers, data-default, directory, filepath, hs-bibutils
@@ -152701,19 +152212,6 @@ self: {
      }) {};
 
   "parallel" = callPackage
-    ({ mkDerivation, array, base, containers, deepseq }:
-     mkDerivation {
-       pname = "parallel";
-       version = "3.2.1.1";
-       sha256 = "05rw8zhpqhx31zi6vg7zpyciaarh24j7g2p613xrpyrnksybjfrj";
-       revision = "1";
-       editedCabalFile = "12sgigg7r4nmyhbfn1p09ajf4s576yca31b7daj5zpp1mxgb5x7i";
-       libraryHaskellDepends = [ array base containers deepseq ];
-       description = "Parallel programming library";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "parallel_3_2_2_0" = callPackage
     ({ mkDerivation, array, base, containers, deepseq, ghc-prim }:
      mkDerivation {
        pname = "parallel";
@@ -152722,7 +152220,6 @@ self: {
        libraryHaskellDepends = [ array base containers deepseq ghc-prim ];
        description = "Parallel programming library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "parallel-io" = callPackage
@@ -159320,8 +158817,8 @@ self: {
        pname = "polyvariadic";
        version = "0.3.0.3";
        sha256 = "0zf7znslayjmcnajmsymc79f0lyyk7ph9zfczq78inirg0hv7hq1";
-       revision = "1";
-       editedCabalFile = "11jrr3xbkc828564sg3cc6ca1qaibbp43lbyrgi32kjy5l97w7y0";
+       revision = "2";
+       editedCabalFile = "0bcckgz6v7707rdgipaahqws6gkcmmrq5wyl407awb3fssnqxfkn";
        libraryHaskellDepends = [ base containers ];
        testHaskellDepends = [ base ];
        description = "Creation and application of polyvariadic functions";
@@ -160654,8 +160151,8 @@ self: {
      }:
      mkDerivation {
        pname = "potoki-cereal";
-       version = "0.2.1.1";
-       sha256 = "19rd5ykifa7bv32cyxp8hi942sl7xwav0cqhygp6kngw3vsrsnv8";
+       version = "0.3";
+       sha256 = "0m7g9dkvzb94iwywf3bil8h57xbs2d3zvgn4d8la54qz5izimszp";
        libraryHaskellDepends = [
          acquire attoparsec base base-prelude bytestring cereal potoki-core
          text
@@ -161594,25 +161091,6 @@ self: {
      }) {};
 
   "pretty-simple" = callPackage
-    ({ mkDerivation, ansi-terminal, base, containers, criterion
-     , doctest, Glob, mtl, parsec, text, transformers
-     }:
-     mkDerivation {
-       pname = "pretty-simple";
-       version = "2.1.0.0";
-       sha256 = "1jiq9l2zlgk3yzy6mif84fdzvwx3vzzbsh9zvwdph12zxa2y4b68";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         ansi-terminal base containers mtl parsec text transformers
-       ];
-       testHaskellDepends = [ base doctest Glob ];
-       benchmarkHaskellDepends = [ base criterion ];
-       description = "pretty printer for data types with a 'Show' instance";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "pretty-simple_2_1_0_1" = callPackage
     ({ mkDerivation, ansi-terminal, base, containers, criterion
      , doctest, Glob, mtl, parsec, text, transformers
      }:
@@ -161629,7 +161107,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion text ];
        description = "pretty printer for data types with a 'Show' instance";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pretty-sop" = callPackage
@@ -163875,8 +163352,8 @@ self: {
        pname = "pseudo-boolean";
        version = "0.1.6.0";
        sha256 = "1v28vbhcrx0mvciazlanwyaxwav0gfjc7sxz7adgims7mj64g1ra";
-       revision = "1";
-       editedCabalFile = "11n7wcfpahbyg8lmq90vvq11fm2ls4761qf9q7pkbvd7vkm6by2n";
+       revision = "2";
+       editedCabalFile = "1wnp16zs9nx3b250cmh6j84scv821arc0grb8k08h0a3kphavqx1";
        libraryHaskellDepends = [
          attoparsec base bytestring bytestring-builder containers deepseq
          dlist hashable megaparsec parsec void
@@ -167778,27 +167255,6 @@ self: {
      }) {};
 
   "ratel" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, case-insensitive
-     , containers, filepath, hspec, http-client, http-client-tls
-     , http-types, text, uuid
-     }:
-     mkDerivation {
-       pname = "ratel";
-       version = "1.0.4";
-       sha256 = "14ivx9hb7hjy0i7ybz92mcr800zzfspfldzw9jr6qpmrnv43nqdd";
-       libraryHaskellDepends = [
-         aeson base bytestring case-insensitive containers http-client
-         http-client-tls http-types text uuid
-       ];
-       testHaskellDepends = [
-         aeson base bytestring case-insensitive containers filepath hspec
-         http-client http-client-tls http-types text uuid
-       ];
-       description = "Notify Honeybadger about exceptions";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "ratel_1_0_5" = callPackage
     ({ mkDerivation, aeson, base, bytestring, case-insensitive
      , containers, filepath, hspec, http-client, http-client-tls
      , http-types, text, uuid
@@ -167817,25 +167273,9 @@ self: {
        ];
        description = "Notify Honeybadger about exceptions";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ratel-wai" = callPackage
-    ({ mkDerivation, base, bytestring, case-insensitive, containers
-     , http-client, ratel, wai
-     }:
-     mkDerivation {
-       pname = "ratel-wai";
-       version = "1.0.2";
-       sha256 = "07hpsmv3c75r8lc9fpa2mn5xsz5xml5nadzlzq8dihbgv6ma4mss";
-       libraryHaskellDepends = [
-         base bytestring case-insensitive containers http-client ratel wai
-       ];
-       description = "Notify Honeybadger about exceptions via a WAI middleware";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "ratel-wai_1_0_3" = callPackage
     ({ mkDerivation, base, bytestring, case-insensitive, containers
      , http-client, ratel, wai
      }:
@@ -167848,7 +167288,6 @@ self: {
        ];
        description = "Notify Honeybadger about exceptions via a WAI middleware";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rating-systems" = callPackage
@@ -167874,36 +167313,6 @@ self: {
      }) {};
 
   "rattletrap" = callPackage
-    ({ mkDerivation, aeson, aeson-pretty, base, binary, binary-bits
-     , bytestring, containers, filepath, http-client, http-client-tls
-     , HUnit, template-haskell, temporary, text, transformers
-     }:
-     mkDerivation {
-       pname = "rattletrap";
-       version = "4.1.1";
-       sha256 = "1wwglqr84ijzrbsrid5cfhm96ljnfdj59z766wjbr8fx5gmrcdfw";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson aeson-pretty base binary binary-bits bytestring containers
-         filepath http-client http-client-tls template-haskell text
-         transformers
-       ];
-       executableHaskellDepends = [
-         aeson aeson-pretty base binary binary-bits bytestring containers
-         filepath http-client http-client-tls template-haskell text
-         transformers
-       ];
-       testHaskellDepends = [
-         aeson aeson-pretty base binary binary-bits bytestring containers
-         filepath http-client http-client-tls HUnit template-haskell
-         temporary text transformers
-       ];
-       description = "Parse and generate Rocket League replays";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "rattletrap_4_1_2" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, binary, binary-bits
      , bytestring, containers, filepath, http-client, http-client-tls
      , HUnit, template-haskell, temporary, text, transformers
@@ -167931,7 +167340,6 @@ self: {
        ];
        description = "Parse and generate Rocket League replays";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "raven-haskell" = callPackage
@@ -170910,6 +170318,29 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "relational-query_0_12_1_0" = callPackage
+    ({ mkDerivation, array, base, bytestring, containers, dlist
+     , names-th, persistable-record, product-isomorphic
+     , quickcheck-simple, sql-words, template-haskell, text
+     , th-reify-compat, time, time-locale-compat, transformers
+     }:
+     mkDerivation {
+       pname = "relational-query";
+       version = "0.12.1.0";
+       sha256 = "1mdd3lh4kpqaa7l0aqnsnwgi95hbwh9p8dx61js8011wl50j9l9k";
+       libraryHaskellDepends = [
+         array base bytestring containers dlist names-th persistable-record
+         product-isomorphic sql-words template-haskell text th-reify-compat
+         time time-locale-compat transformers
+       ];
+       testHaskellDepends = [
+         base containers product-isomorphic quickcheck-simple transformers
+       ];
+       description = "Typeful, Modular, Relational, algebraic query engine";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "relational-query-HDBC" = callPackage
     ({ mkDerivation, base, containers, convertible, dlist, HDBC
      , HDBC-session, names-th, persistable-record, product-isomorphic
@@ -170919,8 +170350,8 @@ self: {
      }:
      mkDerivation {
        pname = "relational-query-HDBC";
-       version = "0.7.0.0";
-       sha256 = "1kzryjkfkg4f616ijyx28p72v9a45gpvjs7jpksb1by24ll9ly46";
+       version = "0.7.0.1";
+       sha256 = "0dlg4ykjh0yjr2c2vrxhss1z33myc0z86im6am8b7g64rjaxhpm0";
        libraryHaskellDepends = [
          base containers convertible dlist HDBC HDBC-session names-th
          persistable-record product-isomorphic relational-query
@@ -170934,7 +170365,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "relational-query-HDBC_0_7_0_1" = callPackage
+  "relational-query-HDBC_0_7_1_1" = callPackage
     ({ mkDerivation, base, containers, convertible, dlist, HDBC
      , HDBC-session, names-th, persistable-record, product-isomorphic
      , QuickCheck, quickcheck-simple, relational-query
@@ -170943,8 +170374,8 @@ self: {
      }:
      mkDerivation {
        pname = "relational-query-HDBC";
-       version = "0.7.0.1";
-       sha256 = "0dlg4ykjh0yjr2c2vrxhss1z33myc0z86im6am8b7g64rjaxhpm0";
+       version = "0.7.1.1";
+       sha256 = "0lgzkqx4nhvwrrgdrr423d4yyadf6x8l664030l2xi4zrxjws2mk";
        libraryHaskellDepends = [
          base containers convertible dlist HDBC HDBC-session names-th
          persistable-record product-isomorphic relational-query
@@ -175640,18 +175071,6 @@ self: {
      }) {inherit (pkgs) libsodium;};
 
   "salve" = callPackage
-    ({ mkDerivation, base, doctest }:
-     mkDerivation {
-       pname = "salve";
-       version = "1.0.3";
-       sha256 = "1688sd4zrw8swb61svnjawaq7w85hgvh4ww7zz3yppl40sl82irj";
-       libraryHaskellDepends = [ base ];
-       testHaskellDepends = [ base doctest ];
-       description = "Semantic version numbers and constraints";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "salve_1_0_4" = callPackage
     ({ mkDerivation, base, doctest }:
      mkDerivation {
        pname = "salve";
@@ -175661,7 +175080,6 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "Semantic version numbers and constraints";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "salvia" = callPackage
@@ -178169,16 +177587,16 @@ self: {
 
   "self-extract" = callPackage
     ({ mkDerivation, base, binary, bytestring, Cabal, extra, file-embed
-     , path, path-io, process, unix-compat, ztar
+     , path, path-io, unix-compat, ztar
      }:
      mkDerivation {
        pname = "self-extract";
-       version = "0.3.1";
-       sha256 = "01kzvjzb6rh86jzvh4n4802bvzgjz34rwmcrpm4aqzxpca9ax556";
+       version = "0.3.2";
+       sha256 = "0w4pqh9bcdnkyjmy24am2b894627x9is33vbyw03r0br9pd7q82q";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base binary bytestring Cabal extra file-embed path path-io process
+         base binary bytestring Cabal extra file-embed path path-io
          unix-compat ztar
        ];
        executableHaskellDepends = [ base ];
@@ -180999,8 +180417,8 @@ self: {
      }:
      mkDerivation {
        pname = "serverless-haskell";
-       version = "0.6.1";
-       sha256 = "1amv4plafwjnw2nd4hc429zpybvd70c4c76hvnmkwc4d13z3rh3b";
+       version = "0.6.2";
+       sha256 = "1nlby06n8wkildflwlszcy9iljji19mdfkaw0fnnll0l7gir14v5";
        libraryHaskellDepends = [
          aeson aeson-casing aeson-extra amazonka-core amazonka-kinesis
          amazonka-s3 base bytestring case-insensitive http-types iproute
@@ -181222,24 +180640,6 @@ self: {
      }) {};
 
   "servius" = callPackage
-    ({ mkDerivation, base, blaze-builder, blaze-html, bytestring
-     , http-types, markdown, shakespeare, text, wai, wai-app-static
-     }:
-     mkDerivation {
-       pname = "servius";
-       version = "1.2.0.3";
-       sha256 = "1w330lvkikbsv92g398kmnlw71wym6l080d8xsdfdx2wwl0iyqj7";
-       isLibrary = false;
-       isExecutable = true;
-       executableHaskellDepends = [
-         base blaze-builder blaze-html bytestring http-types markdown
-         shakespeare text wai wai-app-static
-       ];
-       description = "Warp web server with template rendering";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "servius_1_2_1_0" = callPackage
     ({ mkDerivation, base, blaze-builder, blaze-html, bytestring
      , cmark-gfm, http-types, shakespeare, text, wai, wai-app-static
      }:
@@ -181255,7 +180655,6 @@ self: {
        ];
        description = "Warp web server with template rendering";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ses-html" = callPackage
@@ -183241,8 +182640,8 @@ self: {
        pname = "sign";
        version = "0.4.3";
        sha256 = "0i3m3zylss4nxmf290wmc8ldck0pnx0m5z4y8nhxnz51adlmp1bp";
-       revision = "1";
-       editedCabalFile = "112xj46k2fzhxiqsnh2fs7fmfrhs6k4q65jxw8mkn58mwl9sr86f";
+       revision = "2";
+       editedCabalFile = "1j4kxvxd3cl9k2nhlgnx8zrh1ygd0m75q0m2wrqcqv0pf1z39lya";
        libraryHaskellDepends = [
          base containers deepseq hashable lattices universe-base
        ];
@@ -184940,6 +184339,8 @@ self: {
        pname = "skylighting-core";
        version = "0.7.2";
        sha256 = "066fwmwsd7xcvwlinfk2izlzq0xp8697i6lnbgsbl71jdybyackq";
+       revision = "1";
+       editedCabalFile = "0qjmk3i9kjnd3195fhphjgqvsgbw6blfjl40mdyiblw1piyvc6yw";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -185161,6 +184562,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "slick" = callPackage
+    ({ mkDerivation, aeson, base, binary, bytestring, containers, lens
+     , lens-aeson, mustache, pandoc, shake, text, time
+     }:
+     mkDerivation {
+       pname = "slick";
+       version = "0.1.0.0";
+       sha256 = "0irp1d9z5l8jr33qgbnkq05lpkpll6dw84qyl0cd2xnqs1iklyds";
+       libraryHaskellDepends = [
+         aeson base binary bytestring containers lens lens-aeson mustache
+         pandoc shake text time
+       ];
+       testHaskellDepends = [
+         aeson base binary bytestring containers lens lens-aeson mustache
+         pandoc shake text time
+       ];
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "slidemews" = callPackage
     ({ mkDerivation, aeson, base, bytestring, MonadCatchIO-transformers
      , mtl, pandoc, snap-core, snap-server, utf8-string
@@ -187690,6 +187110,17 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "solve" = callPackage
+    ({ mkDerivation, base, containers }:
+     mkDerivation {
+       pname = "solve";
+       version = "1.0";
+       sha256 = "06sk2imqgzk9zjr10ignigs04avnjjxfsi2qkk7vqfslhcfzgqnq";
+       libraryHaskellDepends = [ base containers ];
+       description = "Solving simple games";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "sonic-visualiser" = callPackage
     ({ mkDerivation, array, base, bytestring, bzlib, containers, mtl
      , pretty, utf8-string, xml
@@ -191994,30 +191425,6 @@ self: {
      }) {};
 
   "stratosphere" = callPackage
-    ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers
-     , hashable, hspec, hspec-discover, lens, template-haskell, text
-     , unordered-containers
-     }:
-     mkDerivation {
-       pname = "stratosphere";
-       version = "0.24.1";
-       sha256 = "1kgky2713bik420i93k982zwlnp4ldr6lik2brg4nqwplwzf091i";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson aeson-pretty base bytestring containers hashable lens
-         template-haskell text unordered-containers
-       ];
-       testHaskellDepends = [
-         aeson aeson-pretty base bytestring containers hashable hspec
-         hspec-discover lens template-haskell text unordered-containers
-       ];
-       testToolDepends = [ hspec-discover ];
-       description = "EDSL for AWS CloudFormation";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "stratosphere_0_24_3" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers
      , hashable, hspec, hspec-discover, lens, template-haskell, text
      , unordered-containers
@@ -192039,7 +191446,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "EDSL for AWS CloudFormation";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "stratum-tool" = callPackage
@@ -192281,24 +191687,25 @@ self: {
      }) {};
 
   "streaming-benchmarks" = callPackage
-    ({ mkDerivation, base, bytestring, Chart, Chart-diagrams, conduit
-     , csv, deepseq, directory, gauge, list-t, list-transformer, logict
-     , machines, mtl, pipes, random, split, streaming, streamly, text
-     , transformers, typed-process, vector
+    ({ mkDerivation, base, bench-graph, bytestring, Chart
+     , Chart-diagrams, conduit, csv, deepseq, directory, drinkery, gauge
+     , getopt-generics, machines, mtl, pipes, random, split, streaming
+     , streamly, template-haskell, text, transformers, typed-process
+     , vector
      }:
      mkDerivation {
        pname = "streaming-benchmarks";
-       version = "0.1.0";
-       sha256 = "0nyv4z828fj8jhan7q0bx2s351xmbxz9z81g2x3nyk4ad1rqjpyq";
+       version = "0.2.0";
+       sha256 = "1vpflmvz2vrll9bangl61rdjnngdxbrmpzg3xha8h85ij3458c0x";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
-         base bytestring Chart Chart-diagrams csv directory split text
-         typed-process
+         base bench-graph bytestring Chart Chart-diagrams csv directory
+         getopt-generics split text transformers typed-process
        ];
        benchmarkHaskellDepends = [
-         base conduit deepseq gauge list-t list-transformer logict machines
-         mtl pipes random streaming streamly transformers vector
+         base conduit deepseq drinkery gauge machines mtl pipes random
+         streaming streamly template-haskell transformers vector
        ];
        description = "Benchmarks to compare streaming packages";
        license = stdenv.lib.licenses.mit;
@@ -193367,29 +192774,6 @@ self: {
      }) {};
 
   "strive" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, data-default, gpolyline
-     , http-client, http-client-tls, http-types, markdown-unlit
-     , template-haskell, text, time, transformers
-     }:
-     mkDerivation {
-       pname = "strive";
-       version = "5.0.5";
-       sha256 = "1kzkhq791ycx5q20vg6pfl1y1mirlk9h00s4ii1pf5l56lw6kgq1";
-       libraryHaskellDepends = [
-         aeson base bytestring data-default gpolyline http-client
-         http-client-tls http-types template-haskell text time transformers
-       ];
-       testHaskellDepends = [
-         aeson base bytestring data-default gpolyline http-client
-         http-client-tls http-types markdown-unlit template-haskell text
-         time transformers
-       ];
-       testToolDepends = [ markdown-unlit ];
-       description = "A client for the Strava V3 API";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "strive_5_0_6" = callPackage
     ({ mkDerivation, aeson, base, bytestring, data-default, gpolyline
      , http-client, http-client-tls, http-types, markdown-unlit
      , template-haskell, text, time, transformers
@@ -193410,7 +192794,6 @@ self: {
        testToolDepends = [ markdown-unlit ];
        description = "A client for the Strava V3 API";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "strptime" = callPackage
@@ -193486,8 +192869,8 @@ self: {
      }:
      mkDerivation {
        pname = "structured-cli";
-       version = "0.9.3.1";
-       sha256 = "0cw358jcdmlvgxsl2cjpb6gfyjizhxhsvlwqh52cwrs87sg9vpsp";
+       version = "0.9.4.0";
+       sha256 = "1mwrr0brmjb15ncjqapqaslrz3akzn3bs3ajnwsa1d0ji25l2igd";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -194062,6 +193445,33 @@ self: {
        license = stdenv.lib.licenses.mpl20;
      }) {};
 
+  "summoner_1_0_5" = callPackage
+    ({ mkDerivation, aeson, ansi-terminal, base, bytestring, directory
+     , filepath, generic-deriving, hedgehog, neat-interpolation
+     , optparse-applicative, process, tasty, tasty-discover
+     , tasty-hedgehog, text, time, tomland, universum
+     }:
+     mkDerivation {
+       pname = "summoner";
+       version = "1.0.5";
+       sha256 = "0sxgg1g2d6pwvmp0rbyny3cizbajd0iq2wdyxspfw3rapkjap5j2";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson ansi-terminal base bytestring directory filepath
+         generic-deriving neat-interpolation optparse-applicative process
+         text time tomland universum
+       ];
+       executableHaskellDepends = [ base universum ];
+       testHaskellDepends = [
+         base hedgehog tasty tasty-hedgehog universum
+       ];
+       testToolDepends = [ tasty-discover ];
+       description = "Tool for creating completely configured production Haskell projects";
+       license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "sump" = callPackage
     ({ mkDerivation, base, bytestring, data-default, lens, serialport
      , transformers, vector
@@ -194379,8 +193789,8 @@ self: {
      }:
      mkDerivation {
        pname = "superrecord";
-       version = "0.5.0.0";
-       sha256 = "1bg2kjkwl78lhf34j1xb20lpypp26bavd0h6cnhj4m6d4sq3z86a";
+       version = "0.5.0.1";
+       sha256 = "0l1zimami83701djj47nk3izb10m6jxszq52zwmb8411dbn9pclb";
        libraryHaskellDepends = [
          aeson base bytestring constraints deepseq ghc-prim mtl text
        ];
@@ -211998,22 +211408,6 @@ self: {
      }) {};
 
   "vector-sized" = callPackage
-    ({ mkDerivation, adjunctions, base, deepseq, distributive
-     , finite-typelits, indexed-list-literals, primitive, vector
-     }:
-     mkDerivation {
-       pname = "vector-sized";
-       version = "1.0.3.0";
-       sha256 = "1mjg8hncv7xd3w7fsdalvhwiwnsr83nxv21njc01bgj891as44bx";
-       libraryHaskellDepends = [
-         adjunctions base deepseq distributive finite-typelits
-         indexed-list-literals primitive vector
-       ];
-       description = "Size tagged vectors";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "vector-sized_1_0_4_0" = callPackage
     ({ mkDerivation, adjunctions, base, deepseq, distributive
      , finite-typelits, indexed-list-literals, primitive, vector
      }:
@@ -212027,7 +211421,6 @@ self: {
        ];
        description = "Size tagged vectors";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vector-space" = callPackage
@@ -212431,24 +211824,6 @@ self: {
      }) {};
 
   "viewprof" = callPackage
-    ({ mkDerivation, base, brick, containers, directory, ghc-prof, lens
-     , scientific, text, vector, vector-algorithms, vty
-     }:
-     mkDerivation {
-       pname = "viewprof";
-       version = "0.0.0.18";
-       sha256 = "1cf37vhj21yd6d1bia7jlwwc0bw6d2lwj7wkl936argn3zzxrqf6";
-       isLibrary = false;
-       isExecutable = true;
-       executableHaskellDepends = [
-         base brick containers directory ghc-prof lens scientific text
-         vector vector-algorithms vty
-       ];
-       description = "Text-based interactive GHC .prof viewer";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "viewprof_0_0_0_19" = callPackage
     ({ mkDerivation, base, brick, containers, directory, ghc-prof, lens
      , scientific, text, vector, vector-algorithms, vty
      }:
@@ -212464,7 +211839,6 @@ self: {
        ];
        description = "Text-based interactive GHC .prof viewer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "views" = callPackage
@@ -213535,36 +212909,6 @@ self: {
      }) {};
 
   "wai-extra" = callPackage
-    ({ mkDerivation, aeson, ansi-terminal, base, base64-bytestring
-     , bytestring, case-insensitive, containers, cookie
-     , data-default-class, deepseq, directory, fast-logger, hspec
-     , http-types, HUnit, iproute, lifted-base, network, old-locale
-     , resourcet, streaming-commons, stringsearch, text, time
-     , transformers, unix, unix-compat, vault, void, wai, wai-logger
-     , word8, zlib
-     }:
-     mkDerivation {
-       pname = "wai-extra";
-       version = "3.0.22.1";
-       sha256 = "0bvj0nc3m314hh6n4rpz6dzb4bqg24b1sz4x0w7bj5ah8msr0z3y";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson ansi-terminal base base64-bytestring bytestring
-         case-insensitive containers cookie data-default-class deepseq
-         directory fast-logger http-types iproute lifted-base network
-         old-locale resourcet streaming-commons stringsearch text time
-         transformers unix unix-compat vault void wai wai-logger word8 zlib
-       ];
-       testHaskellDepends = [
-         base bytestring case-insensitive cookie fast-logger hspec
-         http-types HUnit resourcet text time transformers wai zlib
-       ];
-       description = "Provides some basic WAI handlers and middleware";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "wai-extra_3_0_23_0" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, base, base64-bytestring
      , bytestring, case-insensitive, containers, cookie
      , data-default-class, deepseq, directory, fast-logger, hspec
@@ -213592,7 +212936,6 @@ self: {
        ];
        description = "Provides some basic WAI handlers and middleware";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wai-frontend-monadcgi" = callPackage
@@ -215042,40 +214385,6 @@ self: {
      }) {};
 
   "warp" = callPackage
-    ({ mkDerivation, array, async, auto-update, base, bsb-http-chunked
-     , bytestring, case-insensitive, containers, directory, doctest
-     , gauge, ghc-prim, hashable, hspec, http-client, 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.22";
-       sha256 = "03jrby2q3xb16xgbmlk3yl36g1mnwq56lj62whks438568626nv4";
-       libraryHaskellDepends = [
-         array async auto-update base bsb-http-chunked bytestring
-         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 bsb-http-chunked bytestring
-         case-insensitive containers directory doctest ghc-prim hashable
-         hspec http-client 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 gauge hashable http-date
-         http-types network unix unix-compat
-       ];
-       description = "A fast, light-weight web server for WAI applications";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "warp_3_2_23" = callPackage
     ({ mkDerivation, array, async, auto-update, base, bsb-http-chunked
      , bytestring, case-insensitive, containers, directory, doctest
      , gauge, ghc-prim, hashable, hspec, http-client, http-date
@@ -215107,7 +214416,6 @@ self: {
        ];
        description = "A fast, light-weight web server for WAI applications";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "warp-dynamic" = callPackage
@@ -218392,20 +217700,6 @@ self: {
      }) {};
 
   "wuss" = callPackage
-    ({ mkDerivation, base, bytestring, connection, network, websockets
-     }:
-     mkDerivation {
-       pname = "wuss";
-       version = "1.1.9";
-       sha256 = "1la0zvdsb1w0k2sj8f9wrnsirljjnbx0a1kalzwalh6d82h2jd9z";
-       libraryHaskellDepends = [
-         base bytestring connection network websockets
-       ];
-       description = "Secure WebSocket (WSS) clients";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "wuss_1_1_10" = callPackage
     ({ mkDerivation, base, bytestring, connection, network, websockets
      }:
      mkDerivation {
@@ -218417,7 +217711,6 @@ self: {
        ];
        description = "Secure WebSocket (WSS) clients";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wx" = callPackage
@@ -221047,14 +220340,14 @@ self: {
 
   "yaml" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base-compat, bytestring
-     , conduit, containers, directory, filepath, hspec, HUnit, libyaml
-     , mockery, resourcet, scientific, semigroups, template-haskell
-     , temporary, text, transformers, unordered-containers, vector
+     , conduit, containers, directory, filepath, hspec, HUnit, mockery
+     , resourcet, scientific, semigroups, template-haskell, temporary
+     , text, transformers, unordered-containers, vector
      }:
      mkDerivation {
        pname = "yaml";
-       version = "0.8.31.1";
-       sha256 = "0lwbdlz2r54nvdr5snmjp5lnkv6wwk118bhy13v1vjz62wclb88v";
+       version = "0.8.32";
+       sha256 = "0cbsyh4ilvjzq1q7pxls43k6pdqxg1l85xzibcwpbvmlvrizh86w";
        configureFlags = [ "-fsystem-libyaml" ];
        isLibrary = true;
        isExecutable = true;
@@ -221063,15 +220356,15 @@ self: {
          filepath resourcet scientific semigroups template-haskell text
          transformers unordered-containers vector
        ];
-       libraryPkgconfigDepends = [ libyaml ];
        testHaskellDepends = [
-         aeson base base-compat bytestring conduit directory hspec HUnit
-         mockery resourcet temporary text transformers unordered-containers
-         vector
+         aeson attoparsec base base-compat bytestring conduit containers
+         directory filepath hspec HUnit mockery resourcet scientific
+         semigroups template-haskell temporary text transformers
+         unordered-containers vector
        ];
        description = "Support for parsing and rendering YAML documents";
        license = stdenv.lib.licenses.bsd3;
-     }) {inherit (pkgs) libyaml;};
+     }) {};
 
   "yaml_0_9_0" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base-compat, bytestring
@@ -221646,6 +220939,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "yeshql_4_1_0_1" = callPackage
+    ({ mkDerivation, base, yeshql-core, yeshql-hdbc }:
+     mkDerivation {
+       pname = "yeshql";
+       version = "4.1.0.1";
+       sha256 = "1dlxq8vp18fagfymlzqa4j0ns174s31d7p1vi54wz0b55ml91if4";
+       libraryHaskellDepends = [ base yeshql-core yeshql-hdbc ];
+       description = "YesQL-style SQL database abstraction (legacy compatibility wrapper)";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "yeshql-core" = callPackage
     ({ mkDerivation, base, containers, convertible, filepath, parsec
      , stm, tasty, tasty-hunit, tasty-quickcheck, template-haskell
@@ -221665,6 +220970,25 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "yeshql-core_4_1_0_1" = callPackage
+    ({ mkDerivation, base, containers, convertible, filepath, parsec
+     , stm, tasty, tasty-hunit, tasty-quickcheck, template-haskell
+     }:
+     mkDerivation {
+       pname = "yeshql-core";
+       version = "4.1.0.1";
+       sha256 = "1v15n7h69j6v3zgvdbvy08l8in9z3yl9cbbfny4998i4p7fl2nzn";
+       libraryHaskellDepends = [
+         base containers convertible filepath parsec template-haskell
+       ];
+       testHaskellDepends = [
+         base containers stm tasty tasty-hunit tasty-quickcheck
+       ];
+       description = "YesQL-style SQL database abstraction (core)";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "yeshql-hdbc" = callPackage
     ({ mkDerivation, base, containers, convertible, filepath, HDBC
      , parsec, stm, tasty, tasty-hunit, tasty-quickcheck
@@ -221686,6 +221010,27 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "yeshql-hdbc_4_1_0_1" = callPackage
+    ({ mkDerivation, base, containers, convertible, filepath, HDBC
+     , parsec, stm, tasty, tasty-hunit, tasty-quickcheck
+     , template-haskell, yeshql-core
+     }:
+     mkDerivation {
+       pname = "yeshql-hdbc";
+       version = "4.1.0.1";
+       sha256 = "0a5wkjkq1lfqk5cv7wmxbx28j6r3xqj8bbkafxfjvs2s02x4qvvc";
+       libraryHaskellDepends = [
+         base containers convertible filepath HDBC parsec template-haskell
+         yeshql-core
+       ];
+       testHaskellDepends = [
+         base containers HDBC stm tasty tasty-hunit tasty-quickcheck
+       ];
+       description = "YesQL-style SQL database abstraction (HDBC backend)";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "yeshql-postgresql-simple" = callPackage
     ({ mkDerivation, base, bytestring, containers, convertible
      , filepath, parsec, postgresql-simple, stm, tasty, tasty-hunit
@@ -221693,8 +221038,8 @@ self: {
      }:
      mkDerivation {
        pname = "yeshql-postgresql-simple";
-       version = "4.1.0.0";
-       sha256 = "1dnwlrgnxg3gvfg6xmfrxqvqbi73402g9m82phqb6s624ifjir0c";
+       version = "4.1.0.1";
+       sha256 = "09sypmx1w5shn8sazhll02a4yjdhrrxr3cic74vr7ch08pjpkkyq";
        libraryHaskellDepends = [
          base containers convertible filepath parsec postgresql-simple
          template-haskell yeshql-core
@@ -221831,35 +221176,6 @@ self: {
      }) {};
 
   "yesod-auth" = callPackage
-    ({ mkDerivation, aeson, authenticate, base, base16-bytestring
-     , base64-bytestring, binary, blaze-builder, blaze-html
-     , blaze-markup, byteable, bytestring, conduit, conduit-extra
-     , containers, cryptonite, data-default, email-validate, file-embed
-     , http-client, http-client-tls, http-conduit, http-types, memory
-     , mime-mail, network-uri, nonce, persistent, persistent-template
-     , random, resourcet, safe, shakespeare, template-haskell, text
-     , time, transformers, unliftio, unliftio-core, unordered-containers
-     , wai, yesod-core, yesod-form, yesod-persistent
-     }:
-     mkDerivation {
-       pname = "yesod-auth";
-       version = "1.6.3";
-       sha256 = "1f4qhsfgar7c2yq7rsm7g3wndg6hhwbmcmjz8dbljdwmzmxl5px0";
-       libraryHaskellDepends = [
-         aeson authenticate base base16-bytestring base64-bytestring binary
-         blaze-builder blaze-html blaze-markup byteable bytestring conduit
-         conduit-extra containers cryptonite data-default email-validate
-         file-embed http-client http-client-tls http-conduit http-types
-         memory mime-mail network-uri nonce persistent persistent-template
-         random resourcet safe shakespeare template-haskell text time
-         transformers unliftio unliftio-core unordered-containers wai
-         yesod-core yesod-form yesod-persistent
-       ];
-       description = "Authentication for Yesod";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "yesod-auth_1_6_4_1" = callPackage
     ({ mkDerivation, aeson, authenticate, base, base16-bytestring
      , base64-bytestring, binary, blaze-builder, blaze-html
      , blaze-markup, bytestring, conduit, conduit-extra, containers
@@ -221885,7 +221201,6 @@ self: {
        ];
        description = "Authentication for Yesod";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-auth-account" = callPackage
@@ -222418,45 +221733,6 @@ self: {
      }) {};
 
   "yesod-core" = callPackage
-    ({ mkDerivation, aeson, async, auto-update, base, blaze-html
-     , blaze-markup, byteable, bytestring, case-insensitive, cereal
-     , clientsession, conduit, conduit-extra, containers, cookie
-     , deepseq, deepseq-generics, directory, fast-logger, gauge, hspec
-     , hspec-expectations, http-types, HUnit, monad-logger, mtl, network
-     , old-locale, parsec, path-pieces, primitive, QuickCheck, random
-     , resourcet, safe, semigroups, shakespeare, streaming-commons
-     , template-haskell, text, time, transformers, unix-compat, unliftio
-     , unordered-containers, vector, wai, wai-extra, wai-logger, warp
-     , word8
-     }:
-     mkDerivation {
-       pname = "yesod-core";
-       version = "1.6.5";
-       sha256 = "0yj06bfw7cln4waf76nfj1dm1f5fd13i896f5iy33035xc0bwiml";
-       libraryHaskellDepends = [
-         aeson auto-update base blaze-html blaze-markup byteable bytestring
-         case-insensitive cereal clientsession conduit conduit-extra
-         containers cookie deepseq deepseq-generics directory fast-logger
-         http-types monad-logger mtl old-locale parsec path-pieces primitive
-         random resourcet safe semigroups shakespeare template-haskell text
-         time transformers unix-compat unliftio unordered-containers vector
-         wai wai-extra wai-logger warp word8
-       ];
-       testHaskellDepends = [
-         async base bytestring clientsession conduit conduit-extra
-         containers cookie hspec hspec-expectations http-types HUnit network
-         path-pieces QuickCheck random resourcet shakespeare
-         streaming-commons template-haskell text transformers unliftio wai
-         wai-extra
-       ];
-       benchmarkHaskellDepends = [
-         base blaze-html bytestring gauge shakespeare text transformers
-       ];
-       description = "Creation of type-safe, RESTful web applications";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "yesod-core_1_6_6" = callPackage
     ({ mkDerivation, aeson, async, auto-update, base, blaze-html
      , blaze-markup, byteable, bytestring, case-insensitive, cereal
      , clientsession, conduit, conduit-extra, containers, cookie
@@ -222490,7 +221766,6 @@ self: {
        ];
        description = "Creation of type-safe, RESTful web applications";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-crud" = callPackage
@@ -222752,29 +222027,6 @@ self: {
      }) {};
 
   "yesod-form" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, blaze-builder, blaze-html
-     , blaze-markup, byteable, bytestring, containers, data-default
-     , email-validate, hspec, network-uri, persistent, resourcet
-     , semigroups, shakespeare, template-haskell, text, time
-     , transformers, wai, xss-sanitize, yesod-core, yesod-persistent
-     }:
-     mkDerivation {
-       pname = "yesod-form";
-       version = "1.6.1";
-       sha256 = "05pnsgnhcsq74w91r74p8psh567yxbmyhddj04mnrfzlzzm19zxq";
-       libraryHaskellDepends = [
-         aeson attoparsec base blaze-builder blaze-html blaze-markup
-         byteable bytestring containers data-default email-validate
-         network-uri persistent resourcet semigroups shakespeare
-         template-haskell text time transformers wai xss-sanitize yesod-core
-         yesod-persistent
-       ];
-       testHaskellDepends = [ base hspec text time ];
-       description = "Form handling support for Yesod Web Framework";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "yesod-form_1_6_2" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, blaze-builder, blaze-html
      , blaze-markup, byteable, bytestring, containers, data-default
      , email-validate, hspec, network-uri, persistent, resourcet
@@ -222794,23 +222046,9 @@ self: {
        testHaskellDepends = [ base hspec text time ];
        description = "Form handling support for Yesod Web Framework";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-form-bootstrap4" = callPackage
-    ({ mkDerivation, base, shakespeare, text, yesod-core, yesod-form }:
-     mkDerivation {
-       pname = "yesod-form-bootstrap4";
-       version = "1.0.0";
-       sha256 = "0z19w6d612qxl0w6nmq2vc467s9s9q6ncbjjc2l620px2i7iqrfq";
-       libraryHaskellDepends = [
-         base shakespeare text yesod-core yesod-form
-       ];
-       description = "renderBootstrap4";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "yesod-form-bootstrap4_1_0_2" = callPackage
     ({ mkDerivation, base, text, yesod-core, yesod-form }:
      mkDerivation {
        pname = "yesod-form-bootstrap4";
@@ -222819,7 +222057,6 @@ self: {
        libraryHaskellDepends = [ base text yesod-core yesod-form ];
        description = "renderBootstrap4";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-form-bulma" = callPackage
@@ -223718,32 +222955,6 @@ self: {
      }) {};
 
   "yesod-test" = callPackage
-    ({ mkDerivation, attoparsec, base, blaze-builder, blaze-html
-     , blaze-markup, bytestring, case-insensitive, conduit, containers
-     , cookie, hspec, hspec-core, html-conduit, http-types, HUnit
-     , network, persistent, pretty-show, semigroups, text, time
-     , transformers, unliftio, wai, wai-extra, xml-conduit, xml-types
-     , yesod-core, yesod-form
-     }:
-     mkDerivation {
-       pname = "yesod-test";
-       version = "1.6.4";
-       sha256 = "0nxrscg4rxdwvivpxfsc735zr8w72w5vrlgaw1mq6ikn4cwidyng";
-       libraryHaskellDepends = [
-         attoparsec base blaze-builder blaze-html blaze-markup bytestring
-         case-insensitive conduit containers cookie hspec-core html-conduit
-         http-types HUnit network persistent pretty-show semigroups text
-         time transformers wai wai-extra xml-conduit xml-types yesod-core
-       ];
-       testHaskellDepends = [
-         base bytestring containers hspec html-conduit http-types HUnit text
-         unliftio wai wai-extra xml-conduit yesod-core yesod-form
-       ];
-       description = "integration testing for WAI/Yesod Applications";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "yesod-test_1_6_5" = callPackage
     ({ mkDerivation, attoparsec, base, blaze-builder, blaze-html
      , bytestring, case-insensitive, conduit, containers, cookie, hspec
      , hspec-core, html-conduit, http-types, HUnit, network, pretty-show
@@ -223766,7 +222977,6 @@ self: {
        ];
        description = "integration testing for WAI/Yesod Applications";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-test-json" = callPackage
@@ -225651,8 +224861,8 @@ self: {
     ({ mkDerivation, base, binary, bytestring, containers }:
      mkDerivation {
        pname = "zmidi-core";
-       version = "0.8.2";
-       sha256 = "02895shbxbswnczgljafr9k7vfrxg7w2sqhnlx8azixkw84lk5mh";
+       version = "0.9.0";
+       sha256 = "127c36pdp7rq03amz6r3pji1crw0f7q5xp0baf782yq71fjgy4c5";
        libraryHaskellDepends = [ base binary bytestring containers ];
        description = "Read and write MIDI files";
        license = stdenv.lib.licenses.bsd3;
@@ -225904,18 +225114,21 @@ self: {
      }) {};
 
   "ztar" = callPackage
-    ({ mkDerivation, base, bytestring, directory, extra, filepath, path
-     , path-io, QuickCheck, tar, tasty, tasty-quickcheck, zip, zlib
+    ({ mkDerivation, base, bytestring, bytestring-arbitrary, deepseq
+     , directory, extra, filepath, path, path-io, process, QuickCheck
+     , tasty, tasty-quickcheck, text, unix-compat, zip, zlib
      }:
      mkDerivation {
        pname = "ztar";
-       version = "0.1.0";
-       sha256 = "12jndqj9ls67wdx840c25zrvms2s3prbb59scc9dgi93zb6s0k9d";
+       version = "0.1.3";
+       sha256 = "12pzskr90a724x3wh1dsbpbszh6a58lbp4sxl7sd7s1bk3m2kgq1";
        libraryHaskellDepends = [
-         base bytestring directory filepath path tar zip zlib
+         base bytestring deepseq directory filepath path process text
+         unix-compat zip zlib
        ];
        testHaskellDepends = [
-         base extra path path-io QuickCheck tasty tasty-quickcheck
+         base bytestring bytestring-arbitrary extra path path-io QuickCheck
+         tasty tasty-quickcheck
        ];
        description = "Creating and extracting arbitrary archives";
        license = stdenv.lib.licenses.bsd3;
-- 
GitLab


From 0ac5637ee960be79e3d5c8c03577c818b885cdac Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 17 Jul 2018 19:44:21 +0200
Subject: [PATCH 077/297] Add a couple of overrides to fix builds in the
 ghc-8.6.x package set.

---
 .../haskell-modules/configuration-ghc-8.6.x.nix     | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
index b2e9d43ef08..42712df3295 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
@@ -44,4 +44,17 @@ self: super: {
   # Use to be a core-library, but no longer is since GHC 8.4.x.
   hoopl = self.hoopl_3_10_2_2;
 
+  # lts-12.x versions do not compile.
+  primitive = self.primitive_0_6_4_0;
+  tagged = self.tagged_0_8_6;
+
+  # Over-specified constraints.
+  async = doJailbreak super.async;                           # base >=4.3 && <4.12, stm >=2.2 && <2.5
+  ChasingBottoms = doJailbreak super.ChasingBottoms;         # base >=4.2 && <4.12, containers >=0.3 && <0.6
+  hashable = doJailbreak super.hashable;                     # base >=4.4 && <4.1
+  hashable-time = doJailbreak super.hashable-time;           # base >=4.7 && <4.12
+  integer-logarithms = doJailbreak super.integer-logarithms; # base >=4.3 && <4.12
+  tar = doJailbreak super.tar;                               # containers >=0.2 && <0.6
+  test-framework = doJailbreak super.test-framework;         # containers >=0.1 && <0.6
+
 }
-- 
GitLab


From 205b54ed956761433a3afc914553c2f85783b5eb Mon Sep 17 00:00:00 2001
From: Johan Thomsen <jth@dbc.dk>
Date: Wed, 18 Jul 2018 10:12:35 +0200
Subject: [PATCH 078/297] nixos/kubernetes: Added missing dependency, awk, to
 kube-addon-manager path (#43708)

---
 nixos/modules/services/cluster/kubernetes/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/cluster/kubernetes/default.nix b/nixos/modules/services/cluster/kubernetes/default.nix
index 2707c176efd..e5aba210b01 100644
--- a/nixos/modules/services/cluster/kubernetes/default.nix
+++ b/nixos/modules/services/cluster/kubernetes/default.nix
@@ -1116,6 +1116,7 @@ in {
         wantedBy = [ "kubernetes.target" ];
         after = [ "kube-apiserver.service" ];
         environment.ADDON_PATH = "/etc/kubernetes/addons/";
+        path = [ pkgs.gawk ];
         serviceConfig = {
           Slice = "kubernetes.slice";
           ExecStart = "${cfg.package}/bin/kube-addons";
-- 
GitLab


From 6dd6f284153a72bc13b769b5dddd4b5a5e491959 Mon Sep 17 00:00:00 2001
From: Sarah Brofeldt <sbrofeldt@gmail.com>
Date: Wed, 18 Jul 2018 11:49:14 +0200
Subject: [PATCH 079/297] nixos/kubernetes: Don't lose rbac submodule with no
 explicit options

---
 nixos/modules/services/cluster/kubernetes/dashboard.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/nixos/modules/services/cluster/kubernetes/dashboard.nix b/nixos/modules/services/cluster/kubernetes/dashboard.nix
index 6d9faada440..cbd6e8f7bf7 100644
--- a/nixos/modules/services/cluster/kubernetes/dashboard.nix
+++ b/nixos/modules/services/cluster/kubernetes/dashboard.nix
@@ -10,8 +10,8 @@ in {
 
     rbac = mkOption {
       description = "Role-based access control (RBAC) options";
+      default = {};
       type = types.submodule {
-
         options = {
           enable = mkOption {
             description = "Whether to enable role based access control is enabled for kubernetes dashboard";
@@ -24,7 +24,6 @@ in {
             type = types.bool;
             default = false;
           };
-          
         };
       };
     };
-- 
GitLab


From e778191b24c8a9ddc56bb5d94fbcb8fb2835295a Mon Sep 17 00:00:00 2001
From: Sarah Brofeldt <sbrofeldt@gmail.com>
Date: Wed, 18 Jul 2018 12:55:35 +0200
Subject: [PATCH 080/297] nix-index: 0.1.0 -> 0.1.1

---
 pkgs/tools/package-management/nix-index/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/package-management/nix-index/default.nix b/pkgs/tools/package-management/nix-index/default.nix
index df5a39d6a03..b5d66bec5cc 100644
--- a/pkgs/tools/package-management/nix-index/default.nix
+++ b/pkgs/tools/package-management/nix-index/default.nix
@@ -4,15 +4,15 @@ with rustPlatform;
 
 buildRustPackage rec {
   name = "nix-index-${version}";
-  version = "0.1.0";
+  version = "0.1.1";
 
   src = fetchFromGitHub {
     owner = "bennofs";
     repo = "nix-index";
     rev = "v${version}";
-    sha256 = "1lmg65yqkwf2a5qxm3dmv8158kqhnriir062vlgar5wimf409rm5";
+    sha256 = "17pms3cq3i3jan1irxgqfr3nrjy6zb21y07pwqp9v08hyrjpfqin";
   };
-  cargoSha256 = "0cxdrzjmqq3ywdh0f5mzkcf50hbbgd3bak4398v2ls5gy5s9fcz2";
+  cargoSha256 = "0b7xwcgjds80g08sx91lqip8syb52n458si4q4xycvvsand5fa10";
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ openssl curl];
 
-- 
GitLab


From 8432dec854f7e9f622217671958a92b535dc0d51 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 18 Jul 2018 07:15:00 -0400
Subject: [PATCH 081/297] linux: 4.17.7 -> 4.17.8

---
 pkgs/os-specific/linux/kernel/linux-4.17.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-4.17.nix b/pkgs/os-specific/linux/kernel/linux-4.17.nix
index 90acca8a6d3..bf9dfc7b972 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.17.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.17.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "4.17.7";
+  version = "4.17.8";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "16bbvxr4ncql7sk505g81c0i3bichqz11dfvgaji57d1yaknx4k4";
+    sha256 = "0hkqypjgvr8lyskwk8z3dac8pyi4wappnk25508vs3fy08365h0k";
   };
 } // (args.argsOverride or {}))
-- 
GitLab


From ae8b20f442dbfa1b54b7c7212c3b6dc31d32057b Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Wed, 18 Jul 2018 07:55:57 -0400
Subject: [PATCH 082/297] lollypop: 0.9.519 -> 0.9.521

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

diff --git a/pkgs/applications/audio/lollypop/default.nix b/pkgs/applications/audio/lollypop/default.nix
index 96e1c504373..1c58f4f79cd 100644
--- a/pkgs/applications/audio/lollypop/default.nix
+++ b/pkgs/applications/audio/lollypop/default.nix
@@ -3,14 +3,14 @@
 , python36Packages, gnome3, glib, gst_all_1 }:
 
 stdenv.mkDerivation rec  {  
-  version = "0.9.519";
+  version = "0.9.521";
   name = "lollypop-${version}";
 
   src = fetchgit {
     url = "https://gitlab.gnome.org/World/lollypop";
     rev = "refs/tags/${version}";
     fetchSubmodules = true;
-    sha256 = "1v4p59w4yf86djk7xv1xwbximpjm64wn42il090w7q1wy04my6fl";
+    sha256 = "1iwv0fj50h0xynv152anisbq29jfbmb9hpm60kaa9a9hdiypskcc";
   };
 
   nativeBuildInputs = with python36Packages; [
-- 
GitLab


From cad446513eb011f0ba88279c585d3678646fe0f3 Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Sun, 8 Jul 2018 23:07:41 +0200
Subject: [PATCH 083/297] ntl: 9.11.0 -> 11.2.1

ntl hasn't been updated in a while. So I'm doing that and adding myself
as the maintainer. I'm also adding some options and pinning the sage
dependency, since it is unfortunately not compatible with the latest ntl
yet.

I've also enabled the tests, since they don't take terribly long and are
worth the time in my opinion.
---
 .../science/math/sage/default.nix             | 29 +++++++---
 pkgs/development/libraries/flint/default.nix  |  4 ++
 pkgs/development/libraries/ntl/default.nix    | 54 +++++++++++++++----
 3 files changed, 69 insertions(+), 18 deletions(-)

diff --git a/pkgs/applications/science/math/sage/default.nix b/pkgs/applications/science/math/sage/default.nix
index afb230cf428..1f540cc2b28 100644
--- a/pkgs/applications/science/math/sage/default.nix
+++ b/pkgs/applications/science/math/sage/default.nix
@@ -26,7 +26,7 @@ let
       pybrial = self.callPackage ./pybrial.nix {};
 
       sagelib = self.callPackage ./sagelib.nix {
-        inherit flint ecl pari glpk eclib;
+        inherit flint ecl pari glpk eclib ntl arb;
         inherit sage-src openblas-blas-pc openblas-cblas-pc openblas-lapack-pc pynac singular;
         linbox = nixpkgs.linbox.override { withSage = true; };
       };
@@ -47,13 +47,13 @@ let
       };
 
       sage-env = self.callPackage ./sage-env.nix {
-        inherit sage-src python rWrapper openblas-cblas-pc glpk ecl singular eclib pari palp flint pynac pythonEnv;
+        inherit sage-src python rWrapper openblas-cblas-pc glpk ecl singular eclib pari palp flint pynac pythonEnv giac ntl;
         pkg-config = nixpkgs.pkgconfig; # not to confuse with pythonPackages.pkgconfig
       };
 
       sage-with-env = self.callPackage ./sage-with-env.nix {
-        inherit pari eclib pythonEnv;
-        inherit sage-src openblas-blas-pc openblas-cblas-pc openblas-lapack-pc pynac singular;
+        inherit pari eclib pythonEnv ntl;
+        inherit sage-src openblas-blas-pc openblas-cblas-pc openblas-lapack-pc pynac singular giac;
         pkg-config = nixpkgs.pkgconfig; # not to confuse with pythonPackages.pkgconfig
         three = nodePackages_8_x.three;
       };
@@ -108,10 +108,23 @@ let
     });
   };
 
+  # https://trac.sagemath.org/ticket/25532
+  ntl = nixpkgs.ntl.overrideAttrs (oldAttrs: rec {
+    name = "ntl-10.5.0";
+    sourceRoot = "${name}/src";
+    src = fetchurl {
+      url = "http://www.shoup.net/ntl/${name}.tar.gz";
+      sha256 = "1lmldaldgfr2b2a6585m3np5ds8bq1bis2s1ajycjm49vp4kc2xr";
+    };
+  });
+
+  giac = nixpkgs.giac.override { inherit ntl; };
+  arb = nixpkgs.arb.override { inherit flint; };
+
   # update causes issues
   # https://groups.google.com/forum/#!topic/sage-packaging/cS3v05Q0zso
   # https://trac.sagemath.org/ticket/24735
-  singular = nixpkgs.singular.overrideAttrs (oldAttrs: {
+  singular = (nixpkgs.singular.override { inherit ntl flint; }).overrideAttrs (oldAttrs: {
     name = "singular-4.1.0p3";
     src = fetchurl {
       url = "http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/SOURCES/4-1-0/singular-4.1.0p3.tar.gz";
@@ -121,15 +134,15 @@ let
 
   # *not* to confuse with the python package "pynac"
   # https://trac.sagemath.org/ticket/24838 (depends on arb update)
-  pynac = nixpkgs.pynac.override { inherit singular; };
+  pynac = nixpkgs.pynac.override { inherit singular flint; };
 
-  eclib = nixpkgs.eclib.override { inherit pari; };
+  eclib = nixpkgs.eclib.override { inherit pari ntl; };
 
   # With openblas (64 bit), the tests fail the same way as when sage is build with
   # openblas instead of openblasCompat. Apparently other packages somehow use flints
   # blas when it is available. Alternative would be to override flint to use
   # openblasCompat.
-  flint = nixpkgs.flint.override { withBlas = false; };
+  flint = nixpkgs.flint.override { withBlas = false; inherit ntl; };
 
   # Multiple palp dimensions need to be available and sage expects them all to be
   # in the same folder.
diff --git a/pkgs/development/libraries/flint/default.nix b/pkgs/development/libraries/flint/default.nix
index 67bf7503db9..2b3f75b80db 100644
--- a/pkgs/development/libraries/flint/default.nix
+++ b/pkgs/development/libraries/flint/default.nix
@@ -37,6 +37,10 @@ stdenv.mkDerivation rec {
   ] ++ stdenv.lib.optionals withBlas [
     "--with-blas=${openblas}"
   ];
+
+  # issues with ntl -- https://github.com/wbhart/flint2/issues/487
+  NIX_CFLAGS_COMPILE = [ "-std=c++11" ];
+
   patches = [
     (fetchpatch {
       # Always produce libflint.so.MAJOR; will be included in the next flint version
diff --git a/pkgs/development/libraries/ntl/default.nix b/pkgs/development/libraries/ntl/default.nix
index 32467e4849b..ab50cf1e17c 100644
--- a/pkgs/development/libraries/ntl/default.nix
+++ b/pkgs/development/libraries/ntl/default.nix
@@ -1,27 +1,60 @@
-{ stdenv, fetchurl, perl, gmp, libtool
+{ stdenv
+, lib
+, fetchurl
+, perl
+, gmp
+, gf2x ? null
+# I asked the ntl maintainer weather or not to include gf2x by default:
+# > If I remember correctly, gf2x is now thread safe, so there's no reason not to use it.
+, withGf2x ? true
+, tune ? false # tune for current system; non reproducible and time consuming
 }:
 
+assert withGf2x -> gf2x != null;
+
 stdenv.mkDerivation rec {
   name = "ntl-${version}";
-  version = "9.11.0";
+  version = "11.2.1";
   src = fetchurl {
     url = "http://www.shoup.net/ntl/ntl-${version}.tar.gz";
-    sha256 = "1wcwxpcby1c50llncz131334qq26lzh3dz21rahymgvakrq0369p";
+    sha256 = "04avzmqflx2a33n7v9jj32g83p7m6z712fg1mw308jk5ca2qp489";
   };
 
-  buildInputs = [ perl gmp libtool ];
+  buildInputs = [
+    gmp
+  ];
+
+  nativeBuildInputs = [
+    perl # needed for ./configure
+  ];
 
   sourceRoot = "${name}/src";
 
   enableParallelBuilding = true;
 
-  dontAddPrefix = true;
+  dontAddPrefix = true; # DEF_PREFIX instead
 
-  configureFlags = [ "DEF_PREFIX=$(out)" "WIZARD=off" "SHARED=on" "NATIVE=off" "CXX=c++" ];
+  # reference: http://shoup.net/ntl/doc/tour-unix.html
+  configureFlags = [
+    "DEF_PREFIX=$(out)"
+    "SHARED=on" # genereate a shared library (as well as static)
+    "NATIVE=off" # don't target code to current hardware (reproducibility, portability)
+    "TUNE=${
+      if tune then
+        "auto"
+      else if stdenv.targetPlatform.isx86 then
+        "x86" # "chooses options that should be well suited for most x86 platforms"
+      else
+        "generic" # "chooses options that should be OK for most platforms"
+    }"
+  ] ++ lib.optionals withGf2x [
+    "NTL_GF2X_LIB=on"
+    "GF2X_PREFIX=${gf2x}"
+  ];
 
-  # doCheck = true; # takes some time
+  doCheck = true; # takes some time
 
-  meta = {
+  meta = with lib; {
     description = "A Library for doing Number Theory";
     longDescription = ''
       NTL is a high-performance, portable C++ library providing data
@@ -30,7 +63,8 @@ stdenv.mkDerivation rec {
       the integers and over finite fields.
     '';
     homepage = http://www.shoup.net/ntl/;
-    license = stdenv.lib.licenses.gpl2Plus;
-    platforms = stdenv.lib.platforms.all;
+    maintainers = with maintainers; [ timokau ];
+    license = licenses.gpl2Plus;
+    platforms = platforms.all;
   };
 }
-- 
GitLab


From a4443ef85914ed14e03b89595451a4df717cf5df Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 18 Jul 2018 14:55:23 +0200
Subject: [PATCH 084/297] =?UTF-8?q?nasc:=200.4.6=20=E2=86=92=200.4.7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../science/math/nasc/default.nix             | 34 +++++++++----------
 1 file changed, 16 insertions(+), 18 deletions(-)

diff --git a/pkgs/applications/science/math/nasc/default.nix b/pkgs/applications/science/math/nasc/default.nix
index 8efe8d9da94..cac403b131b 100644
--- a/pkgs/applications/science/math/nasc/default.nix
+++ b/pkgs/applications/science/math/nasc/default.nix
@@ -1,8 +1,6 @@
 { stdenv
-, bash
-, gnused
 , fetchFromGitHub
-, gettext
+, fetchpatch
 , pkgconfig
 , gtk3
 , granite
@@ -11,23 +9,30 @@
 , ninja
 , vala
 , libqalculate
-, elementary-cmake-modules
+, gobjectIntrospection
 , wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
   name = "nasc-${version}";
-  version = "0.4.6";
+  version = "0.4.7";
 
   src = fetchFromGitHub {
     owner = "parnold-x";
     repo = "nasc";
     rev = version;
-    sha256 = "01n4ldj5phrsv97vb04qvs9c1ip6v8wygx9llj704hly1il9fb54";
+    sha256 = "0p74953pdgsijvqj3msssqiwm6sc1hzp68dlmjamqrqirwgqv5aa";
   };
 
-  XDG_DATA_DIRS = stdenv.lib.concatStringsSep ":" [
-    "${granite}/share"
-    "${gnome3.libgee}/share"
+  patches = [
+    # Install libqalculatenasc.so
+    (fetchpatch {
+      url = https://github.com/parnold-x/nasc/commit/93a799f9afb3e32f3f1a54e056b59570aae2e437.patch;
+      sha256 = "1m32w2zaswzxnzbr7p3lf8s6fac4mjvfhm8v9k59b4jyzmvrl631";
+    })
+    (fetchpatch {
+      url = https://github.com/parnold-x/nasc/commit/570b49169326de154af2cf43c5f12268fff1dc6d.patch;
+      sha256 = "1y3w6rxn0453iscx2xg427wy1bd5kv4z1c41hhbjmg614ycp6bka";
+    })
   ];
 
   nativeBuildInputs = [
@@ -35,7 +40,8 @@ stdenv.mkDerivation rec {
     wrapGAppsHook
     vala
     cmake
-    gettext
+    ninja
+    gobjectIntrospection # for setup-hook
   ];
   buildInputs = [
     libqalculate
@@ -46,14 +52,6 @@ stdenv.mkDerivation rec {
     gnome3.gtksourceview
   ];
 
-  prePatch = ''
-    substituteInPlace ./libqalculatenasc/libtool \
-      --replace "/bin/bash" "${bash}/bin/bash" \
-      --replace "/bin/sed" "${gnused}/bin/sed"
-    substituteInPlace ./libqalculatenasc/configure.inc \
-      --replace 'ac_default_path="/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/bin:/usr/X11R6/bin"' 'ac_default_path=$PATH'
-  '';
-
   meta = with stdenv.lib; {
     description = "Do maths like a normal person";
     longDescription = ''
-- 
GitLab


From 811d878f374c4b755d585fb2b51fe2dd6743ce70 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Wed, 18 Jul 2018 15:38:24 +0200
Subject: [PATCH 085/297] josm: 13996 -> 14026

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

diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix
index 97b60080365..c4f10a1c35b 100644
--- a/pkgs/applications/misc/josm/default.nix
+++ b/pkgs/applications/misc/josm/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "josm-${version}";
-  version = "13996";
+  version = "14026";
 
   src = fetchurl {
     url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar";
-    sha256 = "1j98wxw84f5rf3finr38bkr1sh9ckah8pmhmxyhmcw2rxf1mv9bf";
+    sha256 = "1ysi23j2yj5b6cn3xdsrl4xp56klpw4xa7c4gv90z2dllx06mqli";
   };
 
   buildInputs = [ jre10 makeWrapper ];
-- 
GitLab


From d5c9d86b830eb286ffacb9e090c31a3f4534912c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Wed, 18 Jul 2018 07:46:21 -0700
Subject: [PATCH 086/297] s3cmd: 2.0.1 -> 2.0.2

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/s3cmd/versions.
---
 pkgs/tools/networking/s3cmd/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/s3cmd/default.nix b/pkgs/tools/networking/s3cmd/default.nix
index c3d60d8e87b..e74a3554dc2 100644
--- a/pkgs/tools/networking/s3cmd/default.nix
+++ b/pkgs/tools/networking/s3cmd/default.nix
@@ -2,13 +2,13 @@
 
 python2Packages.buildPythonApplication rec {
   name = "s3cmd-${version}";
-  version = "2.0.1";
+  version = "2.0.2";
   
   src = fetchFromGitHub {
     owner  = "s3tools";
     repo   = "s3cmd";
     rev    = "v${version}";
-    sha256 = "198hzzplci57sb8hdan30nbakslawmijfw0j71wjvq85n3xn6qsl";
+    sha256 = "0ninw830309cxga99gjnfghpkywf9kd6yz4wqsq85zni1dv39cdk";
   };
 
   propagatedBuildInputs = with python2Packages; [ python_magic dateutil ];
-- 
GitLab


From a73049b1756c115fec19b9acb5134c20fda98935 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Wed, 18 Jul 2018 08:50:12 -0700
Subject: [PATCH 087/297] playerctl: 0.6.0 -> 0.6.1

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/playerctl/versions.
---
 pkgs/tools/audio/playerctl/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/audio/playerctl/default.nix b/pkgs/tools/audio/playerctl/default.nix
index b8f39a03083..d2a7358ff8f 100644
--- a/pkgs/tools/audio/playerctl/default.nix
+++ b/pkgs/tools/audio/playerctl/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   name = "playerctl-${version}";
-  version = "0.6.0";
+  version = "0.6.1";
 
   src = fetchFromGitHub {
     owner = "acrisci";
     repo = "playerctl";
     rev = "v${version}";
-    sha256 = "1sxy87syrfk485f2x556rl567j6rph4ss0xahf04bv26bzj3mqrp";
+    sha256 = "0jnylj5d6i29c5y6yjxg1a88r2qfbac5pj95f2aljjkfh9428jbb";
   };
 
   nativeBuildInputs = [ pkgconfig ];
-- 
GitLab


From d59c3849a41a7eb467a7f31f7127b809d9fbfb25 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Wed, 18 Jul 2018 09:24:09 -0700
Subject: [PATCH 088/297] opensubdiv: 3.3.1 -> 3.3.2

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/opensubdiv/versions.
---
 pkgs/development/libraries/opensubdiv/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/opensubdiv/default.nix b/pkgs/development/libraries/opensubdiv/default.nix
index 62c093f310f..157723c13ac 100644
--- a/pkgs/development/libraries/opensubdiv/default.nix
+++ b/pkgs/development/libraries/opensubdiv/default.nix
@@ -6,13 +6,13 @@
 
 stdenv.mkDerivation rec {
   name = "opensubdiv-${version}";
-  version = "3.3.1";
+  version = "3.3.2";
 
   src = fetchFromGitHub {
     owner = "PixarAnimationStudios";
     repo = "OpenSubdiv";
     rev = "v${lib.replaceChars ["."] ["_"] version}";
-    sha256 = "1s96038yvf8wch5gv537iigqflxx7rh9wwn3wlrk8f9yfdwv1mk1";
+    sha256 = "0j3vh52w1pnld2a2cm6z7iicni1f617qzg0d8xh3p7l0s2dxjibh";
   };
 
   outputs = [ "out" "dev" ];
-- 
GitLab


From 2ee14993255dfbb200c0dcc76875d60a31b5c5ab Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Wed, 18 Jul 2018 09:50:59 -0700
Subject: [PATCH 089/297] neomutt: 20180622 -> 20180716

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/neomutt/versions.
---
 .../applications/networking/mailreaders/neomutt/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/neomutt/default.nix b/pkgs/applications/networking/mailreaders/neomutt/default.nix
index 33ccec35511..f082c241a64 100644
--- a/pkgs/applications/networking/mailreaders/neomutt/default.nix
+++ b/pkgs/applications/networking/mailreaders/neomutt/default.nix
@@ -15,14 +15,14 @@ let
   '';
 
 in stdenv.mkDerivation rec {
-  version = "20180622";
+  version = "20180716";
   name = "neomutt-${version}";
 
   src = fetchFromGitHub {
     owner  = "neomutt";
     repo   = "neomutt";
     rev    = "neomutt-${version}";
-    sha256 = "0rwrxghsxbkbkdyi0544nglip8ri2xi8fn15m0wg5hg52xzcq40i";
+    sha256 = "0im2kkahkr04q04irvcimfawxi531ld6wrsa92r2m7l10gmijkl8";
   };
 
   buildInputs = [
@@ -53,7 +53,7 @@ in stdenv.mkDerivation rec {
       --replace /etc/mime.types ${mime-types}/etc/mime.types
 
     # The string conversion tests all fail with the first version of neomutt
-    # that has tests (20180223) as well as 20180622 so we disable them for now.
+    # that has tests (20180223) as well as 20180716 so we disable them for now.
     # I don't know if that is related to the tests or our build environment.
     # Try again with a later release.
     sed -i '/rfc2047/d' test/Makefile.autosetup test/main.c
-- 
GitLab


From c33eb38d8a7446ba3c9ca00fe563253f00f2f618 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Wed, 18 Jul 2018 10:07:36 -0700
Subject: [PATCH 090/297] mate.mate-panel: 1.21.0 -> 1.21.1

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/mate-panel/versions.
---
 pkgs/desktops/mate/mate-panel/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/mate/mate-panel/default.nix b/pkgs/desktops/mate/mate-panel/default.nix
index c0c3cd48376..92da012ca7d 100644
--- a/pkgs/desktops/mate/mate-panel/default.nix
+++ b/pkgs/desktops/mate/mate-panel/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "mate-panel-${version}";
-  version = "1.21.0";
+  version = "1.21.1";
 
   src = fetchurl {
     url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz";
-    sha256 = "0vn523jscmxhyv80fmrnvk1wmyp4kdzr4g7yypqnsg4kg2gmr7x0";
+    sha256 = "0093pimqkx5db2nciksgrmq02hldg08p7hghafky3njl0kzv8l5z";
   };
 
   nativeBuildInputs = [
-- 
GitLab


From 6878c20af9d500c603a22d5597681c3b370edfb7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9-Patrick=20Bubel?= <code@apb.name>
Date: Mon, 16 Jul 2018 14:46:25 +0200
Subject: [PATCH 091/297] vcv-rack: init at 0.6.2b

---
 pkgs/applications/audio/vcv-rack/default.nix | 79 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix              |  2 +
 2 files changed, 81 insertions(+)
 create mode 100644 pkgs/applications/audio/vcv-rack/default.nix

diff --git a/pkgs/applications/audio/vcv-rack/default.nix b/pkgs/applications/audio/vcv-rack/default.nix
new file mode 100644
index 00000000000..74e041868db
--- /dev/null
+++ b/pkgs/applications/audio/vcv-rack/default.nix
@@ -0,0 +1,79 @@
+{ stdenv, makeWrapper, fetchFromBitbucket, fetchFromGitHub, pkgconfig
+, alsaLib, curl, glew, glfw, gtk2-x11, jansson, libjack2, libXext, libXi
+, libzip, rtaudio, rtmidi, speex }:
+
+let
+  glfw-git = glfw.overrideAttrs (oldAttrs: {
+    name = "glfw-git-20180529";
+    src = fetchFromGitHub {
+      owner = "glfw";
+      repo = "glfw";
+      rev = "0be4f3f75aebd9d24583ee86590a38e741db0904";
+      sha256 = "0zbcjgc7ks25yi949k0wjknfl00a4dqmz45mhp00k62vlq2sj0i5";
+    };
+    buildInputs = oldAttrs.buildInputs ++ [ libXext libXi ];
+  });
+  pfft-source = fetchFromBitbucket {
+    owner = "jpommier";
+    repo = "pffft";
+    rev = "29e4f76ac53bef048938754f32231d7836401f79";
+    sha256 = "084csgqa6f1a270bhybjayrh3mpyi2jimc87qkdgsqcp8ycsx1l1";
+  };
+in
+with stdenv.lib; stdenv.mkDerivation rec {
+  name = "VCV-Rack-${version}";
+  version = "0.6.2b";
+
+  src = fetchFromGitHub {
+    owner = "VCVRack";
+    repo = "Rack";
+    rev = "v${version}";
+    sha256 = "17ynhxcci6dyn1yi871fd8yli4924fh12pmk510djwkcj5crhas6";
+    fetchSubmodules = true;
+  };
+
+  prePatch = ''
+    ln -s ${pfft-source} dep/jpommier-pffft-source
+
+    mkdir -p dep/include
+
+    cp dep/jpommier-pffft-source/*.h dep/include
+    cp dep/nanosvg/src/*.h dep/include
+    cp dep/nanovg/src/*.h dep/include
+    cp dep/osdialog/*.h dep/include
+    cp dep/oui-blendish/*.h dep/include
+
+    substituteInPlace include/audio.hpp --replace "<RtAudio.h>" "<rtaudio/RtAudio.h>"
+    substituteInPlace compile.mk --replace "-march=nocona" ""
+    substituteInPlace Makefile \
+       --replace "-Wl,-Bstatic" "" \
+       --replace "-lglfw3" "-lglfw"
+  '';
+
+  enableParallelBuilding = true;
+
+  nativeBuildInputs = [ makeWrapper pkgconfig ];
+  buildInputs = [ glfw-git alsaLib curl glew gtk2-x11 jansson libjack2 libzip rtaudio rtmidi speex ];
+
+  buildFlags = "Rack";
+
+  installPhase = ''
+    install -D -m755 -t $out/bin Rack
+    cp -r res $out/
+
+    mkdir -p $out/share/rack
+    cp LICENSE.txt LICENSE-dist.txt $out/share/rack
+
+    # Override the default global resource file directory
+    wrapProgram $out/bin/Rack --add-flags "-g $out"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Open-source virtual modular synthesizer";
+    homepage = http://vcvrack.com/;
+    # The source is BSD-3 licensed, some of the art is CC-BY-NC 4.0 or unfree
+    license = [ licenses.bsd3 licenses.cc-by-nc-40 licenses.unfree ];
+    maintainers = with maintainers; [ moredread ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e0e4bfd4043..839289fa263 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18664,6 +18664,8 @@ with pkgs;
 
   vcprompt = callPackage ../applications/version-management/vcprompt { };
 
+  vcv-rack = callPackage ../applications/audio/vcv-rack { };
+
   vdirsyncer = callPackage ../tools/misc/vdirsyncer { };
 
   vdpauinfo = callPackage ../tools/X11/vdpauinfo { };
-- 
GitLab


From 3c6a9e13a9810530566a29d33cc2534282b569e0 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Wed, 18 Jul 2018 10:26:17 -0700
Subject: [PATCH 092/297] mrtg: 2.17.4 -> 2.17.7

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/mrtg/versions.
---
 pkgs/tools/misc/mrtg/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/mrtg/default.nix b/pkgs/tools/misc/mrtg/default.nix
index 7657b072aa8..26fcea669c2 100644
--- a/pkgs/tools/misc/mrtg/default.nix
+++ b/pkgs/tools/misc/mrtg/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
 
-  version = "2.17.4";
+  version = "2.17.7";
   name = "mrtg-${version}";
 
   src = fetchurl {
     url = "https://oss.oetiker.ch/mrtg/pub/${name}.tar.gz";
-    sha256 = "0r93ipscfp7py0b1dcx65s58q7dlwndqhprf8w4945a0h2p7zyjy";
+    sha256 = "1hrjqfi290i936nblwpfzjn6v8d8p69frcrvml206nxiiwkcp54v";
   };
 
   buildInputs = [
-- 
GitLab


From 7847ae02d842d98387aebe1623734e3838e28364 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Wed, 18 Jul 2018 10:38:17 -0700
Subject: [PATCH 093/297] mutt: 1.10.0 -> 1.10.1

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/mutt/versions.
---
 pkgs/applications/networking/mailreaders/mutt/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/mutt/default.nix b/pkgs/applications/networking/mailreaders/mutt/default.nix
index 81cf4541222..f2c097a4375 100644
--- a/pkgs/applications/networking/mailreaders/mutt/default.nix
+++ b/pkgs/applications/networking/mailreaders/mutt/default.nix
@@ -27,11 +27,11 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "mutt-${version}";
-  version = "1.10.0";
+  version = "1.10.1";
 
   src = fetchurl {
     url = "http://ftp.mutt.org/pub/mutt/${name}.tar.gz";
-    sha256 = "0nskymwr2cdapxlfv0ysz3bjwhb4kcvl5a3c39237k7r1vwva582";
+    sha256 = "182lkbkpd3q3l1x6bvyds90ycp38gyyxhf35ry0d3hwf2n1khjkk";
   };
 
   patches = optional smimeSupport (fetchpatch {
-- 
GitLab


From 38f2a3efbff43975cc2391011ebb912ee89871e1 Mon Sep 17 00:00:00 2001
From: Okina Matara <okinan@chiru.no>
Date: Tue, 10 Jul 2018 18:10:02 -0500
Subject: [PATCH 094/297] nixos/hydron: init

---
 nixos/modules/misc/ids.nix                    |   2 +
 nixos/modules/module-list.nix                 |   1 +
 nixos/modules/services/web-servers/hydron.nix | 105 ++++++++++++++++++
 3 files changed, 108 insertions(+)
 create mode 100644 nixos/modules/services/web-servers/hydron.nix

diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index aac86087f9e..7d3d1f71b70 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -321,6 +321,7 @@
       hdfs = 295;
       mapred = 296;
       hadoop = 297;
+      hydron = 298;
 
       # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399!
 
@@ -602,6 +603,7 @@
       hdfs = 295;
       mapred = 296;
       hadoop = 297;
+      hydron = 298;
 
       # When adding a gid, make sure it doesn't match an existing
       # uid. Users and groups with the same name should have equal
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index f6628b8e9c5..4a5ed20c00f 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -672,6 +672,7 @@
   ./services/web-servers/caddy.nix
   ./services/web-servers/fcgiwrap.nix
   ./services/web-servers/hitch/default.nix
+  ./services/web-servers/hydron.nix
   ./services/web-servers/jboss/default.nix
   ./services/web-servers/lighttpd/cgit.nix
   ./services/web-servers/lighttpd/collectd.nix
diff --git a/nixos/modules/services/web-servers/hydron.nix b/nixos/modules/services/web-servers/hydron.nix
new file mode 100644
index 00000000000..49a18f5e7b2
--- /dev/null
+++ b/nixos/modules/services/web-servers/hydron.nix
@@ -0,0 +1,105 @@
+{ config, lib, pkgs, ... }:
+
+let cfg = config.services.hydron;
+in with lib; {
+  options.services.hydron = {
+    enable = mkEnableOption "hydron";
+
+    dataDir = mkOption {
+      type = types.path;
+      default = "/var/lib/hydron";
+      example = "/home/okina/hydron";
+      description = "Location where hydron runs and stores data.";
+    };
+
+    interval = mkOption {
+      type = types.str;
+      default = "hourly";
+      example = "06:00";
+      description = ''
+        How often we run hydron import and possibly fetch tags. Runs by default every hour.
+
+        The format is described in
+        <citerefentry><refentrytitle>systemd.time</refentrytitle>
+        <manvolnum>7</manvolnum></citerefentry>.
+      '';
+    };
+
+    listenAddress = mkOption {
+      type = types.nullOr types.str;
+      default = null;
+      example = "127.0.0.1:8010";
+      description = "Listen on a specific IP address and port.";
+    };
+
+    importPaths = mkOption {
+      type = types.listOf types.path;
+      default = [];
+      example = [ "/home/okina/Pictures" ];
+      description = "Paths that hydron will recursively import.";
+    };
+
+    fetchTags = mkOption {
+      type = types.bool;
+      default = true;
+      description = "Fetch tags for imported images and webm from gelbooru.";
+    };
+  };
+
+  config = mkIf cfg.enable {
+    systemd.services.hydron = {
+      description = "hydron";
+      after = [ "network.target" ];
+      wantedBy = [ "multi-user.target" ];
+
+      preStart = ''
+        # Ensure folder exists and permissions are correct
+        mkdir -p ${escapeShellArg cfg.dataDir}/images
+        chmod 750 ${escapeShellArg cfg.dataDir}
+        chown -R hydron:hydron ${escapeShellArg cfg.dataDir}
+      '';
+
+      serviceConfig = {
+        PermissionsStartOnly = true;
+        User = "hydron";
+        Group = "hydron";
+        ExecStart = "${pkgs.hydron}/bin/hydron serve"
+        + optionalString (cfg.listenAddress != null) " -a ${cfg.listenAddress}";
+      };
+    };
+
+    systemd.services.hydron-fetch = {
+      description = "Import paths into hydron and possibly fetch tags";
+
+      serviceConfig = {
+        Type = "oneshot";
+        User = "hydron";
+        Group = "hydron";
+        ExecStart = "${pkgs.hydron}/bin/hydron import "
+        + optionalString cfg.fetchTags "-f "
+        + (escapeShellArg cfg.dataDir) + "/images " + (escapeShellArgs cfg.importPaths);
+      };
+    };
+
+    systemd.timers.hydron-fetch = {
+      description = "Automatically import paths into hydron and possibly fetch tags";
+      after = [ "network.target" ];
+      wantedBy = [ "timers.target" ];
+      timerConfig.OnCalendar = cfg.interval;
+    };
+
+    users = {
+      groups.hydron.gid = config.ids.gids.hydron;
+      
+      users.hydron = {
+        description = "hydron server service user";
+        home = cfg.dataDir;
+        createHome = true;
+        group = "hydron";
+        uid = config.ids.uids.hydron;
+      };
+    };
+  };
+
+  meta.maintainers = with maintainers; [ chiiruno ];
+}
-- 
GitLab


From 920f1bc190e76d26070d24db8a165ac7adfbd16a Mon Sep 17 00:00:00 2001
From: Okina Matara <okinan@chiru.no>
Date: Wed, 18 Jul 2018 13:17:42 -0500
Subject: [PATCH 095/297] hydron: init at 2018-07-15

---
 pkgs/servers/hydron/default.nix | 33 ++++++++++++
 pkgs/servers/hydron/deps.nix    | 93 +++++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix |  2 +
 3 files changed, 128 insertions(+)
 create mode 100644 pkgs/servers/hydron/default.nix
 create mode 100644 pkgs/servers/hydron/deps.nix

diff --git a/pkgs/servers/hydron/default.nix b/pkgs/servers/hydron/default.nix
new file mode 100644
index 00000000000..22191e19976
--- /dev/null
+++ b/pkgs/servers/hydron/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, buildGoPackage, fetchFromGitHub, pkgconfig, ffmpeg-full, graphicsmagick
+, quicktemplate, go-bindata, easyjson }:
+
+buildGoPackage rec {
+  name = "hydron-unstable-${version}";
+  version = "2018-07-15";
+  goPackagePath = "github.com/bakape/hydron";
+  goDeps = ./deps.nix;
+
+  src = fetchFromGitHub {
+    rev = "3906ace0b4cf48ba9acccf372377c7feb0665be4";
+    owner = "bakape";
+    repo = "hydron";
+    sha256 = "079a88740wxgq73sq8w96zppfng7af76k7h484x3w695qk83j33r";
+  };
+
+  enableParallelBuilding = true;
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ ffmpeg-full graphicsmagick quicktemplate go-bindata easyjson ];
+
+  # Temporary workaround for https://github.com/NixOS/nixpkgs/issues/43593
+  preBuild = ''
+    rm go/src/github.com/bakape/hydron/ico.syso
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = "https://github.com/bakape/hydron";
+    description = "High performance media tagger and organizer";
+    license = licenses.lgpl3Plus;
+    maintainers = with maintainers; [ chiiruno ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/servers/hydron/deps.nix b/pkgs/servers/hydron/deps.nix
new file mode 100644
index 00000000000..9ef0fd23b45
--- /dev/null
+++ b/pkgs/servers/hydron/deps.nix
@@ -0,0 +1,93 @@
+# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
+[
+  {
+    goPackagePath = "github.com/Masterminds/squirrel";
+    fetch = {
+      type = "git";
+      url = "https://github.com/Masterminds/squirrel";
+      rev = "b127ed9be03443fe3c0877e391130e3dd3f3107a";
+      sha256 = "04vgwm5g5486188656hiw1x56mrkv27s5g2s8mc1lz7z1ig5g5bg";
+    };
+  }
+  {
+    goPackagePath = "github.com/bakape/thumbnailer";
+    fetch = {
+      type = "git";
+      url = "https://github.com/bakape/thumbnailer";
+      rev = "fa88f595f3882773bc425b382eee71e3e2fa1291";
+      sha256 = "19xfn8aj1nhh5dj93hskzrhaa07sayd8agmz1vkkh6varqrldanf";
+    };
+  }
+  {
+    goPackagePath = "github.com/dimfeld/httptreemux";
+    fetch = {
+      type = "git";
+      url = "https://github.com/dimfeld/httptreemux";
+      rev = "7f532489e7739b3d49df5c602bf63549881fe753";
+      sha256 = "0hkw04rsvljvx8ynqjgz9cb743x09fd2xiiycrgz5vbsa8q9iyyk";
+    };
+  }
+  {
+    goPackagePath = "github.com/gorilla/handlers";
+    fetch = {
+      type = "git";
+      url = "https://github.com/gorilla/handlers";
+      rev = "13a38d26174b16d5b4bf6f1094c1389ec9879572";
+      sha256 = "0zg43blpyyy667y0kpiifk5a2w35jh8qkk4zwlabb365c0lzrv6v";
+    };
+  }
+  {
+    goPackagePath = "github.com/lann/builder";
+    fetch = {
+      type = "git";
+      url = "https://github.com/lann/builder";
+      rev = "1b87b36280d04fe7882d1512bf038ea2967ad534";
+      sha256 = "015q46awbyp47vld07yi7d27i0lkd82r7qn5230bb9qxl4mcfiqc";
+    };
+  }
+  {
+    goPackagePath = "github.com/lann/ps";
+    fetch = {
+      type = "git";
+      url = "https://github.com/lann/ps";
+      rev = "62de8c46ede02a7675c4c79c84883eb164cb71e3";
+      sha256 = "10yhcyymypvdiiipchsp80jbglk8c4r7lq7h54v9f4mxmvz6xgf7";
+    };
+  }
+  {
+    goPackagePath = "github.com/mailru/easyjson";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mailru/easyjson";
+      rev = "3fdea8d05856a0c8df22ed4bc71b3219245e4485";
+      sha256 = "0g3crph77yhv4ipdnwqc32z4cp87ahi4ikad5kyy6q4znnxliz74";
+    };
+  }
+  {
+    goPackagePath = "github.com/mattn/go-sqlite3";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mattn/go-sqlite3";
+      rev = "3aefd9f0a162514f66d0e4ceda3edc44e66b502e";
+      sha256 = "0as2kqmlvd21r481vxl457n5lxxp4i1jdjkmyqsjf5vg6xr9gd2d";
+    };
+  }
+  {
+    goPackagePath = "github.com/valyala/bytebufferpool";
+    fetch = {
+      type = "git";
+      url = "https://github.com/valyala/bytebufferpool";
+      rev = "e746df99fe4a3986f4d4f79e13c1e0117ce9c2f7";
+      sha256 = "01lqzjddq6kz9v41nkky7wbgk7f1cw036sa7ldz10d82g5klzl93";
+    };
+  }
+  {
+    goPackagePath = "github.com/valyala/quicktemplate";
+    fetch = {
+      type = "git";
+      url = "https://github.com/valyala/quicktemplate";
+      rev = "a91e0946457b6583004fbfc159339b8171423aed";
+      sha256 = "1z89ang5pkq5qs5b2nwhzyrw0zjlsas539l9kix374fhka49n8yc";
+    };
+  }
+]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0f071c42cd7..d3c988539d0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12756,6 +12756,8 @@ with pkgs;
 
   home-assistant = callPackage ../servers/home-assistant { };
 
+  hydron = callPackage ../servers/hydron { };
+
   ircdHybrid = callPackage ../servers/irc/ircd-hybrid { };
 
   jboss = callPackage ../servers/http/jboss { };
-- 
GitLab


From 8a1f77fe2d6934083f95fa12fc6a814932e0975c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Wed, 18 Jul 2018 11:28:23 -0700
Subject: [PATCH 096/297] libsvm: 3.22 -> 3.23

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/libsvm/versions.
---
 pkgs/development/libraries/libsvm/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libsvm/default.nix b/pkgs/development/libraries/libsvm/default.nix
index aab0da90d39..6eb8b6b1a8e 100644
--- a/pkgs/development/libraries/libsvm/default.nix
+++ b/pkgs/development/libraries/libsvm/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "libsvm-${version}";
-  version = "3.22";
+  version = "3.23";
 
   src = fetchurl {
     url = "https://www.csie.ntu.edu.tw/~cjlin/libsvm/libsvm-${version}.tar.gz";
-    sha256 = "0zd7s19y5vb7agczl6456bn45cj1y64739sslaskw1qk7dywd0bd";
+    sha256 = "0jpaq0rr92x38p4nk3gjan79ip67m6p80anb28z1d8601miysyi5";
   };
 
   buildPhase = ''
-- 
GitLab


From d50c2765602ffae321bc32bfecb8b6c0ba82a209 Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Wed, 18 Jul 2018 19:04:27 +0000
Subject: [PATCH 097/297] xfce4-13.xfce4-screenshooter: 1.9.1 -> 1.9.2 (#43625)

---
 pkgs/desktops/xfce4-13/xfce4-screenshooter/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/xfce4-13/xfce4-screenshooter/default.nix b/pkgs/desktops/xfce4-13/xfce4-screenshooter/default.nix
index 5e2c296f056..0dfad21d07b 100644
--- a/pkgs/desktops/xfce4-13/xfce4-screenshooter/default.nix
+++ b/pkgs/desktops/xfce4-13/xfce4-screenshooter/default.nix
@@ -1,11 +1,12 @@
-{ mkXfceDerivation, exo, gtk3, libsoup, libxfce4ui, libxfce4util, xfce4-panel }:
+{ mkXfceDerivation, exo, gtk3, libsoup, libxfce4ui, libxfce4util, xfce4-panel, wrapGAppsHook, glib-networking }:
 
 mkXfceDerivation rec {
   category = "apps";
   pname = "xfce4-screenshooter";
-  version = "1.9.1";
+  version = "1.9.2";
 
-  sha256 = "1q13hvaz3ykrbgbbqb1186mhri8r9hkmpaayjwhnkvjm7jfyhbin";
+  sha256 = "1zl16xcmgrb1s6rsrn37mpl5w522i1i9s7x167xf2d092x333yx2";
 
-  buildInputs = [ exo gtk3 libsoup libxfce4ui libxfce4util xfce4-panel ];
+  nativeBuildInputs = [ wrapGAppsHook ]; # fix "No GSettings schemas are installed on the system"
+  buildInputs = [ exo gtk3 libsoup libxfce4ui libxfce4util xfce4-panel glib-networking ];
 }
-- 
GitLab


From 2c28747f95f1fccb77d562f923d6195e6dada0c7 Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Wed, 18 Jul 2018 19:06:26 +0000
Subject: [PATCH 098/297] libcardiacarrest: 11.0-6 -> 12.1-6 (#43697)

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

diff --git a/pkgs/misc/libcardiacarrest/default.nix b/pkgs/misc/libcardiacarrest/default.nix
index 186fcb263ca..28e9b81df86 100644
--- a/pkgs/misc/libcardiacarrest/default.nix
+++ b/pkgs/misc/libcardiacarrest/default.nix
@@ -4,13 +4,13 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "libcardiacarrest-${version}";
-  version = "11.0-6"; # <PA API version>-<version>
+  version = "12.1-6"; # <PA API version>-<version>
 
   src = fetchFromGitHub {
     owner = "oxij";
     repo = "libcardiacarrest";
-    rev = "1220b37b3de75238fedee1a66ca703fe1c8c71c3";
-    sha256 = "0fkfiixjybac3rwcd26621hh5dw4f5gnmm230cr4g8fl0i2ikmrz";
+    rev = "4df92b6cc66c7f9fe947dd9bbf4802cf20fe63a2";
+    sha256 = "0zfjn4nvcx8r4f6czcix5b9nsszhhhlbypcwqzi4ddhazl1gyfm6";
   };
 
   outputs = [ "out" "dev" ];
-- 
GitLab


From eaeae60fbce413c09fbf9a9545096b403da233db Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Wed, 18 Jul 2018 19:10:55 +0000
Subject: [PATCH 099/297] ristretto: 0.8.2 -> 0.8.3 (#43696)

---
 pkgs/desktops/xfce4-13/ristretto/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/xfce4-13/ristretto/default.nix b/pkgs/desktops/xfce4-13/ristretto/default.nix
index 5296723eb40..b4b0778e982 100644
--- a/pkgs/desktops/xfce4-13/ristretto/default.nix
+++ b/pkgs/desktops/xfce4-13/ristretto/default.nix
@@ -1,10 +1,10 @@
-{ mkXfceDerivation, automakeAddFlags, exo, dbus_glib, gtk2, libexif
+{ mkXfceDerivation, automakeAddFlags, exo, dbus-glib, gtk2, libexif
 , libxfce4ui, libxfce4util, xfconf }:
 
 mkXfceDerivation rec {
   category = "apps";
   pname = "ristretto";
-  version = "0.8.2";
+  version = "0.8.3";
 
   postPatch = ''
     automakeAddFlags src/Makefile.am ristretto_CFLAGS DBUS_GLIB_CFLAGS
@@ -12,7 +12,7 @@ mkXfceDerivation rec {
   '';
 
   nativeBuildInputs = [ automakeAddFlags exo ];
-  buildInputs = [ dbus_glib gtk2 libexif libxfce4ui libxfce4util xfconf ];
+  buildInputs = [ dbus-glib gtk2 libexif libxfce4ui libxfce4util xfconf ];
 
-  sha256 = "0ra50452ldk91pvhcpl3f3rhdssw3djfr6cm0hc29v8r58am0wni";
+  sha256 = "02i61ddzpv0qjwahkksnzla57zdmkywyg1qrqs57z4bzj6l4nmkx";
 }
-- 
GitLab


From b2d855fea83aa6b88831dcc4b3f68ec3d10a0d0c Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Wed, 18 Jul 2018 19:12:55 +0000
Subject: [PATCH 100/297] xfce4-terminal: 0.8.6 -> 0.8.7.4 (#43706)

---
 pkgs/desktops/xfce4-13/xfce4-terminal/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/xfce4-13/xfce4-terminal/default.nix b/pkgs/desktops/xfce4-13/xfce4-terminal/default.nix
index de37e4071fe..5ee6e338ea4 100644
--- a/pkgs/desktops/xfce4-13/xfce4-terminal/default.nix
+++ b/pkgs/desktops/xfce4-13/xfce4-terminal/default.nix
@@ -3,9 +3,9 @@
 mkXfceDerivation rec {
   category = "apps";
   pname = "xfce4-terminal";
-  version = "0.8.6";
+  version = "0.8.7.4";
 
-  sha256 = "1a0b2ih552zhbbx1fc5ad80nafvkc5my3gw89as4mvycnhyd5inj";
+  sha256 = "1s1dq560icg602jjb2ja58x7hxg4ikp3jrrf74v3qgi0ir950k2y";
 
   buildInputs = [ gtk3 libxfce4ui vte ];
 
-- 
GitLab


From 5e3d434a91a856e8f43d778340d3cef5f115d235 Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Wed, 18 Jul 2018 19:15:50 +0000
Subject: [PATCH 101/297] thunar: 1.7.0 -> 1.8.1 (#43698)

---
 pkgs/desktops/xfce4-13/thunar/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/xfce4-13/thunar/default.nix b/pkgs/desktops/xfce4-13/thunar/default.nix
index 7503e67e4a5..31e1101c5e2 100644
--- a/pkgs/desktops/xfce4-13/thunar/default.nix
+++ b/pkgs/desktops/xfce4-13/thunar/default.nix
@@ -4,9 +4,9 @@
 mkXfceDerivation rec {
   category = "xfce";
   pname = "thunar";
-  version = "1.7.0";
+  version = "1.8.1";
 
-  sha256 = "1s262hii524a5hb15pb8xbrrrhyi5fj3837zgbscg3rdnsm52igw";
+  sha256 = "00n5iinhg3xgzj2rcy7zl6g9449i59x2l09cnlkhyrjzghb4k5ha";
 
   postPatch = ''
     substituteInPlace docs/Makefile.am \
-- 
GitLab


From 061c7445ed1110befd9f0a7a2b9a6ae43757be8d Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Wed, 18 Jul 2018 19:18:45 +0000
Subject: [PATCH 102/297] xfce4-settings: 4.13.1 -> 4.13.4 (#43705)

---
 pkgs/desktops/xfce4-13/xfce4-settings/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/xfce4-13/xfce4-settings/default.nix b/pkgs/desktops/xfce4-13/xfce4-settings/default.nix
index 235c5cd15e4..d08c1f96fdd 100644
--- a/pkgs/desktops/xfce4-13/xfce4-settings/default.nix
+++ b/pkgs/desktops/xfce4-13/xfce4-settings/default.nix
@@ -1,13 +1,13 @@
-{ mkXfceDerivation, automakeAddFlags, dbus_glib, exo, garcon, gtk3
+{ mkXfceDerivation, automakeAddFlags, dbus-glib, exo, garcon, gtk3
 , libnotify ? null, libxfce4ui, libxfce4util, libxklavier ? null
 , upower ? null, xfconf, xf86inputlibinput ? null }:
 
 mkXfceDerivation rec {
   category = "xfce";
   pname = "xfce4-settings";
-  version = "4.13.1";
+  version = "4.13.4";
 
-  sha256 = "010vcgy3qiqykk174jhf50a8q3x4a5qq2lf6b0wcbyzv7aikydrw";
+  sha256 = "0qnnpvcs2hpfq3n4byjwq343p95i9xw96rq7ym4md4mahnk176dy";
 
   postPatch = ''
     automakeAddFlags xfce4-settings-editor/Makefile.am xfce4_settings_editor_CFLAGS DBUS_GLIB_CFLAGS
@@ -19,7 +19,7 @@ mkXfceDerivation rec {
   nativeBuildInputs = [ automakeAddFlags ];
 
   buildInputs = [
-    dbus_glib
+    dbus-glib
     exo
     garcon
     gtk3
-- 
GitLab


From 4884f58f4e49b051f5fe6d78159486cdef5ee703 Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Wed, 18 Jul 2018 19:22:24 +0000
Subject: [PATCH 103/297] tumbler: 0.2.0 -> 0.2.1 (#43699)

---
 pkgs/desktops/xfce4-13/tumbler/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/xfce4-13/tumbler/default.nix b/pkgs/desktops/xfce4-13/tumbler/default.nix
index 6bcdbfbc41e..15b41f090af 100644
--- a/pkgs/desktops/xfce4-13/tumbler/default.nix
+++ b/pkgs/desktops/xfce4-13/tumbler/default.nix
@@ -6,9 +6,9 @@
 mkXfceDerivation rec {
   category = "xfce";
   pname = "tumbler";
-  version = "0.2.0";
+  version = "0.2.1";
 
-  sha256 = "0jr6rhgc57yqb3iwp7y49yf5ig541liaz6xpvjl45ki34j091iaj";
+  sha256 = "0vgk3s6jnsrs8bawrfc11s8nwsm4jvcl3aidbaznk52g97xiyxz0";
 
   buildInputs = [ gdk_pixbuf ffmpegthumbnailer libgsf poppler ];
 }
-- 
GitLab


From f0ad15f758aa5baa985bae14eb0012dbf51aa37c Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Wed, 18 Jul 2018 21:57:38 +0200
Subject: [PATCH 104/297] pythonPackages.llvmlite: fix build

`llvmlite` requires LLVM v6 as build input:
https://github.com/numba/llvmlite/commit/9ae78b184965f76d32b2120c25216cabe23bb3c4

See https://hydra.nixos.org/build/77706684
---
 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 9f0503c25dc..450a21f3463 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7137,7 +7137,7 @@ in {
 
   locustio = callPackage ../development/python-modules/locustio { };
 
-  llvmlite = callPackage ../development/python-modules/llvmlite { llvm = pkgs.llvm; };
+  llvmlite = callPackage ../development/python-modules/llvmlite { llvm = pkgs.llvm_6; };
 
   lockfile = buildPythonPackage rec {
     pname = "lockfile";
-- 
GitLab


From 35c069ea02b6a19263cd66c2885f4d8190a7c910 Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <infinisil@icloud.com>
Date: Wed, 18 Jul 2018 22:04:26 +0200
Subject: [PATCH 105/297] nixos: systemd.globalEnvironment: fix type

Follow up fix of fb2a8d66699c96d6a687eb71ebfcca08e3405037

https://github.com/NixOS/nixpkgs/pull/38356
https://github.com/NixOS/nixpkgs/pull/40416
---
 nixos/modules/system/boot/systemd.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index 6593b1a0243..6f5b15372d7 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -515,7 +515,7 @@ in
     };
 
     systemd.globalEnvironment = mkOption {
-      type = with types; attrsOf (nullOr (either str package));
+      type = with types; attrsOf (nullOr (either str (either path package)));
       default = {};
       example = { TZ = "CET"; };
       description = ''
-- 
GitLab


From f98790da415e8ee644be21b38a522b5b43da2801 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Wed, 18 Jul 2018 13:13:48 -0700
Subject: [PATCH 106/297] krita: 4.1.0 -> 4.1.1

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/krita/versions.
---
 pkgs/applications/graphics/krita/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/graphics/krita/default.nix b/pkgs/applications/graphics/krita/default.nix
index 1fd19162a4f..94a891ededd 100644
--- a/pkgs/applications/graphics/krita/default.nix
+++ b/pkgs/applications/graphics/krita/default.nix
@@ -10,11 +10,11 @@
 
 mkDerivation rec {
   name = "krita-${version}";
-  version = "4.1.0";
+  version = "4.1.1";
 
   src = fetchurl {
     url = "https://download.kde.org/stable/krita/${version}/${name}.tar.gz";
-    sha256 = "1mbyybc7h3sblbaklvz0cci3ys4zcyi616fgdn06p62v2vw2sybq";
+    sha256 = "1qz9bjvnwa5gc2b0063i2p72jq6y1b6kgqdj39599acp7ws11asw";
   };
 
   nativeBuildInputs = [ cmake extra-cmake-modules ];
-- 
GitLab


From fbc009f266c9b137c3e81bd99f1b1031241003ea Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Wed, 18 Jul 2018 22:23:20 +0200
Subject: [PATCH 107/297] osquery: 3.2.8 -> 3.2.9 (#43690)

Latest bugfix release with the following notable changes:

* Memory leak resolve for dispatcher
  (https://github.com/facebook/osquery/commit/06d48654456e2b56091f0d35f55c234cc054d378)

* Fix include path on status.h
  (https://github.com/facebook/osquery/commit/5bd4984f2a5a38c4dd09e9271b162bbacff796ac)

Additionally the patch had to be rebased onto the 3.2.9 branch as it
added XCode support including some CLang flags (namely `-fno-limit-debug-info`)
which are unsupported on GCC.
(see https://github.com/facebook/osquery/commit/bccc28dd9851997b45b69c1dcb11a161763653f9)
---
 pkgs/tools/system/osquery/default.nix |  4 ++--
 pkgs/tools/system/osquery/misc.patch  | 30 +++++++++++++++++----------
 2 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/pkgs/tools/system/osquery/default.nix b/pkgs/tools/system/osquery/default.nix
index c2d31ccb0fb..7bbf42b1132 100644
--- a/pkgs/tools/system/osquery/default.nix
+++ b/pkgs/tools/system/osquery/default.nix
@@ -20,7 +20,7 @@ in
 
 stdenv.mkDerivation rec {
   name = "osquery-${version}";
-  version = "3.2.8";
+  version = "3.2.9";
 
   # this is what `osquery --help` will show as the version.
   OSQUERY_BUILD_VERSION = version;
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
     owner = "facebook";
     repo = "osquery";
     rev = version;
-    sha256 = "1py5jizl7z1f9xzpg7pylbdnawvvifiyv9gpjwiim8ilgkmpaiv4";
+    sha256 = "1fac0yj1701469qhbsp38ab2fmavm3jw6x278bf78yvxdi99ivai";
   };
 
   patches = [ ./misc.patch ];
diff --git a/pkgs/tools/system/osquery/misc.patch b/pkgs/tools/system/osquery/misc.patch
index 859e398616a..129c524521d 100644
--- a/pkgs/tools/system/osquery/misc.patch
+++ b/pkgs/tools/system/osquery/misc.patch
@@ -1,8 +1,16 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 71921740..156ea6dc 100644
+index 0242fb71..5007aace 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -456,12 +456,6 @@ elseif(CLANG AND DEPS AND NOT FREEBSD)
+@@ -304,7 +304,6 @@ else()
+     # To be safe, only include them when building 'release' outputs.
+     add_compile_options(
+       -g
+-      -fno-limit-debug-info
+       -fPIE
+       -fpie
+       -fPIC
+@@ -449,12 +448,6 @@ elseif(CLANG AND DEPS AND NOT FREEBSD)
    set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -flto=thin")
  endif()
  
@@ -15,7 +23,7 @@ index 71921740..156ea6dc 100644
  # Make sure deps were built before compiling (else show warning).
  execute_process(
    COMMAND "${CMAKE_SOURCE_DIR}/tools/provision.sh" check "${CMAKE_BINARY_DIR}"
-@@ -528,6 +522,8 @@ endif()
+@@ -521,6 +514,8 @@ endif()
  
  if(APPLE)
    LOG_PLATFORM("OS X")
@@ -24,7 +32,7 @@ index 71921740..156ea6dc 100644
  elseif(OSQUERY_BUILD_PLATFORM STREQUAL "debian")
    LOG_PLATFORM("Debian")
  elseif(OSQUERY_BUILD_PLATFORM STREQUAL "ubuntu")
-@@ -577,7 +573,6 @@ if(POSIX AND DEPS)
+@@ -570,7 +565,6 @@ if(POSIX AND DEPS)
    endif()
  endif()
  
@@ -32,7 +40,7 @@ index 71921740..156ea6dc 100644
  include_directories("${CMAKE_SOURCE_DIR}/include")
  include_directories("${CMAKE_SOURCE_DIR}")
  
-@@ -668,18 +663,6 @@ if(FREEBSD OR "${HAVE_TR1_TUPLE}" STREQUAL "")
+@@ -661,18 +655,6 @@ if(FREEBSD OR "${HAVE_TR1_TUPLE}" STREQUAL "")
    add_definitions(-DGTEST_USE_OWN_TR1_TUPLE=0)
  endif()
  
@@ -52,10 +60,10 @@ index 71921740..156ea6dc 100644
    add_subdirectory("${CMAKE_SOURCE_DIR}/third-party/linenoise-ng")
  endif()
 diff --git a/osquery/CMakeLists.txt b/osquery/CMakeLists.txt
-index c8cbac4e..a4382420 100644
+index e3842962..f405503d 100644
 --- a/osquery/CMakeLists.txt
 +++ b/osquery/CMakeLists.txt
-@@ -35,8 +35,6 @@ if(CLANG AND POSIX)
+@@ -33,8 +33,6 @@ if(CLANG AND POSIX)
      -Wextra
      -pedantic
      -Wuseless-cast
@@ -64,7 +72,7 @@ index c8cbac4e..a4382420 100644
      -Wno-unused-parameter
      -Wno-gnu-case-range
      -Weffc++
-@@ -65,14 +63,7 @@ endif()
+@@ -63,14 +61,7 @@ endif()
  
  # Construct a set of all object files, starting with third-party and all
  # of the osquery core objects (sources from ADD_CORE_LIBRARY macros).
@@ -80,7 +88,7 @@ index c8cbac4e..a4382420 100644
  
  # Add subdirectories
  add_subdirectory(config)
-@@ -153,10 +144,11 @@ if(APPLE OR LINUX)
+@@ -151,10 +142,11 @@ if(APPLE OR LINUX)
    ADD_OSQUERY_LINK_ADDITIONAL("rocksdb_lite")
  elseif(FREEBSD)
    ADD_OSQUERY_LINK_CORE("icuuc")
@@ -93,7 +101,7 @@ index c8cbac4e..a4382420 100644
  if(POSIX)
    ADD_OSQUERY_LINK_CORE("boost_system")
    ADD_OSQUERY_LINK_CORE("boost_filesystem")
-@@ -174,10 +166,10 @@ endif()
+@@ -172,10 +164,10 @@ endif()
  ADD_OSQUERY_LINK_CORE("glog${WO_KEY}")
  
  if(POSIX)
@@ -142,7 +150,7 @@ index ab91bd24..d8364991 100644
    ADD_OSQUERY_TEST_ADDITIONAL(${OSQUERY_LOGGER_KAFKA_PLUGINS_TESTS})
  endif()
 diff --git a/osquery/tables/CMakeLists.txt b/osquery/tables/CMakeLists.txt
-index dd78084f..158758e1 100644
+index 3ecbb711..af7220d3 100644
 --- a/osquery/tables/CMakeLists.txt
 +++ b/osquery/tables/CMakeLists.txt
 @@ -68,7 +68,7 @@ if(LINUX)
-- 
GitLab


From 471c14b9d1fc5b44ae786e6cd6ba473a1d46de8d Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Wed, 18 Jul 2018 20:25:18 +0000
Subject: [PATCH 108/297] xfdesktop: 4.13.1 -> 4.13.2 (#43701)

---
 pkgs/desktops/xfce4-13/xfdesktop/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/xfce4-13/xfdesktop/default.nix b/pkgs/desktops/xfce4-13/xfdesktop/default.nix
index 7ce32424b9b..0209b791360 100644
--- a/pkgs/desktops/xfce4-13/xfdesktop/default.nix
+++ b/pkgs/desktops/xfce4-13/xfdesktop/default.nix
@@ -3,9 +3,9 @@
 mkXfceDerivation rec {
   category = "xfce";
   pname = "xfdesktop";
-  version = "4.13.1";
+  version = "4.13.2";
 
-  sha256 = "0idc8j44apflvdasnvj7ld0fa8mxlwpndfqzbh97w54s8972gf6g";
+  sha256 = "0v6dlhraqh9v20qciyj03cbjmg3jb6gvmf0hqzavxqi2di3mv5fl";
 
   buildInputs = [
     exo
-- 
GitLab


From 3ea1e5079a45e92651f64b555a106c1ad2a8f622 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Wed, 18 Jul 2018 16:26:13 -0400
Subject: [PATCH 109/297] elementary-cmake-modules: add version (#43732)

---
 .../libraries/elementary-cmake-modules/default.nix           | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/elementary-cmake-modules/default.nix b/pkgs/development/libraries/elementary-cmake-modules/default.nix
index 5287db75609..710338842f8 100644
--- a/pkgs/development/libraries/elementary-cmake-modules/default.nix
+++ b/pkgs/development/libraries/elementary-cmake-modules/default.nix
@@ -1,7 +1,8 @@
 { stdenv, lib, fetchFromGitHub, cmake, pkgconfig }:
 
-stdenv.mkDerivation {
-  name = "elementary-cmake-modules";
+stdenv.mkDerivation rec {
+  name = "elementary-cmake-modules-${version}";
+  version = "0.1.0";
 
   src = fetchFromGitHub {
     owner = "elementary";
-- 
GitLab


From 48aa5f348621f81c3b4c79fc569662dbf92388ba Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 18 Jul 2018 13:35:07 -0700
Subject: [PATCH 110/297] arangodb: 3.3.11 -> 3.3.12 (#43485)

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/arangodb/versions.
---
 pkgs/servers/nosql/arangodb/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/nosql/arangodb/default.nix b/pkgs/servers/nosql/arangodb/default.nix
index 347af1c4de9..9b21deecf4b 100644
--- a/pkgs/servers/nosql/arangodb/default.nix
+++ b/pkgs/servers/nosql/arangodb/default.nix
@@ -3,14 +3,14 @@
 
 let
 in stdenv.mkDerivation rec {
-  version = "3.3.11";
+  version = "3.3.12";
   name    = "arangodb-${version}";
 
   src = fetchFromGitHub {
     repo = "arangodb";
     owner = "arangodb";
     rev = "v${version}";
-    sha256 = "0x1sq2gvag7adba5nsx913dax2b2259h73623r0b7gn4v01ivq21";
+    sha256 = "18mx7bcxll1za91q090g3hps3mwrlqdg40lvs61kibci3amma7j2";
   };
 
   buildInputs = [
-- 
GitLab


From a74cf6a8513cb3bd19913e9e6b96a9fd7ff243ec Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 18 Jul 2018 13:39:53 -0700
Subject: [PATCH 111/297] podofo: 0.9.5 -> 0.9.6 (#43744)

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/podofo/versions.
---
 pkgs/development/libraries/podofo/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/podofo/default.nix b/pkgs/development/libraries/podofo/default.nix
index 84709441b5e..9a43470de3b 100644
--- a/pkgs/development/libraries/podofo/default.nix
+++ b/pkgs/development/libraries/podofo/default.nix
@@ -4,11 +4,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "podofo-0.9.5";
+  name = "podofo-0.9.6";
 
   src = fetchurl {
     url = "mirror://sourceforge/podofo/${name}.tar.gz";
-    sha256 = "012kgfx5j5n6w4zkc1d290d2cwjk60jhzsjlr2x19g3yi75q2jc5";
+    sha256 = "0wj0y4zcmj4q79wrn3vv3xq4bb0vhhxs8yifafwy9f2sjm83c5p9";
   };
 
   propagatedBuildInputs = [ zlib freetype libjpeg libtiff fontconfig openssl libpng libidn expat ];
-- 
GitLab


From 0f710bc8f67794c033b65b45804636fd0cc86ec2 Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Wed, 18 Jul 2018 21:14:10 +0000
Subject: [PATCH 112/297] libxklavier: 5.3 -> 5.4 (#43622)

---
 .../libraries/libxklavier/default.nix         | 20 ++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/libxklavier/default.nix b/pkgs/development/libraries/libxklavier/default.nix
index 1150d04e1b4..263796cdc78 100644
--- a/pkgs/development/libraries/libxklavier/default.nix
+++ b/pkgs/development/libraries/libxklavier/default.nix
@@ -1,15 +1,16 @@
-{ stdenv, fetchurl, pkgconfig, xkeyboard_config, libxml2, xorg
+{ stdenv, fetchgit, autoreconfHook, pkgconfig, gtk-doc, xkeyboard_config, libxml2, xorg, docbook_xsl
 , glib, isocodes, gobjectIntrospection }:
 
 let
-  version = "5.3";
+  version = "5.4";
 in
 stdenv.mkDerivation rec {
   name = "libxklavier-${version}";
 
-  src = fetchurl {
-    url = "mirror://gnome/sources/libxklavier/${version}/${name}.tar.xz";
-    sha256 = "016lpdv35z0qsw1cprdc2k5qzkdi5waj6qmr0a2q6ljn9g2kpv7b";
+  src = fetchgit {
+    url = "git://anongit.freedesktop.org/git/libxklavier";
+    rev = name;
+    sha256 = "1w1x5mrgly2ldiw3q2r6y620zgd89gk7n90ja46775lhaswxzv7a";
   };
 
   outputs = [ "out" "dev" "devdoc" ];
@@ -17,14 +18,20 @@ stdenv.mkDerivation rec {
   # TODO: enable xmodmap support, needs xmodmap DB
   propagatedBuildInputs = with xorg; [ libX11 libXi xkeyboard_config libxml2 libICE glib libxkbfile isocodes ];
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ autoreconfHook pkgconfig gtk-doc docbook_xsl ];
 
   buildInputs = [ gobjectIntrospection ];
 
+  preAutoreconf = ''
+    export NOCONFIGURE=1
+    gtkdocize
+  '';
+
   configureFlags = [
     "--with-xkb-base=${xkeyboard_config}/etc/X11/xkb"
     "--with-xkb-bin-base=${xorg.xkbcomp}/bin"
     "--disable-xmodmap-support"
+    "--enable-gtk-doc"
   ];
 
   meta = with stdenv.lib; {
@@ -34,4 +41,3 @@ stdenv.mkDerivation rec {
     platforms = platforms.linux;
   };
 }
-
-- 
GitLab


From 58327eb2143c4a14b66ce434ddf505d40e7f482f Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Wed, 18 Jul 2018 21:36:24 +0000
Subject: [PATCH 113/297] xfce4-13.xfce4-volumed-pulse: 0.2.2 -> 0.2.3 (#43704)

---
 pkgs/desktops/xfce4-13/xfce4-volumed-pulse/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/xfce4-13/xfce4-volumed-pulse/default.nix b/pkgs/desktops/xfce4-13/xfce4-volumed-pulse/default.nix
index e7f13e104c8..626451c70d6 100644
--- a/pkgs/desktops/xfce4-13/xfce4-volumed-pulse/default.nix
+++ b/pkgs/desktops/xfce4-13/xfce4-volumed-pulse/default.nix
@@ -1,13 +1,13 @@
-{ lib, mkXfceDerivation, gtk2, libnotify ? null, libpulseaudio, keybinder, xfconf }:
+{ lib, mkXfceDerivation, gtk3, libnotify ? null, libpulseaudio, keybinder3, xfconf }:
 
 mkXfceDerivation rec {
   category = "apps";
   pname = "xfce4-volumed-pulse";
-  version = "0.2.2";
+  version = "0.2.3";
 
-  sha256 = "0ccb98b433lx5fgdqd3nqqppg4sldr5p1is6pnx85h9wyxx5svhp";
+  sha256 = "1rsjng9qmq7vzrx5bfxq76h63y501cfl1mksrxkf1x39by9r628j";
 
-  buildInputs = [ gtk2 libnotify libpulseaudio keybinder xfconf ];
+  buildInputs = [ gtk3 libnotify libpulseaudio keybinder3 xfconf ];
 
   meta = with lib; {
     license = licenses.gpl3Plus;
-- 
GitLab


From e07ee596d637a25885dc68d9af432c603753fe78 Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Wed, 18 Jul 2018 21:42:28 +0000
Subject: [PATCH 114/297] xfconf: 4.13.4 -> 4.13.5 (#43703)

---
 pkgs/desktops/xfce4-13/xfconf/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/xfce4-13/xfconf/default.nix b/pkgs/desktops/xfce4-13/xfconf/default.nix
index 8280922d1c7..def60bcfe21 100644
--- a/pkgs/desktops/xfce4-13/xfconf/default.nix
+++ b/pkgs/desktops/xfce4-13/xfconf/default.nix
@@ -3,9 +3,9 @@
 mkXfceDerivation rec {
   category = "xfce";
   pname = "xfconf";
-  version = "4.13.4";
+  version = "4.13.5";
 
-  sha256 = "1bm4q06rwlmkmcy6qnwm6l70w6749iqfrmsrgj3y1jb2sacc3pd4";
+  sha256 = "0xpnwb04yw5qdn0bj8b740a7rmiy316vhja5pp8p6sdiqm32yi8a";
 
   buildInputs = [ libxfce4util ];
 }
-- 
GitLab


From d47b0ab0195f19ddb5b0ea0fbce409b7ff4b0ab1 Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Wed, 18 Jul 2018 21:42:47 +0000
Subject: [PATCH 115/297] xfce4-notifyd: 0.4.1 -> 0.4.2 (#43707)

---
 pkgs/desktops/xfce4-13/xfce4-notifyd/default.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/desktops/xfce4-13/xfce4-notifyd/default.nix b/pkgs/desktops/xfce4-13/xfce4-notifyd/default.nix
index b4be0a35a13..bac25878507 100644
--- a/pkgs/desktops/xfce4-13/xfce4-notifyd/default.nix
+++ b/pkgs/desktops/xfce4-13/xfce4-notifyd/default.nix
@@ -1,13 +1,12 @@
-{ mkXfceDerivation, dbus_glib, exo, gtk3, libnotify, libxfce4ui, libxfce4util
+{ mkXfceDerivation, dbus-glib, exo, gtk3, libnotify, libxfce4ui, libxfce4util
 , xfce4-panel, xfconf }:
 
 mkXfceDerivation rec {
   category = "apps";
   pname = "xfce4-notifyd";
-  version = "0.4.1";
+  version = "0.4.2";
 
-  sha256 = "12mqi0q1hcjm16f4pndq7l58h2n0nq160r5fqx8ns320i83nh94k";
+  sha256 = "1zxwzigrhms74crasbqpnzidmq2mnyxpmc9pqr4p4qj14yw4sam9";
 
-  nativeBuildInputs = [ dbus_glib exo ];
-  buildInputs = [ gtk3 libnotify libxfce4ui libxfce4util xfce4-panel xfconf ];
+  buildInputs = [ dbus-glib exo gtk3 libnotify libxfce4ui libxfce4util xfce4-panel xfconf ];
 }
-- 
GitLab


From d72d3b30ac1311e158f4f14e3b11abfe2342fb37 Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Wed, 18 Jul 2018 21:51:43 +0000
Subject: [PATCH 116/297] xfce4-13.libxfce4util: 4.13.1 -> 4.13.2 (#43761)

---
 pkgs/desktops/xfce4-13/libxfce4util/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/xfce4-13/libxfce4util/default.nix b/pkgs/desktops/xfce4-13/libxfce4util/default.nix
index 091d73bf72a..fe9974ca573 100644
--- a/pkgs/desktops/xfce4-13/libxfce4util/default.nix
+++ b/pkgs/desktops/xfce4-13/libxfce4util/default.nix
@@ -3,9 +3,9 @@
 mkXfceDerivation rec {
   category = "xfce";
   pname = "libxfce4util";
-  version = "4.13.1";
+  version = "4.13.2";
 
-  sha256 = "001ls90an2pi9l04g3r6syfa4lhyvjymp0r9djxrkc2q493mcv3d";
+  sha256 = "0sb6pzhmh0qzfdhixj1ard56zi68318k86z3a1h3f2fhqy7gyf98";
 
   buildInputs = [ gobjectIntrospection ];
 
-- 
GitLab


From 022e9894d434ec2b31f1680b0208fd96ee20d8f7 Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Wed, 18 Jul 2018 21:56:54 +0000
Subject: [PATCH 117/297] xfce4-13.xfwm4: fix build (add libXdamage dependency)
 (#43762)

---
 pkgs/desktops/xfce4-13/xfwm4/default.nix | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkgs/desktops/xfce4-13/xfwm4/default.nix b/pkgs/desktops/xfce4-13/xfwm4/default.nix
index d5de6817300..97d414d6693 100644
--- a/pkgs/desktops/xfce4-13/xfwm4/default.nix
+++ b/pkgs/desktops/xfce4-13/xfwm4/default.nix
@@ -1,6 +1,6 @@
-{ mkXfceDerivation, exo, dbus_glib, epoxy ? null, gtk2, libICE, libSM
-, libstartup_notification ? null, libxfce4ui, libxfce4util, libwnck
-, libXpresent ? null, xfconf }:
+{ mkXfceDerivation, exo, dbus-glib, epoxy, gtk2, libXdamage
+, libstartup_notification, libxfce4ui, libxfce4util, libwnck
+, libXpresent, xfconf }:
 
 mkXfceDerivation rec {
   category = "xfce";
@@ -12,11 +12,10 @@ mkXfceDerivation rec {
   nativeBuildInputs = [ exo ];
 
   buildInputs = [
-    dbus_glib
+    dbus-glib
     epoxy
     gtk2
-    libICE
-    libSM
+    libXdamage
     libstartup_notification
     libxfce4ui
     libxfce4util
-- 
GitLab


From 4c58c20efccc663929e70d138f49cdad0e7537e7 Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Wed, 18 Jul 2018 21:58:36 +0000
Subject: [PATCH 118/297] xfce4-13.xfce4-taskmanager: 1.2.0 -> 1.2.1 (#43763)

---
 pkgs/desktops/xfce4-13/xfce4-taskmanager/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/xfce4-13/xfce4-taskmanager/default.nix b/pkgs/desktops/xfce4-13/xfce4-taskmanager/default.nix
index c2d80e31f15..d9a5991598b 100644
--- a/pkgs/desktops/xfce4-13/xfce4-taskmanager/default.nix
+++ b/pkgs/desktops/xfce4-13/xfce4-taskmanager/default.nix
@@ -7,9 +7,9 @@ in
 mkXfceDerivation rec {
   category = "apps";
   pname = "xfce4-taskmanager";
-  version = "1.2.0";
+  version = "1.2.1";
 
-  sha256 = "1lx66lhzfzhysymcbzfq9nrafyfmwdb79lli9kvhz6m12dhz6j18";
+  sha256 = "1p0496r1fb5zqvn6c41kb6rjqwlqghqahgg6hkzw0gjy911im99w";
 
   nativeBuildInputs = [ exo ];
   buildInputs = [ gtk2 gtk3 libwnck3 libXmu ];
-- 
GitLab


From cb955845a03bc7ce524464d35b513ac9fd6b8459 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Wed, 18 Jul 2018 14:58:42 -0700
Subject: [PATCH 119/297] guake: 3.3.0 -> 3.3.2

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/guake/versions.
---
 pkgs/applications/misc/guake/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/guake/default.nix b/pkgs/applications/misc/guake/default.nix
index 57dc68263ac..8bf779185b3 100644
--- a/pkgs/applications/misc/guake/default.nix
+++ b/pkgs/applications/misc/guake/default.nix
@@ -2,7 +2,7 @@
 , gtk3, keybinder3, libnotify, libutempter, vte }:
 
 let
-  version = "3.3.0";
+  version = "3.3.2";
 in python3.pkgs.buildPythonApplication rec {
   name = "guake-${version}";
   format = "other";
@@ -11,7 +11,7 @@ in python3.pkgs.buildPythonApplication rec {
     owner = "Guake";
     repo = "guake";
     rev = version;
-    sha256 = "1wckzz18rpgacnkynh4rknhhki52agd76i2p80kk9rlrdifqs788";
+    sha256 = "0cz58wfsa66j01sqpka7908ilj5ch3jdxaxzqdi8yspqwzz5iwc7";
   };
 
   nativeBuildInputs = [ gettext gobjectIntrospection wrapGAppsHook python3.pkgs.pip glibcLocales ];
-- 
GitLab


From 6f7773cc2ad5383172f4ef3de934cf2edf5beef0 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Wed, 18 Jul 2018 15:14:22 -0700
Subject: [PATCH 120/297] esptool-ck: 0.4.11 -> 0.4.13

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/esptool-ck/versions.
---
 pkgs/tools/misc/esptool-ck/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/esptool-ck/default.nix b/pkgs/tools/misc/esptool-ck/default.nix
index c1678f3907f..9d3b796c879 100644
--- a/pkgs/tools/misc/esptool-ck/default.nix
+++ b/pkgs/tools/misc/esptool-ck/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "esptool-ck-${version}";
-  version = "0.4.11";
+  version = "0.4.13";
 
   src = fetchFromGitHub {
     owner = "igrr";
     repo = "esptool-ck";
-    rev = "0.4.11";
-    sha256 = "086x68jza24xkaap8nici18kj78id2p2lzbasin98wilvpjc8d7f";
+    rev = "0.4.13";
+    sha256 = "1cb81b30a71r7i0gmkh2qagfx9lhq0myq5i37fk881bq6g7i5n2k";
   };
 
   makeFlags = [ "VERSION=${version}" ];
-- 
GitLab


From 25b10dfaec62e4cb0fa990d7e9f8f89256a8a24d Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Wed, 18 Jul 2018 22:14:36 +0000
Subject: [PATCH 121/297] xfce4-13.xfce4-dict: 0.8.0 -> 0.8.1 (#43764)

---
 pkgs/desktops/xfce4-13/xfce4-dict/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/xfce4-13/xfce4-dict/default.nix b/pkgs/desktops/xfce4-13/xfce4-dict/default.nix
index a5357ebd590..1236b60175d 100644
--- a/pkgs/desktops/xfce4-13/xfce4-dict/default.nix
+++ b/pkgs/desktops/xfce4-13/xfce4-dict/default.nix
@@ -3,9 +3,9 @@
 mkXfceDerivation rec {
   category = "apps";
   pname = "xfce4-dict";
-  version = "0.8.0";
+  version = "0.8.1";
 
-  sha256 = "1r1k9cgl7zkn3q4mjf7qjql6vlxkb2m0spgj9p646mw7bnhbf9wr";
+  sha256 = "0kxirzqmpp7qlr8220i8kipz4bgzkam7h1lpx7yzld5xf7wdzvaf";
 
   patches = [ ./configure-gio.patch ];
 
-- 
GitLab


From a7e5927b4739c6e6427fc993f077cd3eb5433db7 Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Wed, 18 Jul 2018 22:19:06 +0000
Subject: [PATCH 122/297] xfce4-13.parole: 0.9.2 -> 1.0.1 (#43765)

---
 pkgs/desktops/xfce4-13/parole/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/xfce4-13/parole/default.nix b/pkgs/desktops/xfce4-13/parole/default.nix
index c1976727c04..e720791f1c4 100644
--- a/pkgs/desktops/xfce4-13/parole/default.nix
+++ b/pkgs/desktops/xfce4-13/parole/default.nix
@@ -1,4 +1,4 @@
-{ mkXfceDerivation, makeWrapper, wrapGAppsHook, dbus, dbus_glib
+{ mkXfceDerivation, makeWrapper, wrapGAppsHook, dbus, dbus-glib
 , gst-plugins-bad ? null, gst-plugins-base, gst-plugins-good
 , gst-plugins-ugly ? null, gtk3, libnotify, libxfce4ui, libxfce4util
 , taglib ? null, xfconf }:
@@ -8,9 +8,9 @@
 mkXfceDerivation rec {
   category = "apps";
   pname = "parole";
-  version = "0.9.2";
+  version = "1.0.1";
 
-  sha256 = "07i9d7xn2ys3z71sxvr53idq4ivy94pqgxvr0k78crva39ls08s5";
+  sha256 = "0zq1imbjqmwfk3yrsha2s7lclzbh8xgggz0rbksa51siqk73swbb";
 
   postPatch = ''
     substituteInPlace src/plugins/mpris2/Makefile.am \
@@ -21,7 +21,7 @@ mkXfceDerivation rec {
 
   buildInputs = [
     dbus
-    dbus_glib
+    dbus-glib
     gst-plugins-bad
     gst-plugins-base
     gst-plugins-good
-- 
GitLab


From da7899dc2931efb848cdf3580f1744ed1cfb1791 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Wed, 18 Jul 2018 15:30:35 -0700
Subject: [PATCH 123/297] foo2zjs: 20171202 -> 20180519

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/foo2zjs/versions.
---
 pkgs/misc/drivers/foo2zjs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/drivers/foo2zjs/default.nix b/pkgs/misc/drivers/foo2zjs/default.nix
index 8e24cf53c2f..e4d2da3afc2 100644
--- a/pkgs/misc/drivers/foo2zjs/default.nix
+++ b/pkgs/misc/drivers/foo2zjs/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, foomatic-filters, bc, unzip, ghostscript, systemd, vim }:
 
 stdenv.mkDerivation rec {
-  name = "foo2zjs-20171202";
+  name = "foo2zjs-20180519";
 
   src = fetchurl {
     url = "http://www.loegria.net/mirrors/foo2zjs/${name}.tar.gz";
-    sha256 = "b63c65e8e0e7c9fd8d19b9e63f7cd85048eba01a877aac1ca13a6bfc979ea182";
+    sha256 = "1rmw4jmxn2lqp124mapvnic0ma8ipyvisx2vj848mvad5g5w9x3z";
   };
 
   buildInputs = [ foomatic-filters bc unzip ghostscript systemd vim ];
-- 
GitLab


From def83ddf4d87b241f1557cf8a893af06db48d946 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Wed, 18 Jul 2018 22:33:16 +0000
Subject: [PATCH 124/297] xfce4-13.mousepad: 0.4.0 -> 0.4.1

---
 pkgs/desktops/xfce4-13/default.nix          | 4 +---
 pkgs/desktops/xfce4-13/mousepad/default.nix | 8 ++++----
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/pkgs/desktops/xfce4-13/default.nix b/pkgs/desktops/xfce4-13/default.nix
index 451322bcaf9..6db207a79c5 100644
--- a/pkgs/desktops/xfce4-13/default.nix
+++ b/pkgs/desktops/xfce4-13/default.nix
@@ -19,9 +19,7 @@ makeScope newScope (self: with self; {
 
   libxfce4ui = callPackage ./libxfce4ui { };
 
-  mousepad = callPackage ./mousepad {
-    inherit (gnome3) gtksourceview;
-  };
+  mousepad = callPackage ./mousepad { };
 
   orage = callPackage ./orage { };
 
diff --git a/pkgs/desktops/xfce4-13/mousepad/default.nix b/pkgs/desktops/xfce4-13/mousepad/default.nix
index 84206f763f3..b5fd3a19d06 100644
--- a/pkgs/desktops/xfce4-13/mousepad/default.nix
+++ b/pkgs/desktops/xfce4-13/mousepad/default.nix
@@ -1,12 +1,12 @@
-{ mkXfceDerivation, exo, wrapGAppsHook, dbus_glib ? null, gtk3, gtksourceview }:
+{ mkXfceDerivation, exo, wrapGAppsHook, dbus-glib, gtk3, gtksourceview3 }:
 
 mkXfceDerivation rec {
   category = "apps";
   pname = "mousepad";
-  version = "0.4.0";
+  version = "0.4.1";
 
-  sha256 = "0mm90iq2yd3d0qbgsjyk3yj25k0gm3p34jazl640vixk84v20lyw";
+  sha256 = "0pr1w9n0qq2raxhy78982i9g17x0ya02q7vdrn0wb2bpk74hlki5";
 
   nativeBuildInputs = [ exo wrapGAppsHook ];
-  buildInputs = [ dbus_glib gtk3 gtksourceview ];
+  buildInputs = [ dbus-glib gtk3 gtksourceview3 ];
 }
-- 
GitLab


From aae2171aeaf2c3d92c674bb42aa49de216f922e5 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <matthew.bauer@obsidian.systems>
Date: Mon, 16 Jul 2018 11:08:30 -0400
Subject: [PATCH 125/297] aliases: add forceSystem

Some uses of this still exist outside of Nixpkgs
---
 pkgs/top-level/aliases.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index b653dfc7db6..85fb2e4639a 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -319,6 +319,11 @@ mapAliases ({
   libva-full = libva;
   libva1-full = libva1;
 
+  # forceSystem should not be used directly in Nixpkgs.
+  # added 2018-07-16
+  forceSystem = system: _:
+    (import self.path { localSystem = { inherit system; }; });
+
   inherit (ocaml-ng) # added 2016-09-14
     ocamlPackages_3_10_0 ocamlPackages_3_11_2 ocamlPackages_3_12_1
     ocamlPackages_4_00_1 ocamlPackages_4_01_0 ocamlPackages_4_02
-- 
GitLab


From fd1c9d4c9a66b6b5c2541fa513a96d430acf91d8 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Wed, 18 Jul 2018 15:51:54 -0700
Subject: [PATCH 126/297] fwup: 1.2.1 -> 1.2.3

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/fwup/versions.
---
 pkgs/tools/misc/fwup/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/fwup/default.nix b/pkgs/tools/misc/fwup/default.nix
index 77ec5bcb86b..be86f6496f0 100644
--- a/pkgs/tools/misc/fwup/default.nix
+++ b/pkgs/tools/misc/fwup/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   name = "fwup-${version}";
-  version = "1.2.1";
+  version = "1.2.3";
 
   src = fetchFromGitHub {
     owner = "fhunleth";
     repo = "fwup";
     rev = "v${version}";
-    sha256 = "14a3bd84bnnxdrf1x80w860mhm3x4cy9jp9sf9643svq4bky4i41";
+    sha256 = "16v5s9xwdsii7pcphrb0a7aib2zprrw6n4fyc8w8c11gbkg27r4d";
   };
 
   doCheck = true;
-- 
GitLab


From a35367727ff38bb6613b6385e5c7b379ff662c66 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Wed, 18 Jul 2018 15:56:04 -0700
Subject: [PATCH 127/297] chibi: 0.7.3 -> 0.8

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/chibi-scheme/versions.
---
 pkgs/development/interpreters/chibi/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/chibi/default.nix b/pkgs/development/interpreters/chibi/default.nix
index c2ae87582df..2ad0bc0285e 100644
--- a/pkgs/development/interpreters/chibi/default.nix
+++ b/pkgs/development/interpreters/chibi/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, makeWrapper }:
 let
-  version = "0.7.3";
+  version = "0.8";
   name = "chibi-scheme-${version}";
 in
 stdenv.mkDerivation {
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
     owner = "ashinn";
     repo = "chibi-scheme";
     rev = version;
-    sha256 = "05b17flppkll1a2c2aq6lxh4iif4pjmpxmyrmiqzk0ls85gvai2x";
+    sha256 = "0269d5fhaz7nqjb41vh7yz63mp5s4z08fn4sspwc06z32xksigw9";
   };
 
   buildInputs = [ makeWrapper ];
-- 
GitLab


From 362e1702b1a29bf26b5023eaf28d206a232118dd Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Wed, 18 Jul 2018 16:04:53 -0700
Subject: [PATCH 128/297] cups-filters: 1.20.3 -> 1.20.4

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/cups-filters/versions.
---
 pkgs/misc/cups/filters.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/cups/filters.nix b/pkgs/misc/cups/filters.nix
index d15680b6363..12fb5619c25 100644
--- a/pkgs/misc/cups/filters.nix
+++ b/pkgs/misc/cups/filters.nix
@@ -9,11 +9,11 @@ let
 
 in stdenv.mkDerivation rec {
   name = "cups-filters-${version}";
-  version = "1.20.3";
+  version = "1.20.4";
 
   src = fetchurl {
     url = "https://openprinting.org/download/cups-filters/${name}.tar.xz";
-    sha256 = "1g18qkvl9zdxickiblgs2vvkip4b6p2jalw4d30zzz3hh8f1g6iv";
+    sha256 = "0sjkmclcb1r77015wllsyz26272br3s17v6b1q2xwb2nm2gnwx9k";
   };
 
   nativeBuildInputs = [ pkgconfig makeWrapper ];
-- 
GitLab


From b03ed95050707139711a38b4930b0bb689187e7b Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 18 Jul 2018 16:17:38 -0500
Subject: [PATCH 129/297] diffoscope: 98 -> 99

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

diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix
index f84b37d48cc..0095874ce80 100644
--- a/pkgs/tools/misc/diffoscope/default.nix
+++ b/pkgs/tools/misc/diffoscope/default.nix
@@ -8,12 +8,12 @@
 
 python3Packages.buildPythonApplication rec {
   name = "diffoscope-${version}";
-  version = "98";
+  version = "99";
 
   src = fetchgit {
     url    = "https://anonscm.debian.org/git/reproducible/diffoscope.git";
     rev    = "refs/tags/${version}";
-    sha256 = "1xvalxz11jlyk9aczq5g367ldx0wfib4kpxs8f1rg7kh97r8z1rh";
+    sha256 = "04a2sqv43g002b7s0crk9gnpdvf90j8j8p01b6shinxh6an8prs2";
   };
 
   patches = [
-- 
GitLab


From dc29207e93f5128f373112cf59052d47d881515a Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 18 Jul 2018 16:23:25 -0500
Subject: [PATCH 130/297] diffoscope: add lz4 tool

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

diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix
index 0095874ce80..7c17c0e7481 100644
--- a/pkgs/tools/misc/diffoscope/default.nix
+++ b/pkgs/tools/misc/diffoscope/default.nix
@@ -1,7 +1,7 @@
 { lib, stdenv, fetchgit, python3Packages, docutils, help2man
 , acl, apktool, binutils-unwrapped, bzip2, cbfstool, cdrkit, colord, colordiff, coreutils, cpio, db, diffutils, dtc
 , e2fsprogs, file, findutils, fontforge-fonttools, fpc, gettext, ghc, ghostscriptX, giflib, gnupg1, gnutar
-, gzip, imagemagick, jdk, libarchive, libcaca, llvm, mono, openssh, pdftk, pgpdump, poppler_utils, sng, sqlite
+, gzip, imagemagick, jdk, libarchive, libcaca, llvm, lz4, mono, openssh, pdftk, pgpdump, poppler_utils, sng, sqlite
 , squashfsTools, tcpdump, unoconv, unzip, xxd, xz
 , enableBloat ? false
 }:
@@ -32,7 +32,7 @@ python3Packages.buildPythonApplication rec {
   pythonPath = with python3Packages; [ debian libarchive-c python_magic tlsh rpm ] ++ [
       acl binutils-unwrapped bzip2 cdrkit colordiff coreutils cpio db diffutils
       dtc e2fsprogs file findutils fontforge-fonttools gettext gnutar gzip
-      libarchive libcaca pgpdump progressbar33 sng sqlite squashfsTools unzip xxd xz
+      libarchive libcaca lz4 pgpdump progressbar33 sng sqlite squashfsTools unzip xxd xz
     ] ++ lib.optionals enableBloat [
       apktool cbfstool colord fpc ghc ghostscriptX giflib gnupg1 imagemagick
       llvm jdk mono openssh pdftk poppler_utils tcpdump unoconv
-- 
GitLab


From 0a46f8c19897846db3d9fd2aa858b212a0f2a59d Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 18 Jul 2018 16:36:15 -0500
Subject: [PATCH 131/297] diffoscope: fix manpage generation

Was already broken, not sure for how long.

Without this the tool fails to run,
so help2man ends up producing an empty file.
---
 pkgs/tools/misc/diffoscope/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix
index 7c17c0e7481..73b7f2272cd 100644
--- a/pkgs/tools/misc/diffoscope/default.nix
+++ b/pkgs/tools/misc/diffoscope/default.nix
@@ -23,6 +23,9 @@ python3Packages.buildPythonApplication rec {
   postPatch = ''
     # Upstream doesn't provide a PKG-INFO file
     sed -i setup.py -e "/'rpm-python',/d"
+
+    # When generating manpage, use the installed version
+    substituteInPlace doc/Makefile --replace "../bin" "$out/bin"
   '';
 
   nativeBuildInputs = [ docutils help2man ];
-- 
GitLab


From 1e454c5045b325948a215cae6d8c25eb853c5ed5 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Tue, 17 Jul 2018 23:05:55 +0200
Subject: [PATCH 132/297] pythonPackages.graphite_api: move expression

According to the current convention python packages should live in
`pkgs/development/python-modules`. As I altered the `graphite_api`
expression previously in d3d1b888737 I decided to move it as well.

Additionally I applied some minor refactorings:

* use `fetchFromGitHub` instead of `fetchgit`.

* use `checkInputs` for test dependencies

* got rid of fixed points

* applied patch which supports flask-caching to 1.3.1 using `git apply
  -3`
---
 .../python-modules/graphite-api/default.nix   |  45 ++++++
 .../graphite-api/flask-caching-rebased.patch  | 132 ++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  39 +-----
 3 files changed, 178 insertions(+), 38 deletions(-)
 create mode 100644 pkgs/development/python-modules/graphite-api/default.nix
 create mode 100644 pkgs/development/python-modules/graphite-api/flask-caching-rebased.patch

diff --git a/pkgs/development/python-modules/graphite-api/default.nix b/pkgs/development/python-modules/graphite-api/default.nix
new file mode 100644
index 00000000000..7f1726a2c4b
--- /dev/null
+++ b/pkgs/development/python-modules/graphite-api/default.nix
@@ -0,0 +1,45 @@
+{ buildPythonPackage, fetchFromGitHub, lib, flask, flask-caching, cairocffi, pyparsing, pytz, pyyaml
+, raven, six, structlog, tzlocal, nose, mock, cairo, isPyPy
+}:
+
+buildPythonPackage rec {
+  pname = "graphite-api";
+  version = "1.1.3";
+
+  disabled = isPyPy;
+
+  src = fetchFromGitHub {
+    owner = "brutasse";
+    repo = "graphite-api";
+    rev = version;
+    sha256 = "0sz3kav2024ms2z4q03pigcf080gsr5v774z9bp3zw29k2p47ass";
+  };
+
+  # https://github.com/brutasse/graphite-api/pull/239 rebased onto 1.1.3
+  patches = [ ./flask-caching-rebased.patch ];
+
+  checkPhase = "nosetests";
+
+  propagatedBuildInputs = [
+    flask
+    flask-caching
+    cairocffi
+    pyparsing
+    pytz
+    pyyaml
+    raven
+    six
+    structlog
+    tzlocal
+  ];
+
+  checkInputs = [ nose mock ];
+
+  LD_LIBRARY_PATH = "${cairo.out}/lib";
+
+  meta = with lib; {
+    description = "Graphite-web, without the interface. Just the rendering HTTP API";
+    homepage = https://github.com/brutasse/graphite-api;
+    license = licenses.asl20;
+  };
+}
diff --git a/pkgs/development/python-modules/graphite-api/flask-caching-rebased.patch b/pkgs/development/python-modules/graphite-api/flask-caching-rebased.patch
new file mode 100644
index 00000000000..2d4a2f29bc4
--- /dev/null
+++ b/pkgs/development/python-modules/graphite-api/flask-caching-rebased.patch
@@ -0,0 +1,132 @@
+diff --git a/graphite_api/config.py b/graphite_api/config.py
+index 5e1e382..dc033a8 100644
+--- a/graphite_api/config.py
++++ b/graphite_api/config.py
+@@ -112,11 +112,11 @@ def configure(app):
+     app.cache = None
+     if 'cache' in config:
+         try:
+-            from flask.ext.cache import Cache
++            from flask_caching import Cache
+         except ImportError:
+             warnings.warn("'cache' is provided in the configuration but "
+-                          "Flask-Cache is not installed. Please `pip install "
+-                          "Flask-Cache`.")
++                          "flask-caching is not installed. Please `pip "
++                          "install flask-caching`.")
+         else:
+             cache_conf = {'CACHE_DEFAULT_TIMEOUT': 60,
+                           'CACHE_KEY_PREFIX': 'graphite-api:'}
+diff --git a/requirements.txt b/requirements.txt
+index c68b446..7826b0c 100644
+--- a/requirements.txt
++++ b/requirements.txt
+@@ -1,5 +1,5 @@
+ Flask
+-Flask-Cache
++Flask-Caching
+ cairocffi
+ pyparsing>=1.5.7
+ pytz
+diff --git a/setup.py b/setup.py
+index 0337cbe..df07989 100644
+--- a/setup.py
++++ b/setup.py
+@@ -38,7 +38,7 @@ setup(
+     extras_require={
+         'sentry': ['raven[flask]'],
+         'cyanite': ['cyanite'],
+-        'cache': ['Flask-Cache'],
++        'cache': ['Flask-Caching'],
+         'statsd': ['statsd'],
+     },
+     zip_safe=False,
+diff --git a/tests/test_render.py b/tests/test_render.py
+index be5609d..a0e7190 100644
+--- a/tests/test_render.py
++++ b/tests/test_render.py
+@@ -8,7 +8,7 @@ from graphite_api._vendor import whisper
+ from . import TestCase, WHISPER_DIR
+ 
+ try:
+-    from flask.ext.cache import Cache
++    from flask_caching import Cache
+ except ImportError:
+     Cache = None
+ 
+diff --git a/tox.ini b/tox.ini
+index 85a0abb..c820393 100644
+--- a/tox.ini
++++ b/tox.ini
+@@ -47,7 +47,7 @@ basepython = python2.7
+ deps =
+ 	{[testenv]deps}
+ 	Flask
+-	Flask-Cache
++	Flask-Caching
+ 	pyparsing
+ 	mock
+ 
+@@ -56,7 +56,7 @@ basepython = python3.3
+ deps =
+ 	{[testenv]deps}
+ 	Flask
+-	Flask-Cache
++	Flask-Caching
+ 	pyparsing
+ 
+ [testenv:py34]
+@@ -66,7 +66,7 @@ commands =
+ deps =
+ 	{[testenv]deps}
+ 	Flask
+-	Flask-Cache
++	Flask-Caching
+ 	pyparsing
+ 
+ [testenv:py35]
+@@ -76,7 +76,7 @@ commands =
+ deps =
+ 	{[testenv]deps}
+ 	Flask
+-	Flask-Cache
++	Flask-Caching
+ 	pyparsing
+ 
+ [testenv:pyparsing1]
+@@ -84,7 +84,7 @@ basepython = python2.7
+ deps =
+ 	{[testenv]deps}
+ 	Flask
+-	Flask-Cache
++	Flask-Caching
+ 	pyparsing==1.5.7
+ 	mock
+ 
+@@ -93,7 +93,7 @@ basepython = pypy
+ deps =
+ 	{[testenv]deps}
+ 	Flask
+-	Flask-Cache
++	Flask-Caching
+ 	pyparsing
+ 	mock
+ 
+@@ -102,7 +102,7 @@ basepython = python2.7
+ deps =
+ 	{[testenv]deps}
+ 	Flask<0.9
+-	Flask-Cache
++	Flask-Caching
+ 	pyparsing
+ 	mock
+ 
+@@ -111,7 +111,7 @@ basepython = python2.7
+ deps =
+ 	{[testenv]deps}
+ 	Flask<0.10
+-	Flask-Cache
++	Flask-Caching
+ 	pyparsing
+ 	mock
+ 
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 3ea8348314b..07cf9e5623a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -15821,44 +15821,7 @@ EOF
     };
   };
 
-  graphite_api = buildPythonPackage rec {
-    name = "graphite-api-1.0.1";
-    disabled = isPyPy;
-
-    src = pkgs.fetchgit {
-      url = "https://github.com/brutasse/graphite-api.git";
-      rev = "b6f75e8a08fae695c094fece6de611b893fc65fb";
-      sha256 = "1n8h5krhv7hzmn336y9vjrmv6b6009lz5hj0d9wz7v1k2500ws5k";
-    };
-
-    checkPhase = "nosetests";
-
-    propagatedBuildInputs = with self; [
-      flask
-      flask-caching
-      cairocffi
-      pyparsing
-      pytz
-      pyyaml
-      raven
-      six
-      structlog
-      tzlocal
-    ];
-
-    buildInputs = with self; [
-      nose
-      mock
-    ];
-
-    LD_LIBRARY_PATH = "${pkgs.cairo.out}/lib";
-
-    meta = {
-      description = "Graphite-web, without the interface. Just the rendering HTTP API";
-      homepage = https://github.com/brutasse/graphite-api;
-      license = licenses.asl20;
-    };
-  };
+  graphite_api = callPackage ../development/python-modules/graphite-api { };
 
   graphite_beacon = buildPythonPackage rec {
     name = "graphite_beacon-0.27.0";
-- 
GitLab


From a595896c5686881a73c6819fbc9b0d1967cfea60 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Thu, 19 Jul 2018 02:31:23 +0300
Subject: [PATCH 133/297] diffoscope: Document the script to locate missing
 optional dependencies

And give it it a bit more descriptive name of list-missing-tools.sh.
---
 pkgs/tools/misc/diffoscope/default.nix                        | 4 ++++
 .../misc/diffoscope/{list-tools.sh => list-missing-tools.sh}  | 3 +++
 2 files changed, 7 insertions(+)
 rename pkgs/tools/misc/diffoscope/{list-tools.sh => list-missing-tools.sh} (76%)

diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix
index 73b7f2272cd..e55d5c89b5b 100644
--- a/pkgs/tools/misc/diffoscope/default.nix
+++ b/pkgs/tools/misc/diffoscope/default.nix
@@ -6,6 +6,7 @@
 , enableBloat ? false
 }:
 
+# Note: when upgrading this package, please run the list-missing-tools.sh script as described below!
 python3Packages.buildPythonApplication rec {
   name = "diffoscope-${version}";
   version = "99";
@@ -30,6 +31,9 @@ python3Packages.buildPythonApplication rec {
 
   nativeBuildInputs = [ docutils help2man ];
 
+  # Most of the non-Python dependencies here are optional command-line tools for various file-format parsers.
+  # To help figuring out what's missing from the list, run: ./pkgs/tools/misc/diffoscope/list-missing-tools.sh
+  #
   # Still missing these tools: abootimg docx2txt dumpxsb enjarify js-beautify lipo oggDump otool procyon-decompiler Rscript
   # Also these libraries: python3-guestfs
   pythonPath = with python3Packages; [ debian libarchive-c python_magic tlsh rpm ] ++ [
diff --git a/pkgs/tools/misc/diffoscope/list-tools.sh b/pkgs/tools/misc/diffoscope/list-missing-tools.sh
similarity index 76%
rename from pkgs/tools/misc/diffoscope/list-tools.sh
rename to pkgs/tools/misc/diffoscope/list-missing-tools.sh
index 9af7f0e3889..5f4d118cfed 100755
--- a/pkgs/tools/misc/diffoscope/list-tools.sh
+++ b/pkgs/tools/misc/diffoscope/list-missing-tools.sh
@@ -1,5 +1,8 @@
 #!/usr/bin/env bash
 
+# This script lists all the optional command-line tools that diffoscope can use
+# (i.e. `diffoscope --list-tools`) but are missing from the Nix expression.
+
 diffoscope=$(nix-build --no-out-link -E 'with import ./. {}; diffoscope.override { enableBloat = true; }')/bin/diffoscope
 
 required=$($diffoscope --list-tools | \
-- 
GitLab


From 20847b251e38dc9552ddbba97c74c0a3e6299fd0 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Thu, 19 Jul 2018 02:33:45 +0300
Subject: [PATCH 134/297] diffoscope: Add gnumeric dependency

For the `ssconvert` tool.
---
 pkgs/tools/misc/diffoscope/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix
index e55d5c89b5b..80e0cde7e54 100644
--- a/pkgs/tools/misc/diffoscope/default.nix
+++ b/pkgs/tools/misc/diffoscope/default.nix
@@ -1,6 +1,6 @@
 { lib, stdenv, fetchgit, python3Packages, docutils, help2man
 , acl, apktool, binutils-unwrapped, bzip2, cbfstool, cdrkit, colord, colordiff, coreutils, cpio, db, diffutils, dtc
-, e2fsprogs, file, findutils, fontforge-fonttools, fpc, gettext, ghc, ghostscriptX, giflib, gnupg1, gnutar
+, e2fsprogs, file, findutils, fontforge-fonttools, fpc, gettext, ghc, ghostscriptX, giflib, gnumeric, gnupg1, gnutar
 , gzip, imagemagick, jdk, libarchive, libcaca, llvm, lz4, mono, openssh, pdftk, pgpdump, poppler_utils, sng, sqlite
 , squashfsTools, tcpdump, unoconv, unzip, xxd, xz
 , enableBloat ? false
@@ -41,7 +41,7 @@ python3Packages.buildPythonApplication rec {
       dtc e2fsprogs file findutils fontforge-fonttools gettext gnutar gzip
       libarchive libcaca lz4 pgpdump progressbar33 sng sqlite squashfsTools unzip xxd xz
     ] ++ lib.optionals enableBloat [
-      apktool cbfstool colord fpc ghc ghostscriptX giflib gnupg1 imagemagick
+      apktool cbfstool colord fpc ghc ghostscriptX giflib gnupg1 gnumeric imagemagick
       llvm jdk mono openssh pdftk poppler_utils tcpdump unoconv
     ];
 
-- 
GitLab


From 8139663f66b0c4529c0da433b103ad4ccb70aa11 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Wed, 18 Jul 2018 16:36:09 -0700
Subject: [PATCH 135/297] commandergenius: 2.2.0 -> 2.2.2

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/commandergenius/versions.
---
 pkgs/games/commandergenius/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/commandergenius/default.nix b/pkgs/games/commandergenius/default.nix
index 70413f0f941..35579059fcf 100644
--- a/pkgs/games/commandergenius/default.nix
+++ b/pkgs/games/commandergenius/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   name = "commandergenius-${version}";
-  version = "2.2.0";
+  version = "2.2.2";
 
   src = fetchFromGitHub {
     owner = "gerstrong";
     repo = "Commander-Genius";
     rev = "v${version}";
-    sha256 = "1hjx4j325vj1ayxi3j2dpplpd3x0iqx98gyb093ld7dfnsyilbph";
+    sha256 = "1mfw25pgr492ayqw3b85mwp20wh6anrr90gdy605nv1yjma62pmj";
   };
 
   buildInputs = [ SDL2 SDL2_image SDL2_mixer libGL boost libvorbis zlib curl python3 ];
-- 
GitLab


From d398020512f454f241fa77b8b74a6958209c1291 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Wed, 18 Jul 2018 16:41:39 -0700
Subject: [PATCH 136/297] commonsCompress: 1.16.1 -> 1.17

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/commons-compress/versions.
---
 pkgs/development/libraries/java/commons/compress/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/java/commons/compress/default.nix b/pkgs/development/libraries/java/commons/compress/default.nix
index eff57d6f2fd..cf9c554d57f 100644
--- a/pkgs/development/libraries/java/commons/compress/default.nix
+++ b/pkgs/development/libraries/java/commons/compress/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  version = "1.16.1";
+  version = "1.17";
   name    = "commons-compress-${version}";
 
   src = fetchurl {
     url    = "mirror://apache/commons/compress/binaries/${name}-bin.tar.gz";
-    sha256 = "0yz2m3qac1idg9346i64mjfrkq4kniajzx2manyybhj43v9dpx37";
+    sha256 = "1ydm6mhy0kja47mns674iyrhz5mqlhhnh2l8rglzxnq5iawpi2m0";
   };
 
   installPhase = ''
-- 
GitLab


From 6690ec57f85e9e4ee4a840f06c0e63b6ecc9e201 Mon Sep 17 00:00:00 2001
From: Anthony Cowley <acowley@gmail.com>
Date: Wed, 18 Jul 2018 20:05:15 -0400
Subject: [PATCH 137/297] paraview: 5.4.1 -> 5.5.2

This update should also fix the build the hydra: one part of the
change is to build paraview with Qt-5.9, as this is the configuration
that paraview upstream supports.
---
 pkgs/applications/graphics/paraview/default.nix | 7 ++++---
 pkgs/top-level/all-packages.nix                 | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/graphics/paraview/default.nix b/pkgs/applications/graphics/paraview/default.nix
index e5385c75280..1d9956245a6 100644
--- a/pkgs/applications/graphics/paraview/default.nix
+++ b/pkgs/applications/graphics/paraview/default.nix
@@ -6,7 +6,7 @@ stdenv, fetchFromGitHub, cmake, makeWrapper
 
 stdenv.mkDerivation rec {
   name = "paraview-${version}";
-  version = "5.4.1";
+  version = "5.5.2";
 
   # fetching from GitHub instead of taking an "official" source
   # tarball because of missing submodules there
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
     owner = "Kitware";
     repo = "ParaView";
     rev = "v${version}";
-    sha256 = "1ma02sdkz2apxnwcsyvxb26ibwnjh60p71gicw6nlp042acs6v74";
+    sha256 = "1jivph7lppnflmjsiirhgv0mnh8mxx41i1vzkk78ynn00rzacx3j";
     fetchSubmodules = true;
   };
 
@@ -22,13 +22,14 @@ stdenv.mkDerivation rec {
     "-DPARAVIEW_ENABLE_PYTHON=ON"
     "-DPARAVIEW_INSTALL_DEVELOPMENT_FILES=ON"
     "-DPARAVIEW_ENABLE_EMBEDDED_DOCUMENTATION=OFF"
+    "-DOpenGL_GL_PREFERENCE=GLVND"
   ];
 
   # During build, binaries are called that rely on freshly built
   # libraries.  These reside in build/lib, and are not found by
   # default.
   preBuild = ''
-    export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/lib
+    export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/lib:$PWD/VTK/ThirdParty/vtkm/vtk-m/lib
   '';
 
   enableParallelBuilding = true;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 644f5d821e6..60b36ab0500 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17646,7 +17646,7 @@ with pkgs;
 
   pavucontrol = callPackage ../applications/audio/pavucontrol { };
 
-  paraview = libsForQt5.callPackage ../applications/graphics/paraview { };
+  paraview = libsForQt59.callPackage ../applications/graphics/paraview { };
 
   packet = callPackage ../development/tools/packet { };
 
-- 
GitLab


From d7d31fea7e7eef8ff4495e75be5dcbb37fb215d0 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Thu, 19 Jul 2018 02:08:04 +0200
Subject: [PATCH 138/297] lf: 6 -> 7

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

diff --git a/pkgs/tools/misc/lf/default.nix b/pkgs/tools/misc/lf/default.nix
index 033e93609ab..7f44dab71f4 100644
--- a/pkgs/tools/misc/lf/default.nix
+++ b/pkgs/tools/misc/lf/default.nix
@@ -2,13 +2,13 @@
 
 buildGoPackage rec {
   name = "lf-${version}";
-  version = "6";
+  version = "7";
 
   src = fetchFromGitHub {
     owner = "gokcehan";
     repo = "lf";
     rev = "r${version}";
-    sha256 = "1wgmmz1gvphkz0rnjyvgn3860yzvxwackb1dwqbgjrqsqy8ba01z";
+    sha256 = "11n5svxhc2781ss7v15w40ac81mchhcvkszhb2r70zry7sa15li1";
   };
 
   goPackagePath = "github.com/gokcehan/lf";
-- 
GitLab


From 2c2f107a962c4addbbba52c527c71c4742330511 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Wed, 18 Jul 2018 17:24:59 -0700
Subject: [PATCH 139/297] apacheHttpd: 2.4.33 -> 2.4.34

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/apache-httpd/versions.
---
 pkgs/servers/http/apache-httpd/2.4.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/http/apache-httpd/2.4.nix b/pkgs/servers/http/apache-httpd/2.4.nix
index dd076606da5..4822b5109e8 100644
--- a/pkgs/servers/http/apache-httpd/2.4.nix
+++ b/pkgs/servers/http/apache-httpd/2.4.nix
@@ -16,12 +16,12 @@ assert ldapSupport -> aprutil.ldapSupport && openldap != null;
 assert http2Support -> nghttp2 != null;
 
 stdenv.mkDerivation rec {
-  version = "2.4.33";
+  version = "2.4.34";
   name = "apache-httpd-${version}";
 
   src = fetchurl {
     url = "mirror://apache/httpd/httpd-${version}.tar.bz2";
-    sha256 = "de02511859b00d17845b9abdd1f975d5ccb5d0b280c567da5bf2ad4b70846f05";
+    sha256 = "1w1q2smdgf6ln0x741lk5pv5r0gzrxj2iza1vslhifzy65bcjlzs";
   };
 
   # FIXME: -dev depends on -doc
-- 
GitLab


From e48a1292a719bda03e1e29f73879bc274c9d8c8a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Wed, 18 Jul 2018 17:44:52 -0700
Subject: [PATCH 140/297] bfs: 1.2.2 -> 1.2.3

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/bfs/versions.
---
 pkgs/tools/system/bfs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/system/bfs/default.nix b/pkgs/tools/system/bfs/default.nix
index 3f618301a86..fd7f93d1546 100644
--- a/pkgs/tools/system/bfs/default.nix
+++ b/pkgs/tools/system/bfs/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "bfs-${version}";
-  version = "1.2.2";
+  version = "1.2.3";
 
   src = fetchFromGitHub {
     repo = "bfs";
     owner = "tavianator";
     rev = version;
-    sha256 = "0a7zsipvndvg1kp2i35jrg9y9kncj7i6mp36dhpj8zjmkm5d5b8g";
+    sha256 = "01vcqanj2sifa5i51wvrkxh55d6hrq6iq7zmnhv4ls221dqmbyyn";
   };
 
   # Disable fstype test, tries to read /etc/mtab
-- 
GitLab


From c74045c47a51e4edfd143bda8f070694fddcc22d Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 18 Jul 2018 11:40:18 -0500
Subject: [PATCH 141/297] gpm: patch to fix w/musl, good for general use

---
 pkgs/servers/gpm/default.nix | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/gpm/default.nix b/pkgs/servers/gpm/default.nix
index 3cb0d3931db..7636dca15d8 100644
--- a/pkgs/servers/gpm/default.nix
+++ b/pkgs/servers/gpm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, automake, autoconf, libtool, flex, bison, texinfo
+{ stdenv, fetchurl, automake, autoconf, libtool, flex, bison, texinfo, fetchpatch
 
 # Optional Dependencies
 , ncurses ? null
@@ -13,7 +13,6 @@ stdenv.mkDerivation rec {
   };
 
   postPatch = ''
-    sed '1i#include <sys/types.h>' -i src/daemon/open_console.c
     substituteInPlace src/prog/gpm-root.y --replace __sigemptyset sigemptyset
   '';
 
@@ -22,6 +21,22 @@ stdenv.mkDerivation rec {
 
   hardeningDisable = [ "format" ];
 
+  patches = [
+    # musl compat patches, safe everywhere
+    (fetchpatch {
+      url = "https://raw.githubusercontent.com/gentoo/musl/5aed405d87dfa92a5cab1596f898e9dea07169b8/sys-libs/gpm/files/gpm-1.20.7-musl-missing-headers.patch";
+      sha256 = "1g338m6j1sba84wlqp1r6rpabj5nm6ki577hjalg46czg0lfp20h";
+    })
+    # Touches same code as glibc fix in postPatch above, but on the non-glibc route
+    (fetchpatch {
+      url = "https://raw.githubusercontent.com/gentoo/musl/5aed405d87dfa92a5cab1596f898e9dea07169b8/sys-libs/gpm/files/gpm-1.20.7-musl-portable-sigaction.patch";
+      sha256 = "0hfdqm9977hd5dpzn05y0a6jbj55w1kp4hd9gyzmg9wslmxni4rg";
+    })
+    (fetchpatch {
+      url = "https://raw.githubusercontent.com/gentoo/musl/5aed405d87dfa92a5cab1596f898e9dea07169b8/sys-libs/gpm/files/gpm-1.20.7-sysmacros.patch";
+      sha256 = "0lg4l9phvy2n8gy17qsn6zn0qq52vm8g01pgq5kqpr8sd3fb21c2";
+    })
+  ];
   preConfigure = ''
     ./autogen.sh
   '';
-- 
GitLab


From 76999cc40e6c4cbfe817b3b6f125ece999ae9b73 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <matthew.bauer@obsidian.systems>
Date: Tue, 17 Jul 2018 16:11:16 -0400
Subject: [PATCH 142/297] treewide: remove aliases in nixpkgs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This makes the command ‘nix-env -qa -f. --arg config '{skipAliases =
true;}'’ work in Nixpkgs.

Misc...

- qtikz: use libsForQt5.callPackage

  This ensures we get the right poppler.

- rewrites:

  docbook5_xsl -> docbook_xsl_ns
  docbook_xml_xslt -> docbook_xsl

diffpdf: fixup
---
 doc/default.nix                               |  2 +-
 nixos/doc/manual/default.nix                  | 14 ++--
 nixos/modules/services/hardware/usbmuxd.nix   |  2 +-
 nixos/tests/installer.nix                     |  2 +-
 pkgs/applications/audio/flacon/default.nix    |  4 +-
 .../audio/pulseaudio-ctl/default.nix          |  4 +-
 .../crashplan/crashplan-small-business.nix    | 20 +++---
 .../display-managers/lightdm/default.nix      |  4 +-
 .../display-managers/slim/default.nix         |  4 +-
 pkgs/applications/editors/jucipp/default.nix  |  4 +-
 .../editors/texstudio/default.nix             |  4 +-
 .../graphics/draftsight/default.nix           |  4 +-
 .../graphics/exrdisplay/default.nix           |  4 +-
 pkgs/applications/graphics/ktikz/default.nix  |  5 +-
 .../kde/grantleetheme/default.nix             |  6 +-
 pkgs/applications/kde/kcalutils.nix           |  4 +-
 pkgs/applications/kde/kdepim-addons.nix       |  4 +-
 pkgs/applications/kde/kpimtextedit.nix        |  4 +-
 pkgs/applications/kde/messagelib.nix          |  4 +-
 .../misc/cpp-ethereum/default.nix             |  4 +-
 pkgs/applications/misc/diffpdf/default.nix    |  6 +-
 .../misc/digitalbitbox/default.nix            |  6 +-
 pkgs/applications/misc/hyper/default.nix      |  4 +-
 pkgs/applications/misc/lxterminal/default.nix |  4 +-
 pkgs/applications/misc/memo/default.nix       |  4 +-
 .../misc/moonlight-embedded/default.nix       |  4 +-
 pkgs/applications/misc/nixnote2/default.nix   |  7 +-
 pkgs/applications/misc/onboard/default.nix    |  4 +-
 pkgs/applications/misc/oneko/default.nix      |  7 +-
 pkgs/applications/misc/qpdfview/default.nix   |  4 +-
 pkgs/applications/misc/roxterm/default.nix    |  8 +--
 pkgs/applications/misc/terminus/default.nix   |  4 +-
 pkgs/applications/misc/truecrypt/default.nix  |  4 +-
 pkgs/applications/misc/veracrypt/default.nix  |  4 +-
 .../browsers/firefox-bin/default.nix          |  4 +-
 .../networking/browsers/firefox/wrapper.nix   |  4 +-
 .../browsers/google-chrome/default.nix        |  4 +-
 .../networking/browsers/vivaldi/default.nix   |  4 +-
 .../feedreaders/newsboat/default.nix          |  4 +-
 .../instant-messengers/jitsi/default.nix      |  6 +-
 .../pidgin-plugins/purple-discord/default.nix |  4 +-
 .../telepathy/gabble/default.nix              |  7 +-
 .../telepathy/logger/default.nix              |  4 +-
 .../networking/linssid/default.nix            |  4 +-
 .../mailreaders/inboxer/default.nix           | 10 +--
 .../mailreaders/thunderbird-bin/default.nix   |  4 +-
 .../networking/sync/lsyncd/default.nix        |  4 +-
 .../science/electronics/kicad/unstable.nix    |  6 +-
 .../science/robotics/gazebo/default.nix       |  5 +-
 .../cvs-fast-export/default.nix               |  6 +-
 .../git-and-tools/cgit/default.nix            |  4 +-
 .../reposurgeon/default.nix                   | 10 +--
 pkgs/applications/video/dvdstyler/default.nix |  6 +-
 pkgs/applications/video/kodi/default.nix      |  6 +-
 pkgs/applications/video/screenkey/default.nix |  4 +-
 pkgs/applications/video/vlc/default.nix       |  4 +-
 .../virtualization/docker/default.nix         |  6 +-
 pkgs/applications/virtualization/xen/4.5.nix  |  4 +-
 .../window-managers/afterstep/default.nix     |  4 +-
 .../window-managers/compton/git.nix           |  4 +-
 .../window-managers/i3/easyfocus.nix          |  4 +-
 .../window-managers/orbment/default.nix       |  4 +-
 .../window-managers/sway/default.nix          |  4 +-
 .../rust/default-crate-overrides.nix          |  6 +-
 pkgs/desktops/enlightenment/efl.nix           |  6 +-
 .../gnome-2/platform/GConf/default.nix        |  4 +-
 .../gnome-2/platform/gnome-vfs/default.nix    |  4 +-
 .../desktops/gnome-3/core/empathy/default.nix |  2 +-
 pkgs/desktops/gnome-3/core/folks/default.nix  |  6 +-
 .../core/gnome-online-accounts/default.nix    |  2 +-
 .../gnome-3/core/libgnome-keyring/default.nix |  4 +-
 .../extensions/system-monitor/default.nix     |  6 +-
 .../gnome-3/misc/gnome-packagekit/default.nix |  6 +-
 pkgs/desktops/gnustep/back/default.nix        |  4 +-
 pkgs/desktops/lumina/default.nix              |  4 +-
 .../default.nix                               |  4 +-
 pkgs/desktops/xfce4-13/exo/default.nix        |  4 +-
 pkgs/desktops/xfce4-13/thunar/default.nix     |  4 +-
 pkgs/desktops/xfce4-13/xfburn/default.nix     |  4 +-
 .../xfce4-13/xfce4-dev-tools/default.nix      |  5 +-
 .../desktops/xfce4-13/xfce4-mixer/default.nix |  4 +-
 .../haskell-modules/configuration-nix.nix     |  2 +-
 .../interpreters/racket/default.nix           |  6 +-
 .../development/libraries/flatpak/default.nix | 14 ++--
 pkgs/development/libraries/geis/default.nix   |  4 +-
 pkgs/development/libraries/glew/1.10.nix      |  5 +-
 pkgs/development/libraries/glib/default.nix   |  5 +-
 pkgs/development/libraries/gtkd/default.nix   |  2 +-
 .../libraries/gupnp-dlna/default.nix          |  4 +-
 .../kde-frameworks/kdoctools/default.nix      |  4 +-
 .../libraries/libblockdev/default.nix         |  6 +-
 .../libraries/libgnome-keyring/default.nix    |  4 +-
 .../libraries/libindicate/default.nix         |  4 +-
 .../libraries/libstroke/default.nix           |  4 +-
 .../development/libraries/libvirt/default.nix |  4 +-
 .../libraries/mailcore2/default.nix           |  6 +-
 .../libraries/pipewire/default.nix            |  4 +-
 pkgs/development/libraries/strigi/default.nix |  4 +-
 .../libraries/telepathy/qt/default.nix        |  4 +-
 .../libraries/vulkan-loader/default.nix       |  4 +-
 pkgs/development/libraries/wlc/default.nix    |  4 +-
 .../libraries/zeitgeist/default.nix           |  4 +-
 .../python-modules/dbus/default.nix           |  4 +-
 .../python-modules/mysqlclient/default.nix    |  4 +-
 pkgs/development/python-modules/pyqt/4.x.nix  |  4 +-
 pkgs/development/python-modules/pyqt/5.x.nix  |  6 +-
 pkgs/development/tools/buildah/default.nix    |  4 +-
 .../tools/flatpak-builder/default.nix         |  4 +-
 .../tools/react-native-debugger/default.nix   |  4 +-
 pkgs/development/tools/skopeo/default.nix     |  8 +--
 .../vulkan-validation-layers/default.nix      |  4 +-
 pkgs/development/web/insomnia/default.nix     |  6 +-
 pkgs/games/mar1d/default.nix                  |  4 +-
 pkgs/games/openrw/default.nix                 |  4 +-
 pkgs/misc/drivers/moltengamepad/default.nix   |  4 +-
 pkgs/misc/emulators/dolphin-emu/master.nix    |  6 +-
 pkgs/misc/emulators/retroarch/cores.nix       |  4 +-
 pkgs/os-specific/linux/amdgpu-pro/default.nix |  4 +-
 pkgs/os-specific/linux/cryptsetup/default.nix |  5 +-
 pkgs/os-specific/linux/dmraid/default.nix     |  4 +-
 pkgs/os-specific/linux/iputils/default.nix    |  4 +-
 pkgs/os-specific/linux/kernel/perf.nix        |  4 +-
 .../os-specific/linux/libsemanage/default.nix |  4 +-
 pkgs/os-specific/linux/lvm2/default.nix       |  4 +-
 pkgs/os-specific/linux/pm-utils/default.nix   |  4 +-
 pkgs/os-specific/linux/rdma-core/default.nix  |  5 +-
 pkgs/os-specific/linux/sssd/default.nix       |  8 +--
 .../linux/wpa_supplicant/default.nix          |  6 +-
 pkgs/servers/openafs/1.6/module.nix           |  4 +-
 pkgs/tools/X11/xidlehook/default.nix          |  5 +-
 pkgs/tools/X11/xpra/default.nix               |  4 +-
 pkgs/tools/X11/xwinwrap/default.nix           |  4 +-
 .../bluetooth/obex-data-server/default.nix    | 10 +--
 pkgs/tools/compression/pixz/default.nix       |  6 +-
 pkgs/tools/filesystems/ceph/generic.nix       | 30 ++++----
 pkgs/tools/filesystems/convoy/default.nix     |  4 +-
 .../filesystems/nixpart/0.4/cryptsetup.nix    |  4 +-
 .../tools/filesystems/nixpart/0.4/default.nix |  9 +--
 pkgs/tools/filesystems/nixpart/0.4/dmraid.nix |  4 +-
 pkgs/tools/filesystems/nixpart/0.4/parted.nix |  6 +-
 pkgs/tools/filesystems/vmfs-tools/default.nix |  4 +-
 pkgs/tools/graphics/glmark2/default.nix       |  4 +-
 pkgs/tools/graphics/gromit-mpx/default.nix    |  4 +-
 pkgs/tools/graphics/luxcorerender/default.nix |  4 +-
 pkgs/tools/graphics/povray/default.nix        |  6 +-
 pkgs/tools/graphics/vulkan-tools/default.nix  |  4 +-
 .../interception-tools/default.nix            |  4 +-
 pkgs/tools/inputmethods/libkkc/default.nix    |  4 +-
 pkgs/tools/misc/ckb/default.nix               |  5 +-
 pkgs/tools/misc/fileschanged/default.nix      |  4 +-
 pkgs/tools/misc/grub/2.0x.nix                 |  4 +-
 pkgs/tools/misc/grub/trusted.nix              |  4 +-
 pkgs/tools/misc/os-prober/default.nix         |  4 +-
 pkgs/tools/misc/parted/default.nix            |  8 +--
 pkgs/tools/misc/snapper/default.nix           |  4 +-
 pkgs/tools/networking/dnsmasq/default.nix     |  5 +-
 pkgs/tools/networking/offlineimap/default.nix |  4 +-
 pkgs/tools/package-management/nix/default.nix |  4 +-
 .../package-management/nixops/generic.nix     |  4 +-
 pkgs/tools/security/pcsclite/default.nix      |  4 +-
 pkgs/tools/security/pcsctools/default.nix     |  4 +-
 pkgs/tools/system/thermald/default.nix        |  7 +-
 pkgs/tools/text/zimwriterfs/default.nix       |  4 +-
 pkgs/tools/typesetting/asciidoc/default.nix   |  6 +-
 pkgs/top-level/aliases.nix                    | 16 -----
 pkgs/top-level/all-packages.nix               | 72 +++++++++++++------
 pkgs/top-level/perl-packages.nix              |  2 +-
 167 files changed, 460 insertions(+), 445 deletions(-)

diff --git a/doc/default.nix b/doc/default.nix
index f99aaff5f8a..fa2e4a88738 100644
--- a/doc/default.nix
+++ b/doc/default.nix
@@ -16,7 +16,7 @@ pkgs.stdenv.mkDerivation {
   # $ nix-shell --run "make clean all"
   # otherwise they won't reapply :)
   HIGHLIGHTJS = pkgs.documentation-highlighter;
-  XSL = "${pkgs.docbook5_xsl}/xml/xsl";
+  XSL = "${pkgs.docbook_xsl_ns}/xml/xsl";
   RNG = "${pkgs.docbook5}/xml/rng/docbook/docbook.rng";
   XMLFORMAT_CONFIG = ../nixos/doc/xmlformat.conf;
   xsltFlags = lib.concatStringsSep " " [
diff --git a/nixos/doc/manual/default.nix b/nixos/doc/manual/default.nix
index fef6b2f86c8..be28c2c17af 100644
--- a/nixos/doc/manual/default.nix
+++ b/nixos/doc/manual/default.nix
@@ -209,13 +209,13 @@ let
         --stringparam collect.xref.targets only \
         --stringparam targets.filename "$out/manual.db" \
         --nonet \
-        ${docbook5_xsl}/xml/xsl/docbook/xhtml/chunktoc.xsl \
+        ${docbook_xsl_ns}/xml/xsl/docbook/xhtml/chunktoc.xsl \
         ${manual-combined}/manual-combined.xml
 
       cat > "$out/olinkdb.xml" <<EOF
       <?xml version="1.0" encoding="utf-8"?>
       <!DOCTYPE targetset SYSTEM
-        "file://${docbook5_xsl}/xml/xsl/docbook/common/targetdatabase.dtd" [
+        "file://${docbook_xsl_ns}/xml/xsl/docbook/common/targetdatabase.dtd" [
         <!ENTITY manualtargets SYSTEM "file://$out/manual.db">
       ]>
       <targetset>
@@ -264,11 +264,11 @@ in rec {
         ${manualXsltprocOptions} \
         --stringparam target.database.document "${olinkDB}/olinkdb.xml" \
         --nonet --output $dst/ \
-        ${docbook5_xsl}/xml/xsl/docbook/xhtml/chunktoc.xsl \
+        ${docbook_xsl_ns}/xml/xsl/docbook/xhtml/chunktoc.xsl \
         ${manual-combined}/manual-combined.xml
 
       mkdir -p $dst/images/callouts
-      cp ${docbook5_xsl}/xml/xsl/docbook/images/callouts/*.svg $dst/images/callouts/
+      cp ${docbook_xsl_ns}/xml/xsl/docbook/images/callouts/*.svg $dst/images/callouts/
 
       cp ${../../../doc/style.css} $dst/style.css
       cp ${../../../doc/overrides.css} $dst/overrides.css
@@ -292,11 +292,11 @@ in rec {
         ${manualXsltprocOptions} \
         --stringparam target.database.document "${olinkDB}/olinkdb.xml" \
         --nonet --xinclude --output $dst/epub/ \
-        ${docbook5_xsl}/xml/xsl/docbook/epub/docbook.xsl \
+        ${docbook_xsl_ns}/xml/xsl/docbook/epub/docbook.xsl \
         ${manual-combined}/manual-combined.xml
 
       mkdir -p $dst/epub/OEBPS/images/callouts
-      cp -r ${docbook5_xsl}/xml/xsl/docbook/images/callouts/*.svg $dst/epub/OEBPS/images/callouts # */
+      cp -r ${docbook_xsl_ns}/xml/xsl/docbook/images/callouts/*.svg $dst/epub/OEBPS/images/callouts # */
       echo "application/epub+zip" > mimetype
       manual="$dst/nixos-manual.epub"
       zip -0Xq "$manual" mimetype
@@ -324,7 +324,7 @@ in rec {
         --param man.endnotes.are.numbered 0 \
         --param man.break.after.slash 1 \
         --stringparam target.database.document "${olinkDB}/olinkdb.xml" \
-        ${docbook5_xsl}/xml/xsl/docbook/manpages/docbook.xsl \
+        ${docbook_xsl_ns}/xml/xsl/docbook/manpages/docbook.xsl \
         ${manual-combined}/man-pages-combined.xml
     '';
 
diff --git a/nixos/modules/services/hardware/usbmuxd.nix b/nixos/modules/services/hardware/usbmuxd.nix
index 6a3f7cfd210..93ced0b9f04 100644
--- a/nixos/modules/services/hardware/usbmuxd.nix
+++ b/nixos/modules/services/hardware/usbmuxd.nix
@@ -65,7 +65,7 @@ in
       serviceConfig = {
         # Trigger the udev rule manually. This doesn't require replugging the
         # device when first enabling the option to get it to work
-        ExecStartPre = "${pkgs.libudev}/bin/udevadm trigger -s usb -a idVendor=${apple}";
+        ExecStartPre = "${pkgs.udev}/bin/udevadm trigger -s usb -a idVendor=${apple}";
         ExecStart = "${pkgs.usbmuxd}/bin/usbmuxd -U ${cfg.user} -f";
       };
     };
diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix
index 8ce9bc21ff7..875b6c48658 100644
--- a/nixos/tests/installer.nix
+++ b/nixos/tests/installer.nix
@@ -237,7 +237,7 @@ let
                 libxml2.bin
                 libxslt.bin
                 docbook5
-                docbook5_xsl
+                docbook_xsl_ns
                 unionfs-fuse
                 ntp
                 nixos-artwork.wallpapers.gnome-dark
diff --git a/pkgs/applications/audio/flacon/default.nix b/pkgs/applications/audio/flacon/default.nix
index a16593d4d1b..8f3facec09b 100644
--- a/pkgs/applications/audio/flacon/default.nix
+++ b/pkgs/applications/audio/flacon/default.nix
@@ -1,5 +1,5 @@
 { stdenv, lib, fetchFromGitHub, cmake, qt5, libuchardet, pkgconfig, makeWrapper
-, shntool, flac, opusTools, vorbisTools, mp3gain, lame, wavpack, vorbisgain
+, shntool, flac, opusTools, vorbis-tools, mp3gain, lame, wavpack, vorbisgain
 , gtk3
 }:
 
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   postInstall = ''
     wrapProgram $out/bin/flacon \
       --suffix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}" \
-      --prefix PATH : "${lib.makeBinPath [ shntool flac opusTools vorbisTools
+      --prefix PATH : "${lib.makeBinPath [ shntool flac opusTools vorbis-tools
      mp3gain lame wavpack vorbisgain ]}"
   '';
 
diff --git a/pkgs/applications/audio/pulseaudio-ctl/default.nix b/pkgs/applications/audio/pulseaudio-ctl/default.nix
index 6e1e576043d..1ad57efda7a 100644
--- a/pkgs/applications/audio/pulseaudio-ctl/default.nix
+++ b/pkgs/applications/audio/pulseaudio-ctl/default.nix
@@ -1,8 +1,8 @@
 { stdenv, fetchFromGitHub, makeWrapper
-, bc, dbus, gawk, gnused, libnotify, pulseaudioLight }:
+, bc, dbus, gawk, gnused, libnotify, pulseaudio }:
 
 let
-  path = stdenv.lib.makeBinPath [ bc dbus gawk gnused libnotify pulseaudioLight ];
+  path = stdenv.lib.makeBinPath [ bc dbus gawk gnused libnotify pulseaudio ];
   pname = "pulseaudio-ctl";
 
 in stdenv.mkDerivation rec {
diff --git a/pkgs/applications/backup/crashplan/crashplan-small-business.nix b/pkgs/applications/backup/crashplan/crashplan-small-business.nix
index 9bed504103a..529b0dbd42b 100644
--- a/pkgs/applications/backup/crashplan/crashplan-small-business.nix
+++ b/pkgs/applications/backup/crashplan/crashplan-small-business.nix
@@ -1,7 +1,7 @@
-{ stdenv, fetchurl, makeWrapper, getopt, jre, cpio, gawk, gnugrep, gnused, 
-  procps, which, gtk2, atk, glib, pango, gdk_pixbuf, cairo, freetype, 
-  fontconfig, dbus, gconf, nss, nspr, alsaLib, cups, expat, libudev, 
-  libX11, libxcb, libXi, libXcursor, libXdamage, libXrandr, libXcomposite, 
+{ stdenv, fetchurl, makeWrapper, getopt, jre, cpio, gawk, gnugrep, gnused,
+  procps, which, gtk2, atk, glib, pango, gdk_pixbuf, cairo, freetype,
+  fontconfig, dbus, gconf, nss, nspr, alsaLib, cups, expat, udev,
+  libX11, libxcb, libXi, libXcursor, libXdamage, libXrandr, libXcomposite,
   libXext, libXfixes, libXrender, libXtst, libXScrnSaver, nodePackages,
   maxRam ? "1024m" }:
 
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   rev = "1512021600670_4503";
   pname = "CrashPlanSmb";
   name = "${pname}_${version}_${rev}";
-  
+
   src = fetchurl {
     url = "https://web-eam-msp.crashplanpro.com/client/installers/${name}_Linux.tgz";
     sha256 = "0f7ykfxaqjlvv4hv12yc5z8y1vjsysdblv53byml7i1fy1r0q26q";
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   vardir = "/var/lib/crashplan";
   manifestdir = "${vardir}/manifest";
-  
+
   postPatch = ''
     # patch scripts/CrashPlanEngine
     substituteInPlace scripts/CrashPlanEngine \
@@ -85,10 +85,10 @@ stdenv.mkDerivation rec {
 
   postFixup = ''
     patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux-x86-64.so.2 $out/electron/crashplan
-    wrapProgram $out/bin/CrashPlanDesktop --prefix LD_LIBRARY_PATH ":" "${stdenv.lib.makeLibraryPath [ 
-      stdenv.cc.cc.lib gtk2 atk glib pango gdk_pixbuf cairo freetype 
-      fontconfig dbus gconf nss nspr alsaLib cups expat libudev 
-      libX11 libxcb libXi libXcursor libXdamage libXrandr libXcomposite 
+    wrapProgram $out/bin/CrashPlanDesktop --prefix LD_LIBRARY_PATH ":" "${stdenv.lib.makeLibraryPath [
+      stdenv.cc.cc.lib gtk2 atk glib pango gdk_pixbuf cairo freetype
+      fontconfig dbus gconf nss nspr alsaLib cups expat udev
+      libX11 libxcb libXi libXcursor libXdamage libXrandr libXcomposite
       libXext libXfixes libXrender libXtst libXScrnSaver]}"
   '';
 
diff --git a/pkgs/applications/display-managers/lightdm/default.nix b/pkgs/applications/display-managers/lightdm/default.nix
index 6765c5f9dfd..6ba053499f9 100644
--- a/pkgs/applications/display-managers/lightdm/default.nix
+++ b/pkgs/applications/display-managers/lightdm/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pam, pkgconfig, libxcb, glib, libXdmcp, itstool, libxml2
-, intltool, xlibsWrapper, libxklavier, libgcrypt, libaudit, coreutils
+, intltool, xlibsWrapper, libxklavier, libgcrypt, audit, coreutils
 , qt4 ? null
 , withQt5 ? false, qtbase
 }:
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkgconfig intltool ];
   buildInputs = [
     pam libxcb glib libXdmcp itstool libxml2 libxklavier libgcrypt
-    qt4 libaudit
+    qt4 audit
   ] ++ optional withQt5 qtbase;
 
   configureFlags = [
diff --git a/pkgs/applications/display-managers/slim/default.nix b/pkgs/applications/display-managers/slim/default.nix
index 5160e02963f..12e3dad9c79 100644
--- a/pkgs/applications/display-managers/slim/default.nix
+++ b/pkgs/applications/display-managers/slim/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, fetchpatch, cmake, pkgconfig, xorg, libjpeg, libpng
-, fontconfig, freetype, pam, dbus_libs, makeWrapper }:
+, fontconfig, freetype, pam, dbus, makeWrapper }:
 
 stdenv.mkDerivation rec {
   name = "slim-1.3.6";
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
 
   buildInputs =
     [ cmake pkgconfig libjpeg libpng fontconfig freetype
-      pam dbus_libs
+      pam dbus
       xorg.libX11 xorg.libXext xorg.libXrandr xorg.libXrender xorg.libXmu xorg.libXft makeWrapper
     ];
 
diff --git a/pkgs/applications/editors/jucipp/default.nix b/pkgs/applications/editors/jucipp/default.nix
index c24866671f9..6f5f416f4f5 100644
--- a/pkgs/applications/editors/jucipp/default.nix
+++ b/pkgs/applications/editors/jucipp/default.nix
@@ -1,7 +1,7 @@
 { config, stdenv, fetchgit, makeWrapper, gnome3, at-spi2-core, libcxx,
   boost, epoxy, cmake, aspell, llvmPackages, libgit2, pkgconfig, pcre,
   libXdmcp, libxkbcommon, libpthreadstubs, wrapGAppsHook, aspellDicts,
-  coreutils, glibc, dbus_libs, openssl, libxml2, gnumake, ctags }:
+  coreutils, glibc, dbus, openssl, libxml2, gnumake, ctags }:
 
 with stdenv.lib;
 
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
   buildInputs = [
-    dbus_libs
+    dbus
     openssl
     libxml2
     gnome3.gtksourceview
diff --git a/pkgs/applications/editors/texstudio/default.nix b/pkgs/applications/editors/texstudio/default.nix
index 790c4ea45c0..7ba37bd14ff 100644
--- a/pkgs/applications/editors/texstudio/default.nix
+++ b/pkgs/applications/editors/texstudio/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, qt5, poppler_qt5, zlib, pkgconfig}:
+{ stdenv, fetchFromGitHub, qt5, poppler, zlib, pkgconfig}:
 
 stdenv.mkDerivation rec {
   pname = "texstudio";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ qt5.qmake pkgconfig ];
-  buildInputs = [ qt5.qtbase qt5.qtscript qt5.qtsvg poppler_qt5 zlib ];
+  buildInputs = [ qt5.qtbase qt5.qtscript qt5.qtsvg poppler zlib ];
 
   qmakeFlags = [ "NO_APPDATA=True" ];
 
diff --git a/pkgs/applications/graphics/draftsight/default.nix b/pkgs/applications/graphics/draftsight/default.nix
index d817424c452..30101bb9477 100644
--- a/pkgs/applications/graphics/draftsight/default.nix
+++ b/pkgs/applications/graphics/draftsight/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, dpkg, makeWrapper, gcc, libGLU_combined, xdg_utils,
-  dbus_tools, alsaLib, cups, fontconfig, glib, icu, libpng12,
+  dbus, alsaLib, cups, fontconfig, glib, icu, libpng12,
   xkeyboard_config, zlib, libxslt, libxml2, sqlite, orc,
   libX11, libXcursor, libXrandr, libxcb, libXi, libSM, libICE,
   libXrender, libXcomposite }:
@@ -71,7 +71,7 @@ stdenv.mkDerivation {
   };
 
   libPath = stdenv.lib.makeLibraryPath [ gcc.cc libGLU_combined xdg_utils
-    dbus_tools alsaLib cups.lib fontconfig glib icu libpng12
+    dbus alsaLib cups.lib fontconfig glib icu libpng12
     xkeyboard_config zlib libxslt libxml2 sqlite orc libX11
     libXcursor libXrandr libxcb libXi libSM libICE libXrender
     libXcomposite ];
diff --git a/pkgs/applications/graphics/exrdisplay/default.nix b/pkgs/applications/graphics/exrdisplay/default.nix
index 34e7b1f2308..562fb8c11dc 100644
--- a/pkgs/applications/graphics/exrdisplay/default.nix
+++ b/pkgs/applications/graphics/exrdisplay/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, fltk, openexr, libGLU_combined, openexr_ctl }:
+{ stdenv, fetchurl, pkgconfig, fltk, openexr, libGLU_combined, ctl }:
 
 stdenv.mkDerivation {
   name ="openexr_viewers-2.2.1";
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
   '';
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ openexr fltk libGLU_combined openexr_ctl ];
+  buildInputs = [ openexr fltk libGLU_combined ctl ];
 
   meta = {
     description = "Application for viewing OpenEXR images on a display at various exposure settings";
diff --git a/pkgs/applications/graphics/ktikz/default.nix b/pkgs/applications/graphics/ktikz/default.nix
index 8817071e984..4b3a423a8ce 100644
--- a/pkgs/applications/graphics/ktikz/default.nix
+++ b/pkgs/applications/graphics/ktikz/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, gettext, poppler_qt5, qt5 , pkgconfig }:
+{ stdenv, fetchFromGitHub, gettext, poppler, qt5 , pkgconfig }:
 
 # Warning: You will also need a working pdflatex installation containing
 # at least auctex and pgf.
@@ -64,8 +64,7 @@ stdenv.mkDerivation rec {
   '';
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ gettext qt5.full poppler_qt5 ];
+  buildInputs = [ gettext qt5.full poppler ];
 
   enableParallelBuilding = true;
 }
-
diff --git a/pkgs/applications/kde/grantleetheme/default.nix b/pkgs/applications/kde/grantleetheme/default.nix
index 5035685c64f..bb8a97e8341 100644
--- a/pkgs/applications/kde/grantleetheme/default.nix
+++ b/pkgs/applications/kde/grantleetheme/default.nix
@@ -1,7 +1,7 @@
 {
   mkDerivation, copyPathsToStore, lib, kdepimTeam,
   extra-cmake-modules, kdoctools,
-  grantlee5, ki18n, kiconthemes, knewstuff, kservice, kxmlgui, qtbase,
+  grantlee, ki18n, kiconthemes, knewstuff, kservice, kxmlgui, qtbase,
 }:
 
 mkDerivation {
@@ -14,7 +14,7 @@ mkDerivation {
   patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   buildInputs = [
-    grantlee5 ki18n kiconthemes knewstuff kservice kxmlgui qtbase
+    grantlee ki18n kiconthemes knewstuff kservice kxmlgui qtbase
   ];
-  propagatedBuildInputs = [ grantlee5 kiconthemes knewstuff ];
+  propagatedBuildInputs = [ grantlee kiconthemes knewstuff ];
 }
diff --git a/pkgs/applications/kde/kcalutils.nix b/pkgs/applications/kde/kcalutils.nix
index 3f6821e08ea..1628af7e220 100644
--- a/pkgs/applications/kde/kcalutils.nix
+++ b/pkgs/applications/kde/kcalutils.nix
@@ -1,7 +1,7 @@
 {
   mkDerivation, lib, kdepimTeam,
   extra-cmake-modules, kdoctools,
-  grantlee5, kcalcore, kconfig, kontactinterface, kcoreaddons, kdelibs4support,
+  grantlee, kcalcore, kconfig, kontactinterface, kcoreaddons, kdelibs4support,
   kidentitymanagement, kpimtextedit,
 }:
 
@@ -13,7 +13,7 @@ mkDerivation {
   };
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   buildInputs = [
-    grantlee5 kcalcore kconfig kontactinterface kcoreaddons kdelibs4support
+    grantlee kcalcore kconfig kontactinterface kcoreaddons kdelibs4support
     kidentitymanagement kpimtextedit
   ];
   outputs = [ "out" "dev" ];
diff --git a/pkgs/applications/kde/kdepim-addons.nix b/pkgs/applications/kde/kdepim-addons.nix
index fd3fe2d6c09..5be3d881b0c 100644
--- a/pkgs/applications/kde/kdepim-addons.nix
+++ b/pkgs/applications/kde/kdepim-addons.nix
@@ -4,7 +4,7 @@
   akonadi-import-wizard, akonadi-notes, calendarsupport, eventviews,
   incidenceeditor, kcalcore, kcalutils, kconfig, kdbusaddons, kdeclarative,
   kdepim-apps-libs, kholidays, ki18n, kmime, ktexteditor, ktnef, libgravatar,
-  libksieve, mailcommon, mailimporter, messagelib, poppler_qt5, prison
+  libksieve, mailcommon, mailimporter, messagelib, poppler, prison
 }:
 
 mkDerivation {
@@ -18,6 +18,6 @@ mkDerivation {
     akonadi-import-wizard akonadi-notes calendarsupport eventviews
     incidenceeditor kcalcore kcalutils kconfig kdbusaddons kdeclarative
     kdepim-apps-libs kholidays ki18n kmime ktexteditor ktnef libgravatar
-    libksieve mailcommon mailimporter messagelib poppler_qt5 prison
+    libksieve mailcommon mailimporter messagelib poppler prison
   ];
 }
diff --git a/pkgs/applications/kde/kpimtextedit.nix b/pkgs/applications/kde/kpimtextedit.nix
index 17c960d1762..05d174b0554 100644
--- a/pkgs/applications/kde/kpimtextedit.nix
+++ b/pkgs/applications/kde/kpimtextedit.nix
@@ -1,7 +1,7 @@
 {
   mkDerivation, lib, kdepimTeam,
   extra-cmake-modules, kdoctools,
-  grantlee5, kcodecs, kconfigwidgets, kemoticons, ki18n, kiconthemes, kio,
+  grantlee, kcodecs, kconfigwidgets, kemoticons, ki18n, kiconthemes, kio,
   kdesignerplugin, ktextwidgets, sonnet, syntax-highlighting, qttools,
 }:
 
@@ -13,7 +13,7 @@ mkDerivation {
   };
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   buildInputs = [
-    grantlee5 kcodecs kconfigwidgets kemoticons ki18n kiconthemes kio kdesignerplugin
+    grantlee kcodecs kconfigwidgets kemoticons ki18n kiconthemes kio kdesignerplugin
     sonnet syntax-highlighting qttools
   ];
   propagatedBuildInputs = [ ktextwidgets ];
diff --git a/pkgs/applications/kde/messagelib.nix b/pkgs/applications/kde/messagelib.nix
index f12158a1f71..23920a081c0 100644
--- a/pkgs/applications/kde/messagelib.nix
+++ b/pkgs/applications/kde/messagelib.nix
@@ -1,7 +1,7 @@
 {
   mkDerivation, lib, kdepimTeam,
   extra-cmake-modules, kdoctools,
-  akonadi, akonadi-mime, akonadi-notes, akonadi-search, gpgme, grantlee5,
+  akonadi, akonadi-mime, akonadi-notes, akonadi-search, gpgme, grantlee,
   grantleetheme, karchive, kcodecs, kconfig, kconfigwidgets, kcontacts,
   kdepim-apps-libs, kiconthemes, kidentitymanagement, kio, kjobwidgets, kldap,
   kmailtransport, kmbox, kmime, kwindowsystem, libgravatar, libkdepim, libkleo,
@@ -16,7 +16,7 @@ mkDerivation {
   };
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   buildInputs = [
-    akonadi-notes akonadi-search gpgme grantlee5 grantleetheme karchive kcodecs
+    akonadi-notes akonadi-search gpgme grantlee grantleetheme karchive kcodecs
     kconfig kconfigwidgets kdepim-apps-libs kiconthemes kio kjobwidgets kldap
     kmailtransport kmbox kmime kwindowsystem libgravatar libkdepim qtwebkit
     syntax-highlighting
diff --git a/pkgs/applications/misc/cpp-ethereum/default.nix b/pkgs/applications/misc/cpp-ethereum/default.nix
index 33b16e3242c..4d997519246 100644
--- a/pkgs/applications/misc/cpp-ethereum/default.nix
+++ b/pkgs/applications/misc/cpp-ethereum/default.nix
@@ -2,7 +2,7 @@
 , fetchFromGitHub
 , cmake
 , jsoncpp
-, libjson_rpc_cpp
+, libjson-rpc-cpp
 , curl
 , boost
 , leveldb
@@ -58,7 +58,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     cmake
     jsoncpp
-    libjson_rpc_cpp
+    libjson-rpc-cpp
     curl
     boost
     leveldb
diff --git a/pkgs/applications/misc/diffpdf/default.nix b/pkgs/applications/misc/diffpdf/default.nix
index 144e1fa566c..daea20835c8 100644
--- a/pkgs/applications/misc/diffpdf/default.nix
+++ b/pkgs/applications/misc/diffpdf/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, qmake, qttools, qtbase, poppler_qt5 }:
+{ stdenv, fetchurl, fetchpatch, qmake, qttools, qtbase, poppler }:
 
 stdenv.mkDerivation rec {
   version = "2.1.3";
@@ -18,10 +18,10 @@ stdenv.mkDerivation rec {
   ];
 
   nativeBuildInputs = [ qmake qttools ];
-  buildInputs = [ qtbase poppler_qt5 ];
+  buildInputs = [ qtbase poppler ];
 
   preConfigure = ''
-    substituteInPlace diffpdf.pro --replace @@NIX_POPPLER_QT5@@ ${poppler_qt5.dev}
+    substituteInPlace diffpdf.pro --replace @@NIX_POPPLER_QT5@@ ${poppler.dev}
     lrelease diffpdf.pro
   '';
 
diff --git a/pkgs/applications/misc/digitalbitbox/default.nix b/pkgs/applications/misc/digitalbitbox/default.nix
index 09b6db3abf9..3e6a6ab53f7 100644
--- a/pkgs/applications/misc/digitalbitbox/default.nix
+++ b/pkgs/applications/misc/digitalbitbox/default.nix
@@ -7,7 +7,7 @@
 , libevent
 , libtool
 , libqrencode
-, libudev
+, udev
 , libusb
 , makeWrapper
 , pkgconfig
@@ -67,12 +67,12 @@ in stdenv.mkDerivation rec {
     qttools
   ];
 
-  buildInputs = with stdenv.lib; [
+  buildInputs = [
     # TODO: remove libcap when pruneLibtoolFiles applies to pulseaudio.
     libcap
     libevent
     libtool
-    libudev
+    udev
     libusb
     libqrencode
 
diff --git a/pkgs/applications/misc/hyper/default.nix b/pkgs/applications/misc/hyper/default.nix
index 65b85868bc5..a70506f7aaa 100644
--- a/pkgs/applications/misc/hyper/default.nix
+++ b/pkgs/applications/misc/hyper/default.nix
@@ -1,13 +1,13 @@
 { stdenv, lib, fetchurl, dpkg, atk, glib, pango, gdk_pixbuf, gnome3, gtk2, cairo
 , freetype, fontconfig, dbus, libXi, libXcursor, libXdamage, libXrandr
 , libXcomposite, libXext, libXfixes, libXrender, libX11, libXtst, libXScrnSaver
-, libxcb, nss, nspr, alsaLib, cups, expat, libudev, libpulseaudio }:
+, libxcb, nss, nspr, alsaLib, cups, expat, udev, libpulseaudio }:
 
 let
   libPath = stdenv.lib.makeLibraryPath [
     stdenv.cc.cc gtk2 gnome3.gconf atk glib pango gdk_pixbuf cairo freetype fontconfig dbus
     libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes libxcb
-    libXrender libX11 libXtst libXScrnSaver nss nspr alsaLib cups expat libudev libpulseaudio
+    libXrender libX11 libXtst libXScrnSaver nss nspr alsaLib cups expat udev libpulseaudio
   ];
 in
 stdenv.mkDerivation rec {
diff --git a/pkgs/applications/misc/lxterminal/default.nix b/pkgs/applications/misc/lxterminal/default.nix
index 0a2a051223a..b16507c8b7b 100644
--- a/pkgs/applications/misc/lxterminal/default.nix
+++ b/pkgs/applications/misc/lxterminal/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, automake, autoconf, intltool, pkgconfig, gtk3, vte
-, libxslt, docbook_xml_dtd_412, docbook_xml_xslt, libxml2, findXMLCatalogs
+, libxslt, docbook_xml_dtd_412, docbook_xsl, libxml2, findXMLCatalogs
 }:
 
 let version = "0.3.1"; in
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     automake autoconf intltool pkgconfig
-    libxslt docbook_xml_dtd_412 docbook_xml_xslt libxml2 findXMLCatalogs
+    libxslt docbook_xml_dtd_412 docbook_xsl libxml2 findXMLCatalogs
   ];
 
   buildInputs = [ gtk3 vte ];
diff --git a/pkgs/applications/misc/memo/default.nix b/pkgs/applications/misc/memo/default.nix
index 56cbb338a40..7d48b61793c 100644
--- a/pkgs/applications/misc/memo/default.nix
+++ b/pkgs/applications/misc/memo/default.nix
@@ -1,4 +1,4 @@
-{ fetchFromGitHub, ag, tree, man, stdenv, 
+{ fetchFromGitHub, silver-searcher, tree, man, stdenv,
   pandocSupport ? true, pandoc ? null
   , ... }:
 
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   in ''
     mkdir -p $out/{bin,share/man/man1,share/bash-completion/completions}
     substituteInPlace memo \
-      --replace "ack_cmd=ack"       "ack_cmd=${ag}/bin/ag" \
+      --replace "ack_cmd=ack"       "ack_cmd=${silver-searcher}/bin/ag" \
       --replace "tree_cmd=tree"     "tree_cmd=${tree}/bin/tree" \
       --replace "man_cmd=man"       "man_cmd=${man}/bin/man" \
       --replace "pandoc_cmd=pandoc" "${pandocReplacement}"
diff --git a/pkgs/applications/misc/moonlight-embedded/default.nix b/pkgs/applications/misc/moonlight-embedded/default.nix
index 42f1b58061e..5aaaa7a0e37 100644
--- a/pkgs/applications/misc/moonlight-embedded/default.nix
+++ b/pkgs/applications/misc/moonlight-embedded/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchgit, cmake, perl
-, alsaLib, libevdev, libopus, libudev, SDL2
+, alsaLib, libevdev, libopus, udev, SDL2
 , ffmpeg, pkgconfig, xorg, libvdpau, libpulseaudio, libcec
 , curl, expat, avahi, enet, libuuid
 }:
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake perl ];
   buildInputs = [
-    alsaLib libevdev libopus libudev SDL2
+    alsaLib libevdev libopus udev SDL2
     ffmpeg pkgconfig xorg.libxcb libvdpau libpulseaudio libcec
     xorg.libpthreadstubs curl expat avahi enet libuuid
   ];
diff --git a/pkgs/applications/misc/nixnote2/default.nix b/pkgs/applications/misc/nixnote2/default.nix
index 4ac152c2669..12f8c12b586 100644
--- a/pkgs/applications/misc/nixnote2/default.nix
+++ b/pkgs/applications/misc/nixnote2/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, mkDerivation, fetchFromGitHub, boost, qtbase, qtwebkit, poppler_qt5, qmake, hunspell, html-tidy}:
+{ stdenv, mkDerivation, fetchFromGitHub, boost
+, qtbase, qtwebkit, poppler, qmake, hunspell, html-tidy}:
 
 mkDerivation rec {
   name = "nixnote2-${version}";
@@ -11,7 +12,7 @@ mkDerivation rec {
     sha256 = "0cfq95mxvcgby66r61gclm1a2c6zck5aln04xmg2q8kg6p9d31fr";
   };
 
-  buildInputs = [ boost qtbase qtwebkit poppler_qt5 hunspell ];
+  buildInputs = [ boost qtbase qtwebkit poppler hunspell ];
 
   enableParallelBuilding = true;
 
@@ -28,7 +29,7 @@ mkDerivation rec {
 
     substituteInPlace nixnote.cpp --replace 'tidyProcess.start("tidy' 'tidyProcess.start("${html-tidy}/bin/tidy'
   '';
-  
+
   postInstal = ''
     cp images/windowIcon.png $out/share/pixmaps/nixnote2.png
   '';
diff --git a/pkgs/applications/misc/onboard/default.nix b/pkgs/applications/misc/onboard/default.nix
index de64705d832..78105ea535d 100644
--- a/pkgs/applications/misc/onboard/default.nix
+++ b/pkgs/applications/misc/onboard/default.nix
@@ -16,7 +16,7 @@
 , intltool
 , isocodes
 , libcanberra-gtk3
-, libudev
+, udev
 , libxkbcommon
 , pkgconfig
 , procps
@@ -79,7 +79,7 @@ in python3.pkgs.buildPythonApplication rec {
     hunspell
     isocodes
     libcanberra-gtk3
-    libudev
+    udev
     libxkbcommon
     wrapGAppsHook
     xorg.libXtst
diff --git a/pkgs/applications/misc/oneko/default.nix b/pkgs/applications/misc/oneko/default.nix
index 58e80e7f726..e1cc70e4277 100644
--- a/pkgs/applications/misc/oneko/default.nix
+++ b/pkgs/applications/misc/oneko/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, xorg, x11 }:
+{ stdenv, fetchurl, xorg, xlibsWrapper }:
 
 stdenv.mkDerivation rec {
   version = "1.2.sakura.5";
@@ -8,8 +8,8 @@ stdenv.mkDerivation rec {
     url = "http://www.daidouji.com/oneko/distfiles/oneko-${version}.tar.gz";
     sha256 = "2c2e05f1241e9b76f54475b5577cd4fb6670de058218d04a741a04ebd4a2b22f";
   };
-  buildInputs = [ xorg.imake xorg.gccmakedep x11 ];
-  
+  buildInputs = [ xorg.imake xorg.gccmakedep xlibsWrapper ];
+
   configurePhase = "xmkmf";
 
   installPhase = ''
@@ -31,4 +31,3 @@ stdenv.mkDerivation rec {
     platforms = platforms.unix;
   };
 }
-
diff --git a/pkgs/applications/misc/qpdfview/default.nix b/pkgs/applications/misc/qpdfview/default.nix
index f836ce5b808..dfaa90d43ad 100644
--- a/pkgs/applications/misc/qpdfview/default.nix
+++ b/pkgs/applications/misc/qpdfview/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, qmake, qtbase, qtsvg, pkgconfig, poppler_qt5, djvulibre, libspectre, cups
+{stdenv, fetchurl, qmake, qtbase, qtsvg, pkgconfig, poppler, djvulibre, libspectre, cups
 , file, ghostscript
 }:
 let
@@ -12,7 +12,7 @@ let
   };
   nativeBuildInputs = [ qmake pkgconfig ];
   buildInputs = [
-    qtbase qtsvg poppler_qt5 djvulibre libspectre cups file ghostscript
+    qtbase qtsvg poppler djvulibre libspectre cups file ghostscript
   ];
 in
 stdenv.mkDerivation {
diff --git a/pkgs/applications/misc/roxterm/default.nix b/pkgs/applications/misc/roxterm/default.nix
index 1d0c7d28de6..3ef5a6c4e34 100644
--- a/pkgs/applications/misc/roxterm/default.nix
+++ b/pkgs/applications/misc/roxterm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, docbook_xsl, dbus_libs, dbus-glib, expat, gettext
+{ stdenv, fetchurl, docbook_xsl, dbus, dbus-glib, expat, gettext
 , gsettings-desktop-schemas, gdk_pixbuf, gtk2, gtk3, hicolor-icon-theme
 , imagemagick, itstool, librsvg, libtool, libxslt, lockfile, makeWrapper
 , pkgconfig, python, pythonPackages, vte
@@ -22,13 +22,13 @@ in stdenv.mkDerivation rec {
 
   buildInputs =
     [ docbook_xsl expat imagemagick itstool librsvg libtool libxslt
-      makeWrapper python pythonPackages.lockfile dbus_libs dbus-glib
+      makeWrapper python pythonPackages.lockfile dbus dbus-glib
       gdk_pixbuf gsettings-desktop-schemas gtk3
       hicolor-icon-theme vte ];
 
   NIX_CFLAGS_COMPILE = [ "-I${dbus-glib.dev}/include/dbus-1.0"
-                         "-I${dbus_libs.dev}/include/dbus-1.0"
-                         "-I${dbus_libs.lib}/lib/dbus-1.0/include" ];
+                         "-I${dbus.dev}/include/dbus-1.0"
+                         "-I${dbus.lib}/lib/dbus-1.0/include" ];
 
   # Fix up python path so the lockfile library is on it.
   PYTHONPATH = stdenv.lib.makeSearchPathOutput "lib" python.sitePackages [
diff --git a/pkgs/applications/misc/terminus/default.nix b/pkgs/applications/misc/terminus/default.nix
index d2a2936680f..6df81aa1172 100644
--- a/pkgs/applications/misc/terminus/default.nix
+++ b/pkgs/applications/misc/terminus/default.nix
@@ -2,13 +2,13 @@
 , freetype, fontconfig, dbus, libXi, libXcursor, libXdamage, libXrandr
 , libXcomposite, libXext, libXfixes, libXrender, libX11, libXtst, libXScrnSaver
 , libxcb, makeWrapper, nodejs
-, nss, nspr, alsaLib, cups, expat, libudev, libpulseaudio }:
+, nss, nspr, alsaLib, cups, expat, udev, libpulseaudio }:
 
 let
   libPath = stdenv.lib.makeLibraryPath [
     stdenv.cc.cc gtk2 atk glib pango gdk_pixbuf cairo freetype fontconfig dbus
     libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes libxcb
-    libXrender libX11 libXtst libXScrnSaver gnome3.gconf nss nspr alsaLib cups expat libudev libpulseaudio
+    libXrender libX11 libXtst libXScrnSaver gnome3.gconf nss nspr alsaLib cups expat udev libpulseaudio
   ];
 in
 stdenv.mkDerivation rec {
diff --git a/pkgs/applications/misc/truecrypt/default.nix b/pkgs/applications/misc/truecrypt/default.nix
index 9df2a2dde76..48e0d19e20b 100644
--- a/pkgs/applications/misc/truecrypt/default.nix
+++ b/pkgs/applications/misc/truecrypt/default.nix
@@ -40,7 +40,7 @@ library, use the 'NOGUI' parameter:
    $ make NOGUI=1
 */
 
-{ fetchurl, stdenv, pkgconfig, nasm, fuse, wxGTK, devicemapper,
+{ fetchurl, stdenv, pkgconfig, nasm, fuse, wxGTK, lvm2,
   wxGUI ? true
 }:
 
@@ -86,7 +86,7 @@ stdenv.mkDerivation {
   };
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ fuse devicemapper wxGTK nasm ];
+  buildInputs = [ fuse lvm2 wxGTK nasm ];
 
   meta = {
     description = "Free Open-Source filesystem on-the-fly encryption";
diff --git a/pkgs/applications/misc/veracrypt/default.nix b/pkgs/applications/misc/veracrypt/default.nix
index 1c5c4d1dcaa..bc5b19e7737 100644
--- a/pkgs/applications/misc/veracrypt/default.nix
+++ b/pkgs/applications/misc/veracrypt/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, pkgconfig, yasm, fuse, wxGTK30, devicemapper, makeself,
+{ fetchurl, stdenv, pkgconfig, yasm, fuse, wxGTK30, lvm2, makeself,
   wxGUI ? true
 }:
 
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
     '';
 
   nativeBuildInputs = [ makeself yasm pkgconfig ];
-  buildInputs = [ fuse devicemapper ]
+  buildInputs = [ fuse lvm2 ]
     ++ optional wxGUI wxGTK30;
   makeFlags = optionalString (!wxGUI) "NOGUI=1";
 
diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix
index 6a5c9d67470..570180d4c4d 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/default.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix
@@ -5,7 +5,7 @@
 , curl
 , cups
 , dbus-glib
-, dbus_libs
+, dbus
 , fontconfig
 , freetype
 , gconf
@@ -93,7 +93,7 @@ stdenv.mkDerivation {
       curl
       cups
       dbus-glib
-      dbus_libs
+      dbus
       fontconfig
       freetype
       gconf
diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix
index 62fd4f533ea..584dca63297 100644
--- a/pkgs/applications/networking/browsers/firefox/wrapper.nix
+++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix
@@ -8,7 +8,7 @@
 , google_talk_plugin, fribid, gnome3/*.gnome-shell*/
 , esteidfirefoxplugin
 , browserpass, chrome-gnome-shell, uget-integrator, plasma-browser-integration
-, libudev
+, udev
 , kerberos
 }:
 
@@ -66,7 +66,7 @@ let
           ++ lib.optional (cfg.enablePlasmaBrowserIntegration or false) plasma-browser-integration
           ++ extraNativeMessagingHosts
         );
-      libs = [ libudev ]
+      libs =   lib.optional stdenv.isLinux udev
             ++ lib.optional ffmpegSupport ffmpeg
             ++ lib.optional gssSupport kerberos
             ++ lib.optionals (cfg.enableQuakeLive or false)
diff --git a/pkgs/applications/networking/browsers/google-chrome/default.nix b/pkgs/applications/networking/browsers/google-chrome/default.nix
index d2d26190ce0..2df2043517a 100644
--- a/pkgs/applications/networking/browsers/google-chrome/default.nix
+++ b/pkgs/applications/networking/browsers/google-chrome/default.nix
@@ -4,7 +4,7 @@
 , glib, fontconfig, freetype, pango, cairo, libX11, libXi, atk, gconf, nss, nspr
 , libXcursor, libXext, libXfixes, libXrender, libXScrnSaver, libXcomposite, libxcb
 , alsaLib, libXdamage, libXtst, libXrandr, expat, cups
-, dbus_libs, gtk2, gtk3, gdk_pixbuf, gcc-unwrapped, at-spi2-atk
+, dbus, gtk2, gtk3, gdk_pixbuf, gcc-unwrapped, at-spi2-atk
 , kerberos
 
 # command line arguments which are always set e.g "--disable-gpu"
@@ -52,7 +52,7 @@ let
     glib fontconfig freetype pango cairo libX11 libXi atk gconf nss nspr
     libXcursor libXext libXfixes libXrender libXScrnSaver libXcomposite libxcb
     alsaLib libXdamage libXtst libXrandr expat cups
-    dbus_libs gdk_pixbuf gcc-unwrapped.lib
+    dbus gdk_pixbuf gcc-unwrapped.lib
     systemd
     libexif
     liberation_ttf curl utillinux xdg_utils wget
diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix
index 8eae85099fb..7aba25dc339 100644
--- a/pkgs/applications/networking/browsers/vivaldi/default.nix
+++ b/pkgs/applications/networking/browsers/vivaldi/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, zlib, libX11, libXext, libSM, libICE
 , libXfixes, libXt, libXi, libXcursor, libXScrnSaver, libXcomposite, libXdamage, libXtst, libXrandr
-, alsaLib, dbus_libs, cups, libexif, ffmpeg, systemd
+, alsaLib, dbus, cups, libexif, ffmpeg, systemd
 , freetype, fontconfig, libXft, libXrender, libxcb, expat, libXau, libXdmcp
 , libuuid, xz
 , gstreamer, gst-plugins-base, libxml2
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     stdenv.cc.cc stdenv.cc.libc zlib libX11 libXt libXext libSM libICE libxcb
     libXi libXft libXcursor libXfixes libXScrnSaver libXcomposite libXdamage libXtst libXrandr
-    atk at-spi2-atk alsaLib dbus_libs cups gtk3 gdk_pixbuf libexif ffmpeg systemd
+    atk at-spi2-atk alsaLib dbus cups gtk3 gdk_pixbuf libexif ffmpeg systemd
     freetype fontconfig libXrender libuuid expat glib nss nspr
     gstreamer libxml2 gst-plugins-base pango cairo gnome3.gconf
   ] ++ stdenv.lib.optional proprietaryCodecs vivaldi-ffmpeg-codecs;
diff --git a/pkgs/applications/networking/feedreaders/newsboat/default.nix b/pkgs/applications/networking/feedreaders/newsboat/default.nix
index f10a88ec961..bee4c3bea20 100644
--- a/pkgs/applications/networking/feedreaders/newsboat/default.nix
+++ b/pkgs/applications/networking/feedreaders/newsboat/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, stfl, sqlite, curl, gettext, pkgconfig, libxml2, json_c, ncurses
-, asciidoc, docbook_xml_dtd_45, libxslt, docbook_xml_xslt, libiconv, makeWrapper }:
+, asciidoc, docbook_xml_dtd_45, libxslt, docbook_xsl, libiconv, makeWrapper }:
 
 stdenv.mkDerivation rec {
   name = "newsboat-${version}";
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
       --replace "ncurses5.4" "ncurses"
   '';
 
-  nativeBuildInputs = [ pkgconfig asciidoc docbook_xml_dtd_45 libxslt docbook_xml_xslt ]
+  nativeBuildInputs = [ pkgconfig asciidoc docbook_xml_dtd_45 libxslt docbook_xsl ]
                       ++ stdenv.lib.optional stdenv.isDarwin [ makeWrapper libiconv ];
 
   buildInputs = [ stfl sqlite curl gettext libxml2 json_c ncurses ];
diff --git a/pkgs/applications/networking/instant-messengers/jitsi/default.nix b/pkgs/applications/networking/instant-messengers/jitsi/default.nix
index 681a8119ac0..820a742245e 100644
--- a/pkgs/applications/networking/instant-messengers/jitsi/default.nix
+++ b/pkgs/applications/networking/instant-messengers/jitsi/default.nix
@@ -1,6 +1,6 @@
 { stdenv, lib, fetchurl, makeDesktopItem, unzip, ant, jdk
 # Optional, Jitsi still runs without, but you may pass null:
-, alsaLib, dbus_libs, gtk2, libpulseaudio, openssl, xorg
+, alsaLib, dbus, gtk2, libpulseaudio, openssl, xorg
 }:
 
 stdenv.mkDerivation rec {
@@ -25,13 +25,11 @@ stdenv.mkDerivation rec {
 
   libPath = lib.makeLibraryPath ([
     stdenv.cc.cc  # For libstdc++.
-  ] ++ lib.filter (x: x != null) [
     alsaLib
-    dbus_libs
+    dbus
     gtk2
     libpulseaudio
     openssl
-  ] ++ lib.optionals (xorg != null) [
     xorg.libX11
     xorg.libXext
     xorg.libXScrnSaver
diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-discord/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-discord/default.nix
index e41aea497a8..af58aaa0a76 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-discord/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-discord/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, pkgconfig, pidgin, json_glib }:
+{ stdenv, fetchFromGitHub, pkgconfig, pidgin, json-glib }:
 
 stdenv.mkDerivation rec {
   name = "purple-discord-${version}";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ pidgin json_glib ];
+  buildInputs = [ pidgin json-glib ];
 
   makeFlags = [
     "DESTDIR=$(out)"
diff --git a/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix
index 1ff67d02ff6..525a8a313f4 100644
--- a/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, libxslt, telepathy-glib, libxml2, dbus-glib, dbus_daemon
+{ stdenv, fetchurl, pkgconfig, libxslt, telepathy-glib, libxml2, dbus-glib, dbus
 , sqlite, libsoup, libnice, gnutls}:
 
 stdenv.mkDerivation rec {
@@ -10,8 +10,9 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ pkgconfig libxslt ];
-  buildInputs = [ libxml2 dbus-glib sqlite libsoup libnice telepathy-glib gnutls telepathy-glib.python ]
-    ++ stdenv.lib.optional doCheck dbus_daemon;
+  buildInputs = [ libxml2 dbus-glib sqlite libsoup libnice telepathy-glib gnutls telepathy-glib.python ];
+
+  checkInputs = [ dbus.daemon ];
 
   configureFlags = "--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt";
 
diff --git a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix
index 3f22aa28f36..82ad57ae927 100644
--- a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, dbus-glib, libxml2, sqlite, telepathy-glib, pkgconfig
-, gnome3, makeWrapper, intltool, libxslt, gobjectIntrospection, dbus_libs }:
+, gnome3, makeWrapper, intltool, libxslt, gobjectIntrospection, dbus }:
 
 stdenv.mkDerivation rec {
   project = "telepathy-logger";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   ];
   buildInputs = [
     dbus-glib libxml2 sqlite telepathy-glib
-    dbus_libs telepathy-glib.python
+    dbus telepathy-glib.python
   ];
 
   configureFlags = "--enable-call";
diff --git a/pkgs/applications/networking/linssid/default.nix b/pkgs/applications/networking/linssid/default.nix
index 4bd0f2e73e6..0139a3f3a93 100644
--- a/pkgs/applications/networking/linssid/default.nix
+++ b/pkgs/applications/networking/linssid/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, qtbase, qtsvg, qmake, pkgconfig, boost, wirelesstools, iw, qwt6 }:
+{ stdenv, fetchurl, qtbase, qtsvg, qmake, pkgconfig, boost, wirelesstools, iw, qwt }:
 
 stdenv.mkDerivation rec {
   name = "linssid-${version}";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ pkgconfig qmake ];
-  buildInputs = [ qtbase qtsvg boost qwt6 ];
+  buildInputs = [ qtbase qtsvg boost qwt ];
 
   patches = [ ./0001-unbundled-qwt.patch ];
 
diff --git a/pkgs/applications/networking/mailreaders/inboxer/default.nix b/pkgs/applications/networking/mailreaders/inboxer/default.nix
index c0f015944b0..390f68bd105 100644
--- a/pkgs/applications/networking/mailreaders/inboxer/default.nix
+++ b/pkgs/applications/networking/mailreaders/inboxer/default.nix
@@ -1,4 +1,6 @@
-{ stdenv, fetchurl, binutils, patchelf, makeWrapper, expat, xorg, gdk_pixbuf, glib, gnome2, cairo, atk, freetype, fontconfig, dbus, nss, nspr, gtk2-x11, alsaLib, cups, libpulseaudio, libudev }:
+{ stdenv, fetchurl, binutils, patchelf, makeWrapper
+, expat, xorg, gdk_pixbuf, glib, gnome2, cairo, atk, freetype
+, fontconfig, dbus, nss, nspr, gtk2-x11, alsaLib, cups, libpulseaudio, udev }:
 
 stdenv.mkDerivation rec {
   name = "inboxer-${version}";
@@ -53,7 +55,7 @@ stdenv.mkDerivation rec {
       expat
       stdenv.cc.cc.lib
       libpulseaudio
-      libudev
+      udev
     ];
   in ''
     patchelf \
@@ -62,7 +64,7 @@ stdenv.mkDerivation rec {
     patchelf \
       --set-rpath "$out/opt/Inboxer:${lpath}" \
       $out/opt/Inboxer/libffmpeg.so
-   
+
     patchelf \
       --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
       --set-rpath "$out/opt/Inboxer:${lpath}" \
@@ -70,7 +72,7 @@ stdenv.mkDerivation rec {
 
     wrapProgram $out/opt/Inboxer/inboxer --set LD_LIBRARY_PATH "${xorg.libxkbfile}/lib:${lpath}"
   '';
-  
+
   installPhase = ''
     mkdir -p $out/bin
     cp -R usr/share opt $out/
diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
index bea713c9e6b..b9b553f9447 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
@@ -7,7 +7,7 @@
 , cups
 , curl
 , dbus-glib
-, dbus_libs
+, dbus
 , fontconfig
 , freetype
 , gdk_pixbuf
@@ -86,7 +86,7 @@ stdenv.mkDerivation {
       cups
       curl
       dbus-glib
-      dbus_libs
+      dbus
       fontconfig
       freetype
       gdk_pixbuf
diff --git a/pkgs/applications/networking/sync/lsyncd/default.nix b/pkgs/applications/networking/sync/lsyncd/default.nix
index e4bdec668a0..74ffb14f4ad 100644
--- a/pkgs/applications/networking/sync/lsyncd/default.nix
+++ b/pkgs/applications/networking/sync/lsyncd/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, cmake, lua, pkgconfig, rsync,
-  asciidoc, libxml2, docbook_xml_dtd_45, docbook_xml_xslt, libxslt }:
+  asciidoc, libxml2, docbook_xml_dtd_45, docbook_xsl, libxslt }:
 
 stdenv.mkDerivation rec {
   name = "lsyncd-${version}";
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     rsync
     cmake lua pkgconfig
-    asciidoc libxml2 docbook_xml_dtd_45 docbook_xml_xslt libxslt
+    asciidoc libxml2 docbook_xml_dtd_45 docbook_xsl libxslt
   ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/applications/science/electronics/kicad/unstable.nix b/pkgs/applications/science/electronics/kicad/unstable.nix
index eca3ddd32e8..e43fd59e043 100644
--- a/pkgs/applications/science/electronics/kicad/unstable.nix
+++ b/pkgs/applications/science/electronics/kicad/unstable.nix
@@ -2,7 +2,7 @@
 , libX11, gettext, glew, glm, cairo, curl, openssl, boost, pkgconfig
 , doxygen, pcre, libpthreadstubs, libXdmcp
 
-, oceSupport ? true, opencascade_oce
+, oceSupport ? true, opencascade
 , ngspiceSupport ? true, libngspice
 , scriptingSupport ? true, swig, python, wxPython
 }:
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   '';
 
   cmakeFlags =
-    optionals (oceSupport) [ "-DKICAD_USE_OCE=ON" "-DOCE_DIR=${opencascade_oce}" ]
+    optionals (oceSupport) [ "-DKICAD_USE_OCE=ON" "-DOCE_DIR=${opencascade}" ]
     ++ optional (ngspiceSupport) "-DKICAD_SPICE=ON"
     ++ optionals (scriptingSupport) [
       "-DKICAD_SCRIPTING=ON"
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     libGLU_combined zlib libX11 wxGTK pcre libXdmcp gettext glew glm libpthreadstubs
     cairo curl openssl boost
-  ] ++ optional (oceSupport) opencascade_oce
+  ] ++ optional (oceSupport) opencascade
     ++ optional (ngspiceSupport) libngspice
     ++ optionals (scriptingSupport) [ swig python wxPython ];
 
diff --git a/pkgs/applications/science/robotics/gazebo/default.nix b/pkgs/applications/science/robotics/gazebo/default.nix
index 1d933d56948..babd87eb2b1 100644
--- a/pkgs/applications/science/robotics/gazebo/default.nix
+++ b/pkgs/applications/science/robotics/gazebo/default.nix
@@ -5,7 +5,8 @@
   , pythonPackages, utillinux
 
   # these deps are hidden; cmake doesn't catch them
-  , gazeboSimulator, sdformat ? gazeboSimulator.sdformat, curl, tinyxml, qt4, x11
+  , gazeboSimulator, sdformat ? gazeboSimulator.sdformat, curl, tinyxml, qt4
+  , xlibsWrapper
   , withIgnitionTransport ? true
   , libav, withLibAvSupport ? true
   , openal, withAudioSupport ? false
@@ -60,7 +61,7 @@ stdenv.mkDerivation rec {
     # TODO: add these hidden deps to cmake configuration & submit upstream
     curl
     tinyxml
-    x11
+    xlibsWrapper
     qt4
   ] ++ optional stdenv.isLinux utillinux # on Linux needs uuid/uuid.h
     ++ optional withDocs doxygen
diff --git a/pkgs/applications/version-management/cvs-fast-export/default.nix b/pkgs/applications/version-management/cvs-fast-export/default.nix
index ed207a1e7d9..1a5ce6e369e 100644
--- a/pkgs/applications/version-management/cvs-fast-export/default.nix
+++ b/pkgs/applications/version-management/cvs-fast-export/default.nix
@@ -1,5 +1,5 @@
 {stdenv, fetchurl, makeWrapper, flex, bison,
- asciidoc, docbook_xml_dtd_45, docbook_xml_xslt,
+ asciidoc, docbook_xml_dtd_45, docbook_xsl,
  libxml2, libxslt,
  python27, rcs, cvs, git,
  coreutils, rsync}:
@@ -21,7 +21,7 @@ mkDerivation rec {
   };
 
   buildInputs = [
-    flex bison asciidoc docbook_xml_dtd_45 docbook_xml_xslt libxml2 libxslt
+    flex bison asciidoc docbook_xml_dtd_45 docbook_xsl libxml2 libxslt
     python27 rcs cvs git makeWrapper
   ];
 
@@ -29,7 +29,7 @@ mkDerivation rec {
 
   preBuild = ''
     makeFlagsArray=(
-      XML_CATALOG_FILES="${docbook_xml_dtd_45}/xml/dtd/docbook/catalog.xml ${docbook_xml_xslt}/xml/xsl/docbook/catalog.xml"
+      XML_CATALOG_FILES="${docbook_xml_dtd_45}/xml/dtd/docbook/catalog.xml ${docbook_xsl}/xml/xsl/docbook/catalog.xml"
       LIBS=""
       prefix="$out"
     )
diff --git a/pkgs/applications/version-management/git-and-tools/cgit/default.nix b/pkgs/applications/version-management/git-and-tools/cgit/default.nix
index a6efb8d339e..284a1cc649a 100644
--- a/pkgs/applications/version-management/git-and-tools/cgit/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/cgit/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, openssl, zlib, asciidoc, libxml2, libxslt
-, docbook_xml_xslt, pkgconfig, luajit
+, docbook_xsl, pkgconfig, luajit
 , gzip, bzip2, xz
 , python, wrapPython, pygments, markdown
 }:
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig ] ++ [ python wrapPython ];
   buildInputs = [
-    openssl zlib asciidoc libxml2 libxslt docbook_xml_xslt luajit
+    openssl zlib asciidoc libxml2 libxslt docbook_xsl luajit
   ];
   pythonPath = [ pygments markdown ];
 
diff --git a/pkgs/applications/version-management/reposurgeon/default.nix b/pkgs/applications/version-management/reposurgeon/default.nix
index 238d527ce38..84b6633b883 100644
--- a/pkgs/applications/version-management/reposurgeon/default.nix
+++ b/pkgs/applications/version-management/reposurgeon/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, makeWrapper, python27Packages, git
-, docbook_xml_dtd_412, docbook_xml_xslt, asciidoc, xmlto
+, docbook_xml_dtd_412, docbook_xsl, asciidoc, xmlto
 , bazaar ? null, cvs ? null, darcs ? null, fossil ? null
 , mercurial ? null, monotone ? null, rcs ? null, src ? null
 , subversion ? null, cvs_fast_export ? null }:
@@ -24,16 +24,16 @@ in mkDerivation rec {
   };
 
   # See https://gitlab.com/esr/reposurgeon/issues/17
-  patches = [ ./fix-preserve-type.patch ];  
+  patches = [ ./fix-preserve-type.patch ];
 
   buildInputs =
-    [ docbook_xml_dtd_412 docbook_xml_xslt asciidoc xmlto makeWrapper ] ++
+    [ docbook_xml_dtd_412 docbook_xsl asciidoc xmlto makeWrapper ] ++
     optional (cython != null) cython
   ;
 
   preBuild = ''
     makeFlagsArray=(
-      XML_CATALOG_FILES="${docbook_xml_dtd_412}/xml/dtd/docbook/catalog.xml ${docbook_xml_xslt}/xml/xsl/docbook/catalog.xml"
+      XML_CATALOG_FILES="${docbook_xml_dtd_412}/xml/dtd/docbook/catalog.xml ${docbook_xsl}/xml/xsl/docbook/catalog.xml"
       prefix="$out"
       pyinclude="-I${python}/include/python2.7"
       pylib="-L${python}/lib -lpython2.7"
@@ -64,5 +64,5 @@ in mkDerivation rec {
           --prefix PYTHONPATH : "${pythonpath}"
       done
     ''
-  ;    
+  ;
 }
diff --git a/pkgs/applications/video/dvdstyler/default.nix b/pkgs/applications/video/dvdstyler/default.nix
index f89aa04e014..f73c5277d05 100644
--- a/pkgs/applications/video/dvdstyler/default.nix
+++ b/pkgs/applications/video/dvdstyler/default.nix
@@ -6,7 +6,7 @@
 , cdrtools, dvdauthor, dvdplusrwtools
 , dvdisasterSupport ? true, dvdisaster ? null
 , thumbnailSupport ? true, libgnomeui ? null
-, udevSupport ? true, libudev ? null
+, udevSupport ? true, udev ? null
 , dbusSupport ? true, dbus ? null
 , makeWrapper }:
 
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
     sha256 = "0lwc0hn94m9r8fi07sjqz3fr618l6lnw3zsakxw7nlgnxbjsk7pi";
   };
 
-  nativeBuildInputs = 
+  nativeBuildInputs =
   [ pkgconfig ];
 
   packagesToBinPath =
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
     docbook5 zip makeWrapper ]
   ++ packagesToBinPath
   ++ optionals dvdisasterSupport [ dvdisaster ]
-  ++ optionals udevSupport [ libudev ]
+  ++ optionals udevSupport [ udev ]
   ++ optionals dbusSupport [ dbus ]
   ++ optionals thumbnailSupport [ libgnomeui ];
 
diff --git a/pkgs/applications/video/kodi/default.nix b/pkgs/applications/video/kodi/default.nix
index 64119d2dfc5..776d2732327 100644
--- a/pkgs/applications/video/kodi/default.nix
+++ b/pkgs/applications/video/kodi/default.nix
@@ -19,7 +19,7 @@
 , libcrossguid, libmicrohttpd
 , bluez, doxygen, giflib, glib, harfbuzz, lcms2, libidn, libpthreadstubs, libtasn1, libXdmcp
 , libplist, p11-kit, zlib
-, dbusSupport ? true, dbus_libs ? null
+, dbusSupport ? true, dbus ? null
 , joystickSupport ? true, cwiid ? null
 , nfsSupport ? true, libnfs ? null
 , pulseSupport ? true, libpulseaudio ? null
@@ -30,7 +30,7 @@
 , vdpauSupport ? true, libvdpau ? null
 }:
 
-assert dbusSupport  -> dbus_libs != null;
+assert dbusSupport  -> dbus != null;
 assert nfsSupport   -> libnfs != null;
 assert pulseSupport -> libpulseaudio != null;
 assert rtmpSupport  -> rtmpdump != null;
@@ -139,7 +139,7 @@ in stdenv.mkDerivation rec {
       ffmpeg
       # libdvdcss libdvdnav libdvdread
     ]
-    ++ lib.optional  dbusSupport     dbus_libs
+    ++ lib.optional  dbusSupport     dbus
     ++ lib.optionals joystickSupport [ cwiid ]
     ++ lib.optional  nfsSupport      libnfs
     ++ lib.optional  pulseSupport    libpulseaudio
diff --git a/pkgs/applications/video/screenkey/default.nix b/pkgs/applications/video/screenkey/default.nix
index 5638fad39e5..6042f490dfa 100644
--- a/pkgs/applications/video/screenkey/default.nix
+++ b/pkgs/applications/video/screenkey/default.nix
@@ -10,7 +10,7 @@
 , libXtst
 , wrapGAppsHook
 , defaultIconTheme
-, hicolor_icon_theme
+, hicolor-icon-theme
 }:
 buildPythonApplication rec {
   pname = "screenkey";
@@ -40,7 +40,7 @@ buildPythonApplication rec {
 
   buildInputs = [
     defaultIconTheme
-    hicolor_icon_theme
+    hicolor-icon-theme
   ];
 
   propagatedBuildInputs = [
diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix
index d9bc2ed18b1..6fedc227e44 100644
--- a/pkgs/applications/video/vlc/default.nix
+++ b/pkgs/applications/video/vlc/default.nix
@@ -6,7 +6,7 @@
 , libcaca, libpulseaudio, flac, schroedinger, libxml2, librsvg
 , mpeg2dec, systemd, gnutls, avahi, libcddb, libjack2, SDL, SDL_image
 , libmtp, unzip, taglib, libkate, libtiger, libv4l, samba, liboggz
-, libass, libva-full, libdvbpsi, libdc1394, libraw1394, libopus
+, libass, libva, libdvbpsi, libdc1394, libraw1394, libopus
 , libvdpau, libsamplerate, live555, fluidsynth, wayland, wayland-protocols
 , onlyLibVLC ? false
 , withQt5 ? true, qtbase ? null, qtsvg ? null, qtx11extras ? null
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
     libbluray dbus fribidi libvorbis libtheora speex lua5 libgcrypt libgpgerror
     libupnp libcaca libpulseaudio flac schroedinger libxml2 librsvg mpeg2dec
     systemd gnutls avahi libcddb SDL SDL_image libmtp unzip taglib libarchive
-    libkate libtiger libv4l samba liboggz libass libdvbpsi libva-full
+    libkate libtiger libv4l samba liboggz libass libdvbpsi libva
     xorg.xlibsWrapper xorg.libXv xorg.libXvMC xorg.libXpm xorg.xcbutilkeysyms
     libdc1394 libraw1394 libopus libebml libmatroska libvdpau libsamplerate live555
     fluidsynth wayland wayland-protocols
diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix
index 1a2c850f156..7e9a89d4888 100644
--- a/pkgs/applications/virtualization/docker/default.nix
+++ b/pkgs/applications/virtualization/docker/default.nix
@@ -1,6 +1,6 @@
 { stdenv, lib, fetchFromGitHub, makeWrapper, removeReferencesTo, pkgconfig
 , go-md2man, go, containerd, runc, docker-proxy, tini, libtool
-, sqlite, iproute, bridge-utils, devicemapper, systemd
+, sqlite, iproute, bridge-utils, lvm2, systemd
 , btrfs-progs, iptables, e2fsprogs, xz, utillinux, xfsprogs
 , procps, libseccomp
 }:
@@ -66,7 +66,7 @@ rec {
     DOCKER_BUILDTAGS = []
       ++ optional (systemd != null) [ "journald" ]
       ++ optional (btrfs-progs == null) "exclude_graphdriver_btrfs"
-      ++ optional (devicemapper == null) "exclude_graphdriver_devicemapper"
+      ++ optional (lvm2 == null) "exclude_graphdriver_devicemapper"
       ++ optional (libseccomp != null) "seccomp";
 
    }) // rec {
@@ -88,7 +88,7 @@ rec {
     buildInputs = [
       makeWrapper removeReferencesTo go-md2man go libtool
     ] ++ optionals (stdenv.isLinux) [
-      sqlite devicemapper btrfs-progs systemd libseccomp
+      sqlite lvm2 btrfs-progs systemd libseccomp
     ];
 
     dontStrip = true;
diff --git a/pkgs/applications/virtualization/xen/4.5.nix b/pkgs/applications/virtualization/xen/4.5.nix
index bb6209ce47f..64704f73e7b 100644
--- a/pkgs/applications/virtualization/xen/4.5.nix
+++ b/pkgs/applications/virtualization/xen/4.5.nix
@@ -1,5 +1,5 @@
 { stdenv, callPackage, fetchurl, fetchpatch, fetchgit
-, ocamlPackages_4_02
+, ocaml-ng
 , withInternalQemu ? true
 , withInternalTraditionalQemu ? true
 , withInternalSeabios ? true
@@ -258,4 +258,4 @@ callPackage (import ./generic.nix (rec {
       else throw "this xen has no qemu builtin";
   };
 
-})) ({ ocamlPackages = ocamlPackages_4_02; } // args)
+})) ({ ocamlPackages = ocaml-ng.ocamlPackages_4_02; } // args)
diff --git a/pkgs/applications/window-managers/afterstep/default.nix b/pkgs/applications/window-managers/afterstep/default.nix
index 20deb2c2404..a48d031ad33 100644
--- a/pkgs/applications/window-managers/afterstep/default.nix
+++ b/pkgs/applications/window-managers/afterstep/default.nix
@@ -2,7 +2,7 @@
 , libjpeg, libtiff, libpng, freetype
 , fltk, gtk
 , libX11, libXext, libICE
-, dbus, dbus_libs
+, dbus
 }:
 
 stdenv.mkDerivation rec {
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ libjpeg libtiff libpng freetype fltk gtk libX11 libXext libICE dbus dbus_libs ];
+  buildInputs = [ libjpeg libtiff libpng freetype fltk gtk libX11 libXext libICE dbus ];
 
   # A strange type of bug: dbus is not immediately found by pkgconfig
   preConfigure = ''
diff --git a/pkgs/applications/window-managers/compton/git.nix b/pkgs/applications/window-managers/compton/git.nix
index dd2559d2b15..90ae043fba3 100644
--- a/pkgs/applications/window-managers/compton/git.nix
+++ b/pkgs/applications/window-managers/compton/git.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, asciidoc, dbus, docbook_xml_dtd_45,
-  docbook_xml_xslt, libconfig, libdrm, libxml2, libxslt, libGLU_combined, pcre,
+  docbook_xsl, libconfig, libdrm, libxml2, libxslt, libGLU_combined, pcre,
   pkgconfig, libXcomposite, libXdamage, libXext, libXfixes, libXinerama,
   libXrandr, libXrender, xwininfo }:
 
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     asciidoc
     docbook_xml_dtd_45
-    docbook_xml_xslt
+    docbook_xsl
     pkgconfig
   ];
 
diff --git a/pkgs/applications/window-managers/i3/easyfocus.nix b/pkgs/applications/window-managers/i3/easyfocus.nix
index 337ecdd651f..f72ef13173c 100644
--- a/pkgs/applications/window-managers/i3/easyfocus.nix
+++ b/pkgs/applications/window-managers/i3/easyfocus.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, pkgconfig, xproto, libxcb, xcbutilkeysyms
-, xlibs , i3ipc-glib , glib
+, xorg , i3ipc-glib , glib
 }:
 
 stdenv.mkDerivation rec {
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ libxcb xcbutilkeysyms xproto xlibs.libX11.dev i3ipc-glib glib.dev ];
+  buildInputs = [ libxcb xcbutilkeysyms xproto xorg.libX11.dev i3ipc-glib glib.dev ];
 
   # Makefile has no rule for 'install'
   installPhase = ''
diff --git a/pkgs/applications/window-managers/orbment/default.nix b/pkgs/applications/window-managers/orbment/default.nix
index 46130680af4..6bf6f44d423 100644
--- a/pkgs/applications/window-managers/orbment/default.nix
+++ b/pkgs/applications/window-managers/orbment/default.nix
@@ -1,5 +1,5 @@
 { lib, stdenv, fetchgit, cmake, pkgconfig, makeWrapper, callPackage
-, wlc, dbus_libs, wayland, libxkbcommon, pixman, libinput, udev, zlib, libpng
+, wlc, dbus, wayland, libxkbcommon, pixman, libinput, udev, zlib, libpng
 , libdrm, libX11
 , westonLite
 }:
@@ -20,7 +20,7 @@ in stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake pkgconfig makeWrapper ];
 
   buildInputs = [
-    wlc dbus_libs wayland libxkbcommon pixman libinput udev zlib libpng libX11
+    wlc dbus wayland libxkbcommon pixman libinput udev zlib libpng libX11
     libdrm
   ];
 
diff --git a/pkgs/applications/window-managers/sway/default.nix b/pkgs/applications/window-managers/sway/default.nix
index 89e7b9dd088..50614534f8e 100644
--- a/pkgs/applications/window-managers/sway/default.nix
+++ b/pkgs/applications/window-managers/sway/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub
 , cmake, pkgconfig, asciidoc, libxslt, docbook_xsl
-, wayland, wlc, libxkbcommon, pcre, json_c, dbus_libs
+, wayland, wlc, libxkbcommon, pcre, json_c, dbus
 , pango, cairo, libinput, libcap, pam, gdk_pixbuf, libpthreadstubs
 , libXdmcp
 , buildDocs ? true
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
     cmake pkgconfig
   ] ++ stdenv.lib.optional buildDocs [ asciidoc libxslt docbook_xsl ];
   buildInputs = [
-    wayland wlc libxkbcommon pcre json_c dbus_libs
+    wayland wlc libxkbcommon pcre json_c dbus
     pango cairo libinput libcap pam gdk_pixbuf libpthreadstubs
     libXdmcp
   ];
diff --git a/pkgs/build-support/rust/default-crate-overrides.nix b/pkgs/build-support/rust/default-crate-overrides.nix
index d82a9204230..9d22fcf8be1 100644
--- a/pkgs/build-support/rust/default-crate-overrides.nix
+++ b/pkgs/build-support/rust/default-crate-overrides.nix
@@ -1,5 +1,5 @@
 { stdenv, pkgconfig, curl, darwin, libiconv, libgit2, libssh2,
-  openssl, sqlite, zlib, dbus_libs, dbus-glib, gdk_pixbuf, cairo, python3,
+  openssl, sqlite, zlib, dbus, dbus-glib, gdk_pixbuf, cairo, python3,
   libsodium, postgresql, ... }:
 
 let
@@ -41,10 +41,10 @@ in
   };
 
   dbus = attrs: {
-    buildInputs = [ pkgconfig dbus_libs ];
+    buildInputs = [ pkgconfig dbus ];
   };
   libdbus-sys = attrs: {
-    buildInputs = [ pkgconfig dbus_libs ];
+    buildInputs = [ pkgconfig dbus ];
   };
   gobject-sys = attrs: {
     buildInputs = [ dbus-glib ];
diff --git a/pkgs/desktops/enlightenment/efl.nix b/pkgs/desktops/enlightenment/efl.nix
index 9660bc3e4c7..f4d29643dd7 100644
--- a/pkgs/desktops/enlightenment/efl.nix
+++ b/pkgs/desktops/enlightenment/efl.nix
@@ -1,8 +1,8 @@
 { stdenv, fetchurl, pkgconfig, openssl, libjpeg, zlib, lz4, freetype, fontconfig
 , fribidi, SDL2, SDL, libGL, giflib, libpng, libtiff, glib, gst_all_1, libpulseaudio
-, libsndfile, xorg, libdrm, libxkbcommon, udev, utillinux, dbus, bullet, luajit
+, libsndfile, xorg, libdrm, libxkbcommon, udev, utillinux, bullet, luajit
 , python27Packages, openjpeg, doxygen, expat, harfbuzz, jbig2dec, librsvg
-, dbus_libs, alsaLib, poppler, ghostscript, libraw, libspectre, xineLib, libwebp
+, dbus, alsaLib, poppler, ghostscript, libraw, libspectre, xineLib, libwebp
 , curl, libinput, systemd, mesa_noglu, writeText
 }:
 
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
     xorg.libXdamage xorg.libXinerama xorg.libXp xorg.libXtst xorg.libXi xorg.libXext
     bullet xorg.libXScrnSaver xorg.libXrender xorg.libXfixes xorg.libXrandr
     xorg.libxkbfile xorg.libxcb xorg.xcbutilkeysyms openjpeg doxygen expat luajit
-    harfbuzz jbig2dec librsvg dbus_libs alsaLib poppler ghostscript libraw libspectre xineLib libwebp curl libdrm
+    harfbuzz jbig2dec librsvg alsaLib poppler ghostscript libraw libspectre xineLib libwebp curl libdrm
     libinput utillinux fribidi SDL2 ];
 
   # ac_ct_CXX must be set to random value, because then it skips some magic which does alternative searching for g++
diff --git a/pkgs/desktops/gnome-2/platform/GConf/default.nix b/pkgs/desktops/gnome-2/platform/GConf/default.nix
index 778a1cc920f..3eabca2d24d 100644
--- a/pkgs/desktops/gnome-2/platform/GConf/default.nix
+++ b/pkgs/desktops/gnome-2/platform/GConf/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, dbus-glib, glib, ORBit2, libxml2
-, polkit, intltool, dbus_libs, gtk2 ? null, withGtk ? false }:
+, polkit, intltool, dbus, gtk2 ? null, withGtk ? false }:
 
 assert withGtk -> (gtk2 != null);
 
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
 
   outputs = [ "out" "dev" "man" ];
 
-  buildInputs = [ ORBit2 dbus_libs dbus-glib libxml2 ]
+  buildInputs = [ ORBit2 dbus dbus-glib libxml2 ]
     # polkit requires pam, which requires shadow.h, which is not available on
     # darwin
     ++ stdenv.lib.optional (!stdenv.isDarwin) polkit
diff --git a/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix b/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix
index 9d71b999d11..c15f43b542a 100644
--- a/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix
+++ b/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, libxml2, bzip2, openssl, dbus-glib
-, glib, fam, cdparanoia, intltool, GConf, gnome_mime_data, avahi, acl }:
+, glib, gamin, cdparanoia, intltool, GConf, gnome_mime_data, avahi, acl }:
 
 stdenv.mkDerivation rec {
   name = "gnome-vfs-${minVer}.4";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ intltool pkgconfig ];
   buildInputs =
-    [ libxml2 bzip2 openssl dbus-glib fam cdparanoia
+    [ libxml2 bzip2 openssl dbus-glib gamin cdparanoia
       gnome_mime_data avahi acl
     ];
 
diff --git a/pkgs/desktops/gnome-3/core/empathy/default.nix b/pkgs/desktops/gnome-3/core/empathy/default.nix
index 4da4c480266..98cfc686e97 100644
--- a/pkgs/desktops/gnome-3/core/empathy/default.nix
+++ b/pkgs/desktops/gnome-3/core/empathy/default.nix
@@ -1,6 +1,6 @@
 { stdenv, intltool, fetchurl, webkitgtk, pkgconfig, gtk3, glib
 , file, librsvg, gnome3, gdk_pixbuf
-, dbus-glib, dbus_libs, telepathy-glib, telepathy-farstream
+, dbus-glib, telepathy-glib, telepathy-farstream
 , clutter-gtk, clutter-gst, gst_all_1, cogl, gnome-online-accounts
 , gcr, libsecret, folks, libpulseaudio, telepathy-mission-control
 , telepathy-logger, libnotify, clutter, libsoup, gnutls
diff --git a/pkgs/desktops/gnome-3/core/folks/default.nix b/pkgs/desktops/gnome-3/core/folks/default.nix
index beb40209bc8..bea40431a24 100644
--- a/pkgs/desktops/gnome-3/core/folks/default.nix
+++ b/pkgs/desktops/gnome-3/core/folks/default.nix
@@ -1,5 +1,5 @@
 { fetchurl, stdenv, pkgconfig, glib, gnome3, nspr, intltool
-, vala, sqlite, libxml2, dbus-glib, libsoup, nss, dbus_libs
+, vala, sqlite, libxml2, dbus-glib, libsoup, nss, dbus
 , telepathy-glib, evolution-data-server, libsecret, db }:
 
 # TODO: enable more folks backends
@@ -16,14 +16,14 @@ in stdenv.mkDerivation rec {
 
   propagatedBuildInputs = [ glib gnome3.libgee sqlite ];
   # dbus_daemon needed for tests
-  buildInputs = [ dbus-glib telepathy-glib evolution-data-server dbus_libs
+  buildInputs = [ dbus-glib telepathy-glib evolution-data-server dbus
                   vala libsecret libxml2 libsoup nspr nss intltool db ];
   nativeBuildInputs = [ pkgconfig ];
 
   configureFlags = "--disable-fatal-warnings";
 
   NIX_CFLAGS_COMPILE = ["-I${nss.dev}/include/nss"
-                        "-I${dbus-glib.dev}/include/dbus-1.0" "-I${dbus_libs.dev}/include/dbus-1.0"];
+                        "-I${dbus-glib.dev}/include/dbus-1.0" "-I${dbus.dev}/include/dbus-1.0"];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix b/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix
index d3d14f555cf..4bd2dcbe13e 100644
--- a/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, pkgconfig, vala, glib, libxslt, gtk, wrapGAppsHook
 , webkitgtk, json-glib, rest, libsecret, dbus-glib, gtk-doc
-, telepathy-glib, gettext, dbus_libs, icu, glib-networking
+, telepathy-glib, gettext, icu, glib-networking
 , libsoup, docbook_xsl, docbook_xsl_ns, gnome3, gcr, kerberos
 }:
 
diff --git a/pkgs/desktops/gnome-3/core/libgnome-keyring/default.nix b/pkgs/desktops/gnome-3/core/libgnome-keyring/default.nix
index d46cf489620..8f77944577e 100644
--- a/pkgs/desktops/gnome-3/core/libgnome-keyring/default.nix
+++ b/pkgs/desktops/gnome-3/core/libgnome-keyring/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, glib, dbus_libs, libgcrypt, pkgconfig, intltool, gobjectIntrospection, gnome3 }:
+{ stdenv, fetchurl, glib, dbus, libgcrypt, pkgconfig, intltool, gobjectIntrospection, gnome3 }:
 
 let
   pname = "libgnome-keyring";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   outputs = [ "out" "dev" ];
 
-  propagatedBuildInputs = [ glib gobjectIntrospection dbus_libs libgcrypt ];
+  propagatedBuildInputs = [ glib gobjectIntrospection dbus libgcrypt ];
   nativeBuildInputs = [ pkgconfig intltool ];
 
   passthru = {
diff --git a/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix b/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix
index eed34ae523d..47a0238a7fd 100644
--- a/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix
+++ b/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix
@@ -1,4 +1,4 @@
-{ config, stdenv, substituteAll, fetchFromGitHub, glib, glib_networking, libgtop, pkgs }:
+{ config, stdenv, substituteAll, fetchFromGitHub, glib, glib-networking, libgtop, pkgs }:
 
 stdenv.mkDerivation rec {
   name = "gnome-shell-system-monitor-${version}";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     glib
-    glib_networking
+    glib-networking
     libgtop
   ];
 
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
     (substituteAll {
       src = ./paths_and_nonexisting_dirs.patch;
       gtop_path = "${libgtop}/lib/girepository-1.0";
-      glib_net_path = "${glib_networking}/lib/girepository-1.0";
+      glib_net_path = "${glib-networking}/lib/girepository-1.0";
     })
   ];
 
diff --git a/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix b/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix
index e3ff784b16f..7bc0ee37175 100644
--- a/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix
+++ b/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, meson, ninja, gettext, gnome3, libxslt, packagekit, polkit
-, fontconfig, libcanberra-gtk3, systemd, libnotify, wrapGAppsHook, dbus-glib, dbus_libs, desktop-file-utils }:
+, fontconfig, libcanberra-gtk3, systemd, libnotify, wrapGAppsHook, dbus-glib, dbus, desktop-file-utils }:
 
 stdenv.mkDerivation rec {
   name = "gnome-packagekit-${version}";
@@ -14,11 +14,11 @@ stdenv.mkDerivation rec {
     updateScript = gnome3.updateScript { packageName = "gnome-packagekit"; attrPath = "gnome3.gnome-packagekit"; };
   };
 
-  NIX_CFLAGS_COMPILE = "-I${dbus-glib.dev}/include/dbus-1.0 -I${dbus_libs.dev}/include/dbus-1.0";
+  NIX_CFLAGS_COMPILE = "-I${dbus-glib.dev}/include/dbus-1.0 -I${dbus.dev}/include/dbus-1.0";
 
   nativeBuildInputs = [ pkgconfig meson ninja gettext wrapGAppsHook desktop-file-utils ];
   buildInputs = [ libxslt gnome3.gtk packagekit fontconfig systemd polkit
-                  libcanberra-gtk3 libnotify dbus-glib dbus_libs ];
+                  libcanberra-gtk3 libnotify dbus-glib dbus ];
 
   prePatch = "patchShebangs meson_post_install.sh";
 
diff --git a/pkgs/desktops/gnustep/back/default.nix b/pkgs/desktops/gnustep/back/default.nix
index 7920c8e1f45..ed162229d9a 100644
--- a/pkgs/desktops/gnustep/back/default.nix
+++ b/pkgs/desktops/gnustep/back/default.nix
@@ -2,7 +2,7 @@
 , cairo
 , fetchurl
 , base, gui
-, x11
+, xlibsWrapper
 , freetype
 , pkgconfig
 , libXmu
@@ -17,7 +17,7 @@ gsmakeDerivation {
     sha256 = "012gsc7x66gmsw6r5w65a64krcigf7rzqzd5x86d4gv94344knlf";
   };
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ cairo base gui freetype x11 libXmu ];
+  buildInputs = [ cairo base gui freetype xlibsWrapper libXmu ];
   meta = {
     description = "A generic backend for GNUstep";
   };
diff --git a/pkgs/desktops/lumina/default.nix b/pkgs/desktops/lumina/default.nix
index 7563e344750..00ebfd8a725 100644
--- a/pkgs/desktops/lumina/default.nix
+++ b/pkgs/desktops/lumina/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, fluxbox, xscreensaver, desktop-file-utils,
   numlockx, xorg, qtbase, qtsvg, qtmultimedia, qtx11extras, qmake,
-  qttools, poppler_qt5, wrapGAppsHook
+  qttools, poppler, wrapGAppsHook
 }:
 
 stdenv.mkDerivation rec {
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
     qtsvg
     qtmultimedia
     qtx11extras
-    poppler_qt5
+    poppler
     fluxbox
     xscreensaver
     desktop-file-utils
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/default.nix
index e1825d21ca7..21705b0fb5e 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/default.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, substituteAll, callPackage, pkgconfig, cmake, vala, libxml2,
   glib, pcre, gtk2, gtk3, xorg, libxkbcommon, epoxy, at-spi2-core, dbus-glib, bamf,
-  xfce, libwnck3, libdbusmenu-glib, gobjectIntrospection }:
+  xfce, libwnck3, libdbusmenu, gobjectIntrospection }:
 
 stdenv.mkDerivation rec {
   name = "xfce4-vala-panel-appmenu-plugin-${version}";
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ (callPackage ./appmenu-gtk-module.nix {})
                   glib pcre gtk2 gtk3 xorg.libpthreadstubs xorg.libXdmcp libxkbcommon epoxy
                   at-spi2-core dbus-glib bamf xfce.xfce4panel_gtk3 xfce.libxfce4util xfce.xfconf
-                  libwnck3 libdbusmenu-glib gobjectIntrospection ];
+                  libwnck3 libdbusmenu gobjectIntrospection ];
 
   patches = [
     (substituteAll {
diff --git a/pkgs/desktops/xfce4-13/exo/default.nix b/pkgs/desktops/xfce4-13/exo/default.nix
index 1ff1153d727..1096996ee6d 100644
--- a/pkgs/desktops/xfce4-13/exo/default.nix
+++ b/pkgs/desktops/xfce4-13/exo/default.nix
@@ -1,4 +1,4 @@
-{ mkXfceDerivation, docbook_xml_xslt, libxslt, perlPackages, gtk2, gtk3
+{ mkXfceDerivation, docbook_xsl, libxslt, perlPackages, gtk2, gtk3
 , libxfce4ui, libxfce4util }:
 
 mkXfceDerivation rec {
@@ -14,7 +14,7 @@ mkXfceDerivation rec {
   postPatch = ''
     substituteInPlace docs/reference/Makefile.am \
       --replace http://docbook.sourceforge.net/release/xsl/current \
-                ${docbook_xml_xslt}/share/xml/docbook-xsl
+                ${docbook_xsl}/share/xml/docbook-xsl
   '';
 
   meta = {
diff --git a/pkgs/desktops/xfce4-13/thunar/default.nix b/pkgs/desktops/xfce4-13/thunar/default.nix
index 31e1101c5e2..dbeb80ac9bd 100644
--- a/pkgs/desktops/xfce4-13/thunar/default.nix
+++ b/pkgs/desktops/xfce4-13/thunar/default.nix
@@ -1,4 +1,4 @@
-{ mkXfceDerivation, docbook_xml_xslt, exo, gdk_pixbuf, gtk3, libgudev ? null
+{ mkXfceDerivation, docbook_xsl, exo, gdk_pixbuf, gtk3, libgudev ? null
 , libnotify ? null, libX11, libxfce4ui, libxfce4util, libxslt, xfconf }:
 
 mkXfceDerivation rec {
@@ -11,7 +11,7 @@ mkXfceDerivation rec {
   postPatch = ''
     substituteInPlace docs/Makefile.am \
       --replace http://docbook.sourceforge.net/release/xsl/current \
-                ${docbook_xml_xslt}/share/xml/docbook-xsl
+                ${docbook_xsl}/share/xml/docbook-xsl
   '';
 
   nativeBuildInputs = [ libxslt ];
diff --git a/pkgs/desktops/xfce4-13/xfburn/default.nix b/pkgs/desktops/xfce4-13/xfburn/default.nix
index 266722c9b05..e5898687098 100644
--- a/pkgs/desktops/xfce4-13/xfburn/default.nix
+++ b/pkgs/desktops/xfce4-13/xfburn/default.nix
@@ -1,4 +1,4 @@
-{ mkXfceDerivation, docbook_xml_xslt, exo, gtk2, libburn, libICE, libisofs, libSM, libxfce4ui, libxslt }:
+{ mkXfceDerivation, docbook_xsl, exo, gtk2, libburn, libICE, libisofs, libSM, libxfce4ui, libxslt }:
 
 mkXfceDerivation rec {
   category = "apps";
@@ -8,7 +8,7 @@ mkXfceDerivation rec {
   postPatch = ''
     substituteInPlace docs/Makefile.am \
       --replace http://docbook.sourceforge.net/release/xsl/current \
-                ${docbook_xml_xslt}/share/xml/docbook-xsl
+                ${docbook_xsl}/share/xml/docbook-xsl
   '';
 
   sha256 = "1lmv48vqrlap1a2ha72g16vqly18zvcwj8y3f3f00l10pmn52bkp";
diff --git a/pkgs/desktops/xfce4-13/xfce4-dev-tools/default.nix b/pkgs/desktops/xfce4-13/xfce4-dev-tools/default.nix
index ab64acee050..9dedb8674dc 100644
--- a/pkgs/desktops/xfce4-13/xfce4-dev-tools/default.nix
+++ b/pkgs/desktops/xfce4-13/xfce4-dev-tools/default.nix
@@ -1,4 +1,5 @@
-{ mkXfceDerivation, autoreconfHook, autoconf, automake, glib, gtk_doc, intltool, libtool }:
+{ mkXfceDerivation, autoreconfHook, autoconf, automake
+, glib, gtk-doc, intltool, libtool }:
 
 mkXfceDerivation rec {
   category = "xfce";
@@ -13,7 +14,7 @@ mkXfceDerivation rec {
     autoconf
     automake
     glib
-    gtk_doc
+    gtk-doc
     intltool
     libtool
   ];
diff --git a/pkgs/desktops/xfce4-13/xfce4-mixer/default.nix b/pkgs/desktops/xfce4-13/xfce4-mixer/default.nix
index 96deb96e7f7..76cb22b5b5f 100644
--- a/pkgs/desktops/xfce4-13/xfce4-mixer/default.nix
+++ b/pkgs/desktops/xfce4-13/xfce4-mixer/default.nix
@@ -1,4 +1,4 @@
-{ mkXfceDerivation, automakeAddFlags, dbus_glib, gst-plugins-base, gtk2
+{ mkXfceDerivation, automakeAddFlags, dbus-glib, gst-plugins-base, gtk2
 , libICE, libSM, libunique, libxfce4ui, libxfce4util, xfce4-panel, xfconf }:
 
 mkXfceDerivation rec {
@@ -16,7 +16,7 @@ mkXfceDerivation rec {
   '';
 
   buildInputs = [
-    dbus_glib
+    dbus-glib
     gst-plugins-base
     gtk2
     libICE
diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index 86494e9323b..fe4321474ec 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -442,7 +442,7 @@ self: super: builtins.intersectAttrs super {
     then addBuildDepend (dontCheck super.fsnotify) pkgs.darwin.apple_sdk.frameworks.Cocoa
     else dontCheck super.fsnotify;
 
-  hidapi = addExtraLibrary super.hidapi pkgs.libudev;
+  hidapi = addExtraLibrary super.hidapi pkgs.udev;
 
   hs-GeoIP = super.hs-GeoIP.override { GeoIP = pkgs.geoipWithDatabase; };
 
diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix
index 36d1a8326e7..d002f6eb31c 100644
--- a/pkgs/development/interpreters/racket/default.nix
+++ b/pkgs/development/interpreters/racket/default.nix
@@ -5,7 +5,7 @@
 , readline, sqlite
 , disableDocs ? false
 , CoreFoundation
-, gsettings_desktop_schemas
+, gsettings-desktop-schemas
 }:
 
 let
@@ -20,7 +20,7 @@ let
     glib
     gmp
     gtk3
-    gsettings_desktop_schemas
+    gsettings-desktop-schemas
     libedit
     libjpeg
     libpng
@@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
     (stdenv.lib.optionalString stdenv.isDarwin "-framework CoreFoundation")
   ];
 
-  buildInputs = [ fontconfig libffi libtool makeWrapper sqlite gsettings_desktop_schemas gtk3 ]
+  buildInputs = [ fontconfig libffi libtool makeWrapper sqlite gsettings-desktop-schemas gtk3 ]
     ++ stdenv.lib.optionals stdenv.isDarwin [ CoreFoundation ];
 
   preConfigure = ''
diff --git a/pkgs/development/libraries/flatpak/default.nix b/pkgs/development/libraries/flatpak/default.nix
index a229beb5ccb..b8b55d6a874 100644
--- a/pkgs/development/libraries/flatpak/default.nix
+++ b/pkgs/development/libraries/flatpak/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, autoreconfHook, docbook_xml_dtd_412, docbook_xml_dtd_42, docbook_xml_dtd_43, docbook_xsl, which, libxml2
-, gobjectIntrospection, gtk_doc, intltool, libxslt, pkgconfig, xmlto, appstream-glib, substituteAll, glibcLocales, yacc
-, bubblewrap, bzip2, dbus, glib, gpgme, json_glib, libarchive, libcap, libseccomp, coreutils, python2, hicolor-icon-theme
-, libsoup, lzma, ostree, polkit, python3, systemd, xlibs, valgrind, glib_networking, makeWrapper, gnome3 }:
+, gobjectIntrospection, gtk-doc, intltool, libxslt, pkgconfig, xmlto, appstream-glib, substituteAll, glibcLocales, yacc
+, bubblewrap, bzip2, dbus, glib, gpgme, json-glib, libarchive, libcap, libseccomp, coreutils, python2, hicolor-icon-theme
+, libsoup, lzma, ostree, polkit, python3, systemd, xorg, valgrind, glib-networking, makeWrapper, gnome3 }:
 
 let
   version = "0.99.3";
@@ -28,12 +28,12 @@ in stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     autoreconfHook libxml2 docbook_xml_dtd_412 docbook_xml_dtd_42 docbook_xml_dtd_43 docbook_xsl which gobjectIntrospection
-    gtk_doc intltool libxslt pkgconfig xmlto appstream-glib yacc makeWrapper
+    gtk-doc intltool libxslt pkgconfig xmlto appstream-glib yacc makeWrapper
   ] ++ stdenv.lib.optionals doCheck checkInputs;
 
   buildInputs = [
-    bubblewrap bzip2 dbus glib gpgme json_glib libarchive libcap libseccomp
-    libsoup lzma ostree polkit python3 systemd xlibs.libXau
+    bubblewrap bzip2 dbus glib gpgme json-glib libarchive libcap libseccomp
+    libsoup lzma ostree polkit python3 systemd xorg.libXau
   ];
 
   checkInputs = [ valgrind ];
@@ -60,7 +60,7 @@ in stdenv.mkDerivation rec {
 
   postFixup = ''
     wrapProgram $out/bin/flatpak \
-      --prefix GIO_EXTRA_MODULES : "${glib_networking.out}/lib/gio/modules" \
+      --prefix GIO_EXTRA_MODULES : "${glib-networking.out}/lib/gio/modules" \
       --prefix XDG_DATA_DIRS : "${desktop_schemas}/share/gsettings-schemas/${desktop_schemas.name}"
   '';
 
diff --git a/pkgs/development/libraries/geis/default.nix b/pkgs/development/libraries/geis/default.nix
index 5796425e438..56d8cd21f84 100644
--- a/pkgs/development/libraries/geis/default.nix
+++ b/pkgs/development/libraries/geis/default.nix
@@ -3,7 +3,7 @@
 , python3Packages
 , wrapGAppsHook
 , atk
-, dbus_libs
+, dbus
 , evemu
 , frame
 , gdk_pixbuf
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
     [ pygobject3  ];
 
   nativeBuildInputs = [ pkgconfig wrapGAppsHook python3Packages.wrapPython];
-  buildInputs = [ atk dbus_libs evemu frame gdk_pixbuf gobjectIntrospection grail
+  buildInputs = [ atk dbus evemu frame gdk_pixbuf gobjectIntrospection grail
     gtk3 libX11 libXext libXi libXtst pango python3Packages.python xorgserver
   ];
 
diff --git a/pkgs/development/libraries/glew/1.10.nix b/pkgs/development/libraries/glew/1.10.nix
index fafcf82258a..af0830ab704 100644
--- a/pkgs/development/libraries/glew/1.10.nix
+++ b/pkgs/development/libraries/glew/1.10.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libGLU, x11, libXmu, libXi
+{ stdenv, fetchurl, libGLU, xlibsWrapper, libXmu, libXi
 , buildPlatform, hostPlatform
 , AGL ? null
 }:
@@ -13,7 +13,8 @@ stdenv.mkDerivation rec {
     sha256 = "01zki46dr5khzlyywr3cg615bcal32dazfazkf360s1znqh17i4r";
   };
 
-  buildInputs = [ x11 libXmu libXi ] ++ optionals stdenv.isDarwin [ AGL ];
+  buildInputs = [ xlibsWrapper libXmu libXi ]
+              ++ optionals stdenv.isDarwin [ AGL ];
   propagatedBuildInputs = [ libGLU ]; # GL/glew.h includes GL/glu.h
 
   patchPhase = ''
diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix
index ff870f525f2..fd6e0a65abc 100644
--- a/pkgs/development/libraries/glib/default.nix
+++ b/pkgs/development/libraries/glib/default.nix
@@ -4,7 +4,8 @@
 , utillinuxMinimal ? null
 
 # this is just for tests (not in closure of any regular package)
-, coreutils, dbus_daemon, libxml2, tzdata, desktop-file-utils, shared-mime-info, doCheck ? false
+, coreutils, dbus, libxml2, tzdata, desktop-file-utils
+, shared-mime-info, doCheck ? false
 }:
 
 with stdenv.lib;
@@ -121,7 +122,7 @@ stdenv.mkDerivation rec {
     export XDG_RUNTIME_HOME="$TMP"
     export HOME="$TMP"
     export XDG_DATA_DIRS="${desktop-file-utils}/share:${shared-mime-info}/share"
-    export G_TEST_DBUS_DAEMON="${dbus_daemon.out}/bin/dbus-daemon"
+    export G_TEST_DBUS_DAEMON="${dbus.daemon}/bin/dbus-daemon"
     export PATH="$PATH:$(pwd)/gobject"
     echo "PATH=$PATH"
 
diff --git a/pkgs/development/libraries/gtkd/default.nix b/pkgs/development/libraries/gtkd/default.nix
index f206a169b93..656afef22f9 100644
--- a/pkgs/development/libraries/gtkd/default.nix
+++ b/pkgs/development/libraries/gtkd/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchzip, atk, cairo, dmd, gdk_pixbuf, gnome3, gst_all_1, librsvg
-, pango, pkgconfig, substituteAll, which }:
+, pango, pkgconfig, substituteAll, which, gst_plugins_base }:
 
 stdenv.mkDerivation rec {
   name = "gtkd-${version}";
diff --git a/pkgs/development/libraries/gupnp-dlna/default.nix b/pkgs/development/libraries/gupnp-dlna/default.nix
index 642e10ea541..75818f75692 100644
--- a/pkgs/development/libraries/gupnp-dlna/default.nix
+++ b/pkgs/development/libraries/gupnp-dlna/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig,  gobjectIntrospection, gupnp, gst_plugins_base }:
+{ stdenv, fetchurl, pkgconfig,  gobjectIntrospection, gupnp, gst-plugins-base }:
 
 stdenv.mkDerivation rec {
   name = "gupnp-dlna-${version}";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ pkgconfig gobjectIntrospection ];
-  buildInputs = [ gupnp gst_plugins_base ];
+  buildInputs = [ gupnp gst-plugins-base ];
 
   meta = {
     homepage = https://wiki.gnome.org/Projects/GUPnP/;
diff --git a/pkgs/development/libraries/kde-frameworks/kdoctools/default.nix b/pkgs/development/libraries/kde-frameworks/kdoctools/default.nix
index 0a600fe8d05..68b5c08aa09 100644
--- a/pkgs/development/libraries/kde-frameworks/kdoctools/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/kdoctools/default.nix
@@ -1,6 +1,6 @@
 {
   mkDerivation, lib,
-  extra-cmake-modules, docbook_xml_dtd_45, docbook5_xsl,
+  extra-cmake-modules, docbook_xml_dtd_45, docbook_xsl_ns,
   karchive, ki18n, qtbase,
   perl, perlPackages
 }:
@@ -24,7 +24,7 @@ mkDerivation {
   patches = [ ./kdoctools-no-find-docbook-xml.patch ];
   cmakeFlags = [
     "-DDocBookXML4_DTD_DIR=${docbook_xml_dtd_45}/xml/dtd/docbook"
-    "-DDocBookXSL_DIR=${docbook5_xsl}/xml/xsl/docbook"
+    "-DDocBookXSL_DIR=${docbook_xsl_ns}/xml/xsl/docbook"
   ];
   postFixup = ''
     moveToOutput "share/doc" "$dev"
diff --git a/pkgs/development/libraries/libblockdev/default.nix b/pkgs/development/libraries/libblockdev/default.nix
index e84df0c1aed..b5402984d16 100644
--- a/pkgs/development/libraries/libblockdev/default.nix
+++ b/pkgs/development/libraries/libblockdev/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gtk-doc, libxslt, docbook_xsl
-, docbook_xml_dtd_43, python3, gobjectIntrospection, glib, libudev, kmod, parted, libyaml
-, cryptsetup, devicemapper, dmraid, utillinux, libbytesize, libndctl, nss, volume_key
+, docbook_xml_dtd_43, python3, gobjectIntrospection, glib, udev, kmod, parted, libyaml
+, cryptsetup, lvm2, dmraid, utillinux, libbytesize, libndctl, nss, volume_key
 }:
 
 let
@@ -26,7 +26,7 @@ in stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
-    glib libudev kmod parted cryptsetup devicemapper dmraid utillinux libbytesize libndctl nss volume_key libyaml
+    glib udev kmod parted cryptsetup lvm2 dmraid utillinux libbytesize libndctl nss volume_key libyaml
   ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/libraries/libgnome-keyring/default.nix b/pkgs/development/libraries/libgnome-keyring/default.nix
index b2a0021d53b..e7157afbaee 100644
--- a/pkgs/development/libraries/libgnome-keyring/default.nix
+++ b/pkgs/development/libraries/libgnome-keyring/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, glib, dbus_libs, libgcrypt, pkgconfig,
+{ stdenv, fetchurl, glib, dbus, libgcrypt, pkgconfig,
 intltool }:
 
 stdenv.mkDerivation {
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
 
   outputs = [ "out" "dev" ];
 
-  propagatedBuildInputs = [ glib dbus_libs libgcrypt ];
+  propagatedBuildInputs = [ glib dbus libgcrypt ];
   nativeBuildInputs = [ pkgconfig intltool ];
 
   meta = {
diff --git a/pkgs/development/libraries/libindicate/default.nix b/pkgs/development/libraries/libindicate/default.nix
index 1bde9336c66..1f5ee90337a 100644
--- a/pkgs/development/libraries/libindicate/default.nix
+++ b/pkgs/development/libraries/libindicate/default.nix
@@ -2,7 +2,7 @@
 
 { stdenv, fetchurl, lib, file
 , pkgconfig, autoconf
-, glib, dbus-glib, libdbusmenu-glib
+, glib, dbus-glib, libdbusmenu
 , gtkVersion ? "3", gtk2 ? null, gtk3 ? null
 , pythonPackages, gobjectIntrospection, vala, gnome-doc-utils
 , monoSupport ? false, mono ? null, gtk-sharp-2_0 ? null
@@ -27,7 +27,7 @@ in stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkgconfig autoconf gobjectIntrospection vala gnome-doc-utils ];
 
   buildInputs = [
-    glib dbus-glib libdbusmenu-glib
+    glib dbus-glib libdbusmenu
     python pygobject2 pygtk
   ] ++ (if gtkVersion == "2"
     then [ gtk2 ] ++ optionals monoSupport [ mono gtk-sharp-2_0 ]
diff --git a/pkgs/development/libraries/libstroke/default.nix b/pkgs/development/libraries/libstroke/default.nix
index bd54b3aa343..400a107c518 100644
--- a/pkgs/development/libraries/libstroke/default.nix
+++ b/pkgs/development/libraries/libstroke/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, automake, autoconf, x11}:
+{stdenv, fetchurl, automake, autoconf, xlibsWrapper}:
 
 stdenv.mkDerivation {
   name = "libstroke-0.5.1";
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
     sha256 = "0bbpqzsqh9zrc6cg62f6vp1p4dzvv37blsd0gdlzdskgwvyzba8d";
   };
 
-  buildInputs = [ automake autoconf x11 ];
+  buildInputs = [ automake autoconf xlibsWrapper ];
 
   # libstroke ships with an ancient config.sub that doesn't know about x86_64, so regenerate it.
   # Also, modern automake doesn't like things and returns error code 63.  But it generates the file.
diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix
index b12ed961351..57eb5b42f37 100644
--- a/pkgs/development/libraries/libvirt/default.nix
+++ b/pkgs/development/libraries/libvirt/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, fetchgit
 , pkgconfig, makeWrapper, libtool, autoconf, automake
-, coreutils, libxml2, gnutls, devicemapper, perl, python2, attr
+, coreutils, libxml2, gnutls, perl, python2, attr
 , iproute, iptables, readline, lvm2, utillinux, systemd, libpciaccess, gettext
 , libtasn1, ebtables, libgcrypt, yajl, pmutils, libcap_ng, libapparmor
 , dnsmasq, libnl, libpcap, libxslt, xhtml1, numad, numactl, perlPackages
@@ -39,7 +39,7 @@ in stdenv.mkDerivation rec {
   ] ++ optionals (!buildFromTarball) [
     libtool autoconf automake
   ] ++ optionals stdenv.isLinux [
-    libpciaccess devicemapper lvm2 utillinux systemd libnl numad zfs
+    libpciaccess lvm2 utillinux systemd libnl numad zfs
     libapparmor libcap_ng numactl attr parted
   ] ++ optionals (enableXen && stdenv.isLinux && stdenv.isx86_64) [
     xen
diff --git a/pkgs/development/libraries/mailcore2/default.nix b/pkgs/development/libraries/mailcore2/default.nix
index 3828ebcb7a7..367c4e96384 100644
--- a/pkgs/development/libraries/mailcore2/default.nix
+++ b/pkgs/development/libraries/mailcore2/default.nix
@@ -1,5 +1,5 @@
 { stdenv, lib, fetchFromGitHub, cmake, libetpan, icu, cyrus_sasl, libctemplate
-, libuchardet, pkgconfig, glib, libtidy, libxml2, libuuid, openssl
+, libuchardet, pkgconfig, glib, html-tidy, libxml2, libuuid, openssl
 }:
 
 stdenv.mkDerivation rec {
@@ -17,14 +17,14 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [
     libetpan cmake icu cyrus_sasl libctemplate libuchardet glib
-    libtidy libxml2 libuuid openssl
+    html-tidy libxml2 libuuid openssl
   ];
 
   postPatch = ''
     substituteInPlace CMakeLists.txt \
        --replace " icule iculx" "" \
        --replace "tidy/tidy.h" "tidy.h" \
-       --replace "/usr/include/tidy" "${libtidy}/include" \
+       --replace "/usr/include/tidy" "${html-tidy}/include" \
        --replace "/usr/include/libxml2" "${libxml2.dev}/include/libxml2"
     substituteInPlace src/core/basetypes/MCHTMLCleaner.cpp \
       --replace buffio.h tidybuffio.h
diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix
index 7e7314c936d..c50fc9fb35c 100644
--- a/pkgs/development/libraries/pipewire/default.nix
+++ b/pkgs/development/libraries/pipewire/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, meson, ninja, pkgconfig, doxygen, graphviz, valgrind
-, glib, dbus, gst_all_1, v4l_utils, alsaLib, ffmpeg, libjack2, libudev, libva, xorg
+, glib, dbus, gst_all_1, v4l_utils, alsaLib, ffmpeg, libjack2, udev, libva, xorg
 , sbc, SDL2, makeFontsConf, freefont_ttf
 }:
 
@@ -26,7 +26,7 @@ in stdenv.mkDerivation rec {
   ];
   buildInputs = [
     glib dbus gst_all_1.gst-plugins-base gst_all_1.gstreamer v4l_utils
-    alsaLib ffmpeg libjack2 libudev libva xorg.libX11 sbc SDL2
+    alsaLib ffmpeg libjack2 udev libva xorg.libX11 sbc SDL2
   ];
 
   mesonFlags = [
diff --git a/pkgs/development/libraries/strigi/default.nix b/pkgs/development/libraries/strigi/default.nix
index 63060bf5553..e2b8279b3ca 100644
--- a/pkgs/development/libraries/strigi/default.nix
+++ b/pkgs/development/libraries/strigi/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, cmake, qt4, perl, bzip2, libxml2, exiv2
-, clucene_core, fam, zlib, dbus_tools, pkgconfig
+, clucene_core, fam, zlib, dbus, pkgconfig
 }:
 
 stdenv.mkDerivation rec {
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   CLUCENE_HOME = clucene_core;
 
   buildInputs =
-    [ zlib bzip2 libxml2 qt4 exiv2 clucene_core fam dbus_tools ];
+    [ zlib bzip2 libxml2 qt4 exiv2 clucene_core fam dbus ];
 
   nativeBuildInputs = [ cmake pkgconfig perl ];
 
diff --git a/pkgs/development/libraries/telepathy/qt/default.nix b/pkgs/development/libraries/telepathy/qt/default.nix
index 24dc3667d17..d14010c857e 100644
--- a/pkgs/development/libraries/telepathy/qt/default.nix
+++ b/pkgs/development/libraries/telepathy/qt/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, qtbase, pkgconfig, python2Packages, dbus-glib, dbus_daemon
+{ stdenv, fetchurl, cmake, qtbase, pkgconfig, python2Packages, dbus-glib, dbus
 , telepathy-farstream, telepathy-glib, fetchpatch }:
 
 let
@@ -14,7 +14,7 @@ in stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake pkgconfig python ];
   propagatedBuildInputs = [ qtbase telepathy-farstream telepathy-glib ];
   buildInputs = [ dbus-glib ];
-  checkInputs = [ dbus_daemon dbus-python ];
+  checkInputs = [ dbus.daemon dbus-python ];
 
   patches = [
     # https://github.com/TelepathyIM/telepathy-qt/issues/25
diff --git a/pkgs/development/libraries/vulkan-loader/default.nix b/pkgs/development/libraries/vulkan-loader/default.nix
index 4b84f696eec..e44a678194a 100644
--- a/pkgs/development/libraries/vulkan-loader/default.nix
+++ b/pkgs/development/libraries/vulkan-loader/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, cmake, python3, vulkan-headers, pkgconfig,
-  x11, libxcb, libXrandr, libXext, wayland, libGL_driver }:
+  xlibsWrapper, libxcb, libXrandr, libXext, wayland, libGL_driver }:
 let version = "1.1.77.0"; in
 assert version == vulkan-headers.version;
 stdenv.mkDerivation rec {
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ cmake python3 x11 libxcb libXrandr libXext wayland ];
+  buildInputs = [ cmake python3 xlibsWrapper libxcb libXrandr libXext wayland ];
   enableParallelBuilding = true;
 
   cmakeFlags = [
diff --git a/pkgs/development/libraries/wlc/default.nix b/pkgs/development/libraries/wlc/default.nix
index a672bbf52a9..2b9244ff1b1 100644
--- a/pkgs/development/libraries/wlc/default.nix
+++ b/pkgs/development/libraries/wlc/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, fetchpatch, cmake, pkgconfig
 , wayland, pixman, libxkbcommon, libinput, xcbutilwm, xcbutilimage, libGL
-, libX11, dbus_libs, wayland-protocols, libdrm, mesa_noglu
+, libX11, dbus, wayland-protocols, libdrm, mesa_noglu
 , libpthreadstubs, libXdmcp, libXext, libXfixes
 , withOptionalPackages ? true, zlib, valgrind, doxygen
 }:
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     wayland pixman libxkbcommon libinput xcbutilwm xcbutilimage libGL
-    libX11 libXfixes dbus_libs wayland-protocols
+    libX11 libXfixes dbus wayland-protocols
     libpthreadstubs libXdmcp libXext libdrm mesa_noglu ]
     ++ stdenv.lib.optionals withOptionalPackages [ zlib valgrind doxygen ];
 
diff --git a/pkgs/development/libraries/zeitgeist/default.nix b/pkgs/development/libraries/zeitgeist/default.nix
index 33cf5dd4af8..7acbaa260a0 100644
--- a/pkgs/development/libraries/zeitgeist/default.nix
+++ b/pkgs/development/libraries/zeitgeist/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchgit, pkgconfig, glib, sqlite, vala_0_38
-, autoconf, automake, libtool, gettext, dbus_libs, telepathy-glib
+, autoconf, automake, libtool, gettext, dbus, telepathy-glib
 , gtk3, json-glib, librdf_raptor2, dbus-glib
 , pythonSupport ? true, python2Packages
 }:
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ autoconf automake libtool pkgconfig gettext vala_0_38 python2Packages.python ];
   buildInputs = [
-    glib sqlite dbus_libs telepathy-glib dbus-glib
+    glib sqlite dbus telepathy-glib dbus-glib
     gtk3 json-glib librdf_raptor2 python2Packages.rdflib
   ];
 
diff --git a/pkgs/development/python-modules/dbus/default.nix b/pkgs/development/python-modules/dbus/default.nix
index f207683d2b0..5e42331d183 100644
--- a/pkgs/development/python-modules/dbus/default.nix
+++ b/pkgs/development/python-modules/dbus/default.nix
@@ -1,4 +1,4 @@
-{ lib, fetchurl, buildPythonPackage, python, pkgconfig, dbus, dbus-glib, dbus_tools, isPyPy
+{ lib, fetchurl, buildPythonPackage, python, pkgconfig, dbus, dbus-glib, isPyPy
 , ncurses, pygobject3 }:
 
 if isPyPy then throw "dbus-python not supported for interpreter ${python.executable}" else buildPythonPackage rec {
@@ -15,7 +15,7 @@ if isPyPy then throw "dbus-python not supported for interpreter ${python.executa
 
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ dbus dbus-glib ]
-    ++ lib.optionals doCheck [ dbus_tools pygobject3 ]
+    ++ lib.optionals doCheck [ pygobject3 ]
     # My guess why it's sometimes trying to -lncurses.
     # It seems not to retain the dependency anyway.
     ++ lib.optional (! python ? modules) ncurses;
diff --git a/pkgs/development/python-modules/mysqlclient/default.nix b/pkgs/development/python-modules/mysqlclient/default.nix
index 0be0f892d73..9aabd6d94e2 100644
--- a/pkgs/development/python-modules/mysqlclient/default.nix
+++ b/pkgs/development/python-modules/mysqlclient/default.nix
@@ -1,11 +1,11 @@
-{ stdenv, buildPythonPackage, fetchPypi, libmysql }:
+{ stdenv, buildPythonPackage, fetchPypi, mysql }:
 
 buildPythonPackage rec {
   pname = "mysqlclient";
   version = "1.3.12";
 
   buildInputs = [
-    libmysql
+    mysql.connector-c
   ];
 
   # Tests need a MySQL database
diff --git a/pkgs/development/python-modules/pyqt/4.x.nix b/pkgs/development/python-modules/pyqt/4.x.nix
index 0efb77d27b3..a747d42e418 100644
--- a/pkgs/development/python-modules/pyqt/4.x.nix
+++ b/pkgs/development/python-modules/pyqt/4.x.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pythonPackages, qt4, pkgconfig, lndir, dbus_libs, makeWrapper }:
+{ stdenv, fetchurl, pythonPackages, qt4, pkgconfig, lndir, dbus, makeWrapper }:
 
 let
   pname = "PyQt-x11-gpl";
@@ -42,7 +42,7 @@ in buildPythonPackage {
   '';
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ makeWrapper qt4 lndir dbus_libs ];
+  buildInputs = [ makeWrapper qt4 lndir dbus ];
 
   propagatedBuildInputs = [ sip ];
 
diff --git a/pkgs/development/python-modules/pyqt/5.x.nix b/pkgs/development/python-modules/pyqt/5.x.nix
index b669c145641..ebad81f809b 100644
--- a/pkgs/development/python-modules/pyqt/5.x.nix
+++ b/pkgs/development/python-modules/pyqt/5.x.nix
@@ -1,5 +1,5 @@
 { lib, fetchurl, fetchpatch, pythonPackages, pkgconfig, makeWrapper
-, qmake, lndir, qtbase, qtsvg, qtwebkit, qtwebengine, dbus_libs
+, qmake, lndir, qtbase, qtsvg, qtwebkit, qtwebengine, dbus
 , withWebSockets ? false, qtwebsockets
 , withConnectivity ? false, qtconnectivity
 }:
@@ -32,7 +32,7 @@ in buildPythonPackage {
 
   nativeBuildInputs = [ pkgconfig qmake lndir ];
 
-  buildInputs = [ dbus_libs ];
+  buildInputs = [ dbus ];
 
   propagatedBuildInputs = [
     sip qtbase qtsvg qtwebkit qtwebengine
@@ -53,7 +53,7 @@ in buildPythonPackage {
 
     ${python.executable} configure.py  -w \
       --confirm-license \
-      --dbus=${dbus_libs.dev}/include/dbus-1.0 \
+      --dbus=${dbus.dev}/include/dbus-1.0 \
       --no-qml-plugin \
       --bindir=$out/bin \
       --destdir=$out/${python.sitePackages} \
diff --git a/pkgs/development/tools/buildah/default.nix b/pkgs/development/tools/buildah/default.nix
index b820dc997e4..2dca2b6cd42 100644
--- a/pkgs/development/tools/buildah/default.nix
+++ b/pkgs/development/tools/buildah/default.nix
@@ -1,5 +1,5 @@
 { stdenv, lib, buildGoPackage, fetchFromGitHub, runCommand
-, gpgme, libgpgerror, devicemapper, btrfs-progs, pkgconfig, ostree, libselinux, libseccomp
+, gpgme, libgpgerror, lvm2, btrfs-progs, pkgconfig, ostree, libselinux, libseccomp
 , go-md2man }:
 
 let
@@ -26,7 +26,7 @@ in buildGoPackage rec {
   hardeningDisable = [ "fortify" ];
 
   nativeBuildInputs = [ pkgconfig go-md2man.bin ];
-  buildInputs = [ gpgme libgpgerror devicemapper btrfs-progs ostree libselinux libseccomp ];
+  buildInputs = [ gpgme libgpgerror lvm2 btrfs-progs ostree libselinux libseccomp ];
 
   # Copied from the skopeo package, doesn’t seem to make a difference?
   # If something related to these libs failed, uncomment these lines.
diff --git a/pkgs/development/tools/flatpak-builder/default.nix b/pkgs/development/tools/flatpak-builder/default.nix
index 377791007a3..b4a35b3a21c 100644
--- a/pkgs/development/tools/flatpak-builder/default.nix
+++ b/pkgs/development/tools/flatpak-builder/default.nix
@@ -25,7 +25,7 @@
 , gitMinimal
 , glib
 , gnutar
-, json_glib
+, json-glib
 , libcap
 , libdwarf
 , libsoup
@@ -67,7 +67,7 @@ in stdenv.mkDerivation rec {
     elfutils
     flatpak
     glib
-    json_glib
+    json-glib
     libcap
     libdwarf
     libsoup
diff --git a/pkgs/development/tools/react-native-debugger/default.nix b/pkgs/development/tools/react-native-debugger/default.nix
index 5e88384c58d..775b744f839 100644
--- a/pkgs/development/tools/react-native-debugger/default.nix
+++ b/pkgs/development/tools/react-native-debugger/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, unzip, cairo, xorg, gdk_pixbuf, fontconfig, pango, gnome2, atk, gtk2, glib
-, freetype, dbus, nss, nspr, alsaLib, cups, expat, libudev, makeDesktopItem
+, freetype, dbus, nss, nspr, alsaLib, cups, expat, udev, makeDesktopItem
 }:
 
 let
@@ -19,7 +19,7 @@ let
     alsaLib
     cups
     expat
-    libudev
+    udev
 
     gnome2.GConf
 
diff --git a/pkgs/development/tools/skopeo/default.nix b/pkgs/development/tools/skopeo/default.nix
index 0535a11e0ce..dc157b67253 100644
--- a/pkgs/development/tools/skopeo/default.nix
+++ b/pkgs/development/tools/skopeo/default.nix
@@ -1,5 +1,5 @@
 { stdenv, lib, buildGoPackage, fetchFromGitHub, runCommand
-, gpgme, libgpgerror, devicemapper, btrfs-progs, pkgconfig, ostree, libselinux
+, gpgme, libgpgerror, lvm2, btrfs-progs, pkgconfig, ostree, libselinux
 , go-md2man }:
 
 with stdenv.lib;
@@ -28,7 +28,7 @@ buildGoPackage rec {
   excludedPackages = "integration";
 
   nativeBuildInputs = [ pkgconfig (lib.getBin go-md2man) ];
-  buildInputs = [ gpgme libgpgerror devicemapper btrfs-progs ostree libselinux ];
+  buildInputs = [ gpgme libgpgerror lvm2 btrfs-progs ostree libselinux ];
 
   buildFlagsArray = ''
     -ldflags=
@@ -37,8 +37,8 @@ buildGoPackage rec {
   '';
 
   preBuild = ''
-    export CGO_CFLAGS="-I${getDev gpgme}/include -I${getDev libgpgerror}/include -I${getDev devicemapper}/include -I${getDev btrfs-progs}/include"
-    export CGO_LDFLAGS="-L${getLib gpgme}/lib -L${getLib libgpgerror}/lib -L${getLib devicemapper}/lib"
+    export CGO_CFLAGS="-I${getDev gpgme}/include -I${getDev libgpgerror}/include -I${getDev lvm2}/include -I${getDev btrfs-progs}/include"
+    export CGO_LDFLAGS="-L${getLib gpgme}/lib -L${getLib libgpgerror}/lib -L${getLib lvm2}/lib"
   '';
 
   postBuild = ''
diff --git a/pkgs/development/tools/vulkan-validation-layers/default.nix b/pkgs/development/tools/vulkan-validation-layers/default.nix
index 8951f16e43c..da2612415ba 100644
--- a/pkgs/development/tools/vulkan-validation-layers/default.nix
+++ b/pkgs/development/tools/vulkan-validation-layers/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, cmake, python3, vulkan-headers, vulkan-loader,
-  glslang, pkgconfig, x11, libxcb, libXrandr, wayland }:
+  glslang, pkgconfig, xlibsWrapper, libxcb, libXrandr, wayland }:
 
 stdenv.mkDerivation rec {
   name = "vulkan-validation-layers-${version}";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ cmake python3 vulkan-headers vulkan-loader x11 libxcb libXrandr wayland ];
+  buildInputs = [ cmake python3 vulkan-headers vulkan-loader xlibsWrapper libxcb libXrandr wayland ];
   enableParallelBuilding = true;
 
   cmakeFlags = [ "-DGLSLANG_INSTALL_DIR=${glslang}" ];
diff --git a/pkgs/development/web/insomnia/default.nix b/pkgs/development/web/insomnia/default.nix
index fbf76842c20..1487ed4e1dd 100644
--- a/pkgs/development/web/insomnia/default.nix
+++ b/pkgs/development/web/insomnia/default.nix
@@ -1,5 +1,5 @@
 { stdenv, lib, makeWrapper, fetchurl, dpkg
-, alsaLib, atk, cairo, cups, dbus_daemon, expat, fontconfig, freetype
+, alsaLib, atk, cairo, cups, dbus, expat, fontconfig, freetype
 , gdk_pixbuf, glib, gnome2, gtk2-x11, nspr, nss
 , libX11, libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext
 , libXfixes, libXi, libXrandr, libXrender, libXtst, libxcb, nghttp2
@@ -8,8 +8,8 @@
 
 let
   libPath = lib.makeLibraryPath [
-    alsaLib atk cairo cups dbus_daemon.lib expat fontconfig freetype gdk_pixbuf glib gnome2.GConf gnome2.pango
-    gtk2-x11 nspr nss stdenv.cc.cc.lib libX11 libXScrnSaver libXcomposite libXcursor libXdamage libXext libXfixes
+    alsaLib atk cairo cups dbus expat fontconfig freetype gdk_pixbuf glib gnome2.GConf gnome2.pango
+    gtk2-x11 nspr nss stdenv.cc.cc libX11 libXScrnSaver libXcomposite libXcursor libXdamage libXext libXfixes
     libXi libXrandr libXrender libXtst libxcb
   ];
   runtimeLibs = lib.makeLibraryPath [ libudev0-shim glibc curl openssl nghttp2 ];
diff --git a/pkgs/games/mar1d/default.nix b/pkgs/games/mar1d/default.nix
index dce52d4c295..da711f59af0 100644
--- a/pkgs/games/mar1d/default.nix
+++ b/pkgs/games/mar1d/default.nix
@@ -2,7 +2,7 @@
 , fetchFromGitHub
 , cmake
 , libGLU
-, x11
+, xlibsWrapper
 , xorg
 , xinput_calibrator
 , doxygen
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
       libao
       libpthreadstubs
       libGLU
-      x11
+      xlibsWrapper
       xinput_calibrator
       xorg.libXrandr
       xorg.libXi
diff --git a/pkgs/games/openrw/default.nix b/pkgs/games/openrw/default.nix
index 5a8a8d244bf..63fb24dc4d7 100644
--- a/pkgs/games/openrw/default.nix
+++ b/pkgs/games/openrw/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, cmake, sfml, libGLU_combined, bullet, glm, libmad, x11, openal
+{ stdenv, fetchgit, cmake, sfml, libGLU_combined, bullet, glm, libmad, xlibsWrapper, openal
 , SDL2, boost, ffmpeg }:
 
 stdenv.mkDerivation rec {
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [
-    cmake sfml libGLU_combined bullet glm libmad x11 openal SDL2 boost ffmpeg
+    cmake sfml libGLU_combined bullet glm libmad xlibsWrapper openal SDL2 boost ffmpeg
   ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/misc/drivers/moltengamepad/default.nix b/pkgs/misc/drivers/moltengamepad/default.nix
index 590441bb6dd..31b13baf796 100644
--- a/pkgs/misc/drivers/moltengamepad/default.nix
+++ b/pkgs/misc/drivers/moltengamepad/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, libudev }:
+{ stdenv, fetchFromGitHub, udev }:
 
 stdenv.mkDerivation rec {
   name = "moltengamepad-git-${version}";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   hardeningDisable = [ "format" ];
 
-  buildInputs = [ libudev ];
+  buildInputs = [ udev ];
 
   buildPhase = ''
     make
diff --git a/pkgs/misc/emulators/dolphin-emu/master.nix b/pkgs/misc/emulators/dolphin-emu/master.nix
index 6959177b3c9..bc872bb5faa 100644
--- a/pkgs/misc/emulators/dolphin-emu/master.nix
+++ b/pkgs/misc/emulators/dolphin-emu/master.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, makeWrapper, makeDesktopItem, pkgconfig, cmake, qt5
 , bluez, ffmpeg, libao, libGLU_combined, pcre, gettext, libXrandr, libusb, lzo
 , libpthreadstubs, libXext, libXxf86vm, libXinerama, libSM, libXdmcp, readline
-, openal, libudev, libevdev, portaudio, curl, alsaLib, miniupnpc, enet, polarssl
+, openal, udev, libevdev, portaudio, curl, alsaLib, miniupnpc, enet, mbedtls
 , soundtouch, sfml, vulkan-loader ? null, libpulseaudio ? null
 
 # - Inputs used for Darwin
@@ -36,10 +36,10 @@ in stdenv.mkDerivation rec {
   buildInputs = [
     curl ffmpeg libao libGLU_combined pcre gettext libpthreadstubs libpulseaudio
     libXrandr libXext libXxf86vm libXinerama libSM readline openal libXdmcp lzo
-    portaudio libusb libpng hidapi miniupnpc enet polarssl soundtouch sfml
+    portaudio libusb libpng hidapi miniupnpc enet mbedtls soundtouch sfml
     qt5.qtbase
   ] ++ stdenv.lib.optionals stdenv.isLinux [
-    bluez libudev libevdev alsaLib vulkan-loader
+    bluez udev libevdev alsaLib vulkan-loader
   ] ++ stdenv.lib.optionals stdenv.isDarwin [
     CoreBluetooth cf-private OpenGL ForceFeedback IOKit
   ];
diff --git a/pkgs/misc/emulators/retroarch/cores.nix b/pkgs/misc/emulators/retroarch/cores.nix
index 8c965e471e5..8f6e66c18c3 100644
--- a/pkgs/misc/emulators/retroarch/cores.nix
+++ b/pkgs/misc/emulators/retroarch/cores.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchgit, fetchFromGitLab, cmake, pkgconfig, makeWrapper, python27, retroarch
 , alsaLib, fluidsynth, curl, hidapi, libGLU_combined, gettext, glib, gtk2, portaudio, SDL
-, ffmpeg, pcre, libevdev, libpng, libjpeg, libudev, libvorbis
+, ffmpeg, pcre, libevdev, libpng, libjpeg, udev, libvorbis
 , miniupnpc, sfml, xorg, zlib }:
 
 let
@@ -149,7 +149,7 @@ in with stdenv.lib.licenses;
     extraBuildInputs = [
       cmake curl libGLU_combined pcre pkgconfig sfml miniupnpc
       gettext glib gtk2 hidapi
-      libevdev libudev
+      libevdev udev
     ] ++ (with xorg; [ libSM libX11 libXi libpthreadstubs libxcb xcbutil ]);
   }).override {
     cmakeFlags = [
diff --git a/pkgs/os-specific/linux/amdgpu-pro/default.nix b/pkgs/os-specific/linux/amdgpu-pro/default.nix
index 6828fbf6b1c..df0ef80ff4d 100644
--- a/pkgs/os-specific/linux/amdgpu-pro/default.nix
+++ b/pkgs/os-specific/linux/amdgpu-pro/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, elfutils
-, xorg, patchelf, openssl, libdrm, libudev
+, xorg, patchelf, openssl, libdrm, udev
 , libxcb, libxshmfence, epoxy, perl, zlib
 , fetchFromGitHub, ncurses
 , libsOnly ? false, kernel ? null
@@ -101,7 +101,7 @@ in stdenv.mkDerivation rec {
 
   depLibPath = makeLibraryPath [
     stdenv.cc.cc.lib xorg.libXext xorg.libX11 xorg.libXdamage xorg.libXfixes zlib
-    xorg.libXxf86vm libxcb libxshmfence epoxy openssl libdrm elfutils libudev ncurses5
+    xorg.libXxf86vm libxcb libxshmfence epoxy openssl libdrm elfutils udev ncurses5
   ];
 
   installPhase = ''
diff --git a/pkgs/os-specific/linux/cryptsetup/default.nix b/pkgs/os-specific/linux/cryptsetup/default.nix
index e1da0a449c5..a09fa93cb78 100644
--- a/pkgs/os-specific/linux/cryptsetup/default.nix
+++ b/pkgs/os-specific/linux/cryptsetup/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchurl, fetchpatch, devicemapper, json_c, openssl, libuuid, pkgconfig, popt
+{ stdenv, fetchurl, fetchpatch, lvm2, json_c
+, openssl, libuuid, pkgconfig, popt
 , enablePython ? false, python2 ? null }:
 
 assert enablePython -> python2 != null;
@@ -28,7 +29,7 @@ stdenv.mkDerivation rec {
   ] ++ stdenv.lib.optional enablePython "--enable-python";
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ devicemapper json_c openssl libuuid popt ]
+  buildInputs = [ lvm2 json_c openssl libuuid popt ]
     ++ stdenv.lib.optional enablePython python2;
 
   meta = {
diff --git a/pkgs/os-specific/linux/dmraid/default.nix b/pkgs/os-specific/linux/dmraid/default.nix
index e71d36c5e48..a6f6365ae63 100644
--- a/pkgs/os-specific/linux/dmraid/default.nix
+++ b/pkgs/os-specific/linux/dmraid/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, devicemapper }:
+{ stdenv, fetchurl, fetchpatch, lvm2 }:
 
 stdenv.mkDerivation rec {
   name = "dmraid-1.0.0.rc16";
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
 
   preConfigure = "cd */";
 
-  buildInputs = [ devicemapper ];
+  buildInputs = [ lvm2 ];
 
   meta = {
     description = "Old-style RAID configuration utility";
diff --git a/pkgs/os-specific/linux/iputils/default.nix b/pkgs/os-specific/linux/iputils/default.nix
index d2eab02f675..d0a8950a508 100644
--- a/pkgs/os-specific/linux/iputils/default.nix
+++ b/pkgs/os-specific/linux/iputils/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl
-, libsysfs, gnutls, openssl
+, sysfsutils, gnutls, openssl
 , libcap, opensp, docbook_sgml_dtd_31
 , libidn, nettle
 , SGMLSpm, libgcrypt }:
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
 
   depsBuildBuild = [ opensp SGMLSpm docbook_sgml_dtd_31 ];
   buildInputs = [
-    libsysfs openssl libcap libgcrypt nettle
+    sysfsutils openssl libcap libgcrypt nettle
   ] ++ stdenv.lib.optional (!stdenv.hostPlatform.isMusl) libidn;
 
   # ninfod probably could build on cross, but the Makefile doesn't pass --host etc to the sub configure...
diff --git a/pkgs/os-specific/linux/kernel/perf.nix b/pkgs/os-specific/linux/kernel/perf.nix
index c58851bb03e..840d4cc9cf7 100644
--- a/pkgs/os-specific/linux/kernel/perf.nix
+++ b/pkgs/os-specific/linux/kernel/perf.nix
@@ -1,6 +1,6 @@
 { lib, stdenv, kernel, elfutils, python, perl, newt, slang, asciidoc, xmlto, makeWrapper
 , docbook_xsl, docbook_xml_dtd_45, libxslt, flex, bison, pkgconfig, libunwind, binutils
-, libiberty, libaudit, libbfd, openssl, systemtap, numactl
+, libiberty, audit, libbfd, openssl, systemtap, numactl
 , zlib, withGtk ? false, gtk2 ? null
 }:
 
@@ -36,7 +36,7 @@ stdenv.mkDerivation {
   # perf refers both to newt and slang
   nativeBuildInputs = [
     asciidoc xmlto docbook_xsl docbook_xml_dtd_45 libxslt
-    flex bison libiberty libaudit makeWrapper pkgconfig python perl
+    flex bison libiberty audit makeWrapper pkgconfig python perl
   ];
   buildInputs = [
     elfutils newt slang libunwind libbfd zlib openssl systemtap.stapBuild numactl
diff --git a/pkgs/os-specific/linux/libsemanage/default.nix b/pkgs/os-specific/linux/libsemanage/default.nix
index 45222bee6b0..1664a2afac5 100644
--- a/pkgs/os-specific/linux/libsemanage/default.nix
+++ b/pkgs/os-specific/linux/libsemanage/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, bison, flex, libsepol, libselinux, bzip2, libaudit
+{ stdenv, fetchurl, pkgconfig, bison, flex, libsepol, libselinux, bzip2, audit
 , enablePython ? true, swig ? null, python ? null
 }:
 
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ bison flex pkgconfig ];
-  buildInputs = [ libsepol libselinux bzip2 libaudit ]
+  buildInputs = [ libsepol libselinux bzip2 audit ]
     ++ optionals enablePython [ swig python ];
 
   preBuild = ''
diff --git a/pkgs/os-specific/linux/lvm2/default.nix b/pkgs/os-specific/linux/lvm2/default.nix
index 8cda636e987..0f542b9e382 100644
--- a/pkgs/os-specific/linux/lvm2/default.nix
+++ b/pkgs/os-specific/linux/lvm2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, pkgconfig, systemd, libudev, utillinux, coreutils, libuuid
+{ stdenv, fetchurl, fetchpatch, pkgconfig, systemd, udev, utillinux, coreutils, libuuid
 , thin-provisioning-tools, enable_dmeventd ? false }:
 
 let
@@ -27,7 +27,7 @@ stdenv.mkDerivation {
   ];
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ libudev libuuid thin-provisioning-tools ];
+  buildInputs = [ udev libuuid thin-provisioning-tools ];
 
   preConfigure =
     ''
diff --git a/pkgs/os-specific/linux/pm-utils/default.nix b/pkgs/os-specific/linux/pm-utils/default.nix
index 326ba444957..a5577b97b87 100644
--- a/pkgs/os-specific/linux/pm-utils/default.nix
+++ b/pkgs/os-specific/linux/pm-utils/default.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchurl, coreutils, gnugrep, utillinux, kmod
-, procps, kbd, dbus_tools }:
+, procps, kbd, dbus }:
 
 let
 
   binPath = stdenv.lib.makeBinPath
-    [ coreutils gnugrep utillinux kmod procps kbd dbus_tools ];
+    [ coreutils gnugrep utillinux kmod procps kbd dbus ];
 
   sbinPath = stdenv.lib.makeSearchPathOutput "bin" "sbin"
     [ procps ];
diff --git a/pkgs/os-specific/linux/rdma-core/default.nix b/pkgs/os-specific/linux/rdma-core/default.nix
index 0cfc266d871..de7164b2af0 100644
--- a/pkgs/os-specific/linux/rdma-core/default.nix
+++ b/pkgs/os-specific/linux/rdma-core/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, cmake, pkgconfig, pandoc
-, ethtool, nettools, libnl, libudev, python, perl
+, ethtool, nettools, libnl, udev, python, perl
 } :
 
 let
@@ -16,7 +16,7 @@ in stdenv.mkDerivation {
   };
 
   nativeBuildInputs = [ cmake pkgconfig pandoc ];
-  buildInputs = [ libnl ethtool nettools libudev python perl ];
+  buildInputs = [ libnl ethtool nettools udev python perl ];
 
   cmakeFlags = [
     "-DCMAKE_INSTALL_RUNDIR=/run"
@@ -37,4 +37,3 @@ in stdenv.mkDerivation {
     maintainers = with maintainers; [ markuskowa ];
   };
 }
-
diff --git a/pkgs/os-specific/linux/sssd/default.nix b/pkgs/os-specific/linux/sssd/default.nix
index bbc4bc7da46..99e4b09f46d 100644
--- a/pkgs/os-specific/linux/sssd/default.nix
+++ b/pkgs/os-specific/linux/sssd/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, pkgs, lib, glibc, augeas, dnsutils, c-ares, curl,
   cyrus_sasl, ding-libs, libnl, libunistring, nss, samba, libnfsidmap, doxygen,
   python, python3, pam, popt, talloc, tdb, tevent, pkgconfig, ldb, openldap,
-  pcre, kerberos, cifs_utils, glib, keyutils, dbus, fakeroot, libxslt, libxml2,
-  libuuid, docbook_xml_xslt, ldap, systemd, nspr, check, cmocka, uid_wrapper,
+  pcre, kerberos, cifs-utils, glib, keyutils, dbus, fakeroot, libxslt, libxml2,
+  libuuid, docbook_xsl, ldap, systemd, nspr, check, cmocka, uid_wrapper,
   nss_wrapper, docbook_xml_dtd_44, ncurses, Po4a, http-parser, jansson
   , withSudo ? false }:
 
 let
-  docbookFiles = "${pkgs.docbook_xml_xslt}/share/xml/docbook-xsl/catalog.xml:${pkgs.docbook_xml_dtd_44}/xml/dtd/docbook/catalog.xml";
+  docbookFiles = "${pkgs.docbook_xsl}/share/xml/docbook-xsl/catalog.xml:${pkgs.docbook_xml_dtd_44}/xml/dtd/docbook/catalog.xml";
 in
 stdenv.mkDerivation rec {
   name = "sssd-${version}";
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ augeas dnsutils c-ares curl cyrus_sasl ding-libs libnl libunistring nss
                   samba libnfsidmap doxygen python python3 popt
                   talloc tdb tevent pkgconfig ldb pam openldap pcre kerberos
-                  cifs_utils glib keyutils dbus fakeroot libxslt libxml2
+                  cifs-utils glib keyutils dbus fakeroot libxslt libxml2
                   libuuid ldap systemd nspr check cmocka uid_wrapper
                   nss_wrapper ncurses Po4a http-parser jansson ];
 
diff --git a/pkgs/os-specific/linux/wpa_supplicant/default.nix b/pkgs/os-specific/linux/wpa_supplicant/default.nix
index 3dce750d255..7b421aaff3d 100644
--- a/pkgs/os-specific/linux/wpa_supplicant/default.nix
+++ b/pkgs/os-specific/linux/wpa_supplicant/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchpatch, fetchurl, lib, openssl, pkgconfig, libnl
-, dbus_libs ? null, readline ? null, pcsclite ? null
+, dbus, readline ? null, pcsclite ? null
 }:
 
 with stdenv.lib;
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
     CONFIG_EAP_AKA=y
     CONFIG_EAP_AKA_PRIME=y
     CONFIG_PCSC=y
-  '' + optionalString (dbus_libs != null) ''
+  '' + optionalString (dbus != null) ''
     CONFIG_CTRL_IFACE_DBUS=y
     CONFIG_CTRL_IFACE_DBUS_NEW=y
     CONFIG_CTRL_IFACE_DBUS_INTRO=y
@@ -74,7 +74,7 @@ stdenv.mkDerivation rec {
       -I${stdenv.lib.getDev pcsclite}/include/PCSC/"
   '';
 
-  buildInputs = [ openssl libnl dbus_libs readline pcsclite ];
+  buildInputs = [ openssl libnl dbus readline pcsclite ];
 
   nativeBuildInputs = [ pkgconfig ];
 
diff --git a/pkgs/servers/openafs/1.6/module.nix b/pkgs/servers/openafs/1.6/module.nix
index 8cd9287a777..bf4f36bb250 100644
--- a/pkgs/servers/openafs/1.6/module.nix
+++ b/pkgs/servers/openafs/1.6/module.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, which, autoconf, automake, flex, yacc
+{ stdenv, fetchurl, which, autoconf, automake, flex, bison
 , kernel, glibc, perl }:
 
 with (import ./srcs.nix { inherit fetchurl; });
@@ -11,7 +11,7 @@ in stdenv.mkDerivation rec {
   name = "openafs-${version}-${kernel.version}";
   inherit version src;
 
-  nativeBuildInputs = [ autoconf automake flex perl yacc which ] ++ kernel.moduleBuildDependencies;
+  nativeBuildInputs = [ autoconf automake flex perl bison which ] ++ kernel.moduleBuildDependencies;
 
   hardeningDisable = [ "pic" ];
 
diff --git a/pkgs/tools/X11/xidlehook/default.nix b/pkgs/tools/X11/xidlehook/default.nix
index 2faa8ead071..b9623534140 100644
--- a/pkgs/tools/X11/xidlehook/default.nix
+++ b/pkgs/tools/X11/xidlehook/default.nix
@@ -1,4 +1,5 @@
-{ lib, stdenv, rustPlatform, fetchFromGitHub, x11, xorg, libpulseaudio, pkgconfig, patchelf }:
+{ lib, stdenv, rustPlatform, fetchFromGitHub
+, xlibsWrapper, xorg, libpulseaudio, pkgconfig, patchelf }:
 
 rustPlatform.buildRustPackage rec {
   name = "xidlehook-${version}";
@@ -17,7 +18,7 @@ rustPlatform.buildRustPackage rec {
   cargoBuildFlags = lib.optionals (!stdenv.isLinux) ["--no-default-features" "--features" "pulse"];
   cargoSha256 = "1mrg59flmmqg5wwi2l8lw6p1xpgdw597fdfsmpn8b126rgzqmjl8";
 
-  buildInputs = [ x11 xorg.libXScrnSaver libpulseaudio ];
+  buildInputs = [ xlibsWrapper xorg.libXScrnSaver libpulseaudio ];
   nativeBuildInputs = [ pkgconfig patchelf ];
 
   postFixup = lib.optionalString stdenv.isLinux ''
diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix
index 7523bab2e8c..8bff5a2e714 100644
--- a/pkgs/tools/X11/xpra/default.nix
+++ b/pkgs/tools/X11/xpra/default.nix
@@ -3,7 +3,7 @@
 , makeWrapper, xkbcomp, xorgserver, getopt, xauth, utillinux, which, fontsConf
 , ffmpeg, x264, libvpx, libwebp
 , libfakeXinerama
-, gst_all_1, pulseaudioLight, gobjectIntrospection
+, gst_all_1, pulseaudio, gobjectIntrospection
 , pam }:
 
 with lib;
@@ -61,7 +61,7 @@ in buildPythonApplication rec {
       --set GI_TYPELIB_PATH "$GI_TYPELIB_PATH" \
       --set GST_PLUGIN_SYSTEM_PATH_1_0 "$GST_PLUGIN_SYSTEM_PATH_1_0" \
       --prefix LD_LIBRARY_PATH : ${libfakeXinerama}/lib  \
-      --prefix PATH : ${stdenv.lib.makeBinPath [ getopt xorgserver xauth which utillinux pulseaudioLight ]}
+      --prefix PATH : ${stdenv.lib.makeBinPath [ getopt xorgserver xauth which utillinux pulseaudio ]}
   '';
 
   preCheck = "exit 0";
diff --git a/pkgs/tools/X11/xwinwrap/default.nix b/pkgs/tools/X11/xwinwrap/default.nix
index 6ea24ad2c6a..cc2eb50ce1f 100644
--- a/pkgs/tools/X11/xwinwrap/default.nix
+++ b/pkgs/tools/X11/xwinwrap/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchbzr, x11 }:
+{ stdenv, fetchbzr, xlibsWrapper }:
 
 let
   version = "4";
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
   };
 
   buildInputs = [
-    x11
+    xlibsWrapper
   ];
 
   buildPhase = if stdenv.system == "x86_64-linux" then ''
diff --git a/pkgs/tools/bluetooth/obex-data-server/default.nix b/pkgs/tools/bluetooth/obex-data-server/default.nix
index ffc7ee192c9..5c272e3dbaf 100644
--- a/pkgs/tools/bluetooth/obex-data-server/default.nix
+++ b/pkgs/tools/bluetooth/obex-data-server/default.nix
@@ -1,21 +1,21 @@
-{ stdenv, fetchurl, pkgconfig, libusb, glib, dbus-glib, bluez, openobex, dbus_libs }:
-   
+{ stdenv, fetchurl, pkgconfig, libusb, glib, dbus-glib, bluez, openobex, dbus }:
+
 stdenv.mkDerivation rec {
   name = "obex-data-server-0.4.6";
-   
+
   src = fetchurl {
     url = "http://tadas.dailyda.com/software/${name}.tar.gz";
     sha256 = "0kq940wqs9j8qjnl58d6l3zhx0jaszci356xprx23l6nvdfld6dk";
   };
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ libusb glib dbus-glib bluez openobex dbus_libs ];
+  buildInputs = [ libusb glib dbus-glib bluez openobex dbus ];
 
   patches = [ ./obex-data-server-0.4.6-build-fixes-1.patch ];
 
   preConfigure = ''
   addToSearchPath PKG_CONFIG_PATH ${openobex}/lib64/pkgconfig
-  export PKG_CONFIG_PATH="${dbus_libs.dev}/lib/pkgconfig:$PKG_CONFIG_PATH"
+  export PKG_CONFIG_PATH="${dbus.dev}/lib/pkgconfig:$PKG_CONFIG_PATH"
   '';
 
   meta = {
diff --git a/pkgs/tools/compression/pixz/default.nix b/pkgs/tools/compression/pixz/default.nix
index 2a5250a95ac..7eca80f8400 100644
--- a/pkgs/tools/compression/pixz/default.nix
+++ b/pkgs/tools/compression/pixz/default.nix
@@ -1,6 +1,6 @@
-{ 
+{
   stdenv, fetchFromGitHub, autoconf, automake, libtool, pkgconfig
-  , asciidoc, libxslt, libxml2, docbook_xml_dtd_45, docbook_xml_xslt
+  , asciidoc, libxslt, libxml2, docbook_xml_dtd_45, docbook_xsl
   , libarchive, lzma
 }:
 stdenv.mkDerivation rec {
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [
     autoconf automake libtool asciidoc libxslt libxml2
-    docbook_xml_dtd_45 docbook_xml_xslt
+    docbook_xml_dtd_45 docbook_xsl
     libarchive lzma
   ];
   preBuild = ''
diff --git a/pkgs/tools/filesystems/ceph/generic.nix b/pkgs/tools/filesystems/ceph/generic.nix
index 4325a935536..672b289b5bb 100644
--- a/pkgs/tools/filesystems/ceph/generic.nix
+++ b/pkgs/tools/filesystems/ceph/generic.nix
@@ -2,7 +2,7 @@
 , which, git
 , boost, python2Packages
 , libxml2, zlib
-, openldap, lttngUst
+, openldap, lttng-ust
 , babeltrace, gperf
 , cunit, snappy
 , rocksdb, makeWrapper
@@ -84,11 +84,11 @@ let
     none = [ ];
   };
 
-  ceph-python-env = python2Packages.python.withPackages (ps: [ 
+  ceph-python-env = python2Packages.python.withPackages (ps: [
     ps.sphinx
     ps.flask
     ps.argparse
-    ps.cython 
+    ps.cython
     ps.setuptools
     ps.pip
     # Libraries needed by the python tools
@@ -105,9 +105,9 @@ stdenv.mkDerivation {
 
   inherit src;
 
-  patches = [ 
+  patches = [
  #	 ./ceph-patch-cmake-path.patch
-    ./0001-kv-RocksDBStore-API-break-additional.patch   
+    ./0001-kv-RocksDBStore-API-break-additional.patch
   ] ++ optionals stdenv.isLinux [
     ./0002-fix-absolute-include-path.patch
   ];
@@ -117,10 +117,10 @@ stdenv.mkDerivation {
     pkgconfig which git python2Packages.wrapPython makeWrapper
     (ensureNewerSourcesHook { year = "1980"; })
   ];
-  
+
   buildInputs = buildInputs ++ cryptoLibsMap.${cryptoStr} ++ [
-    boost ceph-python-env libxml2 optYasm optLibatomic_ops optLibs3 
-    malloc zlib openldap lttngUst babeltrace gperf cunit
+    boost ceph-python-env libxml2 optYasm optLibatomic_ops optLibs3
+    malloc zlib openldap lttng-ust babeltrace gperf cunit
     snappy rocksdb
   ] ++ optionals stdenv.isLinux [
     linuxHeaders libuuid udev keyutils optLibaio optLibxfs optZfs
@@ -130,28 +130,28 @@ stdenv.mkDerivation {
     optKinetic-cpp-client
   ];
 
-  
+
   preConfigure =''
     # rip off submodule that interfer with system libs
 	rm -rf src/boost
 	rm -rf src/rocksdb
-	
+
 	# require LD_LIBRARY_PATH for cython to find internal dep
 	export LD_LIBRARY_PATH="$PWD/build/lib:$LD_LIBRARY_PATH"
-	
+
 	# requires setuptools due to embedded in-cmake setup.py usage
 	export PYTHONPATH="${python2Packages.setuptools}/lib/python2.7/site-packages/:$PYTHONPATH"
   '';
 
-  cmakeFlags = [ 
+  cmakeFlags = [
     "-DENABLE_GIT_VERSION=OFF"
     "-DWITH_SYSTEM_BOOST=ON"
     "-DWITH_SYSTEM_ROCKSDB=ON"
     "-DWITH_LEVELDB=OFF"
-    
+
     # enforce shared lib
     "-DBUILD_SHARED_LIBS=ON"
-    
+
     # disable cephfs, cmake build broken for now
     "-DWITH_CEPHFS=OFF"
     "-DWITH_LIBCEPHFS=OFF"
@@ -163,7 +163,7 @@ stdenv.mkDerivation {
   '';
 
   enableParallelBuilding = true;
-  
+
   outputs = [ "dev" "lib" "out" "doc" ];
 
   meta = {
diff --git a/pkgs/tools/filesystems/convoy/default.nix b/pkgs/tools/filesystems/convoy/default.nix
index fe713556577..8af745ed436 100644
--- a/pkgs/tools/filesystems/convoy/default.nix
+++ b/pkgs/tools/filesystems/convoy/default.nix
@@ -1,5 +1,5 @@
 # This file was generated by go2nix.
-{ stdenv, buildGoPackage, fetchFromGitHub, devicemapper }:
+{ stdenv, buildGoPackage, fetchFromGitHub, lvm2 }:
 
 buildGoPackage rec {
   name = "convoy-${version}";
@@ -14,7 +14,7 @@ buildGoPackage rec {
     sha256 = "0ihy0cfq7sa2wml904ajwr165hx2mas3jb1bqk3i0m4fg1lx1xw1";
   };
 
-  buildInputs = [devicemapper];
+  buildInputs = [lvm2];
 
   meta = with stdenv.lib; {
     homepage = https://github.com/rancher/convoy;
diff --git a/pkgs/tools/filesystems/nixpart/0.4/cryptsetup.nix b/pkgs/tools/filesystems/nixpart/0.4/cryptsetup.nix
index 24eec2f0dc4..b0c33212edb 100644
--- a/pkgs/tools/filesystems/nixpart/0.4/cryptsetup.nix
+++ b/pkgs/tools/filesystems/nixpart/0.4/cryptsetup.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, devicemapper, libgcrypt, libuuid, pkgconfig, popt
+{ stdenv, fetchurl, lvm2, libgcrypt, libuuid, pkgconfig, popt
 , enablePython ? true, python ? null
 }:
 
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
                 ++ stdenv.lib.optional enablePython "--enable-python";
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ devicemapper libgcrypt libuuid popt ]
+  buildInputs = [ lvm2 libgcrypt libuuid popt ]
              ++ stdenv.lib.optional enablePython python;
 
   meta = {
diff --git a/pkgs/tools/filesystems/nixpart/0.4/default.nix b/pkgs/tools/filesystems/nixpart/0.4/default.nix
index 5ae32093e7f..217056117ea 100644
--- a/pkgs/tools/filesystems/nixpart/0.4/default.nix
+++ b/pkgs/tools/filesystems/nixpart/0.4/default.nix
@@ -18,13 +18,11 @@ let
 
   cryptsetup = import ./cryptsetup.nix {
     inherit stdenv fetchurl python;
-    inherit (pkgs) pkgconfig libgcrypt libuuid popt;
-    devicemapper = lvm2;
+    inherit (pkgs) pkgconfig libgcrypt libuuid popt lvm2;
   };
 
   dmraid = import ./dmraid.nix {
-    inherit stdenv fetchurl;
-    devicemapper = lvm2;
+    inherit stdenv fetchurl lvm2;
   };
 
   lvm2 = import ./lvm2.nix {
@@ -39,8 +37,7 @@ let
 
   parted = import ./parted.nix {
     inherit stdenv fetchurl;
-    inherit (pkgs) utillinux readline libuuid gettext check;
-    devicemapper = lvm2;
+    inherit (pkgs) utillinux readline libuuid gettext check lvm2;
   };
 
   pyblock = import ./pyblock.nix {
diff --git a/pkgs/tools/filesystems/nixpart/0.4/dmraid.nix b/pkgs/tools/filesystems/nixpart/0.4/dmraid.nix
index defdf6702ea..a4dcb408e05 100644
--- a/pkgs/tools/filesystems/nixpart/0.4/dmraid.nix
+++ b/pkgs/tools/filesystems/nixpart/0.4/dmraid.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, devicemapper }:
+{ stdenv, fetchurl, lvm2 }:
 
 stdenv.mkDerivation rec {
   name = "dmraid-1.0.0.rc15";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
 
   preConfigure = "cd */";
 
-  buildInputs = [ devicemapper ];
+  buildInputs = [ lvm2 ];
 
   meta = {
     description = "Old-style RAID configuration utility";
diff --git a/pkgs/tools/filesystems/nixpart/0.4/parted.nix b/pkgs/tools/filesystems/nixpart/0.4/parted.nix
index 04859020e36..3f43fdc0c39 100644
--- a/pkgs/tools/filesystems/nixpart/0.4/parted.nix
+++ b/pkgs/tools/filesystems/nixpart/0.4/parted.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, devicemapper, libuuid, gettext, readline
+{ stdenv, fetchurl, lvm2, libuuid, gettext, readline
 , utillinux, check, enableStatic ? false, hurd ? null }:
 
 stdenv.mkDerivation rec {
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ libuuid ]
     ++ stdenv.lib.optional (readline != null) readline
     ++ stdenv.lib.optional (gettext != null) gettext
-    ++ stdenv.lib.optional (devicemapper != null) devicemapper
+    ++ stdenv.lib.optional (lvm2 != null) lvm2
     ++ stdenv.lib.optional (hurd != null) hurd
     ++ stdenv.lib.optional doCheck check;
 
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
        (if (readline != null)
         then [ "--with-readline" ]
         else [ "--without-readline" ])
-    ++ stdenv.lib.optional (devicemapper == null) "--disable-device-mapper"
+    ++ stdenv.lib.optional (lvm2 == null) "--disable-device-mapper"
     ++ stdenv.lib.optional enableStatic "--enable-static";
 
   doCheck = true;
diff --git a/pkgs/tools/filesystems/vmfs-tools/default.nix b/pkgs/tools/filesystems/vmfs-tools/default.nix
index d563f438020..b22f7e07a46 100644
--- a/pkgs/tools/filesystems/vmfs-tools/default.nix
+++ b/pkgs/tools/filesystems/vmfs-tools/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, pkgconfig
-, asciidoc, docbook_xml_xslt, fuse, libuuid, libxslt }:
+, asciidoc, docbook_xsl, fuse, libuuid, libxslt }:
 
 stdenv.mkDerivation rec {
   name = "vmfs-tools";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "14y412ww5hxk336ils62s3fwykfh6mx1j0iiaa5cwc615pi6qvi4";
   };
 
-  nativeBuildInputs = [ asciidoc docbook_xml_xslt fuse libuuid libxslt pkgconfig ];
+  nativeBuildInputs = [ asciidoc docbook_xsl fuse libuuid libxslt pkgconfig ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/tools/graphics/glmark2/default.nix b/pkgs/tools/graphics/glmark2/default.nix
index 43da52634e6..14972fc5e56 100644
--- a/pkgs/tools/graphics/glmark2/default.nix
+++ b/pkgs/tools/graphics/glmark2/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, pkgconfig, libjpeg, libpng, xorg, libX11, libGL, libdrm,
-  python27, wayland, libudev, mesa_noglu }:
+  python27, wayland, udev, mesa_noglu }:
 
 stdenv.mkDerivation rec {
   name = "glmark2-${version}";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [
-    libjpeg libpng xorg.libxcb libX11 libGL libdrm python27 wayland libudev mesa_noglu
+    libjpeg libpng xorg.libxcb libX11 libGL libdrm python27 wayland udev mesa_noglu
   ];
 
   buildPhase = ''
diff --git a/pkgs/tools/graphics/gromit-mpx/default.nix b/pkgs/tools/graphics/gromit-mpx/default.nix
index dc703cf02f7..48d40ac4965 100644
--- a/pkgs/tools/graphics/gromit-mpx/default.nix
+++ b/pkgs/tools/graphics/gromit-mpx/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, autoreconfHook, autoconf, automake, pkgconfig
 , gtk, glib, pcre, libappindicator, libpthreadstubs, libXdmcp
-, libxkbcommon, epoxy, at-spi2-core, dbus, libdbusmenu-glib
+, libxkbcommon, epoxy, at-spi2-core, dbus, libdbusmenu
 }:
 
 stdenv.mkDerivation rec {
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
     autoconf automake autoreconfHook
     gtk glib pcre libappindicator libpthreadstubs
     libXdmcp libxkbcommon epoxy at-spi2-core
-    dbus libdbusmenu-glib
+    dbus libdbusmenu
   ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/tools/graphics/luxcorerender/default.nix b/pkgs/tools/graphics/luxcorerender/default.nix
index 0492164dfa3..85713a300ec 100644
--- a/pkgs/tools/graphics/luxcorerender/default.nix
+++ b/pkgs/tools/graphics/luxcorerender/default.nix
@@ -3,7 +3,7 @@
 , freetype, openexr, libXdmcp, libxkbcommon, epoxy, at-spi2-core
 , dbus, doxygen, qt5, c-blosc, libGLU, gnome3, pcre
 , bison, flex, libpthreadstubs, libX11
-, embree2, makeWrapper, gsettings_desktop_schemas, glib
+, embree2, makeWrapper, gsettings-desktop-schemas, glib
 , withOpenCL ? true , opencl-headers, ocl-icd, opencl-clhpp
 }:
 
@@ -31,7 +31,7 @@ in stdenv.mkDerivation rec {
      flex libX11 libpthreadstubs python35 libXdmcp libxkbcommon
      epoxy at-spi2-core dbus doxygen
      # needed for GSETTINGS_SCHEMAS_PATH
-     gsettings_desktop_schemas glib gnome3.gtk
+     gsettings-desktop-schemas glib gnome3.gtk
      # needed for XDG_ICON_DIRS
      gnome3.defaultIconTheme
      makeWrapper
diff --git a/pkgs/tools/graphics/povray/default.nix b/pkgs/tools/graphics/povray/default.nix
index 217a85f266a..76829b6b727 100644
--- a/pkgs/tools/graphics/povray/default.nix
+++ b/pkgs/tools/graphics/povray/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, autoconf, automake, boost
-, zlib, libpng, libjpeg, libtiff, x11, SDL
+, zlib, libpng, libjpeg, libtiff, xlibsWrapper, SDL
 }:
 
 stdenv.mkDerivation rec {
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   };
 
 
-  buildInputs = [ autoconf automake boost zlib libpng libjpeg libtiff x11 SDL ];
+  buildInputs = [ autoconf automake boost zlib libpng libjpeg libtiff xlibsWrapper SDL ];
 
   # the installPhase wants to put files into $HOME. I let it put the files
   # to $TMPDIR, so they don't get into the $out
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
   configureFlags = [ "COMPILED_BY='nix'" "--with-boost-thread=boost_thread" "--with-x" ];
 
   enableParallelBuilding = true;
-  
+
   preInstall = ''
     mkdir "$TMP/bin"
     for i in chown chgrp; do
diff --git a/pkgs/tools/graphics/vulkan-tools/default.nix b/pkgs/tools/graphics/vulkan-tools/default.nix
index 778a1234154..e44021bad5d 100644
--- a/pkgs/tools/graphics/vulkan-tools/default.nix
+++ b/pkgs/tools/graphics/vulkan-tools/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, cmake, python3, vulkan-loader,
-  glslang, pkgconfig, x11, libxcb, libXrandr, wayland }:
+  glslang, pkgconfig, xlibsWrapper, libxcb, libXrandr, wayland }:
 
 stdenv.mkDerivation rec {
   name = "vulkan-tools-${version}";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ cmake python3 vulkan-loader x11 libxcb libXrandr wayland ];
+  buildInputs = [ cmake python3 vulkan-loader xlibsWrapper libxcb libXrandr wayland ];
   enableParallelBuilding = true;
 
   cmakeFlags = [ "-DBUILD_ICD=OFF" "-DGLSLANG_INSTALL_DIR=${glslang}" ];
diff --git a/pkgs/tools/inputmethods/interception-tools/default.nix b/pkgs/tools/inputmethods/interception-tools/default.nix
index 33fea9705ac..33c66fb7ff2 100644
--- a/pkgs/tools/inputmethods/interception-tools/default.nix
+++ b/pkgs/tools/inputmethods/interception-tools/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, fetchFromGitHub, pkgconfig, cmake, libyamlcpp,
-  libevdev, libudev }:
+  libevdev, udev }:
 
 let
   version = "0.1.1";
@@ -13,7 +13,7 @@ in stdenv.mkDerivation {
   };
 
   nativeBuildInputs = [ cmake pkgconfig ];
-  buildInputs = [ libevdev libudev libyamlcpp ];
+  buildInputs = [ libevdev udev libyamlcpp ];
 
   prePatch = ''
     substituteInPlace CMakeLists.txt --replace \
diff --git a/pkgs/tools/inputmethods/libkkc/default.nix b/pkgs/tools/inputmethods/libkkc/default.nix
index 0051be14ee7..7311b09008b 100644
--- a/pkgs/tools/inputmethods/libkkc/default.nix
+++ b/pkgs/tools/inputmethods/libkkc/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl
 , vala, gobjectIntrospection, intltool, python2Packages, glib
 , pkgconfig
-, libgee, json_glib, marisa, libkkc-data
+, libgee, json-glib, marisa, libkkc-data
 }:
 
 stdenv.mkDerivation rec {
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ marisa libkkc-data ];
   enableParallelBuilding = true;
 
-  propagatedBuildInputs = [ libgee json_glib ];
+  propagatedBuildInputs = [ libgee json-glib ];
 
   postInstall = ''
     ln -s ${libkkc-data}/lib/libkkc/models $out/share/libkkc/models
diff --git a/pkgs/tools/misc/ckb/default.nix b/pkgs/tools/misc/ckb/default.nix
index 0af90ae2bf2..57be1b89e46 100644
--- a/pkgs/tools/misc/ckb/default.nix
+++ b/pkgs/tools/misc/ckb/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchFromGitHub, substituteAll, libudev, pkgconfig, qtbase, qmake, zlib, kmod }:
+{ stdenv, fetchFromGitHub, substituteAll, udev
+, pkgconfig, qtbase, qmake, zlib, kmod }:
 
 stdenv.mkDerivation rec {
   version = "0.2.9";
@@ -12,7 +13,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [
-    libudev
+    udev
     qtbase
     zlib
   ];
diff --git a/pkgs/tools/misc/fileschanged/default.nix b/pkgs/tools/misc/fileschanged/default.nix
index 260151f5bd2..f761c1ec4c5 100644
--- a/pkgs/tools/misc/fileschanged/default.nix
+++ b/pkgs/tools/misc/fileschanged/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fam }:
+{ stdenv, fetchurl, gamin }:
 
 stdenv.mkDerivation rec {
   name = "fileschanged-0.6.9";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "0ajc9h023vzpnlqqjli4wbvs0q36nr5p9msc3wzbic8rk687qcxc";
   };
 
-  buildInputs = [ fam ];
+  buildInputs = [ gamin ];
 
   patches = [./unused-variables.debian.patch];
 
diff --git a/pkgs/tools/misc/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix
index 84c06a49f84..58c9f18ec5a 100644
--- a/pkgs/tools/misc/grub/2.0x.nix
+++ b/pkgs/tools/misc/grub/2.0x.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, fetchFromSavannah, autogen, flex, bison, python, autoconf, automake
-, gettext, ncurses, libusb, freetype, qemu, devicemapper, unifont, pkgconfig
+, gettext, ncurses, libusb, freetype, qemu, lvm2, unifont, pkgconfig
 , fuse # only needed for grub-mount
 , zfs ? null
 , efiSupport ? false
@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ bison flex python pkgconfig ];
-  buildInputs = [ ncurses libusb freetype gettext devicemapper fuse ]
+  buildInputs = [ ncurses libusb freetype gettext lvm2 fuse ]
     ++ optional doCheck qemu
     ++ optional zfsSupport zfs;
 
diff --git a/pkgs/tools/misc/grub/trusted.nix b/pkgs/tools/misc/grub/trusted.nix
index 2bf7e3dcf43..63a73658e0a 100644
--- a/pkgs/tools/misc/grub/trusted.nix
+++ b/pkgs/tools/misc/grub/trusted.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, fetchgit, autogen, flex, bison, python, autoconf, automake
-, gettext, ncurses, libusb, freetype, qemu, devicemapper
+, gettext, ncurses, libusb, freetype, qemu, lvm2
 , for_HP_laptop ? false
 }:
 
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
         };
 
   nativeBuildInputs = [ autogen flex bison python autoconf automake ];
-  buildInputs = [ ncurses libusb freetype gettext devicemapper ]
+  buildInputs = [ ncurses libusb freetype gettext lvm2 ]
     ++ optional doCheck qemu;
 
   hardeningDisable = [ "stackprotector" "pic" ];
diff --git a/pkgs/tools/misc/os-prober/default.nix b/pkgs/tools/misc/os-prober/default.nix
index c4a304e0d28..6211c863bd4 100644
--- a/pkgs/tools/misc/os-prober/default.nix
+++ b/pkgs/tools/misc/os-prober/default.nix
@@ -4,7 +4,7 @@ coreutils,  # mktemp
 grub2,      # grub-mount and grub-probe
 cryptsetup, # cryptsetup
 libuuid,    # blkid and blockdev
-libudev,    # udevadm udevinfo
+udev,    # udevadm udevinfo
 ntfs3g      # ntfs3g
 }:
 
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
     done;
     for file in $out/bin/*; do
       wrapProgram $file \
-        --suffix PATH : ${stdenv.lib.makeBinPath [ grub2 libudev coreutils cryptsetup libuuid ntfs3g ]} \
+        --suffix PATH : ${stdenv.lib.makeBinPath [ grub2 udev coreutils cryptsetup libuuid ntfs3g ]} \
         --run "[ -d /var/lib/os-prober ] || mkdir /var/lib/os-prober"
     done;
   '';
diff --git a/pkgs/tools/misc/parted/default.nix b/pkgs/tools/misc/parted/default.nix
index 3395e028634..6649db4c48d 100644
--- a/pkgs/tools/misc/parted/default.nix
+++ b/pkgs/tools/misc/parted/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, devicemapper, libuuid, gettext, readline, perl, python2
+{ stdenv, fetchurl, fetchpatch, lvm2, libuuid, gettext, readline, perl, python2
 , utillinux, check, enableStatic ? false, hurd ? null }:
 
 stdenv.mkDerivation rec {
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
       url = "https://git.alpinelinux.org/cgit/aports/plain/main/parted/fix-includes.patch?id=9c5cd3c329a40ba4559cc1d8c7d17a9bf95c237b";
       sha256 = "117ypyiwvzym6pi8xmy16wa5z3sbpx7gh6haabs6kfb1x2894z7q";
     })
-    ++ stdenv.lib.optional (devicemapper == null)
+    ++ stdenv.lib.optional (lvm2 == null)
     (fetchpatch {
       url = https://git.savannah.gnu.org/cgit/parted.git/patch/?id=7e87ca3c531228d35e13e802d2622006138b104c;
       sha256 = "0i29lfg8cwj342q5s7qwqhncz2bkifj5rjc7cx6jd4zqb6ykkndj";
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ libuuid ]
     ++ stdenv.lib.optional (readline != null) readline
     ++ stdenv.lib.optional (gettext != null) gettext
-    ++ stdenv.lib.optional (devicemapper != null) devicemapper
+    ++ stdenv.lib.optional (lvm2 != null) lvm2
     ++ stdenv.lib.optional (hurd != null) hurd
     ++ stdenv.lib.optionals doCheck [ check perl python2 ];
 
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
        (if (readline != null)
         then [ "--with-readline" ]
         else [ "--without-readline" ])
-    ++ stdenv.lib.optional (devicemapper == null) "--disable-device-mapper"
+    ++ stdenv.lib.optional (lvm2 == null) "--disable-device-mapper"
     ++ stdenv.lib.optional enableStatic "--enable-static";
 
   # Tests were previously failing due to Hydra running builds as uid 0.
diff --git a/pkgs/tools/misc/snapper/default.nix b/pkgs/tools/misc/snapper/default.nix
index 52a57629cd1..563232dbe53 100644
--- a/pkgs/tools/misc/snapper/default.nix
+++ b/pkgs/tools/misc/snapper/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, fetchpatch
 , autoreconfHook, pkgconfig, docbook_xsl, libxslt, docbook_xml_dtd_45
-, acl, attr, boost, btrfs-progs, dbus_libs, diffutils, e2fsprogs, libxml2
+, acl, attr, boost, btrfs-progs, dbus, diffutils, e2fsprogs, libxml2
 , lvm2, pam, python, utillinux }:
 
 stdenv.mkDerivation rec {
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
     docbook_xsl libxslt docbook_xml_dtd_45
   ];
   buildInputs = [
-    acl attr boost btrfs-progs dbus_libs diffutils e2fsprogs libxml2
+    acl attr boost btrfs-progs dbus diffutils e2fsprogs libxml2
     lvm2 pam python utillinux
   ];
 
diff --git a/pkgs/tools/networking/dnsmasq/default.nix b/pkgs/tools/networking/dnsmasq/default.nix
index ebbe5a11b52..be14db79880 100644
--- a/pkgs/tools/networking/dnsmasq/default.nix
+++ b/pkgs/tools/networking/dnsmasq/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchurl, pkgconfig, dbus_libs, nettle, libidn, libnetfilter_conntrack, fetchpatch }:
+{ stdenv, fetchurl, pkgconfig, dbus, nettle
+, libidn, libnetfilter_conntrack, fetchpatch }:
 
 with stdenv.lib;
 let
@@ -62,7 +63,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ nettle libidn ]
-    ++ optionals stdenv.isLinux [ dbus_libs libnetfilter_conntrack ];
+    ++ optionals stdenv.isLinux [ dbus libnetfilter_conntrack ];
 
   meta = {
     description = "An integrated DNS, DHCP and TFTP server for small networks";
diff --git a/pkgs/tools/networking/offlineimap/default.nix b/pkgs/tools/networking/offlineimap/default.nix
index c7d15318698..647b7ed26da 100644
--- a/pkgs/tools/networking/offlineimap/default.nix
+++ b/pkgs/tools/networking/offlineimap/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, pythonPackages,
-  asciidoc, libxml2, libxslt, docbook_xml_xslt }:
+  asciidoc, libxml2, libxslt, docbook_xsl }:
 
 pythonPackages.buildPythonApplication rec {
   version = "7.2.1";
@@ -20,7 +20,7 @@ pythonPackages.buildPythonApplication rec {
 
   doCheck = false;
 
-  nativeBuildInputs = [ asciidoc libxml2 libxslt docbook_xml_xslt ];
+  nativeBuildInputs = [ asciidoc libxml2 libxslt docbook_xsl ];
   propagatedBuildInputs = [ pythonPackages.six pythonPackages.kerberos ];
 
   postInstall = ''
diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index c3f1e4d8d45..07c130f1cb3 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -1,6 +1,6 @@
 { lib, stdenv, fetchurl, fetchFromGitHub, perl, curl, bzip2, sqlite, openssl ? null, xz
 , pkgconfig, boehmgc, perlPackages, libsodium, aws-sdk-cpp, brotli, boost
-, autoreconfHook, autoconf-archive, bison, flex, libxml2, libxslt, docbook5, docbook5_xsl
+, autoreconfHook, autoconf-archive, bison, flex, libxml2, libxslt, docbook5, docbook_xsl_ns
 , busybox-sandbox-shell
 , hostPlatform, buildPlatform
 , storeDir ? "/nix/store"
@@ -26,7 +26,7 @@ let
     nativeBuildInputs =
       [ pkgconfig ]
       ++ lib.optionals (!is20) [ curl perl ]
-      ++ lib.optionals fromGit [ autoreconfHook autoconf-archive bison flex libxml2 libxslt docbook5 docbook5_xsl ];
+      ++ lib.optionals fromGit [ autoreconfHook autoconf-archive bison flex libxml2 libxslt docbook5 docbook_xsl_ns ];
 
     buildInputs = [ curl openssl sqlite xz bzip2 ]
       ++ lib.optional (stdenv.isLinux || stdenv.isDarwin) libsodium
diff --git a/pkgs/tools/package-management/nixops/generic.nix b/pkgs/tools/package-management/nixops/generic.nix
index f392e0f50ed..da62eba63fd 100644
--- a/pkgs/tools/package-management/nixops/generic.nix
+++ b/pkgs/tools/package-management/nixops/generic.nix
@@ -1,4 +1,4 @@
-{ lib, python2Packages, fetchurl, libxslt, docbook5_xsl, openssh
+{ lib, python2Packages, fetchurl, libxslt, docbook_xsl_ns, openssh
 # version args
 , src, version
 }:
@@ -31,7 +31,7 @@ python2Packages.buildPythonApplication {
   doCheck = false;
 
   postInstall = ''
-    make -C doc/manual install nixops.1 docbookxsl=${docbook5_xsl}/xml/xsl/docbook \
+    make -C doc/manual install nixops.1 docbookxsl=${docbook_xsl_ns}/xml/xsl/docbook \
       docdir=$out/share/doc/nixops mandir=$out/share/man
 
     mkdir -p $out/share/nix/nixops
diff --git a/pkgs/tools/security/pcsclite/default.nix b/pkgs/tools/security/pcsclite/default.nix
index f46e3f22ecd..84072fd2840 100644
--- a/pkgs/tools/security/pcsclite/default.nix
+++ b/pkgs/tools/security/pcsclite/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, udev, dbus_libs, perl, python2
+{ stdenv, fetchurl, pkgconfig, udev, dbus, perl, python2
 , IOKit ? null }:
 
 stdenv.mkDerivation rec {
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
   '';
 
   nativeBuildInputs = [ pkgconfig perl python2 ];
-  buildInputs = stdenv.lib.optionals stdenv.isLinux [ udev dbus_libs ]
+  buildInputs = stdenv.lib.optionals stdenv.isLinux [ udev dbus ]
              ++ stdenv.lib.optionals stdenv.isDarwin [ IOKit ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/tools/security/pcsctools/default.nix b/pkgs/tools/security/pcsctools/default.nix
index 585e089b8af..d9e68c77d25 100644
--- a/pkgs/tools/security/pcsctools/default.nix
+++ b/pkgs/tools/security/pcsctools/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, makeWrapper, pkgconfig, udev, dbus_libs, pcsclite
+{ stdenv, lib, fetchurl, makeWrapper, pkgconfig, udev, dbus, pcsclite
 , wget, coreutils
 , perl, pcscperl, Glib, Gtk2, Pango, Cairo
 }:
@@ -13,7 +13,7 @@ in stdenv.mkDerivation rec {
     sha256 = "0iqcy28pb963ds4pjrpi37577vm6nkgf3i0b3rr978jy9qi1bix9";
   };
 
-  buildInputs = [ udev dbus_libs perl pcsclite ];
+  buildInputs = [ udev dbus perl pcsclite ];
 
   makeFlags = [ "DESTDIR=$(out)" ];
 
diff --git a/pkgs/tools/system/thermald/default.nix b/pkgs/tools/system/thermald/default.nix
index 27458174dc2..a8670203775 100644
--- a/pkgs/tools/system/thermald/default.nix
+++ b/pkgs/tools/system/thermald/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, dbus_libs, dbus-glib, libxml2 }:
+{ stdenv, fetchFromGitHub, autoconf, automake, libtool
+, pkgconfig, dbus, dbus-glib, libxml2 }:
 
 stdenv.mkDerivation rec {
   name = "thermald-${version}";
@@ -12,12 +13,12 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ autoconf automake libtool dbus_libs dbus-glib libxml2 ];
+  buildInputs = [ autoconf automake libtool dbus dbus-glib libxml2 ];
 
   patchPhase = ''sed -e 's/upstartconfdir = \/etc\/init/upstartconfdir = $(out)\/etc\/init/' -i data/Makefile.am'';
 
   preConfigure = ''
-    export PKG_CONFIG_PATH="${dbus_libs.dev}/lib/pkgconfig:$PKG_CONFIG_PATH"
+    export PKG_CONFIG_PATH="${dbus.dev}/lib/pkgconfig:$PKG_CONFIG_PATH"
     ./autogen.sh
   '';
 
diff --git a/pkgs/tools/text/zimwriterfs/default.nix b/pkgs/tools/text/zimwriterfs/default.nix
index 5a5757bf2f2..085331ce0d5 100644
--- a/pkgs/tools/text/zimwriterfs/default.nix
+++ b/pkgs/tools/text/zimwriterfs/default.nix
@@ -8,7 +8,7 @@
 
 , file
 , icu
-, libgumbo
+, gumbo
 , lzma
 , xapian
 , zimlib
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ automake autoconf libtool pkgconfig ];
-  buildInputs = [ file icu libgumbo lzma zimlib zlib xapian ];
+  buildInputs = [ file icu gumbo lzma zimlib zlib xapian ];
   setSourceRoot = ''
     sourceRoot=$(echo */zimwriterfs)
   '';
diff --git a/pkgs/tools/typesetting/asciidoc/default.nix b/pkgs/tools/typesetting/asciidoc/default.nix
index d5da10b5cd4..efa1471f068 100644
--- a/pkgs/tools/typesetting/asciidoc/default.nix
+++ b/pkgs/tools/typesetting/asciidoc/default.nix
@@ -14,7 +14,7 @@
 , lilypond ? null
 , libxml2 ? null
 , docbook_xml_dtd_45 ? null
-, docbook5_xsl ? null
+, docbook_xsl_ns ? null
 , docbook_xsl ? null
 , fop ? null
 # TODO: Package this:
@@ -56,7 +56,7 @@ assert enableStandardFeatures ->
   lilypond != null &&
   libxml2 != null &&
   docbook_xml_dtd_45 != null &&
-  docbook5_xsl != null &&
+  docbook_xsl_ns != null &&
   docbook_xsl != null &&
   (fop != null || !enableJava) &&
 # TODO: Package this:
@@ -238,7 +238,7 @@ stdenv.mkDerivation rec {
     # use it to work around an impurity in the tetex package; tetex tools
     # cannot find their neighbours (e.g. pdflatex doesn't find mktextfm).
     # We can remove PATH= when those impurities are fixed.
-    sed -e "s|^ENV =.*|ENV = dict(XML_CATALOG_FILES='${docbook_xml_dtd_45}/xml/dtd/docbook/catalog.xml ${docbook5_xsl}/xml/xsl/docbook/catalog.xml ${docbook_xsl}/xml/xsl/docbook/catalog.xml', PATH='${stdenv.lib.makeBinPath [ tetex coreutils gnused ]}')|" \
+    sed -e "s|^ENV =.*|ENV = dict(XML_CATALOG_FILES='${docbook_xml_dtd_45}/xml/dtd/docbook/catalog.xml ${docbook_xsl_ns}/xml/xsl/docbook/catalog.xml ${docbook_xsl}/xml/xsl/docbook/catalog.xml', PATH='${stdenv.lib.makeBinPath [ tetex coreutils gnused ]}')|" \
         -e "s|^ASCIIDOC =.*|ASCIIDOC = '$out/bin/asciidoc'|" \
         -e "s|^XSLTPROC =.*|XSLTPROC = '${libxslt.bin}/bin/xsltproc'|" \
         -e "s|^DBLATEX =.*|DBLATEX = '${dblatexFull}/bin/dblatex'|" \
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 85fb2e4639a..b6476ca7ece 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -85,7 +85,6 @@ mapAliases ({
   evolution_data_server = evolution-data-server; # added 2018-02-25
   etcdctl = etcd; # added 2018-04-25
   exfat-utils = exfat;                  # 2015-09-11
-  fam = gamin; # added 2018-04-25
   ffadoFull = ffado; # added 2018-05-01
   firefox-esr-wrapper = firefox-esr;  # 2016-01
   firefox-wrapper = firefox;          # 2016-01
@@ -98,10 +97,8 @@ mapAliases ({
   gccApple = throw "gccApple is no longer supported"; # added 2018-04-25
   gdb-multitarget = gdb; # added 2017-11-13
   gettextWithExpat = gettext; # 2016-02-19
-  gflags = google-gflags; # added 2018-04-25
   git-hub = gitAndTools.git-hub; # added 2016-04-29
   glib_networking = glib-networking; # added 2018-02-25
-  gmock = gtest; # added 2018-04-25
   gnome-themes-standard = gnome-themes-extra; # added 2018-03-14
   gnome_doc_utils = gnome-doc-utils; # added 2018-02-25
   gnome_themes_standard = gnome-themes-standard; # added 2018-02-25
@@ -132,7 +129,6 @@ mapAliases ({
   iana_etc = iana-etc;  # added 2017-03-08
   idea = jetbrains; # added 2017-04-03
   inotifyTools = inotify-tools;
-  jack2Full = jack2; # added 2018-04-25
   joseki = apache-jena-fuseki; # added 2016-02-28
   json_glib = json-glib; # added 2018-02-25
   kdiff3-qt5 = kdiff3; # added 2017-02-18
@@ -140,7 +136,6 @@ mapAliases ({
   keepassx-community = keepassxc; # added 2017-11
   keepassx-reboot = keepassx-community; # added 2017-02-01
   keepassx2-http = keepassx-reboot; # added 2016-10-17
-  kerberos = libkrb5; # added 2018-04-25
   keybase-go = keybase;  # added 2016-08-24
   krename-qt5 = krename; # added 2017-02-18
   kvm = qemu_kvm; # added 2018-04-25
@@ -158,7 +153,6 @@ mapAliases ({
   libgumbo = gumbo; # added 2018-01-21
   libintlOrEmpty = stdenv.lib.optional (!stdenv.isLinux || hostPlatform.libc != "glibc") gettext; # added 2018-03-14
   libjson_rpc_cpp = libjson-rpc-cpp; # added 2017-02-28
-  liblrdf = librdf; # added 2018-04-25
   libmysql = mysql.connector-c; # added # 2017-12-28, this was a misnomer refering to libmysqlclient
   librecad2 = librecad;  # backwards compatibility alias, added 2015-10
   libsysfs = sysfsutils; # added 2018-04-25
@@ -170,7 +164,6 @@ mapAliases ({
   lua5_1_sockets = lua51Packages.luasocket; # added 2017-05-02
   lua5_expat = luaPackages.luaexpat; # added 2017-05-02
   lua5_sec = luaPackages.luasec; # added 2017-05-02
-  lzma = xz; # added 2018-04-25
   m3d-linux = m33-linux; # added 2016-08-13
   man_db = man-db; # added 2016-05
   manpages = man-pages; # added 2015-12-06
@@ -182,7 +175,6 @@ mapAliases ({
   mssys = ms-sys; # added 2015-12-13
   multipath_tools = multipath-tools;  # added 2016-01-21
   mupen64plus1_5 = mupen64plus; # added 2016-02-12
-  mysql = mariadb; # added 2018-04-25
   mysqlWorkbench = mysql-workbench; # added 2017-01-19
   nagiosPluginsOfficial = monitoring-plugins;
   ncat = nmap;  # added 2016-01-26
@@ -198,7 +190,6 @@ mapAliases ({
   nilfs_utils = nilfs-utils; # added 2018-04-25
   nmap_graphical = nmap-graphical;  # added 2017-01-19
   nologin = shadow; # added 2018-04-25
-  openal = openalSoft; # added 2018-04-25
   opencascade_oce = opencascade; # added 2018-04-25
   opencl-icd = ocl-icd; # added 2017-01-20
   openexr_ctl = ctl; # added 2018-04-25
@@ -217,9 +208,7 @@ mapAliases ({
   pidginwindowmerge = pidgin-window-merge; # added 2018-01-08
   piwik = matomo; # added 2018-01-16
   pltScheme = racket; # just to be sure
-  polarssl = mbedtls; # added 2018-04-25
   poppler_qt5 = libsForQt5.poppler;  # added 2015-12-19
-  procps = procps-ng; # added 2018-04-25
   prometheus-statsd-bridge = prometheus-statsd-exporter;  # added 2017-08-27
   pulseaudioLight = pulseaudio; # added 2018-04-25
   qca-qt5 = libsForQt5.qca-qt5;  # added 2015-12-19
@@ -229,7 +218,6 @@ mapAliases ({
   qwt6 = libsForQt5.qwt;  # added 2015-12-19
   rdiff_backup = rdiff-backup;  # added 2014-11-23
   rdmd = dtools;  # added 2017-08-19
-  redland = librdf_redland; # added 2018-04-25
   robomongo = robo3t; #added 2017-09-28
   rssglx = rss-glx; #added 2015-03-25
   ruby_2_0_0 = throw "deprecated 2018-0213: use a newer version of ruby";
@@ -261,7 +249,6 @@ mapAliases ({
   spice_protocol = spice-protocol; # added 2018-02-25
   sqlite3_analyzer = sqlite-analyzer; # added 2018-05-22
   sqliteInteractive = sqlite-interactive;  # added 2014-12-06
-  sshfs = sshfs-fuse; # added 2017-08-14
   sshfsFuse = sshfs-fuse; # added 2016-09
   suil-qt5 = suil; # added 2018-05-01
   surf-webkit2 = surf; # added 2017-04-02
@@ -289,7 +276,6 @@ mapAliases ({
   transmission_remote_gtk = transmission-remote-gtk; # added 2018-01-06
   tshark = wireshark-cli; # added 2018-04-25
   ucsFonts = ucs-fonts; # added 2016-07-15
-  udev = systemd; # added 2018-04-25
   ultrastardx-beta = ultrastardx; # added 2017-08-12
   usb_modeswitch = usb-modeswitch; # added 2016-05-10
   vimbWrapper = vimb; # added 2015-01
@@ -306,7 +292,6 @@ mapAliases ({
   xmonad_log_applet_gnome3 = xmonad_log_applet; # added 2018-05-01
   xf86_video_nouveau = xorg.xf86videonouveau; # added 2015-09
   xlibs = xorg; # added 2015-09
-  yacc = bison; # added 2018-04-25
   youtubeDL = youtube-dl;  # added 2014-10-26
 
   # added 2017-05-27
@@ -352,5 +337,4 @@ mapAliases ({
   ocaml_4_01_0 = ocamlPackages_4_01_0.ocaml;
   ocaml_4_02   = ocamlPackages_4_02.ocaml;
   ocaml_4_03   = ocamlPackages_4_03.ocaml;
-  ocaml        = ocamlPackages.ocaml;
 }))
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 013573a1a61..bfe9d8e726d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2863,6 +2863,8 @@ with pkgs;
   gt5 = callPackage ../tools/system/gt5 { };
 
   gtest = callPackage ../development/libraries/gtest {};
+  gmock = gtest; # TODO: move to aliases.nix
+
   gbenchmark = callPackage ../development/libraries/gbenchmark {};
 
   gtkdatabox = callPackage ../development/libraries/gtkdatabox {};
@@ -2871,7 +2873,9 @@ with pkgs;
 
   gtdialog = callPackage ../development/libraries/gtdialog {};
 
-  gtkd = callPackage ../development/libraries/gtkd { };
+  gtkd = callPackage ../development/libraries/gtkd {
+    gst_plugins_base = gst-plugins-base;
+  };
 
   gtkgnutella = callPackage ../tools/networking/p2p/gtk-gnutella { };
 
@@ -3393,7 +3397,7 @@ with pkgs;
 
   liquidsoap = callPackage ../tools/audio/liquidsoap/full.nix {
     ffmpeg = ffmpeg_2;
-    ocamlPackages = ocamlPackages_4_02;
+    ocamlPackages = ocaml-ng.ocamlPackages_4_02;
   };
 
   lksctp-tools = callPackage ../os-specific/linux/lksctp-tools { };
@@ -3728,6 +3732,7 @@ with pkgs;
   luxcorerender = callPackage ../tools/graphics/luxcorerender { };
 
   xz = callPackage ../tools/compression/xz { };
+  lzma = xz; # TODO: move to aliases.nix
 
   lz4 = callPackage ../tools/compression/lz4 { };
 
@@ -4034,7 +4039,7 @@ with pkgs;
 
   netboot = callPackage ../tools/networking/netboot {};
 
-  netcat = netcat-openbsd;
+  netcat = libressl.nc;
 
   netcat-gnu = callPackage ../tools/networking/netcat { };
 
@@ -4717,7 +4722,7 @@ with pkgs;
 
   qshowdiff = callPackage ../tools/text/qshowdiff { };
 
-  qtikz = callPackage ../applications/graphics/ktikz { };
+  qtikz = libsForQt5.callPackage ../applications/graphics/ktikz { };
 
   quicktun = callPackage ../tools/networking/quicktun { };
 
@@ -5069,7 +5074,7 @@ with pkgs;
 
   skippy-xd = callPackage ../tools/X11/skippy-xd {};
 
-  sks = callPackage ../servers/sks { inherit (ocamlPackages_4_02) ocaml camlp4; };
+  sks = callPackage ../servers/sks { inherit (ocaml-ng.ocamlPackages_4_02) ocaml camlp4; };
 
   skydns = callPackage ../servers/skydns { };
 
@@ -5173,6 +5178,7 @@ with pkgs;
   srcml = callPackage ../applications/version-management/srcml { };
 
   sshfs-fuse = callPackage ../tools/filesystems/sshfs-fuse { };
+  sshfs = sshfs-fuse; # added 2017-08-14
 
   sshlatex = callPackage ../tools/typesetting/sshlatex { };
 
@@ -5343,7 +5349,7 @@ with pkgs;
 
   texmaker = libsForQt5.callPackage ../applications/editors/texmaker { };
 
-  texstudio = callPackage ../applications/editors/texstudio { };
+  texstudio = libsForQt5.callPackage ../applications/editors/texstudio { };
 
   textadept = callPackage ../applications/editors/textadept { };
 
@@ -6977,6 +6983,7 @@ with pkgs;
   obliv-c = callPackage ../development/compilers/obliv-c {};
 
   ocaml-ng = callPackage ./ocaml-packages.nix { };
+  ocaml = ocamlPackages.ocaml;
 
   ocamlPackages = recurseIntoAttrs ocaml-ng.ocamlPackages;
 
@@ -6993,7 +7000,7 @@ with pkgs;
   ocsigen-i18n = callPackage ../development/tools/ocaml/ocsigen-i18n { };
 
   opa = callPackage ../development/compilers/opa {
-    ocamlPackages = ocamlPackages_4_02;
+    ocamlPackages = ocaml-ng.ocamlPackages_4_02;
   };
 
   opaline = callPackage ../development/tools/ocaml/opaline { };
@@ -7117,7 +7124,7 @@ with pkgs;
   };
 
   teyjus = callPackage ../development/compilers/teyjus {
-    inherit (ocamlPackages_4_02) ocaml;
+    inherit (ocaml-ng.ocamlPackages_4_02) ocaml;
     omake = omake_rc1;
   };
 
@@ -7839,6 +7846,7 @@ with pkgs;
   bison2 = callPackage ../development/tools/parsing/bison/2.x.nix { };
   bison3 = callPackage ../development/tools/parsing/bison/3.x.nix { };
   bison = bison3;
+  yacc = bison; # TODO: move to aliases.nix
 
   blackmagic = callPackage ../development/tools/misc/blackmagic {
     stdenv = overrideCC stdenv gcc6;
@@ -9223,6 +9231,7 @@ with pkgs;
   funambol = callPackage ../development/libraries/funambol { };
 
   gamin = callPackage ../development/libraries/gamin { };
+  fam = gamin; # added 2018-04-25
 
   ganv = callPackage ../development/libraries/ganv { };
 
@@ -9418,6 +9427,7 @@ with pkgs;
   goocanvas2 = callPackage ../development/libraries/goocanvas/2.x.nix { };
 
   google-gflags = callPackage ../development/libraries/google-gflags { };
+  gflags = google-gflags; # TODO: move to aliases.nix
 
   gperftools = callPackage ../development/libraries/gperftools { };
 
@@ -9833,6 +9843,7 @@ with pkgs;
     fetchurl = fetchurlBoot;
     type = "lib";
   };
+  kerberos = libkrb5; # TODO: move to aliases.nix
 
   languageMachines = recurseIntoAttrs (import ../development/libraries/languagemachines/packages.nix { inherit callPackage; });
 
@@ -10902,6 +10913,7 @@ with pkgs;
 
   mbedtls = callPackage ../development/libraries/mbedtls { };
   mbedtls_1_3 = callPackage ../development/libraries/mbedtls/1.3.nix { };
+  polarssl = mbedtls; # TODO: add to aliases.nix
 
   mdds_0_7_1 = callPackage ../development/libraries/mdds/0.7.1.nix { };
   mdds_0_12_1 = callPackage ../development/libraries/mdds/0.12.1.nix { };
@@ -11132,6 +11144,7 @@ with pkgs;
   openalSoft = callPackage ../development/libraries/openal-soft {
     inherit (darwin.apple_sdk.frameworks) CoreServices AudioUnit AudioToolbox;
   };
+  openal = openalSoft;
 
   openbabel = callPackage ../development/libraries/openbabel { };
 
@@ -11654,8 +11667,10 @@ with pkgs;
   librdf_rasqal = callPackage ../development/libraries/librdf/rasqal.nix { };
 
   librdf_redland = callPackage ../development/libraries/librdf/redland.nix { };
+  redland = librdf_redland; # added 2018-04-25
 
   librdf = callPackage ../development/libraries/librdf { };
+  liblrdf = librdf; # added 2018-04-25
 
   libsmf = callPackage ../development/libraries/audio/libsmf { };
 
@@ -12968,6 +12983,7 @@ with pkgs;
     inherit (darwin) cctools;
     inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices;
   };
+  mysql = mariadb; # TODO: move to aliases.nix
 
   mongodb = callPackage ../servers/nosql/mongodb {
     sasl = cyrus_sasl;
@@ -13471,7 +13487,7 @@ with pkgs;
   directvnc = callPackage ../os-specific/linux/directvnc { };
 
   dmraid = callPackage ../os-specific/linux/dmraid {
-    devicemapper = devicemapper.override {enable_dmeventd = true;};
+    lvm2 = lvm2.override {enable_dmeventd = true;};
   };
 
   drbd = callPackage ../os-specific/linux/drbd { };
@@ -14284,8 +14300,9 @@ with pkgs;
 
   prayer = callPackage ../servers/prayer { };
 
-  procps-ng = if stdenv.isLinux then callPackage ../os-specific/linux/procps-ng { }
-              else unixtools.procps;
+  procps = if stdenv.isLinux then callPackage ../os-specific/linux/procps-ng { }
+           else unixtools.procps;
+  procps-ng = procps; # TODO: move to aliases.nix
 
   watch = callPackage ../os-specific/linux/procps/watch.nix { };
 
@@ -14383,6 +14400,7 @@ with pkgs;
   systemd = callPackage ../os-specific/linux/systemd {
     utillinux = utillinuxMinimal; # break the cyclic dependency
   };
+  udev = systemd; # TODO: move to aliases.nix
 
   # standalone cryptsetup generator for systemd
   systemd-cryptsetup-generator = callPackage ../os-specific/linux/systemd/cryptsetup-generator.nix { };
@@ -15626,9 +15644,9 @@ with pkgs;
   };
 
   # go 1.9 pin until https://github.com/moby/moby/pull/35739
-  inherit (callPackage ../applications/virtualization/docker { go = go_1_9; })
-    docker_18_03
-    docker_18_05;
+  inherit (callPackage ../applications/virtualization/docker {
+    go = go_1_9;
+  }) docker_18_03 docker_18_05;
 
   docker = docker_18_03;
   docker-edge = docker_18_05;
@@ -16426,7 +16444,7 @@ with pkgs;
   praat = callPackage ../applications/audio/praat { };
 
   quvi = callPackage ../applications/video/quvi/tool.nix {
-    lua5_sockets = lua5_1_sockets;
+    lua5_sockets = lua51Packages.luasocket;
     lua5 = lua5_1;
   };
 
@@ -16935,6 +16953,7 @@ with pkgs;
 
   krita = libsForQt5.callPackage ../applications/graphics/krita {
     openjpeg = openjpeg_1;
+    poppler_qt5 = libsForQt5.poppler;
   };
 
   krusader = libsForQt5.callPackage ../applications/misc/krusader { };
@@ -17488,6 +17507,7 @@ with pkgs;
   synfigstudio = callPackage ../applications/graphics/synfigstudio {
     fontsConf = makeFontsConf { fontDirectories = [ freefont_ttf ]; };
     inherit (gnome3) defaultIconTheme;
+    mlt-qt5 = libsForQt5.mlt;
   };
 
   typora = callPackage ../applications/editors/typora { };
@@ -17657,7 +17677,10 @@ with pkgs;
 
   opusTools = callPackage ../applications/audio/opus-tools { };
 
-  orpie = callPackage ../applications/misc/orpie { gsl = gsl_1; ocamlPackages = ocamlPackages_4_02; };
+  orpie = callPackage ../applications/misc/orpie {
+    gsl = gsl_1;
+    ocamlPackages = ocaml-ng.ocamlPackages_4_02;
+  };
 
   osmo = callPackage ../applications/office/osmo { };
 
@@ -20567,8 +20590,10 @@ with pkgs;
 
   boogie = dotnetPackages.Boogie;
 
-  inherit (callPackage ./coq-packages.nix {})
-    mkCoqPackages
+  inherit (callPackage ./coq-packages.nix {
+    inherit (ocaml-ng) ocamlPackages_3_12_1
+                       ocamlPackages_4_02;
+  }) mkCoqPackages
     coq_8_3 coq_8_4 coq_8_5 coq_8_6 coq_8_7 coq_8_8
     coqPackages_8_5 coqPackages_8_6 coqPackages_8_7 coqPackages_8_8
     coqPackages coq
@@ -20592,7 +20617,7 @@ with pkgs;
   drat-trim = callPackage ../applications/science/logic/drat-trim {};
 
   ekrhyper = callPackage ../applications/science/logic/ekrhyper {
-    inherit (ocamlPackages_4_02) ocaml;
+    inherit (ocaml-ng.ocamlPackages_4_02) ocaml;
   };
 
   eprover = callPackage ../applications/science/logic/eprover { };
@@ -20625,7 +20650,7 @@ with pkgs;
   };
 
   iprover = callPackage ../applications/science/logic/iprover {
-    inherit (ocamlPackages_4_02) ocaml;
+    inherit (ocaml-ng.ocamlPackages_4_02) ocaml;
   };
 
   jonprl = callPackage ../applications/science/logic/jonprl {
@@ -20640,7 +20665,7 @@ with pkgs;
   elan = callPackage ../applications/science/logic/elan {};
 
   leo2 = callPackage ../applications/science/logic/leo2 {
-     ocaml = ocamlPackages_4_01_0.ocaml;};
+     ocaml = ocaml-ng.ocamlPackages_4_01_0.ocaml;};
 
   logisim = callPackage ../applications/science/logic/logisim {};
 
@@ -20669,7 +20694,7 @@ with pkgs;
 
   libpoly = callPackage ../applications/science/logic/poly {};
 
-  prooftree = (with ocamlPackages_4_01_0;
+  prooftree = (with ocaml-ng.ocamlPackages_4_01_0;
     callPackage  ../applications/science/logic/prooftree {
       camlp5 = camlp5_transitional;
     });
@@ -20681,7 +20706,7 @@ with pkgs;
   sapic = callPackage ../applications/science/logic/sapic { };
 
   satallax = callPackage ../applications/science/logic/satallax {
-    ocaml = ocamlPackages_4_01_0.ocaml;
+    ocaml = ocaml-ng.ocamlPackages_4_01_0.ocaml;
   };
 
   saw-tools = callPackage ../applications/science/logic/saw-tools {};
@@ -21210,6 +21235,7 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) AudioToolbox CoreAudio CoreFoundation;
   };
   libjack2 = jack2.override { prefix = "lib"; };
+  jack2Full = jack2; # TODO: move to aliases.nix
 
   keynav = callPackage ../tools/X11/keynav { };
 
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index b98b5b508cf..420a257c607 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -12428,7 +12428,7 @@ let self = _self // overrides; _self = with self; {
       url = "https://alioth.debian.org/frs/download.php/file/4142/po4a-0.47.tar.gz";
       sha256 = "5010e1b7df1115cbd475f46587fc05fefc97301f9bba0c2f15106005ca017507";
     };
-    nativeBuildInputs = [ pkgs.docbook_xml_xslt pkgs.docbook_xsl pkgs.docbook_xsl_ns ];
+    nativeBuildInputs = [ pkgs.docbook_xsl pkgs.docbook_xsl_ns ];
     propagatedBuildInputs = [ TextWrapI18N LocaleGettext TermReadKey SGMLSpm ModuleBuild UnicodeLineBreak ModuleBuild ];
     buildInputs = [ pkgs.gettext pkgs.libxslt pkgs.glibcLocales pkgs.docbook_xml_dtd_412 pkgs.docbook_sgml_dtd_41 pkgs.texlive.combined.scheme-basic pkgs.jade ];
     LC_ALL="en_US.UTF-8";
-- 
GitLab


From 25c42e7736d0507fd23fb5375a9282f528cc843f Mon Sep 17 00:00:00 2001
From: Matthew Bauer <matthew.bauer@obsidian.systems>
Date: Tue, 17 Jul 2018 16:32:33 -0400
Subject: [PATCH 143/297] release: disallow aliases

This will make hydra & ofborg ignore aliases when evluating
---
 pkgs/top-level/release.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index 5553c4d5265..f1b487d98c1 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -16,7 +16,7 @@
   # Strip most of attributes when evaluating to spare memory usage
 ,  scrubJobs ? true
   # Attributes passed to nixpkgs. Don't build packages marked as unfree.
-,  nixpkgsArgs ? { config = { allowUnfree = false; inHydra = true; }; }
+,  nixpkgsArgs ? { config = { allowUnfree = false; inHydra = true; allowAliases = false; }; }
 }:
 
 with import ./release-lib.nix { inherit supportedSystems scrubJobs nixpkgsArgs; };
-- 
GitLab


From aab3182ca4a2b69bfd01db53e1e95c941425203b Mon Sep 17 00:00:00 2001
From: Matthew Bauer <matthew.bauer@obsidian.systems>
Date: Wed, 18 Jul 2018 20:20:07 -0400
Subject: [PATCH 144/297] lollypop-portal: use callPackage

otherwise we get this error on evaluation:

derivation 'lollypop-portal' has invalid meta attribute 'override'
derivation 'lollypop-portal' has invalid meta attribute 'overrideDerivation'
---
 pkgs/top-level/all-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bfe9d8e726d..4f72fa6ba36 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21251,7 +21251,7 @@ with pkgs;
     lilypond = lilypond-unstable;
   };
 
-  lollypop-portal = callPackages ../misc/lollypop-portal { };
+  lollypop-portal = callPackage ../misc/lollypop-portal { };
 
   openlilylib-fonts = callPackage ../misc/lilypond/fonts.nix { };
 
-- 
GitLab


From 4ed7a4b993d3e03e16eb5dbe0f1ea3061d2eb475 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <matthew.bauer@obsidian.systems>
Date: Thu, 19 Jul 2018 00:09:01 -0400
Subject: [PATCH 145/297] treewide: preserve hashes from 76999cc40e6

76999cc40e6 changed some hashes resulting in this PR being technically
a mass rebuild. To avoid this, I am restoring some of the hashes (even
though it seems silly). My main goal is to get this PR merged quickly
as treewide changes like this get out-of-date quickly.

This commit should be reverted on the next mass rebuild.
---
 pkgs/applications/window-managers/afterstep/default.nix | 2 +-
 pkgs/desktops/enlightenment/efl.nix                     | 2 +-
 pkgs/development/libraries/libvirt/default.nix          | 2 +-
 pkgs/development/libraries/strigi/default.nix           | 2 +-
 pkgs/development/python-modules/dbus/default.nix        | 2 +-
 pkgs/top-level/perl-packages.nix                        | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/window-managers/afterstep/default.nix b/pkgs/applications/window-managers/afterstep/default.nix
index a48d031ad33..46a86da1d66 100644
--- a/pkgs/applications/window-managers/afterstep/default.nix
+++ b/pkgs/applications/window-managers/afterstep/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ libjpeg libtiff libpng freetype fltk gtk libX11 libXext libICE dbus ];
+  buildInputs = [ libjpeg libtiff libpng freetype fltk gtk libX11 libXext libICE dbus dbus ];
 
   # A strange type of bug: dbus is not immediately found by pkgconfig
   preConfigure = ''
diff --git a/pkgs/desktops/enlightenment/efl.nix b/pkgs/desktops/enlightenment/efl.nix
index f4d29643dd7..5daf4c29601 100644
--- a/pkgs/desktops/enlightenment/efl.nix
+++ b/pkgs/desktops/enlightenment/efl.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
     xorg.libXdamage xorg.libXinerama xorg.libXp xorg.libXtst xorg.libXi xorg.libXext
     bullet xorg.libXScrnSaver xorg.libXrender xorg.libXfixes xorg.libXrandr
     xorg.libxkbfile xorg.libxcb xorg.xcbutilkeysyms openjpeg doxygen expat luajit
-    harfbuzz jbig2dec librsvg alsaLib poppler ghostscript libraw libspectre xineLib libwebp curl libdrm
+    harfbuzz jbig2dec librsvg dbus alsaLib poppler ghostscript libraw libspectre xineLib libwebp curl libdrm
     libinput utillinux fribidi SDL2 ];
 
   # ac_ct_CXX must be set to random value, because then it skips some magic which does alternative searching for g++
diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix
index 57eb5b42f37..02c13e413e3 100644
--- a/pkgs/development/libraries/libvirt/default.nix
+++ b/pkgs/development/libraries/libvirt/default.nix
@@ -39,7 +39,7 @@ in stdenv.mkDerivation rec {
   ] ++ optionals (!buildFromTarball) [
     libtool autoconf automake
   ] ++ optionals stdenv.isLinux [
-    libpciaccess lvm2 utillinux systemd libnl numad zfs
+    libpciaccess lvm2 lvm2 utillinux systemd libnl numad zfs
     libapparmor libcap_ng numactl attr parted
   ] ++ optionals (enableXen && stdenv.isLinux && stdenv.isx86_64) [
     xen
diff --git a/pkgs/development/libraries/strigi/default.nix b/pkgs/development/libraries/strigi/default.nix
index e2b8279b3ca..36768acd991 100644
--- a/pkgs/development/libraries/strigi/default.nix
+++ b/pkgs/development/libraries/strigi/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   CLUCENE_HOME = clucene_core;
 
   buildInputs =
-    [ zlib bzip2 libxml2 qt4 exiv2 clucene_core fam dbus ];
+    [ zlib bzip2 libxml2 qt4 exiv2 clucene_core fam dbus.out ];
 
   nativeBuildInputs = [ cmake pkgconfig perl ];
 
diff --git a/pkgs/development/python-modules/dbus/default.nix b/pkgs/development/python-modules/dbus/default.nix
index 5e42331d183..8f3f331fd50 100644
--- a/pkgs/development/python-modules/dbus/default.nix
+++ b/pkgs/development/python-modules/dbus/default.nix
@@ -15,7 +15,7 @@ if isPyPy then throw "dbus-python not supported for interpreter ${python.executa
 
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ dbus dbus-glib ]
-    ++ lib.optionals doCheck [ pygobject3 ]
+    ++ lib.optionals doCheck [ dbus.out pygobject3 ]
     # My guess why it's sometimes trying to -lncurses.
     # It seems not to retain the dependency anyway.
     ++ lib.optional (! python ? modules) ncurses;
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 420a257c607..27a1341eecc 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -12428,7 +12428,7 @@ let self = _self // overrides; _self = with self; {
       url = "https://alioth.debian.org/frs/download.php/file/4142/po4a-0.47.tar.gz";
       sha256 = "5010e1b7df1115cbd475f46587fc05fefc97301f9bba0c2f15106005ca017507";
     };
-    nativeBuildInputs = [ pkgs.docbook_xsl pkgs.docbook_xsl_ns ];
+    nativeBuildInputs = [ pkgs.docbook_xsl pkgs.docbook_xsl pkgs.docbook_xsl_ns ];
     propagatedBuildInputs = [ TextWrapI18N LocaleGettext TermReadKey SGMLSpm ModuleBuild UnicodeLineBreak ModuleBuild ];
     buildInputs = [ pkgs.gettext pkgs.libxslt pkgs.glibcLocales pkgs.docbook_xml_dtd_412 pkgs.docbook_sgml_dtd_41 pkgs.texlive.combined.scheme-basic pkgs.jade ];
     LC_ALL="en_US.UTF-8";
-- 
GitLab


From 402ee4e9eaf08a697672718cd502067c726a7c73 Mon Sep 17 00:00:00 2001
From: Johannes Frankenau <johannes@frankenau.net>
Date: Sat, 10 Mar 2018 12:09:03 +0100
Subject: [PATCH 146/297] mpv: use wrapper for scripts and add mpris script

---
 pkgs/applications/video/mpv/default.nix       |  4 ---
 pkgs/applications/video/mpv/scripts/mpris.nix | 28 +++++++++++++++++++
 pkgs/applications/video/mpv/wrapper.nix       | 14 ++++++++++
 pkgs/top-level/all-packages.nix               |  3 ++
 4 files changed, 45 insertions(+), 4 deletions(-)
 create mode 100644 pkgs/applications/video/mpv/scripts/mpris.nix
 create mode 100644 pkgs/applications/video/mpv/wrapper.nix

diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix
index 61e3a7d895d..cefd5b66aed 100644
--- a/pkgs/applications/video/mpv/default.nix
+++ b/pkgs/applications/video/mpv/default.nix
@@ -38,9 +38,6 @@
 , vapoursynthSupport ? false, vapoursynth   ? null
 , archiveSupport     ? false, libarchive    ? null
 , jackaudioSupport   ? false, libjack2      ? null
-
-# scripts you want to be loaded by default
-, scripts ? []
 }:
 
 with stdenv.lib;
@@ -180,7 +177,6 @@ in stdenv.mkDerivation rec {
     ln -s ${freefont_ttf}/share/fonts/truetype/FreeSans.ttf $out/share/mpv/subfont.ttf
     # Ensure youtube-dl is available in $PATH for MPV
     wrapProgram $out/bin/mpv \
-      --add-flags "--scripts=${concatStringsSep "," scripts}" \
       --prefix LUA_PATH : "${luaPath}" \
       --prefix LUA_CPATH : "${luaCPath}" \
   '' + optionalString youtubeSupport ''
diff --git a/pkgs/applications/video/mpv/scripts/mpris.nix b/pkgs/applications/video/mpv/scripts/mpris.nix
new file mode 100644
index 00000000000..e98ba9bdc3f
--- /dev/null
+++ b/pkgs/applications/video/mpv/scripts/mpris.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchFromGitHub, pkgconfig, gobjectIntrospection, mpv }:
+
+stdenv.mkDerivation rec {
+  name = "mpv-mpris-${version}.so";
+  version = "0.1";
+
+  src = fetchFromGitHub {
+    owner = "hoyon";
+    repo = "mpv-mpris";
+    rev = "v${version}";
+    sha256 = "0rsbrbv5q7vki59wdlx4cdkd0vvd79qgbjvdb3fn3li7aznvjwiy";
+  };
+
+  nativeBuildInputs = [ pkgconfig ];
+
+  buildInputs = [ gobjectIntrospection mpv ];
+
+  installPhase = ''
+    cp mpris.so $out
+  '';
+
+  meta = with stdenv.lib; {
+    description = "MPRIS plugin for mpv";
+    homepage = https://github.com/hoyon/mpv-mpris;
+    license = licenses.mit;
+    maintainers = with maintainers; [ jfrankenau ];
+  };
+}
diff --git a/pkgs/applications/video/mpv/wrapper.nix b/pkgs/applications/video/mpv/wrapper.nix
new file mode 100644
index 00000000000..624c06414fd
--- /dev/null
+++ b/pkgs/applications/video/mpv/wrapper.nix
@@ -0,0 +1,14 @@
+{ stdenv, symlinkJoin, makeWrapper, mpv, scripts ? [] }:
+
+symlinkJoin {
+  name = "mpv-with-scripts-${mpv.version}";
+
+  paths = [ mpv ];
+
+  buildInputs = [ makeWrapper ];
+
+  postBuild = ''
+    wrapProgram $out/bin/mpv \
+      --add-flags "${stdenv.lib.concatMapStringsSep " " (x: "--script=" + x) scripts}"
+  '';
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index aabe94fef4c..3afb13b28fb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17374,8 +17374,11 @@ with pkgs;
     xvSupport          = !stdenv.isDarwin;
   };
 
+  mpv-with-scripts = callPackage ../applications/video/mpv/wrapper.nix { };
+
   mpvScripts = {
     convert = callPackage ../applications/video/mpv/scripts/convert.nix {};
+    mpris = callPackage ../applications/video/mpv/scripts/mpris.nix {};
   };
 
   mrpeach = callPackage ../applications/audio/pd-plugins/mrpeach { };
-- 
GitLab


From 5ab07a8041c7b83ca294ba7a9bfb07ab9223935a Mon Sep 17 00:00:00 2001
From: Mathieu Boespflug <m@tweag.io>
Date: Sat, 14 Jul 2018 17:36:42 +0200
Subject: [PATCH 147/297] bazel: make more tools available in customBash.

---
 .../tools/build-managers/bazel/default.nix    | 33 +++++++++++--------
 1 file changed, 20 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix
index b4e3dfa0e0f..1ccbb317330 100644
--- a/pkgs/development/tools/build-managers/bazel/default.nix
+++ b/pkgs/development/tools/build-managers/bazel/default.nix
@@ -1,4 +1,6 @@
-{ stdenv, lib, fetchurl, runCommand, jdk, zip, unzip, bash, writeCBin, coreutils, makeWrapper, which, python, gnused
+{ stdenv, lib, fetchurl, runCommand, makeWrapper
+, jdk, zip, unzip, bash, writeCBin, coreutils
+, which, python, gnused, gnugrep, findutils
 # Always assume all markers valid (don't redownload dependencies).
 # Also, don't clean up environment variables.
 , enableNixHacks ? false
@@ -6,16 +8,21 @@
 , libcxx, CoreFoundation, CoreServices, Foundation
 }:
 
-let srcDeps = stdenv.lib.singleton (
-      fetchurl {
-        url = "https://github.com/google/desugar_jdk_libs/archive/f5e6d80c6b4ec6b0a46603f72b015d45cf3c11cd.zip";
-        sha256 = "c80f3f3d442d8a6ca7adc83f90ecd638c3864087fdd6787ffac070b6f1cc8f9b";
-      }
-    );
-    distDir = runCommand "bazel-deps" {} ''
-      mkdir -p $out
-      for i in ${builtins.toString srcDeps}; do cp $i $out/$(stripHash $i); done
-    '';
+let
+  srcDeps = stdenv.lib.singleton (
+    fetchurl {
+      url = "https://github.com/google/desugar_jdk_libs/archive/f5e6d80c6b4ec6b0a46603f72b015d45cf3c11cd.zip";
+      sha256 = "c80f3f3d442d8a6ca7adc83f90ecd638c3864087fdd6787ffac070b6f1cc8f9b";
+    }
+  );
+
+  distDir = runCommand "bazel-deps" {} ''
+    mkdir -p $out
+    for i in ${builtins.toString srcDeps}; do cp $i $out/$(stripHash $i); done
+  '';
+
+  defaultShellPath = lib.makeBinPath [ bash coreutils findutils gnugrep gnused which ];
+
 in
 stdenv.mkDerivation rec {
 
@@ -52,7 +59,7 @@ stdenv.mkDerivation rec {
 
     int main(int argc, char *argv[]) {
       char *path = getenv("PATH");
-      char *pathToAppend = "${lib.makeBinPath [ coreutils gnused ]}";
+      char *pathToAppend = "${defaultShellPath}";
       char *newPath;
       if (path != NULL) {
         int length = strlen(path) + 1 + strlen(pathToAppend) + 1;
@@ -140,7 +147,7 @@ stdenv.mkDerivation rec {
   # Save paths to hardcoded dependencies so Nix can detect them.
   postFixup = ''
     mkdir -p $out/nix-support
-    echo "${customBash} ${gnused} ${coreutils}" > $out/nix-support/depends
+    echo "${customBash} ${defaultShellPath}" > $out/nix-support/depends
   '';
 
   dontStrip = true;
-- 
GitLab


From c27f686a4b4fcd77efb0d332f463b9293b746061 Mon Sep 17 00:00:00 2001
From: Mathieu Boespflug <m@tweag.io>
Date: Sat, 14 Jul 2018 17:37:45 +0200
Subject: [PATCH 148/297] bazel: Set a sensible strict action environment.

Bazel either reuses the `PATH` from the client, or sets a hardcoded
one. The former mode in problematic for build hermeticity. But the
latter is crippled on NixOS, because the hardcoded value is
`/bin:/usr/bin`. So we set the hardcoded value to match what
`customBash` provides. This has the effect of aligning the
environments for `ctx.actions.run` and `ctx.actions.run_shell`, which
were previously distinct (bug).
---
 pkgs/development/tools/build-managers/bazel/default.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix
index 1ccbb317330..b59a93d3732 100644
--- a/pkgs/development/tools/build-managers/bazel/default.nix
+++ b/pkgs/development/tools/build-managers/bazel/default.nix
@@ -96,6 +96,15 @@ stdenv.mkDerivation rec {
     sed -i -e "361 a --host_copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --host_copt=\"/g')\" \\\\" scripts/bootstrap/compile.sh
     sed -i -e "361 a --linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --linkopt=\"-Wl,/g')\" \\\\" scripts/bootstrap/compile.sh
     sed -i -e "361 a --host_linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --host_linkopt=\"-Wl,/g')\" \\\\" scripts/bootstrap/compile.sh
+
+    # --experimental_strict_action_env (which will soon become the
+    # default, see bazelbuild/bazel#2574) hardcodes the default
+    # action environment to a value that on NixOS at least is bogus.
+    # So we hardcode it to something useful.
+    substituteInPlace \
+		  src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRuleClassProvider.java \
+      --replace /bin:/usr/bin ${defaultShellPath}
+
     patchShebangs .
   '';
 
-- 
GitLab


From b53b5950fcffe32e62f2e4d290f4a2c3b6afab59 Mon Sep 17 00:00:00 2001
From: Sarah Brofeldt <sbrofeldt@gmail.com>
Date: Wed, 18 Jul 2018 13:21:48 +0200
Subject: [PATCH 149/297] haskellPackages.spatial-rotations: dontCheck for
 cyclic dependency

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

diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index 2e3a8e1c867..682e1bc91ef 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -504,7 +504,7 @@ self: super: builtins.intersectAttrs super {
   # Break cyclic reference that results in an infinite recursion.
   partial-semigroup = dontCheck super.partial-semigroup;
   colour = dontCheck super.colour;
-  manifolds = super.manifolds.override { spatial-rotations = dontCheck self.spatial-rotations; };
+  spatial-rotations = dontCheck super.spatial-rotations;
 
   LDAP = dontCheck (overrideCabal super.LDAP (drv: {
     librarySystemDepends = drv.librarySystemDepends or [] ++ [ pkgs.cyrus_sasl.dev ];
-- 
GitLab


From 338898c2f7953ce2d17edb39ee7099365f1822c8 Mon Sep 17 00:00:00 2001
From: Boris Babic <boris.ivan.babic@gmail.com>
Date: Thu, 19 Jul 2018 12:38:15 +0200
Subject: [PATCH 150/297] postman: fix icon not found

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

diff --git a/pkgs/development/web/postman/default.nix b/pkgs/development/web/postman/default.nix
index c51e1595ee7..3388df5e8ed 100644
--- a/pkgs/development/web/postman/default.nix
+++ b/pkgs/development/web/postman/default.nix
@@ -17,8 +17,8 @@ stdenv.mkDerivation rec {
   buildPhase = ":";   # nothing to build
 
   icon = fetchurl {
-    url = "https://www.getpostman.com/img-rebrand/logo.png";
-    sha256 = "0jdhl9c07b1723j2f172z3s5p5lh8sqa1rcvdzz3h6z5zwn21g7v";
+    url = "https://www.getpostman.com/img/v2/media-kit/Logo/PNG/pm-logo-horiz.png";
+    sha256 = "271b88317bd787f4a30ab374148e73314d60fb1b220ef791611774a061c49f30";
   };
 
   desktopItem = makeDesktopItem {
-- 
GitLab


From 4fd9ca3a51b2eefad9ed12e57483b69199d6497e Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Thu, 19 Jul 2018 12:52:06 +0200
Subject: [PATCH 151/297] signal-desktop: 1.14.1 -> 1.14.2

---
 .../networking/instant-messengers/signal-desktop/default.nix  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
index fcdc1610134..d0b7ccfbff7 100644
--- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
@@ -40,11 +40,11 @@ let
 
 in stdenv.mkDerivation rec {
   name = "signal-desktop-${version}";
-  version = "1.14.1";
+  version = "1.14.2";
 
   src = fetchurl {
     url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
-    sha256 = "1f54azqdfqa2yrzlp9b7pz7nswl5n3pgln38yxcvb3y5k6x0ljqp";
+    sha256 = "0szc7ynl26hqvvwk3sx02ym4abyz78akx0sp6cvif3bb4m8brz1c";
   };
 
   phases = [ "unpackPhase" "installPhase" ];
-- 
GitLab


From b9e7469c441ec8ebb5d8d06793bd47c2ea3b0faf Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Thu, 19 Jul 2018 13:27:09 +0200
Subject: [PATCH 152/297] xgboost: 0.7 -> 0.72

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

diff --git a/pkgs/development/libraries/xgboost/default.nix b/pkgs/development/libraries/xgboost/default.nix
index 7865724efa4..6ebfd1359dc 100644
--- a/pkgs/development/libraries/xgboost/default.nix
+++ b/pkgs/development/libraries/xgboost/default.nix
@@ -9,13 +9,13 @@ assert ncclSupport -> cudaSupport;
 
 stdenv.mkDerivation rec {
   name = "xgboost-${version}";
-  version = "0.7";
+  version = "0.72";
 
   # needs submodules
   src = fetchgit {
     url = "https://github.com/dmlc/xgboost";
     rev = "refs/tags/v${version}";
-    sha256 = "1wxh020l4q037hc5z7vgxflb70l41a97anl8g6y4wxb74l5zv61l";
+    sha256 = "1d4kw2jm7d12g8qwi7p9r3429y7sjks9xp9yhvfpx5jh7qakkxj6";
   };
 
   enableParallelBuilding = true;
-- 
GitLab


From 88a35d8bb5e8809e19afca23076c49f23151e187 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Thu, 19 Jul 2018 13:27:22 +0200
Subject: [PATCH 153/297] pythonPackages.xgboost: fix build

The setup.py of `python-package` contains some path resolution magic to
find `libxgboost.so` which is needed for the python API.

Unfortunately the code is incompatible with Nix as it isn't compatible
with the store-based structure for each package and tries to express the
location of the shared object with relative paths.

The detection in `setup.py` and `xgboost/libpath.py` has been either
removed entirely or patched to link to the proper store path of the
`libxgboost` build input.

See https://hydra.nixos.org/build/77702715 for further reference.
---
 .../python-modules/xgboost/default.nix        | 30 +++++-----
 .../xgboost/lib-path-for-python.patch         | 59 +++++++++++++++++++
 2 files changed, 73 insertions(+), 16 deletions(-)
 create mode 100644 pkgs/development/python-modules/xgboost/lib-path-for-python.patch

diff --git a/pkgs/development/python-modules/xgboost/default.nix b/pkgs/development/python-modules/xgboost/default.nix
index 9b53c180397..d9b8fc892c1 100644
--- a/pkgs/development/python-modules/xgboost/default.nix
+++ b/pkgs/development/python-modules/xgboost/default.nix
@@ -3,30 +3,28 @@
 , nose
 , scipy
 , xgboost
+, substituteAll
 }:
 
 buildPythonPackage rec {
   pname = "xgboost";
   inherit (xgboost) version src meta;
 
-  propagatedBuildInputs = [ scipy ];
-  checkInputs = [ nose ];
-
-  postPatch = let
-    libname = "libxgboost.${stdenv.hostPlatform.extensions.sharedLibrary}";
+  patches = [
+    (substituteAll {
+      src = ./lib-path-for-python.patch;
+      libpath = "${xgboost}/lib";
+    })
+  ];
 
-  in ''
-    cd python-package
+  postPatch = "cd python-package";
 
-    sed "s/CURRENT_DIR = os.path.dirname(__file__)/CURRENT_DIR = os.path.abspath(os.path.dirname(__file__))/g" -i setup.py
-    sed "/^LIB_PATH.*/a LIB_PATH = [os.path.relpath(LIB_PATH[0], CURRENT_DIR)]" -i setup.py
-    cat <<EOF >xgboost/libpath.py
-    def find_lib_path():
-      return ["${xgboost}/lib/${libname}"]
-    EOF
-  '';
+  propagatedBuildInputs = [ scipy ];
+  buildInputs = [ xgboost ];
+  checkInputs = [ nose ];
 
-  postInstall = ''
-    rm -rf $out/xgboost
+  checkPhase = ''
+    ln -sf ../demo .
+    nosetests ../tests/python
   '';
 }
diff --git a/pkgs/development/python-modules/xgboost/lib-path-for-python.patch b/pkgs/development/python-modules/xgboost/lib-path-for-python.patch
new file mode 100644
index 00000000000..68b39dee53e
--- /dev/null
+++ b/pkgs/development/python-modules/xgboost/lib-path-for-python.patch
@@ -0,0 +1,59 @@
+diff --git a/python-package/setup.py b/python-package/setup.py
+index e6c3386f..4ed0a8bd 100644
+--- a/python-package/setup.py
++++ b/python-package/setup.py
+@@ -16,8 +16,6 @@ libpath_py = os.path.join(CURRENT_DIR, 'xgboost/libpath.py')
+ libpath = {'__file__': libpath_py}
+ exec(compile(open(libpath_py, "rb").read(), libpath_py, 'exec'), libpath, libpath)
+ 
+-LIB_PATH = [os.path.relpath(libfile, CURRENT_DIR) for libfile in libpath['find_lib_path']()]
+-print("Install libxgboost from: %s" % LIB_PATH)
+ # Please use setup_pip.py for generating and deploying pip installation
+ # detailed instruction in setup_pip.py
+ setup(name='xgboost',
+@@ -35,7 +33,6 @@ setup(name='xgboost',
+       # this will use MANIFEST.in during install where we specify additional files,
+       # this is the golden line
+       include_package_data=True,
+-      data_files=[('xgboost', LIB_PATH)],
+       license='Apache-2.0',
+       classifiers=['License :: OSI Approved :: Apache Software License'],
+       url='https://github.com/dmlc/xgboost')
+diff --git a/python-package/xgboost/libpath.py b/python-package/xgboost/libpath.py
+index d87922c0..859a30fb 100644
+--- a/python-package/xgboost/libpath.py
++++ b/python-package/xgboost/libpath.py
+@@ -19,32 +19,4 @@ def find_lib_path():
+     lib_path: list(string)
+        List of all found library path to xgboost
+     """
+-    curr_path = os.path.dirname(os.path.abspath(os.path.expanduser(__file__)))
+-    # make pythonpack hack: copy this directory one level upper for setup.py
+-    dll_path = [curr_path, os.path.join(curr_path, '../../lib/'),
+-                os.path.join(curr_path, './lib/'),
+-                os.path.join(sys.prefix, 'xgboost')]
+-    if sys.platform == 'win32':
+-        if platform.architecture()[0] == '64bit':
+-            dll_path.append(os.path.join(curr_path, '../../windows/x64/Release/'))
+-            # hack for pip installation when copy all parent source directory here
+-            dll_path.append(os.path.join(curr_path, './windows/x64/Release/'))
+-        else:
+-            dll_path.append(os.path.join(curr_path, '../../windows/Release/'))
+-            # hack for pip installation when copy all parent source directory here
+-            dll_path.append(os.path.join(curr_path, './windows/Release/'))
+-        dll_path = [os.path.join(p, 'xgboost.dll') for p in dll_path]
+-    elif sys.platform.startswith('linux') or sys.platform.startswith('freebsd'):
+-        dll_path = [os.path.join(p, 'libxgboost.so') for p in dll_path]
+-    elif sys.platform == 'darwin':
+-        dll_path = [os.path.join(p, 'libxgboost.dylib') for p in dll_path]
+-
+-    lib_path = [p for p in dll_path if os.path.exists(p) and os.path.isfile(p)]
+-
+-    # From github issues, most of installation errors come from machines w/o compilers
+-    if not lib_path and not os.environ.get('XGBOOST_BUILD_DOC', False):
+-        raise XGBoostLibraryNotFound(
+-            'Cannot find XGBoost Library in the candidate path, ' +
+-            'did you install compilers and run build.sh in root path?\n'
+-            'List of candidates:\n' + ('\n'.join(dll_path)))
+-    return lib_path
++    return ["@libpath@/libxgboost.so"]
-- 
GitLab


From 1ae8fabc863f07ec9a7a5f4833ecfe14f6dc6c56 Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Thu, 19 Jul 2018 21:01:29 +0900
Subject: [PATCH 154/297] oraclejdk: 10.0.1 -> 10.0.2

---
 pkgs/development/compilers/oraclejdk/jdk10-linux.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/compilers/oraclejdk/jdk10-linux.nix b/pkgs/development/compilers/oraclejdk/jdk10-linux.nix
index b93a13abc9c..e6e868fdf41 100644
--- a/pkgs/development/compilers/oraclejdk/jdk10-linux.nix
+++ b/pkgs/development/compilers/oraclejdk/jdk10-linux.nix
@@ -28,7 +28,7 @@
 assert swingSupport -> xorg != null;
 
 let
-  version = "10.0.1";
+  version = "10.0.2";
 
   downloadUrlBase = http://www.oracle.com/technetwork/java/javase/downloads;
 
@@ -51,19 +51,19 @@ let result = stdenv.mkDerivation rec {
       requireFile {
         name = "jdk-${version}_linux-x64_bin.tar.gz";
         url =  "${downloadUrlBase}/jdk10-downloads-4416644.html";
-        sha256 = "1975s6cn2lxb8jmxp236afvq6hhxqrx5jix8aqm46f5gwr2xd3mf";
+        sha256 = "0arpzac64apji1s8d0gzizkvrjz0fbhz7l34af1j0365ac6w4cv6";
       }
     else if packageType == "JRE" then
       requireFile {
         name = "jre-${version}_linux-x64_bin.tar.gz";
         url = "${downloadUrlBase}/jre10-downloads-4417026.html";
-        sha256 = "11pb8cwzmalc6ax735m84g13jh1mrfc8g84b5qypnmqjjdv6fpiq";
+        sha256 = "0pc4a0a3fl6874vfaflf6jvpm9da647vp41pj0hihkspjyjhjabx";
       }
     else if packageType == "ServerJRE" then
       requireFile {
         name = "serverjre-${version}_linux-x64_bin.tar.gz";
         url = "${downloadUrlBase}/sjre10-downloads-4417025.html";
-        sha256 = "0hvfqgr22sq9zyqc496vqgg5ail189h3a4pazp39i8n86brd48lw";
+        sha256 = "0hbcb4c6ncy0sbz02gyygyqcwkz0xpv4fwrx4sripia6vph9592c";
       }
     else abort "unknown package Type ${packageType}";
 
-- 
GitLab


From 80d44926bf7099f2bc77ca5e9288c0c0ca35e99d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Wed, 18 Jul 2018 17:54:29 -0700
Subject: [PATCH 155/297] atom: 1.28.1 -> 1.28.2

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/atom/versions.
---
 pkgs/applications/editors/atom/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix
index 142e9b78994..8139640457e 100644
--- a/pkgs/applications/editors/atom/default.nix
+++ b/pkgs/applications/editors/atom/default.nix
@@ -61,8 +61,8 @@ let
   };
 in stdenv.lib.mapAttrs common {
   atom = {
-    version = "1.28.1";
-    sha256 = "03phnbsc45i0r799ni9br7s4qjy05fczbca64jd0sr4jhzi7qmlx";
+    version = "1.28.2";
+    sha256 = "07lz4lj07dbfz952l3q9vplvg41pxl1cx89gzy8bzzr3ay7kn6za";
   };
 
   atom-beta = {
-- 
GitLab


From e953d314a89c804c3b3b413369f73d54732d42ff Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Thu, 19 Jul 2018 08:34:13 -0400
Subject: [PATCH 156/297] docker: 18.03 -> 18.06

---
 .../virtualization/docker/default.nix         | 32 ++++++-------------
 pkgs/top-level/all-packages.nix               | 10 +++---
 2 files changed, 14 insertions(+), 28 deletions(-)

diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix
index 7e9a89d4888..6e40f9ba076 100644
--- a/pkgs/applications/virtualization/docker/default.nix
+++ b/pkgs/applications/virtualization/docker/default.nix
@@ -197,27 +197,15 @@ rec {
   # Get revisions from
   # https://github.com/docker/docker-ce/tree/v${version}/components/engine/hack/dockerfile/install/*
 
-  docker_18_03 = dockerGen rec {
-    version = "18.03.1-ce";
-    rev = "9ee9f402cd1eba817c5591a64f1d770c87c421a4"; # git commit
-    sha256 = "1jm3jmcbkvvy3s8pi3xcpir6mwxjfbad46lbif4bnpjfd2r5irrx";
-    runcRev = "4fc53a81fb7c994640722ac585fa9ca548971871";
-    runcSha256 = "1ikqw39jn8dzb4snc4pcg3z85jb67ivskdhx028k17ss29bf4062";
-    containerdRev = "773c489c9c1b21a6d78b5c538cd395416ec50f88";
-    containerdSha256 = "0k1zjn0mpd7q3p5srxld2fr4k6ijzbk0r34r6w69sh0d0rd2fvbs";
-    tiniRev = "949e6facb77383876aeff8a6944dde66b3089574";
-    tiniSha256 = "0zj4kdis1vvc6dwn4gplqna0bs7v6d1y2zc8v80s3zi018inhznw";
-  };
-
-  docker_18_05 = dockerGen rec {
-    version = "18.05.0-ce";
-    rev = "f150324782643a5268a04e7d1a675587125da20e"; # git commit
-    sha256 = "0vgh03qwlfm25sm3yaa6vf5ap2ag575f814ccgcrp5zlcal13r0z";
-    runcRev = "4fc53a81fb7c994640722ac585fa9ca548971871";
-    runcSha256 = "1ikqw39jn8dzb4snc4pcg3z85jb67ivskdhx028k17ss29bf4062";
-    containerdRev = "773c489c9c1b21a6d78b5c538cd395416ec50f88";
-    containerdSha256 = "0k1zjn0mpd7q3p5srxld2fr4k6ijzbk0r34r6w69sh0d0rd2fvbs";
-    tiniRev = "949e6facb77383876aeff8a6944dde66b3089574";
-    tiniSha256 = "0zj4kdis1vvc6dwn4gplqna0bs7v6d1y2zc8v80s3zi018inhznw";
+  docker_18_06 = dockerGen rec {
+    version = "18.06.0-ce";
+    rev = "0ffa8257ec673ed6849b73b03fb01b0cac90fdb3"; # git commit
+    sha256 = "1w6jgqbc53pkgfkf2p6z5g316q1r5jvnw4lq11j4qdkw7vy8q5d9";
+    runcRev = "69663f0bd4b60df09991c08812a60108003fa340";
+    runcSha256 = "1l37r97l3ra4ph069w190d05r0a43s76nn9jvvlkbwrip1cp6gyq";
+    containerdRev = "d64c661f1d51c48782c9cec8fda7604785f93587";
+    containerdSha256 = "0pk1kii8bmlvziblrqwb88w5cd486pmb7vw8p7kcyn9lqsw32ria";
+    tiniRev = "fec3683b971d9c3ef73f284f176672c44b448662";
+    tiniSha256 = "1h20i3wwlbd8x4jr2gz68hgklh0lb0jj7y5xk1wvr8y58fip1rdn";
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3afb13b28fb..6be270050ff 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15643,13 +15643,11 @@ with pkgs;
   dmtx-utils = callPackage (callPackage ../tools/graphics/dmtx-utils) {
   };
 
-  # go 1.9 pin until https://github.com/moby/moby/pull/35739
-  inherit (callPackage ../applications/virtualization/docker {
-    go = go_1_9;
-  }) docker_18_03 docker_18_05;
+  inherit (callPackage ../applications/virtualization/docker {})
+    docker_18_06;
 
-  docker = docker_18_03;
-  docker-edge = docker_18_05;
+  docker = docker_18_06;
+  docker-edge = docker_18_06;
 
   docker-proxy = callPackage ../applications/virtualization/docker/proxy.nix { };
 
-- 
GitLab


From d68322504a53d72eae29dca959936f544f54672a Mon Sep 17 00:00:00 2001
From: Matthew Bauer <matthew.bauer@obsidian.systems>
Date: Thu, 19 Jul 2018 09:46:53 -0400
Subject: [PATCH 157/297] Revert "release: disallow aliases"

This reverts commit 25c42e7736d0507fd23fb5375a9282f528cc843f.

This commit is still causing evaluation errors (despite passing
OfBorg!)

Here is the current error:

error: undefined variable 'Log4Perl' at
/nix/store/n0gwyv3mcvm3hc9jrmkxjhmsrdjqzcqb-source/maintainers/scripts/nix-generate-from-cpan.nix:7:71

More investigation is needed

/cc @volth
---
 pkgs/top-level/release.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index f1b487d98c1..5553c4d5265 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -16,7 +16,7 @@
   # Strip most of attributes when evaluating to spare memory usage
 ,  scrubJobs ? true
   # Attributes passed to nixpkgs. Don't build packages marked as unfree.
-,  nixpkgsArgs ? { config = { allowUnfree = false; inHydra = true; allowAliases = false; }; }
+,  nixpkgsArgs ? { config = { allowUnfree = false; inHydra = true; }; }
 }:
 
 with import ./release-lib.nix { inherit supportedSystems scrubJobs nixpkgsArgs; };
-- 
GitLab


From dc24ab277617aba311970cd23826b60641a49ba4 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <matthew.bauer@obsidian.systems>
Date: Thu, 19 Jul 2018 09:57:29 -0400
Subject: [PATCH 158/297] gtkd: fixup from treewide commit

This was mistakenly replaced when it was already avoiding the alias.

Thanks @jtojnar
---
 pkgs/development/libraries/gtkd/default.nix | 2 +-
 pkgs/top-level/all-packages.nix             | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/gtkd/default.nix b/pkgs/development/libraries/gtkd/default.nix
index 656afef22f9..f206a169b93 100644
--- a/pkgs/development/libraries/gtkd/default.nix
+++ b/pkgs/development/libraries/gtkd/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchzip, atk, cairo, dmd, gdk_pixbuf, gnome3, gst_all_1, librsvg
-, pango, pkgconfig, substituteAll, which, gst_plugins_base }:
+, pango, pkgconfig, substituteAll, which }:
 
 stdenv.mkDerivation rec {
   name = "gtkd-${version}";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6be270050ff..bdc3ca6741e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2873,9 +2873,7 @@ with pkgs;
 
   gtdialog = callPackage ../development/libraries/gtdialog {};
 
-  gtkd = callPackage ../development/libraries/gtkd {
-    gst_plugins_base = gst-plugins-base;
-  };
+  gtkd = callPackage ../development/libraries/gtkd { };
 
   gtkgnutella = callPackage ../tools/networking/p2p/gtk-gnutella { };
 
-- 
GitLab


From 0467e8d1f60096e11bda77065c5f99fedd5a27f6 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <matthew.bauer@obsidian.systems>
Date: Thu, 19 Jul 2018 10:12:58 -0400
Subject: [PATCH 159/297] libuv: fix apple patch url

The old url was subject to change on pushing to the PR. It now
references the correct commit.
---
 pkgs/development/libraries/libuv/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix
index c902a8b216a..ce8d741adf2 100644
--- a/pkgs/development/libraries/libuv/default.nix
+++ b/pkgs/development/libraries/libuv/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   patches = [
     (fetchpatch {
-      url = "https://github.com/libuv/libuv/pull/1909.patch";
+      url = "https://github.com/libuv/libuv/commit/1a5d4f08238dd532c3718e210078de1186a5920d.patch";
       sha256 = "1s2692h4dvqnzwwicrkpj0zph1i2bhv39w31z5vh7ssgvykaradj";
     })
   ];
-- 
GitLab


From cb033fabd6229b88ac2ccb84b65c1bcdb8ce651a Mon Sep 17 00:00:00 2001
From: Kamil Chmielewski <kamil.chm@gmail.com>
Date: Thu, 19 Jul 2018 17:02:53 +0200
Subject: [PATCH 160/297] oraclejdk: 8u171 -> 8u181

---
 pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix b/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix
index bdd367ef352..55faf277b15 100644
--- a/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix
+++ b/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix
@@ -1,11 +1,11 @@
 import ./jdk-linux-base.nix {
   productVersion = "8";
-  patchVersion = "171";
+  patchVersion = "181";
   downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html;
-  sha256.i686-linux = "0dh5r02v40pinway952fflw2r0i1xi67hmyb87c278qfp4jn929p";
-  sha256.x86_64-linux = "10jr4z0bw9wcws5xgc4qkw101cadfx5bkyvcnc4l3v5axwvjipdn";
-  sha256.armv7l-linux = "1bqivmp1wfnypgg5bsfzi25yzl7vd2xncfap9mi8jn63aj633dw0";
-  sha256.aarch64-linux = "1016lf3g1syjsl29m58s2s2w9nkj4jkvxhqg4s35vy41cs2v77j7";
+  sha256.i686-linux = "0159q5wrlp24v8rc6m1cr3kq8nddpdjdprj3vsmf8z7vpwx052np";
+  sha256.x86_64-linux = "1lwiz44vlxn4hc5b43r9arad15lpjfbr7l6h5vafpgxzjmq5ci8q";
+  sha256.armv7l-linux = "0zpgb1hqf9zazic66c7nim036ac6ld3dhnsanx4ijlrl7kd3fbn7";
+  sha256.aarch64-linux = "191r926501cm6mz8p93ljdfxi0dgzw7ljjsrzsbmmxn4k0q2j0ad";
   jceName = "jce_policy-8.zip";
   jceDownloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html;
   sha256JCE = "0n8b6b8qmwb14lllk2lk1q1ahd3za9fnjigz5xn65mpg48whl0pk";
-- 
GitLab


From 10439f798e86a69831bb334fa72cb869292cd289 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Thu, 19 Jul 2018 01:19:45 +0200
Subject: [PATCH 161/297] python3Packages.simpleldap: remove

Fairly outdated and incompatible with Python 3, see the following links
for further reference:

* https://github.com/gdub/python-simpleldap/blob/0.8/setup.py#L12-L14
* https://github.com/NixOS/nixpkgs/pull/43782#issuecomment-406186881
---
 pkgs/top-level/python-packages.nix | 24 ------------------------
 1 file changed, 24 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 450a21f3463..6798778f3a1 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -12638,30 +12638,6 @@ in {
 
   simplejson = callPackage ../development/python-modules/simplejson { };
 
-  simpleldap = buildPythonPackage rec {
-    version = "0.8";
-    name = "simpleldap-${version}";
-
-    propagatedBuildInputs = with self; [ ldap ];
-    buildInputs = with self; [ pep8 pytest tox ];
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/s/simpleldap/simpleldap-${version}.tar.gz";
-      sha256 = "a5916680a7fe1b2c5d74dc76351be2941d03b7b94a50d8520280e3f588a84e61";
-    };
-
-    meta = {
-      description = "A module that makes simple LDAP usage simple";
-      longDescription = ''
-        A small wrapper around the python-ldap library that provides a more
-        Pythonic interface for LDAP server connections, LDAP objects, and the
-        common get and search operations.
-      '';
-      license = licenses.mit;
-      maintainers = with maintainers; [ layus ];
-    };
-  };
-
   simpleparse = buildPythonPackage rec {
     version = "2.1.1";
     name = "simpleparse-${version}";
-- 
GitLab


From 0adca53c79b501fb876ee0e38465574f549ca125 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Thu, 19 Jul 2018 13:44:12 +0200
Subject: [PATCH 162/297] inginious: remove

Fallout of 9db7f15ea3ce57eee25458daf87cce7a04ea98b2 which removed
simpleldap.

@layus suggests to remove:

* https://github.com/NixOS/nixpkgs/pull/43782#issuecomment-406186881
* https://github.com/NixOS/nixpkgs/pull/31975#issuecomment-346647857
---
 nixos/modules/module-list.nix                 |   1 -
 .../web-servers/lighttpd/inginious.nix        | 261 ------------------
 pkgs/servers/inginious/default.nix            |  74 -----
 pkgs/top-level/all-packages.nix               |   2 -
 4 files changed, 338 deletions(-)
 delete mode 100644 nixos/modules/services/web-servers/lighttpd/inginious.nix
 delete mode 100644 pkgs/servers/inginious/default.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index cd00bc8d6bc..e5dce84d6ee 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -682,7 +682,6 @@
   ./services/web-servers/lighttpd/collectd.nix
   ./services/web-servers/lighttpd/default.nix
   ./services/web-servers/lighttpd/gitweb.nix
-  ./services/web-servers/lighttpd/inginious.nix
   ./services/web-servers/meguca.nix
   ./services/web-servers/mighttpd2.nix
   ./services/web-servers/minio.nix
diff --git a/nixos/modules/services/web-servers/lighttpd/inginious.nix b/nixos/modules/services/web-servers/lighttpd/inginious.nix
deleted file mode 100644
index 5ff1796e92a..00000000000
--- a/nixos/modules/services/web-servers/lighttpd/inginious.nix
+++ /dev/null
@@ -1,261 +0,0 @@
-{ config, lib, pkgs, ... }:
-with lib;
-
-let
-  cfg = config.services.lighttpd.inginious;
-  inginious = pkgs.inginious;
-  execName = "inginious-${if cfg.useLTI then "lti" else "webapp"}";
-
-  inginiousConfigFile = if cfg.configFile != null then cfg.configFile else pkgs.writeText "inginious.yaml" ''
-    # Backend; can be:
-    # - "local" (run containers on the same machine)
-    # - "remote" (connect to distant docker daemon and auto start agents) (choose this if you use boot2docker)
-    # - "remote_manual" (connect to distant and manually installed agents)
-    backend: "${cfg.backendType}"
-
-    ## TODO (maybe): Add an option for the "remote" backend in this NixOS module.
-    # List of remote docker daemon to which the backend will try
-    # to connect (backend: remote only)
-    #docker_daemons:
-    #  - # Host of the docker daemon *from the webapp*
-    #    remote_host: "some.remote.server"
-    #    # Port of the distant docker daemon *from the webapp*
-    #    remote_docker_port: "2375"
-    #    # A mandatory port used by the backend and the agent that will be automatically started.
-    #    # Needs to be available on the remote host, and to be open in the firewall.
-    #    remote_agent_port: "63456"
-    #    # Does the remote docker requires tls? Defaults to false.
-    #    # Parameter can be set to true or path to the certificates
-    #    #use_tls: false
-    #    # Link to the docker daemon *from the host that runs the docker daemon*. Defaults to:
-    #    #local_location: "unix:///var/run/docker.sock"
-    #    # Path to the cgroups "mount" *from the host that runs the docker daemon*. Defaults to:
-    #    #cgroups_location: "/sys/fs/cgroup"
-    #    # Name that will be used to reference the agent
-    #    #"agent_name": "inginious-agent"
-
-    # List of remote agents to which the backend will try
-    # to connect (backend: remote_manual only)
-    # Example:
-    #agents:
-    #  - host: "192.168.59.103"
-    #    port: 5001
-    agents:
-    ${lib.concatMapStrings (agent:
-      "  - host: \"${agent.host}\"\n" +
-      "    port: ${agent.port}\n"
-    ) cfg.remoteAgents}
-
-    # Location of the task directory
-    tasks_directory: "${cfg.tasksDirectory}"
-
-    # Super admins: list of user names that can do everything in the backend
-    superadmins:
-    ${lib.concatMapStrings (x: "  - \"${x}\"\n") cfg.superadmins}
-
-    # Aliases for containers
-    # Only containers listed here can be used by tasks
-    containers:
-    ${lib.concatStrings (lib.mapAttrsToList (name: fullname:
-      "  ${name}: \"${fullname}\"\n"
-    ) cfg.containers)}
-
-    # Use single minified javascript file (production) or multiple files (dev) ?
-    use_minified_js: true
-
-    ## TODO (maybe): Add NixOS options for these parameters.
-
-    # MongoDB options
-    #mongo_opt:
-    #    host: localhost
-    #    database: INGInious
-
-    # Disable INGInious?
-    #maintenance: false
-
-    #smtp:
-    #    sendername: 'INGInious <no-reply@inginious.org>'
-    #    host: 'smtp.gmail.com'
-    #    port: 587
-    #    username: 'configme@gmail.com'
-    #    password: 'secret'
-    #    starttls: True
-
-    ## NixOS extra config
-
-    ${cfg.extraConfig}
-  '';
-in
-{
-  options.services.lighttpd.inginious = {
-    enable = mkEnableOption  "INGInious, an automated code testing and grading system.";
-
-    configFile = mkOption {
-      type = types.nullOr types.path;
-      default = null;
-      example = literalExample ''pkgs.writeText "configuration.yaml" "# custom config options ...";'';
-      description = ''The path to an INGInious configuration file.'';
-    };
-
-    extraConfig = mkOption {
-      type = types.lines;
-      default = "";
-      example = ''
-        # Load the dummy auth plugin.
-        plugins:
-          - plugin_module: inginious.frontend.webapp.plugins.auth.demo_auth
-            users:
-              # register the user "test" with the password "someverycomplexpassword"
-              test: someverycomplexpassword
-      '';
-      description = ''Extra option in YaML format, to be appended to the config file.'';
-    };
-
-    tasksDirectory = mkOption {
-      type = types.path;
-      example = "/var/lib/INGInious/tasks";
-      description = ''
-        Path to the tasks folder.
-        Defaults to the provided test tasks folder (readonly).
-      '';
-    };
-
-    useLTI = mkOption {
-      type = types.bool;
-      default = false;
-      description = ''Whether to start the LTI frontend in place of the webapp.'';
-    };
-
-    superadmins = mkOption {
-      type = types.uniq (types.listOf types.str);
-      default = [ "admin" ];
-      example = [ "john" "pepe" "emilia" ];
-      description = ''List of user logins allowed to administrate the whole server.'';
-    };
-
-    containers = mkOption {
-      type = types.attrsOf types.str;
-      default = {
-          default = "ingi/inginious-c-default";
-      };
-      example = {
-        default = "ingi/inginious-c-default";
-        sekexe  = "ingi/inginious-c-sekexe";
-        java    = "ingi/inginious-c-java";
-        oz      = "ingi/inginious-c-oz";
-        pythia1compat = "ingi/inginious-c-pythia1compat";
-      };
-      description = ''
-        An attrset describing the required containers
-        These containers will be available in INGInious using their short name (key)
-        and will be automatically downloaded before INGInious starts.
-      '';
-    };
-
-    hostPattern = mkOption {
-      type = types.str;
-      default = "^inginious.";
-      example = "^inginious.mydomain.xyz$";
-      description = ''
-        The domain that serves INGInious.
-        INGInious uses absolute paths which makes it difficult to relocate in its own subdir.
-        The default configuration will serve INGInious when the server is accessed with a hostname starting with "inginious.".
-        If left blank, INGInious will take the precedence over all the other lighttpd sites, which is probably not what you want.
-      '';
-    };
-
-    backendType = mkOption {
-      type = types.enum [ "local" "remote_manual" ]; # TODO: support backend "remote"
-      default = "local";
-      description = ''
-        Select how INGINious accesses to grading containers.
-        The default "local" option ensures that Docker is started and provisioned.
-        Fore more information, see http://inginious.readthedocs.io/en/latest/install_doc/config_reference.html
-        Not all backends are supported. Use services.inginious.configFile for full flexibility.
-      '';
-    };
-
-    remoteAgents = mkOption {
-      type = types.listOf (types.attrsOf types.str);
-      default = [];
-      example = [ { host = "192.0.2.25"; port = "1345"; } ];
-      description = ''A list of remote agents, used only when services.inginious.backendType is "remote_manual".'';
-    };
-  };
-
-  config = mkIf cfg.enable (
-    mkMerge [
-      # For a local install, we need docker.
-      (mkIf (cfg.backendType == "local") {
-        virtualisation.docker = {
-          enable = true;
-          # We need docker to listen on port 2375.
-          listenOptions = ["127.0.0.1:2375" "/var/run/docker.sock"];
-          storageDriver = mkDefault "overlay";
-        };
-
-        users.users."lighttpd".extraGroups = [ "docker" ];
-
-        # Ensure that docker has pulled the required images.
-        systemd.services.inginious-prefetch = {
-          script = let
-            images = lib.unique (
-              [ "centos" "ingi/inginious-agent" ]
-              ++ lib.mapAttrsToList (_: image: image) cfg.containers
-            );
-          in lib.concatMapStrings (image: ''
-            ${pkgs.docker}/bin/docker pull ${image}
-          '') images;
-
-          serviceConfig.Type = "oneshot";
-          wants = [ "docker.service" ];
-          after = [ "docker.service" ];
-          wantedBy = [ "lighttpd.service" ];
-          before = [ "lighttpd.service" ];
-        };
-      })
-
-      # Common
-      {
-        services.lighttpd.inginious.tasksDirectory = mkDefault "${inginious}/lib/python2.7/site-packages/inginious/tasks";
-        # To access inginous tools (like inginious-test-task)
-        environment.systemPackages = [ inginious ];
-
-        services.mongodb.enable = true;
-
-        services.lighttpd.enable = true;
-        services.lighttpd.enableModules = [ "mod_access" "mod_alias" "mod_fastcgi" "mod_redirect" "mod_rewrite" ];
-        services.lighttpd.extraConfig = ''
-          $HTTP["host"] =~ "${cfg.hostPattern}" {
-            fastcgi.server = ( "/${execName}" =>
-              ((
-                "socket" => "/run/lighttpd/inginious-fastcgi.socket",
-                "bin-path" => "${inginious}/bin/${execName} --config=${inginiousConfigFile}",
-                "max-procs" => 1,
-                "bin-environment" => ( "REAL_SCRIPT_NAME" => "" ),
-                "check-local" => "disable"
-              ))
-            )
-            url.rewrite-once = (
-              "^/.well-known/.*" => "$0",
-              "^/static/.*" => "$0",
-              "^/.*$" => "/${execName}$0",
-              "^/favicon.ico$" => "/static/common/favicon.ico",
-            )
-            alias.url += (
-              "/static/webapp/" => "${inginious}/lib/python2.7/site-packages/inginious/frontend/webapp/static/",
-              "/static/common/" => "${inginious}/lib/python2.7/site-packages/inginious/frontend/common/static/"
-            )
-          }
-        '';
-
-        systemd.services.lighttpd.preStart = ''
-          mkdir -p /run/lighttpd
-          chown lighttpd.lighttpd /run/lighttpd
-        '';
-
-        systemd.services.lighttpd.wants = [ "mongodb.service" "docker.service" ];
-        systemd.services.lighttpd.after = [ "mongodb.service" "docker.service" ];
-      }
-    ]);
-}
diff --git a/pkgs/servers/inginious/default.nix b/pkgs/servers/inginious/default.nix
deleted file mode 100644
index fbe226d3e3d..00000000000
--- a/pkgs/servers/inginious/default.nix
+++ /dev/null
@@ -1,74 +0,0 @@
-{ pkgs, lib, python2Packages }:
-with lib;
-
-let
-  pythonPackages = python2Packages;
-
-  docker_1_7_2 = pythonPackages.docker.overrideAttrs (oldAttrs: rec {
-    name = "docker-py-1.7.2";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/d/docker-py/${name}.tar.gz";
-      sha256 = "0k6hm3vmqh1d3wr9rryyif5n4rzvcffdlb1k4jvzp7g4996d3ccm";
-    };
-  });
-
-  webpy-custom = pythonPackages.web.override {
-    name = "web.py-INGI";
-    src = pkgs.fetchFromGitHub {
-      owner = "UCL-INGI";
-      repo = "webpy-INGI";
-      # tip of branch "ingi"
-      rev = "f487e78d65d6569eb70003e588d5c6ace54c384f";
-      sha256 = "159vwmb8554xk98rw380p3ah170r6gm861r1nqf2l452vvdfxscd";
-    };
-  };
-
-in pythonPackages.buildPythonApplication rec {
-  version = "0.3a2.dev0";
-  name = "inginious-${version}";
-
-  disabled = pythonPackages.isPy3k;
-
-  patchPhase = ''
-    # transient failures
-    substituteInPlace inginious/backend/tests/TestRemoteAgent.py \
-      --replace "test_update_task_directory" "noop"
-  '';
-
-  propagatedBuildInputs = with pythonPackages; [
-    requests
-    cgroup-utils docker_1_7_2 docutils PyLTI mock pygments
-    pymongo pyyaml rpyc sh simpleldap sphinx_rtd_theme tidylib
-    websocket_client watchdog webpy-custom flup
-  ];
-
-  buildInputs = with pythonPackages; [ nose selenium virtual-display ];
-
-  /* Hydra fix exists only on github for now.
-  src = pkgs.fetchurl {
-    url = "mirror://pypi/I/INGInious/INGInious-${version}.tar.gz";
-  };
-  */
-  src = pkgs.fetchFromGitHub {
-    owner = "UCL-INGI";
-    repo = "INGInious";
-    rev = "07d111c0a3045c7cc4e464d4adb8aa28b75a6948";
-    sha256 = "0kldbkc9yw1mgg5w5q5v8k2hz089c5c4rvxb5xhbagkzgm2gn230";
-  };
-
-  # Only patch shebangs in /bin, other scripts are run within docker
-  # containers and will fail if patched.
-  dontPatchShebangs = true;
-  preFixup = ''
-    patchShebangs $prefix/bin
-  '';
-
-  meta = {
-    broken = true;
-    description = "An intelligent grader that allows secured and automated testing of code made by students";
-    homepage = https://github.com/UCL-INGI/INGInious;
-    license = licenses.agpl3;
-    maintainers = with maintainers; [ layus ];
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 013573a1a61..f0e644ff367 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16766,8 +16766,6 @@ with pkgs;
 
   inferno = pkgsi686Linux.callPackage ../applications/inferno { };
 
-  inginious = callPackage ../servers/inginious {};
-
   inkscape = callPackage ../applications/graphics/inkscape {
     lcms = lcms2;
     poppler = poppler_0_61;
-- 
GitLab


From 0204a2739c1751631b90d520ae6ea945f3b973e9 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Thu, 19 Jul 2018 10:42:59 -0500
Subject: [PATCH 163/297] vim-plugins: update (2018-07-19)

Moved 'dhall-vim' to match order in vim-plugin-names,
so diff'ing against generated expressions is easier.

There's a "vim-nix" update in here! :)
---
 pkgs/misc/vim-plugins/default.nix | 396 +++++++++++++++---------------
 1 file changed, 198 insertions(+), 198 deletions(-)

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index 0085e9280a9..0f617d529c5 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -170,11 +170,11 @@ let
   };
 
   julia-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "julia-vim-2018-05-07";
+    name = "julia-vim-2018-07-01";
     src = fetchgit {
       url = "https://github.com/JuliaEditorSupport/julia-vim";
-      rev = "3b8e8f9b03c4ffa415fb715406231efbbd1dfdd6";
-      sha256 = "1dnhawb73c89x58nl0iqhn1rvyw0wrhmvfkxdsh40rnpdbjkyrcn";
+      rev = "c49d4d39fa7f54387ec20b8bbf006700b1e01fe2";
+      sha256 = "14wib4768vi7681iclihlj94dlqq1apkynma8n7p9nh3jfzd4d06";
     };
     dependencies = [];
 
@@ -192,11 +192,11 @@ let
   };
 
   vim-nix = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-nix-2018-04-24";
+    name = "vim-nix-2018-07-01";
     src = fetchgit {
       url = "https://github.com/LnL7/vim-nix";
-      rev = "dae3d30a145f1d0e50658dafd88f95cd4b5e323d";
-      sha256 = "1x3gaiz2wbqykzhk0zj0krjp81m5rxhk80pcg96f4gyqp7hxrx78";
+      rev = "7d71026ba7c2d0a4bdb915e884c4ac8dbdc45bf0";
+      sha256 = "084vs1p0qpkc4cx049v3mkyylj1n1yvd45i1sc9qafgp4x5va457";
     };
     dependencies = [];
 
@@ -412,11 +412,11 @@ let
   };
 
   tsuquyomi = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "tsuquyomi-2018-03-23";
+    name = "tsuquyomi-2018-07-04";
     src = fetchgit {
       url = "https://github.com/Quramy/tsuquyomi";
-      rev = "94f10d312134fc59b53b2e821d3315320f694cf0";
-      sha256 = "1f084y9vv8rkb2d0ig6lc40sbdchpfc68fkxlvaky4jk1l1l89ay";
+      rev = "9247e0f1ad0e1ae7d350ad5b27ef92269955cc65";
+      sha256 = "09mihjiqg407n14gb4kr60fnyp3rpi18fr9nhnpg1ym2ly0nsa1l";
     };
     dependencies = [];
 
@@ -444,22 +444,22 @@ let
   };
 
   riv-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "riv-vim-2018-01-21";
+    name = "riv-vim-2018-06-21";
     src = fetchgit {
       url = "https://github.com/Rykka/riv.vim";
-      rev = "454fef3402c8b8b2c2036232a9e9b798f5e35d09";
-      sha256 = "1n5m4y03bfabhr6inmgwhwc4ayaafavsrqagklzjwfx1cv3r9f2j";
+      rev = "fb6d6f8c9d85128fd69c74f11bb7413addc002e8";
+      sha256 = "1mjp90lz6jf3w9j4h1sidz7kfxhi9hk27pdnvb0hrvxw0q3bj9ch";
     };
     dependencies = [];
 
   };
 
   deoplete-nvim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "deoplete-nvim-2018-06-17";
+    name = "deoplete-nvim-2018-07-19";
     src = fetchgit {
       url = "https://github.com/Shougo/deoplete.nvim";
-      rev = "62078d04aea43aceb7cbdcfc4b22cf8f7767f614";
-      sha256 = "1gc6hl3yi7h2mzw2sf1phnaphwmalyfqd6lfzmzq0lzf111mq9r3";
+      rev = "0f1921799644cd662cb0a3393ba71096e5e56115";
+      sha256 = "0xbi6zac45fr8ipz1vqafl6ljh7bpdhbz7dfdyv8z04aqvn621s2";
     };
     dependencies = [];
 
@@ -488,22 +488,22 @@ let
   };
 
   vim-gitgutter = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-gitgutter-2018-06-01";
+    name = "vim-gitgutter-2018-07-06";
     src = fetchgit {
       url = "https://github.com/airblade/vim-gitgutter";
-      rev = "a986ab054788776dca269d6c289b470255d54e8c";
-      sha256 = "0c0rjclqz8l1w1q6dfa2sxc67ns9vvg6q7yy2l0s5p7159d423iy";
+      rev = "6076c9678643a8b2fc9973f16ec9efcd5dbe1aca";
+      sha256 = "1dyrll5rm61qdmzkym67hfyw80qnw10s1qrz9ryw3zvh1s2ad43l";
     };
     dependencies = [];
 
   };
 
   Spacegray-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "Spacegray-vim-2018-04-07";
+    name = "Spacegray-vim-2018-06-20";
     src = fetchgit {
       url = "https://github.com/ajh17/Spacegray.vim";
-      rev = "255a6086aa5af07e38e441964623029a39fa17c1";
-      sha256 = "0pfwmazcmsz9wdjmbw6hjcvbsd9j99jrjxw81xy1s6vqxmlhi8gj";
+      rev = "f9e5205319cbb5c598bbf02b16c3d05277817f81";
+      sha256 = "1s32zf75ybqs9jjjvqk5z4x9a6lr43gjbwlgw8k01qf4lsxkzkn9";
     };
     dependencies = [];
 
@@ -608,17 +608,6 @@ let
 
   };
 
-  dhall-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "dhall-vim-2018-06-04";
-    src = fetchgit {
-      url = "https://github.com/vmchale/dhall-vim";
-      rev = "290c2ec86b5c3d35dd3913cbb6ab9d2139074e38";
-      sha256 = "03jhcaz6r2lbd4drc8acc9kv2k0287nzvw7lyl36jjkk3qy4c499";
-    };
-    dependencies = [];
-
-  };
-
   clighter8 = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "clighter8-2018-04-15";
     src = fetchgit {
@@ -634,11 +623,11 @@ let
   };
 
   neomake = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "neomake-2018-06-02";
+    name = "neomake-2018-07-16";
     src = fetchgit {
       url = "https://github.com/benekastah/neomake";
-      rev = "ed2d2069ef7d2e919fc73c993a2c99a05d12d79e";
-      sha256 = "1sf1ad8qzya8vkj8kdkkd204hs0fn7wh3ar9wv4nq1ks7v2y2855";
+      rev = "f26a31a315f60150fd42682df911306b4d795dd8";
+      sha256 = "1rxlzypzwlr6j84llg30d122142la621nai1f7735i58kvmzk51w";
     };
     dependencies = [];
 
@@ -678,22 +667,22 @@ let
   };
 
   denite-extra = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "denite-extra-2018-06-02";
+    name = "denite-extra-2018-07-19";
     src = fetchgit {
       url = "https://github.com/chemzqm/denite-extra";
-      rev = "54c2df37a2fa53e3caed4ad7391f85ff6dc7f0b1";
-      sha256 = "0rsgd302h3rml98a9ddkaglp157av6yhbfbmc5i781k5pz003vvg";
+      rev = "10836562703ebfe6552204e63b9b4293236d6d0f";
+      sha256 = "1jq6wv6vhjpkd9xy8i6rjd0l69djvxg8395ylclr2dv21carx5z6";
     };
     dependencies = [];
 
   };
 
   denite-git = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "denite-git-2018-06-05";
+    name = "denite-git-2018-07-19";
     src = fetchgit {
       url = "https://github.com/chemzqm/denite-git";
-      rev = "dfc8c8977133b2e00efa2d5add7ff05c36b2c1a3";
-      sha256 = "1p4y22wwxvhxbgavandlld2rp2204g7vr162y0vsc0dm9lygvvm6";
+      rev = "edd2c202e05c3f84e31b94a841fef236b923d559";
+      sha256 = "0x8nf4x49859lgyi83vhqvpdhb1mxv55a9l8vbdflfagagj0gnzd";
     };
     dependencies = [];
 
@@ -722,22 +711,22 @@ let
   };
 
   CheckAttach = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "CheckAttach-2017-03-15";
+    name = "CheckAttach-2018-07-18";
     src = fetchgit {
       url = "https://github.com/chrisbra/CheckAttach";
-      rev = "b583efd45e03902438a55299623390a0f9253513";
-      sha256 = "0j1nx8ryrlixisd8z2d24k1xk2yrqk4i0ar8m4vq3jlr74309a34";
+      rev = "0f1f2e78071d7f805a0a679955cb4486f692b753";
+      sha256 = "11skk275ijq8hwpp0zxsdgr08brq08v1syvyawck8vzrnqrq71sc";
     };
     dependencies = [];
 
   };
 
   csv-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "csv-vim-2018-06-12";
+    name = "csv-vim-2018-06-24";
     src = fetchgit {
       url = "https://github.com/chrisbra/csv.vim";
-      rev = "eddfe4d553d2d25ffcf294e225717ddf9ae4c357";
-      sha256 = "1074x0gycwaivadsa6g7mfhdf9rvyirhsfipby2pcvjrkbzvmz7j";
+      rev = "918be3bd15920fd9bc79fca5e6870b8055742a1a";
+      sha256 = "01fhw55s5q23ny3n7ldg53n3raysr2wnnkpfybbba2wv55w5vpdy";
     };
     dependencies = [];
 
@@ -755,22 +744,22 @@ let
   };
 
   vim-sort-motion = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-sort-motion-2018-03-05";
+    name = "vim-sort-motion-2018-07-15";
     src = fetchgit {
       url = "https://github.com/christoomey/vim-sort-motion";
-      rev = "b4455cea401c86d189e84c4dda55f18d8a4a67d4";
-      sha256 = "0cav0l152qy8fvhwpcdr7lddf0jnjkjw6hnjrmmpvikxj7rq2yik";
+      rev = "49dfcabeee2bf3a85a6cc0774b35f687b6c9d0e5";
+      sha256 = "02v12iqy3gjhvh5aza6b6b3pfv2qkyyw83bxqjgbjj002f71ydkb";
     };
     dependencies = [];
 
   };
 
   vim-tmux-navigator = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-tmux-navigator-2018-05-17";
+    name = "vim-tmux-navigator-2018-07-13";
     src = fetchgit {
       url = "https://github.com/christoomey/vim-tmux-navigator";
-      rev = "d030f75e2932605cfc1417ca2ebb3fd5192c2a8e";
-      sha256 = "1qfkzlg7g4ri54fhxnwwvh2xsm0hcnfxav7chdw10z3g984nzb1a";
+      rev = "18b775fbccde5ff02e516c014290650bb40e257d";
+      sha256 = "09v8amrdk8h4hsr9va8v9wdgzvj89z04y4j71l94rd7r6smxinbj";
     };
     dependencies = [];
 
@@ -788,11 +777,11 @@ let
   };
 
   ctrlp-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "ctrlp-vim-2018-06-11";
+    name = "ctrlp-vim-2018-06-28";
     src = fetchgit {
       url = "https://github.com/ctrlpvim/ctrlp.vim";
-      rev = "306bc60a1bed48cee895623d03c87d84d00764b6";
-      sha256 = "1ylzg9wjc1m4jgi6p3wk9nbip16cfhhgcbavly394j9w4zn3zdwy";
+      rev = "43cc73b8e7d4ab45f17118573eb81fd45704b989";
+      sha256 = "16jn9n6vavwiwh6l2av2i3livan72saaz0d0v8vmznrrs2ngi1gk";
     };
     dependencies = [];
 
@@ -876,11 +865,11 @@ let
   };
 
   vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-2018-05-31";
+    name = "vim-2018-07-07";
     src = fetchgit {
       url = "https://github.com/dracula/vim";
-      rev = "23e76f31abae2d3e090fcc25fbfcd8d8c9edd3bd";
-      sha256 = "0zj749kc65dgqhsan65wagqlq45hg68m7qs07h1r12csfrr3r8x7";
+      rev = "a88e82a94f0ff41e84e51fe501635f0f64d1bb33";
+      sha256 = "1ld7vbh6dxrf3wqbya9pvvzwp7qgv2pdj74g5w7yjn1bdi597vnm";
     };
     dependencies = [];
 
@@ -964,11 +953,11 @@ let
   };
 
   elm-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "elm-vim-2018-06-16";
+    name = "elm-vim-2018-06-18";
     src = fetchgit {
       url = "https://github.com/elmcast/elm-vim";
-      rev = "e7c2f9ce36e69608c2f289f75e22d068255eac1f";
-      sha256 = "022xan3ss4rrfhdsz9dd5n6avk4nf6lxqqbgpx9v4lrnqy01dhd8";
+      rev = "e51e2e43ad617c26205a84453481d3ac152c8fec";
+      sha256 = "09bgfjnpa1s25x5wnxry9lmsly92s0mazn1sl0vg2wfgphf67m6b";
     };
     dependencies = [];
 
@@ -1041,11 +1030,11 @@ let
   };
 
   vim-go = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-go-2018-06-16";
+    name = "vim-go-2018-07-18";
     src = fetchgit {
       url = "https://github.com/fatih/vim-go";
-      rev = "155836d47052ea9c9bac81ba3e937f6f22c8e384";
-      sha256 = "1d16xninxwmqd6vgcjxzlqqynygb2h40lfmvwgp2cm60g2994fa3";
+      rev = "2c909e71e184de6ea23e3f8adc7d199856c2806b";
+      sha256 = "0v42yrgnd3hi8s2i9ij7ldgyvs75jkikw1kpqblysdim9cfbbqfk";
     };
     dependencies = [];
 
@@ -1206,11 +1195,11 @@ let
   };
 
   vim-snippets = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-snippets-2018-06-11";
+    name = "vim-snippets-2018-07-19";
     src = fetchgit {
       url = "https://github.com/honza/vim-snippets";
-      rev = "62f46770378ab899f40c334de264ccd64dc2db57";
-      sha256 = "1g55qhy81dh9x5rkzij3k7ain561gz1amyvg69cq44n6d7pz798h";
+      rev = "1143432afdb3a97b606b081700eead5b4f499d4d";
+      sha256 = "1z0pgpsv8y1zhxlm6w76wgd4wx378wbq44mvgxxfxi0mfvb6vywf";
     };
     dependencies = [];
 
@@ -1250,22 +1239,22 @@ let
   };
 
   calendar-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "calendar-vim-2018-03-12";
+    name = "calendar-vim-2018-07-04";
     src = fetchgit {
       url = "https://github.com/itchyny/calendar.vim";
-      rev = "1aee272cc37670b4f96c5d75975ae8af3bd8809e";
-      sha256 = "1mr7yb07aycpc9famb0kq71sb4xyw87zgnkn0gk9i96pcjaab5fs";
+      rev = "f27fcf52c8a516f55ede5cff468f0a3e4014ae1b";
+      sha256 = "07gg83bgj9c43jn66zlvyc1avqjyidb9cjwdv1ln3965zkl47b5r";
     };
     dependencies = [];
 
   };
 
   lightline-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "lightline-vim-2018-05-19";
+    name = "lightline-vim-2018-07-05";
     src = fetchgit {
       url = "https://github.com/itchyny/lightline.vim";
-      rev = "555f202e33987863aaa31bf4df75ef989c3c49a7";
-      sha256 = "0997k1wzlclwf4y70mv5zncv6vp9xdwgp5q7nickw6j9qf86gb84";
+      rev = "0532dff598abca9975d3f80128eaadadbf1d91d4";
+      sha256 = "1wvhl2wc2p4vqi7zzj7wdyq0cnbfq8s7g5ifcchj8f5s8c4h4lfc";
     };
     dependencies = [];
 
@@ -1316,11 +1305,11 @@ let
   };
 
   vim-test-git = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-test-git-2018-05-30";
+    name = "vim-test-git-2018-07-10";
     src = fetchgit {
       url = "https://github.com/janko-m/vim-test.git";
-      rev = "062c489781c995f7e81103fec8a3c07bd2ff1f4b";
-      sha256 = "0q4rnaqf5c979h10pacxxn7h3zv4zs9lf7f3z90avnlarh1sjvvx";
+      rev = "e24477e81e91fe90c5d914849848027cb09a7c86";
+      sha256 = "1kkfzs0bmbg4kjips1jylrsd5rqd39ab2x2z1a64pjkx1fvl703b";
     };
     dependencies = [];
 
@@ -1437,11 +1426,11 @@ let
   };
 
   fzf-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "fzf-vim-2018-05-28";
+    name = "fzf-vim-2018-07-11";
     src = fetchgit {
       url = "https://github.com/junegunn/fzf.vim";
-      rev = "ce82e10630830bc37a50f706cc3b7216d24e5009";
-      sha256 = "081r1a4zqcr46rb4d39m8yj2dq1kiadh7n2iv7gxaqqldhx0p8pb";
+      rev = "8d56bdd6ade7899f0b0a10cfc219804b4ccbc109";
+      sha256 = "0m3p2gp42hshxb7hrgw63fp155a5l1x9fjr2k21dv22xqlaqy9hj";
     };
     dependencies = [];
 
@@ -1580,11 +1569,11 @@ let
   };
 
   vim-signature = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-signature-2018-04-04";
+    name = "vim-signature-2018-07-06";
     src = fetchgit {
       url = "https://github.com/kshenoy/vim-signature";
-      rev = "968622e98238dd7cbd32fc5f4faa60c6b5aed6d8";
-      sha256 = "0cwkb28zszf4sd5i0mcg6bjamjxxkxsr1plx79pwai5ckcgc2x72";
+      rev = "6bc3dd1294a22e897f0dcf8dd72b85f350e306bc";
+      sha256 = "08m5dg77yavria7n7iajkj4kqaw848763680003j2gbrjlhpprpm";
     };
     dependencies = [];
 
@@ -1635,11 +1624,11 @@ let
   };
 
   vimtex = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vimtex-2018-06-17";
+    name = "vimtex-2018-07-13";
     src = fetchgit {
       url = "https://github.com/lervag/vimtex";
-      rev = "13474370fa0cc5e547abd6f40a9b6fddf2712ae4";
-      sha256 = "1rwj8i5k8xaa466ld1p5nxsvfk3g20g42l2xqa60s6jmjicn7km5";
+      rev = "e3dabe0a369dac556508ac5d1132979d654bc753";
+      sha256 = "10wkfh106xc89bk72n0xc2xa7iva74p4pj0n9wfd3dbspagrf9j2";
     };
     dependencies = [];
 
@@ -1679,11 +1668,11 @@ let
   };
 
   rainbow = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "rainbow-2018-06-14";
+    name = "rainbow-2018-06-19";
     src = fetchgit {
       url = "https://github.com/luochen1990/rainbow";
-      rev = "e7d115792f2a6bf6248d3f84a9025ae5e759868e";
-      sha256 = "0zd7dcbrn7djx3nqnf8kkz8wzxcjla2b3bzqg2j7v9bjb3x3vdfl";
+      rev = "549724c2123c5a06834676963be0d76d5c37abc1";
+      sha256 = "0hh0w337qw5yk9flk4iz4vfpa4q13blvyv10hgbfrqy72s30gpdf";
     };
     dependencies = [];
 
@@ -1771,11 +1760,11 @@ let
   };
 
   undotree = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "undotree-2017-10-26";
+    name = "undotree-2018-07-02";
     src = fetchgit {
       url = "https://github.com/mbbill/undotree";
-      rev = "cdbb9022b8972d3e156b8d60af33bf795625b058";
-      sha256 = "0y62hp8k2kbrq0jhxj850f706rqjv2dkd7dxhz458mrsdk60f253";
+      rev = "a80159c9f5c238575b63984b8bc610bc5de6b233";
+      sha256 = "10l091qbigcj053l65bs3cdnysasl7f2qdbsk8bk6k0xj7rrpgzl";
     };
     dependencies = [];
 
@@ -1826,22 +1815,22 @@ let
   };
 
   vim-signify = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-signify-2018-05-03";
+    name = "vim-signify-2018-07-08";
     src = fetchgit {
       url = "https://github.com/mhinz/vim-signify";
-      rev = "a1551dbae3b76035360b2ea2b38555194505d925";
-      sha256 = "0wcfdcvbpl6hknsmzmpj86kbw1mfbfc55fza6kwad0lsw9ff5cix";
+      rev = "9303070b022c4a642a8d35361e3680622c525144";
+      sha256 = "0was67gn22dn361jg1qc4iscdkm0cg65dprfyd7r6ifhi6v01jmz";
     };
     dependencies = [];
 
   };
 
   vim-startify = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-startify-2018-06-14";
+    name = "vim-startify-2018-07-03";
     src = fetchgit {
       url = "https://github.com/mhinz/vim-startify";
-      rev = "0b300f411f466f14f6832b3c97b7fb109f7b1ee3";
-      sha256 = "0qjd2bnag4rr29yjkrxrzpkvfkb0912g2virj5rr26bbf8ya6s5q";
+      rev = "7bbc46e1c2eb9e2e6e4e5a34a634b40d85eb1bde";
+      sha256 = "1q5gxyd85xfhl4i8gzw23dq36bg14lld5i91vnz8xys25idzjs1s";
     };
     dependencies = [];
 
@@ -1939,11 +1928,11 @@ let
   };
 
   vim-easygit = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-easygit-2018-05-15";
+    name = "vim-easygit-2018-07-08";
     src = fetchgit {
       url = "https://github.com/neoclide/vim-easygit";
-      rev = "ada670f87f269e431b72cd7d63727683c46f3b4b";
-      sha256 = "0shj52jzkhq89kw9wg4p89f1aidn9c0h6ishq56pdzzmqnjgzkdr";
+      rev = "9770370a35838f70eda91d0c3006d0563ccc8d2a";
+      sha256 = "1a42s0nymakz20rjrpwmiqpnlndrkdakzbm53aclzcs61i9zq2k8";
     };
     dependencies = [];
 
@@ -2028,11 +2017,11 @@ let
   };
 
   vim-javascript = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-javascript-2018-06-12";
+    name = "vim-javascript-2018-07-14";
     src = fetchgit {
       url = "https://github.com/pangloss/vim-javascript";
-      rev = "935125e2c481a65d344b11ddfdb2e5f903e24e72";
-      sha256 = "1n4cij2in9i4f6mcj7wn9zn9i4xmxcrf6yn00bacx4f51l6qhhkr";
+      rev = "39e332a3c36c0115e1eab85c34cf121b7585869d";
+      sha256 = "04ycwh298i213zw0zvj99igfmxf36swycryapsgp9jrh9jjd9hmw";
     };
     dependencies = [];
 
@@ -2072,11 +2061,11 @@ let
   };
 
   purescript-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "purescript-vim-2018-03-31";
+    name = "purescript-vim-2018-07-05";
     src = fetchgit {
       url = "https://github.com/raichoo/purescript-vim";
-      rev = "8528d2a4a84f428aefad5882212c34db5c852699";
-      sha256 = "0dkh1cm9z644x5cj9dxwdkyb0r9sji71jv35cyy7z0aj9b8x2jbf";
+      rev = "ab8547cef5827f046d43ba57203acb6692b7ef06";
+      sha256 = "1pp7h77qqhgshf2x3hh73gnb4ya8jamqm75spbnn95piznd03k33";
     };
     dependencies = [];
 
@@ -2105,22 +2094,22 @@ let
   };
 
   committia-vim-git = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "committia-vim-git-2018-04-11";
+    name = "committia-vim-git-2018-07-14";
     src = fetchgit {
       url = "https://github.com/rhysd/committia.vim.git";
-      rev = "02a317cb49689b2424232d607d218511f921f2e4";
-      sha256 = "1bfdkj0jbhkklnzd894aigx1cply8bbpzkskvzmbsj7h7jm9iyz5";
+      rev = "6aa77b9161e75828d0be2ba40ed420cbf7a55279";
+      sha256 = "0sr7wzccj805fnc48qgcshp8rypz3vb8507pkc1r3pn7wbxqkni1";
     };
     dependencies = [];
 
   };
 
   vim-grammarous = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-grammarous-2018-05-19";
+    name = "vim-grammarous-2018-06-22";
     src = fetchgit {
       url = "https://github.com/rhysd/vim-grammarous";
-      rev = "058db30bbd88e23fceb2f6364d9b22803d7c4c0d";
-      sha256 = "1l2vhfsb0lhr5j77r8lgqnqgs9h9kdhw9bla1lj27xi0njbl4kql";
+      rev = "0d8a0272389a32bd49e74bb00527c02f9aca19a8";
+      sha256 = "0ji18hjhp1gx147z682b4xy1w02kqcr8rb5frccyqn4kdpqhqvbk";
     };
     dependencies = [];
     # use `:GrammarousCheck` to initialize checking
@@ -2180,44 +2169,44 @@ let
   };
 
   rust-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "rust-vim-2018-01-15";
+    name = "rust-vim-2018-07-17";
     src = fetchgit {
       url = "https://github.com/rust-lang/rust.vim";
-      rev = "8e75da9834abb22f8d7ece3f4ca4324a14fa18a6";
-      sha256 = "1mn4jijfzz2jq215dnwkq5gxiw0ysmvrsrvq4aypr2ms2040iqiq";
+      rev = "2fa74427456a68e9e90f542567f851df50d48a8c";
+      sha256 = "0vqvw5czwy3v99dv5gbgy8ljg31qhsnhqjfl0a4dfij6p66xyi46";
     };
     dependencies = [];
 
   };
 
   vim-devicons = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-devicons-2018-05-19";
+    name = "vim-devicons-2018-06-21";
     src = fetchgit {
       url = "https://github.com/ryanoasis/vim-devicons";
-      rev = "8ee4c8cdef4f6ea0f27b341ac077c303d0e57a90";
-      sha256 = "1mfkg9miqg42qmzamlkhjc3mlqcri69d1pj6cs4kz3bdl7326ww6";
+      rev = "ea5bbf0e2a960965accfa50a516773406a5b6b26";
+      sha256 = "1v365j4an1k82gk06ikgqy2dw0ir80kj0svs1fymgklc117xgqsg";
     };
     dependencies = [];
 
   };
 
   neoformat = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "neoformat-2018-06-01";
+    name = "neoformat-2018-07-16";
     src = fetchgit {
       url = "https://github.com/sbdchd/neoformat";
-      rev = "ebe9ed941aea254e5fc6c3e2a0219054ff873e4b";
-      sha256 = "0la3nvyi8kmp8pq6pkbhjc35wg6g28f903y7bz4igsajl37nijm1";
+      rev = "f20e73193f2260d4437d160759d6b623a74a5a35";
+      sha256 = "0460v5h82zsgslqxkiwf2qbkah15hf3p33ddvcipfqg0rnrbwynp";
     };
     dependencies = [];
 
   };
 
   nerdcommenter = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "nerdcommenter-2018-03-03";
+    name = "nerdcommenter-2018-06-21";
     src = fetchgit {
       url = "https://github.com/scrooloose/nerdcommenter";
-      rev = "e679d8a34193d1ac93b98ed792cdde7c9b1104a1";
-      sha256 = "0if71mcrc7cm8xr4m2zjcm2k4wkfhxyh6phfc0k13s8h392wb7v4";
+      rev = "9a32fd2534427f7a1dcfe22e9c0ea6b67b6dbe78";
+      sha256 = "0s862kzhvv9qpr7gxd3h52hczjvm55zyff5qn0z5095072pr3wjx";
     };
     dependencies = [];
 
@@ -2235,11 +2224,11 @@ let
   };
 
   syntastic = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "syntastic-2018-06-15";
+    name = "syntastic-2018-07-16";
     src = fetchgit {
       url = "https://github.com/scrooloose/syntastic";
-      rev = "9e1b2a8620a0ff48a9f4e42a6e09b65a34ad2a6a";
-      sha256 = "1765ish9vdm7abm7c45z4h4v1xdhfis7igm5yc3m5h7im33gl7j2";
+      rev = "0dde090ed41b383b1fa56f8db49d89e0735b1ca9";
+      sha256 = "027g3wmfdrhb65krlfs89xk3imbm2mgzb2ddv7xwrhch736nvb2q";
     };
     dependencies = [];
 
@@ -2257,11 +2246,11 @@ let
   };
 
   vim-polyglot = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-polyglot-2018-06-05";
+    name = "vim-polyglot-2018-07-08";
     src = fetchgit {
       url = "https://github.com/sheerun/vim-polyglot";
-      rev = "33f610feb73ce782cf41a7d9a377541991c692b5";
-      sha256 = "0sqsarrvy8flxlp0nj5782gzqvk3v6c7r6234pbpjwqga967h0fd";
+      rev = "055f7710b65dfa2df52fc0b5be2486ae36ac5751";
+      sha256 = "1q1aw0sapr2zgrxbh97g6hj22f2xym3apzfxw5xxmqzmjc0kiq4p";
     };
     dependencies = [];
 
@@ -2279,11 +2268,11 @@ let
   };
 
   denite-nvim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "denite-nvim-2018-06-11";
+    name = "denite-nvim-2018-07-19";
     src = fetchgit {
       url = "https://github.com/shougo/denite.nvim";
-      rev = "ef3ffe7ffff25b0260be1e336dcd55014a6787a7";
-      sha256 = "1zvin44fb9b11dciv1i14pwr3wc6yigsr4xmcg3gzaibr4mpng6b";
+      rev = "0cab5543d755be4a6c9d331672b07235f8473f1f";
+      sha256 = "1r9a29fjmab7r10f5c39xdmbpq14jc6lwyj7d63b5p2dnlva2wr0";
     };
     dependencies = [];
 
@@ -2367,11 +2356,11 @@ let
   };
 
   neosnippet-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "neosnippet-vim-2018-06-17";
+    name = "neosnippet-vim-2018-07-19";
     src = fetchgit {
       url = "https://github.com/shougo/neosnippet.vim";
-      rev = "978ef36165e83ba1f8ee0a2047b6c923f7842d33";
-      sha256 = "083jfdwadjdv2pwbxmwz8m384m023zvzdszjnn6qkbgwimx5ga7m";
+      rev = "2959ae99f6e8f422e7d9062fd0a3cd692d2221fb";
+      sha256 = "0zdyfc9lrp8g76b6qigci6dlxz0zqpqf5y9887x2zdy631dksfi4";
     };
     dependencies = [];
 
@@ -2441,11 +2430,11 @@ let
   };
 
   alchemist-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "alchemist-vim-2018-04-23";
+    name = "alchemist-vim-2018-06-25";
     src = fetchgit {
       url = "https://github.com/slashmili/alchemist.vim";
-      rev = "d15033ce1b94aa1e6ba11c1bf1249d9680b24a45";
-      sha256 = "0b0r236ah56zax7s095wq18j6bvfp267a3nfrndnszihwh7h2v1j";
+      rev = "5575fc8e18695b050b1c4d51623ae37f12ff7648";
+      sha256 = "0s1x0avshxfrqj9vd8bahkw10sn9hmajwch285zib9aynqp5x2ma";
     };
     dependencies = [];
 
@@ -2485,11 +2474,11 @@ let
   };
 
   vim-multiple-cursors = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-multiple-cursors-2018-04-17";
+    name = "vim-multiple-cursors-2018-07-16";
     src = fetchgit {
       url = "https://github.com/terryma/vim-multiple-cursors";
-      rev = "b781b1461bd4b346958309e1733a9d6ad1a66b6c";
-      sha256 = "0hadbp2yj0kzcwj5rp18diq3b24xgxn46n7c29dgrjg91w4vagfd";
+      rev = "b9e17a51bb2d857f6a5099363232c4fc7715115d";
+      sha256 = "0dd9m0a33r4diwykk5nxya199zimn0n4gmp2mi8fnwk6m1f8fwnw";
     };
     dependencies = [];
 
@@ -2529,11 +2518,11 @@ let
   };
 
   vim-quickrun = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-quickrun-2018-05-07";
+    name = "vim-quickrun-2018-06-19";
     src = fetchgit {
       url = "https://github.com/thinca/vim-quickrun";
-      rev = "4b493faaeb5322f11cadab52e39a53164baf9db7";
-      sha256 = "0081m3v8dg4ihxsd0rzhmrra3i6vrnpz0svgjmm689rk55dkrv5i";
+      rev = "825f9f195521646f7001f10cad8627c48017311f";
+      sha256 = "0ckcwij5y71dxrga34jxgvf41hs44p4mrd31hbmkz1qrq1i7glpa";
     };
     dependencies = [];
 
@@ -2595,44 +2584,44 @@ let
   };
 
   vim-commentary = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-commentary-2018-05-30";
+    name = "vim-commentary-2018-07-11";
     src = fetchgit {
       url = "https://github.com/tpope/vim-commentary";
-      rev = "7f2127b1dfc57811112785985b46ff2289d72334";
-      sha256 = "0ck221cj0zwn19p0vlzv0vl26rjlsnfpllslrqjh5g57m5cxb8aq";
+      rev = "8295187ea1210138c0b171d8e3ec3569936f4c1a";
+      sha256 = "1zgbpgl0n11b4jlgx7h7rr1jbgdib7yf8vmh62cxrdj5hrngb6h6";
     };
     dependencies = [];
 
   };
 
   vim-dispatch = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-dispatch-2018-06-02";
+    name = "vim-dispatch-2018-07-18";
     src = fetchgit {
       url = "https://github.com/tpope/vim-dispatch";
-      rev = "47729b7831421f20fa40a7d5b3e9b928faf18e75";
-      sha256 = "0wmvfqzw785c9bda0p4vlsavm0d59dmmnhs87jvqfijzyi2prj1l";
+      rev = "43760f9d8469d59fd629a97e19dce4491192cca6";
+      sha256 = "16kziq3y4v0nksilrblryf2vham87w9c3y133xm6zznyjsjp2x90";
     };
     dependencies = [];
 
   };
 
   vim-eunuch = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-eunuch-2018-05-28";
+    name = "vim-eunuch-2018-07-13";
     src = fetchgit {
       url = "https://github.com/tpope/vim-eunuch";
-      rev = "e57666aa8d3a87b42c5ec429490bbf4a54f4c31d";
-      sha256 = "01sz7mhckhnwlp48rkl34cz4nkjwrkdc1rq4mbknd3yscg1w259d";
+      rev = "e5f4f955d53e07192fb330ff272604c1b8290532";
+      sha256 = "0cv3j3bkapb45ywlfiz8csxmz7gnsdngwgmkrgfg6sljnsgav2za";
     };
     dependencies = [];
 
   };
 
   vim-fugitive = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-fugitive-2018-06-15";
+    name = "vim-fugitive-2018-07-18";
     src = fetchgit {
       url = "https://github.com/tpope/vim-fugitive";
-      rev = "d39d5ca4299569a5d1a37a511d1a5eccef71b037";
-      sha256 = "1657x01ihw96hnbnflyzxc88qpyj2lm6dnl84xs1ckzw3iqsw6ki";
+      rev = "9b9a81b170040ab0061ebd5beec1f5e2e1177056";
+      sha256 = "189w34rjh67j1hs77284xaxq8xlhc0zrk4nnk3qnprwg5qfr4plz";
     };
     dependencies = [];
 
@@ -2650,33 +2639,33 @@ let
   };
 
   vim-repeat = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-repeat-2018-01-30";
+    name = "vim-repeat-2018-07-02";
     src = fetchgit {
       url = "https://github.com/tpope/vim-repeat";
-      rev = "8106e142dfdc278ff3eaaadd7b362ad7949d4357";
-      sha256 = "1q0bmqxi1kqxq7g8l0qj7y93g9rqffwc3fbmhpj3chx2kswhd5hc";
+      rev = "43d2678fa59d068c815d8298331c195e850ff5a7";
+      sha256 = "0nb20503ka95qbx0mwhhni15drc86gfcd6kg92nf65llrvyfivk0";
     };
     dependencies = [];
 
   };
 
   vim-rhubarb = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-rhubarb-2017-06-28";
+    name = "vim-rhubarb-2018-07-19";
     src = fetchgit {
       url = "https://github.com/tpope/vim-rhubarb";
-      rev = "6caad2b61afcc1b7c476b0ae3dea9ee5f2b1d14a";
-      sha256 = "1bmc5j9056bgdhyhvylbd93jkp1k9067mv3af6skzh0r77rx1a0g";
+      rev = "186bf27e05ab8713193b1d1210cd3c79f392445a";
+      sha256 = "127gv59dkw1z7lpspxk7by2pf1mqqb6jxc58g359m76lfqpkcvvv";
     };
     dependencies = [];
 
   };
 
   vim-sensible = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-sensible-2018-01-22";
+    name = "vim-sensible-2018-07-16";
     src = fetchgit {
       url = "https://github.com/tpope/vim-sensible";
-      rev = "2d60332fa5b2b1ea346864245569df426052865a";
-      sha256 = "1psv8r3xshcg5c09i8h2qff6jp62anjmsa24qzvbc71ass5bqxyb";
+      rev = "c82c6d4978be28adcf85dc1e61fa428e801bd525";
+      sha256 = "0w87wic0qx20h36k075lvmj53glxkcyv8hkrx5aw4xqxvbq5fk6q";
     };
     dependencies = [];
 
@@ -2716,11 +2705,11 @@ let
   };
 
   vim-vinegar = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-vinegar-2018-06-06";
+    name = "vim-vinegar-2018-06-20";
     src = fetchgit {
       url = "https://github.com/tpope/vim-vinegar";
-      rev = "bc2d57e2f57551171370b4458c6198041b11750c";
-      sha256 = "0f0pasz9r9qqdnlcc6zj94kh4dnslydb7zfdjhdj2salqm3hnpd7";
+      rev = "7b9dff85aec34a0be1a6980b2e686a5d27d70f63";
+      sha256 = "033w3wsg5ijwmkq5l1d5r7l0mqfy784sbh8mbjcsx13ndl8fc2g8";
     };
     dependencies = [];
 
@@ -2782,11 +2771,11 @@ let
   };
 
   youcompleteme = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "youcompleteme-2018-06-10";
+    name = "youcompleteme-2018-06-20";
     src = fetchgit {
       url = "https://github.com/valloric/youcompleteme";
-      rev = "e49f817bfe7a7400efcc0b6527188ff6395f996f";
-      sha256 = "19cnixx08aqirb9yw2k3glklmyna075x1d9szzpg8ml557v9qgnn";
+      rev = "e1ead995c13fe20989ee3d69fd76b20c5fff5d5b";
+      sha256 = "01my9m7a5m24zrh6i867fhqz42jxs0ai2pl4pra8wzvyk4ai1p5f";
     };
     dependencies = [];
     buildPhase = ''
@@ -2808,11 +2797,11 @@ let
   };
 
   vim-airline = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-airline-2018-06-13";
+    name = "vim-airline-2018-07-13";
     src = fetchgit {
       url = "https://github.com/vim-airline/vim-airline";
-      rev = "45c9621157b5bc851804bfed57b8a504d55757b0";
-      sha256 = "0g4g5fa0qy6hagic590sksa8z6xlmigdan64bya06jr9m7fd8a1a";
+      rev = "4cc255a3849c15484f7da5b5039d73f1a567a7e2";
+      sha256 = "124pl87zwfg4fnb3il5jy5dz03bq5vzyk10z60dvkfw4cr57hlfw";
     };
     dependencies = [];
 
@@ -2863,11 +2852,11 @@ let
   };
 
   vim-ruby = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-ruby-2018-06-02";
+    name = "vim-ruby-2018-07-08";
     src = fetchgit {
       url = "https://github.com/vim-ruby/vim-ruby";
-      rev = "1e4c6fdf4450a01208911c079538e1a2ed128ec6";
-      sha256 = "0xnnk0sd3z8v5hvdxy7rljvzfvdl63dqvd3kiksw4kzj7j8gcbkg";
+      rev = "3e0f241b544c63d44ac925ec557ce6735b24d9cf";
+      sha256 = "16ywzvb78pxinls0za1bzcds9aznsgvds8q2l4wimp4q9wrs1scs";
     };
     dependencies = [];
 
@@ -3050,11 +3039,11 @@ let
   };
 
   vimoutliner = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vimoutliner-2018-04-09";
+    name = "vimoutliner-2018-07-04";
     src = fetchgit {
       url = "https://github.com/vimoutliner/vimoutliner";
-      rev = "4f12628247940d98eedd594961695dc504261058";
-      sha256 = "1z44zf9wvd6mc1zb6ywrkjw87yrj1blmc5s03xk9zv5q8hskjl78";
+      rev = "aad0a213069b8a1b5de91cca07d153fc8352c957";
+      sha256 = "0pgkgs6xky0skhpp3s9vrw3h48j80im0j39q4vc2b3pd1ydy6rx2";
     };
     dependencies = [];
 
@@ -3071,23 +3060,34 @@ let
 
   };
 
+  dhall-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "dhall-vim-2018-07-15";
+    src = fetchgit {
+      url = "https://github.com/vmchale/dhall-vim";
+      rev = "a17c1ebb1487f2a69dd5230e9d4b8a247b50e2ae";
+      sha256 = "1xrlzvi626bhxh8rs0gz4hjkx7qc0f6bb0vl6ainnkjqafb310qw";
+    };
+    dependencies = [];
+
+  };
+
   ale = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "ale-2018-06-17";
+    name = "ale-2018-07-17";
     src = fetchgit {
       url = "https://github.com/w0rp/ale";
-      rev = "24fe1953110455f7f3305db2a8e5abc2aa6821af";
-      sha256 = "0m47h33w73k6p0p4i8rhqpnp8jn5siyjzwyhgv5nk3ydci5y1mmy";
+      rev = "5453e0e1a43302226da1d1d753e162af0231f9d3";
+      sha256 = "0zcgfjssvfcc30ksgp42khc9s91gxymkz3dzdhnvwkm0vx90mjlp";
     };
     dependencies = [];
 
   };
 
   vim-wakatime = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-wakatime-2018-05-25";
+    name = "vim-wakatime-2018-07-14";
     src = fetchgit {
       url = "https://github.com/wakatime/vim-wakatime";
-      rev = "3d88d49551c15f6abd9fecd2480ef75f0d8cbe40";
-      sha256 = "1lm4j5c67q4al1ymqnr0zlbdgql0381rl65v78vyai8vzaj98m14";
+      rev = "25aa400fd1f1e3d689c721605a65e015024dc4cf";
+      sha256 = "11lk5k8wl3kxp6p2i0nnp56f4wcaniy40kzs3anjdwlzya631rg2";
     };
     dependencies = [];
     buildInputs = [ python ];
@@ -3175,14 +3175,14 @@ let
   };
 
   deoplete-go = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "deoplete-go-2018-05-20";
+    name = "deoplete-go-2018-07-03";
     src = fetchgit {
       url = "https://github.com/zchee/deoplete-go";
-      rev = "977fb75b38b82528d179f1029d1852900332dedc";
-      sha256 = "114ypdawgj5k2gx1ff48z7yzk14b7gc68s4ijnb1yww2qxa2g9wm";
+      rev = "2d402d856d98d4a351fdcf40d837da0cf52ccdfd";
+      sha256 = "0hj5bhfhd9am11ixaxad370p982bjig53mbm74fi6slhjpikdrdq";
     };
     dependencies = [];
-    buildInputs = [ python3 ];
+    buildInputs = [ python3 ]; 
     buildPhase = ''
       pushd ./rplugin/python3/deoplete/ujson
       python3 setup.py build --build-base=$PWD/build --build-lib=$PWD/build
@@ -3192,22 +3192,22 @@ let
   };
 
   deoplete-jedi = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "deoplete-jedi-2018-05-13";
+    name = "deoplete-jedi-2018-07-10";
     src = fetchgit {
       url = "https://github.com/zchee/deoplete-jedi";
-      rev = "45f1ac2cf44e6a0c10298e07b4d308b84e94a80d";
-      sha256 = "03590rabdycbwjp0h36crb0jsavw5mln77hl107mb737rq2dgmah";
+      rev = "5540e76ee3194f2eaa2df51945297cb847a1dfa8";
+      sha256 = "0mqq42v4l2y0hkcs83j0cp7hxamv6gn5g8z4bccrbssgrsv61cg6";
     };
     dependencies = [];
 
   };
 
   zig-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "zig-vim-2018-06-10";
+    name = "zig-vim-2018-07-18";
     src = fetchgit {
       url = "https://github.com/zig-lang/zig.vim";
-      rev = "e35f63823edcf1dd35fa3deb262e6eed0cac4f8c";
-      sha256 = "0vr6hh4vnpi6gbr3d54xip2n6s4j5xaiiqvzpa4pl6vfnqixazq5";
+      rev = "2dc38afd6af04ea563a0d0d6f61891b5c820e8fe";
+      sha256 = "1nyrg87biwq6b3jk40fyjd5mlnl4pbvwsqi9095y8gjanf9a9dck";
     };
     dependencies = [];
 
-- 
GitLab


From a79a0c686b00526fe918667cb24bf15f8a8abd91 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Thu, 19 Jul 2018 10:52:50 -0500
Subject: [PATCH 164/297] vim-plugins: swift, fastfold, some colorschemes

---
 pkgs/misc/vim-plugins/default.nix      | 66 ++++++++++++++++++++++++++
 pkgs/misc/vim-plugins/vim-plugin-names |  6 +++
 2 files changed, 72 insertions(+)

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index 0f617d529c5..014dc498c94 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -743,6 +743,17 @@ let
 
   };
 
+  base16-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "base16-vim-2018-05-24";
+    src = fetchgit {
+      url = "https://github.com/chriskempson/base16-vim";
+      rev = "fcce6bce6a2f4b14eea7ea388031c0aa65e4b67d";
+      sha256 = "0wi8k80v2brmxqbkk0lrvl4v2sslkjfwpvflm55b3n0ii8qy39nk";
+    };
+    dependencies = [];
+
+  };
+
   vim-sort-motion = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-sort-motion-2018-07-15";
     src = fetchgit {
@@ -1304,6 +1315,17 @@ let
 
   };
 
+  tender-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "tender-vim-2017-03-14";
+    src = fetchgit {
+      url = "https://github.com/jacoborus/tender.vim";
+      rev = "6b0497a59233b3e67fb528a498069eb1d24743f9";
+      sha256 = "1iqijk7xq0g6p3j8jgzgrhqizw87fnfryx73iaqqx5iyq1k8i9mn";
+    };
+    dependencies = [];
+
+  };
+
   vim-test-git = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-test-git-2018-07-10";
     src = fetchgit {
@@ -1557,6 +1579,17 @@ let
 
   };
 
+  swift-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "swift-vim-2018-04-20";
+    src = fetchgit {
+      url = "https://github.com/keith/swift.vim";
+      rev = "404df978f9830d9cf0a1f5002cb02f594e3e8996";
+      sha256 = "03xhzljzcfm0678d6i8j5493pi5knav1hx0jldgn3hish892pfr3";
+    };
+    dependencies = [];
+
+  };
+
   rainbow_parentheses-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "rainbow_parentheses-vim-2013-03-04";
     src = fetchgit {
@@ -1568,6 +1601,17 @@ let
 
   };
 
+  fastfold = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "fastfold-2018-06-02";
+    src = fetchgit {
+      url = "https://github.com/konfekt/fastfold";
+      rev = "4150ebdc6e226e8797d42dcabb7463952de9dc30";
+      sha256 = "0mdb77np2vf564q18fvj1klr99pwrx2sw0jhxify9g7i0177qs4r";
+    };
+    dependencies = [];
+
+  };
+
   vim-signature = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-signature-2018-07-06";
     src = fetchgit {
@@ -2060,6 +2104,17 @@ let
 
   };
 
+  awesome-vim-colorschemes = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "awesome-vim-colorschemes-2018-01-20";
+    src = fetchgit {
+      url = "https://github.com/rafi/awesome-vim-colorschemes";
+      rev = "8d2b6657bdbe4f7253e320c741bc4c1fc2f2f41d";
+      sha256 = "1wfm6rsmyqldxwcz0ic4rq7kf00fgsx00rg42cl9yya35nqiri2z";
+    };
+    dependencies = [];
+
+  };
+
   purescript-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "purescript-vim-2018-07-05";
     src = fetchgit {
@@ -2429,6 +2484,17 @@ let
 
   };
 
+  last256 = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "last256-2017-06-11";
+    src = fetchgit {
+      url = "https://github.com/sk1418/last256";
+      rev = "d29320c1fe715b47edaa1be068201ea5a54ab0c0";
+      sha256 = "16njh0p1j166dnf92110vlrj7gmrbsfkbkd8k6s9gfqjzbgd25jv";
+    };
+    dependencies = [];
+
+  };
+
   alchemist-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "alchemist-vim-2018-06-25";
     src = fetchgit {
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 0137c2e6b47..188d87f9484 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -23,6 +23,7 @@
 "github:chrisbra/CheckAttach"
 "github:chrisbra/csv.vim"
 "github:chrisgeo/sparkup"
+"github:chriskempson/base16-vim"
 "github:christoomey/vim-sort-motion"
 "github:christoomey/vim-tmux-navigator"
 "github:ctjhoa/spacevim"
@@ -75,6 +76,7 @@
 "github:itchyny/vim-cursorword"
 "github:itchyny/vim-gitbranch"
 "github:ivanov/vim-ipython"
+"github:jacoborus/tender.vim"
 "github:janko-m/vim-test.git"
 "github:JazzCore/ctrlp-cmatcher"
 "github:jceb/vim-hier"
@@ -101,7 +103,9 @@
 "github:kana/vim-operator-user"
 "github:kana/vim-tabpagecd"
 "github:kchmck/vim-coffee-script"
+"github:keith/swift.vim"
 "github:kien/rainbow_parentheses.vim"
+"github:konfekt/fastfold"
 "github:kshenoy/vim-signature"
 "github:lambdalisue/vim-gista"
 "github:latex-box-team/latex-box"
@@ -166,6 +170,7 @@
 "github:python-mode/python-mode"
 "github:Quramy/tsuquyomi"
 "github:racer-rust/vim-racer"
+"github:rafi/awesome-vim-colorschemes"
 "github:raichoo/purescript-vim"
 "github:reedes/vim-pencil"
 "github:reedes/vim-wordy"
@@ -203,6 +208,7 @@
 "github:shougo/vimproc.vim"
 "github:SirVer/ultisnips"
 "github:sjl/gundo.vim"
+"github:sk1418/last256"
 "github:slashmili/alchemist.vim"
 "github:t9md/vim-smalls"
 "github:takac/vim-hardtime"
-- 
GitLab


From 0073c30dbf260df65089da565c25601d74b3cadd Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Thu, 19 Jul 2018 11:08:44 -0500
Subject: [PATCH 165/297] vim-plugins: document sorting, fix vim command to not
 ask to hit enter

Fixes #38748. Hopefully :).
---
 pkgs/misc/vim-plugins/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index 014dc498c94..c944f22fac2 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -19,8 +19,9 @@ let
 
 
 # TL;DR
-# Add your plugin to ./vim-plugin-names
-# Regenerate via `nix-shell -I nixpkgs=/path/to/your/local/fork -p vimPlugins.pluginnames2nix --command "vim-plugin-names-to-nix +'w result' +qall"`
+# * Add your plugin to ./vim-plugin-names
+#   * sort -df ./vim-plugin-names > sorted && mv sorted vim-plugin-names
+# * Regenerate via `nix-shell -I nixpkgs=/path/to/your/local/fork -p vimPlugins.pluginnames2nix --command "vim-plugin-names-to-nix +silent +'w result' +qall"`
 # Note: pluginnames2nix will fetch any plugins in the file; to speed up the process,
 #       update ./vim-plugin-names to contain only plugins which need generation
 # Copy the generated expression(s) into this file from the ./result file.
-- 
GitLab


From ee68c9e0849744e7cc979851349ffdd7318a70f9 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Thu, 19 Jul 2018 11:16:05 -0500
Subject: [PATCH 166/297] vim-plugins: simplify command slightly, overwrite
 'result' if present

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

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index c944f22fac2..557547060b8 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -21,7 +21,7 @@ let
 # TL;DR
 # * Add your plugin to ./vim-plugin-names
 #   * sort -df ./vim-plugin-names > sorted && mv sorted vim-plugin-names
-# * Regenerate via `nix-shell -I nixpkgs=/path/to/your/local/fork -p vimPlugins.pluginnames2nix --command "vim-plugin-names-to-nix +silent +'w result' +qall"`
+# * Regenerate via `nix-shell -I nixpkgs=/path/to/your/local/fork -p vimPlugins.pluginnames2nix --command "vim-plugin-names-to-nix +silent +'x! result'"`
 # Note: pluginnames2nix will fetch any plugins in the file; to speed up the process,
 #       update ./vim-plugin-names to contain only plugins which need generation
 # Copy the generated expression(s) into this file from the ./result file.
-- 
GitLab


From 7e9be731384a9ac1cb0b863d67e9977161b25f51 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Thu, 19 Jul 2018 10:48:12 -0500
Subject: [PATCH 167/297] vim-plugins: add alias for maktaba so it is found as
 a dependency

---
 pkgs/misc/vim-plugins/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index 557547060b8..8428a3b7894 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -3330,6 +3330,7 @@ let
   Hoogle              = vim-hoogle;
   ipython             = vim-ipython;
   latex-live-preview  = vim-latex-live-preview;
+  maktaba             = vim-maktaba;
   mayansmoke          = mayansmoke-git;
   multiple-cursors    = vim-multiple-cursors;
   necoGhc             = neco-ghc; # backwards compat, added 2014-10-18
-- 
GitLab


From b244d92f33bb081aaff59a1151671458b23200e4 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 19 Jul 2018 09:21:30 -0700
Subject: [PATCH 168/297] mattermost: 5.0.0 -> 5.1.0

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

diff --git a/pkgs/servers/mattermost/default.nix b/pkgs/servers/mattermost/default.nix
index 305ee174bf3..0654da92776 100644
--- a/pkgs/servers/mattermost/default.nix
+++ b/pkgs/servers/mattermost/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, fetchFromGitHub, buildGoPackage, buildEnv }:
 
 let
-  version = "5.0.0";
+  version = "5.1.0";
 
   mattermost-server = buildGoPackage rec {
     name = "mattermost-server-${version}";
@@ -10,7 +10,7 @@ let
       owner = "mattermost";
       repo = "mattermost-server";
       rev = "v${version}";
-      sha256 = "12wiw8k5is78ppazrf26y2xq73kwbafa9w75wjnb1839v2k9sark";
+      sha256 = "069ihmfr6np991mbgg001y0kyafghn57nsv3kpyyvfmhv07p0qbc";
     };
 
     goPackagePath = "github.com/mattermost/mattermost-server";
@@ -27,7 +27,7 @@ let
 
     src = fetchurl {
       url = "https://releases.mattermost.com/${version}/mattermost-${version}-linux-amd64.tar.gz";
-      sha256 = "1pal65di6w9idf3rwxh77la1v816h8kama1ilkbs40cpp2vazw3b";
+      sha256 = "1bm5nqnhk2w3sy8mvm81k7d65j6bgpvakgphgwqgnlm864i4253z";
     };
 
     installPhase = ''
-- 
GitLab


From ecd9be1b624ae911645e4bd5619467b1e552d6b0 Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Thu, 19 Jul 2018 09:20:34 -0700
Subject: [PATCH 169/297] perlPackages.TextBibTeX: Update perl version in an
 output path

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 27a1341eecc..15372f23dd3 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -16108,7 +16108,7 @@ let self = _self // overrides; _self = with self; {
       install_name_tool -change "$oldPath" "$newPath" "$out/bin/biblex"
       install_name_tool -change "$oldPath" "$newPath" "$out/bin/bibparse"
       install_name_tool -change "$oldPath" "$newPath" "$out/bin/dumpnames"
-      install_name_tool -change "$oldPath" "$newPath" "$out/lib/perl5/site_perl/5.24.3/darwin-2level/auto/Text/BibTeX/BibTeX.bundle"
+      install_name_tool -change "$oldPath" "$newPath" "$out/lib/perl5/site_perl/5.24.4/darwin-2level/auto/Text/BibTeX/BibTeX.bundle"
     '';
     meta = {
       description = "Interface to read and parse BibTeX files";
-- 
GitLab


From 59159f9d8eb3810ef11aee081730bc81c24575b2 Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <infinisil@icloud.com>
Date: Thu, 19 Jul 2018 20:18:44 +0200
Subject: [PATCH 170/297] haskellPackages.hnix: Fix build (#43824)

---
 .../haskell-modules/configuration-common.nix         | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index c7e7cd4f4c3..1d83126f41b 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -244,19 +244,21 @@ self: super: {
   # base bound
   digit = doJailbreak super.digit;
 
-  # https://github.com/jwiegley/hnix/issues/98 - tied to an older deriving-compat
-  hnix = (overrideCabal super.hnix (old: {
+  # dontCheck: Can be removed once https://github.com/haskell-nix/hnix/commit/471712f is in (5.2 probably)
+  #   This is due to GenList having been removed from generic-random in 1.2.0.0
+  # doJailbreak: Can be removed once https://github.com/haskell-nix/hnix/pull/329 is in (5.2 probably)
+  #   This is due to hnix currently having an upper bound of <0.5 on deriving-compat, works just fine with our current version 0.5.1 though
+  hnix = dontCheck (doJailbreak (overrideCabal super.hnix (old: {
     patches = old.patches or [] ++ [
       # should land in hnix-5.2
       (pkgs.fetchpatch {
         url = "https://github.com/haskell-nix/hnix/commit/9cfe060a9dbe9e7c64867956a0523eed9661803a.patch";
         sha256 = "0ci4n7nw2pzqw0gkmkp4szzvxjyb143a4znjm39jmb0s397a68sh";
         name = "disable-hpack-test-by-default.patch";
-       })
+      })
     ];
     testHaskellDepends = old.testHaskellDepends or [] ++ [ pkgs.nix ];
-    broken = true;   # can't cope with deriving-compat 0.5.x.
-  }));
+  })));
 
   # Fails for non-obvious reasons while attempting to use doctest.
   search = dontCheck super.search;
-- 
GitLab


From c4cca95bf2405a64237ca46042426a05481cac99 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Thu, 19 Jul 2018 21:38:15 +0200
Subject: [PATCH 171/297] yafaray-core: adhere to version convention

see issue #43717
---
 pkgs/tools/graphics/yafaray-core/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/graphics/yafaray-core/default.nix b/pkgs/tools/graphics/yafaray-core/default.nix
index a0de144d907..7321128a6b5 100644
--- a/pkgs/tools/graphics/yafaray-core/default.nix
+++ b/pkgs/tools/graphics/yafaray-core/default.nix
@@ -7,12 +7,12 @@
 stdenv.mkDerivation rec {
 
     name = "yafaray-core-${version}";
-    version = "v3.3.0";
+    version = "3.3.0";
 
     src = fetchFromGitHub {
       owner  = "YafaRay";
       repo   = "Core";
-      rev    = "${version}";
+      rev    = "v${version}";
       sha256 = "04p3nlg1rv617qf8v1nzjl6f0w43rvi8w9j6l6ck4bvl77v6cjp6";
     };
 
-- 
GitLab


From aa10b3127f49d43c926c18f8417b100dd8ac222f Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Thu, 19 Jul 2018 21:43:11 +0200
Subject: [PATCH 172/297] weechat: set name to include version

see issue #43717
---
 pkgs/applications/networking/irc/weechat/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix
index dec933489af..a672fa73c4f 100644
--- a/pkgs/applications/networking/irc/weechat/default.nix
+++ b/pkgs/applications/networking/irc/weechat/default.nix
@@ -123,6 +123,7 @@ in if configure == null then weechat else
     ${lib.concatMapStringsSep "\n" (p: lib.optionalString (p ? extraEnv) p.extraEnv) plugins}
     exec ${weechat}/bin/weechat "$@"
   '') // {
+    name = weechat.name;
     unwrapped = weechat;
     meta = weechat.meta;
   }
-- 
GitLab


From bdcba71f9e7a2187e67738754ce7ca1a5b222533 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Thu, 19 Jul 2018 21:49:33 +0200
Subject: [PATCH 173/297] taffybar: include version in name

---
 pkgs/applications/window-managers/taffybar/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/window-managers/taffybar/default.nix b/pkgs/applications/window-managers/taffybar/default.nix
index 3181914c40f..b1e0628ba92 100644
--- a/pkgs/applications/window-managers/taffybar/default.nix
+++ b/pkgs/applications/window-managers/taffybar/default.nix
@@ -3,7 +3,7 @@
 let
 taffybarEnv = ghcWithPackages (self: [ self.taffybar ] ++ packages self);
 in stdenv.mkDerivation {
-  name = "taffybar-with-packages";
+  name = "taffybar-with-packages-${taffybarEnv.version}";
 
   nativeBuildInputs = [ makeWrapper ];
 
-- 
GitLab


From 5324d84423530bd58317f2af62357a2021b70dc8 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Thu, 19 Jul 2018 21:51:35 +0200
Subject: [PATCH 174/297] xmonad: include version in name

---
 pkgs/applications/window-managers/xmonad/wrapper.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/window-managers/xmonad/wrapper.nix b/pkgs/applications/window-managers/xmonad/wrapper.nix
index 6f3d463adb2..bc7a5174e26 100644
--- a/pkgs/applications/window-managers/xmonad/wrapper.nix
+++ b/pkgs/applications/window-managers/xmonad/wrapper.nix
@@ -3,7 +3,7 @@
 let
 xmonadEnv = ghcWithPackages (self: [ self.xmonad ] ++ packages self);
 in stdenv.mkDerivation {
-  name = "xmonad-with-packages";
+  name = "xmonad-with-packages-${xmonadEnv.version}";
 
   nativeBuildInputs = [ makeWrapper ];
 
-- 
GitLab


From c01411f10909844e57272a729baa5c7d6c7b59df Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Thu, 19 Jul 2018 21:55:04 +0200
Subject: [PATCH 175/297] leksah: include version in name

see issue #43717
---
 pkgs/development/tools/haskell/leksah/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/haskell/leksah/default.nix b/pkgs/development/tools/haskell/leksah/default.nix
index fb91015e10c..f1c754ddff9 100644
--- a/pkgs/development/tools/haskell/leksah/default.nix
+++ b/pkgs/development/tools/haskell/leksah/default.nix
@@ -3,7 +3,7 @@
 let
 leksahEnv = ghcWithPackages (self: [ self.leksah-server self.leksah self.cabal-install ]);
 in stdenv.mkDerivation {
-  name = "leksah";
+  name = "leksah-${leksahEnv.version}";
 
   buildInputs = [ gtk3 ];
   nativeBuildInputs = [ makeWrapper ];
-- 
GitLab


From aba0e560f07bdba19df0b097db6a0b479c8088c0 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Thu, 19 Jul 2018 21:56:29 +0200
Subject: [PATCH 176/297] ical2org: adhere to version number convention

see issue #43717
---
 pkgs/tools/misc/ical2org/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/ical2org/default.nix b/pkgs/tools/misc/ical2org/default.nix
index decc4afde0b..141fc968a2d 100644
--- a/pkgs/tools/misc/ical2org/default.nix
+++ b/pkgs/tools/misc/ical2org/default.nix
@@ -2,14 +2,14 @@
 
 buildGoPackage rec {
   name = "ical2org-${version}";
-  version="v.1.1.5";
+  version="1.1.5";
 
   goPackagePath = "github.com/rjhorniii/ical2org";
 
   src = fetchFromGitHub {
     owner = "rjhorniii";
     repo = "ical2org";
-    rev = "${version}";
+    rev = "v.${version}";
     sha256 = "0hdx2j2innjh0z4kxcfzwdl2d54nv0g9ai9fyacfiagjhnzgf7cm";
     fetchSubmodules = true;
   };
-- 
GitLab


From b68770c1a2b44e94b48c1c167f30318c1dedc138 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Thu, 19 Jul 2018 22:12:15 +0200
Subject: [PATCH 177/297] signal-desktop: 1.14.2 -> 1.14.3

---
 .../networking/instant-messengers/signal-desktop/default.nix  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
index d0b7ccfbff7..a8574680186 100644
--- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
@@ -40,11 +40,11 @@ let
 
 in stdenv.mkDerivation rec {
   name = "signal-desktop-${version}";
-  version = "1.14.2";
+  version = "1.14.3";
 
   src = fetchurl {
     url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
-    sha256 = "0szc7ynl26hqvvwk3sx02ym4abyz78akx0sp6cvif3bb4m8brz1c";
+    sha256 = "1z8z32d7ic28zg4mgk3cjmzb6kpism7xzym2ng25b0ndf72g1vfi";
   };
 
   phases = [ "unpackPhase" "installPhase" ];
-- 
GitLab


From accfb935037a1095548533dd9586a810470d37e4 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Thu, 19 Jul 2018 22:27:40 +0200
Subject: [PATCH 178/297] lf: Install the manual page

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

diff --git a/pkgs/tools/misc/lf/default.nix b/pkgs/tools/misc/lf/default.nix
index 7f44dab71f4..6ec9729438c 100644
--- a/pkgs/tools/misc/lf/default.nix
+++ b/pkgs/tools/misc/lf/default.nix
@@ -28,6 +28,10 @@ buildGoPackage rec {
     runHook postBuild
   '';
 
+  postInstall = ''
+    install -D --mode=444 lf.1 $out/share/man/man1/lf.1
+  '';
+
   meta = with stdenv.lib; {
     description = "A terminal file manager written in Go and heavily inspired by ranger";
     longDescription = ''
-- 
GitLab


From 6c1e45b00025d112bbcfaf22939c33650a6e8c55 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Thu, 19 Jul 2018 22:31:17 +0200
Subject: [PATCH 179/297] nvme-cli: 1.5 -> 1.6

---
 pkgs/os-specific/linux/nvme-cli/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/nvme-cli/default.nix b/pkgs/os-specific/linux/nvme-cli/default.nix
index 044479c5629..b40b6125bd9 100644
--- a/pkgs/os-specific/linux/nvme-cli/default.nix
+++ b/pkgs/os-specific/linux/nvme-cli/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "nvme-cli-${version}";
-  version = "1.5";
+  version = "1.6";
 
   src = fetchFromGitHub {
     owner = "linux-nvme";
     repo = "nvme-cli";
     rev = "v${version}";
-    sha256 = "1nl5hl5am8djwmrw1xxnd9ahp7kyzyj0yh1nxgmx43pn3d61n0vz";
+    sha256 = "0pp00yzj9c398bzd7jrjhzr7q1pk7d069dnbzyq1qqssszgcj599";
   };
 
   makeFlags = [ "DESTDIR=$(out)" "PREFIX=" ];
-- 
GitLab


From 48a1dafdbeb184b78ea775c1938014b40e9dd5cf Mon Sep 17 00:00:00 2001
From: Elias Probst <mail@eliasprobst.eu>
Date: Thu, 19 Jul 2018 23:58:25 +0200
Subject: [PATCH 180/297] terraform: remove whitespace from name

A `nix-env -iA unstable.terraform-full` gave me
`installing 'terraform-with-plugins -0.11.7'`
This removes the whitespace which sneaked into its name.
---
 pkgs/applications/networking/cluster/terraform/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix
index 4f45de76d16..fbcb6c8be40 100644
--- a/pkgs/applications/networking/cluster/terraform/default.nix
+++ b/pkgs/applications/networking/cluster/terraform/default.nix
@@ -60,7 +60,7 @@ let
           # of plugins, which might be counterintuitive if someone just wants a vanilla Terraform.
           if actualPlugins == []
             then terraform.overrideAttrs (orig: { passthru = orig.passthru // passthru; })
-            else lib.appendToName "with-plugins "(stdenv.mkDerivation {
+            else lib.appendToName "with-plugins"(stdenv.mkDerivation {
               inherit (terraform) name;
               buildInputs = [ makeWrapper ];
 
-- 
GitLab


From 037e06f0b382f74531adb1a13e9a1fa677c8f18c Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Thu, 19 Jul 2018 20:50:51 -0400
Subject: [PATCH 181/297] linux: 4.4.141 -> 4.4.142

---
 pkgs/os-specific/linux/kernel/linux-4.4.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix
index b1a2c0982f7..dc7c6357406 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix
@@ -1,11 +1,11 @@
 { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
 
 buildLinux (args // rec {
-  version = "4.4.141";
+  version = "4.4.142";
   extraMeta.branch = "4.4";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "08nbz4xg43v57h0x5zw69vnjkvddl9ppi0vwzwf6yxd3ism4p3ci";
+    sha256 = "0zyxlqjnxrr1a1wlg3hzk8sx77ysmy66wb34kp77iv04xr9p9kai";
   };
 } // (args.argsOverride or {}))
-- 
GitLab


From df8062c45b1247cb5e58c453a0d7d02fab941f7c Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 19 Jul 2018 18:12:04 -0700
Subject: [PATCH 182/297] treewide: http -> https

---
 pkgs/applications/networking/super-productivity/default.nix | 2 +-
 pkgs/development/libraries/libav/default.nix                | 2 +-
 pkgs/development/libraries/libdbusmenu-qt/default.nix       | 4 ++--
 pkgs/development/libraries/vulkan-headers/default.nix       | 2 +-
 pkgs/development/tools/vulkan-validation-layers/default.nix | 2 +-
 pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix    | 2 +-
 pkgs/servers/livepeer/default.nix                           | 2 +-
 pkgs/tools/networking/dhcpdump/default.nix                  | 2 +-
 pkgs/top-level/perl-packages.nix                            | 2 +-
 9 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/networking/super-productivity/default.nix b/pkgs/applications/networking/super-productivity/default.nix
index 7c613a8a45a..251bef91360 100644
--- a/pkgs/applications/networking/super-productivity/default.nix
+++ b/pkgs/applications/networking/super-productivity/default.nix
@@ -97,7 +97,7 @@ in stdenv.mkDerivation {
 
   meta = with stdenv.lib; {
     description = "To Do List / Time Tracker with Jira Integration.";
-    homepage = http://super-productivity.com;
+    homepage = https://super-productivity.com;
     license = licenses.mit;
     platforms = [ "x86_64-linux" ];
     maintainers = with maintainers; [ offline ];
diff --git a/pkgs/development/libraries/libav/default.nix b/pkgs/development/libraries/libav/default.nix
index b726d9c2b42..dfe1455759a 100644
--- a/pkgs/development/libraries/libav/default.nix
+++ b/pkgs/development/libraries/libav/default.nix
@@ -21,7 +21,7 @@ assert faacSupport -> enableUnfree;
 let inherit (stdenv.lib) optional optionals hasPrefix enableFeature; in
 
 /* ToDo:
-    - more deps, inspiration: http://packages.ubuntu.com/raring/libav-tools
+    - more deps, inspiration: https://packages.ubuntu.com/raring/libav-tools
     - maybe do some more splitting into outputs
 */
 
diff --git a/pkgs/development/libraries/libdbusmenu-qt/default.nix b/pkgs/development/libraries/libdbusmenu-qt/default.nix
index 34ba39d799e..1342ee6773f 100644
--- a/pkgs/development/libraries/libdbusmenu-qt/default.nix
+++ b/pkgs/development/libraries/libdbusmenu-qt/default.nix
@@ -3,7 +3,7 @@
 let
   baseName = "libdbusmenu-qt";
   v = "0.9.2";
-  homepage = "http://launchpad.net/${baseName}";
+  homepage = "https://launchpad.net/${baseName}";
   name = "${baseName}-${v}";
 in
 
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
   nativeBuildInputs = [ cmake ];
 
   cmakeFlags = "-DWITH_DOC=OFF";
-  
+
   meta = with stdenv.lib; {
     description = "Provides a Qt implementation of the DBusMenu spec";
     inherit homepage;
diff --git a/pkgs/development/libraries/vulkan-headers/default.nix b/pkgs/development/libraries/vulkan-headers/default.nix
index 797c64729ec..e154403697f 100644
--- a/pkgs/development/libraries/vulkan-headers/default.nix
+++ b/pkgs/development/libraries/vulkan-headers/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Vulkan Header files and API registry";
-    homepage    = "http://www.lunarg.com";
+    homepage    = https://www.lunarg.com;
     platforms   = platforms.linux;
     license     = licenses.asl20;
     maintainers = [ maintainers.ralith ];
diff --git a/pkgs/development/tools/vulkan-validation-layers/default.nix b/pkgs/development/tools/vulkan-validation-layers/default.nix
index 8951f16e43c..c5f6a13b813 100644
--- a/pkgs/development/tools/vulkan-validation-layers/default.nix
+++ b/pkgs/development/tools/vulkan-validation-layers/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "LunarG Vulkan loader";
-    homepage    = "http://www.lunarg.com";
+    homepage    = https://www.lunarg.com;
     platforms   = platforms.linux;
     license     = licenses.asl20;
     maintainers = [ maintainers.ralith ];
diff --git a/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix b/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix
index 7137390ecab..50b9146871d 100644
--- a/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix
+++ b/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix
@@ -30,7 +30,7 @@ in stdenv.mkDerivation {
   '';
 
   meta = with stdenv.lib; {
-    homepage = http://packages.ubuntu.com/source/zesty/kmod;
+    homepage = https://packages.ubuntu.com/source/zesty/kmod;
     description = "Linux kernel module blacklists from Ubuntu";
     platforms = platforms.linux;
   };
diff --git a/pkgs/servers/livepeer/default.nix b/pkgs/servers/livepeer/default.nix
index 105223f31a5..2e17001abc5 100644
--- a/pkgs/servers/livepeer/default.nix
+++ b/pkgs/servers/livepeer/default.nix
@@ -27,7 +27,7 @@ buildGoPackage rec {
 
   meta = with stdenv.lib; {
     description = "Official Go implementation of the Livepeer protocol";
-    homepage = http://livepeer.org;
+    homepage = https://livepeer.org;
     license = licenses.mit;
     platforms = platforms.linux;
     maintainers = with maintainers; [ elitak ];
diff --git a/pkgs/tools/networking/dhcpdump/default.nix b/pkgs/tools/networking/dhcpdump/default.nix
index 91232b4ffa7..af4b03ab700 100644
--- a/pkgs/tools/networking/dhcpdump/default.nix
+++ b/pkgs/tools/networking/dhcpdump/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "A tool for visualization of DHCP packets as recorded and output by tcpdump to analyze DHCP server responses";
-    homepage = http://packages.ubuntu.com/ru/lucid/dhcpdump;
+    homepage = https://packages.ubuntu.com/ru/lucid/dhcpdump;
     platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index c910c2852f0..f5ddcaec054 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -5105,7 +5105,7 @@ let self = _self // overrides; _self = with self; {
     };
     propagatedBuildInputs = [ EmailMIME EmailSender IOAll IOString OLEStorage_Lite ];
     meta = with stdenv.lib; {
-      homepage = http://www.matijs.net/software/msgconv/;
+      homepage = https://www.matijs.net/software/msgconv/;
       description = "A .MSG to mbox converter";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
       maintainers = with maintainers; [ peterhoeg ];
-- 
GitLab


From 1d284727d3baf91a306a32d487b1ad607b978dc0 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 19 Jul 2018 18:45:38 -0700
Subject: [PATCH 183/297] mercurial: fix homepage

---
 pkgs/applications/version-management/mercurial/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix
index a00393abf27..cd632336952 100644
--- a/pkgs/applications/version-management/mercurial/default.nix
+++ b/pkgs/applications/version-management/mercurial/default.nix
@@ -56,8 +56,8 @@ in python2Packages.buildPythonApplication {
   meta = {
     inherit version;
     description = "A fast, lightweight SCM system for very large distributed projects";
-    homepage = http://mercurial.selenic.com/;
-    downloadPage = "http://mercurial.selenic.com/release/";
+    homepage = https://www.mercurial-scm.org;
+    downloadPage = https://www.mercurial-scm.org/release/;
     license = stdenv.lib.licenses.gpl2;
     maintainers = [ stdenv.lib.maintainers.eelco ];
     updateWalker = true;
-- 
GitLab


From e97448f7e05f3eebfdff6e356f901efbcf38d34a Mon Sep 17 00:00:00 2001
From: pandaman64 <kointosudesuyo@infoseek.jp>
Date: Tue, 3 Jul 2018 14:40:09 +0900
Subject: [PATCH 184/297] qiskit: 0.5.4 -> 0.5.7

---
 .../python-modules/qiskit/default.nix         | 10 +++------
 .../python-modules/qiskit/setup.py.patch      | 21 -------------------
 2 files changed, 3 insertions(+), 28 deletions(-)
 delete mode 100644 pkgs/development/python-modules/qiskit/setup.py.patch

diff --git a/pkgs/development/python-modules/qiskit/default.nix b/pkgs/development/python-modules/qiskit/default.nix
index 1eda590a864..4ca0155627c 100644
--- a/pkgs/development/python-modules/qiskit/default.nix
+++ b/pkgs/development/python-modules/qiskit/default.nix
@@ -21,13 +21,13 @@
 
 buildPythonPackage rec {
   pname = "qiskit";
-  version = "0.5.4";
+  version = "0.5.7";
 
   disabled = !isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "a86014da4ea8fe057ad3b953b44e2342f2bae3e1f9ac0d5f5d51dd659c33accf";
+    sha256 = "a5a2c6c074f8479dc83d1d599dfebf2363402a182835b8fa5742804055148b17";
   };
 
   buildInputs = [ cmake ]
@@ -50,13 +50,9 @@ buildPythonPackage rec {
   # Pypi's tarball doesn't contain tests
   doCheck = false;
 
-  patches = [
-    ./setup.py.patch
-  ];
-
   meta = {
     description = "Quantum Software Development Kit for writing quantum computing experiments, programs, and applications";
-    homepage    = https://github.com/QISKit/qiskit-sdk-py;
+    homepage    = https://github.com/QISKit/qiskit-terra;
     license     = stdenv.lib.licenses.asl20;
     maintainers = with stdenv.lib.maintainers; [
       pandaman
diff --git a/pkgs/development/python-modules/qiskit/setup.py.patch b/pkgs/development/python-modules/qiskit/setup.py.patch
deleted file mode 100644
index 9c4224ce64c..00000000000
--- a/pkgs/development/python-modules/qiskit/setup.py.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/setup.py
-+++ b/setup.py
-@@ -18,13 +18,13 @@ from setuptools.dist import Distribution
- 
- requirements = [
-     "IBMQuantumExperience>=1.9.2",
--    "matplotlib>=2.1,<2.2",
--    "networkx>=2.0,<2.1",
--    "numpy>=1.13,<1.15",
--    "ply==3.10",
--    "scipy>=0.19,<1.2",
--    "sympy>=1.0,<1.2",
--    "pillow>=4.2.1,<5.2"
-+    "matplotlib>=2.1",
-+    "networkx>=2.0",
-+    "numpy>=1.13",
-+    "ply>=3.10",
-+    "scipy>=0.19",
-+    "sympy>=1.0",
-+    "pillow>=4.2.1"
- ]
-- 
GitLab


From c7fec43ee83681573c8fdc4bf7c5dceffd9379ff Mon Sep 17 00:00:00 2001
From: pandaman64 <kointosudesuyo@infoseek.jp>
Date: Wed, 4 Jul 2018 15:15:51 +0900
Subject: [PATCH 185/297] qasm2image: 0.5.0 -> 0.7.0

---
 pkgs/development/python-modules/qasm2image/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/qasm2image/default.nix b/pkgs/development/python-modules/qasm2image/default.nix
index 174e0871ca2..5f7cded86fd 100644
--- a/pkgs/development/python-modules/qasm2image/default.nix
+++ b/pkgs/development/python-modules/qasm2image/default.nix
@@ -12,13 +12,13 @@
 
 buildPythonPackage rec {
   pname = "qasm2image";
-  version = "0.5.0";
+  version = "0.7.0";
 
   src = fetchFromGitHub {
     owner = "nelimeee";
     repo = "qasm2image";
-    rev = "7f3c3e4d1701b8b284ef0352aa3a47722ebbbcaa";
-    sha256 = "129xlpwp36h2czzw1wcl8df2864zg3if2gaad1v18ah1cf68b0f3";
+    rev = "57a640621bbbc74244f07e2e068a26411b0d9b24";
+    sha256 = "1ha5vfl4jfwcwbipsq07xlknkrvx79z5bwbzndybclyk9pa69dlz";
   };
 
   propagatedBuildInputs = [
-- 
GitLab


From 9146271578a7ca0f7cabcb4ec04af6e98e7132b5 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 20 Jul 2018 07:18:04 +0200
Subject: [PATCH 186/297] python.pkgs.scikitimage: move expression

---
 .../python-modules/scikit-image/default.nix   | 36 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 23 +-----------
 2 files changed, 37 insertions(+), 22 deletions(-)
 create mode 100644 pkgs/development/python-modules/scikit-image/default.nix

diff --git a/pkgs/development/python-modules/scikit-image/default.nix b/pkgs/development/python-modules/scikit-image/default.nix
new file mode 100644
index 00000000000..da7918ebe2d
--- /dev/null
+++ b/pkgs/development/python-modules/scikit-image/default.nix
@@ -0,0 +1,36 @@
+{ lib
+, fetchPypi
+, buildPythonPackage
+, cython
+, dask
+, nose
+, numpy
+, scipy
+, six
+, pillow
+, matplotlib
+, networkx
+}:
+
+buildPythonPackage rec {
+  pname = "scikit-image";
+  version = "0.12.3";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1iypjww5hk46i9vzg2zlfc9w4vdw029cfyakkkl02isj1qpiknl2";
+  };
+
+  buildInputs = [ cython dask nose ];
+
+  propagatedBuildInputs = [ pillow matplotlib networkx scipy six numpy ];
+
+  # the test fails because the loader cannot create test objects!
+  doCheck = false;
+
+  meta = {
+    description = "Image processing routines for SciPy";
+    homepage = http://scikit-image.org;
+    license = lib.licenses.bsd3;
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a5697feb540..14fe614841f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -12437,28 +12437,7 @@ in {
 
   scipy = callPackage ../development/python-modules/scipy { };
 
-  scikitimage = buildPythonPackage rec {
-    name = "scikit-image-${version}";
-    version = "0.12.3";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/s/scikit-image/${name}.tar.gz";
-      sha256 = "1iypjww5hk46i9vzg2zlfc9w4vdw029cfyakkkl02isj1qpiknl2";
-    };
-
-    buildInputs = with self; [ cython dask nose numpy scipy six ];
-
-    propagatedBuildInputs = with self; [ pillow matplotlib networkx scipy six numpy ];
-
-    # the test fails because the loader cannot create test objects!
-    doCheck = false;
-
-    meta = {
-      description = "Image processing routines for SciPy";
-      homepage = http://scikit-image.org;
-      license = licenses.bsd3;
-    };
-  };
+  scikitimage = callPackage ../development/python-modules/scikit-image { };
 
   scikitlearn = callPackage ../development/python-modules/scikitlearn {
     inherit (pkgs) gfortran glibcLocales;
-- 
GitLab


From 9768a80726c1a008e2fce25557381277666b3688 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 20 Jul 2018 07:38:08 +0200
Subject: [PATCH 187/297] python.pkgs.pywavelets: init at 0.5.2

---
 .../python-modules/pywavelets/default.nix     | 36 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 38 insertions(+)
 create mode 100644 pkgs/development/python-modules/pywavelets/default.nix

diff --git a/pkgs/development/python-modules/pywavelets/default.nix b/pkgs/development/python-modules/pywavelets/default.nix
new file mode 100644
index 00000000000..c072b661cc4
--- /dev/null
+++ b/pkgs/development/python-modules/pywavelets/default.nix
@@ -0,0 +1,36 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, cython
+, nose
+, pytest
+, numpy
+}:
+
+buildPythonPackage rec {
+  pname = "PyWavelets";
+  version = "0.5.2";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "ce36e2f0648ea1781490b09515363f1f64446b0eac524603e5db5e180113bed9";
+  };
+
+  checkInputs = [ nose pytest ];
+
+  buildInputs = [ cython ];
+
+  propagatedBuildInputs = [ numpy ];
+
+  # Somehow nosetests doesn't run the tests, so let's use pytest instead
+  checkPhase = ''
+    py.test pywt/tests
+  '';
+
+  meta = {
+    description = "Wavelet transform module";
+    homepage = https://github.com/PyWavelets/pywt;
+    license = lib.licenses.mit;
+  };
+
+}
\ No newline at end of file
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 14fe614841f..5d1525f54f2 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4568,6 +4568,8 @@ in {
 
   };
 
+  pywavelets = callPackage ../development/python-modules/pywavelets { };
+
   zope_deprecation = buildPythonPackage rec {
     name = "zope.deprecation-4.1.2";
 
-- 
GitLab


From 6ed3ea6e74d31ef8fe8f5983df0c4676a5a791ea Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 20 Jul 2018 07:42:28 +0200
Subject: [PATCH 188/297] python.pkgs.scikitimage: 0.12.3 -> 0.14.0

---
 .../python-modules/scikit-image/default.nix   | 23 +++++++++++--------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/python-modules/scikit-image/default.nix b/pkgs/development/python-modules/scikit-image/default.nix
index da7918ebe2d..6ac3ab5ddb9 100644
--- a/pkgs/development/python-modules/scikit-image/default.nix
+++ b/pkgs/development/python-modules/scikit-image/default.nix
@@ -2,30 +2,35 @@
 , fetchPypi
 , buildPythonPackage
 , cython
-, dask
-, nose
 , numpy
 , scipy
-, six
-, pillow
 , matplotlib
 , networkx
+, six
+, pillow
+, pywavelets
+, dask
+, cloudpickle
+, nose
+, pytest
 }:
 
 buildPythonPackage rec {
   pname = "scikit-image";
-  version = "0.12.3";
+  version = "0.14.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1iypjww5hk46i9vzg2zlfc9w4vdw029cfyakkkl02isj1qpiknl2";
+    sha256 = "325f75eb80fbc5371136e37f323445309ca9f65b6c6f718d0d0e2189e5de1224";
   };
 
-  buildInputs = [ cython dask nose ];
+  buildInputs = [ cython ];
+
+  propagatedBuildInputs = [ numpy scipy matplotlib networkx six pillow pywavelets dask cloudpickle ];
 
-  propagatedBuildInputs = [ pillow matplotlib networkx scipy six numpy ];
+  checkInputs = [ pytest ];
 
-  # the test fails because the loader cannot create test objects!
+  # No tests in archive
   doCheck = false;
 
   meta = {
-- 
GitLab


From 5fba38d65c895b3de627711533b68efcb1b83133 Mon Sep 17 00:00:00 2001
From: Roger Qiu <roger.qiu@polyhack.io>
Date: Wed, 18 Jul 2018 18:02:54 +1000
Subject: [PATCH 189/297] pythonPackages.image-match: init at 1.1.2

---
 .../python-modules/image-match/default.nix    | 34 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 36 insertions(+)
 create mode 100644 pkgs/development/python-modules/image-match/default.nix

diff --git a/pkgs/development/python-modules/image-match/default.nix b/pkgs/development/python-modules/image-match/default.nix
new file mode 100644
index 00000000000..25c3c901a4e
--- /dev/null
+++ b/pkgs/development/python-modules/image-match/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, buildPythonPackage, fetchFromGitHub, pytestrunner, dask, scikitimage, six }:
+
+buildPythonPackage {
+  pname = "image-match";
+  version = "1.1.2";
+
+  src = fetchFromGitHub {
+    owner = "ascribe";
+    repo = "image-match";
+    rev = "1c5f3170555540bdf43ff8b8189c4e8c13a8b950";
+    sha256 = "0vlmpidmhkpgdzw2k03x5layhijcrjpmyfd93yv2ls77ihz00ix5";
+  };
+
+  buildInputs = [ pytestrunner ];
+
+  propagatedBuildInputs = [
+    scikitimage
+  ];
+
+  # remove elasticsearch requirement due to version incompatibility
+  postPatch = ''
+    substituteInPlace setup.py --replace "'elasticsearch>=5.0.0,<6.0.0'," ""
+  '';
+
+  # tests cannot work without elasticsearch
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/ascribe/image-match;
+    description = "Quickly search over billions of images";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ cmcdragonkai ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 5d1525f54f2..81d38de4f38 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3131,6 +3131,8 @@ in {
 
   };
 
+  image-match = callPackage ../development/python-modules/image-match { };
+
   imbalanced-learn = callPackage ../development/python-modules/imbalanced-learn { };
 
   immutables = callPackage ../development/python-modules/immutables {};
-- 
GitLab


From aecf24a0eb00bd61f192781b45dad0c0c0099a8d Mon Sep 17 00:00:00 2001
From: Erik Arvstedt <erik.arvstedt@gmail.com>
Date: Fri, 20 Jul 2018 10:30:49 +0200
Subject: [PATCH 190/297] openvpn: document how to import an external config

---
 nixos/modules/services/networking/openvpn.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/nixos/modules/services/networking/openvpn.nix b/nixos/modules/services/networking/openvpn.nix
index a418839d22b..b94b4026fd9 100644
--- a/nixos/modules/services/networking/openvpn.nix
+++ b/nixos/modules/services/networking/openvpn.nix
@@ -131,6 +131,9 @@ in
               Configuration of this OpenVPN instance.  See
               <citerefentry><refentrytitle>openvpn</refentrytitle><manvolnum>8</manvolnum></citerefentry>
               for details.
+
+              To import an external config file, use the following definition:
+              <literal>config = "config /path/to/config.ovpn"</literal>
             '';
           };
 
-- 
GitLab


From a5ade790b41a4bad5fa9e732b470fbaf4b17bc59 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <pascal.wittmann@red6-es.de>
Date: Fri, 20 Jul 2018 14:04:53 +0200
Subject: [PATCH 191/297] gencfsm: fix build

---
 pkgs/tools/security/gencfsm/default.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/security/gencfsm/default.nix b/pkgs/tools/security/gencfsm/default.nix
index 3a9c81df234..9398b38cb34 100644
--- a/pkgs/tools/security/gencfsm/default.nix
+++ b/pkgs/tools/security/gencfsm/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, autoconf, automake, intltool, libtool, pkgconfig, encfs
-, glib , gnome3, gtk3, libgnome-keyring, vala, wrapGAppsHook, xorg
+, glib , gnome3, gtk3, libgnome-keyring, vala, wrapGAppsHook, xorg, gobjectIntrospection
 }:
 
 stdenv.mkDerivation rec {
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ autoconf automake intltool libtool vala glib encfs
     gtk3 libgnome-keyring gnome3.libgee xorg.libSM xorg.libICE
-    wrapGAppsHook ];
+    wrapGAppsHook gobjectIntrospection  ];
 
   patches = [ ./makefile-mkdir.patch ];
 
@@ -35,6 +35,5 @@ stdenv.mkDerivation rec {
     license = licenses.gpl2Plus;
     platforms = platforms.linux;
     maintainers = [ maintainers.spacefrogg ];
-    broken = true; # 2018-04-10
   };
 }
-- 
GitLab


From a4d5583a858ecf96262ab34eedef706a898ac4f6 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Fri, 20 Jul 2018 08:13:10 -0400
Subject: [PATCH 192/297] gradle: 4.8.1 -> 4.9

---
 pkgs/development/tools/build-managers/gradle/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix
index f810f97ef49..f5ca69e59c8 100644
--- a/pkgs/development/tools/build-managers/gradle/default.nix
+++ b/pkgs/development/tools/build-managers/gradle/default.nix
@@ -52,12 +52,12 @@ rec {
   };
 
   gradle_latest = gradleGen rec {
-    name = "gradle-4.8.1";
+    name = "gradle-4.9";
     nativeVersion = "0.14";
 
     src = fetchurl {
       url = "http://services.gradle.org/distributions/${name}-bin.zip";
-      sha256 = "0wgdf1iv0izi957hay1xfsk5xnl6s2vx5dammcwy8say9fclscxg";
+      sha256 = "0a0dkdzmz0ynf73inii8djy2hihqd9c97fir9c0d4g8px3f6jvp6";
     };
   };
 
-- 
GitLab


From b77a32f6cffecda1fe829a29cff4c1226f185ae8 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Fri, 20 Jul 2018 08:18:01 -0400
Subject: [PATCH 193/297] minikube: 0.28.0 -> 0.28.1

---
 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 7301e45a41f..4c2e1b6f4c0 100644
--- a/pkgs/applications/networking/cluster/minikube/default.nix
+++ b/pkgs/applications/networking/cluster/minikube/default.nix
@@ -14,7 +14,7 @@ let
 in buildGoPackage rec {
   pname   = "minikube";
   name    = "${pname}-${version}";
-  version = "0.28.0";
+  version = "0.28.1";
 
   goPackagePath = "k8s.io/minikube";
 
@@ -22,7 +22,7 @@ in buildGoPackage rec {
     owner  = "kubernetes";
     repo   = "minikube";
     rev    = "v${version}";
-    sha256 = "1gm61w0f33mdax6im42wckfmjgdr5pziiaw2n7yj6jfjrxjnmzmf";
+    sha256 = "0c36rzsdzxf9q6l4hl506bsd4qwmw033i0k1xhqszv9agg7qjlmm";
   };
 
   buildInputs = [ go-bindata makeWrapper gpgme ] ++ stdenv.lib.optional hostPlatform.isDarwin vmnet;
-- 
GitLab


From 871f3396a56c862b5f122a94c12a5946ee48b735 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Fri, 20 Jul 2018 08:22:03 -0400
Subject: [PATCH 194/297] vscode: 1.25.0 -> 1.25.1

---
 pkgs/applications/editors/vscode/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/editors/vscode/default.nix b/pkgs/applications/editors/vscode/default.nix
index d79a50855f3..cf58d5d2190 100644
--- a/pkgs/applications/editors/vscode/default.nix
+++ b/pkgs/applications/editors/vscode/default.nix
@@ -2,7 +2,7 @@
   gtk2, makeWrapper, libXScrnSaver, libxkbfile, libsecret }:
 
 let
-  version = "1.25.0";
+  version = "1.25.1";
   channel = "stable";
 
   plat = {
@@ -12,9 +12,9 @@ let
   }.${stdenv.system};
 
   sha256 = {
-    "i686-linux" = "1dgn9swqax54pn5ykk97zdkkzyj46jambmnkb67cn44p29bw9s9m";
-    "x86_64-linux" = "0w2lzif7iilibvwhvg13gxarwz41qsb72s8hvj87mk5iqfdms1px";
-    "x86_64-darwin" = "08xhwvggflzh9lfc5s3jgrqb49yz4jdfii8sfq6v8w3c6yy8cdly";
+    "i686-linux" = "1qljnajk4h9ki5gvydh1b557fvhvcryvkrvypvz0pr804lpdqsmg";
+    "x86_64-linux" = "0f1lpwyxfchmbymzzxv97w9cy1z5pdljhwm49mc5v84aygmvnmjq";
+    "x86_64-darwin" = "1dgda1drij1c114xzv4hs44k7rx4x1vzghlxgii0h2rg641n6pbn";
   }.${stdenv.system};
 
   archive_fmt = if stdenv.system == "x86_64-darwin" then "zip" else "tar.gz";
-- 
GitLab


From 69454943b78cbf7bb126fe3f2d2b2e6dfeef565b Mon Sep 17 00:00:00 2001
From: Christian Kauhaus <kc@flyingcircus.io>
Date: Fri, 20 Jul 2018 15:24:40 +0200
Subject: [PATCH 195/297] vulnix: 1.6.3 -> 1.7

The updated version brings selective whitelisting, i.e. when some CVEs
of a package are whitelisted and others are not, only the new CVEs are
reported.

Also correct license to match upstream BSD-3-Clause and clean up source.
---
 pkgs/tools/security/vulnix/default.nix | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/pkgs/tools/security/vulnix/default.nix b/pkgs/tools/security/vulnix/default.nix
index 70640563aa3..6e099e5d786 100644
--- a/pkgs/tools/security/vulnix/default.nix
+++ b/pkgs/tools/security/vulnix/default.nix
@@ -2,16 +2,21 @@
 
 pythonPackages.buildPythonApplication rec {
   pname = "vulnix";
-  version = "1.6.3";
+  version = "1.7";
 
   src = pythonPackages.fetchPypi {
     inherit pname version;
-    sha256 = "0ia71l0210dgcxf63bg07csx40nmpdghr4mszz91qrri7lsa5qqi";
+    sha256 = "16228w0vakb515cnrk4akadh0m21abiv8rv574jarcsf7359xslj";
   };
 
   buildInputs = [ ronn ];
 
-  checkInputs = with pythonPackages; [ freezegun pytest pytestcov pytest-flake8 ];
+  checkInputs = with pythonPackages; [
+    freezegun
+    pytest
+    pytestcov
+    pytest-flake8
+  ];
 
   propagatedBuildInputs = [
     nix
@@ -27,9 +32,7 @@ pythonPackages.buildPythonApplication rec {
 
   outputs = [ "out" "doc" ];
 
-  postBuild = ''
-    make -C doc
-  '';
+  postBuild = "make -C doc";
 
   checkPhase = "py.test src/vulnix";
 
@@ -45,7 +48,7 @@ pythonPackages.buildPythonApplication rec {
   meta = with stdenv.lib; {
     description = "NixOS vulnerability scanner";
     homepage = https://github.com/flyingcircusio/vulnix;
-    license = licenses.bsd2;
+    license = licenses.bsd3;
     maintainers = with maintainers; [ ckauhaus plumps ];
   };
 }
-- 
GitLab


From 491f20533236798e45d9e40ee41c6577f818942d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 20 Jul 2018 15:37:49 +0200
Subject: [PATCH 196/297] knot-dns: libidn -> libidn2

It's only used by the `kdig` tool.
---
 pkgs/servers/dns/knot-dns/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix
index ef99772a082..2bdd758b980 100644
--- a/pkgs/servers/dns/knot-dns/default.nix
+++ b/pkgs/servers/dns/knot-dns/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, gnutls, liburcu, lmdb, libcap_ng, libidn
+{ stdenv, fetchurl, pkgconfig, gnutls, liburcu, lmdb, libcap_ng, libidn2, libunistring
 , systemd, nettle, libedit, zlib, libiconv, libintl
 }:
 
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [
-    gnutls liburcu libidn
+    gnutls liburcu libidn2 libunistring
     nettle libedit
     libiconv lmdb libintl
     # without sphinx &al. for developer documentation
-- 
GitLab


From 0e617f68d3b752024cd6d8064a5ccc18e85e799f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Fri, 20 Jul 2018 15:16:33 +0100
Subject: [PATCH 197/297] gdbgui: 0.11.1.2 -> 0.13.0.0

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

diff --git a/pkgs/development/tools/misc/gdbgui/default.nix b/pkgs/development/tools/misc/gdbgui/default.nix
index 12d3f97dfc4..29bf92d2b6e 100644
--- a/pkgs/development/tools/misc/gdbgui/default.nix
+++ b/pkgs/development/tools/misc/gdbgui/default.nix
@@ -4,14 +4,14 @@ let
 in
 python27Packages.buildPythonApplication rec {
   pname = "gdbgui";
-  version = "0.11.1.2";
+  version = "0.13.0.0";
 
   buildInputs = [ gdb ];
   propagatedBuildInputs = builtins.attrValues deps.packages;
 
   src = python27Packages.fetchPypi {
     inherit pname version;
-    sha256 = "15502fg90df183mcg6nic8fakf111pgrlp7f044g3136wpwgfln7";
+    sha256 = "16a46kabhfqsgsks5l25kpgrvrkdah3h5f5m6ams2z9nzbrxl8bz";
   };
 
   postPatch = ''
-- 
GitLab


From b97a98e5242ae9dfa6564fe3abebdfb21b9e1cf8 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Fri, 20 Jul 2018 10:15:55 -0500
Subject: [PATCH 198/297] python3Packages.zconfig: remove test that relies on
 setlocale failing

---
 .../python-modules/zconfig/default.nix        |  3 ++-
 .../zconfig/remove-setlocale-test.patch       | 24 +++++++++++++++++++
 2 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/python-modules/zconfig/remove-setlocale-test.patch

diff --git a/pkgs/development/python-modules/zconfig/default.nix b/pkgs/development/python-modules/zconfig/default.nix
index f8f933b96ab..79f6ddca543 100644
--- a/pkgs/development/python-modules/zconfig/default.nix
+++ b/pkgs/development/python-modules/zconfig/default.nix
@@ -15,7 +15,8 @@ buildPythonPackage rec {
     sha256 = "de0a802e5dfea3c0b3497ccdbe33a5023c4265f950f33e35dd4cf078d2a81b19";
   };
 
-  patches = [ ./skip-broken-test.patch ];
+  patches = [ ./skip-broken-test.patch ]
+    ++ stdenv.lib.optional stdenv.hostPlatform.isMusl ./remove-setlocale-test.patch;
 
   buildInputs = [ manuel docutils ];
   propagatedBuildInputs = [ zope_testrunner ];
diff --git a/pkgs/development/python-modules/zconfig/remove-setlocale-test.patch b/pkgs/development/python-modules/zconfig/remove-setlocale-test.patch
new file mode 100644
index 00000000000..6b3d3266b21
--- /dev/null
+++ b/pkgs/development/python-modules/zconfig/remove-setlocale-test.patch
@@ -0,0 +1,24 @@
+From 43fd87037be1c98b6afa20f179f2e2d8ef5491ba Mon Sep 17 00:00:00 2001
+From: Will Dietz <w@wdtz.org>
+Date: Fri, 20 Jul 2018 10:07:22 -0500
+Subject: [PATCH] remove test that fails w/musl (setlocale() always succeeds)
+
+---
+ ZConfig/tests/test_datatypes.py | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/ZConfig/tests/test_datatypes.py b/ZConfig/tests/test_datatypes.py
+index 7c8d80c..addecd2 100644
+--- a/ZConfig/tests/test_datatypes.py
++++ b/ZConfig/tests/test_datatypes.py
+@@ -229,7 +229,6 @@ class DatatypeTestCase(unittest.TestCase):
+         convert = self.types.get("locale")
+         # Python supports "C" even when the _locale module is not available
+         self.assertEqual(convert("C"), "C")
+-        self.assertRaises(ValueError, convert, "locale-does-not-exist")
+ 
+     def test_datatype_port(self):
+         convert = self.types.get("port-number")
+-- 
+2.18.0
+
-- 
GitLab


From b5b23b39bebb8f4efe9d2448a10ab9bbfef62683 Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <infinisil@icloud.com>
Date: Fri, 20 Jul 2018 17:43:03 +0200
Subject: [PATCH 199/297] libsass: Fix CVE-2018-11693

See https://github.com/sass/libsass/pull/2676

For https://github.com/NixOS/nixpkgs/issues/43846
---
 pkgs/development/libraries/libsass/default.nix | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libsass/default.nix b/pkgs/development/libraries/libsass/default.nix
index 8168ff0edae..38ba93d4f7c 100644
--- a/pkgs/development/libraries/libsass/default.nix
+++ b/pkgs/development/libraries/libsass/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, autoreconfHook }:
+{ stdenv, fetchurl, fetchpatch, autoreconfHook }:
 
 stdenv.mkDerivation rec {
   name = "libsass-${version}";
@@ -9,7 +9,15 @@ stdenv.mkDerivation rec {
     sha256 = "0w47hvzmbdpbjx8j83wn8dwcvglpab8abkszf9xfzrpqvb6wnqaz";
   };
 
-  patchPhase = ''
+  patches = [
+    # CVE-2018-11693, is in master but no release yet
+    (fetchpatch {
+      url = "https://github.com/sass/libsass/commit/af0e12cdf09d43dbd1fc11e3f64b244277cc1a1e.patch";
+      sha256 = "1y8yvjvvz91lcr1kpq2pw8729xhdgp15mbldcw392pfzdlliwdyl";
+    })
+  ];
+
+  preConfigure = ''
     export LIBSASS_VERSION=${version}
   '';
 
-- 
GitLab


From 73aaf63fb1632b6ba1f8c57d2e125b9c960d3544 Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <infinisil@icloud.com>
Date: Fri, 20 Jul 2018 17:15:43 +0200
Subject: [PATCH 200/297] postgresql93: 9.3.22 -> 9.3.23

Release notes: https://www.postgresql.org/docs/10/static/release-9-3-23.html
---
 pkgs/servers/sql/postgresql/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix
index 5d348c12943..caf921d4a7a 100644
--- a/pkgs/servers/sql/postgresql/default.nix
+++ b/pkgs/servers/sql/postgresql/default.nix
@@ -95,9 +95,9 @@ let
 in {
 
   postgresql93 = common {
-    version = "9.3.22";
+    version = "9.3.23";
     psqlSchema = "9.3";
-    sha256 = "06p9rk2bav41ybp8ra1bpf44avw9kl5s1wyql21n5awvlm5fs60v";
+    sha256 = "1jzncs7b6zrcgpnqjbjcc4y8303a96zqi3h31d3ix1g3vh31160x";
   };
 
   postgresql94 = common {
-- 
GitLab


From 3d16732102b64b818a9878f0c55308cd29aabc53 Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <infinisil@icloud.com>
Date: Fri, 20 Jul 2018 17:16:06 +0200
Subject: [PATCH 201/297] postgresql94: 9.4.17 -> 9.4.18

Release notes: https://www.postgresql.org/docs/10/static/release-9-4-18.html
---
 pkgs/servers/sql/postgresql/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix
index caf921d4a7a..5abf1d65b09 100644
--- a/pkgs/servers/sql/postgresql/default.nix
+++ b/pkgs/servers/sql/postgresql/default.nix
@@ -101,9 +101,9 @@ in {
   };
 
   postgresql94 = common {
-    version = "9.4.17";
+    version = "9.4.18";
     psqlSchema = "9.4";
-    sha256 = "1inpkwbr2xappz3kq3jr3hsn6mwn167nijcx406q8aq56p9hqcks";
+    sha256 = "1h64yjyrlz3ppsp9k6sm4jihg6n9i7mqhkx4p0hymqzmnbr3g0s2";
   };
 
   postgresql95 = common {
-- 
GitLab


From ac5fdda5a637435a5581702ee9cb27735790e628 Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <infinisil@icloud.com>
Date: Fri, 20 Jul 2018 17:16:30 +0200
Subject: [PATCH 202/297] postgresql95: 9.5.12 -> 9.5.13

Release notes: https://www.postgresql.org/docs/10/static/release-9-5-13.html
---
 pkgs/servers/sql/postgresql/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix
index 5abf1d65b09..dd4b7eaba70 100644
--- a/pkgs/servers/sql/postgresql/default.nix
+++ b/pkgs/servers/sql/postgresql/default.nix
@@ -107,9 +107,9 @@ in {
   };
 
   postgresql95 = common {
-    version = "9.5.12";
+    version = "9.5.13";
     psqlSchema = "9.5";
-    sha256 = "167nlrpsnqz63gafgn21j4yc2f5g1mpfkz8qxjxk2xs6crf6zs02";
+    sha256 = "1vm55q9apja6lg672m9xl1zq3iwv2zwnn0d0qr003zan1dmbh22l";
   };
 
   postgresql96 = common {
-- 
GitLab


From d066cecd7de115b6906339ad94f68a93595d56f1 Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <infinisil@icloud.com>
Date: Fri, 20 Jul 2018 17:16:47 +0200
Subject: [PATCH 203/297] postgresql96: 9.6.8 -> 9.6.9

Fixes CVE-2018-1115

Release notes: https://www.postgresql.org/docs/10/static/release-9-6-9.html
---
 pkgs/servers/sql/postgresql/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix
index dd4b7eaba70..66162b9a88e 100644
--- a/pkgs/servers/sql/postgresql/default.nix
+++ b/pkgs/servers/sql/postgresql/default.nix
@@ -113,9 +113,9 @@ in {
   };
 
   postgresql96 = common {
-    version = "9.6.8";
+    version = "9.6.9";
     psqlSchema = "9.6";
-    sha256 = "0w7bwf19wbdd3jjbjv03cnx56qka4801srcbsayk9v792awv7zga";
+    sha256 = "0biy8j69dbvdmrag55pdszpc0702agzqhhcwdx21xp02mzim4ydr";
   };
 
   postgresql100 = common {
-- 
GitLab


From 446ec6df2d67dcba8d0c3cc020980a31445dcb75 Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <infinisil@icloud.com>
Date: Fri, 20 Jul 2018 17:16:58 +0200
Subject: [PATCH 204/297] postgresql100: 10.3 -> 10.4

Fixes CVE-2018-1115

Release notes: https://www.postgresql.org/docs/10/static/release-10-4.html
---
 pkgs/servers/sql/postgresql/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix
index 66162b9a88e..c8b007b36ac 100644
--- a/pkgs/servers/sql/postgresql/default.nix
+++ b/pkgs/servers/sql/postgresql/default.nix
@@ -119,9 +119,9 @@ in {
   };
 
   postgresql100 = common {
-    version = "10.3";
+    version = "10.4";
     psqlSchema = "10.0";
-    sha256 = "06lkcwsf851z49zqcws5yc77s2yrbaazf2nvbk38hpp31rw6i8kf";
+    sha256 = "0j000bcs9w8wrllg8m7j1lxsd3n2x0yzkack5p35cmxx20iq2q0v";
   };
 
 }
-- 
GitLab


From 55a12c97635868a45e1f9383d64389036a240b3f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <rschuetz17@gmail.com>
Date: Fri, 20 Jul 2018 19:28:29 +0200
Subject: [PATCH 205/297] nixos/home-assistant: do not always override
 extraComponents (#43845)

Fixes #43843.
---
 nixos/modules/services/misc/home-assistant.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/misc/home-assistant.nix b/nixos/modules/services/misc/home-assistant.nix
index fdcfe6bc2b8..0756e81612a 100644
--- a/nixos/modules/services/misc/home-assistant.nix
+++ b/nixos/modules/services/misc/home-assistant.nix
@@ -37,7 +37,7 @@ let
   # List of components used in config
   extraComponents = filter useComponent availableComponents;
 
-  package = if cfg.autoExtraComponents
+  package = if (cfg.autoExtraComponents && cfg.config != null)
     then (cfg.package.override { inherit extraComponents; })
     else cfg.package;
 
@@ -110,7 +110,9 @@ in {
       '';
       description = ''
         Home Assistant package to use.
-        Override <literal>extraPackages</literal> in order to add additional dependencies.
+        Override <literal>extraPackages</literal> or <literal>extraComponents</literal> in order to add additional dependencies.
+        If you specify <option>config</option> and do not set <option>autoExtraComponents</option>
+        to <literal>false</literal>, overriding <literal>extraComponents</literal> will have no effect.
       '';
     };
 
-- 
GitLab


From fdb9f10e4e63681e881597ffb99fc171d0a38407 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Fri, 20 Jul 2018 12:54:32 -0500
Subject: [PATCH 206/297] perl: 1.1.8 -> 1.2, fix w/newer perl

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

diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix
index 4deadefcc4b..dc1faf240f5 100644
--- a/pkgs/development/interpreters/perl/default.nix
+++ b/pkgs/development/interpreters/perl/default.nix
@@ -156,11 +156,11 @@ let
       platforms = platforms.all;
     };
   } // stdenv.lib.optionalAttrs (stdenv.buildPlatform != stdenv.hostPlatform) rec {
-    crossVersion = "1.1.8";
+    crossVersion = "1.2";
 
     perl-cross-src = fetchurlBoot {
       url = "https://github.com/arsv/perl-cross/releases/download/${crossVersion}/perl-cross-${crossVersion}.tar.gz";
-      sha256 = "072j491rpz2qx2sngbg4flqh4lx5865zyql7b9lqm6s1kknjdrh8";
+      sha256 = "02cic7lk91hgmsg8klkm2kv88m2a8y22m4m8gl4ydxbap2z7g42r";
     };
 
     # https://github.com/arsv/perl-cross/issues/60
-- 
GitLab


From 063132c22c937253a13ce52281a3a18ffcf73351 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Fri, 20 Jul 2018 12:56:07 -0500
Subject: [PATCH 207/297] perl-cross: remove patch that's now included

---
 pkgs/development/interpreters/perl/default.nix | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix
index dc1faf240f5..08672d28a1f 100644
--- a/pkgs/development/interpreters/perl/default.nix
+++ b/pkgs/development/interpreters/perl/default.nix
@@ -163,19 +163,10 @@ let
       sha256 = "02cic7lk91hgmsg8klkm2kv88m2a8y22m4m8gl4ydxbap2z7g42r";
     };
 
-    # https://github.com/arsv/perl-cross/issues/60
-    perl-cross-gcc7-patch = fetchpatch {
-      url = "https://github.com/arsv/perl-cross/commit/07208bc1707b8be3ea170c62c59120020cf0f87f.patch";
-      sha256 = "1gh8w9m5if2s0lrx2x8f8grp74d1l6d46m8jglpjm5a1kf55j810";
-    };
-
     depsBuildBuild = [ buildPackages.stdenv.cc makeWrapper ];
 
     postUnpack = ''
       unpackFile ${perl-cross-src}
-      cd perl-cross-*
-      patch -Np1 -i ${perl-cross-gcc7-patch}
-      cd ..
       cp -R perl-cross-${crossVersion}/* perl-${version}/
     '';
 
-- 
GitLab


From 87f5930c3fb2c852f5243278b7a9da8e117d95e4 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Fri, 20 Jul 2018 17:56:59 +0000
Subject: [PATCH 208/297] [bot]: remove unreferenced code

---
 doc/default.nix                               |  2 -
 lib/generators.nix                            |  2 -
 lib/lists.nix                                 |  1 -
 lib/modules.nix                               |  1 -
 lib/tests/misc.nix                            |  4 --
 lib/types.nix                                 |  1 -
 .../config/fonts/fontconfig-ultimate.nix      |  4 +-
 nixos/modules/installer/tools/tools.nix       |  2 -
 nixos/modules/profiles/clone-config.nix       |  1 -
 nixos/modules/programs/nylas-mail.nix         |  1 -
 nixos/modules/programs/shell.nix              |  6 ---
 nixos/modules/programs/ssh.nix                |  1 -
 nixos/modules/programs/xonsh.nix              |  2 -
 nixos/modules/security/acme.nix               |  1 -
 nixos/modules/services/backup/bacula.nix      | 11 ------
 .../backup/crashplan-small-business.nix       |  1 -
 nixos/modules/services/backup/crashplan.nix   |  1 -
 nixos/modules/services/backup/restic.nix      |  1 -
 nixos/modules/services/backup/znapzend.nix    |  7 ----
 .../services/cluster/hadoop/default.nix       |  5 +--
 .../services/cluster/kubernetes/default.nix   |  3 --
 nixos/modules/services/mail/dovecot.nix       |  2 -
 nixos/modules/services/misc/disnix.nix        | 10 -----
 .../modules/services/misc/docker-registry.nix | 37 -------------------
 nixos/modules/services/misc/dysnomia.nix      |  3 --
 nixos/modules/services/misc/emby.nix          |  1 -
 nixos/modules/services/misc/exhibitor.nix     |  1 -
 nixos/modules/services/misc/mediatomb.nix     |  1 -
 nixos/modules/services/misc/nzbget.nix        |  2 +-
 nixos/modules/services/misc/plex.nix          |  1 -
 .../services/misc/taskserver/default.nix      | 10 -----
 nixos/modules/services/networking/gdomap.nix  |  3 --
 nixos/modules/services/networking/i2pd.nix    |  4 +-
 nixos/modules/services/networking/morty.nix   |  2 -
 nixos/modules/services/networking/znc.nix     |  1 -
 nixos/modules/services/system/saslauthd.nix   |  1 -
 .../modules/services/torrent/transmission.nix |  6 ---
 nixos/modules/services/web-apps/frab.nix      |  1 -
 .../web-servers/apache-httpd/default.nix      |  5 ---
 .../web-servers/apache-httpd/owncloud.nix     | 11 ------
 .../web-servers/apache-httpd/trac.nix         |  2 -
 nixos/modules/services/web-servers/uwsgi.nix  |  4 --
 .../services/x11/desktop-managers/gnome3.nix  |  1 -
 nixos/modules/system/boot/stage-1.nix         |  1 -
 nixos/modules/system/boot/stage-2.nix         |  3 --
 nixos/modules/system/boot/systemd-nspawn.nix  |  3 --
 nixos/modules/system/boot/systemd.nix         |  2 -
 nixos/modules/tasks/encrypted-devices.nix     |  1 -
 nixos/modules/tasks/filesystems/zfs.nix       |  1 -
 .../tasks/network-interfaces-scripted.nix     |  1 -
 .../modules/testing/test-instrumentation.nix  |  4 --
 nixos/modules/virtualisation/openvswitch.nix  |  3 --
 nixos/tests/cjdns.nix                         | 10 +----
 nixos/tests/containers-reloadable.nix         |  1 -
 nixos/tests/installer.nix                     |  3 --
 nixos/tests/pam-oath-login.nix                |  2 -
 pkgs/applications/altcoins/mist.nix           |  4 +-
 .../applications/audio/clementine/default.nix |  3 --
 .../editors/emacs-modes/org-packages.nix      |  6 ---
 .../editors/textadept/default.nix             |  1 -
 .../misc/bitcoinarmory/default.nix            |  1 -
 pkgs/applications/misc/llpp/default.nix       |  3 +-
 pkgs/applications/misc/tqsl/default.nix       |  7 ----
 .../networking/browsers/chromium/common.nix   |  4 --
 .../flashplayer/standalone.nix                |  6 ---
 pkgs/applications/office/mendeley/default.nix |  1 -
 .../science/electronics/bitscope/common.nix   |  4 --
 .../science/electronics/bitscope/packages.nix |  4 --
 .../science/math/mathematica/default.nix      |  6 ---
 pkgs/applications/science/misc/golly/beta.nix | 10 +----
 pkgs/applications/virtualization/xen/4.10.nix |  5 ---
 pkgs/applications/virtualization/xen/4.8.nix  |  5 ---
 .../window-managers/way-cooler/way-cooler.nix |  7 ----
 .../window-managers/way-cooler/wc-bg.nix      |  7 ----
 .../window-managers/way-cooler/wc-grab.nix    |  7 ----
 .../window-managers/way-cooler/wc-lock.nix    |  7 ----
 .../dotnetenv/build-solution.nix              |  3 --
 .../fetchdocker/generic-fetcher.nix           |  2 -
 pkgs/build-support/rust/build-rust-crate.nix  | 11 +-----
 pkgs/build-support/rust/carnix.nix            |  6 ---
 pkgs/build-support/rust/default.nix           |  2 -
 pkgs/build-support/vm/windows/default.nix     |  5 ---
 .../compilers/chicken/eggDerivation.nix       |  1 -
 .../development/compilers/gcc/4.8/default.nix |  3 --
 .../development/compilers/gcc/4.9/default.nix |  3 --
 pkgs/development/compilers/gcc/5/default.nix  |  3 --
 pkgs/development/compilers/gcc/6/default.nix  |  3 --
 pkgs/development/compilers/gcc/7/default.nix  |  3 --
 pkgs/development/compilers/gcc/8/default.nix  |  3 --
 .../compilers/gcc/snapshot/default.nix        |  3 --
 .../compilers/ocaml/ber-metaocaml-104.nix     |  1 -
 pkgs/development/haskell-modules/hoogle.nix   |  4 --
 .../python/cpython/2.7/default.nix            |  5 ---
 .../python/cpython/3.4/default.nix            |  1 -
 .../python/cpython/3.5/default.nix            |  1 -
 .../python/cpython/3.6/default.nix            |  1 -
 .../python/cpython/3.7/default.nix            |  1 -
 .../development/interpreters/ruby/default.nix |  2 -
 .../libraries/wiredtiger/default.nix          |  1 -
 .../quicklisp-to-nix-overrides.nix            |  1 -
 .../mobile/androidenv/androidndk.nix          |  3 --
 .../mobile/androidenv/build-app.nix           |  4 --
 .../ocaml-modules/pycaml/default.nix          |  7 +---
 .../python-modules/gurobipy/linux.nix         |  7 +---
 .../ruby-modules/testing/stubs.nix            |  3 --
 .../development/tools/misc/dialog/default.nix |  3 +-
 pkgs/development/tools/phantomjs2/default.nix | 18 ---------
 .../tools/selenium/server/default.nix         |  3 --
 pkgs/games/dwarf-fortress/wrapper/default.nix |  2 -
 pkgs/games/simutrans/default.nix              |  1 -
 pkgs/misc/cups/drivers/canon/default.nix      |  1 -
 pkgs/servers/x11/xorg/overrides.nix           | 12 ------
 pkgs/tools/X11/bumblebee/default.nix          |  5 ---
 pkgs/tools/admin/ansible/default.nix          | 13 -------
 pkgs/tools/filesystems/ceph/generic.nix       |  5 ---
 .../cargo-edit/cargo-edit.nix                 |  7 ----
 pkgs/top-level/haxe-packages.nix              |  1 -
 pkgs/top-level/lua-packages.nix               |  1 -
 118 files changed, 16 insertions(+), 449 deletions(-)

diff --git a/doc/default.nix b/doc/default.nix
index f99aaff5f8a..9ad1b3da69c 100644
--- a/doc/default.nix
+++ b/doc/default.nix
@@ -1,8 +1,6 @@
 let
   pkgs = import ./.. { };
   lib = pkgs.lib;
-  sources = lib.sourceFilesBySuffices ./. [".xml"];
-  sources-langs = ./languages-frameworks;
 in
 pkgs.stdenv.mkDerivation {
   name = "nixpkgs-manual";
diff --git a/lib/generators.nix b/lib/generators.nix
index aa675908703..f5faf700786 100644
--- a/lib/generators.nix
+++ b/lib/generators.nix
@@ -19,8 +19,6 @@ let
   libStr = lib.strings;
   libAttr = lib.attrsets;
 
-  flipMapAttrs = flip libAttr.mapAttrs;
-
   inherit (lib) isFunction;
 in
 
diff --git a/lib/lists.nix b/lib/lists.nix
index 231c2317c0c..288882924ff 100644
--- a/lib/lists.nix
+++ b/lib/lists.nix
@@ -64,7 +64,6 @@ rec {
   */
   foldl = op: nul: list:
     let
-      len = length list;
       foldl' = n:
         if n == -1
         then nul
diff --git a/lib/modules.nix b/lib/modules.nix
index 20207b31d35..a443d5ec5d1 100644
--- a/lib/modules.nix
+++ b/lib/modules.nix
@@ -670,7 +670,6 @@ rec {
     { config, options, ... }:
     let
       fromOpt = getAttrFromPath from options;
-      toOpt = getAttrFromPath to options;
       toOf = attrByPath to
         (abort "Renaming error: option `${showOption to}' does not exist.");
     in
diff --git a/lib/tests/misc.nix b/lib/tests/misc.nix
index eab20d0f14d..3f2d742e788 100644
--- a/lib/tests/misc.nix
+++ b/lib/tests/misc.nix
@@ -380,10 +380,6 @@ runTests {
 
           resRem7 = res6.replace (a: removeAttrs a ["a"]);
 
-          resReplace6 = let x = defaultOverridableDelayableArgs id { a = 7; mergeAttrBy = { a = builtins.add; }; };
-                            x2 = x.merge { a = 20; }; # now we have 27
-                        in (x2.replace) { a = 10; }; # and override the value by 10
-
           # fixed tests (delayed args): (when using them add some comments, please)
           resFixed1 =
                 let x = defaultOverridableDelayableArgs id ( x: { a = 7; c = x.fixed.b; });
diff --git a/lib/types.nix b/lib/types.nix
index cf6f2aa46e4..98eff2ac6ff 100644
--- a/lib/types.nix
+++ b/lib/types.nix
@@ -309,7 +309,6 @@ rec {
               }
           else
             def;
-        listOnly = listOf elemType;
         attrOnly = attrsOf elemType;
       in mkOptionType rec {
         name = "loaOf";
diff --git a/nixos/modules/config/fonts/fontconfig-ultimate.nix b/nixos/modules/config/fonts/fontconfig-ultimate.nix
index c7654ca78c3..7549dc6c065 100644
--- a/nixos/modules/config/fonts/fontconfig-ultimate.nix
+++ b/nixos/modules/config/fonts/fontconfig-ultimate.nix
@@ -2,9 +2,7 @@
 
 with lib;
 
-let fcBool = x: if x then "<bool>true</bool>" else "<bool>false</bool>";
-
-    cfg = config.fonts.fontconfig.ultimate;
+let cfg = config.fonts.fontconfig.ultimate;
 
     latestVersion  = pkgs.fontconfig.configVersion;
 
diff --git a/nixos/modules/installer/tools/tools.nix b/nixos/modules/installer/tools/tools.nix
index 42b00b2025d..05029628672 100644
--- a/nixos/modules/installer/tools/tools.nix
+++ b/nixos/modules/installer/tools/tools.nix
@@ -6,8 +6,6 @@
 with lib;
 
 let
-  cfg = config.installer;
-
   makeProg = args: pkgs.substituteAll (args // {
     dir = "bin";
     isExecutable = true;
diff --git a/nixos/modules/profiles/clone-config.nix b/nixos/modules/profiles/clone-config.nix
index 5b4e68beb6a..99d4774584f 100644
--- a/nixos/modules/profiles/clone-config.nix
+++ b/nixos/modules/profiles/clone-config.nix
@@ -31,7 +31,6 @@ let
     let
       relocateNixOS = path:
         "<nixpkgs/nixos" + removePrefix nixosPath (toString path) + ">";
-      relocateOthers = null;
     in
       { nixos = map relocateNixOS partitionedModuleFiles.nixos;
         others = []; # TODO: copy the modules to the install-device repository.
diff --git a/nixos/modules/programs/nylas-mail.nix b/nixos/modules/programs/nylas-mail.nix
index 9a6cf755f2a..08a6cd0a604 100644
--- a/nixos/modules/programs/nylas-mail.nix
+++ b/nixos/modules/programs/nylas-mail.nix
@@ -4,7 +4,6 @@ with lib;
 
 let
   cfg = config.services.nylas-mail;
-  defaultUser = "nylas-mail";
 in {
   ###### interface
   options = {
diff --git a/nixos/modules/programs/shell.nix b/nixos/modules/programs/shell.nix
index 56fe347528b..26ef1875992 100644
--- a/nixos/modules/programs/shell.nix
+++ b/nixos/modules/programs/shell.nix
@@ -4,12 +4,6 @@
 
 with lib;
 
-let
-
-  cfg = config.environment;
-
-in
-
 {
 
   config = {
diff --git a/nixos/modules/programs/ssh.nix b/nixos/modules/programs/ssh.nix
index 36289080a82..b4184041d18 100644
--- a/nixos/modules/programs/ssh.nix
+++ b/nixos/modules/programs/ssh.nix
@@ -7,7 +7,6 @@ with lib;
 let
 
   cfg  = config.programs.ssh;
-  cfgd = config.services.openssh;
 
   askPassword = cfg.askPassword;
 
diff --git a/nixos/modules/programs/xonsh.nix b/nixos/modules/programs/xonsh.nix
index 49cc4906e03..f967ca82ac8 100644
--- a/nixos/modules/programs/xonsh.nix
+++ b/nixos/modules/programs/xonsh.nix
@@ -6,8 +6,6 @@ with lib;
 
 let
 
-  cfge = config.environment;
-
   cfg = config.programs.xonsh;
 
 in
diff --git a/nixos/modules/security/acme.nix b/nixos/modules/security/acme.nix
index 9e5d636241e..946da92d80e 100644
--- a/nixos/modules/security/acme.nix
+++ b/nixos/modules/security/acme.nix
@@ -209,7 +209,6 @@ in
           servicesLists = mapAttrsToList certToServices cfg.certs;
           certToServices = cert: data:
               let
-                domain = if data.domain != null then data.domain else cert;
                 cpath = lpath + optionalString (data.activationDelay != null) ".staging";
                 lpath = "${cfg.directory}/${cert}";
                 rights = if data.allowKeysForGroup then "750" else "700";
diff --git a/nixos/modules/services/backup/bacula.nix b/nixos/modules/services/backup/bacula.nix
index e2806a69539..be02ba56795 100644
--- a/nixos/modules/services/backup/bacula.nix
+++ b/nixos/modules/services/backup/bacula.nix
@@ -97,17 +97,6 @@ let
     ${dir_cfg.extraConfig}
     '';
 
-  # TODO: by default use this config
-  bconsole_conf = pkgs.writeText "bconsole.conf"
-    ''
-    Director {
-      Name = ${dir_cfg.name};
-      Address = "localhost";
-      DirPort = ${toString dir_cfg.port};
-      Password = "${dir_cfg.password}";
-    }
-    '';
-
   directorOptions = {name, config, ...}:
   {
     options = {
diff --git a/nixos/modules/services/backup/crashplan-small-business.nix b/nixos/modules/services/backup/crashplan-small-business.nix
index 9497d8c18bb..790dafefe66 100644
--- a/nixos/modules/services/backup/crashplan-small-business.nix
+++ b/nixos/modules/services/backup/crashplan-small-business.nix
@@ -3,7 +3,6 @@
 let
   cfg = config.services.crashplansb;
   crashplansb = pkgs.crashplansb.override { maxRam = cfg.maxRam; };
-  varDir = "/var/lib/crashplan";
 in
 
 with lib;
diff --git a/nixos/modules/services/backup/crashplan.nix b/nixos/modules/services/backup/crashplan.nix
index d0af2e416b6..c540cc6e2ae 100644
--- a/nixos/modules/services/backup/crashplan.nix
+++ b/nixos/modules/services/backup/crashplan.nix
@@ -3,7 +3,6 @@
 let
   cfg = config.services.crashplan;
   crashplan = pkgs.crashplan;
-  varDir = "/var/lib/crashplan";
 in
 
 with lib;
diff --git a/nixos/modules/services/backup/restic.nix b/nixos/modules/services/backup/restic.nix
index 2d14762e868..409c05221d0 100644
--- a/nixos/modules/services/backup/restic.nix
+++ b/nixos/modules/services/backup/restic.nix
@@ -127,7 +127,6 @@ with lib;
       mapAttrs' (name: backup:
         let
           extraOptions = concatMapStrings (arg: " -o ${arg}") backup.extraOptions;
-          connectTo = elemAt (splitString ":" backup.repository) 1;
           resticCmd = "${pkgs.restic}/bin/restic${extraOptions}";
         in nameValuePair "restic-backups-${name}" ({
           environment = {
diff --git a/nixos/modules/services/backup/znapzend.nix b/nixos/modules/services/backup/znapzend.nix
index 3d133f82d20..fc8a424190f 100644
--- a/nixos/modules/services/backup/znapzend.nix
+++ b/nixos/modules/services/backup/znapzend.nix
@@ -5,13 +5,6 @@ with types;
 
 let
 
-  # Converts a plan like
-  #   { "1d" = "1h"; "1w" = "1d"; }
-  # into
-  #   "1d=>1h,1w=>1d"
-  attrToPlan = attrs: concatStringsSep "," (builtins.attrValues (
-    mapAttrs (n: v: "${n}=>${v}") attrs));
-
   planDescription = ''
       The znapzend backup plan to use for the source.
     </para>
diff --git a/nixos/modules/services/cluster/hadoop/default.nix b/nixos/modules/services/cluster/hadoop/default.nix
index 240938f0d62..f0f5a6ecbfc 100644
--- a/nixos/modules/services/cluster/hadoop/default.nix
+++ b/nixos/modules/services/cluster/hadoop/default.nix
@@ -1,8 +1,5 @@
 { config, lib, pkgs, ...}:
-let 
-  cfg = config.services.hadoop;
-  hadoopConf = import ./conf.nix { hadoop = cfg; pkgs = pkgs; };
-in
+
 with lib;
 {
   imports = [ ./yarn.nix ./hdfs.nix ];
diff --git a/nixos/modules/services/cluster/kubernetes/default.nix b/nixos/modules/services/cluster/kubernetes/default.nix
index e5aba210b01..f56a529afdf 100644
--- a/nixos/modules/services/cluster/kubernetes/default.nix
+++ b/nixos/modules/services/cluster/kubernetes/default.nix
@@ -36,9 +36,6 @@ let
     })}
   '';
 
-  skipAttrs = attrs: map (filterAttrs (k: v: k != "enable"))
-    (filter (v: !(hasAttr "enable" v) || v.enable) attrs);
-
   infraContainer = pkgs.dockerTools.buildImage {
     name = "pause";
     tag = "latest";
diff --git a/nixos/modules/services/mail/dovecot.nix b/nixos/modules/services/mail/dovecot.nix
index a3eb1653df5..04df97fdbbe 100644
--- a/nixos/modules/services/mail/dovecot.nix
+++ b/nixos/modules/services/mail/dovecot.nix
@@ -9,8 +9,6 @@ let
   baseDir = "/run/dovecot2";
   stateDir = "/var/lib/dovecot";
 
-  canCreateMailUserGroup = cfg.mailUser != null && cfg.mailGroup != null;
-
   dovecotConf = concatStrings [
     ''
       base_dir = ${baseDir}
diff --git a/nixos/modules/services/misc/disnix.nix b/nixos/modules/services/misc/disnix.nix
index b28995a0911..bb3ac1ecf07 100644
--- a/nixos/modules/services/misc/disnix.nix
+++ b/nixos/modules/services/misc/disnix.nix
@@ -7,16 +7,6 @@ let
 
   cfg = config.services.disnix;
 
-  dysnomia = pkgs.dysnomia.override (origArgs: {
-    enableApacheWebApplication = config.services.httpd.enable;
-    enableAxis2WebService = config.services.tomcat.axis2.enable;
-    enableEjabberdDump = config.services.ejabberd.enable;
-    enableMySQLDatabase = config.services.mysql.enable;
-    enablePostgreSQLDatabase = config.services.postgresql.enable;
-    enableSubversionRepository = config.services.svnserve.enable;
-    enableTomcatWebApplication = config.services.tomcat.enable;
-    enableMongoDatabase = config.services.mongodb.enable;
-  });
 in
 
 {
diff --git a/nixos/modules/services/misc/docker-registry.nix b/nixos/modules/services/misc/docker-registry.nix
index 9a3966ab30a..08031d33c13 100644
--- a/nixos/modules/services/misc/docker-registry.nix
+++ b/nixos/modules/services/misc/docker-registry.nix
@@ -5,43 +5,6 @@ with lib;
 let
   cfg = config.services.dockerRegistry;
 
-  blobCache = if cfg.enableRedisCache
-    then "redis"
-    else "inmemory";
-
-  registryConfig = {
-    version =  "0.1";
-    log.fields.service = "registry";
-    storage = {
-      cache.blobdescriptor = blobCache;
-      filesystem.rootdirectory = cfg.storagePath;
-      delete.enabled = cfg.enableDelete;
-    };
-    http = {
-      addr = ":${builtins.toString cfg.port}";
-      headers.X-Content-Type-Options = ["nosniff"];
-    };
-    health.storagedriver = {
-      enabled = true;
-      interval = "10s";
-      threshold = 3;
-    };
-  };
-
-  registryConfig.redis = mkIf cfg.enableRedisCache {
-    addr = "${cfg.redisUrl}";
-    password = "${cfg.redisPassword}";
-    db = 0;
-    dialtimeout = "10ms";
-    readtimeout = "10ms";
-    writetimeout = "10ms";
-    pool = {
-      maxidle = 16;
-      maxactive = 64;
-      idletimeout = "300s";
-    };
-  };
-
   configFile = pkgs.writeText "docker-registry-config.yml" (builtins.toJSON (recursiveUpdate registryConfig cfg.extraConfig));
 
 in {
diff --git a/nixos/modules/services/misc/dysnomia.nix b/nixos/modules/services/misc/dysnomia.nix
index 9e66e0811ab..ba74b18b697 100644
--- a/nixos/modules/services/misc/dysnomia.nix
+++ b/nixos/modules/services/misc/dysnomia.nix
@@ -62,9 +62,6 @@ let
       cd $out
 
       ${concatMapStrings (containerName:
-        let
-          components = cfg.components."${containerName}";
-        in
         linkMutableComponents { inherit containerName; }
       ) (builtins.attrNames cfg.components)}
     '';
diff --git a/nixos/modules/services/misc/emby.nix b/nixos/modules/services/misc/emby.nix
index b1968784af0..92a68b60251 100644
--- a/nixos/modules/services/misc/emby.nix
+++ b/nixos/modules/services/misc/emby.nix
@@ -4,7 +4,6 @@ with lib;
 
 let
   cfg = config.services.emby;
-  emby = pkgs.emby;
 in
 {
   options = {
diff --git a/nixos/modules/services/misc/exhibitor.nix b/nixos/modules/services/misc/exhibitor.nix
index 685e652c0ba..a90c7f402e7 100644
--- a/nixos/modules/services/misc/exhibitor.nix
+++ b/nixos/modules/services/misc/exhibitor.nix
@@ -4,7 +4,6 @@ with lib;
 
 let
   cfg = config.services.exhibitor;
-  exhibitor = cfg.package;
   exhibitorConfig = ''
     zookeeper-install-directory=${cfg.baseDir}/zookeeper
     zookeeper-data-directory=${cfg.zkDataDir}
diff --git a/nixos/modules/services/misc/mediatomb.nix b/nixos/modules/services/misc/mediatomb.nix
index 5c1977d28de..e8e9c0946d7 100644
--- a/nixos/modules/services/misc/mediatomb.nix
+++ b/nixos/modules/services/misc/mediatomb.nix
@@ -4,7 +4,6 @@ with lib;
 
 let
 
-  uid = config.ids.uids.mediatomb;
   gid = config.ids.gids.mediatomb;
   cfg = config.services.mediatomb;
 
diff --git a/nixos/modules/services/misc/nzbget.nix b/nixos/modules/services/misc/nzbget.nix
index f79a04a1d74..a472b6c7157 100644
--- a/nixos/modules/services/misc/nzbget.nix
+++ b/nixos/modules/services/misc/nzbget.nix
@@ -4,7 +4,7 @@ with lib;
 
 let
   cfg = config.services.nzbget;
-  nzbget = pkgs.nzbget; in {
+in {
   options = {
     services.nzbget = {
       enable = mkEnableOption "NZBGet";
diff --git a/nixos/modules/services/misc/plex.nix b/nixos/modules/services/misc/plex.nix
index 85f1d4a8556..8fe5879c276 100644
--- a/nixos/modules/services/misc/plex.nix
+++ b/nixos/modules/services/misc/plex.nix
@@ -4,7 +4,6 @@ with lib;
 
 let
   cfg = config.services.plex;
-  plex = pkgs.plex;
 in
 {
   options = {
diff --git a/nixos/modules/services/misc/taskserver/default.nix b/nixos/modules/services/misc/taskserver/default.nix
index ba9f52f1904..7daf12f9171 100644
--- a/nixos/modules/services/misc/taskserver/default.nix
+++ b/nixos/modules/services/misc/taskserver/default.nix
@@ -7,16 +7,6 @@ let
 
   taskd = "${pkgs.taskserver}/bin/taskd";
 
-  mkVal = val:
-    if val == true then "true"
-    else if val == false then "false"
-    else if isList val then concatStringsSep ", " val
-    else toString val;
-
-  mkConfLine = key: val: let
-    result = "${key} = ${mkVal val}";
-  in optionalString (val != null && val != []) result;
-
   mkManualPkiOption = desc: mkOption {
     type = types.nullOr types.path;
     default = null;
diff --git a/nixos/modules/services/networking/gdomap.nix b/nixos/modules/services/networking/gdomap.nix
index b3fd91d037f..3d829cb6913 100644
--- a/nixos/modules/services/networking/gdomap.nix
+++ b/nixos/modules/services/networking/gdomap.nix
@@ -2,9 +2,6 @@
 
 with lib;
 
-let
-  cfg = config.services.gdomap;
-in
 {
   #
   # interface
diff --git a/nixos/modules/services/networking/i2pd.nix b/nixos/modules/services/networking/i2pd.nix
index 8875309143f..4f219fe56b4 100644
--- a/nixos/modules/services/networking/i2pd.nix
+++ b/nixos/modules/services/networking/i2pd.nix
@@ -103,7 +103,7 @@ let
 
     ${flip concatMapStrings
       (collect (proto: proto ? port && proto ? address && proto ? name) cfg.proto)
-      (proto: let portStr = toString proto.port; in ''
+      (proto: ''
         [${proto.name}]
         enabled = ${boolToString proto.enable}
         address = ${proto.address}
@@ -122,7 +122,7 @@ let
     # DO NOT EDIT -- this file has been generated automatically.
     ${flip concatMapStrings
       (collect (tun: tun ? port && tun ? destination) cfg.outTunnels)
-      (tun: let portStr = toString tun.port; in ''
+      (tun: ''
         [${tun.name}]
         type = client
         destination = ${tun.destination}
diff --git a/nixos/modules/services/networking/morty.nix b/nixos/modules/services/networking/morty.nix
index f24562f1181..cc81e27e939 100644
--- a/nixos/modules/services/networking/morty.nix
+++ b/nixos/modules/services/networking/morty.nix
@@ -6,8 +6,6 @@ let
 
   cfg = config.services.morty;
 
-  configFile = cfg.configFile;
-
 in
 
 {
diff --git a/nixos/modules/services/networking/znc.nix b/nixos/modules/services/networking/znc.nix
index 6f477e3b146..f817db2ad00 100644
--- a/nixos/modules/services/networking/znc.nix
+++ b/nixos/modules/services/networking/znc.nix
@@ -26,7 +26,6 @@ let
   };
 
   # Keep znc.conf in nix store, then symlink or copy into `dataDir`, depending on `mutable`.
-  notNull = a: ! isNull a;
   mkZncConf = confOpts: ''
     Version = 1.6.3
     ${concatMapStrings (n: "LoadModule = ${n}\n") confOpts.modules}
diff --git a/nixos/modules/services/system/saslauthd.nix b/nixos/modules/services/system/saslauthd.nix
index 281716cf186..c8ddca9a0db 100644
--- a/nixos/modules/services/system/saslauthd.nix
+++ b/nixos/modules/services/system/saslauthd.nix
@@ -4,7 +4,6 @@ with lib;
 
 let
 
-  nssModulesPath = config.system.nssModules.path;
   cfg = config.services.saslauthd;
 
 in
diff --git a/nixos/modules/services/torrent/transmission.nix b/nixos/modules/services/torrent/transmission.nix
index bf4fb76d0c0..96413d2dd56 100644
--- a/nixos/modules/services/torrent/transmission.nix
+++ b/nixos/modules/services/torrent/transmission.nix
@@ -13,12 +13,6 @@ let
   settingsDir = "${homeDir}/.config/transmission-daemon";
   settingsFile = pkgs.writeText "settings.json" (builtins.toJSON fullSettings);
 
-  # Strings must be quoted, ints and bools must not (for settings.json).
-  toOption = x:
-    if isBool x then boolToString x
-    else if isInt x then toString x
-    else toString ''"${x}"'';
-
   # for users in group "transmission" to have access to torrents
   fullSettings = { umask = 2; download-dir = downloadDir; incomplete-dir = incompleteDir; } // cfg.settings;
 
diff --git a/nixos/modules/services/web-apps/frab.nix b/nixos/modules/services/web-apps/frab.nix
index d411727a1a5..fb95e024817 100644
--- a/nixos/modules/services/web-apps/frab.nix
+++ b/nixos/modules/services/web-apps/frab.nix
@@ -6,7 +6,6 @@ let
   cfg = config.services.frab;
 
   package = pkgs.frab;
-  ruby = package.ruby;
 
   databaseConfig = builtins.toJSON { production = cfg.database; };
 
diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix
index eb8ee9b5cf4..73607c6f9a3 100644
--- a/nixos/modules/services/web-servers/apache-httpd/default.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/default.nix
@@ -98,11 +98,6 @@ let
   allSubservices = mainSubservices ++ concatMap subservicesFor mainCfg.virtualHosts;
 
 
-  # !!! should be in lib
-  writeTextInDir = name: text:
-    pkgs.runCommand name {inherit text;} "mkdir -p $out; echo -n \"$text\" > $out/$name";
-
-
   enableSSL = any (vhost: vhost.enableSSL) allHosts;
 
 
diff --git a/nixos/modules/services/web-servers/apache-httpd/owncloud.nix b/nixos/modules/services/web-servers/apache-httpd/owncloud.nix
index 82b8bf3e30d..6345a9a5693 100644
--- a/nixos/modules/services/web-servers/apache-httpd/owncloud.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/owncloud.nix
@@ -4,17 +4,6 @@ with lib;
 
 let
 
-  httpd = serverInfo.serverConfig.package;
-
-  version24 = !versionOlder httpd.version "2.4";
-
-  allGranted = if version24 then ''
-    Require all granted
-  '' else ''
-    Order allow,deny
-    Allow from all
-  '';
-
   owncloudConfig = pkgs.writeText "config.php"
     ''
       <?php
diff --git a/nixos/modules/services/web-servers/apache-httpd/trac.nix b/nixos/modules/services/web-servers/apache-httpd/trac.nix
index 35b9ab56087..28b411a64b6 100644
--- a/nixos/modules/services/web-servers/apache-httpd/trac.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/trac.nix
@@ -12,8 +12,6 @@ let
     apacheHttpd = httpd;
   };
 
-  pythonLib = p: "${p}/";
-
   httpd = serverInfo.serverConfig.package;
 
   versionPre24 = versionOlder httpd.version "2.4";
diff --git a/nixos/modules/services/web-servers/uwsgi.nix b/nixos/modules/services/web-servers/uwsgi.nix
index 3ef78ea77cb..3f858d90fa4 100644
--- a/nixos/modules/services/web-servers/uwsgi.nix
+++ b/nixos/modules/services/web-servers/uwsgi.nix
@@ -27,10 +27,6 @@ let
         else if hasPython3 then uwsgi.python3
         else null;
 
-      pythonPackages = pkgs.pythonPackages.override {
-        inherit python;
-      };
-
       pythonEnv = python.withPackages (c.pythonPackages or (self: []));
 
       uwsgiCfg = {
diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix
index 27b62df7097..9fb8f44b242 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome3.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix
@@ -10,7 +10,6 @@ let
     let
       pkgName = drv: (builtins.parseDrvName drv.name).name;
       ysNames = map pkgName ys;
-      res = (filter (x: !(builtins.elem (pkgName x) ysNames)) xs);
     in
       filter (x: !(builtins.elem (pkgName x) ysNames)) xs;
 
diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix
index b6a7081b896..71b806a0b4e 100644
--- a/nixos/modules/system/boot/stage-1.nix
+++ b/nixos/modules/system/boot/stage-1.nix
@@ -11,7 +11,6 @@ let
 
   udev = config.systemd.package;
 
-  kernelPackages = config.boot.kernelPackages;
   modulesTree = config.system.modulesTree;
   firmware = config.hardware.firmware;
 
diff --git a/nixos/modules/system/boot/stage-2.nix b/nixos/modules/system/boot/stage-2.nix
index 78afbd8dbc1..9fd89b6319d 100644
--- a/nixos/modules/system/boot/stage-2.nix
+++ b/nixos/modules/system/boot/stage-2.nix
@@ -4,9 +4,6 @@ with lib;
 
 let
 
-  kernel = config.boot.kernelPackages.kernel;
-  activateConfiguration = config.system.activationScripts.script;
-
   bootStage2 = pkgs.substituteAll {
     src = ./stage-2-init.sh;
     shellDebug = "${pkgs.bashInteractive}/bin/bash";
diff --git a/nixos/modules/system/boot/systemd-nspawn.nix b/nixos/modules/system/boot/systemd-nspawn.nix
index 64b3b8b584e..83fef835436 100644
--- a/nixos/modules/system/boot/systemd-nspawn.nix
+++ b/nixos/modules/system/boot/systemd-nspawn.nix
@@ -6,9 +6,6 @@ with import ./systemd-lib.nix { inherit config lib pkgs; };
 
 let
   cfg = config.systemd.nspawn;
-  assertions = [
-    # boot = true -> processtwo != true
-  ];
 
   checkExec = checkUnitConfig "Exec" [
     (assertOnlyFields [
diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index 6f5b15372d7..500c2d40661 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -188,8 +188,6 @@ let
       "timers.target"
     ];
 
-  boolToString = value: if value then "yes" else "no";
-
   makeJobScript = name: text:
     let mkScriptName =  s: (replaceChars [ "\\" ] [ "-" ] (shellEscape s) );
         x = pkgs.writeTextFile { name = "unit-script"; executable = true; destination = "/bin/${mkScriptName name}"; inherit text; };
diff --git a/nixos/modules/tasks/encrypted-devices.nix b/nixos/modules/tasks/encrypted-devices.nix
index da0c9408d89..11ed5d7e4d0 100644
--- a/nixos/modules/tasks/encrypted-devices.nix
+++ b/nixos/modules/tasks/encrypted-devices.nix
@@ -7,7 +7,6 @@ let
   encDevs = filter (dev: dev.encrypted.enable) fileSystems;
   keyedEncDevs = filter (dev: dev.encrypted.keyFile != null) encDevs;
   keylessEncDevs = filter (dev: dev.encrypted.keyFile == null) encDevs;
-  isIn = needle: haystack: filter (p: p == needle) haystack != [];
   anyEncrypted =
     fold (j: v: v || j.encrypted.enable) false encDevs;
 
diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix
index 39f51c36367..7120856387e 100644
--- a/nixos/modules/tasks/filesystems/zfs.nix
+++ b/nixos/modules/tasks/filesystems/zfs.nix
@@ -9,7 +9,6 @@ with lib;
 
 let
 
-  cfgSpl = config.boot.spl;
   cfgZfs = config.boot.zfs;
   cfgSnapshots = config.services.zfs.autoSnapshot;
   cfgSnapFlags = cfgSnapshots.flags;
diff --git a/nixos/modules/tasks/network-interfaces-scripted.nix b/nixos/modules/tasks/network-interfaces-scripted.nix
index c4a2bd1f75f..f3f6a19318a 100644
--- a/nixos/modules/tasks/network-interfaces-scripted.nix
+++ b/nixos/modules/tasks/network-interfaces-scripted.nix
@@ -7,7 +7,6 @@ let
 
   cfg = config.networking;
   interfaces = attrValues cfg.interfaces;
-  hasVirtuals = any (i: i.virtual) interfaces;
 
   slaves = concatMap (i: i.interfaces) (attrValues cfg.bonds)
     ++ concatMap (i: i.interfaces) (attrValues cfg.bridges)
diff --git a/nixos/modules/testing/test-instrumentation.nix b/nixos/modules/testing/test-instrumentation.nix
index 7a7fcbecd64..114e0ca39fa 100644
--- a/nixos/modules/testing/test-instrumentation.nix
+++ b/nixos/modules/testing/test-instrumentation.nix
@@ -6,10 +6,6 @@
 with lib;
 with import ../../lib/qemu-flags.nix { inherit pkgs; };
 
-let
-  kernel = config.boot.kernelPackages.kernel;
-in
-
 {
 
   # This option is a dummy that if used in conjunction with
diff --git a/nixos/modules/virtualisation/openvswitch.nix b/nixos/modules/virtualisation/openvswitch.nix
index 38b138e0632..bb8b9172f23 100644
--- a/nixos/modules/virtualisation/openvswitch.nix
+++ b/nixos/modules/virtualisation/openvswitch.nix
@@ -51,9 +51,6 @@ in {
     # Where the communication sockets live
     runDir = "/var/run/openvswitch";
 
-    # Where the config database live (can't be in nix-store)
-    stateDir = "/var/db/openvswitch";
-
     # The path to the an initialized version of the database
     db = pkgs.stdenv.mkDerivation {
       name = "vswitch.db";
diff --git a/nixos/tests/cjdns.nix b/nixos/tests/cjdns.nix
index 4d3b58abc6e..db89c496944 100644
--- a/nixos/tests/cjdns.nix
+++ b/nixos/tests/cjdns.nix
@@ -2,7 +2,6 @@ let
   carolKey = "2d2a338b46f8e4a8c462f0c385b481292a05f678e19a2b82755258cf0f0af7e2";
   carolPubKey = "n932l3pjvmhtxxcdrqq2qpw5zc58f01vvjx01h4dtd1bb0nnu2h0.k";
   carolPassword = "678287829ce4c67bc8b227e56d94422ee1b85fa11618157b2f591de6c6322b52";
-  carolIp4 = "192.168.0.9";
 
   basicConfig =
     { config, pkgs, ... }:
@@ -44,9 +43,7 @@ import ./make-test.nix ({ pkgs, ...} : {
       bob =
         { config, lib, nodes, ... }:
 
-        let carolIp4 = lib.mkForce nodes.carol.config.networking.interfaces.eth1; in
-
-          { imports = [ basicConfig ];
+        { imports = [ basicConfig ];
 
           networking.interfaces.eth1.ipv4.addresses = [
             { address = "192.168.0.2"; prefixLength = 24; }
@@ -67,10 +64,7 @@ import ./make-test.nix ({ pkgs, ...} : {
       # but knows neither Alice or Bob.
       carol =
         { config, lib, nodes, ... }:
-          let
-            carolIp4 = (lib.mkForce nodes.carol.config.networking.interfaces.eth1);
-          in
-          { imports = [ basicConfig ];
+        { imports = [ basicConfig ];
 
           environment.etc."cjdns.keys".text = ''
             CJDNS_PRIVATE_KEY=${carolKey}
diff --git a/nixos/tests/containers-reloadable.nix b/nixos/tests/containers-reloadable.nix
index 5fb42f2272b..15862ac64c1 100644
--- a/nixos/tests/containers-reloadable.nix
+++ b/nixos/tests/containers-reloadable.nix
@@ -45,7 +45,6 @@ in {
   };
 
   testScript = {nodes, ...}: let
-    originalSystem = nodes.client.config.system.build.toplevel;
     c1System = nodes.client_c1.config.system.build.toplevel;
     c2System = nodes.client_c2.config.system.build.toplevel;
   in ''
diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix
index 8ce9bc21ff7..59226484bd8 100644
--- a/nixos/tests/installer.nix
+++ b/nixos/tests/installer.nix
@@ -58,9 +58,6 @@ let
     '';
 
 
-  channelContents = [ pkgs.rlwrap ];
-
-
   # The test script boots a NixOS VM, installs NixOS on an empty hard
   # disk, and then reboot from the hard disk.  It's parameterized with
   # a test script fragment `createPartitions', which must create
diff --git a/nixos/tests/pam-oath-login.nix b/nixos/tests/pam-oath-login.nix
index eb5966d9213..9f40ecfe865 100644
--- a/nixos/tests/pam-oath-login.nix
+++ b/nixos/tests/pam-oath-login.nix
@@ -12,8 +12,6 @@ let
   # and picking a the first 4:
   oathSnakeOilPassword1 = "143349";
   oathSnakeOilPassword2 = "801753";
-  oathSnakeOilPassword3 = "019933";
-  oathSnakeOilPassword4 = "403895";
 
   alicePassword = "foobar";
   # Generated via: mkpasswd -m sha-512 and passing in "foobar"
diff --git a/pkgs/applications/altcoins/mist.nix b/pkgs/applications/altcoins/mist.nix
index c38e613fdd4..cb8d01467a2 100644
--- a/pkgs/applications/altcoins/mist.nix
+++ b/pkgs/applications/altcoins/mist.nix
@@ -26,7 +26,7 @@ let
   };
 
   mist = stdenv.lib.appendToName "unwrapped" (stdenv.mkDerivation {
-    inherit name version;
+    inherit name version meta;
 
     src = {
       i686-linux = fetchurl {
@@ -56,7 +56,7 @@ let
   });
 in
 buildFHSUserEnv {
-  inherit name;
+  inherit name meta;
 
   targetPkgs = pkgs: with pkgs; [
      mist
diff --git a/pkgs/applications/audio/clementine/default.nix b/pkgs/applications/audio/clementine/default.nix
index 6379975e951..b8044972576 100644
--- a/pkgs/applications/audio/clementine/default.nix
+++ b/pkgs/applications/audio/clementine/default.nix
@@ -4,7 +4,6 @@
 , qca2, pkgconfig, sparsehash, config, makeWrapper, runCommand, gst_plugins }:
 
 let
-  withSpotify = config.clementine.spotify or false;
   withIpod = config.clementine.ipod or false;
   withMTP = config.clementine.mtp or true;
   withCD = config.clementine.cd or true;
@@ -12,8 +11,6 @@ let
 
   version = "1.3.1";
 
-  exeName = "clementine";
-
   src = fetchurl {
     url = https://github.com/clementine-player/Clementine/archive/1.3.1.tar.gz;
     sha256 = "0z7k73wyz54c3020lb6x2dgw0vz4ri7wcl3vs03qdj5pk8d971gq";
diff --git a/pkgs/applications/editors/emacs-modes/org-packages.nix b/pkgs/applications/editors/emacs-modes/org-packages.nix
index b8543841a7f..8df45ffb61e 100644
--- a/pkgs/applications/editors/emacs-modes/org-packages.nix
+++ b/pkgs/applications/editors/emacs-modes/org-packages.nix
@@ -23,12 +23,6 @@ self:
 
     super = imported;
 
-    markBroken = pkg: pkg.override {
-      elpaBuild = args: self.elpaBuild (args // {
-        meta = (args.meta or {}) // { broken = true; };
-      });
-    };
-
     overrides = {
     };
 
diff --git a/pkgs/applications/editors/textadept/default.nix b/pkgs/applications/editors/textadept/default.nix
index 4f1a29278be..818183b9852 100644
--- a/pkgs/applications/editors/textadept/default.nix
+++ b/pkgs/applications/editors/textadept/default.nix
@@ -56,7 +56,6 @@ let
   gtdialog_zip   = "gtdialog_1.3.zip";
   cdk_tgz        = "cdk-5.0-20150928.tgz";
   termkey_tgz    = "libtermkey-0.17.tar.gz";
-  bombay_zip     = "bombay.zip";
 
   scinterm_url   = "http://foicica.com/scinterm/download/" + scinterm_zip;
   tre_url        = "https://github.com/laurikari/tre/archive/" + tre_zip;
diff --git a/pkgs/applications/misc/bitcoinarmory/default.nix b/pkgs/applications/misc/bitcoinarmory/default.nix
index a9d32d4b252..3245a56e9de 100644
--- a/pkgs/applications/misc/bitcoinarmory/default.nix
+++ b/pkgs/applications/misc/bitcoinarmory/default.nix
@@ -6,7 +6,6 @@
 let
 
   version = "0.96.1";
-  sitePackages = pythonPackages.python.sitePackages;
   inherit (pythonPackages) buildPythonApplication pyqt4 psutil twisted;
 
 in buildPythonApplication {
diff --git a/pkgs/applications/misc/llpp/default.nix b/pkgs/applications/misc/llpp/default.nix
index 959ed6b11ba..25067e3bba5 100644
--- a/pkgs/applications/misc/llpp/default.nix
+++ b/pkgs/applications/misc/llpp/default.nix
@@ -3,8 +3,7 @@
 
 assert lib.versionAtLeast (lib.getVersion ocaml) "4.02";
 
-let ocamlVersion = (builtins.parseDrvName (ocaml.name)).version;
-in stdenv.mkDerivation rec {
+stdenv.mkDerivation rec {
   name = "llpp-${version}";
   version = "2018-03-02";
 
diff --git a/pkgs/applications/misc/tqsl/default.nix b/pkgs/applications/misc/tqsl/default.nix
index b41f5c9a0a7..f001cbcaab9 100644
--- a/pkgs/applications/misc/tqsl/default.nix
+++ b/pkgs/applications/misc/tqsl/default.nix
@@ -1,12 +1,5 @@
 { stdenv, fetchurl, makeWrapper, cmake, expat, openssl, zlib, db, curl, wxGTK }:
 
-let
-  lib_suffix =
-  if stdenv.system == "x86_64-linux" then
-    "64"
-  else
-    "";
-in
 stdenv.mkDerivation rec {
   name = "tqsl-${version}";
   version = "2.3.1";
diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index 021c048669f..196e2eb79bd 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -43,10 +43,6 @@ let
   # source tree.
   extraAttrs = buildFun base;
 
-  gentooPatch = name: sha256: fetchpatch {
-    url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/www-client/chromium/files/${name}";
-    inherit sha256;
-  };
   githubPatch = commit: sha256: fetchpatch {
     url = "https://github.com/chromium/chromium/commit/${commit}.patch";
     inherit sha256;
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
index dbf0bbbd4d5..8420dbdaaa8 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
@@ -47,12 +47,6 @@
 , debug ? false
 }:
 
-let
-  arch =
-    if stdenv.system == "x86_64-linux" then
-      "x86_64"
-    else throw "Flash Player is not supported on this platform";
-in
 stdenv.mkDerivation rec {
   name = "flashplayer-standalone-${version}";
   version = "30.0.0.134";
diff --git a/pkgs/applications/office/mendeley/default.nix b/pkgs/applications/office/mendeley/default.nix
index cf40392c6dd..693fa63661b 100644
--- a/pkgs/applications/office/mendeley/default.nix
+++ b/pkgs/applications/office/mendeley/default.nix
@@ -36,7 +36,6 @@
 
 let
   arch32 = "i686-linux";
-  arch64 = "x86_64-linux";
 
   arch = if stdenv.system == arch32
     then "i386"
diff --git a/pkgs/applications/science/electronics/bitscope/common.nix b/pkgs/applications/science/electronics/bitscope/common.nix
index e1db7131a65..ba2d5221cc5 100644
--- a/pkgs/applications/science/electronics/bitscope/common.nix
+++ b/pkgs/applications/science/electronics/bitscope/common.nix
@@ -60,10 +60,6 @@ let
       ${(wrapBinary libs) attrs.toolName}
     '';
   });
-  fhs = target: buildFHSUserEnv {
-    inherit (pkg) name;
-    runScript = target;
-  };
 in buildFHSUserEnv {
   name = "${attrs.toolName}-${attrs.version}";
   runScript = "${pkg.outPath}/bin/${attrs.toolName}";
diff --git a/pkgs/applications/science/electronics/bitscope/packages.nix b/pkgs/applications/science/electronics/bitscope/packages.nix
index c10e9de851a..dc333f3d3b7 100644
--- a/pkgs/applications/science/electronics/bitscope/packages.nix
+++ b/pkgs/applications/science/electronics/bitscope/packages.nix
@@ -6,10 +6,6 @@
 }:
 
 let
-  wrapBinary = libPaths: binaryName: ''
-    wrapProgram "$out/bin/${binaryName}" \
-      --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath libPaths}"
-  '';
   mkBitscope = callPackage (import ./common.nix) { };
 in {
   chart = let
diff --git a/pkgs/applications/science/math/mathematica/default.nix b/pkgs/applications/science/math/mathematica/default.nix
index 97781a69ce6..d2a518e9db0 100644
--- a/pkgs/applications/science/math/mathematica/default.nix
+++ b/pkgs/applications/science/math/mathematica/default.nix
@@ -24,12 +24,6 @@
 }:
 
 let
-  platform =
-    if stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux" then
-      "Linux"
-    else
-      throw "Mathematica requires i686-linux or x86_64 linux";
-
   l10n =
     with stdenv.lib;
     with callPackage ./l10ns.nix {};
diff --git a/pkgs/applications/science/misc/golly/beta.nix b/pkgs/applications/science/misc/golly/beta.nix
index 5b210fa4bf6..f423adbe786 100644
--- a/pkgs/applications/science/misc/golly/beta.nix
+++ b/pkgs/applications/science/misc/golly/beta.nix
@@ -2,15 +2,7 @@
 , wxGTK, perl, python2, zlib, libGLU_combined, libX11
 , automake, autoconf
 }:
-let
-  s = # Generated upstream information
-  rec {
-    baseName="golly";
-    version="2.8";
-    name="${baseName}-${version}";
-    hash="0a4vn2hm7h4b47v2iwip1z3n9y8isf79v08aipl2iqms2m3p5204";
-  };
-in
+
 stdenv.mkDerivation rec {
   name = "golly-${version}";
   version = "2.8.99.2.20161122";
diff --git a/pkgs/applications/virtualization/xen/4.10.nix b/pkgs/applications/virtualization/xen/4.10.nix
index dab90a1ed78..5e21f7ee608 100644
--- a/pkgs/applications/virtualization/xen/4.10.nix
+++ b/pkgs/applications/virtualization/xen/4.10.nix
@@ -22,11 +22,6 @@ with stdenv.lib;
 # and try applying all the ones we don't have yet.
 
 let
-  xsaPatch = { name , sha256 }: (fetchpatch {
-    url = "https://xenbits.xen.org/xsa/xsa${name}.patch";
-    inherit sha256;
-  });
-
   xsa = import ./xsa-patches.nix { inherit fetchpatch; };
 
   qemuMemfdBuildFix = fetchpatch {
diff --git a/pkgs/applications/virtualization/xen/4.8.nix b/pkgs/applications/virtualization/xen/4.8.nix
index 79be1be1190..f99cdb69d2a 100644
--- a/pkgs/applications/virtualization/xen/4.8.nix
+++ b/pkgs/applications/virtualization/xen/4.8.nix
@@ -22,11 +22,6 @@ with stdenv.lib;
 # and try applying all the ones we don't have yet.
 
 let
-  xsaPatch = { name , sha256 }: (fetchpatch {
-    url = "https://xenbits.xen.org/xsa/xsa${name}.patch";
-    inherit sha256;
-  });
-
   xsa = import ./xsa-patches.nix { inherit fetchpatch; };
 
   xenlockprofpatch = (fetchpatch {
diff --git a/pkgs/applications/window-managers/way-cooler/way-cooler.nix b/pkgs/applications/window-managers/way-cooler/way-cooler.nix
index 9ba6db36772..8a740b15500 100644
--- a/pkgs/applications/window-managers/way-cooler/way-cooler.nix
+++ b/pkgs/applications/window-managers/way-cooler/way-cooler.nix
@@ -1,13 +1,6 @@
 # Generated by carnix 0.6.5: carnix -o way-cooler.nix Cargo.lock
 { lib, buildPlatform, buildRustCrate, fetchgit }:
 let kernel = buildPlatform.parsed.kernel.name;
-    abi = buildPlatform.parsed.abi.name;
-    include = includedFiles: src: builtins.filterSource (path: type:
-      lib.lists.any (f:
-        let p = toString (src + ("/" + f)); in
-        (path == p) || (type == "directory" && lib.strings.hasPrefix path p)
-      ) includedFiles
-    ) src;
     updateFeatures = f: up: functions: builtins.deepSeq f (lib.lists.foldl' (features: fun: fun features) (lib.attrsets.recursiveUpdate f up) functions);
     mapFeatures = features: map (fun: fun { features = features; });
     mkFeatures = feat: lib.lists.foldl (features: featureName:
diff --git a/pkgs/applications/window-managers/way-cooler/wc-bg.nix b/pkgs/applications/window-managers/way-cooler/wc-bg.nix
index d1c0993982a..c63123db7cc 100644
--- a/pkgs/applications/window-managers/way-cooler/wc-bg.nix
+++ b/pkgs/applications/window-managers/way-cooler/wc-bg.nix
@@ -1,13 +1,6 @@
 # Generated by carnix 0.6.5: carnix -o wc-bg.nix Cargo.lock
 { lib, buildPlatform, buildRustCrate, fetchgit }:
 let kernel = buildPlatform.parsed.kernel.name;
-    abi = buildPlatform.parsed.abi.name;
-    include = includedFiles: src: builtins.filterSource (path: type:
-      lib.lists.any (f:
-        let p = toString (src + ("/" + f)); in
-        (path == p) || (type == "directory" && lib.strings.hasPrefix path p)
-      ) includedFiles
-    ) src;
     updateFeatures = f: up: functions: builtins.deepSeq f (lib.lists.foldl' (features: fun: fun features) (lib.attrsets.recursiveUpdate f up) functions);
     mapFeatures = features: map (fun: fun { features = features; });
     mkFeatures = feat: lib.lists.foldl (features: featureName:
diff --git a/pkgs/applications/window-managers/way-cooler/wc-grab.nix b/pkgs/applications/window-managers/way-cooler/wc-grab.nix
index 253281b6a9a..947a9653e56 100644
--- a/pkgs/applications/window-managers/way-cooler/wc-grab.nix
+++ b/pkgs/applications/window-managers/way-cooler/wc-grab.nix
@@ -1,13 +1,6 @@
 # Generated by carnix 0.6.5: carnix -o wc-grab.nix Cargo.lock
 { lib, buildPlatform, buildRustCrate, fetchgit }:
 let kernel = buildPlatform.parsed.kernel.name;
-    abi = buildPlatform.parsed.abi.name;
-    include = includedFiles: src: builtins.filterSource (path: type:
-      lib.lists.any (f:
-        let p = toString (src + ("/" + f)); in
-        (path == p) || (type == "directory" && lib.strings.hasPrefix path p)
-      ) includedFiles
-    ) src;
     updateFeatures = f: up: functions: builtins.deepSeq f (lib.lists.foldl' (features: fun: fun features) (lib.attrsets.recursiveUpdate f up) functions);
     mapFeatures = features: map (fun: fun { features = features; });
     mkFeatures = feat: lib.lists.foldl (features: featureName:
diff --git a/pkgs/applications/window-managers/way-cooler/wc-lock.nix b/pkgs/applications/window-managers/way-cooler/wc-lock.nix
index 80775112abc..008df5479ce 100644
--- a/pkgs/applications/window-managers/way-cooler/wc-lock.nix
+++ b/pkgs/applications/window-managers/way-cooler/wc-lock.nix
@@ -1,13 +1,6 @@
 # Generated by carnix 0.6.5: carnix -o wc-lock.nix Cargo.lock
 { lib, buildPlatform, buildRustCrate, fetchgit }:
 let kernel = buildPlatform.parsed.kernel.name;
-    abi = buildPlatform.parsed.abi.name;
-    include = includedFiles: src: builtins.filterSource (path: type:
-      lib.lists.any (f:
-        let p = toString (src + ("/" + f)); in
-        (path == p) || (type == "directory" && lib.strings.hasPrefix path p)
-      ) includedFiles
-    ) src;
     updateFeatures = f: up: functions: builtins.deepSeq f (lib.lists.foldl' (features: fun: fun features) (lib.attrsets.recursiveUpdate f up) functions);
     mapFeatures = features: map (fun: fun { features = features; });
     mkFeatures = feat: lib.lists.foldl (features: featureName:
diff --git a/pkgs/build-support/dotnetenv/build-solution.nix b/pkgs/build-support/dotnetenv/build-solution.nix
index b1853bf7364..62370d361cd 100644
--- a/pkgs/build-support/dotnetenv/build-solution.nix
+++ b/pkgs/build-support/dotnetenv/build-solution.nix
@@ -14,9 +14,6 @@
 
 assert modifyPublicMain -> mainClassFile != null;
 
-let
-  wrapperCS = ./Wrapper.cs.in;  
-in
 stdenv.mkDerivation {
   inherit name src;
   
diff --git a/pkgs/build-support/fetchdocker/generic-fetcher.nix b/pkgs/build-support/fetchdocker/generic-fetcher.nix
index e051cee0843..3b0c3377046 100644
--- a/pkgs/build-support/fetchdocker/generic-fetcher.nix
+++ b/pkgs/build-support/fetchdocker/generic-fetcher.nix
@@ -2,8 +2,6 @@
 let
   awk                   = "${gawk}/bin/awk";
   dockerCredentialsFile = import ./credentials.nix;
-  stripScheme           =
-    builtins.replaceStrings [ "https://" "http://" ] [ "" "" ];
 in
 { fetcher
 , name
diff --git a/pkgs/build-support/rust/build-rust-crate.nix b/pkgs/build-support/rust/build-rust-crate.nix
index be76c283bab..7f21b66ce12 100644
--- a/pkgs/build-support/rust/build-rust-crate.nix
+++ b/pkgs/build-support/rust/build-rust-crate.nix
@@ -187,20 +187,12 @@ let makeDeps = dependencies:
                    crateType, metadata, crateBin, finalBins,
                    extraRustcOpts, verbose, colors }:
 
-      let depsDir = lib.concatStringsSep " " dependencies;
-          completeDepsDir = lib.concatStringsSep " " completeDeps;
-          completeBuildDepsDir = lib.concatStringsSep " " completeBuildDeps;
-          deps = makeDeps dependencies;
-          optLevel = if release then 3 else 0;
+      let deps = makeDeps dependencies;
           rustcOpts =
             lib.lists.foldl' (opts: opt: opts + " " + opt)
               (if release then "-C opt-level=3" else "-C debuginfo=2")
               (["-C codegen-units=1"] ++ extraRustcOpts);
           rustcMeta = "-C metadata=${metadata} -C extra-filename=-${metadata}";
-          version_ = lib.splitString "-" crateVersion;
-          versionPre = if lib.tail version_ == [] then "" else builtins.elemAt version_ 1;
-          version = lib.splitString "." (lib.head version_);
-          authors = lib.concatStringsSep ":" crateAuthors;
       in ''
       runHook preBuild
       norm=""
@@ -348,7 +340,6 @@ crate_: lib.makeOverridable ({ rust, release, verbose, features, buildInputs, cr
   preConfigure, postConfigure, preBuild, postBuild, preInstall, postInstall }:
 
 let crate = crate_ // (lib.attrByPath [ crate_.crateName ] (attr: {}) crateOverrides crate_);
-    release_ = release;
     dependencies_ = dependencies;
     buildDependencies_ = buildDependencies;
     processedAttrs = [
diff --git a/pkgs/build-support/rust/carnix.nix b/pkgs/build-support/rust/carnix.nix
index 5b79d607f9d..22d3fcd0c1f 100644
--- a/pkgs/build-support/rust/carnix.nix
+++ b/pkgs/build-support/rust/carnix.nix
@@ -2,12 +2,6 @@
 { lib, buildPlatform, buildRustCrate, fetchgit }:
 let kernel = buildPlatform.parsed.kernel.name;
     abi = buildPlatform.parsed.abi.name;
-    include = includedFiles: src: builtins.filterSource (path: type:
-      lib.lists.any (f:
-        let p = toString (src + ("/" + f)); in
-        (path == p) || (type == "directory" && lib.strings.hasPrefix path p)
-      ) includedFiles
-    ) src;
     updateFeatures = f: up: functions: builtins.deepSeq f (lib.lists.foldl' (features: fun: fun features) (lib.attrsets.recursiveUpdate f up) functions);
     mapFeatures = features: map (fun: fun { features = features; });
     mkFeatures = feat: lib.lists.foldl (features: featureName:
diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix
index d7d03aae33e..59e8c3e7f7e 100644
--- a/pkgs/build-support/rust/default.nix
+++ b/pkgs/build-support/rust/default.nix
@@ -20,8 +20,6 @@ in
 assert cargoVendorDir == null -> cargoSha256 != "unset";
 
 let
-  lib = stdenv.lib;
-
   cargoDeps = if cargoVendorDir == null
     then fetchcargo {
         inherit name src srcs sourceRoot cargoUpdateHook;
diff --git a/pkgs/build-support/vm/windows/default.nix b/pkgs/build-support/vm/windows/default.nix
index f1575219982..e5ff13f0da9 100644
--- a/pkgs/build-support/vm/windows/default.nix
+++ b/pkgs/build-support/vm/windows/default.nix
@@ -21,11 +21,6 @@ let
 
 in {
   runInWindowsVM = drv: let
-    newDrv = drv.override {
-      stdenv = drv.stdenv.override {
-        shell = "/bin/sh";
-      };
-    };
   in pkgs.lib.overrideDerivation drv (attrs: let
     bootstrap = bootstrapper attrs.windowsImage;
   in {
diff --git a/pkgs/development/compilers/chicken/eggDerivation.nix b/pkgs/development/compilers/chicken/eggDerivation.nix
index 58247e5aeb5..bcb7a763fb6 100644
--- a/pkgs/development/compilers/chicken/eggDerivation.nix
+++ b/pkgs/development/compilers/chicken/eggDerivation.nix
@@ -8,7 +8,6 @@
 let
   libPath = "${chicken}/var/lib/chicken/${toString chicken.binaryVersion}/";
   overrides = import ./overrides.nix;
-  lib = stdenv.lib;
   baseName = (builtins.parseDrvName name).name;
   override = if builtins.hasAttr baseName overrides
    then
diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix
index 75259ed3983..15071fd2ba5 100644
--- a/pkgs/development/compilers/gcc/4.8/default.nix
+++ b/pkgs/development/compilers/gcc/4.8/default.nix
@@ -54,9 +54,6 @@ with builtins;
 
 let version = "4.8.5";
 
-    # Whether building a cross-compiler for GNU/Hurd.
-    crossGNU = targetPlatform != hostPlatform && targetPlatform.config == "i586-pc-gnu";
-
     enableParallelBuilding = true;
 
     patches = [ ]
diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix
index 27164176b53..006cbdf40dc 100644
--- a/pkgs/development/compilers/gcc/4.9/default.nix
+++ b/pkgs/development/compilers/gcc/4.9/default.nix
@@ -54,9 +54,6 @@ with builtins;
 
 let version = "4.9.4";
 
-    # Whether building a cross-compiler for GNU/Hurd.
-    crossGNU = targetPlatform != hostPlatform && targetPlatform.config == "i586-pc-gnu";
-
     enableParallelBuilding = true;
 
     patches =
diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix
index eeeabe301d1..f360ed135d7 100644
--- a/pkgs/development/compilers/gcc/5/default.nix
+++ b/pkgs/development/compilers/gcc/5/default.nix
@@ -53,9 +53,6 @@ with builtins;
 let version = "5.5.0";
     sha256 = "11zd1hgzkli3b2v70qsm2hyqppngd4616qc96lmm9zl2kl9yl32k";
 
-    # Whether building a cross-compiler for GNU/Hurd.
-    crossGNU = targetPlatform != hostPlatform && targetPlatform.config == "i586-pc-gnu";
-
     enableParallelBuilding = true;
 
     patches =
diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix
index e5c77568a0e..02a00350162 100644
--- a/pkgs/development/compilers/gcc/6/default.nix
+++ b/pkgs/development/compilers/gcc/6/default.nix
@@ -52,9 +52,6 @@ with builtins;
 
 let version = "6.4.0";
 
-    # Whether building a cross-compiler for GNU/Hurd.
-    crossGNU = targetPlatform != hostPlatform && targetPlatform.config == "i586-pc-gnu";
-
     enableParallelBuilding = true;
 
     patches =
diff --git a/pkgs/development/compilers/gcc/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix
index d671743ee62..84323cca823 100644
--- a/pkgs/development/compilers/gcc/7/default.nix
+++ b/pkgs/development/compilers/gcc/7/default.nix
@@ -41,9 +41,6 @@ with builtins;
 
 let version = "7.3.0";
 
-    # Whether building a cross-compiler for GNU/Hurd.
-    crossGNU = targetPlatform != hostPlatform && targetPlatform.config == "i586-pc-gnu";
-
     enableParallelBuilding = true;
 
     patches =
diff --git a/pkgs/development/compilers/gcc/8/default.nix b/pkgs/development/compilers/gcc/8/default.nix
index e8c03c38230..85c03bc440f 100644
--- a/pkgs/development/compilers/gcc/8/default.nix
+++ b/pkgs/development/compilers/gcc/8/default.nix
@@ -41,9 +41,6 @@ with builtins;
 
 let version = "8.1.0";
 
-    # Whether building a cross-compiler for GNU/Hurd.
-    crossGNU = targetPlatform != hostPlatform && targetPlatform.config == "i586-pc-gnu";
-
     enableParallelBuilding = true;
 
     patches =
diff --git a/pkgs/development/compilers/gcc/snapshot/default.nix b/pkgs/development/compilers/gcc/snapshot/default.nix
index 4e69d7e0408..b00f180bbc7 100644
--- a/pkgs/development/compilers/gcc/snapshot/default.nix
+++ b/pkgs/development/compilers/gcc/snapshot/default.nix
@@ -42,9 +42,6 @@ with builtins;
 
 let version = "7-20170409";
 
-    # Whether building a cross-compiler for GNU/Hurd.
-    crossGNU = targetPlatform != hostPlatform && targetPlatform.config == "i586-pc-gnu";
-
     enableParallelBuilding = true;
 
     patches =
diff --git a/pkgs/development/compilers/ocaml/ber-metaocaml-104.nix b/pkgs/development/compilers/ocaml/ber-metaocaml-104.nix
index 16d7e2580b3..e084a2dcf94 100644
--- a/pkgs/development/compilers/ocaml/ber-metaocaml-104.nix
+++ b/pkgs/development/compilers/ocaml/ber-metaocaml-104.nix
@@ -2,7 +2,6 @@
 
 let
    useX11 = stdenv.isi686 || stdenv.isx86_64;
-   useNativeCompilers = stdenv.isi686 || stdenv.isx86_64 || stdenv.isMips;
    inherit (stdenv.lib) optionals optionalString;
 in
 
diff --git a/pkgs/development/haskell-modules/hoogle.nix b/pkgs/development/haskell-modules/hoogle.nix
index 38e8dfd24c4..7b3fe8fba02 100644
--- a/pkgs/development/haskell-modules/hoogle.nix
+++ b/pkgs/development/haskell-modules/hoogle.nix
@@ -36,10 +36,6 @@ let
     if !isGhcjs
     then "haddock"
     else "haddock-ghcjs";
-  ghcName =
-    if !isGhcjs
-    then "ghc"
-    else "ghcjs";
   ghcDocLibDir =
     if !isGhcjs
     then ghc.doc + ''/share/doc/ghc*/html/libraries''
diff --git a/pkgs/development/interpreters/python/cpython/2.7/default.nix b/pkgs/development/interpreters/python/cpython/2.7/default.nix
index cd1a0fc6e18..d37f59250d5 100644
--- a/pkgs/development/interpreters/python/cpython/2.7/default.nix
+++ b/pkgs/development/interpreters/python/cpython/2.7/default.nix
@@ -33,7 +33,6 @@ let
   majorVersion = "2.7";
   minorVersion = "15";
   minorVersionSuffix = "";
-  pythonVersion = majorVersion;
   version = "${majorVersion}.${minorVersion}${minorVersionSuffix}";
   libPrefix = "python${majorVersion}";
   sitePackages = "lib/${libPrefix}/site-packages";
@@ -161,10 +160,6 @@ let
     # don't rely on detecting glibc-isms.
   ++ optional hostPlatform.isLinux "ac_cv_func_lchmod=no";
 
-  postConfigure = if hostPlatform.isCygwin then ''
-    sed -i Makefile -e 's,PYTHONPATH="$(srcdir),PYTHONPATH="$(abs_srcdir),'
-  '' else null;
-
   buildInputs =
     optional (stdenv ? cc && stdenv.cc.libc != null) stdenv.cc.libc ++
     [ bzip2 openssl zlib ]
diff --git a/pkgs/development/interpreters/python/cpython/3.4/default.nix b/pkgs/development/interpreters/python/cpython/3.4/default.nix
index 7da2cfdd152..a8b6ffd1da9 100644
--- a/pkgs/development/interpreters/python/cpython/3.4/default.nix
+++ b/pkgs/development/interpreters/python/cpython/3.4/default.nix
@@ -29,7 +29,6 @@ let
   majorVersion = "3.4";
   minorVersion = "8";
   minorVersionSuffix = "";
-  pythonVersion = majorVersion;
   version = "${majorVersion}.${minorVersion}${minorVersionSuffix}";
   libPrefix = "python${majorVersion}";
   sitePackages = "lib/${libPrefix}/site-packages";
diff --git a/pkgs/development/interpreters/python/cpython/3.5/default.nix b/pkgs/development/interpreters/python/cpython/3.5/default.nix
index 434c2338270..2bbdb8bdd84 100644
--- a/pkgs/development/interpreters/python/cpython/3.5/default.nix
+++ b/pkgs/development/interpreters/python/cpython/3.5/default.nix
@@ -29,7 +29,6 @@ let
   majorVersion = "3.5";
   minorVersion = "5";
   minorVersionSuffix = "";
-  pythonVersion = majorVersion;
   version = "${majorVersion}.${minorVersion}${minorVersionSuffix}";
   libPrefix = "python${majorVersion}";
   sitePackages = "lib/${libPrefix}/site-packages";
diff --git a/pkgs/development/interpreters/python/cpython/3.6/default.nix b/pkgs/development/interpreters/python/cpython/3.6/default.nix
index 9ea0876b1ce..f8628186d79 100644
--- a/pkgs/development/interpreters/python/cpython/3.6/default.nix
+++ b/pkgs/development/interpreters/python/cpython/3.6/default.nix
@@ -29,7 +29,6 @@ let
   majorVersion = "3.6";
   minorVersion = "6";
   minorVersionSuffix = "";
-  pythonVersion = majorVersion;
   version = "${majorVersion}.${minorVersion}${minorVersionSuffix}";
   libPrefix = "python${majorVersion}";
   sitePackages = "lib/${libPrefix}/site-packages";
diff --git a/pkgs/development/interpreters/python/cpython/3.7/default.nix b/pkgs/development/interpreters/python/cpython/3.7/default.nix
index ad88895fa67..e0cc198c096 100644
--- a/pkgs/development/interpreters/python/cpython/3.7/default.nix
+++ b/pkgs/development/interpreters/python/cpython/3.7/default.nix
@@ -29,7 +29,6 @@ let
   majorVersion = "3.7";
   minorVersion = "0";
   minorVersionSuffix = "";
-  pythonVersion = majorVersion;
   version = "${majorVersion}.${minorVersion}${minorVersionSuffix}";
   libPrefix = "python${majorVersion}";
   sitePackages = "lib/${libPrefix}/site-packages";
diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix
index 89d394c8756..bb6f2758f4c 100644
--- a/pkgs/development/interpreters/ruby/default.nix
+++ b/pkgs/development/interpreters/ruby/default.nix
@@ -32,8 +32,6 @@ let
   generic = { version, sha256 }: let
     ver = version;
     tag = ver.gitTag;
-    isRuby20 = ver.majMin == "2.0";
-    isRuby21 = ver.majMin == "2.1";
     isRuby25 = ver.majMin == "2.5";
     baseruby = self.override { useRailsExpress = false; };
     self = lib.makeOverridable (
diff --git a/pkgs/development/libraries/wiredtiger/default.nix b/pkgs/development/libraries/wiredtiger/default.nix
index c905c40cf96..c4d94af850d 100644
--- a/pkgs/development/libraries/wiredtiger/default.nix
+++ b/pkgs/development/libraries/wiredtiger/default.nix
@@ -13,7 +13,6 @@ let
     + optionalString (val != null && cond != false) "=${val}";
   mkEnable = mkFlag "enable-" "disable-";
   mkWith = mkFlag "with-" "without-";
-  mkOther = mkFlag "" "" true;
 
   shouldUsePkg = pkg: if pkg != null && pkg.meta.available then pkg else null;
 
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
index 111d9952749..1dc2488f55a 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
@@ -1,6 +1,5 @@
 {pkgs, buildLispPackage, clwrapper, quicklisp-to-nix-packages}:
 let
-  addDeps = newdeps: x: {deps = x.deps ++ newdeps;};
   addNativeLibs = libs: x: { propagatedBuildInputs = libs; };
   skipBuildPhase = x: {
     overrides = y: ((x.overrides y) // { buildPhase = "true"; });
diff --git a/pkgs/development/mobile/androidenv/androidndk.nix b/pkgs/development/mobile/androidenv/androidndk.nix
index 1e8ea65c73d..fd8651e89cf 100644
--- a/pkgs/development/mobile/androidenv/androidndk.nix
+++ b/pkgs/development/mobile/androidenv/androidndk.nix
@@ -25,9 +25,6 @@ stdenv.mkDerivation rec {
     sed_script_1 =
       "'s|^PROGDIR=`dirname $0`" +
       "|PROGDIR=`dirname $(readlink -f $(which $0))`|'";
-    sed_script_2 =
-      "'s|^MYNDKDIR=`dirname $0`" +
-      "|MYNDKDIR=`dirname $(readlink -f $(which $0))`|'";
     runtime_paths = (lib.makeBinPath [
       coreutils file findutils
       gawk gnugrep gnused
diff --git a/pkgs/development/mobile/androidenv/build-app.nix b/pkgs/development/mobile/androidenv/build-app.nix
index 390c5eb7a20..20b3ff3b8f5 100644
--- a/pkgs/development/mobile/androidenv/build-app.nix
+++ b/pkgs/development/mobile/androidenv/build-app.nix
@@ -7,10 +7,6 @@ args@{ name, src, platformVersions ? [ "8" ], useGoogleAPIs ? false, antFlags ?
 assert release -> keyStore != null && keyAlias != null && keyStorePassword != null && keyAliasPassword != null;
 
 let
-  platformName = if stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux" then "linux"
-    else if stdenv.system == "x86_64-darwin" then "macosx"
-    else throw "Platform: ${stdenv.system} is not supported!";
-
   androidsdkComposition = androidsdk {
     inherit platformVersions useGoogleAPIs;
     abiVersions = [];
diff --git a/pkgs/development/ocaml-modules/pycaml/default.nix b/pkgs/development/ocaml-modules/pycaml/default.nix
index 7421e2fa0b1..46453f30d3b 100644
--- a/pkgs/development/ocaml-modules/pycaml/default.nix
+++ b/pkgs/development/ocaml-modules/pycaml/default.nix
@@ -2,12 +2,7 @@
 
 # This is the original pycaml version with patches from debian.
 
-let debian = fetchurl {
-      url = "mirror://debian/pool/main/p/pycaml/pycaml_0.82-14.debian.tar.gz";
-      sha256 = "a763088ec1fa76c769bf586ed6692e7ac035b0a2bfd48a90a8e7a9539ec0c2f1";
-    };
-
-in stdenv.mkDerivation {
+stdenv.mkDerivation {
   name = "pycaml-0.82-14";
 
   srcs = [
diff --git a/pkgs/development/python-modules/gurobipy/linux.nix b/pkgs/development/python-modules/gurobipy/linux.nix
index 8afe6379dc7..d572b10fd62 100644
--- a/pkgs/development/python-modules/gurobipy/linux.nix
+++ b/pkgs/development/python-modules/gurobipy/linux.nix
@@ -1,10 +1,7 @@
 { fetchurl, python }:
 assert python.pkgs.isPy27;
-let utf =
-  if python.ucsEncoding == 2 then "16"
-  else if python.ucsEncoding == 4 then "32"
-  else throw "Unsupported python UCS encoding UCS${toString python.ucsEncoding}";
-in python.pkgs.buildPythonPackage
+
+python.pkgs.buildPythonPackage
   { pname = "gurobipy";
     version = "7.5.2";
     src = fetchurl
diff --git a/pkgs/development/ruby-modules/testing/stubs.nix b/pkgs/development/ruby-modules/testing/stubs.nix
index 3585681478c..7e6d1102f66 100644
--- a/pkgs/development/ruby-modules/testing/stubs.nix
+++ b/pkgs/development/ruby-modules/testing/stubs.nix
@@ -1,8 +1,5 @@
 { stdenv, lib, ruby, callPackage, ... }:
 let
-  real = {
-    inherit (stdenv) mkDerivation;
-  };
   mkDerivation = {name, ...}@argSet:
   derivation {
     inherit name;
diff --git a/pkgs/development/tools/misc/dialog/default.nix b/pkgs/development/tools/misc/dialog/default.nix
index 82b224b37f4..09d1276ed42 100644
--- a/pkgs/development/tools/misc/dialog/default.nix
+++ b/pkgs/development/tools/misc/dialog/default.nix
@@ -3,8 +3,7 @@
 , unicodeSupport ? true
 }:
 
-let optional = stdenv.lib.optional;
-    optStr = stdenv.lib.optionalString;
+let optStr = stdenv.lib.optionalString;
     buildShared = !stdenv.isDarwin;
 in
 
diff --git a/pkgs/development/tools/phantomjs2/default.nix b/pkgs/development/tools/phantomjs2/default.nix
index 3c062dbe1ab..949d798f7e8 100644
--- a/pkgs/development/tools/phantomjs2/default.nix
+++ b/pkgs/development/tools/phantomjs2/default.nix
@@ -5,24 +5,6 @@
 }:
 
 let
-  fakeXcrun = writeScriptBin "xcrun" ''
-    #!${stdenv.shell}
-    echo >&2 "Fake xcrun: ''$@"
-    args=()
-    while (("$#")); do
-      case "$1" in
-        -sdk*) shift;;
-        -find*) shift;;
-        *) args+=("$1");;
-      esac
-      shift
-    done
-
-    if [ "''${#args[@]}" -gt "0" ]; then
-      echo >&2 "Fake xcrun: ''${args[@]}"
-      exec "''${args[@]}"
-    fi
-  '';
   fakeClang = writeScriptBin "clang" ''
     #!${stdenv.shell}
     if [[ "$@" == *.c ]]; then
diff --git a/pkgs/development/tools/selenium/server/default.nix b/pkgs/development/tools/selenium/server/default.nix
index 3b1e8c2c8a7..c3d71e2b2a3 100644
--- a/pkgs/development/tools/selenium/server/default.nix
+++ b/pkgs/development/tools/selenium/server/default.nix
@@ -6,9 +6,6 @@ with stdenv.lib;
 let
   minorVersion = "3.6";
   patchVersion = "0";
-  arch = if stdenv.system == "x86_64-linux" then "amd64"
-         else if stdenv.system == "i686-linux" then "i386"
-         else "";
 
 in stdenv.mkDerivation rec {
   name = "selenium-server-standalone-${version}";
diff --git a/pkgs/games/dwarf-fortress/wrapper/default.nix b/pkgs/games/dwarf-fortress/wrapper/default.nix
index 5eebbf77d2b..6efe004fa9e 100644
--- a/pkgs/games/dwarf-fortress/wrapper/default.nix
+++ b/pkgs/games/dwarf-fortress/wrapper/default.nix
@@ -22,8 +22,6 @@ let
     then builtins.getAttr theme themes
     else theme;
 
-  twbtOnlyWithDFHack = assert (enableDFHack || !enableTWBT); true;
-
   unBool = b: if b then "YES" else "NO";
 
   # These are in inverse order for first packages to override the next ones.
diff --git a/pkgs/games/simutrans/default.nix b/pkgs/games/simutrans/default.nix
index ada2520a097..ccece066cdc 100644
--- a/pkgs/games/simutrans/default.nix
+++ b/pkgs/games/simutrans/default.nix
@@ -16,7 +16,6 @@ let
   ver3 = "2";
   version =   "${ver1}.${ver2}.${ver3}";
   ver_dash =  "${ver1}-${ver2}-${ver3}";
-  ver2_dash = "${ver1}-${ver2}";
 
   binary_src = fetchurl {
     url = "mirror://sourceforge/simutrans/simutrans/${ver_dash}/simutrans-src-${ver_dash}.zip";
diff --git a/pkgs/misc/cups/drivers/canon/default.nix b/pkgs/misc/cups/drivers/canon/default.nix
index 1c0b8e13ab0..9c5ef1d0283 100644
--- a/pkgs/misc/cups/drivers/canon/default.nix
+++ b/pkgs/misc/cups/drivers/canon/default.nix
@@ -4,7 +4,6 @@ let
 
   i686_NIX_GCC = pkgsi686Linux.callPackage ({gcc}: gcc) {};
   i686_libxml2 = pkgsi686Linux.callPackage ({libxml2}: libxml2) {};
-  i686_glibc = pkgsi686Linux.callPackage ({glibc}: glibc) {};
 
   src_canon = fetchurl {
     url = "https://files.canon-europe.com/files/soft45378/software/o147jen_linuxufrII_0290.zip";
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index f45ee7500ed..2438c49d9cb 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -8,18 +8,6 @@ let
   malloc0ReturnsNullCrossFlag = stdenv.lib.optional
     (stdenv.hostPlatform != stdenv.buildPlatform)
     "--enable-malloc0returnsnull";
-
-  gitRelease = { libName, version, rev, sha256 } : attrs : attrs // {
-    name = libName + "-" + version;
-    src = args.fetchgit {
-      url = git://anongit.freedesktop.org/xorg/lib/ + libName;
-      inherit rev sha256;
-    };
-    buildInputs = attrs.buildInputs ++ [ xorg.utilmacros  ];
-    preConfigure = (attrs.preConfigure or "") + "\n./autogen.sh";
-  };
-
-  compose = f: g: x: f (g x);
 in
 {
   bdftopcf = attrs: attrs // {
diff --git a/pkgs/tools/X11/bumblebee/default.nix b/pkgs/tools/X11/bumblebee/default.nix
index 14fe769db6b..7345528dad2 100644
--- a/pkgs/tools/X11/bumblebee/default.nix
+++ b/pkgs/tools/X11/bumblebee/default.nix
@@ -36,11 +36,6 @@
 let
   version = "3.2.1";
 
-  primus = if useNvidia then primusLib else primusLib.override { nvidia_x11 = null; };
-  primus_i686 = if useNvidia then primusLib_i686 else primusLib_i686.override { nvidia_x11 = null; };
-
-  primusLibs = lib.makeLibraryPath ([ primus ] ++ lib.optional (primusLib_i686 != null) primus_i686);
-
   nvidia_x11s = [ nvidia_x11 ]
                 ++ lib.optional nvidia_x11.useGLVND libglvnd
                 ++ lib.optionals (nvidia_x11_i686 != null)
diff --git a/pkgs/tools/admin/ansible/default.nix b/pkgs/tools/admin/ansible/default.nix
index 363214129b2..b942ae6a006 100644
--- a/pkgs/tools/admin/ansible/default.nix
+++ b/pkgs/tools/admin/ansible/default.nix
@@ -3,19 +3,6 @@
 }:
 
 let
-  oldJinja = python2.override {
-    packageOverrides = self: super: {
-      jinja2 = super.jinja2.overridePythonAttrs (oldAttrs: rec {
-        version = "2.8.1";
-        src = oldAttrs.src.override {
-          inherit version;
-          sha256 = "14aqmhkc9rw5w0v311jhixdm6ym8vsm29dhyxyrjfqxljwx1yd1m";
-        };
-        doCheck = false;
-      });
-    };
-  };
-
   generic = { version, sha256, py ? python2 }: py.pkgs.buildPythonPackage rec {
     pname = "ansible";
     inherit version;
diff --git a/pkgs/tools/filesystems/ceph/generic.nix b/pkgs/tools/filesystems/ceph/generic.nix
index 4325a935536..784ca7ec4f6 100644
--- a/pkgs/tools/filesystems/ceph/generic.nix
+++ b/pkgs/tools/filesystems/ceph/generic.nix
@@ -44,8 +44,6 @@ let
   optExpat = shouldUsePkg expat;
   optCurl = shouldUsePkg curl;
   optFuse = shouldUsePkg fuse;
-  optLibibverbs = shouldUsePkg libibverbs;
-  optLibrdmacm = shouldUsePkg librdmacm;
   optLibedit = shouldUsePkg libedit;
   optLibatomic_ops = shouldUsePkg libatomic_ops;
   optKinetic-cpp-client = shouldUsePkg kinetic-cpp-client;
@@ -62,9 +60,6 @@ let
   optLibxfs = shouldUsePkg libxfs;
   optZfs = shouldUsePkg zfs;
 
-  hasMon = true;
-  hasMds = true;
-  hasOsd = true;
   hasRadosgw = optFcgi != null && optExpat != null && optCurl != null && optLibedit != null;
 
 
diff --git a/pkgs/tools/package-management/cargo-edit/cargo-edit.nix b/pkgs/tools/package-management/cargo-edit/cargo-edit.nix
index 042c999be0d..67aa52f4789 100644
--- a/pkgs/tools/package-management/cargo-edit/cargo-edit.nix
+++ b/pkgs/tools/package-management/cargo-edit/cargo-edit.nix
@@ -3,13 +3,6 @@
 
 with pkgs;
 let kernel = buildPlatform.parsed.kernel.name;
-    abi = buildPlatform.parsed.abi.name;
-    include = includedFiles: src: builtins.filterSource (path: type:
-      lib.lists.any (f:
-        let p = toString (src + ("/" + f)); in
-        (path == p) || (type == "directory" && lib.strings.hasPrefix path p)
-      ) includedFiles
-    ) src;
     updateFeatures = f: up: functions: builtins.deepSeq f (lib.lists.foldl' (features: fun: fun features) (lib.attrsets.recursiveUpdate f up) functions);
     mapFeatures = features: map (fun: fun { features = features; });
     mkFeatures = feat: lib.lists.foldl (features: featureName:
diff --git a/pkgs/top-level/haxe-packages.nix b/pkgs/top-level/haxe-packages.nix
index 5a85dc3433b..3ac8d5f164d 100644
--- a/pkgs/top-level/haxe-packages.nix
+++ b/pkgs/top-level/haxe-packages.nix
@@ -2,7 +2,6 @@
 
 let
   self = haxePackages;
-  callPackage = newScope self;
   haxePackages = with self; {
 
     withCommas = stdenv.lib.replaceChars ["."] [","];
diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix
index 017b9fca3f9..520db16d366 100644
--- a/pkgs/top-level/lua-packages.nix
+++ b/pkgs/top-level/lua-packages.nix
@@ -13,7 +13,6 @@
 }:
 
 let
-  isLua51 = lua.luaversion == "5.1";
   isLua52 = lua.luaversion == "5.2";
   isLuaJIT = (builtins.parseDrvName lua.name).name == "luajit";
 
-- 
GitLab


From 6d2857a311a6586860cb0c70778b035c92d9c88c Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Fri, 20 Jul 2018 19:36:12 +0000
Subject: [PATCH 209/297] [bot] treewide: remove unused 'inherit' in let blocks

---
 lib/attrsets.nix                                             | 4 ++--
 lib/composable-derivation.nix                                | 2 +-
 lib/customisation.nix                                        | 5 -----
 lib/types.nix                                                | 2 +-
 nixos/modules/programs/tmux.nix                              | 2 +-
 nixos/modules/security/pam_usb.nix                           | 2 --
 nixos/modules/services/hardware/udev.nix                     | 2 --
 nixos/modules/services/monitoring/uptime.nix                 | 2 +-
 nixos/modules/services/network-filesystems/openafs/lib.nix   | 2 +-
 .../modules/services/network-filesystems/openafs/server.nix  | 2 +-
 nixos/modules/services/networking/chrony.nix                 | 2 --
 nixos/modules/services/system/kerberos.nix                   | 2 +-
 nixos/modules/services/system/nscd.nix                       | 2 --
 nixos/modules/services/ttys/kmscon.nix                       | 2 +-
 nixos/modules/services/x11/desktop-managers/plasma5.nix      | 2 +-
 .../services/x11/display-managers/lightdm-greeters/gtk.nix   | 2 +-
 nixos/modules/services/x11/display-managers/lightdm.nix      | 2 +-
 nixos/modules/services/x11/window-managers/openbox.nix       | 1 -
 nixos/modules/services/x11/window-managers/wmii.nix          | 1 -
 pkgs/applications/audio/sonata/default.nix                   | 2 +-
 pkgs/applications/networking/browsers/chromium/default.nix   | 2 --
 .../networking/instant-messengers/zoom-us/default.nix        | 3 +--
 pkgs/applications/networking/irc/weechat/default.nix         | 2 +-
 pkgs/applications/science/logic/acgtk/default.nix            | 3 +--
 pkgs/applications/science/math/sage/default.nix              | 2 +-
 .../version-management/git-and-tools/git-cola/default.nix    | 2 +-
 pkgs/build-support/build-maven.nix                           | 2 +-
 pkgs/development/beam-modules/default.nix                    | 2 +-
 pkgs/development/beam-modules/lib.nix                        | 2 --
 pkgs/development/compilers/go/1.10.nix                       | 2 +-
 pkgs/development/compilers/go/1.9.nix                        | 2 +-
 pkgs/development/compilers/ocaml/ber-metaocaml-104.nix       | 2 +-
 pkgs/development/compilers/rust/binaryBuild.nix              | 3 +--
 pkgs/development/haskell-modules/default.nix                 | 2 +-
 pkgs/development/haskell-modules/hoogle.nix                  | 1 -
 pkgs/development/libraries/blitz/default.nix                 | 2 +-
 pkgs/development/libraries/ffmpeg/generic.nix                | 2 +-
 pkgs/development/libraries/freetype/default.nix              | 2 +-
 pkgs/development/libraries/gstreamer/good/default.nix        | 2 +-
 pkgs/development/libraries/libav/default.nix                 | 2 +-
 pkgs/development/libraries/libgsf/default.nix                | 2 --
 pkgs/development/libraries/libvpx/default.nix                | 2 +-
 pkgs/development/libraries/opendbx/default.nix               | 3 ---
 .../development/libraries/science/math/liblapack/default.nix | 3 +--
 pkgs/development/python-modules/pandas/0.17.1.nix            | 2 +-
 pkgs/development/python-modules/pandas/default.nix           | 2 +-
 pkgs/development/tools/misc/binutils/default.nix             | 2 +-
 pkgs/development/tools/misc/gdbgui/requirements.nix          | 2 +-
 pkgs/development/tools/xcbuild/wrapper.nix                   | 2 --
 pkgs/misc/vim-plugins/default.nix                            | 3 +--
 pkgs/misc/vscode-extensions/default.nix                      | 3 +--
 pkgs/servers/coturn/default.nix                              | 2 --
 pkgs/servers/dns/knot-resolver/default.nix                   | 2 +-
 pkgs/stdenv/native/default.nix                               | 2 +-
 pkgs/tools/X11/xpra/default.nix                              | 2 +-
 pkgs/tools/filesystems/sshfs-fuse/default.nix                | 4 +---
 pkgs/tools/graphics/graphviz/base.nix                        | 2 +-
 pkgs/tools/misc/findutils/default.nix                        | 2 --
 pkgs/tools/networking/spoofer/default.nix                    | 2 +-
 pkgs/tools/system/ddrescue/default.nix                       | 2 --
 60 files changed, 45 insertions(+), 86 deletions(-)

diff --git a/lib/attrsets.nix b/lib/attrsets.nix
index dca39cf79ff..0066fba362a 100644
--- a/lib/attrsets.nix
+++ b/lib/attrsets.nix
@@ -3,9 +3,9 @@
 
 let
   inherit (builtins) head tail length;
-  inherit (lib.trivial) and or;
+  inherit (lib.trivial) and;
   inherit (lib.strings) concatStringsSep;
-  inherit (lib.lists) fold concatMap concatLists all deepSeqList;
+  inherit (lib.lists) fold concatMap concatLists;
 in
 
 rec {
diff --git a/lib/composable-derivation.nix b/lib/composable-derivation.nix
index 5e55ac023f1..cb1fdc121e1 100644
--- a/lib/composable-derivation.nix
+++ b/lib/composable-derivation.nix
@@ -1,5 +1,5 @@
 {lib, pkgs}:
-let inherit (lib) nv nvs; in
+let inherit (lib) nvs; in
 {
 
   # composableDerivation basically mixes these features:
diff --git a/lib/customisation.nix b/lib/customisation.nix
index d942f54ee79..48028042890 100644
--- a/lib/customisation.nix
+++ b/lib/customisation.nix
@@ -1,9 +1,4 @@
 { lib }:
-let
-
-  inherit (builtins) attrNames;
-
-in
 
 rec {
 
diff --git a/lib/types.nix b/lib/types.nix
index 98eff2ac6ff..4d6ac51c898 100644
--- a/lib/types.nix
+++ b/lib/types.nix
@@ -8,7 +8,7 @@ with lib.trivial;
 with lib.strings;
 let
 
-  inherit (lib.modules) mergeDefinitions filterOverrides;
+  inherit (lib.modules) mergeDefinitions;
   outer_types =
 rec {
   isType = type: x: (x._type or "") == type;
diff --git a/nixos/modules/programs/tmux.nix b/nixos/modules/programs/tmux.nix
index 4a60403a282..3d5a37274ae 100644
--- a/nixos/modules/programs/tmux.nix
+++ b/nixos/modules/programs/tmux.nix
@@ -1,7 +1,7 @@
 { config, pkgs, lib, ... }:
 
 let
-  inherit (lib) mkOption mkEnableOption mkIf mkMerge types;
+  inherit (lib) mkOption mkIf types;
 
   cfg = config.programs.tmux;
 
diff --git a/nixos/modules/security/pam_usb.nix b/nixos/modules/security/pam_usb.nix
index 9bc73bf0b85..c695ba075ca 100644
--- a/nixos/modules/security/pam_usb.nix
+++ b/nixos/modules/security/pam_usb.nix
@@ -4,8 +4,6 @@ with lib;
 
 let
 
-  inherit (pkgs) pam_usb;
-
   cfg = config.security.pam.usb;
 
   anyUsbAuth = any (attrByPath ["usbAuth"] false) (attrValues config.security.pam.services);
diff --git a/nixos/modules/services/hardware/udev.nix b/nixos/modules/services/hardware/udev.nix
index 7bfc3bb6487..0266286aaac 100644
--- a/nixos/modules/services/hardware/udev.nix
+++ b/nixos/modules/services/hardware/udev.nix
@@ -4,8 +4,6 @@ with lib;
 
 let
 
-  inherit (pkgs) stdenv writeText procps;
-
   udev = config.systemd.package;
 
   cfg = config.services.udev;
diff --git a/nixos/modules/services/monitoring/uptime.nix b/nixos/modules/services/monitoring/uptime.nix
index 29616a085c8..b4d3a264010 100644
--- a/nixos/modules/services/monitoring/uptime.nix
+++ b/nixos/modules/services/monitoring/uptime.nix
@@ -1,6 +1,6 @@
 { config, pkgs, lib, ... }:
 let
-  inherit (lib) mkOption mkEnableOption mkIf mkMerge types optionalAttrs optional;
+  inherit (lib) mkOption mkEnableOption mkIf mkMerge types optional;
 
   cfg = config.services.uptime;
 
diff --git a/nixos/modules/services/network-filesystems/openafs/lib.nix b/nixos/modules/services/network-filesystems/openafs/lib.nix
index 255740ac65e..cc68eea91f2 100644
--- a/nixos/modules/services/network-filesystems/openafs/lib.nix
+++ b/nixos/modules/services/network-filesystems/openafs/lib.nix
@@ -1,7 +1,7 @@
 { config, lib, pkgs, ...}:
 
 let
-  inherit (lib) concatStringsSep getBin mkOption types;
+  inherit (lib) concatStringsSep mkOption types;
 
 in rec {
 
diff --git a/nixos/modules/services/network-filesystems/openafs/server.nix b/nixos/modules/services/network-filesystems/openafs/server.nix
index aa8640fd240..4c80ed0839f 100644
--- a/nixos/modules/services/network-filesystems/openafs/server.nix
+++ b/nixos/modules/services/network-filesystems/openafs/server.nix
@@ -4,7 +4,7 @@
 with import ./lib.nix { inherit config lib pkgs; };
 
 let
-  inherit (lib) concatStringsSep intersperse mapAttrsToList mkForce mkIf mkMerge mkOption optionalString types;
+  inherit (lib) concatStringsSep mkIf mkOption optionalString types;
 
   bosConfig = pkgs.writeText "BosConfig" (''
     restrictmode 1
diff --git a/nixos/modules/services/networking/chrony.nix b/nixos/modules/services/networking/chrony.nix
index 6a89002b42d..cef30661cc3 100644
--- a/nixos/modules/services/networking/chrony.nix
+++ b/nixos/modules/services/networking/chrony.nix
@@ -4,8 +4,6 @@ with lib;
 
 let
 
-  inherit (pkgs) chrony;
-
   stateDir = "/var/lib/chrony";
 
   keyFile = "/etc/chrony.keys";
diff --git a/nixos/modules/services/system/kerberos.nix b/nixos/modules/services/system/kerberos.nix
index d85dee08982..d151385d2f9 100644
--- a/nixos/modules/services/system/kerberos.nix
+++ b/nixos/modules/services/system/kerberos.nix
@@ -2,7 +2,7 @@
 
 let
 
-  inherit (lib) mkOption mkIf singleton;
+  inherit (lib) mkOption mkIf;
 
   inherit (pkgs) heimdalFull;
 
diff --git a/nixos/modules/services/system/nscd.nix b/nixos/modules/services/system/nscd.nix
index 11a30ea81ba..fd1570d1198 100644
--- a/nixos/modules/services/system/nscd.nix
+++ b/nixos/modules/services/system/nscd.nix
@@ -7,8 +7,6 @@ let
   nssModulesPath = config.system.nssModules.path;
   cfg = config.services.nscd;
 
-  inherit (lib) singleton;
-
 in
 
 {
diff --git a/nixos/modules/services/ttys/kmscon.nix b/nixos/modules/services/ttys/kmscon.nix
index 88e488425bc..59c45fcb44e 100644
--- a/nixos/modules/services/ttys/kmscon.nix
+++ b/nixos/modules/services/ttys/kmscon.nix
@@ -1,6 +1,6 @@
 { config, pkgs, lib, ... }:
 let
-  inherit (lib) mkOption types mkIf optionalString;
+  inherit (lib) mkOption types mkIf;
 
   cfg = config.services.kmscon;
 
diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix
index 4b9e561d53c..17733aa7e4f 100644
--- a/nixos/modules/services/x11/desktop-managers/plasma5.nix
+++ b/nixos/modules/services/x11/desktop-managers/plasma5.nix
@@ -7,7 +7,7 @@ let
   xcfg = config.services.xserver;
   cfg = xcfg.desktopManager.plasma5;
 
-  inherit (pkgs) kdeApplications plasma5 libsForQt5 qt5 xorg;
+  inherit (pkgs) kdeApplications plasma5 libsForQt5 qt5;
 
 in
 
diff --git a/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix b/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix
index 2a71d233860..385f20b7e06 100644
--- a/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix
+++ b/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix
@@ -8,7 +8,7 @@ let
   ldmcfg = dmcfg.lightdm;
   cfg = ldmcfg.greeters.gtk;
 
-  inherit (pkgs) stdenv lightdm writeScript writeText;
+  inherit (pkgs) writeText;
 
   theme = cfg.theme.package;
   icons = cfg.iconTheme.package;
diff --git a/nixos/modules/services/x11/display-managers/lightdm.nix b/nixos/modules/services/x11/display-managers/lightdm.nix
index 206ede227ef..54d4520a0c8 100644
--- a/nixos/modules/services/x11/display-managers/lightdm.nix
+++ b/nixos/modules/services/x11/display-managers/lightdm.nix
@@ -13,7 +13,7 @@ let
   wmDefault = xcfg.windowManager.default;
   hasDefaultUserSession = dmDefault != "none" || wmDefault != "none";
 
-  inherit (pkgs) stdenv lightdm writeScript writeText;
+  inherit (pkgs) lightdm writeScript writeText;
 
   # lightdm runs with clearenv(), but we need a few things in the enviornment for X to startup
   xserverWrapper = writeScript "xserver-wrapper"
diff --git a/nixos/modules/services/x11/window-managers/openbox.nix b/nixos/modules/services/x11/window-managers/openbox.nix
index 07ef77151e9..165772d1aa0 100644
--- a/nixos/modules/services/x11/window-managers/openbox.nix
+++ b/nixos/modules/services/x11/window-managers/openbox.nix
@@ -2,7 +2,6 @@
 
 with lib;
 let
-  inherit (lib) mkOption mkIf;
   cfg = config.services.xserver.windowManager.openbox;
 in
 
diff --git a/nixos/modules/services/x11/window-managers/wmii.nix b/nixos/modules/services/x11/window-managers/wmii.nix
index 30c8df78224..eec6f2b2b81 100644
--- a/nixos/modules/services/x11/window-managers/wmii.nix
+++ b/nixos/modules/services/x11/window-managers/wmii.nix
@@ -2,7 +2,6 @@
 
 with lib;
 let
-  inherit (lib) mkOption mkIf singleton;
   cfg = config.services.xserver.windowManager.wmii;
   wmii = pkgs.wmii_hg;
 in
diff --git a/pkgs/applications/audio/sonata/default.nix b/pkgs/applications/audio/sonata/default.nix
index a3d418cd4fe..8c5bab40b45 100644
--- a/pkgs/applications/audio/sonata/default.nix
+++ b/pkgs/applications/audio/sonata/default.nix
@@ -2,7 +2,7 @@
 , python3Packages, gnome3, gtk3, gobjectIntrospection}:
 
 let
-  inherit (python3Packages) buildPythonApplication python isPy3k dbus-python pygobject3 mpd2;
+  inherit (python3Packages) buildPythonApplication isPy3k dbus-python pygobject3 mpd2;
 in buildPythonApplication rec {
   pname = "sonata";
   version = "1.7b1";
diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix
index d2bb0425170..51618a479d4 100644
--- a/pkgs/applications/networking/browsers/chromium/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/default.nix
@@ -64,8 +64,6 @@ let
 
   version = chromium.browser.version;
 
-  inherit (stdenv.lib) versionAtLeast;
-
 in stdenv.mkDerivation {
   name = "chromium${suffix}-${version}";
   inherit version;
diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
index 196cbb70b4e..72812563b09 100644
--- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
+++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
@@ -11,8 +11,7 @@
 assert pulseaudioSupport -> libpulseaudio != null;
 
 let
-  inherit (stdenv.lib) concatStringsSep makeBinPath makeLibraryPath
-    makeSearchPath optional optionalString;
+  inherit (stdenv.lib) concatStringsSep makeBinPath optional;
 
   version = "2.2.128200.0702";
   srcs = {
diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix
index a672fa73c4f..89b9893085c 100644
--- a/pkgs/applications/networking/irc/weechat/default.nix
+++ b/pkgs/applications/networking/irc/weechat/default.nix
@@ -15,7 +15,7 @@
 , runCommand }:
 
 let
-  inherit (pythonPackages) python pycrypto pync;
+  inherit (pythonPackages) python;
   plugins = [
     { name = "perl"; enabled = perlSupport; cmakeFlag = "ENABLE_PERL"; buildInputs = [ perl ]; }
     { name = "tcl"; enabled = tclSupport; cmakeFlag = "ENABLE_TCL"; buildInputs = [ tcl ]; }
diff --git a/pkgs/applications/science/logic/acgtk/default.nix b/pkgs/applications/science/logic/acgtk/default.nix
index 9e6243c5498..b787a4e7a01 100644
--- a/pkgs/applications/science/logic/acgtk/default.nix
+++ b/pkgs/applications/science/logic/acgtk/default.nix
@@ -4,8 +4,7 @@
   installExamples ? true,
   installEmacsMode ? true }:
 
-let inherit (stdenv.lib) versionAtLeast
-                         optionals optionalString; in
+let inherit (stdenv.lib) versionAtLeast optionalString; in
 
 let inherit (ocamlPackages) ocaml camlp4; in
 
diff --git a/pkgs/applications/science/math/sage/default.nix b/pkgs/applications/science/math/sage/default.nix
index 1f540cc2b28..63b751b814e 100644
--- a/pkgs/applications/science/math/sage/default.nix
+++ b/pkgs/applications/science/math/sage/default.nix
@@ -3,7 +3,7 @@
 }:
 
 let
-  inherit (nixpkgs) fetchpatch fetchurl symlinkJoin fetchFromGitHub callPackage nodePackages_8_x;
+  inherit (nixpkgs) fetchpatch fetchurl symlinkJoin callPackage nodePackages_8_x;
 
   # https://trac.sagemath.org/ticket/15980 for tracking of python3 support
   python = nixpkgs.python2.override {
diff --git a/pkgs/applications/version-management/git-and-tools/git-cola/default.nix b/pkgs/applications/version-management/git-and-tools/git-cola/default.nix
index 391ca26de25..860b7b7dd0c 100644
--- a/pkgs/applications/version-management/git-and-tools/git-cola/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-cola/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, pythonPackages, makeWrapper, gettext, git }:
 
 let
-  inherit (pythonPackages) buildPythonApplication pyqt5 sip pyinotify python mock;
+  inherit (pythonPackages) buildPythonApplication pyqt5 sip pyinotify;
 in buildPythonApplication rec {
   name = "git-cola-${version}";
   version = "3.1";
diff --git a/pkgs/build-support/build-maven.nix b/pkgs/build-support/build-maven.nix
index ba85428ba8c..30df3e8e733 100644
--- a/pkgs/build-support/build-maven.nix
+++ b/pkgs/build-support/build-maven.nix
@@ -17,7 +17,7 @@ infoFile: let
     ${lib.concatStrings (map (dep: let
       inherit (dep)
         url sha1 groupId artifactId version
-        authenticated metadata extension repository-id;
+        authenticated metadata repository-id;
 
       versionDir = dep.unresolved-version or version;
 
diff --git a/pkgs/development/beam-modules/default.nix b/pkgs/development/beam-modules/default.nix
index 83de6f9e569..f10c8ec86ff 100644
--- a/pkgs/development/beam-modules/default.nix
+++ b/pkgs/development/beam-modules/default.nix
@@ -1,7 +1,7 @@
 { stdenv, pkgs, erlang }:
 
 let
-  inherit (stdenv.lib) getVersion versionAtLeast makeExtensible;
+  inherit (stdenv.lib) makeExtensible;
 
   lib = pkgs.callPackage ./lib.nix {};
 
diff --git a/pkgs/development/beam-modules/lib.nix b/pkgs/development/beam-modules/lib.nix
index d6b83cb1af0..db40c47794f 100644
--- a/pkgs/development/beam-modules/lib.nix
+++ b/pkgs/development/beam-modules/lib.nix
@@ -49,7 +49,6 @@ rec {
   */
   callElixir = drv: args:
     let
-      inherit (stdenv.lib) versionAtLeast;
       builder = callPackage ../interpreters/elixir/generic-builder.nix args;
     in
       callPackage drv {
@@ -71,7 +70,6 @@ rec {
   */
   callLFE = drv: args:
     let
-      inherit (stdenv.lib) versionAtLeast;
       builder = callPackage ../interpreters/lfe/generic-builder.nix args;
     in
       callPackage drv {
diff --git a/pkgs/development/compilers/go/1.10.nix b/pkgs/development/compilers/go/1.10.nix
index b4fa005c3de..0958bdeb0c1 100644
--- a/pkgs/development/compilers/go/1.10.nix
+++ b/pkgs/development/compilers/go/1.10.nix
@@ -6,7 +6,7 @@
 
 let
 
-  inherit (stdenv.lib) optional optionals optionalString;
+  inherit (stdenv.lib) optionals optionalString;
 
   clangHack = writeScriptBin "clang" ''
     #!${stdenv.shell}
diff --git a/pkgs/development/compilers/go/1.9.nix b/pkgs/development/compilers/go/1.9.nix
index 8ef528e2c92..6acedecb211 100644
--- a/pkgs/development/compilers/go/1.9.nix
+++ b/pkgs/development/compilers/go/1.9.nix
@@ -6,7 +6,7 @@
 
 let
 
-  inherit (stdenv.lib) optional optionals optionalString;
+  inherit (stdenv.lib) optionals optionalString;
 
   clangHack = writeScriptBin "clang" ''
     #!${stdenv.shell}
diff --git a/pkgs/development/compilers/ocaml/ber-metaocaml-104.nix b/pkgs/development/compilers/ocaml/ber-metaocaml-104.nix
index e084a2dcf94..e6c68894036 100644
--- a/pkgs/development/compilers/ocaml/ber-metaocaml-104.nix
+++ b/pkgs/development/compilers/ocaml/ber-metaocaml-104.nix
@@ -2,7 +2,7 @@
 
 let
    useX11 = stdenv.isi686 || stdenv.isx86_64;
-   inherit (stdenv.lib) optionals optionalString;
+   inherit (stdenv.lib) optionals;
 in
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/development/compilers/rust/binaryBuild.nix b/pkgs/development/compilers/rust/binaryBuild.nix
index 4c3c5d008f0..dbfc14e30ef 100644
--- a/pkgs/development/compilers/rust/binaryBuild.nix
+++ b/pkgs/development/compilers/rust/binaryBuild.nix
@@ -6,8 +6,7 @@
 }:
 
 let
-  inherit (stdenv.lib) getLib optionalString;
-  inherit (darwin) libiconv;
+  inherit (stdenv.lib) optionalString;
   inherit (darwin.apple_sdk.frameworks) Security;
 
   bootstrapping = versionType == "bootstrap";
diff --git a/pkgs/development/haskell-modules/default.nix b/pkgs/development/haskell-modules/default.nix
index 7b512e46da8..b8943a55394 100644
--- a/pkgs/development/haskell-modules/default.nix
+++ b/pkgs/development/haskell-modules/default.nix
@@ -11,7 +11,7 @@
 let
 
   inherit (lib) extends makeExtensible;
-  inherit (haskellLib) overrideCabal makePackageSet;
+  inherit (haskellLib) makePackageSet;
 
   haskellPackages = pkgs.callPackage makePackageSet {
     package-set = initialPackages;
diff --git a/pkgs/development/haskell-modules/hoogle.nix b/pkgs/development/haskell-modules/hoogle.nix
index 7b3fe8fba02..c7fbab6ab88 100644
--- a/pkgs/development/haskell-modules/hoogle.nix
+++ b/pkgs/development/haskell-modules/hoogle.nix
@@ -28,7 +28,6 @@
 }:
 
 let
-  inherit (stdenv.lib) optional;
   wrapper = ./hoogle-local-wrapper.sh;
   isGhcjs = ghc.isGhcjs or false;
   opts = lib.optionalString;
diff --git a/pkgs/development/libraries/blitz/default.nix b/pkgs/development/libraries/blitz/default.nix
index 5ae9ead9ced..503e4b0fa43 100644
--- a/pkgs/development/libraries/blitz/default.nix
+++ b/pkgs/development/libraries/blitz/default.nix
@@ -19,7 +19,7 @@
 assert enableSerialization -> boost != null;
 
 let
-  inherit (stdenv.lib) optional optionals optionalString;
+  inherit (stdenv.lib) optional optionals;
 in
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix
index 3d9027db160..e763e5c1159 100644
--- a/pkgs/development/libraries/ffmpeg/generic.nix
+++ b/pkgs/development/libraries/ffmpeg/generic.nix
@@ -42,7 +42,7 @@
  */
 
 let
-  inherit (stdenv) icCygwin isDarwin isFreeBSD isLinux isAarch32;
+  inherit (stdenv) isDarwin isFreeBSD isLinux isAarch32;
   inherit (stdenv.lib) optional optionals enableFeature;
 
   cmpVer = builtins.compareVersions;
diff --git a/pkgs/development/libraries/freetype/default.nix b/pkgs/development/libraries/freetype/default.nix
index 23aa86af377..dbfb18a22ed 100644
--- a/pkgs/development/libraries/freetype/default.nix
+++ b/pkgs/development/libraries/freetype/default.nix
@@ -10,7 +10,7 @@
 }:
 
 let
-  inherit (stdenv.lib) optional optionals optionalString;
+  inherit (stdenv.lib) optional optionalString;
 
 in stdenv.mkDerivation rec {
   name = "freetype-${version}";
diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix
index 11e0894df3c..ad7309be044 100644
--- a/pkgs/development/libraries/gstreamer/good/default.nix
+++ b/pkgs/development/libraries/gstreamer/good/default.nix
@@ -12,7 +12,7 @@
 assert gtkSupport -> gtk3 != null;
 
 let
-  inherit (stdenv.lib) optional optionals optionalString;
+  inherit (stdenv.lib) optional optionals;
 in
 stdenv.mkDerivation rec {
   name = "gst-plugins-good-1.14.0";
diff --git a/pkgs/development/libraries/libav/default.nix b/pkgs/development/libraries/libav/default.nix
index dfe1455759a..5eb90aaf05c 100644
--- a/pkgs/development/libraries/libav/default.nix
+++ b/pkgs/development/libraries/libav/default.nix
@@ -18,7 +18,7 @@
 
 assert faacSupport -> enableUnfree;
 
-let inherit (stdenv.lib) optional optionals hasPrefix enableFeature; in
+let inherit (stdenv.lib) optional hasPrefix enableFeature; in
 
 /* ToDo:
     - more deps, inspiration: https://packages.ubuntu.com/raring/libav-tools
diff --git a/pkgs/development/libraries/libgsf/default.nix b/pkgs/development/libraries/libgsf/default.nix
index b0013d0f949..90daf2ddf74 100644
--- a/pkgs/development/libraries/libgsf/default.nix
+++ b/pkgs/development/libraries/libgsf/default.nix
@@ -1,8 +1,6 @@
 { fetchurl, stdenv, pkgconfig, intltool, gettext, glib, libxml2, zlib, bzip2
 , python, perl, gdk_pixbuf, libiconv, libintl }:
 
-let inherit (stdenv.lib) optionals; in
-
 stdenv.mkDerivation rec {
   name = "libgsf-1.14.42";
 
diff --git a/pkgs/development/libraries/libvpx/default.nix b/pkgs/development/libraries/libvpx/default.nix
index 731892d33b4..7e3780603f7 100644
--- a/pkgs/development/libraries/libvpx/default.nix
+++ b/pkgs/development/libraries/libvpx/default.nix
@@ -41,7 +41,7 @@
 }:
 
 let
-  inherit (stdenv) isi686 isx86_64 isAarch32 is64bit isMips isDarwin isCygwin;
+  inherit (stdenv) is64bit isMips isDarwin isCygwin;
   inherit (stdenv.lib) enableFeature optional optionals;
 in
 
diff --git a/pkgs/development/libraries/opendbx/default.nix b/pkgs/development/libraries/opendbx/default.nix
index 20a62ef67f9..a073a29b507 100644
--- a/pkgs/development/libraries/opendbx/default.nix
+++ b/pkgs/development/libraries/opendbx/default.nix
@@ -1,8 +1,5 @@
 { stdenv, fetchurl, readline, mysql, postgresql, sqlite }:
 
-let
-  inherit (stdenv.lib) getDev getLib;
-in
 stdenv.mkDerivation rec {
   name = "opendbx-1.4.6";
 
diff --git a/pkgs/development/libraries/science/math/liblapack/default.nix b/pkgs/development/libraries/science/math/liblapack/default.nix
index c68454fbe4a..e6af2251b1f 100644
--- a/pkgs/development/libraries/science/math/liblapack/default.nix
+++ b/pkgs/development/libraries/science/math/liblapack/default.nix
@@ -11,8 +11,7 @@ let
   atlasMaybeShared = if atlas != null then atlas.override { inherit shared; }
                      else null;
   usedLibExtension = if shared then ".so" else ".a";
-  inherit (stdenv.lib) optional optionals concatStringsSep;
-  inherit (builtins) hasAttr attrNames;
+  inherit (stdenv.lib) optional optionals;
   version = "3.8.0";
 in
 
diff --git a/pkgs/development/python-modules/pandas/0.17.1.nix b/pkgs/development/python-modules/pandas/0.17.1.nix
index 2c0a2c44f6e..cab93429b57 100644
--- a/pkgs/development/python-modules/pandas/0.17.1.nix
+++ b/pkgs/development/python-modules/pandas/0.17.1.nix
@@ -23,7 +23,7 @@
 }:
 
 let
-  inherit (stdenv.lib) optional optionalString concatStringsSep;
+  inherit (stdenv.lib) optional optionalString;
   inherit (stdenv) isDarwin;
 in buildPythonPackage rec {
   pname = "pandas";
diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix
index 08fdddb7346..03be247ab47 100644
--- a/pkgs/development/python-modules/pandas/default.nix
+++ b/pkgs/development/python-modules/pandas/default.nix
@@ -24,7 +24,7 @@
 }:
 
 let
-  inherit (stdenv.lib) optional optionals optionalString concatStringsSep;
+  inherit (stdenv.lib) optional optionals optionalString;
   inherit (stdenv) isDarwin;
 
 in buildPythonPackage rec {
diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix
index 0b71c6719dc..be5dfa945c0 100644
--- a/pkgs/development/tools/misc/binutils/default.nix
+++ b/pkgs/development/tools/misc/binutils/default.nix
@@ -10,7 +10,7 @@ let
   # https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=commitdiff;h=330b90b5ffbbc20c5de6ae6c7f60c40fab2e7a4f;hp=99181ccac0fc7d82e7dabb05dc7466e91f1645d3
   version = "2.30";
   basename = "binutils-${version}";
-  inherit (stdenv.lib) optional optionals optionalString;
+  inherit (stdenv.lib) optionals optionalString;
   # The targetPrefix prepended to binary names to allow multiple binuntils on the
   # PATH to both be usable.
   targetPrefix = optionalString (targetPlatform != hostPlatform) "${targetPlatform.config}-";
diff --git a/pkgs/development/tools/misc/gdbgui/requirements.nix b/pkgs/development/tools/misc/gdbgui/requirements.nix
index 13978645c29..273f9db0c39 100644
--- a/pkgs/development/tools/misc/gdbgui/requirements.nix
+++ b/pkgs/development/tools/misc/gdbgui/requirements.nix
@@ -11,7 +11,7 @@
 let
 
   inherit (pkgs) makeWrapper;
-  inherit (pkgs.stdenv.lib) fix' extends inNixShell;
+  inherit (pkgs.stdenv.lib) fix' extends;
 
   pythonPackages =
   import "${toString pkgs.path}/pkgs/top-level/python-packages.nix" {
diff --git a/pkgs/development/tools/xcbuild/wrapper.nix b/pkgs/development/tools/xcbuild/wrapper.nix
index f8b1c1bf31e..8f71e995183 100644
--- a/pkgs/development/tools/xcbuild/wrapper.nix
+++ b/pkgs/development/tools/xcbuild/wrapper.nix
@@ -7,8 +7,6 @@
 
 let
 
-  inherit (lib) toLower;
-
   toolchainName = "com.apple.dt.toolchain.XcodeDefault";
   sdkName = "${xcodePlatform}${sdkVer}";
 
diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index 8428a3b7894..3e662d33f42 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -14,8 +14,7 @@ let
 
   _skim = skim;
 
-  inherit (vimUtils.override {inherit vim;}) rtpPath addRtp buildVimPlugin
-    buildVimPluginFrom2Nix vimHelpTags;
+  inherit (vimUtils.override {inherit vim;}) buildVimPluginFrom2Nix;
 
 
 # TL;DR
diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix
index 16ddb8fd405..6b431456b35 100644
--- a/pkgs/misc/vscode-extensions/default.nix
+++ b/pkgs/misc/vscode-extensions/default.nix
@@ -1,8 +1,7 @@
 { stdenv, lib, fetchurl, callPackage, vscode-utils }:
 
 let
-  inherit (vscode-utils) buildVscodeExtension buildVscodeMarketplaceExtension
-      extensionFromVscodeMarketplace;
+  inherit (vscode-utils) buildVscodeMarketplaceExtension;
 in
 #
 # Unless there is a good reason not to, we attemp to use the same name as the 
diff --git a/pkgs/servers/coturn/default.nix b/pkgs/servers/coturn/default.nix
index f83ef4cef38..0891b72cd1e 100644
--- a/pkgs/servers/coturn/default.nix
+++ b/pkgs/servers/coturn/default.nix
@@ -1,7 +1,5 @@
 { stdenv, fetchFromGitHub, openssl, libevent }:
 
-let inherit (stdenv.lib) optional; in
-
 stdenv.mkDerivation rec {
   name = "coturn-${version}";
   version = "4.5.0.7";
diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix
index bfa610b57d8..b9c2faeae6e 100644
--- a/pkgs/servers/dns/knot-resolver/default.nix
+++ b/pkgs/servers/dns/knot-resolver/default.nix
@@ -8,7 +8,7 @@ let # un-indented, over the whole file
 
 result = if extraFeatures then wrapped-full else unwrapped;
 
-inherit (stdenv.lib) optional optionals optionalString concatStringsSep;
+inherit (stdenv.lib) optional concatStringsSep;
 
 unwrapped = stdenv.mkDerivation rec {
   name = "knot-resolver-${version}";
diff --git a/pkgs/stdenv/native/default.nix b/pkgs/stdenv/native/default.nix
index 78f7a82d295..37795b11f6d 100644
--- a/pkgs/stdenv/native/default.nix
+++ b/pkgs/stdenv/native/default.nix
@@ -5,7 +5,7 @@
 assert crossSystem == null;
 
 let
-  inherit (localSystem) system platform;
+  inherit (localSystem) system;
 
   shell =
     if system == "i686-freebsd" || system == "x86_64-freebsd" then "/usr/local/bin/bash"
diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix
index 8bff5a2e714..9bc2a978e0e 100644
--- a/pkgs/tools/X11/xpra/default.nix
+++ b/pkgs/tools/X11/xpra/default.nix
@@ -9,7 +9,7 @@
 with lib;
 
 let
-  inherit (python2Packages) python cython buildPythonApplication;
+  inherit (python2Packages) cython buildPythonApplication;
 in buildPythonApplication rec {
   name = "xpra-${version}";
   version = "2.3.2";
diff --git a/pkgs/tools/filesystems/sshfs-fuse/default.nix b/pkgs/tools/filesystems/sshfs-fuse/default.nix
index e9325e9b18d..6d95d5ee12b 100644
--- a/pkgs/tools/filesystems/sshfs-fuse/default.nix
+++ b/pkgs/tools/filesystems/sshfs-fuse/default.nix
@@ -2,9 +2,7 @@
 , docutils
 }:
 
-let
-  inherit (stdenv.lib) optional;
-in stdenv.mkDerivation rec {
+stdenv.mkDerivation rec {
   version = "3.4.0";
   name = "sshfs-fuse-${version}";
 
diff --git a/pkgs/tools/graphics/graphviz/base.nix b/pkgs/tools/graphics/graphviz/base.nix
index 2fa4bb90a8e..68ff84c7495 100644
--- a/pkgs/tools/graphics/graphviz/base.nix
+++ b/pkgs/tools/graphics/graphviz/base.nix
@@ -7,7 +7,7 @@
 assert stdenv.isDarwin -> ApplicationServices != null;
 
 let
-  inherit (stdenv.lib) optional optionals optionalString;
+  inherit (stdenv.lib) optionals optionalString;
 in
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/tools/misc/findutils/default.nix b/pkgs/tools/misc/findutils/default.nix
index f79720289bf..66b7ef4c291 100644
--- a/pkgs/tools/misc/findutils/default.nix
+++ b/pkgs/tools/misc/findutils/default.nix
@@ -3,8 +3,6 @@
 , buildPlatform, hostPlatform
 }:
 
-let inherit (stdenv.lib) optionals; in
-
 stdenv.mkDerivation rec {
   name = "findutils-4.6.0";
 
diff --git a/pkgs/tools/networking/spoofer/default.nix b/pkgs/tools/networking/spoofer/default.nix
index 675777e4faa..acda30dbfef 100644
--- a/pkgs/tools/networking/spoofer/default.nix
+++ b/pkgs/tools/networking/spoofer/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pkgconfig, protobuf, openssl, libpcap, traceroute
 , withGUI ? false, qt5 }:
 
-let inherit (stdenv.lib) optional optionalString;
+let inherit (stdenv.lib) optional;
 in
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/tools/system/ddrescue/default.nix b/pkgs/tools/system/ddrescue/default.nix
index fc42c3b856f..91489388eec 100644
--- a/pkgs/tools/system/ddrescue/default.nix
+++ b/pkgs/tools/system/ddrescue/default.nix
@@ -3,8 +3,6 @@
 , hostPlatform, buildPlatform
 }:
 
-let inherit (stdenv.lib) optionals; in
-
 stdenv.mkDerivation rec {
   name = "ddrescue-1.23";
 
-- 
GitLab


From 88cdecf34cbcd87b9435098edf4f23797280bb66 Mon Sep 17 00:00:00 2001
From: Vladyslav Mykhailichenko <dywedir@pm.me>
Date: Fri, 20 Jul 2018 22:40:58 +0300
Subject: [PATCH 210/297] elvish: 0.11 -> 0.12

---
 pkgs/shells/elvish/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/shells/elvish/default.nix b/pkgs/shells/elvish/default.nix
index 086fca480bb..dc7133e988f 100644
--- a/pkgs/shells/elvish/default.nix
+++ b/pkgs/shells/elvish/default.nix
@@ -1,21 +1,22 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+{ stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "elvish-${version}";
-  version = "0.11";
+  version = "0.12";
 
   goPackagePath = "github.com/elves/elvish";
+  excludedPackages = [ "website" ];
 
   src = fetchFromGitHub {
     repo = "elvish";
     owner = "elves";
     rev = version;
-    sha256 = "1rzgy1ql381nwsdjgiwv4mdr1xwivnpmzgkdzms8ipn2lbwhff87";
+    sha256 = "1vvbgkpnrnb5aaak4ks45wl0cyp0vbry8bpxl6v2dpmq9x0bscpp";
   };
 
   meta = with stdenv.lib; {
     description = "A friendly and expressive Unix shell";
-    homepage = https://github.com/elves/elvish;
+    homepage = https://elv.sh/;
     license = licenses.bsd2;
     maintainers = with maintainers; [ vrthra ];
     platforms = with platforms; linux ++ darwin;
-- 
GitLab


From dda95bae353e8c78faa921dbf25347b11060b383 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Fri, 20 Jul 2018 19:54:05 +0000
Subject: [PATCH 211/297] [bot] treewide: remove unused 'args@' in lambdas

---
 nixos/modules/services/misc/leaps.nix                         | 2 +-
 pkgs/applications/editors/jetbrains/common.nix                | 2 +-
 pkgs/applications/networking/bittorrentsync/generic.nix       | 2 +-
 pkgs/data/misc/nixos-artwork/wallpapers.nix                   | 2 +-
 pkgs/development/compilers/rust/rustc.nix                     | 2 +-
 .../lisp-modules/quicklisp-to-nix-output/alexandria.nix       | 2 +-
 .../lisp-modules/quicklisp-to-nix-output/array-utils.nix      | 2 +-
 .../lisp-modules/quicklisp-to-nix-output/asdf-finalizers.nix  | 2 +-
 .../quicklisp-to-nix-output/asdf-system-connections.nix       | 2 +-
 .../lisp-modules/quicklisp-to-nix-output/chipz.nix            | 2 +-
 .../lisp-modules/quicklisp-to-nix-output/cl-aa.nix            | 2 +-
 .../lisp-modules/quicklisp-to-nix-output/cl-anonfun.nix       | 2 +-
 .../lisp-modules/quicklisp-to-nix-output/cl-html-parse.nix    | 2 +-
 .../lisp-modules/quicklisp-to-nix-output/cl-l10n-cldr.nix     | 2 +-
 .../lisp-modules/quicklisp-to-nix-output/cl-log.nix           | 2 +-
 .../lisp-modules/quicklisp-to-nix-output/cl-markup.nix        | 2 +-
 .../lisp-modules/quicklisp-to-nix-output/cl-paths.nix         | 2 +-
 .../lisp-modules/quicklisp-to-nix-output/cl-unification.nix   | 2 +-
 .../lisp-modules/quicklisp-to-nix-output/cl-utilities.nix     | 2 +-
 .../lisp-modules/quicklisp-to-nix-output/clack-socket.nix     | 2 +-
 .../lisp-modules/quicklisp-to-nix-output/closer-mop.nix       | 2 +-
 .../quicklisp-to-nix-output/command-line-arguments.nix        | 2 +-
 .../lisp-modules/quicklisp-to-nix-output/css-lite.nix         | 2 +-
 pkgs/development/lisp-modules/quicklisp-to-nix-output/db3.nix | 2 +-
 pkgs/development/lisp-modules/quicklisp-to-nix-output/eos.nix | 2 +-
 .../lisp-modules/quicklisp-to-nix-output/garbage-pools.nix    | 2 +-
 .../lisp-modules/quicklisp-to-nix-output/iterate.nix          | 2 +-
 .../lisp-modules/quicklisp-to-nix-output/kmrcl.nix            | 2 +-
 .../lisp-modules/quicklisp-to-nix-output/lack-component.nix   | 2 +-
 .../development/lisp-modules/quicklisp-to-nix-output/lift.nix | 2 +-
 .../lisp-modules/quicklisp-to-nix-output/map-set.nix          | 2 +-
 .../lisp-modules/quicklisp-to-nix-output/marshal.nix          | 2 +-
 pkgs/development/lisp-modules/quicklisp-to-nix-output/md5.nix | 2 +-
 .../lisp-modules/quicklisp-to-nix-output/metabang-bind.nix    | 2 +-
 .../quicklisp-to-nix-output/metatilities-base.nix             | 2 +-
 .../lisp-modules/quicklisp-to-nix-output/misc-extensions.nix  | 2 +-
 .../lisp-modules/quicklisp-to-nix-output/mt19937.nix          | 2 +-
 .../lisp-modules/quicklisp-to-nix-output/named-readtables.nix | 2 +-
 .../net_dot_didierverna_dot_asdf-flv.nix                      | 2 +-
 .../lisp-modules/quicklisp-to-nix-output/parse-number.nix     | 2 +-
 .../lisp-modules/quicklisp-to-nix-output/plump-lexer.nix      | 2 +-
 .../lisp-modules/quicklisp-to-nix-output/ptester.nix          | 2 +-
 .../lisp-modules/quicklisp-to-nix-output/rfc2388.nix          | 2 +-
 pkgs/development/lisp-modules/quicklisp-to-nix-output/rt.nix  | 2 +-
 .../lisp-modules/quicklisp-to-nix-output/salza2.nix           | 2 +-
 .../lisp-modules/quicklisp-to-nix-output/string-case.nix      | 2 +-
 .../lisp-modules/quicklisp-to-nix-output/swank.nix            | 2 +-
 .../quicklisp-to-nix-output/trivial-backtrace.nix             | 2 +-
 .../lisp-modules/quicklisp-to-nix-output/trivial-features.nix | 2 +-
 .../quicklisp-to-nix-output/trivial-gray-streams.nix          | 2 +-
 .../lisp-modules/quicklisp-to-nix-output/trivial-indent.nix   | 2 +-
 .../lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix    | 2 +-
 .../lisp-modules/quicklisp-to-nix-output/trivial-types.nix    | 2 +-
 .../lisp-modules/quicklisp-to-nix-output/trivial-utf-8.nix    | 2 +-
 .../development/lisp-modules/quicklisp-to-nix-output/uffi.nix | 2 +-
 .../development/lisp-modules/quicklisp-to-nix-output/uiop.nix | 2 +-
 .../lisp-modules/quicklisp-to-nix-output/unit-test.nix        | 2 +-
 pkgs/development/lisp-modules/quicklisp-to-nix-output/vom.nix | 2 +-
 .../lisp-modules/quicklisp-to-nix-output/xsubseq.nix          | 2 +-
 .../development/lisp-modules/quicklisp-to-nix-output/yacc.nix | 2 +-
 .../lisp-modules/quicklisp-to-nix-output/zpb-ttf.nix          | 2 +-
 pkgs/development/node-packages/node-env.nix                   | 4 ++--
 pkgs/development/pharo/vm/default.nix                         | 2 +-
 pkgs/development/ruby-modules/bundled-common/default.nix      | 2 +-
 pkgs/development/ruby-modules/bundled-common/functions.nix    | 4 ++--
 pkgs/development/ruby-modules/bundled-common/test.nix         | 2 +-
 pkgs/development/ruby-modules/bundler-env/test.nix            | 2 +-
 pkgs/os-specific/linux/kernel/generic.nix                     | 2 +-
 pkgs/os-specific/linux/spl/default.nix                        | 2 +-
 pkgs/os-specific/linux/zfs/default.nix                        | 2 +-
 pkgs/servers/http/tomcat/default.nix                          | 2 +-
 pkgs/servers/owncloud/default.nix                             | 2 +-
 pkgs/servers/sql/postgresql/default.nix                       | 2 +-
 pkgs/top-level/emacs-packages.nix                             | 2 +-
 74 files changed, 76 insertions(+), 76 deletions(-)

diff --git a/nixos/modules/services/misc/leaps.nix b/nixos/modules/services/misc/leaps.nix
index b92cf27f58d..d4e88ecbebd 100644
--- a/nixos/modules/services/misc/leaps.nix
+++ b/nixos/modules/services/misc/leaps.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, lib, ... } @ args:
+{ config, pkgs, lib, ... }:
 
 with lib;
 
diff --git a/pkgs/applications/editors/jetbrains/common.nix b/pkgs/applications/editors/jetbrains/common.nix
index 7715de15398..caf334b3ee4 100644
--- a/pkgs/applications/editors/jetbrains/common.nix
+++ b/pkgs/applications/editors/jetbrains/common.nix
@@ -2,7 +2,7 @@
 , coreutils, gnugrep, which, git, python, unzip, libsecret
 }:
 
-{ name, product, version, src, wmClass, jdk, meta } @ attrs:
+{ name, product, version, src, wmClass, jdk, meta }:
 
 with stdenv.lib;
 
diff --git a/pkgs/applications/networking/bittorrentsync/generic.nix b/pkgs/applications/networking/bittorrentsync/generic.nix
index eb988471c8c..dae540ba426 100644
--- a/pkgs/applications/networking/bittorrentsync/generic.nix
+++ b/pkgs/applications/networking/bittorrentsync/generic.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, version, sha256s, ... } @ args:
+{ stdenv, fetchurl, version, sha256s, ... }:
 
 let
   arch = {
diff --git a/pkgs/data/misc/nixos-artwork/wallpapers.nix b/pkgs/data/misc/nixos-artwork/wallpapers.nix
index 2eebe61b142..3a65a9626d1 100644
--- a/pkgs/data/misc/nixos-artwork/wallpapers.nix
+++ b/pkgs/data/misc/nixos-artwork/wallpapers.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 let
-  mkNixBackground = { name, src, description } @ attrs:
+  mkNixBackground = { name, src, description }:
 
     stdenv.mkDerivation {
       inherit name src;
diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix
index b0dae9d2042..f3f9e2f57b7 100644
--- a/pkgs/development/compilers/rust/rustc.nix
+++ b/pkgs/development/compilers/rust/rustc.nix
@@ -13,7 +13,7 @@
 , doCheck ? true
 , broken ? false
 , buildPlatform, hostPlatform
-} @ args:
+}:
 
 let
   inherit (stdenv.lib) optional optionalString;
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix
index 9b9486e9758..22aa818f875 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix
@@ -1,4 +1,4 @@
-args @ { fetchurl, ... }:
+{ fetchurl, ... }:
 rec {
   baseName = ''alexandria'';
   version = ''20170830-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix
index 7c618a9fffb..c90a9e09192 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix
@@ -1,4 +1,4 @@
-args @ { fetchurl, ... }:
+{ fetchurl, ... }:
 rec {
   baseName = ''array-utils'';
   version = ''20180131-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-finalizers.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-finalizers.nix
index f2125676e5a..68c8a7e087b 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-finalizers.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-finalizers.nix
@@ -1,4 +1,4 @@
-args @ { fetchurl, ... }:
+{ fetchurl, ... }:
 rec {
   baseName = ''asdf-finalizers'';
   version = ''20170403-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-system-connections.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-system-connections.nix
index 65df45d95a5..4612e6175b9 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-system-connections.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-system-connections.nix
@@ -1,4 +1,4 @@
-args @ { fetchurl, ... }:
+{ fetchurl, ... }:
 rec {
   baseName = ''asdf-system-connections'';
   version = ''20170124-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/chipz.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/chipz.nix
index a9808173b62..c8f34e0fa17 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/chipz.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/chipz.nix
@@ -1,4 +1,4 @@
-args @ { fetchurl, ... }:
+{ fetchurl, ... }:
 rec {
   baseName = ''chipz'';
   version = ''20180328-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-aa.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-aa.nix
index 531d429df24..a420c22054f 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-aa.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-aa.nix
@@ -1,4 +1,4 @@
-args @ { fetchurl, ... }:
+{ fetchurl, ... }:
 rec {
   baseName = ''cl-aa'';
   version = ''cl-vectors-20180228-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-anonfun.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-anonfun.nix
index a413743eb8d..42a7bd59585 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-anonfun.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-anonfun.nix
@@ -1,4 +1,4 @@
-args @ { fetchurl, ... }:
+{ fetchurl, ... }:
 rec {
   baseName = ''cl-anonfun'';
   version = ''20111203-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html-parse.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html-parse.nix
index 61a35f2b58c..0321572e72a 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html-parse.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html-parse.nix
@@ -1,4 +1,4 @@
-args @ { fetchurl, ... }:
+{ fetchurl, ... }:
 rec {
   baseName = ''cl-html-parse'';
   version = ''20161031-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n-cldr.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n-cldr.nix
index dfabda0428f..825fea4eb90 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n-cldr.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n-cldr.nix
@@ -1,4 +1,4 @@
-args @ { fetchurl, ... }:
+{ fetchurl, ... }:
 rec {
   baseName = ''cl-l10n-cldr'';
   version = ''20120909-darcs'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-log.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-log.nix
index 57c9c03ba42..d506acf876e 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-log.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-log.nix
@@ -1,4 +1,4 @@
-args @ { fetchurl, ... }:
+{ fetchurl, ... }:
 rec {
   baseName = ''cl-log'';
   version = ''cl-log.1.0.1'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markup.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markup.nix
index 8967b0970c5..67468edbb6c 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markup.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markup.nix
@@ -1,4 +1,4 @@
-args @ { fetchurl, ... }:
+{ fetchurl, ... }:
 rec {
   baseName = ''cl-markup'';
   version = ''20131003-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths.nix
index e8034b11c23..f546e4711ac 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths.nix
@@ -1,4 +1,4 @@
-args @ { fetchurl, ... }:
+{ fetchurl, ... }:
 rec {
   baseName = ''cl-paths'';
   version = ''cl-vectors-20180228-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unification.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unification.nix
index 6d284b7b012..4434e711d9d 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unification.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unification.nix
@@ -1,4 +1,4 @@
-args @ { fetchurl, ... }:
+{ fetchurl, ... }:
 rec {
   baseName = ''cl-unification'';
   version = ''20171227-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-utilities.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-utilities.nix
index 750da99d5d6..1b78d0d2898 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-utilities.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-utilities.nix
@@ -1,4 +1,4 @@
-args @ { fetchurl, ... }:
+{ fetchurl, ... }:
 rec {
   baseName = ''cl-utilities'';
   version = ''1.2.4'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-socket.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-socket.nix
index fe511ec40bd..a4a66ecfa64 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-socket.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-socket.nix
@@ -1,4 +1,4 @@
-args @ { fetchurl, ... }:
+{ fetchurl, ... }:
 rec {
   baseName = ''clack-socket'';
   version = ''clack-20180328-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix
index 312d0eb10a4..ec7599f2bd3 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix
@@ -1,4 +1,4 @@
-args @ { fetchurl, ... }:
+{ fetchurl, ... }:
 rec {
   baseName = ''closer-mop'';
   version = ''20180430-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/command-line-arguments.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/command-line-arguments.nix
index e1fb5965852..1ae6fa0f4ec 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/command-line-arguments.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/command-line-arguments.nix
@@ -1,4 +1,4 @@
-args @ { fetchurl, ... }:
+{ fetchurl, ... }:
 rec {
   baseName = ''command-line-arguments'';
   version = ''20151218-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-lite.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-lite.nix
index f4941aa80cd..bb5ab940638 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-lite.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-lite.nix
@@ -1,4 +1,4 @@
-args @ { fetchurl, ... }:
+{ fetchurl, ... }:
 rec {
   baseName = ''css-lite'';
   version = ''20120407-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/db3.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/db3.nix
index ae8ed6de877..7c69878900c 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/db3.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/db3.nix
@@ -1,4 +1,4 @@
-args @ { fetchurl, ... }:
+{ fetchurl, ... }:
 rec {
   baseName = ''db3'';
   version = ''cl-20150302-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/eos.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/eos.nix
index 1568533d92a..91b8db69a36 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/eos.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/eos.nix
@@ -1,4 +1,4 @@
-args @ { fetchurl, ... }:
+{ fetchurl, ... }:
 rec {
   baseName = ''eos'';
   version = ''20150608-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/garbage-pools.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/garbage-pools.nix
index 11d5ac4491e..76e2a55620c 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/garbage-pools.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/garbage-pools.nix
@@ -1,4 +1,4 @@
-args @ { fetchurl, ... }:
+{ fetchurl, ... }:
 rec {
   baseName = ''garbage-pools'';
   version = ''20130720-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iterate.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iterate.nix
index f276ec72736..f85b128652d 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iterate.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iterate.nix
@@ -1,4 +1,4 @@
-args @ { fetchurl, ... }:
+{ fetchurl, ... }:
 rec {
   baseName = ''iterate'';
   version = ''20180228-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/kmrcl.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/kmrcl.nix
index e5cbad3e9e8..62a3ae2bb7d 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/kmrcl.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/kmrcl.nix
@@ -1,4 +1,4 @@
-args @ { fetchurl, ... }:
+{ fetchurl, ... }:
 rec {
   baseName = ''kmrcl'';
   version = ''20150923-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix
index 4dfdce68bc8..79f2d38ef10 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix
@@ -1,4 +1,4 @@
-args @ { fetchurl, ... }:
+{ fetchurl, ... }:
 rec {
   baseName = ''lack-component'';
   version = ''lack-20180430-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lift.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lift.nix
index a3ddc2fd953..b44c0c8a987 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lift.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lift.nix
@@ -1,4 +1,4 @@
-args @ { fetchurl, ... }:
+{ fetchurl, ... }:
 rec {
   baseName = ''lift'';
   version = ''20151031-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/map-set.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/map-set.nix
index db25e6ae534..006361ed80c 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/map-set.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/map-set.nix
@@ -1,4 +1,4 @@
-args @ { fetchurl, ... }:
+{ fetchurl, ... }:
 rec {
   baseName = ''map-set'';
   version = ''20160628-hg'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/marshal.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/marshal.nix
index 4f6842606b4..c34d79f3d13 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/marshal.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/marshal.nix
@@ -1,4 +1,4 @@
-args @ { fetchurl, ... }:
+{ fetchurl, ... }:
 rec {
   baseName = ''marshal'';
   version = ''cl-20180328-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/md5.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/md5.nix
index 953dd0a58a4..c65d95d9ef7 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/md5.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/md5.nix
@@ -1,4 +1,4 @@
-args @ { fetchurl, ... }:
+{ fetchurl, ... }:
 rec {
   baseName = ''md5'';
   version = ''20180228-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/metabang-bind.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/metabang-bind.nix
index d72e0839d1e..5647b9a9270 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/metabang-bind.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/metabang-bind.nix
@@ -1,4 +1,4 @@
-args @ { fetchurl, ... }:
+{ fetchurl, ... }:
 rec {
   baseName = ''metabang-bind'';
   version = ''20171130-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/metatilities-base.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/metatilities-base.nix
index 1fc10b9c8db..6bbdf5f911e 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/metatilities-base.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/metatilities-base.nix
@@ -1,4 +1,4 @@
-args @ { fetchurl, ... }:
+{ fetchurl, ... }:
 rec {
   baseName = ''metatilities-base'';
   version = ''20170403-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/misc-extensions.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/misc-extensions.nix
index 6334804c4f7..3c289fefa9a 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/misc-extensions.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/misc-extensions.nix
@@ -1,4 +1,4 @@
-args @ { fetchurl, ... }:
+{ fetchurl, ... }:
 rec {
   baseName = ''misc-extensions'';
   version = ''20150608-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/mt19937.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/mt19937.nix
index a8cfc070bf9..29460307e69 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/mt19937.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/mt19937.nix
@@ -1,4 +1,4 @@
-args @ { fetchurl, ... }:
+{ fetchurl, ... }:
 rec {
   baseName = ''mt19937'';
   version = ''1.1.1'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/named-readtables.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/named-readtables.nix
index 82d06b1c93b..e1d6a1477a7 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/named-readtables.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/named-readtables.nix
@@ -1,4 +1,4 @@
-args @ { fetchurl, ... }:
+{ fetchurl, ... }:
 rec {
   baseName = ''named-readtables'';
   version = ''20180131-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/net_dot_didierverna_dot_asdf-flv.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/net_dot_didierverna_dot_asdf-flv.nix
index 4e7c84566a0..67636d3f6cf 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/net_dot_didierverna_dot_asdf-flv.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/net_dot_didierverna_dot_asdf-flv.nix
@@ -1,4 +1,4 @@
-args @ { fetchurl, ... }:
+{ fetchurl, ... }:
 rec {
   baseName = ''net_dot_didierverna_dot_asdf-flv'';
   version = ''asdf-flv-version-2.1'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/parse-number.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/parse-number.nix
index e636df0805e..5c1f90220eb 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/parse-number.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/parse-number.nix
@@ -1,4 +1,4 @@
-args @ { fetchurl, ... }:
+{ fetchurl, ... }:
 rec {
   baseName = ''parse-number'';
   version = ''v1.7'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump-lexer.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump-lexer.nix
index 5edceaf4ad9..cd0db041c5b 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump-lexer.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump-lexer.nix
@@ -1,4 +1,4 @@
-args @ { fetchurl, ... }:
+{ fetchurl, ... }:
 rec {
   baseName = ''plump-lexer'';
   version = ''plump-20170725-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ptester.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ptester.nix
index ffa2e595c26..c90b252313b 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ptester.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ptester.nix
@@ -1,4 +1,4 @@
-args @ { fetchurl, ... }:
+{ fetchurl, ... }:
 rec {
   baseName = ''ptester'';
   version = ''20160929-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/rfc2388.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/rfc2388.nix
index be2897d19a4..41ead034791 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/rfc2388.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/rfc2388.nix
@@ -1,4 +1,4 @@
-args @ { fetchurl, ... }:
+{ fetchurl, ... }:
 rec {
   baseName = ''rfc2388'';
   version = ''20130720-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/rt.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/rt.nix
index d5be4be7daf..8ed7c1a4499 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/rt.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/rt.nix
@@ -1,4 +1,4 @@
-args @ { fetchurl, ... }:
+{ fetchurl, ... }:
 rec {
   baseName = ''rt'';
   version = ''20101006-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/salza2.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/salza2.nix
index 9056cfbdcca..d55f7700092 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/salza2.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/salza2.nix
@@ -1,4 +1,4 @@
-args @ { fetchurl, ... }:
+{ fetchurl, ... }:
 rec {
   baseName = ''salza2'';
   version = ''2.0.9'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/string-case.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/string-case.nix
index 7f5cc1e048d..9cc6338c8b8 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/string-case.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/string-case.nix
@@ -1,4 +1,4 @@
-args @ { fetchurl, ... }:
+{ fetchurl, ... }:
 rec {
   baseName = ''string-case'';
   version = ''20151218-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/swank.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/swank.nix
index 1359e13b949..6819e4b2571 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/swank.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/swank.nix
@@ -1,4 +1,4 @@
-args @ { fetchurl, ... }:
+{ fetchurl, ... }:
 rec {
   baseName = ''swank'';
   version = ''slime-v2.20'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-backtrace.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-backtrace.nix
index 9a4afce3280..a772694b983 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-backtrace.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-backtrace.nix
@@ -1,4 +1,4 @@
-args @ { fetchurl, ... }:
+{ fetchurl, ... }:
 rec {
   baseName = ''trivial-backtrace'';
   version = ''20160531-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-features.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-features.nix
index 1a562c2288b..5efc5766955 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-features.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-features.nix
@@ -1,4 +1,4 @@
-args @ { fetchurl, ... }:
+{ fetchurl, ... }:
 rec {
   baseName = ''trivial-features'';
   version = ''20161204-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-gray-streams.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-gray-streams.nix
index dd93a599d69..9a285fea2f1 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-gray-streams.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-gray-streams.nix
@@ -1,4 +1,4 @@
-args @ { fetchurl, ... }:
+{ fetchurl, ... }:
 rec {
   baseName = ''trivial-gray-streams'';
   version = ''20180328-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix
index 4f4e1f81223..e044f097701 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix
@@ -1,4 +1,4 @@
-args @ { fetchurl, ... }:
+{ fetchurl, ... }:
 rec {
   baseName = ''trivial-indent'';
   version = ''20180131-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix
index 56bbb583837..6946141f112 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix
@@ -1,4 +1,4 @@
-args @ { fetchurl, ... }:
+{ fetchurl, ... }:
 rec {
   baseName = ''trivial-mimes'';
   version = ''20180131-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-types.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-types.nix
index 8cc04c2c64a..1af66736f30 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-types.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-types.nix
@@ -1,4 +1,4 @@
-args @ { fetchurl, ... }:
+{ fetchurl, ... }:
 rec {
   baseName = ''trivial-types'';
   version = ''20120407-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-utf-8.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-utf-8.nix
index c925382d81d..753f21dbcb9 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-utf-8.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-utf-8.nix
@@ -1,4 +1,4 @@
-args @ { fetchurl, ... }:
+{ fetchurl, ... }:
 rec {
   baseName = ''trivial-utf-8'';
   version = ''20111001-darcs'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uffi.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uffi.nix
index 1986f7c88f7..0ac190993d8 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uffi.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uffi.nix
@@ -1,4 +1,4 @@
-args @ { fetchurl, ... }:
+{ fetchurl, ... }:
 rec {
   baseName = ''uffi'';
   version = ''20180228-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix
index 39c2060af02..afb8b388568 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix
@@ -1,4 +1,4 @@
-args @ { fetchurl, ... }:
+{ fetchurl, ... }:
 rec {
   baseName = ''uiop'';
   version = ''3.3.1'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/unit-test.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/unit-test.nix
index 6c456496732..3a4b05e0526 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/unit-test.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/unit-test.nix
@@ -1,4 +1,4 @@
-args @ { fetchurl, ... }:
+{ fetchurl, ... }:
 rec {
   baseName = ''unit-test'';
   version = ''20120520-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/vom.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/vom.nix
index 6a4751f799e..11b9351c03a 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/vom.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/vom.nix
@@ -1,4 +1,4 @@
-args @ { fetchurl, ... }:
+{ fetchurl, ... }:
 rec {
   baseName = ''vom'';
   version = ''20160825-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xsubseq.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xsubseq.nix
index b9ab71744c3..c70c3f2e1e1 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xsubseq.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xsubseq.nix
@@ -1,4 +1,4 @@
-args @ { fetchurl, ... }:
+{ fetchurl, ... }:
 rec {
   baseName = ''xsubseq'';
   version = ''20170830-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/yacc.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/yacc.nix
index c7031f4aa3f..733185e2b26 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/yacc.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/yacc.nix
@@ -1,4 +1,4 @@
-args @ { fetchurl, ... }:
+{ fetchurl, ... }:
 rec {
   baseName = ''yacc'';
   version = ''cl-20101006-darcs'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/zpb-ttf.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/zpb-ttf.nix
index 74e5d7e97e9..090aa670ad9 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/zpb-ttf.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/zpb-ttf.nix
@@ -1,4 +1,4 @@
-args @ { fetchurl, ... }:
+{ fetchurl, ... }:
 rec {
   baseName = ''zpb-ttf'';
   version = ''1.0.3'';
diff --git a/pkgs/development/node-packages/node-env.nix b/pkgs/development/node-packages/node-env.nix
index 720e0cc0850..eee72cb9613 100644
--- a/pkgs/development/node-packages/node-env.nix
+++ b/pkgs/development/node-packages/node-env.nix
@@ -56,7 +56,7 @@ let
       ) dependencies);
 
   # Recursively composes the dependencies of a package
-  composePackage = { name, packageName, src, dependencies ? [], ... }@args:
+  composePackage = { name, packageName, src, dependencies ? [], ... }:
     ''
       DIR=$(pwd)
       cd $TMPDIR
@@ -176,7 +176,7 @@ let
   # dependencies in the package.json file to the versions that are actually
   # being used.
 
-  pinpointDependenciesOfPackage = { packageName, dependencies ? [], production ? true, ... }@args:
+  pinpointDependenciesOfPackage = { packageName, dependencies ? [], production ? true, ... }:
     ''
       if [ -d "${packageName}" ]
       then
diff --git a/pkgs/development/pharo/vm/default.nix b/pkgs/development/pharo/vm/default.nix
index b995e0e2540..5178551df45 100644
--- a/pkgs/development/pharo/vm/default.nix
+++ b/pkgs/development/pharo/vm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, callPackage, pkgsi686Linux, makeWrapper, ...} @pkgs:
+{ stdenv, callPackage, pkgsi686Linux, makeWrapper, ...}:
 
 let
   i686    = pkgsi686Linux.callPackage ./vms.nix {};
diff --git a/pkgs/development/ruby-modules/bundled-common/default.nix b/pkgs/development/ruby-modules/bundled-common/default.nix
index 16f1abe1a89..f902ca58c38 100644
--- a/pkgs/development/ruby-modules/bundled-common/default.nix
+++ b/pkgs/development/ruby-modules/bundled-common/default.nix
@@ -61,7 +61,7 @@ let
   else
     name;
 
-  copyIfBundledByPath = { bundledByPath ? false, ...}@main:
+  copyIfBundledByPath = { bundledByPath ? false, ...}:
   (if bundledByPath then
       assert gemFiles.gemdir != null; "cp -a ${gemFiles.gemdir}/* $out/" #*/
     else ""
diff --git a/pkgs/development/ruby-modules/bundled-common/functions.nix b/pkgs/development/ruby-modules/bundled-common/functions.nix
index 85e93959e4b..b8e666a92f9 100644
--- a/pkgs/development/ruby-modules/bundled-common/functions.nix
+++ b/pkgs/development/ruby-modules/bundled-common/functions.nix
@@ -22,9 +22,9 @@ rec {
     else gemset;
   };
 
-  filterGemset = {ruby, groups,...}@env: gemset: lib.filterAttrs (name: attrs: platformMatches ruby attrs && groupMatches groups attrs) gemset;
+  filterGemset = {ruby, groups,...}: gemset: lib.filterAttrs (name: attrs: platformMatches ruby attrs && groupMatches groups attrs) gemset;
 
-  platformMatches = {rubyEngine, version, ...}@ruby: attrs: (
+  platformMatches = {rubyEngine, version, ...}: attrs: (
   !(attrs ? "platforms") ||
   builtins.length attrs.platforms == 0 ||
     builtins.any (platform:
diff --git a/pkgs/development/ruby-modules/bundled-common/test.nix b/pkgs/development/ruby-modules/bundled-common/test.nix
index ee3754595f3..7c5932c4e76 100644
--- a/pkgs/development/ruby-modules/bundled-common/test.nix
+++ b/pkgs/development/ruby-modules/bundled-common/test.nix
@@ -1,4 +1,4 @@
-{ stdenv, writeText, lib, ruby, defaultGemConfig, callPackage, test, stubs, should }@defs:
+{ stdenv, writeText, lib, ruby, defaultGemConfig, callPackage, test, stubs, should }:
 let
   testConfigs = {
     inherit lib;
diff --git a/pkgs/development/ruby-modules/bundler-env/test.nix b/pkgs/development/ruby-modules/bundler-env/test.nix
index 63da7044c0c..e42f1bf2571 100644
--- a/pkgs/development/ruby-modules/bundler-env/test.nix
+++ b/pkgs/development/ruby-modules/bundler-env/test.nix
@@ -1,4 +1,4 @@
-{ stdenv, writeText, lib, ruby, defaultGemConfig, callPackage, test, stubs, should}@defs:
+{ stdenv, writeText, lib, ruby, defaultGemConfig, callPackage, test, stubs, should}:
 let
   bundlerEnv = callPackage ./default.nix stubs // {
     basicEnv = callPackage ../bundled-common stubs;
diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix
index 684955b9067..25078b7d753 100644
--- a/pkgs/os-specific/linux/kernel/generic.nix
+++ b/pkgs/os-specific/linux/kernel/generic.nix
@@ -47,7 +47,7 @@
 
 , mkValueOverride ? null
 , ...
-} @ args:
+}:
 
 assert stdenv.isLinux;
 
diff --git a/pkgs/os-specific/linux/spl/default.nix b/pkgs/os-specific/linux/spl/default.nix
index af3df245fe6..880da81c42e 100644
--- a/pkgs/os-specific/linux/spl/default.nix
+++ b/pkgs/os-specific/linux/spl/default.nix
@@ -12,7 +12,7 @@ let
     , rev ? "spl-${version}"
     , broken ? false
     , patches ? []
-    } @ args : stdenv.mkDerivation rec {
+    }: stdenv.mkDerivation rec {
       name = "spl-${version}-${kernel.version}";
 
       src = fetchFromGitHub {
diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix
index 6eac54ddf65..45edf8945c0 100644
--- a/pkgs/os-specific/linux/zfs/default.nix
+++ b/pkgs/os-specific/linux/zfs/default.nix
@@ -24,7 +24,7 @@ let
     , rev ? "zfs-${version}"
     , isUnstable ? false
     , isLegacyCrypto ? false
-    , incompatibleKernelVersion ? null } @ args:
+    , incompatibleKernelVersion ? null }:
     if buildKernel &&
       (incompatibleKernelVersion != null) &&
         versionAtLeast kernel.version incompatibleKernelVersion then
diff --git a/pkgs/servers/http/tomcat/default.nix b/pkgs/servers/http/tomcat/default.nix
index 098825d59ce..8fe34cd6183 100644
--- a/pkgs/servers/http/tomcat/default.nix
+++ b/pkgs/servers/http/tomcat/default.nix
@@ -2,7 +2,7 @@
 
 let
 
-  common = { versionMajor, versionMinor, sha256 } @ args: stdenv.mkDerivation (rec {
+  common = { versionMajor, versionMinor, sha256 }: stdenv.mkDerivation (rec {
     name = "apache-tomcat-${version}";
     version = "${versionMajor}.${versionMinor}";
 
diff --git a/pkgs/servers/owncloud/default.nix b/pkgs/servers/owncloud/default.nix
index f02e67740b6..14a4a2868f0 100644
--- a/pkgs/servers/owncloud/default.nix
+++ b/pkgs/servers/owncloud/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl }:
 let
-  common = { versiona, sha256 } @ args: stdenv.mkDerivation (rec {
+  common = { versiona, sha256 }: stdenv.mkDerivation (rec {
 
     name= "owncloud-${version}";
     version= versiona;
diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix
index c8b007b36ac..a727b60dd9d 100644
--- a/pkgs/servers/sql/postgresql/default.nix
+++ b/pkgs/servers/sql/postgresql/default.nix
@@ -2,7 +2,7 @@
 
 let
 
-  common = { version, sha256, psqlSchema } @ args:
+  common = { version, sha256, psqlSchema }:
    let atLeast = lib.versionAtLeast version; in stdenv.mkDerivation (rec {
     name = "postgresql-${version}";
 
diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix
index f6c992d5bd5..770e45a5d62 100644
--- a/pkgs/top-level/emacs-packages.nix
+++ b/pkgs/top-level/emacs-packages.nix
@@ -39,7 +39,7 @@
 , melpaBuild
 
 , external
-}@args:
+}:
 
 with lib.licenses;
 
-- 
GitLab


From 70328c3ce99132e5ed2324eca5f11b61d9b0e39f Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Fri, 20 Jul 2018 22:38:08 +0200
Subject: [PATCH 212/297] calibre: 3.27.1 -> 3.28.0

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

diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix
index 1aabbb587eb..fef98529ddf 100644
--- a/pkgs/applications/misc/calibre/default.nix
+++ b/pkgs/applications/misc/calibre/default.nix
@@ -5,12 +5,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "3.27.1";
+  version = "3.28.0";
   name = "calibre-${version}";
 
   src = fetchurl {
     url = "https://download.calibre-ebook.com/${version}/${name}.tar.xz";
-    sha256 = "0hmdlnwrfql2b675xmjf50hnnrrkv5jbky0ssdpyfjfa5vxya2bh";
+    sha256 = "0b3vv03c6m6972sk8zj3zc5sq6b9837irnfgjlqhv9z5i75m0414";
   };
 
   patches = [
-- 
GitLab


From ba893d4e49735a9382e32c763ec72b9e71da1877 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Fri, 20 Jul 2018 22:50:48 +0200
Subject: [PATCH 213/297] bazel-buildtools: add version to name

see issue #43717
---
 .../tools/build-managers/bazel/buildtools/default.nix           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/build-managers/bazel/buildtools/default.nix b/pkgs/development/tools/build-managers/bazel/buildtools/default.nix
index a98c2b4e04b..52fec3f131b 100644
--- a/pkgs/development/tools/build-managers/bazel/buildtools/default.nix
+++ b/pkgs/development/tools/build-managers/bazel/buildtools/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "bazel-buildtools";
+  name = "bazel-buildtools-unstable-${version}";
   version = "2018-05-24";
 
   goPackagePath = "github.com/bazelbuild/buildtools";
-- 
GitLab


From 4d1fd3775d33d5d46a8d691c4e12c7eef8fcefbd Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Fri, 20 Jul 2018 22:53:05 +0200
Subject: [PATCH 214/297] buck: adhere to version schema convention

see issue #43717
---
 pkgs/development/tools/build-managers/buck/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/build-managers/buck/default.nix b/pkgs/development/tools/build-managers/buck/default.nix
index 5d486f47844..9fdecaabfd8 100644
--- a/pkgs/development/tools/build-managers/buck/default.nix
+++ b/pkgs/development/tools/build-managers/buck/default.nix
@@ -1,8 +1,8 @@
 { stdenv, fetchFromGitHub, jdk, ant, python2, python2Packages, watchman, unzip, bash, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "buck-${version}";
-  version = "v2017.10.01.01";
+  name = "buck-unstable-${version}";
+  version = "2017-10-01";
 
   src = fetchFromGitHub {
     owner = "facebook";
-- 
GitLab


From 2e979e8ceb45c2c251ed189c28a736fec7539c15 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Fri, 20 Jul 2018 20:56:59 +0000
Subject: [PATCH 215/297] [bot] nixos/*: remove unused arguments in lambdas

---
 nixos/lib/build-vms.nix                       |  2 +-
 nixos/lib/make-disk-image.nix                 |  3 --
 nixos/lib/make-iso9660-image.nix              |  2 +-
 nixos/lib/testing.nix                         |  2 +-
 nixos/maintainers/option-usages.nix           |  4 +-
 nixos/modules/config/no-x-libs.nix            |  2 +-
 nixos/modules/config/nsswitch.nix             |  2 +-
 nixos/modules/config/power-management.nix     |  2 +-
 nixos/modules/config/sysctl.nix               |  2 +-
 nixos/modules/config/unix-odbc-drivers.nix    |  2 +-
 nixos/modules/config/users-groups.nix         |  2 +-
 nixos/modules/config/vpnc.nix                 |  2 +-
 .../hardware/network/smc-2632w/default.nix    |  2 +-
 .../modules/hardware/network/zydas-zd1211.nix |  2 +-
 nixos/modules/hardware/video/ati.nix          |  2 +-
 .../hardware/video/capture/mwprocapture.nix   |  2 +-
 .../video/uvcvideo/uvcdynctrl-udev-rules.nix  |  4 +-
 ...stallation-cd-graphical-kde-new-kernel.nix |  2 +-
 .../installation-cd-minimal-new-kernel.nix    |  2 +-
 .../cd-dvd/installation-cd-minimal.nix        |  2 +-
 .../installer/netboot/netboot-base.nix        |  2 +-
 .../installer/netboot/netboot-minimal.nix     |  2 +-
 nixos/modules/installer/scan/detected.nix     |  2 +-
 nixos/modules/installer/tools/tools.nix       |  2 +-
 nixos/modules/installer/virtualbox-demo.nix   |  2 +-
 nixos/modules/misc/assertions.nix             |  2 +-
 nixos/modules/misc/extra-arguments.nix        |  2 +-
 nixos/modules/misc/ids.nix                    |  2 +-
 nixos/modules/misc/label.nix                  |  2 +-
 nixos/modules/misc/lib.nix                    |  2 +-
 nixos/modules/misc/locate.nix                 |  2 +-
 nixos/modules/misc/meta.nix                   |  2 +-
 nixos/modules/misc/passthru.nix               |  2 +-
 nixos/modules/profiles/all-hardware.nix       |  2 +-
 nixos/modules/profiles/base.nix               |  2 +-
 nixos/modules/profiles/demo.nix               |  2 +-
 nixos/modules/profiles/graphical.nix          |  2 +-
 nixos/modules/profiles/hardened.nix           |  2 +-
 nixos/modules/profiles/headless.nix           |  2 +-
 nixos/modules/profiles/minimal.nix            |  2 +-
 nixos/modules/profiles/qemu-guest.nix         |  2 +-
 nixos/modules/programs/atop.nix               |  2 +-
 nixos/modules/programs/bcc.nix                |  2 +-
 nixos/modules/programs/environment.nix        |  2 +-
 nixos/modules/programs/shell.nix              |  2 +-
 nixos/modules/programs/systemtap.nix          |  2 +-
 nixos/modules/security/hidepid.nix            |  2 +-
 nixos/modules/security/oath.nix               |  2 +-
 nixos/modules/services/backup/bacula.nix      |  4 +-
 nixos/modules/services/backup/borgbackup.nix  |  2 +-
 nixos/modules/services/backup/restic.nix      |  2 +-
 .../continuous-integration/jenkins/slave.nix  |  2 +-
 nixos/modules/services/hardware/actkbd.nix    |  2 +-
 .../services/hardware/nvidia-optimus.nix      |  2 +-
 .../hardware/sane_extra_backends/brscan4.nix  |  2 +-
 .../modules/services/logging/journalwatch.nix |  2 +-
 nixos/modules/services/mail/dovecot.nix       |  2 +-
 nixos/modules/services/mail/mail.nix          |  2 +-
 nixos/modules/services/misc/emby.nix          |  2 +-
 nixos/modules/services/misc/jackett.nix       |  2 +-
 nixos/modules/services/misc/nix-gc.nix        |  2 +-
 nixos/modules/services/misc/nix-optimise.nix  |  2 +-
 nixos/modules/services/misc/nix-ssh-serve.nix |  2 +-
 nixos/modules/services/misc/radarr.nix        |  2 +-
 nixos/modules/services/misc/sonarr.nix        |  2 +-
 .../services/misc/taskserver/default.nix      |  2 +-
 .../monitoring/prometheus/exporters.nix       |  2 +-
 nixos/modules/services/monitoring/smartd.nix  |  2 +-
 .../services/network-filesystems/beegfs.nix   |  2 +-
 .../network-filesystems/openafs/lib.nix       |  2 +-
 .../services/networking/avahi-daemon.nix      |  2 +-
 nixos/modules/services/networking/cjdns.nix   |  2 +-
 nixos/modules/services/networking/i2pd.nix    |  4 +-
 .../networking/nghttpx/nghttpx-options.nix    |  2 +-
 nixos/modules/services/networking/nylon.nix   |  2 +-
 nixos/modules/services/networking/pptpd.nix   |  2 +-
 nixos/modules/services/networking/shout.nix   |  2 +-
 .../modules/services/networking/ssh/sshd.nix  |  2 +-
 nixos/modules/services/networking/toxvpn.nix  |  2 +-
 .../modules/services/networking/tvheadend.nix |  2 +-
 .../modules/services/networking/wireguard.nix |  2 +-
 nixos/modules/services/networking/xl2tpd.nix  |  2 +-
 nixos/modules/services/networking/zerobin.nix |  2 +-
 .../services/security/oauth2_proxy_nginx.nix  |  2 +-
 nixos/modules/services/security/tor.nix       |  4 +-
 nixos/modules/services/torrent/flexget.nix    |  2 +-
 nixos/modules/services/web-apps/matomo.nix    |  2 +-
 nixos/modules/services/web-apps/youtrack.nix  |  2 +-
 .../web-servers/apache-httpd/limesurvey.nix   |  2 +-
 .../web-servers/apache-httpd/mercurial.nix    |  2 +-
 .../web-servers/apache-httpd/wordpress.nix    |  2 +-
 .../web-servers/nginx/vhost-options.nix       |  2 +-
 nixos/modules/services/web-servers/zope2.nix  |  2 +-
 .../services/x11/display-managers/auto.nix    |  2 +-
 .../modules/services/x11/terminal-server.nix  |  2 +-
 .../services/x11/window-managers/default.nix  |  2 +-
 .../services/x11/window-managers/wmii.nix     |  2 +-
 nixos/modules/services/x11/xserver.nix        |  2 +-
 nixos/modules/system/activation/top-level.nix |  2 +-
 nixos/modules/system/boot/kexec.nix           |  2 +-
 nixos/modules/system/boot/loader/loader.nix   |  2 +-
 nixos/modules/system/boot/networkd.nix        |  2 +-
 nixos/modules/system/boot/resolved.nix        |  2 +-
 nixos/modules/system/boot/systemd.nix         |  6 +--
 nixos/modules/system/boot/timesyncd.nix       |  2 +-
 nixos/modules/tasks/bcache.nix                |  2 +-
 nixos/modules/tasks/filesystems/ext.nix       |  2 +-
 .../tasks/network-interfaces-systemd.nix      |  2 +-
 nixos/modules/tasks/network-interfaces.nix    |  2 +-
 .../tasks/scsi-link-power-management.nix      |  2 +-
 nixos/modules/tasks/swraid.nix                |  2 +-
 nixos/modules/tasks/trackpoint.nix            |  2 +-
 nixos/modules/testing/service-runner.nix      |  2 +-
 .../modules/virtualisation/amazon-options.nix |  2 +-
 nixos/modules/virtualisation/azure-common.nix |  2 +-
 .../virtualisation/azure-config-user.nix      |  2 +-
 nixos/modules/virtualisation/azure-config.nix |  2 +-
 .../virtualisation/brightbox-config.nix       |  2 +-
 nixos/modules/virtualisation/containers.nix   |  4 +-
 nixos/modules/virtualisation/docker-image.nix |  2 +-
 .../virtualisation/google-compute-config.nix  |  2 +-
 .../modules/virtualisation/lxc-container.nix  |  2 +-
 nixos/modules/virtualisation/nova-config.nix  |  2 +-
 nixos/modules/virtualisation/xen-domU.nix     |  2 +-
 nixos/release.nix                             | 30 +++++++-------
 nixos/tests/acme.nix                          |  2 +-
 nixos/tests/ammonite.nix                      |  2 +-
 nixos/tests/atd.nix                           |  4 +-
 nixos/tests/avahi.nix                         |  2 +-
 nixos/tests/beegfs.nix                        |  6 +--
 nixos/tests/bittorrent.nix                    |  8 ++--
 nixos/tests/borgbackup.nix                    |  4 +-
 nixos/tests/buildbot.nix                      |  6 +--
 nixos/tests/cadvisor.nix                      |  4 +-
 nixos/tests/cassandra.nix                     |  6 +--
 nixos/tests/ceph.nix                          |  4 +-
 nixos/tests/cjdns.nix                         |  8 ++--
 nixos/tests/cloud-init.nix                    |  2 +-
 nixos/tests/common/user-account.nix           |  2 +-
 nixos/tests/containers-bridge.nix             |  2 +-
 nixos/tests/containers-extra_veth.nix         |  2 +-
 nixos/tests/containers-hosts.nix              |  2 +-
 nixos/tests/containers-ipv4.nix               |  2 +-
 nixos/tests/containers-ipv6.nix               |  2 +-
 nixos/tests/containers-macvlans.nix           |  4 +-
 .../tests/containers-physical_interfaces.nix  |  8 ++--
 nixos/tests/containers-portforward.nix        |  2 +-
 nixos/tests/containers-reloadable.nix         |  6 +--
 nixos/tests/containers-restart_networking.nix |  8 ++--
 nixos/tests/containers-tmpfs.nix              |  2 +-
 nixos/tests/couchdb.nix                       |  4 +-
 nixos/tests/deluge.nix                        |  2 +-
 nixos/tests/dnscrypt-proxy.nix                |  2 +-
 nixos/tests/docker-edge.nix                   |  2 +-
 nixos/tests/docker-registry.nix               |  6 +--
 nixos/tests/docker-tools-overlay.nix          |  2 +-
 nixos/tests/docker-tools.nix                  |  2 +-
 nixos/tests/docker.nix                        |  2 +-
 nixos/tests/ecryptfs.nix                      |  4 +-
 nixos/tests/elk.nix                           |  2 +-
 nixos/tests/emacs-daemon.nix                  |  2 +-
 nixos/tests/env.nix                           |  2 +-
 nixos/tests/etcd-cluster.nix                  |  6 +--
 nixos/tests/etcd.nix                          |  2 +-
 nixos/tests/ferm.nix                          |  4 +-
 nixos/tests/firefox.nix                       |  2 +-
 nixos/tests/firewall.nix                      |  6 +--
 nixos/tests/flannel.nix                       |  6 +--
 nixos/tests/flatpak.nix                       |  2 +-
 nixos/tests/fwupd.nix                         |  2 +-
 nixos/tests/gitlab.nix                        |  2 +-
 nixos/tests/gitolite.nix                      |  4 +-
 nixos/tests/gnome3-gdm.nix                    |  2 +-
 nixos/tests/gnome3.nix                        |  2 +-
 nixos/tests/gocd-agent.nix                    |  2 +-
 nixos/tests/gocd-server.nix                   |  2 +-
 nixos/tests/grafana.nix                       |  2 +-
 nixos/tests/graphite.nix                      |  4 +-
 nixos/tests/hadoop/hdfs.nix                   |  6 +--
 nixos/tests/hadoop/yarn.nix                   |  6 +--
 nixos/tests/haka.nix                          |  2 +-
 nixos/tests/haproxy.nix                       |  2 +-
 nixos/tests/hardened.nix                      |  2 +-
 nixos/tests/hibernate.nix                     |  2 +-
 nixos/tests/hitch/default.nix                 |  2 +-
 nixos/tests/hocker-fetchdocker/machine.nix    |  2 +-
 nixos/tests/home-assistant.nix                |  2 +-
 nixos/tests/hound.nix                         |  2 +-
 nixos/tests/hydra/default.nix                 |  2 +-
 nixos/tests/i3wm.nix                          |  4 +-
 nixos/tests/influxdb.nix                      |  2 +-
 nixos/tests/initrd-network-ssh/default.nix    |  6 +--
 nixos/tests/initrd-network.nix                |  2 +-
 nixos/tests/installer.nix                     |  2 +-
 nixos/tests/ipfs.nix                          |  4 +-
 nixos/tests/ipv6.nix                          |  6 +--
 nixos/tests/jenkins.nix                       |  4 +-
 nixos/tests/kafka.nix                         |  4 +-
 nixos/tests/kernel-copperhead.nix             |  2 +-
 nixos/tests/kernel-latest.nix                 |  2 +-
 nixos/tests/kernel-lts.nix                    |  2 +-
 nixos/tests/kexec.nix                         |  2 +-
 nixos/tests/krb5/deprecated-config.nix        |  2 +-
 nixos/tests/krb5/example-config.nix           |  2 +-
 nixos/tests/kubernetes/certs.nix              |  4 +-
 nixos/tests/kubernetes/dns.nix                |  2 +-
 nixos/tests/ldap.nix                          |  4 +-
 nixos/tests/lightdm.nix                       |  2 +-
 nixos/tests/login.nix                         |  2 +-
 nixos/tests/mathics.nix                       |  2 +-
 nixos/tests/memcached.nix                     |  2 +-
 nixos/tests/mesos.nix                         |  4 +-
 nixos/tests/minio.nix                         |  2 +-
 nixos/tests/misc.nix                          |  2 +-
 nixos/tests/mongodb.nix                       |  2 +-
 nixos/tests/morty.nix                         |  4 +-
 nixos/tests/mpd.nix                           |  6 +--
 nixos/tests/mumble.nix                        |  4 +-
 nixos/tests/munin.nix                         |  2 +-
 nixos/tests/mutable-users.nix                 |  4 +-
 nixos/tests/mysql-backup.nix                  |  2 +-
 nixos/tests/mysql-replication.nix             |  6 +--
 nixos/tests/mysql.nix                         |  2 +-
 nixos/tests/nat.nix                           |  8 ++--
 nixos/tests/netdata.nix                       |  2 +-
 nixos/tests/networking-proxy.nix              |  8 ++--
 nixos/tests/networking.nix                    | 40 +++++++++----------
 nixos/tests/nexus.nix                         |  2 +-
 nixos/tests/nfs.nix                           |  4 +-
 nixos/tests/nginx.nix                         |  2 +-
 nixos/tests/novacomd.nix                      |  2 +-
 nixos/tests/openssh.nix                       |  6 +--
 nixos/tests/owncloud.nix                      |  4 +-
 nixos/tests/pam-oath-login.nix                |  4 +-
 nixos/tests/partition.nix                     |  2 +-
 nixos/tests/peerflix.nix                      |  2 +-
 nixos/tests/pgjwt.nix                         |  2 +-
 nixos/tests/phabricator.nix                   |  6 +--
 nixos/tests/php-pcre.nix                      |  6 +--
 nixos/tests/plasma5.nix                       |  2 +-
 nixos/tests/plotinus.nix                      |  2 +-
 nixos/tests/postgis.nix                       |  2 +-
 nixos/tests/postgresql.nix                    |  2 +-
 nixos/tests/powerdns.nix                      |  2 +-
 nixos/tests/predictable-interface-names.nix   |  2 +-
 nixos/tests/printing.nix                      |  4 +-
 nixos/tests/prometheus.nix                    |  2 +-
 nixos/tests/prosody.nix                       |  2 +-
 nixos/tests/proxy.nix                         |  6 +--
 nixos/tests/quagga.nix                        | 10 ++---
 nixos/tests/quake3.nix                        |  4 +-
 nixos/tests/rabbitmq.nix                      |  2 +-
 nixos/tests/radicale.nix                      |  2 +-
 nixos/tests/riak.nix                          |  2 +-
 nixos/tests/run-in-machine.nix                |  2 +-
 nixos/tests/rxe.nix                           |  4 +-
 nixos/tests/samba.nix                         |  4 +-
 nixos/tests/sddm.nix                          |  6 +--
 nixos/tests/simple.nix                        |  2 +-
 nixos/tests/slim.nix                          |  2 +-
 nixos/tests/slurm.nix                         |  8 ++--
 nixos/tests/smokeping.nix                     |  2 +-
 nixos/tests/strongswan-swanctl.nix            |  6 +--
 nixos/tests/subversion.nix                    |  4 +-
 nixos/tests/sudo.nix                          |  2 +-
 nixos/tests/switch-test.nix                   |  4 +-
 nixos/tests/tomcat.nix                        |  2 +-
 nixos/tests/tor.nix                           |  4 +-
 nixos/tests/trac.nix                          |  8 ++--
 nixos/tests/transmission.nix                  |  2 +-
 nixos/tests/udisks2.nix                       |  2 +-
 nixos/tests/vault.nix                         |  2 +-
 nixos/tests/wordpress.nix                     |  4 +-
 nixos/tests/xdg-desktop-portal.nix            |  2 +-
 nixos/tests/xfce.nix                          |  2 +-
 nixos/tests/xmonad.nix                        |  2 +-
 nixos/tests/xrdp.nix                          |  6 +--
 nixos/tests/zfs.nix                           |  2 +-
 nixos/tests/zookeeper.nix                     |  2 +-
 279 files changed, 419 insertions(+), 424 deletions(-)

diff --git a/nixos/lib/build-vms.nix b/nixos/lib/build-vms.nix
index e14105f5f01..48288cf5962 100644
--- a/nixos/lib/build-vms.nix
+++ b/nixos/lib/build-vms.nix
@@ -47,7 +47,7 @@ rec {
       machinesNumbered = zipLists machines (range 1 254);
 
       nodes_ = flip map machinesNumbered (m: nameValuePair m.fst
-        [ ( { config, pkgs, nodes, ... }:
+        [ ( { config, nodes, ... }:
             let
               interfacesNumbered = zipLists config.virtualisation.vlans (range 1 255);
               interfaces = flip map interfacesNumbered ({ fst, snd }:
diff --git a/nixos/lib/make-disk-image.nix b/nixos/lib/make-disk-image.nix
index ebfb09db7b7..bf32a36895c 100644
--- a/nixos/lib/make-disk-image.nix
+++ b/nixos/lib/make-disk-image.nix
@@ -24,9 +24,6 @@
   #   most likely fails as GRUB will probably refuse to install.
   partitionTableType ? "legacy"
 
-  # Whether to invoke switch-to-configuration boot during image creation
-, installBootLoader ? true
-
 , # The root file system type.
   fsType ? "ext4"
 
diff --git a/nixos/lib/make-iso9660-image.nix b/nixos/lib/make-iso9660-image.nix
index c6bafd48f9d..8cd19b6e187 100644
--- a/nixos/lib/make-iso9660-image.nix
+++ b/nixos/lib/make-iso9660-image.nix
@@ -1,4 +1,4 @@
-{ stdenv, perl, closureInfo, xorriso, syslinux
+{ stdenv, closureInfo, xorriso, syslinux
 
 , # The file name of the resulting ISO image.
   isoName ? "cd.iso"
diff --git a/nixos/lib/testing.nix b/nixos/lib/testing.nix
index 57acc990a48..42a0c60c7e1 100644
--- a/nixos/lib/testing.nix
+++ b/nixos/lib/testing.nix
@@ -222,7 +222,7 @@ in rec {
   runInMachineWithX = { require ? [], ... } @ args:
     let
       client =
-        { config, pkgs, ... }:
+        { ... }:
         {
           inherit require;
           virtualisation.memorySize = 1024;
diff --git a/nixos/maintainers/option-usages.nix b/nixos/maintainers/option-usages.nix
index 371ee7d9180..242c2a4dd44 100644
--- a/nixos/maintainers/option-usages.nix
+++ b/nixos/maintainers/option-usages.nix
@@ -149,7 +149,7 @@ let
          else testOptions;
        checkAll = checkList == [];
      in
-       flip filter graph ({option, usedBy}:
+       flip filter graph ({option, ...}:
          (checkAll || elem option checkList)
          && !(elem option excludedTestOptions)
        );
@@ -165,7 +165,7 @@ let
   '';
 
   graphToText = graph:
-    concatMapStrings ({option, usedBy}:
+    concatMapStrings ({usedBy, ...}:
         concatMapStrings (user: ''
           ${user}
         '') usedBy
diff --git a/nixos/modules/config/no-x-libs.nix b/nixos/modules/config/no-x-libs.nix
index c7a6c943bc2..d9ecaa4818b 100644
--- a/nixos/modules/config/no-x-libs.nix
+++ b/nixos/modules/config/no-x-libs.nix
@@ -1,7 +1,7 @@
 # This module gets rid of all dependencies on X11 client libraries
 # (including fontconfig).
 
-{ config, lib, pkgs, ... }:
+{ config, lib, ... }:
 
 with lib;
 
diff --git a/nixos/modules/config/nsswitch.nix b/nixos/modules/config/nsswitch.nix
index c595c693294..a74d551f50d 100644
--- a/nixos/modules/config/nsswitch.nix
+++ b/nixos/modules/config/nsswitch.nix
@@ -1,6 +1,6 @@
 # Configuration for the Name Service Switch (/etc/nsswitch.conf).
 
-{ config, lib, pkgs, ... }:
+{ config, lib, ... }:
 
 with lib;
 
diff --git a/nixos/modules/config/power-management.nix b/nixos/modules/config/power-management.nix
index 4c37e8a6208..0277f1ad11e 100644
--- a/nixos/modules/config/power-management.nix
+++ b/nixos/modules/config/power-management.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, ... }:
 
 with lib;
 
diff --git a/nixos/modules/config/sysctl.nix b/nixos/modules/config/sysctl.nix
index 2114fb2b9d4..74bff602a47 100644
--- a/nixos/modules/config/sysctl.nix
+++ b/nixos/modules/config/sysctl.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, ... }:
 
 with lib;
 
diff --git a/nixos/modules/config/unix-odbc-drivers.nix b/nixos/modules/config/unix-odbc-drivers.nix
index 9565a09b3a1..8dd81172738 100644
--- a/nixos/modules/config/unix-odbc-drivers.nix
+++ b/nixos/modules/config/unix-odbc-drivers.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, ... }:
 
 with lib;
 
diff --git a/nixos/modules/config/users-groups.nix b/nixos/modules/config/users-groups.nix
index 621ca36fb6b..0290eff22fb 100644
--- a/nixos/modules/config/users-groups.nix
+++ b/nixos/modules/config/users-groups.nix
@@ -282,7 +282,7 @@ let
 
   };
 
-  groupOpts = { name, config, ... }: {
+  groupOpts = { name, ... }: {
 
     options = {
 
diff --git a/nixos/modules/config/vpnc.nix b/nixos/modules/config/vpnc.nix
index c7ac1b3530e..356e007c0a3 100644
--- a/nixos/modules/config/vpnc.nix
+++ b/nixos/modules/config/vpnc.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, ... }:
 
 with lib;
 
diff --git a/nixos/modules/hardware/network/smc-2632w/default.nix b/nixos/modules/hardware/network/smc-2632w/default.nix
index 650011aca81..b00286464f3 100644
--- a/nixos/modules/hardware/network/smc-2632w/default.nix
+++ b/nixos/modules/hardware/network/smc-2632w/default.nix
@@ -1,4 +1,4 @@
-{lib, config, ...}:
+{lib, ...}:
 
 {
   hardware = {
diff --git a/nixos/modules/hardware/network/zydas-zd1211.nix b/nixos/modules/hardware/network/zydas-zd1211.nix
index c8428a7241b..5dd7f30ed82 100644
--- a/nixos/modules/hardware/network/zydas-zd1211.nix
+++ b/nixos/modules/hardware/network/zydas-zd1211.nix
@@ -1,4 +1,4 @@
-{pkgs, config, ...}:
+{pkgs, ...}:
 
 {
   hardware.firmware = [ pkgs.zd1211fw ];
diff --git a/nixos/modules/hardware/video/ati.nix b/nixos/modules/hardware/video/ati.nix
index 022fdea0a0a..2fa37af6ca5 100644
--- a/nixos/modules/hardware/video/ati.nix
+++ b/nixos/modules/hardware/video/ati.nix
@@ -1,6 +1,6 @@
 # This module provides the proprietary ATI X11 / OpenGL drivers.
 
-{ config, lib, pkgs, pkgs_i686, ... }:
+{ config, lib, pkgs_i686, ... }:
 
 with lib;
 
diff --git a/nixos/modules/hardware/video/capture/mwprocapture.nix b/nixos/modules/hardware/video/capture/mwprocapture.nix
index aee15dcec6e..61bab533eda 100644
--- a/nixos/modules/hardware/video/capture/mwprocapture.nix
+++ b/nixos/modules/hardware/video/capture/mwprocapture.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, ... }:
 
 with lib;
 
diff --git a/nixos/modules/hardware/video/uvcvideo/uvcdynctrl-udev-rules.nix b/nixos/modules/hardware/video/uvcvideo/uvcdynctrl-udev-rules.nix
index 832e6196612..2cf5f13bc15 100644
--- a/nixos/modules/hardware/video/uvcvideo/uvcdynctrl-udev-rules.nix
+++ b/nixos/modules/hardware/video/uvcvideo/uvcdynctrl-udev-rules.nix
@@ -1,6 +1,4 @@
-{ lib
-, stdenv
-, buildEnv
+{ buildEnv
 , libwebcam
 , makeWrapper
 , runCommand
diff --git a/nixos/modules/installer/cd-dvd/installation-cd-graphical-kde-new-kernel.nix b/nixos/modules/installer/cd-dvd/installation-cd-graphical-kde-new-kernel.nix
index a4bcd7079a4..3336d512cfd 100644
--- a/nixos/modules/installer/cd-dvd/installation-cd-graphical-kde-new-kernel.nix
+++ b/nixos/modules/installer/cd-dvd/installation-cd-graphical-kde-new-kernel.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ pkgs, ... }:
 
 {
   imports = [ ./installation-cd-graphical-kde.nix ];
diff --git a/nixos/modules/installer/cd-dvd/installation-cd-minimal-new-kernel.nix b/nixos/modules/installer/cd-dvd/installation-cd-minimal-new-kernel.nix
index 4363c8e6c93..3911a2b01b1 100644
--- a/nixos/modules/installer/cd-dvd/installation-cd-minimal-new-kernel.nix
+++ b/nixos/modules/installer/cd-dvd/installation-cd-minimal-new-kernel.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ pkgs, ... }:
 
 {
   imports = [ ./installation-cd-minimal.nix ];
diff --git a/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix b/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix
index 7ec55f159d0..3dc0f606bf6 100644
--- a/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix
+++ b/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix
@@ -1,7 +1,7 @@
 # This module defines a small NixOS installation CD.  It does not
 # contain any graphical stuff.
 
-{ config, lib, pkgs, ... }:
+{ ... }:
 
 {
   imports =
diff --git a/nixos/modules/installer/netboot/netboot-base.nix b/nixos/modules/installer/netboot/netboot-base.nix
index 5e8f7f93d92..da7d760ad2f 100644
--- a/nixos/modules/installer/netboot/netboot-base.nix
+++ b/nixos/modules/installer/netboot/netboot-base.nix
@@ -1,7 +1,7 @@
 # This module contains the basic configuration for building netboot
 # images
 
-{ config, lib, pkgs, ... }:
+{ lib, ... }:
 
 with lib;
 
diff --git a/nixos/modules/installer/netboot/netboot-minimal.nix b/nixos/modules/installer/netboot/netboot-minimal.nix
index 8ad6234edc7..1563501a7e0 100644
--- a/nixos/modules/installer/netboot/netboot-minimal.nix
+++ b/nixos/modules/installer/netboot/netboot-minimal.nix
@@ -1,6 +1,6 @@
 # This module defines a small netboot environment.
 
-{ config, lib, ... }:
+{ ... }:
 
 {
   imports =
diff --git a/nixos/modules/installer/scan/detected.nix b/nixos/modules/installer/scan/detected.nix
index 7e181acb93b..5c5fba56f51 100644
--- a/nixos/modules/installer/scan/detected.nix
+++ b/nixos/modules/installer/scan/detected.nix
@@ -1,6 +1,6 @@
 # List all devices which are detected by nixos-generate-config.
 # Common devices are enabled by default.
-{ config, lib, pkgs, ... }:
+{ lib, ... }:
 
 with lib;
 
diff --git a/nixos/modules/installer/tools/tools.nix b/nixos/modules/installer/tools/tools.nix
index 05029628672..af0a3a2fcc8 100644
--- a/nixos/modules/installer/tools/tools.nix
+++ b/nixos/modules/installer/tools/tools.nix
@@ -1,7 +1,7 @@
 # This module generates nixos-install, nixos-rebuild,
 # nixos-generate-config, etc.
 
-{ config, lib, pkgs, modulesPath, ... }:
+{ config, lib, pkgs, ... }:
 
 with lib;
 
diff --git a/nixos/modules/installer/virtualbox-demo.nix b/nixos/modules/installer/virtualbox-demo.nix
index f58c3658780..f823c0d83bb 100644
--- a/nixos/modules/installer/virtualbox-demo.nix
+++ b/nixos/modules/installer/virtualbox-demo.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ lib, ... }:
 
 with lib;
 
diff --git a/nixos/modules/misc/assertions.nix b/nixos/modules/misc/assertions.nix
index 3b50e60a0ff..550b3ac97f6 100644
--- a/nixos/modules/misc/assertions.nix
+++ b/nixos/modules/misc/assertions.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ lib, ... }:
 
 with lib;
 
diff --git a/nixos/modules/misc/extra-arguments.nix b/nixos/modules/misc/extra-arguments.nix
index f4ee94ecc0d..8716e3d9fef 100644
--- a/nixos/modules/misc/extra-arguments.nix
+++ b/nixos/modules/misc/extra-arguments.nix
@@ -1,4 +1,4 @@
-{ lib, pkgs, config, ... }:
+{ pkgs, ... }:
 
 {
   _module.args = {
diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index 14c661553c6..782f6c8f69d 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -9,7 +9,7 @@
 # Systemd can also change ownership of service directories using the
 # RuntimeDirectory/StateDirectory options.
 
-{ config, pkgs, lib, ... }:
+{ lib, ... }:
 
 {
   options = {
diff --git a/nixos/modules/misc/label.nix b/nixos/modules/misc/label.nix
index 8e5e57b3b83..02b91555b3c 100644
--- a/nixos/modules/misc/label.nix
+++ b/nixos/modules/misc/label.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, ... }:
 
 with lib;
 
diff --git a/nixos/modules/misc/lib.nix b/nixos/modules/misc/lib.nix
index be8000ac029..121f396701e 100644
--- a/nixos/modules/misc/lib.nix
+++ b/nixos/modules/misc/lib.nix
@@ -1,4 +1,4 @@
-{ config, lib, ... }:
+{ lib, ... }:
 
 {
   options = {
diff --git a/nixos/modules/misc/locate.nix b/nixos/modules/misc/locate.nix
index dd6a2f67b30..449149e4bb6 100644
--- a/nixos/modules/misc/locate.nix
+++ b/nixos/modules/misc/locate.nix
@@ -1,4 +1,4 @@
-{ config, options, lib, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
 with lib;
 
diff --git a/nixos/modules/misc/meta.nix b/nixos/modules/misc/meta.nix
index 7a1e751394c..be3f4cbbcfe 100644
--- a/nixos/modules/misc/meta.nix
+++ b/nixos/modules/misc/meta.nix
@@ -1,4 +1,4 @@
-{ config, lib, ... }:
+{ lib, ... }:
 
 with lib;
 
diff --git a/nixos/modules/misc/passthru.nix b/nixos/modules/misc/passthru.nix
index f3c9f6ba651..4e99631fdd8 100644
--- a/nixos/modules/misc/passthru.nix
+++ b/nixos/modules/misc/passthru.nix
@@ -1,7 +1,7 @@
 # This module allows you to export something from configuration
 # Use case: export kernel source expression for ease of configuring
 
-{ config, lib, ... }:
+{ lib, ... }:
 
 {
   options = {
diff --git a/nixos/modules/profiles/all-hardware.nix b/nixos/modules/profiles/all-hardware.nix
index f56640f1978..0d7124be0a5 100644
--- a/nixos/modules/profiles/all-hardware.nix
+++ b/nixos/modules/profiles/all-hardware.nix
@@ -3,7 +3,7 @@
 # enabled in the initrd.  Its primary use is in the NixOS installation
 # CDs.
 
-{ config, pkgs, ... }:
+{ ... }:
 
 {
 
diff --git a/nixos/modules/profiles/base.nix b/nixos/modules/profiles/base.nix
index 406a69722de..5aaffa4f1f2 100644
--- a/nixos/modules/profiles/base.nix
+++ b/nixos/modules/profiles/base.nix
@@ -1,7 +1,7 @@
 # This module defines the software packages included in the "minimal"
 # installation CD.  It might be useful elsewhere.
 
-{ config, lib, pkgs, ... }:
+{ lib, pkgs, ... }:
 
 {
   # Include some utilities that are useful for installing or repairing
diff --git a/nixos/modules/profiles/demo.nix b/nixos/modules/profiles/demo.nix
index 7477795a94e..18f190071ba 100644
--- a/nixos/modules/profiles/demo.nix
+++ b/nixos/modules/profiles/demo.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ ... }:
 
 {
   imports = [ ./graphical.nix ];
diff --git a/nixos/modules/profiles/graphical.nix b/nixos/modules/profiles/graphical.nix
index fe9851e79a6..332cf58aa53 100644
--- a/nixos/modules/profiles/graphical.nix
+++ b/nixos/modules/profiles/graphical.nix
@@ -1,7 +1,7 @@
 # This module defines a NixOS configuration with the Plasma 5 desktop.
 # It's used by the graphical installation CD.
 
-{ config, pkgs, ... }:
+{ pkgs, ... }:
 
 {
   services.xserver = {
diff --git a/nixos/modules/profiles/hardened.nix b/nixos/modules/profiles/hardened.nix
index 456538742f5..2af8bf1f8e3 100644
--- a/nixos/modules/profiles/hardened.nix
+++ b/nixos/modules/profiles/hardened.nix
@@ -1,7 +1,7 @@
 # A profile with most (vanilla) hardening options enabled by default,
 # potentially at the cost of features and performance.
 
-{ config, lib, pkgs, ... }:
+{ lib, pkgs, ... }:
 
 with lib;
 
diff --git a/nixos/modules/profiles/headless.nix b/nixos/modules/profiles/headless.nix
index 67f8d633bab..131ee272859 100644
--- a/nixos/modules/profiles/headless.nix
+++ b/nixos/modules/profiles/headless.nix
@@ -1,7 +1,7 @@
 # Common configuration for headless machines (e.g., Amazon EC2
 # instances).
 
-{ config, lib, pkgs, ... }:
+{ lib, ... }:
 
 with lib;
 
diff --git a/nixos/modules/profiles/minimal.nix b/nixos/modules/profiles/minimal.nix
index 40df7063a9b..ed04e46c77d 100644
--- a/nixos/modules/profiles/minimal.nix
+++ b/nixos/modules/profiles/minimal.nix
@@ -1,7 +1,7 @@
 # This module defines a small NixOS configuration.  It does not
 # contain any graphical stuff.
 
-{ config, lib, pkgs, ... }:
+{ config, lib, ... }:
 
 with lib;
 
diff --git a/nixos/modules/profiles/qemu-guest.nix b/nixos/modules/profiles/qemu-guest.nix
index a1ec1d45395..315d04093b1 100644
--- a/nixos/modules/profiles/qemu-guest.nix
+++ b/nixos/modules/profiles/qemu-guest.nix
@@ -1,7 +1,7 @@
 # Common configuration for virtual machines running under QEMU (using
 # virtio).
 
-{ config, pkgs, ... }:
+{ ... }:
 
 {
   boot.initrd.availableKernelModules = [ "virtio_net" "virtio_pci" "virtio_mmio" "virtio_blk" "virtio_scsi" "9p" "9pnet_virtio" ];
diff --git a/nixos/modules/programs/atop.nix b/nixos/modules/programs/atop.nix
index b91bd98047e..4651cdb76e0 100644
--- a/nixos/modules/programs/atop.nix
+++ b/nixos/modules/programs/atop.nix
@@ -1,6 +1,6 @@
 # Global configuration for atop.
 
-{ config, lib, pkgs, ... }:
+{ config, lib, ... }:
 
 with lib;
 
diff --git a/nixos/modules/programs/bcc.nix b/nixos/modules/programs/bcc.nix
index 3522ab22fa8..d76249bb5ca 100644
--- a/nixos/modules/programs/bcc.nix
+++ b/nixos/modules/programs/bcc.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, ... }:
 {
   options.programs.bcc.enable = lib.mkEnableOption "bcc";
 
diff --git a/nixos/modules/programs/environment.nix b/nixos/modules/programs/environment.nix
index 06ebb7bc729..3bac8d98990 100644
--- a/nixos/modules/programs/environment.nix
+++ b/nixos/modules/programs/environment.nix
@@ -2,7 +2,7 @@
 
 # Most of the stuff here should probably be moved elsewhere sometime.
 
-{ config, lib, pkgs, ... }:
+{ config, lib, ... }:
 
 with lib;
 
diff --git a/nixos/modules/programs/shell.nix b/nixos/modules/programs/shell.nix
index 26ef1875992..3b5212c9e76 100644
--- a/nixos/modules/programs/shell.nix
+++ b/nixos/modules/programs/shell.nix
@@ -1,6 +1,6 @@
 # This module defines a standard configuration for NixOS shells.
 
-{ config, lib, pkgs, ... }:
+{ config, lib, ... }:
 
 with lib;
 
diff --git a/nixos/modules/programs/systemtap.nix b/nixos/modules/programs/systemtap.nix
index fd84732cd41..ca81e018c9d 100644
--- a/nixos/modules/programs/systemtap.nix
+++ b/nixos/modules/programs/systemtap.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, ... }:
 
 with lib;
 
diff --git a/nixos/modules/security/hidepid.nix b/nixos/modules/security/hidepid.nix
index 96443fda758..55a48ea3c9c 100644
--- a/nixos/modules/security/hidepid.nix
+++ b/nixos/modules/security/hidepid.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, lib, ... }:
+{ config, lib, ... }:
 with lib;
 
 {
diff --git a/nixos/modules/security/oath.nix b/nixos/modules/security/oath.nix
index 20f3e2dd9f8..93bdc851117 100644
--- a/nixos/modules/security/oath.nix
+++ b/nixos/modules/security/oath.nix
@@ -1,6 +1,6 @@
 # This module provides configuration for the OATH PAM modules.
 
-{ config, lib, pkgs, ... }:
+{ lib, ... }:
 
 with lib;
 
diff --git a/nixos/modules/services/backup/bacula.nix b/nixos/modules/services/backup/bacula.nix
index be02ba56795..a0565ca2620 100644
--- a/nixos/modules/services/backup/bacula.nix
+++ b/nixos/modules/services/backup/bacula.nix
@@ -97,7 +97,7 @@ let
     ${dir_cfg.extraConfig}
     '';
 
-  directorOptions = {name, config, ...}:
+  directorOptions = {...}:
   {
     options = {
       password = mkOption {
@@ -117,7 +117,7 @@ let
     };
   };
 
-  deviceOptions = {name, config, ...}:
+  deviceOptions = {...}:
   {
     options = {
       archiveDevice = mkOption {
diff --git a/nixos/modules/services/backup/borgbackup.nix b/nixos/modules/services/backup/borgbackup.nix
index 0c3fc9af6f8..415a70ea5ad 100644
--- a/nixos/modules/services/backup/borgbackup.nix
+++ b/nixos/modules/services/backup/borgbackup.nix
@@ -510,7 +510,7 @@ in {
     '';
     default = { };
     type = types.attrsOf (types.submodule (
-      { name, config, ... }: {
+      { ... }: {
         options = {
           
           path = mkOption {
diff --git a/nixos/modules/services/backup/restic.nix b/nixos/modules/services/backup/restic.nix
index 409c05221d0..9b31ff3b582 100644
--- a/nixos/modules/services/backup/restic.nix
+++ b/nixos/modules/services/backup/restic.nix
@@ -6,7 +6,7 @@ with lib;
     description = ''
       Periodic backups to create with Restic.
     '';
-    type = types.attrsOf (types.submodule ({ name, config, ... }: {
+    type = types.attrsOf (types.submodule ({ name, ... }: {
       options = {
         passwordFile = mkOption {
           type = types.str;
diff --git a/nixos/modules/services/continuous-integration/jenkins/slave.nix b/nixos/modules/services/continuous-integration/jenkins/slave.nix
index d8f55fb826f..92deabc3dd3 100644
--- a/nixos/modules/services/continuous-integration/jenkins/slave.nix
+++ b/nixos/modules/services/continuous-integration/jenkins/slave.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, ... }:
 with lib;
 let
   cfg = config.services.jenkinsSlave;
diff --git a/nixos/modules/services/hardware/actkbd.nix b/nixos/modules/services/hardware/actkbd.nix
index b16a8f50a3d..4168140b287 100644
--- a/nixos/modules/services/hardware/actkbd.nix
+++ b/nixos/modules/services/hardware/actkbd.nix
@@ -15,7 +15,7 @@ let
     ${cfg.extraConfig}
   '';
 
-  bindingCfg = { config, ... }: {
+  bindingCfg = { ... }: {
     options = {
 
       keys = mkOption {
diff --git a/nixos/modules/services/hardware/nvidia-optimus.nix b/nixos/modules/services/hardware/nvidia-optimus.nix
index eb1713baa14..d53175052c7 100644
--- a/nixos/modules/services/hardware/nvidia-optimus.nix
+++ b/nixos/modules/services/hardware/nvidia-optimus.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, lib, ... }:
+{ config, lib, ... }:
 
 let kernel = config.boot.kernelPackages; in
 
diff --git a/nixos/modules/services/hardware/sane_extra_backends/brscan4.nix b/nixos/modules/services/hardware/sane_extra_backends/brscan4.nix
index 1923addeb3a..f6ed4e25e9c 100644
--- a/nixos/modules/services/hardware/sane_extra_backends/brscan4.nix
+++ b/nixos/modules/services/hardware/sane_extra_backends/brscan4.nix
@@ -9,7 +9,7 @@ let
 
   etcFiles = pkgs.callPackage ./brscan4_etc_files.nix { netDevices = netDeviceList; };
 
-  netDeviceOpts = { name, config, ... }: {
+  netDeviceOpts = { name, ... }: {
 
     options = {
 
diff --git a/nixos/modules/services/logging/journalwatch.nix b/nixos/modules/services/logging/journalwatch.nix
index 2c9bc18c8c3..d0824df38ae 100644
--- a/nixos/modules/services/logging/journalwatch.nix
+++ b/nixos/modules/services/logging/journalwatch.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, services, ... }:
+{ config, lib, pkgs, ... }:
 with lib;
 
 let
diff --git a/nixos/modules/services/mail/dovecot.nix b/nixos/modules/services/mail/dovecot.nix
index 04df97fdbbe..e6091182b2a 100644
--- a/nixos/modules/services/mail/dovecot.nix
+++ b/nixos/modules/services/mail/dovecot.nix
@@ -110,7 +110,7 @@ let
       special_use = \${toString mailbox.specialUse}
   '' + "}";
 
-  mailboxes = { lib, pkgs, ... }: {
+  mailboxes = { ... }: {
     options = {
       name = mkOption {
         type = types.strMatching ''[^"]+'';
diff --git a/nixos/modules/services/mail/mail.nix b/nixos/modules/services/mail/mail.nix
index cfe1b5496a4..fed313e4738 100644
--- a/nixos/modules/services/mail/mail.nix
+++ b/nixos/modules/services/mail/mail.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, ... }:
 
 with lib;
 
diff --git a/nixos/modules/services/misc/emby.nix b/nixos/modules/services/misc/emby.nix
index 92a68b60251..64cc9c610ac 100644
--- a/nixos/modules/services/misc/emby.nix
+++ b/nixos/modules/services/misc/emby.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, lib, mono, ... }:
+{ config, pkgs, lib, ... }:
 
 with lib;
 
diff --git a/nixos/modules/services/misc/jackett.nix b/nixos/modules/services/misc/jackett.nix
index db72d36f2ac..8d1b3d225a4 100644
--- a/nixos/modules/services/misc/jackett.nix
+++ b/nixos/modules/services/misc/jackett.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, lib, mono, ... }:
+{ config, pkgs, lib, ... }:
 
 with lib;
 
diff --git a/nixos/modules/services/misc/nix-gc.nix b/nixos/modules/services/misc/nix-gc.nix
index 8b493041b2c..12bed05757a 100644
--- a/nixos/modules/services/misc/nix-gc.nix
+++ b/nixos/modules/services/misc/nix-gc.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, ... }:
 
 with lib;
 
diff --git a/nixos/modules/services/misc/nix-optimise.nix b/nixos/modules/services/misc/nix-optimise.nix
index 295e7fb0ba0..6f75e4dd03e 100644
--- a/nixos/modules/services/misc/nix-optimise.nix
+++ b/nixos/modules/services/misc/nix-optimise.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, ... }:
 
 with lib;
 
diff --git a/nixos/modules/services/misc/nix-ssh-serve.nix b/nixos/modules/services/misc/nix-ssh-serve.nix
index 87ed7f0a61b..7ce3841be2f 100644
--- a/nixos/modules/services/misc/nix-ssh-serve.nix
+++ b/nixos/modules/services/misc/nix-ssh-serve.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, ... }:
 
 with lib;
 let cfg = config.nix.sshServe;
diff --git a/nixos/modules/services/misc/radarr.nix b/nixos/modules/services/misc/radarr.nix
index 7738eacc6ae..1a9fad3883c 100644
--- a/nixos/modules/services/misc/radarr.nix
+++ b/nixos/modules/services/misc/radarr.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, lib, mono, ... }:
+{ config, pkgs, lib, ... }:
 
 with lib;
 
diff --git a/nixos/modules/services/misc/sonarr.nix b/nixos/modules/services/misc/sonarr.nix
index edba4e6c23e..97b67a0b503 100644
--- a/nixos/modules/services/misc/sonarr.nix
+++ b/nixos/modules/services/misc/sonarr.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, lib, mono, ... }:
+{ config, pkgs, lib, ... }:
 
 with lib;
 
diff --git a/nixos/modules/services/misc/taskserver/default.nix b/nixos/modules/services/misc/taskserver/default.nix
index 7daf12f9171..5f97abf1871 100644
--- a/nixos/modules/services/misc/taskserver/default.nix
+++ b/nixos/modules/services/misc/taskserver/default.nix
@@ -84,7 +84,7 @@ let
     in flatten (mapAttrsToList mkSublist attrs);
   in all isNull (findPkiDefinitions [] manualPkiOptions);
 
-  orgOptions = { name, ... }: {
+  orgOptions = { ... }: {
     options.users = mkOption {
       type = types.uniq (types.listOf types.str);
       default = [];
diff --git a/nixos/modules/services/monitoring/prometheus/exporters.nix b/nixos/modules/services/monitoring/prometheus/exporters.nix
index 8d2c303a69e..9c58a15bcd7 100644
--- a/nixos/modules/services/monitoring/prometheus/exporters.nix
+++ b/nixos/modules/services/monitoring/prometheus/exporters.nix
@@ -94,7 +94,7 @@ let
     };
   });
 
-  mkSubModule = { name, port, extraOpts, serviceOpts }: {
+  mkSubModule = { name, port, extraOpts, ... }: {
     ${name} = mkOption {
       type = types.submodule {
         options = (mkExporterOpts {
diff --git a/nixos/modules/services/monitoring/smartd.nix b/nixos/modules/services/monitoring/smartd.nix
index fecae4ca1b3..c345ec48a01 100644
--- a/nixos/modules/services/monitoring/smartd.nix
+++ b/nixos/modules/services/monitoring/smartd.nix
@@ -64,7 +64,7 @@ let
        "DEVICESCAN ${notifyOpts}${cfg.defaults.autodetected}"}
   '';
 
-  smartdDeviceOpts = { name, ... }: {
+  smartdDeviceOpts = { ... }: {
 
     options = {
 
diff --git a/nixos/modules/services/network-filesystems/beegfs.nix b/nixos/modules/services/network-filesystems/beegfs.nix
index 182fabf6405..e06a80e443d 100644
--- a/nixos/modules/services/network-filesystems/beegfs.nix
+++ b/nixos/modules/services/network-filesystems/beegfs.nix
@@ -139,7 +139,7 @@ in
       description = ''
         BeeGFS configurations. Every mount point requires a separate configuration.
       '';
-      type = with types; attrsOf (submodule ({ config, ... } : {
+      type = with types; attrsOf (submodule ({ ... } : {
         options = {
           mgmtdHost = mkOption {
             type = types.str;
diff --git a/nixos/modules/services/network-filesystems/openafs/lib.nix b/nixos/modules/services/network-filesystems/openafs/lib.nix
index 255740ac65e..a0d4a3a9705 100644
--- a/nixos/modules/services/network-filesystems/openafs/lib.nix
+++ b/nixos/modules/services/network-filesystems/openafs/lib.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ...}:
+{ config, lib, ...}:
 
 let
   inherit (lib) concatStringsSep getBin mkOption types;
diff --git a/nixos/modules/services/networking/avahi-daemon.nix b/nixos/modules/services/networking/avahi-daemon.nix
index 81e11db1040..2ec5a10b481 100644
--- a/nixos/modules/services/networking/avahi-daemon.nix
+++ b/nixos/modules/services/networking/avahi-daemon.nix
@@ -1,5 +1,5 @@
 # Avahi daemon.
-{ config, lib, utils, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
 with lib;
 
diff --git a/nixos/modules/services/networking/cjdns.nix b/nixos/modules/services/networking/cjdns.nix
index 39b62bdc709..c40962f4aa8 100644
--- a/nixos/modules/services/networking/cjdns.nix
+++ b/nixos/modules/services/networking/cjdns.nix
@@ -9,7 +9,7 @@ let
   cfg = config.services.cjdns;
 
   connectToSubmodule =
-  { options, ... }:
+  { ... }:
   { options =
     { password = mkOption {
       type = types.str;
diff --git a/nixos/modules/services/networking/i2pd.nix b/nixos/modules/services/networking/i2pd.nix
index 4f219fe56b4..3afafaf3fed 100644
--- a/nixos/modules/services/networking/i2pd.nix
+++ b/nixos/modules/services/networking/i2pd.nix
@@ -405,7 +405,7 @@ in
       outTunnels = mkOption {
         default = {};
         type = with types; loaOf (submodule (
-          { name, config, ... }: {
+          { name, ... }: {
             options = {
               destinationPort = mkOption {
                 type = types.int;
@@ -426,7 +426,7 @@ in
       inTunnels = mkOption {
         default = {};
         type = with types; loaOf (submodule (
-          { name, config, ... }: {
+          { name, ... }: {
             options = {
               inPort = mkOption {
                 type = types.int;
diff --git a/nixos/modules/services/networking/nghttpx/nghttpx-options.nix b/nixos/modules/services/networking/nghttpx/nghttpx-options.nix
index cce65be321a..51f1d081b97 100644
--- a/nixos/modules/services/networking/nghttpx/nghttpx-options.nix
+++ b/nixos/modules/services/networking/nghttpx/nghttpx-options.nix
@@ -1,4 +1,4 @@
-{ config, lib, ... }:
+{ lib, ... }:
 { options.services.nghttpx = {
     enable = lib.mkEnableOption "nghttpx";
 
diff --git a/nixos/modules/services/networking/nylon.nix b/nixos/modules/services/networking/nylon.nix
index b7b59d95bf0..613b0e0fb51 100644
--- a/nixos/modules/services/networking/nylon.nix
+++ b/nixos/modules/services/networking/nylon.nix
@@ -22,7 +22,7 @@ let
     Deny-IP=${concatStringsSep " " cfg.deniedIPRanges}
   '';
 
-  nylonOpts = { name, config, ... }: {
+  nylonOpts = { name, ... }: {
 
     options = {
 
diff --git a/nixos/modules/services/networking/pptpd.nix b/nixos/modules/services/networking/pptpd.nix
index 513e6174752..56a612b9105 100644
--- a/nixos/modules/services/networking/pptpd.nix
+++ b/nixos/modules/services/networking/pptpd.nix
@@ -1,4 +1,4 @@
-{ config, stdenv, pkgs, lib, ... }:
+{ config, pkgs, lib, ... }:
 
 with lib;
 
diff --git a/nixos/modules/services/networking/shout.nix b/nixos/modules/services/networking/shout.nix
index 9784f1d160f..1ea676d0f92 100644
--- a/nixos/modules/services/networking/shout.nix
+++ b/nixos/modules/services/networking/shout.nix
@@ -1,4 +1,4 @@
-{ pkgs, lib, config, options, ... }:
+{ pkgs, lib, config, ... }:
 
 with lib;
 
diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix
index 7b2d1920f0f..c16fbe8a52f 100644
--- a/nixos/modules/services/networking/ssh/sshd.nix
+++ b/nixos/modules/services/networking/ssh/sshd.nix
@@ -479,7 +479,7 @@ in
 
     assertions = [{ assertion = if cfg.forwardX11 then cfgc.setXAuthLocation else true;
                     message = "cannot enable X11 forwarding without setting xauth location";}]
-      ++ flip map cfg.listenAddresses ({ addr, port, ... }: {
+      ++ flip map cfg.listenAddresses ({ addr, ... }: {
         assertion = addr != null;
         message = "addr must be specified in each listenAddresses entry";
       });
diff --git a/nixos/modules/services/networking/toxvpn.nix b/nixos/modules/services/networking/toxvpn.nix
index f5baea9222b..b7655f4bec6 100644
--- a/nixos/modules/services/networking/toxvpn.nix
+++ b/nixos/modules/services/networking/toxvpn.nix
@@ -1,4 +1,4 @@
-{ config, stdenv, pkgs, lib, ... }:
+{ config, pkgs, lib, ... }:
 
 with lib;
 
diff --git a/nixos/modules/services/networking/tvheadend.nix b/nixos/modules/services/networking/tvheadend.nix
index f495c39967e..ccf87999663 100644
--- a/nixos/modules/services/networking/tvheadend.nix
+++ b/nixos/modules/services/networking/tvheadend.nix
@@ -1,4 +1,4 @@
-{ config, coreutils, lib, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
 with lib;
 
diff --git a/nixos/modules/services/networking/wireguard.nix b/nixos/modules/services/networking/wireguard.nix
index acb4778d848..1b87b77f976 100644
--- a/nixos/modules/services/networking/wireguard.nix
+++ b/nixos/modules/services/networking/wireguard.nix
@@ -10,7 +10,7 @@ let
 
   # interface options
 
-  interfaceOpts = { name, ... }: {
+  interfaceOpts = { ... }: {
 
     options = {
 
diff --git a/nixos/modules/services/networking/xl2tpd.nix b/nixos/modules/services/networking/xl2tpd.nix
index 5e006c13f0d..46111a76af8 100644
--- a/nixos/modules/services/networking/xl2tpd.nix
+++ b/nixos/modules/services/networking/xl2tpd.nix
@@ -1,4 +1,4 @@
-{ config, stdenv, pkgs, lib, ... }:
+{ config, pkgs, lib, ... }:
 
 with lib;
 
diff --git a/nixos/modules/services/networking/zerobin.nix b/nixos/modules/services/networking/zerobin.nix
index 274bbca53fa..06ccd7032e6 100644
--- a/nixos/modules/services/networking/zerobin.nix
+++ b/nixos/modules/services/networking/zerobin.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, lib, nodes, ... }:
+{ config, pkgs, lib, ... }:
 with lib;
 let
   cfg = config.services.zerobin;
diff --git a/nixos/modules/services/security/oauth2_proxy_nginx.nix b/nixos/modules/services/security/oauth2_proxy_nginx.nix
index 2aa2c57fd22..a9ad5497a65 100644
--- a/nixos/modules/services/security/oauth2_proxy_nginx.nix
+++ b/nixos/modules/services/security/oauth2_proxy_nginx.nix
@@ -1,4 +1,4 @@
-{ pkgs, config, lib, ... }:
+{ config, lib, ... }:
 with lib;
 let
   cfg = config.services.oauth2_proxy.nginx;
diff --git a/nixos/modules/services/security/tor.nix b/nixos/modules/services/security/tor.nix
index dcb41d187c2..def77ba69e5 100644
--- a/nixos/modules/services/security/tor.nix
+++ b/nixos/modules/services/security/tor.nix
@@ -578,7 +578,7 @@ in
             ];
           }
         '';
-        type = types.loaOf (types.submodule ({name, config, ...}: {
+        type = types.loaOf (types.submodule ({name, ...}: {
           options = {
 
              name = mkOption {
@@ -638,7 +638,7 @@ in
              authorizeClient = mkOption {
                default = null;
                description = "If configured, the hidden service is accessible for authorized clients only.";
-               type = types.nullOr (types.submodule ({config, ...}: {
+               type = types.nullOr (types.submodule ({...}: {
 
                  options = {
 
diff --git a/nixos/modules/services/torrent/flexget.nix b/nixos/modules/services/torrent/flexget.nix
index 4b9038e3e25..ca63f529a5d 100644
--- a/nixos/modules/services/torrent/flexget.nix
+++ b/nixos/modules/services/torrent/flexget.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, timezone, ... }:
+{ config, lib, pkgs, ... }:
 
 with lib;
 
diff --git a/nixos/modules/services/web-apps/matomo.nix b/nixos/modules/services/web-apps/matomo.nix
index 42affb06b51..fbbd7715c6b 100644
--- a/nixos/modules/services/web-apps/matomo.nix
+++ b/nixos/modules/services/web-apps/matomo.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, services, ... }:
+{ config, lib, pkgs, ... }:
 with lib;
 let
   cfg = config.services.matomo;
diff --git a/nixos/modules/services/web-apps/youtrack.nix b/nixos/modules/services/web-apps/youtrack.nix
index e057e302562..8c675c64200 100644
--- a/nixos/modules/services/web-apps/youtrack.nix
+++ b/nixos/modules/services/web-apps/youtrack.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, options, ... }:
+{ config, lib, pkgs, ... }:
 
 with lib;
 
diff --git a/nixos/modules/services/web-servers/apache-httpd/limesurvey.nix b/nixos/modules/services/web-servers/apache-httpd/limesurvey.nix
index 6f1f67970f6..77194f34749 100644
--- a/nixos/modules/services/web-servers/apache-httpd/limesurvey.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/limesurvey.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, serverInfo, php, ... }:
+{ config, lib, pkgs, serverInfo, ... }:
 
 with lib;
 
diff --git a/nixos/modules/services/web-servers/apache-httpd/mercurial.nix b/nixos/modules/services/web-servers/apache-httpd/mercurial.nix
index 6dd91be00a7..4b8ee2b17ea 100644
--- a/nixos/modules/services/web-servers/apache-httpd/mercurial.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/mercurial.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, serverInfo, lib, ... }:
+{ config, pkgs, lib, ... }:
 
 let
   inherit (pkgs) mercurial;
diff --git a/nixos/modules/services/web-servers/apache-httpd/wordpress.nix b/nixos/modules/services/web-servers/apache-httpd/wordpress.nix
index 1c654667dfc..c810b914e25 100644
--- a/nixos/modules/services/web-servers/apache-httpd/wordpress.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/wordpress.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, serverInfo, php, ... }:
+{ config, lib, pkgs, serverInfo, ... }:
 # http://codex.wordpress.org/Hardening_WordPress
 
 with lib;
diff --git a/nixos/modules/services/web-servers/nginx/vhost-options.nix b/nixos/modules/services/web-servers/nginx/vhost-options.nix
index e4494dff37d..1075b00768f 100644
--- a/nixos/modules/services/web-servers/nginx/vhost-options.nix
+++ b/nixos/modules/services/web-servers/nginx/vhost-options.nix
@@ -3,7 +3,7 @@
 # has additional options that affect the web server as a whole, like
 # the user/group to run under.)
 
-{ config, lib }:
+{ lib, ... }:
 
 with lib;
 {
diff --git a/nixos/modules/services/web-servers/zope2.nix b/nixos/modules/services/web-servers/zope2.nix
index 1dcc3ac9d8d..4cad2a2ff77 100644
--- a/nixos/modules/services/web-servers/zope2.nix
+++ b/nixos/modules/services/web-servers/zope2.nix
@@ -6,7 +6,7 @@ let
 
   cfg = config.services.zope2;
 
-  zope2Opts = { name, config, ... }: {
+  zope2Opts = { name, ... }: {
     options = {
 
       name = mkOption {
diff --git a/nixos/modules/services/x11/display-managers/auto.nix b/nixos/modules/services/x11/display-managers/auto.nix
index c02ccdf12b6..d2aae64bf22 100644
--- a/nixos/modules/services/x11/display-managers/auto.nix
+++ b/nixos/modules/services/x11/display-managers/auto.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, ... }:
 
 with lib;
 
diff --git a/nixos/modules/services/x11/terminal-server.nix b/nixos/modules/services/x11/terminal-server.nix
index 09a7f386876..503c14c9b62 100644
--- a/nixos/modules/services/x11/terminal-server.nix
+++ b/nixos/modules/services/x11/terminal-server.nix
@@ -5,7 +5,7 @@
 # not, a X server (Xvfb) is started for that user.  The Xvfb instances
 # persist across VNC sessions.
 
-{ config, lib, pkgs, ... }:
+{ lib, pkgs, ... }:
 
 with lib;
 
diff --git a/nixos/modules/services/x11/window-managers/default.nix b/nixos/modules/services/x11/window-managers/default.nix
index e617e55a7a5..06c59342b45 100644
--- a/nixos/modules/services/x11/window-managers/default.nix
+++ b/nixos/modules/services/x11/window-managers/default.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, ... }:
 
 with lib;
 
diff --git a/nixos/modules/services/x11/window-managers/wmii.nix b/nixos/modules/services/x11/window-managers/wmii.nix
index 30c8df78224..a414d8d4ac6 100644
--- a/nixos/modules/services/x11/window-managers/wmii.nix
+++ b/nixos/modules/services/x11/window-managers/wmii.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, options, modulesPath, ... }:
+{ config, lib, pkgs, ... }:
 
 with lib;
 let
diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix
index 3048cd02683..b45e510f6b8 100644
--- a/nixos/modules/services/x11/xserver.nix
+++ b/nixos/modules/services/x11/xserver.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, pkgs_i686, ... }:
+{ config, lib, pkgs, ... }:
 
 with lib;
 
diff --git a/nixos/modules/system/activation/top-level.nix b/nixos/modules/system/activation/top-level.nix
index e2d1dd49ef0..da29e08b369 100644
--- a/nixos/modules/system/activation/top-level.nix
+++ b/nixos/modules/system/activation/top-level.nix
@@ -226,7 +226,7 @@ in
       default = [];
       example = lib.literalExample "[ ({ original = pkgs.openssl; replacement = pkgs.callPackage /path/to/openssl { }; }) ]";
       type = types.listOf (types.submodule (
-        { options, ... }: {
+        { ... }: {
           options.original = mkOption {
             type = types.package;
             description = "The original package to override.";
diff --git a/nixos/modules/system/boot/kexec.nix b/nixos/modules/system/boot/kexec.nix
index 3fc1af28f62..3e5d7b40f2c 100644
--- a/nixos/modules/system/boot/kexec.nix
+++ b/nixos/modules/system/boot/kexec.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, lib, ... }:
+{ pkgs, lib, ... }:
 
 {
   config = lib.mkIf (pkgs.kexectools.meta.available) {
diff --git a/nixos/modules/system/boot/loader/loader.nix b/nixos/modules/system/boot/loader/loader.nix
index 28cceafea7c..7fbda9ef0f5 100644
--- a/nixos/modules/system/boot/loader/loader.nix
+++ b/nixos/modules/system/boot/loader/loader.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ lib, ... }:
 
 with lib;
 
diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix
index 9aa557ac859..ce770d06760 100644
--- a/nixos/modules/system/boot/networkd.nix
+++ b/nixos/modules/system/boot/networkd.nix
@@ -523,7 +523,7 @@ let
 
   };
 
-  networkConfig = { name, config, ... }: {
+  networkConfig = { config, ... }: {
     config = {
       matchConfig = optionalAttrs (config.name != null) {
         Name = config.name;
diff --git a/nixos/modules/system/boot/resolved.nix b/nixos/modules/system/boot/resolved.nix
index e1095fb988e..fc68904ae08 100644
--- a/nixos/modules/system/boot/resolved.nix
+++ b/nixos/modules/system/boot/resolved.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, ... }:
 
 with lib;
 let
diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index 500c2d40661..ed149f4791b 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -193,7 +193,7 @@ let
         x = pkgs.writeTextFile { name = "unit-script"; executable = true; destination = "/bin/${mkScriptName name}"; inherit text; };
     in "${x}/bin/${mkScriptName name}";
 
-  unitConfig = { name, config, ... }: {
+  unitConfig = { config, ... }: {
     config = {
       unitConfig =
         optionalAttrs (config.requires != [])
@@ -275,7 +275,7 @@ let
       ];
   };
 
-  mountConfig = { name, config, ... }: {
+  mountConfig = { config, ... }: {
     config = {
       mountConfig =
         { What = config.what;
@@ -288,7 +288,7 @@ let
     };
   };
 
-  automountConfig = { name, config, ... }: {
+  automountConfig = { config, ... }: {
     config = {
       automountConfig =
         { Where = config.where;
diff --git a/nixos/modules/system/boot/timesyncd.nix b/nixos/modules/system/boot/timesyncd.nix
index 18aad58b36c..8d8bfe5900a 100644
--- a/nixos/modules/system/boot/timesyncd.nix
+++ b/nixos/modules/system/boot/timesyncd.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, ... }:
 
 with lib;
 
diff --git a/nixos/modules/tasks/bcache.nix b/nixos/modules/tasks/bcache.nix
index 3bfdf89e0cf..8bab91c721f 100644
--- a/nixos/modules/tasks/bcache.nix
+++ b/nixos/modules/tasks/bcache.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ pkgs, ... }:
 
 {
 
diff --git a/nixos/modules/tasks/filesystems/ext.nix b/nixos/modules/tasks/filesystems/ext.nix
index 3a8999c242b..a14a3ac3854 100644
--- a/nixos/modules/tasks/filesystems/ext.nix
+++ b/nixos/modules/tasks/filesystems/ext.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ pkgs, ... }:
 
 {
   config = {
diff --git a/nixos/modules/tasks/network-interfaces-systemd.nix b/nixos/modules/tasks/network-interfaces-systemd.nix
index c640e886fca..2318bdd1d58 100644
--- a/nixos/modules/tasks/network-interfaces-systemd.nix
+++ b/nixos/modules/tasks/network-interfaces-systemd.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, utils, ... }:
+{ config, lib, utils, ... }:
 
 with utils;
 with lib;
diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix
index 7053aa57f80..20a740ce1f0 100644
--- a/nixos/modules/tasks/network-interfaces.nix
+++ b/nixos/modules/tasks/network-interfaces.nix
@@ -1,4 +1,4 @@
-{ config, options, lib, pkgs, utils, stdenv, ... }:
+{ config, options, lib, pkgs, utils, ... }:
 
 with lib;
 with utils;
diff --git a/nixos/modules/tasks/scsi-link-power-management.nix b/nixos/modules/tasks/scsi-link-power-management.nix
index 69599bda6d3..a9d987780ee 100644
--- a/nixos/modules/tasks/scsi-link-power-management.nix
+++ b/nixos/modules/tasks/scsi-link-power-management.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, ... }:
 
 with lib;
 
diff --git a/nixos/modules/tasks/swraid.nix b/nixos/modules/tasks/swraid.nix
index 1b142fb8fd3..93e03c44c86 100644
--- a/nixos/modules/tasks/swraid.nix
+++ b/nixos/modules/tasks/swraid.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ pkgs, ... }:
 
 {
 
diff --git a/nixos/modules/tasks/trackpoint.nix b/nixos/modules/tasks/trackpoint.nix
index 1f8f2891e98..3575a291b2b 100644
--- a/nixos/modules/tasks/trackpoint.nix
+++ b/nixos/modules/tasks/trackpoint.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, ... }:
 
 with lib;
 
diff --git a/nixos/modules/testing/service-runner.nix b/nixos/modules/testing/service-runner.nix
index dfe8b430e04..25490d67115 100644
--- a/nixos/modules/testing/service-runner.nix
+++ b/nixos/modules/testing/service-runner.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ lib, pkgs, ... }:
 
 with lib;
 
diff --git a/nixos/modules/virtualisation/amazon-options.nix b/nixos/modules/virtualisation/amazon-options.nix
index 9ecdcf23e5f..1a45c3093b7 100644
--- a/nixos/modules/virtualisation/amazon-options.nix
+++ b/nixos/modules/virtualisation/amazon-options.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, ... }:
 {
   options = {
     ec2 = {
diff --git a/nixos/modules/virtualisation/azure-common.nix b/nixos/modules/virtualisation/azure-common.nix
index 5cd2304a295..03239991b95 100644
--- a/nixos/modules/virtualisation/azure-common.nix
+++ b/nixos/modules/virtualisation/azure-common.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ lib, pkgs, ... }:
 
 with lib;
 {
diff --git a/nixos/modules/virtualisation/azure-config-user.nix b/nixos/modules/virtualisation/azure-config-user.nix
index de1b3857923..267ba50ae02 100644
--- a/nixos/modules/virtualisation/azure-config-user.nix
+++ b/nixos/modules/virtualisation/azure-config-user.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, modulesPath, ... }:
+{ modulesPath, ... }:
 
 {
   # To build the configuration or use nix-env, you need to run
diff --git a/nixos/modules/virtualisation/azure-config.nix b/nixos/modules/virtualisation/azure-config.nix
index 5c9f18ef52a..780bd1b78dc 100644
--- a/nixos/modules/virtualisation/azure-config.nix
+++ b/nixos/modules/virtualisation/azure-config.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, modulesPath, ... }:
+{ modulesPath, ... }:
 
 {
   imports = [ "${modulesPath}/virtualisation/azure-image.nix" ];
diff --git a/nixos/modules/virtualisation/brightbox-config.nix b/nixos/modules/virtualisation/brightbox-config.nix
index 528ffecc0bf..0a018e4cd69 100644
--- a/nixos/modules/virtualisation/brightbox-config.nix
+++ b/nixos/modules/virtualisation/brightbox-config.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, modulesPath, ... }:
+{ modulesPath, ... }:
 
 {
   imports = [ "${modulesPath}/virtualisation/brightbox-image.nix" ];
diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix
index c3044ea124c..31f5f6fe780 100644
--- a/nixos/modules/virtualisation/containers.nix
+++ b/nixos/modules/virtualisation/containers.nix
@@ -257,7 +257,7 @@ let
 
   system = config.nixpkgs.localSystem.system;
 
-  bindMountOpts = { name, config, ... }: {
+  bindMountOpts = { name, ... }: {
 
     options = {
       mountPoint = mkOption {
@@ -284,7 +284,7 @@ let
 
   };
 
-  allowedDeviceOpts = { name, config, ... }: {
+  allowedDeviceOpts = { ... }: {
     options = {
       node = mkOption {
         example = "/dev/net/tun";
diff --git a/nixos/modules/virtualisation/docker-image.nix b/nixos/modules/virtualisation/docker-image.nix
index 9535e3e0d67..2f304094d55 100644
--- a/nixos/modules/virtualisation/docker-image.nix
+++ b/nixos/modules/virtualisation/docker-image.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ ... }:
 
 {
   imports = [
diff --git a/nixos/modules/virtualisation/google-compute-config.nix b/nixos/modules/virtualisation/google-compute-config.nix
index f6bca1aa857..8f20100bc1b 100644
--- a/nixos/modules/virtualisation/google-compute-config.nix
+++ b/nixos/modules/virtualisation/google-compute-config.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ ... }:
 
 {
   imports = [ <nixpkgs/nixos/modules/virtualisation/google-compute-image.nix> ];
diff --git a/nixos/modules/virtualisation/lxc-container.nix b/nixos/modules/virtualisation/lxc-container.nix
index dbb7b881955..d4936484018 100644
--- a/nixos/modules/virtualisation/lxc-container.nix
+++ b/nixos/modules/virtualisation/lxc-container.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, lib, ... }:
+{ lib, ... }:
 
 with lib;
 
diff --git a/nixos/modules/virtualisation/nova-config.nix b/nixos/modules/virtualisation/nova-config.nix
index c1d2a314daf..cecf2a3f144 100644
--- a/nixos/modules/virtualisation/nova-config.nix
+++ b/nixos/modules/virtualisation/nova-config.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ lib, ... }:
 
 with lib;
 
diff --git a/nixos/modules/virtualisation/xen-domU.nix b/nixos/modules/virtualisation/xen-domU.nix
index b46002c10b5..c00b984c2ce 100644
--- a/nixos/modules/virtualisation/xen-domU.nix
+++ b/nixos/modules/virtualisation/xen-domU.nix
@@ -1,6 +1,6 @@
 # Common configuration for Xen DomU NixOS virtual machines.
 
-{ config, pkgs, ... }:
+{ ... }:
 
 {
   boot.loader.grub.version = 2;
diff --git a/nixos/release.nix b/nixos/release.nix
index f11f372335a..dfa4ee9e127 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -45,7 +45,7 @@ let
 
 
   makeIso =
-    { module, type, maintainers ? ["eelco"], system }:
+    { module, type, system, ... }:
 
     with import nixpkgs { inherit system; };
 
@@ -56,7 +56,7 @@ let
 
 
   makeSdImage =
-    { module, maintainers ? ["dezgeg"], system }:
+    { module, system, ... }:
 
     with import nixpkgs { inherit system; };
 
@@ -96,7 +96,7 @@ let
   buildFromConfig = module: sel: forAllSystems (system: hydraJob (sel (import ./lib/eval-config.nix {
     inherit system;
     modules = [ module versionModule ] ++ singleton
-      ({ config, lib, ... }:
+      ({ ... }:
       { fileSystems."/".device  = mkDefault "/dev/sda1";
         boot.loader.grub.device = mkDefault "/dev/sda";
       });
@@ -128,15 +128,15 @@ in rec {
 
   channel = import lib/make-channel.nix { inherit pkgs nixpkgs version versionSuffix; };
 
-  manual = buildFromConfig ({ pkgs, ... }: { }) (config: config.system.build.manual.manual);
-  manualEpub = (buildFromConfig ({ pkgs, ... }: { }) (config: config.system.build.manual.manualEpub));
-  manpages = buildFromConfig ({ pkgs, ... }: { }) (config: config.system.build.manual.manpages);
-  manualGeneratedSources = buildFromConfig ({ pkgs, ... }: { }) (config: config.system.build.manual.generatedSources);
-  options = (buildFromConfig ({ pkgs, ... }: { }) (config: config.system.build.manual.optionsJSON)).x86_64-linux;
+  manual = buildFromConfig ({ ... }: { }) (config: config.system.build.manual.manual);
+  manualEpub = (buildFromConfig ({ ... }: { }) (config: config.system.build.manual.manualEpub));
+  manpages = buildFromConfig ({ ... }: { }) (config: config.system.build.manual.manpages);
+  manualGeneratedSources = buildFromConfig ({ ... }: { }) (config: config.system.build.manual.generatedSources);
+  options = (buildFromConfig ({ ... }: { }) (config: config.system.build.manual.optionsJSON)).x86_64-linux;
 
 
   # Build the initial ramdisk so Hydra can keep track of its size over time.
-  initialRamdisk = buildFromConfig ({ pkgs, ... }: { }) (config: config.system.build.initialRamdisk);
+  initialRamdisk = buildFromConfig ({ ... }: { }) (config: config.system.build.initialRamdisk);
 
   netboot = forMatchingSystems [ "x86_64-linux" "aarch64-linux" ] (system: makeNetboot {
     inherit system;
@@ -195,7 +195,7 @@ in rec {
   dummy = forAllSystems (system: pkgs.runCommand "dummy"
     { toplevel = (import lib/eval-config.nix {
         inherit system;
-        modules = singleton ({ config, pkgs, ... }:
+        modules = singleton ({ ... }:
           { fileSystems."/".device  = mkDefault "/dev/sda1";
             boot.loader.grub.device = mkDefault "/dev/sda";
             system.nixos.stateVersion = mkDefault "18.03";
@@ -424,27 +424,27 @@ in rec {
 
   closures = {
 
-    smallContainer = makeClosure ({ pkgs, ... }:
+    smallContainer = makeClosure ({ ... }:
       { boot.isContainer = true;
         services.openssh.enable = true;
       });
 
-    tinyContainer = makeClosure ({ pkgs, ... }:
+    tinyContainer = makeClosure ({ ... }:
       { boot.isContainer = true;
         imports = [ modules/profiles/minimal.nix ];
       });
 
-    ec2 = makeClosure ({ pkgs, ... }:
+    ec2 = makeClosure ({ ... }:
       { imports = [ modules/virtualisation/amazon-image.nix ];
       });
 
-    kde = makeClosure ({ pkgs, ... }:
+    kde = makeClosure ({ ... }:
       { services.xserver.enable = true;
         services.xserver.displayManager.sddm.enable = true;
         services.xserver.desktopManager.plasma5.enable = true;
       });
 
-    xfce = makeClosure ({ pkgs, ... }:
+    xfce = makeClosure ({ ... }:
       { services.xserver.enable = true;
         services.xserver.desktopManager.xfce.enable = true;
       });
diff --git a/nixos/tests/acme.nix b/nixos/tests/acme.nix
index c5898db6b32..6d728b387e1 100644
--- a/nixos/tests/acme.nix
+++ b/nixos/tests/acme.nix
@@ -1,5 +1,5 @@
 let
-  commonConfig = { config, lib, pkgs, nodes, ... }: {
+  commonConfig = { lib, nodes, ... }: {
     networking.nameservers = [
       nodes.letsencrypt.config.networking.primaryIPAddress
     ];
diff --git a/nixos/tests/ammonite.nix b/nixos/tests/ammonite.nix
index e1dee71fddf..fedfde233e8 100644
--- a/nixos/tests/ammonite.nix
+++ b/nixos/tests/ammonite.nix
@@ -6,7 +6,7 @@ import ./make-test.nix ({ pkgs, ...} : {
 
   nodes = {
     amm =
-      { config, pkgs, ... }:
+      { pkgs, ... }:
         {
           environment.systemPackages = [ pkgs.ammonite ];
         };
diff --git a/nixos/tests/atd.nix b/nixos/tests/atd.nix
index ef848c2a374..9f367d4c1d2 100644
--- a/nixos/tests/atd.nix
+++ b/nixos/tests/atd.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix ({ pkgs, lib, ... }:
+import ./make-test.nix ({ pkgs, ... }:
 
 {
   name = "atd";
@@ -7,7 +7,7 @@ import ./make-test.nix ({ pkgs, lib, ... }:
   };
 
   machine =
-    { config, pkgs, ... }:
+    { ... }:
     { services.atd.enable = true;
       users.users.alice = { isNormalUser = true; };
     };
diff --git a/nixos/tests/avahi.nix b/nixos/tests/avahi.nix
index 976a770e887..dfb60998941 100644
--- a/nixos/tests/avahi.nix
+++ b/nixos/tests/avahi.nix
@@ -6,7 +6,7 @@ import ./make-test.nix ({ pkgs, ... } : {
   };
 
   nodes = let
-    cfg = { config, pkgs, ... }: {
+    cfg = { ... }: {
       services.avahi = {
         enable = true;
         nssmdns = true;
diff --git a/nixos/tests/beegfs.nix b/nixos/tests/beegfs.nix
index 433910feafe..9c241fd2301 100644
--- a/nixos/tests/beegfs.nix
+++ b/nixos/tests/beegfs.nix
@@ -1,9 +1,9 @@
-import ./make-test.nix ({ pkgs, ... } :
+import ./make-test.nix ({ ... } :
 
 let
   connAuthFile="beegfs/auth-def.key";
 
-  client = { config, pkgs, lib, ... } : {
+  client = { pkgs, ... } : {
     networking.firewall.enable = false;
     services.beegfsEnable = true;
     services.beegfs.default = {
@@ -31,7 +31,7 @@ let
   };
 
 
-  server = service : { config, pkgs, lib, ... } : {
+  server = service : { pkgs, ... } : {
     networking.firewall.enable = false;
     boot.initrd.postDeviceCommands = ''
       ${pkgs.e2fsprogs}/bin/mkfs.ext4 -L data /dev/vdb
diff --git a/nixos/tests/bittorrent.nix b/nixos/tests/bittorrent.nix
index 50c98664660..609b1ff7a83 100644
--- a/nixos/tests/bittorrent.nix
+++ b/nixos/tests/bittorrent.nix
@@ -30,7 +30,7 @@ in
 
   nodes =
     { tracker =
-        { config, pkgs, ... }:
+        { pkgs, ... }:
         { environment.systemPackages = [ pkgs.transmission pkgs.opentracker ];
 
           # We need Apache on the tracker to serve the torrents.
@@ -42,7 +42,7 @@ in
         };
 
       router =
-        { config, pkgs, ... }:
+        { pkgs, ... }:
         { environment.systemPackages = [ pkgs.miniupnpd ];
           virtualisation.vlans = [ 1 2 ];
           networking.nat.enable = true;
@@ -52,7 +52,7 @@ in
         };
 
       client1 =
-        { config, pkgs, nodes, ... }:
+        { pkgs, nodes, ... }:
         { environment.systemPackages = [ pkgs.transmission ];
           virtualisation.vlans = [ 2 ];
           networking.defaultGateway =
@@ -61,7 +61,7 @@ in
         };
 
       client2 =
-        { config, pkgs, ... }:
+        { pkgs, ... }:
         { environment.systemPackages = [ pkgs.transmission ];
           networking.firewall.enable = false;
         };
diff --git a/nixos/tests/borgbackup.nix b/nixos/tests/borgbackup.nix
index 36731773de2..9b39abdfa8e 100644
--- a/nixos/tests/borgbackup.nix
+++ b/nixos/tests/borgbackup.nix
@@ -41,7 +41,7 @@ in {
   };
 
   nodes = {
-    client = { config, pkgs, ... }: {
+    client = { ... }: {
       services.borgbackup.jobs = {
         
         local = rec {
@@ -84,7 +84,7 @@ in {
       };
     };
 
-    server = { config, pkgs, ... }: {
+    server = { ... }: {
       services.openssh = {
         enable = true;
         passwordAuthentication = false;
diff --git a/nixos/tests/buildbot.nix b/nixos/tests/buildbot.nix
index 828846f17c8..cf408dc7fec 100644
--- a/nixos/tests/buildbot.nix
+++ b/nixos/tests/buildbot.nix
@@ -4,7 +4,7 @@ import ./make-test.nix ({ pkgs, ... } : {
   name = "buildbot";
 
   nodes = {
-    bbmaster = { config, pkgs, ... }: {
+    bbmaster = { pkgs, ... }: {
       services.buildbot-master = {
         enable = true;
         package = pkgs.buildbot-full;
@@ -22,7 +22,7 @@ import ./make-test.nix ({ pkgs, ... } : {
       environment.systemPackages = with pkgs; [ git buildbot-full ];
     };
 
-    bbworker = { config, pkgs, ... }: {
+    bbworker = { pkgs, ... }: {
       services.buildbot-worker = {
         enable = true;
         masterUrl = "bbmaster:9989";
@@ -30,7 +30,7 @@ import ./make-test.nix ({ pkgs, ... } : {
       environment.systemPackages = with pkgs; [ git buildbot-worker ];
     };
 
-    gitrepo = { config, pkgs, ... }: {
+    gitrepo = { pkgs, ... }: {
       services.openssh.enable = true;
       networking.firewall.allowedTCPPorts = [ 22 9418 ];
       environment.systemPackages = with pkgs; [ git ];
diff --git a/nixos/tests/cadvisor.nix b/nixos/tests/cadvisor.nix
index f0083ab18e4..e60bae4b700 100644
--- a/nixos/tests/cadvisor.nix
+++ b/nixos/tests/cadvisor.nix
@@ -5,11 +5,11 @@ import ./make-test.nix ({ pkgs, ... } : {
   };
 
   nodes = {
-    machine = { config, pkgs, ... }: {
+    machine = { ... }: {
       services.cadvisor.enable = true;
     };
 
-    influxdb = { config, pkgs, lib, ... }: with lib; {
+    influxdb = { lib, ... }: with lib; {
       services.cadvisor.enable = true;
       services.cadvisor.storageDriver = "influxdb";
       services.influxdb.enable = true;
diff --git a/nixos/tests/cassandra.nix b/nixos/tests/cassandra.nix
index b729e6b158b..ca8f35ef3bf 100644
--- a/nixos/tests/cassandra.nix
+++ b/nixos/tests/cassandra.nix
@@ -24,9 +24,9 @@ in
   name = "cassandra-ci";
 
   nodes = {
-    cass0 = {pkgs, config, nodes, ...}: nodeCfg nodes "192.168.1.1" {};
-    cass1 = {pkgs, config, nodes, ...}: nodeCfg nodes "192.168.1.2" {};
-    cass2 = {pkgs, config, nodes, ...}: nodeCfg nodes "192.168.1.3" {
+    cass0 = { nodes, ... }: nodeCfg nodes "192.168.1.1" {};
+    cass1 = { nodes, ... }: nodeCfg nodes "192.168.1.2" {};
+    cass2 = { nodes, ... }: nodeCfg nodes "192.168.1.3" {
       extraParams = [
         ''JVM_OPTS="$JVM_OPTS -Dcassandra.replace_address=192.168.1.2"''
       ];
diff --git a/nixos/tests/ceph.nix b/nixos/tests/ceph.nix
index b9993062c07..dd45f0157b0 100644
--- a/nixos/tests/ceph.nix
+++ b/nixos/tests/ceph.nix
@@ -5,7 +5,7 @@ import ./make-test.nix ({pkgs, ...}: rec {
   };
 
   nodes = {
-    aio = { config, pkgs, ... }: {
+    aio = { pkgs, ... }: {
       virtualisation = {
         emptyDiskImages = [ 20480 20480 ];
         vlans = [ 1 ];
@@ -55,7 +55,7 @@ import ./make-test.nix ({pkgs, ...}: rec {
     };
   };
   
-  testScript = { nodes, ... }: ''
+  testScript = { ... }: ''
     startAll;
 
     $aio->waitForUnit("network.target");
diff --git a/nixos/tests/cjdns.nix b/nixos/tests/cjdns.nix
index db89c496944..ab5f8e0bcf3 100644
--- a/nixos/tests/cjdns.nix
+++ b/nixos/tests/cjdns.nix
@@ -4,7 +4,7 @@ let
   carolPassword = "678287829ce4c67bc8b227e56d94422ee1b85fa11618157b2f591de6c6322b52";
 
   basicConfig =
-    { config, pkgs, ... }:
+    { ... }:
     { services.cjdns.enable = true;
 
       # Turning off DHCP isn't very realistic but makes
@@ -29,7 +29,7 @@ import ./make-test.nix ({ pkgs, ...} : {
   nodes = rec
     { # Alice finds peers over over ETHInterface.
       alice =
-        { config, ... }:
+        { ... }:
         { imports = [ basicConfig ];
 
           services.cjdns.ETHInterface.bind = "eth1";
@@ -41,7 +41,7 @@ import ./make-test.nix ({ pkgs, ...} : {
 
       # Bob explicitly connects to Carol over UDPInterface.
       bob =
-        { config, lib, nodes, ... }:
+        { ... }:
 
         { imports = [ basicConfig ];
 
@@ -63,7 +63,7 @@ import ./make-test.nix ({ pkgs, ...} : {
       # Carol listens on ETHInterface and UDPInterface,
       # but knows neither Alice or Bob.
       carol =
-        { config, lib, nodes, ... }:
+        { ... }:
         { imports = [ basicConfig ];
 
           environment.etc."cjdns.keys".text = ''
diff --git a/nixos/tests/cloud-init.nix b/nixos/tests/cloud-init.nix
index 2a258e4bff5..303e7408646 100644
--- a/nixos/tests/cloud-init.nix
+++ b/nixos/tests/cloud-init.nix
@@ -31,7 +31,7 @@ in makeTest {
     maintainers = [ lewo ];
   };
   machine =
-    { config, pkgs, ... }:
+    { ... }:
     {
       virtualisation.qemu.options = [ "-cdrom" "${metadataDrive}/metadata.iso" ];
       services.cloud-init.enable = true;
diff --git a/nixos/tests/common/user-account.nix b/nixos/tests/common/user-account.nix
index dc50e14750b..9cd531a1f96 100644
--- a/nixos/tests/common/user-account.nix
+++ b/nixos/tests/common/user-account.nix
@@ -1,4 +1,4 @@
-{ lib, ... }:
+{ ... }:
 
 { users.users.alice =
     { isNormalUser = true;
diff --git a/nixos/tests/containers-bridge.nix b/nixos/tests/containers-bridge.nix
index dfef46a2ada..bd8bd5dee9c 100644
--- a/nixos/tests/containers-bridge.nix
+++ b/nixos/tests/containers-bridge.nix
@@ -14,7 +14,7 @@ import ./make-test.nix ({ pkgs, ...} : {
   };
 
   machine =
-    { config, pkgs, ... }:
+    { pkgs, ... }:
     { imports = [ ../modules/installer/cd-dvd/channel.nix ];
       virtualisation.writableStore = true;
       virtualisation.memorySize = 768;
diff --git a/nixos/tests/containers-extra_veth.nix b/nixos/tests/containers-extra_veth.nix
index df3f3354b2d..8f874b3585d 100644
--- a/nixos/tests/containers-extra_veth.nix
+++ b/nixos/tests/containers-extra_veth.nix
@@ -7,7 +7,7 @@ import ./make-test.nix ({ pkgs, ...} : {
   };
 
   machine =
-    { config, pkgs, ... }:
+    { pkgs, ... }:
     { imports = [ ../modules/installer/cd-dvd/channel.nix ];
       virtualisation.writableStore = true;
       virtualisation.memorySize = 768;
diff --git a/nixos/tests/containers-hosts.nix b/nixos/tests/containers-hosts.nix
index df1ef6d1493..8cf298c6225 100644
--- a/nixos/tests/containers-hosts.nix
+++ b/nixos/tests/containers-hosts.nix
@@ -7,7 +7,7 @@ import ./make-test.nix ({ pkgs, ...} : {
   };
 
   machine =
-    { config, pkgs, lib, ... }:
+    { lib, ... }:
     {
       virtualisation.memorySize = 256;
       virtualisation.vlans = [];
diff --git a/nixos/tests/containers-ipv4.nix b/nixos/tests/containers-ipv4.nix
index 821ce1cd07d..c4d954592ef 100644
--- a/nixos/tests/containers-ipv4.nix
+++ b/nixos/tests/containers-ipv4.nix
@@ -7,7 +7,7 @@ import ./make-test.nix ({ pkgs, ...} : {
   };
 
   machine =
-    { config, pkgs, ... }:
+    { pkgs, ... }:
     { imports = [ ../modules/installer/cd-dvd/channel.nix ];
       virtualisation.writableStore = true;
       virtualisation.memorySize = 768;
diff --git a/nixos/tests/containers-ipv6.nix b/nixos/tests/containers-ipv6.nix
index f676ed122bb..7db389a18e7 100644
--- a/nixos/tests/containers-ipv6.nix
+++ b/nixos/tests/containers-ipv6.nix
@@ -12,7 +12,7 @@ import ./make-test.nix ({ pkgs, ...} : {
   };
 
   machine =
-    { config, pkgs, ... }:
+    { pkgs, ... }:
     { imports = [ ../modules/installer/cd-dvd/channel.nix ];
       virtualisation.writableStore = true;
       virtualisation.memorySize = 768;
diff --git a/nixos/tests/containers-macvlans.nix b/nixos/tests/containers-macvlans.nix
index 390dc4ad2c2..2bdb926a8e2 100644
--- a/nixos/tests/containers-macvlans.nix
+++ b/nixos/tests/containers-macvlans.nix
@@ -15,7 +15,7 @@ import ./make-test.nix ({ pkgs, ...} : {
   nodes = {
 
     machine1 =
-      { config, pkgs, lib, ... }:
+      { lib, ... }:
       {
         virtualisation.memorySize = 256;
         virtualisation.vlans = [ 1 ];
@@ -55,7 +55,7 @@ import ./make-test.nix ({ pkgs, ...} : {
       };
 
     machine2 =
-      { config, pkgs, ... }:
+      { ... }:
       {
         virtualisation.memorySize = 256;
         virtualisation.vlans = [ 1 ];
diff --git a/nixos/tests/containers-physical_interfaces.nix b/nixos/tests/containers-physical_interfaces.nix
index bde8e175f95..1e312f59f43 100644
--- a/nixos/tests/containers-physical_interfaces.nix
+++ b/nixos/tests/containers-physical_interfaces.nix
@@ -6,7 +6,7 @@ import ./make-test.nix ({ pkgs, ...} : {
   };
 
   nodes = {
-    server = { config, pkgs, ... }:
+    server = { ... }:
       {
         virtualisation.memorySize = 256;
         virtualisation.vlans = [ 1 ];
@@ -23,7 +23,7 @@ import ./make-test.nix ({ pkgs, ...} : {
           };
         };
       };
-    bridged = { config, pkgs, ... }: {
+    bridged = { ... }: {
       virtualisation.memorySize = 128;
       virtualisation.vlans = [ 1 ];
 
@@ -41,7 +41,7 @@ import ./make-test.nix ({ pkgs, ...} : {
       };
     };
 
-    bonded = { config, pkgs, ... }: {
+    bonded = { ... }: {
       virtualisation.memorySize = 128;
       virtualisation.vlans = [ 1 ];
 
@@ -62,7 +62,7 @@ import ./make-test.nix ({ pkgs, ...} : {
       };
     };
 
-    bridgedbond = { config, pkgs, ... }: {
+    bridgedbond = { ... }: {
       virtualisation.memorySize = 128;
       virtualisation.vlans = [ 1 ];
 
diff --git a/nixos/tests/containers-portforward.nix b/nixos/tests/containers-portforward.nix
index 78cc445c2dd..be83f82445e 100644
--- a/nixos/tests/containers-portforward.nix
+++ b/nixos/tests/containers-portforward.nix
@@ -14,7 +14,7 @@ import ./make-test.nix ({ pkgs, ...} : {
   };
 
   machine =
-    { config, pkgs, ... }:
+    { pkgs, ... }:
     { imports = [ ../modules/installer/cd-dvd/channel.nix ];
       virtualisation.writableStore = true;
       virtualisation.memorySize = 768;
diff --git a/nixos/tests/containers-reloadable.nix b/nixos/tests/containers-reloadable.nix
index 15862ac64c1..9726ca0cb0e 100644
--- a/nixos/tests/containers-reloadable.nix
+++ b/nixos/tests/containers-reloadable.nix
@@ -21,11 +21,11 @@ in {
   };
 
   nodes = {
-    client = { lib, pkgs, ... }: {
+    client = { ... }: {
       imports = [ client_base ];
     };
 
-    client_c1 = { lib, pkgs, ... }: {
+    client_c1 = { lib, ... }: {
       imports = [ client_base ];
 
       containers.test1.config = {
@@ -34,7 +34,7 @@ in {
         services.httpd.adminAddr = "nixos@example.com";
       };
     };
-    client_c2 = { lib, pkgs, ... }: {
+    client_c2 = { lib, ... }: {
       imports = [ client_base ];
 
       containers.test1.config = {
diff --git a/nixos/tests/containers-restart_networking.nix b/nixos/tests/containers-restart_networking.nix
index f68c9b07759..aeb0a6e68e2 100644
--- a/nixos/tests/containers-restart_networking.nix
+++ b/nixos/tests/containers-restart_networking.nix
@@ -17,7 +17,7 @@ let
       };
     };
   };
-in import ./make-test.nix ({ pkgs, lib, ...} :
+in import ./make-test.nix ({ pkgs, ...} :
 {
   name = "containers-restart_networking";
   meta = with pkgs.stdenv.lib.maintainers; {
@@ -25,7 +25,7 @@ in import ./make-test.nix ({ pkgs, lib, ...} :
   };
 
   nodes = {
-    client = { lib, pkgs, ... }: client_base // {
+    client = { lib, ... }: client_base // {
       virtualisation.vlans = [ 1 ];
 
       networking.bridges.br0 = {
@@ -38,7 +38,7 @@ in import ./make-test.nix ({ pkgs, lib, ...} :
       };
 
     };
-    client_eth1 = { lib, pkgs, ... }: client_base // {
+    client_eth1 = { lib, ... }: client_base // {
       networking.bridges.br0 = {
         interfaces = [ "eth1" ];
         rstp = false;
@@ -48,7 +48,7 @@ in import ./make-test.nix ({ pkgs, lib, ...} :
         br0.ipv4.addresses = [ { address = "192.168.1.2"; prefixLength = 24; } ];
       };
     };
-    client_eth1_rstp = { lib, pkgs, ... }: client_base // {
+    client_eth1_rstp = { lib, ... }: client_base // {
       networking.bridges.br0 = {
         interfaces = [ "eth1" ];
         rstp = true;
diff --git a/nixos/tests/containers-tmpfs.nix b/nixos/tests/containers-tmpfs.nix
index 873dd364369..05c21f4907b 100644
--- a/nixos/tests/containers-tmpfs.nix
+++ b/nixos/tests/containers-tmpfs.nix
@@ -7,7 +7,7 @@ import ./make-test.nix ({ pkgs, ...} : {
   };
 
   machine =
-    { config, pkgs, ... }:
+    { pkgs, ... }:
     { imports = [ ../modules/installer/cd-dvd/channel.nix ];
       virtualisation.writableStore = true;
       virtualisation.memorySize = 768;
diff --git a/nixos/tests/couchdb.nix b/nixos/tests/couchdb.nix
index a3f675236bc..48ea48eebbb 100644
--- a/nixos/tests/couchdb.nix
+++ b/nixos/tests/couchdb.nix
@@ -10,14 +10,14 @@ with lib;
 
   nodes = {
     couchdb1 =
-      { pkgs, config, ... }:
+      { pkgs, ... }:
 
       { environment.systemPackages = with pkgs; [ jq ];
         services.couchdb.enable = true;
       };
 
     couchdb2 =
-      { pkgs, config, ... }:
+      { pkgs, ... }:
 
       { environment.systemPackages = with pkgs; [ jq ];
         services.couchdb.enable = true;
diff --git a/nixos/tests/deluge.nix b/nixos/tests/deluge.nix
index 6119fd58447..b4be5e465cc 100644
--- a/nixos/tests/deluge.nix
+++ b/nixos/tests/deluge.nix
@@ -6,7 +6,7 @@ import ./make-test.nix ({ pkgs, ...} : {
 
   nodes = {
     server =
-      { pkgs, config, ... }:
+      { ... }:
 
       { services.deluge = {
           enable = true;
diff --git a/nixos/tests/dnscrypt-proxy.nix b/nixos/tests/dnscrypt-proxy.nix
index 1fcf3903b13..13bc9d3d916 100644
--- a/nixos/tests/dnscrypt-proxy.nix
+++ b/nixos/tests/dnscrypt-proxy.nix
@@ -8,7 +8,7 @@ import ./make-test.nix ({ pkgs, ... }: {
     # A client running the recommended setup: DNSCrypt proxy as a forwarder
     # for a caching DNS client.
     client =
-    { config, pkgs, ... }:
+    { ... }:
     let localProxyPort = 43; in
     {
       security.apparmor.enable = true;
diff --git a/nixos/tests/docker-edge.nix b/nixos/tests/docker-edge.nix
index 38d25daff19..b306c149be9 100644
--- a/nixos/tests/docker-edge.nix
+++ b/nixos/tests/docker-edge.nix
@@ -8,7 +8,7 @@ import ./make-test.nix ({ pkgs, ...} : {
 
   nodes = {
     docker =
-      { config, pkgs, ... }:
+      { pkgs, ... }:
         {
           virtualisation.docker.enable = true;
           virtualisation.docker.package = pkgs.docker-edge;
diff --git a/nixos/tests/docker-registry.nix b/nixos/tests/docker-registry.nix
index 1fbd199c7bc..8936421072a 100644
--- a/nixos/tests/docker-registry.nix
+++ b/nixos/tests/docker-registry.nix
@@ -7,7 +7,7 @@ import ./make-test.nix ({ pkgs, ...} : {
   };
 
   nodes = {
-    registry = { config, pkgs, ... }: {
+    registry = { ... }: {
       services.dockerRegistry.enable = true;
       services.dockerRegistry.enableDelete = true;
       services.dockerRegistry.port = 8080;
@@ -16,12 +16,12 @@ import ./make-test.nix ({ pkgs, ...} : {
       networking.firewall.allowedTCPPorts = [ 8080 ];
     };
 
-    client1 = { config, pkgs, ...}: {
+    client1 = { ... }: {
       virtualisation.docker.enable = true;
       virtualisation.docker.extraOptions = "--insecure-registry registry:8080";
     };
 
-    client2 = { config, pkgs, ...}: {
+    client2 = { ... }: {
       virtualisation.docker.enable = true;
       virtualisation.docker.extraOptions = "--insecure-registry registry:8080";
     };
diff --git a/nixos/tests/docker-tools-overlay.nix b/nixos/tests/docker-tools-overlay.nix
index 9d7fa3e7a8c..637957bd3e8 100644
--- a/nixos/tests/docker-tools-overlay.nix
+++ b/nixos/tests/docker-tools-overlay.nix
@@ -9,7 +9,7 @@ import ./make-test.nix ({ pkgs, ... }:
 
   nodes = {
     docker =
-      { config, pkgs, ... }:
+      { ... }:
       {
         virtualisation.docker.enable = true;
         virtualisation.docker.storageDriver = "overlay";  # defaults to overlay2
diff --git a/nixos/tests/docker-tools.nix b/nixos/tests/docker-tools.nix
index e2bcfbbd1f9..db4eacc3728 100644
--- a/nixos/tests/docker-tools.nix
+++ b/nixos/tests/docker-tools.nix
@@ -8,7 +8,7 @@ import ./make-test.nix ({ pkgs, ... }: {
 
   nodes = {
     docker =
-      { config, pkgs, ... }: {
+      { ... }: {
         virtualisation = {
           diskSize = 2048;
           docker.enable = true;
diff --git a/nixos/tests/docker.nix b/nixos/tests/docker.nix
index c6c8f4cdb5f..d67b2f8743d 100644
--- a/nixos/tests/docker.nix
+++ b/nixos/tests/docker.nix
@@ -8,7 +8,7 @@ import ./make-test.nix ({ pkgs, ...} : {
 
   nodes = {
     docker =
-      { config, pkgs, ... }:
+      { pkgs, ... }:
         {
           virtualisation.docker.enable = true;
           virtualisation.docker.package = pkgs.docker;
diff --git a/nixos/tests/ecryptfs.nix b/nixos/tests/ecryptfs.nix
index 041be0f5a62..3f02cecb866 100644
--- a/nixos/tests/ecryptfs.nix
+++ b/nixos/tests/ecryptfs.nix
@@ -1,8 +1,8 @@
-import ./make-test.nix ({ pkgs, ... }:
+import ./make-test.nix ({ ... }:
 {
   name = "ecryptfs";
 
-  machine = { config, pkgs, ... }: {
+  machine = { pkgs, ... }: {
     imports = [ ./common/user-account.nix ];
     boot.kernelModules = [ "ecryptfs" ];
     security.pam.enableEcryptfs = true;
diff --git a/nixos/tests/elk.nix b/nixos/tests/elk.nix
index ed656b3628b..8dba7a905fa 100644
--- a/nixos/tests/elk.nix
+++ b/nixos/tests/elk.nix
@@ -11,7 +11,7 @@ let
     };
     nodes = {
       one =
-        { config, pkgs, ... }: {
+        { pkgs, ... }: {
             # Not giving the machine at least 2060MB results in elasticsearch failing with the following error:
             #
             #   OpenJDK 64-Bit Server VM warning:
diff --git a/nixos/tests/emacs-daemon.nix b/nixos/tests/emacs-daemon.nix
index 466e772a881..3594e35e343 100644
--- a/nixos/tests/emacs-daemon.nix
+++ b/nixos/tests/emacs-daemon.nix
@@ -7,7 +7,7 @@ import ./make-test.nix ({ pkgs, ...} : {
   enableOCR = true;
 
   machine =
-    { config, pkgs, ... }:
+    { ... }:
 
     { imports = [ ./common/x11.nix ];
       services.emacs = {
diff --git a/nixos/tests/env.nix b/nixos/tests/env.nix
index c6b0424e97b..064c498204a 100644
--- a/nixos/tests/env.nix
+++ b/nixos/tests/env.nix
@@ -4,7 +4,7 @@ import ./make-test.nix ({ pkgs, ...} : {
     maintainers = [ nequissimus ];
   };
 
-  machine = { config, lib, pkgs, ... }:
+  machine = { pkgs, ... }:
     {
       boot.kernelPackages = pkgs.linuxPackages;
       environment.etc."plainFile".text = ''
diff --git a/nixos/tests/etcd-cluster.nix b/nixos/tests/etcd-cluster.nix
index 3971997a9bf..3c4de5950a7 100644
--- a/nixos/tests/etcd-cluster.nix
+++ b/nixos/tests/etcd-cluster.nix
@@ -102,7 +102,7 @@ in {
   };
 
   nodes = {
-    node1 = { config, pkgs, nodes, ... }: {
+    node1 = { ... }: {
       require = [nodeConfig];
       services.etcd = {
         initialCluster = ["node1=https://node1:2380" "node2=https://node2:2380"];
@@ -110,7 +110,7 @@ in {
       };
     };
 
-    node2 = { config, pkgs, ... }: {
+    node2 = { ... }: {
       require = [nodeConfig];
       services.etcd = {
         initialCluster = ["node1=https://node1:2380" "node2=https://node2:2380"];
@@ -118,7 +118,7 @@ in {
       };
     };
 
-    node3 = { config, pkgs, ... }: {
+    node3 = { ... }: {
       require = [nodeConfig];
       services.etcd = {
         initialCluster = ["node1=https://node1:2380" "node2=https://node2:2380" "node3=https://node3:2380"];
diff --git a/nixos/tests/etcd.nix b/nixos/tests/etcd.nix
index f8a6791a834..6c23b31779b 100644
--- a/nixos/tests/etcd.nix
+++ b/nixos/tests/etcd.nix
@@ -8,7 +8,7 @@ import ./make-test.nix ({ pkgs, ... } : {
   };
 
   nodes = {
-    node = { config, pkgs, nodes, ... }: {
+    node = { ... }: {
       services.etcd.enable = true;
     };
   };
diff --git a/nixos/tests/ferm.nix b/nixos/tests/ferm.nix
index bb7daae118c..24b74df85ad 100644
--- a/nixos/tests/ferm.nix
+++ b/nixos/tests/ferm.nix
@@ -7,7 +7,7 @@ import ./make-test.nix ({ pkgs, ...} : {
 
   nodes =
     { client =
-        { config, pkgs, ... }:
+        { pkgs, ... }:
         with pkgs.lib;
         {
           networking = {
@@ -16,7 +16,7 @@ import ./make-test.nix ({ pkgs, ...} : {
           };
       };
       server =
-        { config, pkgs, ... }:
+        { pkgs, ... }:
         with pkgs.lib;
         {
           networking = {
diff --git a/nixos/tests/firefox.nix b/nixos/tests/firefox.nix
index e1b628c9144..58a80243ea9 100644
--- a/nixos/tests/firefox.nix
+++ b/nixos/tests/firefox.nix
@@ -5,7 +5,7 @@ import ./make-test.nix ({ pkgs, ... }: {
   };
 
   machine =
-    { config, pkgs, ... }:
+    { pkgs, ... }:
 
     { imports = [ ./common/x11.nix ];
       environment.systemPackages = [ pkgs.firefox pkgs.xdotool ];
diff --git a/nixos/tests/firewall.nix b/nixos/tests/firewall.nix
index 1119a5312eb..7207a880d8e 100644
--- a/nixos/tests/firewall.nix
+++ b/nixos/tests/firewall.nix
@@ -8,7 +8,7 @@ import ./make-test.nix ( { pkgs, ... } : {
 
   nodes =
     { walled =
-        { config, pkgs, nodes, ... }:
+        { ... }:
         { networking.firewall.enable = true;
           networking.firewall.logRefusedPackets = true;
           services.httpd.enable = true;
@@ -20,13 +20,13 @@ import ./make-test.nix ( { pkgs, ... } : {
       # original walled configuration so that there is a change in the service
       # file.
       walled2 =
-        { config, pkgs, nodes, ... }:
+        { ... }:
         { networking.firewall.enable = true;
           networking.firewall.rejectPackets = true;
         };
 
       attacker =
-        { config, pkgs, ... }:
+        { ... }:
         { services.httpd.enable = true;
           services.httpd.adminAddr = "foo@example.org";
           networking.firewall.enable = false;
diff --git a/nixos/tests/flannel.nix b/nixos/tests/flannel.nix
index 7f27903a302..fb66fe28209 100644
--- a/nixos/tests/flannel.nix
+++ b/nixos/tests/flannel.nix
@@ -17,7 +17,7 @@ import ./make-test.nix ({ pkgs, ...} : rec {
       networking.firewall.allowedUDPPorts = [ 8472 ];
     };
   in {
-    etcd = { config, pkgs, ... }: {
+    etcd = { ... }: {
       services = {
         etcd = {
           enable = true;
@@ -31,11 +31,11 @@ import ./make-test.nix ({ pkgs, ...} : rec {
       networking.firewall.allowedTCPPorts = [ 2379 ];
     };
 
-    node1 = { config, ... }: {
+    node1 = { ... }: {
       require = [flannelConfig];
     };
 
-    node2 = { config, ... }: {
+    node2 = { ... }: {
       require = [flannelConfig];
     };
   };
diff --git a/nixos/tests/flatpak.nix b/nixos/tests/flatpak.nix
index 9a5bdf07021..096b37e6e2c 100644
--- a/nixos/tests/flatpak.nix
+++ b/nixos/tests/flatpak.nix
@@ -7,7 +7,7 @@ import ./make-test.nix ({ pkgs, ... }:
     maintainers = pkgs.flatpak.meta.maintainers;
   };
 
-  machine = { config, pkgs, ... }: {
+  machine = { pkgs, ... }: {
     imports = [ ./common/x11.nix ];
     services.xserver.desktopManager.gnome3.enable = true; # TODO: figure out minimal environment where the tests work
     environment.gnome3.excludePackages = pkgs.gnome3.optionalPackages;
diff --git a/nixos/tests/fwupd.nix b/nixos/tests/fwupd.nix
index bf4ef25130b..2e64149b2db 100644
--- a/nixos/tests/fwupd.nix
+++ b/nixos/tests/fwupd.nix
@@ -6,7 +6,7 @@ import ./make-test.nix ({ pkgs, ... }: {
     maintainers = pkgs.fwupd.meta.maintainers;
   };
 
-  machine = { config, pkgs, ... }: {
+  machine = { pkgs, ... }: {
     services.fwupd.enable = true;
     environment.systemPackages = with pkgs; [ gnome-desktop-testing ];
     environment.variables.XDG_DATA_DIRS = [ "${pkgs.fwupd.installedTests}/share" ];
diff --git a/nixos/tests/gitlab.nix b/nixos/tests/gitlab.nix
index 7268636b62a..3af2cbcd098 100644
--- a/nixos/tests/gitlab.nix
+++ b/nixos/tests/gitlab.nix
@@ -7,7 +7,7 @@ import ./make-test.nix ({ pkgs, ...} : {
   };
 
   nodes = {
-    gitlab = { config, pkgs, ... }: {
+    gitlab = { ... }: {
       virtualisation.memorySize = 768;
 
       services.nginx = {
diff --git a/nixos/tests/gitolite.nix b/nixos/tests/gitolite.nix
index d4028efad1d..690e456ed7c 100644
--- a/nixos/tests/gitolite.nix
+++ b/nixos/tests/gitolite.nix
@@ -58,7 +58,7 @@ in
   nodes = {
 
     server =
-      { config, pkgs, lib, ... }:
+      { ... }:
       {
         services.gitolite = {
           enable = true;
@@ -68,7 +68,7 @@ in
       };
 
     client =
-      { config, pkgs, lib, ... }:
+      { pkgs, ... }:
       {
         environment.systemPackages = [ pkgs.git ];
         programs.ssh.extraConfig = ''
diff --git a/nixos/tests/gnome3-gdm.nix b/nixos/tests/gnome3-gdm.nix
index 71ae1709d52..1f590f337fd 100644
--- a/nixos/tests/gnome3-gdm.nix
+++ b/nixos/tests/gnome3-gdm.nix
@@ -5,7 +5,7 @@ import ./make-test.nix ({ pkgs, ...} : {
   };
 
   machine =
-    { config, pkgs, ... }:
+    { ... }:
 
     { imports = [ ./common/user-account.nix ];
 
diff --git a/nixos/tests/gnome3.nix b/nixos/tests/gnome3.nix
index 591ed860068..3f51d04163a 100644
--- a/nixos/tests/gnome3.nix
+++ b/nixos/tests/gnome3.nix
@@ -5,7 +5,7 @@ import ./make-test.nix ({ pkgs, ...} : {
   };
 
   machine =
-    { config, pkgs, ... }:
+    { ... }:
 
     { imports = [ ./common/user-account.nix ];
 
diff --git a/nixos/tests/gocd-agent.nix b/nixos/tests/gocd-agent.nix
index 5cadff08995..50470379576 100644
--- a/nixos/tests/gocd-agent.nix
+++ b/nixos/tests/gocd-agent.nix
@@ -17,7 +17,7 @@ import ./make-test.nix ({ pkgs, ...} : {
 
   nodes = {
     gocd_agent =
-      { config, pkgs, ... }:
+      { ... }:
       {
         virtualisation.memorySize = 2046;
         services.gocd-agent = {
diff --git a/nixos/tests/gocd-server.nix b/nixos/tests/gocd-server.nix
index b473d4ad61c..80cf04ed640 100644
--- a/nixos/tests/gocd-server.nix
+++ b/nixos/tests/gocd-server.nix
@@ -12,7 +12,7 @@ import ./make-test.nix ({ pkgs, ...} :
 
 nodes = {
   gocd_server =
-    { config, pkgs, ... }:
+    { ... }:
     {
       virtualisation.memorySize = 2046;
       services.gocd-server.enable = true;
diff --git a/nixos/tests/grafana.nix b/nixos/tests/grafana.nix
index d45776c3ee2..9dc765a879b 100644
--- a/nixos/tests/grafana.nix
+++ b/nixos/tests/grafana.nix
@@ -6,7 +6,7 @@ import ./make-test.nix ({ lib, ... }:
     maintainers = [ willibutz ];
   };
 
-  machine = { config, pkgs, ... }: {
+  machine = { ... }: {
     services.grafana = {
       enable = true;
       addr = "localhost";
diff --git a/nixos/tests/graphite.nix b/nixos/tests/graphite.nix
index 5a1f50bd29b..1fe4357191e 100644
--- a/nixos/tests/graphite.nix
+++ b/nixos/tests/graphite.nix
@@ -1,9 +1,9 @@
-import ./make-test.nix ({ pkgs, ...} :
+import ./make-test.nix ({ ... } :
 {
   name = "graphite";
   nodes = {
     one =
-      { config, pkgs, ... }: {
+      { ... }: {
         virtualisation.memorySize = 1024;
         time.timeZone = "UTC";
         services.graphite = {
diff --git a/nixos/tests/hadoop/hdfs.nix b/nixos/tests/hadoop/hdfs.nix
index 4206c940c1a..e7d72a56e1e 100644
--- a/nixos/tests/hadoop/hdfs.nix
+++ b/nixos/tests/hadoop/hdfs.nix
@@ -1,6 +1,6 @@
-import ../make-test.nix ({pkgs, ...}: {
+import ../make-test.nix ({...}: {
   nodes = {
-    namenode = {pkgs, config, ...}: {
+    namenode = {pkgs, ...}: {
       services.hadoop = {
         package = pkgs.hadoop_3_1;
         hdfs.namenode.enabled = true;
@@ -18,7 +18,7 @@ import ../make-test.nix ({pkgs, ...}: {
         8020 # namenode.rpc-address
       ];
     };
-    datanode = {pkgs, config, ...}: {
+    datanode = {pkgs, ...}: {
       services.hadoop = {
         package = pkgs.hadoop_3_1;
         hdfs.datanode.enabled = true;
diff --git a/nixos/tests/hadoop/yarn.nix b/nixos/tests/hadoop/yarn.nix
index e97cc1acc90..031592301f1 100644
--- a/nixos/tests/hadoop/yarn.nix
+++ b/nixos/tests/hadoop/yarn.nix
@@ -1,6 +1,6 @@
-import ../make-test.nix ({pkgs, ...}: {
+import ../make-test.nix ({...}: {
   nodes = {
-    resourcemanager = {pkgs, config, ...}: {
+    resourcemanager = {pkgs, ...}: {
       services.hadoop.package = pkgs.hadoop_3_1;
       services.hadoop.yarn.resourcemanager.enabled = true;
       services.hadoop.yarnSite = {
@@ -11,7 +11,7 @@ import ../make-test.nix ({pkgs, ...}: {
         8031 # resourcemanager.resource-tracker.address
       ];
     };
-    nodemanager = {pkgs, config, ...}: {
+    nodemanager = {pkgs, ...}: {
       services.hadoop.package = pkgs.hadoop_3_1;
       services.hadoop.yarn.nodemanager.enabled = true;
       services.hadoop.yarnSite = {
diff --git a/nixos/tests/haka.nix b/nixos/tests/haka.nix
index 40548f34690..6277ebb4933 100644
--- a/nixos/tests/haka.nix
+++ b/nixos/tests/haka.nix
@@ -8,7 +8,7 @@ import ./make-test.nix ({ pkgs, ...} : {
 
   nodes = {
     haka =
-      { config, pkgs, ... }:
+      { ... }:
         {
           services.haka.enable = true;
         };
diff --git a/nixos/tests/haproxy.nix b/nixos/tests/haproxy.nix
index ce4094237db..22a83e9d1ea 100644
--- a/nixos/tests/haproxy.nix
+++ b/nixos/tests/haproxy.nix
@@ -1,7 +1,7 @@
 import ./make-test.nix ({ pkgs, ...}: {
   name = "haproxy";
   nodes = {
-    machine = { config, ...}: {
+    machine = { ... }: {
       imports = [ ../modules/profiles/minimal.nix ];
       services.haproxy = {
         enable = true;
diff --git a/nixos/tests/hardened.nix b/nixos/tests/hardened.nix
index 0a0639d6279..2700b8e5935 100644
--- a/nixos/tests/hardened.nix
+++ b/nixos/tests/hardened.nix
@@ -5,7 +5,7 @@ import ./make-test.nix ({ pkgs, ...} : {
   };
 
   machine =
-    { config, lib, pkgs, ... }:
+    { lib, pkgs, ... }:
     with lib;
     { users.users.alice = { isNormalUser = true; extraGroups = [ "proc" ]; };
       users.users.sybil = { isNormalUser = true; group = "wheel"; };
diff --git a/nixos/tests/hibernate.nix b/nixos/tests/hibernate.nix
index 3ae2bdffed9..1f98bb739f2 100644
--- a/nixos/tests/hibernate.nix
+++ b/nixos/tests/hibernate.nix
@@ -16,7 +16,7 @@ import ./make-test.nix (pkgs: {
       systemd.services.listener.serviceConfig.ExecStart = "${pkgs.netcat}/bin/nc -l 4444 -k";
     };
 
-    probe = { config, lib, pkgs, ...}: {
+    probe = { pkgs, ...}: {
       environment.systemPackages = [ pkgs.netcat ];
     };
   };
diff --git a/nixos/tests/hitch/default.nix b/nixos/tests/hitch/default.nix
index b024306cde5..cb24c4dcffc 100644
--- a/nixos/tests/hitch/default.nix
+++ b/nixos/tests/hitch/default.nix
@@ -4,7 +4,7 @@ import ../make-test.nix ({ pkgs, ... }:
   meta = with pkgs.stdenv.lib.maintainers; {
     maintainers = [ jflanglois ];
   };
-  machine = { config, pkgs, ... }: {
+  machine = { pkgs, ... }: {
     environment.systemPackages = [ pkgs.curl ];
     services.hitch = {
       enable = true;
diff --git a/nixos/tests/hocker-fetchdocker/machine.nix b/nixos/tests/hocker-fetchdocker/machine.nix
index 12c58a01224..78343f0e02f 100644
--- a/nixos/tests/hocker-fetchdocker/machine.nix
+++ b/nixos/tests/hocker-fetchdocker/machine.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ pkgs, ... }:
 { nixpkgs.config.packageOverrides = pkgs': {
     hello-world-container = pkgs'.callPackage ./hello-world-container.nix { };
   };
diff --git a/nixos/tests/home-assistant.nix b/nixos/tests/home-assistant.nix
index 797706a062c..0c027eaca61 100644
--- a/nixos/tests/home-assistant.nix
+++ b/nixos/tests/home-assistant.nix
@@ -12,7 +12,7 @@ in {
 
   nodes = {
     hass =
-      { config, pkgs, ... }:
+      { pkgs, ... }:
       {
         environment.systemPackages = with pkgs; [
           mosquitto
diff --git a/nixos/tests/hound.nix b/nixos/tests/hound.nix
index 82fd44e8e36..f21c0ad58a8 100644
--- a/nixos/tests/hound.nix
+++ b/nixos/tests/hound.nix
@@ -4,7 +4,7 @@ import ./make-test.nix ({ pkgs, ... } : {
   meta = with pkgs.stdenv.lib.maintainers; {
     maintainers = [ grahamc ];
   };
-  machine = { config, pkgs, ... }: {
+  machine = { pkgs, ... }: {
     services.hound = {
       enable = true;
       config = ''
diff --git a/nixos/tests/hydra/default.nix b/nixos/tests/hydra/default.nix
index 74919444c16..98d99811f3c 100644
--- a/nixos/tests/hydra/default.nix
+++ b/nixos/tests/hydra/default.nix
@@ -31,7 +31,7 @@ in {
   };
 
   machine =
-    { config, pkgs, ... }:
+    { pkgs, ... }:
 
     {
       virtualisation.memorySize = 1024;
diff --git a/nixos/tests/i3wm.nix b/nixos/tests/i3wm.nix
index 4685992d7a0..245c17eedf7 100644
--- a/nixos/tests/i3wm.nix
+++ b/nixos/tests/i3wm.nix
@@ -4,14 +4,14 @@ import ./make-test.nix ({ pkgs, ...} : {
     maintainers = [ aszlig ];
   };
 
-  machine = { lib, pkgs, ... }: {
+  machine = { lib, ... }: {
     imports = [ ./common/x11.nix ./common/user-account.nix ];
     services.xserver.displayManager.auto.user = "alice";
     services.xserver.windowManager.default = lib.mkForce "i3";
     services.xserver.windowManager.i3.enable = true;
   };
 
-  testScript = { nodes, ... }: ''
+  testScript = { ... }: ''
     $machine->waitForX;
     $machine->waitForFile("/home/alice/.Xauthority");
     $machine->succeed("xauth merge ~alice/.Xauthority");
diff --git a/nixos/tests/influxdb.nix b/nixos/tests/influxdb.nix
index ee126091667..440049d9511 100644
--- a/nixos/tests/influxdb.nix
+++ b/nixos/tests/influxdb.nix
@@ -7,7 +7,7 @@ import ./make-test.nix ({ pkgs, ...} : {
   };
 
   nodes = {
-    one = { config, pkgs, ... }: {
+    one = { ... }: {
       services.influxdb.enable = true;
     };
   };
diff --git a/nixos/tests/initrd-network-ssh/default.nix b/nixos/tests/initrd-network-ssh/default.nix
index b1f3d147e86..b2209f297a4 100644
--- a/nixos/tests/initrd-network-ssh/default.nix
+++ b/nixos/tests/initrd-network-ssh/default.nix
@@ -1,4 +1,4 @@
-import ../make-test.nix ({ pkgs, lib, ... }:
+import ../make-test.nix ({ lib, ... }:
 
 {
   name = "initrd-network-ssh";
@@ -8,7 +8,7 @@ import ../make-test.nix ({ pkgs, lib, ... }:
 
   nodes = with lib; rec {
     server =
-      { config, pkgs, ... }:
+      { config, ... }:
       {
         boot.kernelParams = [
           "ip=${config.networking.primaryIPAddress}:::255.255.255.0::eth1:none"
@@ -33,7 +33,7 @@ import ../make-test.nix ({ pkgs, lib, ... }:
       };
 
     client =
-      { config, pkgs, ... }:
+      { config, ... }:
       {
         environment.etc.knownHosts = {
           text = concatStrings [
diff --git a/nixos/tests/initrd-network.nix b/nixos/tests/initrd-network.nix
index db9f572d3c2..ed9b82e2da7 100644
--- a/nixos/tests/initrd-network.nix
+++ b/nixos/tests/initrd-network.nix
@@ -3,7 +3,7 @@ import ./make-test.nix ({ pkgs, ...} : {
 
   meta.maintainers = [ pkgs.stdenv.lib.maintainers.eelco ];
 
-  machine = { config, pkgs, ... }: {
+  machine = { ... }: {
     imports = [ ../modules/profiles/minimal.nix ];
     boot.initrd.network.enable = true;
     boot.initrd.network.postCommands =
diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix
index 96230940e87..2455b9152bd 100644
--- a/nixos/tests/installer.nix
+++ b/nixos/tests/installer.nix
@@ -203,7 +203,7 @@ let
 
         # The configuration of the machine used to run "nixos-install".
         machine =
-          { config, lib, pkgs, ... }:
+          { pkgs, ... }:
 
           { imports =
               [ ../modules/profiles/installation-device.nix
diff --git a/nixos/tests/ipfs.nix b/nixos/tests/ipfs.nix
index c6bc6154524..3cff7e99ff8 100644
--- a/nixos/tests/ipfs.nix
+++ b/nixos/tests/ipfs.nix
@@ -7,7 +7,7 @@ import ./make-test.nix ({ pkgs, ...} : {
 
   nodes = {
     adder =
-      { config, pkgs, ... }:
+      { ... }:
       {
         services.ipfs = {
           enable = true;
@@ -18,7 +18,7 @@ import ./make-test.nix ({ pkgs, ...} : {
         networking.firewall.allowedTCPPorts = [ 4001 ];
       };
     getter =
-      { config, pkgs, ... }:
+      { ... }:
       {
         services.ipfs = {
           enable = true;
diff --git a/nixos/tests/ipv6.nix b/nixos/tests/ipv6.nix
index 7a98fd85cfd..97f348a9bee 100644
--- a/nixos/tests/ipv6.nix
+++ b/nixos/tests/ipv6.nix
@@ -8,17 +8,17 @@ import ./make-test.nix ({ pkgs, ...} : {
   };
 
   nodes =
-    { client = { config, pkgs, ... }: { };
+    { client = { ... }: { };
 
       server =
-        { config, pkgs, ... }:
+        { ... }:
         { services.httpd.enable = true;
           services.httpd.adminAddr = "foo@example.org";
           networking.firewall.allowedTCPPorts = [ 80 ];
         };
 
       router =
-        { config, pkgs, ... }:
+        { ... }:
         { services.radvd.enable = true;
           services.radvd.config =
             ''
diff --git a/nixos/tests/jenkins.nix b/nixos/tests/jenkins.nix
index 25629efbfa4..4f2d2085cd1 100644
--- a/nixos/tests/jenkins.nix
+++ b/nixos/tests/jenkins.nix
@@ -12,7 +12,7 @@ import ./make-test.nix ({ pkgs, ...} : {
   nodes = {
 
     master =
-      { config, pkgs, ... }:
+      { ... }:
       { services.jenkins.enable = true;
 
         # should have no effect
@@ -24,7 +24,7 @@ import ./make-test.nix ({ pkgs, ...} : {
       };
 
     slave =
-      { config, pkgs, ... }:
+      { ... }:
       { services.jenkinsSlave.enable = true;
 
         users.users.jenkins.extraGroups = [ "users" ];
diff --git a/nixos/tests/kafka.nix b/nixos/tests/kafka.nix
index e48b25d67df..c9fd74620ef 100644
--- a/nixos/tests/kafka.nix
+++ b/nixos/tests/kafka.nix
@@ -10,7 +10,7 @@ let
     };
 
     nodes = {
-      zookeeper1 = { config, ... }: {
+      zookeeper1 = { ... }: {
         services.zookeeper = {
           enable = true;
         };
@@ -18,7 +18,7 @@ let
         networking.firewall.allowedTCPPorts = [ 2181 ];
         virtualisation.memorySize = 1024;
       };
-      kafka = { config, ... }: {
+      kafka = { ... }: {
         services.apache-kafka = {
           enable = true;
           extraProperties = ''
diff --git a/nixos/tests/kernel-copperhead.nix b/nixos/tests/kernel-copperhead.nix
index aa133c9b0aa..652fbf05537 100644
--- a/nixos/tests/kernel-copperhead.nix
+++ b/nixos/tests/kernel-copperhead.nix
@@ -4,7 +4,7 @@ import ./make-test.nix ({ pkgs, ...} : {
     maintainers = [ nequissimus ];
   };
 
-  machine = { config, lib, pkgs, ... }:
+  machine = { pkgs, ... }:
     {
       boot.kernelPackages = pkgs.linuxPackages_copperhead_lts;
     };
diff --git a/nixos/tests/kernel-latest.nix b/nixos/tests/kernel-latest.nix
index 1350426654d..f30bd2e2e76 100644
--- a/nixos/tests/kernel-latest.nix
+++ b/nixos/tests/kernel-latest.nix
@@ -4,7 +4,7 @@ import ./make-test.nix ({ pkgs, ...} : {
     maintainers = [ nequissimus ];
   };
 
-  machine = { config, lib, pkgs, ... }:
+  machine = { pkgs, ... }:
     {
       boot.kernelPackages = pkgs.linuxPackages_latest;
     };
diff --git a/nixos/tests/kernel-lts.nix b/nixos/tests/kernel-lts.nix
index 2aab4ce0b49..28717fa6a84 100644
--- a/nixos/tests/kernel-lts.nix
+++ b/nixos/tests/kernel-lts.nix
@@ -4,7 +4,7 @@ import ./make-test.nix ({ pkgs, ...} : {
     maintainers = [ nequissimus ];
   };
 
-  machine = { config, lib, pkgs, ... }:
+  machine = { pkgs, ... }:
     {
       boot.kernelPackages = pkgs.linuxPackages;
     };
diff --git a/nixos/tests/kexec.nix b/nixos/tests/kexec.nix
index 0f5ddef7b1a..db596189d46 100644
--- a/nixos/tests/kexec.nix
+++ b/nixos/tests/kexec.nix
@@ -6,7 +6,7 @@ import ./make-test.nix ({ pkgs, ...} : {
     maintainers = [ eelco chaoflow ];
   };
 
-  machine = { config, pkgs, ... }:
+  machine = { ... }:
     { virtualisation.vlans = [ ]; };
 
   testScript =
diff --git a/nixos/tests/krb5/deprecated-config.nix b/nixos/tests/krb5/deprecated-config.nix
index 980b3e762dc..7d7926309c9 100644
--- a/nixos/tests/krb5/deprecated-config.nix
+++ b/nixos/tests/krb5/deprecated-config.nix
@@ -8,7 +8,7 @@ import ../make-test.nix ({ pkgs, ...} : {
   };
 
   machine =
-    { config, pkgs, ... }: {
+    { ... }: {
       krb5 = {
         enable = true;
         defaultRealm = "ATHENA.MIT.EDU";
diff --git a/nixos/tests/krb5/example-config.nix b/nixos/tests/krb5/example-config.nix
index d5328720931..f01cf6988ee 100644
--- a/nixos/tests/krb5/example-config.nix
+++ b/nixos/tests/krb5/example-config.nix
@@ -8,7 +8,7 @@ import ../make-test.nix ({ pkgs, ...} : {
   };
 
   machine =
-    { config, pkgs, ... }: {
+    { pkgs, ... }: {
       krb5 = {
         enable = true;
         kerberos = pkgs.krb5Full;
diff --git a/nixos/tests/kubernetes/certs.nix b/nixos/tests/kubernetes/certs.nix
index 520c728b65e..85e92f6330c 100644
--- a/nixos/tests/kubernetes/certs.nix
+++ b/nixos/tests/kubernetes/certs.nix
@@ -1,9 +1,9 @@
 {
   pkgs ? import <nixpkgs> {},
-  internalDomain ? "cloud.yourdomain.net",
   externalDomain ? "myawesomecluster.cluster.yourdomain.net",
   serviceClusterIp ? "10.0.0.1",
-  kubelets
+  kubelets,
+  ...
 }:
 let
    runWithCFSSL = name: cmd:
diff --git a/nixos/tests/kubernetes/dns.nix b/nixos/tests/kubernetes/dns.nix
index 8c488d271bc..30e1acd255a 100644
--- a/nixos/tests/kubernetes/dns.nix
+++ b/nixos/tests/kubernetes/dns.nix
@@ -60,7 +60,7 @@ let
     config.Entrypoint = "/bin/tail";
   };
 
-  extraConfiguration = { config, pkgs, lib, nodes, ... }: {
+  extraConfiguration = { config, pkgs, ... }: {
     environment.systemPackages = [ pkgs.bind.host ];
     # virtualisation.docker.extraOptions = "--dns=${config.services.kubernetes.addons.dns.clusterIp}";
     services.dnsmasq.enable = true;
diff --git a/nixos/tests/ldap.nix b/nixos/tests/ldap.nix
index b39f4124c95..035a8192417 100644
--- a/nixos/tests/ldap.nix
+++ b/nixos/tests/ldap.nix
@@ -37,7 +37,7 @@ let
     memberUid: ${ldapUser}
   '';
   mkClient = useDaemon:
-    { config, pkgs, lib, ... }:
+    { lib, ... }:
     {
       virtualisation.memorySize = 256;
       virtualisation.vlans = [ 1 ];
@@ -61,7 +61,7 @@ in
   nodes = {
 
     server =
-      { config, pkgs, lib, ... }:
+      { pkgs, ... }:
       {
         virtualisation.memorySize = 256;
         virtualisation.vlans = [ 1 ];
diff --git a/nixos/tests/lightdm.nix b/nixos/tests/lightdm.nix
index d2b561fa67b..8a9a7408d29 100644
--- a/nixos/tests/lightdm.nix
+++ b/nixos/tests/lightdm.nix
@@ -4,7 +4,7 @@ import ./make-test.nix ({ pkgs, ...} : {
     maintainers = [ aszlig ];
   };
 
-  machine = { lib, ... }: {
+  machine = { ... }: {
     imports = [ ./common/user-account.nix ];
     services.xserver.enable = true;
     services.xserver.displayManager.lightdm.enable = true;
diff --git a/nixos/tests/login.nix b/nixos/tests/login.nix
index a6a460fb0a7..3dbb494b689 100644
--- a/nixos/tests/login.nix
+++ b/nixos/tests/login.nix
@@ -7,7 +7,7 @@ import ./make-test.nix ({ pkgs, latestKernel ? false, ... }:
   };
 
   machine =
-    { config, pkgs, lib, ... }:
+    { pkgs, lib, ... }:
     { boot.kernelPackages = lib.mkIf latestKernel pkgs.linuxPackages_latest;
     };
 
diff --git a/nixos/tests/mathics.nix b/nixos/tests/mathics.nix
index 310b751b4d8..fcbeeb18a72 100644
--- a/nixos/tests/mathics.nix
+++ b/nixos/tests/mathics.nix
@@ -5,7 +5,7 @@ import ./make-test.nix ({ pkgs, ... }: {
   };
 
   nodes = {
-    machine = { config, pkgs, ... }: {
+    machine = { ... }: {
       services.mathics.enable = true;
       services.mathics.port = 8888;
     };
diff --git a/nixos/tests/memcached.nix b/nixos/tests/memcached.nix
index f9ef3647bd1..b120599c51d 100644
--- a/nixos/tests/memcached.nix
+++ b/nixos/tests/memcached.nix
@@ -3,7 +3,7 @@ import ./make-test.nix ({ pkgs, ...} : {
 
   nodes = {
     machine =
-      { config, pkgs, ... }:
+      { ... }:
       {
         imports = [ ../modules/profiles/minimal.nix ];
         services.memcached.enable = true;
diff --git a/nixos/tests/mesos.nix b/nixos/tests/mesos.nix
index 007d7ac2160..3ceb1d8125b 100644
--- a/nixos/tests/mesos.nix
+++ b/nixos/tests/mesos.nix
@@ -5,7 +5,7 @@ import ./make-test.nix ({ pkgs, ...} : rec {
   };
 
   nodes = {
-    master = { config, pkgs, ... }: {
+    master = { ... }: {
       networking.firewall.enable = false;
       services.zookeeper.enable = true;
       services.mesos.master = {
@@ -14,7 +14,7 @@ import ./make-test.nix ({ pkgs, ...} : rec {
       };
     };
 
-    slave = { config, pkgs, ... }: {
+    slave = { ... }: {
       networking.firewall.enable = false;
       networking.nat.enable = true;
       virtualisation.docker.enable = true;
diff --git a/nixos/tests/minio.nix b/nixos/tests/minio.nix
index 07a292a9baa..40a59954665 100644
--- a/nixos/tests/minio.nix
+++ b/nixos/tests/minio.nix
@@ -5,7 +5,7 @@ import ./make-test.nix ({ pkgs, ...} : {
   };
 
   nodes = {
-    machine = { config, pkgs, ... }: {
+    machine = { pkgs, ... }: {
       services.minio = {
         enable = true;
         accessKey = "BKIKJAA5BMMU2RHO6IBB";
diff --git a/nixos/tests/misc.nix b/nixos/tests/misc.nix
index 179c95e7643..b0bc1d083b1 100644
--- a/nixos/tests/misc.nix
+++ b/nixos/tests/misc.nix
@@ -9,7 +9,7 @@ import ./make-test.nix ({ pkgs, ...} : rec {
   foo = pkgs.writeText "foo" "Hello World";
 
   machine =
-    { config, lib, pkgs, ... }:
+    { lib, ... }:
     with lib;
     { swapDevices = mkOverride 0
         [ { device = "/root/swapfile"; size = 128; } ];
diff --git a/nixos/tests/mongodb.nix b/nixos/tests/mongodb.nix
index 18535f51af9..2f380ff543e 100644
--- a/nixos/tests/mongodb.nix
+++ b/nixos/tests/mongodb.nix
@@ -13,7 +13,7 @@ in {
 
   nodes = {
     one =
-      { config, pkgs, ... }:
+      { ... }:
         {
           services = {
            mongodb.enable = true;
diff --git a/nixos/tests/morty.nix b/nixos/tests/morty.nix
index 0a5324259ad..eab123bd50f 100644
--- a/nixos/tests/morty.nix
+++ b/nixos/tests/morty.nix
@@ -9,7 +9,7 @@ import ./make-test.nix ({ pkgs, ... }:
   nodes =
     { mortyProxyWithKey =
 
-      { config, pkgs, ... }:
+      { ... }:
       { services.morty = {
         enable = true;
 	key = "78a9cd0cfee20c672f78427efb2a2a96036027f0";
@@ -20,7 +20,7 @@ import ./make-test.nix ({ pkgs, ... }:
     };
 
   testScript =
-    { nodes , ... }:
+    { ... }:
     ''
       $mortyProxyWithKey->waitForUnit("default.target");
 
diff --git a/nixos/tests/mpd.nix b/nixos/tests/mpd.nix
index 2950a8d809d..ac2b810defe 100644
--- a/nixos/tests/mpd.nix
+++ b/nixos/tests/mpd.nix
@@ -47,10 +47,10 @@ import ./make-test.nix ({ pkgs, ... }:
 
   nodes =
     { client = 
-      { config, pkgs, ... }: { };
+      { ... }: { };
 
       serverALSA =
-        { config, pkgs, ... }: (mkServer {
+        { ... }: (mkServer {
           mpd = defaultMpdCfg // {
             network.listenAddress = "any";
             extraConfig = ''
@@ -66,7 +66,7 @@ import ./make-test.nix ({ pkgs, ... }:
         }) // { networking.firewall.allowedTCPPorts = [ 6600 ]; };
 
       serverPulseAudio =
-        { config, pkgs, ... }: (mkServer {
+        { ... }: (mkServer {
           mpd = defaultMpdCfg // {
             extraConfig = ''
               audio_output {
diff --git a/nixos/tests/mumble.nix b/nixos/tests/mumble.nix
index 7959b85a0cf..8146453bfd5 100644
--- a/nixos/tests/mumble.nix
+++ b/nixos/tests/mumble.nix
@@ -1,7 +1,7 @@
 import ./make-test.nix ({ pkgs, ...} : 
 
 let
-  client = { config, pkgs, ... }: {
+  client = { pkgs, ... }: {
     imports = [ ./common/x11.nix ];
     environment.systemPackages = [ pkgs.mumble ];
   };
@@ -13,7 +13,7 @@ in
   };
 
   nodes = {
-    server = { config, pkgs, ... }: {
+    server = { config, ... }: {
       services.murmur.enable       = true;
       services.murmur.registerName = "NixOS tests";
       networking.firewall.allowedTCPPorts = [ config.services.murmur.port ];
diff --git a/nixos/tests/munin.nix b/nixos/tests/munin.nix
index 40fafc62514..eb91d4d630b 100644
--- a/nixos/tests/munin.nix
+++ b/nixos/tests/munin.nix
@@ -9,7 +9,7 @@ import ./make-test.nix ({ pkgs, ...} : {
 
   nodes = {
     one =
-      { config, pkgs, ... }:
+      { config, ... }:
         {
           services = {
            munin-node.enable = true;
diff --git a/nixos/tests/mutable-users.nix b/nixos/tests/mutable-users.nix
index 4f11a4b8366..e590703ab2f 100644
--- a/nixos/tests/mutable-users.nix
+++ b/nixos/tests/mutable-users.nix
@@ -7,10 +7,10 @@ import ./make-test.nix ({ pkgs, ...} : {
   };
 
   nodes = {
-    machine = { config, lib, pkgs, ... }: {
+    machine = { ... }: {
       users.mutableUsers = false;
     };
-    mutable = { config, lib, pkgs, ... }: {
+    mutable = { ... }: {
       users.mutableUsers = true;
     };
   };
diff --git a/nixos/tests/mysql-backup.nix b/nixos/tests/mysql-backup.nix
index ff365098883..81482dfef7e 100644
--- a/nixos/tests/mysql-backup.nix
+++ b/nixos/tests/mysql-backup.nix
@@ -6,7 +6,7 @@ import ./make-test.nix ({ pkgs, ... } : {
   };
 
   nodes = {
-    master = { config, pkgs, ... }: {
+    master = { pkgs, ... }: {
       services.mysql = {
         enable = true;
         initialDatabases = [ { name = "testdb"; schema = ./testdb.sql; } ];
diff --git a/nixos/tests/mysql-replication.nix b/nixos/tests/mysql-replication.nix
index ed09ac10b75..84d70cf3524 100644
--- a/nixos/tests/mysql-replication.nix
+++ b/nixos/tests/mysql-replication.nix
@@ -13,7 +13,7 @@ in
 
   nodes = {
     master =
-      { pkgs, config, ... }:
+      { pkgs, ... }:
 
       {
         services.mysql.enable = true;
@@ -27,7 +27,7 @@ in
       };
 
     slave1 =
-      { pkgs, config, nodes, ... }:
+      { pkgs, nodes, ... }:
 
       {
         services.mysql.enable = true;
@@ -40,7 +40,7 @@ in
       };
 
     slave2 =
-      { pkgs, config, nodes, ... }:
+      { pkgs, nodes, ... }:
 
       {
         services.mysql.enable = true;
diff --git a/nixos/tests/mysql.nix b/nixos/tests/mysql.nix
index c18fee6c749..7251c4a8649 100644
--- a/nixos/tests/mysql.nix
+++ b/nixos/tests/mysql.nix
@@ -6,7 +6,7 @@ import ./make-test.nix ({ pkgs, ...} : {
 
   nodes = {
     master =
-      { pkgs, config, ... }:
+      { pkgs, ... }:
 
       {
         services.mysql.enable = true;
diff --git a/nixos/tests/nat.nix b/nixos/tests/nat.nix
index 7057158a829..9c280fe8b5b 100644
--- a/nixos/tests/nat.nix
+++ b/nixos/tests/nat.nix
@@ -30,7 +30,7 @@ import ./make-test.nix ({ pkgs, lib, withFirewall, withConntrackHelpers ? false,
 
     nodes =
       { client =
-          { config, pkgs, nodes, ... }:
+          { pkgs, nodes, ... }:
           lib.mkMerge [
             { virtualisation.vlans = [ 1 ];
               networking.firewall.allowPing = true;
@@ -44,19 +44,19 @@ import ./make-test.nix ({ pkgs, lib, withFirewall, withConntrackHelpers ? false,
           ];
 
         router =
-        { config, pkgs, ... }: lib.mkMerge [
+        { ... }: lib.mkMerge [
           routerBase
           { networking.nat.enable = true; }
         ];
 
         routerDummyNoNat =
-        { config, pkgs, ... }: lib.mkMerge [
+        { ... }: lib.mkMerge [
           routerBase
           { networking.nat.enable = false; }
         ];
 
         server =
-          { config, pkgs, ... }:
+          { ... }:
           { virtualisation.vlans = [ 2 ];
             networking.firewall.enable = false;
             services.httpd.enable = true;
diff --git a/nixos/tests/netdata.nix b/nixos/tests/netdata.nix
index 58733c1b337..c56506ba287 100644
--- a/nixos/tests/netdata.nix
+++ b/nixos/tests/netdata.nix
@@ -8,7 +8,7 @@ import ./make-test.nix ({ pkgs, ...} : {
 
   nodes = {
     netdata =
-      { config, pkgs, ... }:
+      { pkgs, ... }:
         {
           environment.systemPackages = with pkgs; [ curl jq ];
           services.netdata.enable = true;
diff --git a/nixos/tests/networking-proxy.nix b/nixos/tests/networking-proxy.nix
index 4c572573140..ab908c96e5e 100644
--- a/nixos/tests/networking-proxy.nix
+++ b/nixos/tests/networking-proxy.nix
@@ -19,13 +19,13 @@ in import ./make-test.nix ({ pkgs, ...} : {
   nodes = {
     # no proxy
     machine =
-      { config, pkgs, ... }:
+      { ... }:
 
       default-config;
 
     # proxy default
     machine2 =
-      { config, pkgs, ... }:
+      { ... }:
 
       default-config // {
         networking.proxy.default = "http://user:pass@host:port";
@@ -33,7 +33,7 @@ in import ./make-test.nix ({ pkgs, ...} : {
 
     # specific proxy options
     machine3 =
-      { config, pkgs, ... }:
+      { ... }:
 
       default-config //
       {
@@ -51,7 +51,7 @@ in import ./make-test.nix ({ pkgs, ...} : {
 
     # mix default + proxy options
     machine4 =
-      { config, pkgs, ... }:
+      { ... }:
 
       default-config // {
         networking.proxy = {
diff --git a/nixos/tests/networking.nix b/nixos/tests/networking.nix
index 5cb40af5799..cd5d537a3be 100644
--- a/nixos/tests/networking.nix
+++ b/nixos/tests/networking.nix
@@ -81,7 +81,7 @@ let
     static = {
       name = "Static";
       nodes.router = router;
-      nodes.client = { config, pkgs, ... }: with pkgs.lib; {
+      nodes.client = { pkgs, ... }: with pkgs.lib; {
         virtualisation.vlans = [ 1 2 ];
         networking = {
           useNetworkd = networkd;
@@ -98,7 +98,7 @@ let
           ];
         };
       };
-      testScript = { nodes, ... }:
+      testScript = { ... }:
         ''
           startAll;
 
@@ -134,7 +134,7 @@ let
     dhcpSimple = {
       name = "SimpleDHCP";
       nodes.router = router;
-      nodes.client = { config, pkgs, ... }: with pkgs.lib; {
+      nodes.client = { pkgs, ... }: with pkgs.lib; {
         virtualisation.vlans = [ 1 2 ];
         networking = {
           useNetworkd = networkd;
@@ -150,7 +150,7 @@ let
           };
         };
       };
-      testScript = { nodes, ... }:
+      testScript = { ... }:
         ''
           startAll;
 
@@ -189,7 +189,7 @@ let
     dhcpOneIf = {
       name = "OneInterfaceDHCP";
       nodes.router = router;
-      nodes.client = { config, pkgs, ... }: with pkgs.lib; {
+      nodes.client = { pkgs, ... }: with pkgs.lib; {
         virtualisation.vlans = [ 1 2 ];
         networking = {
           useNetworkd = networkd;
@@ -202,7 +202,7 @@ let
           interfaces.eth2.ipv4.addresses = mkOverride 0 [ ];
         };
       };
-      testScript = { nodes, ... }:
+      testScript = { ... }:
         ''
           startAll;
 
@@ -229,7 +229,7 @@ let
         '';
     };
     bond = let
-      node = address: { config, pkgs, ... }: with pkgs.lib; {
+      node = address: { pkgs, ... }: with pkgs.lib; {
         virtualisation.vlans = [ 1 2 ];
         networking = {
           useNetworkd = networkd;
@@ -249,7 +249,7 @@ let
       name = "Bond";
       nodes.client1 = node "192.168.1.1";
       nodes.client2 = node "192.168.1.2";
-      testScript = { nodes, ... }:
+      testScript = { ... }:
         ''
           startAll;
 
@@ -266,7 +266,7 @@ let
         '';
     };
     bridge = let
-      node = { address, vlan }: { config, pkgs, ... }: with pkgs.lib; {
+      node = { address, vlan }: { pkgs, ... }: with pkgs.lib; {
         virtualisation.vlans = [ vlan ];
         networking = {
           useNetworkd = networkd;
@@ -280,7 +280,7 @@ let
       name = "Bridge";
       nodes.client1 = node { address = "192.168.1.2"; vlan = 1; };
       nodes.client2 = node { address = "192.168.1.3"; vlan = 2; };
-      nodes.router = { config, pkgs, ... }: with pkgs.lib; {
+      nodes.router = { pkgs, ... }: with pkgs.lib; {
         virtualisation.vlans = [ 1 2 ];
         networking = {
           useNetworkd = networkd;
@@ -293,7 +293,7 @@ let
             [ { address = "192.168.1.1"; prefixLength = 24; } ];
         };
       };
-      testScript = { nodes, ... }:
+      testScript = { ... }:
         ''
           startAll;
 
@@ -319,7 +319,7 @@ let
     macvlan = {
       name = "MACVLAN";
       nodes.router = router;
-      nodes.client = { config, pkgs, ... }: with pkgs.lib; {
+      nodes.client = { pkgs, ... }: with pkgs.lib; {
         virtualisation.vlans = [ 1 ];
         networking = {
           useNetworkd = networkd;
@@ -329,7 +329,7 @@ let
           interfaces.eth1.ipv4.addresses = mkOverride 0 [ ];
         };
       };
-      testScript = { nodes, ... }:
+      testScript = { ... }:
         ''
           startAll;
 
@@ -356,7 +356,7 @@ let
         '';
     };
     sit = let
-      node = { address4, remote, address6 }: { config, pkgs, ... }: with pkgs.lib; {
+      node = { address4, remote, address6 }: { pkgs, ... }: with pkgs.lib; {
         virtualisation.vlans = [ 1 ];
         networking = {
           useNetworkd = networkd;
@@ -377,7 +377,7 @@ let
       name = "Sit";
       nodes.client1 = node { address4 = "192.168.1.1"; remote = "192.168.1.2"; address6 = "fc00::1"; };
       nodes.client2 = node { address4 = "192.168.1.2"; remote = "192.168.1.1"; address6 = "fc00::2"; };
-      testScript = { nodes, ... }:
+      testScript = { ... }:
         ''
           startAll;
 
@@ -398,7 +398,7 @@ let
         '';
     };
     vlan = let
-      node = address: { config, pkgs, ... }: with pkgs.lib; {
+      node = address: { pkgs, ... }: with pkgs.lib; {
         #virtualisation.vlans = [ 1 ];
         networking = {
           useNetworkd = networkd;
@@ -418,7 +418,7 @@ let
       name = "vlan";
       nodes.client1 = node "192.168.1.1";
       nodes.client2 = node "192.168.1.2";
-      testScript = { nodes, ... }:
+      testScript = { ... }:
         ''
           startAll;
 
@@ -476,7 +476,7 @@ let
     };
     privacy = {
       name = "Privacy";
-      nodes.router = { config, pkgs, ... }: {
+      nodes.router = { ... }: {
         virtualisation.vlans = [ 1 ];
         boot.kernel.sysctl."net.ipv6.conf.all.forwarding" = true;
         networking = {
@@ -502,7 +502,7 @@ let
           '';
         };
       };
-      nodes.client = { config, pkgs, ... }: with pkgs.lib; {
+      nodes.client = { pkgs, ... }: with pkgs.lib; {
         virtualisation.vlans = [ 1 ];
         networking = {
           useNetworkd = networkd;
@@ -514,7 +514,7 @@ let
           };
         };
       };
-      testScript = { nodes, ... }:
+      testScript = { ... }:
         ''
           startAll;
 
diff --git a/nixos/tests/nexus.nix b/nixos/tests/nexus.nix
index be886201877..bf49d2247bd 100644
--- a/nixos/tests/nexus.nix
+++ b/nixos/tests/nexus.nix
@@ -12,7 +12,7 @@ import ./make-test.nix ({ pkgs, ...} : {
   nodes = {
 
     server =
-      { config, pkgs, ... }:
+      { ... }:
       { virtualisation.memorySize = 2047; # qemu-system-i386 has a 2047M limit
         virtualisation.diskSize = 2048;
 
diff --git a/nixos/tests/nfs.nix b/nixos/tests/nfs.nix
index 6ed1995f262..1992f240e7b 100644
--- a/nixos/tests/nfs.nix
+++ b/nixos/tests/nfs.nix
@@ -3,7 +3,7 @@ import ./make-test.nix ({ pkgs, version ? 4, ... }:
 let
 
   client =
-    { config, pkgs, ... }:
+    { pkgs, ... }:
     { fileSystems = pkgs.lib.mkVMOverride
         [ { mountPoint = "/data";
             device = "server:/data";
@@ -27,7 +27,7 @@ in
       client2 = client;
 
       server =
-        { config, pkgs, ... }:
+        { ... }:
         { services.nfs.server.enable = true;
           services.nfs.server.exports =
             ''
diff --git a/nixos/tests/nginx.nix b/nixos/tests/nginx.nix
index 7f7bc0f0b4f..32b11364923 100644
--- a/nixos/tests/nginx.nix
+++ b/nixos/tests/nginx.nix
@@ -10,7 +10,7 @@ import ./make-test.nix ({ pkgs, ...} : {
 
   nodes = {
     webserver =
-      { config, pkgs, ... }:
+      { ... }:
       { services.nginx.enable = true;
         services.nginx.commonHttpConfig = ''
         log_format ceeformat '@cee: {"status":"$status",'
diff --git a/nixos/tests/novacomd.nix b/nixos/tests/novacomd.nix
index 21b86f6dae2..2b56aee0a2e 100644
--- a/nixos/tests/novacomd.nix
+++ b/nixos/tests/novacomd.nix
@@ -4,7 +4,7 @@ import ./make-test.nix ({ pkgs, ...} : {
     maintainers = [ dtzWill ];
   };
 
-  machine = { config, pkgs, ... }: {
+  machine = { ... }: {
     services.novacomd.enable = true;
   };
 
diff --git a/nixos/tests/openssh.nix b/nixos/tests/openssh.nix
index 230b4520684..c66b90b802d 100644
--- a/nixos/tests/openssh.nix
+++ b/nixos/tests/openssh.nix
@@ -11,7 +11,7 @@ in {
   nodes = {
 
     server =
-      { config, pkgs, ... }:
+      { ... }:
 
       {
         services.openssh.enable = true;
@@ -23,7 +23,7 @@ in {
       };
 
     server_lazy =
-      { config, pkgs, ... }:
+      { ... }:
 
       {
         services.openssh = { enable = true; startWhenNeeded = true; };
@@ -35,7 +35,7 @@ in {
       };
 
     client =
-      { config, pkgs, ... }: { };
+      { ... }: { };
 
   };
 
diff --git a/nixos/tests/owncloud.nix b/nixos/tests/owncloud.nix
index 0dcdea40b06..c968569f200 100644
--- a/nixos/tests/owncloud.nix
+++ b/nixos/tests/owncloud.nix
@@ -1,10 +1,10 @@
-import ./make-test.nix ({ pkgs, ... }:
+import ./make-test.nix ({ ... }:
 
 {
   name = "owncloud";
   nodes =
     { web =
-        { config, pkgs, ... }:
+        { ... }:
         {
           services.postgresql.enable = true;
           services.httpd = {
diff --git a/nixos/tests/pam-oath-login.nix b/nixos/tests/pam-oath-login.nix
index 9f40ecfe865..b9d489950e7 100644
--- a/nixos/tests/pam-oath-login.nix
+++ b/nixos/tests/pam-oath-login.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix ({ pkgs, latestKernel ? false, ... }:
+import ./make-test.nix ({ ... }:
 
 let
   oathSnakeoilSecret = "cdd4083ef8ff1fa9178c6d46bfb1a3";
@@ -22,7 +22,7 @@ in
   name = "pam-oath-login";
 
   machine =
-    { config, pkgs, lib, ... }:
+    { ... }:
     {
       security.pam.oath = {
         enable = true;
diff --git a/nixos/tests/partition.nix b/nixos/tests/partition.nix
index 291d9b278d3..01a08995950 100644
--- a/nixos/tests/partition.nix
+++ b/nixos/tests/partition.nix
@@ -65,7 +65,7 @@ let
 in {
   name = "partitiion";
 
-  machine = { config, pkgs, ... }: {
+  machine = { pkgs, ... }: {
     environment.systemPackages = [
       pkgs.pythonPackages.nixpart0
       pkgs.file pkgs.btrfs-progs pkgs.xfsprogs pkgs.lvm2
diff --git a/nixos/tests/peerflix.nix b/nixos/tests/peerflix.nix
index eb729f22f91..fae37fedaac 100644
--- a/nixos/tests/peerflix.nix
+++ b/nixos/tests/peerflix.nix
@@ -8,7 +8,7 @@ import ./make-test.nix ({ pkgs, ...} : {
 
   nodes = {
     peerflix =
-      { config, pkgs, ... }:
+      { ... }:
         {
           services.peerflix.enable = true;
         };
diff --git a/nixos/tests/pgjwt.nix b/nixos/tests/pgjwt.nix
index d186c42a2a9..a2d81288c81 100644
--- a/nixos/tests/pgjwt.nix
+++ b/nixos/tests/pgjwt.nix
@@ -14,7 +14,7 @@ with pkgs; {
   };
 
   nodes = {
-    master = { pkgs, config, ... }:
+    master = { ... }:
     {
       services.postgresql = {
         enable = true;
diff --git a/nixos/tests/phabricator.nix b/nixos/tests/phabricator.nix
index fdc39393fae..20b3b838aba 100644
--- a/nixos/tests/phabricator.nix
+++ b/nixos/tests/phabricator.nix
@@ -6,7 +6,7 @@ import ./make-test.nix ({ pkgs, ... }: {
 
   nodes = {
     storage =
-      { config, pkgs, ... }:
+      { ... }:
       { services.nfs.server.enable = true;
         services.nfs.server.exports = ''
           /repos 192.168.1.0/255.255.255.0(rw,no_root_squash)
@@ -15,7 +15,7 @@ import ./make-test.nix ({ pkgs, ... }: {
       };
 
     webserver =
-      { config, pkgs, ... }:
+      { pkgs, ... }:
       { fileSystems = pkgs.lib.mkVMOverride
           [ { mountPoint = "/repos";
               device = "storage:/repos";
@@ -52,7 +52,7 @@ import ./make-test.nix ({ pkgs, ... }: {
       };
 
     client =
-      { config, pkgs, ... }:
+      { ... }:
       { imports = [ ./common/x11.nix ];
         services.xserver.desktopManager.plasma5.enable = true;
       };
diff --git a/nixos/tests/php-pcre.nix b/nixos/tests/php-pcre.nix
index f618a39a229..19bde9babad 100644
--- a/nixos/tests/php-pcre.nix
+++ b/nixos/tests/php-pcre.nix
@@ -1,9 +1,9 @@
 
 let testString = "can-use-subgroups"; in
 
-import ./make-test.nix ({ pkgs, ...}: {
+import ./make-test.nix ({ ...}: {
   name = "php-httpd-pcre-jit-test";
-  machine = { config, lib, pkgs, ... }: {
+  machine = { lib, pkgs, ... }: {
     time.timeZone = "UTC";
     services.httpd = {
       enable = true;
@@ -34,7 +34,7 @@ import ./make-test.nix ({ pkgs, ...}: {
       };
     };
   };
-  testScript = { nodes, ... }:
+  testScript = { ... }:
   ''
     $machine->waitForUnit('httpd.service');
     # Ensure php evaluation by matching on the var_dump syntax
diff --git a/nixos/tests/plasma5.nix b/nixos/tests/plasma5.nix
index e479d3f1cb8..eb705536827 100644
--- a/nixos/tests/plasma5.nix
+++ b/nixos/tests/plasma5.nix
@@ -6,7 +6,7 @@ import ./make-test.nix ({ pkgs, ...} :
     maintainers = [ ttuegel ];
   };
 
-  machine = { lib, ... }:
+  machine = { ... }:
   let
     sddm_theme = pkgs.stdenv.mkDerivation {
       name = "breeze-ocr-theme";
diff --git a/nixos/tests/plotinus.nix b/nixos/tests/plotinus.nix
index 9058c59c92d..609afe7b214 100644
--- a/nixos/tests/plotinus.nix
+++ b/nixos/tests/plotinus.nix
@@ -5,7 +5,7 @@ import ./make-test.nix ({ pkgs, ... }: {
   };
 
   machine =
-    { config, pkgs, ... }:
+    { pkgs, ... }:
 
     { imports = [ ./common/x11.nix ];
       programs.plotinus.enable = true;
diff --git a/nixos/tests/postgis.nix b/nixos/tests/postgis.nix
index 7fe905eb425..f8b63c5b6a2 100644
--- a/nixos/tests/postgis.nix
+++ b/nixos/tests/postgis.nix
@@ -6,7 +6,7 @@ import ./make-test.nix ({ pkgs, ...} : {
 
   nodes = {
     master =
-      { pkgs, config, ... }:
+      { pkgs, ... }:
 
       {
         services.postgresql = let mypg = pkgs.postgresql100; in {
diff --git a/nixos/tests/postgresql.nix b/nixos/tests/postgresql.nix
index 2381939552e..f1f09277f34 100644
--- a/nixos/tests/postgresql.nix
+++ b/nixos/tests/postgresql.nix
@@ -22,7 +22,7 @@ let
       maintainers = [ zagy ];
     };
 
-    machine = {pkgs, config, ...}:
+    machine = {...}:
       {
         services.postgresql.package=postgresql-package;
         services.postgresql.enable = true;
diff --git a/nixos/tests/powerdns.nix b/nixos/tests/powerdns.nix
index 0d5b0f715f5..8addcc78401 100644
--- a/nixos/tests/powerdns.nix
+++ b/nixos/tests/powerdns.nix
@@ -1,7 +1,7 @@
 import ./make-test.nix ({ pkgs, ... }: {
   name = "powerdns";
 
-  nodes.server = { config, pkgs, ... }: {
+  nodes.server = { ... }: {
     services.powerdns.enable = true;
   };
 
diff --git a/nixos/tests/predictable-interface-names.nix b/nixos/tests/predictable-interface-names.nix
index 0b431034a7a..0d73436c1c3 100644
--- a/nixos/tests/predictable-interface-names.nix
+++ b/nixos/tests/predictable-interface-names.nix
@@ -9,7 +9,7 @@ in pkgs.lib.listToAttrs (pkgs.lib.crossLists (predictable: withNetworkd: {
     name = "${if predictable then "" else "un"}predictableInterfaceNames${if withNetworkd then "-with-networkd" else ""}";
     meta = {};
 
-    machine = { config, lib, ... }: {
+    machine = { lib, ... }: {
       networking.usePredictableInterfaceNames = lib.mkForce predictable;
       networking.useNetworkd = withNetworkd;
       networking.dhcpcd.enable = !withNetworkd;
diff --git a/nixos/tests/printing.nix b/nixos/tests/printing.nix
index 98900883061..d85abf3c105 100644
--- a/nixos/tests/printing.nix
+++ b/nixos/tests/printing.nix
@@ -9,7 +9,7 @@ import ./make-test.nix ({pkgs, ... }: {
   nodes = {
 
     server =
-      { config, pkgs, ... }:
+      { ... }:
       { services.printing.enable = true;
         services.printing.listenAddresses = [ "*:631" ];
         services.printing.defaultShared = true;
@@ -24,7 +24,7 @@ import ./make-test.nix ({pkgs, ... }: {
       };
 
     client =
-      { config, pkgs, nodes, ... }:
+      { ... }:
       { services.printing.enable = true;
       };
 
diff --git a/nixos/tests/prometheus.nix b/nixos/tests/prometheus.nix
index 374fb2d634b..87a6510f40f 100644
--- a/nixos/tests/prometheus.nix
+++ b/nixos/tests/prometheus.nix
@@ -2,7 +2,7 @@ import ./make-test.nix {
   name = "prometheus";
 
   nodes = {
-    one = { config, pkgs, ... }: {
+    one = { ... }: {
       services.prometheus = {
         enable = true;
         scrapeConfigs = [{
diff --git a/nixos/tests/prosody.nix b/nixos/tests/prosody.nix
index fcebfaf74e1..5d33aaf8d65 100644
--- a/nixos/tests/prosody.nix
+++ b/nixos/tests/prosody.nix
@@ -1,7 +1,7 @@
 import ./make-test.nix {
   name = "prosody";
 
-  machine = { config, pkgs, ... }: {
+  machine = { pkgs, ... }: {
     services.prosody = {
       enable = true;
       # TODO: use a self-signed certificate
diff --git a/nixos/tests/proxy.nix b/nixos/tests/proxy.nix
index 3fee1d32538..18195312028 100644
--- a/nixos/tests/proxy.nix
+++ b/nixos/tests/proxy.nix
@@ -3,7 +3,7 @@ import ./make-test.nix ({ pkgs, ...} :
 let
 
   backend =
-    { config, pkgs, ... }:
+    { pkgs, ... }:
 
     { services.httpd.enable = true;
       services.httpd.adminAddr = "foo@example.org";
@@ -21,7 +21,7 @@ in
 
   nodes =
     { proxy =
-        { config, pkgs, nodes, ... }:
+        { nodes, ... }:
 
         { services.httpd.enable = true;
           services.httpd.adminAddr = "bar@example.org";
@@ -57,7 +57,7 @@ in
       backend1 = backend;
       backend2 = backend;
 
-      client = { config, pkgs, ... }: { };
+      client = { ... }: { };
     };
 
   testScript =
diff --git a/nixos/tests/quagga.nix b/nixos/tests/quagga.nix
index 613180942c4..0ff14a21584 100644
--- a/nixos/tests/quagga.nix
+++ b/nixos/tests/quagga.nix
@@ -30,14 +30,14 @@ import ./make-test.nix ({ pkgs, ... }:
       nodes = {
 
         client =
-          { config, pkgs, nodes, ... }:
+          { nodes, ... }:
           {
             virtualisation.vlans = [ 1 ];
             networking.defaultGateway = ifAddr nodes.router1 "eth1";
           };
 
         router1 =
-          { config, pkgs, nodes, ... }:
+          { ... }:
           {
             virtualisation.vlans = [ 1 2 ];
             boot.kernel.sysctl."net.ipv4.ip_forward" = "1";
@@ -49,7 +49,7 @@ import ./make-test.nix ({ pkgs, ... }:
           };
 
         router2 =
-          { config, pkgs, nodes, ... }:
+          { ... }:
           {
             virtualisation.vlans = [ 3 2 ];
             boot.kernel.sysctl."net.ipv4.ip_forward" = "1";
@@ -61,7 +61,7 @@ import ./make-test.nix ({ pkgs, ... }:
           };
 
         server =
-          { config, pkgs, nodes, ... }:
+          { nodes, ... }:
           {
             virtualisation.vlans = [ 3 ];
             networking.defaultGateway = ifAddr nodes.router2 "eth1";
@@ -73,7 +73,7 @@ import ./make-test.nix ({ pkgs, ... }:
       };
 
       testScript =
-        { nodes, ... }:
+        { ... }:
         ''
           startAll;
 
diff --git a/nixos/tests/quake3.nix b/nixos/tests/quake3.nix
index 22d71595cb4..75c82cca63f 100644
--- a/nixos/tests/quake3.nix
+++ b/nixos/tests/quake3.nix
@@ -29,7 +29,7 @@ rec {
   #makeCoverageReport = true;
 
   client =
-    { config, pkgs, ... }:
+    { pkgs, ... }:
 
     { imports = [ ./common/x11.nix ];
       hardware.opengl.driSupport = true;
@@ -40,7 +40,7 @@ rec {
 
   nodes =
     { server =
-        { config, pkgs, ... }:
+        { pkgs, ... }:
 
         { systemd.services."quake3-server" =
             { wantedBy = [ "multi-user.target" ];
diff --git a/nixos/tests/rabbitmq.nix b/nixos/tests/rabbitmq.nix
index 23a7e2ed538..34ab0578786 100644
--- a/nixos/tests/rabbitmq.nix
+++ b/nixos/tests/rabbitmq.nix
@@ -7,7 +7,7 @@ import ./make-test.nix ({ pkgs, ... }: {
   };
 
   nodes = {
-    one = { config, pkgs, ... }: {
+    one = { ... }: {
       services.rabbitmq.enable = true;
     };
   };
diff --git a/nixos/tests/radicale.nix b/nixos/tests/radicale.nix
index e3843038541..0a9c2d394a7 100644
--- a/nixos/tests/radicale.nix
+++ b/nixos/tests/radicale.nix
@@ -28,7 +28,7 @@ let
 
 in
 
-  import ./make-test.nix ({ pkgs, lib, ... }@args: {
+  import ./make-test.nix ({ lib, ... }@args: {
     name = "radicale";
     meta.maintainers = with lib.maintainers; [ aneeshusa infinisil ];
 
diff --git a/nixos/tests/riak.nix b/nixos/tests/riak.nix
index 18d028232ac..68a9b7315b3 100644
--- a/nixos/tests/riak.nix
+++ b/nixos/tests/riak.nix
@@ -3,7 +3,7 @@ import ./make-test.nix {
 
   nodes = {
     master =
-      { pkgs, config, ... }:
+      { pkgs, ... }:
 
       {
         services.riak.enable = true;
diff --git a/nixos/tests/run-in-machine.nix b/nixos/tests/run-in-machine.nix
index a6dfece44a9..bd90dc3080b 100644
--- a/nixos/tests/run-in-machine.nix
+++ b/nixos/tests/run-in-machine.nix
@@ -5,7 +5,7 @@ with import ../lib/testing.nix { inherit system; };
 let
   output = runInMachine {
     drv = pkgs.hello;
-    machine = { config, pkgs, ... }: { /* services.sshd.enable = true; */ };
+    machine = { ... }: { /* services.sshd.enable = true; */ };
   };
 in pkgs.runCommand "verify-output" { inherit output; } ''
   if [ ! -e "$output/bin/hello" ]; then
diff --git a/nixos/tests/rxe.nix b/nixos/tests/rxe.nix
index cfe64a75a63..d0b53db8eeb 100644
--- a/nixos/tests/rxe.nix
+++ b/nixos/tests/rxe.nix
@@ -1,7 +1,7 @@
-import ./make-test.nix ({ pkgs, ... } :
+import ./make-test.nix ({ ... } :
 
 let
-  node = { config, pkgs, lib, ... } : {
+  node = { pkgs, ... } : {
     networking = {
       firewall = {
         allowedUDPPorts = [ 4791 ]; # open RoCE port
diff --git a/nixos/tests/samba.nix b/nixos/tests/samba.nix
index e446284fc0e..2802e00a5b1 100644
--- a/nixos/tests/samba.nix
+++ b/nixos/tests/samba.nix
@@ -7,7 +7,7 @@ import ./make-test.nix ({ pkgs, ... }:
 
   nodes =
     { client =
-        { config, pkgs, ... }:
+        { pkgs, ... }:
         { fileSystems = pkgs.lib.mkVMOverride
             { "/public" = {
                 fsType = "cifs";
@@ -18,7 +18,7 @@ import ./make-test.nix ({ pkgs, ... }:
         };
 
       server =
-        { config, pkgs, ... }:
+        { ... }:
         { services.samba.enable = true;
           services.samba.shares.public =
             { path = "/public";
diff --git a/nixos/tests/sddm.nix b/nixos/tests/sddm.nix
index ac91a89f669..7b9fdc0b344 100644
--- a/nixos/tests/sddm.nix
+++ b/nixos/tests/sddm.nix
@@ -9,7 +9,7 @@ let
     default = {
       name = "sddm";
 
-      machine = { lib, ... }: {
+      machine = { ... }: {
         imports = [ ./common/user-account.nix ];
         services.xserver.enable = true;
         services.xserver.displayManager.sddm.enable = true;
@@ -39,7 +39,7 @@ let
         maintainers = [ ttuegel ];
       };
 
-      machine = { lib, ... }: {
+      machine = { ... }: {
         imports = [ ./common/user-account.nix ];
         services.xserver.enable = true;
         services.xserver.displayManager.sddm = {
@@ -54,7 +54,7 @@ let
         services.xserver.desktopManager.default = "none";
       };
 
-      testScript = { nodes, ... }: ''
+      testScript = { ... }: ''
         startAll;
         $machine->waitForFile("/home/alice/.Xauthority");
         $machine->succeed("xauth merge ~alice/.Xauthority");
diff --git a/nixos/tests/simple.nix b/nixos/tests/simple.nix
index 04d624adcfe..84c5621d962 100644
--- a/nixos/tests/simple.nix
+++ b/nixos/tests/simple.nix
@@ -4,7 +4,7 @@ import ./make-test.nix ({ pkgs, ...} : {
     maintainers = [ eelco ];
   };
 
-  machine = { config, pkgs, ... }: {
+  machine = { ... }: {
     imports = [ ../modules/profiles/minimal.nix ];
   };
 
diff --git a/nixos/tests/slim.nix b/nixos/tests/slim.nix
index 5c76c58cf3f..42c87dfa039 100644
--- a/nixos/tests/slim.nix
+++ b/nixos/tests/slim.nix
@@ -5,7 +5,7 @@ import ./make-test.nix ({ pkgs, ...} : {
     maintainers = [ aszlig ];
   };
 
-  machine = { pkgs, lib, ... }: {
+  machine = { pkgs, ... }: {
     imports = [ ./common/user-account.nix ];
     services.xserver.enable = true;
     services.xserver.windowManager.default = "icewm";
diff --git a/nixos/tests/slurm.nix b/nixos/tests/slurm.nix
index ec67ea09287..60f44c3c845 100644
--- a/nixos/tests/slurm.nix
+++ b/nixos/tests/slurm.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix ({ pkgs, ... }:
+import ./make-test.nix ({ ... }:
 let mungekey = "mungeverryweakkeybuteasytointegratoinatest";
     slurmconfig = {
       controlMachine = "control";
@@ -14,7 +14,7 @@ in {
   nodes =
     let
     computeNode =
-      { config, pkgs, ...}:
+      { ...}:
       {
         # TODO slrumd port and slurmctld port should be configurations and
         # automatically allowed by the  firewall.
@@ -26,7 +26,7 @@ in {
     in {
 
     control =
-      { config, pkgs, ...}:
+      { ...}:
       {
         networking.firewall.enable = false;
         services.slurm = {
@@ -35,7 +35,7 @@ in {
       };
 
     submit =
-      { config, pkgs, ...}:
+      { ...}:
       {
         networking.firewall.enable = false;
         services.slurm = {
diff --git a/nixos/tests/smokeping.nix b/nixos/tests/smokeping.nix
index 4c77e4b7861..07d22805112 100644
--- a/nixos/tests/smokeping.nix
+++ b/nixos/tests/smokeping.nix
@@ -6,7 +6,7 @@ import ./make-test.nix ({ pkgs, ...} : {
 
   nodes = {
     sm =
-      { pkgs, config, ... }:
+      { ... }:
       {
         services.smokeping = {
           enable = true;
diff --git a/nixos/tests/strongswan-swanctl.nix b/nixos/tests/strongswan-swanctl.nix
index 021743021b4..8bbebd42300 100644
--- a/nixos/tests/strongswan-swanctl.nix
+++ b/nixos/tests/strongswan-swanctl.nix
@@ -34,7 +34,7 @@ in {
   meta.maintainers = with pkgs.stdenv.lib.maintainers; [ basvandijk ];
   nodes = {
 
-    alice = { nodes, ... } : {
+    alice = { ... } : {
       virtualisation.vlans = [ 0 ];
       networking = {
         dhcpcd.enable = false;
@@ -42,7 +42,7 @@ in {
       };
     };
 
-    moon = {pkgs, config, nodes, ...} :
+    moon = { config, ...} :
       let strongswan = config.services.strongswan-swanctl.package;
       in {
         virtualisation.vlans = [ 0 1 ];
@@ -94,7 +94,7 @@ in {
         };
       };
 
-    carol = {pkgs, config, nodes, ...} :
+    carol = { config, ...} :
       let strongswan = config.services.strongswan-swanctl.package;
       in {
         virtualisation.vlans = [ 1 ];
diff --git a/nixos/tests/subversion.nix b/nixos/tests/subversion.nix
index a8e33a6f7e5..6175155cdfc 100644
--- a/nixos/tests/subversion.nix
+++ b/nixos/tests/subversion.nix
@@ -39,7 +39,7 @@ in
 
   nodes =
     { webserver =
-        { config, pkgs, ... }:
+        { ... }:
 
         {
           services.httpd.enable = true;
@@ -55,7 +55,7 @@ in
         };
 
       client =
-        { config, pkgs, ... }:
+        { pkgs, ... }:
 
         {
           environment.systemPackages = [ pkgs.subversion ];
diff --git a/nixos/tests/sudo.nix b/nixos/tests/sudo.nix
index 5d6c8691230..fc16b99cc19 100644
--- a/nixos/tests/sudo.nix
+++ b/nixos/tests/sudo.nix
@@ -11,7 +11,7 @@ in
     };
 
     machine =
-      { config, lib, pkgs, ... }:
+      { lib, ... }:
       with lib;
       {
         users.groups = { foobar = {}; barfoo = {}; baz = { gid = 1337; }; };
diff --git a/nixos/tests/switch-test.nix b/nixos/tests/switch-test.nix
index 46f2563af8d..32010838e67 100644
--- a/nixos/tests/switch-test.nix
+++ b/nixos/tests/switch-test.nix
@@ -7,10 +7,10 @@ import ./make-test.nix ({ pkgs, ...} : {
   };
 
   nodes = {
-    machine = { config, lib, pkgs, ... }: {
+    machine = { ... }: {
       users.mutableUsers = false;
     };
-    other = { config, lib, pkgs, ... }: {
+    other = { ... }: {
       users.mutableUsers = true;
     };
   };
diff --git a/nixos/tests/tomcat.nix b/nixos/tests/tomcat.nix
index 475c947e72d..af63c7ee8e0 100644
--- a/nixos/tests/tomcat.nix
+++ b/nixos/tests/tomcat.nix
@@ -6,7 +6,7 @@ import ./make-test.nix ({ pkgs, ...} : {
 
   nodes = {
     server =
-      { pkgs, config, ... }:
+      { ... }:
 
       { services.tomcat.enable = true;
         services.httpd.enable = true;
diff --git a/nixos/tests/tor.nix b/nixos/tests/tor.nix
index 24d46a03897..0cb44ddff24 100644
--- a/nixos/tests/tor.nix
+++ b/nixos/tests/tor.nix
@@ -5,14 +5,14 @@ rec {
   meta.maintainers = with maintainers; [ joachifm ];
 
   common =
-    { config, ... }:
+    { ... }:
     { boot.kernelParams = [ "audit=0" "apparmor=0" "quiet" ];
       networking.firewall.enable = false;
       networking.useDHCP = false;
     };
 
   nodes.client =
-    { config, pkgs, ... }:
+    { pkgs, ... }:
     { imports = [ common ];
       environment.systemPackages = with pkgs; [ netcat ];
       services.tor.enable = true;
diff --git a/nixos/tests/trac.nix b/nixos/tests/trac.nix
index 5da5717d7f8..4599885acde 100644
--- a/nixos/tests/trac.nix
+++ b/nixos/tests/trac.nix
@@ -6,7 +6,7 @@ import ./make-test.nix ({ pkgs, ... }: {
 
   nodes = {
     storage =
-      { config, pkgs, ... }:
+      { ... }:
       { services.nfs.server.enable = true;
         services.nfs.server.exports = ''
           /repos 192.168.1.0/255.255.255.0(rw,no_root_squash)
@@ -15,7 +15,7 @@ import ./make-test.nix ({ pkgs, ... }: {
       };
 
     postgresql =
-      { config, pkgs, ... }:
+      { pkgs, ... }:
       { services.postgresql.enable = true;
         services.postgresql.package = pkgs.postgresql;
         services.postgresql.enableTCPIP = true;
@@ -29,7 +29,7 @@ import ./make-test.nix ({ pkgs, ... }: {
       };
 
     webserver =
-      { config, pkgs, ... }:
+      { pkgs, ... }:
       { fileSystems = pkgs.lib.mkVMOverride
           [ { mountPoint = "/repos";
               device = "storage:/repos";
@@ -43,7 +43,7 @@ import ./make-test.nix ({ pkgs, ... }: {
       };
 
     client =
-      { config, pkgs, ... }:
+      { ... }:
       { imports = [ ./common/x11.nix ];
         services.xserver.desktopManager.plasma5.enable = true;
       };
diff --git a/nixos/tests/transmission.nix b/nixos/tests/transmission.nix
index 34c49bd7f15..f1c238730eb 100644
--- a/nixos/tests/transmission.nix
+++ b/nixos/tests/transmission.nix
@@ -4,7 +4,7 @@ import ./make-test.nix ({ pkgs, ...} : {
     maintainers = [ coconnor ];
   };
 
-  machine = { config, pkgs, ... }: {
+  machine = { ... }: {
     imports = [ ../modules/profiles/minimal.nix ];
 
     networking.firewall.allowedTCPPorts = [ 9091 ];
diff --git a/nixos/tests/udisks2.nix b/nixos/tests/udisks2.nix
index 70a999267a5..8bbbe286efc 100644
--- a/nixos/tests/udisks2.nix
+++ b/nixos/tests/udisks2.nix
@@ -16,7 +16,7 @@ in
   };
 
   machine =
-    { config, pkgs, ... }:
+    { ... }:
     { services.udisks2.enable = true;
       imports = [ ./common/user-account.nix ];
 
diff --git a/nixos/tests/vault.nix b/nixos/tests/vault.nix
index 515d5c8bac2..caf0cbb2abf 100644
--- a/nixos/tests/vault.nix
+++ b/nixos/tests/vault.nix
@@ -4,7 +4,7 @@ import ./make-test.nix ({ pkgs, ... }:
   meta = with pkgs.stdenv.lib.maintainers; {
     maintainers = [ lnl7 ];
   };
-  machine = { config, pkgs, ... }: {
+  machine = { pkgs, ... }: {
     environment.systemPackages = [ pkgs.vault ];
     environment.variables.VAULT_ADDR = "http://127.0.0.1:8200";
     services.vault.enable = true;
diff --git a/nixos/tests/wordpress.nix b/nixos/tests/wordpress.nix
index c51306a8c7a..2c0bbbfd716 100644
--- a/nixos/tests/wordpress.nix
+++ b/nixos/tests/wordpress.nix
@@ -8,7 +8,7 @@ import ./make-test.nix ({ pkgs, ... }:
 
   nodes =
     { web =
-        { config, pkgs, ... }:
+        { pkgs, ... }:
         {
           services.mysql = {
             enable = true;
@@ -41,7 +41,7 @@ import ./make-test.nix ({ pkgs, ... }:
     };
 
   testScript =
-    { nodes, ... }:
+    { ... }:
     ''
       startAll;
 
diff --git a/nixos/tests/xdg-desktop-portal.nix b/nixos/tests/xdg-desktop-portal.nix
index d954b07f73d..79ebb83c49a 100644
--- a/nixos/tests/xdg-desktop-portal.nix
+++ b/nixos/tests/xdg-desktop-portal.nix
@@ -7,7 +7,7 @@ import ./make-test.nix ({ pkgs, ... }:
     maintainers = pkgs.xdg-desktop-portal.meta.maintainers;
   };
 
-  machine = { config, pkgs, ... }: {
+  machine = { pkgs, ... }: {
     environment.systemPackages = with pkgs; [ gnome-desktop-testing ];
   };
 
diff --git a/nixos/tests/xfce.nix b/nixos/tests/xfce.nix
index c8b18f12265..47717e8cf7d 100644
--- a/nixos/tests/xfce.nix
+++ b/nixos/tests/xfce.nix
@@ -5,7 +5,7 @@ import ./make-test.nix ({ pkgs, ...} : {
   };
 
   machine =
-    { config, pkgs, ... }:
+    { pkgs, ... }:
 
     { imports = [ ./common/user-account.nix ];
 
diff --git a/nixos/tests/xmonad.nix b/nixos/tests/xmonad.nix
index 3ea455c393c..61fa7c1a67d 100644
--- a/nixos/tests/xmonad.nix
+++ b/nixos/tests/xmonad.nix
@@ -15,7 +15,7 @@ import ./make-test.nix ({ pkgs, ...} : {
     };
   };
 
-  testScript = { nodes, ... }: ''
+  testScript = { ... }: ''
     $machine->waitForX;
     $machine->waitForFile("/home/alice/.Xauthority");
     $machine->succeed("xauth merge ~alice/.Xauthority");
diff --git a/nixos/tests/xrdp.nix b/nixos/tests/xrdp.nix
index c997e36cc44..0106aefe831 100644
--- a/nixos/tests/xrdp.nix
+++ b/nixos/tests/xrdp.nix
@@ -5,14 +5,14 @@ import ./make-test.nix ({ pkgs, ...} : {
   };
 
   nodes = {
-    server = { lib, pkgs, ... }: {
+    server = { pkgs, ... }: {
       imports = [ ./common/user-account.nix ];
       services.xrdp.enable = true;
       services.xrdp.defaultWindowManager = "${pkgs.xterm}/bin/xterm";
       networking.firewall.allowedTCPPorts = [ 3389 ];
     };
 
-    client = { lib, pkgs, ... }: {
+    client = { pkgs, ... }: {
       imports = [ ./common/x11.nix ./common/user-account.nix ];
       services.xserver.displayManager.auto.user = "alice";
       environment.systemPackages = [ pkgs.freerdp ];
@@ -21,7 +21,7 @@ import ./make-test.nix ({ pkgs, ...} : {
     };
   };
 
-  testScript = { nodes, ... }: ''
+  testScript = { ... }: ''
     startAll;
 
     $client->waitForX;
diff --git a/nixos/tests/zfs.nix b/nixos/tests/zfs.nix
index a6908024de9..1434038e90c 100644
--- a/nixos/tests/zfs.nix
+++ b/nixos/tests/zfs.nix
@@ -17,7 +17,7 @@ let
         maintainers = [ adisbladis ];
       };
 
-      machine = { config, lib, pkgs, ... }:
+      machine = { pkgs, ... }:
         {
           virtualisation.emptyDiskImages = [ 4096 ];
           networking.hostId = "deadbeef";
diff --git a/nixos/tests/zookeeper.nix b/nixos/tests/zookeeper.nix
index d247654adad..f343ebd39e4 100644
--- a/nixos/tests/zookeeper.nix
+++ b/nixos/tests/zookeeper.nix
@@ -5,7 +5,7 @@ import ./make-test.nix ({ pkgs, ...} : {
   };
 
   nodes = {
-    server = { pkgs, config, ... }: {
+    server = { ... }: {
       services.zookeeper = {
         enable = true;
       };
-- 
GitLab


From fbe71e9c4809b8df417ef86bf7bd2110152bb666 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Fri, 20 Jul 2018 22:58:52 +0200
Subject: [PATCH 216/297] cinelerra: add version

see issue #43717
---
 pkgs/applications/video/cinelerra/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/video/cinelerra/default.nix b/pkgs/applications/video/cinelerra/default.nix
index 4adbdbdadb2..cefabfbcab5 100644
--- a/pkgs/applications/video/cinelerra/default.nix
+++ b/pkgs/applications/video/cinelerra/default.nix
@@ -7,7 +7,7 @@
 , fontconfig, intltool }:
 
 stdenv.mkDerivation {
-  name = "cinelerra-git";
+  name = "cinelerra-unstable-2016-01-12";
 
   # # REGION AUTO UPDATE:    { name="cinelerra"; type="git"; url="git://git.cinelerra.org/j6t/cinelerra.git"; }
   # src= sourceFromHead "cinelerra-9f9adf2ad5472886d5bc43a05c6aa8077cabd967.tar.gz"
-- 
GitLab


From db697f016bb3eac254283af0405a25cf4538371b Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Fri, 20 Jul 2018 23:00:27 +0200
Subject: [PATCH 217/297] cinelerra: remove old commented code

---
 pkgs/applications/video/cinelerra/default.nix | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/pkgs/applications/video/cinelerra/default.nix b/pkgs/applications/video/cinelerra/default.nix
index cefabfbcab5..07bbb829d22 100644
--- a/pkgs/applications/video/cinelerra/default.nix
+++ b/pkgs/applications/video/cinelerra/default.nix
@@ -9,21 +9,8 @@
 stdenv.mkDerivation {
   name = "cinelerra-unstable-2016-01-12";
 
-  # # REGION AUTO UPDATE:    { name="cinelerra"; type="git"; url="git://git.cinelerra.org/j6t/cinelerra.git"; }
-  # src= sourceFromHead "cinelerra-9f9adf2ad5472886d5bc43a05c6aa8077cabd967.tar.gz"
-  #              (fetchurl { url = "http://mawercer.de/~nix/repos/cinelerra-9f9adf2ad5472886d5bc43a05c6aa8077cabd967.tar.gz"; sha256 = "0b264e2a770d2257550c9a23883a060afcaff12293fe43828954e7373f5f4fb4"; });
-  # # END
-
   src = fetchgit {
     url = "git://git.cinelerra-cv.org/j6t/cinelerra.git";
-    # 2.3
-    #rev = "58ef118e63bf2fac8c99add372c584e93b008bae";
-    #sha256 = "1wx8c9rvh4y7fgg39lb02cy3sanms8a4fayr70jbhcb4rp691lph";
-    # master 22 nov 2016
-    #rev = "dbc22e0f35a9e8c274b06d4075b51dc9bace34aa";
-    #sha256 = "0c76j98ws1x2s5hzcdlykxm2bi7987d9nanka428xj62id0grla5";
-
-    # j6t/cinelerra.git
     rev = "454be60e201c18c1fc3f1f253a6d2184fcfc94c4";
     sha256 = "1n4kshqhgnr7aivsi8dgx48phyd2nzvv4szbc82mndklvs9jfb7r";
   };
-- 
GitLab


From a83b6f9cb32d802404eb8eca7b9eec1694822bef Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Fri, 20 Jul 2018 23:04:39 +0200
Subject: [PATCH 218/297] frog: adhere to version schema convention

see issue #43717
---
 pkgs/development/libraries/languagemachines/frog.nix            | 2 +-
 .../release-info/LanguageMachines-frogdata.json                 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/languagemachines/frog.nix b/pkgs/development/libraries/languagemachines/frog.nix
index 853d23c9745..dcff8c2757e 100644
--- a/pkgs/development/libraries/languagemachines/frog.nix
+++ b/pkgs/development/libraries/languagemachines/frog.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
   name = "frog-${release.version}";
   version = release.version;
   src = fetchurl { inherit (release) url sha256;
-                   name = "frog-${release.version}.tar.gz"; };
+                   name = "frog-v${release.version}.tar.gz"; };
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ automake autoconf bzip2 libtar libtool autoconf-archive
                   libxml2 icu
diff --git a/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-frogdata.json b/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-frogdata.json
index 1147322be6d..6ea44938717 100644
--- a/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-frogdata.json
+++ b/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-frogdata.json
@@ -1,5 +1,5 @@
 {
-  "version": "v0.13",
+  "version": "0.13",
   "url": "https://api.github.com/repos/LanguageMachines/frogdata/tarball/v0.13",
   "sha256": "13mhv8qacl0n20ddl1ay49xi6h2m0a149ya3rrsmaah3x4adb4sg"
 }
-- 
GitLab


From eca518109c10ad2b53ce2b470164c0424aa4f4ad Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Fri, 20 Jul 2018 23:07:16 +0200
Subject: [PATCH 219/297] hyper-haskell-server-with-packages: add version to
 name

see issue #43717
---
 pkgs/development/tools/haskell/hyper-haskell/server.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/haskell/hyper-haskell/server.nix b/pkgs/development/tools/haskell/hyper-haskell/server.nix
index ff82127f0c4..47a9c550fa8 100644
--- a/pkgs/development/tools/haskell/hyper-haskell/server.nix
+++ b/pkgs/development/tools/haskell/hyper-haskell/server.nix
@@ -3,7 +3,7 @@
 let
 hyperHaskellEnv = ghcWithPackages (self: [ self.hyper-haskell-server ] ++ packages self);
 in stdenv.mkDerivation {
-  name = "hyper-haskell-server-with-packages";
+  name = "hyper-haskell-server-with-packages-${hyperHaskellEnv.version}";
 
   nativeBuildInputs = [ makeWrapper ];
 
-- 
GitLab


From 8993ddf8975f42ccb1b088c03b2ffda1a266b08f Mon Sep 17 00:00:00 2001
From: hcmensch <hcmensch@umich.edu>
Date: Fri, 20 Jul 2018 18:23:21 -0400
Subject: [PATCH 220/297] Update vim-plugin-names

---
 pkgs/misc/vim-plugins/vim-plugin-names | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 188d87f9484..9e7f70925a2 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -110,6 +110,7 @@
 "github:lambdalisue/vim-gista"
 "github:latex-box-team/latex-box"
 "github:leafgarland/typescript-vim"
+"github:ledger/vim-ledger"
 "github:lepture/vim-jinja"
 "github:lervag/vimtex"
 "github:lfilho/cosco.vim"
-- 
GitLab


From f517b5a8ddcc73319f0dc531cf82d68c6204a500 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Fri, 20 Jul 2018 17:50:08 -0500
Subject: [PATCH 221/297] foundationdb: bump to 5.2.6, 6.0.2-prelease

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/servers/foundationdb/default.nix         | 31 ++++++--
 .../{ldflags.patch => ldflags-5.2.patch}      |  0
 pkgs/servers/foundationdb/ldflags-6.0.patch   | 78 +++++++++++++++++++
 3 files changed, 101 insertions(+), 8 deletions(-)
 rename pkgs/servers/foundationdb/{ldflags.patch => ldflags-5.2.patch} (100%)
 create mode 100644 pkgs/servers/foundationdb/ldflags-6.0.patch

diff --git a/pkgs/servers/foundationdb/default.nix b/pkgs/servers/foundationdb/default.nix
index ecefc1d8fab..461b90bc978 100644
--- a/pkgs/servers/foundationdb/default.nix
+++ b/pkgs/servers/foundationdb/default.nix
@@ -53,7 +53,9 @@ let
         patches =
           [ # For 5.2+, we need a slightly adjusted patch to fix all the ldflags
             (if lib.versionAtLeast version "5.2"
-             then ./ldflags.patch
+             then (if lib.versionAtLeast version "6.0"
+                   then ./ldflags-6.0.patch
+                   else ./ldflags-5.2.patch)
              else ./ldflags-5.1.patch)
           ] ++
           # for 6.0+, we do NOT need to apply this version fix, since we can specify
@@ -77,10 +79,20 @@ let
             --replace 'exit 1' '#exit 1'
 
           patchShebangs .
+        '' + lib.optionalString (lib.versionAtLeast version "6.0") ''
+          substituteInPlace ./Makefile \
+            --replace 'TLS_LIBS +=' '#TLS_LIBS +=' \
+            --replace 'LDFLAGS :=' 'LDFLAGS := -ltls -lssl -lcrypto'
         '';
 
         enableParallelBuilding = true;
-        makeFlags = [ "all" "fdb_c" "fdb_java" "KVRELEASE=1" ];
+
+        makeFlags = [ "all" "fdb_java" ]
+          # Don't compile FDBLibTLS if we don't need it in 6.0 or later;
+          # it gets statically linked in
+          ++ lib.optional (!lib.versionAtLeast version "6.0") [ "fdb_c" ]
+          # Needed environment overrides
+          ++ [ "KVRELEASE=1" ];
 
         # on 6.0 and later, we can specify all this information manually
         configurePhase = lib.optionalString (lib.versionAtLeast version "6.0") ''
@@ -93,7 +105,9 @@ let
           mkdir -vp $out/{bin,libexec/plugins} $lib/{lib,share/java} $dev/include/foundationdb
 
           cp -v ./lib/libfdb_c.so     $lib/lib
+        '' + lib.optionalString (!lib.versionAtLeast version "6.0") ''
           cp -v ./lib/libFDBLibTLS.so $out/libexec/plugins/FDBLibTLS.so
+        '' + ''
 
           cp -v ./bindings/c/foundationdb/fdb_c.h           $dev/include/foundationdb
           cp -v ./bindings/c/foundationdb/fdb_c_options.g.h $dev/include/foundationdb
@@ -131,15 +145,16 @@ in with builtins; {
   };
 
   foundationdb52 = makeFdb rec {
-    version = "5.2.5";
+    version = "5.2.6";
     branch  = "release-5.2";
-    sha256  = "00csr4v9cwl9y8r63p73grc6cvhlqmzcniwrf80i0klxv5asg7q7";
+    rev     = "refs/tags/v5.2.6"; # seemed to be tagged incorrectly
+    sha256  = "1q3lq1hqq0f53n51gd4cw5cpayyw65dmkfplhsw1m5mghymzmskk";
   };
 
   foundationdb60 = makeFdb rec {
-    version = "6.0.0pre2227_${substring 0 8 rev}";
-    branch  = "master";
-    rev     = "8caa6eaecf1eeec0298fc77db334761b0c1d1523";
-    sha256  = "1q200rpsphl5fzwzp2vk7ifgsnqh95k0xfiicfi1c8253ylnsgll";
+    version = "6.0.2pre2430_${substring 0 8 rev}";
+    branch  = "release-6.0";
+    rev     = "7938d247a5eaf886a176575de6592b76374df58c";
+    sha256  = "0g8h2zs0f3aacs7x4hyjh0scybv33gjj6dqfb789h4n6r4gd7d9h";
   };
 }
diff --git a/pkgs/servers/foundationdb/ldflags.patch b/pkgs/servers/foundationdb/ldflags-5.2.patch
similarity index 100%
rename from pkgs/servers/foundationdb/ldflags.patch
rename to pkgs/servers/foundationdb/ldflags-5.2.patch
diff --git a/pkgs/servers/foundationdb/ldflags-6.0.patch b/pkgs/servers/foundationdb/ldflags-6.0.patch
new file mode 100644
index 00000000000..1fa17a9615a
--- /dev/null
+++ b/pkgs/servers/foundationdb/ldflags-6.0.patch
@@ -0,0 +1,78 @@
+diff --git a/bindings/c/local.mk b/bindings/c/local.mk
+index c861a29c..ff886e93 100644
+--- a/bindings/c/local.mk
++++ b/bindings/c/local.mk
+@@ -30,8 +30,8 @@ fdb_c_tests_HEADERS := -Ibindings/c
+ CLEAN_TARGETS += fdb_c_tests_clean
+ 
+ ifeq ($(PLATFORM),linux)
+-  fdb_c_LIBS += lib/libstdc++.a -lm -lpthread -lrt -ldl
+-  fdb_c_LDFLAGS += -Wl,--version-script=bindings/c/fdb_c.map -static-libgcc -Wl,-z,nodelete
++  fdb_c_LIBS += lib/libstdc++.a
++  fdb_c_LDFLAGS += -Wl,--version-script=bindings/c/fdb_c.map -static-libgcc -Wl,-z,nodelete -lm -lpthread -lrt -ldl
+   fdb_c_tests_LIBS += -lpthread
+ endif
+ 
+diff --git a/bindings/flow/tester/local.mk b/bindings/flow/tester/local.mk
+index 2ef4fcb7..6e59625c 100644
+--- a/bindings/flow/tester/local.mk
++++ b/bindings/flow/tester/local.mk
+@@ -35,8 +35,7 @@ _fdb_flow_tester_clean:
+ 	@rm -rf bindings/flow/bin
+ 
+ ifeq ($(PLATFORM),linux)
+-  fdb_flow_tester_LIBS += -ldl -lpthread -lrt
+-  fdb_flow_tester_LDFLAGS += -static-libstdc++ -static-libgcc
++  fdb_flow_tester_LDFLAGS += -static-libstdc++ -static-libgcc -ldl -lpthread -lrt
+ else ifeq ($(PLATFORM),osx)
+   fdb_flow_tester_LDFLAGS += -lc++
+ endif
+diff --git a/fdbbackup/local.mk b/fdbbackup/local.mk
+index ca5dbab6..012f0130 100644
+--- a/fdbbackup/local.mk
++++ b/fdbbackup/local.mk
+@@ -26,8 +26,7 @@ fdbbackup_LIBS := lib/libfdbclient.a lib/libfdbrpc.a lib/libflow.a $(FDB_TLS_LIB
+ fdbbackup_STATIC_LIBS := $(TLS_LIBS)
+ 
+ ifeq ($(PLATFORM),linux)
+-  fdbbackup_LIBS += -ldl -lpthread -lrt
+-  fdbbackup_LDFLAGS += -static-libstdc++ -static-libgcc
++  fdbbackup_LDFLAGS += -static-libstdc++ -static-libgcc -ldl -lpthread -lrt
+ 
+   # GPerfTools profiler (uncomment to use)
+   # fdbbackup_CFLAGS += -I/opt/gperftools/include -DUSE_GPERFTOOLS=1
+diff --git a/fdbcli/local.mk b/fdbcli/local.mk
+index fd738876..3af026b9 100644
+--- a/fdbcli/local.mk
++++ b/fdbcli/local.mk
+@@ -22,14 +22,13 @@
+ 
+ fdbcli_CFLAGS := $(fdbclient_CFLAGS)
+ fdbcli_LDFLAGS := $(fdbrpc_LDFLAGS)
+-fdbcli_LIBS := lib/libfdbclient.a lib/libfdbrpc.a lib/libflow.a -ldl $(FDB_TLS_LIB)
++fdbcli_LIBS := lib/libfdbclient.a lib/libfdbrpc.a lib/libflow.a $(FDB_TLS_LIB)
+ fdbcli_STATIC_LIBS := $(TLS_LIBS)
+ 
+ fdbcli_GENERATED_SOURCES += versions.h
+ 
+ ifeq ($(PLATFORM),linux)
+-  fdbcli_LDFLAGS += -static-libstdc++ -static-libgcc
+-  fdbcli_LIBS += -lpthread -lrt
++  fdbcli_LDFLAGS += -static-libstdc++ -static-libgcc -lpthread -lrt -ldl
+ else ifeq ($(PLATFORM),osx)
+   fdbcli_LDFLAGS += -lc++
+ endif
+diff --git a/fdbserver/local.mk b/fdbserver/local.mk
+index 690916d0..475abbaf 100644
+--- a/fdbserver/local.mk
++++ b/fdbserver/local.mk
+@@ -26,8 +26,7 @@ fdbserver_LIBS := lib/libfdbclient.a lib/libfdbrpc.a lib/libflow.a $(FDB_TLS_LIB
+ fdbserver_STATIC_LIBS := $(TLS_LIBS)
+ 
+ ifeq ($(PLATFORM),linux)
+-  fdbserver_LIBS += -ldl -lpthread -lrt
+-  fdbserver_LDFLAGS += -static-libstdc++ -static-libgcc
++  fdbserver_LDFLAGS += -static-libstdc++ -static-libgcc -ldl -lpthread -lrt
+ 
+   # GPerfTools profiler (uncomment to use)
+   # fdbserver_CFLAGS += -I/opt/gperftools/include -DUSE_GPERFTOOLS=1
-- 
GitLab


From 75162b1045b0bfdb9399de2db712b376d586ef4e Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sat, 21 Jul 2018 02:29:02 +0200
Subject: [PATCH 222/297] geoclue: drop

---
 .../development/libraries/geoclue/default.nix | 36 -------------------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 38 deletions(-)
 delete mode 100644 pkgs/development/libraries/geoclue/default.nix

diff --git a/pkgs/development/libraries/geoclue/default.nix b/pkgs/development/libraries/geoclue/default.nix
deleted file mode 100644
index bf0af502d01..00000000000
--- a/pkgs/development/libraries/geoclue/default.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{ stdenv, fetchurl, dbus, dbus-glib, glib, pkgconfig, libxml2, gnome2,
-  libxslt, glib-networking }:
-
-stdenv.mkDerivation rec {
-  name = "geoclue-0.12.0";
-  src = fetchurl {
-    url = "https://launchpad.net/geoclue/trunk/0.12/+download/${name}.tar.gz";
-    sha256 = "15j619kvmdgj2hpma92mkxbzjvgn8147a7500zl3bap9g8bkylqg";
-  };
-
-  outputs = [ "out" "dev" ];
-
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ libxml2 gnome2.GConf libxslt glib-networking ];
-
-  propagatedBuildInputs = [dbus glib dbus-glib];
-
-  hardeningDisable = [ "format" ];
-
-  preConfigure = ''
-    sed -e '/-Werror/d' -i configure
-  '';
-
-  meta = with stdenv.lib; {
-    description = "Geolocation framework and some data providers";
-    maintainers = with maintainers; [ raskin ];
-    platforms = platforms.linux;
-    license = licenses.lgpl2;
-  };
-
-  passthru = {
-    updateInfo = {
-      downloadPage = "http://folks.o-hand.com/jku/geoclue-releases/";
-    };
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 644f5d821e6..a7451517a9f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9232,8 +9232,6 @@ with pkgs;
     gtk = self.gtk2;
   };
 
-  geoclue = callPackage ../development/libraries/geoclue {};
-
   geoclue2 = callPackage ../development/libraries/geoclue/2.0.nix {};
 
   geoipWithDatabase = makeOverridable (callPackage ../development/libraries/geoip) {
-- 
GitLab


From 919a507cb2bcff3f449dbef57082e24c1a32827e Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sat, 21 Jul 2018 02:30:10 +0200
Subject: [PATCH 223/297] geoclue2: move to default.nix

---
 pkgs/development/libraries/geoclue/{2.0.nix => default.nix} | 0
 pkgs/top-level/all-packages.nix                             | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename pkgs/development/libraries/geoclue/{2.0.nix => default.nix} (100%)

diff --git a/pkgs/development/libraries/geoclue/2.0.nix b/pkgs/development/libraries/geoclue/default.nix
similarity index 100%
rename from pkgs/development/libraries/geoclue/2.0.nix
rename to pkgs/development/libraries/geoclue/default.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a7451517a9f..1a55c07e88e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9232,7 +9232,7 @@ with pkgs;
     gtk = self.gtk2;
   };
 
-  geoclue2 = callPackage ../development/libraries/geoclue/2.0.nix {};
+  geoclue2 = callPackage ../development/libraries/geoclue {};
 
   geoipWithDatabase = makeOverridable (callPackage ../development/libraries/geoip) {
     drvName = "geoip-tools";
-- 
GitLab


From a6dab86ada516b09096a77ff24b3b3291e80ef50 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sat, 21 Jul 2018 02:44:15 +0200
Subject: [PATCH 224/297] =?UTF-8?q?geoclue2:=202.4.8=20=E2=86=92=202.4.10?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../development/libraries/geoclue/default.nix | 56 ++++++++++---------
 1 file changed, 31 insertions(+), 25 deletions(-)

diff --git a/pkgs/development/libraries/geoclue/default.nix b/pkgs/development/libraries/geoclue/default.nix
index eb7a6d6aaf2..2588d7f3d54 100644
--- a/pkgs/development/libraries/geoclue/default.nix
+++ b/pkgs/development/libraries/geoclue/default.nix
@@ -1,48 +1,54 @@
-{ fetchurl, stdenv, intltool, pkgconfig, glib, json-glib, libsoup, geoip
-, dbus, dbus-glib, modemmanager, avahi, glib-networking, wrapGAppsHook, gobjectIntrospection
+{ fetchurl, stdenv, intltool, pkgconfig, gtk-doc, docbook_xsl, docbook_xml_dtd_412, glib, json-glib, libsoup, libnotify, gdk_pixbuf
+, modemmanager, avahi, glib-networking, wrapGAppsHook, gobjectIntrospection
+, withDemoAgent ? false
 }:
 
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "geoclue-2.4.8";
+  name = "geoclue-${version}";
+  version = "2.4.10";
 
   src = fetchurl {
-    url = "https://www.freedesktop.org/software/geoclue/releases/2.4/${name}.tar.xz";
-    sha256 = "08yg1r7m0n9hwyvcy769qkmkf8lslqwv69cjfffwnc3zm5km25qj";
+    url = "https://www.freedesktop.org/software/geoclue/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    sha256 = "0h4n8jf7w457sglfdhghkyf8n4v4a5jrx8dgdy5zn35nbscx24l4";
   };
 
-  outputs = [ "out" "dev" ];
+  outputs = [ "out" "dev" "devdoc" ];
 
   nativeBuildInputs = [
-    pkgconfig intltool wrapGAppsHook gobjectIntrospection
+    pkgconfig intltool gtk-doc docbook_xsl docbook_xml_dtd_412 wrapGAppsHook gobjectIntrospection
   ];
 
-  buildInputs = [ glib json-glib libsoup geoip
-     dbus dbus-glib avahi
-   ] ++ optionals (!stdenv.isDarwin) [ modemmanager ];
-
-  propagatedBuildInputs = [ dbus dbus-glib glib glib-networking ];
-
-  preConfigure = ''
-     substituteInPlace configure --replace "-Werror" ""
-  '';
-
-  configureFlags = [ "--with-systemdsystemunitdir=$(out)/etc/systemd/system" "--enable-introspection" ] ++
-                   optionals stdenv.isDarwin [
-                       "--disable-silent-rules"
-                       "--disable-3g-source"
-                       "--disable-cdma-source"
-                       "--disable-modem-gps-source"
-                       "--disable-nmea-source" ];
+  buildInputs = [
+    glib json-glib libsoup avahi
+  ] ++ optionals withDemoAgent [
+    libnotify gdk_pixbuf
+  ] ++ optionals (!stdenv.isDarwin) [ modemmanager ];
+
+  propagatedBuildInputs = [ glib glib-networking ];
+
+  configureFlags = [
+    "--with-systemdsystemunitdir=$(out)/etc/systemd/system"
+    "--enable-introspection"
+    "--enable-gtk-doc"
+    "--enable-demo-agent=${if withDemoAgent then "yes" else "no"}"
+  ] ++ optionals stdenv.isDarwin [
+    "--disable-silent-rules"
+    "--disable-3g-source"
+    "--disable-cdma-source"
+    "--disable-modem-gps-source"
+    "--disable-nmea-source"
+  ];
 
+  # https://gitlab.freedesktop.org/geoclue/geoclue/issues/73
   postInstall = ''
     sed -i $dev/lib/pkgconfig/libgeoclue-2.0.pc -e "s|includedir=.*|includedir=$dev/include|"
   '';
 
   meta = with stdenv.lib; {
     description = "Geolocation framework and some data providers";
-    homepage = https://freedesktop.org/wiki/Software/GeoClue/;
+    homepage = https://gitlab.freedesktop.org/geoclue/geoclue/wikis/home;
     maintainers = with maintainers; [ raskin garbas ];
     platforms = with platforms; linux ++ darwin;
     license = licenses.lgpl2;
-- 
GitLab


From 52f53c69ce6dbc5538f7e4cd22f9d93baf1f64a2 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Sat, 21 Jul 2018 00:44:44 +0000
Subject: [PATCH 225/297] pkgs/*: remove unreferenced function arguments

---
 pkgs/applications/altcoins/clightning.nix     |  4 +-
 pkgs/applications/altcoins/default.nix        |  2 +-
 pkgs/applications/altcoins/dero.nix           |  2 +-
 pkgs/applications/altcoins/dogecoin.nix       |  2 +-
 .../applications/altcoins/ethsign/default.nix |  2 +-
 pkgs/applications/altcoins/freicoin.nix       |  2 +-
 .../altcoins/go-ethereum-classic/default.nix  |  2 +-
 pkgs/applications/altcoins/go-ethereum.nix    |  2 +-
 pkgs/applications/altcoins/hevm.nix           |  4 +-
 pkgs/applications/altcoins/mist.nix           |  2 +-
 pkgs/applications/altcoins/namecoin.nix       |  2 +-
 .../altcoins/nano-wallet/default.nix          |  2 +-
 .../altcoins/parity-ui/default.nix            |  2 +-
 pkgs/applications/altcoins/parity-ui/env.nix  |  2 +-
 .../altcoins/particl/particl-core.nix         |  3 -
 pkgs/applications/altcoins/stellar-core.nix   |  2 +-
 pkgs/applications/audio/abcde/default.nix     |  4 +-
 pkgs/applications/audio/airwave/default.nix   |  2 +-
 pkgs/applications/audio/audacity/default.nix  |  4 +-
 pkgs/applications/audio/banshee/default.nix   |  2 +-
 .../applications/audio/clementine/default.nix |  2 +-
 pkgs/applications/audio/deadbeef/default.nix  |  2 +-
 pkgs/applications/audio/deadbeef/wrapper.nix  |  2 +-
 pkgs/applications/audio/distrho/default.nix   |  2 +-
 pkgs/applications/audio/faust/faust2.nix      |  1 -
 pkgs/applications/audio/fmit/default.nix      |  2 +-
 pkgs/applications/audio/gradio/default.nix    |  1 -
 pkgs/applications/audio/gtkpod/default.nix    |  4 +-
 pkgs/applications/audio/jaaa/default.nix      |  2 +-
 .../audio/lastfmsubmitd/default.nix           |  2 +-
 .../magnetophonDSP/VoiceOfFaust/default.nix   |  2 +-
 pkgs/applications/audio/mikmod/default.nix    |  2 +-
 pkgs/applications/audio/mopidy/mopify.nix     |  2 +-
 pkgs/applications/audio/pianobar/default.nix  |  2 +-
 pkgs/applications/audio/picard/default.nix    |  2 +-
 pkgs/applications/audio/puddletag/default.nix |  2 +-
 pkgs/applications/audio/puredata/wrapper.nix  |  2 +-
 pkgs/applications/audio/rkrlv2/default.nix    |  2 +-
 pkgs/applications/audio/sonata/default.nix    |  2 +-
 pkgs/applications/audio/ympd/default.nix      |  2 +-
 .../applications/backup/crashplan/default.nix |  2 +-
 .../display-managers/lightdm/default.nix      |  2 +-
 .../display-managers/sddm/default.nix         |  4 +-
 .../editors/android-studio/default.nix        |  2 +-
 pkgs/applications/editors/atom/default.nix    |  2 +-
 pkgs/applications/editors/atom/env.nix        |  2 +-
 .../applications/editors/brackets/default.nix |  4 +-
 pkgs/applications/editors/dit/default.nix     |  2 +-
 pkgs/applications/editors/eclipse/default.nix |  6 +-
 .../emacs-clang-complete-async/default.nix    |  2 +-
 .../emacs-modes/filesets-plus/default.nix     |  2 +-
 .../emacs-modes/font-lock-plus/default.nix    |  2 +-
 .../editors/emacs-modes/header2/default.nix   |  2 +-
 .../editors/emacs-modes/hexrgb/default.nix    |  2 +-
 .../emacs-modes/lib-requires/default.nix      |  2 +-
 .../emacs-modes/melpa-stable-packages.nix     |  2 +-
 .../editors/emacs-modes/ocaml/default.nix     |  2 +-
 .../editors/emacs-modes/org-packages.nix      |  2 +-
 .../editors/emacs-modes/org/default.nix       |  2 +-
 .../emacs-modes/thingatpt-plus/default.nix    |  2 +-
 pkgs/applications/editors/emacs/25.nix        |  2 +-
 pkgs/applications/editors/emacs/default.nix   |  2 +-
 .../applications/editors/jetbrains/common.nix |  4 +-
 .../editors/jetbrains/default.nix             | 24 ++++----
 pkgs/applications/editors/jucipp/default.nix  |  2 +-
 pkgs/applications/editors/kakoune/default.nix |  2 +-
 .../editors/kodestudio/default.nix            |  2 +-
 .../editors/monodevelop/default.nix           |  2 +-
 pkgs/applications/editors/nano/default.nix    |  2 +-
 pkgs/applications/editors/neovim/default.nix  |  4 +-
 pkgs/applications/editors/neovim/wrapper.nix  |  5 +-
 pkgs/applications/editors/nvpy/default.nix    |  2 +-
 pkgs/applications/editors/texmacs/darwin.nix  |  2 +-
 pkgs/applications/editors/tiled/default.nix   |  2 +-
 pkgs/applications/editors/typora/default.nix  |  2 +-
 pkgs/applications/editors/vim/macvim.nix      |  2 +-
 pkgs/applications/editors/vscode/default.nix  |  2 +-
 .../editors/vscode/with-extensions.nix        |  2 +-
 .../editors/wxhexeditor/default.nix           |  2 +-
 pkgs/applications/gis/qgis/default.nix        |  2 +-
 .../applications/graphics/ImageMagick/7.0.nix |  4 +-
 .../graphics/ImageMagick/default.nix          |  2 +-
 .../graphics/ahoviewer/default.nix            |  2 +-
 .../applications/graphics/avocode/default.nix |  2 +-
 .../graphics/awesomebump/default.nix          |  2 +-
 .../applications/graphics/digikam/default.nix |  3 +-
 pkgs/applications/graphics/dosage/default.nix |  2 +-
 pkgs/applications/graphics/epeg/default.nix   |  2 +-
 pkgs/applications/graphics/fstl/default.nix   |  2 +-
 .../applications/graphics/glabels/default.nix |  2 +-
 pkgs/applications/graphics/goxel/default.nix  |  2 +-
 .../graphics/graphicsmagick/default.nix       |  2 +-
 .../graphics/inkscape/default.nix             |  2 +-
 pkgs/applications/graphics/k3d/default.nix    |  2 +-
 .../graphics/kgraphviewer/default.nix         |  2 +-
 pkgs/applications/graphics/krita/default.nix  |  2 +-
 pkgs/applications/graphics/nomacs/default.nix |  1 -
 .../graphics/openscad/default.nix             |  2 +-
 .../graphics/processing3/default.nix          |  2 +-
 .../graphics/sane/backends/generic.nix        |  2 +-
 .../graphics/scantailor/advanced.nix          |  2 +-
 .../graphics/screencloud/default.nix          |  2 +-
 .../applications/graphics/shutter/default.nix |  2 +-
 .../graphics/synfigstudio/default.nix         |  4 +-
 .../graphics/write_stylus/default.nix         |  2 +-
 pkgs/applications/graphics/yed/default.nix    |  2 +-
 pkgs/applications/inferno/default.nix         |  2 +-
 pkgs/applications/kde/ark/default.nix         |  2 +-
 pkgs/applications/kde/default.nix             |  3 +-
 pkgs/applications/kde/dolphin.nix             |  4 +-
 pkgs/applications/kde/kdenlive.nix            |  5 --
 pkgs/applications/kde/libkomparediff2.nix     |  2 +-
 pkgs/applications/kde/pim-data-exporter.nix   |  2 +-
 pkgs/applications/kde/pimcommon.nix           |  2 +-
 pkgs/applications/misc/acbuild/default.nix    |  2 +-
 pkgs/applications/misc/alacritty/default.nix  |  1 -
 .../misc/bashSnippets/default.nix             |  2 +-
 pkgs/applications/misc/calibre/default.nix    |  4 +-
 pkgs/applications/misc/cataract/default.nix   | 11 +---
 pkgs/applications/misc/cataract/unstable.nix  | 11 +---
 pkgs/applications/misc/cherrytree/default.nix |  2 +-
 pkgs/applications/misc/chirp/default.nix      |  2 +-
 .../misc/dbvisualizer/default.nix             |  2 +-
 .../misc/dfilemanager/default.nix             |  2 +-
 .../misc/electron-cash/default.nix            |  2 +-
 pkgs/applications/misc/electrum/default.nix   |  2 +-
 pkgs/applications/misc/evtest/default.nix     |  2 +-
 pkgs/applications/misc/far2l/default.nix      |  2 +-
 pkgs/applications/misc/finalterm/default.nix  |  2 +-
 pkgs/applications/misc/gcal/default.nix       |  2 +-
 .../misc/golden-cheetah/default.nix           |  2 +-
 .../applications/misc/googleearth/default.nix |  2 +-
 pkgs/applications/misc/gpsprune/default.nix   |  2 +-
 pkgs/applications/misc/gpxsee/default.nix     |  2 +-
 pkgs/applications/misc/gramps/default.nix     |  2 +-
 pkgs/applications/misc/gummi/default.nix      |  2 +-
 .../misc/hamster-time-tracker/default.nix     |  2 +-
 pkgs/applications/misc/haxor-news/default.nix |  2 +-
 pkgs/applications/misc/houdini/default.nix    |  2 +-
 pkgs/applications/misc/icesl/default.nix      |  2 +-
 pkgs/applications/misc/josm/default.nix       |  2 +-
 pkgs/applications/misc/khard/default.nix      |  2 +-
 pkgs/applications/misc/kitty/default.nix      |  4 +-
 pkgs/applications/misc/kiwix/default.nix      |  2 +-
 pkgs/applications/misc/kupfer/default.nix     |  2 -
 pkgs/applications/misc/llpp/default.nix       |  2 +-
 pkgs/applications/misc/madonctl/default.nix   |  2 +-
 .../misc/masterpdfeditor/default.nix          |  2 +-
 pkgs/applications/misc/mop/default.nix        |  2 +-
 pkgs/applications/misc/octoprint/default.nix  |  2 +-
 pkgs/applications/misc/octoprint/plugins.nix  |  2 +-
 pkgs/applications/misc/orca/default.nix       |  4 +-
 pkgs/applications/misc/perkeep/default.nix    |  2 +-
 pkgs/applications/misc/pgmanage/default.nix   |  2 +-
 pkgs/applications/misc/polybar/default.nix    |  2 +-
 pkgs/applications/misc/pt/default.nix         |  2 +-
 .../misc/redis-desktop-manager/default.nix    |  2 +-
 pkgs/applications/misc/redshift/default.nix   |  2 +-
 pkgs/applications/misc/rofi/default.nix       |  2 +-
 pkgs/applications/misc/rofi/wrapper.nix       |  2 +-
 pkgs/applications/misc/roxterm/default.nix    |  6 +-
 pkgs/applications/misc/rtv/default.nix        |  2 +-
 .../misc/rxvt_unicode/wrapper.nix             |  2 +-
 pkgs/applications/misc/simplenote/default.nix |  2 +-
 pkgs/applications/misc/slic3r/prusa3d.nix     |  2 +-
 pkgs/applications/misc/spacefm/default.nix    |  2 +-
 .../applications/misc/sweethome3d/editors.nix |  4 +-
 pkgs/applications/misc/tasksh/default.nix     |  2 +-
 pkgs/applications/misc/tilix/default.nix      |  2 +-
 .../applications/misc/timewarrior/default.nix |  2 +-
 pkgs/applications/misc/twmn/default.nix       |  2 +-
 pkgs/applications/misc/wego/default.nix       |  2 +-
 pkgs/applications/misc/welle-io/default.nix   |  2 +-
 pkgs/applications/misc/wsjtx/default.nix      |  2 +-
 pkgs/applications/misc/xmr-stak/default.nix   |  2 +-
 pkgs/applications/misc/yarssr/default.nix     |  2 +-
 .../misc/yubioath-desktop/default.nix         |  2 +-
 .../misc/zathura/core/default.nix             |  2 +-
 .../misc/zathura/pdf-mupdf/default.nix        |  3 +-
 pkgs/applications/misc/zscroll/default.nix    |  2 +-
 .../networking/browsers/chromium/common.nix   |  5 +-
 .../networking/browsers/falkon/default.nix    |  4 +-
 .../networking/browsers/firefox/common.nix    |  2 +-
 .../networking/browsers/firefox/packages.nix  |  2 +-
 .../browsers/google-chrome/default.nix        |  2 +-
 .../networking/browsers/lynx/default.nix      |  1 -
 .../google-talk-plugin/default.nix            |  2 +-
 .../mozilla-plugins/trezor/default.nix        |  2 +-
 .../networking/browsers/otter/default.nix     |  2 +-
 .../browsers/vimprobable2/default.nix         |  2 +-
 .../networking/browsers/vivaldi/default.nix   |  4 +-
 .../browsers/vivaldi/ffmpeg-codecs.nix        |  2 +-
 .../networking/cluster/habitat/default.nix    |  2 +-
 .../networking/cluster/kompose/default.nix    |  2 +-
 .../networking/cluster/kops/default.nix       |  2 +-
 .../networking/cluster/kubernetes/default.nix |  3 +-
 .../networking/cluster/mesos/default.nix      |  2 +-
 .../networking/cluster/minikube/default.nix   |  4 +-
 .../networking/cluster/openshift/default.nix  |  4 +-
 .../networking/cluster/taktuk/default.nix     |  2 +-
 .../terraform-provider-ibm/default.nix        |  2 +-
 .../terraform-provider-nixos/default.nix      |  2 +-
 .../networking/cluster/terraform/default.nix  |  4 +-
 .../cluster/terraform/providers/default.nix   |  2 +-
 .../networking/compactor/default.nix          |  2 +-
 .../applications/networking/drive/default.nix |  2 +-
 .../bitlbee-facebook/default.nix              |  2 +-
 .../bitlbee-steam/default.nix                 |  2 +-
 .../instant-messengers/bitlbee/default.nix    |  2 +-
 .../instant-messengers/ekiga/default.nix      |  2 +-
 .../instant-messengers/linphone/default.nix   |  2 +-
 .../instant-messengers/mikutter/default.nix   |  2 +-
 .../instant-messengers/pidgin/wrapper.nix     |  2 +-
 .../instant-messengers/pond/default.nix       |  4 +-
 .../instant-messengers/psi/default.nix        |  2 +-
 .../instant-messengers/ricochet/default.nix   |  2 +-
 .../ring-daemon/default.nix                   |  1 -
 .../instant-messengers/riot/riot-web.nix      |  2 +-
 .../instant-messengers/slack/default.nix      |  2 +-
 .../telegram/tdesktop/default.nix             |  2 +-
 .../instant-messengers/utox/default.nix       |  2 +-
 .../instant-messengers/vacuum/default.nix     |  2 +-
 .../networking/irc/irssi/otr/default.nix      |  2 +-
 .../networking/irc/weechat/default.nix        |  4 +-
 .../networking/mailreaders/alpine/default.nix |  2 +-
 .../mailreaders/mailnag/default.nix           |  2 +-
 .../mailreaders/mailpile/default.nix          |  2 +-
 .../mailreaders/msgviewer/default.nix         |  2 +-
 .../mailreaders/nylas-mail-bin/default.nix    |  3 +-
 .../mailreaders/realpine/default.nix          |  2 +-
 .../networking/mailreaders/sup/default.nix    |  3 +-
 .../mailreaders/thunderbird/default.nix       |  2 +-
 .../networking/newsreaders/pan/default.nix    |  2 +-
 .../applications/networking/owamp/default.nix |  2 +-
 .../networking/p2p/frostwire/default.nix      |  2 +-
 .../networking/p2p/ktorrent/default.nix       |  2 +-
 .../networking/p2p/retroshare/default.nix     |  2 +-
 .../networking/p2p/soulseekqt/default.nix     |  4 +-
 .../networking/p2p/transmission/default.nix   |  2 +-
 .../networking/p2p/tribler/default.nix        |  2 +-
 .../networking/pyload/default.nix             |  3 +-
 .../networking/remote/anydesk/default.nix     |  4 +-
 .../networking/remote/freerdp/legacy.nix      |  3 +-
 .../networking/remote/ssvnc/default.nix       |  2 +-
 .../networking/remote/teamviewer/default.nix  |  2 +-
 .../networking/remote/xrdp/default.nix        |  2 +-
 .../networking/seafile-client/default.nix     |  2 +-
 .../networking/sniffers/wireshark/default.nix |  4 +-
 .../networking/super-productivity/default.nix |  2 +-
 .../networking/sync/backintime/qt4.nix        |  2 +-
 .../networking/sync/casync/default.nix        |  2 +-
 .../networking/sync/rsync/base.nix            |  2 +-
 .../networking/sync/rsync/default.nix         |  4 +-
 .../networking/sync/rsync/rrsync.nix          |  2 +-
 pkgs/applications/networking/znc/modules.nix  |  2 +-
 pkgs/applications/office/autokey/default.nix  |  2 +-
 pkgs/applications/office/calligra/default.nix |  2 +-
 .../office/impressive/default.nix             |  2 +-
 .../office/libreoffice/default.nix            |  4 +-
 .../applications/office/libreoffice/still.nix |  4 +-
 .../applications/office/moneyplex/default.nix |  2 +-
 pkgs/applications/office/timetrap/default.nix |  2 +-
 pkgs/applications/office/trytond/default.nix  |  2 +-
 .../applications/office/wpsoffice/default.nix |  2 +-
 pkgs/applications/office/zim/default.nix      |  2 +-
 .../science/astronomy/celestia/default.nix    |  3 +-
 .../science/astronomy/stellarium/default.nix  |  2 +-
 .../science/biology/diamond/default.nix       |  2 +-
 .../science/biology/freebayes/default.nix     |  2 +-
 .../science/biology/mosdepth/default.nix      |  2 +-
 .../science/biology/raxml/default.nix         |  1 -
 .../science/biology/vcftools/default.nix      |  2 +-
 .../science/electronics/adms/default.nix      |  2 +-
 .../science/electronics/bitscope/common.nix   |  2 -
 .../science/electronics/bitscope/packages.nix |  5 +-
 .../science/electronics/kicad/default.nix     |  2 +-
 .../science/electronics/librepcb/default.nix  |  2 +-
 .../science/logic/aspino/default.nix          |  2 +-
 .../science/logic/coq2html/default.nix        |  2 +-
 .../science/logic/elan/default.nix            |  2 +-
 .../science/logic/hol_light/default.nix       |  2 +-
 .../science/logic/lean2/default.nix           |  2 +-
 .../science/logic/mcrl2/default.nix           |  3 +-
 .../science/logic/saw-tools/default.nix       |  2 +-
 .../science/logic/tamarin-prover/default.nix  |  2 +-
 .../science/logic/tlaplus/tlaps.nix           |  6 +-
 .../science/logic/workcraft/default.nix       |  2 +-
 .../machine-learning/torch/torch-distro.nix   |  6 +-
 pkgs/applications/science/math/R/default.nix  |  2 +-
 .../science/math/cntk/default.nix             |  2 +-
 .../science/math/colpack/default.nix          |  2 +-
 .../science/math/mathematica/10.nix           |  2 -
 .../science/math/mathematica/9.nix            |  2 -
 .../science/math/mathematica/default.nix      |  1 -
 .../science/math/sage/env-locations.nix       |  3 +-
 .../science/math/sage/openblas-pc.nix         |  3 +-
 .../science/math/sage/sage-with-env.nix       |  3 -
 .../science/math/sage/sagedoc.nix             |  4 +-
 .../science/math/sage/sagelib.nix             |  3 +-
 .../science/math/scilab/default.nix           |  2 +-
 .../science/math/singular/default.nix         |  2 +-
 .../science/misc/gephi/default.nix            |  2 +-
 pkgs/applications/science/misc/golly/beta.nix |  2 +-
 .../science/misc/openmvg/default.nix          |  2 +-
 .../science/misc/openmvs/default.nix          |  2 +-
 .../science/misc/root/default.nix             |  2 +-
 .../science/robotics/gazebo/default.nix       |  2 +-
 .../robotics/qgroundcontrol/default.nix       |  6 +-
 .../science/robotics/yarp/default.nix         |  2 +-
 pkgs/applications/science/spyder/default.nix  |  4 +-
 .../version-management/bazaar/tools.nix       |  2 +-
 .../version-management/bitkeeper/default.nix  |  4 +-
 .../git-and-tools/fast-export/default.nix     |  2 +-
 .../git-annex-remote-b2/default.nix           |  2 +-
 .../git-and-tools/git-cola/default.nix        |  2 +-
 .../git-and-tools/git-dit/default.nix         |  1 -
 .../git-and-tools/git-fame/default.nix        |  2 +-
 .../git-and-tools/git-hub/default.nix         |  2 +-
 .../git-and-tools/hub/default.nix             |  2 +-
 .../svn-all-fast-export/default.nix           |  2 +-
 .../version-management/git-lfs/1.nix          |  2 +-
 .../version-management/git-review/default.nix |  2 +-
 .../version-management/git-sizer/default.nix  |  2 +-
 .../version-management/gitea/default.nix      |  2 +-
 .../version-management/gitkraken/default.nix  |  2 +-
 .../version-management/gitlab/default.nix     |  2 +-
 .../version-management/gogs/default.nix       |  2 +-
 .../version-management/guitone/default.nix    |  2 +-
 .../version-management/mercurial/default.nix  |  4 +-
 .../version-management/rapidsvn/default.nix   |  2 +-
 .../version-management/redmine/default.nix    |  2 +-
 .../reposurgeon/default.nix                   |  2 +-
 .../version-management/smartgithg/default.nix |  1 -
 .../version-management/tailor/default.nix     |  2 +-
 .../version-management/yadm/default.nix       |  2 +-
 pkgs/applications/video/avidemux/default.nix  |  2 +-
 pkgs/applications/video/cinelerra/default.nix |  2 +-
 pkgs/applications/video/devede/default.nix    |  2 +-
 pkgs/applications/video/handbrake/default.nix |  4 +-
 pkgs/applications/video/k9copy/default.nix    |  2 +-
 pkgs/applications/video/kodi/commons.nix      |  5 +-
 pkgs/applications/video/kodi/default.nix      |  2 +-
 pkgs/applications/video/kodi/plugins.nix      |  2 +-
 .../applications/video/lightworks/default.nix |  4 +-
 pkgs/applications/video/mapmap/default.nix    |  1 -
 pkgs/applications/video/mplayer/default.nix   |  2 +-
 pkgs/applications/video/mpv/default.nix       |  2 +-
 pkgs/applications/video/natron/default.nix    |  2 +-
 .../video/openshot-qt/libopenshot.nix         |  2 +-
 pkgs/applications/video/pitivi/default.nix    |  2 +-
 .../video/qstopmotion/default.nix             |  2 +-
 .../video/recordmydesktop/gtk.nix             |  2 +-
 .../video/zdfmediathk/default.nix             |  2 +-
 .../virtualization/containerd/default.nix     |  2 +-
 .../virtualization/docker/default.nix         |  2 +-
 .../virtualization/runc/default.nix           |  2 +-
 .../virtualization/virtinst/default.nix       |  2 +-
 .../virtualization/virtualbox/default.nix     |  6 +-
 .../virtualization/vpcs/default.nix           |  2 +-
 .../window-managers/bspwm/default.nix         |  2 +-
 .../window-managers/bspwm/unstable.nix        |  2 +-
 .../window-managers/clfswm/default.nix        |  5 +-
 .../window-managers/i3/default.nix            |  2 +-
 .../window-managers/notion/default.nix        |  2 +-
 .../window-managers/spectrwm/default.nix      |  1 -
 .../window-managers/stumpwm/default.nix       |  2 +-
 .../window-managers/taffybar/default.nix      |  2 +-
 .../window-managers/wtftw/default.nix         |  2 +-
 .../build-fhs-userenv/default.nix             |  2 +-
 pkgs/build-support/docker/default.nix         |  1 -
 pkgs/build-support/emacs/elpa.nix             |  2 +-
 pkgs/build-support/emacs/melpa.nix            |  2 +-
 pkgs/build-support/fetchdarcs/default.nix     |  2 +-
 .../build-support/fetchdocker/credentials.nix |  2 +-
 pkgs/build-support/fetchdocker/default.nix    |  2 +-
 pkgs/build-support/fetchgit/private.nix       |  2 +-
 pkgs/build-support/fetchgitlocal/default.nix  |  2 +-
 pkgs/build-support/fetchhg/default.nix        |  2 +-
 pkgs/build-support/fetchnuget/default.nix     |  2 +-
 pkgs/build-support/fetchs3/default.nix        |  1 -
 pkgs/build-support/rust/build-rust-crate.nix  | 16 +++---
 .../rust/cargo-vendor/cargo-vendor.nix        |  2 +-
 pkgs/build-support/rust/default.nix           |  2 +-
 .../singularity-tools/default.nix             |  3 +-
 pkgs/data/fonts/arkpandora/default.nix        |  2 +-
 pkgs/data/fonts/iosevka/default.nix           |  1 -
 pkgs/data/fonts/noto-fonts/default.nix        |  2 +-
 pkgs/data/fonts/tex-gyre/default.nix          |  2 +-
 pkgs/data/misc/cacert/default.nix             |  2 +-
 .../schemas/xml-dtd/docbook-ebnf/default.nix  |  2 +-
 .../schemas/xml-dtd/docbook/4.1.2.nix         |  2 +-
 .../sgml+xml/schemas/xml-dtd/docbook/4.2.nix  |  2 +-
 .../sgml+xml/schemas/xml-dtd/docbook/4.3.nix  |  2 +-
 .../sgml+xml/schemas/xml-dtd/docbook/4.4.nix  |  2 +-
 .../sgml+xml/schemas/xml-dtd/docbook/4.5.nix  |  2 +-
 .../schemas/xml-dtd/docbook/generic.nix       |  2 +-
 pkgs/desktops/enlightenment/enlightenment.nix |  2 +-
 .../desktop/gnome-control-center/default.nix  |  5 +-
 .../gnome-2/desktop/gnome-panel/default.nix   |  6 +-
 .../desktop/mail-notification/default.nix     |  2 +-
 .../gnome-2/desktop/zenity/default.nix        |  2 +-
 .../platform/gnome-vfs-monikers/default.nix   |  2 +-
 .../gnome-2/platform/libbonobo/default.nix    |  2 +-
 .../gnome-2/platform/libgnome/default.nix     |  2 +-
 .../gnome-3/apps/gnome-characters/default.nix |  2 +-
 .../gnome-3/apps/gnome-documents/default.nix  |  8 +--
 .../gnome-3/apps/gnome-music/default.nix      |  2 +-
 pkgs/desktops/gnome-3/apps/polari/default.nix |  2 +-
 .../gnome-3/apps/seahorse/default.nix         |  2 +-
 pkgs/desktops/gnome-3/core/dconf/default.nix  |  2 +-
 .../desktops/gnome-3/core/empathy/default.nix |  4 +-
 pkgs/desktops/gnome-3/core/gdm/default.nix    |  2 +-
 .../gnome-3/core/gnome-shell/default.nix      |  2 +-
 .../gnome-3/core/gnome-user-docs/default.nix  |  2 +-
 .../gnome-3/core/gnome-user-share/default.nix |  4 +-
 .../gnome-3/core/grilo-plugins/default.nix    |  2 +-
 .../gsettings-desktop-schemas/default.nix     |  2 +-
 .../gnome-3/core/gucharmap/default.nix        |  2 +-
 .../gnome-3/core/nautilus/default.nix         |  2 +-
 pkgs/desktops/gnome-3/core/sushi/default.nix  |  2 +-
 pkgs/desktops/gnome-3/core/totem/default.nix  |  4 +-
 pkgs/desktops/gnome-3/core/vte/default.nix    |  2 +-
 .../gnome-3/core/yelp-xsl/default.nix         |  2 +-
 pkgs/desktops/gnome-3/core/zenity/default.nix |  2 +-
 .../extensions/system-monitor/default.nix     |  2 +-
 .../extensions/topicons-plus/default.nix      |  2 +-
 .../gnome-3/misc/gfbgraph/default.nix         |  2 +-
 pkgs/desktops/gnome-3/misc/gitg/default.nix   |  4 +-
 .../gnome-3/misc/gnome-tweaks/default.nix     |  6 +-
 pkgs/desktops/gnome-3/misc/libgda/default.nix |  2 +-
 pkgs/desktops/gnustep/gworkspace/default.nix  |  1 -
 .../gnustep/make/gsmakeDerivation.nix         |  2 +-
 .../lxqt/core/lxqt-config/default.nix         |  2 +-
 pkgs/desktops/lxqt/default.nix                |  2 +-
 pkgs/desktops/mate/mate-applets/default.nix   |  2 +-
 .../mate/mate-settings-daemon/default.nix     |  2 +-
 pkgs/desktops/mate/mate-themes/default.nix    |  2 +-
 pkgs/desktops/plasma-5/default.nix            |  3 +-
 pkgs/desktops/plasma-5/kdeplasma-addons.nix   |  2 +-
 pkgs/desktops/plasma-5/kwin/default.nix       |  2 +-
 .../xfce/applications/xfce4-screenshooter.nix |  2 +-
 pkgs/desktops/xfce/core/xfce4-session.nix     |  2 +-
 .../appmenu-gtk-module.nix                    |  2 +-
 .../arduino/platformio/default.nix            |  2 +-
 pkgs/development/compilers/boo/default.nix    |  5 +-
 .../compilers/chicken/eggDerivation.nix       |  2 +-
 pkgs/development/compilers/clasp/default.nix  |  2 +-
 .../compilers/cudatoolkit/default.nix         |  2 +-
 .../compilers/dotnet/sdk/default.nix          |  1 -
 pkgs/development/compilers/elm/default.nix    |  2 +-
 .../compilers/emscripten/default.nix          |  4 +-
 .../fastcomp/emscripten-fastcomp.nix          |  2 +-
 .../compilers/factor-lang/default.nix         |  2 +-
 pkgs/development/compilers/gambit/build.nix   |  2 +-
 pkgs/development/compilers/gambit/default.nix |  1 -
 .../development/compilers/gambit/unstable.nix |  1 -
 .../development/compilers/gcc/4.8/default.nix |  1 -
 .../development/compilers/gcc/4.9/default.nix |  1 -
 pkgs/development/compilers/gcc/5/default.nix  |  1 -
 pkgs/development/compilers/gcc/6/default.nix  |  1 -
 pkgs/development/compilers/gcc/7/default.nix  |  1 -
 pkgs/development/compilers/gcc/8/default.nix  |  3 +-
 .../compilers/gcc/snapshot/default.nix        |  1 -
 pkgs/development/compilers/gcl/2.6.13-pre.nix |  2 +-
 pkgs/development/compilers/gcl/default.nix    |  2 +-
 pkgs/development/compilers/gerbil/build.nix   |  2 +-
 pkgs/development/compilers/ghc/7.10.3.nix     |  4 +-
 pkgs/development/compilers/ghc/8.0.2.nix      |  2 +-
 pkgs/development/compilers/ghc/8.2.2.nix      |  2 +-
 pkgs/development/compilers/ghc/8.4.3.nix      |  2 +-
 pkgs/development/compilers/ghc/8.6.1.nix      |  4 +-
 pkgs/development/compilers/ghc/head.nix       |  2 +-
 .../ghcjs-ng/configured-ghcjs-src.nix         |  1 -
 pkgs/development/compilers/ghcjs/base.nix     |  7 +--
 pkgs/development/compilers/go/1.10.nix        |  2 +-
 pkgs/development/compilers/go/1.9.nix         |  2 +-
 .../development/compilers/graalvm/default.nix |  2 +-
 pkgs/development/compilers/haxe/default.nix   |  2 +-
 .../development/compilers/inform7/default.nix |  2 +-
 .../compilers/ios-cross-compile/9.2.nix       |  2 +-
 pkgs/development/compilers/ispc/default.nix   |  2 +-
 pkgs/development/compilers/julia/0.5.nix      |  5 +-
 pkgs/development/compilers/julia/0.6.nix      |  5 +-
 pkgs/development/compilers/julia/default.nix  |  2 +-
 pkgs/development/compilers/ldc/default.nix    |  2 +-
 pkgs/development/compilers/llvm/3.4/llvm.nix  |  1 -
 .../compilers/llvm/3.5/dragonegg.nix          |  2 +-
 .../compilers/llvm/3.7/default.nix            |  4 +-
 pkgs/development/compilers/llvm/3.7/llvm.nix  |  1 -
 .../compilers/llvm/3.8/default.nix            |  2 +-
 pkgs/development/compilers/llvm/3.8/llvm.nix  |  1 -
 .../compilers/llvm/3.9/default.nix            |  2 +-
 pkgs/development/compilers/llvm/3.9/llvm.nix  |  2 -
 pkgs/development/compilers/llvm/4/default.nix |  3 +-
 .../compilers/llvm/4/libc++/default.nix       |  2 +-
 pkgs/development/compilers/llvm/4/lld.nix     |  2 -
 pkgs/development/compilers/llvm/4/llvm.nix    |  2 -
 pkgs/development/compilers/llvm/4/openmp.nix  |  1 -
 .../compilers/llvm/5/clang/default.nix        |  2 +-
 pkgs/development/compilers/llvm/5/default.nix |  3 +-
 .../compilers/llvm/5/libc++/default.nix       |  2 +-
 pkgs/development/compilers/llvm/5/lld.nix     |  2 -
 pkgs/development/compilers/llvm/5/llvm.nix    |  3 -
 pkgs/development/compilers/llvm/5/openmp.nix  |  1 -
 .../compilers/llvm/6/clang/default.nix        |  2 +-
 pkgs/development/compilers/llvm/6/default.nix |  3 +-
 .../compilers/llvm/6/libc++/default.nix       |  2 +-
 pkgs/development/compilers/llvm/6/lld.nix     |  1 -
 pkgs/development/compilers/llvm/6/llvm.nix    |  3 -
 pkgs/development/compilers/llvm/6/openmp.nix  |  1 -
 .../compilers/matter-compiler/default.nix     |  2 +-
 pkgs/development/compilers/mcpp/default.nix   |  2 +-
 pkgs/development/compilers/mono/4.0.nix       |  2 +-
 pkgs/development/compilers/mono/4.4.nix       |  2 +-
 pkgs/development/compilers/mono/4.6.nix       |  2 +-
 pkgs/development/compilers/mono/4.8.nix       |  2 +-
 pkgs/development/compilers/mono/5.0.nix       |  2 +-
 pkgs/development/compilers/mono/5.4.nix       |  2 +-
 pkgs/development/compilers/mono/5.8.nix       |  2 +-
 .../compilers/nvidia-cg-toolkit/default.nix   |  2 +-
 .../development/compilers/obliv-c/default.nix |  2 +-
 pkgs/development/compilers/openjdk/10.nix     |  2 +-
 .../compilers/openjdk/bootstrap.nix           |  2 +-
 .../compilers/oraclejdk/jdk10-linux.nix       |  2 -
 pkgs/development/compilers/pakcs/default.nix  |  4 +-
 .../compilers/rust/binaryBuild.nix            |  2 +-
 pkgs/development/compilers/rust/cargo.nix     |  2 +-
 .../development/compilers/souffle/default.nix |  2 +-
 pkgs/development/compilers/swift/default.nix  |  1 -
 pkgs/development/compilers/urweb/default.nix  |  2 +-
 .../coq-modules/mathcomp/generic.nix          |  2 +-
 .../coq-modules/ssreflect/generic.nix         |  2 +-
 .../idris-modules/build-builtin-package.nix   |  2 +-
 pkgs/development/interpreters/erlang/R19.nix  |  2 +-
 pkgs/development/interpreters/erlang/R20.nix  |  2 +-
 pkgs/development/interpreters/erlang/R21.nix  |  2 +-
 .../interpreters/erlang/generic-builder.nix   |  2 +-
 pkgs/development/interpreters/guile/2.0.nix   |  2 +-
 .../interpreters/guile/default.nix            |  2 +-
 pkgs/development/interpreters/lua-5/5.1.nix   |  2 +-
 pkgs/development/interpreters/lua-5/5.2.nix   |  4 +-
 pkgs/development/interpreters/lua-5/5.3.nix   |  4 +-
 .../interpreters/luajit/default.nix           |  2 +-
 .../development/interpreters/perl/default.nix |  2 +-
 pkgs/development/interpreters/php/default.nix |  2 +-
 pkgs/development/interpreters/pyrex/0.9.5.nix |  2 +-
 pkgs/development/interpreters/pyrex/0.9.6.nix |  2 +-
 .../python/cpython/2.7/default.nix            |  3 +-
 .../python/cpython/3.4/default.nix            |  2 +-
 .../python/cpython/3.5/default.nix            |  2 +-
 .../python/cpython/3.6/default.nix            |  3 +-
 .../python/cpython/3.7/default.nix            |  3 +-
 .../interpreters/python/pypy/2.7/default.nix  |  2 +-
 .../interpreters/rebol/default.nix            |  2 +-
 .../development/interpreters/self/default.nix |  2 +-
 pkgs/development/interpreters/tcl/generic.nix |  2 +-
 .../interpreters/unicon-lang/default.nix      |  2 +-
 .../development/java-modules/jogl/default.nix |  2 +-
 .../java-modules/maven-minimal.nix            |  2 +-
 .../development/java-modules/mavenPlugins.nix |  2 +-
 .../libraries/arguments/default.nix           |  2 +-
 pkgs/development/libraries/assimp/default.nix |  2 +-
 .../libraries/audio/libbass/default.nix       |  2 +-
 pkgs/development/libraries/avro-c/default.nix |  2 +-
 .../development/libraries/belcard/default.nix |  2 +-
 .../libraries/belle-sip/default.nix           |  2 +-
 pkgs/development/libraries/belr/default.nix   |  2 +-
 pkgs/development/libraries/bzrtp/default.nix  |  2 +-
 pkgs/development/libraries/caf/default.nix    |  2 +-
 pkgs/development/libraries/cairo/default.nix  |  2 +-
 .../development/libraries/cairomm/default.nix |  2 +-
 .../libraries/capstone/default.nix            |  2 +-
 pkgs/development/libraries/cl/default.nix     |  2 +-
 .../development/libraries/clutter/default.nix |  2 +-
 .../libraries/crypto++/default.nix            |  2 +-
 pkgs/development/libraries/db/generic.nix     |  2 +-
 .../libraries/dbus-sharp/dbus-sharp-1.0.nix   |  2 +-
 .../libraries/dbus-sharp/default.nix          |  2 +-
 pkgs/development/libraries/eclib/default.nix  |  2 -
 pkgs/development/libraries/expat/default.nix  |  2 +-
 pkgs/development/libraries/faac/default.nix   |  2 +-
 .../libraries/ffmpeg-full/default.nix         |  3 +-
 .../libraries/ffmpeg-sixel/default.nix        |  2 +-
 .../libraries/ffmpegthumbnailer/default.nix   |  2 +-
 pkgs/development/libraries/folly/default.nix  |  2 +-
 .../libraries/fontconfig/default.nix          |  2 +-
 .../libraries/fontconfig/make-fonts-cache.nix |  2 +-
 pkgs/development/libraries/frame/default.nix  |  2 +-
 .../libraries/freetype/default.nix            |  3 +-
 .../libraries/gbenchmark/default.nix          |  2 +-
 pkgs/development/libraries/gegl/default.nix   |  2 +-
 pkgs/development/libraries/geos/default.nix   |  2 +-
 pkgs/development/libraries/glib/default.nix   |  2 +-
 pkgs/development/libraries/glibc/common.nix   |  2 +-
 .../libraries/gnutls-kdh/generic.nix          |  4 +-
 pkgs/development/libraries/gnutls/generic.nix |  2 +-
 .../development/libraries/goffice/default.nix |  2 +-
 pkgs/development/libraries/gpgme/default.nix  |  2 +-
 pkgs/development/libraries/gsasl/default.nix  |  2 +-
 pkgs/development/libraries/gsl/default.nix    |  2 +-
 .../libraries/gstreamer/base/default.nix      |  2 +-
 .../legacy/gst-plugins-base/default.nix       |  2 +-
 .../legacy/gst-plugins-good/default.nix       |  4 +-
 .../legacy/gst-plugins-ugly/default.nix       |  2 +-
 .../libraries/gstreamer/vaapi/default.nix     |  2 +-
 pkgs/development/libraries/gtkd/default.nix   |  2 +-
 pkgs/development/libraries/gvfs/default.nix   |  2 +-
 .../libraries/hunspell/dictionaries.nix       |  1 +
 pkgs/development/libraries/icu/base.nix       |  2 +-
 .../libraries/ignition-transport/generic.nix  |  2 +-
 pkgs/development/libraries/ijs/default.nix    |  2 +-
 .../libraries/iso-codes/default.nix           |  2 +-
 pkgs/development/libraries/itk/default.nix    |  2 +-
 .../libraries/jbig2dec/default.nix            |  2 +-
 .../libraries/json-glib/default.nix           |  2 +-
 .../libraries/kde-frameworks/kcoreaddons.nix  |  2 +-
 .../libraries/kde-frameworks/kdeclarative.nix |  2 +-
 .../libraries/kde-frameworks/kglobalaccel.nix |  2 +-
 .../kde-frameworks/kpackage/default.nix       |  2 +-
 .../libraries/kde-frameworks/ktexteditor.nix  |  2 +-
 .../libraries/keybinder3/default.nix          |  2 +-
 .../development/libraries/kpmcore/default.nix |  2 +-
 .../development/libraries/kreport/default.nix |  2 +-
 .../libraries/languagemachines/frogdata.nix   |  2 -
 .../libraries/languagemachines/uctodata.nix   |  3 +-
 .../development/libraries/lensfun/default.nix |  2 +-
 .../libraries/libatomic_ops/default.nix       |  2 +-
 .../libraries/libbdplus/default.nix           |  2 +-
 pkgs/development/libraries/libbfd/default.nix |  4 +-
 .../libraries/libchamplain/default.nix        |  2 +-
 .../libraries/libcollectdclient/default.nix   |  2 +-
 .../libraries/libdazzle/default.nix           |  2 +-
 .../development/libraries/libedit/default.nix |  2 +-
 pkgs/development/libraries/libewf/default.nix |  2 +-
 .../libraries/libgdiplus/default.nix          |  2 +-
 .../development/libraries/libgksu/default.nix |  2 +-
 .../libraries/libgphoto2/default.nix          |  2 +-
 .../development/libraries/libgpod/default.nix |  2 +-
 .../development/libraries/libgtop/default.nix |  2 +-
 .../libraries/libiberty/default.nix           |  2 +-
 .../libraries/libid3tag/default.nix           |  2 +-
 .../development/libraries/libidn2/default.nix |  2 +-
 .../libraries/libircclient/default.nix        |  2 +-
 .../libraries/libjson-rpc-cpp/default.nix     |  2 +-
 .../libraries/libndctl/default.nix            |  2 +-
 .../libraries/libopcodes/default.nix          |  2 +-
 .../development/libraries/libopus/default.nix |  2 +-
 .../libraries/libplist/default.nix            |  2 +-
 pkgs/development/libraries/libpng/default.nix |  4 +-
 .../libraries/libproxy/default.nix            |  2 +-
 pkgs/development/libraries/librdf/raptor2.nix |  2 +-
 .../libraries/libsecret/default.nix           |  2 +-
 .../libraries/libsigcxx/default.nix           |  2 +-
 .../libraries/libsigsegv/default.nix          |  1 -
 pkgs/development/libraries/libskk/default.nix |  2 +-
 .../libraries/libsnark/default.nix            |  2 +-
 .../libraries/libtheora/default.nix           |  2 +-
 .../development/libraries/libtiff/default.nix |  2 +-
 .../libraries/libunwind/default.nix           |  2 +-
 .../libraries/libva-utils/default.nix         |  2 +-
 pkgs/development/libraries/libvpx/default.nix |  1 -
 pkgs/development/libraries/libvpx/git.nix     |  1 -
 .../development/libraries/libxml2/default.nix |  2 +-
 .../development/libraries/libxslt/default.nix |  2 +-
 .../libraries/libyaml-cpp/default.nix         |  2 +-
 .../development/libraries/libyaml/default.nix |  2 +-
 .../libraries/linenoise-ng/default.nix        |  2 +-
 pkgs/development/libraries/lirc/default.nix   |  2 +-
 .../libraries/lucene++/default.nix            |  2 +-
 .../libraries/mediastreamer/default.nix       |  2 +-
 .../libraries/mediastreamer/msopenh264.nix    |  2 +-
 .../libraries/mesa-darwin/default.nix         |  6 +-
 pkgs/development/libraries/mesa/default.nix   |  4 +-
 pkgs/development/libraries/mlt/default.nix    |  2 +-
 .../libraries/mono-zeroconf/default.nix       |  2 +-
 pkgs/development/libraries/mpich2/default.nix |  2 +-
 pkgs/development/libraries/mpir/default.nix   |  2 +-
 .../development/libraries/neardal/default.nix |  2 +-
 pkgs/development/libraries/ntrack/default.nix |  2 +-
 pkgs/development/libraries/odpic/default.nix  |  2 +-
 pkgs/development/libraries/opencv/3.x.nix     |  2 +-
 .../development/libraries/openexr/default.nix |  2 +-
 .../development/libraries/openpam/default.nix |  2 +-
 .../development/libraries/openssl/default.nix |  1 -
 .../libraries/opensubdiv/default.nix          |  2 +-
 pkgs/development/libraries/ortp/default.nix   |  2 +-
 pkgs/development/libraries/pango/default.nix  |  2 +-
 pkgs/development/libraries/pcre2/default.nix  |  2 +-
 .../libraries/physics/herwig/default.nix      |  2 +-
 .../libraries/physics/mcgrid/default.nix      |  2 +-
 .../libraries/physics/nlojet/default.nix      |  2 +-
 .../libraries/physics/yoda/default.nix        |  2 +-
 .../development/libraries/postgis/default.nix |  2 -
 .../libraries/protobuf/generic.nix            |  2 +-
 .../libraries/qimageblitz/default.nix         |  2 +-
 .../libraries/qt-4.x/4.8/default.nix          |  4 +-
 .../libraries/qt-5/5.11/default.nix           |  2 +-
 .../libraries/qt-5/5.6/default.nix            |  2 +-
 .../libraries/qt-5/5.9/default.nix            |  2 +-
 .../libraries/qt-5/modules/qtbase.nix         |  6 +-
 .../libraries/qt-5/modules/qtmultimedia.nix   |  1 -
 .../libraries/qt-5/modules/qtserialport.nix   |  2 +-
 .../libraries/qt-5/modules/qtwebkit.nix       |  1 -
 pkgs/development/libraries/qt-5/qt-env.nix    |  2 +-
 .../libraries/qtstyleplugins/default.nix      |  2 +-
 pkgs/development/libraries/quazip/default.nix |  2 +-
 .../libraries/quickder/default.nix            |  2 +-
 .../development/libraries/rocksdb/default.nix |  1 -
 .../libraries/science/math/arpack/default.nix |  2 +-
 .../libraries/science/math/caffe2/default.nix |  2 +-
 .../science/math/openblas/default.nix         |  2 +-
 .../science/networking/ns3/default.nix        |  2 +-
 pkgs/development/libraries/serf/default.nix   |  2 +-
 pkgs/development/libraries/smpeg2/default.nix |  2 +-
 .../libraries/speech-tools/default.nix        |  2 +-
 pkgs/development/libraries/spice/default.nix  |  2 +-
 .../development/libraries/tachyon/default.nix |  1 -
 pkgs/development/libraries/ti-rpc/default.nix |  2 +-
 .../libraries/unicorn-emu/default.nix         |  2 +-
 pkgs/development/libraries/v8/3.14.nix        |  2 +-
 pkgs/development/libraries/vigra/default.nix  |  2 +-
 pkgs/development/libraries/vtk/default.nix    |  2 +-
 .../development/libraries/wavpack/default.nix |  2 +-
 pkgs/development/libraries/wayland/1.9.nix    |  2 +-
 .../development/libraries/wayland/default.nix |  2 +-
 pkgs/development/libraries/wlc/default.nix    |  2 +-
 .../libraries/xcb-util-cursor/HEAD.nix        |  2 +-
 .../development/libraries/xgboost/default.nix |  1 -
 .../libraries/xine-lib/default.nix            |  2 +-
 .../lisp-modules/clwrapper/default.nix        |  2 +-
 .../quicklisp-to-nix-overrides.nix            |  2 +-
 pkgs/development/misc/loc/default.nix         |  2 +-
 .../mobile/titaniumenv/default.nix            |  2 +-
 .../examples/simulate-kitchensink/default.nix |  2 +-
 .../mobile/titaniumenv/titaniumsdk-6.3.nix    |  2 +-
 .../mobile/titaniumenv/titaniumsdk-7.1.nix    |  2 +-
 .../ocaml-modules/atdgen/default.nix          |  2 +-
 .../development/ocaml-modules/bap/default.nix |  2 +-
 .../ocaml-modules/bin_prot/default.nix        |  2 +-
 .../ocaml-modules/cohttp/default.nix          |  2 +-
 .../ocaml-modules/cstruct/1.9.0.nix           |  2 +-
 .../ocaml-modules/eliom/default.nix           |  2 +-
 .../ocaml-modules/erm_xmpp/0.3.nix            |  2 +-
 .../ocaml-modules/git-unix/default.nix        |  2 +-
 .../development/ocaml-modules/git/default.nix |  2 +-
 .../ocaml-modules/janestreet/async-extra.nix  |  2 +-
 .../ocaml-modules/janestreet/async-kernel.nix |  4 +-
 .../ocaml-modules/janestreet/async-unix.nix   |  2 +-
 .../ocaml-modules/janestreet/async.nix        |  2 +-
 .../ocaml-modules/janestreet/async_ssl.nix    |  4 +-
 .../janestreet/core-extended.nix              |  5 +-
 .../ocaml-modules/janestreet/core.nix         |  5 +-
 .../ocaml-modules/janestreet/core_kernel.nix  |  5 +-
 .../ocaml-modules/janestreet/default.nix      |  2 +-
 .../ocaml-modules/mysql/default.nix           |  2 +-
 .../ocaml-modules/ocaml-cairo/default.nix     |  2 +-
 .../ocaml-modules/piqi-ocaml/default.nix      |  2 +-
 .../ocaml-modules/ppx_import/default.nix      |  4 +-
 .../development/ocaml-modules/re2/default.nix |  2 +-
 .../development/ocaml-modules/tls/default.nix |  2 +-
 pkgs/development/perl-modules/MNI/default.nix |  2 +-
 pkgs/development/pharo/vm/build-vm.nix        |  2 +-
 pkgs/development/pure-modules/gen/default.nix |  2 +-
 .../development/pure-modules/glpk/default.nix |  2 +-
 .../python-modules/Cython/default.nix         |  1 -
 .../python-modules/GeoIP/default.nix          |  3 +-
 .../python-modules/JPype1/default.nix         |  2 +-
 .../python-modules/PyLD/default.nix           |  2 +-
 .../python-modules/Theano/default.nix         |  1 -
 .../python-modules/acme/default.nix           |  2 +-
 .../python-modules/aiohttp-jinja2/default.nix |  2 +-
 .../python-modules/aiohttp/cors.nix           |  2 +-
 .../python-modules/aiohue/default.nix         |  2 +-
 .../python-modules/anyjson/default.nix        |  2 +-
 .../python-modules/application/default.nix    |  2 +-
 .../python-modules/area53/default.nix         |  2 +-
 .../python-modules/argcomplete/default.nix    |  2 +-
 .../python-modules/argon2_cffi/default.nix    |  3 +-
 .../python-modules/asana/default.nix          |  2 +-
 .../python-modules/async_timeout/default.nix  |  1 -
 .../python-modules/asyncio/default.nix        |  2 +-
 .../python-modules/asynctest/default.nix      |  2 +-
 .../python-modules/autograd/default.nix       |  2 +-
 .../python-modules/behave/default.nix         |  2 +-
 .../bootstrapped-pip/default.nix              |  2 +-
 .../python-modules/bottleneck/default.nix     |  3 +-
 .../browsermob-proxy/default.nix              |  1 -
 .../python-modules/bz2file/default.nix        |  1 -
 .../python-modules/cachetools/default.nix     |  2 +-
 .../python-modules/can/default.nix            |  1 -
 .../python-modules/canmatrix/default.nix      |  1 -
 .../python-modules/canopen/default.nix        |  2 -
 .../python-modules/cdecimal/default.nix       |  2 +-
 .../python-modules/cffi/default.nix           |  2 +-
 .../python-modules/cftime/default.nix         |  3 +-
 .../python-modules/chainer/default.nix        |  2 +-
 .../python-modules/characteristic/default.nix |  3 +-
 .../python-modules/circus/default.nix         |  2 +-
 .../python-modules/cmd2/default.nix           |  4 +-
 pkgs/development/python-modules/cmd2/old.nix  |  2 +-
 .../python-modules/coinmarketcap/default.nix  |  2 +-
 .../python-modules/colorlover/default.nix     |  2 +-
 .../python-modules/configargparse/default.nix |  2 +-
 .../python-modules/configparser/default.nix   |  2 +-
 .../python-modules/construct/default.nix      |  2 +-
 .../python-modules/coverage/default.nix       |  1 -
 .../python-modules/cram/default.nix           |  2 +-
 .../python-modules/credstash/default.nix      |  2 +-
 .../cryptography_vectors/default.nix          |  1 -
 .../python-modules/cupy/default.nix           |  2 +-
 .../python-modules/cx_freeze/default.nix      |  2 +-
 .../python-modules/datadog/default.nix        |  2 +-
 .../python-modules/dateparser/default.nix     |  2 +-
 .../python-modules/debian/default.nix         |  2 +-
 .../python-modules/defusedxml/default.nix     |  2 +-
 .../python-modules/django_tagging/default.nix |  2 +-
 .../python-modules/dkimpy/default.nix         |  2 +-
 .../python-modules/dugong/default.nix         |  2 +-
 .../python-modules/ecpy/default.nix           |  2 +-
 .../email-validator/default.nix               |  2 +-
 .../python-modules/faulthandler/default.nix   |  2 +-
 .../python-modules/feedgen/default.nix        |  2 +-
 .../flake8-future-import/default.nix          |  3 +-
 .../python-modules/flask-migrate/default.nix  |  3 +-
 .../python-modules/flit/default.nix           |  1 -
 .../python-modules/fpdf/default.nix           |  2 +-
 .../python-modules/ftfy/default.nix           |  2 -
 .../python-modules/gensim/default.nix         |  3 -
 .../python-modules/graph-tool/2.x.x.nix       |  2 +-
 .../python-modules/h5py/default.nix           |  2 +-
 .../python-modules/hupper/default.nix         |  2 +-
 .../python-modules/hypchat/default.nix        |  2 +-
 .../python-modules/hypothesis/default.nix     |  4 +-
 .../python-modules/image-match/default.nix    |  2 +-
 .../python-modules/iowait/default.nix         |  2 +-
 pkgs/development/python-modules/ipython/5.nix |  2 -
 .../python-modules/joblib/default.nix         |  3 -
 .../python-modules/jsmin/default.nix          |  2 +-
 .../python-modules/jupyter_core/default.nix   |  1 -
 .../python-modules/jupyterhub/default.nix     |  2 -
 .../python-modules/kaitaistruct/default.nix   |  2 +-
 .../python-modules/keras/default.nix          |  2 +-
 .../python-modules/ldap/default.nix           |  2 +-
 .../python-modules/ldappool/default.nix       |  2 +-
 .../python-modules/libarcus/default.nix       |  4 +-
 .../python-modules/libgpuarray/default.nix    |  1 -
 .../python-modules/libversion/default.nix     |  2 +-
 .../python-modules/libvirt/default.nix        |  2 +-
 .../python-modules/linode-api/default.nix     |  1 -
 .../python-modules/lmtpd/default.nix          |  2 +-
 .../marionette-harness/default.nix            |  1 -
 .../marionette-harness/manifestparser.nix     |  1 -
 .../marionette-harness/marionette_driver.nix  |  1 -
 .../marionette-harness/mozcrash.nix           |  1 -
 .../marionette-harness/mozdevice.nix          |  1 -
 .../marionette-harness/mozfile.nix            |  1 -
 .../marionette-harness/mozhttpd.nix           |  1 -
 .../marionette-harness/mozlog.nix             |  1 -
 .../marionette-harness/moznetwork.nix         |  1 -
 .../marionette-harness/mozprocess.nix         |  1 -
 .../marionette-harness/mozprofile.nix         |  1 -
 .../marionette-harness/mozrunner.nix          |  1 -
 .../marionette-harness/moztest.nix            |  1 -
 .../marionette-harness/mozversion.nix         |  1 -
 .../python-modules/moto/default.nix           |  2 +-
 .../python-modules/mrbob/default.nix          |  2 +-
 .../python-modules/murmurhash/default.nix     |  1 -
 .../python-modules/nbconvert/default.nix      |  1 -
 .../python-modules/ncclient/default.nix       |  1 -
 .../python-modules/netdisco/default.nix       |  2 +-
 .../python-modules/nltk/default.nix           |  2 +-
 .../python-modules/numpy/default.nix          |  2 +-
 .../python-modules/ovh/default.nix            |  3 -
 .../python-modules/pandas/0.17.1.nix          |  2 -
 .../python-modules/pandas/default.nix         |  1 -
 .../python-modules/parse-type/default.nix     |  2 +-
 .../python-modules/parse/default.nix          |  2 +-
 .../python-modules/passlib/default.nix        |  3 +-
 .../python-modules/pelican/default.nix        |  2 +-
 .../python-modules/persistent/default.nix     |  1 -
 .../plaster-pastedeploy/default.nix           |  2 +-
 .../python-modules/plaster/default.nix        |  2 +-
 .../python-modules/pluggy/default.nix         |  1 -
 .../python-modules/plumbum/default.nix        |  3 +-
 .../python-modules/poppler-qt5/default.nix    |  2 +-
 .../python-modules/powerline/default.nix      |  3 -
 .../python-modules/progressbar2/default.nix   |  1 -
 .../prometheus_client/default.nix             |  2 +-
 .../python-modules/psutil/default.nix         |  1 -
 .../python-modules/pyGithub/default.nix       |  1 -
 .../python-modules/pyaml/default.nix          |  1 -
 .../python-modules/pycaption/default.nix      |  2 +-
 .../python-modules/pycollada/default.nix      |  2 +-
 .../python-modules/pycrypto/default.nix       |  2 +-
 .../python-modules/pycryptodome/default.nix   |  2 +-
 .../python-modules/pygame/default.nix         |  2 +-
 .../python-modules/pygame_sdl2/default.nix    |  2 +-
 .../python-modules/pygccxml/default.nix       |  2 +-
 .../python-modules/pygobject/3.nix            |  2 +-
 .../python-modules/pymc3/default.nix          |  1 -
 .../python-modules/pymvglive/default.nix      |  2 +-
 .../python-modules/pynacl/default.nix         |  2 +-
 .../python-modules/pyogg/default.nix          |  2 +-
 .../python-modules/pyowm/default.nix          |  2 +-
 pkgs/development/python-modules/pyqt/5.x.nix  |  2 +-
 .../python-modules/pysc2/default.nix          |  1 -
 .../python-modules/pysdl2/default.nix         |  2 +-
 .../python-modules/pyside/default.nix         |  2 +-
 .../python-modules/pytest-cram/default.nix    |  2 +-
 .../python-modules/pytest-flake8/default.nix  |  2 +-
 .../python-modules/pytest-mock/default.nix    |  2 +-
 .../python-modules/pytest-xdist/default.nix   |  2 +-
 .../python-modules/python-oauth2/default.nix  |  1 -
 .../python-modules/pytorch/default.nix        |  4 +-
 .../python-modules/pywbem/default.nix         |  2 +-
 .../python-modules/pyxml/default.nix          |  2 +-
 .../python-modules/pyzmq/default.nix          |  3 +-
 .../python-modules/qiskit/default.nix         |  2 -
 .../python-modules/rdflib/default.nix         |  3 +-
 .../python-modules/redis/default.nix          |  2 +-
 .../python-modules/reportlab/default.nix      |  4 +-
 .../python-modules/requests-mock/default.nix  |  2 +-
 .../python-modules/responses/default.nix      |  2 +-
 .../python-modules/rhpl/default.nix           |  2 +-
 .../python-modules/rubymarshal/default.nix    |  2 +-
 .../python-modules/salmon-mail/default.nix    |  2 +-
 .../python-modules/scikit-image/default.nix   |  1 -
 .../python-modules/scikitlearn/default.nix    |  2 +-
 .../python-modules/scipy/default.nix          |  2 +-
 .../serversyncstorage/default.nix             |  3 +-
 .../python-modules/smart_open/default.nix     |  1 -
 .../python-modules/spacy/default.nix          |  2 -
 .../python-modules/sqlalchemy/default.nix     |  1 -
 .../python-modules/sseclient/default.nix      |  2 +-
 .../python-modules/syncserver/default.nix     |  3 +-
 .../python-modules/tempora/default.nix        |  2 +-
 .../python-modules/tensorflow/bin.nix         |  2 +-
 .../python-modules/testfixtures/default.nix   |  2 +-
 .../python-modules/textacy/default.nix        |  1 -
 .../python-modules/thespian/default.nix       |  2 +-
 .../python-modules/thinc/default.nix          |  2 -
 .../python-modules/tiros/default.nix          |  2 +-
 .../python-modules/todoist/default.nix        |  2 +-
 .../python-modules/tokenserver/default.nix    |  3 +-
 .../python-modules/tox/default.nix            |  3 +-
 .../python-modules/tqdm/default.nix           |  2 -
 .../python-modules/typed-ast/default.nix      |  2 +-
 .../python-modules/tzlocal/default.nix        |  2 +-
 .../ukpostcodeparser/default.nix              |  2 +-
 .../python-modules/uranium/default.nix        |  2 +-
 .../python-modules/vcrpy/default.nix          |  1 -
 .../python-modules/warrant/default.nix        |  2 +-
 .../python-modules/wptserve/default.nix       |  1 -
 .../python-modules/wsproto/default.nix        |  2 +-
 .../python-modules/xarray/default.nix         |  1 -
 .../python-modules/zeep/default.nix           |  1 -
 .../python-modules/zodb/default.nix           |  1 -
 .../zope_testrunner/default.nix               |  1 -
 pkgs/development/r-modules/default.nix        |  4 +-
 .../ruby-modules/bundler/default.nix          |  2 +-
 .../tools/analysis/qcachegrind/default.nix    |  2 +-
 .../tools/analysis/radare/default.nix         |  2 +-
 .../tools/analysis/valgrind/default.nix       |  2 +-
 .../tools/backblaze-b2/default.nix            |  2 +-
 pkgs/development/tools/bloaty/default.nix     |  2 +-
 .../tools/build-managers/buck/default.nix     |  2 +-
 .../tools/build-managers/buildbot/default.nix |  2 +-
 .../tools/build-managers/cmake/2.8.nix        |  2 +-
 .../tools/build-managers/conan/default.nix    |  2 +-
 .../tools/build-managers/dub/default.nix      |  2 +-
 .../tools/build-managers/meson/default.nix    |  2 +-
 .../tools/build-managers/nant/default.nix     |  2 +-
 .../tools/build-managers/pants/default.nix    |  2 +-
 .../tools/build-managers/rebar3/default.nix   |  4 +-
 .../tools/build-managers/scons/common.nix     |  2 +-
 .../tools/build-managers/scons/default.nix    |  2 +-
 .../tools/build-managers/waf/default.nix      |  2 +-
 pkgs/development/tools/buildah/default.nix    |  2 +-
 pkgs/development/tools/castxml/default.nix    |  1 -
 pkgs/development/tools/chefdk/default.nix     |  2 +-
 pkgs/development/tools/compass/default.nix    |  2 +-
 .../default.nix                               |  2 +-
 .../tools/database/liquibase/default.nix      |  2 +-
 pkgs/development/tools/delve/default.nix      |  2 +-
 .../tools/devpi-client/default.nix            |  1 -
 .../tools/devpi-server/default.nix            |  2 +-
 .../documentation/gnome-doc-utils/default.nix |  4 +-
 pkgs/development/tools/easyjson/default.nix   |  2 +-
 .../tools/egg2nix/chicken-eggs.nix            |  2 +-
 pkgs/development/tools/electron/default.nix   |  2 +-
 .../tools/erlang/hex2nix/default.nix          |  2 +-
 .../tools/erlang/relx-exe/default.nix         |  2 +-
 pkgs/development/tools/fac/default.nix        |  2 +-
 pkgs/development/tools/git-ftp/default.nix    |  2 +-
 pkgs/development/tools/go-bindata/default.nix |  2 +-
 pkgs/development/tools/go-outline/default.nix |  2 +-
 .../tools/go-repo-root/default.nix            |  2 +-
 pkgs/development/tools/go-symbols/default.nix |  2 +-
 pkgs/development/tools/gocode/default.nix     |  2 +-
 pkgs/development/tools/goconvey/default.nix   |  2 +-
 pkgs/development/tools/godef/default.nix      |  2 +-
 pkgs/development/tools/goimports/default.nix  |  2 +-
 pkgs/development/tools/golint/default.nix     |  2 +-
 .../tools/gomodifytags/default.nix            |  2 +-
 pkgs/development/tools/gopkgs/default.nix     |  2 +-
 pkgs/development/tools/gotags/default.nix     |  2 +-
 pkgs/development/tools/gotests/default.nix    |  2 +-
 pkgs/development/tools/gotools/default.nix    |  2 +-
 pkgs/development/tools/govers/default.nix     |  2 +-
 pkgs/development/tools/gox/default.nix        |  2 +-
 .../tools/haskell/hyper-haskell/default.nix   |  2 +-
 .../tools/haskell/lambdabot/default.nix       |  2 +-
 .../haskell/multi-ghc-travis/default.nix      |  2 +-
 pkgs/development/tools/hexio/default.nix      |  2 +-
 pkgs/development/tools/iaca/2.1.nix           |  2 +-
 pkgs/development/tools/iaca/3.0.nix           |  2 +-
 .../tools/irony-server/default.nix            |  2 +-
 pkgs/development/tools/jmespath/default.nix   |  2 +-
 pkgs/development/tools/jp/default.nix         |  2 +-
 pkgs/development/tools/json2hcl/default.nix   |  2 +-
 pkgs/development/tools/kube-aws/default.nix   |  2 +-
 pkgs/development/tools/leaps/default.nix      |  2 +-
 .../tools/librarian-puppet-go/default.nix     |  2 +-
 pkgs/development/tools/manul/default.nix      |  2 +-
 .../tools/misc/autogen/default.nix            |  2 +-
 .../tools/misc/automake/automake-1.16.x.nix   |  2 +-
 .../tools/misc/binutils/default.nix           |  2 +-
 .../tools/misc/blackmagic/default.nix         |  2 +-
 .../tools/misc/cbrowser/default.nix           |  2 +-
 .../development/tools/misc/ccache/default.nix |  2 +-
 .../development/tools/misc/cquery/default.nix |  2 +-
 pkgs/development/tools/misc/ctags/wrapped.nix |  2 +-
 .../development/tools/misc/dialog/default.nix |  2 +-
 .../tools/misc/fswatch/default.nix            |  2 +-
 .../development/tools/misc/global/default.nix |  2 +-
 pkgs/development/tools/misc/hydra/default.nix |  4 +-
 .../tools/misc/intel-gpu-tools/default.nix    |  2 +-
 .../tools/misc/linuxkit/default.nix           |  2 +-
 .../tools/misc/loccount/default.nix           |  2 +-
 .../development/tools/misc/md2man/default.nix |  2 +-
 pkgs/development/tools/misc/moby/default.nix  |  2 +-
 .../tools/misc/pkgconfig/default.nix          |  2 +-
 .../tools/misc/stm32flash/default.nix         |  2 +-
 pkgs/development/tools/misc/swig/3.x.nix      |  2 +-
 .../tools/misc/teensy-loader-cli/default.nix  |  2 +-
 pkgs/development/tools/misc/trv/default.nix   |  2 +-
 pkgs/development/tools/nailgun/default.nix    |  2 +-
 pkgs/development/tools/node-webkit/nw12.nix   |  2 +-
 pkgs/development/tools/nwjs/default.nix       |  6 +-
 .../tools/ocaml/camlidl/default.nix           |  2 +-
 pkgs/development/tools/ocaml/opam/default.nix |  2 +-
 pkgs/development/tools/ocaml/utop/default.nix |  2 +-
 pkgs/development/tools/parsing/bison/3.x.nix  |  2 +-
 .../tools/parsing/hammer/default.nix          |  2 +-
 .../tools/quicktemplate/default.nix           |  2 +-
 pkgs/development/tools/redis-dump/default.nix |  2 +-
 pkgs/development/tools/rtags/default.nix      |  2 +-
 pkgs/development/tools/rubocop/default.nix    |  2 +-
 .../tools/rust/rainicorn/default.nix          |  2 +-
 .../tools/selenium/server/default.nix         |  2 +-
 pkgs/development/tools/slimerjs/default.nix   |  2 +-
 pkgs/development/tools/textql/default.nix     |  2 +-
 pkgs/development/tools/vim-vint/default.nix   |  2 +-
 pkgs/development/tools/vndr/default.nix       |  2 +-
 pkgs/development/tools/ws/default.nix         |  2 +-
 pkgs/development/tools/xcbuild/wrapper.nix    |  2 +-
 pkgs/development/tools/xib2nib/default.nix    |  2 +-
 pkgs/development/tools/yq/default.nix         |  2 +-
 pkgs/development/web/minify/default.nix       |  2 +-
 pkgs/development/web/postman/default.nix      |  2 +-
 pkgs/games/0ad/game.nix                       |  2 +-
 pkgs/games/90secondportraits/default.nix      |  2 +-
 pkgs/games/commandergenius/default.nix        |  2 +-
 pkgs/games/dwarf-fortress/default.nix         |  6 +-
 pkgs/games/dwarf-fortress/dfhack/default.nix  |  2 +-
 .../dwarf-therapist/default.nix               |  2 +-
 .../dwarf-therapist/wrapper.nix               |  2 +-
 pkgs/games/dwarf-fortress/lazy-pack.nix       |  2 +-
 pkgs/games/dwarf-fortress/themes/default.nix  |  2 +-
 pkgs/games/gcs/default.nix                    |  1 -
 pkgs/games/gzdoom/default.nix                 |  2 +-
 pkgs/games/meritous/default.nix               |  2 +-
 pkgs/games/mnemosyne/default.nix              |  3 +-
 pkgs/games/mrrescue/default.nix               |  2 +-
 pkgs/games/nethack/default.nix                |  2 +-
 pkgs/games/opendune/default.nix               |  2 +-
 pkgs/games/openmw/default.nix                 |  2 +-
 pkgs/games/openrct2/default.nix               |  2 +-
 pkgs/games/openspades/default.nix             |  2 +-
 pkgs/games/openxcom/default.nix               |  2 +-
 pkgs/games/pokerth/default.nix                |  2 +-
 pkgs/games/quake3/wrapper/default.nix         |  2 +-
 pkgs/games/rigsofrods/default.nix             |  4 +-
 pkgs/games/sienna/default.nix                 |  2 +-
 pkgs/games/spring/default.nix                 |  2 +-
 pkgs/games/spring/springlobby.nix             |  2 +-
 pkgs/games/stepmania/default.nix              |  2 +-
 pkgs/games/tibia/default.nix                  |  2 +-
 pkgs/games/torcs/default.nix                  |  2 +-
 pkgs/games/uqm/default.nix                    |  2 +-
 pkgs/games/vdrift/default.nix                 |  2 +-
 pkgs/games/wesnoth/default.nix                |  2 +-
 pkgs/games/widelands/default.nix              |  2 +-
 pkgs/games/worldofgoo/default.nix             |  2 +-
 pkgs/games/xonotic/default.nix                |  2 +-
 pkgs/games/zandronum/sqlite.nix               |  2 +-
 pkgs/misc/cups/drivers/brlaser/default.nix    |  2 +-
 pkgs/misc/cups/drivers/hl1110/default.nix     |  2 +-
 .../cups/drivers/mfcj470dwlpr/default.nix     |  2 +-
 .../cups/drivers/mfcj6510dwlpr/default.nix    |  2 +-
 pkgs/misc/cups/drivers/samsung/default.nix    |  2 +-
 pkgs/misc/cups/drivers/splix/default.nix      |  2 +-
 pkgs/misc/cups/filters.nix                    |  2 +-
 pkgs/misc/drivers/epson-alc1100/default.nix   |  2 +-
 pkgs/misc/drivers/hplip/3.16.11.nix           |  5 +-
 pkgs/misc/drivers/hplip/default.nix           |  3 +-
 .../drivers/postscript-lexmark/default.nix    |  2 +-
 pkgs/misc/emulators/cdemu/analyzer.nix        |  2 +-
 pkgs/misc/emulators/cdemu/gui.nix             |  2 +-
 pkgs/misc/emulators/cdemu/vhba.nix            |  2 +-
 pkgs/misc/emulators/dosbox/unstable.nix       |  2 +-
 pkgs/misc/emulators/epsxe/default.nix         |  2 +-
 pkgs/misc/emulators/mupen64plus/default.nix   |  2 +-
 pkgs/misc/emulators/nestopia/default.nix      |  4 +-
 pkgs/misc/emulators/qmc2/default.nix          |  2 +-
 pkgs/misc/emulators/retrofe/default.nix       |  2 +-
 pkgs/misc/emulators/vbam/default.nix          |  4 --
 pkgs/misc/emulators/vice/default.nix          |  2 +-
 pkgs/misc/emulators/wine/default.nix          |  2 +-
 pkgs/misc/emulators/wine/packages.nix         |  2 +-
 pkgs/misc/emulators/wine/staging.nix          |  2 +-
 pkgs/misc/ghostscript/default.nix             |  2 +-
 pkgs/misc/jackaudio/default.nix               |  1 -
 pkgs/misc/lilypond/unstable.nix               |  2 +-
 pkgs/misc/my-env/default.nix                  |  2 +-
 pkgs/misc/phabricator/default.nix             |  2 +-
 pkgs/misc/screensavers/slock/default.nix      |  2 +-
 pkgs/misc/themes/vertex/default.nix           |  2 +-
 pkgs/misc/uboot/default.nix                   |  2 +-
 pkgs/misc/vim-plugins/default.nix             |  6 +-
 .../vscode-extensions/cpptools/default.nix    |  2 +-
 pkgs/misc/vscode-extensions/default.nix       |  2 +-
 .../misc/vscode-extensions/python/default.nix |  2 +-
 pkgs/misc/vscode-extensions/vscode-utils.nix  |  2 +-
 .../apple-source-releases/ICU/default.nix     |  2 +-
 .../apple-source-releases/Libc/825_40_1.nix   |  2 +-
 .../apple-source-releases/Libc/default.nix    |  2 +-
 .../apple-source-releases/Libinfo/default.nix |  2 +-
 .../apple-source-releases/Libm/default.nix    |  2 +-
 .../Libnotify/default.nix                     |  2 +-
 .../Libsystem/default.nix                     |  4 +-
 .../Security/default.nix                      |  2 +-
 .../adv_cmds/default.nix                      |  2 +-
 .../apple-source-releases/adv_cmds/xcode.nix  |  2 +-
 .../basic_cmds/default.nix                    |  2 +-
 .../apple-source-releases/bsdmake/default.nix |  2 +-
 .../copyfile/default.nix                      |  2 +-
 .../developer_cmds/default.nix                |  2 +-
 .../diskdev_cmds/default.nix                  |  2 +-
 .../apple-source-releases/dtrace/default.nix  |  2 +-
 .../eap8021x/default.nix                      |  2 +-
 .../apple-source-releases/launchd/default.nix |  2 +-
 .../libclosure/default.nix                    |  2 +-
 .../libdispatch/default.nix                   |  2 +-
 .../libiconv/default.nix                      |  2 +-
 .../libplatform/default.nix                   |  2 +-
 .../libresolv/default.nix                     |  2 +-
 .../libsecurity_cdsa_utils/default.nix        |  2 +-
 .../libsecurity_cssm/default.nix              |  2 +-
 .../libsecurity_keychain/default.nix          |  2 +-
 .../libsecurity_utilities/default.nix         |  2 +-
 .../mDNSResponder/default.nix                 |  2 +-
 .../apple-source-releases/objc4/default.nix   |  2 +-
 .../apple-source-releases/ppp/default.nix     |  2 +-
 .../removefile/default.nix                    |  2 +-
 .../system_cmds/default.nix                   |  2 +-
 .../text_cmds/default.nix                     |  2 +-
 .../apple-source-releases/xnu/default.nix     |  2 +-
 pkgs/os-specific/darwin/binutils/default.nix  |  1 -
 pkgs/os-specific/darwin/cctools/port.nix      |  4 +-
 pkgs/os-specific/darwin/darling/default.nix   |  2 +-
 .../darwin/security-tool/default.nix          |  2 +-
 .../darwin/swift-corelibs/default.nix         |  2 +-
 pkgs/os-specific/darwin/xcode/sdk-pkgs.nix    |  2 +-
 pkgs/os-specific/linux/amdgpu-pro/default.nix |  2 +-
 pkgs/os-specific/linux/autofs/default.nix     |  2 +-
 pkgs/os-specific/linux/bcc/default.nix        |  2 +-
 pkgs/os-specific/linux/blcr/default.nix       |  2 +-
 .../linux/broadcom-sta/default.nix            |  2 +-
 pkgs/os-specific/linux/busybox/default.nix    |  3 +-
 pkgs/os-specific/linux/checksec/default.nix   |  2 +-
 pkgs/os-specific/linux/conky/default.nix      |  2 +-
 pkgs/os-specific/linux/cpupower/default.nix   |  2 +-
 pkgs/os-specific/linux/criu/default.nix       |  2 +-
 pkgs/os-specific/linux/cryptodev/default.nix  |  2 +-
 .../os-specific/linux/dbus-broker/default.nix |  2 +-
 .../os-specific/linux/displaylink/default.nix |  2 +-
 pkgs/os-specific/linux/ena/default.nix        |  2 +-
 pkgs/os-specific/linux/fatrace/default.nix    |  2 +-
 .../firmware-linux-nonfree/default.nix        |  2 +-
 pkgs/os-specific/linux/fuse/common.nix        |  1 -
 pkgs/os-specific/linux/fuse/default.nix       |  2 +-
 pkgs/os-specific/linux/guvcview/default.nix   |  4 +-
 pkgs/os-specific/linux/iproute/default.nix    |  2 +-
 pkgs/os-specific/linux/iputils/default.nix    |  2 +-
 .../linux/kernel-headers/default.nix          |  2 +-
 .../linux/kernel/manual-config.nix            |  3 +-
 pkgs/os-specific/linux/kernel/patches.nix     |  2 +-
 pkgs/os-specific/linux/keyutils/default.nix   |  2 +-
 pkgs/os-specific/linux/lvm2/default.nix       |  2 +-
 pkgs/os-specific/linux/lxc/default.nix        |  2 +-
 pkgs/os-specific/linux/mbpfan/default.nix     |  2 +-
 pkgs/os-specific/linux/microcode/amd.nix      |  2 +-
 .../linux/mkinitcpio-nfs-utils/default.nix    |  2 +-
 pkgs/os-specific/linux/musl/default.nix       |  1 -
 pkgs/os-specific/linux/nvidia-x11/default.nix |  2 +-
 pkgs/os-specific/linux/nvidia-x11/generic.nix |  2 +-
 .../linux/nvidia-x11/persistenced.nix         |  2 +-
 .../os-specific/linux/openvswitch/default.nix |  2 +-
 pkgs/os-specific/linux/ply/default.nix        |  2 +-
 pkgs/os-specific/linux/pmount/default.nix     |  2 +-
 pkgs/os-specific/linux/prl-tools/default.nix  |  3 +-
 pkgs/os-specific/linux/rtl8812au/default.nix  |  2 +-
 pkgs/os-specific/linux/rtl8814au/default.nix  |  2 +-
 .../linux/service-wrapper/default.nix         |  2 +-
 pkgs/os-specific/linux/seturgent/default.nix  |  2 +-
 pkgs/os-specific/linux/sssd/default.nix       |  6 +-
 pkgs/os-specific/linux/sysdig/default.nix     |  2 +-
 pkgs/os-specific/linux/systemd/default.nix    |  4 +-
 pkgs/os-specific/linux/tbs/default.nix        |  2 +-
 .../os-specific/linux/thunderbolt/default.nix |  1 -
 pkgs/os-specific/linux/trinity/default.nix    |  2 +-
 pkgs/os-specific/linux/udisks/2-default.nix   |  2 +-
 pkgs/os-specific/linux/upower/default.nix     |  2 +-
 pkgs/os-specific/linux/util-linux/default.nix |  2 +-
 pkgs/os-specific/linux/virtualbox/default.nix |  2 +-
 pkgs/os-specific/linux/wireguard/default.nix  |  2 +-
 .../linux/wpa_supplicant/default.nix          |  2 +-
 pkgs/os-specific/linux/wpa_supplicant/gui.nix |  2 +-
 .../linux/xf86-input-wacom/default.nix        |  2 +-
 .../windows/pthread-w32/default.nix           |  2 +-
 pkgs/servers/amqp/rabbitmq-server/default.nix |  2 +-
 pkgs/servers/asterisk/default.nix             |  2 +-
 pkgs/servers/caddy/default.nix                |  2 +-
 pkgs/servers/computing/storm/default.nix      |  4 +-
 pkgs/servers/consul/default.nix               |  2 +-
 pkgs/servers/dict/dictd-wordnet.nix           |  2 +-
 pkgs/servers/dns/knot-resolver/default.nix    |  2 +-
 pkgs/servers/dns/nsd/default.nix              |  2 +-
 pkgs/servers/etcd/default.nix                 |  2 +-
 pkgs/servers/exhibitor/default.nix            |  2 +-
 pkgs/servers/firebird/default.nix             |  2 +-
 pkgs/servers/gotty/default.nix                |  2 +-
 pkgs/servers/h2/default.nix                   |  2 +-
 pkgs/servers/hbase/default.nix                |  2 +-
 pkgs/servers/home-assistant/appdaemon.nix     |  2 +-
 pkgs/servers/http/couchdb/default.nix         |  2 +-
 .../servers/http/jboss/jdbc/mysql/default.nix |  2 +-
 pkgs/servers/http/nginx/generic.nix           |  3 +-
 pkgs/servers/http/nginx/modules.nix           |  2 +-
 .../servers/http/nix-binary-cache/default.nix |  2 +-
 pkgs/servers/http/openresty/default.nix       |  2 +-
 pkgs/servers/interlock/default.nix            |  2 +-
 pkgs/servers/isso/default.nix                 |  2 +-
 pkgs/servers/ldap/389/default.nix             |  2 +-
 pkgs/servers/mail/dovecot/default.nix         |  2 +-
 pkgs/servers/mail/mlmmj/default.nix           |  2 +-
 pkgs/servers/matrix-synapse/default.nix       |  2 +-
 pkgs/servers/mesos-dns/default.nix            |  2 +-
 pkgs/servers/mirrorbits/default.nix           |  2 +-
 pkgs/servers/monitoring/cadvisor/default.nix  |  2 +-
 .../monitoring/consul-alerts/default.nix      |  2 +-
 .../monitoring/fusion-inventory/default.nix   |  2 +-
 pkgs/servers/monitoring/kapacitor/default.nix |  2 +-
 pkgs/servers/monitoring/lcdproc/default.nix   |  2 +-
 .../monitoring/plugins/labs_consol_de.nix     |  2 +-
 .../prometheus/blackbox-exporter.nix          |  2 +-
 .../prometheus/collectd-exporter.nix          |  2 +-
 .../prometheus/fritzbox-exporter.nix          |  2 +-
 .../monitoring/prometheus/json-exporter.nix   |  2 +-
 .../monitoring/prometheus/mesos-exporter.nix  |  2 +-
 .../prometheus/minio-exporter/default.nix     |  2 +-
 .../monitoring/prometheus/prom2json.nix       |  2 +-
 .../monitoring/prometheus/snmp-exporter.nix   |  2 +-
 .../monitoring/prometheus/statsd-bridge.nix   |  2 +-
 .../prometheus/surfboard-exporter.nix         |  2 +-
 .../prometheus/unifi-exporter/default.nix     |  2 +-
 .../prometheus/varnish-exporter.nix           |  2 +-
 pkgs/servers/monitoring/zabbix/2.0.nix        |  2 +-
 pkgs/servers/monitoring/zabbix/2.2.nix        |  2 +-
 pkgs/servers/monitoring/zabbix/3.4.nix        |  2 +-
 pkgs/servers/mpd/default.nix                  |  2 +-
 pkgs/servers/nextcloud/default.nix            |  2 +-
 pkgs/servers/nosql/arangodb/default.nix       |  2 +-
 pkgs/servers/nosql/eventstore/default.nix     |  2 +-
 pkgs/servers/nosql/mongodb/default.nix        |  2 +-
 pkgs/servers/nosql/rethinkdb/default.nix      |  2 +-
 pkgs/servers/nosql/riak-cs/2.1.1.nix          |  2 +-
 pkgs/servers/nosql/riak-cs/stanchion.nix      |  2 +-
 pkgs/servers/nosql/riak/2.2.0.nix             |  2 +-
 pkgs/servers/nsq/default.nix                  |  2 +-
 pkgs/servers/openafs/1.6/default.nix          |  2 +-
 pkgs/servers/openafs/1.8/default.nix          |  2 +-
 pkgs/servers/pulseaudio/default.nix           |  3 -
 pkgs/servers/rippled/data-api.nix             |  2 +-
 pkgs/servers/rippled/package.nix              |  2 +-
 pkgs/servers/samba/4.x.nix                    |  4 +-
 pkgs/servers/samba/master.nix                 |  2 +-
 pkgs/servers/search/elasticsearch/plugins.nix |  2 +-
 pkgs/servers/skydns/default.nix               |  2 +-
 pkgs/servers/sql/mariadb/default.nix          |  2 +-
 pkgs/servers/x11/xquartz/default.nix          |  4 +-
 pkgs/shells/bash/4.4.nix                      |  1 -
 pkgs/shells/elvish/default.nix                |  2 +-
 pkgs/shells/fish/default.nix                  |  2 +-
 pkgs/shells/oh/default.nix                    |  2 +-
 pkgs/shells/oil/default.nix                   |  2 +-
 pkgs/shells/powershell/default.nix            |  2 +-
 pkgs/shells/zsh/antibody/default.nix          |  2 +-
 pkgs/shells/zsh/zsh-powerlevel9k/default.nix  |  2 +-
 pkgs/shells/zsh/zsh-prezto/default.nix        |  2 +-
 pkgs/tools/X11/bumblebee/default.nix          |  5 +-
 pkgs/tools/X11/go-sct/default.nix             |  2 +-
 pkgs/tools/X11/primus/default.nix             |  1 -
 pkgs/tools/X11/setroot/default.nix            |  2 +-
 pkgs/tools/X11/vdpauinfo/default.nix          |  2 +-
 pkgs/tools/X11/xbindkeys-config/default.nix   |  2 +-
 pkgs/tools/X11/xdg-utils/default.nix          |  2 +-
 pkgs/tools/X11/xpra/default.nix               |  2 +-
 pkgs/tools/X11/xpra/gtk3.nix                  |  2 +-
 pkgs/tools/admin/ansible/default.nix          |  2 +-
 pkgs/tools/admin/dehydrated/default.nix       |  2 +-
 pkgs/tools/admin/gtk-vnc/default.nix          |  4 +-
 pkgs/tools/admin/intecture/agent.nix          |  2 +-
 pkgs/tools/admin/intecture/auth.nix           |  2 +-
 pkgs/tools/admin/intecture/cli.nix            |  2 +-
 pkgs/tools/admin/lxd/default.nix              |  2 +-
 pkgs/tools/admin/simp_le/default.nix          |  2 +-
 pkgs/tools/admin/ssl-cert-check/default.nix   |  1 -
 pkgs/tools/archivers/innoextract/default.nix  |  2 +-
 pkgs/tools/archivers/rpmextract/default.nix   |  2 +-
 pkgs/tools/archivers/unp/default.nix          |  2 +-
 pkgs/tools/archivers/zpaq/zpaqd.nix           |  2 +-
 pkgs/tools/backup/bareos/default.nix          |  2 +-
 pkgs/tools/backup/ddar/default.nix            |  2 +-
 pkgs/tools/backup/partimage/default.nix       |  1 -
 pkgs/tools/backup/rsnapshot/default.nix       |  2 +-
 .../backup/ugarit-manifest-maker/default.nix  |  2 +-
 .../backup/ugarit-manifest-maker/eggs.nix     |  2 +-
 pkgs/tools/backup/ugarit/default.nix          |  2 +-
 pkgs/tools/backup/ugarit/eggs.nix             |  2 +-
 pkgs/tools/backup/znapzend/default.nix        |  2 +-
 pkgs/tools/bluetooth/blueman/default.nix      |  2 +-
 pkgs/tools/bootloaders/refind/default.nix     |  2 +-
 pkgs/tools/cd-dvd/brasero/default.nix         |  2 +-
 pkgs/tools/compression/bzip2/default.nix      |  2 +-
 pkgs/tools/compression/gzip/default.nix       |  2 +-
 pkgs/tools/compression/lzbench/default.nix    |  2 +-
 pkgs/tools/compression/upx/default.nix        |  2 +-
 .../filesystems/bcachefs-tools/default.nix    |  2 +-
 pkgs/tools/filesystems/ceph/generic.nix       |  8 +--
 pkgs/tools/filesystems/fatresize/default.nix  |  2 +-
 pkgs/tools/filesystems/glusterfs/default.nix  |  2 +-
 pkgs/tools/filesystems/go-mtpfs/default.nix   |  2 +-
 pkgs/tools/filesystems/grive2/default.nix     |  2 +-
 pkgs/tools/filesystems/irods/default.nix      |  2 +-
 .../tools/filesystems/nixpart/0.4/default.nix |  2 -
 pkgs/tools/filesystems/squashfuse/default.nix |  4 +-
 pkgs/tools/filesystems/xtreemfs/default.nix   |  2 +-
 pkgs/tools/filesystems/zkfuse/default.nix     |  2 +-
 pkgs/tools/graphics/argyllcms/default.nix     |  2 +-
 pkgs/tools/graphics/cuneiform/default.nix     |  2 +-
 pkgs/tools/graphics/gmic/default.nix          |  2 +-
 pkgs/tools/graphics/gnuplot/default.nix       |  1 -
 pkgs/tools/graphics/jbig2enc/default.nix      |  2 +-
 pkgs/tools/graphics/pywal/default.nix         |  2 +-
 pkgs/tools/graphics/vips/default.nix          |  4 +-
 .../fcitx-engines/fcitx-mozc/default.nix      |  2 +-
 pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix   |  2 +-
 pkgs/tools/inputmethods/fcitx/unwrapped.nix   |  2 +-
 pkgs/tools/inputmethods/fcitx/wrapper.nix     |  2 +-
 .../ibus-engines/ibus-hangul/default.nix      |  2 +-
 .../ibus-engines/ibus-mozc/default.nix        |  2 +-
 pkgs/tools/inputmethods/ibus/default.nix      |  2 +-
 .../interception-tools/default.nix            |  2 +-
 pkgs/tools/misc/apt-offline/default.nix       |  2 +-
 pkgs/tools/misc/azure-vhd-utils/default.nix   |  2 +-
 pkgs/tools/misc/bibutils/default.nix          |  2 +-
 pkgs/tools/misc/byobu/default.nix             |  2 +-
 pkgs/tools/misc/colord/default.nix            |  2 +-
 pkgs/tools/misc/dashing/default.nix           |  2 +-
 pkgs/tools/misc/debootstrap/default.nix       |  2 +-
 pkgs/tools/misc/direnv/default.nix            |  2 +-
 pkgs/tools/misc/dust/default.nix              |  2 +-
 pkgs/tools/misc/fluentd/default.nix           |  2 +-
 pkgs/tools/misc/fontforge/default.nix         |  2 +-
 pkgs/tools/misc/fzf/default.nix               |  2 +-
 pkgs/tools/misc/gams/default.nix              |  2 +-
 pkgs/tools/misc/gawp/default.nix              |  2 +-
 pkgs/tools/misc/gh-ost/default.nix            |  2 +-
 pkgs/tools/misc/gosu/default.nix              |  2 +-
 pkgs/tools/misc/graylog/plugins.nix           |  2 +-
 pkgs/tools/misc/grub/2.0x.nix                 |  2 +-
 pkgs/tools/misc/hdf5/1_8.nix                  |  1 -
 pkgs/tools/misc/hdf5/default.nix              |  1 -
 pkgs/tools/misc/hdfview/default.nix           |  2 +-
 pkgs/tools/misc/i3cat/default.nix             |  2 +-
 .../misc/libbitcoin/libbitcoin-client.nix     |  2 +-
 .../misc/libbitcoin/libbitcoin-explorer.nix   |  2 +-
 .../misc/libbitcoin/libbitcoin-network.nix    |  2 +-
 .../misc/libbitcoin/libbitcoin-protocol.nix   |  2 +-
 pkgs/tools/misc/libbitcoin/libbitcoin.nix     |  2 +-
 pkgs/tools/misc/massren/default.nix           |  2 +-
 pkgs/tools/misc/mmake/default.nix             |  2 +-
 pkgs/tools/misc/neofetch/default.nix          |  2 +-
 pkgs/tools/misc/pal/default.nix               |  2 +-
 pkgs/tools/misc/papis/default.nix             |  2 +-
 pkgs/tools/misc/peruse/default.nix            |  2 +-
 pkgs/tools/misc/pipelight/default.nix         |  2 +-
 .../misc/profile-sync-daemon/default.nix      |  2 +-
 pkgs/tools/misc/qt5ct/default.nix             |  2 +-
 pkgs/tools/misc/recutils/default.nix          |  2 +-
 pkgs/tools/misc/s6-portable-utils/default.nix |  2 +-
 pkgs/tools/misc/svtplay-dl/default.nix        |  2 +-
 .../misc/system-config-printer/default.nix    |  3 +-
 pkgs/tools/misc/t/default.nix                 |  2 +-
 pkgs/tools/misc/tmuxinator/default.nix        |  2 +-
 pkgs/tools/misc/tmuxp/default.nix             |  2 +-
 pkgs/tools/misc/toilet/default.nix            |  2 +-
 pkgs/tools/misc/trash-cli/default.nix         |  2 +-
 pkgs/tools/misc/upower-notify/default.nix     |  2 +-
 pkgs/tools/misc/urjtag/default.nix            |  2 +-
 pkgs/tools/misc/watchexec/default.nix         |  2 +-
 pkgs/tools/misc/xfstests/default.nix          |  2 +-
 pkgs/tools/misc/xvfb-run/default.nix          |  2 +-
 pkgs/tools/misc/youtube-dl/default.nix        |  2 +-
 .../misc/yubikey-neo-manager/default.nix      |  2 +-
 pkgs/tools/misc/zsh-autoenv/default.nix       |  2 +-
 pkgs/tools/networking/airfield/default.nix    |  2 +-
 pkgs/tools/networking/argus/default.nix       |  2 +-
 pkgs/tools/networking/assh/default.nix        |  2 +-
 pkgs/tools/networking/cmst/default.nix        |  2 +-
 pkgs/tools/networking/connman/default.nix     |  2 +-
 pkgs/tools/networking/dd-agent/default.nix    |  2 +-
 pkgs/tools/networking/dnsmasq/default.nix     |  2 +-
 pkgs/tools/networking/flannel/default.nix     |  2 +-
 pkgs/tools/networking/i2pd/default.nix        |  2 +-
 pkgs/tools/networking/inadyn/default.nix      |  2 +-
 pkgs/tools/networking/ipv6calc/default.nix    |  3 +-
 pkgs/tools/networking/maxscale/default.nix    |  2 +-
 .../networking/network-manager/default.nix    |  2 +-
 .../networking/network-manager/dmenu.nix      |  2 +-
 .../network-manager/fortisslvpn.nix           |  2 +-
 .../network-manager/openvpn/default.nix       |  2 +-
 pkgs/tools/networking/ngrok-1/default.nix     |  2 +-
 pkgs/tools/networking/openssh/default.nix     |  2 +-
 pkgs/tools/networking/s3gof3r/default.nix     |  2 +-
 .../networking/shadowsocks-libev/default.nix  |  2 +-
 pkgs/tools/networking/skydive/default.nix     |  2 +-
 pkgs/tools/networking/srelay/default.nix      |  2 +-
 pkgs/tools/networking/tcpdump/default.nix     |  2 +-
 .../networking/tcptraceroute/default.nix      |  2 +-
 pkgs/tools/networking/tftp-hpa/default.nix    |  2 +-
 pkgs/tools/networking/tinc/pre.nix            |  2 +-
 pkgs/tools/networking/ua/default.nix          |  2 +-
 pkgs/tools/networking/wicd/default.nix        |  3 +-
 pkgs/tools/networking/zap/default.nix         |  2 +-
 .../nix-prefetch-scripts/default.nix          |  2 +-
 .../package-management/nix-repl/default.nix   |  2 +-
 .../package-management/nix-serve/default.nix  |  2 +-
 .../package-management/nixops/generic.nix     |  2 +-
 .../package-management/nixops/nixops-dns.nix  |  1 -
 .../package-management/nixui/default.nix      |  2 +-
 .../package-management/packagekit/qt.nix      |  4 +-
 pkgs/tools/security/afl/default.nix           |  2 +-
 pkgs/tools/security/afl/qemu.nix              |  2 +-
 pkgs/tools/security/cfssl/default.nix         |  2 +-
 pkgs/tools/security/cipherscan/default.nix    |  2 +-
 pkgs/tools/security/clamav/default.nix        |  2 +-
 pkgs/tools/security/diceware/default.nix      |  1 -
 pkgs/tools/security/enpass/default.nix        |  2 +-
 pkgs/tools/security/gnupg/22.nix              |  2 +-
 pkgs/tools/security/gorilla-bin/default.nix   |  2 +-
 pkgs/tools/security/hash-slinger/default.nix  |  2 +-
 pkgs/tools/security/hologram/default.nix      |  2 +-
 pkgs/tools/security/jd-gui/default.nix        |  2 +-
 pkgs/tools/security/john/default.nix          |  2 +-
 pkgs/tools/security/keybase/gui.nix           |  4 +-
 pkgs/tools/security/pass/default.nix          |  2 +-
 pkgs/tools/security/pinentry/mac.nix          |  2 +-
 pkgs/tools/security/qesteidutil/default.nix   |  2 +-
 pkgs/tools/security/saml2aws/default.nix      |  2 +-
 pkgs/tools/security/sops/default.nix          |  2 +-
 pkgs/tools/security/ssdeep/default.nix        |  2 +-
 pkgs/tools/security/theharvester/default.nix  |  2 +-
 pkgs/tools/security/tor/update.nix            |  1 -
 pkgs/tools/security/vulnix/default.nix        |  2 +-
 pkgs/tools/system/bootchart/default.nix       |  2 +-
 pkgs/tools/system/confd/default.nix           |  2 +-
 pkgs/tools/system/consul-template/default.nix |  2 +-
 pkgs/tools/system/ddrescue/default.nix        |  1 -
 pkgs/tools/system/evemu/default.nix           |  2 +-
 pkgs/tools/system/gohai/default.nix           |  2 +-
 pkgs/tools/system/journalwatch/default.nix    |  2 +-
 pkgs/tools/system/osquery/default.nix         |  2 +-
 pkgs/tools/system/pcstat/default.nix          |  2 +-
 pkgs/tools/system/procodile/default.nix       |  2 +-
 pkgs/tools/text/codesearch/default.nix        |  2 +-
 pkgs/tools/text/groff/default.nix             |  2 +-
 pkgs/tools/text/platinum-searcher/default.nix |  2 +-
 pkgs/tools/text/ripgrep/default.nix           |  2 +-
 pkgs/tools/text/sgml/jade/default.nix         |  2 +-
 pkgs/tools/text/shfmt/default.nix             |  2 +-
 pkgs/tools/text/sift/default.nix              |  2 +-
 pkgs/tools/text/wgetpaste/default.nix         |  2 +-
 pkgs/tools/text/zimreader/default.nix         |  2 +-
 pkgs/tools/typesetting/tectonic/default.nix   |  2 +-
 pkgs/tools/typesetting/tex/nix/default.nix    |  2 -
 pkgs/tools/typesetting/tex/texlive/bin.nix    | 12 ++--
 pkgs/tools/typesetting/xmlto/default.nix      |  2 +-
 pkgs/tools/video/flvtool2/default.nix         |  2 +-
 pkgs/tools/video/vnc2flv/default.nix          |  2 +-
 pkgs/tools/virtualization/awless/default.nix  |  2 +-
 .../virtualization/cloud-init/default.nix     |  2 +-
 .../virtualization/distrobuilder/default.nix  |  2 +-
 .../virtualization/euca2ools/default.nix      |  2 +-
 .../google-compute-engine/default.nix         |  1 -
 pkgs/top-level/all-packages.nix               | 56 ++++++-------------
 pkgs/top-level/beam-packages.nix              |  2 +-
 pkgs/top-level/dotnet-packages.nix            |  1 -
 pkgs/top-level/emacs-packages.nix             |  6 +-
 pkgs/top-level/haskell-packages.nix           |  2 +-
 pkgs/top-level/haxe-packages.nix              |  2 +-
 pkgs/top-level/java-packages.nix              |  2 +-
 pkgs/top-level/lua-packages.nix               |  6 +-
 pkgs/top-level/ocaml-packages.nix             |  6 +-
 pkgs/top-level/perl-packages.nix              |  2 +-
 pkgs/top-level/python-packages.nix            |  2 +-
 pkgs/top-level/release-python.nix             |  4 +-
 pkgs/top-level/unix-tools.nix                 |  3 +-
 1540 files changed, 1554 insertions(+), 1878 deletions(-)

diff --git a/pkgs/applications/altcoins/clightning.nix b/pkgs/applications/altcoins/clightning.nix
index 73cdd3664ea..d7e4ee233a8 100644
--- a/pkgs/applications/altcoins/clightning.nix
+++ b/pkgs/applications/altcoins/clightning.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchpatch, python3, pkgconfig, which, libtool, autoconf, automake,
-  autogen, git, sqlite, gmp, zlib, fetchFromGitHub }:
+{ stdenv, python3, pkgconfig, which, libtool, autoconf, automake,
+  autogen, sqlite, gmp, zlib, fetchFromGitHub }:
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
diff --git a/pkgs/applications/altcoins/default.nix b/pkgs/applications/altcoins/default.nix
index 385e9e53522..9f1763087de 100644
--- a/pkgs/applications/altcoins/default.nix
+++ b/pkgs/applications/altcoins/default.nix
@@ -88,5 +88,5 @@ rec {
   parity = callPackage ./parity { };
   parity-ui = callPackage ./parity-ui { };
 
-  particl-core = callPackage ./particl/particl-core.nix { boost = boost165; miniupnpc = miniupnpc_2; withGui = false; };
+  particl-core = callPackage ./particl/particl-core.nix { boost = boost165; miniupnpc = miniupnpc_2; };
 }
diff --git a/pkgs/applications/altcoins/dero.nix b/pkgs/applications/altcoins/dero.nix
index dff7bc0b0dc..8405ea8f842 100644
--- a/pkgs/applications/altcoins/dero.nix
+++ b/pkgs/applications/altcoins/dero.nix
@@ -1,5 +1,5 @@
 { lib, stdenv, fetchFromGitHub, cmake, pkgconfig, unbound, openssl, boost
-, libunwind, lmdb, miniupnpc, readline }:
+, lmdb, miniupnpc, readline }:
 
 stdenv.mkDerivation rec {
   name = "dero-${version}";
diff --git a/pkgs/applications/altcoins/dogecoin.nix b/pkgs/applications/altcoins/dogecoin.nix
index 33c2e598fca..0452f401334 100644
--- a/pkgs/applications/altcoins/dogecoin.nix
+++ b/pkgs/applications/altcoins/dogecoin.nix
@@ -1,7 +1,7 @@
 { stdenv , fetchFromGitHub
 , pkgconfig, autoreconfHook
 , db5, openssl, boost, zlib, miniupnpc
-, glib, protobuf, utillinux, qt4, qrencode
+, protobuf, utillinux, qt4, qrencode
 , withGui }:
 
 with stdenv.lib;
diff --git a/pkgs/applications/altcoins/ethsign/default.nix b/pkgs/applications/altcoins/ethsign/default.nix
index 0659c4fa258..35fd4bc718c 100644
--- a/pkgs/applications/altcoins/ethsign/default.nix
+++ b/pkgs/applications/altcoins/ethsign/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoPackage, fetchFromGitHub, fetchgit, clang }:
+{ stdenv, buildGoPackage, fetchFromGitHub, fetchgit }:
 
 buildGoPackage rec {
   name = "ethsign-${version}";
diff --git a/pkgs/applications/altcoins/freicoin.nix b/pkgs/applications/altcoins/freicoin.nix
index b753e2d48c9..1e9192bc6e4 100644
--- a/pkgs/applications/altcoins/freicoin.nix
+++ b/pkgs/applications/altcoins/freicoin.nix
@@ -1,4 +1,4 @@
-{ fetchFromGitHub, stdenv, db, boost, gmp, mpfr, miniupnpc, qt4, qmake4Hook, unzip }:
+{ fetchFromGitHub, stdenv, db, boost, gmp, mpfr, qt4, qmake4Hook }:
 
 stdenv.mkDerivation rec {
   version = "0.8.6-2";
diff --git a/pkgs/applications/altcoins/go-ethereum-classic/default.nix b/pkgs/applications/altcoins/go-ethereum-classic/default.nix
index 679312d9a8e..7461e4c376a 100644
--- a/pkgs/applications/altcoins/go-ethereum-classic/default.nix
+++ b/pkgs/applications/altcoins/go-ethereum-classic/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+{ lib, buildGoPackage, fetchgit }:
 
 buildGoPackage rec {
   name = "go-ethereum-classic-${version}";
diff --git a/pkgs/applications/altcoins/go-ethereum.nix b/pkgs/applications/altcoins/go-ethereum.nix
index 79c8e0dfde8..73aa4452c0f 100644
--- a/pkgs/applications/altcoins/go-ethereum.nix
+++ b/pkgs/applications/altcoins/go-ethereum.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub, libobjc, IOKit }:
+{ stdenv, buildGoPackage, fetchFromGitHub, libobjc, IOKit }:
 
 buildGoPackage rec {
   name = "go-ethereum-${version}";
diff --git a/pkgs/applications/altcoins/hevm.nix b/pkgs/applications/altcoins/hevm.nix
index 1aa598f3254..e7f47d0f220 100644
--- a/pkgs/applications/altcoins/hevm.nix
+++ b/pkgs/applications/altcoins/hevm.nix
@@ -5,12 +5,12 @@
 , lens-aeson, memory, monad-par, mtl, optparse-generic, process
 , QuickCheck, quickcheck-text, readline, rosezipper, scientific
 , stdenv, tasty, tasty-hunit, tasty-quickcheck, temporary, text
-, text-format, time, unordered-containers, vector, vty
+, text-format, unordered-containers, vector, vty
 
 , restless-git
 
 , fetchFromGitHub, lib, makeWrapper
-, ncurses, zlib, bzip2, solc, coreutils
+, zlib, bzip2, solc, coreutils
 , bash
 }:
 
diff --git a/pkgs/applications/altcoins/mist.nix b/pkgs/applications/altcoins/mist.nix
index cb8d01467a2..f809b30189f 100644
--- a/pkgs/applications/altcoins/mist.nix
+++ b/pkgs/applications/altcoins/mist.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, makeWrapper, fetchurl, unzip, atomEnv, makeDesktopItem, buildFHSUserEnv }:
+{ stdenv, makeWrapper, fetchurl, unzip, atomEnv, makeDesktopItem, buildFHSUserEnv }:
 
 let
   version = "0.10.0";
diff --git a/pkgs/applications/altcoins/namecoin.nix b/pkgs/applications/altcoins/namecoin.nix
index f7349581169..9af37ff0bca 100644
--- a/pkgs/applications/altcoins/namecoin.nix
+++ b/pkgs/applications/altcoins/namecoin.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, openssl, boost, libevent, autoreconfHook, db4, miniupnpc, eject, pkgconfig, qt4, protobuf, libqrencode
+{ stdenv, fetchFromGitHub, openssl, boost, libevent, autoreconfHook, db4, miniupnpc, eject, pkgconfig, qt4, protobuf, libqrencode
 , withGui }:
 
 with stdenv.lib;
diff --git a/pkgs/applications/altcoins/nano-wallet/default.nix b/pkgs/applications/altcoins/nano-wallet/default.nix
index a14a40e9cc7..76ee914bd3d 100644
--- a/pkgs/applications/altcoins/nano-wallet/default.nix
+++ b/pkgs/applications/altcoins/nano-wallet/default.nix
@@ -1,4 +1,4 @@
-{lib, pkgs, stdenv, fetchFromGitHub, cmake, pkgconfig, boost, libGL, qtbase}:
+{lib, stdenv, fetchFromGitHub, cmake, pkgconfig, boost, libGL, qtbase}:
 
 stdenv.mkDerivation rec {
 
diff --git a/pkgs/applications/altcoins/parity-ui/default.nix b/pkgs/applications/altcoins/parity-ui/default.nix
index b22302d0d39..8566e6037d6 100644
--- a/pkgs/applications/altcoins/parity-ui/default.nix
+++ b/pkgs/applications/altcoins/parity-ui/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, pkgs, fetchurl, lib, makeWrapper, nodePackages }:
+{ stdenv, pkgs, fetchurl, makeWrapper, nodePackages }:
 
 let
 
diff --git a/pkgs/applications/altcoins/parity-ui/env.nix b/pkgs/applications/altcoins/parity-ui/env.nix
index a273bf33d10..2fd235ade53 100644
--- a/pkgs/applications/altcoins/parity-ui/env.nix
+++ b/pkgs/applications/altcoins/parity-ui/env.nix
@@ -1,5 +1,5 @@
 { stdenv, lib, zlib, glib, alsaLib, dbus, gtk2, atk, pango, freetype, fontconfig
-, libgnome-keyring3, gdk_pixbuf, gvfs, cairo, cups, expat, libgpgerror, nspr
+, libgnome-keyring3, gdk_pixbuf, cairo, cups, expat, libgpgerror, nspr
 , nss, xorg, libcap, systemd, libnotify, libsecret, gnome3 }:
 
 let
diff --git a/pkgs/applications/altcoins/particl/particl-core.nix b/pkgs/applications/altcoins/particl/particl-core.nix
index 5be2bec6c72..331e169cf3f 100644
--- a/pkgs/applications/altcoins/particl/particl-core.nix
+++ b/pkgs/applications/altcoins/particl/particl-core.nix
@@ -4,14 +4,11 @@
 , db48
 , fetchurl
 , libevent
-, libtool
 , miniupnpc
 , openssl
 , pkgconfig
-, utillinux
 , zeromq
 , zlib
-, withGui
 , unixtools
 }:
 
diff --git a/pkgs/applications/altcoins/stellar-core.nix b/pkgs/applications/altcoins/stellar-core.nix
index 4a4665291d6..4c3f9fe0760 100644
--- a/pkgs/applications/altcoins/stellar-core.nix
+++ b/pkgs/applications/altcoins/stellar-core.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchgit, autoconf, libtool, automake, pkgconfig, git
+{ stdenv, fetchgit, autoconf, libtool, automake, pkgconfig, git
 , bison, flex, postgresql }:
 
 let
diff --git a/pkgs/applications/audio/abcde/default.nix b/pkgs/applications/audio/abcde/default.nix
index e672e6f3bae..04ee72edc36 100644
--- a/pkgs/applications/audio/abcde/default.nix
+++ b/pkgs/applications/audio/abcde/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, libcdio-paranoia, cddiscid, wget, bash, which, vorbis-tools, id3v2, eyeD3
-, lame, flac, eject, mkcue, glyr
+{ stdenv, fetchurl, libcdio-paranoia, cddiscid, wget, which, vorbis-tools, id3v2, eyeD3
+, lame, flac, glyr
 , perl, DigestSHA, MusicBrainz, MusicBrainzDiscID
 , makeWrapper }:
 
diff --git a/pkgs/applications/audio/airwave/default.nix b/pkgs/applications/audio/airwave/default.nix
index c37963c77f3..737e73421c9 100644
--- a/pkgs/applications/audio/airwave/default.nix
+++ b/pkgs/applications/audio/airwave/default.nix
@@ -1,5 +1,5 @@
 { stdenv, multiStdenv, cmake, fetchFromGitHub, file, libX11, makeWrapper
-, overrideCC, qt5, requireFile, unzip, wine
+, qt5, requireFile, unzip, wine
 }:
 
 let
diff --git a/pkgs/applications/audio/audacity/default.nix b/pkgs/applications/audio/audacity/default.nix
index b0c47972e38..1989fd1400d 100644
--- a/pkgs/applications/audio/audacity/default.nix
+++ b/pkgs/applications/audio/audacity/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, wxGTK30, pkgconfig, file, gettext, gtk2, glib, zlib, perl, intltool,
-  libogg, libvorbis, libmad, libjack2, lv2, lilv, serd, sord, sratom, suil, alsaLib, libsndfile, soxr, flac, lame,
+{ stdenv, fetchurl, wxGTK30, pkgconfig, file, gettext, gtk2,
+  libvorbis, libmad, libjack2, lv2, lilv, serd, sord, sratom, suil, alsaLib, libsndfile, soxr, flac, lame,
   expat, libid3tag, ffmpeg, soundtouch, /*, portaudio - given up fighting their portaudio.patch */
   autoconf, automake, libtool
   }:
diff --git a/pkgs/applications/audio/banshee/default.nix b/pkgs/applications/audio/banshee/default.nix
index a3ac2b097e9..2479360b88e 100644
--- a/pkgs/applications/audio/banshee/default.nix
+++ b/pkgs/applications/audio/banshee/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, stdenv, lib, fetchurl, intltool, pkgconfig, gstreamer, gst-plugins-base
+{ stdenv, lib, fetchurl, intltool, pkgconfig, gstreamer, gst-plugins-base
 , gst-plugins-good, gst-plugins-bad, gst-plugins-ugly, gst-ffmpeg, glib
 , mono, mono-addins, dbus-sharp-1_0, dbus-sharp-glib-1_0, notify-sharp, gtk-sharp-2_0
 , boo, gdata-sharp, taglib-sharp, sqlite, gnome-sharp, gconf, gtk-sharp-beans, gio-sharp
diff --git a/pkgs/applications/audio/clementine/default.nix b/pkgs/applications/audio/clementine/default.nix
index b8044972576..611828753e4 100644
--- a/pkgs/applications/audio/clementine/default.nix
+++ b/pkgs/applications/audio/clementine/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, fetchpatch, boost, cmake, chromaprint, gettext, gst_all_1, liblastfm
 , qt4, taglib, fftw, glew, qjson, sqlite, libgpod, libplist, usbmuxd, libmtp
 , libpulseaudio, gvfs, libcdio, libechonest, libspotify, pcre, projectm, protobuf
-, qca2, pkgconfig, sparsehash, config, makeWrapper, runCommand, gst_plugins }:
+, qca2, pkgconfig, sparsehash, config, makeWrapper, gst_plugins }:
 
 let
   withIpod = config.clementine.ipod or false;
diff --git a/pkgs/applications/audio/deadbeef/default.nix b/pkgs/applications/audio/deadbeef/default.nix
index 4dced0cfafa..e2fcc3c4626 100644
--- a/pkgs/applications/audio/deadbeef/default.nix
+++ b/pkgs/applications/audio/deadbeef/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, intltool, pkgconfig, fetchpatch, jansson
+{ stdenv, fetchurl, intltool, pkgconfig, jansson
 # deadbeef can use either gtk2 or gtk3
 , gtk2Support ? false, gtk2 ? null
 , gtk3Support ? true, gtk3 ? null, gsettings-desktop-schemas ? null, wrapGAppsHook ? null
diff --git a/pkgs/applications/audio/deadbeef/wrapper.nix b/pkgs/applications/audio/deadbeef/wrapper.nix
index 5b14302204e..cd45ef5926b 100644
--- a/pkgs/applications/audio/deadbeef/wrapper.nix
+++ b/pkgs/applications/audio/deadbeef/wrapper.nix
@@ -1,4 +1,4 @@
-{ stdenv, symlinkJoin, deadbeef, makeWrapper, plugins }:
+{ symlinkJoin, deadbeef, makeWrapper, plugins }:
 
 symlinkJoin {
   name = "deadbeef-with-plugins-${deadbeef.version}";
diff --git a/pkgs/applications/audio/distrho/default.nix b/pkgs/applications/audio/distrho/default.nix
index 5c9211e7f3b..3aa8aa371e6 100644
--- a/pkgs/applications/audio/distrho/default.nix
+++ b/pkgs/applications/audio/distrho/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, alsaLib, fftwSinglePrec, freetype, libjack2
-, libxslt, lv2, pkgconfig, premake3, xorg, ladspa-sdk }:
+, pkgconfig, premake3, xorg, ladspa-sdk }:
 
 stdenv.mkDerivation rec {
   name = "distrho-ports-unstable-2018-01-01";
diff --git a/pkgs/applications/audio/faust/faust2.nix b/pkgs/applications/audio/faust/faust2.nix
index 961ef713569..cfb37e5761a 100644
--- a/pkgs/applications/audio/faust/faust2.nix
+++ b/pkgs/applications/audio/faust/faust2.nix
@@ -3,7 +3,6 @@
 , fetchFromGitHub
 , makeWrapper
 , pkgconfig
-, clang
 , llvm
 , emscripten
 , openssl
diff --git a/pkgs/applications/audio/fmit/default.nix b/pkgs/applications/audio/fmit/default.nix
index f1bdcd8c524..a61f7dc0a90 100644
--- a/pkgs/applications/audio/fmit/default.nix
+++ b/pkgs/applications/audio/fmit/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fftw, freeglut, libGLU, qtbase, qtmultimedia, qmake
+{ stdenv, fetchFromGitHub, fftw, qtbase, qtmultimedia, qmake
 , alsaSupport ? true, alsaLib ? null
 , jackSupport ? false, libjack2 ? null
 , portaudioSupport ? false, portaudio ? null }:
diff --git a/pkgs/applications/audio/gradio/default.nix b/pkgs/applications/audio/gradio/default.nix
index d111502651e..ed34c3118c6 100644
--- a/pkgs/applications/audio/gradio/default.nix
+++ b/pkgs/applications/audio/gradio/default.nix
@@ -1,5 +1,4 @@
 { stdenv, fetchFromGitHub, pkgconfig
-, gcc
 , python3
 , gsettings-desktop-schemas
 , desktop-file-utils
diff --git a/pkgs/applications/audio/gtkpod/default.nix b/pkgs/applications/audio/gtkpod/default.nix
index e0e620bd05f..6546fd7866e 100644
--- a/pkgs/applications/audio/gtkpod/default.nix
+++ b/pkgs/applications/audio/gtkpod/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, pkgconfig, wrapGAppsHook, intltool, libgpod, curl, flac,
-  gnome3, gtk3, glib, gettext, perl, perlXMLParser, flex, libid3tag,
-  libvorbis, hicolor-icon-theme, gdk_pixbuf }:
+  gnome3, gtk3, gettext, perl, perlXMLParser, flex, libid3tag,
+  libvorbis, gdk_pixbuf }:
 
 stdenv.mkDerivation rec {
   version = "2.1.5";
diff --git a/pkgs/applications/audio/jaaa/default.nix b/pkgs/applications/audio/jaaa/default.nix
index cacbf428caa..2410106cff0 100644
--- a/pkgs/applications/audio/jaaa/default.nix
+++ b/pkgs/applications/audio/jaaa/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, alsaLib, libclthreads, libclxclient, libX11, libXft, libXrender, fftwFloat, freetype, fontconfig, libjack2, xorg, zita-alsa-pcmi }:
+{ stdenv, fetchurl, alsaLib, libclthreads, libclxclient, libX11, libXft, libXrender, fftwFloat, libjack2, zita-alsa-pcmi }:
 
 stdenv.mkDerivation rec {
   name = "jaaa-${version}";
diff --git a/pkgs/applications/audio/lastfmsubmitd/default.nix b/pkgs/applications/audio/lastfmsubmitd/default.nix
index 2cb90081c68..e22bca29bc9 100644
--- a/pkgs/applications/audio/lastfmsubmitd/default.nix
+++ b/pkgs/applications/audio/lastfmsubmitd/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pythonPackages }:
+{ fetchurl, pythonPackages }:
 
 pythonPackages.buildPythonApplication rec {
   pname = "lastfmsubmitd";
diff --git a/pkgs/applications/audio/magnetophonDSP/VoiceOfFaust/default.nix b/pkgs/applications/audio/magnetophonDSP/VoiceOfFaust/default.nix
index d7cc88905c5..740763889ff 100644
--- a/pkgs/applications/audio/magnetophonDSP/VoiceOfFaust/default.nix
+++ b/pkgs/applications/audio/magnetophonDSP/VoiceOfFaust/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, pkgs, callPackage, fetchFromGitHub, faust2jack, faust2lv2, helmholtz, mrpeach, puredata-with-plugins }:
+{ stdenv, fetchFromGitHub, faust2jack, faust2lv2, helmholtz, mrpeach, puredata-with-plugins }:
 stdenv.mkDerivation rec {
   name = "VoiceOfFaust-${version}";
   version = "1.1.4";
diff --git a/pkgs/applications/audio/mikmod/default.nix b/pkgs/applications/audio/mikmod/default.nix
index f077afec8b2..343ec8679fe 100644
--- a/pkgs/applications/audio/mikmod/default.nix
+++ b/pkgs/applications/audio/mikmod/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libmikmod, ncurses, alsaLib }:
+{ stdenv, fetchurl, libmikmod, ncurses }:
 
 stdenv.mkDerivation rec {
   name = "mikmod-3.2.8";
diff --git a/pkgs/applications/audio/mopidy/mopify.nix b/pkgs/applications/audio/mopidy/mopify.nix
index d55e711cf33..b657f69e26e 100644
--- a/pkgs/applications/audio/mopidy/mopify.nix
+++ b/pkgs/applications/audio/mopidy/mopify.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pythonPackages, mopidy }:
+{ stdenv, pythonPackages, mopidy }:
 
 pythonPackages.buildPythonApplication rec {
   pname = "Mopidy-Mopify";
diff --git a/pkgs/applications/audio/pianobar/default.nix b/pkgs/applications/audio/pianobar/default.nix
index 8e591487111..e21815574d1 100644
--- a/pkgs/applications/audio/pianobar/default.nix
+++ b/pkgs/applications/audio/pianobar/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, pkgconfig, libao, readline, json_c, libgcrypt, libav, curl }:
+{ fetchurl, stdenv, pkgconfig, libao, json_c, libgcrypt, libav, curl }:
 
 stdenv.mkDerivation rec {
   name = "pianobar-2016.06.02";
diff --git a/pkgs/applications/audio/picard/default.nix b/pkgs/applications/audio/picard/default.nix
index 26f35f25865..d7e6173da9a 100644
--- a/pkgs/applications/audio/picard/default.nix
+++ b/pkgs/applications/audio/picard/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, python2Packages, fetchurl, gettext, chromaprint }:
+{ stdenv, python2Packages, fetchurl, gettext }:
 
 let
   pythonPackages = python2Packages;
diff --git a/pkgs/applications/audio/puddletag/default.nix b/pkgs/applications/audio/puddletag/default.nix
index e96b6f1909a..915d7fcbd98 100644
--- a/pkgs/applications/audio/puddletag/default.nix
+++ b/pkgs/applications/audio/puddletag/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, python2Packages, makeWrapper, chromaprint }:
+{ stdenv, fetchFromGitHub, python2Packages, chromaprint }:
 
 python2Packages.buildPythonApplication rec {
   pname = "puddletag";
diff --git a/pkgs/applications/audio/puredata/wrapper.nix b/pkgs/applications/audio/puredata/wrapper.nix
index 9c0a48db51c..80968e2700b 100644
--- a/pkgs/applications/audio/puredata/wrapper.nix
+++ b/pkgs/applications/audio/puredata/wrapper.nix
@@ -1,4 +1,4 @@
-{ stdenv, symlinkJoin, puredata, makeWrapper, plugins }:
+{ symlinkJoin, puredata, makeWrapper, plugins }:
 
 let
 puredataFlags = map (x: "-path ${x}/") plugins;
diff --git a/pkgs/applications/audio/rkrlv2/default.nix b/pkgs/applications/audio/rkrlv2/default.nix
index 28a69d5a3b7..0ff23102e75 100644
--- a/pkgs/applications/audio/rkrlv2/default.nix
+++ b/pkgs/applications/audio/rkrlv2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, pkgs, fetchFromGitHub,
+{ stdenv, fetchFromGitHub,
 automake, pkgconfig, lv2, fftw, cmake, xorg, libjack2, libsamplerate, libsndfile
 }:
 
diff --git a/pkgs/applications/audio/sonata/default.nix b/pkgs/applications/audio/sonata/default.nix
index a3d418cd4fe..c5754a199ba 100644
--- a/pkgs/applications/audio/sonata/default.nix
+++ b/pkgs/applications/audio/sonata/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, pkgconfig, intltool, wrapGAppsHook
+{ stdenv, fetchFromGitHub, pkgconfig, intltool, wrapGAppsHook
 , python3Packages, gnome3, gtk3, gobjectIntrospection}:
 
 let
diff --git a/pkgs/applications/audio/ympd/default.nix b/pkgs/applications/audio/ympd/default.nix
index 2e335e6b10e..134e5bfb42a 100644
--- a/pkgs/applications/audio/ympd/default.nix
+++ b/pkgs/applications/audio/ympd/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, llvmPackages, pkgconfig, mpd_clientlib, openssl }:
+{ stdenv, fetchFromGitHub, cmake, pkgconfig, mpd_clientlib, openssl }:
 
 stdenv.mkDerivation rec {
   name = "ympd-${version}";
diff --git a/pkgs/applications/backup/crashplan/default.nix b/pkgs/applications/backup/crashplan/default.nix
index e840c6eeda0..2c76891b3f9 100644
--- a/pkgs/applications/backup/crashplan/default.nix
+++ b/pkgs/applications/backup/crashplan/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, makeWrapper, jre, cpio, gawk, gnugrep, gnused, procps, swt, gtk2, glib, libXtst }:
+{ stdenv, fetchurl, makeWrapper, jre, cpio, gawk, gnugrep, gnused, procps, gtk2, glib, libXtst }:
 
 stdenv.mkDerivation rec {
   version = "4.8.3";
diff --git a/pkgs/applications/display-managers/lightdm/default.nix b/pkgs/applications/display-managers/lightdm/default.nix
index 6ba053499f9..8d3d9c9bfcf 100644
--- a/pkgs/applications/display-managers/lightdm/default.nix
+++ b/pkgs/applications/display-managers/lightdm/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pam, pkgconfig, libxcb, glib, libXdmcp, itstool, libxml2
-, intltool, xlibsWrapper, libxklavier, libgcrypt, audit, coreutils
+, intltool, libxklavier, libgcrypt, audit, coreutils
 , qt4 ? null
 , withQt5 ? false, qtbase
 }:
diff --git a/pkgs/applications/display-managers/sddm/default.nix b/pkgs/applications/display-managers/sddm/default.nix
index 27b23bb571f..5e583049190 100644
--- a/pkgs/applications/display-managers/sddm/default.nix
+++ b/pkgs/applications/display-managers/sddm/default.nix
@@ -1,5 +1,5 @@
-{ mkDerivation, lib, fetchFromGitHub, fetchpatch
-, cmake, extra-cmake-modules, pkgconfig, libxcb, libpthreadstubs, lndir
+{ mkDerivation, lib, fetchFromGitHub
+, cmake, extra-cmake-modules, pkgconfig, libxcb, libpthreadstubs
 , libXdmcp, libXau, qtbase, qtdeclarative, qttools, pam, systemd
 }:
 
diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix
index b7a23b589db..bd0c412efa5 100644
--- a/pkgs/applications/editors/android-studio/default.nix
+++ b/pkgs/applications/editors/android-studio/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, callPackage, fetchurl, makeFontsConf, gnome2 }:
+{ stdenv, callPackage, makeFontsConf, gnome2 }:
 
 let
   mkStudio = opts: callPackage (import ./common.nix opts) {
diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix
index 8139640457e..4078efa6783 100644
--- a/pkgs/applications/editors/atom/default.nix
+++ b/pkgs/applications/editors/atom/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, pkgs, fetchurl, lib, makeWrapper, gvfs, atomEnv}:
+{ stdenv, pkgs, fetchurl, makeWrapper, gvfs, atomEnv}:
 
 let
   common = pname: {version, sha256}: stdenv.mkDerivation rec {
diff --git a/pkgs/applications/editors/atom/env.nix b/pkgs/applications/editors/atom/env.nix
index f93d4042a62..da78c39324a 100644
--- a/pkgs/applications/editors/atom/env.nix
+++ b/pkgs/applications/editors/atom/env.nix
@@ -1,5 +1,5 @@
 { stdenv, lib, zlib, glib, alsaLib, dbus, gtk3, atk, pango, freetype, fontconfig
-, libgnome-keyring3, gdk_pixbuf, gvfs, cairo, cups, expat, libgpgerror, nspr
+, libgnome-keyring3, gdk_pixbuf, cairo, cups, expat, libgpgerror, nspr
 , gconf, nss, xorg, libcap, systemd, libnotify, libsecret
 }:
 
diff --git a/pkgs/applications/editors/brackets/default.nix b/pkgs/applications/editors/brackets/default.nix
index 23cb16c0733..1065564f7b4 100644
--- a/pkgs/applications/editors/brackets/default.nix
+++ b/pkgs/applications/editors/brackets/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, buildEnv, gtk2, glib, gdk_pixbuf, alsaLib, nss, nspr, gconf
-, cups, libgcrypt_1_5, systemd, makeWrapper, dbus }:
+{ stdenv, fetchurl, gtk2, glib, gdk_pixbuf, alsaLib, nss, nspr, gconf
+, cups, libgcrypt_1_5, systemd, dbus }:
 with stdenv.lib;
 
 let
diff --git a/pkgs/applications/editors/dit/default.nix b/pkgs/applications/editors/dit/default.nix
index 03c3c5d5eec..33d80a577db 100644
--- a/pkgs/applications/editors/dit/default.nix
+++ b/pkgs/applications/editors/dit/default.nix
@@ -1,4 +1,4 @@
-{ lib, fetchurl, stdenv, coreutils, ncurses, lua }:
+{ fetchurl, stdenv, coreutils, ncurses, lua }:
 
 stdenv.mkDerivation rec {
   name = "dit-${version}";
diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix
index a2d246809c9..c719c7b2da1 100644
--- a/pkgs/applications/editors/eclipse/default.nix
+++ b/pkgs/applications/editors/eclipse/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, lib, fetchurl, makeDesktopItem, makeWrapper
-, freetype, fontconfig, libX11, libXext, libXrender, zlib
+{ stdenv, fetchurl, makeDesktopItem, makeWrapper
+, freetype, fontconfig, libX11, libXrender, zlib
 , glib, gtk3, libXtst, jdk, gsettings-desktop-schemas
 , webkitgtk ? null  # for internal web browser
-, buildEnv, writeText, runCommand
+, buildEnv, runCommand
 , callPackage
 }:
 
diff --git a/pkgs/applications/editors/emacs-modes/emacs-clang-complete-async/default.nix b/pkgs/applications/editors/emacs-modes/emacs-clang-complete-async/default.nix
index 9585f327821..66ac9a3d77e 100644
--- a/pkgs/applications/editors/emacs-modes/emacs-clang-complete-async/default.nix
+++ b/pkgs/applications/editors/emacs-modes/emacs-clang-complete-async/default.nix
@@ -1,4 +1,4 @@
-{ clangStdenv, fetchgit, llvmPackages, clang }:
+{ clangStdenv, fetchgit, llvmPackages }:
 
 clangStdenv.mkDerivation {
   name = "emacs-clang-complete-async-20130218";
diff --git a/pkgs/applications/editors/emacs-modes/filesets-plus/default.nix b/pkgs/applications/editors/emacs-modes/filesets-plus/default.nix
index f09a71ec9df..ad22faf3dff 100644
--- a/pkgs/applications/editors/emacs-modes/filesets-plus/default.nix
+++ b/pkgs/applications/editors/emacs-modes/filesets-plus/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, lib, stdenv, melpaBuild }:
+{ fetchurl, melpaBuild }:
 
 melpaBuild {
   pname = "filesets-plus";
diff --git a/pkgs/applications/editors/emacs-modes/font-lock-plus/default.nix b/pkgs/applications/editors/emacs-modes/font-lock-plus/default.nix
index 5362451e06b..b4ee54f3bd3 100644
--- a/pkgs/applications/editors/emacs-modes/font-lock-plus/default.nix
+++ b/pkgs/applications/editors/emacs-modes/font-lock-plus/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, lib, stdenv, melpaBuild }:
+{ fetchurl, lib, melpaBuild }:
 
 melpaBuild {
   pname = "font-lock-plus";
diff --git a/pkgs/applications/editors/emacs-modes/header2/default.nix b/pkgs/applications/editors/emacs-modes/header2/default.nix
index 7da40425185..171d8c6b16a 100644
--- a/pkgs/applications/editors/emacs-modes/header2/default.nix
+++ b/pkgs/applications/editors/emacs-modes/header2/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, lib, stdenv, melpaBuild }:
+{ fetchurl, lib, melpaBuild }:
 
 melpaBuild {
   pname = "header2";
diff --git a/pkgs/applications/editors/emacs-modes/hexrgb/default.nix b/pkgs/applications/editors/emacs-modes/hexrgb/default.nix
index 3144eea702d..8b9ebcd6026 100644
--- a/pkgs/applications/editors/emacs-modes/hexrgb/default.nix
+++ b/pkgs/applications/editors/emacs-modes/hexrgb/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, lib, stdenv, melpaBuild }:
+{ fetchurl, lib, melpaBuild }:
 
 melpaBuild {
   pname = "hexrgb";
diff --git a/pkgs/applications/editors/emacs-modes/lib-requires/default.nix b/pkgs/applications/editors/emacs-modes/lib-requires/default.nix
index 8e5d5ee1929..84dae10127e 100644
--- a/pkgs/applications/editors/emacs-modes/lib-requires/default.nix
+++ b/pkgs/applications/editors/emacs-modes/lib-requires/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, lib, stdenv, melpaBuild }:
+{ fetchurl, lib, melpaBuild }:
 
 melpaBuild {
   pname = "lib-requires";
diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix
index bf0d5036897..c0febd803cc 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix
@@ -13,7 +13,7 @@ To update the list of packages from MELPA,
 
 */
 
-{ lib, external }:
+{ external }:
 
 self:
 
diff --git a/pkgs/applications/editors/emacs-modes/ocaml/default.nix b/pkgs/applications/editors/emacs-modes/ocaml/default.nix
index 7ed6355f981..9f8d408dd5a 100644
--- a/pkgs/applications/editors/emacs-modes/ocaml/default.nix
+++ b/pkgs/applications/editors/emacs-modes/ocaml/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, emacs, ocaml }:
+{ stdenv, emacs, ocaml }:
 
 # this package installs the emacs-mode which
 # resides in the ocaml compiler sources.
diff --git a/pkgs/applications/editors/emacs-modes/org-packages.nix b/pkgs/applications/editors/emacs-modes/org-packages.nix
index 8df45ffb61e..46b90a52a09 100644
--- a/pkgs/applications/editors/emacs-modes/org-packages.nix
+++ b/pkgs/applications/editors/emacs-modes/org-packages.nix
@@ -11,7 +11,7 @@ To update the list of packages from ELPA,
 
 */
 
-{ fetchurl, lib, stdenv, texinfo }:
+{ }:
 
 self:
 
diff --git a/pkgs/applications/editors/emacs-modes/org/default.nix b/pkgs/applications/editors/emacs-modes/org/default.nix
index 1189fd1d6d1..99ecddcb264 100644
--- a/pkgs/applications/editors/emacs-modes/org/default.nix
+++ b/pkgs/applications/editors/emacs-modes/org/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, emacs, texinfo, which, texlive }:
+{ fetchurl, stdenv, emacs, texinfo, texlive }:
 
 stdenv.mkDerivation rec {
   name = "org-8.3.3";
diff --git a/pkgs/applications/editors/emacs-modes/thingatpt-plus/default.nix b/pkgs/applications/editors/emacs-modes/thingatpt-plus/default.nix
index d68feaec293..820919b5321 100644
--- a/pkgs/applications/editors/emacs-modes/thingatpt-plus/default.nix
+++ b/pkgs/applications/editors/emacs-modes/thingatpt-plus/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, lib, stdenv, melpaBuild }:
+{ fetchurl, lib, melpaBuild }:
 
 melpaBuild {
   pname = "thingatpt-plus";
diff --git a/pkgs/applications/editors/emacs/25.nix b/pkgs/applications/editors/emacs/25.nix
index b659e060e3b..ee21bbbd9bd 100644
--- a/pkgs/applications/editors/emacs/25.nix
+++ b/pkgs/applications/editors/emacs/25.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, fetchurl, ncurses, xlibsWrapper, libXaw, libXpm, Xaw3d
 , pkgconfig, gettext, libXft, dbus, libpng, libjpeg, libungif
 , libtiff, librsvg, gconf, libxml2, imagemagick, gnutls, libselinux
-, alsaLib, cairo, acl, gpm, AppKit, CoreWLAN, Kerberos, GSS, ImageIO
+, alsaLib, cairo, acl, gpm, AppKit, GSS, ImageIO
 , withX ? !stdenv.isDarwin
 , withGTK2 ? false, gtk2 ? null
 , withGTK3 ? true, gtk3 ? null, gsettings-desktop-schemas ? null
diff --git a/pkgs/applications/editors/emacs/default.nix b/pkgs/applications/editors/emacs/default.nix
index 67afdb24cd4..01eaac7be5d 100644
--- a/pkgs/applications/editors/emacs/default.nix
+++ b/pkgs/applications/editors/emacs/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, fetchurl, ncurses, xlibsWrapper, libXaw, libXpm, Xaw3d
 , pkgconfig, gettext, libXft, dbus, libpng, libjpeg, libungif
 , libtiff, librsvg, gconf, libxml2, imagemagick, gnutls, libselinux
-, alsaLib, cairo, acl, gpm, AppKit, CoreWLAN, Kerberos, GSS, ImageIO
+, alsaLib, cairo, acl, gpm, AppKit, GSS, ImageIO
 , withX ? !stdenv.isDarwin
 , withGTK2 ? false, gtk2 ? null
 , withGTK3 ? true, gtk3 ? null, gsettings-desktop-schemas ? null
diff --git a/pkgs/applications/editors/jetbrains/common.nix b/pkgs/applications/editors/jetbrains/common.nix
index 7715de15398..f357972c449 100644
--- a/pkgs/applications/editors/jetbrains/common.nix
+++ b/pkgs/applications/editors/jetbrains/common.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, makeDesktopItem, makeWrapper, patchelf, p7zip
-, coreutils, gnugrep, which, git, python, unzip, libsecret
+{ stdenv, makeDesktopItem, makeWrapper, patchelf, p7zip
+, coreutils, gnugrep, which, git, unzip, libsecret
 }:
 
 { name, product, version, src, wmClass, jdk, meta } @ attrs:
diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index 060d1de5e04..2d7ea931dd2 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -1,6 +1,6 @@
-{ lib, stdenv, callPackage, fetchurl, makeDesktopItem, makeWrapper, patchelf
-, coreutils, gnugrep, which, git, python, unzip, p7zip
-, androidsdk, jdk, cmake, libxml2, zlib, python3, ncurses
+{ lib, stdenv, callPackage, fetchurl
+, python
+, jdk, cmake, libxml2, zlib, python3, ncurses
 }:
 
 with stdenv.lib;
@@ -10,7 +10,7 @@ let
 
   # Sorted alphabetically
 
-  buildClion = { name, version, src, license, description, wmClass, update-channel }:
+  buildClion = { name, version, src, license, description, wmClass, ... }:
     lib.overrideDerivation (mkJetBrainsProduct rec {
       inherit name version src wmClass jdk;
       product = "CLion";
@@ -66,7 +66,7 @@ let
       '';
     });
 
-  buildDataGrip = { name, version, src, license, description, wmClass, update-channel }:
+  buildDataGrip = { name, version, src, license, description, wmClass, ... }:
     (mkJetBrainsProduct {
       inherit name version src wmClass jdk;
       product = "DataGrip";
@@ -83,7 +83,7 @@ let
       };
     });
 
-  buildGoland = { name, version, src, license, description, wmClass, update-channel }:
+  buildGoland = { name, version, src, license, description, wmClass, ... }:
     lib.overrideDerivation (mkJetBrainsProduct {
       inherit name version src wmClass jdk;
       product = "Goland";
@@ -108,7 +108,7 @@ let
       '';
     });
 
-  buildIdea = { name, version, src, license, description, wmClass, update-channel }:
+  buildIdea = { name, version, src, license, description, wmClass, ... }:
     (mkJetBrainsProduct rec {
       inherit name version src wmClass jdk;
       product = "IDEA";
@@ -125,7 +125,7 @@ let
       };
     });
 
-  buildPhpStorm = { name, version, src, license, description, wmClass, update-channel }:
+  buildPhpStorm = { name, version, src, license, description, wmClass, ... }:
     (mkJetBrainsProduct {
       inherit name version src wmClass jdk;
       product = "PhpStorm";
@@ -142,7 +142,7 @@ let
       };
     });
 
-  buildPycharm = { name, version, src, license, description, wmClass, update-channel }:
+  buildPycharm = { name, version, src, license, description, wmClass, ... }:
     (mkJetBrainsProduct rec {
       inherit name version src wmClass jdk;
       product = "PyCharm";
@@ -169,7 +169,7 @@ let
       propagatedUserEnvPkgs = [ python ];
     };
 
-  buildRider = { name, version, src, license, description, wmClass, update-channel }:
+  buildRider = { name, version, src, license, description, wmClass, ... }:
     lib.overrideDerivation (mkJetBrainsProduct rec {
       inherit name version src wmClass jdk;
       product = "Rider";
@@ -195,7 +195,7 @@ let
       '';
     });
 
-  buildRubyMine = { name, version, src, license, description, wmClass, update-channel }:
+  buildRubyMine = { name, version, src, license, description, wmClass, ... }:
     (mkJetBrainsProduct rec {
       inherit name version src wmClass jdk;
       product = "RubyMine";
@@ -208,7 +208,7 @@ let
       };
     });
 
-  buildWebStorm = { name, version, src, license, description, wmClass, update-channel }:
+  buildWebStorm = { name, version, src, license, description, wmClass, ... }:
     lib.overrideDerivation (mkJetBrainsProduct {
       inherit name version src wmClass jdk;
       product = "WebStorm";
diff --git a/pkgs/applications/editors/jucipp/default.nix b/pkgs/applications/editors/jucipp/default.nix
index 6f5f416f4f5..08918beb8d5 100644
--- a/pkgs/applications/editors/jucipp/default.nix
+++ b/pkgs/applications/editors/jucipp/default.nix
@@ -1,4 +1,4 @@
-{ config, stdenv, fetchgit, makeWrapper, gnome3, at-spi2-core, libcxx,
+{ stdenv, fetchgit, gnome3, at-spi2-core,
   boost, epoxy, cmake, aspell, llvmPackages, libgit2, pkgconfig, pcre,
   libXdmcp, libxkbcommon, libpthreadstubs, wrapGAppsHook, aspellDicts,
   coreutils, glibc, dbus, openssl, libxml2, gnumake, ctags }:
diff --git a/pkgs/applications/editors/kakoune/default.nix b/pkgs/applications/editors/kakoune/default.nix
index 8ef1e549906..83598bd7eb1 100644
--- a/pkgs/applications/editors/kakoune/default.nix
+++ b/pkgs/applications/editors/kakoune/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, ncurses, boost, asciidoc, docbook_xsl, libxslt, pkgconfig }:
+{ stdenv, fetchFromGitHub, ncurses, asciidoc, docbook_xsl, libxslt, pkgconfig }:
 
 with stdenv.lib;
 
diff --git a/pkgs/applications/editors/kodestudio/default.nix b/pkgs/applications/editors/kodestudio/default.nix
index b03abc2146a..4e22e032e35 100644
--- a/pkgs/applications/editors/kodestudio/default.nix
+++ b/pkgs/applications/editors/kodestudio/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, callPackage, fetchurl, makeDesktopItem, makeWrapper
+{ stdenv, lib, fetchurl, makeDesktopItem, makeWrapper
 , # Patchelf dependencies:
   alsaLib, atomEnv, boehmgc, flac, libogg, libvorbis, libXScrnSaver, libGLU_combined
 , openssl, xorg, zlib
diff --git a/pkgs/applications/editors/monodevelop/default.nix b/pkgs/applications/editors/monodevelop/default.nix
index 66112b3498d..69e102f2077 100644
--- a/pkgs/applications/editors/monodevelop/default.nix
+++ b/pkgs/applications/editors/monodevelop/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchgit, fetchNuGet
+{ stdenv, fetchurl
 , autoconf, automake, pkgconfig, shared-mime-info, intltool
 , glib, mono, gtk-sharp-2_0, gnome2, gnome-sharp, unzip
 , dotnetPackages
diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/applications/editors/nano/default.nix
index fb0ce43a60e..96a9cea09c7 100644
--- a/pkgs/applications/editors/nano/default.nix
+++ b/pkgs/applications/editors/nano/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, hostPlatform, fetchurl, fetchFromGitHub
+{ stdenv, fetchurl, fetchFromGitHub
 , ncurses
 , texinfo
 , gettext ? null
diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix
index f47688b8280..af454d357e9 100644
--- a/pkgs/applications/editors/neovim/default.nix
+++ b/pkgs/applications/editors/neovim/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, cmake, gettext, libmsgpack, libtermkey, libiconv
-, libtool, libuv, luaPackages, ncurses, perl, pkgconfig
-, unibilium, vimUtils, xsel, gperf, callPackage
+, libuv, luaPackages, ncurses, pkgconfig
+, unibilium, xsel, gperf
 , libvterm-neovim
 , withJemalloc ? true, jemalloc
 }:
diff --git a/pkgs/applications/editors/neovim/wrapper.nix b/pkgs/applications/editors/neovim/wrapper.nix
index f1ec03cb42e..fa060325559 100644
--- a/pkgs/applications/editors/neovim/wrapper.nix
+++ b/pkgs/applications/editors/neovim/wrapper.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, makeDesktopItem, makeWrapper
+{ stdenv, lib, makeWrapper
 , vimUtils
 , bundlerEnv, ruby
 , pythonPackages
@@ -10,8 +10,7 @@ neovim:
 
 let
   wrapper = {
-    name ? "neovim"
-    , withPython ? true,  extraPythonPackages ? []
+      withPython ? true,  extraPythonPackages ? []
     , withPython3 ? true,  extraPython3Packages ? []
     , withRuby ? true
     , withPyGUI ? false
diff --git a/pkgs/applications/editors/nvpy/default.nix b/pkgs/applications/editors/nvpy/default.nix
index e806e63cdbf..567f4752035 100644
--- a/pkgs/applications/editors/nvpy/default.nix
+++ b/pkgs/applications/editors/nvpy/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, fetchurl, tk, python2Packages }:
+{ pkgs, fetchurl, python2Packages }:
 
 let
   pythonPackages = python2Packages;
diff --git a/pkgs/applications/editors/texmacs/darwin.nix b/pkgs/applications/editors/texmacs/darwin.nix
index e319ccf39b1..dfb2e49e0c8 100644
--- a/pkgs/applications/editors/texmacs/darwin.nix
+++ b/pkgs/applications/editors/texmacs/darwin.nix
@@ -1,4 +1,4 @@
-{ stdenv, callPackage, fetchurl, makeWrapper,
+{ stdenv, callPackage, fetchurl,
   guile_1_8, qt4, zlib, freetype, CoreFoundation, Cocoa, gettext, libiconv, ghostscript,
   tex ? null,
   aspell ? null,
diff --git a/pkgs/applications/editors/tiled/default.nix b/pkgs/applications/editors/tiled/default.nix
index b23db38e0f4..5f9fa850fe6 100644
--- a/pkgs/applications/editors/tiled/default.nix
+++ b/pkgs/applications/editors/tiled/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, pkgconfig, qmake
-, python, qtbase, qttools, zlib }:
+, python, qtbase, qttools }:
 
 stdenv.mkDerivation rec {
   name = "tiled-${version}";
diff --git a/pkgs/applications/editors/typora/default.nix b/pkgs/applications/editors/typora/default.nix
index 082bc2a2536..7777ef1f17c 100644
--- a/pkgs/applications/editors/typora/default.nix
+++ b/pkgs/applications/editors/typora/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, dpkg, lib, glib, dbus, makeWrapper, gnome3, gtk3, atk, cairo, pango
+{ stdenv, fetchurl, dpkg, glib, dbus, makeWrapper, gnome3, gtk3, atk, cairo, pango
 , gdk_pixbuf, freetype, fontconfig, nspr, nss, xorg, alsaLib, cups, expat, udev, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/applications/editors/vim/macvim.nix b/pkgs/applications/editors/vim/macvim.nix
index b6c03a57b56..c97b17bd9af 100644
--- a/pkgs/applications/editors/vim/macvim.nix
+++ b/pkgs/applications/editors/vim/macvim.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, ncurses, gettext
-, pkgconfig, cscope, python, ruby, tcl, perl, luajit
+, pkgconfig, python, ruby, tcl, perl, luajit
 , darwin
 }:
 
diff --git a/pkgs/applications/editors/vscode/default.nix b/pkgs/applications/editors/vscode/default.nix
index cf58d5d2190..3e815642c17 100644
--- a/pkgs/applications/editors/vscode/default.nix
+++ b/pkgs/applications/editors/vscode/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, callPackage, fetchurl, unzip, atomEnv, makeDesktopItem,
+{ stdenv, lib, fetchurl, unzip, atomEnv, makeDesktopItem,
   gtk2, makeWrapper, libXScrnSaver, libxkbfile, libsecret }:
 
 let
diff --git a/pkgs/applications/editors/vscode/with-extensions.nix b/pkgs/applications/editors/vscode/with-extensions.nix
index 9b0d69ae65a..5535d9ab112 100644
--- a/pkgs/applications/editors/vscode/with-extensions.nix
+++ b/pkgs/applications/editors/vscode/with-extensions.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, runCommand, buildEnv, vscode, which, writeScript
+{ stdenv, lib, runCommand, buildEnv, vscode, which, writeScript
 , vscodeExtensions ? [] }:
 
 /*
diff --git a/pkgs/applications/editors/wxhexeditor/default.nix b/pkgs/applications/editors/wxhexeditor/default.nix
index 5597bf0d0b3..c345e8a95d5 100644
--- a/pkgs/applications/editors/wxhexeditor/default.nix
+++ b/pkgs/applications/editors/wxhexeditor/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchpatch, wxGTK, autoconf, automake, libtool, python, gettext, bash }:
+{ stdenv, fetchFromGitHub, fetchpatch, wxGTK, autoconf, automake, libtool, python, gettext }:
 
 stdenv.mkDerivation rec {
   name = "wxHexEditor-${version}";
diff --git a/pkgs/applications/gis/qgis/default.nix b/pkgs/applications/gis/qgis/default.nix
index 02e874739ef..c2ead5a1914 100644
--- a/pkgs/applications/gis/qgis/default.nix
+++ b/pkgs/applications/gis/qgis/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, gdal, cmake, qt4, flex, bison, proj, geos, xlibsWrapper, sqlite, gsl
+{ stdenv, fetchurl, gdal, cmake, qt4, flex, bison, proj, geos, xlibsWrapper, sqlite, gsl
 , qwt, fcgi, python2Packages, libspatialindex, libspatialite, qscintilla, postgresql, makeWrapper
 , qjson, qca2, txt2tags, openssl, darwin, pkgconfig
 , withGrass ? true, grass, IOKit, ApplicationServices
diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix
index 63cf950f02a..86aafa9697d 100644
--- a/pkgs/applications/graphics/ImageMagick/7.0.nix
+++ b/pkgs/applications/graphics/ImageMagick/7.0.nix
@@ -1,8 +1,8 @@
-{ lib, stdenv, fetchFromGitHub, fetchpatch, pkgconfig, libtool
+{ lib, stdenv, fetchFromGitHub, pkgconfig, libtool
 , bzip2, zlib, libX11, libXext, libXt, fontconfig, freetype, ghostscript, libjpeg
 , lcms2, openexr, libpng, librsvg, libtiff, libxml2, openjpeg, libwebp, libheif
 , ApplicationServices
-, buildPlatform, hostPlatform
+, hostPlatform
 }:
 
 let
diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix
index b767f11da00..94a4aeaa933 100644
--- a/pkgs/applications/graphics/ImageMagick/default.nix
+++ b/pkgs/applications/graphics/ImageMagick/default.nix
@@ -2,7 +2,7 @@
 , bzip2, zlib, libX11, libXext, libXt, fontconfig, freetype, ghostscript, libjpeg
 , lcms2, openexr, libpng, librsvg, libtiff, libxml2, openjpeg, libwebp, fftw, libheif, libde265
 , ApplicationServices
-, buildPlatform, hostPlatform
+, hostPlatform
 }:
 
 let
diff --git a/pkgs/applications/graphics/ahoviewer/default.nix b/pkgs/applications/graphics/ahoviewer/default.nix
index 5fb7e007806..53264580380 100644
--- a/pkgs/applications/graphics/ahoviewer/default.nix
+++ b/pkgs/applications/graphics/ahoviewer/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, pkgs, fetchurl, fetchFromGitHub, pkgconfig, libconfig,
+{ stdenv, fetchFromGitHub, pkgconfig, libconfig,
   gtkmm2, glibmm, libxml2, libsecret, curl, libzip,
   librsvg, gst_all_1, autoreconfHook, makeWrapper,
   useUnrar ? false, unrar
diff --git a/pkgs/applications/graphics/avocode/default.nix b/pkgs/applications/graphics/avocode/default.nix
index fbf6443b91f..d427b2586c0 100644
--- a/pkgs/applications/graphics/avocode/default.nix
+++ b/pkgs/applications/graphics/avocode/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, makeDesktopItem, fetchurl, unzip
+{ stdenv, makeDesktopItem, fetchurl, unzip
 , gdk_pixbuf, glib, gtk2, atk, pango, cairo, freetype, fontconfig, dbus, nss, nspr, alsaLib, cups, expat, udev, gnome2
 , xorg, mozjpeg
 }:
diff --git a/pkgs/applications/graphics/awesomebump/default.nix b/pkgs/applications/graphics/awesomebump/default.nix
index f7a813f3606..df742645e86 100644
--- a/pkgs/applications/graphics/awesomebump/default.nix
+++ b/pkgs/applications/graphics/awesomebump/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchgit, qtbase, qmake, makeWrapper, qtscript, gcc, flex, bison, qtdeclarative, gnutar }:
+{ lib, stdenv, fetchgit, qtbase, qmake, makeWrapper, qtscript, flex, bison, qtdeclarative }:
 
 
 let
diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix
index 5c6a4bab930..a31bbe8caeb 100644
--- a/pkgs/applications/graphics/digikam/default.nix
+++ b/pkgs/applications/graphics/digikam/default.nix
@@ -1,4 +1,4 @@
-{ mkDerivation, lib, fetchFromGitHub, cmake, doxygen, extra-cmake-modules, wrapGAppsHook, fetchpatch
+{ mkDerivation, lib, fetchFromGitHub, cmake, doxygen, extra-cmake-modules, wrapGAppsHook
 
 # For `digitaglinktree`
 , perl, sqlite
@@ -35,7 +35,6 @@
 , libusb1
 , marble
 , libGLU_combined
-, mysql
 , opencv3
 , pcre
 , threadweaver
diff --git a/pkgs/applications/graphics/dosage/default.nix b/pkgs/applications/graphics/dosage/default.nix
index 7667b674fce..69d09cd429c 100644
--- a/pkgs/applications/graphics/dosage/default.nix
+++ b/pkgs/applications/graphics/dosage/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, pythonPackages, fetchFromGitHub }:
+{ pythonPackages, fetchFromGitHub }:
 
 pythonPackages.buildPythonApplication rec {
   pname = "dosage";
diff --git a/pkgs/applications/graphics/epeg/default.nix b/pkgs/applications/graphics/epeg/default.nix
index 02528a43e31..ef694dec652 100644
--- a/pkgs/applications/graphics/epeg/default.nix
+++ b/pkgs/applications/graphics/epeg/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, pkgconfig, libtool, autoconf, automake
+{ stdenv, fetchFromGitHub, pkgconfig, libtool, autoconf, automake
 , libjpeg, libexif
 }:
 
diff --git a/pkgs/applications/graphics/fstl/default.nix b/pkgs/applications/graphics/fstl/default.nix
index 355acf7681a..b1437508a50 100644
--- a/pkgs/applications/graphics/fstl/default.nix
+++ b/pkgs/applications/graphics/fstl/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchFromGitHub, qtbase, mesa_glu, qmake}:
+{stdenv, fetchFromGitHub, qtbase, mesa_glu}:
 stdenv.mkDerivation rec {
   name = "fstl-${version}";
   version = "0.9.3";
diff --git a/pkgs/applications/graphics/glabels/default.nix b/pkgs/applications/graphics/glabels/default.nix
index 2d4fa882dd6..b4715902df1 100644
--- a/pkgs/applications/graphics/glabels/default.nix
+++ b/pkgs/applications/graphics/glabels/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, barcode, gnome3, autoreconfHook
 , gtk3, gtk-doc, libxml2, librsvg , libtool, libe-book
-, intltool, itstool, makeWrapper, pkgconfig, which
+, intltool, itstool, makeWrapper, pkgconfig
 }:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/applications/graphics/goxel/default.nix b/pkgs/applications/graphics/goxel/default.nix
index 3d49452cbe6..99230eb23e3 100644
--- a/pkgs/applications/graphics/goxel/default.nix
+++ b/pkgs/applications/graphics/goxel/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, scons, pkgconfig, wrapGAppsHook
+{ stdenv, fetchFromGitHub, scons, pkgconfig, wrapGAppsHook
 , glfw3, gtk3, libpng12 }:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/applications/graphics/graphicsmagick/default.nix b/pkgs/applications/graphics/graphicsmagick/default.nix
index 2c322128c38..ee58e9831e9 100644
--- a/pkgs/applications/graphics/graphicsmagick/default.nix
+++ b/pkgs/applications/graphics/graphicsmagick/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, bzip2, freetype, graphviz, ghostscript
+{ stdenv, fetchurl, bzip2, freetype, graphviz, ghostscript
 , libjpeg, libpng, libtiff, libxml2, zlib, libtool, xz, libX11
 , libwebp, quantumdepth ? 8, fixDarwinDylibNames }:
 
diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix
index 639f1928f8a..a82f13ee409 100644
--- a/pkgs/applications/graphics/inkscape/default.nix
+++ b/pkgs/applications/graphics/inkscape/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, pkgconfig, perl, perlXMLParser, libXft
+{ stdenv, fetchurl, pkgconfig, perl, perlXMLParser, libXft
 , libpng, zlib, popt, boehmgc, libxml2, libxslt, glib, gtkmm2
 , glibmm, libsigcxx, lcms, boost, gettext, makeWrapper
 , gsl, python2, poppler, imagemagick, libwpg, librevenge
diff --git a/pkgs/applications/graphics/k3d/default.nix b/pkgs/applications/graphics/k3d/default.nix
index 996d495d87c..3555c2b477f 100644
--- a/pkgs/applications/graphics/k3d/default.nix
+++ b/pkgs/applications/graphics/k3d/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchpatch, unzip, ftgl, glew, asciidoc
+{ stdenv, fetchFromGitHub, fetchpatch, ftgl, glew, asciidoc
 , cmake, ninja, libGLU_combined, zlib, python, expat, libxml2, libsigcxx, libuuid, freetype
 , libpng, boost, doxygen, cairomm, pkgconfig, imagemagick, libjpeg, libtiff
 , gettext, intltool, perl, gtkmm2, glibmm, gtkglext, pangox_compat, libXmu }:
diff --git a/pkgs/applications/graphics/kgraphviewer/default.nix b/pkgs/applications/graphics/kgraphviewer/default.nix
index 8f043816ba0..0d898df14b3 100644
--- a/pkgs/applications/graphics/kgraphviewer/default.nix
+++ b/pkgs/applications/graphics/kgraphviewer/default.nix
@@ -1,5 +1,5 @@
 { stdenv, mkDerivation, fetchurl, cmake, extra-cmake-modules, pkgconfig, wrapGAppsHook
-, kconfig, kcrash, kinit, kdoctools, kiconthemes, kio, kparts, kwidgetsaddons
+, kconfig, kinit, kdoctools, kio, kparts, kwidgetsaddons
 , qtbase, qtsvg
 , boost, graphviz
 }:
diff --git a/pkgs/applications/graphics/krita/default.nix b/pkgs/applications/graphics/krita/default.nix
index 1fd19162a4f..ec92638f855 100644
--- a/pkgs/applications/graphics/krita/default.nix
+++ b/pkgs/applications/graphics/krita/default.nix
@@ -1,4 +1,4 @@
-{ mkDerivation, lib, fetchurl, fetchpatch, cmake, extra-cmake-modules
+{ mkDerivation, lib, fetchurl, cmake, extra-cmake-modules
 , karchive, kconfig, kwidgetsaddons, kcompletion, kcoreaddons
 , kguiaddons, ki18n, kitemmodels, kitemviews, kwindowsystem
 , kio, kcrash
diff --git a/pkgs/applications/graphics/nomacs/default.nix b/pkgs/applications/graphics/nomacs/default.nix
index 1103c9ff40a..50862a4583b 100644
--- a/pkgs/applications/graphics/nomacs/default.nix
+++ b/pkgs/applications/graphics/nomacs/default.nix
@@ -1,7 +1,6 @@
 { stdenv
 , fetchFromGitHub
 , cmake
-, makeWrapper
 , pkgconfig
 , wrapGAppsHook
 , gsettings-desktop-schemas
diff --git a/pkgs/applications/graphics/openscad/default.nix b/pkgs/applications/graphics/openscad/default.nix
index 9ab5288700c..44855d5c8b4 100644
--- a/pkgs/applications/graphics/openscad/default.nix
+++ b/pkgs/applications/graphics/openscad/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchFromGitHub, qt5, libsForQt5
+{ stdenv, fetchFromGitHub, qt5, libsForQt5
 , bison, flex, eigen, boost, libGLU_combined, glew, opencsg, cgal
 , mpfr, gmp, glib, pkgconfig, harfbuzz, gettext
 }:
diff --git a/pkgs/applications/graphics/processing3/default.nix b/pkgs/applications/graphics/processing3/default.nix
index 803257d9392..6916ef4ad7a 100644
--- a/pkgs/applications/graphics/processing3/default.nix
+++ b/pkgs/applications/graphics/processing3/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, callPackage, fetchFromGitHub, fetchurl, xmlstarlet, makeWrapper, ant, jdk, rsync, javaPackages, libXxf86vm, gsettings-desktop-schemas }:
+{ stdenv, fetchFromGitHub, fetchurl, xmlstarlet, makeWrapper, ant, jdk, rsync, javaPackages, libXxf86vm, gsettings-desktop-schemas }:
 
 stdenv.mkDerivation rec {
   version = "3.3.7";
diff --git a/pkgs/applications/graphics/sane/backends/generic.nix b/pkgs/applications/graphics/sane/backends/generic.nix
index 2ca1fead84c..0f47c82f032 100644
--- a/pkgs/applications/graphics/sane/backends/generic.nix
+++ b/pkgs/applications/graphics/sane/backends/generic.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl
+{ stdenv
 , avahi, libjpeg, libusb1, libv4l, net_snmp, libpng
 , gettext, pkgconfig
 
diff --git a/pkgs/applications/graphics/scantailor/advanced.nix b/pkgs/applications/graphics/scantailor/advanced.nix
index 29e53683d1c..d55441e39fa 100644
--- a/pkgs/applications/graphics/scantailor/advanced.nix
+++ b/pkgs/applications/graphics/scantailor/advanced.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, makeDesktopItem
+{ stdenv, fetchFromGitHub
 , cmake, libjpeg, libpng, libtiff, boost
 , qtbase, qttools }:
 
diff --git a/pkgs/applications/graphics/screencloud/default.nix b/pkgs/applications/graphics/screencloud/default.nix
index cffe485711f..292ae9c8faa 100644
--- a/pkgs/applications/graphics/screencloud/default.nix
+++ b/pkgs/applications/graphics/screencloud/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchFromGitHub, cmake, qt4, quazip, qt-mobility, qxt, pythonPackages, glib }:
+{ stdenv, fetchFromGitHub, cmake, qt4, quazip, qt-mobility, qxt, pythonPackages }:
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
diff --git a/pkgs/applications/graphics/shutter/default.nix b/pkgs/applications/graphics/shutter/default.nix
index 3bc814e1e75..1f41253b699 100644
--- a/pkgs/applications/graphics/shutter/default.nix
+++ b/pkgs/applications/graphics/shutter/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, perl, perlPackages, makeWrapper, imagemagick, gdk_pixbuf, librsvg
+{ stdenv, fetchurl, perl, perlPackages, makeWrapper, imagemagick, gdk_pixbuf, librsvg
 , hicolor-icon-theme
 }:
 
diff --git a/pkgs/applications/graphics/synfigstudio/default.nix b/pkgs/applications/graphics/synfigstudio/default.nix
index 930a7e686f8..63d35cc5453 100644
--- a/pkgs/applications/graphics/synfigstudio/default.nix
+++ b/pkgs/applications/graphics/synfigstudio/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchFromGitHub, boost, cairo, fontsConf, gettext, glibmm, gtk3, gtkmm3
-, libjack2, libsigcxx, libtool, libxmlxx, makeWrapper, mlt-qt5, pango, pkgconfig
+{ stdenv, fetchFromGitHub, boost, cairo, gettext, glibmm, gtk3, gtkmm3
+, libjack2, libsigcxx, libxmlxx, makeWrapper, mlt-qt5, pango, pkgconfig
 , imagemagick, intltool, autoreconfHook, which, defaultIconTheme
 }:
 
diff --git a/pkgs/applications/graphics/write_stylus/default.nix b/pkgs/applications/graphics/write_stylus/default.nix
index a1c39fadb59..231a9799b59 100644
--- a/pkgs/applications/graphics/write_stylus/default.nix
+++ b/pkgs/applications/graphics/write_stylus/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, qtbase, qtsvg,  makeWrapper, fetchurl, makeDesktopItem }:
+{ stdenv, lib, qtbase, qtsvg,  fetchurl, makeDesktopItem }:
 stdenv.mkDerivation rec {
   name = "write_stylus-${version}";
   version = "209";
diff --git a/pkgs/applications/graphics/yed/default.nix b/pkgs/applications/graphics/yed/default.nix
index a8b4038b11f..aa2435c43de 100644
--- a/pkgs/applications/graphics/yed/default.nix
+++ b/pkgs/applications/graphics/yed/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, requireFile, makeWrapper, unzip, jre }:
+{ stdenv, requireFile, makeWrapper, unzip, jre }:
 
 stdenv.mkDerivation rec {
   name = "yEd-${version}";
diff --git a/pkgs/applications/inferno/default.nix b/pkgs/applications/inferno/default.nix
index 3f3c2a32e68..de9be76b6e4 100644
--- a/pkgs/applications/inferno/default.nix
+++ b/pkgs/applications/inferno/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, fetchhg, stdenv, xorg, makeWrapper }:
+{ fetchhg, stdenv, xorg, makeWrapper }:
 
 stdenv.mkDerivation rec {
   # Inferno is a rolling release from a mercurial repository. For the verison number
diff --git a/pkgs/applications/kde/ark/default.nix b/pkgs/applications/kde/ark/default.nix
index fb631414838..598857f2e70 100644
--- a/pkgs/applications/kde/ark/default.nix
+++ b/pkgs/applications/kde/ark/default.nix
@@ -1,5 +1,5 @@
 {
-  mkDerivation, lib, config, makeWrapper,
+  mkDerivation, lib, makeWrapper,
 
   extra-cmake-modules, kdoctools,
 
diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix
index 8f64c884931..d839a7141e3 100644
--- a/pkgs/applications/kde/default.nix
+++ b/pkgs/applications/kde/default.nix
@@ -26,8 +26,7 @@ still shows most of the available features is in `./gwenview.nix`.
 */
 
 {
-  stdenv, lib, libsForQt5, fetchurl, recurseIntoAttrs,
-  plasma5, attica, phonon,
+  lib, libsForQt5, fetchurl,
   okteta
 }:
 
diff --git a/pkgs/applications/kde/dolphin.nix b/pkgs/applications/kde/dolphin.nix
index 2570e37bf2c..6a4635c26fb 100644
--- a/pkgs/applications/kde/dolphin.nix
+++ b/pkgs/applications/kde/dolphin.nix
@@ -1,10 +1,10 @@
 {
   mkDerivation, lib,
   extra-cmake-modules, kdoctools,
-  baloo, baloo-widgets, dolphin-plugins, kactivities, kbookmarks, kcmutils,
+  baloo, baloo-widgets, kactivities, kbookmarks, kcmutils,
   kcompletion, kconfig, kcoreaddons, kdelibs4support, kdbusaddons,
   kfilemetadata, ki18n, kiconthemes, kinit, kio, knewstuff, knotifications,
-  konsole, kparts, ktexteditor, kwindowsystem, phonon, solid
+  kparts, ktexteditor, kwindowsystem, phonon, solid
 }:
 
 mkDerivation {
diff --git a/pkgs/applications/kde/kdenlive.nix b/pkgs/applications/kde/kdenlive.nix
index 65080ba7f06..9da12b248c5 100644
--- a/pkgs/applications/kde/kdenlive.nix
+++ b/pkgs/applications/kde/kdenlive.nix
@@ -2,18 +2,13 @@
 , lib
 , extra-cmake-modules
 , kdoctools
-, kactivities
 , kconfig
 , kcrash
 , kguiaddons
 , kiconthemes
 , ki18n
 , kinit
-, kio
-, kio-extras
-, kwindowsystem
 , kdbusaddons
-, plasma-framework
 , knotifications
 , knewstuff
 , karchive
diff --git a/pkgs/applications/kde/libkomparediff2.nix b/pkgs/applications/kde/libkomparediff2.nix
index 52aa2b10e24..cae2aec5668 100644
--- a/pkgs/applications/kde/libkomparediff2.nix
+++ b/pkgs/applications/kde/libkomparediff2.nix
@@ -1,4 +1,4 @@
-{ mkDerivation, lib, extra-cmake-modules, ki18n, kxmlgui, kcodecs, kio }:
+{ mkDerivation, extra-cmake-modules, ki18n, kxmlgui, kcodecs, kio }:
 
 mkDerivation {
   name = "libkomparediff2";
diff --git a/pkgs/applications/kde/pim-data-exporter.nix b/pkgs/applications/kde/pim-data-exporter.nix
index 10123944e3a..d17ffb3c044 100644
--- a/pkgs/applications/kde/pim-data-exporter.nix
+++ b/pkgs/applications/kde/pim-data-exporter.nix
@@ -4,7 +4,7 @@
   akonadi, kcmutils, kcrash, kdbusaddons, kidentitymanagement, kldap,
   kmailtransport, knewstuff, knotifications, knotifyconfig, kparts, kross, ktexteditor,
   kwallet, libkdepim, libkleo, pimcommon, qttools,
-  karchive, mailcommon, messagelib, pim-data-exporter
+  karchive, mailcommon, messagelib
 }:
 
 mkDerivation {
diff --git a/pkgs/applications/kde/pimcommon.nix b/pkgs/applications/kde/pimcommon.nix
index 02e9a47274b..bbbcca13d98 100644
--- a/pkgs/applications/kde/pimcommon.nix
+++ b/pkgs/applications/kde/pimcommon.nix
@@ -2,7 +2,7 @@
   mkDerivation, lib, kdepimTeam,
   extra-cmake-modules, kdoctools,
   akonadi, akonadi-contacts, akonadi-mime, grantlee, karchive, kcodecs,
-  kcompletion, kconfig, kconfigwidgets, kcontacts, kdbusaddons, kdesignerplugin,
+  kcompletion, kconfig, kconfigwidgets, kcontacts, kdbusaddons,
   kiconthemes, kimap, kio, kitemmodels, kjobwidgets, knewstuff, kpimtextedit,
   kwallet, kwindowsystem, libkdepim, qtwebengine
 }:
diff --git a/pkgs/applications/misc/acbuild/default.nix b/pkgs/applications/misc/acbuild/default.nix
index 319764ae81a..c1b8a7eb866 100644
--- a/pkgs/applications/misc/acbuild/default.nix
+++ b/pkgs/applications/misc/acbuild/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, go, fetchFromGitHub }:
+{ stdenv, go, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
   name = "acbuild-${version}";
diff --git a/pkgs/applications/misc/alacritty/default.nix b/pkgs/applications/misc/alacritty/default.nix
index 698485fb086..09da61f3464 100644
--- a/pkgs/applications/misc/alacritty/default.nix
+++ b/pkgs/applications/misc/alacritty/default.nix
@@ -9,7 +9,6 @@
   freetype,
   fontconfig,
   libX11,
-  gperf,
   libXcursor,
   libXxf86vm,
   libXi,
diff --git a/pkgs/applications/misc/bashSnippets/default.nix b/pkgs/applications/misc/bashSnippets/default.nix
index acd5ae7dd73..fc5fa4d0300 100644
--- a/pkgs/applications/misc/bashSnippets/default.nix
+++ b/pkgs/applications/misc/bashSnippets/default.nix
@@ -1,5 +1,5 @@
 { stdenv, lib, fetchFromGitHub, makeWrapper
-, curl, netcat, python, bind, iproute, bc, gitMinimal }:
+, curl, python, bind, iproute, bc, gitMinimal }:
 let
   version = "1.17.3";
   deps = lib.makeBinPath [
diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix
index 1aabbb587eb..8e553af5250 100644
--- a/pkgs/applications/misc/calibre/default.nix
+++ b/pkgs/applications/misc/calibre/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, fetchpatch, poppler_utils, pkgconfig, libpng
+{ stdenv, fetchurl, poppler_utils, pkgconfig, libpng
 , imagemagick, libjpeg, fontconfig, podofo, qtbase, qmake, icu, sqlite
-, makeWrapper, unrarSupport ? false, chmlib, python2Packages, xz, libusb1, libmtp
+, makeWrapper, unrarSupport ? false, chmlib, python2Packages, libusb1, libmtp
 , xdg_utils, makeDesktopItem, wrapGAppsHook
 }:
 
diff --git a/pkgs/applications/misc/cataract/default.nix b/pkgs/applications/misc/cataract/default.nix
index 83292a76c5d..3a9f2028922 100644
--- a/pkgs/applications/misc/cataract/default.nix
+++ b/pkgs/applications/misc/cataract/default.nix
@@ -1,13 +1,4 @@
-{ callPackage
-, stdenv
-, fetchgit
-, autoconf
-, automake
-, glib
-, pkgconfig
-, libxml2
-, exiv2
-, imagemagick }:
+{ callPackage }:
 
 callPackage ./build.nix {
   version = "1.1.0";
diff --git a/pkgs/applications/misc/cataract/unstable.nix b/pkgs/applications/misc/cataract/unstable.nix
index 8d8b063e48b..397aed355a9 100644
--- a/pkgs/applications/misc/cataract/unstable.nix
+++ b/pkgs/applications/misc/cataract/unstable.nix
@@ -1,13 +1,4 @@
-{ callPackage
-, stdenv
-, fetchgit
-, autoconf
-, automake
-, glib
-, pkgconfig
-, libxml2
-, exiv2
-, imagemagick }:
+{ callPackage }:
 
 callPackage ./build.nix {
   version = "unstable-2016-10-18";
diff --git a/pkgs/applications/misc/cherrytree/default.nix b/pkgs/applications/misc/cherrytree/default.nix
index 03709c30373..6bd1cef7c1b 100644
--- a/pkgs/applications/misc/cherrytree/default.nix
+++ b/pkgs/applications/misc/cherrytree/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pythonPackages, gettext, sqlite }:
+{ stdenv, fetchurl, pythonPackages, gettext }:
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
diff --git a/pkgs/applications/misc/chirp/default.nix b/pkgs/applications/misc/chirp/default.nix
index 6e0152c71ed..8c57ebead6a 100644
--- a/pkgs/applications/misc/chirp/default.nix
+++ b/pkgs/applications/misc/chirp/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, libxml2Python, libxslt, makeWrapper
-, python, pyserial, pygtk }:
+, pyserial, pygtk }:
 
 stdenv.mkDerivation rec {
   name = "chirp-daily-${version}";
diff --git a/pkgs/applications/misc/dbvisualizer/default.nix b/pkgs/applications/misc/dbvisualizer/default.nix
index 7aa19ffb301..fbeb965df38 100644
--- a/pkgs/applications/misc/dbvisualizer/default.nix
+++ b/pkgs/applications/misc/dbvisualizer/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, jre, coreutils, makeWrapper }:
+{ stdenv, fetchurl, jre, makeWrapper }:
 
 stdenv.mkDerivation {
   name = "dbvisualizer-9.5.7";
diff --git a/pkgs/applications/misc/dfilemanager/default.nix b/pkgs/applications/misc/dfilemanager/default.nix
index 53344595f78..6cbdc8ece0c 100644
--- a/pkgs/applications/misc/dfilemanager/default.nix
+++ b/pkgs/applications/misc/dfilemanager/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, cmake, file, qtbase, qttools, qtx11extras, solid }:
+{ stdenv, fetchgit, cmake, file, qtbase, qttools, solid }:
 
 let
   version = "git-2016-01-10";
diff --git a/pkgs/applications/misc/electron-cash/default.nix b/pkgs/applications/misc/electron-cash/default.nix
index 76b61de5608..891222a0f10 100644
--- a/pkgs/applications/misc/electron-cash/default.nix
+++ b/pkgs/applications/misc/electron-cash/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, python3Packages, qtbase }:
+{ stdenv, fetchurl, python3Packages }:
 
 let
 
diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix
index 383f73b6299..ed2f0626e5d 100644
--- a/pkgs/applications/misc/electrum/default.nix
+++ b/pkgs/applications/misc/electrum/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, python3, python3Packages, zbar, fetchpatch }:
+{ stdenv, fetchurl, python3, python3Packages, zbar }:
 
 python3Packages.buildPythonApplication rec {
   name = "electrum-${version}";
diff --git a/pkgs/applications/misc/evtest/default.nix b/pkgs/applications/misc/evtest/default.nix
index 73911bab6f6..3d715a1d16b 100644
--- a/pkgs/applications/misc/evtest/default.nix
+++ b/pkgs/applications/misc/evtest/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, autoreconfHook, automake, pkgconfig, libxml2 }:
+{ stdenv, fetchgit, autoreconfHook, pkgconfig, libxml2 }:
 
 stdenv.mkDerivation rec {
   name = "evtest-1.33";
diff --git a/pkgs/applications/misc/far2l/default.nix b/pkgs/applications/misc/far2l/default.nix
index 9ddd39981cc..d8a0c53d9e1 100644
--- a/pkgs/applications/misc/far2l/default.nix
+++ b/pkgs/applications/misc/far2l/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchpatch, makeWrapper, cmake, pkgconfig, wxGTK30, glib, pcre, m4, bash,
+{ stdenv, fetchFromGitHub, makeWrapper, cmake, pkgconfig, wxGTK30, glib, pcre, m4, bash,
   xdg_utils, gvfs, zip, unzip, gzip, bzip2, gnutar, p7zip, xz, imagemagick, darwin }:
 
 with stdenv.lib;
diff --git a/pkgs/applications/misc/finalterm/default.nix b/pkgs/applications/misc/finalterm/default.nix
index 93e5d297ffb..2c024b9fe0e 100644
--- a/pkgs/applications/misc/finalterm/default.nix
+++ b/pkgs/applications/misc/finalterm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, makeWrapper
+{ stdenv, fetchFromGitHub, makeWrapper
 , pkgconfig, cmake, libxml2, vala_0_26, intltool, libmx, gnome3, gtk3, gtk-doc
 , keybinder3, clutter-gtk, libnotify
 , libxkbcommon, xorg, udev
diff --git a/pkgs/applications/misc/gcal/default.nix b/pkgs/applications/misc/gcal/default.nix
index f3f7fe2aacb..a3aebf22733 100644
--- a/pkgs/applications/misc/gcal/default.nix
+++ b/pkgs/applications/misc/gcal/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, ncurses  }:
+{ stdenv, fetchurl, ncurses  }:
 
 stdenv.mkDerivation rec {
   name = "gcal-${version}";
diff --git a/pkgs/applications/misc/golden-cheetah/default.nix b/pkgs/applications/misc/golden-cheetah/default.nix
index efd3bfe73dd..f62eb92ac04 100644
--- a/pkgs/applications/misc/golden-cheetah/default.nix
+++ b/pkgs/applications/misc/golden-cheetah/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl
 , qtbase, qtsvg, qtserialport, qtwebkit, qtmultimedia, qttools, qtconnectivity
-, yacc, flex, zlib, config, qmake, makeWrapper
+, yacc, flex, zlib, qmake, makeWrapper
 }:
 stdenv.mkDerivation rec {
   name = "golden-cheetah-${version}";
diff --git a/pkgs/applications/misc/googleearth/default.nix b/pkgs/applications/misc/googleearth/default.nix
index c77f8658220..9c1b457c299 100644
--- a/pkgs/applications/misc/googleearth/default.nix
+++ b/pkgs/applications/misc/googleearth/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, glibc, libGLU_combined, freetype, glib, libSM, libICE, libXi, libXv
-, libXrender, libXrandr, libXfixes, libXcursor, libXinerama, libXext, libX11, qt4
+, libXrender, libXrandr, libXfixes, libXcursor, libXinerama, libXext, libX11
 , zlib, fontconfig, dpkg, libproxy, libxml2, gstreamer, gst_all_1, dbus }:
 
 let
diff --git a/pkgs/applications/misc/gpsprune/default.nix b/pkgs/applications/misc/gpsprune/default.nix
index 586807b2dd5..6689a3cae10 100644
--- a/pkgs/applications/misc/gpsprune/default.nix
+++ b/pkgs/applications/misc/gpsprune/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, makeDesktopItem, makeWrapper, unzip, bash, jre8 }:
+{ fetchurl, stdenv, makeDesktopItem, makeWrapper, unzip, jre8 }:
 
 stdenv.mkDerivation rec {
   name = "gpsprune-${version}";
diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix
index d87ac459d02..ed0dd3ba5be 100644
--- a/pkgs/applications/misc/gpxsee/default.nix
+++ b/pkgs/applications/misc/gpxsee/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, qmake, qtbase, qttools }:
+{ stdenv, fetchFromGitHub, qmake, qttools }:
 
 stdenv.mkDerivation rec {
   name = "gpxsee-${version}";
diff --git a/pkgs/applications/misc/gramps/default.nix b/pkgs/applications/misc/gramps/default.nix
index 50f575d15ce..b4b98909447 100644
--- a/pkgs/applications/misc/gramps/default.nix
+++ b/pkgs/applications/misc/gramps/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, gtk3, pythonPackages, intltool, gnome3,
-  pango, gsettings-desktop-schemas, gobjectIntrospection, wrapGAppsHook,
+  pango, gobjectIntrospection, wrapGAppsHook,
 # Optional packages:
  enableOSM ? true, osm-gps-map
  }:
diff --git a/pkgs/applications/misc/gummi/default.nix b/pkgs/applications/misc/gummi/default.nix
index 5fdb8985bbb..6c84f3cbd32 100644
--- a/pkgs/applications/misc/gummi/default.nix
+++ b/pkgs/applications/misc/gummi/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, pkgs, makeWrapper
+{ stdenv, pkgs, makeWrapper
 , glib, gnome2, gnome3, gtk2-x11, gtkspell2, poppler
 , pkgconfig, intltool, autoreconfHook, wrapGAppsHook
 }:
diff --git a/pkgs/applications/misc/hamster-time-tracker/default.nix b/pkgs/applications/misc/hamster-time-tracker/default.nix
index 105f7beb98f..2abdce45c95 100644
--- a/pkgs/applications/misc/hamster-time-tracker/default.nix
+++ b/pkgs/applications/misc/hamster-time-tracker/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchzip, pythonPackages, docbook2x, libxslt, gnome-doc-utils
-, intltool, dbus-glib, gnome_python, dbus
+, intltool, dbus-glib, gnome_python
 , hicolor-icon-theme
 }:
 
diff --git a/pkgs/applications/misc/haxor-news/default.nix b/pkgs/applications/misc/haxor-news/default.nix
index 624c15e118a..1fa016627d4 100644
--- a/pkgs/applications/misc/haxor-news/default.nix
+++ b/pkgs/applications/misc/haxor-news/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, python }:
+{ stdenv, python }:
 
 with python.pkgs;
 
diff --git a/pkgs/applications/misc/houdini/default.nix b/pkgs/applications/misc/houdini/default.nix
index 0b679617243..607dff29318 100644
--- a/pkgs/applications/misc/houdini/default.nix
+++ b/pkgs/applications/misc/houdini/default.nix
@@ -1,4 +1,4 @@
-{ zsh, stdenv, callPackage, buildFHSUserEnv, undaemonize }:
+{ callPackage, buildFHSUserEnv, undaemonize }:
 
 let
   houdini-runtime = callPackage ./runtime.nix { };
diff --git a/pkgs/applications/misc/icesl/default.nix b/pkgs/applications/misc/icesl/default.nix
index 2295e15cc3d..49b1741fd5a 100644
--- a/pkgs/applications/misc/icesl/default.nix
+++ b/pkgs/applications/misc/icesl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchzip, patchelf, freeglut, libXmu, libXi, libX11, libICE, libGLU_combined, libSM, libXext, dialog, makeWrapper }:
+{ stdenv, lib, fetchzip, freeglut, libXmu, libXi, libX11, libICE, libGLU_combined, libSM, libXext, dialog, makeWrapper }:
 let
   lpath = stdenv.lib.makeLibraryPath [ libXmu libXi libX11 freeglut libICE libGLU_combined libSM libXext ];
 in
diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix
index c4f10a1c35b..9872ff23f34 100644
--- a/pkgs/applications/misc/josm/default.nix
+++ b/pkgs/applications/misc/josm/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, makeDesktopItem, makeWrapper, unzip, bash, jre10 }:
+{ fetchurl, stdenv, makeDesktopItem, makeWrapper, unzip, jre10 }:
 
 stdenv.mkDerivation rec {
   name = "josm-${version}";
diff --git a/pkgs/applications/misc/khard/default.nix b/pkgs/applications/misc/khard/default.nix
index 075640f702c..3c5184d5463 100644
--- a/pkgs/applications/misc/khard/default.nix
+++ b/pkgs/applications/misc/khard/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchFromGitHub, glibcLocales, python3 }:
+{ stdenv, fetchurl, glibcLocales, python3 }:
 
 let
   python = python3.override {
diff --git a/pkgs/applications/misc/kitty/default.nix b/pkgs/applications/misc/kitty/default.nix
index 38c2494c9f7..0c894fb0b61 100644
--- a/pkgs/applications/misc/kitty/default.nix
+++ b/pkgs/applications/misc/kitty/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchFromGitHub, pkgs, python3Packages, glfw, libunistring, harfbuzz,
-  fontconfig, zlib, pkgconfig, ncurses, imagemagick, makeWrapper, xsel,
+{ stdenv, fetchFromGitHub, python3Packages, glfw, libunistring, harfbuzz,
+  fontconfig, pkgconfig, ncurses, imagemagick, xsel,
   libstartup_notification, libX11, libXrandr, libXinerama, libXcursor,
   libxkbcommon, libXi, libXext, wayland-protocols, wayland,
   which
diff --git a/pkgs/applications/misc/kiwix/default.nix b/pkgs/applications/misc/kiwix/default.nix
index 699cb2fd098..c37d26f3dbc 100644
--- a/pkgs/applications/misc/kiwix/default.nix
+++ b/pkgs/applications/misc/kiwix/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, makeWrapper, pkgconfig
 , zip, python, zlib, which, icu, libmicrohttpd, lzma, aria2, wget, bc
-, libuuid, glibc, libX11, libXext, libXt, libXrender, glib, dbus, dbus-glib
+, libuuid, libX11, libXext, libXt, libXrender, glib, dbus, dbus-glib
 , gtk2, gdk_pixbuf, pango, cairo, freetype, fontconfig, alsaLib, atk, cmake
 , xapian, ctpp2, zimlib
 }:
diff --git a/pkgs/applications/misc/kupfer/default.nix b/pkgs/applications/misc/kupfer/default.nix
index bb55fc2d4a8..3072963c43e 100644
--- a/pkgs/applications/misc/kupfer/default.nix
+++ b/pkgs/applications/misc/kupfer/default.nix
@@ -1,11 +1,9 @@
 { stdenv
-, makeWrapper
 , fetchurl
 , intltool
 , python3Packages
 , gobjectIntrospection
 , gtk3
-, dbus
 , libwnck3
 , keybinder3
 , hicolor-icon-theme
diff --git a/pkgs/applications/misc/llpp/default.nix b/pkgs/applications/misc/llpp/default.nix
index 25067e3bba5..372adef4375 100644
--- a/pkgs/applications/misc/llpp/default.nix
+++ b/pkgs/applications/misc/llpp/default.nix
@@ -1,5 +1,5 @@
 { stdenv, lib, makeWrapper, fetchgit, pkgconfig, ninja, ocaml, findlib, mupdf
-, lablgl, gtk3, openjpeg, jbig2dec, mujs, xsel, openssl, freetype, ncurses }:
+, gtk3, openjpeg, jbig2dec, mujs, xsel, openssl, freetype, ncurses }:
 
 assert lib.versionAtLeast (lib.getVersion ocaml) "4.02";
 
diff --git a/pkgs/applications/misc/madonctl/default.nix b/pkgs/applications/misc/madonctl/default.nix
index 787ce7231f3..f2dacb7890f 100644
--- a/pkgs/applications/misc/madonctl/default.nix
+++ b/pkgs/applications/misc/madonctl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoPackage, fetchFromGitHub, fetchgx }:
+{ stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "madonctl-${version}";
diff --git a/pkgs/applications/misc/masterpdfeditor/default.nix b/pkgs/applications/misc/masterpdfeditor/default.nix
index fb17aadfa49..23f14d7ac9a 100644
--- a/pkgs/applications/misc/masterpdfeditor/default.nix
+++ b/pkgs/applications/misc/masterpdfeditor/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, glibc, sane-backends, qtbase, qtsvg, libXext, libX11, libXdmcp, libXau, libxcb, autoPatchelfHook }:
+{ stdenv, fetchurl, sane-backends, qtbase, qtsvg, autoPatchelfHook }:
 let
   version = "4.3.89";
 in stdenv.mkDerivation {
diff --git a/pkgs/applications/misc/mop/default.nix b/pkgs/applications/misc/mop/default.nix
index 336b136c56d..8c6bd92d536 100644
--- a/pkgs/applications/misc/mop/default.nix
+++ b/pkgs/applications/misc/mop/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchgit }:
+{ stdenv, buildGoPackage, fetchgit }:
 
 buildGoPackage rec {
   name = "mop-${version}";
diff --git a/pkgs/applications/misc/octoprint/default.nix b/pkgs/applications/misc/octoprint/default.nix
index 6b057186eaf..2abbfdea041 100644
--- a/pkgs/applications/misc/octoprint/default.nix
+++ b/pkgs/applications/misc/octoprint/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, python2, fetchurl }:
+{ stdenv, fetchFromGitHub, python2 }:
 
 let
 
diff --git a/pkgs/applications/misc/octoprint/plugins.nix b/pkgs/applications/misc/octoprint/plugins.nix
index 0a1d26012a8..bd65acf5e5e 100644
--- a/pkgs/applications/misc/octoprint/plugins.nix
+++ b/pkgs/applications/misc/octoprint/plugins.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchpatch, octoprint, pythonPackages }:
+{ stdenv, fetchFromGitHub, octoprint, pythonPackages }:
 
 let
   buildPlugin = args: pythonPackages.buildPythonApplication (args // {
diff --git a/pkgs/applications/misc/orca/default.nix b/pkgs/applications/misc/orca/default.nix
index ca06b5fa6df..199fa3e9bfe 100644
--- a/pkgs/applications/misc/orca/default.nix
+++ b/pkgs/applications/misc/orca/default.nix
@@ -1,9 +1,9 @@
-{ stdenv, lib, pkgconfig, fetchurl, buildPythonApplication
+{ lib, pkgconfig, fetchurl, buildPythonApplication
 , autoreconfHook, wrapGAppsHook, gobjectIntrospection
 , intltool, yelp-tools, itstool, libxmlxx3
 , python, pygobject3, gtk3, gnome3, substituteAll
 , at-spi2-atk, at-spi2-core, pyatspi, dbus, dbus-python, pyxdg
-, xkbcomp, gsettings-desktop-schemas, liblouis
+, xkbcomp, gsettings-desktop-schemas
 , speechd, brltty, setproctitle, gst_all_1, gst-python
 }:
 
diff --git a/pkgs/applications/misc/perkeep/default.nix b/pkgs/applications/misc/perkeep/default.nix
index 746a319c2e1..9ecf0da5806 100644
--- a/pkgs/applications/misc/perkeep/default.nix
+++ b/pkgs/applications/misc/perkeep/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, go, fetchzip, git, fetchpatch, fetchFromGitHub, fetchgit }:
+{ stdenv, go, fetchzip, git, fetchFromGitHub, fetchgit }:
 
 # When perkeep is updated all deps in the let block should be removed
 let
diff --git a/pkgs/applications/misc/pgmanage/default.nix b/pkgs/applications/misc/pgmanage/default.nix
index 23ab0f8d34a..a548c149665 100644
--- a/pkgs/applications/misc/pgmanage/default.nix
+++ b/pkgs/applications/misc/pgmanage/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, runCommand, postgresql, openssl } :
+{ stdenv, fetchFromGitHub, postgresql, openssl } :
 
 stdenv.mkDerivation rec {
   name = "pgmanage-${version}";
diff --git a/pkgs/applications/misc/polybar/default.nix b/pkgs/applications/misc/polybar/default.nix
index 05ad3e2a906..3ac719d18d2 100644
--- a/pkgs/applications/misc/polybar/default.nix
+++ b/pkgs/applications/misc/polybar/default.nix
@@ -1,6 +1,6 @@
 { cairo, cmake, fetchgit, libXdmcp, libpthreadstubs, libxcb, pcre, pkgconfig
 , python2 , stdenv, xcbproto, xcbutil, xcbutilimage, xcbutilrenderutil
-, xcbutilwm, xcbutilxrm, fetchpatch, makeWrapper
+, xcbutilwm, xcbutilxrm, makeWrapper
 
 # optional packages-- override the variables ending in 'Support' to enable or
 # disable modules
diff --git a/pkgs/applications/misc/pt/default.nix b/pkgs/applications/misc/pt/default.nix
index a400bb04da4..dbda7664bde 100644
--- a/pkgs/applications/misc/pt/default.nix
+++ b/pkgs/applications/misc/pt/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, bundlerEnv, ruby }:
+{ lib, bundlerEnv, ruby }:
 
 bundlerEnv {
   name = "pt-0.7.3";
diff --git a/pkgs/applications/misc/redis-desktop-manager/default.nix b/pkgs/applications/misc/redis-desktop-manager/default.nix
index 7a4348260fd..bf4559e9117 100644
--- a/pkgs/applications/misc/redis-desktop-manager/default.nix
+++ b/pkgs/applications/misc/redis-desktop-manager/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchgit, fetchpatch, pkgconfig, libssh2
+{ stdenv, lib, fetchgit, pkgconfig, libssh2
 , qtbase, qtdeclarative, qtgraphicaleffects, qtimageformats, qtquickcontrols
 , qtsvg, qttools, qtquick1, qtcharts
 , qmake
diff --git a/pkgs/applications/misc/redshift/default.nix b/pkgs/applications/misc/redshift/default.nix
index dcc8300550f..c6d3d6e1a9d 100644
--- a/pkgs/applications/misc/redshift/default.nix
+++ b/pkgs/applications/misc/redshift/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchurl, autoconf, automake, gettext, intltool
+{ stdenv, fetchFromGitHub, autoconf, automake, gettext, intltool
 , libtool, pkgconfig, wrapGAppsHook, wrapPython, gobjectIntrospection
 , gtk3, python, pygobject3, hicolor-icon-theme, pyxdg
 
diff --git a/pkgs/applications/misc/rofi/default.nix b/pkgs/applications/misc/rofi/default.nix
index 7da721e9f37..2d22d87c49a 100644
--- a/pkgs/applications/misc/rofi/default.nix
+++ b/pkgs/applications/misc/rofi/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, autoreconfHook, pkgconfig, libxkbcommon, pango, which, git
-, cairo, glib, libxcb, xcbutil, xcbutilwm, xcbutilxrm, libstartup_notification
+, cairo, libxcb, xcbutil, xcbutilwm, xcbutilxrm, libstartup_notification
 , bison, flex, librsvg, check
 }:
 
diff --git a/pkgs/applications/misc/rofi/wrapper.nix b/pkgs/applications/misc/rofi/wrapper.nix
index 17bbf1583c4..c2384f56faa 100644
--- a/pkgs/applications/misc/rofi/wrapper.nix
+++ b/pkgs/applications/misc/rofi/wrapper.nix
@@ -1,4 +1,4 @@
-{ stdenv, rofi-unwrapped, makeWrapper, theme ? null, lib }:
+{ stdenv, rofi-unwrapped, makeWrapper, theme ? null }:
 
 if theme == null then rofi-unwrapped else
 stdenv.mkDerivation {
diff --git a/pkgs/applications/misc/roxterm/default.nix b/pkgs/applications/misc/roxterm/default.nix
index 3ef5a6c4e34..11a75e4064f 100644
--- a/pkgs/applications/misc/roxterm/default.nix
+++ b/pkgs/applications/misc/roxterm/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, docbook_xsl, dbus, dbus-glib, expat, gettext
-, gsettings-desktop-schemas, gdk_pixbuf, gtk2, gtk3, hicolor-icon-theme
-, imagemagick, itstool, librsvg, libtool, libxslt, lockfile, makeWrapper
+{ stdenv, fetchurl, docbook_xsl, dbus, dbus-glib, expat
+, gsettings-desktop-schemas, gdk_pixbuf, gtk3, hicolor-icon-theme
+, imagemagick, itstool, librsvg, libtool, libxslt, makeWrapper
 , pkgconfig, python, pythonPackages, vte
 , wrapGAppsHook}:
 
diff --git a/pkgs/applications/misc/rtv/default.nix b/pkgs/applications/misc/rtv/default.nix
index d2027696824..5c16a02ddb8 100644
--- a/pkgs/applications/misc/rtv/default.nix
+++ b/pkgs/applications/misc/rtv/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, pkgs, pythonPackages }:
+{ stdenv, fetchFromGitHub, pythonPackages }:
 
 with pythonPackages;
 buildPythonApplication rec {
diff --git a/pkgs/applications/misc/rxvt_unicode/wrapper.nix b/pkgs/applications/misc/rxvt_unicode/wrapper.nix
index 98d7e12a8ed..909c267def8 100644
--- a/pkgs/applications/misc/rxvt_unicode/wrapper.nix
+++ b/pkgs/applications/misc/rxvt_unicode/wrapper.nix
@@ -1,4 +1,4 @@
-{ stdenv, symlinkJoin, rxvt_unicode, makeWrapper, plugins }:
+{ symlinkJoin, rxvt_unicode, makeWrapper, plugins }:
 
 let
   rxvt_name = builtins.parseDrvName rxvt_unicode.name;
diff --git a/pkgs/applications/misc/simplenote/default.nix b/pkgs/applications/misc/simplenote/default.nix
index 513c5facc6b..8049cc2feae 100644
--- a/pkgs/applications/misc/simplenote/default.nix
+++ b/pkgs/applications/misc/simplenote/default.nix
@@ -1,5 +1,5 @@
 { fetchurl, stdenv, lib, zlib, glib, alsaLib, dbus, gtk2, atk, pango, freetype, fontconfig
-, libgnome-keyring3, gdk_pixbuf, gvfs, cairo, cups, expat, libgpgerror, nspr
+, libgnome-keyring3, gdk_pixbuf, cairo, cups, expat, libgpgerror, nspr
 , nss, xorg, libcap, systemd, libnotify ,libXScrnSaver, gnome3 }:
 
  stdenv.mkDerivation rec {
diff --git a/pkgs/applications/misc/slic3r/prusa3d.nix b/pkgs/applications/misc/slic3r/prusa3d.nix
index 11a5baa288d..9f4036c3f96 100644
--- a/pkgs/applications/misc/slic3r/prusa3d.nix
+++ b/pkgs/applications/misc/slic3r/prusa3d.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, makeWrapper, which, cmake, perl, perlPackages,
-  boost, tbb, wxGTK30, pkgconfig, gtk3, fetchurl, gtk2, bash, libGLU,
+  boost, tbb, wxGTK30, pkgconfig, gtk3, fetchurl, gtk2, libGLU,
   glew, eigen, curl }:
 let
   AlienWxWidgets = perlPackages.buildPerlPackage rec {
diff --git a/pkgs/applications/misc/spacefm/default.nix b/pkgs/applications/misc/spacefm/default.nix
index 6fa594dec04..9f20b20f7f3 100644
--- a/pkgs/applications/misc/spacefm/default.nix
+++ b/pkgs/applications/misc/spacefm/default.nix
@@ -1,6 +1,6 @@
 { pkgs, fetchFromGitHub, stdenv, gtk3, udev, desktop-file-utils
 , shared-mime-info, intltool, pkgconfig, wrapGAppsHook, ffmpegthumbnailer
-, jmtpfs, ifuseSupport ? false, ifuse ? null, lsof, udisks2, hicolor-icon-theme, adwaita-icon-theme }:
+, jmtpfs, ifuseSupport ? false, ifuse ? null, lsof, udisks2 }:
 
 stdenv.mkDerivation rec {
   name = "spacefm-${version}";
diff --git a/pkgs/applications/misc/sweethome3d/editors.nix b/pkgs/applications/misc/sweethome3d/editors.nix
index 6c4b32ca9aa..14285a52e27 100644
--- a/pkgs/applications/misc/sweethome3d/editors.nix
+++ b/pkgs/applications/misc/sweethome3d/editors.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, fetchcvs, makeWrapper, makeDesktopItem, jdk, jre, ant
-, gtk3, gsettings-desktop-schemas, p7zip, sweethome3dApp }:
+{ stdenv, fetchcvs, makeWrapper, makeDesktopItem, jdk, jre, ant
+, gtk3, gsettings-desktop-schemas, sweethome3dApp }:
 
 let
 
diff --git a/pkgs/applications/misc/tasksh/default.nix b/pkgs/applications/misc/tasksh/default.nix
index 1e51ba22ddc..dac447edd7d 100644
--- a/pkgs/applications/misc/tasksh/default.nix
+++ b/pkgs/applications/misc/tasksh/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, libuuid, gnutls, readline }:
+{ stdenv, fetchurl, cmake, readline }:
 
 stdenv.mkDerivation rec {
   name = "tasksh-${version}";
diff --git a/pkgs/applications/misc/tilix/default.nix b/pkgs/applications/misc/tilix/default.nix
index 1cc03b4cd42..f30c6a63948 100644
--- a/pkgs/applications/misc/tilix/default.nix
+++ b/pkgs/applications/misc/tilix/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, dmd, gnome3, dbus
-, gsettings-desktop-schemas, libsecret, desktop-file-utils, gettext, gtkd
+, gsettings-desktop-schemas, desktop-file-utils, gettext, gtkd
 , perlPackages, wrapGAppsHook, xdg_utils }:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/applications/misc/timewarrior/default.nix b/pkgs/applications/misc/timewarrior/default.nix
index 9aca45264af..ff3caec2964 100644
--- a/pkgs/applications/misc/timewarrior/default.nix
+++ b/pkgs/applications/misc/timewarrior/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, libuuid, gnutls }:
+{ stdenv, fetchurl, cmake }:
 
 stdenv.mkDerivation rec {
   name = "timewarrior-${version}";
diff --git a/pkgs/applications/misc/twmn/default.nix b/pkgs/applications/misc/twmn/default.nix
index 297f3d0b599..020aa963541 100644
--- a/pkgs/applications/misc/twmn/default.nix
+++ b/pkgs/applications/misc/twmn/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, fetchgit, qtbase, qtx11extras, qmake, pkgconfig, boost }:
+{ stdenv, fetchgit, qtbase, qtx11extras, qmake, pkgconfig, boost }:
 
 stdenv.mkDerivation rec {
   name = "twmn-git-2014-09-23";
diff --git a/pkgs/applications/misc/wego/default.nix b/pkgs/applications/misc/wego/default.nix
index e59a3e98943..b61566af6b2 100644
--- a/pkgs/applications/misc/wego/default.nix
+++ b/pkgs/applications/misc/wego/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+{ stdenv, buildGoPackage, fetchgit }:
 
 buildGoPackage rec {
   name = "wego-${version}";
diff --git a/pkgs/applications/misc/welle-io/default.nix b/pkgs/applications/misc/welle-io/default.nix
index 27376f4db81..410346bce9a 100644
--- a/pkgs/applications/misc/welle-io/default.nix
+++ b/pkgs/applications/misc/welle-io/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildEnv, fetchFromGitHub, cmake, pkgconfig
+{ stdenv, fetchFromGitHub, cmake, pkgconfig
 , qtbase, qtcharts, qtmultimedia, qtquickcontrols, qtquickcontrols2
 , faad2, rtl-sdr, soapysdr-with-plugins, libusb, fftwSinglePrec }:
 let
diff --git a/pkgs/applications/misc/wsjtx/default.nix b/pkgs/applications/misc/wsjtx/default.nix
index 23be3a5dc4f..fd6be8f5920 100644
--- a/pkgs/applications/misc/wsjtx/default.nix
+++ b/pkgs/applications/misc/wsjtx/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, asciidoc, asciidoctor, autoconf, automake, cmake,
-  docbook_xsl, fftw, fftwFloat, gfortran, libtool, libpulseaudio, qtbase,
+  docbook_xsl, fftw, fftwFloat, gfortran, libtool, qtbase,
   qtmultimedia, qtserialport, texinfo, libusb1 }:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/applications/misc/xmr-stak/default.nix b/pkgs/applications/misc/xmr-stak/default.nix
index 05530af1254..9d68affa7ad 100644
--- a/pkgs/applications/misc/xmr-stak/default.nix
+++ b/pkgs/applications/misc/xmr-stak/default.nix
@@ -1,5 +1,5 @@
 { stdenv, stdenvGcc6, lib
-, fetchFromGitHub, cmake, libuv, libmicrohttpd, openssl
+, fetchFromGitHub, cmake, libmicrohttpd, openssl
 , opencl-headers, ocl-icd, hwloc, cudatoolkit
 , devDonationLevel ? "0.0"
 , cudaSupport ? false
diff --git a/pkgs/applications/misc/yarssr/default.nix b/pkgs/applications/misc/yarssr/default.nix
index cadf5ccb6a4..2c569b7d681 100644
--- a/pkgs/applications/misc/yarssr/default.nix
+++ b/pkgs/applications/misc/yarssr/default.nix
@@ -1,6 +1,6 @@
 {
 fetchFromGitHub, stdenv, lib,
-autoreconfHook, intltool, pkgconfig, makeWrapper, pkgs,
+makeWrapper, pkgs,
 perl, perlPackages,
 gnome2 }:
 
diff --git a/pkgs/applications/misc/yubioath-desktop/default.nix b/pkgs/applications/misc/yubioath-desktop/default.nix
index 06fa8d2bd0d..8843c821ffb 100644
--- a/pkgs/applications/misc/yubioath-desktop/default.nix
+++ b/pkgs/applications/misc/yubioath-desktop/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl,  python27Packages, swig, gettext, pcsclite, qt48Full, yubikey-personalization }:
+{ stdenv, fetchurl,  python27Packages, pcsclite, yubikey-personalization }:
 
 python27Packages.buildPythonApplication rec {
     namePrefix = "";
diff --git a/pkgs/applications/misc/zathura/core/default.nix b/pkgs/applications/misc/zathura/core/default.nix
index 415995a828d..001d70775d6 100644
--- a/pkgs/applications/misc/zathura/core/default.nix
+++ b/pkgs/applications/misc/zathura/core/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, meson, ninja, makeWrapper, pkgconfig
 , appstream-glib, desktop-file-utils, python3
-, gtk, girara, ncurses, gettext, libxml2
+, gtk, girara, gettext, libxml2
 , file, sqlite, glib, texlive, libintl, libseccomp
 , gtk-mac-integration, synctexSupport ? true
 }:
diff --git a/pkgs/applications/misc/zathura/pdf-mupdf/default.nix b/pkgs/applications/misc/zathura/pdf-mupdf/default.nix
index 86fe453465a..9d86dfe4a44 100644
--- a/pkgs/applications/misc/zathura/pdf-mupdf/default.nix
+++ b/pkgs/applications/misc/zathura/pdf-mupdf/default.nix
@@ -1,6 +1,5 @@
 { stdenv, lib, meson, ninja, fetchurl, pkgconfig, zathura_core, cairo,
-gtk-mac-integration, girara, mupdf, openssl , libjpeg, jbig2dec,
-openjpeg, fetchpatch }:
+gtk-mac-integration, girara, mupdf }:
 
 stdenv.mkDerivation rec {
   version = "0.3.3";
diff --git a/pkgs/applications/misc/zscroll/default.nix b/pkgs/applications/misc/zscroll/default.nix
index 92d173807f9..18876cf355b 100644
--- a/pkgs/applications/misc/zscroll/default.nix
+++ b/pkgs/applications/misc/zscroll/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, python3, python3Packages, fetchFromGitHub }:
+{ stdenv, python3, python3Packages, fetchFromGitHub }:
 
 let version = "1.0"; in
 
diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index 196e2eb79bd..c2471d8a0ea 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -5,7 +5,7 @@
 , libevent, expat, libjpeg, snappy
 , libpng, libcap
 , xdg_utils, yasm, minizip, libwebp
-, libusb1, pciutils, nss, re2, zlib, libvpx
+, libusb1, pciutils, nss, re2, zlib
 
 , python2Packages, perl, pkgconfig
 , nspr, systemd, kerberos
@@ -14,11 +14,10 @@
 , glib, gtk2, gtk3, dbus-glib
 , libXScrnSaver, libXcursor, libXtst, libGLU_combined
 , protobuf, speechd, libXdamage, cups
-, ffmpeg, harfbuzz, harfbuzz-icu, libxslt, libxml2
+, ffmpeg, libxslt, libxml2
 
 # optional dependencies
 , libgcrypt ? null # gnomeSupport || cupsSupport
-, libexif ? null # only needed for Chromium before version 51
 
 # package customization
 , enableNaCl ? false
diff --git a/pkgs/applications/networking/browsers/falkon/default.nix b/pkgs/applications/networking/browsers/falkon/default.nix
index 9dad2df7fd0..21631ef191c 100644
--- a/pkgs/applications/networking/browsers/falkon/default.nix
+++ b/pkgs/applications/networking/browsers/falkon/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, lib, fetchFromGitHub, cmake, extra-cmake-modules, pkgconfig, qmake
-, libpthreadstubs, libxcb, libXdmcp, qtsvg, qttools, qtwebengine, qtx11extras, kwallet, openssl }:
+{ stdenv, fetchFromGitHub, cmake, extra-cmake-modules, pkgconfig, qmake
+, libpthreadstubs, libxcb, libXdmcp, qtsvg, qttools, qtwebengine, qtx11extras, kwallet }:
 
 stdenv.mkDerivation rec {
   name = "falkon-${version}";
diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix
index 50eb396d644..336cd255661 100644
--- a/pkgs/applications/networking/browsers/firefox/common.nix
+++ b/pkgs/applications/networking/browsers/firefox/common.nix
@@ -8,7 +8,7 @@
 , freetype, fontconfig, file, nspr, nss, libnotify
 , yasm, libGLU_combined, sqlite, unzip, makeWrapper
 , hunspell, libevent, libstartup_notification, libvpx
-, cairo, icu, libpng, jemalloc, glib
+, icu, libpng, jemalloc, glib
 , autoconf213, which, gnused, cargo, rustc, llvmPackages
 , debugBuild ? false
 
diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix
index bdb9dab4f9d..f1d7b216120 100644
--- a/pkgs/applications/networking/browsers/firefox/packages.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages.nix
@@ -1,4 +1,4 @@
-{ lib, callPackage, stdenv, overrideCC, gcc5, fetchurl, fetchFromGitHub, fetchpatch, python3 }:
+{ lib, callPackage, stdenv, fetchurl, fetchFromGitHub, fetchpatch, python3 }:
 
 let
 
diff --git a/pkgs/applications/networking/browsers/google-chrome/default.nix b/pkgs/applications/networking/browsers/google-chrome/default.nix
index 2df2043517a..52a2ccb292b 100644
--- a/pkgs/applications/networking/browsers/google-chrome/default.nix
+++ b/pkgs/applications/networking/browsers/google-chrome/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, patchelf, makeWrapper
+{ stdenv, patchelf, makeWrapper
 
 # Linked dynamic libraries.
 , glib, fontconfig, freetype, pango, cairo, libX11, libXi, atk, gconf, nss, nspr
diff --git a/pkgs/applications/networking/browsers/lynx/default.nix b/pkgs/applications/networking/browsers/lynx/default.nix
index 9cdd32d2aae..6097c0e95f0 100644
--- a/pkgs/applications/networking/browsers/lynx/default.nix
+++ b/pkgs/applications/networking/browsers/lynx/default.nix
@@ -1,7 +1,6 @@
 { stdenv, buildPackages
 , fetchurl, pkgconfig, ncurses, gzip
 , sslSupport ? true, openssl ? null
-, buildPlatform, hostPlatform
 , nukeReferences
 }:
 
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix
index a320321ea17..a172e0e8d5d 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, rpm, cpio, libGL, xorg, cairo
+{ stdenv, fetchurl, libGL, xorg, cairo
 , libpng, gtk2, glib, gdk_pixbuf, fontconfig, freetype, curl
 , dbus-glib, alsaLib, libpulseaudio, systemd, pango
 }:
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/trezor/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/trezor/default.nix
index fb6e85ccdbb..3d4e0fc0022 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/trezor/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/trezor/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, dpkg, zlib }:
+{ stdenv, fetchurl, dpkg }:
 
 stdenv.mkDerivation {
   name = "TREZOR-bridge-1.0.5";
diff --git a/pkgs/applications/networking/browsers/otter/default.nix b/pkgs/applications/networking/browsers/otter/default.nix
index 0a8efb3aace..d1f50627d90 100644
--- a/pkgs/applications/networking/browsers/otter/default.nix
+++ b/pkgs/applications/networking/browsers/otter/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, cmake, openssl, gst_all_1, fetchFromGitHub
+{ stdenv, cmake, fetchFromGitHub
 , qtbase, qtmultimedia, qtwebengine
 , version ? "0.9.96"
 , sourceSha ? "1xzfy3jjx9sskwwbk7l8hnwnjf8af62p4kjkydp0ld0j50apc39p"
diff --git a/pkgs/applications/networking/browsers/vimprobable2/default.nix b/pkgs/applications/networking/browsers/vimprobable2/default.nix
index 54abc7dedff..9de7518677d 100644
--- a/pkgs/applications/networking/browsers/vimprobable2/default.nix
+++ b/pkgs/applications/networking/browsers/vimprobable2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, makeWrapper, glib, glib-networking, gtk2, libsoup, libX11, perl,
+{ stdenv, fetchurl, makeWrapper, glib-networking, gtk2, libsoup, libX11, perl,
   pkgconfig, webkit, gsettings-desktop-schemas }:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix
index 7aba25dc339..11264df98f1 100644
--- a/pkgs/applications/networking/browsers/vivaldi/default.nix
+++ b/pkgs/applications/networking/browsers/vivaldi/default.nix
@@ -1,8 +1,8 @@
 { stdenv, fetchurl, zlib, libX11, libXext, libSM, libICE
 , libXfixes, libXt, libXi, libXcursor, libXScrnSaver, libXcomposite, libXdamage, libXtst, libXrandr
 , alsaLib, dbus, cups, libexif, ffmpeg, systemd
-, freetype, fontconfig, libXft, libXrender, libxcb, expat, libXau, libXdmcp
-, libuuid, xz
+, freetype, fontconfig, libXft, libXrender, libxcb, expat
+, libuuid
 , gstreamer, gst-plugins-base, libxml2
 , glib, gtk3, pango, gdk_pixbuf, cairo, atk, at-spi2-atk, gnome3
 , nss, nspr
diff --git a/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix b/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix
index 11aa0ce706d..ab2c24727d7 100644
--- a/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix
+++ b/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch
+{ stdenv, fetchurl
 , dbus-glib, gtk2, gtk3, libexif, libpulseaudio, libXScrnSaver, ninja, nss
 , pciutils, pkgconfig, python2, xdg_utils
 }:
diff --git a/pkgs/applications/networking/cluster/habitat/default.nix b/pkgs/applications/networking/cluster/habitat/default.nix
index 1656e5a09a6..0c210dcc535 100644
--- a/pkgs/applications/networking/cluster/habitat/default.nix
+++ b/pkgs/applications/networking/cluster/habitat/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, rustPlatform, pkgconfig
+{ lib, fetchFromGitHub, rustPlatform, pkgconfig
 , libsodium, libarchive, openssl }:
 
 with rustPlatform;
diff --git a/pkgs/applications/networking/cluster/kompose/default.nix b/pkgs/applications/networking/cluster/kompose/default.nix
index ff0f664154a..d6e703f79d0 100644
--- a/pkgs/applications/networking/cluster/kompose/default.nix
+++ b/pkgs/applications/networking/cluster/kompose/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+{ stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "kompose-${version}";
diff --git a/pkgs/applications/networking/cluster/kops/default.nix b/pkgs/applications/networking/cluster/kops/default.nix
index a1e17f60810..5f7a2e8e284 100644
--- a/pkgs/applications/networking/cluster/kops/default.nix
+++ b/pkgs/applications/networking/cluster/kops/default.nix
@@ -1,5 +1,5 @@
 
-{ stdenv, lib, buildGoPackage, fetchFromGitHub, go-bindata }:
+{ stdenv, buildGoPackage, fetchFromGitHub, go-bindata }:
 
 buildGoPackage rec {
   name = "kops-${version}";
diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix
index 6bd7ba3eac2..01bf3467af9 100644
--- a/pkgs/applications/networking/cluster/kubernetes/default.nix
+++ b/pkgs/applications/networking/cluster/kubernetes/default.nix
@@ -1,5 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, fetchpatch, removeReferencesTo, which, go_1_9, go-bindata, makeWrapper, rsync
-, iptables, coreutils
+{ stdenv, lib, fetchFromGitHub, removeReferencesTo, which, go_1_9, go-bindata, makeWrapper, rsync
 , components ? [
     "cmd/kubeadm"
     "cmd/kubectl"
diff --git a/pkgs/applications/networking/cluster/mesos/default.nix b/pkgs/applications/networking/cluster/mesos/default.nix
index 961c0afc5c5..6e2089f9935 100644
--- a/pkgs/applications/networking/cluster/mesos/default.nix
+++ b/pkgs/applications/networking/cluster/mesos/default.nix
@@ -1,6 +1,6 @@
 { stdenv, lib, makeWrapper, fetchurl, curl, sasl, openssh
 , unzip, gnutar, jdk, python, wrapPython
-, setuptools, boto, pythonProtobuf, apr, subversion, gzip, systemd
+, setuptools, boto, pythonProtobuf, apr, subversion, gzip
 , leveldb, glog, perf, utillinux, libnl, iproute, openssl, libevent
 , ethtool, coreutils, which, iptables, maven
 , bash, autoreconfHook
diff --git a/pkgs/applications/networking/cluster/minikube/default.nix b/pkgs/applications/networking/cluster/minikube/default.nix
index 4c2e1b6f4c0..b674f1f6458 100644
--- a/pkgs/applications/networking/cluster/minikube/default.nix
+++ b/pkgs/applications/networking/cluster/minikube/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, buildGoPackage, fetchFromGitHub, fetchurl, go-bindata, libvirt, qemu
-, gpgme, makeWrapper, hostPlatform, vmnet, python, pkgconfig
+{ stdenv, buildGoPackage, fetchFromGitHub, go-bindata, libvirt, qemu
+, gpgme, makeWrapper, hostPlatform, vmnet, python
 , docker-machine-kvm, docker-machine-kvm2
 , extraDrivers ? []
 }:
diff --git a/pkgs/applications/networking/cluster/openshift/default.nix b/pkgs/applications/networking/cluster/openshift/default.nix
index 6b6a2dc8986..6f836d27357 100644
--- a/pkgs/applications/networking/cluster/openshift/default.nix
+++ b/pkgs/applications/networking/cluster/openshift/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, lib, fetchFromGitHub, fetchpatch, removeReferencesTo, which, go_1_9, go-bindata, makeWrapper, rsync, utillinux
-, iptables, coreutils, kerberos, clang
+{ stdenv, lib, fetchFromGitHub, removeReferencesTo, which, go_1_9, go-bindata, makeWrapper, rsync, utillinux
+, coreutils, kerberos, clang
 , components ? [
   "cmd/oc"
   "cmd/openshift"
diff --git a/pkgs/applications/networking/cluster/taktuk/default.nix b/pkgs/applications/networking/cluster/taktuk/default.nix
index 1510dc575cc..c61896d8921 100644
--- a/pkgs/applications/networking/cluster/taktuk/default.nix
+++ b/pkgs/applications/networking/cluster/taktuk/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, perl , openssh}:
+{ stdenv, fetchurl, perl }:
 
 stdenv.mkDerivation rec {
   version = "3.7.7";
diff --git a/pkgs/applications/networking/cluster/terraform-provider-ibm/default.nix b/pkgs/applications/networking/cluster/terraform-provider-ibm/default.nix
index ad4edec6b4e..fddf13795f3 100644
--- a/pkgs/applications/networking/cluster/terraform-provider-ibm/default.nix
+++ b/pkgs/applications/networking/cluster/terraform-provider-ibm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+{ stdenv, buildGoPackage, fetchFromGitHub }:
 
 #
 # USAGE:
diff --git a/pkgs/applications/networking/cluster/terraform-provider-nixos/default.nix b/pkgs/applications/networking/cluster/terraform-provider-nixos/default.nix
index 135e5402929..f4ad171c267 100644
--- a/pkgs/applications/networking/cluster/terraform-provider-nixos/default.nix
+++ b/pkgs/applications/networking/cluster/terraform-provider-nixos/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+{ stdenv, buildGoPackage, fetchFromGitHub }:
 buildGoPackage rec {
   name = "terraform-provider-nixos-${version}";
   version = "0.0.1";
diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix
index fbcb6c8be40..358a1f23147 100644
--- a/pkgs/applications/networking/cluster/terraform/default.nix
+++ b/pkgs/applications/networking/cluster/terraform/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildEnv, buildGoPackage, fetchpatch, fetchFromGitHub, makeWrapper }:
+{ stdenv, lib, buildEnv, buildGoPackage, fetchFromGitHub, makeWrapper }:
 
 let
   goPackagePath = "github.com/hashicorp/terraform";
@@ -75,7 +75,7 @@ let
             });
     in withPlugins (_: []);
 
-  plugins = import ./providers { inherit stdenv lib buildGoPackage fetchFromGitHub; };
+  plugins = import ./providers { inherit lib buildGoPackage fetchFromGitHub; };
 in rec {
   terraform_0_8_5 = generic {
     version = "0.8.5";
diff --git a/pkgs/applications/networking/cluster/terraform/providers/default.nix b/pkgs/applications/networking/cluster/terraform/providers/default.nix
index 40117b45855..cf1649f7bb3 100644
--- a/pkgs/applications/networking/cluster/terraform/providers/default.nix
+++ b/pkgs/applications/networking/cluster/terraform/providers/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 let
   list = import ./data.nix;
 
diff --git a/pkgs/applications/networking/compactor/default.nix b/pkgs/applications/networking/compactor/default.nix
index 749b94f7b7e..d2b1a8eba36 100644
--- a/pkgs/applications/networking/compactor/default.nix
+++ b/pkgs/applications/networking/compactor/default.nix
@@ -1,4 +1,4 @@
-{ autoconf, automake, boost, cbor-diag, cddl, fetchFromGitHub, file, gcc, libpcap, libtins, libtool, lzma, openssl, pkgconfig, stdenv, tcpdump, wireshark-cli }:
+{ autoconf, automake, boost, cbor-diag, cddl, fetchFromGitHub, file, libpcap, libtins, libtool, lzma, openssl, pkgconfig, stdenv, tcpdump, wireshark-cli }:
 
 stdenv.mkDerivation rec {
   name = "compactor-${version}";
diff --git a/pkgs/applications/networking/drive/default.nix b/pkgs/applications/networking/drive/default.nix
index 826452016e7..113d6a2e5f4 100644
--- a/pkgs/applications/networking/drive/default.nix
+++ b/pkgs/applications/networking/drive/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "drive-${version}";
diff --git a/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix
index 9793fd234a1..aa7895ce148 100644
--- a/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix
+++ b/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, fetchFromGitHub, stdenv, bitlbee, autoconf, automake, libtool, pkgconfig, glib, json-glib }:
+{ fetchFromGitHub, stdenv, bitlbee, autoconf, automake, libtool, pkgconfig, glib, json-glib }:
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
diff --git a/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix
index 1477d067464..a034827c4ed 100644
--- a/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix
+++ b/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, fetchFromGitHub, stdenv, bitlbee, autoconf, automake, libtool, pkgconfig, glib, libgcrypt }:
+{ fetchFromGitHub, stdenv, bitlbee, autoconf, automake, libtool, pkgconfig, glib, libgcrypt }:
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
diff --git a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix
index 0b2a97b5378..2ed7fbcee3b 100644
--- a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix
+++ b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, fetchpatch, stdenv, gnutls, glib, pkgconfig, check, libotr, python,
+{ fetchurl, stdenv, gnutls, glib, pkgconfig, check, libotr, python,
 enableLibPurple ? false, pidgin ? null }:
 
 with stdenv.lib;
diff --git a/pkgs/applications/networking/instant-messengers/ekiga/default.nix b/pkgs/applications/networking/instant-messengers/ekiga/default.nix
index 003ffbfc7d1..f831ac0847c 100644
--- a/pkgs/applications/networking/instant-messengers/ekiga/default.nix
+++ b/pkgs/applications/networking/instant-messengers/ekiga/default.nix
@@ -1,7 +1,7 @@
 { stdenv, glib, fetchurl, fetchpatch, cyrus_sasl, gettext, openldap, ptlib, opal, libXv, rarian, intltool
 , perl, perlXMLParser, evolution-data-server, gnome-doc-utils, avahi, autoreconfHook
 , libsigcxx, gtk, dbus-glib, libnotify, libXext, xextproto, gnome3, boost, libsecret
-, pkgconfig, libxml2, videoproto, unixODBC, db, nspr, nss, zlib, hicolor-icon-theme
+, pkgconfig, libxml2, videoproto, unixODBC, db, nspr, nss, zlib
 , libXrandr, randrproto, which, libxslt, libtasn1, gmp, nettle, sqlite, makeWrapper }:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/applications/networking/instant-messengers/linphone/default.nix b/pkgs/applications/networking/instant-messengers/linphone/default.nix
index e0aecd2c810..1b257ea61dc 100644
--- a/pkgs/applications/networking/instant-messengers/linphone/default.nix
+++ b/pkgs/applications/networking/instant-messengers/linphone/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, intltool, pkgconfig, readline, openldap, cyrus_sasl, libupnp
+{ stdenv, intltool, pkgconfig, readline, openldap, cyrus_sasl, libupnp
 , zlib, libxml2, gtk2, libnotify, speex, ffmpeg, libX11, libsoup, udev
 , ortp, mediastreamer, sqlite, belle-sip, libosip, libexosip, bzrtp
 , mediastreamer-openh264, bctoolbox, makeWrapper, fetchFromGitHub, cmake
diff --git a/pkgs/applications/networking/instant-messengers/mikutter/default.nix b/pkgs/applications/networking/instant-messengers/mikutter/default.nix
index 6b17eb0a897..3c267e612a6 100644
--- a/pkgs/applications/networking/instant-messengers/mikutter/default.nix
+++ b/pkgs/applications/networking/instant-messengers/mikutter/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl
-, bundlerEnv, ruby, pkgconfig
+, bundlerEnv, ruby
 , alsaUtils, libnotify, which, wrapGAppsHook, gtk2
 }:
 
diff --git a/pkgs/applications/networking/instant-messengers/pidgin/wrapper.nix b/pkgs/applications/networking/instant-messengers/pidgin/wrapper.nix
index 914b3480a95..095f838fe98 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin/wrapper.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin/wrapper.nix
@@ -1,4 +1,4 @@
-{ stdenv, symlinkJoin, pidgin, makeWrapper, plugins }:
+{ symlinkJoin, pidgin, makeWrapper, plugins }:
 
 let
 extraArgs = map (x: x.wrapArgs or "") plugins;
diff --git a/pkgs/applications/networking/instant-messengers/pond/default.nix b/pkgs/applications/networking/instant-messengers/pond/default.nix
index 5d463648bd8..e7527bafcc6 100644
--- a/pkgs/applications/networking/instant-messengers/pond/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pond/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, lib, buildGoPackage, trousers, dclxvi, wrapGAppsHook, pkgconfig, gtk3, gtkspell3,
-  fetchgit, fetchhg, fetchbzr, fetchsvn }:
+{ stdenv, buildGoPackage, trousers, dclxvi, wrapGAppsHook, pkgconfig, gtk3, gtkspell3,
+  fetchgit }:
 
 let
   gui = true; # Might be implemented with nixpkgs config.
diff --git a/pkgs/applications/networking/instant-messengers/psi/default.nix b/pkgs/applications/networking/instant-messengers/psi/default.nix
index 7fabfa5f772..37d9de8794e 100644
--- a/pkgs/applications/networking/instant-messengers/psi/default.nix
+++ b/pkgs/applications/networking/instant-messengers/psi/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, enchant, qt4, zlib, sox, libX11, xproto, libSM
-, libICE, qca2, pkgconfig, callPackage, which, glib
+, libICE, qca2, pkgconfig, which, glib
 , libXScrnSaver, scrnsaverproto
 }:
 
diff --git a/pkgs/applications/networking/instant-messengers/ricochet/default.nix b/pkgs/applications/networking/instant-messengers/ricochet/default.nix
index c99130f28a3..a6aef5e6a2f 100644
--- a/pkgs/applications/networking/instant-messengers/ricochet/default.nix
+++ b/pkgs/applications/networking/instant-messengers/ricochet/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, makeDesktopItem, unzip
+{ stdenv, fetchurl, pkgconfig, makeDesktopItem
 , qtbase, qttools, qtmultimedia, qtquick1, qtquickcontrols
 , openssl, protobuf, qmake
 }:
diff --git a/pkgs/applications/networking/instant-messengers/ring-daemon/default.nix b/pkgs/applications/networking/instant-messengers/ring-daemon/default.nix
index 024902a9c48..f858bb38dd1 100644
--- a/pkgs/applications/networking/instant-messengers/ring-daemon/default.nix
+++ b/pkgs/applications/networking/instant-messengers/ring-daemon/default.nix
@@ -30,7 +30,6 @@
 , openssl
 , perl
 , python3
-, bash
 , libupnp
 , speexdsp
 , fetchFromGitHub
diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix
index dbf17d9cbdb..37ce34f09df 100644
--- a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix
+++ b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, fetchpatch, writeText, conf ? null }:
+{ lib, stdenv, fetchurl, writeText, conf ? null }:
 
 let configFile = writeText "riot-config.json" conf; in
 stdenv.mkDerivation rec {
diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix
index 32648ee34c9..7f7245152b7 100644
--- a/pkgs/applications/networking/instant-messengers/slack/default.nix
+++ b/pkgs/applications/networking/instant-messengers/slack/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, dpkg, makeWrapper
 , alsaLib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, glib
 , gnome3, gtk3, gdk_pixbuf, libnotify, libxcb, nspr, nss, pango
-, systemd, wget, xorg }:
+, systemd, xorg }:
 
 let
 
diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
index 9354ae72821..39d664805fa 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
@@ -1,4 +1,4 @@
-{ qt5, stdenv }:
+{ qt5 }:
 
 let
   mkTelegram = args: qt5.callPackage (import ./generic.nix args) { };
diff --git a/pkgs/applications/networking/instant-messengers/utox/default.nix b/pkgs/applications/networking/instant-messengers/utox/default.nix
index e139904fee5..5955ecb60bd 100644
--- a/pkgs/applications/networking/instant-messengers/utox/default.nix
+++ b/pkgs/applications/networking/instant-messengers/utox/default.nix
@@ -1,6 +1,6 @@
 { stdenv, lib, fetchFromGitHub, check, cmake, pkgconfig
 , libtoxcore, filter-audio, dbus, libvpx, libX11, openal, freetype, libv4l
-, libXrender, fontconfig, libXext, libXft, utillinux, libsodium, libopus }:
+, libXrender, fontconfig, libXext, libXft, libsodium, libopus }:
 
 stdenv.mkDerivation rec {
   name = "utox-${version}";
diff --git a/pkgs/applications/networking/instant-messengers/vacuum/default.nix b/pkgs/applications/networking/instant-messengers/vacuum/default.nix
index 9ed954cc7ec..9d5d5c1b80f 100644
--- a/pkgs/applications/networking/instant-messengers/vacuum/default.nix
+++ b/pkgs/applications/networking/instant-messengers/vacuum/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub
+{ stdenv, fetchFromGitHub
   , qt4, qmake4Hook, openssl
   , xproto, libX11, libXScrnSaver, scrnsaverproto
   , xz, zlib
diff --git a/pkgs/applications/networking/irc/irssi/otr/default.nix b/pkgs/applications/networking/irc/irssi/otr/default.nix
index 8d7bf677983..add4fa632c9 100644
--- a/pkgs/applications/networking/irc/irssi/otr/default.nix
+++ b/pkgs/applications/networking/irc/irssi/otr/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchFromGitHub, libotr, automake, autoconf, libtool, glib, pkgconfig, irssi }:
+{ stdenv, fetchFromGitHub, libotr, automake, autoconf, libtool, glib, pkgconfig, irssi }:
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix
index a672fa73c4f..dcd16c7c5b2 100644
--- a/pkgs/applications/networking/irc/weechat/default.nix
+++ b/pkgs/applications/networking/irc/weechat/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, fetchurl, fetchpatch, lib
+{ stdenv, fetchurl, lib
 , ncurses, openssl, aspell, gnutls
 , zlib, curl, pkgconfig, libgcrypt
 , cmake, makeWrapper, libobjc, libresolv, libiconv
-, writeScriptBin, symlinkJoin # for withPlugins
+, writeScriptBin # for withPlugins
 , asciidoctor # manpages
 , guileSupport ? true, guile
 , luaSupport ? true, lua5
diff --git a/pkgs/applications/networking/mailreaders/alpine/default.nix b/pkgs/applications/networking/mailreaders/alpine/default.nix
index 3b45c2fd445..bb62014c77a 100644
--- a/pkgs/applications/networking/mailreaders/alpine/default.nix
+++ b/pkgs/applications/networking/mailreaders/alpine/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, ncurses, tcl, openssl, pam, pkgconfig, gettext, kerberos
+{stdenv, fetchurl, ncurses, tcl, openssl, pam, kerberos
 , openldap
 }:
 
diff --git a/pkgs/applications/networking/mailreaders/mailnag/default.nix b/pkgs/applications/networking/mailreaders/mailnag/default.nix
index 75f34952394..2b62db069bc 100644
--- a/pkgs/applications/networking/mailreaders/mailnag/default.nix
+++ b/pkgs/applications/networking/mailreaders/mailnag/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, gettext, gtk3, pythonPackages
 , gdk_pixbuf, libnotify, gst_all_1
-, libgnome-keyring3, networkmanager
+, libgnome-keyring3
 , wrapGAppsHook, gnome3
 # otherwise passwords are stored unencrypted
 , withGnomeKeyring ? true
diff --git a/pkgs/applications/networking/mailreaders/mailpile/default.nix b/pkgs/applications/networking/mailreaders/mailpile/default.nix
index 36dc94951d5..0f11d9a6df0 100644
--- a/pkgs/applications/networking/mailreaders/mailpile/default.nix
+++ b/pkgs/applications/networking/mailreaders/mailpile/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, python2Packages, gnupg1orig, makeWrapper, openssl, git }:
+{ stdenv, fetchFromGitHub, python2Packages, gnupg1orig, openssl, git }:
 
 python2Packages.buildPythonApplication rec {
   name = "mailpile-${version}";
diff --git a/pkgs/applications/networking/mailreaders/msgviewer/default.nix b/pkgs/applications/networking/mailreaders/msgviewer/default.nix
index 487b2799b98..6e2e8d58c67 100644
--- a/pkgs/applications/networking/mailreaders/msgviewer/default.nix
+++ b/pkgs/applications/networking/mailreaders/msgviewer/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, makeWrapper, writeScript, unzip, jre }:
+{ stdenv, fetchurl, makeWrapper, unzip, jre }:
 
 let
   version = "1.9";
diff --git a/pkgs/applications/networking/mailreaders/nylas-mail-bin/default.nix b/pkgs/applications/networking/mailreaders/nylas-mail-bin/default.nix
index 766aab39ce3..e7e199155d7 100644
--- a/pkgs/applications/networking/mailreaders/nylas-mail-bin/default.nix
+++ b/pkgs/applications/networking/mailreaders/nylas-mail-bin/default.nix
@@ -1,4 +1,4 @@
-{ dpkg, fetchurl, lib, pkgs, stdenv, config
+{ dpkg, fetchurl, lib, pkgs, stdenv
 , alsaLib
 , atk
 , cairo
@@ -13,7 +13,6 @@
 , gdk_pixbuf
 , glib
 , gnome2
-, libgcrypt
 , libgnome-keyring
 , libnotify
 , makeWrapper
diff --git a/pkgs/applications/networking/mailreaders/realpine/default.nix b/pkgs/applications/networking/mailreaders/realpine/default.nix
index 728287f8c75..713f585d283 100644
--- a/pkgs/applications/networking/mailreaders/realpine/default.nix
+++ b/pkgs/applications/networking/mailreaders/realpine/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, ncurses, tcl, openssl, pam, pkgconfig, gettext, kerberos
+{stdenv, fetchurl, ncurses, tcl, openssl, pam, kerberos
 , openldap
 }:
 # NOTE: Please check if any changes here are applicable to ../alpine/ as well
diff --git a/pkgs/applications/networking/mailreaders/sup/default.nix b/pkgs/applications/networking/mailreaders/sup/default.nix
index b7ac621eb6d..06777916b92 100644
--- a/pkgs/applications/networking/mailreaders/sup/default.nix
+++ b/pkgs/applications/networking/mailreaders/sup/default.nix
@@ -1,5 +1,4 @@
-{ stdenv, lib, bundlerEnv, gpgme, ruby, ncurses, writeText, zlib, xapian
-, pkgconfig, which }:
+{ lib, bundlerEnv, ruby }:
 
 bundlerEnv {
   name = "sup-0.22.1";
diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
index 92161164485..85c98742af3 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
@@ -3,7 +3,7 @@
 , freetype, fontconfig, file, nspr, nss, libnotify
 , yasm, libGLU_combined, sqlite, unzip
 , hunspell, libevent, libstartup_notification
-, cairo, gstreamer, gst-plugins-base, icu, libpng, jemalloc
+, icu, libpng, jemalloc
 , autoconf213, which, m4
 , writeScript, xidel, common-updater-scripts, coreutils, gnused, gnugrep, curl
 , enableGTK3 ? false, gtk3, gnome3, wrapGAppsHook, makeWrapper
diff --git a/pkgs/applications/networking/newsreaders/pan/default.nix b/pkgs/applications/networking/newsreaders/pan/default.nix
index 916bd36ba54..4a1940ae654 100644
--- a/pkgs/applications/networking/newsreaders/pan/default.nix
+++ b/pkgs/applications/networking/newsreaders/pan/default.nix
@@ -1,6 +1,6 @@
 { spellChecking ? true
 , stdenv, fetchurl, pkgconfig, gtk3, gtkspell3 ? null
-, perl, pcre, gmime2, gettext, intltool, itstool, libxml2, dbus-glib, libnotify, gnutls
+, perl, gmime2, gettext, intltool, itstool, libxml2, dbus-glib, libnotify, gnutls
 , makeWrapper, gnupg
 , gnomeSupport ? true, libgnome-keyring3
 }:
diff --git a/pkgs/applications/networking/owamp/default.nix b/pkgs/applications/networking/owamp/default.nix
index 293c6716483..9ed532acfe1 100644
--- a/pkgs/applications/networking/owamp/default.nix
+++ b/pkgs/applications/networking/owamp/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, fetchFromGitHub
+{stdenv, fetchFromGitHub
 , autoconf, automake, mandoc }:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/applications/networking/p2p/frostwire/default.nix b/pkgs/applications/networking/p2p/frostwire/default.nix
index 8cb5f768f95..7b854fce6c5 100644
--- a/pkgs/applications/networking/p2p/frostwire/default.nix
+++ b/pkgs/applications/networking/p2p/frostwire/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, gradle, perl, jre, makeWrapper, makeDesktopItem, mplayer }:
+{ stdenv, fetchFromGitHub, gradle, perl, jre, makeWrapper, makeDesktopItem, mplayer }:
 
 let
   version = "6.6.7-build-529";
diff --git a/pkgs/applications/networking/p2p/ktorrent/default.nix b/pkgs/applications/networking/p2p/ktorrent/default.nix
index 53485e95b9a..c66c3ca05a4 100644
--- a/pkgs/applications/networking/p2p/ktorrent/default.nix
+++ b/pkgs/applications/networking/p2p/ktorrent/default.nix
@@ -2,7 +2,7 @@
 , extra-cmake-modules, qtbase, qtscript
 , karchive, kcrash, kdnssd, ki18n, kio, knotifications, knotifyconfig
 , kdoctools, kross, kcmutils, kwindowsystem
-, libktorrent, boost, taglib, libgcrypt, kplotting
+, libktorrent, taglib, libgcrypt, kplotting
 }:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/applications/networking/p2p/retroshare/default.nix b/pkgs/applications/networking/p2p/retroshare/default.nix
index 950187ed9c6..34b4780633b 100644
--- a/pkgs/applications/networking/p2p/retroshare/default.nix
+++ b/pkgs/applications/networking/p2p/retroshare/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, libupnp, gpgme, gnome3, glib, libssh, pkgconfig, protobuf, bzip2
+{ stdenv, fetchFromGitHub, libupnp, gpgme, gnome3, glib, libssh, pkgconfig, protobuf, bzip2
 , libXScrnSaver, speex, curl, libxml2, libxslt, sqlcipher, libmicrohttpd, opencv, qmake, ffmpeg
 , qtmultimedia, qtx11extras, qttools }:
 
diff --git a/pkgs/applications/networking/p2p/soulseekqt/default.nix b/pkgs/applications/networking/p2p/soulseekqt/default.nix
index 315106ea852..e525c564c50 100644
--- a/pkgs/applications/networking/p2p/soulseekqt/default.nix
+++ b/pkgs/applications/networking/p2p/soulseekqt/default.nix
@@ -1,8 +1,8 @@
 { stdenv
 , fetchurl
 , dbus
-, expat, zlib, fontconfig
-, libpng, libX11, libxcb, libXau, libXdmcp, freetype, libbsd
+, zlib, fontconfig
+, libX11, libxcb, libXau, libXdmcp, freetype, libbsd
 }:
 
 with stdenv.lib;
diff --git a/pkgs/applications/networking/p2p/transmission/default.nix b/pkgs/applications/networking/p2p/transmission/default.nix
index d8fc1d840d2..d9ddf045921 100644
--- a/pkgs/applications/networking/p2p/transmission/default.nix
+++ b/pkgs/applications/networking/p2p/transmission/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, pkgconfig, intltool, file, wrapGAppsHook
+{ stdenv, fetchurl, pkgconfig, intltool, file, wrapGAppsHook
 , openssl, curl, libevent, inotify-tools, systemd, zlib
 , enableGTK3 ? false, gtk3
 , enableSystemd ? stdenv.isLinux
diff --git a/pkgs/applications/networking/p2p/tribler/default.nix b/pkgs/applications/networking/p2p/tribler/default.nix
index aa42af5ccbd..1169dba188c 100644
--- a/pkgs/applications/networking/p2p/tribler/default.nix
+++ b/pkgs/applications/networking/p2p/tribler/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pythonPackages, makeWrapper, nettools, libtorrentRasterbar, imagemagick
+{ stdenv, fetchurl, pythonPackages, makeWrapper, libtorrentRasterbar, imagemagick
 , enablePlayer ? true, vlc ? null, qt5 }:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/applications/networking/pyload/default.nix b/pkgs/applications/networking/pyload/default.nix
index c331c4f287e..6a89731ff10 100644
--- a/pkgs/applications/networking/pyload/default.nix
+++ b/pkgs/applications/networking/pyload/default.nix
@@ -1,5 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchpatch, pythonPackages, gocr, unrar, rhino, spidermonkey
-, pkgs }:
+{ stdenv, fetchFromGitHub, fetchpatch, pythonPackages, gocr, unrar, rhino, spidermonkey }:
 
 let
   beautifulsoup = pythonPackages.callPackage ./beautifulsoup.nix {
diff --git a/pkgs/applications/networking/remote/anydesk/default.nix b/pkgs/applications/networking/remote/anydesk/default.nix
index 19e85a9711d..0f107936be6 100644
--- a/pkgs/applications/networking/remote/anydesk/default.nix
+++ b/pkgs/applications/networking/remote/anydesk/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, autoPatchelfHook, makeWrapper, makeDesktopItem
-, atk, cairo, freetype, gdk_pixbuf, glib, gnome2, gtk2, libGLU_combined, pango, xorg
+{ stdenv, fetchurl, makeWrapper, makeDesktopItem
+, atk, cairo, gdk_pixbuf, glib, gnome2, gtk2, libGLU_combined, pango, xorg
 , lsb-release }:
 
 let
diff --git a/pkgs/applications/networking/remote/freerdp/legacy.nix b/pkgs/applications/networking/remote/freerdp/legacy.nix
index d3746fa6c7a..9830b846525 100644
--- a/pkgs/applications/networking/remote/freerdp/legacy.nix
+++ b/pkgs/applications/networking/remote/freerdp/legacy.nix
@@ -14,10 +14,9 @@
 , ffmpeg
 , libxkbfile
 #, xmlto, docbook_xml_dtd_412, docbook_xml_xslt
-, libXfixes
 , libXinerama
 , libXv
-, pulseaudioSupport ? true, libpulseaudio
+, pulseaudioSupport ? true
 }:
 
 assert printerSupport -> cups != null;
diff --git a/pkgs/applications/networking/remote/ssvnc/default.nix b/pkgs/applications/networking/remote/ssvnc/default.nix
index 1d1d6f4e1e3..f20bb740615 100644
--- a/pkgs/applications/networking/remote/ssvnc/default.nix
+++ b/pkgs/applications/networking/remote/ssvnc/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, imake, zlib, jdk, libX11, libXt, libXmu
-, libXaw, libXext, libXpm, openjpeg, openssl, tcl, tk, perl }:
+, libXaw, libXext, libXpm, openjpeg, openssl, tk, perl }:
 
 stdenv.mkDerivation rec {
   name = "ssvnc-${version}";
diff --git a/pkgs/applications/networking/remote/teamviewer/default.nix b/pkgs/applications/networking/remote/teamviewer/default.nix
index 5365228ae65..e4715cce8e1 100644
--- a/pkgs/applications/networking/remote/teamviewer/default.nix
+++ b/pkgs/applications/networking/remote/teamviewer/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, autoPatchelfHook, makeWrapper, xdg_utils, dbus, qtbase, qtwebkit, qtx11extras, qtquickcontrols, glibc, libXrandr, libX11 }:
+{ stdenv, fetchurl, autoPatchelfHook, makeWrapper, xdg_utils, dbus, qtbase, qtwebkit, qtx11extras, qtquickcontrols, glibc, libXrandr, libX11 }:
 
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/applications/networking/remote/xrdp/default.nix b/pkgs/applications/networking/remote/xrdp/default.nix
index 3061467c82b..a778042c2ea 100644
--- a/pkgs/applications/networking/remote/xrdp/default.nix
+++ b/pkgs/applications/networking/remote/xrdp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig, which, perl, autoconf, automake, libtool, openssl, systemd, pam, fuse, libjpeg, libopus, nasm, xorg }:
+{ stdenv, fetchFromGitHub, pkgconfig, which, perl, autoconf, automake, libtool, openssl, systemd, pam, fuse, libjpeg, libopus, nasm, xorg }:
 
 let
   xorgxrdp = stdenv.mkDerivation rec {
diff --git a/pkgs/applications/networking/seafile-client/default.nix b/pkgs/applications/networking/seafile-client/default.nix
index ea0a756e76d..a1f1d50e5be 100644
--- a/pkgs/applications/networking/seafile-client/default.nix
+++ b/pkgs/applications/networking/seafile-client/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, writeScript, pkgconfig, cmake, qtbase, qttools
+{ stdenv, fetchFromGitHub, pkgconfig, cmake, qtbase, qttools
 , seafile-shared, ccnet, makeWrapper
 , withShibboleth ? true, qtwebengine }:
 
diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix
index ef1dade4ddd..5232704cd36 100644
--- a/pkgs/applications/networking/sniffers/wireshark/default.nix
+++ b/pkgs/applications/networking/sniffers/wireshark/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, lib, fetchurl, pkgconfig, pcre, perl, flex, bison, gettext, libpcap, libnl, c-ares
-, gnutls, libgcrypt, libgpgerror, geoip, openssl, lua5, makeDesktopItem, python, libcap, glib
+{ stdenv, fetchurl, pkgconfig, pcre, perl, flex, bison, gettext, libpcap, libnl, c-ares
+, gnutls, libgcrypt, libgpgerror, geoip, openssl, lua5, python, libcap, glib
 , libssh, zlib, cmake, extra-cmake-modules, fetchpatch, makeWrapper
 , withGtk ? false, gtk3 ? null, librsvg ? null, gsettings-desktop-schemas ? null, wrapGAppsHook ? null
 , withQt ? false, qt5 ? null
diff --git a/pkgs/applications/networking/super-productivity/default.nix b/pkgs/applications/networking/super-productivity/default.nix
index 251bef91360..5519ba41ac7 100644
--- a/pkgs/applications/networking/super-productivity/default.nix
+++ b/pkgs/applications/networking/super-productivity/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, dpkg, makeWrapper
 , alsaLib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, glib
 , gnome3, gtk3, gdk_pixbuf, libnotify, libxcb, nspr, nss, pango
-, systemd, wget, xorg, xprintidle-ng }:
+, systemd, xorg, xprintidle-ng }:
 
 let
 
diff --git a/pkgs/applications/networking/sync/backintime/qt4.nix b/pkgs/applications/networking/sync/backintime/qt4.nix
index b8f388c63eb..26288f9f6e6 100644
--- a/pkgs/applications/networking/sync/backintime/qt4.nix
+++ b/pkgs/applications/networking/sync/backintime/qt4.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, makeWrapper, gettext, pkgconfig, libtool, backintime-common, python3, python3Packages }:
+{stdenv, makeWrapper, gettext, backintime-common, python3, python3Packages }:
 
 stdenv.mkDerivation rec {
   inherit (backintime-common) version src installFlags;
diff --git a/pkgs/applications/networking/sync/casync/default.nix b/pkgs/applications/networking/sync/casync/default.nix
index 82dd3a506de..bea6a0780ed 100644
--- a/pkgs/applications/networking/sync/casync/default.nix
+++ b/pkgs/applications/networking/sync/casync/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchpatch
+{ stdenv, fetchFromGitHub
 , meson, ninja, pkgconfig, sphinx
 , acl, curl, fuse, libselinux, udev, xz, zstd
 , fuseSupport ? true
diff --git a/pkgs/applications/networking/sync/rsync/base.nix b/pkgs/applications/networking/sync/rsync/base.nix
index abc1f27e4f6..fc4bc6c0671 100644
--- a/pkgs/applications/networking/sync/rsync/base.nix
+++ b/pkgs/applications/networking/sync/rsync/base.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch }:
+{ stdenv, fetchurl }:
 
 rec {
   version = "3.1.3";
diff --git a/pkgs/applications/networking/sync/rsync/default.nix b/pkgs/applications/networking/sync/rsync/default.nix
index f1e3f6b7301..0b4d580cd20 100644
--- a/pkgs/applications/networking/sync/rsync/default.nix
+++ b/pkgs/applications/networking/sync/rsync/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, perl, libiconv, zlib, popt
+{ stdenv, fetchurl, perl, libiconv, zlib, popt
 , enableACLs ? true, acl ? null
 , enableCopyDevicesPatch ? false
 }:
@@ -6,7 +6,7 @@
 assert enableACLs -> acl != null;
 
 let
-  base = import ./base.nix { inherit stdenv fetchurl fetchpatch; };
+  base = import ./base.nix { inherit stdenv fetchurl; };
 in
 stdenv.mkDerivation rec {
   name = "rsync-${base.version}";
diff --git a/pkgs/applications/networking/sync/rsync/rrsync.nix b/pkgs/applications/networking/sync/rsync/rrsync.nix
index bc2a6eb9c3c..e5c04798aab 100644
--- a/pkgs/applications/networking/sync/rsync/rrsync.nix
+++ b/pkgs/applications/networking/sync/rsync/rrsync.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, fetchpatch, perl, rsync }:
 
 let
-  base = import ./base.nix { inherit stdenv fetchurl fetchpatch; };
+  base = import ./base.nix { inherit stdenv fetchurl; };
 in
 stdenv.mkDerivation rec {
   name = "rrsync-${base.version}";
diff --git a/pkgs/applications/networking/znc/modules.nix b/pkgs/applications/networking/znc/modules.nix
index 4b68285c3f1..a799df2d1ed 100644
--- a/pkgs/applications/networking/znc/modules.nix
+++ b/pkgs/applications/networking/znc/modules.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchFromGitHub, znc }:
+{ stdenv, fetchFromGitHub, znc }:
 
 let
   zncDerivation = a@{
diff --git a/pkgs/applications/office/autokey/default.nix b/pkgs/applications/office/autokey/default.nix
index fdff39e27f9..0a6268f8452 100644
--- a/pkgs/applications/office/autokey/default.nix
+++ b/pkgs/applications/office/autokey/default.nix
@@ -1,5 +1,5 @@
 { lib, python3Packages, fetchFromGitHub, wrapGAppsHook, gobjectIntrospection
-, gtksourceview, gnome3, libappindicator-gtk3, libnotify }:
+, gnome3, libappindicator-gtk3, libnotify }:
 
 python3Packages.buildPythonApplication rec {
   name = "autokey-${version}";
diff --git a/pkgs/applications/office/calligra/default.nix b/pkgs/applications/office/calligra/default.nix
index 80046ecb2cd..a7c6165bdd2 100644
--- a/pkgs/applications/office/calligra/default.nix
+++ b/pkgs/applications/office/calligra/default.nix
@@ -1,5 +1,5 @@
 {
-  mkDerivation, lib, fetchurl, fetchpatch, extra-cmake-modules, kdoctools, makeWrapper,
+  mkDerivation, lib, fetchurl, extra-cmake-modules, kdoctools, makeWrapper,
   boost, qtwebkit, qtx11extras, shared-mime-info,
   breeze-icons, kactivities, karchive, kcodecs, kcompletion, kconfig, kconfigwidgets,
   kcoreaddons, kdbusaddons, kdiagram, kguiaddons, khtml, ki18n,
diff --git a/pkgs/applications/office/impressive/default.nix b/pkgs/applications/office/impressive/default.nix
index 92feb6618c9..8946bbab931 100644
--- a/pkgs/applications/office/impressive/default.nix
+++ b/pkgs/applications/office/impressive/default.nix
@@ -1,5 +1,5 @@
 { fetchurl, stdenv, python2, makeWrapper, lib
-, libGLU_combined, SDL, freeglut, ghostscript, pdftk, dejavu_fonts }:
+, SDL, ghostscript, pdftk, dejavu_fonts }:
 
 let
   version = "0.12.0";
diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix
index e3ff0b594b4..43258282ac0 100644
--- a/pkgs/applications/office/libreoffice/default.nix
+++ b/pkgs/applications/office/libreoffice/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pam, python3, libxslt, perl, ArchiveZip, gettext
-, CompressZlib, zlib, libjpeg, expat, pkgconfigUpstream, freetype, libwpd
+, CompressZlib, zlib, libjpeg, expat, freetype, libwpd
 , libxml2, db, sablotron, curl, fontconfig, libsndfile, neon
 , bison, flex, zip, unzip, gtk3, gtk2, libmspack, getopt, file, cairo, which
 , icu, boost, jdk, ant, cups, xorg, libcmis
@@ -8,7 +8,7 @@
 , autoconf, automake, openldap, bash, hunspell, librdf_redland, nss, nspr
 , libwpg, dbus-glib, glibc, qt4, clucene_core, libcdr, lcms, vigra
 , unixODBC, mdds, sane-backends, mythes, libexttextcat, libvisio
-, fontsConf, pkgconfig, libzip, bluez5, libtool, maven, carlito
+, fontsConf, pkgconfig, bluez5, libtool, carlito
 , libatomic_ops, graphite2, harfbuzz, libodfgen, libzmf
 , librevenge, libe-book, libmwaw, glm, glew, gst_all_1
 , gdb, commonsLogging, librdf_rasqal, wrapGAppsHook
diff --git a/pkgs/applications/office/libreoffice/still.nix b/pkgs/applications/office/libreoffice/still.nix
index dbfeb0f2fe8..7a2538e4bcd 100644
--- a/pkgs/applications/office/libreoffice/still.nix
+++ b/pkgs/applications/office/libreoffice/still.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pam, python3, libxslt, perl, ArchiveZip
-, CompressZlib, zlib, libjpeg, expat, pkgconfigUpstream, freetype, libwpd
+, CompressZlib, zlib, libjpeg, expat, freetype, libwpd
 , libxml2, db, sablotron, curl, fontconfig, libsndfile, neon
 , bison, flex, zip, unzip, gtk3, gtk2, libmspack, getopt, file, cairo, which
 , icu, boost, jdk, ant, cups, xorg, libcmis, carlito
@@ -8,7 +8,7 @@
 , autoconf, automake, openldap, bash, hunspell, librdf_redland, nss, nspr
 , libwpg, dbus-glib, glibc, qt4, clucene_core, libcdr, lcms, vigra
 , unixODBC, mdds, sane-backends, mythes, libexttextcat, libvisio
-, fontsConf, pkgconfig, libzip, bluez5, libtool, maven
+, fontsConf, pkgconfig, bluez5, libtool
 , libatomic_ops, graphite2, harfbuzz, libodfgen, libzmf
 , librevenge, libe-book, libmwaw, glm, glew, gst_all_1
 , gdb, commonsLogging, librdf_rasqal, wrapGAppsHook
diff --git a/pkgs/applications/office/moneyplex/default.nix b/pkgs/applications/office/moneyplex/default.nix
index 31de4db76f1..47d2ecc81ea 100644
--- a/pkgs/applications/office/moneyplex/default.nix
+++ b/pkgs/applications/office/moneyplex/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, patchelf, libredirect, coreutils, pcsclite
+{ stdenv, fetchurl, patchelf, coreutils, pcsclite
 , zlib, glib, gdk_pixbuf, gtk2, cairo, pango, libX11, atk, openssl }:
 
 let
diff --git a/pkgs/applications/office/timetrap/default.nix b/pkgs/applications/office/timetrap/default.nix
index 3564454a674..20dd27fa287 100644
--- a/pkgs/applications/office/timetrap/default.nix
+++ b/pkgs/applications/office/timetrap/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, bundlerEnv, ruby }:
+{ lib, bundlerEnv, ruby }:
 
 bundlerEnv rec {
   name = "timetrap-${version}";
diff --git a/pkgs/applications/office/trytond/default.nix b/pkgs/applications/office/trytond/default.nix
index d1b3cb1b1a1..59c58a3af13 100644
--- a/pkgs/applications/office/trytond/default.nix
+++ b/pkgs/applications/office/trytond/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, python2Packages
+{ stdenv, python2Packages
 , withPostgresql ? true }:
 
 with stdenv.lib;
diff --git a/pkgs/applications/office/wpsoffice/default.nix b/pkgs/applications/office/wpsoffice/default.nix
index a55a98b1f5e..46faf9ba651 100644
--- a/pkgs/applications/office/wpsoffice/default.nix
+++ b/pkgs/applications/office/wpsoffice/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchFromGitHub
+{ stdenv, fetchurl
 , libX11, glib, xorg, fontconfig, freetype
 , zlib, libpng12, libICE, libXrender, cups }:
 
diff --git a/pkgs/applications/office/zim/default.nix b/pkgs/applications/office/zim/default.nix
index 9f7048f3646..26a141dc506 100644
--- a/pkgs/applications/office/zim/default.nix
+++ b/pkgs/applications/office/zim/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, python2Packages }:
+{ stdenv, fetchurl, python2Packages }:
 
 #
 # TODO: Declare configuration options for the following optional dependencies:
diff --git a/pkgs/applications/science/astronomy/celestia/default.nix b/pkgs/applications/science/astronomy/celestia/default.nix
index 589625cc18f..e3ceffd34c1 100644
--- a/pkgs/applications/science/astronomy/celestia/default.nix
+++ b/pkgs/applications/science/astronomy/celestia/default.nix
@@ -1,6 +1,5 @@
 { stdenv, fetchurl, freeglut, gtk2, gtkglext, libjpeg_turbo, libtheora, libXmu
-, lua, libGLU_combined, pkgconfig, perl, autoreconfHook, glib, cairo
-, pango, gdk_pixbuf, atk
+, lua, libGLU_combined, pkgconfig, perl, autoreconfHook
 }:
 
 let
diff --git a/pkgs/applications/science/astronomy/stellarium/default.nix b/pkgs/applications/science/astronomy/stellarium/default.nix
index 11160812671..24d6246e90c 100644
--- a/pkgs/applications/science/astronomy/stellarium/default.nix
+++ b/pkgs/applications/science/astronomy/stellarium/default.nix
@@ -1,5 +1,5 @@
 { mkDerivation, lib, fetchFromGitHub
-, cmake, freetype, libpng, libGLU_combined, gettext, openssl, perl, libiconv
+, cmake, freetype, libpng, libGLU_combined, openssl, perl, libiconv
 , qtscript, qtserialport, qttools
 , qtmultimedia, qtlocation, makeWrapper, qtbase
 }:
diff --git a/pkgs/applications/science/biology/diamond/default.nix b/pkgs/applications/science/biology/diamond/default.nix
index a45e5df2f52..854e91b2fcb 100644
--- a/pkgs/applications/science/biology/diamond/default.nix
+++ b/pkgs/applications/science/biology/diamond/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, gcc, zlib }:
+{ stdenv, fetchurl, cmake, zlib }:
 
 stdenv.mkDerivation rec {
   name = "diamond-0.8.36";
diff --git a/pkgs/applications/science/biology/freebayes/default.nix b/pkgs/applications/science/biology/freebayes/default.nix
index 99d2dfa55dd..1a15dcf6197 100644
--- a/pkgs/applications/science/biology/freebayes/default.nix
+++ b/pkgs/applications/science/biology/freebayes/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, gcc, zlib, bzip2, lzma }:
+{ stdenv, fetchFromGitHub, zlib, bzip2, lzma }:
 
 stdenv.mkDerivation rec {
   name    = "freebayes-${version}";
diff --git a/pkgs/applications/science/biology/mosdepth/default.nix b/pkgs/applications/science/biology/mosdepth/default.nix
index 05cd7992aa9..4b4920a6ca3 100644
--- a/pkgs/applications/science/biology/mosdepth/default.nix
+++ b/pkgs/applications/science/biology/mosdepth/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchFromGitHub, nim, htslib, patchelf, pcre}:
+{stdenv, fetchFromGitHub, nim, htslib, pcre}:
 
 let
   hts-nim = fetchFromGitHub {
diff --git a/pkgs/applications/science/biology/raxml/default.nix b/pkgs/applications/science/biology/raxml/default.nix
index efe19a4e2b6..140f7032319 100644
--- a/pkgs/applications/science/biology/raxml/default.nix
+++ b/pkgs/applications/science/biology/raxml/default.nix
@@ -1,6 +1,5 @@
 { stdenv
 , fetchFromGitHub
-, zlib
 , pkgs
 , mpi ? false
 }:
diff --git a/pkgs/applications/science/biology/vcftools/default.nix b/pkgs/applications/science/biology/vcftools/default.nix
index ab3050955df..394973692dc 100755
--- a/pkgs/applications/science/biology/vcftools/default.nix
+++ b/pkgs/applications/science/biology/vcftools/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, htslib, zlib, autoreconfHook, pkgconfig, perl }:
+{ stdenv, fetchFromGitHub, zlib, autoreconfHook, pkgconfig, perl }:
 
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
diff --git a/pkgs/applications/science/electronics/adms/default.nix b/pkgs/applications/science/electronics/adms/default.nix
index 99b7ef79594..236225959f7 100644
--- a/pkgs/applications/science/electronics/adms/default.nix
+++ b/pkgs/applications/science/electronics/adms/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, libtool, autoreconfHook, flex, bison, gperf,
+{ stdenv, fetchFromGitHub, autoreconfHook, flex, bison, gperf,
   libxml2, perl, perlPackages, gd }:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/applications/science/electronics/bitscope/common.nix b/pkgs/applications/science/electronics/bitscope/common.nix
index ba2d5221cc5..64777b5a0ac 100644
--- a/pkgs/applications/science/electronics/bitscope/common.nix
+++ b/pkgs/applications/science/electronics/bitscope/common.nix
@@ -2,14 +2,12 @@
 , buildFHSUserEnv
 , cairo
 , dpkg
-, fetchurl
 , gdk_pixbuf
 , glib
 , gtk2-x11
 , makeWrapper
 , pango
 , stdenv
-, writeTextFile
 , xorg
 }:
 
diff --git a/pkgs/applications/science/electronics/bitscope/packages.nix b/pkgs/applications/science/electronics/bitscope/packages.nix
index dc333f3d3b7..58e01f4f9f4 100644
--- a/pkgs/applications/science/electronics/bitscope/packages.nix
+++ b/pkgs/applications/science/electronics/bitscope/packages.nix
@@ -1,8 +1,5 @@
-{ buildFHSUserEnv
-, callPackage
+{ callPackage
 , fetchurl
-, makeWrapper
-, stdenv
 }:
 
 let
diff --git a/pkgs/applications/science/electronics/kicad/default.nix b/pkgs/applications/science/electronics/kicad/default.nix
index 8e98bad55c3..e3244ec339e 100644
--- a/pkgs/applications/science/electronics/kicad/default.nix
+++ b/pkgs/applications/science/electronics/kicad/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchbzr, cmake, libGLU_combined, wxGTK, zlib, libX11, gettext, glew, cairo, curl, openssl, boost, pkgconfig, doxygen }:
+{ stdenv, fetchurl, cmake, libGLU_combined, wxGTK, zlib, libX11, gettext, glew, cairo, curl, openssl, boost, pkgconfig, doxygen }:
 
 stdenv.mkDerivation rec {
   name = "kicad-${version}";
diff --git a/pkgs/applications/science/electronics/librepcb/default.nix b/pkgs/applications/science/electronics/librepcb/default.nix
index 48afb5bf9dc..33eb52c18ee 100644
--- a/pkgs/applications/science/electronics/librepcb/default.nix
+++ b/pkgs/applications/science/electronics/librepcb/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, qtbase, qttools, qmake, libGLU_combined, openssl, zlib }:
+{ stdenv, fetchFromGitHub, qtbase, qttools, qmake }:
 
 stdenv.mkDerivation rec {
   name = "librepcb-${version}";
diff --git a/pkgs/applications/science/logic/aspino/default.nix b/pkgs/applications/science/logic/aspino/default.nix
index 5e1a448a7cf..d7a5e7b4c83 100644
--- a/pkgs/applications/science/logic/aspino/default.nix
+++ b/pkgs/applications/science/logic/aspino/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchFromGitHub, zlib, boost, glucose }:
+{ stdenv, fetchurl, fetchFromGitHub, zlib, boost }:
 
 let
   glucose' = fetchurl {
diff --git a/pkgs/applications/science/logic/coq2html/default.nix b/pkgs/applications/science/logic/coq2html/default.nix
index 9687ac66ead..a987bf1ba57 100644
--- a/pkgs/applications/science/logic/coq2html/default.nix
+++ b/pkgs/applications/science/logic/coq2html/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, make, fetchgit, ocaml }:
+{ stdenv, make, fetchgit, ocaml }:
 
 let 
   version = "20170720";
diff --git a/pkgs/applications/science/logic/elan/default.nix b/pkgs/applications/science/logic/elan/default.nix
index ff737de0cc4..2b7cb9c30fa 100644
--- a/pkgs/applications/science/logic/elan/default.nix
+++ b/pkgs/applications/science/logic/elan/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, pkgconfig, curl, openssl, zlib, fetchFromGitHub, rustPlatform }:
+{ stdenv, pkgconfig, curl, openssl, zlib, fetchFromGitHub, rustPlatform }:
 
 rustPlatform.buildRustPackage rec {
   name = "elan-${version}";
diff --git a/pkgs/applications/science/logic/hol_light/default.nix b/pkgs/applications/science/logic/hol_light/default.nix
index 8d7c11ee91b..a1779baf5f8 100644
--- a/pkgs/applications/science/logic/hol_light/default.nix
+++ b/pkgs/applications/science/logic/hol_light/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchpatch, writeScript, ocaml, camlp5 }:
+{ stdenv, fetchFromGitHub, fetchpatch, ocaml, camlp5 }:
 
 let
   start_script = ''
diff --git a/pkgs/applications/science/logic/lean2/default.nix b/pkgs/applications/science/logic/lean2/default.nix
index 2b861b6d06d..4e1415d3961 100644
--- a/pkgs/applications/science/logic/lean2/default.nix
+++ b/pkgs/applications/science/logic/lean2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, gmp, mpfr, boost, python
+{ stdenv, fetchFromGitHub, cmake, gmp, mpfr, python
 , gperftools, ninja, makeWrapper }:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/applications/science/logic/mcrl2/default.nix b/pkgs/applications/science/logic/mcrl2/default.nix
index 6d9549b526f..dc32e84279a 100644
--- a/pkgs/applications/science/logic/mcrl2/default.nix
+++ b/pkgs/applications/science/logic/mcrl2/default.nix
@@ -1,5 +1,4 @@
-{stdenv, fetchurl, cmake, subversion, libGLU_combined, qt5, boost,
- python27, python27Packages}:
+{stdenv, fetchurl, cmake, libGLU_combined, qt5, boost}:
 
 stdenv.mkDerivation rec {
   version = "201707";
diff --git a/pkgs/applications/science/logic/saw-tools/default.nix b/pkgs/applications/science/logic/saw-tools/default.nix
index 949b34420b7..65d2b4d91c3 100644
--- a/pkgs/applications/science/logic/saw-tools/default.nix
+++ b/pkgs/applications/science/logic/saw-tools/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gmp4, ncurses, zlib, makeWrapper, clang_35 }:
+{ stdenv, fetchurl, gmp4, ncurses, zlib, clang_35 }:
 
 let
   libPath = stdenv.lib.makeLibraryPath
diff --git a/pkgs/applications/science/logic/tamarin-prover/default.nix b/pkgs/applications/science/logic/tamarin-prover/default.nix
index fb37554b65f..4efc384ed22 100644
--- a/pkgs/applications/science/logic/tamarin-prover/default.nix
+++ b/pkgs/applications/science/logic/tamarin-prover/default.nix
@@ -1,4 +1,4 @@
-{ haskell, haskellPackages, mkDerivation, fetchFromGitHub, lib
+{ haskellPackages, mkDerivation, fetchFromGitHub, lib
 # the following are non-haskell dependencies
 , makeWrapper, which, maude, graphviz, sapic
 }:
diff --git a/pkgs/applications/science/logic/tlaplus/tlaps.nix b/pkgs/applications/science/logic/tlaplus/tlaps.nix
index 9a78c1df8b1..7d35f5f91df 100644
--- a/pkgs/applications/science/logic/tlaplus/tlaps.nix
+++ b/pkgs/applications/science/logic/tlaplus/tlaps.nix
@@ -1,8 +1,6 @@
-{ lib
-, fetchurl
-, makeWrapper
+{ fetchurl
 , stdenv
-, ocaml, gawk, isabelle, cvc3, perl, wget, which
+, ocaml, isabelle, cvc3, perl, wget, which
 }:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/applications/science/logic/workcraft/default.nix b/pkgs/applications/science/logic/workcraft/default.nix
index b677927a8ef..313fe5a9f1d 100644
--- a/pkgs/applications/science/logic/workcraft/default.nix
+++ b/pkgs/applications/science/logic/workcraft/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, pkgs, fetchurl, jre, makeWrapper }:
+{ stdenv, fetchurl, jre, makeWrapper }:
 
 stdenv.mkDerivation rec {
   name = "workcraft-${version}";
diff --git a/pkgs/applications/science/machine-learning/torch/torch-distro.nix b/pkgs/applications/science/machine-learning/torch/torch-distro.nix
index 85a4aa02e44..9c4f2402143 100644
--- a/pkgs/applications/science/machine-learning/torch/torch-distro.nix
+++ b/pkgs/applications/science/machine-learning/torch/torch-distro.nix
@@ -1,6 +1,6 @@
-{ luarocks, lib , stdenv,  writeText , readline,  makeWrapper,
-  less, ncurses, cmake, openblas, coreutils, fetchgit, libuuid, czmq, openssl,
-  gnuplot, fetchurl, lua, src, libjpeg, libpng
+{ luarocks, lib , stdenv,  readline,  makeWrapper,
+  less, ncurses, cmake, coreutils, fetchgit, libuuid, czmq, openssl,
+  gnuplot, lua, src, libjpeg, libpng
 } :
 
 let
diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix
index 25ebee96a10..913fac6ac12 100644
--- a/pkgs/applications/science/math/R/default.nix
+++ b/pkgs/applications/science/math/R/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, bzip2, gfortran, libX11, libXmu, libXt, libjpeg, libpng
 , libtiff, ncurses, pango, pcre, perl, readline, tcl, texLive, tk, xz, zlib
 , less, texinfo, graphviz, icu, pkgconfig, bison, imake, which, jdk, openblas
-, curl, Cocoa, Foundation, cf-private, libobjc, libcxx, tzdata, fetchpatch
+, curl, Cocoa, Foundation, libobjc, libcxx, tzdata
 , withRecommendedPackages ? true
 , enableStrictBarrier ? false
 }:
diff --git a/pkgs/applications/science/math/cntk/default.nix b/pkgs/applications/science/math/cntk/default.nix
index 07740f4c8ae..fe5c77be8b2 100644
--- a/pkgs/applications/science/math/cntk/default.nix
+++ b/pkgs/applications/science/math/cntk/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchgit, fetchFromGitHub, fetchpatch, cmake
+{ lib, stdenv, fetchgit, fetchFromGitHub, cmake
 , openblas, opencv3, libzip, boost, protobuf, openmpi
 , onebitSGDSupport ? false
 , cudaSupport ? false, cudatoolkit, nvidia_x11
diff --git a/pkgs/applications/science/math/colpack/default.nix b/pkgs/applications/science/math/colpack/default.nix
index 29785363b04..e62df7f11cc 100644
--- a/pkgs/applications/science/math/colpack/default.nix
+++ b/pkgs/applications/science/math/colpack/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, autoconf, automake, libtool, gettext }:
+{ stdenv, fetchFromGitHub, autoconf, automake, libtool, gettext }:
 
 stdenv.mkDerivation rec {
 
diff --git a/pkgs/applications/science/math/mathematica/10.nix b/pkgs/applications/science/math/mathematica/10.nix
index 6a49976c86b..4884ee1f93a 100644
--- a/pkgs/applications/science/math/mathematica/10.nix
+++ b/pkgs/applications/science/math/mathematica/10.nix
@@ -7,13 +7,11 @@
 , freetype
 , gcc
 , glib
-, libpng
 , ncurses
 , opencv
 , openssl
 , unixODBC
 , xorg
-, zlib
 , libxml2
 , libuuid
 }:
diff --git a/pkgs/applications/science/math/mathematica/9.nix b/pkgs/applications/science/math/mathematica/9.nix
index c4fd0c384c1..d60feb54695 100644
--- a/pkgs/applications/science/math/mathematica/9.nix
+++ b/pkgs/applications/science/math/mathematica/9.nix
@@ -7,13 +7,11 @@
 , freetype
 , gcc
 , glib
-, libpng
 , ncurses
 , opencv
 , openssl
 , unixODBC
 , xorg
-, zlib
 }:
 
 let
diff --git a/pkgs/applications/science/math/mathematica/default.nix b/pkgs/applications/science/math/mathematica/default.nix
index d2a518e9db0..fa4ff8b0068 100644
--- a/pkgs/applications/science/math/mathematica/default.nix
+++ b/pkgs/applications/science/math/mathematica/default.nix
@@ -8,7 +8,6 @@
 , freetype
 , gcc
 , glib
-, libpng
 , ncurses
 , opencv
 , openssl
diff --git a/pkgs/applications/science/math/sage/env-locations.nix b/pkgs/applications/science/math/sage/env-locations.nix
index 2ed079ab32b..288ffd6e0e1 100644
--- a/pkgs/applications/science/math/sage/env-locations.nix
+++ b/pkgs/applications/science/math/sage/env-locations.nix
@@ -1,5 +1,4 @@
-{ stdenv
-, writeTextFile
+{ writeTextFile
 , pari_data
 , pari
 , singular
diff --git a/pkgs/applications/science/math/sage/openblas-pc.nix b/pkgs/applications/science/math/sage/openblas-pc.nix
index ba46850bbc6..f4669a6557e 100644
--- a/pkgs/applications/science/math/sage/openblas-pc.nix
+++ b/pkgs/applications/science/math/sage/openblas-pc.nix
@@ -1,5 +1,4 @@
-{ stdenv
-, openblasCompat
+{ openblasCompat
 , writeTextFile
 , name
 }:
diff --git a/pkgs/applications/science/math/sage/sage-with-env.nix b/pkgs/applications/science/math/sage/sage-with-env.nix
index 3d1ebe87c6b..63b9772b823 100644
--- a/pkgs/applications/science/math/sage/sage-with-env.nix
+++ b/pkgs/applications/science/math/sage/sage-with-env.nix
@@ -3,8 +3,6 @@
 , makeWrapper
 , sage-env
 , sage-src
-, sagelib
-, sagedoc
 , openblasCompat
 , openblas-blas-pc
 , openblas-cblas-pc
@@ -14,7 +12,6 @@
 , singular
 , libgap
 , gap-libgap-compatible
-, gcc
 , giac
 , maxima-ecl
 , pari
diff --git a/pkgs/applications/science/math/sage/sagedoc.nix b/pkgs/applications/science/math/sage/sagedoc.nix
index 7b280e9e028..a594428a389 100644
--- a/pkgs/applications/science/math/sage/sagedoc.nix
+++ b/pkgs/applications/science/math/sage/sagedoc.nix
@@ -1,7 +1,5 @@
-{ pkgs
-, stdenv
+{ stdenv
 , sage-src
-, env-locations
 , sage-with-env
 , sagelib
 , python2
diff --git a/pkgs/applications/science/math/sage/sagelib.nix b/pkgs/applications/science/math/sage/sagelib.nix
index a053d997bf9..abcefba5e26 100644
--- a/pkgs/applications/science/math/sage/sagelib.nix
+++ b/pkgs/applications/science/math/sage/sagelib.nix
@@ -1,5 +1,4 @@
-{ stdenv
-, sage-src
+{ sage-src
 , perl
 , buildPythonPackage
 , arb
diff --git a/pkgs/applications/science/math/scilab/default.nix b/pkgs/applications/science/math/scilab/default.nix
index fcdbb6b985d..6063a45a3ef 100644
--- a/pkgs/applications/science/math/scilab/default.nix
+++ b/pkgs/applications/science/math/scilab/default.nix
@@ -1,6 +1,6 @@
 {stdenv, fetchurl, lib, gfortran
 , ncurses
-, Xaw3d, withXaw3d ? false
+, withXaw3d ? false
 #, withPVMlib ? false
 , tcl, tk, withTk ? false
 , gtk2, withGtk ? false # working ?
diff --git a/pkgs/applications/science/math/singular/default.nix b/pkgs/applications/science/math/singular/default.nix
index cec1a831c91..8be302f41e5 100644
--- a/pkgs/applications/science/math/singular/default.nix
+++ b/pkgs/applications/science/math/singular/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gmp, bison, perl, autoconf, ncurses, readline, coreutils, pkgconfig
+{ stdenv, fetchurl, gmp, bison, perl, ncurses, readline, coreutils, pkgconfig
 , autoreconfHook
 , file
 , flint
diff --git a/pkgs/applications/science/misc/gephi/default.nix b/pkgs/applications/science/misc/gephi/default.nix
index 3a0bcb66813..b81f188a91b 100644
--- a/pkgs/applications/science/misc/gephi/default.nix
+++ b/pkgs/applications/science/misc/gephi/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, callPackage, jdk, maven, javaPackages }:
+{ stdenv, fetchFromGitHub, jdk, maven, javaPackages }:
 
 let
   version = "0.9.2";
diff --git a/pkgs/applications/science/misc/golly/beta.nix b/pkgs/applications/science/misc/golly/beta.nix
index f423adbe786..dc768725d4f 100644
--- a/pkgs/applications/science/misc/golly/beta.nix
+++ b/pkgs/applications/science/misc/golly/beta.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, fetchgit
+{stdenv, fetchgit
 , wxGTK, perl, python2, zlib, libGLU_combined, libX11
 , automake, autoconf
 }:
diff --git a/pkgs/applications/science/misc/openmvg/default.nix b/pkgs/applications/science/misc/openmvg/default.nix
index 0f0c6aaf74d..c3e1cd60bf0 100644
--- a/pkgs/applications/science/misc/openmvg/default.nix
+++ b/pkgs/applications/science/misc/openmvg/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchgit, pkgconfig, cmake
+{ stdenv, fetchgit, pkgconfig, cmake
 , libjpeg ? null
 , zlib ? null
 , libpng ? null
diff --git a/pkgs/applications/science/misc/openmvs/default.nix b/pkgs/applications/science/misc/openmvs/default.nix
index 4e5b986a428..b665d5f4f68 100644
--- a/pkgs/applications/science/misc/openmvs/default.nix
+++ b/pkgs/applications/science/misc/openmvs/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, pkgconfig, cmake
+{ stdenv, fetchFromGitHub, pkgconfig, cmake
 , eigen, opencv, ceres-solver, cgal, boost, vcg
 , gmp, mpfr, glog, google-gflags, libjpeg_turbo }:
 
diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix
index 00ca1d2c7ab..e966e798ae6 100644
--- a/pkgs/applications/science/misc/root/default.nix
+++ b/pkgs/applications/science/misc/root/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, cmake, pcre, pkgconfig, python2
+{ stdenv, fetchurl, cmake, pcre, pkgconfig, python2
 , libX11, libXpm, libXft, libXext, libGLU_combined, zlib, libxml2, lz4, lzma, gsl, xxHash
 , Cocoa, OpenGL, noSplash ? false }:
 
diff --git a/pkgs/applications/science/robotics/gazebo/default.nix b/pkgs/applications/science/robotics/gazebo/default.nix
index babd87eb2b1..98ccd92c4ee 100644
--- a/pkgs/applications/science/robotics/gazebo/default.nix
+++ b/pkgs/applications/science/robotics/gazebo/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, cmake, pkgconfig, boost, protobuf, freeimage
   , boost-build, boost_process
   , xorg_sys_opengl, tbb, ogre, tinyxml-2
-  , libtar, glxinfo,  libusb, libxslt, ruby, ignition
+  , libtar, glxinfo,  libusb, libxslt, ignition
   , pythonPackages, utillinux
 
   # these deps are hidden; cmake doesn't catch them
diff --git a/pkgs/applications/science/robotics/qgroundcontrol/default.nix b/pkgs/applications/science/robotics/qgroundcontrol/default.nix
index 95462c02eb5..ce3317da9f8 100644
--- a/pkgs/applications/science/robotics/qgroundcontrol/default.nix
+++ b/pkgs/applications/science/robotics/qgroundcontrol/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, fetchgit, git,  espeak, SDL2, udev, doxygen, cmake
+{ stdenv, fetchgit, git,  SDL2, udev, doxygen
 , qtbase, qtlocation, qtserialport, qtdeclarative, qtconnectivity, qtxmlpatterns
 , qtsvg, qtquick1, qtquickcontrols, qtgraphicaleffects, qmake, qtspeech
-, makeWrapper, lndir
-, gst_all_1, qt-gstreamer1, pkgconfig, glibc
+, makeWrapper
+, gst_all_1, pkgconfig
 }:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/applications/science/robotics/yarp/default.nix b/pkgs/applications/science/robotics/yarp/default.nix
index 98576cfd091..507481cddab 100644
--- a/pkgs/applications/science/robotics/yarp/default.nix
+++ b/pkgs/applications/science/robotics/yarp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, pkgconfig, cmake, ace
+{ stdenv, fetchFromGitHub, cmake, ace
 }:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/applications/science/spyder/default.nix b/pkgs/applications/science/spyder/default.nix
index 4411d78cec2..0564f3de1b7 100644
--- a/pkgs/applications/science/spyder/default.nix
+++ b/pkgs/applications/science/spyder/default.nix
@@ -1,7 +1,7 @@
-{ stdenv, fetchPypi, unzip, buildPythonApplication, makeDesktopItem
+{ stdenv, fetchPypi, buildPythonApplication, makeDesktopItem
 # mandatory
 , numpydoc, qtconsole, qtawesome, jedi, pycodestyle, psutil
-, pyflakes, rope, sphinx, nbconvert, mccabe, pyopengl, cloudpickle
+, pyflakes, rope, nbconvert, mccabe, pyopengl, cloudpickle
 # optional
 , numpy ? null, scipy ? null, matplotlib ? null
 # optional
diff --git a/pkgs/applications/version-management/bazaar/tools.nix b/pkgs/applications/version-management/bazaar/tools.nix
index d6c65548c1f..0ad3c6079ac 100644
--- a/pkgs/applications/version-management/bazaar/tools.nix
+++ b/pkgs/applications/version-management/bazaar/tools.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, makeWrapper, python2Packages, bazaar }:
+{ stdenv, fetchurl, python2Packages }:
 
 python2Packages.buildPythonApplication rec {
   name = "bzr-tools-${version}";
diff --git a/pkgs/applications/version-management/bitkeeper/default.nix b/pkgs/applications/version-management/bitkeeper/default.nix
index 06cfc90e65f..26397380d57 100644
--- a/pkgs/applications/version-management/bitkeeper/default.nix
+++ b/pkgs/applications/version-management/bitkeeper/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, perl, gperf, bison, groff
-, pkgconfig, libXft, fontconfig, pcre
-, libtomcrypt, libtommath, lz4, zlib }:
+, pkgconfig, libXft, pcre
+, libtomcrypt, libtommath, lz4 }:
 
 stdenv.mkDerivation rec {
   name = "bitkeeper-${version}";
diff --git a/pkgs/applications/version-management/git-and-tools/fast-export/default.nix b/pkgs/applications/version-management/git-and-tools/fast-export/default.nix
index 474faa30467..88d1f07ee74 100644
--- a/pkgs/applications/version-management/git-and-tools/fast-export/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/fast-export/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchgit, mercurial, coreutils, git, makeWrapper, subversion}:
+{stdenv, fetchgit, mercurial, makeWrapper, subversion}:
 
 with stdenv.lib;
 stdenv.mkDerivation {
diff --git a/pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/default.nix
index 9f1d8e9d717..4d0f33730e4 100644
--- a/pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+{ stdenv, buildGoPackage, fetchgit }:
 
 buildGoPackage rec {
   name = "git-annex-remote-b2-${version}";
diff --git a/pkgs/applications/version-management/git-and-tools/git-cola/default.nix b/pkgs/applications/version-management/git-and-tools/git-cola/default.nix
index 391ca26de25..9bccbdb5049 100644
--- a/pkgs/applications/version-management/git-and-tools/git-cola/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-cola/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, pythonPackages, makeWrapper, gettext, git }:
+{ stdenv, fetchFromGitHub, pythonPackages, gettext, git }:
 
 let
   inherit (pythonPackages) buildPythonApplication pyqt5 sip pyinotify python mock;
diff --git a/pkgs/applications/version-management/git-and-tools/git-dit/default.nix b/pkgs/applications/version-management/git-and-tools/git-dit/default.nix
index 654576a29e8..9c362276383 100644
--- a/pkgs/applications/version-management/git-and-tools/git-dit/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-dit/default.nix
@@ -1,7 +1,6 @@
 { stdenv
 , fetchFromGitHub
 , openssl
-, gcc
 , zlib
 , libssh
 , cmake
diff --git a/pkgs/applications/version-management/git-and-tools/git-fame/default.nix b/pkgs/applications/version-management/git-and-tools/git-fame/default.nix
index 8b77efd1be2..9ca7a67a53e 100644
--- a/pkgs/applications/version-management/git-and-tools/git-fame/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-fame/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, bundlerEnv, ruby, fetchFromGitHub, makeWrapper, bundler }:
+{ stdenv, bundlerEnv, ruby }:
 
 bundlerEnv rec {
   inherit ruby;
diff --git a/pkgs/applications/version-management/git-and-tools/git-hub/default.nix b/pkgs/applications/version-management/git-and-tools/git-hub/default.nix
index 94143e652f9..ba126bb476c 100644
--- a/pkgs/applications/version-management/git-and-tools/git-hub/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-hub/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, docutils, gitMinimal, python2Packages }:
+{ stdenv, fetchFromGitHub, gitMinimal, python2Packages }:
 
 stdenv.mkDerivation rec {
   name = "git-hub-${version}";
diff --git a/pkgs/applications/version-management/git-and-tools/hub/default.nix b/pkgs/applications/version-management/git-and-tools/hub/default.nix
index 645b12220bd..12b7b8965ef 100644
--- a/pkgs/applications/version-management/git-and-tools/hub/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/hub/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoPackage, fetchFromGitHub, go, ronn, ruby, groff, Security, utillinux }:
+{ stdenv, buildGoPackage, fetchFromGitHub, ronn, ruby, groff, Security, utillinux }:
 
 buildGoPackage rec {
   name = "hub-${version}";
diff --git a/pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix b/pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix
index e3ceccdcf3b..17fb74945dc 100644
--- a/pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchpatch, qmake, qtbase, qttools, subversion, apr }:
+{ stdenv, fetchFromGitHub, qmake, qtbase, qttools, subversion, apr }:
 
 let
   version = "1.0.12";
diff --git a/pkgs/applications/version-management/git-lfs/1.nix b/pkgs/applications/version-management/git-lfs/1.nix
index 24c22d423d5..3cde046a2ad 100644
--- a/pkgs/applications/version-management/git-lfs/1.nix
+++ b/pkgs/applications/version-management/git-lfs/1.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+{ stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "git-lfs-${version}";
diff --git a/pkgs/applications/version-management/git-review/default.nix b/pkgs/applications/version-management/git-review/default.nix
index 21ceccf9f35..7b81c28c375 100644
--- a/pkgs/applications/version-management/git-review/default.nix
+++ b/pkgs/applications/version-management/git-review/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pythonPackages, python} :
+{ stdenv, fetchurl, pythonPackages} :
 
 pythonPackages.buildPythonApplication rec {
   name = "git-review-${version}";
diff --git a/pkgs/applications/version-management/git-sizer/default.nix b/pkgs/applications/version-management/git-sizer/default.nix
index a0d7382de34..9c5ab20d364 100644
--- a/pkgs/applications/version-management/git-sizer/default.nix
+++ b/pkgs/applications/version-management/git-sizer/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "git-sizer";
diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix
index 917deac6daa..5f8619b4a7f 100644
--- a/pkgs/applications/version-management/gitea/default.nix
+++ b/pkgs/applications/version-management/gitea/default.nix
@@ -1,5 +1,5 @@
 { stdenv, buildGoPackage, fetchFromGitHub, makeWrapper
-, git, coreutils, bash, gzip, openssh
+, git, bash, gzip, openssh
 , sqliteSupport ? true
 }:
 
diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix
index db2fdf0199e..3fb9b9492af 100644
--- a/pkgs/applications/version-management/gitkraken/default.nix
+++ b/pkgs/applications/version-management/gitkraken/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, libXcomposite, libgnome-keyring, makeWrapper, udev, curl, alsaLib
+{ stdenv, libXcomposite, libgnome-keyring, makeWrapper, udev, curl, alsaLib
 , libXfixes, atk, gtk2, libXrender, pango, gnome2, cairo, freetype, fontconfig
 , libX11, libXi, libxcb, libXext, libXcursor, glib, libXScrnSaver, libxkbfile, libXtst
 , nss, nspr, cups, fetchurl, expat, gdk_pixbuf, libXdamage, libXrandr, dbus
diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix
index 87e4aff28c3..71c62b75868 100644
--- a/pkgs/applications/version-management/gitlab/default.nix
+++ b/pkgs/applications/version-management/gitlab/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, stdenv, lib, bundler, fetchurl, fetchFromGitHub, bundlerEnv, libiconv
+{ stdenv, lib, fetchurl, fetchFromGitHub, bundlerEnv
 , ruby, tzdata, git, procps, nettools
 }:
 
diff --git a/pkgs/applications/version-management/gogs/default.nix b/pkgs/applications/version-management/gogs/default.nix
index 508c8b3fb6d..d3c248b4475 100644
--- a/pkgs/applications/version-management/gogs/default.nix
+++ b/pkgs/applications/version-management/gogs/default.nix
@@ -1,5 +1,5 @@
 { stdenv, buildGoPackage, fetchFromGitHub, makeWrapper
-, git, coreutils, bash, gzip, openssh
+, git, bash, gzip, openssh
 , sqliteSupport ? true
 }:
 
diff --git a/pkgs/applications/version-management/guitone/default.nix b/pkgs/applications/version-management/guitone/default.nix
index ded0d5e3986..88074a0862c 100644
--- a/pkgs/applications/version-management/guitone/default.nix
+++ b/pkgs/applications/version-management/guitone/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchmtn, qt4, qmake4Hook, pkgconfig, graphviz }:
+{ stdenv, fetchmtn, qt4, qmake4Hook, pkgconfig, graphviz }:
 
 let version = "1.0-mtn-head"; in
 stdenv.mkDerivation rec {
diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix
index a00393abf27..d786e939675 100644
--- a/pkgs/applications/version-management/mercurial/default.nix
+++ b/pkgs/applications/version-management/mercurial/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, python2Packages, makeWrapper, docutils, unzip
+{ stdenv, fetchurl, python2Packages, makeWrapper, unzip
 , guiSupport ? false, tk ? null
-, ApplicationServices, cf-private }:
+, ApplicationServices }:
 
 let
   # if you bump version, update pkgs.tortoisehg too or ping maintainer
diff --git a/pkgs/applications/version-management/rapidsvn/default.nix b/pkgs/applications/version-management/rapidsvn/default.nix
index 7b3c7aafa44..e799d5fac43 100644
--- a/pkgs/applications/version-management/rapidsvn/default.nix
+++ b/pkgs/applications/version-management/rapidsvn/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, wxGTK, subversion, apr, aprutil, python }:
+{ stdenv, fetchurl, wxGTK, subversion, apr, aprutil, python }:
 
 stdenv.mkDerivation rec {
   name = "rapidsvn-${version}";
diff --git a/pkgs/applications/version-management/redmine/default.nix b/pkgs/applications/version-management/redmine/default.nix
index 1535d88026a..5a23c38a886 100644
--- a/pkgs/applications/version-management/redmine/default.nix
+++ b/pkgs/applications/version-management/redmine/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ruby, bundler, libiconv, libxslt, libxml2, pkgconfig, libffi, glibc, imagemagickBig, postgresql }:
+{ stdenv, fetchurl, ruby, bundler, libiconv, libxslt, libxml2, pkgconfig, libffi, imagemagickBig, postgresql }:
 
 let
   gemspec = map (gem: fetchurl { url=gem.url; sha256=gem.hash; }) (import ./Gemfile.nix);
diff --git a/pkgs/applications/version-management/reposurgeon/default.nix b/pkgs/applications/version-management/reposurgeon/default.nix
index 84b6633b883..3fd66572315 100644
--- a/pkgs/applications/version-management/reposurgeon/default.nix
+++ b/pkgs/applications/version-management/reposurgeon/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, makeWrapper, python27Packages, git
 , docbook_xml_dtd_412, docbook_xsl, asciidoc, xmlto
 , bazaar ? null, cvs ? null, darcs ? null, fossil ? null
-, mercurial ? null, monotone ? null, rcs ? null, src ? null
+, mercurial ? null, monotone ? null, rcs ? null
 , subversion ? null, cvs_fast_export ? null }:
 
 with stdenv; with lib;
diff --git a/pkgs/applications/version-management/smartgithg/default.nix b/pkgs/applications/version-management/smartgithg/default.nix
index a34afbab55e..519f339a508 100644
--- a/pkgs/applications/version-management/smartgithg/default.nix
+++ b/pkgs/applications/version-management/smartgithg/default.nix
@@ -2,7 +2,6 @@
 , jre
 , gtk2, glib
 , libXtst
-, git, mercurial, subversion
 , which
 }:
 
diff --git a/pkgs/applications/version-management/tailor/default.nix b/pkgs/applications/version-management/tailor/default.nix
index dc202e9e7b4..c68cc928848 100644
--- a/pkgs/applications/version-management/tailor/default.nix
+++ b/pkgs/applications/version-management/tailor/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, python2Packages }:
+{ fetchurl, python2Packages }:
 
 python2Packages.buildPythonApplication rec {
   name = "tailor-${version}";
diff --git a/pkgs/applications/version-management/yadm/default.nix b/pkgs/applications/version-management/yadm/default.nix
index 8b2d6fcc8c3..0553b60fde7 100644
--- a/pkgs/applications/version-management/yadm/default.nix
+++ b/pkgs/applications/version-management/yadm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchFromGitHub }:
+{ stdenv, fetchFromGitHub }:
 
 let version = "1.12.0"; in
 stdenv.mkDerivation {
diff --git a/pkgs/applications/video/avidemux/default.nix b/pkgs/applications/video/avidemux/default.nix
index b36147009a6..0637e813b48 100644
--- a/pkgs/applications/video/avidemux/default.nix
+++ b/pkgs/applications/video/avidemux/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, cmake, pkgconfig, lndir
+{ stdenv, lib, fetchurl, cmake, pkgconfig
 , zlib, gettext, libvdpau, libva, libXv, sqlite
 , yasm, freetype, fontconfig, fribidi
 , makeWrapper, libXext, libGLU, qttools, qtbase
diff --git a/pkgs/applications/video/cinelerra/default.nix b/pkgs/applications/video/cinelerra/default.nix
index 4adbdbdadb2..4235ebb802e 100644
--- a/pkgs/applications/video/cinelerra/default.nix
+++ b/pkgs/applications/video/cinelerra/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, sourceFromHead, autoconf, automake, libtool
+{ stdenv, fetchgit, autoconf, automake, libtool
 , pkgconfig, faad2, faac, a52dec, alsaLib, fftw, lame, libavc1394
 , libiec61883, libraw1394, libsndfile, libvorbis, libogg, libjpeg
 , libtiff, freetype, mjpegtools, x264, gettext, openexr
diff --git a/pkgs/applications/video/devede/default.nix b/pkgs/applications/video/devede/default.nix
index 157e4903e52..48c5032f2da 100644
--- a/pkgs/applications/video/devede/default.nix
+++ b/pkgs/applications/video/devede/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, stdenv, fetchFromGitHub, python3Packages, ffmpeg, mplayer, vcdimager, cdrkit, dvdauthor
+{ stdenv, fetchFromGitHub, python3Packages, ffmpeg, mplayer, vcdimager, cdrkit, dvdauthor
 , gtk3, gettext, wrapGAppsHook, gdk_pixbuf }:
 
 let
diff --git a/pkgs/applications/video/handbrake/default.nix b/pkgs/applications/video/handbrake/default.nix
index 0d0ac0a2e94..32dd3e6ff75 100644
--- a/pkgs/applications/video/handbrake/default.nix
+++ b/pkgs/applications/video/handbrake/default.nix
@@ -4,13 +4,13 @@
 #
 
 { stdenv, lib, fetchurl,
-  python2, pkgconfig, yasm, harfbuzz, zlib,
+  python2, pkgconfig, yasm, zlib,
   autoconf, automake, libtool, m4, jansson,
   libass, libiconv, libsamplerate, fribidi, libxml2, bzip2,
   libogg, libopus, libtheora, libvorbis, libdvdcss, a52dec,
   lame, libdvdread, libdvdnav, libbluray,
   mp4v2, mpeg2dec, x264, x265, libmkv,
-  fontconfig, freetype, hicolor-icon-theme,
+  fontconfig, freetype,
   glib, gtk3, intltool, libnotify,
   gst_all_1, dbus-glib, udev, libgudev, libvpx,
   useGtk ? true, wrapGAppsHook ? null, libappindicator-gtk3 ? null,
diff --git a/pkgs/applications/video/k9copy/default.nix b/pkgs/applications/video/k9copy/default.nix
index 48c7624cfa6..1e8883eae7f 100644
--- a/pkgs/applications/video/k9copy/default.nix
+++ b/pkgs/applications/video/k9copy/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl
-, cmake, automoc4
+, cmake
 , dvdauthor, xineLib, libmpeg2, libav, libdvdread, libdvdnav, dvdplusrwtools
 , phonon, qtx11extras
 , extra-cmake-modules, kio, kiconthemes, ki18n, kdesu, kdoctools, solid
diff --git a/pkgs/applications/video/kodi/commons.nix b/pkgs/applications/video/kodi/commons.nix
index 734229eac93..eff9b787106 100644
--- a/pkgs/applications/video/kodi/commons.nix
+++ b/pkgs/applications/video/kodi/commons.nix
@@ -1,6 +1,5 @@
-{ stdenv, fetchurl, fetchFromGitHub, fetchpatch, lib
-, unzip, cmake, kodiPlain, steam, libcec_platform, tinyxml
-, libusb, pcre-cpp, jsoncpp, libhdhomerun }:
+{ stdenv, fetchFromGitHub
+, cmake, kodiPlain, libcec_platform, tinyxml }:
 
 rec {
 
diff --git a/pkgs/applications/video/kodi/default.nix b/pkgs/applications/video/kodi/default.nix
index 776d2732327..5ca678a2e17 100644
--- a/pkgs/applications/video/kodi/default.nix
+++ b/pkgs/applications/video/kodi/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, fetchurl, autoconf, automake, libtool, makeWrapper
+{ stdenv, lib, fetchFromGitHub, autoconf, automake, libtool, makeWrapper
 , pkgconfig, cmake, gnumake, yasm, python2
 , libgcrypt, libgpgerror, libunistring
 , boost, avahi, lame, autoreconfHook
diff --git a/pkgs/applications/video/kodi/plugins.nix b/pkgs/applications/video/kodi/plugins.nix
index 4d6b1885454..5a0583202e6 100644
--- a/pkgs/applications/video/kodi/plugins.nix
+++ b/pkgs/applications/video/kodi/plugins.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, callPackage, fetchurl, fetchFromGitHub, unzip
+{ stdenv, callPackage, fetchurl, fetchFromGitHub, unzip
 , steam, libusb, pcre-cpp, jsoncpp, libhdhomerun, zlib }:
 
 with (callPackage ./commons.nix {});
diff --git a/pkgs/applications/video/lightworks/default.nix b/pkgs/applications/video/lightworks/default.nix
index e3b94b69179..64a967001b5 100644
--- a/pkgs/applications/video/lightworks/default.nix
+++ b/pkgs/applications/video/lightworks/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, dpkg, makeWrapper, patchelf, buildFHSUserEnv
-, gtk3, gnome3, gdk_pixbuf, cairo, libjpeg_original, glib, gnome2, libGLU
+{ stdenv, fetchurl, dpkg, makeWrapper, buildFHSUserEnv
+, gnome3, gdk_pixbuf, cairo, libjpeg_original, glib, gnome2, libGLU
 , nvidia_cg_toolkit, zlib, openssl, portaudio
 }:
 let
diff --git a/pkgs/applications/video/mapmap/default.nix b/pkgs/applications/video/mapmap/default.nix
index 6569caad6c5..c44bd25b91a 100644
--- a/pkgs/applications/video/mapmap/default.nix
+++ b/pkgs/applications/video/mapmap/default.nix
@@ -1,7 +1,6 @@
 { stdenv 
 , fetchFromGitHub
 , qttools
-, qtbase
 , qtmultimedia
 , liblo
 , gst_all_1
diff --git a/pkgs/applications/video/mplayer/default.nix b/pkgs/applications/video/mplayer/default.nix
index f2d40c2ac80..02a0c2c0ec4 100644
--- a/pkgs/applications/video/mplayer/default.nix
+++ b/pkgs/applications/video/mplayer/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, pkgconfig, freetype, yasm, ffmpeg
+{ stdenv, fetchurl, pkgconfig, freetype, yasm, ffmpeg
 , aalibSupport ? true, aalib ? null
 , fontconfigSupport ? true, fontconfig ? null, freefont_ttf ? null
 , fribidiSupport ? true, fribidi ? null
diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix
index cefd5b66aed..e3954598cbe 100644
--- a/pkgs/applications/video/mpv/default.nix
+++ b/pkgs/applications/video/mpv/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchFromGitHub, fetchpatch, makeWrapper
+{ stdenv, fetchurl, fetchFromGitHub, makeWrapper
 , docutils, perl, pkgconfig, python3, which, ffmpeg_4
 , freefont_ttf, freetype, libass, libpthreadstubs
 , lua, luasocket, libuchardet, libiconv ? null, darwin
diff --git a/pkgs/applications/video/natron/default.nix b/pkgs/applications/video/natron/default.nix
index 1eb725d10bb..090b4ec9ffe 100644
--- a/pkgs/applications/video/natron/default.nix
+++ b/pkgs/applications/video/natron/default.nix
@@ -1,6 +1,6 @@
 { lib, stdenv, fetchurl, qt4, pkgconfig, boost, expat, cairo, python2Packages,
   cmake, flex, bison, pango, librsvg, librevenge, libxml2, libcdr, libzip,
-  poppler, imagemagick, glew, openexr, ffmpeg, opencolorio, openimageio,
+  poppler, imagemagick, openexr, ffmpeg, opencolorio, openimageio,
   qmake4Hook, libpng, libGL, lndir }:
 
 let
diff --git a/pkgs/applications/video/openshot-qt/libopenshot.nix b/pkgs/applications/video/openshot-qt/libopenshot.nix
index 9e5e278ba89..422b50a8585 100644
--- a/pkgs/applications/video/openshot-qt/libopenshot.nix
+++ b/pkgs/applications/video/openshot-qt/libopenshot.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchpatch
+{ stdenv, fetchFromGitHub
 , pkgconfig, cmake, doxygen
 , libopenshot-audio, imagemagick, ffmpeg
 , swig, python3
diff --git a/pkgs/applications/video/pitivi/default.nix b/pkgs/applications/video/pitivi/default.nix
index 6c92b9aeed6..cea85f553b5 100644
--- a/pkgs/applications/video/pitivi/default.nix
+++ b/pkgs/applications/video/pitivi/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, intltool, itstool, wrapGAppsHook
-, python3Packages, gst, gtk3, hicolor-icon-theme
+, python3Packages, gst, gtk3
 , gobjectIntrospection, librsvg, gnome3, libnotify
 , meson, ninja
 }:
diff --git a/pkgs/applications/video/qstopmotion/default.nix b/pkgs/applications/video/qstopmotion/default.nix
index a689697e0a0..1fce30edbdf 100644
--- a/pkgs/applications/video/qstopmotion/default.nix
+++ b/pkgs/applications/video/qstopmotion/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, qt5, ffmpeg, guvcview, automoc4
+{ stdenv, fetchurl, qt5, ffmpeg, guvcview
 , cmake, ninja, libxml2, gettext, pkgconfig, libgphoto2, gphoto2, v4l_utils
 , libv4l, pcre }:
 
diff --git a/pkgs/applications/video/recordmydesktop/gtk.nix b/pkgs/applications/video/recordmydesktop/gtk.nix
index 2beb3ca94f2..984b623cee7 100644
--- a/pkgs/applications/video/recordmydesktop/gtk.nix
+++ b/pkgs/applications/video/recordmydesktop/gtk.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchsvn, recordmydesktop, autoreconfHook, pkgconfig, glib
+{ stdenv, lib, fetchsvn, recordmydesktop, autoreconfHook, pkgconfig
 , pythonPackages, jack2, xwininfo }:
 
 let
diff --git a/pkgs/applications/video/zdfmediathk/default.nix b/pkgs/applications/video/zdfmediathk/default.nix
index d85e4df7434..a875daf065e 100644
--- a/pkgs/applications/video/zdfmediathk/default.nix
+++ b/pkgs/applications/video/zdfmediathk/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, unzip, jre }:
+{ stdenv, fetchurl, jre }:
 
 with stdenv;
 
diff --git a/pkgs/applications/virtualization/containerd/default.nix b/pkgs/applications/virtualization/containerd/default.nix
index 46d03ad3d62..6c739b32c5f 100644
--- a/pkgs/applications/virtualization/containerd/default.nix
+++ b/pkgs/applications/virtualization/containerd/default.nix
@@ -1,5 +1,5 @@
 { stdenv, lib, fetchFromGitHub, removeReferencesTo
-, go, libapparmor, apparmor-parser, libseccomp, btrfs-progs }:
+, go, btrfs-progs }:
 
 with lib;
 
diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix
index 6e40f9ba076..d52b5365b5e 100644
--- a/pkgs/applications/virtualization/docker/default.nix
+++ b/pkgs/applications/virtualization/docker/default.nix
@@ -1,6 +1,6 @@
 { stdenv, lib, fetchFromGitHub, makeWrapper, removeReferencesTo, pkgconfig
 , go-md2man, go, containerd, runc, docker-proxy, tini, libtool
-, sqlite, iproute, bridge-utils, lvm2, systemd
+, sqlite, iproute, lvm2, systemd
 , btrfs-progs, iptables, e2fsprogs, xz, utillinux, xfsprogs
 , procps, libseccomp
 }:
diff --git a/pkgs/applications/virtualization/runc/default.nix b/pkgs/applications/virtualization/runc/default.nix
index b0fd42f4efb..7172b172ef2 100644
--- a/pkgs/applications/virtualization/runc/default.nix
+++ b/pkgs/applications/virtualization/runc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, fetchpatch, removeReferencesTo, go-md2man
+{ stdenv, lib, fetchFromGitHub, removeReferencesTo, go-md2man
 , go, pkgconfig, libapparmor, apparmor-parser, libseccomp }:
 
 with lib;
diff --git a/pkgs/applications/virtualization/virtinst/default.nix b/pkgs/applications/virtualization/virtinst/default.nix
index f0ee4b5b26e..8222fb50a8f 100644
--- a/pkgs/applications/virtualization/virtinst/default.nix
+++ b/pkgs/applications/virtualization/virtinst/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, python2Packages, intltool, libxml2Python, curl }:
+{ stdenv, fetchurl, python2Packages, intltool, libxml2Python }:
 
 with stdenv.lib;
 
diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix
index e7ab3aa251c..f9770435aaf 100644
--- a/pkgs/applications/virtualization/virtualbox/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, lib, fetchpatch, iasl, dev86, pam, libxslt, libxml2
 , libX11, xproto, libXext, libXcursor, libXmu, qt5, libIDL, SDL, libcap
-, zlib, libpng, glib, lvm2, libXrandr, libXinerama
+, libpng, glib, lvm2, libXrandr, libXinerama
 , pkgconfig, which, docbook_xsl, docbook_xml_dtd_43
-, alsaLib, curl, libvpx, gawk, nettools, dbus
+, alsaLib, curl, libvpx, nettools, dbus
 , xorriso, makeself, perl
 , javaBindings ? false, jdk ? null
 , pythonBindings ? false, python2 ? null
-, enableExtensionPack ? false, requireFile ? null, patchelf ? null, fakeroot ? null
+, enableExtensionPack ? false, requireFile ? null, fakeroot ? null
 , pulseSupport ? false, libpulseaudio ? null
 , enableHardening ? false
 , headless ? false
diff --git a/pkgs/applications/virtualization/vpcs/default.nix b/pkgs/applications/virtualization/vpcs/default.nix
index af344eb82cf..65435e19366 100644
--- a/pkgs/applications/virtualization/vpcs/default.nix
+++ b/pkgs/applications/virtualization/vpcs/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, glibc, buildPlatform }:
+{ stdenv, fetchurl, glibc, buildPlatform }:
 
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
diff --git a/pkgs/applications/window-managers/bspwm/default.nix b/pkgs/applications/window-managers/bspwm/default.nix
index 0538228d4b4..dc57ad13d41 100644
--- a/pkgs/applications/window-managers/bspwm/default.nix
+++ b/pkgs/applications/window-managers/bspwm/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, libxcb, libXinerama
-, sxhkd, xcbutil, xcbutilkeysyms, xcbutilwm
+, xcbutil, xcbutilkeysyms, xcbutilwm
 }:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/applications/window-managers/bspwm/unstable.nix b/pkgs/applications/window-managers/bspwm/unstable.nix
index 7b31c63128a..09c7c8e0e08 100644
--- a/pkgs/applications/window-managers/bspwm/unstable.nix
+++ b/pkgs/applications/window-managers/bspwm/unstable.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, libxcb, libXinerama, sxhkd, xcbutil, xcbutilkeysyms, xcbutilwm }:
+{ stdenv, fetchFromGitHub, libxcb, libXinerama, xcbutil, xcbutilkeysyms, xcbutilwm }:
 
 stdenv.mkDerivation rec {
   name = "bspwm-unstable-2016-09-30";
diff --git a/pkgs/applications/window-managers/clfswm/default.nix b/pkgs/applications/window-managers/clfswm/default.nix
index 97e399a133e..cc00f1e4b6e 100644
--- a/pkgs/applications/window-managers/clfswm/default.nix
+++ b/pkgs/applications/window-managers/clfswm/default.nix
@@ -1,6 +1,5 @@
-{ stdenv, pkgs, fetchgit, autoconf, sbcl, lispPackages, xdpyinfo, texinfo4
-, makeWrapper , rlwrap, gnused, gnugrep, coreutils, xprop
-, extraModulePaths ? [] }:
+{ stdenv, fetchgit, autoconf, sbcl, lispPackages, xdpyinfo, texinfo4
+, makeWrapper }:
 
 stdenv.mkDerivation rec {
   name = "clfswm";
diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix
index 986639c947b..74c3c71dbf7 100644
--- a/pkgs/applications/window-managers/i3/default.nix
+++ b/pkgs/applications/window-managers/i3/default.nix
@@ -1,6 +1,6 @@
 { fetchurl, stdenv, which, pkgconfig, makeWrapper, libxcb, xcbutilkeysyms
 , xcbutil, xcbutilwm, xcbutilxrm, libstartup_notification, libX11, pcre, libev
-, yajl, xcb-util-cursor, coreutils, perl, pango, perlPackages, libxkbcommon
+, yajl, xcb-util-cursor, perl, pango, perlPackages, libxkbcommon
 , xorgserver, xvfb_run }:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/applications/window-managers/notion/default.nix b/pkgs/applications/window-managers/notion/default.nix
index ebe58e921dd..eaeb9979c10 100644
--- a/pkgs/applications/window-managers/notion/default.nix
+++ b/pkgs/applications/window-managers/notion/default.nix
@@ -1,6 +1,6 @@
 {
   enableXft ? true, libXft ? null, patches ? [], stdenv, lua, gettext, pkgconfig, xlibsWrapper, libXinerama, libXrandr, libX11,
-  xterm, xmessage, makeWrapper, lib, fetchFromGitHub, mandoc, which
+  xterm, xmessage, makeWrapper, fetchFromGitHub, mandoc, which
 }:
 
 assert enableXft -> libXft != null;
diff --git a/pkgs/applications/window-managers/spectrwm/default.nix b/pkgs/applications/window-managers/spectrwm/default.nix
index 1a3c976f77d..81901be0e60 100644
--- a/pkgs/applications/window-managers/spectrwm/default.nix
+++ b/pkgs/applications/window-managers/spectrwm/default.nix
@@ -1,5 +1,4 @@
 { fetchurl
-, coreutils
 , libX11
 , libXrandr
 , libXcursor
diff --git a/pkgs/applications/window-managers/stumpwm/default.nix b/pkgs/applications/window-managers/stumpwm/default.nix
index 117d4fe1d6a..3ed7f4325f2 100644
--- a/pkgs/applications/window-managers/stumpwm/default.nix
+++ b/pkgs/applications/window-managers/stumpwm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, pkgs, fetchgit, autoconf, sbcl, lispPackages, xdpyinfo, texinfo4
+{ stdenv, fetchgit, autoconf, sbcl, lispPackages, xdpyinfo, texinfo4
 , makeWrapper , rlwrap, gnused, gnugrep, coreutils, xprop
 , extraModulePaths ? []
 , version }:
diff --git a/pkgs/applications/window-managers/taffybar/default.nix b/pkgs/applications/window-managers/taffybar/default.nix
index b1e0628ba92..dfb2eec5dc5 100644
--- a/pkgs/applications/window-managers/taffybar/default.nix
+++ b/pkgs/applications/window-managers/taffybar/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, ghcWithPackages, xmessage, makeWrapper, packages ? (x: []) }:
+{ stdenv, ghcWithPackages, makeWrapper, packages ? (x: []) }:
 
 let
 taffybarEnv = ghcWithPackages (self: [ self.taffybar ] ++ packages self);
diff --git a/pkgs/applications/window-managers/wtftw/default.nix b/pkgs/applications/window-managers/wtftw/default.nix
index c68562d82b3..8a680e1f763 100644
--- a/pkgs/applications/window-managers/wtftw/default.nix
+++ b/pkgs/applications/window-managers/wtftw/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, rustPlatform, cargo, libXinerama, libX11, pkgconfig }:
+{ stdenv, fetchFromGitHub, rustPlatform, libXinerama, libX11, pkgconfig }:
 
 rustPlatform.buildRustPackage rec {
   name = "wtftw-0.0pre20170921";
diff --git a/pkgs/build-support/build-fhs-userenv/default.nix b/pkgs/build-support/build-fhs-userenv/default.nix
index 219530a67bd..c733556de45 100644
--- a/pkgs/build-support/build-fhs-userenv/default.nix
+++ b/pkgs/build-support/build-fhs-userenv/default.nix
@@ -1,4 +1,4 @@
-{ callPackage, runCommand, lib, writeScript, stdenv, coreutils }:
+{ callPackage, runCommand, writeScript, stdenv, coreutils }:
 
 let buildFHSEnv = callPackage ./env.nix { }; in
 
diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix
index ff45cf81d7e..950c0c86a6e 100644
--- a/pkgs/build-support/docker/default.nix
+++ b/pkgs/build-support/docker/default.nix
@@ -1,5 +1,4 @@
 {
-  callPackage,
   coreutils,
   docker,
   e2fsprogs,
diff --git a/pkgs/build-support/emacs/elpa.nix b/pkgs/build-support/emacs/elpa.nix
index 79a26abcb83..e6f6c23e449 100644
--- a/pkgs/build-support/emacs/elpa.nix
+++ b/pkgs/build-support/emacs/elpa.nix
@@ -1,6 +1,6 @@
 # builder for Emacs packages built for packages.el
 
-{ lib, stdenv, fetchurl, emacs, texinfo }:
+{ lib, stdenv, emacs, texinfo }:
 
 with lib;
 
diff --git a/pkgs/build-support/emacs/melpa.nix b/pkgs/build-support/emacs/melpa.nix
index f55c91f82c7..5fa45b154a3 100644
--- a/pkgs/build-support/emacs/melpa.nix
+++ b/pkgs/build-support/emacs/melpa.nix
@@ -1,7 +1,7 @@
 # builder for Emacs packages built for packages.el
 # using MELPA package-build.el
 
-{ lib, stdenv, fetchurl, fetchFromGitHub, emacs, texinfo }:
+{ lib, stdenv, fetchFromGitHub, emacs, texinfo }:
 
 with lib;
 
diff --git a/pkgs/build-support/fetchdarcs/default.nix b/pkgs/build-support/fetchdarcs/default.nix
index 3b965b06662..02777c9900d 100644
--- a/pkgs/build-support/fetchdarcs/default.nix
+++ b/pkgs/build-support/fetchdarcs/default.nix
@@ -1,4 +1,4 @@
-{stdenvNoCC, darcs, nix, cacert}:
+{stdenvNoCC, darcs, cacert}:
 
 {url, rev ? null, context ? null, md5 ? "", sha256 ? ""}:
 
diff --git a/pkgs/build-support/fetchdocker/credentials.nix b/pkgs/build-support/fetchdocker/credentials.nix
index c01288dbf53..001693501cc 100644
--- a/pkgs/build-support/fetchdocker/credentials.nix
+++ b/pkgs/build-support/fetchdocker/credentials.nix
@@ -32,7 +32,7 @@
 let
   pathParts =
    (builtins.filter
-    ({path, prefix}: "DOCKER_CREDENTIALS" == prefix)
+    ({prefix}: "DOCKER_CREDENTIALS" == prefix)
     builtins.nixPath);
 in
   if (pathParts != []) then (builtins.head pathParts).path else ""
diff --git a/pkgs/build-support/fetchdocker/default.nix b/pkgs/build-support/fetchdocker/default.nix
index ae3ae4185e0..3556df32d92 100644
--- a/pkgs/build-support/fetchdocker/default.nix
+++ b/pkgs/build-support/fetchdocker/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, coreutils, bash, gnutar, jq, writeText }:
+{ stdenv, lib, coreutils, bash, gnutar, writeText }:
 let
   stripScheme =
     builtins.replaceStrings [ "https://" "http://" ] [ "" "" ];
diff --git a/pkgs/build-support/fetchgit/private.nix b/pkgs/build-support/fetchgit/private.nix
index 4dcf6d06718..59376f3b042 100644
--- a/pkgs/build-support/fetchgit/private.nix
+++ b/pkgs/build-support/fetchgit/private.nix
@@ -1,4 +1,4 @@
-{ fetchgit, runCommand, makeWrapper, openssh, stdenv }: args: derivation ((fetchgit args).drvAttrs // {
+{ fetchgit, runCommand, makeWrapper, openssh }: args: derivation ((fetchgit args).drvAttrs // {
   SSH_AUTH_SOCK = if (builtins.tryEval <ssh-auth-sock>).success
     then builtins.toString <ssh-auth-sock>
     else null;
diff --git a/pkgs/build-support/fetchgitlocal/default.nix b/pkgs/build-support/fetchgitlocal/default.nix
index 7a25966e9fb..fa194577553 100644
--- a/pkgs/build-support/fetchgitlocal/default.nix
+++ b/pkgs/build-support/fetchgitlocal/default.nix
@@ -1,4 +1,4 @@
-{ runCommand, git, nix }: src:
+{ runCommand, git }: src:
 
 let
   srcStr = toString src;
diff --git a/pkgs/build-support/fetchhg/default.nix b/pkgs/build-support/fetchhg/default.nix
index 36a48ce9f17..40ead021cdb 100644
--- a/pkgs/build-support/fetchhg/default.nix
+++ b/pkgs/build-support/fetchhg/default.nix
@@ -1,4 +1,4 @@
-{stdenvNoCC, mercurial, nix}: {name ? null, url, rev ? null, md5 ? null, sha256 ? null, fetchSubrepos ? false}:
+{stdenvNoCC, mercurial}: {name ? null, url, rev ? null, md5 ? null, sha256 ? null, fetchSubrepos ? false}:
 
 if md5 != null then
   throw "fetchhg does not support md5 anymore, please use sha256"
diff --git a/pkgs/build-support/fetchnuget/default.nix b/pkgs/build-support/fetchnuget/default.nix
index 40ba79ec435..960bc3c1ffb 100644
--- a/pkgs/build-support/fetchnuget/default.nix
+++ b/pkgs/build-support/fetchnuget/default.nix
@@ -1,4 +1,4 @@
-{ stdenvNoCC, fetchurl, buildDotnetPackage, unzip }:
+{ fetchurl, buildDotnetPackage, unzip }:
 
 attrs @
 { baseName
diff --git a/pkgs/build-support/fetchs3/default.nix b/pkgs/build-support/fetchs3/default.nix
index 14dac9997d9..3dbde203374 100644
--- a/pkgs/build-support/fetchs3/default.nix
+++ b/pkgs/build-support/fetchs3/default.nix
@@ -5,7 +5,6 @@
 , sha256
 , region ? "us-east-1"
 , credentials ? null # Default to looking at local EC2 metadata service
-, executable ? false
 , recursiveHash ? false
 , postFetch ? null
 }:
diff --git a/pkgs/build-support/rust/build-rust-crate.nix b/pkgs/build-support/rust/build-rust-crate.nix
index 7f21b66ce12..6c7dd67c400 100644
--- a/pkgs/build-support/rust/build-rust-crate.nix
+++ b/pkgs/build-support/rust/build-rust-crate.nix
@@ -53,7 +53,7 @@ let makeDeps = dependencies:
     '';
 
     configureCrate =
-      { crateName, crateVersion, crateAuthors, build, libName, crateFeatures, colors, libPath, release, buildDependencies, completeDeps, completeBuildDeps, verbose, dependencies, workspace_member, extraLinkFlags }:
+      { crateName, crateVersion, crateAuthors, build, libName, crateFeatures, colors, libPath, release, buildDependencies, completeDeps, completeBuildDeps, verbose, workspace_member, extraLinkFlags }:
       let version_ = lib.splitString "-" crateVersion;
           versionPre = if lib.tail version_ == [] then "" else builtins.elemAt version_ 1;
           version = lib.splitString "." (lib.head version_);
@@ -181,9 +181,9 @@ let makeDeps = dependencies:
       runHook postConfigure
     '';
 
-    buildCrate = { crateName, crateVersion, crateAuthors,
-                   dependencies, completeDeps, completeBuildDeps,
-                   crateFeatures, libName, build, release, libPath,
+    buildCrate = { crateName,
+                   dependencies,
+                   crateFeatures, libName, release, libPath,
                    crateType, metadata, crateBin, finalBins,
                    extraRustcOpts, verbose, colors }:
 
@@ -422,16 +422,16 @@ stdenv.mkDerivation (rec {
     colors = lib.attrByPath [ "colors" ] "always" crate;
     extraLinkFlags = builtins.concatStringsSep " " (crate.extraLinkFlags or []);
     configurePhase = configureCrate {
-      inherit crateName dependencies buildDependencies completeDeps completeBuildDeps
+      inherit crateName buildDependencies completeDeps completeBuildDeps
               crateFeatures libName build workspace_member release libPath crateVersion
               extraLinkFlags
               crateAuthors verbose colors;
     };
     extraRustcOpts = if crate ? extraRustcOpts then crate.extraRustcOpts else [];
     buildPhase = buildCrate {
-      inherit crateName dependencies completeDeps completeBuildDeps
-              crateFeatures libName build release libPath crateType
-              crateVersion crateAuthors metadata crateBin finalBins verbose colors
+      inherit crateName dependencies
+              crateFeatures libName release libPath crateType
+              metadata crateBin finalBins verbose colors
               extraRustcOpts;
     };
     installPhase = installCrate crateName metadata;
diff --git a/pkgs/build-support/rust/cargo-vendor/cargo-vendor.nix b/pkgs/build-support/rust/cargo-vendor/cargo-vendor.nix
index ac6bb6ab1bd..486f365f78a 100644
--- a/pkgs/build-support/rust/cargo-vendor/cargo-vendor.nix
+++ b/pkgs/build-support/rust/cargo-vendor/cargo-vendor.nix
@@ -1,5 +1,5 @@
 # Generated by carnix 0.5.2: carnix Cargo.lock -o cargo-vendor.nix
-{ lib, buildPlatform, buildRustCrate, fetchgit }:
+{ lib, buildPlatform, buildRustCrate }:
 let kernel = buildPlatform.parsed.kernel.name;
     abi = buildPlatform.parsed.abi.name;
     hasFeature = feature:
diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix
index 59e8c3e7f7e..fb1d6e390ae 100644
--- a/pkgs/build-support/rust/default.nix
+++ b/pkgs/build-support/rust/default.nix
@@ -1,4 +1,4 @@
-{ callPackage, fetchurl, stdenv, path, cacert, git, rust, cargo-vendor }:
+{ stdenv, cacert, git, rust, cargo-vendor }:
 let
   fetchcargo = import ./fetchcargo.nix {
     inherit stdenv cacert git rust cargo-vendor;
diff --git a/pkgs/build-support/singularity-tools/default.nix b/pkgs/build-support/singularity-tools/default.nix
index db2bef367e9..5179f47eaa5 100644
--- a/pkgs/build-support/singularity-tools/default.nix
+++ b/pkgs/build-support/singularity-tools/default.nix
@@ -8,8 +8,7 @@
 , vmTools
 , gawk
 , utillinux
-, e2fsprogs
-, squashfsTools }:
+, e2fsprogs }:
 
 rec {
   shellScript = name: text:
diff --git a/pkgs/data/fonts/arkpandora/default.nix b/pkgs/data/fonts/arkpandora/default.nix
index c2e64cb63dd..909985d945b 100644
--- a/pkgs/data/fonts/arkpandora/default.nix
+++ b/pkgs/data/fonts/arkpandora/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, unzip }:
+{ stdenv, fetchurl }:
 
 let
   version = "2.04";
diff --git a/pkgs/data/fonts/iosevka/default.nix b/pkgs/data/fonts/iosevka/default.nix
index 4fc47793661..f7fce315e8c 100644
--- a/pkgs/data/fonts/iosevka/default.nix
+++ b/pkgs/data/fonts/iosevka/default.nix
@@ -1,7 +1,6 @@
 {
   stdenv, lib,
   fetchFromGitHub, fetchurl,
-  runCommand, writeText,
   nodejs, ttfautohint-nox, otfcc,
 
   # Custom font set options.
diff --git a/pkgs/data/fonts/noto-fonts/default.nix b/pkgs/data/fonts/noto-fonts/default.nix
index 33435c98267..0a086453244 100644
--- a/pkgs/data/fonts/noto-fonts/default.nix
+++ b/pkgs/data/fonts/noto-fonts/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip, fetchFromGitHub, optipng, cairo, unzip, pythonPackages, pkgconfig, pngquant, which, imagemagick }:
+{ stdenv, fetchzip, fetchFromGitHub, optipng, cairo, pythonPackages, pkgconfig, pngquant, which, imagemagick }:
 
 let
   mkNoto = { name, weights, sha256, }:
diff --git a/pkgs/data/fonts/tex-gyre/default.nix b/pkgs/data/fonts/tex-gyre/default.nix
index 1cbf7168ea9..a801886350d 100644
--- a/pkgs/data/fonts/tex-gyre/default.nix
+++ b/pkgs/data/fonts/tex-gyre/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchzip }:
 
 let
-  mkVariant = variant: { displayName, version, abbreviation, sha256, outputHash }: stdenv.mkDerivation {
+  mkVariant = variant: { version, abbreviation, sha256, outputHash }: stdenv.mkDerivation {
     name = "tex-gyre-${variant}-${version}";
     inherit version;
 
diff --git a/pkgs/data/misc/cacert/default.nix b/pkgs/data/misc/cacert/default.nix
index e867d0fbb4b..aa6a42badb7 100644
--- a/pkgs/data/misc/cacert/default.nix
+++ b/pkgs/data/misc/cacert/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, writeText, nss, python
+{ stdenv, fetchurl, nss, python
 , blacklist ? []
 , includeEmail ? false
 }:
diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-ebnf/default.nix b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-ebnf/default.nix
index bc51ceeca43..3d8e16443db 100644
--- a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-ebnf/default.nix
+++ b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-ebnf/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, unzip}:
+{stdenv, fetchurl}:
 
 stdenv.mkDerivation {
   name = "docbook-xml-ebnf-1.2b1";
diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.1.2.nix b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.1.2.nix
index d4cb7bc889d..35e69641f11 100644
--- a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.1.2.nix
+++ b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.1.2.nix
@@ -12,7 +12,7 @@ let
 in
 
 import ./generic.nix {
-  inherit stdenv fetchurl unzip findXMLCatalogs;
+  inherit stdenv unzip findXMLCatalogs;
   name = "docbook-xml-4.1.2";
   src = fetchurl {
     url = http://www.docbook.org/xml/4.1.2/docbkx412.zip;
diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.2.nix b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.2.nix
index d2cc69559b8..f8c827e826d 100644
--- a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.2.nix
+++ b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.2.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl, unzip, findXMLCatalogs}:
 
 import ./generic.nix {
-  inherit stdenv fetchurl unzip findXMLCatalogs;
+  inherit stdenv unzip findXMLCatalogs;
   name = "docbook-xml-4.2";
   src = fetchurl {
     url = http://www.docbook.org/xml/4.2/docbook-xml-4.2.zip;
diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.3.nix b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.3.nix
index e1f9337df94..2c253a1029d 100644
--- a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.3.nix
+++ b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.3.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl, unzip, findXMLCatalogs}:
 
 import ./generic.nix {
-  inherit stdenv fetchurl unzip findXMLCatalogs;
+  inherit stdenv unzip findXMLCatalogs;
   name = "docbook-xml-4.3";
   src = fetchurl {
     url = http://www.docbook.org/xml/4.3/docbook-xml-4.3.zip;
diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.4.nix b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.4.nix
index 1a9d622affc..d051d205808 100644
--- a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.4.nix
+++ b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.4.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl, unzip, findXMLCatalogs}:
 
 import ./generic.nix {
-  inherit stdenv fetchurl unzip findXMLCatalogs;
+  inherit stdenv unzip findXMLCatalogs;
   name = "docbook-xml-4.4";
   src = fetchurl {
     url = http://www.docbook.org/xml/4.4/docbook-xml-4.4.zip;
diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.5.nix b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.5.nix
index 301b400ac7e..156ee653bbe 100644
--- a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.5.nix
+++ b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.5.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl, unzip, findXMLCatalogs}:
 
 import ./generic.nix {
-  inherit stdenv fetchurl unzip findXMLCatalogs;
+  inherit stdenv unzip findXMLCatalogs;
   name = "docbook-xml-4.5";
   src = fetchurl {
     url = http://www.docbook.org/xml/4.5/docbook-xml-4.5.zip;
diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/generic.nix b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/generic.nix
index 10b76f7b2b5..41c4b73d3f6 100644
--- a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/generic.nix
+++ b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/generic.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, unzip, src, name, postInstall ? "true", meta ? {}, findXMLCatalogs }:
+{ stdenv, unzip, src, name, postInstall ? "true", meta ? {}, findXMLCatalogs }:
 
 stdenv.mkDerivation {
   inherit src name postInstall;
diff --git a/pkgs/desktops/enlightenment/enlightenment.nix b/pkgs/desktops/enlightenment/enlightenment.nix
index dc538625bf0..9119d5e93d8 100644
--- a/pkgs/desktops/enlightenment/enlightenment.nix
+++ b/pkgs/desktops/enlightenment/enlightenment.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, meson, ninja, pkgconfig, gettext, efl,
   xcbutilkeysyms, libXrandr, libXdmcp, libxcb, libffi, pam, alsaLib,
-  luajit, bzip2, libpthreadstubs, gdbm, libcap, libGLU, mesa_noglu,
+  luajit, bzip2, libpthreadstubs, gdbm, libcap, mesa_noglu,
   xkeyboard_config, pcre
 }:
 
diff --git a/pkgs/desktops/gnome-2/desktop/gnome-control-center/default.nix b/pkgs/desktops/gnome-2/desktop/gnome-control-center/default.nix
index 276bc7e79c1..c4f6ad8207c 100644
--- a/pkgs/desktops/gnome-2/desktop/gnome-control-center/default.nix
+++ b/pkgs/desktops/gnome-2/desktop/gnome-control-center/default.nix
@@ -1,8 +1,7 @@
-{ stdenv, fetchurl, pkgconfig, dbus-glib, libxml2Python, libxslt, libxklavier, cairo, popt, which, python
+{ stdenv, fetchurl, pkgconfig, dbus-glib, libxml2Python, libxslt, libxklavier, popt, which, python
 , shared-mime-info, desktop-file-utils, libunique, libtool, bzip2
-, glib, gtk, pango, atk, gnome-doc-utils, intltool, GConf, libglade, libgnome, libgnomeui, libgnomekbd
+, gtk, gnome-doc-utils, intltool, GConf, libglade, libgnomeui, libgnomekbd
 , librsvg, gnome_menus, gnome-desktop, gnome_panel, metacity, gnome-settings-daemon
-, libbonobo, libbonoboui, libgnomecanvas, libart_lgpl, gnome_vfs, ORBit2
 , libSM, docbook_xml_dtd_412 }:
 
 stdenv.mkDerivation {
diff --git a/pkgs/desktops/gnome-2/desktop/gnome-panel/default.nix b/pkgs/desktops/gnome-2/desktop/gnome-panel/default.nix
index d85b5494da4..3bef218740c 100644
--- a/pkgs/desktops/gnome-2/desktop/gnome-panel/default.nix
+++ b/pkgs/desktops/gnome-2/desktop/gnome-panel/default.nix
@@ -1,7 +1,7 @@
-{ stdenv, fetchurl, pkgconfig, dbus-glib, dbus, cairo, popt, which, libxml2Python, libxslt, bzip2, python
-, glib, gtk, pango, atk, libXau, libcanberra-gtk2
+{ stdenv, fetchurl, pkgconfig, dbus-glib, popt, which, libxml2Python, libxslt, bzip2, python
+, gtk, libXau, libcanberra-gtk2
 , intltool, ORBit2, libglade, libgnome, libgnomeui, libbonobo, libbonoboui, GConf, gnome_menus, gnome-desktop
-, libwnck, librsvg, libgweather, gnome-doc-utils, libgnomecanvas, libart_lgpl, libtasn1, libtool, xorg }:
+, libwnck, librsvg, libgweather, gnome-doc-utils, libtasn1, libtool, xorg }:
 
 stdenv.mkDerivation {
   name = "gnome-panel-2.32.1";
diff --git a/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix b/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix
index d4935c498f1..c14ee25981c 100644
--- a/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix
+++ b/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchFromGitHub, pkgconfig, glib, gnome2, dbus-glib, gmime, libnotify, libgnome-keyring, openssl, cyrus_sasl, gnonlin, sylpheed, gob2, gettext, intltool, libxml2, hicolor-icon-theme, tango-icon-theme }:
+{ stdenv, fetchFromGitHub, pkgconfig, glib, gnome2, dbus-glib, gmime, libnotify, libgnome-keyring, openssl, cyrus_sasl, gnonlin, sylpheed, gob2, gettext, intltool, libxml2, hicolor-icon-theme, tango-icon-theme }:
 
 stdenv.mkDerivation rec {
   rev = "9ae8768";
diff --git a/pkgs/desktops/gnome-2/desktop/zenity/default.nix b/pkgs/desktops/gnome-2/desktop/zenity/default.nix
index a9b692aadf5..0233f6340f5 100644
--- a/pkgs/desktops/gnome-2/desktop/zenity/default.nix
+++ b/pkgs/desktops/gnome-2/desktop/zenity/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, cairo, libxml2, libxslt, glib, gtk, pango, atk
+{ stdenv, fetchurl, pkgconfig, libxml2, libxslt, gtk
 , gnome-doc-utils, intltool, libglade, libX11, which, docbook_xml_dtd_412 }:
 
 stdenv.mkDerivation {
diff --git a/pkgs/desktops/gnome-2/platform/gnome-vfs-monikers/default.nix b/pkgs/desktops/gnome-2/platform/gnome-vfs-monikers/default.nix
index 029d751e719..5ae126df331 100644
--- a/pkgs/desktops/gnome-2/platform/gnome-vfs-monikers/default.nix
+++ b/pkgs/desktops/gnome-2/platform/gnome-vfs-monikers/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, pkgconfig, glib, intltool, gnome_vfs, libbonobo, ORBit2}:
+{stdenv, fetchurl, pkgconfig, glib, intltool, gnome_vfs, libbonobo}:
 
 stdenv.mkDerivation {
   name = "gnome-vfs-monikers-2.15.3";
diff --git a/pkgs/desktops/gnome-2/platform/libbonobo/default.nix b/pkgs/desktops/gnome-2/platform/libbonobo/default.nix
index ee0bf5f82a0..bf0cec8dfbe 100644
--- a/pkgs/desktops/gnome-2/platform/libbonobo/default.nix
+++ b/pkgs/desktops/gnome-2/platform/libbonobo/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, flex, bison, pkgconfig, glib, dbus-glib, libxml2, popt
+{ stdenv, fetchurl, flex, bison, pkgconfig, glib, libxml2, popt
 , intltool, ORBit2, procps }:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/desktops/gnome-2/platform/libgnome/default.nix b/pkgs/desktops/gnome-2/platform/libgnome/default.nix
index 2dcb85235ee..42f47bc5a83 100644
--- a/pkgs/desktops/gnome-2/platform/libgnome/default.nix
+++ b/pkgs/desktops/gnome-2/platform/libgnome/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, glib, popt, zlib, libcanberra-gtk2
-, intltool, libbonobo, GConf, gnome_vfs, ORBit2, libtool, libogg
+, intltool, libbonobo, GConf, gnome_vfs, libtool, libogg
 }:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix b/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix
index b07417ecc35..b5525957d46 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, meson, ninja, pkgconfig, gettext, gnome3, glib, gtk3, pango, wrapGAppsHook
-, gobjectIntrospection, gjs, gdk_pixbuf, librsvg, libunistring }:
+, gobjectIntrospection, gjs, libunistring }:
 
 stdenv.mkDerivation rec {
   name = "gnome-characters-${version}";
diff --git a/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix b/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix
index 7db21d9e748..a7d4288c9eb 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix
@@ -1,10 +1,10 @@
 { stdenv, meson, ninja, gettext, fetchurl, evince, gjs
 , pkgconfig, gtk3, glib, tracker, tracker-miners
-, itstool, libxslt, webkitgtk, libgdata, gnome-online-accounts
+, itstool, libxslt, webkitgtk, libgdata
 , gnome-desktop, libzapojit, libgepub
-, gnome3, librsvg, gdk_pixbuf, libsoup, docbook_xsl
-, gobjectIntrospection, json-glib, inkscape, poppler_utils
-, gmp, desktop-file-utils, wrapGAppsHook }:
+, gnome3, gdk_pixbuf, libsoup, docbook_xsl
+, gobjectIntrospection, inkscape, poppler_utils
+, desktop-file-utils, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
   name = "gnome-documents-${version}";
diff --git a/pkgs/desktops/gnome-3/apps/gnome-music/default.nix b/pkgs/desktops/gnome-3/apps/gnome-music/default.nix
index 560d8446f08..eef91ec0fbb 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-music/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-music/default.nix
@@ -1,7 +1,7 @@
 { stdenv, meson, ninja, gettext, fetchurl, gdk_pixbuf, tracker
 , libxml2, python3, libnotify, wrapGAppsHook, libmediaart
 , gobjectIntrospection, gnome-online-accounts, grilo, grilo-plugins
-, pkgconfig, gtk3, glib, cairo, desktop-file-utils, appstream-glib
+, pkgconfig, gtk3, glib, desktop-file-utils, appstream-glib
 , itstool, gnome3, gst_all_1 }:
 
 python3.pkgs.buildPythonApplication rec {
diff --git a/pkgs/desktops/gnome-3/apps/polari/default.nix b/pkgs/desktops/gnome-3/apps/polari/default.nix
index 4ae67f9b41d..d3bb75d1f97 100644
--- a/pkgs/desktops/gnome-3/apps/polari/default.nix
+++ b/pkgs/desktops/gnome-3/apps/polari/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, itstool, fetchurl, fetchpatch, gdk_pixbuf, adwaita-icon-theme
+{ stdenv, itstool, fetchurl, gdk_pixbuf, adwaita-icon-theme
 , telepathy-glib, gjs, meson, ninja, gettext, telepathy-idle, libxml2, desktop-file-utils
 , pkgconfig, gtk3, glib, libsecret, libsoup, gobjectIntrospection, appstream-glib
 , gnome3, wrapGAppsHook, telepathy-logger, gspell }:
diff --git a/pkgs/desktops/gnome-3/apps/seahorse/default.nix b/pkgs/desktops/gnome-3/apps/seahorse/default.nix
index 60e8822135c..1bcf7783900 100644
--- a/pkgs/desktops/gnome-3/apps/seahorse/default.nix
+++ b/pkgs/desktops/gnome-3/apps/seahorse/default.nix
@@ -1,7 +1,7 @@
 { stdenv, intltool, fetchurl, vala
 , pkgconfig, gtk3, glib
 , wrapGAppsHook, itstool, gnupg, libsoup
-, gnome3, librsvg, gdk_pixbuf, gpgme
+, gnome3, gpgme
 , libsecret, avahi, p11-kit, openssh }:
 
 let
diff --git a/pkgs/desktops/gnome-3/core/dconf/default.nix b/pkgs/desktops/gnome-3/core/dconf/default.nix
index 400b3ea9a9b..71779c17280 100644
--- a/pkgs/desktops/gnome-3/core/dconf/default.nix
+++ b/pkgs/desktops/gnome-3/core/dconf/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, meson, ninja, python3, vala, libxslt, pkgconfig, glib, dbus-glib, gnome3
-, libxml2, docbook_xsl, makeWrapper }:
+, libxml2, docbook_xsl }:
 
 let
   pname = "dconf";
diff --git a/pkgs/desktops/gnome-3/core/empathy/default.nix b/pkgs/desktops/gnome-3/core/empathy/default.nix
index 98cfc686e97..089c32d602e 100644
--- a/pkgs/desktops/gnome-3/core/empathy/default.nix
+++ b/pkgs/desktops/gnome-3/core/empathy/default.nix
@@ -1,12 +1,12 @@
 { stdenv, intltool, fetchurl, webkitgtk, pkgconfig, gtk3, glib
 , file, librsvg, gnome3, gdk_pixbuf
-, dbus-glib, telepathy-glib, telepathy-farstream
+, telepathy-glib, telepathy-farstream
 , clutter-gtk, clutter-gst, gst_all_1, cogl, gnome-online-accounts
 , gcr, libsecret, folks, libpulseaudio, telepathy-mission-control
 , telepathy-logger, libnotify, clutter, libsoup, gnutls
 , evolution-data-server, yelp-xsl
 , libcanberra-gtk3, p11-kit, farstream, libtool, shared-mime-info
-, bash, wrapGAppsHook, itstool, libxml2, libxslt, icu, libgee
+, wrapGAppsHook, itstool, libxml2, libxslt, icu, libgee
 , isocodes, enchant, libchamplain, geoclue2, geocode-glib, cheese, libgudev }:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/desktops/gnome-3/core/gdm/default.nix b/pkgs/desktops/gnome-3/core/gdm/default.nix
index 2f7452dbc57..5ceba1a7719 100644
--- a/pkgs/desktops/gnome-3/core/gdm/default.nix
+++ b/pkgs/desktops/gnome-3/core/gdm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, substituteAll, pkgconfig, glib, itstool, libxml2, xorg, dbus
+{ stdenv, fetchurl, substituteAll, pkgconfig, glib, itstool, libxml2, xorg
 , intltool, accountsservice, libX11, gnome3, systemd, autoreconfHook
 , gtk, libcanberra-gtk3, pam, libtool, gobjectIntrospection, plymouth
 , librsvg, coreutils, xwayland }:
diff --git a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix
index 772df5d2441..c3b2f97f9b2 100644
--- a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix
@@ -2,7 +2,7 @@
 , python3Packages, libsoup, polkit, clutter, networkmanager, docbook_xsl , docbook_xsl_ns, at-spi2-core
 , libstartup_notification, telepathy-glib, telepathy-logger, libXtst, unzip, glibcLocales, shared-mime-info
 , libgweather, libcanberra-gtk3, librsvg, geoclue2, perl, docbook_xml_dtd_42, desktop-file-utils
-, libpulseaudio, libical, nss, gobjectIntrospection, gstreamer, wrapGAppsHook
+, libpulseaudio, libical, gobjectIntrospection, gstreamer, wrapGAppsHook
 , accountsservice, gdk_pixbuf, gdm, upower, ibus, networkmanagerapplet
 , sassc, systemd, gst_all_1 }:
 
diff --git a/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix b/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix
index 6cb827bc504..1938c90a825 100644
--- a/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, file, gnome3, itstool, libxml2, intltool }:
+{ stdenv, fetchurl, pkgconfig, gnome3, itstool, libxml2, intltool }:
 
 stdenv.mkDerivation rec {
   name = "gnome-user-docs-${version}";
diff --git a/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix b/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix
index 509c10d7564..da117a53691 100644
--- a/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix
@@ -1,6 +1,6 @@
 { stdenv, intltool, fetchurl, apacheHttpd, nautilus
-, pkgconfig, gtk3, glib, libxml2, gnused, systemd
-, bash, wrapGAppsHook, itstool, libnotify, libtool, mod_dnssd
+, pkgconfig, gtk3, glib, libxml2, systemd
+, wrapGAppsHook, itstool, libnotify, libtool, mod_dnssd
 , gnome3, librsvg, gdk_pixbuf, file, libcanberra-gtk3 }:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/desktops/gnome-3/core/grilo-plugins/default.nix b/pkgs/desktops/gnome-3/core/grilo-plugins/default.nix
index c6000352ab0..35e2012c531 100644
--- a/pkgs/desktops/gnome-3/core/grilo-plugins/default.nix
+++ b/pkgs/desktops/gnome-3/core/grilo-plugins/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, file, intltool, glib, sqlite
+{ stdenv, fetchurl, pkgconfig, intltool, sqlite
 , gnome3, libxml2, gupnp, gssdp, lua5, liboauth, gupnp-av
 , gmime, json-glib, avahi, tracker, dleyna-server, itstool }:
 
diff --git a/pkgs/desktops/gnome-3/core/gsettings-desktop-schemas/default.nix b/pkgs/desktops/gnome-3/core/gsettings-desktop-schemas/default.nix
index e5ca314c69a..5dc6137c9fc 100644
--- a/pkgs/desktops/gnome-3/core/gsettings-desktop-schemas/default.nix
+++ b/pkgs/desktops/gnome-3/core/gsettings-desktop-schemas/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, pkgconfig, intltool, glib, gobjectIntrospection
   # just for passthru
-, gnome3, gtk3, gsettings-desktop-schemas }:
+, gnome3 }:
 
 stdenv.mkDerivation rec {
   name = "gsettings-desktop-schemas-${version}";
diff --git a/pkgs/desktops/gnome-3/core/gucharmap/default.nix b/pkgs/desktops/gnome-3/core/gucharmap/default.nix
index 1562c42b374..861702a3986 100644
--- a/pkgs/desktops/gnome-3/core/gucharmap/default.nix
+++ b/pkgs/desktops/gnome-3/core/gucharmap/default.nix
@@ -1,5 +1,5 @@
 { stdenv, intltool, fetchFromGitLab, pkgconfig, gtk3, defaultIconTheme
-, glib, desktop-file-utils, bash, appdata-tools, gtk-doc, autoconf, automake, libtool
+, glib, desktop-file-utils, appdata-tools, gtk-doc, autoconf, automake, libtool
 , wrapGAppsHook, gnome3, itstool, libxml2
 , callPackage, unzip, gobjectIntrospection }:
 
diff --git a/pkgs/desktops/gnome-3/core/nautilus/default.nix b/pkgs/desktops/gnome-3/core/nautilus/default.nix
index 2daaf2d4326..5beabd08fa3 100644
--- a/pkgs/desktops/gnome-3/core/nautilus/default.nix
+++ b/pkgs/desktops/gnome-3/core/nautilus/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, meson, ninja, pkgconfig, gettext, libxml2, desktop-file-utils, wrapGAppsHook
-, gtk, gnome3, gnome-autoar, glib, dbus-glib, shared-mime-info, libnotify, libexif
+, gtk, gnome3, gnome-autoar, dbus-glib, shared-mime-info, libnotify, libexif
 , exempi, librsvg, tracker, tracker-miners, gnome-desktop, gexiv2, libselinux, gdk_pixbuf }:
 
 let
diff --git a/pkgs/desktops/gnome-3/core/sushi/default.nix b/pkgs/desktops/gnome-3/core/sushi/default.nix
index 114c0d8ac96..100a2727fc3 100644
--- a/pkgs/desktops/gnome-3/core/sushi/default.nix
+++ b/pkgs/desktops/gnome-3/core/sushi/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, file, intltool, gobjectIntrospection, glib
-, clutter-gtk, clutter-gst, gnome3, gtksourceview, libmusicbrainz
+, clutter-gtk, clutter-gst, gnome3, gtksourceview
 , webkitgtk, libmusicbrainz5, icu, makeWrapper, gst_all_1
 , gdk_pixbuf, librsvg, gtk3, harfbuzz }:
 
diff --git a/pkgs/desktops/gnome-3/core/totem/default.nix b/pkgs/desktops/gnome-3/core/totem/default.nix
index 7cf1872da5a..1a7e257f929 100644
--- a/pkgs/desktops/gnome-3/core/totem/default.nix
+++ b/pkgs/desktops/gnome-3/core/totem/default.nix
@@ -1,7 +1,7 @@
-{ stdenv, fetchurl, meson, ninja, intltool, gst_all_1, clutter
+{ stdenv, fetchurl, meson, ninja, intltool, gst_all_1
 , clutter-gtk, clutter-gst, python3Packages, shared-mime-info
 , pkgconfig, gtk3, glib, gobjectIntrospection
-, bash, wrapGAppsHook, itstool, libxml2, vala, gnome3, librsvg
+, wrapGAppsHook, itstool, libxml2, vala, gnome3
 , gdk_pixbuf, tracker, nautilus }:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/desktops/gnome-3/core/vte/default.nix b/pkgs/desktops/gnome-3/core/vte/default.nix
index ed313221e56..17385ab7202 100644
--- a/pkgs/desktops/gnome-3/core/vte/default.nix
+++ b/pkgs/desktops/gnome-3/core/vte/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, intltool, pkgconfig
 , gnome3, ncurses, gobjectIntrospection, vala, libxml2, gnutls
-, fetchFromGitHub, autoconf, automake, libtool, gtk-doc, gperf, pcre2
+, gperf, pcre2
 }:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix b/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix
index f904a90454f..6abaff8e32b 100644
--- a/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix
+++ b/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, intltool, fetchurl, pkgconfig, bash
+{ stdenv, intltool, fetchurl, pkgconfig
 , itstool, libxml2, libxslt, gnome3 }:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/desktops/gnome-3/core/zenity/default.nix b/pkgs/desktops/gnome-3/core/zenity/default.nix
index b9788106342..7f9996d17d9 100644
--- a/pkgs/desktops/gnome-3/core/zenity/default.nix
+++ b/pkgs/desktops/gnome-3/core/zenity/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, cairo, libxml2, libxslt, gnome3, pango
+{ stdenv, fetchurl, pkgconfig, libxml2, libxslt, gnome3
 , gnome-doc-utils, intltool, libX11, which, itstool, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix b/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix
index 47a0238a7fd..395e90d263e 100644
--- a/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix
+++ b/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix
@@ -1,4 +1,4 @@
-{ config, stdenv, substituteAll, fetchFromGitHub, glib, glib-networking, libgtop, pkgs }:
+{ stdenv, substituteAll, fetchFromGitHub, glib, glib-networking, libgtop }:
 
 stdenv.mkDerivation rec {
   name = "gnome-shell-system-monitor-${version}";
diff --git a/pkgs/desktops/gnome-3/extensions/topicons-plus/default.nix b/pkgs/desktops/gnome-3/extensions/topicons-plus/default.nix
index 84a9d26c2d7..f9c45f45ea4 100644
--- a/pkgs/desktops/gnome-3/extensions/topicons-plus/default.nix
+++ b/pkgs/desktops/gnome-3/extensions/topicons-plus/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, glib, gettext, bash }:
+{ stdenv, fetchFromGitHub, glib, gettext }:
 
 stdenv.mkDerivation rec {
   name = "gnome-shell-extension-topicons-plus-${version}";
diff --git a/pkgs/desktops/gnome-3/misc/gfbgraph/default.nix b/pkgs/desktops/gnome-3/misc/gfbgraph/default.nix
index 8194e3f1699..f8d29612223 100644
--- a/pkgs/desktops/gnome-3/misc/gfbgraph/default.nix
+++ b/pkgs/desktops/gnome-3/misc/gfbgraph/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, intltool, fetchurl, pkgconfig, glib
+{ stdenv, fetchurl, pkgconfig, glib
 , gnome3, libsoup, json-glib, gobjectIntrospection }:
 
 let
diff --git a/pkgs/desktops/gnome-3/misc/gitg/default.nix b/pkgs/desktops/gnome-3/misc/gitg/default.nix
index 32da3a9a4b8..d2dce9d6f1b 100644
--- a/pkgs/desktops/gnome-3/misc/gitg/default.nix
+++ b/pkgs/desktops/gnome-3/misc/gitg/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, vala, intltool, pkgconfig, gtk3, glib
 , json-glib, wrapGAppsHook, libpeas, bash, gobjectIntrospection
-, gnome3, gtkspell3, shared-mime-info, libgee, libgit2-glib, librsvg, libsecret
-, libsoup }:
+, gnome3, gtkspell3, shared-mime-info, libgee, libgit2-glib, libsecret
+ }:
 
 let
   pname = "gitg";
diff --git a/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix b/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix
index a7c69de44eb..41206b71d42 100644
--- a/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix
+++ b/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix
@@ -1,7 +1,7 @@
-{ stdenv, meson, ninja, gettext, fetchurl, atk
+{ stdenv, meson, ninja, gettext, fetchurl
 , pkgconfig, gtk3, glib, libsoup
-, bash, itstool, libxml2, python3Packages
-, gnome3, librsvg, gdk_pixbuf, file, libnotify, gobjectIntrospection, wrapGAppsHook }:
+, itstool, libxml2, python3Packages
+, gnome3, gdk_pixbuf, libnotify, gobjectIntrospection, wrapGAppsHook }:
 
 let
   pname = "gnome-tweaks";
diff --git a/pkgs/desktops/gnome-3/misc/libgda/default.nix b/pkgs/desktops/gnome-3/misc/libgda/default.nix
index ce7bb6f75b5..a10675ab803 100644
--- a/pkgs/desktops/gnome-3/misc/libgda/default.nix
+++ b/pkgs/desktops/gnome-3/misc/libgda/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, pkgconfig, intltool, itstool, libxml2, gtk3, openssl, gnome3
+{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, gtk3, openssl, gnome3
 , mysqlSupport ? false, mysql ? null
 , postgresSupport ? false, postgresql ? null
 }:
diff --git a/pkgs/desktops/gnustep/gworkspace/default.nix b/pkgs/desktops/gnustep/gworkspace/default.nix
index 210b72292fd..d5018a4350f 100644
--- a/pkgs/desktops/gnustep/gworkspace/default.nix
+++ b/pkgs/desktops/gnustep/gworkspace/default.nix
@@ -1,6 +1,5 @@
 { back, base, gui, gsmakeDerivation
 , fetchurl
-, sqlite
 , system_preferences
 }:
 let
diff --git a/pkgs/desktops/gnustep/make/gsmakeDerivation.nix b/pkgs/desktops/gnustep/make/gsmakeDerivation.nix
index 00b96cd2fac..7bb287c3fa5 100644
--- a/pkgs/desktops/gnustep/make/gsmakeDerivation.nix
+++ b/pkgs/desktops/gnustep/make/gsmakeDerivation.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, make, makeWrapper, which }:
+{ stdenv, make, makeWrapper, which }:
 { buildInputs ? [], ...} @ args:
 stdenv.mkDerivation (args // {
   buildInputs = [ makeWrapper make which ] ++ buildInputs;
diff --git a/pkgs/desktops/lxqt/core/lxqt-config/default.nix b/pkgs/desktops/lxqt/core/lxqt-config/default.nix
index 191fe0796e8..ba4937a7227 100644
--- a/pkgs/desktops/lxqt/core/lxqt-config/default.nix
+++ b/pkgs/desktops/lxqt/core/lxqt-config/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchpatch, cmake, pkgconfig, lxqt-build-tools, qtbase, qtx11extras, qttools, qtsvg, kwindowsystem, libkscreen, liblxqt, libqtxdg, libpthreadstubs, xorg }:
+{ stdenv, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools, qtbase, qtx11extras, qttools, qtsvg, kwindowsystem, libkscreen, liblxqt, libqtxdg, xorg }:
 
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
diff --git a/pkgs/desktops/lxqt/default.nix b/pkgs/desktops/lxqt/default.nix
index 40c25b3302c..675368c9a69 100644
--- a/pkgs/desktops/lxqt/default.nix
+++ b/pkgs/desktops/lxqt/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, makeScope, libsForQt5, fetchFromGitHub }:
+{ pkgs, makeScope, libsForQt5 }:
 
 let
   packages = self: with self; {
diff --git a/pkgs/desktops/mate/mate-applets/default.nix b/pkgs/desktops/mate/mate-applets/default.nix
index eda4e9b05bc..59316039b36 100644
--- a/pkgs/desktops/mate/mate-applets/default.nix
+++ b/pkgs/desktops/mate/mate-applets/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, intltool, itstool, gnome3, libwnck3, libgtop, libxml2, libnotify, dbus-glib, polkit, upower, wirelesstools, mate, hicolor-icon-theme, wrapGAppsHook }:
+{ stdenv, fetchurl, pkgconfig, intltool, itstool, gnome3, libwnck3, libgtop, libxml2, libnotify, polkit, upower, wirelesstools, mate, hicolor-icon-theme, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
   name = "mate-applets-${version}";
diff --git a/pkgs/desktops/mate/mate-settings-daemon/default.nix b/pkgs/desktops/mate/mate-settings-daemon/default.nix
index 6a24e67d2c7..4138a042856 100644
--- a/pkgs/desktops/mate/mate-settings-daemon/default.nix
+++ b/pkgs/desktops/mate/mate-settings-daemon/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, intltool, glib, dbus-glib, libxklavier, libcanberra-gtk3, libnotify, nss, polkit, gnome3, mate, wrapGAppsHook
+{ stdenv, fetchurl, pkgconfig, intltool, dbus-glib, libxklavier, libcanberra-gtk3, libnotify, nss, polkit, gnome3, mate, wrapGAppsHook
 , pulseaudioSupport ? stdenv.config.pulseaudio or true, libpulseaudio
 }:
 
diff --git a/pkgs/desktops/mate/mate-themes/default.nix b/pkgs/desktops/mate/mate-themes/default.nix
index 8d6d470727d..bdf5ac29ca6 100644
--- a/pkgs/desktops/mate/mate-themes/default.nix
+++ b/pkgs/desktops/mate/mate-themes/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, intltool, mate, gnome3, gtk2, gtk_engines,
+{ stdenv, fetchurl, pkgconfig, intltool, mate, gtk2, gtk_engines,
   gtk-engine-murrine, gdk_pixbuf, librsvg }:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/desktops/plasma-5/default.nix b/pkgs/desktops/plasma-5/default.nix
index 0b1668038f5..2c99713bcd4 100644
--- a/pkgs/desktops/plasma-5/default.nix
+++ b/pkgs/desktops/plasma-5/default.nix
@@ -26,8 +26,7 @@ existing packages here and modify it as necessary.
 
 {
   libsForQt5, lib, fetchurl,
-  gconf, gsettings-desktop-schemas,
-  debug ? false,
+  gconf, gsettings-desktop-schemas
 }:
 
 let
diff --git a/pkgs/desktops/plasma-5/kdeplasma-addons.nix b/pkgs/desktops/plasma-5/kdeplasma-addons.nix
index e23ffd3644a..398fc356fc9 100644
--- a/pkgs/desktops/plasma-5/kdeplasma-addons.nix
+++ b/pkgs/desktops/plasma-5/kdeplasma-addons.nix
@@ -1,7 +1,7 @@
 {
   mkDerivation,
   extra-cmake-modules, kdoctools,
-  kconfig, kconfigwidgets, kcoreaddons, kcmutils, kdelibs4support, ki18n, kio,
+  kconfig, kconfigwidgets, kcoreaddons, kcmutils, kdelibs4support, kio,
   knewstuff, kross, krunner, kservice, ksysguard, kunitconversion, ibus,
   plasma-framework, plasma-workspace, qtdeclarative, qtx11extras, kholidays
 }:
diff --git a/pkgs/desktops/plasma-5/kwin/default.nix b/pkgs/desktops/plasma-5/kwin/default.nix
index 2c9d824999e..a0b09e30338 100644
--- a/pkgs/desktops/plasma-5/kwin/default.nix
+++ b/pkgs/desktops/plasma-5/kwin/default.nix
@@ -1,5 +1,5 @@
 {
-  mkDerivation, lib, copyPathsToStore, fetchpatch,
+  mkDerivation, lib, copyPathsToStore,
   extra-cmake-modules, kdoctools,
 
   epoxy,libICE, libSM, libinput, libxkbcommon, udev, wayland, xcb-util-cursor,
diff --git a/pkgs/desktops/xfce/applications/xfce4-screenshooter.nix b/pkgs/desktops/xfce/applications/xfce4-screenshooter.nix
index 28c586382b4..8e5bffd9dd6 100644
--- a/pkgs/desktops/xfce/applications/xfce4-screenshooter.nix
+++ b/pkgs/desktops/xfce/applications/xfce4-screenshooter.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, intltool, xfce4-panel, libxfce4util, gtk, libsoup
-, makeWrapper, glib-networking, exo, hicolor-icon-theme, wrapGAppsHook }:
+, glib-networking, exo, hicolor-icon-theme, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
   p_name  = "xfce4-screenshooter";
diff --git a/pkgs/desktops/xfce/core/xfce4-session.nix b/pkgs/desktops/xfce/core/xfce4-session.nix
index 2d5a169a215..3f6237d6de1 100644
--- a/pkgs/desktops/xfce/core/xfce4-session.nix
+++ b/pkgs/desktops/xfce/core/xfce4-session.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, pkgconfig, intltool, gtk, polkit
+{ stdenv, fetchurl, pkgconfig, intltool, gtk, polkit
 , libxfce4util, libxfce4ui, xfce4-panel, libwnck, dbus-glib, xfconf, libglade, xorg
 , hicolor-icon-theme
 }:
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/appmenu-gtk-module.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/appmenu-gtk-module.nix
index 4db9e03ae72..7134d29c9ff 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/appmenu-gtk-module.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/appmenu-gtk-module.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, substituteAll, cmake, vala, glib, gtk2, gtk3 }:
+{ stdenv, fetchFromGitHub, cmake, vala, glib, gtk2, gtk3 }:
 stdenv.mkDerivation rec {
   name = "vala-panel-appmenu-xfce-${version}";
   version = "0.6.94";
diff --git a/pkgs/development/arduino/platformio/default.nix b/pkgs/development/arduino/platformio/default.nix
index dfdd8141aaa..45186914604 100644
--- a/pkgs/development/arduino/platformio/default.nix
+++ b/pkgs/development/arduino/platformio/default.nix
@@ -1,5 +1,5 @@
 
-{ pkgs, newScope }:
+{ newScope }:
 
 let
   callPackage = newScope self;
diff --git a/pkgs/development/compilers/boo/default.nix b/pkgs/development/compilers/boo/default.nix
index 968c845a011..ec5e08ffda4 100644
--- a/pkgs/development/compilers/boo/default.nix
+++ b/pkgs/development/compilers/boo/default.nix
@@ -1,6 +1,5 @@
-{ stdenv, fetchFromGitHub, pkgconfig, dbus, mono, makeWrapper, nant
-, shared-mime-info, gtksourceview, gtk2
-, targetVersion ? "4.5" }:
+{ stdenv, fetchFromGitHub, pkgconfig, mono, makeWrapper, nant
+, shared-mime-info, gtksourceview, gtk2 }:
 
 let
   release = "alpha";
diff --git a/pkgs/development/compilers/chicken/eggDerivation.nix b/pkgs/development/compilers/chicken/eggDerivation.nix
index bcb7a763fb6..2a14a997e57 100644
--- a/pkgs/development/compilers/chicken/eggDerivation.nix
+++ b/pkgs/development/compilers/chicken/eggDerivation.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchegg, chicken, makeWrapper }:
+{ stdenv, chicken, makeWrapper }:
 { name, src
 , buildInputs ? []
 , chickenInstallFlags ? []
diff --git a/pkgs/development/compilers/clasp/default.nix b/pkgs/development/compilers/clasp/default.nix
index 6bfb71a9627..6ff2028e3c1 100644
--- a/pkgs/development/compilers/clasp/default.nix
+++ b/pkgs/development/compilers/clasp/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchFromGitHub
   , llvmPackages
   , cmake, boehmgc, gmp, zlib, ncurses, boost
-  , waf, python, git, sbcl
+  , python, git, sbcl
 }:
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
diff --git a/pkgs/development/compilers/cudatoolkit/default.nix b/pkgs/development/compilers/cudatoolkit/default.nix
index b7c310cf01d..e44c21abe94 100644
--- a/pkgs/development/compilers/cudatoolkit/default.nix
+++ b/pkgs/development/compilers/cudatoolkit/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, makeWrapper, fetchurl, requireFile, patchelf, perl, ncurses, expat, python27, zlib
+{ lib, stdenv, makeWrapper, fetchurl, requireFile, perl, ncurses, expat, python27, zlib
 , gcc48, gcc49, gcc5, gcc6
 , xorg, gtk2, glib, fontconfig, freetype, unixODBC, alsaLib, glibc
 }:
diff --git a/pkgs/development/compilers/dotnet/sdk/default.nix b/pkgs/development/compilers/dotnet/sdk/default.nix
index e7cb7495c90..f16be1b2822 100644
--- a/pkgs/development/compilers/dotnet/sdk/default.nix
+++ b/pkgs/development/compilers/dotnet/sdk/default.nix
@@ -6,7 +6,6 @@
 , libuuid
 , zlib
 , curl
-, patchelf
 }:
 
 let
diff --git a/pkgs/development/compilers/elm/default.nix b/pkgs/development/compilers/elm/default.nix
index 8ed34cf9d1e..6a8d5f11b75 100644
--- a/pkgs/development/compilers/elm/default.nix
+++ b/pkgs/development/compilers/elm/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildEnv, haskell, nodejs, fetchurl, fetchpatch, makeWrapper }:
+{ lib, stdenv, buildEnv, haskell, nodejs, fetchurl, makeWrapper }:
 
 # To update:
 # 1) Update versions in ./update-elm.rb and run it.
diff --git a/pkgs/development/compilers/emscripten/default.nix b/pkgs/development/compilers/emscripten/default.nix
index 8e268aa7eb7..e03039cb5e1 100644
--- a/pkgs/development/compilers/emscripten/default.nix
+++ b/pkgs/development/compilers/emscripten/default.nix
@@ -1,5 +1,5 @@
-{ emscriptenVersion, stdenv, fetchFromGitHub, emscriptenfastcomp, python, nodejs, closurecompiler, pkgs
-, jre, binaryen, enableWasm ? true ,  python2Packages, cmake
+{ emscriptenVersion, stdenv, fetchFromGitHub, emscriptenfastcomp, python, nodejs, closurecompiler
+, jre, binaryen, enableWasm ? true ,  cmake
 }:
 
 let
diff --git a/pkgs/development/compilers/emscripten/fastcomp/emscripten-fastcomp.nix b/pkgs/development/compilers/emscripten/fastcomp/emscripten-fastcomp.nix
index 5317cf25d41..06acebd2ba4 100644
--- a/pkgs/development/compilers/emscripten/fastcomp/emscripten-fastcomp.nix
+++ b/pkgs/development/compilers/emscripten/fastcomp/emscripten-fastcomp.nix
@@ -1,4 +1,4 @@
-{ emscriptenVersion, stdenv, llvm, fetchFromGitHub, cmake, python, gtest, ... }:
+{ emscriptenVersion, stdenv, fetchFromGitHub, cmake, python, gtest, ... }:
 
 let
   rev = emscriptenVersion;
diff --git a/pkgs/development/compilers/factor-lang/default.nix b/pkgs/development/compilers/factor-lang/default.nix
index ce198786600..4dab2e06f48 100644
--- a/pkgs/development/compilers/factor-lang/default.nix
+++ b/pkgs/development/compilers/factor-lang/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchFromGitHub, glib, glibc, git,
+{ stdenv, fetchurl, fetchFromGitHub, glib, git,
   rlwrap, curl, pkgconfig, perl, makeWrapper, tzdata, ncurses,
   libX11, pango, cairo, gtk2, gdk_pixbuf, gtkglext,
   libGLU, libXmu, libXt, libICE, libSM }:
diff --git a/pkgs/development/compilers/gambit/build.nix b/pkgs/development/compilers/gambit/build.nix
index 202e5525422..72530f99cdb 100644
--- a/pkgs/development/compilers/gambit/build.nix
+++ b/pkgs/development/compilers/gambit/build.nix
@@ -1,4 +1,4 @@
-{ stdenv, git, openssl, autoconf, pkgs, makeStaticLibraries, version, git-version, SRC }:
+{ stdenv, git, openssl, autoconf, pkgs, makeStaticLibraries, version, SRC }:
 
 stdenv.mkDerivation rec {
   name    = "gambit-${version}";
diff --git a/pkgs/development/compilers/gambit/default.nix b/pkgs/development/compilers/gambit/default.nix
index 93f1d9184b4..77e8fb51602 100644
--- a/pkgs/development/compilers/gambit/default.nix
+++ b/pkgs/development/compilers/gambit/default.nix
@@ -2,7 +2,6 @@
 
 callPackage ./build.nix {
   version = "4.8.9";
-  git-version = "4.8.9";
 
   SRC = fetchurl {
     url = "http://www.iro.umontreal.ca/~gambit/download/gambit/v4.8/source/gambit-v4_8_9-devel.tgz";
diff --git a/pkgs/development/compilers/gambit/unstable.nix b/pkgs/development/compilers/gambit/unstable.nix
index 545bece12c4..169ddb5a6a3 100644
--- a/pkgs/development/compilers/gambit/unstable.nix
+++ b/pkgs/development/compilers/gambit/unstable.nix
@@ -2,7 +2,6 @@
 
 callPackage ./build.nix {
   version = "unstable-2018-05-30";
-  git-version = "4.8.9-54-gffe8841b";
   SRC = fetchgit {
     url = "https://github.com/feeley/gambit.git";
     rev = "ffe8841b56330eb86fd794b16dc7f83914ecc7c5";
diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix
index 15071fd2ba5..943391611de 100644
--- a/pkgs/development/compilers/gcc/4.8/default.nix
+++ b/pkgs/development/compilers/gcc/4.8/default.nix
@@ -28,7 +28,6 @@
 , # Strip kills static libs of other archs (hence no cross)
   stripped ? hostPlatform == buildPlatform && targetPlatform == hostPlatform
 , gnused ? null
-, darwin ? null
 , buildPlatform, hostPlatform, targetPlatform
 , buildPackages
 }:
diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix
index 006cbdf40dc..bf3b192e1bb 100644
--- a/pkgs/development/compilers/gcc/4.9/default.nix
+++ b/pkgs/development/compilers/gcc/4.9/default.nix
@@ -28,7 +28,6 @@
 , # Strip kills static libs of other archs (hence no cross)
   stripped ? hostPlatform == buildPlatform && targetPlatform == hostPlatform
 , gnused ? null
-, darwin ? null
 , buildPlatform, hostPlatform, targetPlatform
 , buildPackages
 }:
diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix
index f360ed135d7..0564329967e 100644
--- a/pkgs/development/compilers/gcc/5/default.nix
+++ b/pkgs/development/compilers/gcc/5/default.nix
@@ -29,7 +29,6 @@
   stripped ? hostPlatform == buildPlatform && targetPlatform == hostPlatform
 , gnused ? null
 , cloog # unused; just for compat with gcc4, as we override the parameter on some places
-, darwin ? null
 , buildPlatform, hostPlatform, targetPlatform
 , buildPackages
 }:
diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix
index 02a00350162..50d55aef234 100644
--- a/pkgs/development/compilers/gcc/6/default.nix
+++ b/pkgs/development/compilers/gcc/6/default.nix
@@ -29,7 +29,6 @@
   stripped ? hostPlatform == buildPlatform && targetPlatform == hostPlatform
 , gnused ? null
 , cloog # unused; just for compat with gcc4, as we override the parameter on some places
-, darwin ? null
 , buildPlatform, hostPlatform, targetPlatform
 , buildPackages
 }:
diff --git a/pkgs/development/compilers/gcc/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix
index 84323cca823..0c51868aef8 100644
--- a/pkgs/development/compilers/gcc/7/default.nix
+++ b/pkgs/development/compilers/gcc/7/default.nix
@@ -22,7 +22,6 @@
   stripped ? hostPlatform == buildPlatform && targetPlatform == hostPlatform
 , gnused ? null
 , cloog # unused; just for compat with gcc4, as we override the parameter on some places
-, darwin ? null
 , buildPlatform, hostPlatform, targetPlatform
 , buildPackages
 }:
diff --git a/pkgs/development/compilers/gcc/8/default.nix b/pkgs/development/compilers/gcc/8/default.nix
index 85c03bc440f..38d8bcd83cf 100644
--- a/pkgs/development/compilers/gcc/8/default.nix
+++ b/pkgs/development/compilers/gcc/8/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, targetPackages, fetchurl, fetchpatch, noSysDirs
+{ stdenv, targetPackages, fetchurl, noSysDirs
 , langC ? true, langCC ? true, langFortran ? false
 , langObjC ? targetPlatform.isDarwin
 , langObjCpp ? targetPlatform.isDarwin
@@ -22,7 +22,6 @@
   stripped ? hostPlatform == buildPlatform && targetPlatform == hostPlatform
 , gnused ? null
 , cloog # unused; just for compat with gcc4, as we override the parameter on some places
-, darwin ? null
 , buildPlatform, hostPlatform, targetPlatform
 , buildPackages
 }:
diff --git a/pkgs/development/compilers/gcc/snapshot/default.nix b/pkgs/development/compilers/gcc/snapshot/default.nix
index b00f180bbc7..124fdbcdf9d 100644
--- a/pkgs/development/compilers/gcc/snapshot/default.nix
+++ b/pkgs/development/compilers/gcc/snapshot/default.nix
@@ -22,7 +22,6 @@
   stripped ? hostPlatform == buildPlatform && targetPlatform == hostPlatform
 , gnused ? null
 , cloog # unused; just for compat with gcc4, as we override the parameter on some places
-, darwin ? null
 , flex ? null
 , buildPlatform, hostPlatform, targetPlatform
 , buildPackages
diff --git a/pkgs/development/compilers/gcl/2.6.13-pre.nix b/pkgs/development/compilers/gcl/2.6.13-pre.nix
index 2a80eccfb40..71a6eaa8db8 100644
--- a/pkgs/development/compilers/gcl/2.6.13-pre.nix
+++ b/pkgs/development/compilers/gcl/2.6.13-pre.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, mpfr, m4, binutils, fetchcvs, emacs, zlib, which
+{ stdenv, fetchgit, mpfr, m4, binutils, emacs, zlib, which
 , texinfo, libX11, xproto, inputproto, libXi, gmp, readline, strace
 , libXext, xextproto, libXt, libXaw, libXmu } :
 
diff --git a/pkgs/development/compilers/gcl/default.nix b/pkgs/development/compilers/gcl/default.nix
index 0e4d5bed051..f503427b326 100644
--- a/pkgs/development/compilers/gcl/default.nix
+++ b/pkgs/development/compilers/gcl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, mpfr, m4, binutils, fetchcvs, emacs, zlib, which
+{ stdenv, fetchurl, mpfr, m4, binutils, emacs, zlib, which
 , texinfo, libX11, xproto, inputproto, libXi, gmp
 , libXext, xextproto, libXt, libXaw, libXmu } :
 
diff --git a/pkgs/development/compilers/gerbil/build.nix b/pkgs/development/compilers/gerbil/build.nix
index 5609de15d4c..0ce9fbb00e2 100644
--- a/pkgs/development/compilers/gerbil/build.nix
+++ b/pkgs/development/compilers/gerbil/build.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, makeStaticLibraries,
+{ stdenv, makeStaticLibraries,
   coreutils, rsync, bash,
   openssl, zlib, sqlite, libxml2, libyaml, mysql, lmdb, leveldb, postgresql,
   version, git-version, GAMBIT, SRC }:
diff --git a/pkgs/development/compilers/ghc/7.10.3.nix b/pkgs/development/compilers/ghc/7.10.3.nix
index 2a906d918aa..0cf3a4cb12b 100644
--- a/pkgs/development/compilers/ghc/7.10.3.nix
+++ b/pkgs/development/compilers/ghc/7.10.3.nix
@@ -3,10 +3,10 @@
 
 # build-tools
 , bootPkgs, hscolour
-, coreutils, fetchurl, fetchpatch, perl
+, coreutils, fetchurl, perl
 , docbook_xsl, docbook_xml_dtd_45, docbook_xml_dtd_42, libxml2, libxslt
 
-, libffi, libiconv ? null, ncurses
+, libiconv ? null, ncurses
 
 , useLLVM ? !targetPlatform.isx86
 , # LLVM is conceptually a run-time-only depedendency, but for
diff --git a/pkgs/development/compilers/ghc/8.0.2.nix b/pkgs/development/compilers/ghc/8.0.2.nix
index 8062e93df54..7671fcdb025 100644
--- a/pkgs/development/compilers/ghc/8.0.2.nix
+++ b/pkgs/development/compilers/ghc/8.0.2.nix
@@ -5,7 +5,7 @@
 , bootPkgs, hscolour
 , coreutils, fetchpatch, fetchurl, perl, sphinx
 
-, libffi, libiconv ? null, ncurses
+, libiconv ? null, ncurses
 
 , useLLVM ? !targetPlatform.isx86
 , # LLVM is conceptually a run-time-only depedendency, but for
diff --git a/pkgs/development/compilers/ghc/8.2.2.nix b/pkgs/development/compilers/ghc/8.2.2.nix
index d740a7ee673..c24cdeb43bf 100644
--- a/pkgs/development/compilers/ghc/8.2.2.nix
+++ b/pkgs/development/compilers/ghc/8.2.2.nix
@@ -6,7 +6,7 @@
 , autoconf, autoreconfHook, automake, coreutils, fetchurl, fetchpatch, perl, python3, sphinx
 , runCommand
 
-, libffi, libiconv ? null, ncurses
+, libiconv ? null, ncurses
 
 , useLLVM ? !targetPlatform.isx86 || (targetPlatform.isMusl && hostPlatform != targetPlatform)
 , # LLVM is conceptually a run-time-only depedendency, but for
diff --git a/pkgs/development/compilers/ghc/8.4.3.nix b/pkgs/development/compilers/ghc/8.4.3.nix
index 182afa6b349..c93fb1fd9b2 100644
--- a/pkgs/development/compilers/ghc/8.4.3.nix
+++ b/pkgs/development/compilers/ghc/8.4.3.nix
@@ -5,7 +5,7 @@
 , bootPkgs, alex, happy, hscolour
 , autoconf, automake, coreutils, fetchurl, fetchpatch, perl, python3, m4
 
-, libffi, libiconv ? null, ncurses
+, libiconv ? null, ncurses
 
 , useLLVM ? !targetPlatform.isx86 || (targetPlatform.isMusl && hostPlatform != targetPlatform)
 , # LLVM is conceptually a run-time-only depedendency, but for
diff --git a/pkgs/development/compilers/ghc/8.6.1.nix b/pkgs/development/compilers/ghc/8.6.1.nix
index 522ad32e69f..ae22e1f1e40 100644
--- a/pkgs/development/compilers/ghc/8.6.1.nix
+++ b/pkgs/development/compilers/ghc/8.6.1.nix
@@ -3,9 +3,9 @@
 
 # build-tools
 , bootPkgs, alex, happy, hscolour
-, autoconf, automake, coreutils, fetchurl, fetchpatch, perl, python3, m4
+, autoconf, automake, coreutils, fetchurl, perl, python3, m4
 
-, libffi, libiconv ? null, ncurses
+, libiconv ? null, ncurses
 
 , useLLVM ? !targetPlatform.isx86 || (targetPlatform.isMusl && hostPlatform != targetPlatform)
 , # LLVM is conceptually a run-time-only depedendency, but for
diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix
index 4c1e5d986dc..2824ce669ee 100644
--- a/pkgs/development/compilers/ghc/head.nix
+++ b/pkgs/development/compilers/ghc/head.nix
@@ -5,7 +5,7 @@
 , bootPkgs, alex, happy, hscolour
 , autoconf, automake, coreutils, fetchgit, perl, python3, m4
 
-, libffi, libiconv ? null, ncurses
+, libiconv ? null, ncurses
 
 , useLLVM ? !targetPlatform.isx86 || (targetPlatform.isMusl && hostPlatform != targetPlatform)
 , # LLVM is conceptually a run-time-only depedendency, but for
diff --git a/pkgs/development/compilers/ghcjs-ng/configured-ghcjs-src.nix b/pkgs/development/compilers/ghcjs-ng/configured-ghcjs-src.nix
index 57d9fccd266..df1394e4a24 100644
--- a/pkgs/development/compilers/ghcjs-ng/configured-ghcjs-src.nix
+++ b/pkgs/development/compilers/ghcjs-ng/configured-ghcjs-src.nix
@@ -4,7 +4,6 @@
 , python3
 , gcc
 , cabal-install
-, gmp
 , runCommand
 , lib
 , stdenv
diff --git a/pkgs/development/compilers/ghcjs/base.nix b/pkgs/development/compilers/ghcjs/base.nix
index f09a577110b..46e9d8d72be 100644
--- a/pkgs/development/compilers/ghcjs/base.nix
+++ b/pkgs/development/compilers/ghcjs/base.nix
@@ -3,7 +3,6 @@
 , broken ? false
 , test-framework
 , test-framework-hunit
-, test-framework-quickcheck2
 , data-default
 , ghc-paths
 , haskell-src-exts
@@ -20,10 +19,8 @@
 , transformers-compat
 , haddock-api
 , regex-posix
-, callPackage
 
 , bootPkgs, gmp
-, jailbreak-cabal
 
 , runCommand
 , nodejs, stdenv, filepath, HTTP, HUnit, mtl, network, QuickCheck, random, stm
@@ -32,11 +29,11 @@
 , lens
 , parallel, safe, shelly, split, stringsearch, syb
 , tar, terminfo
-, vector, yaml, fetchgit, fetchFromGitHub, Cabal
+, vector, yaml, fetchgit, fetchFromGitHub
 , alex, happy, git, gnumake, autoconf, patch
 , automake, libtool
 , cryptohash
-, haddock, hspec, xhtml, primitive, cacert, pkgs
+, haddock, hspec, xhtml, pkgs
 , coreutils
 , libiconv
 
diff --git a/pkgs/development/compilers/go/1.10.nix b/pkgs/development/compilers/go/1.10.nix
index b4fa005c3de..272c953af7a 100644
--- a/pkgs/development/compilers/go/1.10.nix
+++ b/pkgs/development/compilers/go/1.10.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, tzdata, iana-etc, go_bootstrap, runCommand, writeScriptBin
 , perl, which, pkgconfig, patch, procps
 , pcre, cacert, llvm
-, Security, Foundation, bash
+, Security, Foundation
 , makeWrapper, git, subversion, mercurial, bazaar }:
 
 let
diff --git a/pkgs/development/compilers/go/1.9.nix b/pkgs/development/compilers/go/1.9.nix
index 8ef528e2c92..cbaa427c827 100644
--- a/pkgs/development/compilers/go/1.9.nix
+++ b/pkgs/development/compilers/go/1.9.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, tzdata, iana-etc, go_bootstrap, runCommand, writeScriptBin
 , perl, which, pkgconfig, patch, procps
 , pcre, cacert, llvm
-, Security, Foundation, bash
+, Security, Foundation
 , makeWrapper, git, subversion, mercurial, bazaar }:
 
 let
diff --git a/pkgs/development/compilers/graalvm/default.nix b/pkgs/development/compilers/graalvm/default.nix
index 79446744371..52a49c519b3 100644
--- a/pkgs/development/compilers/graalvm/default.nix
+++ b/pkgs/development/compilers/graalvm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, fetchhg, fetchurl, fetchzip, mercurial, python27, zlib, makeWrapper, oraclejdk8 }:
+{ stdenv, lib, fetchFromGitHub, fetchurl, fetchzip, mercurial, python27, zlib, makeWrapper, oraclejdk8 }:
 
 let
   # pre-download some cache entries ('mx' will not be able to download under nixbld1)
diff --git a/pkgs/development/compilers/haxe/default.nix b/pkgs/development/compilers/haxe/default.nix
index afeef2b3637..0a974fccc88 100644
--- a/pkgs/development/compilers/haxe/default.nix
+++ b/pkgs/development/compilers/haxe/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, bash, coreutils, ocaml, zlib, pcre, neko, camlp4 }:
+{ stdenv, fetchgit, coreutils, ocaml, zlib, pcre, neko, camlp4 }:
 
 let
   generic = { version, sha256, prePatch }:
diff --git a/pkgs/development/compilers/inform7/default.nix b/pkgs/development/compilers/inform7/default.nix
index 7f1830430c4..a6955c03051 100644
--- a/pkgs/development/compilers/inform7/default.nix
+++ b/pkgs/development/compilers/inform7/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, writeText, fetchzip, coreutils, perl, gnutar, gzip }:
+{ stdenv, fetchzip, coreutils, perl, gnutar, gzip }:
 let
   version = "6M62";
 in stdenv.mkDerivation {
diff --git a/pkgs/development/compilers/ios-cross-compile/9.2.nix b/pkgs/development/compilers/ios-cross-compile/9.2.nix
index 9c4b38f87de..e64c0c912d9 100644
--- a/pkgs/development/compilers/ios-cross-compile/9.2.nix
+++ b/pkgs/development/compilers/ios-cross-compile/9.2.nix
@@ -1,6 +1,6 @@
 { stdenv, git, clang,
   fetchFromGitHub, requireFile,
-  openssl, xz, gnutar, gcc,
+  openssl, xz, gnutar,
   automake, autoconf, libtool, clangStdenv } :
 
 clangStdenv.mkDerivation rec {
diff --git a/pkgs/development/compilers/ispc/default.nix b/pkgs/development/compilers/ispc/default.nix
index 7aedf191abe..a5d6247ffdc 100644
--- a/pkgs/development/compilers/ispc/default.nix
+++ b/pkgs/development/compilers/ispc/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchFromGitHub, fetchpatch, bash, which, m4, python, bison, flex, llvmPackages,
+{stdenv, fetchFromGitHub, fetchpatch, which, m4, python, bison, flex, llvmPackages,
 testedTargets ? ["sse2" "host"] # the default test target is sse4, but that is not supported by all Hydra agents
 }:
 
diff --git a/pkgs/development/compilers/julia/0.5.nix b/pkgs/development/compilers/julia/0.5.nix
index cff6c1c446f..e503b7a92ce 100644
--- a/pkgs/development/compilers/julia/0.5.nix
+++ b/pkgs/development/compilers/julia/0.5.nix
@@ -1,11 +1,10 @@
-{ stdenv, fetchgit, fetchurl, fetchzip
+{ stdenv, fetchurl, fetchzip
 # build tools
 , gfortran, m4, makeWrapper, patchelf, perl, which, python2
-, runCommand
 , paxctl
 # libjulia dependencies
 , libunwind, readline, utf8proc, zlib
-, llvm, libffi, ncurses
+, llvm
 # standard library dependencies
 , curl, fftwSinglePrec, fftw, gmp, libgit2, mpfr, openlibm, openspecfun, pcre2
 # linear algebra
diff --git a/pkgs/development/compilers/julia/0.6.nix b/pkgs/development/compilers/julia/0.6.nix
index 49bbaf0e8df..fcf486b3b41 100644
--- a/pkgs/development/compilers/julia/0.6.nix
+++ b/pkgs/development/compilers/julia/0.6.nix
@@ -1,11 +1,10 @@
-{ stdenv, fetchgit, fetchurl, fetchzip
+{ stdenv, fetchurl, fetchzip
 # build tools
 , gfortran, m4, makeWrapper, patchelf, perl, which, python2
-, runCommand
 , paxctl
 # libjulia dependencies
 , libunwind, readline, utf8proc, zlib
-, llvm, libffi, ncurses
+, llvm
 # standard library dependencies
 , curl, fftwSinglePrec, fftw, gmp, libgit2, mpfr, openlibm, openspecfun, pcre2
 # linear algebra
diff --git a/pkgs/development/compilers/julia/default.nix b/pkgs/development/compilers/julia/default.nix
index b5a3a8c6be2..a504dc2ea46 100644
--- a/pkgs/development/compilers/julia/default.nix
+++ b/pkgs/development/compilers/julia/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, fetchurl
+{ stdenv, fetchurl
 # build tools
 , gfortran, m4, makeWrapper, patchelf, perl, which, python2, paxctl
 # libjulia dependencies
diff --git a/pkgs/development/compilers/ldc/default.nix b/pkgs/development/compilers/ldc/default.nix
index 48301a8f287..dc6a933a934 100644
--- a/pkgs/development/compilers/ldc/default.nix
+++ b/pkgs/development/compilers/ldc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, fetchurl, cmake, llvm, curl, tzdata
+{ stdenv, fetchurl, cmake, llvm, curl, tzdata
 , python, libconfig, lit, gdb, unzip, darwin, bash
 , callPackage, makeWrapper, targetPackages
 , bootstrapVersion ? false
diff --git a/pkgs/development/compilers/llvm/3.4/llvm.nix b/pkgs/development/compilers/llvm/3.4/llvm.nix
index 0b29b04825a..25bb0828414 100644
--- a/pkgs/development/compilers/llvm/3.4/llvm.nix
+++ b/pkgs/development/compilers/llvm/3.4/llvm.nix
@@ -8,7 +8,6 @@
 , libffi
 , libbfd
 , libxml2
-, valgrind
 , ncurses
 , version
 , zlib
diff --git a/pkgs/development/compilers/llvm/3.5/dragonegg.nix b/pkgs/development/compilers/llvm/3.5/dragonegg.nix
index 96d4f9f558c..d54ffd96382 100644
--- a/pkgs/development/compilers/llvm/3.5/dragonegg.nix
+++ b/pkgs/development/compilers/llvm/3.5/dragonegg.nix
@@ -1,4 +1,4 @@
-{stdenv, fetch, fetchpatch, llvm, gmp, mpfr, libmpc, ncurses, zlib, version}:
+{stdenv, fetch, llvm, gmp, mpfr, libmpc, ncurses, zlib, version}:
 
 stdenv.mkDerivation rec {
   name = "dragonegg-${version}";
diff --git a/pkgs/development/compilers/llvm/3.7/default.nix b/pkgs/development/compilers/llvm/3.7/default.nix
index 1bd4b88c72d..f176894dedb 100644
--- a/pkgs/development/compilers/llvm/3.7/default.nix
+++ b/pkgs/development/compilers/llvm/3.7/default.nix
@@ -1,5 +1,5 @@
-{ newScope, stdenv, libstdcxxHook, cmake, libxml2, python2, isl, fetchurl
-, overrideCC, wrapCCWith, darwin
+{ newScope, stdenv, libstdcxxHook, isl, fetchurl
+, overrideCC, wrapCCWith
 , buildLlvmTools # tools, but from the previous stage, for cross
 , targetLlvmLibraries # libraries, but from the next stage, for cross
 }:
diff --git a/pkgs/development/compilers/llvm/3.7/llvm.nix b/pkgs/development/compilers/llvm/3.7/llvm.nix
index 1654914ff8c..98b6f4adbbf 100644
--- a/pkgs/development/compilers/llvm/3.7/llvm.nix
+++ b/pkgs/development/compilers/llvm/3.7/llvm.nix
@@ -8,7 +8,6 @@
 , libffi
 , libbfd
 , libxml2
-, valgrind
 , ncurses
 , version
 , zlib
diff --git a/pkgs/development/compilers/llvm/3.8/default.nix b/pkgs/development/compilers/llvm/3.8/default.nix
index 28f908ee829..99869e6e80a 100644
--- a/pkgs/development/compilers/llvm/3.8/default.nix
+++ b/pkgs/development/compilers/llvm/3.8/default.nix
@@ -1,4 +1,4 @@
-{ newScope, stdenv, libstdcxxHook, isl, fetchurl, overrideCC, wrapCCWith, darwin
+{ newScope, stdenv, libstdcxxHook, isl, fetchurl, overrideCC, wrapCCWith
 , buildLlvmTools # tools, but from the previous stage, for cross
 , targetLlvmLibraries # libraries, but from the next stage, for cross
 }:
diff --git a/pkgs/development/compilers/llvm/3.8/llvm.nix b/pkgs/development/compilers/llvm/3.8/llvm.nix
index a6fb6119817..8cfcb1af43d 100644
--- a/pkgs/development/compilers/llvm/3.8/llvm.nix
+++ b/pkgs/development/compilers/llvm/3.8/llvm.nix
@@ -8,7 +8,6 @@
 , libffi
 , libbfd
 , libxml2
-, valgrind
 , ncurses
 , version
 , zlib
diff --git a/pkgs/development/compilers/llvm/3.9/default.nix b/pkgs/development/compilers/llvm/3.9/default.nix
index ea3ea36eb6d..01c08f4bd20 100644
--- a/pkgs/development/compilers/llvm/3.9/default.nix
+++ b/pkgs/development/compilers/llvm/3.9/default.nix
@@ -1,4 +1,4 @@
-{ newScope, stdenv, libstdcxxHook, isl, fetchurl, overrideCC, wrapCCWith, darwin
+{ newScope, stdenv, libstdcxxHook, isl, fetchurl, overrideCC, wrapCCWith
 , buildLlvmTools # tools, but from the previous stage, for cross
 , targetLlvmLibraries # libraries, but from the next stage, for cross
 }:
diff --git a/pkgs/development/compilers/llvm/3.9/llvm.nix b/pkgs/development/compilers/llvm/3.9/llvm.nix
index 458ad7db8ef..c974eb6f6d3 100644
--- a/pkgs/development/compilers/llvm/3.9/llvm.nix
+++ b/pkgs/development/compilers/llvm/3.9/llvm.nix
@@ -8,14 +8,12 @@
 , libffi
 , libbfd
 , libxml2
-, valgrind
 , ncurses
 , version
 , zlib
 , compiler-rt_src
 , debugVersion ? false
 , enableSharedLibraries ? (buildPlatform == hostPlatform)
-, darwin
 , buildPackages
 , buildPlatform
 , hostPlatform
diff --git a/pkgs/development/compilers/llvm/4/default.nix b/pkgs/development/compilers/llvm/4/default.nix
index ae674d1fa8e..75037f6a07d 100644
--- a/pkgs/development/compilers/llvm/4/default.nix
+++ b/pkgs/development/compilers/llvm/4/default.nix
@@ -1,6 +1,5 @@
-{ lowPrio, newScope, stdenv, targetPlatform, cmake, libstdcxxHook
+{ lowPrio, newScope, stdenv, cmake, libstdcxxHook
 , libxml2, python2, isl, fetchurl, overrideCC, wrapCCWith
-, darwin
 , buildLlvmTools # tools, but from the previous stage, for cross
 , targetLlvmLibraries # libraries, but from the next stage, for cross
 }:
diff --git a/pkgs/development/compilers/llvm/4/libc++/default.nix b/pkgs/development/compilers/llvm/4/libc++/default.nix
index 6ce9c0d4792..2b543b9d793 100644
--- a/pkgs/development/compilers/llvm/4/libc++/default.nix
+++ b/pkgs/development/compilers/llvm/4/libc++/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetch, cmake, python, llvm, libcxxabi, fixDarwinDylibNames, version }:
+{ lib, stdenv, fetch, cmake, python, libcxxabi, fixDarwinDylibNames, version }:
 
 stdenv.mkDerivation rec {
   name = "libc++-${version}";
diff --git a/pkgs/development/compilers/llvm/4/lld.nix b/pkgs/development/compilers/llvm/4/lld.nix
index 776109ee74d..21b0c1c3601 100644
--- a/pkgs/development/compilers/llvm/4/lld.nix
+++ b/pkgs/development/compilers/llvm/4/lld.nix
@@ -1,9 +1,7 @@
 { stdenv
 , fetch
 , cmake
-, zlib
 , llvm
-, python
 , version
 }:
 
diff --git a/pkgs/development/compilers/llvm/4/llvm.nix b/pkgs/development/compilers/llvm/4/llvm.nix
index e9140d3fcc6..514c3a006e3 100644
--- a/pkgs/development/compilers/llvm/4/llvm.nix
+++ b/pkgs/development/compilers/llvm/4/llvm.nix
@@ -6,7 +6,6 @@
 , libffi
 , libbfd
 , libxml2
-, valgrind
 , ncurses
 , version
 , release_version
@@ -15,7 +14,6 @@
 , debugVersion ? false
 , enableManpages ? false
 , enableSharedLibraries ? true
-, darwin
 }:
 
 let
diff --git a/pkgs/development/compilers/llvm/4/openmp.nix b/pkgs/development/compilers/llvm/4/openmp.nix
index 0bdf5c71e1f..a8a6b3dfea8 100644
--- a/pkgs/development/compilers/llvm/4/openmp.nix
+++ b/pkgs/development/compilers/llvm/4/openmp.nix
@@ -1,7 +1,6 @@
 { stdenv
 , fetch
 , cmake
-, zlib
 , llvm
 , perl
 , version
diff --git a/pkgs/development/compilers/llvm/5/clang/default.nix b/pkgs/development/compilers/llvm/5/clang/default.nix
index 07738048f8e..5fd0271f026 100644
--- a/pkgs/development/compilers/llvm/5/clang/default.nix
+++ b/pkgs/development/compilers/llvm/5/clang/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetch, cmake, libxml2, llvm, version, release_version, clang-tools-extra_src, python
+{ stdenv, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src, python
 , fixDarwinDylibNames
 , enableManpages ? false
 }:
diff --git a/pkgs/development/compilers/llvm/5/default.nix b/pkgs/development/compilers/llvm/5/default.nix
index ef2e1c29088..00b0083108b 100644
--- a/pkgs/development/compilers/llvm/5/default.nix
+++ b/pkgs/development/compilers/llvm/5/default.nix
@@ -1,6 +1,5 @@
-{ lowPrio, newScope, stdenv, targetPlatform, cmake, libstdcxxHook
+{ lowPrio, newScope, stdenv, cmake, libstdcxxHook
 , libxml2, python2, isl, fetchurl, overrideCC, wrapCCWith
-, darwin
 , buildLlvmTools # tools, but from the previous stage, for cross
 , targetLlvmLibraries # libraries, but from the next stage, for cross
 }:
diff --git a/pkgs/development/compilers/llvm/5/libc++/default.nix b/pkgs/development/compilers/llvm/5/libc++/default.nix
index 5492e12da98..c7b4615e374 100644
--- a/pkgs/development/compilers/llvm/5/libc++/default.nix
+++ b/pkgs/development/compilers/llvm/5/libc++/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetch, cmake, python, llvm, libcxxabi, fixDarwinDylibNames, version }:
+{ lib, stdenv, fetch, cmake, python, libcxxabi, fixDarwinDylibNames, version }:
 
 stdenv.mkDerivation rec {
   name = "libc++-${version}";
diff --git a/pkgs/development/compilers/llvm/5/lld.nix b/pkgs/development/compilers/llvm/5/lld.nix
index 05801f2f08f..9a47435cf14 100644
--- a/pkgs/development/compilers/llvm/5/lld.nix
+++ b/pkgs/development/compilers/llvm/5/lld.nix
@@ -1,9 +1,7 @@
 { stdenv
 , fetch
 , cmake
-, zlib
 , llvm
-, python
 , version
 }:
 
diff --git a/pkgs/development/compilers/llvm/5/llvm.nix b/pkgs/development/compilers/llvm/5/llvm.nix
index 31750e2d0da..68eebc33c6b 100644
--- a/pkgs/development/compilers/llvm/5/llvm.nix
+++ b/pkgs/development/compilers/llvm/5/llvm.nix
@@ -1,12 +1,10 @@
 { stdenv
 , fetch
-, fetchpatch
 , cmake
 , python
 , libffi
 , libbfd
 , libxml2
-, valgrind
 , ncurses
 , version
 , release_version
@@ -15,7 +13,6 @@
 , debugVersion ? false
 , enableManpages ? false
 , enableSharedLibraries ? true
-, darwin
 }:
 
 let
diff --git a/pkgs/development/compilers/llvm/5/openmp.nix b/pkgs/development/compilers/llvm/5/openmp.nix
index 5c2b7501f97..901015bf2ff 100644
--- a/pkgs/development/compilers/llvm/5/openmp.nix
+++ b/pkgs/development/compilers/llvm/5/openmp.nix
@@ -1,7 +1,6 @@
 { stdenv
 , fetch
 , cmake
-, zlib
 , llvm
 , perl
 , version
diff --git a/pkgs/development/compilers/llvm/6/clang/default.nix b/pkgs/development/compilers/llvm/6/clang/default.nix
index 88214418406..84056749678 100644
--- a/pkgs/development/compilers/llvm/6/clang/default.nix
+++ b/pkgs/development/compilers/llvm/6/clang/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetch, cmake, libxml2, llvm, version, release_version, clang-tools-extra_src, python
+{ stdenv, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src, python
 , fixDarwinDylibNames
 , enableManpages ? false
 }:
diff --git a/pkgs/development/compilers/llvm/6/default.nix b/pkgs/development/compilers/llvm/6/default.nix
index 66f0facc952..141daa88dcf 100644
--- a/pkgs/development/compilers/llvm/6/default.nix
+++ b/pkgs/development/compilers/llvm/6/default.nix
@@ -1,6 +1,5 @@
-{ lowPrio, newScope, stdenv, targetPlatform, cmake, libstdcxxHook
+{ lowPrio, newScope, stdenv, cmake, libstdcxxHook
 , libxml2, python2, isl, fetchurl, overrideCC, wrapCCWith
-, darwin
 , buildLlvmTools # tools, but from the previous stage, for cross
 , targetLlvmLibraries # libraries, but from the next stage, for cross
 }:
diff --git a/pkgs/development/compilers/llvm/6/libc++/default.nix b/pkgs/development/compilers/llvm/6/libc++/default.nix
index c1f0b9f6129..1f87cb83ab0 100644
--- a/pkgs/development/compilers/llvm/6/libc++/default.nix
+++ b/pkgs/development/compilers/llvm/6/libc++/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetch, cmake, python, llvm, libcxxabi, fixDarwinDylibNames, version }:
+{ lib, stdenv, fetch, cmake, python, libcxxabi, fixDarwinDylibNames, version }:
 
 stdenv.mkDerivation rec {
   name = "libc++-${version}";
diff --git a/pkgs/development/compilers/llvm/6/lld.nix b/pkgs/development/compilers/llvm/6/lld.nix
index 818ad47a335..1e68276945e 100644
--- a/pkgs/development/compilers/llvm/6/lld.nix
+++ b/pkgs/development/compilers/llvm/6/lld.nix
@@ -3,7 +3,6 @@
 , cmake
 , libxml2
 , llvm
-, python
 , version
 }:
 
diff --git a/pkgs/development/compilers/llvm/6/llvm.nix b/pkgs/development/compilers/llvm/6/llvm.nix
index 6fc448574f4..a86f5b5039e 100644
--- a/pkgs/development/compilers/llvm/6/llvm.nix
+++ b/pkgs/development/compilers/llvm/6/llvm.nix
@@ -1,12 +1,10 @@
 { stdenv
 , fetch
-, fetchpatch
 , cmake
 , python
 , libffi
 , libbfd
 , libxml2
-, valgrind
 , ncurses
 , version
 , release_version
@@ -15,7 +13,6 @@
 , enableManpages ? false
 , enableSharedLibraries ? true
 , enableWasm ? true
-, darwin
 }:
 
 let
diff --git a/pkgs/development/compilers/llvm/6/openmp.nix b/pkgs/development/compilers/llvm/6/openmp.nix
index 16093758e82..908a5f1218f 100644
--- a/pkgs/development/compilers/llvm/6/openmp.nix
+++ b/pkgs/development/compilers/llvm/6/openmp.nix
@@ -1,7 +1,6 @@
 { stdenv
 , fetch
 , cmake
-, zlib
 , llvm
 , perl
 , version
diff --git a/pkgs/development/compilers/matter-compiler/default.nix b/pkgs/development/compilers/matter-compiler/default.nix
index 58fb0ca22d7..63e5b50c3d4 100644
--- a/pkgs/development/compilers/matter-compiler/default.nix
+++ b/pkgs/development/compilers/matter-compiler/default.nix
@@ -1,5 +1,5 @@
 
-{ stdenv, lib, bundlerEnv, ruby }:
+{ lib, bundlerEnv, ruby }:
 
 bundlerEnv {
   name = "matter_compiler-0.5.1";
diff --git a/pkgs/development/compilers/mcpp/default.nix b/pkgs/development/compilers/mcpp/default.nix
index cdf201cec7a..9ce7c9166bc 100644
--- a/pkgs/development/compilers/mcpp/default.nix
+++ b/pkgs/development/compilers/mcpp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, mcpp }:
+{ stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   name = "mcpp-2.7.2";
diff --git a/pkgs/development/compilers/mono/4.0.nix b/pkgs/development/compilers/mono/4.0.nix
index f13883db74f..892ae99abaf 100644
--- a/pkgs/development/compilers/mono/4.0.nix
+++ b/pkgs/development/compilers/mono/4.0.nix
@@ -1,4 +1,4 @@
-{ stdenv, callPackage, Foundation, libobjc }:
+{ callPackage, Foundation, libobjc }:
 callPackage ./generic.nix (rec {
   inherit Foundation libobjc;
   version = "4.0.4.1";
diff --git a/pkgs/development/compilers/mono/4.4.nix b/pkgs/development/compilers/mono/4.4.nix
index f80cffe220e..9a3ccd1fd86 100644
--- a/pkgs/development/compilers/mono/4.4.nix
+++ b/pkgs/development/compilers/mono/4.4.nix
@@ -1,4 +1,4 @@
-{ stdenv, callPackage, Foundation, libobjc }:
+{ callPackage, Foundation, libobjc }:
 
 callPackage ./generic.nix (rec {
   inherit Foundation libobjc;
diff --git a/pkgs/development/compilers/mono/4.6.nix b/pkgs/development/compilers/mono/4.6.nix
index 7c9918cdd39..2bba660b69c 100644
--- a/pkgs/development/compilers/mono/4.6.nix
+++ b/pkgs/development/compilers/mono/4.6.nix
@@ -1,4 +1,4 @@
-{ stdenv, callPackage, Foundation, libobjc }:
+{ callPackage, Foundation, libobjc }:
 
 callPackage ./generic.nix (rec {
   inherit Foundation libobjc;
diff --git a/pkgs/development/compilers/mono/4.8.nix b/pkgs/development/compilers/mono/4.8.nix
index c3ba316cd13..f445127c0da 100644
--- a/pkgs/development/compilers/mono/4.8.nix
+++ b/pkgs/development/compilers/mono/4.8.nix
@@ -1,4 +1,4 @@
-{ stdenv, callPackage, Foundation, libobjc }:
+{ callPackage, Foundation, libobjc }:
 
 callPackage ./generic-cmake.nix (rec {
   inherit Foundation libobjc;
diff --git a/pkgs/development/compilers/mono/5.0.nix b/pkgs/development/compilers/mono/5.0.nix
index d10d6e3e605..53820c97b1b 100644
--- a/pkgs/development/compilers/mono/5.0.nix
+++ b/pkgs/development/compilers/mono/5.0.nix
@@ -1,4 +1,4 @@
-{ stdenv, callPackage, Foundation, libobjc }:
+{ callPackage, Foundation, libobjc }:
 
 callPackage ./generic-cmake.nix (rec {
   inherit Foundation libobjc;
diff --git a/pkgs/development/compilers/mono/5.4.nix b/pkgs/development/compilers/mono/5.4.nix
index 31e86f94c0a..acebb4beef6 100644
--- a/pkgs/development/compilers/mono/5.4.nix
+++ b/pkgs/development/compilers/mono/5.4.nix
@@ -1,4 +1,4 @@
-{ stdenv, callPackage, Foundation, libobjc }:
+{ callPackage, Foundation, libobjc }:
 
 callPackage ./generic-cmake.nix (rec {
   inherit Foundation libobjc;
diff --git a/pkgs/development/compilers/mono/5.8.nix b/pkgs/development/compilers/mono/5.8.nix
index 6db9e19807b..7b5008fd04c 100644
--- a/pkgs/development/compilers/mono/5.8.nix
+++ b/pkgs/development/compilers/mono/5.8.nix
@@ -1,4 +1,4 @@
-{ stdenv, callPackage, Foundation, libobjc }:
+{ callPackage, Foundation, libobjc }:
 
 callPackage ./generic-cmake.nix (rec {
   inherit Foundation libobjc;
diff --git a/pkgs/development/compilers/nvidia-cg-toolkit/default.nix b/pkgs/development/compilers/nvidia-cg-toolkit/default.nix
index 9eec23f1ba8..21ccf77e4a2 100644
--- a/pkgs/development/compilers/nvidia-cg-toolkit/default.nix
+++ b/pkgs/development/compilers/nvidia-cg-toolkit/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, patchelf }:
+{ lib, stdenv, fetchurl }:
 
 assert stdenv ? glibc;
 
diff --git a/pkgs/development/compilers/obliv-c/default.nix b/pkgs/development/compilers/obliv-c/default.nix
index 774cefb7940..f5bd3430ae7 100644
--- a/pkgs/development/compilers/obliv-c/default.nix
+++ b/pkgs/development/compilers/obliv-c/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libgcrypt, fetchFromGitHub, ocamlPackages, perl }:
+{ stdenv, libgcrypt, fetchFromGitHub, ocamlPackages, perl }:
 stdenv.mkDerivation rec {
   name = "obliv-c-${version}";
   version = "0.0pre20170827";
diff --git a/pkgs/development/compilers/openjdk/10.nix b/pkgs/development/compilers/openjdk/10.nix
index 7ed493fe92e..6e8d9003bf4 100644
--- a/pkgs/development/compilers/openjdk/10.nix
+++ b/pkgs/development/compilers/openjdk/10.nix
@@ -1,5 +1,5 @@
 { stdenv, lib, fetchurl, bash, cpio, pkgconfig, file, which, unzip, zip, cups, freetype
-, alsaLib, bootjdk, cacert, perl, liberation_ttf, fontconfig, zlib, lndir
+, alsaLib, bootjdk, perl, liberation_ttf, fontconfig, zlib, lndir
 , libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama, libXcursor, libXrandr
 , libjpeg, giflib
 , setJavaClassPath
diff --git a/pkgs/development/compilers/openjdk/bootstrap.nix b/pkgs/development/compilers/openjdk/bootstrap.nix
index 3c29df7ec78..612f0db0582 100644
--- a/pkgs/development/compilers/openjdk/bootstrap.nix
+++ b/pkgs/development/compilers/openjdk/bootstrap.nix
@@ -1,5 +1,5 @@
 { stdenv
-, runCommand, fetchurl, file, zlib
+, runCommand, fetchurl, zlib
 
 , version
 }:
diff --git a/pkgs/development/compilers/oraclejdk/jdk10-linux.nix b/pkgs/development/compilers/oraclejdk/jdk10-linux.nix
index e6e868fdf41..de063500b70 100644
--- a/pkgs/development/compilers/oraclejdk/jdk10-linux.nix
+++ b/pkgs/development/compilers/oraclejdk/jdk10-linux.nix
@@ -2,11 +2,9 @@
 , stdenv
 , requireFile
 , makeWrapper
-, unzip
 , file
 , xorg ? null
 , packageType ? "JDK" # JDK, JRE, or ServerJRE
-, pluginSupport ? true
 , glib
 , libxml2
 , ffmpeg_2
diff --git a/pkgs/development/compilers/pakcs/default.nix b/pkgs/development/compilers/pakcs/default.nix
index 94b89cf3a95..60388265348 100644
--- a/pkgs/development/compilers/pakcs/default.nix
+++ b/pkgs/development/compilers/pakcs/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
 
   curryBase = haskellPackages.callPackage (
     { mkDerivation, base, Cabal, containers, directory, either
-    , filepath, mtl, pretty, stdenv, syb, time
+    , filepath, mtl, pretty, syb, time
     }:
     mkDerivation {
       pname = "curry-base";
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
 
   curryFront = haskellPackages.callPackage (
     { mkDerivation, base, Cabal, containers, directory
-    , filepath, mtl, network-uri, process, stdenv, syb, transformers
+    , filepath, mtl, network-uri, process, syb, transformers
     }:
     mkDerivation {
       pname = "curry-frontend";
diff --git a/pkgs/development/compilers/rust/binaryBuild.nix b/pkgs/development/compilers/rust/binaryBuild.nix
index 4c3c5d008f0..3cf6d4efe2d 100644
--- a/pkgs/development/compilers/rust/binaryBuild.nix
+++ b/pkgs/development/compilers/rust/binaryBuild.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, makeWrapper, bash, cacert, zlib, buildRustPackage, curl, darwin
+{ stdenv, makeWrapper, bash, buildRustPackage, curl, darwin
 , version
 , src
 , platform
diff --git a/pkgs/development/compilers/rust/cargo.nix b/pkgs/development/compilers/rust/cargo.nix
index 46caabf3391..2ff3257c7fb 100644
--- a/pkgs/development/compilers/rust/cargo.nix
+++ b/pkgs/development/compilers/rust/cargo.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, file, curl, pkgconfig, python, openssl, cmake, zlib
+{ stdenv, file, curl, pkgconfig, python, openssl, cmake, zlib
 , makeWrapper, libiconv, cacert, rustPlatform, rustc, libgit2, darwin
 , version
 , patches ? []
diff --git a/pkgs/development/compilers/souffle/default.nix b/pkgs/development/compilers/souffle/default.nix
index 099a591b407..0523e099e49 100644
--- a/pkgs/development/compilers/souffle/default.nix
+++ b/pkgs/development/compilers/souffle/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub
 , boost, bison, flex, openjdk, doxygen
-, perl, graphviz, libtool, ncurses, zlib, sqlite
+, perl, graphviz, ncurses, zlib, sqlite
 , autoreconfHook }:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/development/compilers/swift/default.nix b/pkgs/development/compilers/swift/default.nix
index abbfdd2abb7..9c1a3658590 100644
--- a/pkgs/development/compilers/swift/default.nix
+++ b/pkgs/development/compilers/swift/default.nix
@@ -27,7 +27,6 @@
 , git
 , libgit2
 , fetchFromGitHub
-, fetchpatch
 , paxctl
 , findutils
 , makeWrapper
diff --git a/pkgs/development/compilers/urweb/default.nix b/pkgs/development/compilers/urweb/default.nix
index f2b6016ceb7..8426635ce96 100644
--- a/pkgs/development/compilers/urweb/default.nix
+++ b/pkgs/development/compilers/urweb/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, file, openssl, mlton
+{ stdenv, fetchurl, file, openssl, mlton
 , mysql, postgresql, sqlite, gcc
 }:
 
diff --git a/pkgs/development/coq-modules/mathcomp/generic.nix b/pkgs/development/coq-modules/mathcomp/generic.nix
index 1cc5dc368da..22721ca98bc 100644
--- a/pkgs/development/coq-modules/mathcomp/generic.nix
+++ b/pkgs/development/coq-modules/mathcomp/generic.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, coq, ncurses, which
+{ stdenv, coq, ncurses, which
 , graphviz, withDoc ? false
 , src, name
 }:
diff --git a/pkgs/development/coq-modules/ssreflect/generic.nix b/pkgs/development/coq-modules/ssreflect/generic.nix
index a44e81d3c19..d09e47a7f84 100644
--- a/pkgs/development/coq-modules/ssreflect/generic.nix
+++ b/pkgs/development/coq-modules/ssreflect/generic.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, coq, ncurses, which
+{ stdenv, coq, ncurses, which
 , graphviz, withDoc ? false
 , src, name, patches ? []
 }:
diff --git a/pkgs/development/idris-modules/build-builtin-package.nix b/pkgs/development/idris-modules/build-builtin-package.nix
index 1cd687058b3..ff19e52135c 100644
--- a/pkgs/development/idris-modules/build-builtin-package.nix
+++ b/pkgs/development/idris-modules/build-builtin-package.nix
@@ -1,7 +1,7 @@
 # Build one of the packages that comes with idris
 # name: The name of the package
 # deps: The dependencies of the package
-{ idris, build-idris-package, lib }: name: deps:
+{ idris, build-idris-package }: name: deps:
 let
   inherit (builtins.parseDrvName idris.name) version;
 in
diff --git a/pkgs/development/interpreters/erlang/R19.nix b/pkgs/development/interpreters/erlang/R19.nix
index d0ba1912e9a..d94d4a5a14d 100644
--- a/pkgs/development/interpreters/erlang/R19.nix
+++ b/pkgs/development/interpreters/erlang/R19.nix
@@ -1,4 +1,4 @@
-{ mkDerivation, fetchurl, fetchpatch }:
+{ mkDerivation, fetchpatch }:
 
 mkDerivation rec {
   version = "19.3.6.6";
diff --git a/pkgs/development/interpreters/erlang/R20.nix b/pkgs/development/interpreters/erlang/R20.nix
index 5cea1fd533f..19ac6d35592 100644
--- a/pkgs/development/interpreters/erlang/R20.nix
+++ b/pkgs/development/interpreters/erlang/R20.nix
@@ -1,4 +1,4 @@
-{ mkDerivation, fetchurl }:
+{ mkDerivation }:
 
 mkDerivation rec {
   version = "20.3.8";
diff --git a/pkgs/development/interpreters/erlang/R21.nix b/pkgs/development/interpreters/erlang/R21.nix
index de00ebdf2cb..e9aa2a3dc42 100644
--- a/pkgs/development/interpreters/erlang/R21.nix
+++ b/pkgs/development/interpreters/erlang/R21.nix
@@ -1,4 +1,4 @@
-{ mkDerivation, fetchurl }:
+{ mkDerivation }:
 
 mkDerivation rec {
   version = "21.0";
diff --git a/pkgs/development/interpreters/erlang/generic-builder.nix b/pkgs/development/interpreters/erlang/generic-builder.nix
index 6ea3ac73a4b..ba0a00b3037 100644
--- a/pkgs/development/interpreters/erlang/generic-builder.nix
+++ b/pkgs/development/interpreters/erlang/generic-builder.nix
@@ -1,4 +1,4 @@
-{ pkgs, stdenv, fetchurl, fetchFromGitHub, makeWrapper, gawk, gnum4, gnused
+{ pkgs, stdenv, fetchFromGitHub, makeWrapper, gawk, gnum4, gnused
 , libxml2, libxslt, ncurses, openssl, perl, autoreconfHook
 , openjdk ? null # javacSupport
 , unixODBC ? null # odbcSupport
diff --git a/pkgs/development/interpreters/guile/2.0.nix b/pkgs/development/interpreters/guile/2.0.nix
index b0eeb89ce43..848b8666f27 100644
--- a/pkgs/development/interpreters/guile/2.0.nix
+++ b/pkgs/development/interpreters/guile/2.0.nix
@@ -2,7 +2,7 @@
 , buildPlatform, hostPlatform
 , fetchpatch, fetchurl, makeWrapper, gawk, pkgconfig
 , libffi, libtool, readline, gmp, boehmgc, libunistring
-, coverageAnalysis ? null, gnu ? null
+, coverageAnalysis ? null
 }:
 
 # Do either a coverage analysis build or a standard build.
diff --git a/pkgs/development/interpreters/guile/default.nix b/pkgs/development/interpreters/guile/default.nix
index 196c899fcea..8110598e173 100644
--- a/pkgs/development/interpreters/guile/default.nix
+++ b/pkgs/development/interpreters/guile/default.nix
@@ -2,7 +2,7 @@
 , buildPlatform, hostPlatform
 , fetchurl, makeWrapper, gawk, pkgconfig
 , libffi, libtool, readline, gmp, boehmgc, libunistring
-, coverageAnalysis ? null, gnu ? null
+, coverageAnalysis ? null
 }:
 
 # Do either a coverage analysis build or a standard build.
diff --git a/pkgs/development/interpreters/lua-5/5.1.nix b/pkgs/development/interpreters/lua-5/5.1.nix
index 271490c9957..09af492490c 100644
--- a/pkgs/development/interpreters/lua-5/5.1.nix
+++ b/pkgs/development/interpreters/lua-5/5.1.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, readline }:
+{ stdenv, fetchurl, readline }:
 
 let
   dsoPatch = fetchurl {
diff --git a/pkgs/development/interpreters/lua-5/5.2.nix b/pkgs/development/interpreters/lua-5/5.2.nix
index 6221bf3fb84..6d8de7bae27 100644
--- a/pkgs/development/interpreters/lua-5/5.2.nix
+++ b/pkgs/development/interpreters/lua-5/5.2.nix
@@ -1,6 +1,4 @@
-{ stdenv, fetchurl, readline, compat ? false
-, hostPlatform
-}:
+{ stdenv, fetchurl, readline, compat ? false }:
 
 let
   dsoPatch = fetchurl {
diff --git a/pkgs/development/interpreters/lua-5/5.3.nix b/pkgs/development/interpreters/lua-5/5.3.nix
index 5a4893db063..2c4f3657aac 100644
--- a/pkgs/development/interpreters/lua-5/5.3.nix
+++ b/pkgs/development/interpreters/lua-5/5.3.nix
@@ -1,6 +1,4 @@
-{ stdenv, fetchurl, readline, compat ? false
-, hostPlatform
-}:
+{ stdenv, fetchurl, readline, compat ? false }:
 
 stdenv.mkDerivation rec {
   name = "lua-${version}";
diff --git a/pkgs/development/interpreters/luajit/default.nix b/pkgs/development/interpreters/luajit/default.nix
index 73b979e9ca4..9ee628f498e 100644
--- a/pkgs/development/interpreters/luajit/default.nix
+++ b/pkgs/development/interpreters/luajit/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, hostPlatform }:
+{ stdenv, lib, fetchurl }:
 rec {
 
   luajit = luajit_2_1;
diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix
index 08672d28a1f..40a70623dcb 100644
--- a/pkgs/development/interpreters/perl/default.nix
+++ b/pkgs/development/interpreters/perl/default.nix
@@ -1,5 +1,5 @@
 { lib, stdenv, fetchurlBoot, buildPackages
-, enableThreading ? stdenv ? glibc, fetchpatch, makeWrapper
+, enableThreading ? stdenv ? glibc, makeWrapper
 }:
 
 with lib;
diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix
index 3032b5e4c2a..52a3c64f81c 100644
--- a/pkgs/development/interpreters/php/default.nix
+++ b/pkgs/development/interpreters/php/default.nix
@@ -1,6 +1,6 @@
 # pcre functionality is tested in nixos/tests/php-pcre.nix
 
-{ lib, stdenv, fetchurl, composableDerivation, autoconf, automake, flex, bison
+{ lib, stdenv, fetchurl, composableDerivation, flex, bison
 , mysql, libxml2, readline, zlib, curl, postgresql, gettext
 , openssl, pcre, pkgconfig, sqlite, config, libjpeg, libpng, freetype
 , libxslt, libmcrypt, bzip2, icu, openldap, cyrus_sasl, libmhash, freetds
diff --git a/pkgs/development/interpreters/pyrex/0.9.5.nix b/pkgs/development/interpreters/pyrex/0.9.5.nix
index 18bc875fb33..be11b38a0b8 100644
--- a/pkgs/development/interpreters/pyrex/0.9.5.nix
+++ b/pkgs/development/interpreters/pyrex/0.9.5.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, python2Packages }:
+{ fetchurl, python2Packages }:
 
 let version = "0.9.5.1.1"; in
 
diff --git a/pkgs/development/interpreters/pyrex/0.9.6.nix b/pkgs/development/interpreters/pyrex/0.9.6.nix
index 2feb15b647d..2a18dbff9e6 100644
--- a/pkgs/development/interpreters/pyrex/0.9.6.nix
+++ b/pkgs/development/interpreters/pyrex/0.9.6.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, python2Packages }:
+{ fetchurl, python2Packages }:
 
 let version = "0.9.6.4"; in
 
diff --git a/pkgs/development/interpreters/python/cpython/2.7/default.nix b/pkgs/development/interpreters/python/cpython/2.7/default.nix
index d37f59250d5..fd84d924d7b 100644
--- a/pkgs/development/interpreters/python/cpython/2.7/default.nix
+++ b/pkgs/development/interpreters/python/cpython/2.7/default.nix
@@ -10,7 +10,6 @@
 , zlib
 , callPackage
 , self
-, gettext
 , db
 , expat
 , libffi
@@ -19,7 +18,7 @@
 # Some proprietary libs assume UCS2 unicode, especially on darwin :(
 , ucsEncoding ? 4
 # For the Python package set
-, pkgs, packageOverrides ? (self: super: {})
+, packageOverrides ? (self: super: {})
 }:
 
 assert x11Support -> tcl != null
diff --git a/pkgs/development/interpreters/python/cpython/3.4/default.nix b/pkgs/development/interpreters/python/cpython/3.4/default.nix
index a8b6ffd1da9..7e583087c08 100644
--- a/pkgs/development/interpreters/python/cpython/3.4/default.nix
+++ b/pkgs/development/interpreters/python/cpython/3.4/default.nix
@@ -15,7 +15,7 @@
 , CF, configd
 , python-setup-hook
 # For the Python package set
-, pkgs, packageOverrides ? (self: super: {})
+, packageOverrides ? (self: super: {})
 }:
 
 assert x11Support -> tcl != null
diff --git a/pkgs/development/interpreters/python/cpython/3.5/default.nix b/pkgs/development/interpreters/python/cpython/3.5/default.nix
index 2bbdb8bdd84..588880c1e82 100644
--- a/pkgs/development/interpreters/python/cpython/3.5/default.nix
+++ b/pkgs/development/interpreters/python/cpython/3.5/default.nix
@@ -15,7 +15,7 @@
 , CF, configd
 , python-setup-hook
 # For the Python package set
-, pkgs, packageOverrides ? (self: super: {})
+, packageOverrides ? (self: super: {})
 }:
 
 assert x11Support -> tcl != null
diff --git a/pkgs/development/interpreters/python/cpython/3.6/default.nix b/pkgs/development/interpreters/python/cpython/3.6/default.nix
index f8628186d79..6b9e26e99fc 100644
--- a/pkgs/development/interpreters/python/cpython/3.6/default.nix
+++ b/pkgs/development/interpreters/python/cpython/3.6/default.nix
@@ -1,5 +1,4 @@
 { stdenv, fetchurl, fetchpatch, buildPackages
-, glibc
 , bzip2
 , expat
 , libffi
@@ -16,7 +15,7 @@
 , CF, configd
 , python-setup-hook
 # For the Python package set
-, pkgs, packageOverrides ? (self: super: {})
+, packageOverrides ? (self: super: {})
 }:
 
 assert x11Support -> tcl != null
diff --git a/pkgs/development/interpreters/python/cpython/3.7/default.nix b/pkgs/development/interpreters/python/cpython/3.7/default.nix
index e0cc198c096..adee8d594f1 100644
--- a/pkgs/development/interpreters/python/cpython/3.7/default.nix
+++ b/pkgs/development/interpreters/python/cpython/3.7/default.nix
@@ -1,5 +1,4 @@
 { stdenv, fetchurl, fetchpatch
-, glibc
 , bzip2
 , expat
 , libffi
@@ -16,7 +15,7 @@
 , CF, configd
 , python-setup-hook
 # For the Python package set
-, pkgs, packageOverrides ? (self: super: {})
+, packageOverrides ? (self: super: {})
 }:
 
 assert x11Support -> tcl != null
diff --git a/pkgs/development/interpreters/python/pypy/2.7/default.nix b/pkgs/development/interpreters/python/pypy/2.7/default.nix
index e68cfc3148f..95a893a209c 100644
--- a/pkgs/development/interpreters/python/pypy/2.7/default.nix
+++ b/pkgs/development/interpreters/python/pypy/2.7/default.nix
@@ -4,7 +4,7 @@
 , makeWrapper, callPackage, self, gdbm, db
 , python-setup-hook
 # For the Python package set
-, pkgs, packageOverrides ? (self: super: {})
+, packageOverrides ? (self: super: {})
 }:
 
 assert zlibSupport -> zlib != null;
diff --git a/pkgs/development/interpreters/rebol/default.nix b/pkgs/development/interpreters/rebol/default.nix
index 8a13c4efce6..4d98f18eee4 100644
--- a/pkgs/development/interpreters/rebol/default.nix
+++ b/pkgs/development/interpreters/rebol/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchurl, patchelf, glibc, libX11, libXt, perl }:
+{ stdenv, fetchFromGitHub, fetchurl, glibc, libX11, libXt, perl }:
 
 stdenv.mkDerivation rec {
   name = "rebol-nightly-${version}";
diff --git a/pkgs/development/interpreters/self/default.nix b/pkgs/development/interpreters/self/default.nix
index 31ef51802ed..594bbc05b7c 100644
--- a/pkgs/development/interpreters/self/default.nix
+++ b/pkgs/development/interpreters/self/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, fetchgit, stdenv, xorg, makeWrapper, ncurses, cmake }:
+{ fetchgit, stdenv, xorg, makeWrapper, ncurses, cmake }:
 
 stdenv.mkDerivation rec {
   # The Self wrapper stores source in $XDG_DATA_HOME/self or ~/.local/share/self 
diff --git a/pkgs/development/interpreters/tcl/generic.nix b/pkgs/development/interpreters/tcl/generic.nix
index 3bf4ba2dc2f..a472ccaafbf 100644
--- a/pkgs/development/interpreters/tcl/generic.nix
+++ b/pkgs/development/interpreters/tcl/generic.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl
+{ stdenv
 
 # Version specific stuff
 , release, version, src
diff --git a/pkgs/development/interpreters/unicon-lang/default.nix b/pkgs/development/interpreters/unicon-lang/default.nix
index a6dfec49b2a..77154b54fd8 100644
--- a/pkgs/development/interpreters/unicon-lang/default.nix
+++ b/pkgs/development/interpreters/unicon-lang/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, unzip, gdbm, libX11, libXt }:
+{ stdenv, fetchurl, unzip, libX11, libXt }:
 
 stdenv.mkDerivation rec {
   name = "unicon-lang-${version}";
diff --git a/pkgs/development/java-modules/jogl/default.nix b/pkgs/development/java-modules/jogl/default.nix
index cceec44e6ae..a3c3b2bf96f 100644
--- a/pkgs/development/java-modules/jogl/default.nix
+++ b/pkgs/development/java-modules/jogl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, makeWrapper, ant, jdk, openjdk8, zulu8, git, xorg, udev, libGL, libGLU }:
+{ stdenv, fetchgit, ant, jdk, openjdk8, zulu8, git, xorg, udev, libGL, libGLU }:
 
 let
   # workaround https://github.com/NixOS/nixpkgs/issues/37364
diff --git a/pkgs/development/java-modules/maven-minimal.nix b/pkgs/development/java-modules/maven-minimal.nix
index df87f51768d..ca7cc7027be 100644
--- a/pkgs/development/java-modules/maven-minimal.nix
+++ b/pkgs/development/java-modules/maven-minimal.nix
@@ -6,7 +6,7 @@ with pkgs.javaPackages;
 let
   collections = import ./collections.nix { inherit pkgs; };
   fetchMaven = pkgs.callPackage ./m2install.nix { };
-  plugins = import ./mavenPlugins.nix { inherit stdenv pkgs maven; };
+  plugins = import ./mavenPlugins.nix { inherit pkgs; };
   poms = import ./poms.nix { inherit fetchMaven; };
 in rec {
   # Maven needs all of these to function
diff --git a/pkgs/development/java-modules/mavenPlugins.nix b/pkgs/development/java-modules/mavenPlugins.nix
index e9ce5b1ce8c..8cc79dc1d22 100644
--- a/pkgs/development/java-modules/mavenPlugins.nix
+++ b/pkgs/development/java-modules/mavenPlugins.nix
@@ -1,4 +1,4 @@
-{ pkgs, stdenv, maven }:
+{ pkgs }:
 
 with pkgs;
 with pkgs.javaPackages;
diff --git a/pkgs/development/libraries/arguments/default.nix b/pkgs/development/libraries/arguments/default.nix
index 912ea53c3d3..60fafd60ad0 100644
--- a/pkgs/development/libraries/arguments/default.nix
+++ b/pkgs/development/libraries/arguments/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, libminc, bicpl }:
+{ stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
   pname = "arguments";
diff --git a/pkgs/development/libraries/assimp/default.nix b/pkgs/development/libraries/assimp/default.nix
index 219c8df803b..24e06b0d65a 100644
--- a/pkgs/development/libraries/assimp/default.nix
+++ b/pkgs/development/libraries/assimp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, unzip, cmake, boost, zlib }:
+{ stdenv, fetchFromGitHub, cmake, boost, zlib }:
 
 stdenv.mkDerivation rec {
   name = "assimp-${version}";
diff --git a/pkgs/development/libraries/audio/libbass/default.nix b/pkgs/development/libraries/audio/libbass/default.nix
index 703679ba3a5..ec93e2f6467 100644
--- a/pkgs/development/libraries/audio/libbass/default.nix
+++ b/pkgs/development/libraries/audio/libbass/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, unzip, fetchurl, writeText }:
+{ stdenv, unzip, fetchurl }:
 
 let
   version = "24";
diff --git a/pkgs/development/libraries/avro-c/default.nix b/pkgs/development/libraries/avro-c/default.nix
index 8b787855c4d..580cd1bd73f 100644
--- a/pkgs/development/libraries/avro-c/default.nix
+++ b/pkgs/development/libraries/avro-c/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, bash, cmake, fetchurl, pkgconfig, jansson, zlib }:
+{ stdenv, cmake, fetchurl, pkgconfig, jansson, zlib }:
 
 let
   version = "1.8.2";
diff --git a/pkgs/development/libraries/belcard/default.nix b/pkgs/development/libraries/belcard/default.nix
index 8805dc74a26..093bb811489 100644
--- a/pkgs/development/libraries/belcard/default.nix
+++ b/pkgs/development/libraries/belcard/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, fetchFromGitHub, bctoolbox, belr }:
+{ stdenv, cmake, fetchFromGitHub, bctoolbox, belr }:
 
 stdenv.mkDerivation rec {
   baseName = "belcard";
diff --git a/pkgs/development/libraries/belle-sip/default.nix b/pkgs/development/libraries/belle-sip/default.nix
index 003fce0ea8c..09ca4908d78 100644
--- a/pkgs/development/libraries/belle-sip/default.nix
+++ b/pkgs/development/libraries/belle-sip/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, antlr3_4, libantlr3c, jre, polarssl, fetchFromGitHub
+{ stdenv, antlr3_4, libantlr3c, jre, polarssl, fetchFromGitHub
   , cmake, zlib, bctoolbox
 }:
 
diff --git a/pkgs/development/libraries/belr/default.nix b/pkgs/development/libraries/belr/default.nix
index 214abb21f2c..736c9a2f9e0 100644
--- a/pkgs/development/libraries/belr/default.nix
+++ b/pkgs/development/libraries/belr/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, fetchFromGitHub, bctoolbox }:
+{ stdenv, cmake, fetchFromGitHub, bctoolbox }:
 
 stdenv.mkDerivation rec {
   baseName = "belr";
diff --git a/pkgs/development/libraries/bzrtp/default.nix b/pkgs/development/libraries/bzrtp/default.nix
index cdc660ca3f3..11b94a0181a 100644
--- a/pkgs/development/libraries/bzrtp/default.nix
+++ b/pkgs/development/libraries/bzrtp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, fetchFromGitHub, bctoolbox, sqlite }:
+{ stdenv, cmake, fetchFromGitHub, bctoolbox, sqlite }:
 
 stdenv.mkDerivation rec {
   baseName = "bzrtp";
diff --git a/pkgs/development/libraries/caf/default.nix b/pkgs/development/libraries/caf/default.nix
index 1e764aff4cc..397e80961e0 100644
--- a/pkgs/development/libraries/caf/default.nix
+++ b/pkgs/development/libraries/caf/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchpatch, cmake }:
+{ stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
   name = "actor-framework-${version}";
diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix
index 4486149cfce..db46412ceb5 100644
--- a/pkgs/development/libraries/cairo/default.nix
+++ b/pkgs/development/libraries/cairo/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchFromGitHub, fetchpatch, pkgconfig, libiconv
+{ stdenv, fetchurl, pkgconfig, libiconv
 , libintl, expat, zlib, libpng, pixman, fontconfig, freetype, xorg
 , gobjectSupport ? true, glib
 , xcbSupport ? true # no longer experimental since 1.12
diff --git a/pkgs/development/libraries/cairomm/default.nix b/pkgs/development/libraries/cairomm/default.nix
index 47250f2b3da..a4e4968f562 100644
--- a/pkgs/development/libraries/cairomm/default.nix
+++ b/pkgs/development/libraries/cairomm/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, pkgconfig, darwin, cairo, xlibsWrapper, fontconfig, freetype, libsigcxx }:
+{ fetchurl, stdenv, pkgconfig, darwin, cairo, fontconfig, freetype, libsigcxx }:
 let
   ver_maj = "1.12";
   ver_min = "2";
diff --git a/pkgs/development/libraries/capstone/default.nix b/pkgs/development/libraries/capstone/default.nix
index 64e3690eb3e..0fc0dfb0706 100644
--- a/pkgs/development/libraries/capstone/default.nix
+++ b/pkgs/development/libraries/capstone/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, bash, pkgconfig }:
+{ stdenv, fetchurl, pkgconfig }:
 
 stdenv.mkDerivation rec {
   name    = "capstone-${version}";
diff --git a/pkgs/development/libraries/cl/default.nix b/pkgs/development/libraries/cl/default.nix
index 7c44c2e0ab0..7cb75d8de0f 100644
--- a/pkgs/development/libraries/cl/default.nix
+++ b/pkgs/development/libraries/cl/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchFromGitHub, SDL, libGLU_combined, rebar, erlang, opencl-headers, ocl-icd }:
+{stdenv, fetchFromGitHub, rebar, erlang, opencl-headers, ocl-icd }:
 
 stdenv.mkDerivation rec {
   version = "1.2.3";
diff --git a/pkgs/development/libraries/clutter/default.nix b/pkgs/development/libraries/clutter/default.nix
index eba94288e8f..705aa7252d1 100644
--- a/pkgs/development/libraries/clutter/default.nix
+++ b/pkgs/development/libraries/clutter/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, glib, pkgconfig, libGLU_combined, libX11, libXext, libXfixes
+{ stdenv, fetchurl, pkgconfig, libGLU_combined, libX11, libXext, libXfixes
 , libXdamage, libXcomposite, libXi, libxcb, cogl, pango, atk, json-glib,
 gobjectIntrospection, gtk3, gnome3
 }:
diff --git a/pkgs/development/libraries/crypto++/default.nix b/pkgs/development/libraries/crypto++/default.nix
index c1bf789c59b..ba5b2aa4371 100644
--- a/pkgs/development/libraries/crypto++/default.nix
+++ b/pkgs/development/libraries/crypto++/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, fetchFromGitHub, stdenv }:
+{ fetchFromGitHub, stdenv }:
 
 stdenv.mkDerivation rec {
   name = "crypto++-${version}";
diff --git a/pkgs/development/libraries/db/generic.nix b/pkgs/development/libraries/db/generic.nix
index fb129218175..c3ca9aa442b 100644
--- a/pkgs/development/libraries/db/generic.nix
+++ b/pkgs/development/libraries/db/generic.nix
@@ -5,7 +5,7 @@
 
 # Options from inherited versions
 , version, sha256
-, patchSrc ? "src", extraPatches ? [ ]
+, extraPatches ? [ ]
 , license ? stdenv.lib.licenses.sleepycat
 , drvArgs ? {}
 }:
diff --git a/pkgs/development/libraries/dbus-sharp/dbus-sharp-1.0.nix b/pkgs/development/libraries/dbus-sharp/dbus-sharp-1.0.nix
index c17a140b9c5..013913e5297 100644
--- a/pkgs/development/libraries/dbus-sharp/dbus-sharp-1.0.nix
+++ b/pkgs/development/libraries/dbus-sharp/dbus-sharp-1.0.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchFromGitHub, pkgconfig, dbus, mono, autoreconfHook }:
+{stdenv, fetchFromGitHub, pkgconfig, mono, autoreconfHook }:
 
 stdenv.mkDerivation rec {
   name = "dbus-sharp-${version}";
diff --git a/pkgs/development/libraries/dbus-sharp/default.nix b/pkgs/development/libraries/dbus-sharp/default.nix
index ea7d920dc82..40c633dda52 100644
--- a/pkgs/development/libraries/dbus-sharp/default.nix
+++ b/pkgs/development/libraries/dbus-sharp/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchFromGitHub, pkgconfig, dbus, mono, autoreconfHook }:
+{stdenv, fetchFromGitHub, pkgconfig, mono, autoreconfHook }:
 
 stdenv.mkDerivation rec {
   name = "dbus-sharp-${version}";
diff --git a/pkgs/development/libraries/eclib/default.nix b/pkgs/development/libraries/eclib/default.nix
index e4d1fa2073f..62014489f30 100644
--- a/pkgs/development/libraries/eclib/default.nix
+++ b/pkgs/development/libraries/eclib/default.nix
@@ -2,8 +2,6 @@
 , fetchFromGitHub
 , fetchpatch
 , autoreconfHook
-, libtool
-, gettext
 , pari
 , ntl
 , gmp
diff --git a/pkgs/development/libraries/expat/default.nix b/pkgs/development/libraries/expat/default.nix
index e341ce842eb..79b29a90463 100644
--- a/pkgs/development/libraries/expat/default.nix
+++ b/pkgs/development/libraries/expat/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchpatch, fetchurl }:
+{ stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   name = "expat-2.2.5";
diff --git a/pkgs/development/libraries/faac/default.nix b/pkgs/development/libraries/faac/default.nix
index 51696886148..04d085bde73 100644
--- a/pkgs/development/libraries/faac/default.nix
+++ b/pkgs/development/libraries/faac/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, autoreconfHook
+{ stdenv, fetchurl, autoreconfHook
 , mp4v2Support ? true, mp4v2 ? null
 , drmSupport ? false # Digital Radio Mondiale
 }:
diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix
index c5ce5e252fa..34c649022cf 100644
--- a/pkgs/development/libraries/ffmpeg-full/default.nix
+++ b/pkgs/development/libraries/ffmpeg-full/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, pkgconfig, perl, texinfo, yasm
+{ stdenv, fetchurl, pkgconfig, perl, texinfo, yasm
 , hostPlatform
 /*
  *  Licensing options (yes some are listed twice, filters and such are not listed)
@@ -80,7 +80,6 @@
 #, libnut ? null # NUT (de)muxer, native (de)muser exists
 , libogg ? null # Ogg container used by vorbis & theora
 , libopus ? null # Opus de/encoder
-, libsndio ? null # sndio playback/record support
 , libssh ? null # SFTP protocol
 , libtheora ? null # Theora encoder
 , libv4l ? null # Video 4 Linux support
diff --git a/pkgs/development/libraries/ffmpeg-sixel/default.nix b/pkgs/development/libraries/ffmpeg-sixel/default.nix
index a3ce9ea9c2b..4607d3e2f19 100644
--- a/pkgs/development/libraries/ffmpeg-sixel/default.nix
+++ b/pkgs/development/libraries/ffmpeg-sixel/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, pkgconfig, perl, libsixel, yasm
+{ stdenv, fetchFromGitHub, pkgconfig, libsixel, yasm
 }:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/development/libraries/ffmpegthumbnailer/default.nix b/pkgs/development/libraries/ffmpegthumbnailer/default.nix
index 9e76c1e6400..a1cc11fb8c1 100644
--- a/pkgs/development/libraries/ffmpegthumbnailer/default.nix
+++ b/pkgs/development/libraries/ffmpegthumbnailer/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, fetchFromGitHub, stdenv, ffmpeg, cmake, libpng, pkgconfig, libjpeg
+{ fetchFromGitHub, stdenv, ffmpeg, cmake, libpng, pkgconfig, libjpeg
 }:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/development/libraries/folly/default.nix b/pkgs/development/libraries/folly/default.nix
index ccf2d6d0585..2b6a949c232 100644
--- a/pkgs/development/libraries/folly/default.nix
+++ b/pkgs/development/libraries/folly/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, pkgconfig, boost, libevent
+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, boost, libevent
 , double-conversion, glog, google-gflags, python, libiberty, openssl }:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/development/libraries/fontconfig/default.nix b/pkgs/development/libraries/fontconfig/default.nix
index c2d99446d81..01c4140f3b5 100644
--- a/pkgs/development/libraries/fontconfig/default.nix
+++ b/pkgs/development/libraries/fontconfig/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, substituteAll, fetchurl, fetchpatch
+{ stdenv, substituteAll, fetchurl
 , pkgconfig, freetype, expat, libxslt, gperf, dejavu_fonts
 , hostPlatform
 }:
diff --git a/pkgs/development/libraries/fontconfig/make-fonts-cache.nix b/pkgs/development/libraries/fontconfig/make-fonts-cache.nix
index 8b534edd249..76e89b97617 100644
--- a/pkgs/development/libraries/fontconfig/make-fonts-cache.nix
+++ b/pkgs/development/libraries/fontconfig/make-fonts-cache.nix
@@ -1,4 +1,4 @@
-{ runCommand, lib, writeText, fontconfig, fontDirectories }:
+{ runCommand, lib, fontconfig, fontDirectories }:
 
 runCommand "fc-cache"
   rec {
diff --git a/pkgs/development/libraries/frame/default.nix b/pkgs/development/libraries/frame/default.nix
index 2f5374851d8..e15626a160e 100644
--- a/pkgs/development/libraries/frame/default.nix
+++ b/pkgs/development/libraries/frame/default.nix
@@ -1,5 +1,5 @@
 { enableX11 ? true
-,  stdenv, fetchurl, pkgconfig, xorg, xorgserver, xinput }:
+,  stdenv, fetchurl, pkgconfig, xorg }:
 
 stdenv.mkDerivation rec {
   name = "frame-${version}";
diff --git a/pkgs/development/libraries/freetype/default.nix b/pkgs/development/libraries/freetype/default.nix
index 23aa86af377..c678b46c0d2 100644
--- a/pkgs/development/libraries/freetype/default.nix
+++ b/pkgs/development/libraries/freetype/default.nix
@@ -1,5 +1,4 @@
-{ stdenv, lib, fetchurl, copyPathsToStore
-, hostPlatform
+{ stdenv, fetchurl
 , pkgconfig, which, makeWrapper
 , zlib, bzip2, libpng, gnumake, glib
 
diff --git a/pkgs/development/libraries/gbenchmark/default.nix b/pkgs/development/libraries/gbenchmark/default.nix
index 6745bc1ecf5..d700c3d3c16 100644
--- a/pkgs/development/libraries/gbenchmark/default.nix
+++ b/pkgs/development/libraries/gbenchmark/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, callPackage, fetchFromGitHub, cmake }:
+{ stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
   name = "gbenchmark-${version}";
diff --git a/pkgs/development/libraries/gegl/default.nix b/pkgs/development/libraries/gegl/default.nix
index d2987be6a3d..ccfa7e53611 100644
--- a/pkgs/development/libraries/gegl/default.nix
+++ b/pkgs/development/libraries/gegl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, glib, babl, libpng, cairo, libjpeg
+{ stdenv, fetchurl, pkgconfig, babl, libpng, cairo, libjpeg
 , librsvg, pango, gtk2, bzip2, intltool, libintl
 , OpenGL ? null }:
 
diff --git a/pkgs/development/libraries/geos/default.nix b/pkgs/development/libraries/geos/default.nix
index b92f6e61f56..83030a7a014 100644
--- a/pkgs/development/libraries/geos/default.nix
+++ b/pkgs/development/libraries/geos/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, python }:
+{ stdenv, fetchurl, python }:
 
 stdenv.mkDerivation rec {
   name = "geos-3.6.2";
diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix
index fd6e0a65abc..8a07a9f9f22 100644
--- a/pkgs/development/libraries/glib/default.nix
+++ b/pkgs/development/libraries/glib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, hostPlatform, fetchurl, gettext, pkgconfig, perl, python
+{ stdenv, fetchurl, gettext, pkgconfig, perl, python
 , libiconv, zlib, libffi, pcre, libelf, gnome3
 # use utillinuxMinimal to avoid circular dependency (utillinux, systemd, glib)
 , utillinuxMinimal ? null
diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix
index 5c504d0d8e2..8b4a213aae0 100644
--- a/pkgs/development/libraries/glibc/common.nix
+++ b/pkgs/development/libraries/glibc/common.nix
@@ -20,7 +20,7 @@
 { stdenv, lib
 , buildPlatform, hostPlatform
 , buildPackages
-, fetchurl, fetchpatch ? null
+, fetchurl ? null
 , linuxHeaders ? null
 , gd ? null, libpng ? null
 , bison
diff --git a/pkgs/development/libraries/gnutls-kdh/generic.nix b/pkgs/development/libraries/gnutls-kdh/generic.nix
index 472ec83fb02..a81cd91fdc7 100644
--- a/pkgs/development/libraries/gnutls-kdh/generic.nix
+++ b/pkgs/development/libraries/gnutls-kdh/generic.nix
@@ -1,6 +1,6 @@
-{ lib, fetchurl, stdenv, zlib, lzo, libtasn1, nettle, pkgconfig, lzip
+{ lib, stdenv, zlib, lzo, libtasn1, nettle, pkgconfig, lzip
 , guileBindings, guile, perl, gmp, autogen, libidn, p11-kit, unbound, libiconv
-, tpmSupport ? true, trousers, nettools, bash, gperftools, gperf, gettext, automake
+, tpmSupport ? true, trousers, nettools, gperftools, gperf, gettext, automake
 , yacc, texinfo
 
 # Version dependent args
diff --git a/pkgs/development/libraries/gnutls/generic.nix b/pkgs/development/libraries/gnutls/generic.nix
index 984603827c8..081d896a6e0 100644
--- a/pkgs/development/libraries/gnutls/generic.nix
+++ b/pkgs/development/libraries/gnutls/generic.nix
@@ -1,4 +1,4 @@
-{ lib, fetchurl, stdenv, zlib, lzo, libtasn1, nettle, pkgconfig, lzip
+{ lib, stdenv, zlib, lzo, libtasn1, nettle, pkgconfig, lzip
 , guileBindings, guile, perl, gmp, autogen, libidn, p11-kit, libiconv
 , tpmSupport ? false, trousers, which, nettools, libunistring
 , unbound, dns-root-data, gettext
diff --git a/pkgs/development/libraries/goffice/default.nix b/pkgs/development/libraries/goffice/default.nix
index 6cdd19f307d..6155b8b18bd 100644
--- a/pkgs/development/libraries/goffice/default.nix
+++ b/pkgs/development/libraries/goffice/default.nix
@@ -1,5 +1,5 @@
 { fetchurl, stdenv, pkgconfig, intltool, glib, gtk3
-, libgsf, libxml2, libxslt, cairo, pango, librsvg, libspectre }:
+, libgsf, libxml2, libxslt, cairo, pango, librsvg }:
 
 stdenv.mkDerivation rec {
   name = "goffice-0.10.39";
diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix
index 94c09b71683..e7da60a9d1a 100644
--- a/pkgs/development/libraries/gpgme/default.nix
+++ b/pkgs/development/libraries/gpgme/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, libgpgerror, gnupg, pkgconfig, glib, pth, libassuan
+{ stdenv, fetchurl, libgpgerror, gnupg, pkgconfig, glib, pth, libassuan
 , file, which
 , autoreconfHook
 , git
diff --git a/pkgs/development/libraries/gsasl/default.nix b/pkgs/development/libraries/gsasl/default.nix
index 720ff06ceaa..9c19bdbdc29 100644
--- a/pkgs/development/libraries/gsasl/default.nix
+++ b/pkgs/development/libraries/gsasl/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, gss, libidn, kerberos }:
+{ fetchurl, stdenv, libidn, kerberos }:
 
 stdenv.mkDerivation rec {
   name = "gsasl-1.8.0";
diff --git a/pkgs/development/libraries/gsl/default.nix b/pkgs/development/libraries/gsl/default.nix
index 4f952359f71..37d4843db8d 100644
--- a/pkgs/development/libraries/gsl/default.nix
+++ b/pkgs/development/libraries/gsl/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, fetchpatch, stdenv }:
+{ fetchurl, stdenv }:
 
 stdenv.mkDerivation rec {
   name = "gsl-2.5";
diff --git a/pkgs/development/libraries/gstreamer/base/default.nix b/pkgs/development/libraries/gstreamer/base/default.nix
index dfd3383cdba..49216b70fe1 100644
--- a/pkgs/development/libraries/gstreamer/base/default.nix
+++ b/pkgs/development/libraries/gstreamer/base/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, fetchpatch, lib
 , pkgconfig, meson, ninja, gettext, gobjectIntrospection
-, python, gstreamer, orc, pango, libtheora, libvisual
+, python, gstreamer, orc, pango, libtheora
 , libintl, libopus
 , enableX11 ? stdenv.isLinux, libXv
 , enableWayland ? stdenv.isLinux, wayland
diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix
index 8371b278040..db75705c825 100644
--- a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix
+++ b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, pkgconfig, python, gstreamer, xorg, alsaLib, cdparanoia
+{ fetchurl, stdenv, pkgconfig, gstreamer, xorg, alsaLib, cdparanoia
 , libogg, libtheora, libvorbis, freetype, pango, liboil, glib, cairo, orc
 , libintl
 , ApplicationServices
diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix
index 75583624f54..9c47ef0260b 100644
--- a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix
+++ b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix
@@ -1,6 +1,6 @@
 { fetchurl, stdenv, lib, pkgconfig, gst-plugins-base, aalib, cairo
-, flac, libjpeg, zlib, speex, libpng, libdv, libcaca, libvpx
-, libiec61883, libavc1394, taglib, libpulseaudio, gdk_pixbuf, orc
+, flac, libjpeg, speex, libpng, libdv, libcaca, libvpx
+, taglib, libpulseaudio, gdk_pixbuf, orc
 , glib, gstreamer, bzip2, libsoup, libshout, ncurses, libintl
 , # Whether to build no plugins that have external dependencies
   # (except the PulseAudio plugin).
diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-ugly/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-ugly/default.nix
index ac680f8432a..2f46016adac 100644
--- a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-ugly/default.nix
+++ b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-ugly/default.nix
@@ -1,5 +1,5 @@
 { fetchurl, stdenv, pkgconfig, glib, gstreamer, gst-plugins-base
-, libmad, libdvdread, libmpeg2, libcdio, a52dec, x264, orc, lame, libintl }:
+, libmad, libdvdread, a52dec, x264, orc, lame, libintl }:
 
 stdenv.mkDerivation rec {
   name = "gst-plugins-ugly-0.10.19";
diff --git a/pkgs/development/libraries/gstreamer/vaapi/default.nix b/pkgs/development/libraries/gstreamer/vaapi/default.nix
index 11b451e76fd..7255894f3b1 100644
--- a/pkgs/development/libraries/gstreamer/vaapi/default.nix
+++ b/pkgs/development/libraries/gstreamer/vaapi/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, meson, ninja, pkgconfig, gst-plugins-base, bzip2, libva, wayland
-, libdrm, udev, xorg, libGLU_combined, yasm, gstreamer, gst-plugins-bad, nasm
+, libdrm, udev, xorg, libGLU_combined, gstreamer, gst-plugins-bad, nasm
 , libvpx, python
 }:
 
diff --git a/pkgs/development/libraries/gtkd/default.nix b/pkgs/development/libraries/gtkd/default.nix
index f206a169b93..c0dc0753cd0 100644
--- a/pkgs/development/libraries/gtkd/default.nix
+++ b/pkgs/development/libraries/gtkd/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchzip, atk, cairo, dmd, gdk_pixbuf, gnome3, gst_all_1, librsvg
-, pango, pkgconfig, substituteAll, which }:
+, pango, pkgconfig, which }:
 
 stdenv.mkDerivation rec {
   name = "gtkd-${version}";
diff --git a/pkgs/development/libraries/gvfs/default.nix b/pkgs/development/libraries/gvfs/default.nix
index 4f3bc64b5d4..4c858242bb5 100644
--- a/pkgs/development/libraries/gvfs/default.nix
+++ b/pkgs/development/libraries/gvfs/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, meson, ninja, fetchurl, pkgconfig, gettext, gnome3
+{ stdenv, fetchurl, pkgconfig, gettext, gnome3
 , glib, libgudev, udisks2, libgcrypt, libcap, polkit
 , libgphoto2, avahi, libarchive, fuse, libcdio
 , libxml2, libxslt, docbook_xsl, docbook_xml_dtd_42, samba, libmtp
diff --git a/pkgs/development/libraries/hunspell/dictionaries.nix b/pkgs/development/libraries/hunspell/dictionaries.nix
index ee8a5107b34..9f0a6c34512 100644
--- a/pkgs/development/libraries/hunspell/dictionaries.nix
+++ b/pkgs/development/libraries/hunspell/dictionaries.nix
@@ -163,6 +163,7 @@ let
       name = "hunspell-dict-${shortName}-linguistico-${version}";
       readmeFile = dictFileName + "_README.txt";
       meta = with stdenv.lib; {
+        description = "Hunspell dictionary for ${shortDescription}";
         homepage = https://sourceforge.net/projects/linguistico/;
         license = licenses.gpl3;
         maintainers = with maintainers; [ renzo ];
diff --git a/pkgs/development/libraries/icu/base.nix b/pkgs/development/libraries/icu/base.nix
index ee868d371ce..705fb816b2e 100644
--- a/pkgs/development/libraries/icu/base.nix
+++ b/pkgs/development/libraries/icu/base.nix
@@ -1,5 +1,5 @@
 { version, sha256, patches ? [], patchFlags ? "" }:
-{ stdenv, fetchurl, fetchpatch, fixDarwinDylibNames
+{ stdenv, fetchurl, fixDarwinDylibNames
   # Cross-compiled icu4c requires a build-root of a native compile
 , buildRootOnly ? false, nativeBuildRoot, buildPlatform, hostPlatform
 }:
diff --git a/pkgs/development/libraries/ignition-transport/generic.nix b/pkgs/development/libraries/ignition-transport/generic.nix
index 3568edb7890..8abff4c5f05 100644
--- a/pkgs/development/libraries/ignition-transport/generic.nix
+++ b/pkgs/development/libraries/ignition-transport/generic.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, pkgconfig, utillinux,
+{ stdenv, cmake, pkgconfig, utillinux,
   protobuf, zeromq, cppzmq,
   version, src    # parametrize version and src so we can easily have pkgs
                   # for different versions
diff --git a/pkgs/development/libraries/ijs/default.nix b/pkgs/development/libraries/ijs/default.nix
index ed500ca518f..a5b226ee9c7 100644
--- a/pkgs/development/libraries/ijs/default.nix
+++ b/pkgs/development/libraries/ijs/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, autoreconfHook, ghostscript }:
+{ stdenv, autoreconfHook, ghostscript }:
 
 stdenv.mkDerivation {
   name = "ijs-${ghostscript.version}";
diff --git a/pkgs/development/libraries/iso-codes/default.nix b/pkgs/development/libraries/iso-codes/default.nix
index 4dfe190124b..d78c59e9c25 100644
--- a/pkgs/development/libraries/iso-codes/default.nix
+++ b/pkgs/development/libraries/iso-codes/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, gettext, python3, xz}:
+{stdenv, fetchurl, gettext, python3}:
 
 stdenv.mkDerivation rec {
   name = "iso-codes-${version}";
diff --git a/pkgs/development/libraries/itk/default.nix b/pkgs/development/libraries/itk/default.nix
index 5280a95afb4..5f6a6f51a52 100644
--- a/pkgs/development/libraries/itk/default.nix
+++ b/pkgs/development/libraries/itk/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, cmake, libX11, libuuid, xz, vtk }:
+{ stdenv, fetchurl, cmake, libX11, libuuid, xz, vtk }:
 
 stdenv.mkDerivation rec {
   name = "itk-4.13.0";
diff --git a/pkgs/development/libraries/jbig2dec/default.nix b/pkgs/development/libraries/jbig2dec/default.nix
index 8731bd8e736..b9dcc927172 100644
--- a/pkgs/development/libraries/jbig2dec/default.nix
+++ b/pkgs/development/libraries/jbig2dec/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch }:
+{ stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   name = "jbig2dec-0.14";
diff --git a/pkgs/development/libraries/json-glib/default.nix b/pkgs/development/libraries/json-glib/default.nix
index a9b5d596b39..be83dbc52f4 100644
--- a/pkgs/development/libraries/json-glib/default.nix
+++ b/pkgs/development/libraries/json-glib/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, fetchpatch, glib, meson, ninja, pkgconfig, gettext
-, gobjectIntrospection, dbus, fixDarwinDylibNames, gnome3
+, gobjectIntrospection, fixDarwinDylibNames, gnome3
 }:
 
 let
diff --git a/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix b/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix
index cd5f2163dd9..d5a407ee16f 100644
--- a/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix
+++ b/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix
@@ -1,5 +1,5 @@
 {
-  mkDerivation, lib, fetchurl, writeScript,
+  mkDerivation, lib,
   extra-cmake-modules,
   qtbase, qttools, shared-mime-info
 }:
diff --git a/pkgs/development/libraries/kde-frameworks/kdeclarative.nix b/pkgs/development/libraries/kde-frameworks/kdeclarative.nix
index 7aabeb02154..34e01b4c1b6 100644
--- a/pkgs/development/libraries/kde-frameworks/kdeclarative.nix
+++ b/pkgs/development/libraries/kde-frameworks/kdeclarative.nix
@@ -1,7 +1,7 @@
 {
   mkDerivation, lib, extra-cmake-modules,
   epoxy, kconfig, kglobalaccel, kguiaddons, ki18n, kiconthemes, kio, kpackage,
-  kwidgetsaddons, kwindowsystem, pkgconfig, qtdeclarative
+  kwidgetsaddons, kwindowsystem, qtdeclarative
 }:
 
 mkDerivation {
diff --git a/pkgs/development/libraries/kde-frameworks/kglobalaccel.nix b/pkgs/development/libraries/kde-frameworks/kglobalaccel.nix
index ae945ab7338..ca015151e0f 100644
--- a/pkgs/development/libraries/kde-frameworks/kglobalaccel.nix
+++ b/pkgs/development/libraries/kde-frameworks/kglobalaccel.nix
@@ -1,5 +1,5 @@
 {
-  mkDerivation, lib,
+  mkDerivation,
   extra-cmake-modules,
   kconfig, kcoreaddons, kcrash, kdbusaddons, kservice, kwindowsystem,
   qtbase, qttools, qtx11extras,
diff --git a/pkgs/development/libraries/kde-frameworks/kpackage/default.nix b/pkgs/development/libraries/kde-frameworks/kpackage/default.nix
index c0b4b631286..6779faa50cd 100644
--- a/pkgs/development/libraries/kde-frameworks/kpackage/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/kpackage/default.nix
@@ -1,5 +1,5 @@
 {
-  mkDerivation, fetchurl, lib, copyPathsToStore,
+  mkDerivation, lib, copyPathsToStore,
   extra-cmake-modules, kdoctools,
   karchive, kconfig, kcoreaddons, ki18n, qtbase,
 }:
diff --git a/pkgs/development/libraries/kde-frameworks/ktexteditor.nix b/pkgs/development/libraries/kde-frameworks/ktexteditor.nix
index 3efd4cf4e2a..c633aee30a1 100644
--- a/pkgs/development/libraries/kde-frameworks/ktexteditor.nix
+++ b/pkgs/development/libraries/kde-frameworks/ktexteditor.nix
@@ -1,5 +1,5 @@
 {
-  mkDerivation, lib, copyPathsToStore, fetchpatch,
+  mkDerivation, lib,
   extra-cmake-modules, perl,
   karchive, kconfig, kguiaddons, ki18n, kiconthemes, kio, kparts, libgit2,
   qtscript, qtxmlpatterns, sonnet, syntax-highlighting, qtquickcontrols
diff --git a/pkgs/development/libraries/keybinder3/default.nix b/pkgs/development/libraries/keybinder3/default.nix
index cf4b85043bb..194b57c0534 100644
--- a/pkgs/development/libraries/keybinder3/default.nix
+++ b/pkgs/development/libraries/keybinder3/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, gnome3
-, gtk-doc, gtk3, python, lua, libX11, libXext, libXrender, gobjectIntrospection
+, gtk-doc, gtk3, libX11, libXext, libXrender, gobjectIntrospection
 }:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/development/libraries/kpmcore/default.nix b/pkgs/development/libraries/kpmcore/default.nix
index c6c3ba53d2c..5c53f5e6ad5 100644
--- a/pkgs/development/libraries/kpmcore/default.nix
+++ b/pkgs/development/libraries/kpmcore/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, extra-cmake-modules, pkgconfig
+{ stdenv, lib, fetchurl, extra-cmake-modules
 , qtbase, kdeFrameworks
 , libatasmart, parted
 , utillinux }:
diff --git a/pkgs/development/libraries/kreport/default.nix b/pkgs/development/libraries/kreport/default.nix
index 3f44dbb9c13..256989992c5 100644
--- a/pkgs/development/libraries/kreport/default.nix
+++ b/pkgs/development/libraries/kreport/default.nix
@@ -1,7 +1,7 @@
 {
   mkDerivation, lib, fetchurl,
   extra-cmake-modules,
-  qtbase, qtdeclarative, qtwebkit, kconfig, kcoreaddons, kwidgetsaddons, kguiaddons, kproperty, marble, python2
+  qtdeclarative, qtwebkit, kconfig, kcoreaddons, kwidgetsaddons, kguiaddons, kproperty, marble, python2
 }:
 
 mkDerivation rec {
diff --git a/pkgs/development/libraries/languagemachines/frogdata.nix b/pkgs/development/libraries/languagemachines/frogdata.nix
index 61b4559ebab..2c418c1bc5f 100644
--- a/pkgs/development/libraries/languagemachines/frogdata.nix
+++ b/pkgs/development/libraries/languagemachines/frogdata.nix
@@ -1,7 +1,5 @@
 { stdenv, fetchurl
 , automake, autoconf, libtool, pkgconfig, autoconf-archive
-, libxml2, icu
-, languageMachines
 }:
 
 let
diff --git a/pkgs/development/libraries/languagemachines/uctodata.nix b/pkgs/development/libraries/languagemachines/uctodata.nix
index 7defa71fc0e..01a78b5b4be 100644
--- a/pkgs/development/libraries/languagemachines/uctodata.nix
+++ b/pkgs/development/libraries/languagemachines/uctodata.nix
@@ -1,7 +1,6 @@
 { stdenv, fetchurl
 , automake, autoconf, libtool, pkgconfig, autoconf-archive
-, libxml2, icu
-, languageMachines }:
+ }:
 
 let
   release = builtins.fromJSON (builtins.readFile ./release-info/LanguageMachines-uctodata.json);
diff --git a/pkgs/development/libraries/lensfun/default.nix b/pkgs/development/libraries/lensfun/default.nix
index 5791b0808b4..e9ba4ae5ac2 100644
--- a/pkgs/development/libraries/lensfun/default.nix
+++ b/pkgs/development/libraries/lensfun/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, python, glib, zlib, libpng, gnumake3, cmake }:
+{ stdenv, fetchurl, pkgconfig, glib, zlib, libpng, gnumake3, cmake }:
 
 stdenv.mkDerivation rec {
   version = "0.3.2";
diff --git a/pkgs/development/libraries/libatomic_ops/default.nix b/pkgs/development/libraries/libatomic_ops/default.nix
index fde8a06eb41..0c0fc3861c9 100644
--- a/pkgs/development/libraries/libatomic_ops/default.nix
+++ b/pkgs/development/libraries/libatomic_ops/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, autoconf, automake, libtool, hostPlatform }:
+{ stdenv, fetchurl, autoconf, automake, libtool }:
 
 stdenv.mkDerivation rec {
   name = "libatomic_ops-${version}";
diff --git a/pkgs/development/libraries/libbdplus/default.nix b/pkgs/development/libraries/libbdplus/default.nix
index 8b2f0b0da92..3a1b7752514 100644
--- a/pkgs/development/libraries/libbdplus/default.nix
+++ b/pkgs/development/libraries/libbdplus/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libgcrypt, libgpgerror, yacc, flex, gettext }:
+{ stdenv, fetchurl, libgcrypt, libgpgerror, gettext }:
 
 # library that allows libbluray to play BDplus protected bluray disks
 # libaacs does not infringe DRM's right or copyright. See the legal page of the website for more info.
diff --git a/pkgs/development/libraries/libbfd/default.nix b/pkgs/development/libraries/libbfd/default.nix
index 3f244d399f7..c02e2108f23 100644
--- a/pkgs/development/libraries/libbfd/default.nix
+++ b/pkgs/development/libraries/libbfd/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, buildPackages
-, fetchurl, fetchpatch, gnu-config, autoreconfHook264, bison, binutils-unwrapped
+{ stdenv
+, fetchpatch, gnu-config, autoreconfHook264, bison, binutils-unwrapped
 , libiberty, zlib
 }:
 
diff --git a/pkgs/development/libraries/libchamplain/default.nix b/pkgs/development/libraries/libchamplain/default.nix
index 418e9cf0b57..e4864aded27 100644
--- a/pkgs/development/libraries/libchamplain/default.nix
+++ b/pkgs/development/libraries/libchamplain/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, pkgconfig, glib, gtk3, cairo, clutter, sqlite, gnome3
+{ fetchurl, stdenv, pkgconfig, glib, gtk3, cairo, sqlite, gnome3
 , clutter-gtk, libsoup, gobjectIntrospection /*, libmemphis */ }:
 
 let
diff --git a/pkgs/development/libraries/libcollectdclient/default.nix b/pkgs/development/libraries/libcollectdclient/default.nix
index 4f0ba439417..4f4007649d0 100644
--- a/pkgs/development/libraries/libcollectdclient/default.nix
+++ b/pkgs/development/libraries/libcollectdclient/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, collectd }:
+{ stdenv, collectd }:
 with stdenv.lib;
 
 collectd.overrideAttrs (oldAttrs: {
diff --git a/pkgs/development/libraries/libdazzle/default.nix b/pkgs/development/libraries/libdazzle/default.nix
index 7f4eaa5fd14..295028abc97 100644
--- a/pkgs/development/libraries/libdazzle/default.nix
+++ b/pkgs/development/libraries/libdazzle/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, pkgs, fetchurl, ninja, meson, pkgconfig, vala, gobjectIntrospection, libxml2
+{ stdenv, fetchurl, ninja, meson, pkgconfig, vala, gobjectIntrospection, libxml2
 , gtk-doc, docbook_xsl, dbus, xvfb_run, glib, gtk3, gnome3 }:
 
 let
diff --git a/pkgs/development/libraries/libedit/default.nix b/pkgs/development/libraries/libedit/default.nix
index bc4cea1b470..c68e171084b 100644
--- a/pkgs/development/libraries/libedit/default.nix
+++ b/pkgs/development/libraries/libedit/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ncurses, groff }:
+{ stdenv, fetchurl, ncurses }:
 
 stdenv.mkDerivation rec {
   name = "libedit-20180525-3.1";
diff --git a/pkgs/development/libraries/libewf/default.nix b/pkgs/development/libraries/libewf/default.nix
index b1a6238a378..d150d4a0033 100644
--- a/pkgs/development/libraries/libewf/default.nix
+++ b/pkgs/development/libraries/libewf/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, zlib, openssl, libuuid, file, fuse, autoreconfHook, pkgconfig }:
+{ fetchurl, stdenv, zlib, openssl, libuuid, pkgconfig }:
 
 stdenv.mkDerivation rec {
   version = "20171104";
diff --git a/pkgs/development/libraries/libgdiplus/default.nix b/pkgs/development/libraries/libgdiplus/default.nix
index 05c320c42ae..5e94d00dcdb 100644
--- a/pkgs/development/libraries/libgdiplus/default.nix
+++ b/pkgs/development/libraries/libgdiplus/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, glib, cairo, Carbon, fontconfig
-, libtiff, giflib, libjpeg, libpng, monoDLLFixer
+, libtiff, giflib, libjpeg, libpng
 , libXrender, libexif }:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/development/libraries/libgksu/default.nix b/pkgs/development/libraries/libgksu/default.nix
index 652848d8a95..29f346e9acf 100644
--- a/pkgs/development/libraries/libgksu/default.nix
+++ b/pkgs/development/libraries/libgksu/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, pkgconfig, wrapGAppsHook, gtk2, gnome2, gnome3,
   libstartup_notification, libgtop, perl, perlXMLParser,
-  autoreconfHook, intltool, docbook_xsl, xauth, sudo
+  autoreconfHook, intltool, docbook_xsl, xauth
 }:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/development/libraries/libgphoto2/default.nix b/pkgs/development/libraries/libgphoto2/default.nix
index 96b42ac068c..8616a014675 100644
--- a/pkgs/development/libraries/libgphoto2/default.nix
+++ b/pkgs/development/libraries/libgphoto2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchpatch, fetchFromGitHub, pkgconfig, libusb1, libtool, libexif, libjpeg, gettext, autoreconfHook }:
+{ stdenv, fetchFromGitHub, pkgconfig, libusb1, libtool, libexif, libjpeg, gettext, autoreconfHook }:
 
 stdenv.mkDerivation rec {
   name = "libgphoto2-${meta.version}";
diff --git a/pkgs/development/libraries/libgpod/default.nix b/pkgs/development/libraries/libgpod/default.nix
index fbe421e9974..c6056ee49fb 100644
--- a/pkgs/development/libraries/libgpod/default.nix
+++ b/pkgs/development/libraries/libgpod/default.nix
@@ -1,5 +1,5 @@
 {stdenv, lib, fetchurl, gettext, perl, perlXMLParser, intltool, pkgconfig, glib,
-  libxml2, sqlite, libusb1, zlib, sg3_utils, gdk_pixbuf, taglib,
+  libxml2, sqlite, zlib, sg3_utils, gdk_pixbuf, taglib,
   libimobiledevice, pythonPackages, mutagen,
   monoSupport ? true, mono, gtk-sharp-2_0
 }:
diff --git a/pkgs/development/libraries/libgtop/default.nix b/pkgs/development/libraries/libgtop/default.nix
index 6498014aee8..d0be9e25b87 100644
--- a/pkgs/development/libraries/libgtop/default.nix
+++ b/pkgs/development/libraries/libgtop/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, glib, pkgconfig, perl, gettext, gobjectIntrospection, libintl, libtool, gnome3, gtk-doc }:
+{ stdenv, fetchurl, fetchpatch, glib, pkgconfig, perl, gettext, gobjectIntrospection, libtool, gnome3, gtk-doc }:
 let
   pname = "libgtop";
   version = "2.38.0";
diff --git a/pkgs/development/libraries/libiberty/default.nix b/pkgs/development/libraries/libiberty/default.nix
index 516e6bbbe88..bcc85abbd3e 100644
--- a/pkgs/development/libraries/libiberty/default.nix
+++ b/pkgs/development/libraries/libiberty/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPackages, fetchurl, staticBuild ? false }:
+{ stdenv, buildPackages, staticBuild ? false }:
 
 let inherit (buildPackages.buildPackages) gcc; in
 
diff --git a/pkgs/development/libraries/libid3tag/default.nix b/pkgs/development/libraries/libid3tag/default.nix
index a153001a960..0289a5331f8 100644
--- a/pkgs/development/libraries/libid3tag/default.nix
+++ b/pkgs/development/libraries/libid3tag/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, writeText, zlib, gperf}:
+{stdenv, fetchurl, zlib, gperf}:
 
 stdenv.mkDerivation rec {
   name = "libid3tag-${version}";
diff --git a/pkgs/development/libraries/libidn2/default.nix b/pkgs/development/libraries/libidn2/default.nix
index a100b0cc593..dd8e3c4a4f8 100644
--- a/pkgs/development/libraries/libidn2/default.nix
+++ b/pkgs/development/libraries/libidn2/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, libiconv, libunistring, help2man, ronn, buildPackages }:
+{ fetchurl, stdenv, libiconv, libunistring, help2man, buildPackages }:
 
 with stdenv.lib;
 
diff --git a/pkgs/development/libraries/libircclient/default.nix b/pkgs/development/libraries/libircclient/default.nix
index fef5e7278b8..612de78b741 100644
--- a/pkgs/development/libraries/libircclient/default.nix
+++ b/pkgs/development/libraries/libircclient/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake }:
+{ stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   name    = "${pname}-${version}";
diff --git a/pkgs/development/libraries/libjson-rpc-cpp/default.nix b/pkgs/development/libraries/libjson-rpc-cpp/default.nix
index 87cae224685..f352c8e9ed1 100644
--- a/pkgs/development/libraries/libjson-rpc-cpp/default.nix
+++ b/pkgs/development/libraries/libjson-rpc-cpp/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, cmake, jsoncpp, argtable, curl, libmicrohttpd
-, doxygen, catch, pkgconfig, git
+, doxygen, catch, pkgconfig
 }:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/development/libraries/libndctl/default.nix b/pkgs/development/libraries/libndctl/default.nix
index 4b547fde3ab..79439f82269 100644
--- a/pkgs/development/libraries/libndctl/default.nix
+++ b/pkgs/development/libraries/libndctl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, autoconf, automake, asciidoc, docbook_xsl, docbook_xml_dtd_45, libxslt, xmlto, pkgconfig, json_c, kmod, which, systemd, utillinux
+{ stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, asciidoc, docbook_xsl, docbook_xml_dtd_45, libxslt, xmlto, pkgconfig, json_c, kmod, which, systemd, utillinux
 }:
 
 let
diff --git a/pkgs/development/libraries/libopcodes/default.nix b/pkgs/development/libraries/libopcodes/default.nix
index c918c61abf0..2c59fa03ea0 100644
--- a/pkgs/development/libraries/libopcodes/default.nix
+++ b/pkgs/development/libraries/libopcodes/default.nix
@@ -1,5 +1,5 @@
 { stdenv, buildPackages
-, fetchurl, autoreconfHook264, bison, binutils-unwrapped
+, autoreconfHook264, bison, binutils-unwrapped
 , libiberty, libbfd
 }:
 
diff --git a/pkgs/development/libraries/libopus/default.nix b/pkgs/development/libraries/libopus/default.nix
index 66c7e7e882e..135f1caf97e 100644
--- a/pkgs/development/libraries/libopus/default.nix
+++ b/pkgs/development/libraries/libopus/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch
+{ stdenv, fetchurl
 , fixedPoint ? false, withCustomModes ? true }:
 
 let
diff --git a/pkgs/development/libraries/libplist/default.nix b/pkgs/development/libraries/libplist/default.nix
index 8da097c3d38..8dc64f2c2b5 100644
--- a/pkgs/development/libraries/libplist/default.nix
+++ b/pkgs/development/libraries/libplist/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, libxml2, swig2, python2Packages, glib }:
+{ stdenv, fetchurl, pkgconfig, swig2, python2Packages, glib }:
 
 let
   inherit (python2Packages) python cython;
diff --git a/pkgs/development/libraries/libpng/default.nix b/pkgs/development/libraries/libpng/default.nix
index 5ad9cf1e7b7..4173588ac52 100644
--- a/pkgs/development/libraries/libpng/default.nix
+++ b/pkgs/development/libraries/libpng/default.nix
@@ -1,6 +1,4 @@
-{ stdenv, fetchurl, zlib, apngSupport ? true
-, buildPlatform, hostPlatform
-}:
+{ stdenv, fetchurl, zlib, apngSupport ? true }:
 
 assert zlib != null;
 
diff --git a/pkgs/development/libraries/libproxy/default.nix b/pkgs/development/libraries/libproxy/default.nix
index 02e634b22a3..0e0499251eb 100644
--- a/pkgs/development/libraries/libproxy/default.nix
+++ b/pkgs/development/libraries/libproxy/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, pkgconfig, cmake, zlib
+{ stdenv, fetchFromGitHub, pkgconfig, cmake, zlib
 , dbus, networkmanager, spidermonkey_38, pcre, python2, python3
 , SystemConfiguration, CoreFoundation, JavaScriptCore }:
 
diff --git a/pkgs/development/libraries/librdf/raptor2.nix b/pkgs/development/libraries/librdf/raptor2.nix
index b7a78cb3daf..3f436677123 100644
--- a/pkgs/development/libraries/librdf/raptor2.nix
+++ b/pkgs/development/libraries/librdf/raptor2.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libxml2, libxslt, curl }:
+{ stdenv, fetchurl, libxml2, libxslt }:
 
 stdenv.mkDerivation rec {
   name = "raptor2-2.0.15";
diff --git a/pkgs/development/libraries/libsecret/default.nix b/pkgs/development/libraries/libsecret/default.nix
index b77ba49822f..f311d1a0335 100644
--- a/pkgs/development/libraries/libsecret/default.nix
+++ b/pkgs/development/libraries/libsecret/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, glib, pkgconfig, intltool, libxslt, docbook_xsl, gtk-doc
+{ stdenv, fetchurl, glib, pkgconfig, intltool, libxslt, docbook_xsl
 , libgcrypt, gobjectIntrospection, vala_0_38, gnome3, libintl }:
 let
   pname = "libsecret";
diff --git a/pkgs/development/libraries/libsigcxx/default.nix b/pkgs/development/libraries/libsigcxx/default.nix
index f6bfff78fa2..def5ee0e19a 100644
--- a/pkgs/development/libraries/libsigcxx/default.nix
+++ b/pkgs/development/libraries/libsigcxx/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, pkgconfig, gnum4 }:
+{ stdenv, fetchurl, pkgconfig, gnum4 }:
 let
   ver_maj = "2.10"; # odd major numbers are unstable
   ver_min = "0";
diff --git a/pkgs/development/libraries/libsigsegv/default.nix b/pkgs/development/libraries/libsigsegv/default.nix
index 8152c1ea852..306c73a9b55 100644
--- a/pkgs/development/libraries/libsigsegv/default.nix
+++ b/pkgs/development/libraries/libsigsegv/default.nix
@@ -1,5 +1,4 @@
 { stdenv, fetchurl
-, buildPlatform, hostPlatform
 , enableSigbusFix ? false # required by kernels < 3.18.6
 }:
 
diff --git a/pkgs/development/libraries/libskk/default.nix b/pkgs/development/libraries/libskk/default.nix
index 48b0ed6d711..b64c3e51778 100644
--- a/pkgs/development/libraries/libskk/default.nix
+++ b/pkgs/development/libraries/libskk/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchFromGitHub,
+{ stdenv, fetchFromGitHub,
   libtool, gettext, pkgconfig,
   vala, gnome-common, gobjectIntrospection,
   libgee, json-glib, skk-dicts }:
diff --git a/pkgs/development/libraries/libsnark/default.nix b/pkgs/development/libraries/libsnark/default.nix
index 578053bbb42..4ea2209160f 100644
--- a/pkgs/development/libraries/libsnark/default.nix
+++ b/pkgs/development/libraries/libsnark/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, pkgconfig, openssl, boost, gmp, procps, fetchpatch, patchutils }:
+{ stdenv, fetchFromGitHub, cmake, pkgconfig, openssl, boost, gmp, procps }:
 
 let
   rev = "9e6b19ff15bc19fba5da1707ba18e7f160e5ed07";
diff --git a/pkgs/development/libraries/libtheora/default.nix b/pkgs/development/libraries/libtheora/default.nix
index fd58f4f44e7..b5ab9d310da 100644
--- a/pkgs/development/libraries/libtheora/default.nix
+++ b/pkgs/development/libraries/libtheora/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, libogg, libvorbis, tremor, autoconf, automake, libtool, pkgconfig}:
+{stdenv, fetchurl, libogg, libvorbis, pkgconfig}:
 
 stdenv.mkDerivation rec {
   name = "libtheora-1.1.1";
diff --git a/pkgs/development/libraries/libtiff/default.nix b/pkgs/development/libraries/libtiff/default.nix
index c492a15bfa4..c5a12432280 100644
--- a/pkgs/development/libraries/libtiff/default.nix
+++ b/pkgs/development/libraries/libtiff/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, pkgconfig, zlib, libjpeg, xz }:
+{ stdenv, fetchurl, pkgconfig, zlib, libjpeg, xz }:
 
 let
   version = "4.0.9";
diff --git a/pkgs/development/libraries/libunwind/default.nix b/pkgs/development/libraries/libunwind/default.nix
index dbf1d7a3756..6a32ccf5c1b 100644
--- a/pkgs/development/libraries/libunwind/default.nix
+++ b/pkgs/development/libraries/libunwind/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, autoreconfHook, xz }:
+{ stdenv, fetchurl, autoreconfHook, xz }:
 
 stdenv.mkDerivation rec {
   name = "libunwind-${version}";
diff --git a/pkgs/development/libraries/libva-utils/default.nix b/pkgs/development/libraries/libva-utils/default.nix
index 95d4be08548..6868e5c8cfa 100644
--- a/pkgs/development/libraries/libva-utils/default.nix
+++ b/pkgs/development/libraries/libva-utils/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, autoreconfHook, pkgconfig
+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig
 , libdrm, libva
 }:
 
diff --git a/pkgs/development/libraries/libvpx/default.nix b/pkgs/development/libraries/libvpx/default.nix
index 731892d33b4..4338a709070 100644
--- a/pkgs/development/libraries/libvpx/default.nix
+++ b/pkgs/development/libraries/libvpx/default.nix
@@ -33,7 +33,6 @@
 , temporalDenoisingSupport ? true # use temporal denoising instead of spatial denoising
 , coefficientRangeCheckingSupport ? false # decoder checks if intermediate transform coefficients are in valid range
 , vp9HighbitdepthSupport ? true # 10/12 bit color support in VP9
-, experimentalSupport ? false # experimental features
 # Experimental features
 , experimentalSpatialSvcSupport ? false # Spatial scalable video coding
 , experimentalFpMbStatsSupport ? false
diff --git a/pkgs/development/libraries/libvpx/git.nix b/pkgs/development/libraries/libvpx/git.nix
index 7d4b75d6cdf..fb7f828f61f 100644
--- a/pkgs/development/libraries/libvpx/git.nix
+++ b/pkgs/development/libraries/libvpx/git.nix
@@ -35,7 +35,6 @@
 , temporalDenoisingSupport ? true # use temporal denoising instead of spatial denoising
 , coefficientRangeCheckingSupport ? false # decoder checks if intermediate transform coefficients are in valid range
 , vp9HighbitdepthSupport ? true # 10/12 bit color support in VP9
-, experimentalSupport ? false # experimental features
 # Experimental features
 , experimentalSpatialSvcSupport ? false # Spatial scalable video coding
 , experimentalFpMbStatsSupport ? false
diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix
index 8a3d7abdfa5..51c142a8111 100644
--- a/pkgs/development/libraries/libxml2/default.nix
+++ b/pkgs/development/libraries/libxml2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, fetchpatch
+{ stdenv, lib, fetchurl
 , zlib, xz, python2, findXMLCatalogs, libiconv
 , buildPlatform, hostPlatform
 , pythonSupport ? buildPlatform == hostPlatform
diff --git a/pkgs/development/libraries/libxslt/default.nix b/pkgs/development/libraries/libxslt/default.nix
index 1bb90ee195d..5b6fdb462c2 100644
--- a/pkgs/development/libraries/libxslt/default.nix
+++ b/pkgs/development/libraries/libxslt/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, libxml2, findXMLCatalogs, python2
+{ stdenv, fetchurl, libxml2, findXMLCatalogs, python2
 , buildPlatform, hostPlatform
 , cryptoSupport ? false
 , pythonSupport ? buildPlatform == hostPlatform
diff --git a/pkgs/development/libraries/libyaml-cpp/default.nix b/pkgs/development/libraries/libyaml-cpp/default.nix
index ff09aeab2c6..af665c6d9a4 100644
--- a/pkgs/development/libraries/libyaml-cpp/default.nix
+++ b/pkgs/development/libraries/libyaml-cpp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, boost }:
+{ stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
   name = "libyaml-cpp-${version}";
diff --git a/pkgs/development/libraries/libyaml/default.nix b/pkgs/development/libraries/libyaml/default.nix
index 7178e64b6b6..7bd0d1970f4 100644
--- a/pkgs/development/libraries/libyaml/default.nix
+++ b/pkgs/development/libraries/libyaml/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch }:
+{ stdenv, fetchurl }:
 let
   version = "0.1.7";
 in
diff --git a/pkgs/development/libraries/linenoise-ng/default.nix b/pkgs/development/libraries/linenoise-ng/default.nix
index 3f008744c1b..5fa1035868d 100644
--- a/pkgs/development/libraries/linenoise-ng/default.nix
+++ b/pkgs/development/libraries/linenoise-ng/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, cmake }:
+{ stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
   name = "linenoise-ng-${version}";
diff --git a/pkgs/development/libraries/lirc/default.nix b/pkgs/development/libraries/lirc/default.nix
index 7f4d8cc19c8..ad6d2df1d8b 100644
--- a/pkgs/development/libraries/lirc/default.nix
+++ b/pkgs/development/libraries/lirc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, alsaLib, bash, help2man, pkgconfig, xlibsWrapper, python3
+{ stdenv, fetchurl, alsaLib, help2man, pkgconfig, xlibsWrapper, python3
 , libxslt, systemd, libusb, libftdi1 }:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/development/libraries/lucene++/default.nix b/pkgs/development/libraries/lucene++/default.nix
index 93c8a0474d9..c45fa6bc61a 100644
--- a/pkgs/development/libraries/lucene++/default.nix
+++ b/pkgs/development/libraries/lucene++/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, cmake, boost, gtest }:
+{ stdenv, fetchurl, cmake, boost, gtest }:
 
 stdenv.mkDerivation rec {
   name = "lucene++-${version}";
diff --git a/pkgs/development/libraries/mediastreamer/default.nix b/pkgs/development/libraries/mediastreamer/default.nix
index 8b756e338e4..4b69d5d0aaf 100644
--- a/pkgs/development/libraries/mediastreamer/default.nix
+++ b/pkgs/development/libraries/mediastreamer/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, intltool, alsaLib, libpulseaudio, speex, gsm
+{ stdenv, pkgconfig, intltool, alsaLib, libpulseaudio, speex, gsm
 , libopus, ffmpeg, libX11, libXv, libGLU_combined, glew, libtheora, libvpx, SDL, libupnp
 , ortp, libv4l, libpcap, srtp, fetchFromGitHub, cmake, bctoolbox, doxygen
 , python, libXext, libmatroska, openssl, fetchpatch
diff --git a/pkgs/development/libraries/mediastreamer/msopenh264.nix b/pkgs/development/libraries/mediastreamer/msopenh264.nix
index f49b7ba2c4b..b8a8c64011c 100644
--- a/pkgs/development/libraries/mediastreamer/msopenh264.nix
+++ b/pkgs/development/libraries/mediastreamer/msopenh264.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, autoreconfHook, pkgconfig, mediastreamer, openh264
+{ stdenv, autoreconfHook, pkgconfig, mediastreamer, openh264
 , fetchgit, cmake
 }:
 
diff --git a/pkgs/development/libraries/mesa-darwin/default.nix b/pkgs/development/libraries/mesa-darwin/default.nix
index 0ae17b4d3f6..f18c1e693cb 100644
--- a/pkgs/development/libraries/mesa-darwin/default.nix
+++ b/pkgs/development/libraries/mesa-darwin/default.nix
@@ -1,7 +1,5 @@
-{ stdenv, stdenvAdapters, fetchurl, pkgconfig, intltool, flex, bison
-, python, libxml2Python, file, expat, makedepend, xorg, llvm, libffi, libvdpau
-, enableTextureFloats ? false # Texture floats are patented, see docs/patents.txt
-, enableExtraFeatures ? false # not maintained
+{ stdenv, fetchurl, pkgconfig, intltool, flex, bison
+, python, libxml2Python, expat, makedepend, xorg, llvm, libffi, libvdpau
 , OpenGL, apple_sdk, Xplugin
 }:
 
diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index 9c0bf29d490..028930ba066 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, fetchpatch, lib
-, pkgconfig, intltool, autoreconfHook, substituteAll
+{ stdenv, fetchurl, lib
+, pkgconfig, intltool, autoreconfHook
 , file, expat, libdrm, xorg, wayland, wayland-protocols, openssl
 , llvmPackages, libffi, libomxil-bellagio, libva-minimal
 , libelf, libvdpau, valgrind-light, python2
diff --git a/pkgs/development/libraries/mlt/default.nix b/pkgs/development/libraries/mlt/default.nix
index 2d4de339042..d8075c41a70 100644
--- a/pkgs/development/libraries/mlt/default.nix
+++ b/pkgs/development/libraries/mlt/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchurl, makeWrapper
+{ stdenv, fetchFromGitHub, makeWrapper
 , SDL, ffmpeg, frei0r, libjack2, libdv, libsamplerate
 , libvorbis, libxml2, movit, pkgconfig, sox
 , gtk2
diff --git a/pkgs/development/libraries/mono-zeroconf/default.nix b/pkgs/development/libraries/mono-zeroconf/default.nix
index 444ec9dac2b..d96f90b4bfd 100644
--- a/pkgs/development/libraries/mono-zeroconf/default.nix
+++ b/pkgs/development/libraries/mono-zeroconf/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, autoreconfHook, which, pkgconfig, mono }:
+{ stdenv, fetchurl, which, pkgconfig, mono }:
 
 stdenv.mkDerivation rec {
   name = "mono-zeroconf-${version}";
diff --git a/pkgs/development/libraries/mpich2/default.nix b/pkgs/development/libraries/mpich2/default.nix
index 6c5a0e5279c..b5a36c184ff 100644
--- a/pkgs/development/libraries/mpich2/default.nix
+++ b/pkgs/development/libraries/mpich2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, python, perl, gfortran
+{ stdenv, fetchurl, perl, gfortran
 , slurm, openssh, hwloc
 } :
 
diff --git a/pkgs/development/libraries/mpir/default.nix b/pkgs/development/libraries/mpir/default.nix
index b9b25e7f43b..2ecae98387e 100644
--- a/pkgs/development/libraries/mpir/default.nix
+++ b/pkgs/development/libraries/mpir/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, m4, which, yasm }:
+{ stdenv, fetchurl, m4, which, yasm }:
 
 stdenv.mkDerivation rec {
   name = "mpir-${version}";
diff --git a/pkgs/development/libraries/neardal/default.nix b/pkgs/development/libraries/neardal/default.nix
index e0adb312677..65679c7e282 100644
--- a/pkgs/development/libraries/neardal/default.nix
+++ b/pkgs/development/libraries/neardal/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoconf, automake, libtool, gettext, pkgconfig, glib, readline, makeWrapper }:
+{ stdenv, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, glib, readline, makeWrapper }:
 
 stdenv.mkDerivation rec {
   name = "neardal-0.7-post-git-20150930";
diff --git a/pkgs/development/libraries/ntrack/default.nix b/pkgs/development/libraries/ntrack/default.nix
index 3483d4bed77..fb36839fe23 100644
--- a/pkgs/development/libraries/ntrack/default.nix
+++ b/pkgs/development/libraries/ntrack/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, glib, qt4, pkgconfig, libnl, python }:
+{ stdenv, fetchurl, qt4, pkgconfig, libnl, python }:
 
 let
   version = "016";
diff --git a/pkgs/development/libraries/odpic/default.nix b/pkgs/development/libraries/odpic/default.nix
index 94aba672887..2715ff4dfaf 100644
--- a/pkgs/development/libraries/odpic/default.nix
+++ b/pkgs/development/libraries/odpic/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, fixDarwinDylibNames, oracle-instantclient, libaio }:
+{ stdenv, fetchurl, fixDarwinDylibNames, oracle-instantclient, libaio }:
 
 stdenv.mkDerivation rec {
   name = "odpic-${version}";
diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix
index 1d3a9629fd0..264c05e1af9 100644
--- a/pkgs/development/libraries/opencv/3.x.nix
+++ b/pkgs/development/libraries/opencv/3.x.nix
@@ -1,5 +1,5 @@
 { lib, stdenv
-, fetchurl, fetchFromGitHub, fetchpatch
+, fetchurl, fetchFromGitHub
 , cmake, pkgconfig, unzip, zlib, pcre, hdf5
 , glog, boost, google-gflags, protobuf
 , config
diff --git a/pkgs/development/libraries/openexr/default.nix b/pkgs/development/libraries/openexr/default.nix
index 60ee30177c0..293274a5776 100644
--- a/pkgs/development/libraries/openexr/default.nix
+++ b/pkgs/development/libraries/openexr/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, fetchpatch, autoconf, automake, libtool, pkgconfig, zlib, ilmbase }:
+{ lib, stdenv, fetchurl, autoconf, automake, libtool, pkgconfig, zlib, ilmbase }:
 
 stdenv.mkDerivation rec {
   name = "openexr-${lib.getVersion ilmbase}";
diff --git a/pkgs/development/libraries/openpam/default.nix b/pkgs/development/libraries/openpam/default.nix
index 187f8613375..7d84392d204 100644
--- a/pkgs/development/libraries/openpam/default.nix
+++ b/pkgs/development/libraries/openpam/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPackages, hostPlatform, fetchurl, lib }:
+{ stdenv, fetchurl, lib }:
 
 stdenv.mkDerivation rec {
   name = "openpam-${version}";
diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix
index 0251de77d03..b4b932f8d05 100644
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -1,6 +1,5 @@
 { stdenv, fetchurl, buildPackages, perl
 , buildPlatform, hostPlatform
-, fetchpatch
 , withCryptodev ? false, cryptodevHeaders
 , enableSSL2 ? false
 }:
diff --git a/pkgs/development/libraries/opensubdiv/default.nix b/pkgs/development/libraries/opensubdiv/default.nix
index 62c093f310f..b10e4713019 100644
--- a/pkgs/development/libraries/opensubdiv/default.nix
+++ b/pkgs/development/libraries/opensubdiv/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, fetchFromGitHub, cmake, pkgconfig, xorg, libGLU
+{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, xorg, libGLU
 , libGL, glew, ocl-icd, python3
 , cudaSupport ? false, cudatoolkit
 , darwin
diff --git a/pkgs/development/libraries/ortp/default.nix b/pkgs/development/libraries/ortp/default.nix
index 5dc5df8e95b..e58e347c7f3 100644
--- a/pkgs/development/libraries/ortp/default.nix
+++ b/pkgs/development/libraries/ortp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, fetchFromGitHub, bctoolbox }:
+{ stdenv, cmake, fetchFromGitHub, bctoolbox }:
 
 stdenv.mkDerivation rec {
   baseName = "ortp";
diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix
index 9a27901c862..0dd507d6bb4 100644
--- a/pkgs/development/libraries/pango/default.nix
+++ b/pkgs/development/libraries/pango/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, pkgconfig, libXft, cairo, harfbuzz
+{ stdenv, fetchurl, pkgconfig, libXft, cairo, harfbuzz
 , libintl, gobjectIntrospection, darwin
 }:
 
diff --git a/pkgs/development/libraries/pcre2/default.nix b/pkgs/development/libraries/pcre2/default.nix
index 73e7fd42cdb..e0819cde679 100644
--- a/pkgs/development/libraries/pcre2/default.nix
+++ b/pkgs/development/libraries/pcre2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch }:
+{ stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   name = "pcre2-${version}";
diff --git a/pkgs/development/libraries/physics/herwig/default.nix b/pkgs/development/libraries/physics/herwig/default.nix
index 9993060eb72..a8655c2dcbe 100644
--- a/pkgs/development/libraries/physics/herwig/default.nix
+++ b/pkgs/development/libraries/physics/herwig/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchpatch, fetchurl, boost, fastjet, gfortran, gsl, lhapdf, thepeg, zlib, autoconf, automake, libtool }:
+{ stdenv, fetchurl, boost, fastjet, gfortran, gsl, lhapdf, thepeg, zlib, autoconf, automake, libtool }:
 
 stdenv.mkDerivation rec {
   name = "herwig-${version}";
diff --git a/pkgs/development/libraries/physics/mcgrid/default.nix b/pkgs/development/libraries/physics/mcgrid/default.nix
index 32a05d10d3a..b287e52b243 100644
--- a/pkgs/development/libraries/physics/mcgrid/default.nix
+++ b/pkgs/development/libraries/physics/mcgrid/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fastnlo, rivet, pkgconfig, sherpa }:
+{ stdenv, fetchurl, fastnlo, rivet, pkgconfig }:
 
 stdenv.mkDerivation rec {
   name = "mcgrid-${version}";
diff --git a/pkgs/development/libraries/physics/nlojet/default.nix b/pkgs/development/libraries/physics/nlojet/default.nix
index 0c9d879fbd0..2f79a2b76ab 100644
--- a/pkgs/development/libraries/physics/nlojet/default.nix
+++ b/pkgs/development/libraries/physics/nlojet/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch }:
+{ stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   name = "nlojet++-${version}";
diff --git a/pkgs/development/libraries/physics/yoda/default.nix b/pkgs/development/libraries/physics/yoda/default.nix
index eb34b94118a..1dacdba1b1c 100644
--- a/pkgs/development/libraries/physics/yoda/default.nix
+++ b/pkgs/development/libraries/physics/yoda/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, python2Packages, root, makeWrapper, zlib, withRootSupport ? false }:
+{ stdenv, fetchurl, python2Packages, root, makeWrapper, zlib, withRootSupport ? false }:
 
 stdenv.mkDerivation rec {
   name = "yoda-${version}";
diff --git a/pkgs/development/libraries/postgis/default.nix b/pkgs/development/libraries/postgis/default.nix
index aa9a3f9fdc0..a577d318523 100644
--- a/pkgs/development/libraries/postgis/default.nix
+++ b/pkgs/development/libraries/postgis/default.nix
@@ -1,12 +1,10 @@
 { fetchurl
-, fetchpatch
 , stdenv
 , perl
 , libxml2
 , postgresql
 , geos
 , proj
-, flex
 , gdal
 , json_c
 , pkgconfig
diff --git a/pkgs/development/libraries/protobuf/generic.nix b/pkgs/development/libraries/protobuf/generic.nix
index 06154e0008b..1a20d806b96 100644
--- a/pkgs/development/libraries/protobuf/generic.nix
+++ b/pkgs/development/libraries/protobuf/generic.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, version, src
+{ stdenv, version, src
 , autoreconfHook, zlib, gtest
 , ...
 }:
diff --git a/pkgs/development/libraries/qimageblitz/default.nix b/pkgs/development/libraries/qimageblitz/default.nix
index 4e74e31e3ec..51253676341 100644
--- a/pkgs/development/libraries/qimageblitz/default.nix
+++ b/pkgs/development/libraries/qimageblitz/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, lib, cmake, qt4}:
+{stdenv, fetchurl, cmake, qt4}:
 
 let
   pn = "qimageblitz";
diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix
index 4227575acb0..01d0fc510aa 100644
--- a/pkgs/development/libraries/qt-4.x/4.8/default.nix
+++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix
@@ -1,8 +1,8 @@
 { stdenv, fetchurl, fetchpatch, substituteAll
 , hostPlatform
-, libXrender, libXinerama, libXcursor, libXmu, libXv, libXext
+, libXrender, libXinerama, libXcursor, libXv, libXext
 , libXfixes, libXrandr, libSM, freetype, fontconfig, zlib, libjpeg, libpng
-, libmng, which, libGLSupported, libGL, libGLU, openssl, dbus, cups, pkgconfig
+, libmng, which, libGLSupported, libGLU, openssl, dbus, cups, pkgconfig
 , libtiff, glib, icu, mysql, postgresql, sqlite, perl, coreutils, libXi
 , buildMultimedia ? stdenv.isLinux, alsaLib, gstreamer, gst-plugins-base
 , buildWebkit ? (stdenv.isLinux || stdenv.isDarwin)
diff --git a/pkgs/development/libraries/qt-5/5.11/default.nix b/pkgs/development/libraries/qt-5/5.11/default.nix
index 5407a79cd77..2a706fc7b6e 100644
--- a/pkgs/development/libraries/qt-5/5.11/default.nix
+++ b/pkgs/development/libraries/qt-5/5.11/default.nix
@@ -17,7 +17,7 @@ top-level attribute to `top-level/all-packages.nix`.
 
 {
   newScope,
-  stdenv, fetchurl, fetchFromGitHub, makeSetupHook, makeWrapper,
+  stdenv, fetchurl, fetchFromGitHub, makeSetupHook,
   bison, cups ? null, harfbuzz, libGL, perl,
   gstreamer, gst-plugins-base, gtk3, dconf,
 
diff --git a/pkgs/development/libraries/qt-5/5.6/default.nix b/pkgs/development/libraries/qt-5/5.6/default.nix
index b9ed5eddd5c..8732b106134 100644
--- a/pkgs/development/libraries/qt-5/5.6/default.nix
+++ b/pkgs/development/libraries/qt-5/5.6/default.nix
@@ -26,7 +26,7 @@ existing packages here and modify it as necessary.
 
 {
   newScope,
-  stdenv, fetchurl, makeSetupHook, makeWrapper,
+  stdenv, fetchurl, makeSetupHook,
   bison, cups ? null, harfbuzz, libGL, perl,
   gstreamer, gst-plugins-base,
 
diff --git a/pkgs/development/libraries/qt-5/5.9/default.nix b/pkgs/development/libraries/qt-5/5.9/default.nix
index e109fe447aa..755e6a9487e 100644
--- a/pkgs/development/libraries/qt-5/5.9/default.nix
+++ b/pkgs/development/libraries/qt-5/5.9/default.nix
@@ -17,7 +17,7 @@ top-level attribute to `top-level/all-packages.nix`.
 
 {
   newScope,
-  stdenv, fetchurl, makeSetupHook, makeWrapper,
+  stdenv, fetchurl, makeSetupHook,
   bison, cups ? null, harfbuzz, libGL, perl,
   gstreamer, gst-plugins-base, gtk3, dconf,
 
diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix
index 15e19c77567..0d9cb81afda 100644
--- a/pkgs/development/libraries/qt-5/modules/qtbase.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix
@@ -3,14 +3,14 @@
   src, patches, version, qtCompatVersion,
 
   coreutils, bison, flex, gdb, gperf, lndir, patchelf, perl, pkgconfig, python2,
-  ruby, which,
+  which,
   # darwin support
-  darwin, libiconv, libcxx,
+  darwin, libiconv,
 
   dbus, fontconfig, freetype, glib, harfbuzz, icu, libX11, libXcomposite,
   libXcursor, libXext, libXi, libXrender, libinput, libjpeg, libpng, libtiff,
   libxcb, libxkbcommon, libxml2, libxslt, openssl, pcre16, pcre2, sqlite, udev,
-  xcbutil, xcbutilimage, xcbutilkeysyms, xcbutilrenderutil, xcbutilwm, xorg,
+  xcbutil, xcbutilimage, xcbutilkeysyms, xcbutilrenderutil, xcbutilwm,
   zlib,
 
   # optional dependencies
diff --git a/pkgs/development/libraries/qt-5/modules/qtmultimedia.nix b/pkgs/development/libraries/qt-5/modules/qtmultimedia.nix
index 1b7a7c1fcea..d0bab88b2f2 100644
--- a/pkgs/development/libraries/qt-5/modules/qtmultimedia.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtmultimedia.nix
@@ -1,6 +1,5 @@
 { qtModule, stdenv, qtbase, qtdeclarative, pkgconfig
 , alsaLib, gstreamer, gst-plugins-base, libpulseaudio
-, darwin
 }:
 
 with stdenv.lib;
diff --git a/pkgs/development/libraries/qt-5/modules/qtserialport.nix b/pkgs/development/libraries/qt-5/modules/qtserialport.nix
index 2f8c142323d..516d38340dc 100644
--- a/pkgs/development/libraries/qt-5/modules/qtserialport.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtserialport.nix
@@ -1,4 +1,4 @@
-{ qtModule, stdenv, lib, qtbase, substituteAll, systemd }:
+{ qtModule, stdenv, lib, qtbase, systemd }:
 
 let inherit (lib) getLib optional; in
 
diff --git a/pkgs/development/libraries/qt-5/modules/qtwebkit.nix b/pkgs/development/libraries/qt-5/modules/qtwebkit.nix
index 8691e20ec45..62da679157f 100644
--- a/pkgs/development/libraries/qt-5/modules/qtwebkit.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtwebkit.nix
@@ -4,7 +4,6 @@
 , sqlite, systemd, glib, gst_all_1, cmake
 , bison2, flex, gdb, gperf, perl, pkgconfig, python2, ruby
 , darwin
-, substituteAll
 , flashplayerFix ? false
 , src ? null
 , version ? null
diff --git a/pkgs/development/libraries/qt-5/qt-env.nix b/pkgs/development/libraries/qt-5/qt-env.nix
index 49585f601d1..da56c07779b 100644
--- a/pkgs/development/libraries/qt-5/qt-env.nix
+++ b/pkgs/development/libraries/qt-5/qt-env.nix
@@ -1,4 +1,4 @@
-{ lib, buildEnv, qtbase }: name: paths:
+{ buildEnv, qtbase }: name: paths:
 
 buildEnv {
   inherit name;
diff --git a/pkgs/development/libraries/qtstyleplugins/default.nix b/pkgs/development/libraries/qtstyleplugins/default.nix
index a8611b31240..b94cdd22f7f 100644
--- a/pkgs/development/libraries/qtstyleplugins/default.nix
+++ b/pkgs/development/libraries/qtstyleplugins/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, qmake, qtbase, pkgconfig, gtk2 }:
+{ stdenv, fetchFromGitHub, qmake, pkgconfig, gtk2 }:
 
 stdenv.mkDerivation rec {
   name = "qtstyleplugins-2017-03-11";
diff --git a/pkgs/development/libraries/quazip/default.nix b/pkgs/development/libraries/quazip/default.nix
index 8d096e18f08..ae858738ec1 100644
--- a/pkgs/development/libraries/quazip/default.nix
+++ b/pkgs/development/libraries/quazip/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, zip, zlib, qtbase, qmake }:
+{ fetchurl, stdenv, zlib, qtbase, qmake }:
 
 stdenv.mkDerivation rec {
   name = "quazip-0.7.3";
diff --git a/pkgs/development/libraries/quickder/default.nix b/pkgs/development/libraries/quickder/default.nix
index 77e76ad638a..35d16ee5e19 100644
--- a/pkgs/development/libraries/quickder/default.nix
+++ b/pkgs/development/libraries/quickder/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchurl, python2Packages, hexio
+{ stdenv, fetchFromGitHub, python2Packages, hexio
 , which, cmake, bash, arpa2cm, git, asn2quickder, pkgconfig }:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/development/libraries/rocksdb/default.nix b/pkgs/development/libraries/rocksdb/default.nix
index 90389055a41..786fce0fb63 100644
--- a/pkgs/development/libraries/rocksdb/default.nix
+++ b/pkgs/development/libraries/rocksdb/default.nix
@@ -5,7 +5,6 @@
 
 # Optional Arguments
 , snappy ? null, google-gflags ? null, zlib ? null, bzip2 ? null, lz4 ? null
-, numactl ? null
 
 # Malloc implementation
 , jemalloc ? null, gperftools ? null
diff --git a/pkgs/development/libraries/science/math/arpack/default.nix b/pkgs/development/libraries/science/math/arpack/default.nix
index 77cb7cf1f2b..55c1a641fc3 100644
--- a/pkgs/development/libraries/science/math/arpack/default.nix
+++ b/pkgs/development/libraries/science/math/arpack/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, copyPathsToStore, fetchurl, autoconf, automake, gettext, libtool
+{ stdenv, fetchurl, autoconf, automake, gettext, libtool
 , gfortran, openblas }:
 
 with stdenv.lib;
diff --git a/pkgs/development/libraries/science/math/caffe2/default.nix b/pkgs/development/libraries/science/math/caffe2/default.nix
index 916bf122b3c..c1994533b78 100644
--- a/pkgs/development/libraries/science/math/caffe2/default.nix
+++ b/pkgs/development/libraries/science/math/caffe2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, config, fetchFromGitHub, fetchpatch
+{ stdenv, lib, config, fetchFromGitHub
 , cmake
 , glog, google-gflags, gtest
 , protobuf, snappy
diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix
index fc8f11f2f11..a9aa528a840 100644
--- a/pkgs/development/libraries/science/math/openblas/default.nix
+++ b/pkgs/development/libraries/science/math/openblas/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, gfortran, perl, which, config, coreutils
+{ stdenv, fetchurl, gfortran, perl, which, coreutils
 # Most packages depending on openblas expect integer width to match
 # pointer width, but some expect to use 32-bit integers always
 # (for compatibility with reference BLAS).
diff --git a/pkgs/development/libraries/science/networking/ns3/default.nix b/pkgs/development/libraries/science/networking/ns3/default.nix
index 3601066cb22..632380328db 100644
--- a/pkgs/development/libraries/science/networking/ns3/default.nix
+++ b/pkgs/development/libraries/science/networking/ns3/default.nix
@@ -1,5 +1,5 @@
 { stdenv
-, fetchFromGitHub, fetchurl
+, fetchFromGitHub
 , python
 
 # for binding generation
diff --git a/pkgs/development/libraries/serf/default.nix b/pkgs/development/libraries/serf/default.nix
index dfaf1c679dd..f794c3841b9 100644
--- a/pkgs/development/libraries/serf/default.nix
+++ b/pkgs/development/libraries/serf/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, apr, scons, openssl, aprutil, zlib, kerberos
-, pkgconfig, gnused, expat, openldap, libiconv }:
+, pkgconfig, libiconv }:
 
 stdenv.mkDerivation rec {
   name = "serf-1.3.9";
diff --git a/pkgs/development/libraries/smpeg2/default.nix b/pkgs/development/libraries/smpeg2/default.nix
index 3207bdb3a7f..90043786471 100644
--- a/pkgs/development/libraries/smpeg2/default.nix
+++ b/pkgs/development/libraries/smpeg2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, darwin, fetchsvn, autoconf, automake, libtool, m4, pkgconfig, makeWrapper, SDL2 }:
+{ stdenv, darwin, fetchsvn, autoconf, automake, pkgconfig, makeWrapper, SDL2 }:
 
 stdenv.mkDerivation rec {
   name = "smpeg2-svn${version}";
diff --git a/pkgs/development/libraries/speech-tools/default.nix b/pkgs/development/libraries/speech-tools/default.nix
index 22d66b7e71d..771ad033ed9 100644
--- a/pkgs/development/libraries/speech-tools/default.nix
+++ b/pkgs/development/libraries/speech-tools/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gawk, alsaLib, ncurses }:
+{ stdenv, fetchurl, alsaLib, ncurses }:
 
 stdenv.mkDerivation rec {
   name = "speech_tools-${version}.0";
diff --git a/pkgs/development/libraries/spice/default.nix b/pkgs/development/libraries/spice/default.nix
index 0b815f9095f..ba3791a8a8b 100644
--- a/pkgs/development/libraries/spice/default.nix
+++ b/pkgs/development/libraries/spice/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, pkgconfig, pixman, celt, alsaLib
+{ stdenv, fetchurl, pkgconfig, pixman, celt, alsaLib
 , openssl, libXrandr, libXfixes, libXext, libXrender, libXinerama
 , libjpeg, zlib, spice-protocol, python, pyparsing, glib, cyrus_sasl
 , lz4 }:
diff --git a/pkgs/development/libraries/tachyon/default.nix b/pkgs/development/libraries/tachyon/default.nix
index 0185bd2733b..4f711a639f7 100644
--- a/pkgs/development/libraries/tachyon/default.nix
+++ b/pkgs/development/libraries/tachyon/default.nix
@@ -1,6 +1,5 @@
 { stdenv
 , fetchurl
-, fetchpatch
 , Carbon ? null
 , libjpeg ? null
 , libpng ? null
diff --git a/pkgs/development/libraries/ti-rpc/default.nix b/pkgs/development/libraries/ti-rpc/default.nix
index 99f0bb65441..24251cf0cc1 100644
--- a/pkgs/development/libraries/ti-rpc/default.nix
+++ b/pkgs/development/libraries/ti-rpc/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, fetchpatch, stdenv, autoreconfHook, libkrb5 }:
+{ fetchurl, stdenv, autoreconfHook, libkrb5 }:
 
 stdenv.mkDerivation rec {
   name = "libtirpc-1.0.3";
diff --git a/pkgs/development/libraries/unicorn-emu/default.nix b/pkgs/development/libraries/unicorn-emu/default.nix
index 9f9d8e62de5..aa4a7890b23 100644
--- a/pkgs/development/libraries/unicorn-emu/default.nix
+++ b/pkgs/development/libraries/unicorn-emu/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, bash, pkgconfig, python }:
+{ stdenv, fetchurl, pkgconfig, python }:
 
 stdenv.mkDerivation rec {
   name    = "unicorn-emulator-${version}";
diff --git a/pkgs/development/libraries/v8/3.14.nix b/pkgs/development/libraries/v8/3.14.nix
index 9112079a90e..ce666becc85 100644
--- a/pkgs/development/libraries/v8/3.14.nix
+++ b/pkgs/development/libraries/v8/3.14.nix
@@ -1,5 +1,5 @@
 # This old version of V8 is still needed for the R V8 module
-{ stdenv, callPackage, fetchFromGitHub, gyp, readline, python, which, icu, ... }:
+{ stdenv, fetchFromGitHub, gyp, readline, python, which, icu, ... }:
 
 assert readline != null;
 
diff --git a/pkgs/development/libraries/vigra/default.nix b/pkgs/development/libraries/vigra/default.nix
index 438b4eda454..14211ea65e9 100644
--- a/pkgs/development/libraries/vigra/default.nix
+++ b/pkgs/development/libraries/vigra/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, boost, cmake, doxygen, fftw, fftwSinglePrec, hdf5, ilmbase
+{ stdenv, fetchurl, boost, cmake, fftw, fftwSinglePrec, hdf5, ilmbase
 , libjpeg, libpng, libtiff, openexr, python2Packages }:
 
 let
diff --git a/pkgs/development/libraries/vtk/default.nix b/pkgs/development/libraries/vtk/default.nix
index 984a106236c..bdfe3d1c5c6 100644
--- a/pkgs/development/libraries/vtk/default.nix
+++ b/pkgs/development/libraries/vtk/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, cmake, libGLU_combined, libX11, xproto, libXt
+{ stdenv, fetchurl, cmake, libGLU_combined, libX11, xproto, libXt
 , qtLib ? null
 # Darwin support
 , Cocoa, CoreServices, DiskArbitration, IOKit, CFNetwork, Security, GLUT, OpenGL
diff --git a/pkgs/development/libraries/wavpack/default.nix b/pkgs/development/libraries/wavpack/default.nix
index 29a27e53f22..9eb3254001d 100644
--- a/pkgs/development/libraries/wavpack/default.nix
+++ b/pkgs/development/libraries/wavpack/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, libiconv }:
+{ stdenv, fetchurl, libiconv }:
 
 stdenv.mkDerivation rec {
   name = "wavpack-${version}";
diff --git a/pkgs/development/libraries/wayland/1.9.nix b/pkgs/development/libraries/wayland/1.9.nix
index d832becbed8..3555a923228 100644
--- a/pkgs/development/libraries/wayland/1.9.nix
+++ b/pkgs/development/libraries/wayland/1.9.nix
@@ -1,5 +1,5 @@
 { lib, stdenv, fetchurl, pkgconfig
-, libffi, docbook_xsl, doxygen, graphviz, libxslt, xmlto, libxml2
+, libffi, libxml2
 , expat ? null # Build wayland-scanner (currently cannot be disabled as of 1.7.0)
 }:
 
diff --git a/pkgs/development/libraries/wayland/default.nix b/pkgs/development/libraries/wayland/default.nix
index bbc33f33e70..fce0dae6c73 100644
--- a/pkgs/development/libraries/wayland/default.nix
+++ b/pkgs/development/libraries/wayland/default.nix
@@ -1,5 +1,5 @@
 { lib, stdenv, fetchurl, pkgconfig
-, libffi, docbook_xsl, doxygen, graphviz, libxslt, xmlto, libxml2
+, libffi, libxml2
 , expat ? null # Build wayland-scanner (currently cannot be disabled as of 1.7.0)
 }:
 
diff --git a/pkgs/development/libraries/wlc/default.nix b/pkgs/development/libraries/wlc/default.nix
index 2b9244ff1b1..572adfeb0bb 100644
--- a/pkgs/development/libraries/wlc/default.nix
+++ b/pkgs/development/libraries/wlc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchpatch, cmake, pkgconfig
+{ stdenv, fetchFromGitHub, cmake, pkgconfig
 , wayland, pixman, libxkbcommon, libinput, xcbutilwm, xcbutilimage, libGL
 , libX11, dbus, wayland-protocols, libdrm, mesa_noglu
 , libpthreadstubs, libXdmcp, libXext, libXfixes
diff --git a/pkgs/development/libraries/xcb-util-cursor/HEAD.nix b/pkgs/development/libraries/xcb-util-cursor/HEAD.nix
index 17f8646b517..e343c301127 100644
--- a/pkgs/development/libraries/xcb-util-cursor/HEAD.nix
+++ b/pkgs/development/libraries/xcb-util-cursor/HEAD.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchgit, autoconf, automake, libtool, pkgconfig
-, git, xorg, gnum4, libxcb, gperf }:
+, xorg, gnum4, libxcb, gperf }:
 
 stdenv.mkDerivation rec {
   name = "xcb-util-cursor-0.1.1-3-unstable-${version}";
diff --git a/pkgs/development/libraries/xgboost/default.nix b/pkgs/development/libraries/xgboost/default.nix
index 7865724efa4..63dee2529fe 100644
--- a/pkgs/development/libraries/xgboost/default.nix
+++ b/pkgs/development/libraries/xgboost/default.nix
@@ -1,5 +1,4 @@
 { stdenv, lib, fetchgit, cmake
-, avxSupport ? false
 , cudaSupport ? false, cudatoolkit
 , ncclSupport ? false, nccl
 , llvmPackages
diff --git a/pkgs/development/libraries/xine-lib/default.nix b/pkgs/development/libraries/xine-lib/default.nix
index 274a70057bd..69b5b95e761 100644
--- a/pkgs/development/libraries/xine-lib/default.nix
+++ b/pkgs/development/libraries/xine-lib/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, xorg, alsaLib, libGLU_combined, aalib
-, libvorbis, libtheora, speex, zlib, libdvdcss, perl, ffmpeg
+, libvorbis, libtheora, speex, zlib, perl, ffmpeg
 , flac, libcaca, libpulseaudio, libmng, libcdio, libv4l, vcdimager
 , libmpcdec
 }:
diff --git a/pkgs/development/lisp-modules/clwrapper/default.nix b/pkgs/development/lisp-modules/clwrapper/default.nix
index c834ab7a305..019a44482b9 100644
--- a/pkgs/development/lisp-modules/clwrapper/default.nix
+++ b/pkgs/development/lisp-modules/clwrapper/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, asdf, which, bash, lisp ? null}:
+{stdenv, asdf, which, bash, lisp ? null}:
 stdenv.mkDerivation {
   name = "cl-wrapper-script";
 
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
index 1dc2488f55a..91493d7431e 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
@@ -1,4 +1,4 @@
-{pkgs, buildLispPackage, clwrapper, quicklisp-to-nix-packages}:
+{pkgs, quicklisp-to-nix-packages}:
 let
   addNativeLibs = libs: x: { propagatedBuildInputs = libs; };
   skipBuildPhase = x: {
diff --git a/pkgs/development/misc/loc/default.nix b/pkgs/development/misc/loc/default.nix
index efa76ea00a0..b43deeceb86 100644
--- a/pkgs/development/misc/loc/default.nix
+++ b/pkgs/development/misc/loc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, rustPlatform, makeWrapper }:
+{ stdenv, fetchFromGitHub, rustPlatform }:
 
 with rustPlatform;
 
diff --git a/pkgs/development/mobile/titaniumenv/default.nix b/pkgs/development/mobile/titaniumenv/default.nix
index 6765a9cc5c3..b09a483290f 100644
--- a/pkgs/development/mobile/titaniumenv/default.nix
+++ b/pkgs/development/mobile/titaniumenv/default.nix
@@ -1,4 +1,4 @@
-{pkgs, pkgs_i686, xcodeVersion ? "9.2", xcodeBaseDir ? "/Applications/Xcode.app", tiVersion ? "7.1.0.GA"}:
+{pkgs, xcodeVersion ? "9.2", xcodeBaseDir ? "/Applications/Xcode.app", tiVersion ? "7.1.0.GA"}:
 
 rec {
   androidenv = pkgs.androidenv;
diff --git a/pkgs/development/mobile/titaniumenv/examples/simulate-kitchensink/default.nix b/pkgs/development/mobile/titaniumenv/examples/simulate-kitchensink/default.nix
index 5bdd0fd63c5..bbd94cb7882 100644
--- a/pkgs/development/mobile/titaniumenv/examples/simulate-kitchensink/default.nix
+++ b/pkgs/development/mobile/titaniumenv/examples/simulate-kitchensink/default.nix
@@ -1,4 +1,4 @@
-{stdenv, xcodeenv, kitchensink, bundleId}:
+{xcodeenv, kitchensink, bundleId}:
 
 xcodeenv.simulateApp {
   name = "simulate-${kitchensink.name}";
diff --git a/pkgs/development/mobile/titaniumenv/titaniumsdk-6.3.nix b/pkgs/development/mobile/titaniumenv/titaniumsdk-6.3.nix
index 53963c100c7..26adf373826 100644
--- a/pkgs/development/mobile/titaniumenv/titaniumsdk-6.3.nix
+++ b/pkgs/development/mobile/titaniumenv/titaniumsdk-6.3.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, unzip, makeWrapper, python, jdk}:
+{stdenv, fetchurl, unzip, makeWrapper}:
 
 stdenv.mkDerivation {
   name = "mobilesdk-6.3.1.GA";
diff --git a/pkgs/development/mobile/titaniumenv/titaniumsdk-7.1.nix b/pkgs/development/mobile/titaniumenv/titaniumsdk-7.1.nix
index 61c23a6d0b3..a6de1f0ae8c 100644
--- a/pkgs/development/mobile/titaniumenv/titaniumsdk-7.1.nix
+++ b/pkgs/development/mobile/titaniumenv/titaniumsdk-7.1.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, unzip, makeWrapper, python, jdk}:
+{stdenv, fetchurl, unzip, makeWrapper}:
 
 let
   # Gradle is a build system that bootstraps itself. This is what it actually
diff --git a/pkgs/development/ocaml-modules/atdgen/default.nix b/pkgs/development/ocaml-modules/atdgen/default.nix
index bab2541fd74..291dd03c8d1 100644
--- a/pkgs/development/ocaml-modules/atdgen/default.nix
+++ b/pkgs/development/ocaml-modules/atdgen/default.nix
@@ -1,4 +1,4 @@
-{stdenv, atd, yojson, menhir, easy-format, biniou, cppo, buildOcaml, fetchurl, which}:
+{stdenv, atd, yojson, biniou, buildOcaml, fetchurl, which}:
 
 buildOcaml rec {
   name = "atdgen";
diff --git a/pkgs/development/ocaml-modules/bap/default.nix b/pkgs/development/ocaml-modules/bap/default.nix
index 8882bbf6647..72c426ce037 100644
--- a/pkgs/development/ocaml-modules/bap/default.nix
+++ b/pkgs/development/ocaml-modules/bap/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, fetchurl, fetchpatch
 , ocaml, findlib, ocamlbuild, ocaml_oasis,
- bitstring, camlzip, cmdliner, core_kernel, ezjsonm, faillib, fileutils, ocaml_lwt, ocamlgraph, ocurl, re, uri, zarith, piqi, piqi-ocaml, uuidm, llvm_38, ulex, easy-format, xmlm, frontc, ounit, ppx_jane, parsexp,
+ bitstring, camlzip, cmdliner, core_kernel, ezjsonm, faillib, fileutils, ocaml_lwt, ocamlgraph, ocurl, re, uri, zarith, piqi, piqi-ocaml, uuidm, llvm_38, frontc, ounit, ppx_jane, parsexp,
  utop,
  which, makeWrapper, writeText
 }:
diff --git a/pkgs/development/ocaml-modules/bin_prot/default.nix b/pkgs/development/ocaml-modules/bin_prot/default.nix
index 4a2b9846271..1acb17a8f7a 100644
--- a/pkgs/development/ocaml-modules/bin_prot/default.nix
+++ b/pkgs/development/ocaml-modules/bin_prot/default.nix
@@ -1,4 +1,4 @@
-{stdenv, writeText, buildOcaml, fetchurl, type_conv}:
+{stdenv, buildOcaml, fetchurl, type_conv}:
 
 buildOcaml rec {
   name = "bin_prot";
diff --git a/pkgs/development/ocaml-modules/cohttp/default.nix b/pkgs/development/ocaml-modules/cohttp/default.nix
index 24f0e9bfd7a..962525b47e4 100644
--- a/pkgs/development/ocaml-modules/cohttp/default.nix
+++ b/pkgs/development/ocaml-modules/cohttp/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, ocaml, findlib, jbuilder
 , ppx_fields_conv, ppx_sexp_conv, ppx_deriving
-, base64, fieldslib, jsonm, logs, re, stringext, uri
+, base64, fieldslib, jsonm, re, stringext, uri
 }:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/development/ocaml-modules/cstruct/1.9.0.nix b/pkgs/development/ocaml-modules/cstruct/1.9.0.nix
index 25f84826ec1..0122ec9ff61 100644
--- a/pkgs/development/ocaml-modules/cstruct/1.9.0.nix
+++ b/pkgs/development/ocaml-modules/cstruct/1.9.0.nix
@@ -1,4 +1,4 @@
-{ stdenv, writeText, fetchFromGitHub, ocaml, ocamlbuild, ocplib-endian, sexplib, findlib, ppx_tools
+{ stdenv, fetchFromGitHub, ocaml, ocamlbuild, ocplib-endian, sexplib, findlib, ppx_tools
 , async ? null, lwt ? null
 }:
 
diff --git a/pkgs/development/ocaml-modules/eliom/default.nix b/pkgs/development/ocaml-modules/eliom/default.nix
index 8b304aadd9e..f82cf33e307 100644
--- a/pkgs/development/ocaml-modules/eliom/default.nix
+++ b/pkgs/development/ocaml-modules/eliom/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, which, ocsigen_server, ocsigen_deriving, ocaml, camlp4,
-  js_of_ocaml, lwt_react, cryptokit,
+  lwt_react, cryptokit,
   ipaddr, ocamlnet, lwt_ssl, ocaml_pcre,
   opaline, ppx_tools, ppx_deriving, findlib
 , js_of_ocaml-ocamlbuild, js_of_ocaml-ppx, js_of_ocaml-ppx_deriving_json
diff --git a/pkgs/development/ocaml-modules/erm_xmpp/0.3.nix b/pkgs/development/ocaml-modules/erm_xmpp/0.3.nix
index a7290c8bb98..1a8f854185a 100644
--- a/pkgs/development/ocaml-modules/erm_xmpp/0.3.nix
+++ b/pkgs/development/ocaml-modules/erm_xmpp/0.3.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildOcaml, fetchFromGitHub, fetchurl, ocaml, findlib, erm_xml, nocrypto }:
+{ stdenv, buildOcaml, fetchFromGitHub, ocaml, findlib, erm_xml, nocrypto }:
 
 buildOcaml rec {
   version = "0.3";
diff --git a/pkgs/development/ocaml-modules/git-unix/default.nix b/pkgs/development/ocaml-modules/git-unix/default.nix
index 189388efe32..afeb3f1957b 100644
--- a/pkgs/development/ocaml-modules/git-unix/default.nix
+++ b/pkgs/development/ocaml-modules/git-unix/default.nix
@@ -1,6 +1,6 @@
 { stdenv, ocaml, findlib, jbuilder, git-http
 , cohttp-lwt-unix
-, tls, magic-mime, cmdliner, mtime
+, tls, cmdliner, mtime
 }:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/development/ocaml-modules/git/default.nix b/pkgs/development/ocaml-modules/git/default.nix
index 6f0f0d0b120..0bf43174412 100644
--- a/pkgs/development/ocaml-modules/git/default.nix
+++ b/pkgs/development/ocaml-modules/git/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, ocaml, findlib, jbuilder, opam
+{ stdenv, fetchFromGitHub, ocaml, findlib, jbuilder
 , astring, decompress, fmt, hex, logs, mstruct, ocaml_lwt, ocamlgraph, uri
 , alcotest, mtime, nocrypto
 }:
diff --git a/pkgs/development/ocaml-modules/janestreet/async-extra.nix b/pkgs/development/ocaml-modules/janestreet/async-extra.nix
index 4a283cc9910..19eef7cf182 100644
--- a/pkgs/development/ocaml-modules/janestreet/async-extra.nix
+++ b/pkgs/development/ocaml-modules/janestreet/async-extra.nix
@@ -1,4 +1,4 @@
-{stdenv, buildOcamlJane, fetchurl, async_kernel, async_unix,
+{stdenv, buildOcamlJane, async_kernel, async_unix,
  bin_prot, core, ppx_custom_printf, fieldslib, herelib,
  pipebang, sexplib, async_rpc_kernel}:
 
diff --git a/pkgs/development/ocaml-modules/janestreet/async-kernel.nix b/pkgs/development/ocaml-modules/janestreet/async-kernel.nix
index 4d7213a8603..938f5ccf447 100644
--- a/pkgs/development/ocaml-modules/janestreet/async-kernel.nix
+++ b/pkgs/development/ocaml-modules/janestreet/async-kernel.nix
@@ -1,6 +1,6 @@
-{stdenv, buildOcamlJane, fetchurl, core_kernel,
+{stdenv, buildOcamlJane, core_kernel,
  bin_prot, fieldslib,
- sexplib, herelib, opam, js_build_tools, ocaml_oasis}:
+ sexplib, herelib}:
 
 buildOcamlJane rec {
   name = "async_kernel";
diff --git a/pkgs/development/ocaml-modules/janestreet/async-unix.nix b/pkgs/development/ocaml-modules/janestreet/async-unix.nix
index 5621d2ec704..7db7cae2709 100644
--- a/pkgs/development/ocaml-modules/janestreet/async-unix.nix
+++ b/pkgs/development/ocaml-modules/janestreet/async-unix.nix
@@ -1,4 +1,4 @@
-{stdenv, buildOcamlJane, fetchurl, async_kernel,
+{stdenv, buildOcamlJane, async_kernel,
  bin_prot, comparelib, core, fieldslib, herelib,
  pipebang, sexplib}:
 
diff --git a/pkgs/development/ocaml-modules/janestreet/async.nix b/pkgs/development/ocaml-modules/janestreet/async.nix
index 2e776e273be..4cd67e1af86 100644
--- a/pkgs/development/ocaml-modules/janestreet/async.nix
+++ b/pkgs/development/ocaml-modules/janestreet/async.nix
@@ -1,4 +1,4 @@
-{stdenv, buildOcamlJane, fetchurl, async_kernel,
+{stdenv, buildOcamlJane, async_kernel,
  async_unix, async_extra}:
 
 buildOcamlJane rec {
diff --git a/pkgs/development/ocaml-modules/janestreet/async_ssl.nix b/pkgs/development/ocaml-modules/janestreet/async_ssl.nix
index bc1977ce2d6..63156215976 100644
--- a/pkgs/development/ocaml-modules/janestreet/async_ssl.nix
+++ b/pkgs/development/ocaml-modules/janestreet/async_ssl.nix
@@ -1,5 +1,5 @@
-{ stdenv, ocaml, buildOcamlJane, fetchurl, async, comparelib, core, ctypes
-, openssl, fieldslib, herelib, pipebang, sexplib, ocaml_oasis, integers
+{ stdenv, buildOcamlJane, async, comparelib, core, ctypes
+, openssl, fieldslib, herelib, pipebang, sexplib, ocaml_oasis
 }:
 
 buildOcamlJane rec {
diff --git a/pkgs/development/ocaml-modules/janestreet/core-extended.nix b/pkgs/development/ocaml-modules/janestreet/core-extended.nix
index dc84ea34337..5410167e0a2 100644
--- a/pkgs/development/ocaml-modules/janestreet/core-extended.nix
+++ b/pkgs/development/ocaml-modules/janestreet/core-extended.nix
@@ -1,9 +1,8 @@
-{stdenv, buildOcamlJane, fetchurl,
+{stdenv, buildOcamlJane,
  core,
  bin_prot, fieldslib, sexplib, typerep, variantslib,
  ppx_assert, ppx_bench, ppx_driver, ppx_expect, ppx_inline_test, ppx_jane,
- re2, textutils,
- ocaml_oasis, opam, js_build_tools}:
+ re2, textutils}:
 
 buildOcamlJane rec {
   name = "core_extended";
diff --git a/pkgs/development/ocaml-modules/janestreet/core.nix b/pkgs/development/ocaml-modules/janestreet/core.nix
index 05ea4d5d566..c2f97badda9 100644
--- a/pkgs/development/ocaml-modules/janestreet/core.nix
+++ b/pkgs/development/ocaml-modules/janestreet/core.nix
@@ -1,8 +1,7 @@
-{stdenv, buildOcamlJane, fetchurl,
+{stdenv, buildOcamlJane,
  core_kernel,
  bin_prot, fieldslib, sexplib, typerep, variantslib,
- ppx_assert, ppx_bench, ppx_driver, ppx_expect, ppx_inline_test, ppx_jane,
- ocaml_oasis, opam, js_build_tools}:
+ ppx_assert, ppx_bench, ppx_driver, ppx_expect, ppx_inline_test, ppx_jane}:
 
 buildOcamlJane rec {
   name = "core";
diff --git a/pkgs/development/ocaml-modules/janestreet/core_kernel.nix b/pkgs/development/ocaml-modules/janestreet/core_kernel.nix
index 93fcdde5bb3..e5bbb780052 100644
--- a/pkgs/development/ocaml-modules/janestreet/core_kernel.nix
+++ b/pkgs/development/ocaml-modules/janestreet/core_kernel.nix
@@ -1,7 +1,6 @@
-{stdenv, buildOcamlJane, fetchurl,
+{stdenv, buildOcamlJane,
  bin_prot, fieldslib, sexplib, typerep, variantslib,
- ppx_assert, ppx_bench, ppx_driver, ppx_expect, ppx_inline_test, ppx_jane,
- ocaml_oasis, opam, js_build_tools}:
+ ppx_assert, ppx_bench, ppx_driver, ppx_expect, ppx_inline_test, ppx_jane}:
 
 buildOcamlJane rec {
   name = "core_kernel";
diff --git a/pkgs/development/ocaml-modules/janestreet/default.nix b/pkgs/development/ocaml-modules/janestreet/default.nix
index a4c3c15160d..a05d49245b2 100644
--- a/pkgs/development/ocaml-modules/janestreet/default.nix
+++ b/pkgs/development/ocaml-modules/janestreet/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, janePackage, ocaml, ocamlbuild, angstrom, cryptokit, ctypes,
+{ stdenv, janePackage, ocamlbuild, angstrom, cryptokit, ctypes,
   magic-mime, ocaml-migrate-parsetree, octavius, ounit, ppx_deriving, re,
   zarith, num, openssl
 , ppxlib
diff --git a/pkgs/development/ocaml-modules/mysql/default.nix b/pkgs/development/ocaml-modules/mysql/default.nix
index 5482d7ac87c..1986f7e48f6 100644
--- a/pkgs/development/ocaml-modules/mysql/default.nix
+++ b/pkgs/development/ocaml-modules/mysql/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, ocaml, findlib, mysql, openssl }:
+{ stdenv, fetchurl, fetchpatch, ocaml, findlib, mysql }:
 
 # TODO: la versione stabile da' un errore di compilazione dovuto a
 # qualche cambiamento negli header .h
diff --git a/pkgs/development/ocaml-modules/ocaml-cairo/default.nix b/pkgs/development/ocaml-modules/ocaml-cairo/default.nix
index 165dda1fa02..e1590bb0c9a 100644
--- a/pkgs/development/ocaml-modules/ocaml-cairo/default.nix
+++ b/pkgs/development/ocaml-modules/ocaml-cairo/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, automake, ocaml, autoconf, gnum4, pkgconfig, freetype, lablgtk, unzip, cairo, findlib, gdk_pixbuf, glib, gtk2, pango }:
+{stdenv, fetchurl, automake, ocaml, autoconf, gnum4, pkgconfig, freetype, lablgtk, unzip, cairo, findlib, gdk_pixbuf, gtk2, pango }:
 
 let
   pname = "ocaml-cairo";
diff --git a/pkgs/development/ocaml-modules/piqi-ocaml/default.nix b/pkgs/development/ocaml-modules/piqi-ocaml/default.nix
index 165a566b1b7..38b56ac7beb 100644
--- a/pkgs/development/ocaml-modules/piqi-ocaml/default.nix
+++ b/pkgs/development/ocaml-modules/piqi-ocaml/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ocaml, findlib, piqi, ulex, easy-format, xmlm, camlp4 }:
+{ stdenv, fetchurl, ocaml, findlib, piqi, camlp4 }:
 
 stdenv.mkDerivation rec {
   version = "0.7.5";
diff --git a/pkgs/development/ocaml-modules/ppx_import/default.nix b/pkgs/development/ocaml-modules/ppx_import/default.nix
index 3948cfce0e8..1f53b871282 100644
--- a/pkgs/development/ocaml-modules/ppx_import/default.nix
+++ b/pkgs/development/ocaml-modules/ppx_import/default.nix
@@ -1,5 +1,5 @@
-{stdenv, fetchFromGitHub, buildOcaml, ocaml, opaline,
- cppo, ppx_tools, ounit, ppx_deriving}:
+{stdenv, fetchFromGitHub, buildOcaml, opaline,
+ cppo, ounit, ppx_deriving}:
 
 buildOcaml rec {
   name = "ppx_import";
diff --git a/pkgs/development/ocaml-modules/re2/default.nix b/pkgs/development/ocaml-modules/re2/default.nix
index 9b26c404095..2b7d9855665 100644
--- a/pkgs/development/ocaml-modules/re2/default.nix
+++ b/pkgs/development/ocaml-modules/re2/default.nix
@@ -1,4 +1,4 @@
-{stdenv, buildOcaml, fetchurl, ocaml, core_p4, pa_ounit, pa_test,
+{stdenv, buildOcaml, fetchurl, core_p4, pa_ounit, pa_test,
  bin_prot_p4, comparelib, sexplib_p4, rsync}:
 
 buildOcaml rec {
diff --git a/pkgs/development/ocaml-modules/tls/default.nix b/pkgs/development/ocaml-modules/tls/default.nix
index 1e031b135d2..181946802d7 100644
--- a/pkgs/development/ocaml-modules/tls/default.nix
+++ b/pkgs/development/ocaml-modules/tls/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, topkg
-, ppx_tools, ppx_sexp_conv, result, x509, nocrypto, cstruct, ppx_cstruct, cstruct-unix, ounit
+, ppx_sexp_conv, result, x509, nocrypto, cstruct, ppx_cstruct, cstruct-unix, ounit
 , lwt     ? null}:
 
 with stdenv.lib;
diff --git a/pkgs/development/perl-modules/MNI/default.nix b/pkgs/development/perl-modules/MNI/default.nix
index 176cd06a9cc..dbb167e27b3 100644
--- a/pkgs/development/perl-modules/MNI/default.nix
+++ b/pkgs/development/perl-modules/MNI/default.nix
@@ -1,4 +1,4 @@
-{ fetchFromGitHub, buildPerlPackage, stdenv, perl }:
+{ fetchFromGitHub, buildPerlPackage, stdenv }:
 
 buildPerlPackage rec {
   name = "MNI-Perllib-2012-04-13";
diff --git a/pkgs/development/pharo/vm/build-vm.nix b/pkgs/development/pharo/vm/build-vm.nix
index 82b3da7a37c..b59be96bb62 100644
--- a/pkgs/development/pharo/vm/build-vm.nix
+++ b/pkgs/development/pharo/vm/build-vm.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, bash, unzip, glibc, openssl, gcc, libGLU_combined, freetype, xorg, alsaLib, cairo, libuuid, autoreconfHook, gcc48, ... }:
+{ stdenv, fetchurl, bash, unzip, glibc, openssl, libGLU_combined, freetype, xorg, alsaLib, cairo, libuuid, autoreconfHook, gcc48, ... }:
 
 { name, src, version, source-date, source-url, ... }:
 
diff --git a/pkgs/development/pure-modules/gen/default.nix b/pkgs/development/pure-modules/gen/default.nix
index e8c1a948fe9..22bbb4d3be4 100644
--- a/pkgs/development/pure-modules/gen/default.nix
+++ b/pkgs/development/pure-modules/gen/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl,
+{ stdenv, fetchurl,
   pkgconfig, pure, haskellPackages }:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/development/pure-modules/glpk/default.nix b/pkgs/development/pure-modules/glpk/default.nix
index e86f08b57ca..7b615928da9 100644
--- a/pkgs/development/pure-modules/glpk/default.nix
+++ b/pkgs/development/pure-modules/glpk/default.nix
@@ -1,5 +1,5 @@
 { lib, stdenv, fetchurl,
-  pkgconfig, pure, glpk, gmp, libtool, mysql, libiodbc, zlib }:
+  pkgconfig, pure, glpk, gmp, libtool, mysql, libiodbc }:
 
 stdenv.mkDerivation rec {
   baseName = "glpk";
diff --git a/pkgs/development/python-modules/Cython/default.nix b/pkgs/development/python-modules/Cython/default.nix
index 124e8b80ba0..fa07eee0d7e 100644
--- a/pkgs/development/python-modules/Cython/default.nix
+++ b/pkgs/development/python-modules/Cython/default.nix
@@ -2,7 +2,6 @@
 , stdenv
 , buildPythonPackage
 , fetchPypi
-, isPy3k
 , python
 , glibcLocales
 , pkgconfig
diff --git a/pkgs/development/python-modules/GeoIP/default.nix b/pkgs/development/python-modules/GeoIP/default.nix
index 4f0a7d4aebc..550fa1da3ed 100644
--- a/pkgs/development/python-modules/GeoIP/default.nix
+++ b/pkgs/development/python-modules/GeoIP/default.nix
@@ -1,5 +1,4 @@
-{lib, buildPythonPackage, fetchPypi, isPy3k, incremental, ipaddress, twisted
-, automat, zope_interface, idna, pyopenssl, service-identity, pytest, mock, lsof
+{lib, buildPythonPackage, fetchPypi
 , geoip, nose}:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/JPype1/default.nix b/pkgs/development/python-modules/JPype1/default.nix
index 13bddd3ffb8..879cdb9bd09 100644
--- a/pkgs/development/python-modules/JPype1/default.nix
+++ b/pkgs/development/python-modules/JPype1/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, fetchPypi, isPy3k }:
+{ buildPythonPackage, fetchPypi, isPy3k }:
 
 buildPythonPackage rec {
   pname = "JPype1";
diff --git a/pkgs/development/python-modules/PyLD/default.nix b/pkgs/development/python-modules/PyLD/default.nix
index 29a792000e9..48878995bb4 100644
--- a/pkgs/development/python-modules/PyLD/default.nix
+++ b/pkgs/development/python-modules/PyLD/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchPypi, buildPythonPackage, fetchFromGitHub, python, gnugrep }:
+{ stdenv, buildPythonPackage, fetchFromGitHub, python, gnugrep }:
 
 let
 
diff --git a/pkgs/development/python-modules/Theano/default.nix b/pkgs/development/python-modules/Theano/default.nix
index 30c820ec6c1..e2b31cdda79 100644
--- a/pkgs/development/python-modules/Theano/default.nix
+++ b/pkgs/development/python-modules/Theano/default.nix
@@ -9,7 +9,6 @@
 , isPy3k
 , nose
 , numpy
-, pydot_ng
 , scipy
 , six
 , libgpuarray
diff --git a/pkgs/development/python-modules/acme/default.nix b/pkgs/development/python-modules/acme/default.nix
index cd81a7facc2..820ee2a95d8 100644
--- a/pkgs/development/python-modules/acme/default.nix
+++ b/pkgs/development/python-modules/acme/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi
+{ buildPythonPackage
 , certbot
 , nose
 , cryptography
diff --git a/pkgs/development/python-modules/aiohttp-jinja2/default.nix b/pkgs/development/python-modules/aiohttp-jinja2/default.nix
index f0756e1572e..9f307f24dfa 100644
--- a/pkgs/development/python-modules/aiohttp-jinja2/default.nix
+++ b/pkgs/development/python-modules/aiohttp-jinja2/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, aiohttp, jinja2, pytest, pytest-aiohttp }:
+{ lib, buildPythonPackage, fetchPypi, aiohttp, jinja2, pytest, pytest-aiohttp }:
 
 buildPythonPackage rec {
   pname = "aiohttp-jinja2";
diff --git a/pkgs/development/python-modules/aiohttp/cors.nix b/pkgs/development/python-modules/aiohttp/cors.nix
index 3065bb17c05..00198cd27cf 100644
--- a/pkgs/development/python-modules/aiohttp/cors.nix
+++ b/pkgs/development/python-modules/aiohttp/cors.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, pythonOlder
+{ lib, buildPythonPackage, fetchPypi, pythonOlder
 , typing, aiohttp
 }:
 
diff --git a/pkgs/development/python-modules/aiohue/default.nix b/pkgs/development/python-modules/aiohue/default.nix
index 2ad260f5d40..1492a15aadf 100644
--- a/pkgs/development/python-modules/aiohue/default.nix
+++ b/pkgs/development/python-modules/aiohue/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, aiohttp }:
+{ lib, buildPythonPackage, fetchPypi, aiohttp }:
 
 buildPythonPackage rec {
   pname = "aiohue";
diff --git a/pkgs/development/python-modules/anyjson/default.nix b/pkgs/development/python-modules/anyjson/default.nix
index ba32cf7ea69..6db4bbdc314 100644
--- a/pkgs/development/python-modules/anyjson/default.nix
+++ b/pkgs/development/python-modules/anyjson/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, isPy3k, nose }:
+{ buildPythonPackage, fetchPypi, isPy3k, nose }:
 
 buildPythonPackage rec {
   pname = "anyjson";
diff --git a/pkgs/development/python-modules/application/default.nix b/pkgs/development/python-modules/application/default.nix
index 32314b81edc..584eb3ae2c5 100644
--- a/pkgs/development/python-modules/application/default.nix
+++ b/pkgs/development/python-modules/application/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchdarcs, zope_interface, isPy3k }:
+{ buildPythonPackage, fetchdarcs, zope_interface, isPy3k }:
 
 buildPythonPackage rec {
   pname = "python-application";
diff --git a/pkgs/development/python-modules/area53/default.nix b/pkgs/development/python-modules/area53/default.nix
index 808ddc57096..20013b8a1ed 100644
--- a/pkgs/development/python-modules/area53/default.nix
+++ b/pkgs/development/python-modules/area53/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi
+{ buildPythonPackage, fetchPypi
 , boto }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/argcomplete/default.nix b/pkgs/development/python-modules/argcomplete/default.nix
index 28b88d3b46a..37d97f42aa1 100644
--- a/pkgs/development/python-modules/argcomplete/default.nix
+++ b/pkgs/development/python-modules/argcomplete/default.nix
@@ -1,5 +1,5 @@
 { buildPythonPackage, fetchPypi, lib,
-  coverage, dicttoxml, flake8, pexpect, prettytable, requests_toolbelt
+  dicttoxml, pexpect, prettytable, requests_toolbelt
 }:
 buildPythonPackage rec {
   pname = "argcomplete";
diff --git a/pkgs/development/python-modules/argon2_cffi/default.nix b/pkgs/development/python-modules/argon2_cffi/default.nix
index f46efd9f496..ce371076256 100644
--- a/pkgs/development/python-modules/argon2_cffi/default.nix
+++ b/pkgs/development/python-modules/argon2_cffi/default.nix
@@ -1,5 +1,4 @@
-{ lib
-, cffi
+{ cffi
 , six
 , hypothesis
 , pytest
diff --git a/pkgs/development/python-modules/asana/default.nix b/pkgs/development/python-modules/asana/default.nix
index fd89457ed31..2fbe4932bed 100644
--- a/pkgs/development/python-modules/asana/default.nix
+++ b/pkgs/development/python-modules/asana/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, pytest, requests, requests_oauthlib, six
+{ buildPythonPackage, pytest, requests, requests_oauthlib, six
 , fetchFromGitHub, responses, stdenv
 }:
 
diff --git a/pkgs/development/python-modules/async_timeout/default.nix b/pkgs/development/python-modules/async_timeout/default.nix
index bc8e375271d..ee15be95418 100644
--- a/pkgs/development/python-modules/async_timeout/default.nix
+++ b/pkgs/development/python-modules/async_timeout/default.nix
@@ -1,7 +1,6 @@
 { lib
 , fetchPypi
 , buildPythonPackage
-, pytestrunner
 , pythonOlder
 }:
 
diff --git a/pkgs/development/python-modules/asyncio/default.nix b/pkgs/development/python-modules/asyncio/default.nix
index c3ed7bed742..489a31b3242 100644
--- a/pkgs/development/python-modules/asyncio/default.nix
+++ b/pkgs/development/python-modules/asyncio/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, isPy33, pythonOlder }:
+{ stdenv, buildPythonPackage, fetchPypi, pythonOlder }:
 
 buildPythonPackage rec {
   pname = "asyncio";
diff --git a/pkgs/development/python-modules/asynctest/default.nix b/pkgs/development/python-modules/asynctest/default.nix
index 0004badd6f4..187e0924cca 100644
--- a/pkgs/development/python-modules/asynctest/default.nix
+++ b/pkgs/development/python-modules/asynctest/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, fetchPypi, fetchFromGitHub, pythonOlder, python }:
+{ lib, buildPythonPackage, fetchPypi, pythonOlder, python }:
 
 buildPythonPackage rec {
   pname = "asynctest";
diff --git a/pkgs/development/python-modules/autograd/default.nix b/pkgs/development/python-modules/autograd/default.nix
index 1c3c1fdefbe..bf7c35fa698 100644
--- a/pkgs/development/python-modules/autograd/default.nix
+++ b/pkgs/development/python-modules/autograd/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, numpy, future, nose }:
+{ stdenv, buildPythonPackage, fetchPypi, numpy, future }:
 
 buildPythonPackage rec {
   pname = "autograd";
diff --git a/pkgs/development/python-modules/behave/default.nix b/pkgs/development/python-modules/behave/default.nix
index a4a7b63b8a3..6fc3f16b3ad 100644
--- a/pkgs/development/python-modules/behave/default.nix
+++ b/pkgs/development/python-modules/behave/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchPypi
-, buildPythonApplication, isPy27, python, pythonOlder
+, buildPythonApplication, python, pythonOlder
 , mock, nose, pathpy, pyhamcrest, pytest
 , glibcLocales, parse, parse-type, six
 , traceback2
diff --git a/pkgs/development/python-modules/bootstrapped-pip/default.nix b/pkgs/development/python-modules/bootstrapped-pip/default.nix
index 240dd5513e8..2a9cb2a2cfd 100644
--- a/pkgs/development/python-modules/bootstrapped-pip/default.nix
+++ b/pkgs/development/python-modules/bootstrapped-pip/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, python, fetchPypi, fetchurl, makeWrapper, unzip }:
+{ stdenv, python, fetchPypi, makeWrapper, unzip }:
 
 let
   wheel_source = fetchPypi {
diff --git a/pkgs/development/python-modules/bottleneck/default.nix b/pkgs/development/python-modules/bottleneck/default.nix
index 791b05e81ca..c9ca8f7ec04 100644
--- a/pkgs/development/python-modules/bottleneck/default.nix
+++ b/pkgs/development/python-modules/bottleneck/default.nix
@@ -1,5 +1,4 @@
-{ lib
-, buildPythonPackage
+{ buildPythonPackage
 , fetchPypi
 , nose
 , numpy
diff --git a/pkgs/development/python-modules/browsermob-proxy/default.nix b/pkgs/development/python-modules/browsermob-proxy/default.nix
index 5a9bae58bd6..b5da73a32d2 100644
--- a/pkgs/development/python-modules/browsermob-proxy/default.nix
+++ b/pkgs/development/python-modules/browsermob-proxy/default.nix
@@ -1,5 +1,4 @@
 { lib
-, stdenv
 , buildPythonPackage
 , fetchPypi
 , requests
diff --git a/pkgs/development/python-modules/bz2file/default.nix b/pkgs/development/python-modules/bz2file/default.nix
index 3bc9882585f..8efb1c083f2 100644
--- a/pkgs/development/python-modules/bz2file/default.nix
+++ b/pkgs/development/python-modules/bz2file/default.nix
@@ -1,6 +1,5 @@
 { lib
 , buildPythonPackage
-, isPy3k
 , fetchPypi
 }:
 
diff --git a/pkgs/development/python-modules/cachetools/default.nix b/pkgs/development/python-modules/cachetools/default.nix
index de15ffaabc6..d4b9195c555 100644
--- a/pkgs/development/python-modules/cachetools/default.nix
+++ b/pkgs/development/python-modules/cachetools/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, isPyPy }:
+{ stdenv, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "cachetools";
diff --git a/pkgs/development/python-modules/can/default.nix b/pkgs/development/python-modules/can/default.nix
index 395122b4da9..f85f80ea239 100644
--- a/pkgs/development/python-modules/can/default.nix
+++ b/pkgs/development/python-modules/can/default.nix
@@ -1,5 +1,4 @@
 { lib
-, stdenv
 , buildPythonPackage
 , fetchPypi
 , pyserial
diff --git a/pkgs/development/python-modules/canmatrix/default.nix b/pkgs/development/python-modules/canmatrix/default.nix
index 99ac6c3ec45..3e07188986d 100644
--- a/pkgs/development/python-modules/canmatrix/default.nix
+++ b/pkgs/development/python-modules/canmatrix/default.nix
@@ -1,5 +1,4 @@
 { lib
-, stdenv
 , buildPythonPackage
 , fetchFromGitHub
 , python
diff --git a/pkgs/development/python-modules/canopen/default.nix b/pkgs/development/python-modules/canopen/default.nix
index 08ae54e0b73..1afe2341633 100644
--- a/pkgs/development/python-modules/canopen/default.nix
+++ b/pkgs/development/python-modules/canopen/default.nix
@@ -1,7 +1,5 @@
 { lib
-, stdenv
 , buildPythonPackage
-, fetchPypi
 , fetchFromGitHub
 , nose
 , can
diff --git a/pkgs/development/python-modules/cdecimal/default.nix b/pkgs/development/python-modules/cdecimal/default.nix
index 2c0b0e623ca..0c636e12088 100644
--- a/pkgs/development/python-modules/cdecimal/default.nix
+++ b/pkgs/development/python-modules/cdecimal/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, wget, buildPythonPackage, isPy3k }:
+{ stdenv, fetchurl, buildPythonPackage, isPy3k }:
 
 with stdenv.lib;
 
diff --git a/pkgs/development/python-modules/cffi/default.nix b/pkgs/development/python-modules/cffi/default.nix
index 72476942276..3f1456f6e94 100644
--- a/pkgs/development/python-modules/cffi/default.nix
+++ b/pkgs/development/python-modules/cffi/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, isPy27, isPyPy, fetchPypi, libffi, pycparser, pytest }:
+{ stdenv, buildPythonPackage, isPyPy, fetchPypi, libffi, pycparser, pytest }:
 
 if isPyPy then null else buildPythonPackage rec {
   pname = "cffi";
diff --git a/pkgs/development/python-modules/cftime/default.nix b/pkgs/development/python-modules/cftime/default.nix
index 0e355723604..425a53987ca 100644
--- a/pkgs/development/python-modules/cftime/default.nix
+++ b/pkgs/development/python-modules/cftime/default.nix
@@ -1,5 +1,4 @@
-{ lib
-, buildPythonPackage
+{ buildPythonPackage
 , fetchPypi
 , pytest
 , coveralls
diff --git a/pkgs/development/python-modules/chainer/default.nix b/pkgs/development/python-modules/chainer/default.nix
index b07a205ba21..cc75649119b 100644
--- a/pkgs/development/python-modules/chainer/default.nix
+++ b/pkgs/development/python-modules/chainer/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, python
+{ stdenv, lib
 , buildPythonPackage, fetchPypi, isPy3k
 , filelock, protobuf, numpy, pytest, mock
 , cupy, cudaSupport ? false
diff --git a/pkgs/development/python-modules/characteristic/default.nix b/pkgs/development/python-modules/characteristic/default.nix
index f004e6d541c..1c42b1283ee 100644
--- a/pkgs/development/python-modules/characteristic/default.nix
+++ b/pkgs/development/python-modules/characteristic/default.nix
@@ -1,5 +1,4 @@
-{ lib
-, buildPythonPackage
+{ buildPythonPackage
 , fetchPypi
 , pytest
 }:
diff --git a/pkgs/development/python-modules/circus/default.nix b/pkgs/development/python-modules/circus/default.nix
index 7e6cc206cdc..0a82238b703 100644
--- a/pkgs/development/python-modules/circus/default.nix
+++ b/pkgs/development/python-modules/circus/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi
+{ buildPythonPackage, fetchPypi
 , iowait, psutil, pyzmq, tornado, mock }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/cmd2/default.nix b/pkgs/development/python-modules/cmd2/default.nix
index e83fd4163e4..967941666c8 100644
--- a/pkgs/development/python-modules/cmd2/default.nix
+++ b/pkgs/development/python-modules/cmd2/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchPypi, buildPythonPackage, pythonOlder, isPy3k
 , pyperclip, six, pyparsing, vim, wcwidth, colorama
-, contextlib2 ? null, subprocess32 ? null
-, pytest, mock, which, fetchFromGitHub, glibcLocales
+, contextlib2 ? null
+, pytest, mock, which, glibcLocales
 }:
 buildPythonPackage rec {
   pname = "cmd2";
diff --git a/pkgs/development/python-modules/cmd2/old.nix b/pkgs/development/python-modules/cmd2/old.nix
index 5ffa51def0d..7778e73f92f 100644
--- a/pkgs/development/python-modules/cmd2/old.nix
+++ b/pkgs/development/python-modules/cmd2/old.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchPypi, buildPythonPackage, pythonOlder
+{ stdenv, buildPythonPackage, pythonOlder
 , pyperclip, six, pyparsing, vim
 , contextlib2 ? null, subprocess32 ? null
 , pytest, mock, which, fetchFromGitHub, glibcLocales
diff --git a/pkgs/development/python-modules/coinmarketcap/default.nix b/pkgs/development/python-modules/coinmarketcap/default.nix
index cfd6389ce5f..bcf32714796 100644
--- a/pkgs/development/python-modules/coinmarketcap/default.nix
+++ b/pkgs/development/python-modules/coinmarketcap/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, requests-cache }:
+{ lib, buildPythonPackage, fetchPypi, requests-cache }:
 
 buildPythonPackage rec {
   pname = "coinmarketcap";
diff --git a/pkgs/development/python-modules/colorlover/default.nix b/pkgs/development/python-modules/colorlover/default.nix
index 1ccb31d5120..14bae27592a 100644
--- a/pkgs/development/python-modules/colorlover/default.nix
+++ b/pkgs/development/python-modules/colorlover/default.nix
@@ -1,4 +1,4 @@
-{ buildPythonPackage, fetchPypi, python, stdenv, nose
+{ buildPythonPackage, fetchPypi, stdenv
 }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/configargparse/default.nix b/pkgs/development/python-modules/configargparse/default.nix
index 6a52076252e..62e63a8e5b3 100644
--- a/pkgs/development/python-modules/configargparse/default.nix
+++ b/pkgs/development/python-modules/configargparse/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildPythonPackage, fetchPypi }:
+{ lib, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "ConfigArgParse";
diff --git a/pkgs/development/python-modules/configparser/default.nix b/pkgs/development/python-modules/configparser/default.nix
index 8e770c504c3..7bef3e82935 100644
--- a/pkgs/development/python-modules/configparser/default.nix
+++ b/pkgs/development/python-modules/configparser/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, isPy3k }:
+{ stdenv, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "configparser";
diff --git a/pkgs/development/python-modules/construct/default.nix b/pkgs/development/python-modules/construct/default.nix
index afba2e17bf6..680f6e02cd0 100644
--- a/pkgs/development/python-modules/construct/default.nix
+++ b/pkgs/development/python-modules/construct/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub, six, pytest, pythonOlder }:
+{ stdenv, buildPythonPackage, fetchFromGitHub, six, pytest }:
 
 buildPythonPackage rec {
   pname = "construct";
diff --git a/pkgs/development/python-modules/coverage/default.nix b/pkgs/development/python-modules/coverage/default.nix
index 4d2a168f79c..0aa38aed296 100644
--- a/pkgs/development/python-modules/coverage/default.nix
+++ b/pkgs/development/python-modules/coverage/default.nix
@@ -1,7 +1,6 @@
 { lib
 , buildPythonPackage
 , fetchPypi
-, isPy3k
 , mock
 }:
 
diff --git a/pkgs/development/python-modules/cram/default.nix b/pkgs/development/python-modules/cram/default.nix
index 232a4a19fd8..f27cfc44e57 100644
--- a/pkgs/development/python-modules/cram/default.nix
+++ b/pkgs/development/python-modules/cram/default.nix
@@ -1,4 +1,4 @@
-{stdenv, lib, buildPythonPackage, fetchPypi, bash, which, writeText}:
+{stdenv, lib, buildPythonPackage, fetchPypi, bash, which}:
 
 buildPythonPackage rec {
   version = "0.7";
diff --git a/pkgs/development/python-modules/credstash/default.nix b/pkgs/development/python-modules/credstash/default.nix
index e19850be8ce..db48326535d 100644
--- a/pkgs/development/python-modules/credstash/default.nix
+++ b/pkgs/development/python-modules/credstash/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, fetchpatch, cryptography, boto3, pyyaml, docutils, nose }:
+{ stdenv, buildPythonPackage, fetchPypi, cryptography, boto3, pyyaml, docutils, nose }:
 
 buildPythonPackage rec {
   pname = "credstash";
diff --git a/pkgs/development/python-modules/cryptography_vectors/default.nix b/pkgs/development/python-modules/cryptography_vectors/default.nix
index bcab5c43475..6285ac28fce 100644
--- a/pkgs/development/python-modules/cryptography_vectors/default.nix
+++ b/pkgs/development/python-modules/cryptography_vectors/default.nix
@@ -1,6 +1,5 @@
 { buildPythonPackage
 , fetchPypi
-, cryptography
 }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/cupy/default.nix b/pkgs/development/python-modules/cupy/default.nix
index 3a3aeb7b226..da742b31050 100644
--- a/pkgs/development/python-modules/cupy/default.nix
+++ b/pkgs/development/python-modules/cupy/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, python, buildPythonPackage
+{ stdenv, buildPythonPackage
 , fetchPypi, isPy3k, linuxPackages, gcc5
 , fastrlock, numpy, six, wheel, pytest, mock
 , cudatoolkit, cudnn, nccl
diff --git a/pkgs/development/python-modules/cx_freeze/default.nix b/pkgs/development/python-modules/cx_freeze/default.nix
index 69a5e8c11d4..67120bf0f3d 100644
--- a/pkgs/development/python-modules/cx_freeze/default.nix
+++ b/pkgs/development/python-modules/cx_freeze/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, isPyPy, isPy35, ncurses }:
+{ stdenv, buildPythonPackage, fetchPypi, ncurses }:
 
 buildPythonPackage rec {
   pname = "cx_Freeze";
diff --git a/pkgs/development/python-modules/datadog/default.nix b/pkgs/development/python-modules/datadog/default.nix
index d01029652a9..47c206fda5e 100644
--- a/pkgs/development/python-modules/datadog/default.nix
+++ b/pkgs/development/python-modules/datadog/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, fetchFromGitHub, isPy3k
+{ lib, buildPythonPackage, fetchFromGitHub
 , decorator, requests, simplejson
 , nose, mock }:
 
diff --git a/pkgs/development/python-modules/dateparser/default.nix b/pkgs/development/python-modules/dateparser/default.nix
index fdc408e1c4c..f6af0855b9f 100644
--- a/pkgs/development/python-modules/dateparser/default.nix
+++ b/pkgs/development/python-modules/dateparser/default.nix
@@ -1,4 +1,4 @@
-{ lib, fetchPypi, buildPythonPackage, isPy3k
+{ lib, fetchPypi, buildPythonPackage
 , nose
 , parameterized
 , mock
diff --git a/pkgs/development/python-modules/debian/default.nix b/pkgs/development/python-modules/debian/default.nix
index 937b6df4229..e4cd21bce4a 100644
--- a/pkgs/development/python-modules/debian/default.nix
+++ b/pkgs/development/python-modules/debian/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi
+{ buildPythonPackage, fetchPypi
 , chardet, six}:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/defusedxml/default.nix b/pkgs/development/python-modules/defusedxml/default.nix
index 6426333ed26..32819536500 100644
--- a/pkgs/development/python-modules/defusedxml/default.nix
+++ b/pkgs/development/python-modules/defusedxml/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi }:
+{ buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "defusedxml";
diff --git a/pkgs/development/python-modules/django_tagging/default.nix b/pkgs/development/python-modules/django_tagging/default.nix
index 6b048db90e3..fa06117a644 100644
--- a/pkgs/development/python-modules/django_tagging/default.nix
+++ b/pkgs/development/python-modules/django_tagging/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, django }:
+{ buildPythonPackage, fetchPypi, django }:
 
 buildPythonPackage rec {
   pname = "django-tagging";
diff --git a/pkgs/development/python-modules/dkimpy/default.nix b/pkgs/development/python-modules/dkimpy/default.nix
index dabc3244592..7ce8877bbce 100644
--- a/pkgs/development/python-modules/dkimpy/default.nix
+++ b/pkgs/development/python-modules/dkimpy/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchPypi, openssl, makeWrapper, buildPythonPackage
+{ stdenv, fetchPypi, openssl, buildPythonPackage
 , pytest, dnspython, pynacl, authres, python }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/dugong/default.nix b/pkgs/development/python-modules/dugong/default.nix
index 27b1a3e6122..20f4bc7e0c3 100644
--- a/pkgs/development/python-modules/dugong/default.nix
+++ b/pkgs/development/python-modules/dugong/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, pythonOlder }:
+{ buildPythonPackage, fetchPypi, pythonOlder }:
 
 buildPythonPackage rec {
   pname = "dugong";
diff --git a/pkgs/development/python-modules/ecpy/default.nix b/pkgs/development/python-modules/ecpy/default.nix
index 334778c93aa..97f04828300 100644
--- a/pkgs/development/python-modules/ecpy/default.nix
+++ b/pkgs/development/python-modules/ecpy/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchPypi, buildPythonPackage, isPy3k, hidapi
-, pycrypto, pillow, protobuf, future, ecpy
+, pycrypto, pillow, protobuf, future
 }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/email-validator/default.nix b/pkgs/development/python-modules/email-validator/default.nix
index a0a619a39c8..99859ac1517 100644
--- a/pkgs/development/python-modules/email-validator/default.nix
+++ b/pkgs/development/python-modules/email-validator/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildPythonPackage, fetchPypi, isPy3k, dnspython, idna, ipaddress }:
+{ lib, buildPythonPackage, fetchPypi, isPy3k, dnspython, idna, ipaddress }:
 
 buildPythonPackage rec {
   pname = "email_validator";
diff --git a/pkgs/development/python-modules/faulthandler/default.nix b/pkgs/development/python-modules/faulthandler/default.nix
index a05ac1ba679..c4d600ec994 100644
--- a/pkgs/development/python-modules/faulthandler/default.nix
+++ b/pkgs/development/python-modules/faulthandler/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchPypi, buildPythonPackage, fetchpatch }:
+{ stdenv, fetchPypi, buildPythonPackage }:
 
 buildPythonPackage rec {
   pname = "faulthandler";
diff --git a/pkgs/development/python-modules/feedgen/default.nix b/pkgs/development/python-modules/feedgen/default.nix
index c5ac67106a2..67ff86e8f72 100644
--- a/pkgs/development/python-modules/feedgen/default.nix
+++ b/pkgs/development/python-modules/feedgen/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, fetchurl, dateutil, lxml }:
+{ stdenv, buildPythonPackage, fetchPypi, dateutil, lxml }:
 
 buildPythonPackage rec {
   pname = "feedgen";
diff --git a/pkgs/development/python-modules/flake8-future-import/default.nix b/pkgs/development/python-modules/flake8-future-import/default.nix
index 2612cfde1f5..eaed804245f 100644
--- a/pkgs/development/python-modules/flake8-future-import/default.nix
+++ b/pkgs/development/python-modules/flake8-future-import/default.nix
@@ -1,5 +1,4 @@
-{ lib, fetchFromGitHub, buildPythonPackage, python, flake8, six,
-  fetchurl }:
+{ lib, fetchFromGitHub, buildPythonPackage, flake8, six }:
 
 buildPythonPackage rec {
   pname = "flake8-future-import";
diff --git a/pkgs/development/python-modules/flask-migrate/default.nix b/pkgs/development/python-modules/flask-migrate/default.nix
index f4fc3cf3fa2..89cbdf0fbf8 100644
--- a/pkgs/development/python-modules/flask-migrate/default.nix
+++ b/pkgs/development/python-modules/flask-migrate/default.nix
@@ -1,5 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, isPy3k, python, glibcLocales, flask, flask_sqlalchemy, flask_script, alembic
-}:
+{ stdenv, buildPythonPackage, fetchPypi, isPy3k, glibcLocales, flask, flask_sqlalchemy, flask_script, alembic }:
 
 with stdenv.lib;
 
diff --git a/pkgs/development/python-modules/flit/default.nix b/pkgs/development/python-modules/flit/default.nix
index 17b9d018c39..d9a0682a02e 100644
--- a/pkgs/development/python-modules/flit/default.nix
+++ b/pkgs/development/python-modules/flit/default.nix
@@ -1,7 +1,6 @@
 { lib
 , buildPythonPackage
 , fetchPypi
-, fetchurl
 , isPy3k
 , docutils
 , requests
diff --git a/pkgs/development/python-modules/fpdf/default.nix b/pkgs/development/python-modules/fpdf/default.nix
index c09d54ad555..a528244cb0f 100644
--- a/pkgs/development/python-modules/fpdf/default.nix
+++ b/pkgs/development/python-modules/fpdf/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, writeText, buildPythonPackage, fetchPypi }:
+{ lib, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "fpdf";
diff --git a/pkgs/development/python-modules/ftfy/default.nix b/pkgs/development/python-modules/ftfy/default.nix
index ca1c9a09e4e..d2e806e43b9 100644
--- a/pkgs/development/python-modules/ftfy/default.nix
+++ b/pkgs/development/python-modules/ftfy/default.nix
@@ -4,8 +4,6 @@
 , html5lib
 , wcwidth
 , nose
-, python
-, isPy3k
 }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/gensim/default.nix b/pkgs/development/python-modules/gensim/default.nix
index 3faa6d914d2..1b3ab52c4c3 100644
--- a/pkgs/development/python-modules/gensim/default.nix
+++ b/pkgs/development/python-modules/gensim/default.nix
@@ -5,9 +5,6 @@
 , six
 , scipy
 , smart_open
-, scikitlearn
-, testfixtures
-, unittest2
 }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/graph-tool/2.x.x.nix b/pkgs/development/python-modules/graph-tool/2.x.x.nix
index 7f2c7a58229..aa8050de088 100644
--- a/pkgs/development/python-modules/graph-tool/2.x.x.nix
+++ b/pkgs/development/python-modules/graph-tool/2.x.x.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, python, cairomm, sparsehash, pycairo, autoreconfHook,
-pkgconfig, boost, expat, scipy, numpy, cgal, gmp, mpfr, lndir,
+pkgconfig, boost, expat, scipy, cgal, gmp, mpfr,
 gobjectIntrospection, pygobject3, gtk3, matplotlib, ncurses,
 buildPythonPackage }:
 
diff --git a/pkgs/development/python-modules/h5py/default.nix b/pkgs/development/python-modules/h5py/default.nix
index 144e826b675..2b95b1473cb 100644
--- a/pkgs/development/python-modules/h5py/default.nix
+++ b/pkgs/development/python-modules/h5py/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchPypi, fetchpatch, isPy27, python, buildPythonPackage
+{ stdenv, fetchPypi, isPy27, python, buildPythonPackage
 , numpy, hdf5, cython, six, pkgconfig, unittest2
 , mpi4py ? null, openssh }:
 
diff --git a/pkgs/development/python-modules/hupper/default.nix b/pkgs/development/python-modules/hupper/default.nix
index bbd4760bdf8..5131e64a3c2 100644
--- a/pkgs/development/python-modules/hupper/default.nix
+++ b/pkgs/development/python-modules/hupper/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, python
+{ stdenv, buildPythonPackage, fetchPypi
 , pytest, pytestcov, watchdog, mock
 }:
 
diff --git a/pkgs/development/python-modules/hypchat/default.nix b/pkgs/development/python-modules/hypchat/default.nix
index b7254461183..8337fd2230b 100644
--- a/pkgs/development/python-modules/hypchat/default.nix
+++ b/pkgs/development/python-modules/hypchat/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi
+{ buildPythonPackage, fetchPypi
 , requests, six, dateutil }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/hypothesis/default.nix b/pkgs/development/python-modules/hypothesis/default.nix
index d5ee59ac2d9..88705962627 100644
--- a/pkgs/development/python-modules/hypothesis/default.nix
+++ b/pkgs/development/python-modules/hypothesis/default.nix
@@ -1,6 +1,6 @@
-{ lib, buildPythonPackage, fetchFromGitHub, python
+{ lib, buildPythonPackage, fetchFromGitHub
 , isPy3k, attrs, coverage, enum34
-, doCheck ? true, pytest, pytest_xdist, flake8, flaky, mock
+, doCheck ? true, pytest, pytest_xdist, flaky, mock
 }:
 buildPythonPackage rec {
   # http://hypothesis.readthedocs.org/en/latest/packaging.html
diff --git a/pkgs/development/python-modules/image-match/default.nix b/pkgs/development/python-modules/image-match/default.nix
index 25c3c901a4e..49d1062abc3 100644
--- a/pkgs/development/python-modules/image-match/default.nix
+++ b/pkgs/development/python-modules/image-match/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub, pytestrunner, dask, scikitimage, six }:
+{ stdenv, buildPythonPackage, fetchFromGitHub, pytestrunner, scikitimage }:
 
 buildPythonPackage {
   pname = "image-match";
diff --git a/pkgs/development/python-modules/iowait/default.nix b/pkgs/development/python-modules/iowait/default.nix
index ef2444c0d2f..c67d56b153e 100644
--- a/pkgs/development/python-modules/iowait/default.nix
+++ b/pkgs/development/python-modules/iowait/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi }:
+{ buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "iowait";
diff --git a/pkgs/development/python-modules/ipython/5.nix b/pkgs/development/python-modules/ipython/5.nix
index a91988bd97d..f2066fee2a4 100644
--- a/pkgs/development/python-modules/ipython/5.nix
+++ b/pkgs/development/python-modules/ipython/5.nix
@@ -2,7 +2,6 @@
 , stdenv
 , buildPythonPackage
 , fetchPypi
-, pythonOlder
 # Build dependencies
 , glibcLocales
 # Test dependencies
@@ -13,7 +12,6 @@
 , mock
 # Runtime dependencies
 , backports_shutil_get_terminal_size
-, jedi
 , decorator
 , pathlib2
 , pickleshare
diff --git a/pkgs/development/python-modules/joblib/default.nix b/pkgs/development/python-modules/joblib/default.nix
index 65d1f4f6822..17896a58469 100644
--- a/pkgs/development/python-modules/joblib/default.nix
+++ b/pkgs/development/python-modules/joblib/default.nix
@@ -1,11 +1,8 @@
 { lib
 , buildPythonPackage
 , fetchPypi
-, nose
 , sphinx
 , numpydoc
-, isPy3k
-, stdenv
 , pytest
 }:
 
diff --git a/pkgs/development/python-modules/jsmin/default.nix b/pkgs/development/python-modules/jsmin/default.nix
index 3a6d69cc829..f11fccb086b 100644
--- a/pkgs/development/python-modules/jsmin/default.nix
+++ b/pkgs/development/python-modules/jsmin/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildPythonPackage, fetchPypi }:
+{ lib, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "jsmin";
diff --git a/pkgs/development/python-modules/jupyter_core/default.nix b/pkgs/development/python-modules/jupyter_core/default.nix
index c934d24dab7..a6a955507a7 100644
--- a/pkgs/development/python-modules/jupyter_core/default.nix
+++ b/pkgs/development/python-modules/jupyter_core/default.nix
@@ -1,5 +1,4 @@
 { lib
-, python
 , buildPythonPackage
 , fetchPypi
 , ipython
diff --git a/pkgs/development/python-modules/jupyterhub/default.nix b/pkgs/development/python-modules/jupyterhub/default.nix
index dbd2e36b7b8..8598654e206 100644
--- a/pkgs/development/python-modules/jupyterhub/default.nix
+++ b/pkgs/development/python-modules/jupyterhub/default.nix
@@ -1,5 +1,4 @@
 { lib
-, python
 , buildPythonPackage
 , fetchPypi
 , fetchzip
@@ -13,7 +12,6 @@
 , traitlets
 , requests
 , pythonOlder
-, nodejs-8_x
 , nodePackages
 }:
 
diff --git a/pkgs/development/python-modules/kaitaistruct/default.nix b/pkgs/development/python-modules/kaitaistruct/default.nix
index 19169e88b12..a1e795421b0 100644
--- a/pkgs/development/python-modules/kaitaistruct/default.nix
+++ b/pkgs/development/python-modules/kaitaistruct/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, kaitaistruct, buildPythonPackage, fetchPypi }:
+{ stdenv, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "kaitaistruct";
diff --git a/pkgs/development/python-modules/keras/default.nix b/pkgs/development/python-modules/keras/default.nix
index be59a112be7..3b221238f3a 100644
--- a/pkgs/development/python-modules/keras/default.nix
+++ b/pkgs/development/python-modules/keras/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildPythonPackage, fetchPypi
+{ stdenv, buildPythonPackage, fetchPypi
 , pytest, pytestcov, pytestpep8, pytest_xdist
 , six, numpy, scipy, pyyaml, h5py
 }:
diff --git a/pkgs/development/python-modules/ldap/default.nix b/pkgs/development/python-modules/ldap/default.nix
index 95672600a30..17a6b158d3f 100644
--- a/pkgs/development/python-modules/ldap/default.nix
+++ b/pkgs/development/python-modules/ldap/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, fetchPypi
+{ buildPythonPackage, fetchPypi
 , pyasn1, pyasn1-modules, pytest
 , openldap, cyrus_sasl }:
 
diff --git a/pkgs/development/python-modules/ldappool/default.nix b/pkgs/development/python-modules/ldappool/default.nix
index 58ca72a3dc9..02d10b832ff 100644
--- a/pkgs/development/python-modules/ldappool/default.nix
+++ b/pkgs/development/python-modules/ldappool/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, fetchPypi, isPy3k
+{ lib, buildPythonPackage, fetchPypi
 , pbr, ldap, fixtures, testresources, testtools }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/libarcus/default.nix b/pkgs/development/python-modules/libarcus/default.nix
index 2fc66e810d0..fc58c6ca6a1 100644
--- a/pkgs/development/python-modules/libarcus/default.nix
+++ b/pkgs/development/python-modules/libarcus/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, lib, buildPythonPackage, fetchFromGitHub
-, python, cmake, sip, protobuf, pythonOlder }:
+{ stdenv, buildPythonPackage, fetchFromGitHub
+, cmake, sip, protobuf, pythonOlder }:
 
 buildPythonPackage rec {
   pname = "libarcus";
diff --git a/pkgs/development/python-modules/libgpuarray/default.nix b/pkgs/development/python-modules/libgpuarray/default.nix
index 14e83584678..ef01fde2daa 100644
--- a/pkgs/development/python-modules/libgpuarray/default.nix
+++ b/pkgs/development/python-modules/libgpuarray/default.nix
@@ -8,7 +8,6 @@
 , six
 , nose
 , Mako
-, python
 , cudaSupport ? false, cudatoolkit , nvidia_x11
 , openclSupport ? true, ocl-icd, clblas
 }:
diff --git a/pkgs/development/python-modules/libversion/default.nix b/pkgs/development/python-modules/libversion/default.nix
index cf0a1a865a1..75e55944e98 100644
--- a/pkgs/development/python-modules/libversion/default.nix
+++ b/pkgs/development/python-modules/libversion/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, python, pkgconfig, libversion, pythonOlder }:
+{ stdenv, buildPythonPackage, fetchPypi, pkgconfig, libversion, pythonOlder }:
 
 buildPythonPackage rec {
   pname = "libversion";
diff --git a/pkgs/development/python-modules/libvirt/default.nix b/pkgs/development/python-modules/libvirt/default.nix
index a99d4542ba5..26b42020fc3 100644
--- a/pkgs/development/python-modules/libvirt/default.nix
+++ b/pkgs/development/python-modules/libvirt/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchgit, python, pkgconfig, lxml, libvirt, nose }:
+{ stdenv, buildPythonPackage, fetchgit, pkgconfig, lxml, libvirt, nose }:
 
 buildPythonPackage rec {
   pname = "libvirt";
diff --git a/pkgs/development/python-modules/linode-api/default.nix b/pkgs/development/python-modules/linode-api/default.nix
index ad6b938c988..4689050ba6c 100644
--- a/pkgs/development/python-modules/linode-api/default.nix
+++ b/pkgs/development/python-modules/linode-api/default.nix
@@ -1,7 +1,6 @@
 { stdenv,
   buildPythonPackage,
   fetchFromGitHub,
-  isPy3k,
   pythonOlder,
   lib,
   requests,
diff --git a/pkgs/development/python-modules/lmtpd/default.nix b/pkgs/development/python-modules/lmtpd/default.nix
index c9b9b489613..bc91139728b 100644
--- a/pkgs/development/python-modules/lmtpd/default.nix
+++ b/pkgs/development/python-modules/lmtpd/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, fetchFromGitHub }:
+{ stdenv, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "lmtpd";
diff --git a/pkgs/development/python-modules/marionette-harness/default.nix b/pkgs/development/python-modules/marionette-harness/default.nix
index 4a96ce8ad05..ff1a6e49b01 100644
--- a/pkgs/development/python-modules/marionette-harness/default.nix
+++ b/pkgs/development/python-modules/marionette-harness/default.nix
@@ -1,5 +1,4 @@
 { lib
-, stdenv
 , buildPythonPackage
 , fetchPypi
 , isPy3k
diff --git a/pkgs/development/python-modules/marionette-harness/manifestparser.nix b/pkgs/development/python-modules/marionette-harness/manifestparser.nix
index 5d52b52ac7f..7316526aa28 100644
--- a/pkgs/development/python-modules/marionette-harness/manifestparser.nix
+++ b/pkgs/development/python-modules/marionette-harness/manifestparser.nix
@@ -1,5 +1,4 @@
 { lib
-, stdenv
 , buildPythonPackage
 , fetchPypi
 , isPy3k
diff --git a/pkgs/development/python-modules/marionette-harness/marionette_driver.nix b/pkgs/development/python-modules/marionette-harness/marionette_driver.nix
index d27637874af..b6d761f077c 100644
--- a/pkgs/development/python-modules/marionette-harness/marionette_driver.nix
+++ b/pkgs/development/python-modules/marionette-harness/marionette_driver.nix
@@ -1,5 +1,4 @@
 { lib
-, stdenv
 , buildPythonPackage
 , fetchPypi
 , isPy3k
diff --git a/pkgs/development/python-modules/marionette-harness/mozcrash.nix b/pkgs/development/python-modules/marionette-harness/mozcrash.nix
index ccd0eb6cc9f..3f7710acb3c 100644
--- a/pkgs/development/python-modules/marionette-harness/mozcrash.nix
+++ b/pkgs/development/python-modules/marionette-harness/mozcrash.nix
@@ -1,5 +1,4 @@
 { lib
-, stdenv
 , buildPythonPackage
 , fetchPypi
 , mozfile
diff --git a/pkgs/development/python-modules/marionette-harness/mozdevice.nix b/pkgs/development/python-modules/marionette-harness/mozdevice.nix
index 8569d9287ac..491069cd87f 100644
--- a/pkgs/development/python-modules/marionette-harness/mozdevice.nix
+++ b/pkgs/development/python-modules/marionette-harness/mozdevice.nix
@@ -1,5 +1,4 @@
 { lib
-, stdenv
 , buildPythonPackage
 , fetchPypi
 , moznetwork
diff --git a/pkgs/development/python-modules/marionette-harness/mozfile.nix b/pkgs/development/python-modules/marionette-harness/mozfile.nix
index 7bd14f2d10c..34350dd4821 100644
--- a/pkgs/development/python-modules/marionette-harness/mozfile.nix
+++ b/pkgs/development/python-modules/marionette-harness/mozfile.nix
@@ -1,5 +1,4 @@
 { lib
-, stdenv
 , buildPythonPackage
 , fetchPypi
 }:
diff --git a/pkgs/development/python-modules/marionette-harness/mozhttpd.nix b/pkgs/development/python-modules/marionette-harness/mozhttpd.nix
index 1d1be733f99..6862967e420 100644
--- a/pkgs/development/python-modules/marionette-harness/mozhttpd.nix
+++ b/pkgs/development/python-modules/marionette-harness/mozhttpd.nix
@@ -1,5 +1,4 @@
 { lib
-, stdenv
 , buildPythonPackage
 , fetchPypi
 , moznetwork
diff --git a/pkgs/development/python-modules/marionette-harness/mozlog.nix b/pkgs/development/python-modules/marionette-harness/mozlog.nix
index dfe91309ea4..bc4b9e91465 100644
--- a/pkgs/development/python-modules/marionette-harness/mozlog.nix
+++ b/pkgs/development/python-modules/marionette-harness/mozlog.nix
@@ -1,5 +1,4 @@
 { lib
-, stdenv
 , buildPythonPackage
 , fetchPypi
 , isPy3k
diff --git a/pkgs/development/python-modules/marionette-harness/moznetwork.nix b/pkgs/development/python-modules/marionette-harness/moznetwork.nix
index a6561d3e07a..3901f7c310d 100644
--- a/pkgs/development/python-modules/marionette-harness/moznetwork.nix
+++ b/pkgs/development/python-modules/marionette-harness/moznetwork.nix
@@ -1,5 +1,4 @@
 { lib
-, stdenv
 , buildPythonPackage
 , fetchPypi
 , mozlog
diff --git a/pkgs/development/python-modules/marionette-harness/mozprocess.nix b/pkgs/development/python-modules/marionette-harness/mozprocess.nix
index c1e53443260..e8130e8038f 100644
--- a/pkgs/development/python-modules/marionette-harness/mozprocess.nix
+++ b/pkgs/development/python-modules/marionette-harness/mozprocess.nix
@@ -1,5 +1,4 @@
 { lib
-, stdenv
 , buildPythonPackage
 , fetchPypi
 , mozinfo
diff --git a/pkgs/development/python-modules/marionette-harness/mozprofile.nix b/pkgs/development/python-modules/marionette-harness/mozprofile.nix
index c94acdd3ba5..3620248904c 100644
--- a/pkgs/development/python-modules/marionette-harness/mozprofile.nix
+++ b/pkgs/development/python-modules/marionette-harness/mozprofile.nix
@@ -1,5 +1,4 @@
 { lib
-, stdenv
 , buildPythonPackage
 , fetchPypi
 , mozlog
diff --git a/pkgs/development/python-modules/marionette-harness/mozrunner.nix b/pkgs/development/python-modules/marionette-harness/mozrunner.nix
index e9f6177cfa1..324c7c6c2d2 100644
--- a/pkgs/development/python-modules/marionette-harness/mozrunner.nix
+++ b/pkgs/development/python-modules/marionette-harness/mozrunner.nix
@@ -1,5 +1,4 @@
 { lib
-, stdenv
 , buildPythonPackage
 , fetchPypi
 , mozdevice
diff --git a/pkgs/development/python-modules/marionette-harness/moztest.nix b/pkgs/development/python-modules/marionette-harness/moztest.nix
index d1c799c95de..2ff50e1fa92 100644
--- a/pkgs/development/python-modules/marionette-harness/moztest.nix
+++ b/pkgs/development/python-modules/marionette-harness/moztest.nix
@@ -1,5 +1,4 @@
 { lib
-, stdenv
 , buildPythonPackage
 , fetchPypi
 , mozinfo
diff --git a/pkgs/development/python-modules/marionette-harness/mozversion.nix b/pkgs/development/python-modules/marionette-harness/mozversion.nix
index c9eb12bd52b..dbe3cb4bc2d 100644
--- a/pkgs/development/python-modules/marionette-harness/mozversion.nix
+++ b/pkgs/development/python-modules/marionette-harness/mozversion.nix
@@ -1,5 +1,4 @@
 { lib
-, stdenv
 , buildPythonPackage
 , fetchPypi
 , mozlog
diff --git a/pkgs/development/python-modules/moto/default.nix b/pkgs/development/python-modules/moto/default.nix
index e4b2bdefad2..cfb70724210 100644
--- a/pkgs/development/python-modules/moto/default.nix
+++ b/pkgs/development/python-modules/moto/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, jinja2, werkzeug, flask
+{ buildPythonPackage, fetchPypi, jinja2, werkzeug, flask
 , requests, pytz, backports_tempfile, cookies, jsondiff, botocore, aws-xray-sdk, docker, responses
 , six, boto, httpretty, xmltodict, nose, sure, boto3, freezegun, dateutil, mock, pyaml }:
 
diff --git a/pkgs/development/python-modules/mrbob/default.nix b/pkgs/development/python-modules/mrbob/default.nix
index 3f974872b95..6dbfa1fae60 100644
--- a/pkgs/development/python-modules/mrbob/default.nix
+++ b/pkgs/development/python-modules/mrbob/default.nix
@@ -1,5 +1,5 @@
 { buildPythonPackage, stdenv, glibcLocales, mock, nose, isPy3k, argparse, jinja2, six
-, fetchPypi, lib
+, fetchPypi
 }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/murmurhash/default.nix b/pkgs/development/python-modules/murmurhash/default.nix
index f689bc2ff49..a3a9096a335 100644
--- a/pkgs/development/python-modules/murmurhash/default.nix
+++ b/pkgs/development/python-modules/murmurhash/default.nix
@@ -2,7 +2,6 @@
 , buildPythonPackage
 , fetchPypi
 , cython
-, python
 }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/nbconvert/default.nix b/pkgs/development/python-modules/nbconvert/default.nix
index dfa87c843ff..b167b7f427c 100644
--- a/pkgs/development/python-modules/nbconvert/default.nix
+++ b/pkgs/development/python-modules/nbconvert/default.nix
@@ -13,7 +13,6 @@
 , testpath
 , jupyter_core
 , nbformat
-, nbconvert
 , ipykernel
 , pandocfilters
 , tornado
diff --git a/pkgs/development/python-modules/ncclient/default.nix b/pkgs/development/python-modules/ncclient/default.nix
index 4cc5769d8d8..27fc7d11e75 100644
--- a/pkgs/development/python-modules/ncclient/default.nix
+++ b/pkgs/development/python-modules/ncclient/default.nix
@@ -5,7 +5,6 @@
 , lxml
 , libxml2
 , libxslt
-, pytest
 , nose
 , rednose
 }:
diff --git a/pkgs/development/python-modules/netdisco/default.nix b/pkgs/development/python-modules/netdisco/default.nix
index af7e4dde59e..e60233c3590 100644
--- a/pkgs/development/python-modules/netdisco/default.nix
+++ b/pkgs/development/python-modules/netdisco/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, isPy3k, fetchFromGitHub, fetchpatch, requests, zeroconf, netifaces, pytest }:
+{ stdenv, buildPythonPackage, isPy3k, fetchFromGitHub, requests, zeroconf, netifaces, pytest }:
 
 buildPythonPackage rec {
   pname = "netdisco";
diff --git a/pkgs/development/python-modules/nltk/default.nix b/pkgs/development/python-modules/nltk/default.nix
index 9645e54f7ec..56edc44bce7 100644
--- a/pkgs/development/python-modules/nltk/default.nix
+++ b/pkgs/development/python-modules/nltk/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, buildPythonPackage, isPy33, lib, six, pythonAtLeast, pythonOlder }:
+{ fetchurl, buildPythonPackage, lib, six, pythonAtLeast, pythonOlder }:
 
 buildPythonPackage rec {
   version = "3.2.5";
diff --git a/pkgs/development/python-modules/numpy/default.nix b/pkgs/development/python-modules/numpy/default.nix
index d6531eda2ef..d9e884dabbe 100644
--- a/pkgs/development/python-modules/numpy/default.nix
+++ b/pkgs/development/python-modules/numpy/default.nix
@@ -1,4 +1,4 @@
-{lib, fetchPypi, python, buildPythonPackage, isPy27, isPyPy, gfortran, nose, blas, hostPlatform }:
+{lib, fetchPypi, python, buildPythonPackage, isPyPy, gfortran, nose, blas, hostPlatform }:
 
 buildPythonPackage rec {
   pname = "numpy";
diff --git a/pkgs/development/python-modules/ovh/default.nix b/pkgs/development/python-modules/ovh/default.nix
index 3f37940ed8a..474609220cf 100644
--- a/pkgs/development/python-modules/ovh/default.nix
+++ b/pkgs/development/python-modules/ovh/default.nix
@@ -1,9 +1,6 @@
 { lib
 , buildPythonPackage
 , fetchPypi
-, requests
-, nose
-, mock
 }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/pandas/0.17.1.nix b/pkgs/development/python-modules/pandas/0.17.1.nix
index 2c0a2c44f6e..e4973d0d6e3 100644
--- a/pkgs/development/python-modules/pandas/0.17.1.nix
+++ b/pkgs/development/python-modules/pandas/0.17.1.nix
@@ -1,8 +1,6 @@
 { buildPythonPackage
 , fetchPypi
-, python
 , stdenv
-, fetchurl
 , pytest
 , glibcLocales
 , cython
diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix
index 08fdddb7346..fc75e5803af 100644
--- a/pkgs/development/python-modules/pandas/default.nix
+++ b/pkgs/development/python-modules/pandas/default.nix
@@ -2,7 +2,6 @@
 , fetchPypi
 , python
 , stdenv
-, fetchurl
 , pytest
 , glibcLocales
 , cython
diff --git a/pkgs/development/python-modules/parse-type/default.nix b/pkgs/development/python-modules/parse-type/default.nix
index ac150af4b78..34573626bac 100644
--- a/pkgs/development/python-modules/parse-type/default.nix
+++ b/pkgs/development/python-modules/parse-type/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchPypi, fetchpatch
+{ stdenv, fetchPypi
 , buildPythonPackage, pythonOlder
 , pytest, pytestrunner
 , parse, six, enum34
diff --git a/pkgs/development/python-modules/parse/default.nix b/pkgs/development/python-modules/parse/default.nix
index 18cc23338bf..4092f5e1c4f 100644
--- a/pkgs/development/python-modules/parse/default.nix
+++ b/pkgs/development/python-modules/parse/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchPypi, fetchpatch
+{ stdenv, fetchPypi
 , buildPythonPackage, python
 }:
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/passlib/default.nix b/pkgs/development/python-modules/passlib/default.nix
index 165de7bd2ba..24539c7bbce 100644
--- a/pkgs/development/python-modules/passlib/default.nix
+++ b/pkgs/development/python-modules/passlib/default.nix
@@ -1,5 +1,4 @@
-{ lib
-, buildPythonPackage
+{ buildPythonPackage
 , fetchPypi
 , nose
 , bcrypt
diff --git a/pkgs/development/python-modules/pelican/default.nix b/pkgs/development/python-modules/pelican/default.nix
index 2d1f707a8eb..1ee93c753d8 100644
--- a/pkgs/development/python-modules/pelican/default.nix
+++ b/pkgs/development/python-modules/pelican/default.nix
@@ -1,5 +1,5 @@
 { stdenv, buildPythonPackage, fetchFromGitHub
-, glibcLocales, pandoc, git
+, glibcLocales, git
 , mock, nose, markdown, lxml, typogrify
 , jinja2, pygments, docutils, pytz, unidecode, six, dateutil, feedgenerator
 , blinker, pillow, beautifulsoup4, markupsafe }:
diff --git a/pkgs/development/python-modules/persistent/default.nix b/pkgs/development/python-modules/persistent/default.nix
index b861797c4a8..4f2e7f3ca84 100644
--- a/pkgs/development/python-modules/persistent/default.nix
+++ b/pkgs/development/python-modules/persistent/default.nix
@@ -1,7 +1,6 @@
 { buildPythonPackage
 , fetchPypi
 , zope_interface
-, pkgs
 }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/plaster-pastedeploy/default.nix b/pkgs/development/python-modules/plaster-pastedeploy/default.nix
index 3f90e6b2da7..5675be32397 100644
--- a/pkgs/development/python-modules/plaster-pastedeploy/default.nix
+++ b/pkgs/development/python-modules/plaster-pastedeploy/default.nix
@@ -1,4 +1,4 @@
-{ buildPythonPackage, fetchPypi, python
+{ buildPythonPackage, fetchPypi
 , plaster, PasteDeploy
 , pytest, pytestcov
 }:
diff --git a/pkgs/development/python-modules/plaster/default.nix b/pkgs/development/python-modules/plaster/default.nix
index 8c3de8bd035..82aaebb1003 100644
--- a/pkgs/development/python-modules/plaster/default.nix
+++ b/pkgs/development/python-modules/plaster/default.nix
@@ -1,4 +1,4 @@
-{ buildPythonPackage, fetchPypi, python
+{ buildPythonPackage, fetchPypi
 , pytest, pytestcov
 }:
 
diff --git a/pkgs/development/python-modules/pluggy/default.nix b/pkgs/development/python-modules/pluggy/default.nix
index 0fbfa5108c1..2a6996c628e 100644
--- a/pkgs/development/python-modules/pluggy/default.nix
+++ b/pkgs/development/python-modules/pluggy/default.nix
@@ -1,7 +1,6 @@
 { buildPythonPackage
 , lib
 , fetchPypi
-, pytest
 }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/plumbum/default.nix b/pkgs/development/python-modules/plumbum/default.nix
index 5269ecd5d8b..2c6eb7e5fbf 100644
--- a/pkgs/development/python-modules/plumbum/default.nix
+++ b/pkgs/development/python-modules/plumbum/default.nix
@@ -1,5 +1,4 @@
-{ lib
-, buildPythonPackage
+{ buildPythonPackage
 , fetchPypi
 , pytest
 }:
diff --git a/pkgs/development/python-modules/poppler-qt5/default.nix b/pkgs/development/python-modules/poppler-qt5/default.nix
index 0ae689034a3..2b00a007f90 100644
--- a/pkgs/development/python-modules/poppler-qt5/default.nix
+++ b/pkgs/development/python-modules/poppler-qt5/default.nix
@@ -1,5 +1,5 @@
 { buildPythonPackage, fetchPypi, stdenv, sip, qtbase, pyqt5, poppler, pkgconfig, fetchpatch
-, python, substituteAll
+, substituteAll
 }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/powerline/default.nix b/pkgs/development/python-modules/powerline/default.nix
index f51c6989c01..841e003bc89 100644
--- a/pkgs/development/python-modules/powerline/default.nix
+++ b/pkgs/development/python-modules/powerline/default.nix
@@ -1,9 +1,6 @@
 { lib
 , fetchurl
 , buildPythonPackage
-, git
-, mercurial
-, bazaar
 , psutil
 , pygit2
 }:
diff --git a/pkgs/development/python-modules/progressbar2/default.nix b/pkgs/development/python-modules/progressbar2/default.nix
index 212c06cc942..18fb14c3aa9 100644
--- a/pkgs/development/python-modules/progressbar2/default.nix
+++ b/pkgs/development/python-modules/progressbar2/default.nix
@@ -2,7 +2,6 @@
 , python
 , buildPythonPackage
 , fetchFromGitHub
-, isPy3k
 , pytest
 , python-utils
 , sphinx
diff --git a/pkgs/development/python-modules/prometheus_client/default.nix b/pkgs/development/python-modules/prometheus_client/default.nix
index eaf353af082..f6b2bfa939c 100644
--- a/pkgs/development/python-modules/prometheus_client/default.nix
+++ b/pkgs/development/python-modules/prometheus_client/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, pytest }:
+{ lib, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "prometheus_client";
diff --git a/pkgs/development/python-modules/psutil/default.nix b/pkgs/development/python-modules/psutil/default.nix
index 7fbdfb7c33e..84fe2f69554 100644
--- a/pkgs/development/python-modules/psutil/default.nix
+++ b/pkgs/development/python-modules/psutil/default.nix
@@ -2,7 +2,6 @@
 , buildPythonPackage
 , fetchPypi
 , darwin
-, mock
 }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/pyGithub/default.nix b/pkgs/development/python-modules/pyGithub/default.nix
index 6adc1e7ec04..be409e348ea 100644
--- a/pkgs/development/python-modules/pyGithub/default.nix
+++ b/pkgs/development/python-modules/pyGithub/default.nix
@@ -1,5 +1,4 @@
 { stdenv, fetchFromGitHub
-, cacert
 , buildPythonPackage, python-jose, pyjwt }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/pyaml/default.nix b/pkgs/development/python-modules/pyaml/default.nix
index 5fd1be7c15c..fd1866d22f4 100644
--- a/pkgs/development/python-modules/pyaml/default.nix
+++ b/pkgs/development/python-modules/pyaml/default.nix
@@ -3,7 +3,6 @@
 , fetchPypi
 , pyyaml
 , unidecode
-, python
 }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/pycaption/default.nix b/pkgs/development/python-modules/pycaption/default.nix
index 845630e514f..d4ed6088409 100644
--- a/pkgs/development/python-modules/pycaption/default.nix
+++ b/pkgs/development/python-modules/pycaption/default.nix
@@ -1,5 +1,5 @@
 { lib, fetchpatch
-, buildPythonPackage, fetchPypi, isPy3k, pythonOlder
+, buildPythonPackage, fetchPypi, isPy3k
 , beautifulsoup4, lxml, cssutils, future, enum34, six
 }:
 
diff --git a/pkgs/development/python-modules/pycollada/default.nix b/pkgs/development/python-modules/pycollada/default.nix
index b074f9f4934..23ed4917cc5 100644
--- a/pkgs/development/python-modules/pycollada/default.nix
+++ b/pkgs/development/python-modules/pycollada/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchPypi, buildPythonPackage, numpy, isPy3k, dateutil }:
+{ stdenv, fetchPypi, buildPythonPackage, numpy, dateutil }:
 
 buildPythonPackage rec {
   pname = "pycollada";
diff --git a/pkgs/development/python-modules/pycrypto/default.nix b/pkgs/development/python-modules/pycrypto/default.nix
index af975e333f0..e7858888d36 100644
--- a/pkgs/development/python-modules/pycrypto/default.nix
+++ b/pkgs/development/python-modules/pycrypto/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, buildPythonPackage, pycryptodome }:
+{ buildPythonPackage, pycryptodome }:
 
 # This is a dummy package providing the drop-in replacement pycryptodome.
 # https://github.com/NixOS/nixpkgs/issues/21671
diff --git a/pkgs/development/python-modules/pycryptodome/default.nix b/pkgs/development/python-modules/pycryptodome/default.nix
index b4ef42cb22a..35041f8447b 100644
--- a/pkgs/development/python-modules/pycryptodome/default.nix
+++ b/pkgs/development/python-modules/pycryptodome/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchPypi, python, buildPythonPackage, gmp }:
+{ stdenv, fetchPypi, buildPythonPackage }:
 
 buildPythonPackage rec {
   version = "3.6.2";
diff --git a/pkgs/development/python-modules/pygame/default.nix b/pkgs/development/python-modules/pygame/default.nix
index 5a4a81f13ac..b6c9ae5e8ba 100644
--- a/pkgs/development/python-modules/pygame/default.nix
+++ b/pkgs/development/python-modules/pygame/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, buildPythonPackage, python, smpeg, libX11
+{ stdenv, lib, fetchurl, buildPythonPackage, python, libX11
 , SDL, SDL_image, SDL_mixer, SDL_ttf, libpng, libjpeg, portmidi, freetype
 }:
 
diff --git a/pkgs/development/python-modules/pygame_sdl2/default.nix b/pkgs/development/python-modules/pygame_sdl2/default.nix
index 08c266da696..916bf7f692d 100644
--- a/pkgs/development/python-modules/pygame_sdl2/default.nix
+++ b/pkgs/development/python-modules/pygame_sdl2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, pkgs, buildPythonPackage, fetchurl, isPy27, fetchpatch
+{ stdenv, buildPythonPackage, fetchurl, isPy27, fetchpatch
 , cython, SDL2, SDL2_image, SDL2_ttf, SDL2_mixer, libjpeg, libpng }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/pygccxml/default.nix b/pkgs/development/python-modules/pygccxml/default.nix
index 5271677dc1e..d4c46d6b835 100644
--- a/pkgs/development/python-modules/pygccxml/default.nix
+++ b/pkgs/development/python-modules/pygccxml/default.nix
@@ -1,5 +1,5 @@
 { stdenv, castxml, fetchFromGitHub, buildPythonPackage,
-llvmPackages, clang }:
+llvmPackages }:
 buildPythonPackage rec {
   pname = "pygccxml";
   version = "1.9.1";
diff --git a/pkgs/development/python-modules/pygobject/3.nix b/pkgs/development/python-modules/pygobject/3.nix
index 524fb4af61c..c6264f08de8 100644
--- a/pkgs/development/python-modules/pygobject/3.nix
+++ b/pkgs/development/python-modules/pygobject/3.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, buildPythonPackage, python, pkgconfig, glib, gobjectIntrospection, pycairo, cairo, which, ncurses}:
+{ stdenv, fetchurl, buildPythonPackage, pkgconfig, glib, gobjectIntrospection, pycairo, cairo, which, ncurses}:
 
 buildPythonPackage rec {
   major = "3.26";
diff --git a/pkgs/development/python-modules/pymc3/default.nix b/pkgs/development/python-modules/pymc3/default.nix
index a0dd6113b75..5af6ef99228 100644
--- a/pkgs/development/python-modules/pymc3/default.nix
+++ b/pkgs/development/python-modules/pymc3/default.nix
@@ -12,7 +12,6 @@
 , pytest
 , nose
 , parameterized
-, matplotlib
 }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/pymvglive/default.nix b/pkgs/development/python-modules/pymvglive/default.nix
index 1263c498a46..3b7011fa748 100644
--- a/pkgs/development/python-modules/pymvglive/default.nix
+++ b/pkgs/development/python-modules/pymvglive/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, requests }:
+{ lib, buildPythonPackage, fetchPypi, requests }:
 
 buildPythonPackage rec {
   pname = "PyMVGLive";
diff --git a/pkgs/development/python-modules/pynacl/default.nix b/pkgs/development/python-modules/pynacl/default.nix
index bceb2b50cc5..463cd8044e1 100644
--- a/pkgs/development/python-modules/pynacl/default.nix
+++ b/pkgs/development/python-modules/pynacl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub, pytest, coverage, libsodium, cffi, six, hypothesis}:
+{ stdenv, buildPythonPackage, fetchFromGitHub, pytest, libsodium, cffi, six, hypothesis}:
 
 buildPythonPackage rec {
   pname = "pynacl";
diff --git a/pkgs/development/python-modules/pyogg/default.nix b/pkgs/development/python-modules/pyogg/default.nix
index 08fc8712795..09b7f386130 100644
--- a/pkgs/development/python-modules/pyogg/default.nix
+++ b/pkgs/development/python-modules/pyogg/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchPypi, buildPythonPackage, fetchurl, libvorbis, flac, libogg, libopus, opusfile }:
+{ stdenv, lib, fetchPypi, buildPythonPackage, libvorbis, flac, libogg, libopus, opusfile }:
 
 buildPythonPackage rec {
     pname = "PyOgg";
diff --git a/pkgs/development/python-modules/pyowm/default.nix b/pkgs/development/python-modules/pyowm/default.nix
index 8175ef2b172..55f96416efd 100644
--- a/pkgs/development/python-modules/pyowm/default.nix
+++ b/pkgs/development/python-modules/pyowm/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, requests }:
+{ lib, buildPythonPackage, fetchPypi, requests }:
 
 buildPythonPackage rec {
   pname = "pyowm";
diff --git a/pkgs/development/python-modules/pyqt/5.x.nix b/pkgs/development/python-modules/pyqt/5.x.nix
index ebad81f809b..6a3e3e66e2c 100644
--- a/pkgs/development/python-modules/pyqt/5.x.nix
+++ b/pkgs/development/python-modules/pyqt/5.x.nix
@@ -1,4 +1,4 @@
-{ lib, fetchurl, fetchpatch, pythonPackages, pkgconfig, makeWrapper
+{ lib, fetchurl, fetchpatch, pythonPackages, pkgconfig
 , qmake, lndir, qtbase, qtsvg, qtwebkit, qtwebengine, dbus
 , withWebSockets ? false, qtwebsockets
 , withConnectivity ? false, qtconnectivity
diff --git a/pkgs/development/python-modules/pysc2/default.nix b/pkgs/development/python-modules/pysc2/default.nix
index 89799988fa1..280981ab2c2 100644
--- a/pkgs/development/python-modules/pysc2/default.nix
+++ b/pkgs/development/python-modules/pysc2/default.nix
@@ -4,7 +4,6 @@
 , absl-py
 , enum34
 , future
-, futures
 , mock
 , mpyq
 , numpy
diff --git a/pkgs/development/python-modules/pysdl2/default.nix b/pkgs/development/python-modules/pysdl2/default.nix
index 6681b1b199a..1ffc546cfa1 100644
--- a/pkgs/development/python-modules/pysdl2/default.nix
+++ b/pkgs/development/python-modules/pysdl2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchPypi, buildPythonPackage, fetchurl, SDL2, SDL2_ttf, SDL2_image, SDL2_gfx, SDL2_mixer, pyopengl }:
+{ stdenv, lib, fetchPypi, buildPythonPackage, SDL2, SDL2_ttf, SDL2_image, SDL2_gfx, SDL2_mixer }:
 
 buildPythonPackage rec {
   pname = "PySDL2";
diff --git a/pkgs/development/python-modules/pyside/default.nix b/pkgs/development/python-modules/pyside/default.nix
index 288b141d32e..ab46c726f6c 100644
--- a/pkgs/development/python-modules/pyside/default.nix
+++ b/pkgs/development/python-modules/pyside/default.nix
@@ -1,4 +1,4 @@
-{ lib, fetchurl, cmake, python, buildPythonPackage, pysideGeneratorrunner, pysideShiboken, qt4 }:
+{ lib, fetchurl, cmake, buildPythonPackage, pysideGeneratorrunner, pysideShiboken, qt4 }:
 
 # This derivation provides a Python module and should therefore be called via `python-packages.nix`.
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/pytest-cram/default.nix b/pkgs/development/python-modules/pytest-cram/default.nix
index 4555479af43..3ca4f832c8c 100644
--- a/pkgs/development/python-modules/pytest-cram/default.nix
+++ b/pkgs/development/python-modules/pytest-cram/default.nix
@@ -1,4 +1,4 @@
-{lib, buildPythonPackage, fetchPypi, pytest, cram, bash, writeText}:
+{lib, buildPythonPackage, fetchPypi, pytest, cram, bash}:
 
 buildPythonPackage rec {
   version = "0.2.0";
diff --git a/pkgs/development/python-modules/pytest-flake8/default.nix b/pkgs/development/python-modules/pytest-flake8/default.nix
index c2d205f2833..101594750fd 100644
--- a/pkgs/development/python-modules/pytest-flake8/default.nix
+++ b/pkgs/development/python-modules/pytest-flake8/default.nix
@@ -1,4 +1,4 @@
-{lib, buildPythonPackage, fetchPypi, fetchpatch, pytest, flake8}:
+{lib, buildPythonPackage, fetchPypi, pytest, flake8}:
 
 buildPythonPackage rec {
   pname = "pytest-flake8";
diff --git a/pkgs/development/python-modules/pytest-mock/default.nix b/pkgs/development/python-modules/pytest-mock/default.nix
index c12d4b8add0..163063ae57f 100644
--- a/pkgs/development/python-modules/pytest-mock/default.nix
+++ b/pkgs/development/python-modules/pytest-mock/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, fetchPypi, fetchpatch, isPy3k, pytest, mock, setuptools_scm }:
+{ lib, buildPythonPackage, fetchPypi, isPy3k, pytest, mock, setuptools_scm }:
 
 buildPythonPackage rec {
   pname = "pytest-mock";
diff --git a/pkgs/development/python-modules/pytest-xdist/default.nix b/pkgs/development/python-modules/pytest-xdist/default.nix
index 38d34a95854..84f337e1b83 100644
--- a/pkgs/development/python-modules/pytest-xdist/default.nix
+++ b/pkgs/development/python-modules/pytest-xdist/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchPypi, buildPythonPackage, isPy3k, execnet, pytest, setuptools_scm, pytest-forked }:
+{ stdenv, fetchPypi, buildPythonPackage, execnet, pytest, setuptools_scm, pytest-forked }:
 
 buildPythonPackage rec {
   pname = "pytest-xdist";
diff --git a/pkgs/development/python-modules/python-oauth2/default.nix b/pkgs/development/python-modules/python-oauth2/default.nix
index f4d87dc035c..e8c71bff18b 100644
--- a/pkgs/development/python-modules/python-oauth2/default.nix
+++ b/pkgs/development/python-modules/python-oauth2/default.nix
@@ -1,5 +1,4 @@
 { lib
-, python
 , buildPythonPackage
 , fetchPypi
 }:
diff --git a/pkgs/development/python-modules/pytorch/default.nix b/pkgs/development/python-modules/pytorch/default.nix
index 18162d105ac..962ebbecbaa 100644
--- a/pkgs/development/python-modules/pytorch/default.nix
+++ b/pkgs/development/python-modules/pytorch/default.nix
@@ -1,7 +1,7 @@
 { buildPythonPackage, pythonOlder,
   cudaSupport ? false, cudatoolkit ? null, cudnn ? null,
-  fetchFromGitHub, fetchpatch, lib, numpy, pyyaml, cffi, typing, cmake,
-  stdenv, linkFarm, symlinkJoin,
+  fetchFromGitHub, lib, numpy, pyyaml, cffi, typing, cmake,
+  linkFarm, symlinkJoin,
   utillinux, which }:
 
 assert cudnn == null || cudatoolkit != null;
diff --git a/pkgs/development/python-modules/pywbem/default.nix b/pkgs/development/python-modules/pywbem/default.nix
index d09a9bbd6d8..159e0ce15fb 100644
--- a/pkgs/development/python-modules/pywbem/default.nix
+++ b/pkgs/development/python-modules/pywbem/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub, fetchpatch, libxml2
+{ stdenv, buildPythonPackage, fetchFromGitHub, libxml2
 , m2crypto, ply, pyyaml, six
 , httpretty, lxml, mock, pytest, requests
 }:
diff --git a/pkgs/development/python-modules/pyxml/default.nix b/pkgs/development/python-modules/pyxml/default.nix
index 646308feece..5a55c1f47bb 100644
--- a/pkgs/development/python-modules/pyxml/default.nix
+++ b/pkgs/development/python-modules/pyxml/default.nix
@@ -1,4 +1,4 @@
-{lib, fetchurl, python, buildPythonPackage, makeWrapper}:
+{fetchurl, python, buildPythonPackage, makeWrapper}:
 
 buildPythonPackage rec {
   pname = "PyXML";
diff --git a/pkgs/development/python-modules/pyzmq/default.nix b/pkgs/development/python-modules/pyzmq/default.nix
index 26107ea3c4a..4de7777fa8b 100644
--- a/pkgs/development/python-modules/pyzmq/default.nix
+++ b/pkgs/development/python-modules/pyzmq/default.nix
@@ -1,5 +1,4 @@
-{ lib
-, buildPythonPackage
+{ buildPythonPackage
 , fetchPypi
 , pytest
 , tornado
diff --git a/pkgs/development/python-modules/qiskit/default.nix b/pkgs/development/python-modules/qiskit/default.nix
index 1eda590a864..dae43aa0462 100644
--- a/pkgs/development/python-modules/qiskit/default.nix
+++ b/pkgs/development/python-modules/qiskit/default.nix
@@ -2,8 +2,6 @@
 , isPy3k
 , buildPythonPackage
 , fetchPypi
-, fetchurl
-, python
 , numpy
 , scipy
 , sympy
diff --git a/pkgs/development/python-modules/rdflib/default.nix b/pkgs/development/python-modules/rdflib/default.nix
index cdbba180673..badaf9b3787 100644
--- a/pkgs/development/python-modules/rdflib/default.nix
+++ b/pkgs/development/python-modules/rdflib/default.nix
@@ -1,5 +1,4 @@
-{ lib
-, buildPythonPackage
+{ buildPythonPackage
 , fetchPypi
 , isodate
 , html5lib
diff --git a/pkgs/development/python-modules/redis/default.nix b/pkgs/development/python-modules/redis/default.nix
index de2683595e5..6ea233f695b 100644
--- a/pkgs/development/python-modules/redis/default.nix
+++ b/pkgs/development/python-modules/redis/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchPypi, buildPythonPackage }:
+{ fetchPypi, buildPythonPackage }:
 buildPythonPackage rec {
   pname = "redis";
   version = "2.10.6";
diff --git a/pkgs/development/python-modules/reportlab/default.nix b/pkgs/development/python-modules/reportlab/default.nix
index a356db74f07..0b3e84c3512 100644
--- a/pkgs/development/python-modules/reportlab/default.nix
+++ b/pkgs/development/python-modules/reportlab/default.nix
@@ -1,9 +1,7 @@
-{ lib
-, buildPythonPackage
+{ buildPythonPackage
 , fetchPypi
 , freetype
 , pillow
-, pip
 , glibcLocales
 , python
 , isPyPy
diff --git a/pkgs/development/python-modules/requests-mock/default.nix b/pkgs/development/python-modules/requests-mock/default.nix
index 6bd294671de..2286d9c2dc7 100644
--- a/pkgs/development/python-modules/requests-mock/default.nix
+++ b/pkgs/development/python-modules/requests-mock/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, fetchPypi, python
+{ buildPythonPackage, fetchPypi, python
 , mock, testrepository, testtools
 , requests, six }:
 
diff --git a/pkgs/development/python-modules/responses/default.nix b/pkgs/development/python-modules/responses/default.nix
index 4cc74431fc8..662045a9ce1 100644
--- a/pkgs/development/python-modules/responses/default.nix
+++ b/pkgs/development/python-modules/responses/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi
+{ buildPythonPackage, fetchPypi
 , cookies, mock, requests, six }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/rhpl/default.nix b/pkgs/development/python-modules/rhpl/default.nix
index d9c87918176..ed0bf42ae68 100644
--- a/pkgs/development/python-modules/rhpl/default.nix
+++ b/pkgs/development/python-modules/rhpl/default.nix
@@ -1,4 +1,4 @@
-{stdenv, buildPythonPackage, fetchurl, rpmextract, python, wirelesstools, gettext}:
+{buildPythonPackage, fetchurl, rpmextract, python, wirelesstools, gettext}:
 
 buildPythonPackage rec {
   pname = "rhpl";
diff --git a/pkgs/development/python-modules/rubymarshal/default.nix b/pkgs/development/python-modules/rubymarshal/default.nix
index 7184795639c..d8c43c1ea86 100644
--- a/pkgs/development/python-modules/rubymarshal/default.nix
+++ b/pkgs/development/python-modules/rubymarshal/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, python, hypothesis }:
+{ stdenv, buildPythonPackage, fetchPypi, hypothesis }:
 
 buildPythonPackage rec {
   pname = "rubymarshal";
diff --git a/pkgs/development/python-modules/salmon-mail/default.nix b/pkgs/development/python-modules/salmon-mail/default.nix
index ed358213492..c642039d4fe 100644
--- a/pkgs/development/python-modules/salmon-mail/default.nix
+++ b/pkgs/development/python-modules/salmon-mail/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, pythonOlder, nose, dnspython
+{ stdenv, buildPythonPackage, fetchPypi, nose, dnspython
 ,  chardet, lmtpd, pythondaemon, six, jinja2, mock }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/scikit-image/default.nix b/pkgs/development/python-modules/scikit-image/default.nix
index 6ac3ab5ddb9..1a07e001cae 100644
--- a/pkgs/development/python-modules/scikit-image/default.nix
+++ b/pkgs/development/python-modules/scikit-image/default.nix
@@ -11,7 +11,6 @@
 , pywavelets
 , dask
 , cloudpickle
-, nose
 , pytest
 }:
 
diff --git a/pkgs/development/python-modules/scikitlearn/default.nix b/pkgs/development/python-modules/scikitlearn/default.nix
index edaf7cd90cc..39af29da814 100644
--- a/pkgs/development/python-modules/scikitlearn/default.nix
+++ b/pkgs/development/python-modules/scikitlearn/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchpatch, fetchPypi, python
+{ stdenv, buildPythonPackage, fetchPypi, python
 , nose, pillow
 , gfortran, glibcLocales
 , numpy, scipy
diff --git a/pkgs/development/python-modules/scipy/default.nix b/pkgs/development/python-modules/scipy/default.nix
index 5e57dd3f093..41878b19d08 100644
--- a/pkgs/development/python-modules/scipy/default.nix
+++ b/pkgs/development/python-modules/scipy/default.nix
@@ -1,4 +1,4 @@
-{lib, fetchPypi, python, buildPythonPackage, isPyPy, gfortran, nose, pytest, numpy}:
+{lib, fetchPypi, python, buildPythonPackage, gfortran, nose, pytest, numpy}:
 
 buildPythonPackage rec {
   pname = "scipy";
diff --git a/pkgs/development/python-modules/serversyncstorage/default.nix b/pkgs/development/python-modules/serversyncstorage/default.nix
index 1cef1510ccf..0e4b6cfa1e4 100644
--- a/pkgs/development/python-modules/serversyncstorage/default.nix
+++ b/pkgs/development/python-modules/serversyncstorage/default.nix
@@ -1,5 +1,4 @@
-{ stdenv
-, buildPythonPackage
+{ buildPythonPackage
 , fetchgit
 , isPy27
 , testfixtures
diff --git a/pkgs/development/python-modules/smart_open/default.nix b/pkgs/development/python-modules/smart_open/default.nix
index 006f52f1d38..8c66df80dc5 100644
--- a/pkgs/development/python-modules/smart_open/default.nix
+++ b/pkgs/development/python-modules/smart_open/default.nix
@@ -1,6 +1,5 @@
 { lib
 , buildPythonPackage
-, isPy3k
 , fetchPypi
 , boto
 , boto3
diff --git a/pkgs/development/python-modules/spacy/default.nix b/pkgs/development/python-modules/spacy/default.nix
index 16c1841a3d6..d2a306356b6 100644
--- a/pkgs/development/python-modules/spacy/default.nix
+++ b/pkgs/development/python-modules/spacy/default.nix
@@ -1,7 +1,5 @@
 { lib
-, pkgs
 , buildPythonPackage
-, python
 , fetchPypi
 , pythonOlder
 , html5lib
diff --git a/pkgs/development/python-modules/sqlalchemy/default.nix b/pkgs/development/python-modules/sqlalchemy/default.nix
index 211419f86b1..50d58877b7e 100644
--- a/pkgs/development/python-modules/sqlalchemy/default.nix
+++ b/pkgs/development/python-modules/sqlalchemy/default.nix
@@ -3,7 +3,6 @@
 , buildPythonPackage
 , pytest
 , mock
-, pytest_xdist
 , isPy3k
 , pysqlite
 }:
diff --git a/pkgs/development/python-modules/sseclient/default.nix b/pkgs/development/python-modules/sseclient/default.nix
index 9ac04e18e4f..a122a0c40ec 100644
--- a/pkgs/development/python-modules/sseclient/default.nix
+++ b/pkgs/development/python-modules/sseclient/default.nix
@@ -1,6 +1,6 @@
 { stdenv, buildPythonPackage, fetchPypi
 , requests, six
-, backports_unittest-mock, pluggy, pytest, pytestrunner }:
+, backports_unittest-mock, pytest, pytestrunner }:
 
 buildPythonPackage rec {
   pname = "sseclient";
diff --git a/pkgs/development/python-modules/syncserver/default.nix b/pkgs/development/python-modules/syncserver/default.nix
index 3c650bd60dd..7a93d64a89f 100644
--- a/pkgs/development/python-modules/syncserver/default.nix
+++ b/pkgs/development/python-modules/syncserver/default.nix
@@ -1,5 +1,4 @@
-{ stdenv
-, buildPythonPackage
+{ buildPythonPackage
 , fetchgit
 , isPy27
 , unittest2
diff --git a/pkgs/development/python-modules/tempora/default.nix b/pkgs/development/python-modules/tempora/default.nix
index c56a5d7889f..9f8087a305d 100644
--- a/pkgs/development/python-modules/tempora/default.nix
+++ b/pkgs/development/python-modules/tempora/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi
+{ buildPythonPackage, fetchPypi
 , setuptools_scm
 , six, pytz}:
 
diff --git a/pkgs/development/python-modules/tensorflow/bin.nix b/pkgs/development/python-modules/tensorflow/bin.nix
index 21b21f174d0..4e3621157f9 100644
--- a/pkgs/development/python-modules/tensorflow/bin.nix
+++ b/pkgs/development/python-modules/tensorflow/bin.nix
@@ -2,7 +2,7 @@
 , lib
 , fetchurl
 , buildPythonPackage
-, isPy3k, isPy35, isPy36, pythonOlder
+, isPy3k, isPy36, pythonOlder
 , astor
 , gast
 , numpy
diff --git a/pkgs/development/python-modules/testfixtures/default.nix b/pkgs/development/python-modules/testfixtures/default.nix
index 628be2e946a..1e35d95c5e1 100644
--- a/pkgs/development/python-modules/testfixtures/default.nix
+++ b/pkgs/development/python-modules/testfixtures/default.nix
@@ -1,5 +1,5 @@
 { stdenv, buildPythonPackage, fetchPypi
-, mock, manuel, pytest, sybil, zope_component, django }:
+, mock, manuel, pytest, sybil, zope_component }:
 
 buildPythonPackage rec {
   pname = "testfixtures";
diff --git a/pkgs/development/python-modules/textacy/default.nix b/pkgs/development/python-modules/textacy/default.nix
index d4243024821..9b22ad3e545 100644
--- a/pkgs/development/python-modules/textacy/default.nix
+++ b/pkgs/development/python-modules/textacy/default.nix
@@ -4,7 +4,6 @@
 , fetchPypi
 , cachetools
 , cld2-cffi
-, cython
 , cytoolz
 , ftfy
 , ijson
diff --git a/pkgs/development/python-modules/thespian/default.nix b/pkgs/development/python-modules/thespian/default.nix
index 0ffaf315d54..0ced52c7ba1 100644
--- a/pkgs/development/python-modules/thespian/default.nix
+++ b/pkgs/development/python-modules/thespian/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchPypi, buildPythonPackage, lib }:
+{ fetchPypi, buildPythonPackage, lib }:
 
 buildPythonPackage rec {
   version = "3.9.2";
diff --git a/pkgs/development/python-modules/thinc/default.nix b/pkgs/development/python-modules/thinc/default.nix
index b5812820023..88e6c8d1674 100644
--- a/pkgs/development/python-modules/thinc/default.nix
+++ b/pkgs/development/python-modules/thinc/default.nix
@@ -1,6 +1,5 @@
 { stdenv
 , lib
-, pkgs
 , buildPythonPackage
 , fetchPypi
 , pythonOlder
@@ -11,7 +10,6 @@
 , msgpack-python
 , preshed
 , numpy
-, python
 , murmurhash
 , pathlib
 , hypothesis
diff --git a/pkgs/development/python-modules/tiros/default.nix b/pkgs/development/python-modules/tiros/default.nix
index b55c42cfa56..edc4bbdebb1 100644
--- a/pkgs/development/python-modules/tiros/default.nix
+++ b/pkgs/development/python-modules/tiros/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchPypi, buildPythonPackage
+{ fetchPypi, buildPythonPackage
 , semantic-version, boto3, flask, docutils, requests
 }:
 
diff --git a/pkgs/development/python-modules/todoist/default.nix b/pkgs/development/python-modules/todoist/default.nix
index 829d7bcfcb2..6f3eae60c63 100644
--- a/pkgs/development/python-modules/todoist/default.nix
+++ b/pkgs/development/python-modules/todoist/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchPypi, python, buildPythonPackage
+{ stdenv, fetchPypi, buildPythonPackage
 , requests }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/tokenserver/default.nix b/pkgs/development/python-modules/tokenserver/default.nix
index c6efe5ba239..44fcb9b46ff 100644
--- a/pkgs/development/python-modules/tokenserver/default.nix
+++ b/pkgs/development/python-modules/tokenserver/default.nix
@@ -1,5 +1,4 @@
-{ stdenv
-, buildPythonPackage
+{ buildPythonPackage
 , fetchgit
 , testfixtures
 , cornice
diff --git a/pkgs/development/python-modules/tox/default.nix b/pkgs/development/python-modules/tox/default.nix
index 359f13e2a00..4ceeb026634 100644
--- a/pkgs/development/python-modules/tox/default.nix
+++ b/pkgs/development/python-modules/tox/default.nix
@@ -1,5 +1,4 @@
-{ lib
-, buildPythonPackage
+{ buildPythonPackage
 , fetchPypi
 , py
 , virtualenv
diff --git a/pkgs/development/python-modules/tqdm/default.nix b/pkgs/development/python-modules/tqdm/default.nix
index 87fa393ce5e..0b77f706801 100644
--- a/pkgs/development/python-modules/tqdm/default.nix
+++ b/pkgs/development/python-modules/tqdm/default.nix
@@ -5,8 +5,6 @@
 , coverage
 , glibcLocales
 , flake8
-, matplotlib
-, pandas
 }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/typed-ast/default.nix b/pkgs/development/python-modules/typed-ast/default.nix
index 0cfc8c3e14a..5bd0f5f81d2 100644
--- a/pkgs/development/python-modules/typed-ast/default.nix
+++ b/pkgs/development/python-modules/typed-ast/default.nix
@@ -1,4 +1,4 @@
-{ buildPythonPackage, fetchPypi, isPy3k, lib, pythonOlder }:
+{ buildPythonPackage, fetchPypi, lib, pythonOlder }:
 buildPythonPackage rec {
   pname = "typed-ast";
   version = "1.1.0";
diff --git a/pkgs/development/python-modules/tzlocal/default.nix b/pkgs/development/python-modules/tzlocal/default.nix
index 3bb75fb2ac2..8320500fc14 100644
--- a/pkgs/development/python-modules/tzlocal/default.nix
+++ b/pkgs/development/python-modules/tzlocal/default.nix
@@ -1,5 +1,5 @@
 { stdenv, buildPythonPackage, fetchPypi
-, tzlocal, pytz }:
+, pytz }:
 
 buildPythonPackage rec {
   pname = "tzlocal";
diff --git a/pkgs/development/python-modules/ukpostcodeparser/default.nix b/pkgs/development/python-modules/ukpostcodeparser/default.nix
index 235f33da599..42588347c85 100644
--- a/pkgs/development/python-modules/ukpostcodeparser/default.nix
+++ b/pkgs/development/python-modules/ukpostcodeparser/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildPythonPackage, fetchPypi }:
+{ lib, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "UkPostcodeParser";
diff --git a/pkgs/development/python-modules/uranium/default.nix b/pkgs/development/python-modules/uranium/default.nix
index 276ed481601..eb2fa2bd042 100644
--- a/pkgs/development/python-modules/uranium/default.nix
+++ b/pkgs/development/python-modules/uranium/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildPythonPackage, fetchFromGitHub, python, cmake
+{ stdenv, buildPythonPackage, fetchFromGitHub, python, cmake
 , pyqt5, numpy, scipy, libarcus, doxygen, gettext, pythonOlder }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/vcrpy/default.nix b/pkgs/development/python-modules/vcrpy/default.nix
index ab4ce1be2b1..805941cab60 100644
--- a/pkgs/development/python-modules/vcrpy/default.nix
+++ b/pkgs/development/python-modules/vcrpy/default.nix
@@ -7,7 +7,6 @@
 , contextlib2
 , wrapt
 , pytest
-, httpbin
 , pytest-httpbin
 , yarl
 , pythonOlder
diff --git a/pkgs/development/python-modules/warrant/default.nix b/pkgs/development/python-modules/warrant/default.nix
index c152271af33..ef6089baa50 100644
--- a/pkgs/development/python-modules/warrant/default.nix
+++ b/pkgs/development/python-modules/warrant/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, fetchFromGitHub, fetchPypi, fetchpatch
+{ lib, buildPythonPackage, fetchFromGitHub, fetchpatch
 , mock
 , boto3, envs, python-jose, requests }:
 
diff --git a/pkgs/development/python-modules/wptserve/default.nix b/pkgs/development/python-modules/wptserve/default.nix
index b2ce75c43c3..32145623e4d 100644
--- a/pkgs/development/python-modules/wptserve/default.nix
+++ b/pkgs/development/python-modules/wptserve/default.nix
@@ -1,5 +1,4 @@
 { lib
-, stdenv
 , buildPythonPackage
 , fetchPypi
 , isPy3k
diff --git a/pkgs/development/python-modules/wsproto/default.nix b/pkgs/development/python-modules/wsproto/default.nix
index e98fcf205fd..c3ac5b51cb0 100644
--- a/pkgs/development/python-modules/wsproto/default.nix
+++ b/pkgs/development/python-modules/wsproto/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, fetchPypi, h11, enum34 }:
+{ buildPythonPackage, fetchPypi, h11, enum34 }:
 
 buildPythonPackage rec {
   pname = "wsproto";
diff --git a/pkgs/development/python-modules/xarray/default.nix b/pkgs/development/python-modules/xarray/default.nix
index 039a751a5e1..a9041f9a76f 100644
--- a/pkgs/development/python-modules/xarray/default.nix
+++ b/pkgs/development/python-modules/xarray/default.nix
@@ -5,7 +5,6 @@
 , numpy
 , pandas
 , python
-, fetchurl
 }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/zeep/default.nix b/pkgs/development/python-modules/zeep/default.nix
index 418fcebaefd..f283479c8de 100644
--- a/pkgs/development/python-modules/zeep/default.nix
+++ b/pkgs/development/python-modules/zeep/default.nix
@@ -19,7 +19,6 @@
 , pytest
 , pytestcov
 , requests-mock
-, testtools
 , tornado
 }:
 
diff --git a/pkgs/development/python-modules/zodb/default.nix b/pkgs/development/python-modules/zodb/default.nix
index 9aab2ba9e84..c23f332638d 100644
--- a/pkgs/development/python-modules/zodb/default.nix
+++ b/pkgs/development/python-modules/zodb/default.nix
@@ -1,7 +1,6 @@
 { stdenv
 , fetchPypi
 , buildPythonPackage
-, isPy3k
 , zope_testrunner
 , transaction
 , six
diff --git a/pkgs/development/python-modules/zope_testrunner/default.nix b/pkgs/development/python-modules/zope_testrunner/default.nix
index e2bf3a569d0..a4988332b22 100644
--- a/pkgs/development/python-modules/zope_testrunner/default.nix
+++ b/pkgs/development/python-modules/zope_testrunner/default.nix
@@ -1,7 +1,6 @@
 { stdenv
 , buildPythonPackage
 , fetchPypi
-, fetchpatch
 , zope_interface
 , zope_exceptions
 , zope_testing
diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index 68ab42a76dd..acaee897d93 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -47,11 +47,11 @@ let
                                              "mirror://bioc/${biocVersion}/bioc/src/contrib/Archive/${name}_${version}.tar.gz" ];
   };
   deriveBiocAnn = mkDerive {
-    mkHomepage = {name, biocVersion}: "http://www.bioconductor.org/packages/${name}.html";
+    mkHomepage = {name}: "http://www.bioconductor.org/packages/${name}.html";
     mkUrls = {name, version, biocVersion}: [ "mirror://bioc/${biocVersion}/data/annotation/src/contrib/${name}_${version}.tar.gz" ];
   };
   deriveBiocExp = mkDerive {
-    mkHomepage = {name, biocVersion}: "http://www.bioconductor.org/packages/${name}.html";
+    mkHomepage = {name}: "http://www.bioconductor.org/packages/${name}.html";
     mkUrls = {name, version, biocVersion}: [ "mirror://bioc/${biocVersion}/data/experiment/src/contrib/${name}_${version}.tar.gz" ];
   };
   deriveCran = mkDerive {
diff --git a/pkgs/development/ruby-modules/bundler/default.nix b/pkgs/development/ruby-modules/bundler/default.nix
index 2f9a8223832..b1d0b76f086 100644
--- a/pkgs/development/ruby-modules/bundler/default.nix
+++ b/pkgs/development/ruby-modules/bundler/default.nix
@@ -1,4 +1,4 @@
-{ buildRubyGem, makeWrapper, ruby, coreutils }:
+{ buildRubyGem, ruby }:
 
 buildRubyGem rec {
   inherit ruby;
diff --git a/pkgs/development/tools/analysis/qcachegrind/default.nix b/pkgs/development/tools/analysis/qcachegrind/default.nix
index 30d82aca83a..fb0f7414841 100644
--- a/pkgs/development/tools/analysis/qcachegrind/default.nix
+++ b/pkgs/development/tools/analysis/qcachegrind/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, qmake, qtbase, perl, python, php, kcachegrind, fetchpatch }:
+{ stdenv, qmake, qtbase, perl, python, php, kcachegrind }:
 
 let
   name = stdenv.lib.replaceStrings ["kcachegrind"] ["qcachegrind"] kcachegrind.name;
diff --git a/pkgs/development/tools/analysis/radare/default.nix b/pkgs/development/tools/analysis/radare/default.nix
index b174d6c069b..b9b9b8abfb9 100644
--- a/pkgs/development/tools/analysis/radare/default.nix
+++ b/pkgs/development/tools/analysis/radare/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, pkgconfig, libusb, readline, lua, libewf, perl,
+{stdenv, fetchurl, pkgconfig, libusb, readline, lua, perl,
 gtk2 ? null, vte ? null, gtkdialog ? null,
 python ? null,
 ruby ? null,
diff --git a/pkgs/development/tools/analysis/valgrind/default.nix b/pkgs/development/tools/analysis/valgrind/default.nix
index 131533896ff..cbcfa981b6b 100644
--- a/pkgs/development/tools/analysis/valgrind/default.nix
+++ b/pkgs/development/tools/analysis/valgrind/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, perl, gdb, llvm, cctools, xnu, bootstrap_cmds }:
+{ stdenv, fetchurl, perl, gdb, llvm, cctools, xnu, bootstrap_cmds }:
 
 stdenv.mkDerivation rec {
   name = "valgrind-3.13.0";
diff --git a/pkgs/development/tools/backblaze-b2/default.nix b/pkgs/development/tools/backblaze-b2/default.nix
index 5bda2d945eb..19609e15c76 100644
--- a/pkgs/development/tools/backblaze-b2/default.nix
+++ b/pkgs/development/tools/backblaze-b2/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonApplication, fetchFromGitHub, makeWrapper
+{ lib, buildPythonApplication, fetchFromGitHub
 , arrow, futures, logfury, requests, six, tqdm
 }:
 
diff --git a/pkgs/development/tools/bloaty/default.nix b/pkgs/development/tools/bloaty/default.nix
index 953a10ca47a..5f2e9b5f440 100644
--- a/pkgs/development/tools/bloaty/default.nix
+++ b/pkgs/development/tools/bloaty/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, binutils, cmake, zlib, fetchFromGitHub }:
+{ stdenv, cmake, zlib, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
   version = "2018-06-15";
diff --git a/pkgs/development/tools/build-managers/buck/default.nix b/pkgs/development/tools/build-managers/buck/default.nix
index 5d486f47844..e64bf432b38 100644
--- a/pkgs/development/tools/build-managers/buck/default.nix
+++ b/pkgs/development/tools/build-managers/buck/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, jdk, ant, python2, python2Packages, watchman, unzip, bash, makeWrapper }:
+{ stdenv, fetchFromGitHub, jdk, ant, python2, python2Packages, watchman, bash, makeWrapper }:
 
 stdenv.mkDerivation rec {
   name = "buck-${version}";
diff --git a/pkgs/development/tools/build-managers/buildbot/default.nix b/pkgs/development/tools/build-managers/buildbot/default.nix
index 3729abfe247..adb279cdea6 100644
--- a/pkgs/development/tools/build-managers/buildbot/default.nix
+++ b/pkgs/development/tools/build-managers/buildbot/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, openssh, buildbot-worker, buildbot-pkg, pythonPackages, runCommand, makeWrapper }:
+{ stdenv, openssh, buildbot-worker, buildbot-pkg, pythonPackages, runCommand, makeWrapper }:
 
 let
   withPlugins = plugins: runCommand "wrapped-${package.name}" {
diff --git a/pkgs/development/tools/build-managers/cmake/2.8.nix b/pkgs/development/tools/build-managers/cmake/2.8.nix
index f6da92fe621..c61bf3287db 100644
--- a/pkgs/development/tools/build-managers/cmake/2.8.nix
+++ b/pkgs/development/tools/build-managers/cmake/2.8.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, replace, curl, expat, zlib, bzip2
+{ stdenv, fetchurl, fetchpatch, curl, expat, zlib, bzip2
 , useNcurses ? false, ncurses, useQt4 ? false, qt4, ps
 , buildPlatform, hostPlatform
 }:
diff --git a/pkgs/development/tools/build-managers/conan/default.nix b/pkgs/development/tools/build-managers/conan/default.nix
index 9ff32f1b348..e77647b2fed 100644
--- a/pkgs/development/tools/build-managers/conan/default.nix
+++ b/pkgs/development/tools/build-managers/conan/default.nix
@@ -1,4 +1,4 @@
-{ lib, fetchpatch, python }:
+{ lib, python }:
 
 let newPython = python.override {
   packageOverrides = self: super: {
diff --git a/pkgs/development/tools/build-managers/dub/default.nix b/pkgs/development/tools/build-managers/dub/default.nix
index 52e29acc9d8..b9a8c97bd5e 100644
--- a/pkgs/development/tools/build-managers/dub/default.nix
+++ b/pkgs/development/tools/build-managers/dub/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchpatch, curl, dmd, libevent, rsync }:
+{ stdenv, fetchFromGitHub, curl, dmd, libevent, rsync }:
 
 let
 
diff --git a/pkgs/development/tools/build-managers/meson/default.nix b/pkgs/development/tools/build-managers/meson/default.nix
index f14f6adf5fe..3cb906d50ed 100644
--- a/pkgs/development/tools/build-managers/meson/default.nix
+++ b/pkgs/development/tools/build-managers/meson/default.nix
@@ -1,4 +1,4 @@
-{ lib, python3Packages, stdenv, ninja, pkgconfig, targetPlatform, writeTextDir, substituteAll }: let
+{ lib, python3Packages, stdenv, targetPlatform, writeTextDir, substituteAll }: let
   targetPrefix = lib.optionalString stdenv.isCross
                    (targetPlatform.config + "-");
 in python3Packages.buildPythonApplication rec {
diff --git a/pkgs/development/tools/build-managers/nant/default.nix b/pkgs/development/tools/build-managers/nant/default.nix
index 5da32f2334a..c394d87e09e 100644
--- a/pkgs/development/tools/build-managers/nant/default.nix
+++ b/pkgs/development/tools/build-managers/nant/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, fetchFromGitHub, pkgconfig, mono, makeWrapper
+{ stdenv, fetchFromGitHub, pkgconfig, mono, makeWrapper
 , targetVersion ? "4.5" }:
 
 let
diff --git a/pkgs/development/tools/build-managers/pants/default.nix b/pkgs/development/tools/build-managers/pants/default.nix
index 38a197aa900..1ad52f327e1 100644
--- a/pkgs/development/tools/build-managers/pants/default.nix
+++ b/pkgs/development/tools/build-managers/pants/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, pythonPackages, runCommand, curl }:
+{ stdenv, pythonPackages }:
 
 with stdenv.lib;
 with pythonPackages;
diff --git a/pkgs/development/tools/build-managers/rebar3/default.nix b/pkgs/development/tools/build-managers/rebar3/default.nix
index ff6dc07ea9e..d9e260a13de 100644
--- a/pkgs/development/tools/build-managers/rebar3/default.nix
+++ b/pkgs/development/tools/build-managers/rebar3/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, writeText, callPackage, fetchurl,
+{ stdenv, fetchurl,
   fetchHex, erlang, hermeticRebar3 ? true,
-  tree, fetchFromGitHub, hexRegistrySnapshot }:
+  tree, hexRegistrySnapshot }:
 
 let
   version = "3.6.1";
diff --git a/pkgs/development/tools/build-managers/scons/common.nix b/pkgs/development/tools/build-managers/scons/common.nix
index d3842a39f18..4b0242a3956 100644
--- a/pkgs/development/tools/build-managers/scons/common.nix
+++ b/pkgs/development/tools/build-managers/scons/common.nix
@@ -1,6 +1,6 @@
 { version, sha256 }:
 
-{ stdenv, fetchurl, fetchpatch, python2Packages }:
+{ stdenv, fetchurl, python2Packages }:
 
 let name = "scons";
 in python2Packages.buildPythonApplication {
diff --git a/pkgs/development/tools/build-managers/scons/default.nix b/pkgs/development/tools/build-managers/scons/default.nix
index f52d53526fa..3bd31523412 100644
--- a/pkgs/development/tools/build-managers/scons/default.nix
+++ b/pkgs/development/tools/build-managers/scons/default.nix
@@ -1,4 +1,4 @@
-{ callPackage, stdenv }:
+{ callPackage }:
 
 let
   mkScons = args: callPackage (import ./common.nix args) { };
diff --git a/pkgs/development/tools/build-managers/waf/default.nix b/pkgs/development/tools/build-managers/waf/default.nix
index 000943f117f..e86d61cf6c9 100644
--- a/pkgs/development/tools/build-managers/waf/default.nix
+++ b/pkgs/development/tools/build-managers/waf/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, python2 }:
+{ stdenv, fetchurl, python2 }:
 
 stdenv.mkDerivation rec {
   name = "waf-${version}";
diff --git a/pkgs/development/tools/buildah/default.nix b/pkgs/development/tools/buildah/default.nix
index 2dca2b6cd42..95ee4e93f2a 100644
--- a/pkgs/development/tools/buildah/default.nix
+++ b/pkgs/development/tools/buildah/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub, runCommand
+{ stdenv, buildGoPackage, fetchFromGitHub
 , gpgme, libgpgerror, lvm2, btrfs-progs, pkgconfig, ostree, libselinux, libseccomp
 , go-md2man }:
 
diff --git a/pkgs/development/tools/castxml/default.nix b/pkgs/development/tools/castxml/default.nix
index f42adffc5f4..603b155ee4f 100644
--- a/pkgs/development/tools/castxml/default.nix
+++ b/pkgs/development/tools/castxml/default.nix
@@ -1,6 +1,5 @@
 { stdenv, fetchFromGitHub
 , pythonPackages
-, pkgconfig
 , cmake
 , llvmPackages
 , withMan ? true
diff --git a/pkgs/development/tools/chefdk/default.nix b/pkgs/development/tools/chefdk/default.nix
index df06793eaec..1d81d469eb2 100644
--- a/pkgs/development/tools/chefdk/default.nix
+++ b/pkgs/development/tools/chefdk/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, bundlerEnv, ruby_2_4, perl, autoconf }:
+{ lib, bundlerEnv, ruby_2_4, perl, autoconf }:
 
 bundlerEnv {
   # Last updated via:
diff --git a/pkgs/development/tools/compass/default.nix b/pkgs/development/tools/compass/default.nix
index f96d3e810ca..3e3e239fbfb 100644
--- a/pkgs/development/tools/compass/default.nix
+++ b/pkgs/development/tools/compass/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, bundlerEnv, ruby }:
+{ lib, bundlerEnv, ruby }:
 
 bundlerEnv {
   name = "compass-1.0.3";
diff --git a/pkgs/development/tools/container-linux-config-transpiler/default.nix b/pkgs/development/tools/container-linux-config-transpiler/default.nix
index 8d43736d3a8..b2b903b095c 100644
--- a/pkgs/development/tools/container-linux-config-transpiler/default.nix
+++ b/pkgs/development/tools/container-linux-config-transpiler/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, buildGoPackage }:
+{ lib, fetchFromGitHub, buildGoPackage }:
 
 with lib;
 
diff --git a/pkgs/development/tools/database/liquibase/default.nix b/pkgs/development/tools/database/liquibase/default.nix
index 7f66317167a..46104e78d1d 100644
--- a/pkgs/development/tools/database/liquibase/default.nix
+++ b/pkgs/development/tools/database/liquibase/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, writeText, jre, makeWrapper, fetchMavenArtifact
+{ stdenv, fetchurl, jre, makeWrapper
 , mysqlSupport ? true, mysql_jdbc ? null }:
 
 assert mysqlSupport -> mysql_jdbc != null;
diff --git a/pkgs/development/tools/delve/default.nix b/pkgs/development/tools/delve/default.nix
index 9a7a600d134..b101e52aad9 100644
--- a/pkgs/development/tools/delve/default.nix
+++ b/pkgs/development/tools/delve/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+{ stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "delve-${version}";
diff --git a/pkgs/development/tools/devpi-client/default.nix b/pkgs/development/tools/devpi-client/default.nix
index 905314efe5a..26d96a64126 100644
--- a/pkgs/development/tools/devpi-client/default.nix
+++ b/pkgs/development/tools/devpi-client/default.nix
@@ -1,5 +1,4 @@
 { stdenv
-, lib
 , pythonPackages
 , glibcLocales
 , devpi-server
diff --git a/pkgs/development/tools/devpi-server/default.nix b/pkgs/development/tools/devpi-server/default.nix
index 6823ae3372c..f3ade82e52e 100644
--- a/pkgs/development/tools/devpi-server/default.nix
+++ b/pkgs/development/tools/devpi-server/default.nix
@@ -1,4 +1,4 @@
- { stdenv, pythonPackages, glibcLocales, nginx }:
+ { stdenv, pythonPackages, nginx }:
 
 pythonPackages.buildPythonApplication rec {
   name = "${pname}-${version}";
diff --git a/pkgs/development/tools/documentation/gnome-doc-utils/default.nix b/pkgs/development/tools/documentation/gnome-doc-utils/default.nix
index f6920a83e09..7e8a4159072 100644
--- a/pkgs/development/tools/documentation/gnome-doc-utils/default.nix
+++ b/pkgs/development/tools/documentation/gnome-doc-utils/default.nix
@@ -1,5 +1,5 @@
-{stdenv, fetchurl, pkgconfig, libxml2Python, libxslt, intltool
-, makeWrapper, python2Packages }:
+{fetchurl, pkgconfig, libxml2Python, libxslt, intltool
+, python2Packages }:
 
 python2Packages.buildPythonApplication {
   name = "gnome-doc-utils-0.20.10";
diff --git a/pkgs/development/tools/easyjson/default.nix b/pkgs/development/tools/easyjson/default.nix
index 253f5b374d3..de9fb82f66f 100644
--- a/pkgs/development/tools/easyjson/default.nix
+++ b/pkgs/development/tools/easyjson/default.nix
@@ -1,5 +1,5 @@
 # This file was generated by https://github.com/kamilchm/go2nix v1.2.1
-{ stdenv, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+{ stdenv, buildGoPackage, fetchgit }:
 
 buildGoPackage rec {
   name = "easyjson-unstable-${version}";
diff --git a/pkgs/development/tools/egg2nix/chicken-eggs.nix b/pkgs/development/tools/egg2nix/chicken-eggs.nix
index 4ec9e0daa47..1f786f127c9 100644
--- a/pkgs/development/tools/egg2nix/chicken-eggs.nix
+++ b/pkgs/development/tools/egg2nix/chicken-eggs.nix
@@ -1,4 +1,4 @@
-{ pkgs, stdenv }:
+{ pkgs }:
 rec {
   inherit (pkgs) eggDerivation fetchegg;
 
diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix
index 38432e58d0d..695a532305a 100644
--- a/pkgs/development/tools/electron/default.nix
+++ b/pkgs/development/tools/electron/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, libXScrnSaver, makeWrapper, fetchurl, unzip, atomEnv, gtk2 }:
+{ stdenv, libXScrnSaver, makeWrapper, fetchurl, unzip, atomEnv, gtk2 }:
 
 let
   version = "1.8.2";
diff --git a/pkgs/development/tools/erlang/hex2nix/default.nix b/pkgs/development/tools/erlang/hex2nix/default.nix
index 082edb37a4f..e21749f90d0 100644
--- a/pkgs/development/tools/erlang/hex2nix/default.nix
+++ b/pkgs/development/tools/erlang/hex2nix/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, buildRebar3, buildHex,
+{ fetchFromGitHub, buildRebar3,
 
   # Erlang dependencies:
   ibrowse_4_2_2,
diff --git a/pkgs/development/tools/erlang/relx-exe/default.nix b/pkgs/development/tools/erlang/relx-exe/default.nix
index df14c29c372..9bbdc8c8334 100644
--- a/pkgs/development/tools/erlang/relx-exe/default.nix
+++ b/pkgs/development/tools/erlang/relx-exe/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, beamPackages, buildRebar3, buildHex, fetchHex
+{ stdenv, buildHex
 
 , getopt_0_8_2, erlware_commons_1_0_0, cf_0_2_2 }:
 
diff --git a/pkgs/development/tools/fac/default.nix b/pkgs/development/tools/fac/default.nix
index d6cc527e641..18367d14f6e 100644
--- a/pkgs/development/tools/fac/default.nix
+++ b/pkgs/development/tools/fac/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoPackage, fetchFromGitHub, fetchurl, makeWrapper, git }:
+{ stdenv, buildGoPackage, fetchFromGitHub, makeWrapper, git }:
 
 buildGoPackage rec {
   name = "fac-${version}";
diff --git a/pkgs/development/tools/git-ftp/default.nix b/pkgs/development/tools/git-ftp/default.nix
index 3d4d542d2f9..4c67a45d8c3 100644
--- a/pkgs/development/tools/git-ftp/default.nix
+++ b/pkgs/development/tools/git-ftp/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, pandoc, man }:
+{ stdenv, fetchFromGitHub, pandoc, man }:
 stdenv.mkDerivation rec {
   name = "git-ftp-${version}";
   version = "1.5.1";
diff --git a/pkgs/development/tools/go-bindata/default.nix b/pkgs/development/tools/go-bindata/default.nix
index 4b87e74a630..9a783deecee 100644
--- a/pkgs/development/tools/go-bindata/default.nix
+++ b/pkgs/development/tools/go-bindata/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+{ stdenv, buildGoPackage, fetchgit }:
 
 buildGoPackage rec {
   name = "go-bindata-${version}";
diff --git a/pkgs/development/tools/go-outline/default.nix b/pkgs/development/tools/go-outline/default.nix
index fe159c85c3d..5e1cd03e0af 100644
--- a/pkgs/development/tools/go-outline/default.nix
+++ b/pkgs/development/tools/go-outline/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+{ stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "go-outline-${version}";
diff --git a/pkgs/development/tools/go-repo-root/default.nix b/pkgs/development/tools/go-repo-root/default.nix
index e47b84354d6..52cd37f9885 100644
--- a/pkgs/development/tools/go-repo-root/default.nix
+++ b/pkgs/development/tools/go-repo-root/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, gotools, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+{ stdenv, buildGoPackage, fetchgit }:
 
 buildGoPackage rec {
   name = "go-repo-root-${version}";
diff --git a/pkgs/development/tools/go-symbols/default.nix b/pkgs/development/tools/go-symbols/default.nix
index 9a8b592b038..38ceea7d417 100644
--- a/pkgs/development/tools/go-symbols/default.nix
+++ b/pkgs/development/tools/go-symbols/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchgit }:
+{ stdenv, buildGoPackage, fetchgit }:
 
 buildGoPackage rec {
   name = "go-symbols-${version}";
diff --git a/pkgs/development/tools/gocode/default.nix b/pkgs/development/tools/gocode/default.nix
index 2501c36dd5c..a20e1658988 100644
--- a/pkgs/development/tools/gocode/default.nix
+++ b/pkgs/development/tools/gocode/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+{ stdenv, buildGoPackage, fetchgit }:
 
 buildGoPackage rec {
   name = "gocode-${version}";
diff --git a/pkgs/development/tools/goconvey/default.nix b/pkgs/development/tools/goconvey/default.nix
index e4ef9d26da2..fcdb56460e1 100644
--- a/pkgs/development/tools/goconvey/default.nix
+++ b/pkgs/development/tools/goconvey/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+{ stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "goconvey-${version}";
diff --git a/pkgs/development/tools/godef/default.nix b/pkgs/development/tools/godef/default.nix
index 6644c8fcfc4..3227ed8eec2 100644
--- a/pkgs/development/tools/godef/default.nix
+++ b/pkgs/development/tools/godef/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchgit }:
+{ stdenv, buildGoPackage, fetchgit }:
 
 buildGoPackage rec {
   name = "godef-${version}";
diff --git a/pkgs/development/tools/goimports/default.nix b/pkgs/development/tools/goimports/default.nix
index 5c69f34e28b..14c319320d0 100644
--- a/pkgs/development/tools/goimports/default.nix
+++ b/pkgs/development/tools/goimports/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+{ stdenv, buildGoPackage, fetchgit }:
 
 buildGoPackage rec {
   name = "goimports-${version}";
diff --git a/pkgs/development/tools/golint/default.nix b/pkgs/development/tools/golint/default.nix
index 99f049314ae..a617e582c98 100644
--- a/pkgs/development/tools/golint/default.nix
+++ b/pkgs/development/tools/golint/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+{ stdenv, buildGoPackage, fetchgit }:
 
 buildGoPackage rec {
   name = "lint-${version}";
diff --git a/pkgs/development/tools/gomodifytags/default.nix b/pkgs/development/tools/gomodifytags/default.nix
index f1452bc1211..86b7246b411 100644
--- a/pkgs/development/tools/gomodifytags/default.nix
+++ b/pkgs/development/tools/gomodifytags/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchgit }:
+{ stdenv, buildGoPackage, fetchgit }:
 
 buildGoPackage rec {
   name = "gomodifytags-${version}";
diff --git a/pkgs/development/tools/gopkgs/default.nix b/pkgs/development/tools/gopkgs/default.nix
index 298657fe38c..ea9c92c0d0a 100644
--- a/pkgs/development/tools/gopkgs/default.nix
+++ b/pkgs/development/tools/gopkgs/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+{ stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "gopkgs-${version}";
diff --git a/pkgs/development/tools/gotags/default.nix b/pkgs/development/tools/gotags/default.nix
index ad22d4ea407..b8230561fb4 100644
--- a/pkgs/development/tools/gotags/default.nix
+++ b/pkgs/development/tools/gotags/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+{ stdenv, buildGoPackage, fetchgit }:
 
 buildGoPackage rec {
   name = "gotags-${version}";
diff --git a/pkgs/development/tools/gotests/default.nix b/pkgs/development/tools/gotests/default.nix
index ccdab780e6c..6c8270f8598 100644
--- a/pkgs/development/tools/gotests/default.nix
+++ b/pkgs/development/tools/gotests/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+{ stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "gotests-${version}";
diff --git a/pkgs/development/tools/gotools/default.nix b/pkgs/development/tools/gotools/default.nix
index e9a7e7ac891..4bbb6b0bd4f 100644
--- a/pkgs/development/tools/gotools/default.nix
+++ b/pkgs/development/tools/gotools/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, go, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+{ stdenv, go, buildGoPackage, fetchgit }:
 
 buildGoPackage rec {
   name = "gotools-${version}";
diff --git a/pkgs/development/tools/govers/default.nix b/pkgs/development/tools/govers/default.nix
index a80f1569329..440b5e2eb0b 100644
--- a/pkgs/development/tools/govers/default.nix
+++ b/pkgs/development/tools/govers/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+{ stdenv, buildGoPackage, fetchgit }:
 
 buildGoPackage rec {
   name = "govers-${version}";
diff --git a/pkgs/development/tools/gox/default.nix b/pkgs/development/tools/gox/default.nix
index 65bc55c6d8d..69b20dd3a17 100644
--- a/pkgs/development/tools/gox/default.nix
+++ b/pkgs/development/tools/gox/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+{ stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "gox-${version}";
diff --git a/pkgs/development/tools/haskell/hyper-haskell/default.nix b/pkgs/development/tools/haskell/hyper-haskell/default.nix
index 31697750a70..a2a049615b7 100644
--- a/pkgs/development/tools/haskell/hyper-haskell/default.nix
+++ b/pkgs/development/tools/haskell/hyper-haskell/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, writeText, jshon, electron, hyper-haskell-server, extra-packages ? [] }:
+{ stdenv, fetchFromGitHub, jshon, electron, hyper-haskell-server, extra-packages ? [] }:
 
 let
   binPath = stdenv.lib.makeBinPath ([ hyper-haskell-server ] ++ extra-packages);
diff --git a/pkgs/development/tools/haskell/lambdabot/default.nix b/pkgs/development/tools/haskell/lambdabot/default.nix
index edf967f7d11..5e372b4f387 100644
--- a/pkgs/development/tools/haskell/lambdabot/default.nix
+++ b/pkgs/development/tools/haskell/lambdabot/default.nix
@@ -1,4 +1,4 @@
-{ lib, haskellLib, fetchpatch, makeWrapper, haskellPackages
+{ lib, haskellLib, makeWrapper, haskellPackages
 , mueval
 , withDjinn ? true
 , aspell ? null
diff --git a/pkgs/development/tools/haskell/multi-ghc-travis/default.nix b/pkgs/development/tools/haskell/multi-ghc-travis/default.nix
index 88c4fc14a66..30dd7f21791 100644
--- a/pkgs/development/tools/haskell/multi-ghc-travis/default.nix
+++ b/pkgs/development/tools/haskell/multi-ghc-travis/default.nix
@@ -1,6 +1,6 @@
 { mkDerivation, ansi-terminal, base, bytestring, Cabal, containers
 , deepseq, Diff, directory, filepath, ShellCheck, stdenv, tasty
-, tasty-golden, transformers, fetchFromGitHub, fetchpatch
+, tasty-golden, transformers, fetchFromGitHub
 }:
 
 mkDerivation {
diff --git a/pkgs/development/tools/hexio/default.nix b/pkgs/development/tools/hexio/default.nix
index 6511bdd2010..905580482d4 100644
--- a/pkgs/development/tools/hexio/default.nix
+++ b/pkgs/development/tools/hexio/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchurl, python, pcsclite, pth }:
+{ stdenv, fetchFromGitHub, python, pcsclite, pth }:
 
 stdenv.mkDerivation rec {
   pname = "hexio";
diff --git a/pkgs/development/tools/iaca/2.1.nix b/pkgs/development/tools/iaca/2.1.nix
index e71e296212c..b2c764c5a85 100644
--- a/pkgs/development/tools/iaca/2.1.nix
+++ b/pkgs/development/tools/iaca/2.1.nix
@@ -1,4 +1,4 @@
-{ stdenv, makeWrapper, requireFile, patchelf, gcc, unzip }:
+{ stdenv, makeWrapper, requireFile, gcc, unzip }:
 with stdenv.lib;
 
 # v2.1: last version with NHM/WSM arch support
diff --git a/pkgs/development/tools/iaca/3.0.nix b/pkgs/development/tools/iaca/3.0.nix
index af738bc71a9..34b9e1df190 100644
--- a/pkgs/development/tools/iaca/3.0.nix
+++ b/pkgs/development/tools/iaca/3.0.nix
@@ -1,4 +1,4 @@
-{ stdenv, requireFile, patchelf, unzip }:
+{ stdenv, requireFile, unzip }:
 with stdenv.lib;
 
 stdenv.mkDerivation {
diff --git a/pkgs/development/tools/irony-server/default.nix b/pkgs/development/tools/irony-server/default.nix
index e2aa27a96eb..b6a78071bc8 100644
--- a/pkgs/development/tools/irony-server/default.nix
+++ b/pkgs/development/tools/irony-server/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, cmake, llvmPackages, irony }:
+{ stdenv, cmake, llvmPackages, irony }:
 
 stdenv.mkDerivation rec {
   name = "irony-server-${version}";
diff --git a/pkgs/development/tools/jmespath/default.nix b/pkgs/development/tools/jmespath/default.nix
index dd0379e83a7..c53d6608efd 100644
--- a/pkgs/development/tools/jmespath/default.nix
+++ b/pkgs/development/tools/jmespath/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+{ stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "jmespath-${version}";
diff --git a/pkgs/development/tools/jp/default.nix b/pkgs/development/tools/jp/default.nix
index d46f7b3e883..e8e8acd6a9a 100644
--- a/pkgs/development/tools/jp/default.nix
+++ b/pkgs/development/tools/jp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub, jmespath }:
+{ stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "jp-${version}";
diff --git a/pkgs/development/tools/json2hcl/default.nix b/pkgs/development/tools/json2hcl/default.nix
index d53b3902133..694428f55a6 100644
--- a/pkgs/development/tools/json2hcl/default.nix
+++ b/pkgs/development/tools/json2hcl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "json2hcl";
diff --git a/pkgs/development/tools/kube-aws/default.nix b/pkgs/development/tools/kube-aws/default.nix
index 11f4a5c8bd0..af5c0e9c2f9 100644
--- a/pkgs/development/tools/kube-aws/default.nix
+++ b/pkgs/development/tools/kube-aws/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, buildGoPackage }:
+{ lib, fetchFromGitHub, buildGoPackage }:
 
 with lib;
 
diff --git a/pkgs/development/tools/leaps/default.nix b/pkgs/development/tools/leaps/default.nix
index 9e41ef38131..afac17b5251 100644
--- a/pkgs/development/tools/leaps/default.nix
+++ b/pkgs/development/tools/leaps/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoPackage, fetchFromGitHub, fetchhg, fetchbzr, fetchsvn }:
+{ stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "leaps-${version}";
diff --git a/pkgs/development/tools/librarian-puppet-go/default.nix b/pkgs/development/tools/librarian-puppet-go/default.nix
index 8adea820ec7..58f50dd2f7e 100644
--- a/pkgs/development/tools/librarian-puppet-go/default.nix
+++ b/pkgs/development/tools/librarian-puppet-go/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, buildGoPackage }:
+{ lib, fetchFromGitHub, buildGoPackage }:
 
 buildGoPackage rec {
   name = "librarian-puppet-go-${version}";
diff --git a/pkgs/development/tools/manul/default.nix b/pkgs/development/tools/manul/default.nix
index c4df52da170..a5dd0a88272 100644
--- a/pkgs/development/tools/manul/default.nix
+++ b/pkgs/development/tools/manul/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+{ stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "manul-unstable-2016-09-30";
diff --git a/pkgs/development/tools/misc/autogen/default.nix b/pkgs/development/tools/misc/autogen/default.nix
index 660917ee9f1..265d425bbcf 100644
--- a/pkgs/development/tools/misc/autogen/default.nix
+++ b/pkgs/development/tools/misc/autogen/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPackages, fetchurl, which, pkgconfig, texinfo, perl, guile, libxml2 }:
+{ stdenv, buildPackages, fetchurl, which, pkgconfig, perl, guile, libxml2 }:
 
 stdenv.mkDerivation rec {
   name = "autogen-${version}";
diff --git a/pkgs/development/tools/misc/automake/automake-1.16.x.nix b/pkgs/development/tools/misc/automake/automake-1.16.x.nix
index affc400a9ed..6646b847252 100644
--- a/pkgs/development/tools/misc/automake/automake-1.16.x.nix
+++ b/pkgs/development/tools/misc/automake/automake-1.16.x.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, perl, autoconf, makeWrapper, doCheck ? false }:
+{ stdenv, fetchurl, perl, autoconf, doCheck ? false }:
 
 stdenv.mkDerivation rec {
   name = "automake-1.16.1";
diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix
index 0b71c6719dc..df4d0e3f47d 100644
--- a/pkgs/development/tools/misc/binutils/default.nix
+++ b/pkgs/development/tools/misc/binutils/default.nix
@@ -1,6 +1,6 @@
 { stdenv, buildPackages
 , fetchurl, zlib, autoreconfHook264
-, buildPlatform, hostPlatform, targetPlatform
+, hostPlatform, targetPlatform
 , noSysDirs, gold ? true, bison ? null
 }:
 
diff --git a/pkgs/development/tools/misc/blackmagic/default.nix b/pkgs/development/tools/misc/blackmagic/default.nix
index ab84cb37656..2d7225ee03e 100644
--- a/pkgs/development/tools/misc/blackmagic/default.nix
+++ b/pkgs/development/tools/misc/blackmagic/default.nix
@@ -1,5 +1,5 @@
 { stdenv, lib, fetchFromGitHub
-, gcc-arm-embedded, bash, libftdi
+, gcc-arm-embedded, libftdi
 , python, pythonPackages
 }:
 
diff --git a/pkgs/development/tools/misc/cbrowser/default.nix b/pkgs/development/tools/misc/cbrowser/default.nix
index 51610349c45..6519f349bfc 100644
--- a/pkgs/development/tools/misc/cbrowser/default.nix
+++ b/pkgs/development/tools/misc/cbrowser/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, cscope, tk, makeWrapper }:
+{ fetchurl, stdenv, tk, makeWrapper }:
 
 stdenv.mkDerivation rec {
   name = "cbrowser-0.8";
diff --git a/pkgs/development/tools/misc/ccache/default.nix b/pkgs/development/tools/misc/ccache/default.nix
index 34d1d8a829b..c5cb277c256 100644
--- a/pkgs/development/tools/misc/ccache/default.nix
+++ b/pkgs/development/tools/misc/ccache/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, runCommand, perl, zlib, makeWrapper }:
+{ stdenv, fetchurl, perl, zlib, makeWrapper }:
 
 let ccache = stdenv.mkDerivation rec {
   name = "ccache-${version}";
diff --git a/pkgs/development/tools/misc/cquery/default.nix b/pkgs/development/tools/misc/cquery/default.nix
index bf979767126..0b86deb5205 100644
--- a/pkgs/development/tools/misc/cquery/default.nix
+++ b/pkgs/development/tools/misc/cquery/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, makeWrapper
+{ fetchFromGitHub, makeWrapper
 , cmake, llvmPackages, ncurses }:
 
 let
diff --git a/pkgs/development/tools/misc/ctags/wrapped.nix b/pkgs/development/tools/misc/ctags/wrapped.nix
index 4df04f44f56..75ae9f1ba8b 100644
--- a/pkgs/development/tools/misc/ctags/wrapped.nix
+++ b/pkgs/development/tools/misc/ctags/wrapped.nix
@@ -1,4 +1,4 @@
-{ pkgs, ctags, writeScriptBin }:
+{ pkgs, ctags }:
 
 with pkgs.stdenv.lib;
 
diff --git a/pkgs/development/tools/misc/dialog/default.nix b/pkgs/development/tools/misc/dialog/default.nix
index 09d1276ed42..591254c73f5 100644
--- a/pkgs/development/tools/misc/dialog/default.nix
+++ b/pkgs/development/tools/misc/dialog/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ncurses, gettext
+{ stdenv, fetchurl, ncurses
 , withLibrary ? false, libtool
 , unicodeSupport ? true
 }:
diff --git a/pkgs/development/tools/misc/fswatch/default.nix b/pkgs/development/tools/misc/fswatch/default.nix
index 4d8a9b05847..a1f33fdfc9e 100644
--- a/pkgs/development/tools/misc/fswatch/default.nix
+++ b/pkgs/development/tools/misc/fswatch/default.nix
@@ -1,7 +1,7 @@
 { stdenv
 , fetchFromGitHub
 , autoreconfHook
-, findutils                     # for xargs
+                     # for xargs
 , gettext
 , libtool
 , makeWrapper
diff --git a/pkgs/development/tools/misc/global/default.nix b/pkgs/development/tools/misc/global/default.nix
index 296d9673d8f..f0f21f8f4d5 100644
--- a/pkgs/development/tools/misc/global/default.nix
+++ b/pkgs/development/tools/misc/global/default.nix
@@ -1,5 +1,5 @@
 { fetchurl, stdenv, libtool, makeWrapper
-, coreutils, ctags, ncurses, pythonPackages, sqlite, universal-ctags, pkgconfig
+, coreutils, ctags, ncurses, pythonPackages, sqlite, universal-ctags
 }:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/development/tools/misc/hydra/default.nix b/pkgs/development/tools/misc/hydra/default.nix
index 4fdd017306a..cf516b16f4b 100644
--- a/pkgs/development/tools/misc/hydra/default.nix
+++ b/pkgs/development/tools/misc/hydra/default.nix
@@ -1,9 +1,9 @@
 { stdenv, nix, perlPackages, buildEnv, releaseTools, fetchFromGitHub
 , makeWrapper, autoconf, automake, libtool, unzip, pkgconfig, sqlite, libpqxx
 , gitAndTools, mercurial, darcs, subversion, bazaar, openssl, bzip2, libxslt
-, guile, perl, postgresql, aws-sdk-cpp, nukeReferences, git, boehmgc
+, guile, perl, postgresql, nukeReferences, git, boehmgc
 , docbook_xsl, openssh, gnused, coreutils, findutils, gzip, lzma, gnutar
-, rpm, dpkg, cdrkit, fetchpatch, pixz }:
+, rpm, dpkg, cdrkit, pixz }:
 
 with stdenv;
 
diff --git a/pkgs/development/tools/misc/intel-gpu-tools/default.nix b/pkgs/development/tools/misc/intel-gpu-tools/default.nix
index 08729f6b41b..d92b20a12b0 100644
--- a/pkgs/development/tools/misc/intel-gpu-tools/default.nix
+++ b/pkgs/development/tools/misc/intel-gpu-tools/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, pkgconfig, libdrm, libpciaccess, cairo, dri2proto, udev
 , libX11, libXext, libXv, libXrandr, glib, bison, libunwind, python3, kmod
-, procps, autoreconfHook, utilmacros, gnome2 }:
+, procps, utilmacros, gnome2 }:
 
 stdenv.mkDerivation rec {
   name = "intel-gpu-tools-1.22";
diff --git a/pkgs/development/tools/misc/linuxkit/default.nix b/pkgs/development/tools/misc/linuxkit/default.nix
index 71bc3b87a7a..27f49ebcf38 100644
--- a/pkgs/development/tools/misc/linuxkit/default.nix
+++ b/pkgs/development/tools/misc/linuxkit/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildGoPackage, go, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "linuxkit-${version}";
diff --git a/pkgs/development/tools/misc/loccount/default.nix b/pkgs/development/tools/misc/loccount/default.nix
index 9205f6caf0d..017c6ad8049 100644
--- a/pkgs/development/tools/misc/loccount/default.nix
+++ b/pkgs/development/tools/misc/loccount/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitLab }:
+{ stdenv, buildGoPackage, fetchFromGitLab }:
 buildGoPackage rec {
   name = "loccount-${version}";
   version = "1.2";
diff --git a/pkgs/development/tools/misc/md2man/default.nix b/pkgs/development/tools/misc/md2man/default.nix
index 208f0ebd411..23b7119e7d7 100644
--- a/pkgs/development/tools/misc/md2man/default.nix
+++ b/pkgs/development/tools/misc/md2man/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, go, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
 with lib;
 
diff --git a/pkgs/development/tools/misc/moby/default.nix b/pkgs/development/tools/misc/moby/default.nix
index e6f7ac3290b..c45e7841d45 100644
--- a/pkgs/development/tools/misc/moby/default.nix
+++ b/pkgs/development/tools/misc/moby/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildGoPackage, go, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "moby-${version}";
diff --git a/pkgs/development/tools/misc/pkgconfig/default.nix b/pkgs/development/tools/misc/pkgconfig/default.nix
index 219281f4ec1..7235af49c2e 100644
--- a/pkgs/development/tools/misc/pkgconfig/default.nix
+++ b/pkgs/development/tools/misc/pkgconfig/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, automake, libiconv, vanilla ? false }:
+{stdenv, fetchurl, libiconv, vanilla ? false }:
 
 with stdenv.lib;
 
diff --git a/pkgs/development/tools/misc/stm32flash/default.nix b/pkgs/development/tools/misc/stm32flash/default.nix
index 3da98f38ebc..553ded815ef 100644
--- a/pkgs/development/tools/misc/stm32flash/default.nix
+++ b/pkgs/development/tools/misc/stm32flash/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, unzip }:
+{ stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   name = "stm32flash-0.5";
diff --git a/pkgs/development/tools/misc/swig/3.x.nix b/pkgs/development/tools/misc/swig/3.x.nix
index 9b4fd05dc0a..48a2e7bd2cb 100644
--- a/pkgs/development/tools/misc/swig/3.x.nix
+++ b/pkgs/development/tools/misc/swig/3.x.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, bison, pcre }:
+{ stdenv, fetchFromGitHub, autoconf, automake, libtool, bison, pcre }:
 
 stdenv.mkDerivation rec {
   name = "swig-${version}";
diff --git a/pkgs/development/tools/misc/teensy-loader-cli/default.nix b/pkgs/development/tools/misc/teensy-loader-cli/default.nix
index 4263b80789a..d6c5256ca84 100644
--- a/pkgs/development/tools/misc/teensy-loader-cli/default.nix
+++ b/pkgs/development/tools/misc/teensy-loader-cli/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, unzip, libusb, fetchgit }:
+{ stdenv, unzip, libusb, fetchgit }:
 let
   version = "2.1";
 in
diff --git a/pkgs/development/tools/misc/trv/default.nix b/pkgs/development/tools/misc/trv/default.nix
index c8747e66e39..11caf8e7b20 100644
--- a/pkgs/development/tools/misc/trv/default.nix
+++ b/pkgs/development/tools/misc/trv/default.nix
@@ -1,6 +1,6 @@
 {stdenv, fetchFromGitHub, ocaml, findlib, camlp4, core_p4, async_p4, async_unix_p4
 , re2_p4, async_extra_p4, sexplib_p4, async_shell, core_extended_p4, async_find
-, cohttp, conduit, magic-mime, tzdata
+, cohttp, conduit, magic-mime
 }:
 
 assert stdenv.lib.versionOlder "4.02" ocaml.version;
diff --git a/pkgs/development/tools/nailgun/default.nix b/pkgs/development/tools/nailgun/default.nix
index dea1ab2a445..6a34c1c130d 100644
--- a/pkgs/development/tools/nailgun/default.nix
+++ b/pkgs/development/tools/nailgun/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchMavenArtifact, fetchFromGitHub, bash, jre, makeWrapper }:
+{ stdenv, fetchMavenArtifact, fetchFromGitHub, jre, makeWrapper }:
 
 let
   version = "0.9.1";
diff --git a/pkgs/development/tools/node-webkit/nw12.nix b/pkgs/development/tools/node-webkit/nw12.nix
index f09dbfdb165..df7630e2d16 100644
--- a/pkgs/development/tools/node-webkit/nw12.nix
+++ b/pkgs/development/tools/node-webkit/nw12.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, buildEnv, makeWrapper
 , xorg, alsaLib, dbus, glib, gtk2, atk, pango, freetype, fontconfig
-, gdk_pixbuf, cairo, zlib, nss, nssTools, nspr, gconf, expat, systemd, libcap
+, gdk_pixbuf, cairo, nss, nspr, gconf, expat, systemd, libcap
 , libnotify}:
 let
   bits = if stdenv.system == "x86_64-linux" then "x64"
diff --git a/pkgs/development/tools/nwjs/default.nix b/pkgs/development/tools/nwjs/default.nix
index fc1513ecf34..6840bcac0dc 100644
--- a/pkgs/development/tools/nwjs/default.nix
+++ b/pkgs/development/tools/nwjs/default.nix
@@ -1,9 +1,9 @@
 { stdenv, fetchurl, buildEnv, makeWrapper
 
-, xorg, alsaLib, dbus, glib, gtk2, gtk3, atk, pango, freetype, fontconfig
-, gdk_pixbuf, cairo, zlib, nss, nssTools, nspr, gconf, expat, systemd, libcap
+, xorg, alsaLib, dbus, glib, gtk3, atk, pango, freetype, fontconfig
+, gdk_pixbuf, cairo, nss, nspr, gconf, expat, systemd, libcap
 , libnotify
-, ffmpeg, libxcb, libXScrnSaver, cups
+, ffmpeg, libxcb, cups
 , sqlite, udev
 }:
 let
diff --git a/pkgs/development/tools/ocaml/camlidl/default.nix b/pkgs/development/tools/ocaml/camlidl/default.nix
index 7cdf7dc9396..7c7bf79acc7 100644
--- a/pkgs/development/tools/ocaml/camlidl/default.nix
+++ b/pkgs/development/tools/ocaml/camlidl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, makeWrapper, ocaml, ncurses, writeText }:
+{ stdenv, fetchurl, ocaml, writeText }:
 
 let
   pname = "camlidl";
diff --git a/pkgs/development/tools/ocaml/opam/default.nix b/pkgs/development/tools/ocaml/opam/default.nix
index aa9feda985a..73b7da119ab 100644
--- a/pkgs/development/tools/ocaml/opam/default.nix
+++ b/pkgs/development/tools/ocaml/opam/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchgit, fetchurl, makeWrapper,
+{ stdenv, lib, fetchurl, makeWrapper,
   ocaml, unzip, ncurses, curl, aspcud
 }:
 
diff --git a/pkgs/development/tools/ocaml/utop/default.nix b/pkgs/development/tools/ocaml/utop/default.nix
index 340c57f2817..74f450a9e3a 100644
--- a/pkgs/development/tools/ocaml/utop/default.nix
+++ b/pkgs/development/tools/ocaml/utop/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, bash, ocaml, findlib, ocamlbuild, jbuilder
+{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, jbuilder
 , lambdaTerm, cppo, makeWrapper
 }:
 
diff --git a/pkgs/development/tools/parsing/bison/3.x.nix b/pkgs/development/tools/parsing/bison/3.x.nix
index 287bb8beb52..469e64acff0 100644
--- a/pkgs/development/tools/parsing/bison/3.x.nix
+++ b/pkgs/development/tools/parsing/bison/3.x.nix
@@ -1,4 +1,4 @@
-{ stdenv, hostPlatform, fetchurl, m4, perl, help2man }:
+{ stdenv, fetchurl, m4, perl, help2man }:
 
 stdenv.mkDerivation rec {
   name = "bison-3.0.5";
diff --git a/pkgs/development/tools/parsing/hammer/default.nix b/pkgs/development/tools/parsing/hammer/default.nix
index 27596878f34..86c1f82678a 100644
--- a/pkgs/development/tools/parsing/hammer/default.nix
+++ b/pkgs/development/tools/parsing/hammer/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, glib, pkgconfig, python, scons, pythonPackages }:
+{ stdenv, fetchgit, glib, pkgconfig, python, scons }:
 
 stdenv.mkDerivation rec {
   name = "hammer-${version}";
diff --git a/pkgs/development/tools/quicktemplate/default.nix b/pkgs/development/tools/quicktemplate/default.nix
index 614ffe5e218..624866ea9e3 100644
--- a/pkgs/development/tools/quicktemplate/default.nix
+++ b/pkgs/development/tools/quicktemplate/default.nix
@@ -1,5 +1,5 @@
 # This file was generated by https://github.com/kamilchm/go2nix v1.2.1
-{ stdenv, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+{ stdenv, buildGoPackage, fetchgit }:
 
 buildGoPackage rec {
   name = "quicktemplate-unstable-${version}";
diff --git a/pkgs/development/tools/redis-dump/default.nix b/pkgs/development/tools/redis-dump/default.nix
index 88c975b5735..55797948a84 100644
--- a/pkgs/development/tools/redis-dump/default.nix
+++ b/pkgs/development/tools/redis-dump/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, bundlerEnv, ruby, perl, autoconf }:
+{ lib, bundlerEnv, ruby, perl, autoconf }:
 
 bundlerEnv {
   name = "redis-dump-0.3.5";
diff --git a/pkgs/development/tools/rtags/default.nix b/pkgs/development/tools/rtags/default.nix
index a2c75a02aa2..da3b27ebacc 100644
--- a/pkgs/development/tools/rtags/default.nix
+++ b/pkgs/development/tools/rtags/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchgit, cmake, llvmPackages, openssl, writeScript, apple_sdk, bash, emacs, pkgconfig }:
+{ stdenv, lib, fetchgit, cmake, llvmPackages, openssl, apple_sdk, emacs, pkgconfig }:
 
 stdenv.mkDerivation rec {
   name = "rtags-${version}";
diff --git a/pkgs/development/tools/rubocop/default.nix b/pkgs/development/tools/rubocop/default.nix
index 850fb5ad7f5..2b9792e4df2 100644
--- a/pkgs/development/tools/rubocop/default.nix
+++ b/pkgs/development/tools/rubocop/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, bundlerEnv, ruby, makeWrapper }:
+{ lib, bundlerEnv, ruby }:
 
 bundlerEnv rec {
   pname = "rubocop";
diff --git a/pkgs/development/tools/rust/rainicorn/default.nix b/pkgs/development/tools/rust/rainicorn/default.nix
index 370318d1ff2..50c890e3c47 100644
--- a/pkgs/development/tools/rust/rainicorn/default.nix
+++ b/pkgs/development/tools/rust/rainicorn/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, rustPlatform, makeWrapper }:
+{ stdenv, fetchFromGitHub, rustPlatform }:
 
 with rustPlatform;
 
diff --git a/pkgs/development/tools/selenium/server/default.nix b/pkgs/development/tools/selenium/server/default.nix
index c3d71e2b2a3..48bfbdd689b 100644
--- a/pkgs/development/tools/selenium/server/default.nix
+++ b/pkgs/development/tools/selenium/server/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, makeWrapper, jre, jdk, gcc, xorg
+{ stdenv, fetchurl, makeWrapper, jre
 , htmlunit-driver, chromedriver, chromeSupport ? true }:
 
 with stdenv.lib;
diff --git a/pkgs/development/tools/slimerjs/default.nix b/pkgs/development/tools/slimerjs/default.nix
index 041aee7a1c5..534c69200e0 100644
--- a/pkgs/development/tools/slimerjs/default.nix
+++ b/pkgs/development/tools/slimerjs/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, fetchgit, fetchFromGitHub, zip, unzip, firefox, bash}:
+{stdenv, fetchFromGitHub, zip, unzip, firefox, bash}:
 let
   s = # Generated upstream information
   rec {
diff --git a/pkgs/development/tools/textql/default.nix b/pkgs/development/tools/textql/default.nix
index f6687f4e432..a3499258a99 100644
--- a/pkgs/development/tools/textql/default.nix
+++ b/pkgs/development/tools/textql/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub, sqlite }:
+{ stdenv, buildGoPackage, fetchFromGitHub, sqlite }:
 
 buildGoPackage rec {
   name = "textql-${version}";
diff --git a/pkgs/development/tools/vim-vint/default.nix b/pkgs/development/tools/vim-vint/default.nix
index 0db25f88d76..ab90bb27bd5 100644
--- a/pkgs/development/tools/vim-vint/default.nix
+++ b/pkgs/development/tools/vim-vint/default.nix
@@ -1,4 +1,4 @@
-{ fetchFromGitHub, lib, python3Packages, stdenv }:
+{ fetchFromGitHub, lib, python3Packages }:
 
 with python3Packages;
 
diff --git a/pkgs/development/tools/vndr/default.nix b/pkgs/development/tools/vndr/default.nix
index 2a4ddaf8039..0fbcd7b71a6 100644
--- a/pkgs/development/tools/vndr/default.nix
+++ b/pkgs/development/tools/vndr/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "vndr-${version}";
diff --git a/pkgs/development/tools/ws/default.nix b/pkgs/development/tools/ws/default.nix
index b99780d4138..17c64f0548b 100644
--- a/pkgs/development/tools/ws/default.nix
+++ b/pkgs/development/tools/ws/default.nix
@@ -1,5 +1,5 @@
 # This file was generated by https://github.com/kamilchm/go2nix v1.2.1
-{ stdenv, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+{ stdenv, buildGoPackage, fetchgit }:
 
 buildGoPackage rec {
   name = "ws-${version}";
diff --git a/pkgs/development/tools/xcbuild/wrapper.nix b/pkgs/development/tools/xcbuild/wrapper.nix
index f8b1c1bf31e..6a3267b7c34 100644
--- a/pkgs/development/tools/xcbuild/wrapper.nix
+++ b/pkgs/development/tools/xcbuild/wrapper.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildPackages, makeWrapper, writeText, runCommand
+{ lib, buildPackages, makeWrapper, writeText, runCommand
 , CoreServices, ImageIO, CoreGraphics
 , targetPlatform
 , xcodePlatform ? targetPlatform.xcodePlatform or "MacOSX"
diff --git a/pkgs/development/tools/xib2nib/default.nix b/pkgs/development/tools/xib2nib/default.nix
index d585a35b0bc..4d62f5b8571 100644
--- a/pkgs/development/tools/xib2nib/default.nix
+++ b/pkgs/development/tools/xib2nib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, callPackage, fetchFromGitHub, pugixml, boost, PlistCpp }:
+{ stdenv, fetchFromGitHub, pugixml, boost, PlistCpp }:
 
 stdenv.mkDerivation {
   name = "xib2nib-730e177";
diff --git a/pkgs/development/tools/yq/default.nix b/pkgs/development/tools/yq/default.nix
index 52231d0a831..a08e01a48b7 100644
--- a/pkgs/development/tools/yq/default.nix
+++ b/pkgs/development/tools/yq/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildPythonApplication, fetchPypi, pyyaml, xmltodict, jq }:
+{ lib, buildPythonApplication, fetchPypi, pyyaml, xmltodict, jq }:
 
 buildPythonApplication rec {
   pname = "yq";
diff --git a/pkgs/development/web/minify/default.nix b/pkgs/development/web/minify/default.nix
index 0220fbd8df8..e63f609fc2b 100644
--- a/pkgs/development/web/minify/default.nix
+++ b/pkgs/development/web/minify/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoPackage, fetchFromGitHub }:
+{ buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "minify-${version}";
diff --git a/pkgs/development/web/postman/default.nix b/pkgs/development/web/postman/default.nix
index c51e1595ee7..4b45251cde5 100644
--- a/pkgs/development/web/postman/default.nix
+++ b/pkgs/development/web/postman/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, gnome2, fetchurl, pkgs, xorg, udev, makeWrapper, makeDesktopItem }:
+{ stdenv, lib, gnome2, fetchurl, pkgs, xorg, makeWrapper, makeDesktopItem }:
 
 stdenv.mkDerivation rec {
   name = "postman-${version}";
diff --git a/pkgs/games/0ad/game.nix b/pkgs/games/0ad/game.nix
index 0cf1b6f5e67..d05f19d3171 100644
--- a/pkgs/games/0ad/game.nix
+++ b/pkgs/games/0ad/game.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, callPackage, perl, fetchurl, python2
+{ stdenv, lib, perl, fetchurl, python2
 , pkgconfig, spidermonkey_38, boost, icu, libxml2, libpng, libsodium
 , libjpeg, zlib, curl, libogg, libvorbis, enet, miniupnpc
 , openal, libGLU_combined, xproto, libX11, libXcursor, nspr, SDL2
diff --git a/pkgs/games/90secondportraits/default.nix b/pkgs/games/90secondportraits/default.nix
index 0ada8d64685..f2be128fd99 100644
--- a/pkgs/games/90secondportraits/default.nix
+++ b/pkgs/games/90secondportraits/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, unzip, love, lua, makeWrapper, makeDesktopItem }:
+{ stdenv, fetchurl, love, lua, makeWrapper, makeDesktopItem }:
 
 let
   pname = "90secondportraits";
diff --git a/pkgs/games/commandergenius/default.nix b/pkgs/games/commandergenius/default.nix
index 70413f0f941..2abc46690e9 100644
--- a/pkgs/games/commandergenius/default.nix
+++ b/pkgs/games/commandergenius/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, SDL2, SDL2_image, pkgconfig
+{ stdenv, fetchFromGitHub, SDL2, SDL2_image, pkgconfig
 , libvorbis, libGL, boost, cmake, zlib, curl, SDL2_mixer, python3
 }:
 
diff --git a/pkgs/games/dwarf-fortress/default.nix b/pkgs/games/dwarf-fortress/default.nix
index d9a5df73f17..cb75b680270 100644
--- a/pkgs/games/dwarf-fortress/default.nix
+++ b/pkgs/games/dwarf-fortress/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, stdenv, stdenvNoCC, buildEnv, gccStdenv, lib, recurseIntoAttrs }:
+{ pkgs, stdenv, stdenvNoCC, gccStdenv, lib, recurseIntoAttrs }:
 
 # To whomever it may concern:
 #
@@ -60,9 +60,7 @@ let
     legends-browser = callPackage ./legends-browser {};
 
     twbt = callPackage ./twbt {};
-    themes = recurseIntoAttrs (callPackage ./themes {
-      stdenv = stdenvNoCC;
-    });
+    themes = recurseIntoAttrs (callPackage ./themes { });
 
     # aliases
     phoebus-theme = themes.phoebus;
diff --git a/pkgs/games/dwarf-fortress/dfhack/default.nix b/pkgs/games/dwarf-fortress/dfhack/default.nix
index baad4529844..f781b0a71de 100644
--- a/pkgs/games/dwarf-fortress/dfhack/default.nix
+++ b/pkgs/games/dwarf-fortress/dfhack/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildEnv, hostPlatform, lib, fetchurl, fetchFromGitHub, cmake, writeScriptBin, callPackage
+{ stdenv, buildEnv, lib, fetchFromGitHub, cmake, writeScriptBin
 , perl, XMLLibXML, XMLLibXSLT, zlib
 , enableStoneSense ? false,  allegro5, libGLU_combined
 , enableTWBT ? true, twbt
diff --git a/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix b/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix
index 5e92bbb285b..4236d6bab98 100644
--- a/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix
+++ b/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, coreutils, qtbase
+{ stdenv, fetchFromGitHub, qtbase
 , qtdeclarative, cmake, texlive, ninja }:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix b/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix
index 54f0f0405ac..322a21ec3ad 100644
--- a/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix
+++ b/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix
@@ -1,4 +1,4 @@
-{ stdenv, symlinkJoin, lib, dwarf-therapist, dwarf-fortress, makeWrapper }:
+{ stdenv, symlinkJoin, dwarf-therapist, dwarf-fortress, makeWrapper }:
 
 let
   platformSlug = if stdenv.targetPlatform.is32bit then
diff --git a/pkgs/games/dwarf-fortress/lazy-pack.nix b/pkgs/games/dwarf-fortress/lazy-pack.nix
index 3aa9e573f61..3e0d3dcc6d7 100644
--- a/pkgs/games/dwarf-fortress/lazy-pack.nix
+++ b/pkgs/games/dwarf-fortress/lazy-pack.nix
@@ -1,4 +1,4 @@
-{ stdenvNoCC, lib, buildEnv, callPackage
+{ stdenvNoCC, lib, buildEnv
 , dwarf-fortress, themes
   # This package should, at any given time, provide an opinionated "optimal"
   # DF experience. It's the equivalent of the Lazy Newbie Pack, that is, and
diff --git a/pkgs/games/dwarf-fortress/themes/default.nix b/pkgs/games/dwarf-fortress/themes/default.nix
index 5caaa9e05ca..0b8eb23a7b9 100644
--- a/pkgs/games/dwarf-fortress/themes/default.nix
+++ b/pkgs/games/dwarf-fortress/themes/default.nix
@@ -1,4 +1,4 @@
-{stdenv, lib, fetchFromGitHub}:
+{lib, fetchFromGitHub}:
 
 with builtins;
 
diff --git a/pkgs/games/gcs/default.nix b/pkgs/games/gcs/default.nix
index defee04e5c2..b718a92143c 100644
--- a/pkgs/games/gcs/default.nix
+++ b/pkgs/games/gcs/default.nix
@@ -1,7 +1,6 @@
 { stdenv, fetchFromGitHub, runCommand
 , jdk8, ant
 , jre8, makeWrapper
-, findutils
 }:
 
 let
diff --git a/pkgs/games/gzdoom/default.nix b/pkgs/games/gzdoom/default.nix
index df1dd47905e..ae1db1d8b4a 100644
--- a/pkgs/games/gzdoom/default.nix
+++ b/pkgs/games/gzdoom/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, zdoom, makeWrapper
+{ stdenv, fetchFromGitHub, cmake, makeWrapper
 , openal, fluidsynth, soundfont-fluid, libGL, SDL2
 , bzip2, zlib, libjpeg, libsndfile, mpg123, game-music-emu }:
 
diff --git a/pkgs/games/meritous/default.nix b/pkgs/games/meritous/default.nix
index 8d49d38b415..21d2ad87dfb 100644
--- a/pkgs/games/meritous/default.nix
+++ b/pkgs/games/meritous/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitLab, SDL, SDL_image, SDL_mixer, zlib, binutils }:
+{ stdenv, fetchFromGitLab, SDL, SDL_image, SDL_mixer, zlib }:
 
 stdenv.mkDerivation rec {
   name = "meritous-${version}";
diff --git a/pkgs/games/mnemosyne/default.nix b/pkgs/games/mnemosyne/default.nix
index a5b34933492..7c32d7faa3c 100644
--- a/pkgs/games/mnemosyne/default.nix
+++ b/pkgs/games/mnemosyne/default.nix
@@ -1,5 +1,4 @@
-{ stdenv
-, fetchurl
+{ fetchurl
 , python
 }:
 
diff --git a/pkgs/games/mrrescue/default.nix b/pkgs/games/mrrescue/default.nix
index a693c79e8ce..aa4a06bc7d2 100644
--- a/pkgs/games/mrrescue/default.nix
+++ b/pkgs/games/mrrescue/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, unzip, love, lua, makeWrapper, makeDesktopItem }:
+{ stdenv, fetchurl, love, lua, makeWrapper, makeDesktopItem }:
 
 let
   pname = "mrrescue";
diff --git a/pkgs/games/nethack/default.nix b/pkgs/games/nethack/default.nix
index db959177eb5..d4ad1119b9f 100644
--- a/pkgs/games/nethack/default.nix
+++ b/pkgs/games/nethack/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, writeScript, coreutils, ncurses, gzip, flex, bison
+{ stdenv, lib, fetchurl, coreutils, ncurses, gzip, flex, bison
 , less, makeWrapper
 , x11Mode ? false, qtMode ? false, libXaw, libXext, mkfontdir, pkgconfig, qt5
 }:
diff --git a/pkgs/games/opendune/default.nix b/pkgs/games/opendune/default.nix
index 7b848086794..0f045faf371 100644
--- a/pkgs/games/opendune/default.nix
+++ b/pkgs/games/opendune/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, SDL, SDL_image, SDL_mixer, binutils }:
+{ stdenv, fetchFromGitHub, SDL, SDL_image, SDL_mixer }:
 
 # - set the opendune configuration at ~/.config/opendune/opendune.ini:
 #     [opendune]
diff --git a/pkgs/games/openmw/default.nix b/pkgs/games/openmw/default.nix
index 8080c959638..4d01feaccc0 100644
--- a/pkgs/games/openmw/default.nix
+++ b/pkgs/games/openmw/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, qt4, openscenegraph, mygui, bullet, ffmpeg, boost, cmake, SDL2, unshield, openal
-, giflib, libXt, pkgconfig }:
+, libXt, pkgconfig }:
 
 let
   openscenegraph_ = openscenegraph.overrideDerivation (self: {
diff --git a/pkgs/games/openrct2/default.nix b/pkgs/games/openrct2/default.nix
index 9e67c7847f8..e5783ec5396 100644
--- a/pkgs/games/openrct2/default.nix
+++ b/pkgs/games/openrct2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchFromGitHub,
+{ stdenv, fetchFromGitHub,
   SDL2, cmake, curl, fontconfig, freetype, icu, jansson, libiconv, libpng,
   libpthreadstubs, libzip, libGLU, openssl, pkgconfig, speexdsp, zlib
 }:
diff --git a/pkgs/games/openspades/default.nix b/pkgs/games/openspades/default.nix
index 582cafcc4d4..b4757265555 100644
--- a/pkgs/games/openspades/default.nix
+++ b/pkgs/games/openspades/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, fetchFromGitHub, cmake, unzip, zip, file
+{ stdenv, fetchurl, fetchFromGitHub, cmake, unzip, zip, file
 , curl, glew , libGL, SDL2, SDL2_image, zlib, freetype, imagemagick
 , openal , opusfile, libogg
 }:
diff --git a/pkgs/games/openxcom/default.nix b/pkgs/games/openxcom/default.nix
index a936ca13412..9a82c678f37 100644
--- a/pkgs/games/openxcom/default.nix
+++ b/pkgs/games/openxcom/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchFromGitHub, fetchpatch, cmake, libGLU_combined, zlib, openssl, libyamlcpp, boost
+{stdenv, fetchFromGitHub, cmake, libGLU_combined, zlib, openssl, libyamlcpp, boost
 , SDL, SDL_image, SDL_mixer, SDL_gfx }:
 
 let version = "1.0.0.2018.01.28"; in
diff --git a/pkgs/games/pokerth/default.nix b/pkgs/games/pokerth/default.nix
index 122ce3f6e2f..aae49eedd7c 100644
--- a/pkgs/games/pokerth/default.nix
+++ b/pkgs/games/pokerth/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, qmake4Hook, qt4, protobuf, boost155, tinyxml2, libgcrypt, sqlite, gsasl, curl, SDL, SDL_mixer, libircclient }:
+{ stdenv, fetchFromGitHub, qmake4Hook, qt4, protobuf, boost155, tinyxml2, libgcrypt, sqlite, gsasl, curl, SDL, SDL_mixer, libircclient }:
 
 let boost = boost155;
 in stdenv.mkDerivation rec {
diff --git a/pkgs/games/quake3/wrapper/default.nix b/pkgs/games/quake3/wrapper/default.nix
index 69b166664be..4ab53d67732 100644
--- a/pkgs/games/quake3/wrapper/default.nix
+++ b/pkgs/games/quake3/wrapper/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildEnv, lib, fetchurl, libGL, ioquake3, makeWrapper }:
+{ stdenv, buildEnv, lib, libGL, ioquake3, makeWrapper }:
 
 { paks, name ? (stdenv.lib.head paks).name, description ? "" }:
 
diff --git a/pkgs/games/rigsofrods/default.nix b/pkgs/games/rigsofrods/default.nix
index a038957f701..e75698e7279 100644
--- a/pkgs/games/rigsofrods/default.nix
+++ b/pkgs/games/rigsofrods/default.nix
@@ -1,5 +1,5 @@
-{ fetchurl, fetchFromGitHub, stdenv, wxGTK30, freeimage, cmake, zziplib, libGLU_combined, boost,
-  pkgconfig, libuuid, openal, ogre, ois, curl, gtk2, pixman, mygui, unzip,
+{ fetchFromGitHub, stdenv, wxGTK30, freeimage, cmake, zziplib, libGLU_combined, boost,
+  pkgconfig, libuuid, openal, ogre, ois, curl, gtk2, mygui, unzip,
   angelscript, ogrepaged, mysocketw, libxcb
   }:
 
diff --git a/pkgs/games/sienna/default.nix b/pkgs/games/sienna/default.nix
index 2636bc9e799..58ed85c79fd 100644
--- a/pkgs/games/sienna/default.nix
+++ b/pkgs/games/sienna/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, unzip, love, lua, makeWrapper, makeDesktopItem }:
+{ stdenv, fetchurl, love, lua, makeWrapper, makeDesktopItem }:
 
 let
   pname = "sienna";
diff --git a/pkgs/games/spring/default.nix b/pkgs/games/spring/default.nix
index 83a85415664..1dcf432ccd4 100644
--- a/pkgs/games/spring/default.nix
+++ b/pkgs/games/spring/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, cmake, lzma, boost, libdevil, zlib, p7zip
-, openal, libvorbis, glew, freetype, xorg, SDL2, libGLU_combined, binutils
+, openal, libvorbis, glew, freetype, xorg, SDL2, libGLU_combined
 , asciidoc, libxslt, docbook_xsl, docbook_xsl_ns, curl, makeWrapper
 , jdk ? null, python ? null, systemd, libunwind, which, minizip
 , withAI ? true # support for AI Interfaces and Skirmish AIs
diff --git a/pkgs/games/spring/springlobby.nix b/pkgs/games/spring/springlobby.nix
index 2000398b537..632a047e96c 100644
--- a/pkgs/games/spring/springlobby.nix
+++ b/pkgs/games/spring/springlobby.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, cmake, wxGTK30, openal, pkgconfig, curl, libtorrentRasterbar
-, libpng, libX11, gettext, bash, gawk, boost, libnotify, gtk2, doxygen, spring
+, libpng, libX11, gettext, boost, libnotify, gtk2, doxygen, spring
 , makeWrapper, glib, minizip, alure, pcre, jsoncpp }:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/games/stepmania/default.nix b/pkgs/games/stepmania/default.nix
index d51d1bb154d..4f9406abd83 100644
--- a/pkgs/games/stepmania/default.nix
+++ b/pkgs/games/stepmania/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchpatch, fetchFromGitHub, cmake, nasm
+{ stdenv, lib, fetchFromGitHub, cmake, nasm
 , gtk2, glib, ffmpeg, alsaLib, libmad, libogg, libvorbis
 , glew, libpulseaudio, udev
 }:
diff --git a/pkgs/games/tibia/default.nix b/pkgs/games/tibia/default.nix
index e0f9bae2e39..cfef1ed0db2 100644
--- a/pkgs/games/tibia/default.nix
+++ b/pkgs/games/tibia/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, patchelf, glibc, libX11, libGLU_combined }:
+{ stdenv, fetchurl, glibc, libX11, libGLU_combined }:
 
 with stdenv.lib;
 stdenv.mkDerivation {
diff --git a/pkgs/games/torcs/default.nix b/pkgs/games/torcs/default.nix
index 522a1a2857d..b941f3bd2e0 100644
--- a/pkgs/games/torcs/default.nix
+++ b/pkgs/games/torcs/default.nix
@@ -1,6 +1,6 @@
 { fetchpatch, fetchurl, stdenv, libGLU, freeglut, libX11, plib, openal, freealut, libXrandr, xproto,
 libXext, libSM, libICE, libXi, libXt, libXrender, libXxf86vm, libvorbis,
-libpng, zlib, bash, makeWrapper }:
+libpng, zlib, makeWrapper }:
 
 stdenv.mkDerivation rec {
   name = "torcs-1.3.7";
diff --git a/pkgs/games/uqm/default.nix b/pkgs/games/uqm/default.nix
index dd60c0efb59..00592f7c39b 100644
--- a/pkgs/games/uqm/default.nix
+++ b/pkgs/games/uqm/default.nix
@@ -1,5 +1,5 @@
 { stdenv, lib, fetchurl, pkgconfig, libGLU_combined
-, SDL, SDL_image, libpng, zlib, libvorbis, libogg, libmikmod
+, SDL, SDL_image, libpng, libvorbis, libogg, libmikmod
 
 , use3DOVideos ? false, requireFile ? null, writeText ? null
 , haskellPackages ? null
diff --git a/pkgs/games/vdrift/default.nix b/pkgs/games/vdrift/default.nix
index ce20d1b3f17..7e43fbf2c88 100644
--- a/pkgs/games/vdrift/default.nix
+++ b/pkgs/games/vdrift/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, fetchsvn, pkgconfig, scons, libGLU_combined, SDL2, SDL2_image
-, libvorbis, bullet, curl, gettext, writeTextFile, writeShellScriptBin
+, libvorbis, bullet, curl, gettext, writeTextFile
 
 , data ? fetchsvn {
     url = "svn://svn.code.sf.net/p/vdrift/code/vdrift-data";
diff --git a/pkgs/games/wesnoth/default.nix b/pkgs/games/wesnoth/default.nix
index 45b4e5a5891..75afddf52c8 100644
--- a/pkgs/games/wesnoth/default.nix
+++ b/pkgs/games/wesnoth/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, cmake, pkgconfig, SDL2, SDL2_image, SDL2_mixer, SDL2_net, SDL2_ttf
-, pango, gettext, boost, freetype, libvorbis, fribidi, dbus, libpng, pcre, openssl, icu
+, pango, gettext, boost, libvorbis, fribidi, dbus, libpng, pcre, openssl, icu
 , Cocoa, Foundation
 , enableTools ? false
 }:
diff --git a/pkgs/games/widelands/default.nix b/pkgs/games/widelands/default.nix
index 222275a2ba1..1e2c17814d6 100644
--- a/pkgs/games/widelands/default.nix
+++ b/pkgs/games/widelands/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, cmake, python, gettext
 , boost, libpng, zlib, glew, lua, doxygen, icu
-, SDL2, SDL2_image, SDL2_mixer, SDL2_net, SDL2_ttf, SDL2_gfx
+, SDL2, SDL2_image, SDL2_mixer, SDL2_net, SDL2_ttf
 }:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/games/worldofgoo/default.nix b/pkgs/games/worldofgoo/default.nix
index af76e85346f..9684f3b876a 100644
--- a/pkgs/games/worldofgoo/default.nix
+++ b/pkgs/games/worldofgoo/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, config, requireFile, fetchurl
+{ stdenv, requireFile
 , libX11, libXext, libXau, libxcb, libXdmcp , SDL, SDL_mixer, libvorbis, libGLU_combined
 , demo ? false }:
 
diff --git a/pkgs/games/xonotic/default.nix b/pkgs/games/xonotic/default.nix
index 6d9ae55e639..ac7bf7973d7 100644
--- a/pkgs/games/xonotic/default.nix
+++ b/pkgs/games/xonotic/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl
 , # required for both
-  unzip, libjpeg, zlib, libvorbis, curl, patchelf
+  unzip, libjpeg, zlib, libvorbis, curl
 , # glx
   libX11, libGLU_combined, libXpm, libXext, libXxf86vm, alsaLib
 , # sdl
diff --git a/pkgs/games/zandronum/sqlite.nix b/pkgs/games/zandronum/sqlite.nix
index 35fcb4a0eec..3d60dab6fe0 100644
--- a/pkgs/games/zandronum/sqlite.nix
+++ b/pkgs/games/zandronum/sqlite.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, unzip }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation {
   name = "sqlite-zandronum-3.0";
diff --git a/pkgs/misc/cups/drivers/brlaser/default.nix b/pkgs/misc/cups/drivers/brlaser/default.nix
index 0f5ee05349d..1786a4996a3 100644
--- a/pkgs/misc/cups/drivers/brlaser/default.nix
+++ b/pkgs/misc/cups/drivers/brlaser/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, zlib, cups, ghostscript }:
+{ stdenv, fetchFromGitHub, cmake, zlib, cups }:
 
 stdenv.mkDerivation rec {
 
diff --git a/pkgs/misc/cups/drivers/hl1110/default.nix b/pkgs/misc/cups/drivers/hl1110/default.nix
index 6f27985bdbf..701d4b6a100 100644
--- a/pkgs/misc/cups/drivers/hl1110/default.nix
+++ b/pkgs/misc/cups/drivers/hl1110/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, cups, dpkg, gnused, makeWrapper, ghostscript, file, a2ps, coreutils, gawk, patchelf}:
+{stdenv, fetchurl, cups, dpkg, gnused, makeWrapper, ghostscript, file, a2ps, coreutils, gawk}:
 
 let
   version = "3.0.1-1";
diff --git a/pkgs/misc/cups/drivers/mfcj470dwlpr/default.nix b/pkgs/misc/cups/drivers/mfcj470dwlpr/default.nix
index c5b63b07318..f69c972c999 100644
--- a/pkgs/misc/cups/drivers/mfcj470dwlpr/default.nix
+++ b/pkgs/misc/cups/drivers/mfcj470dwlpr/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cups, dpkg, ghostscript, patchelf, a2ps, coreutils, gnused, gawk, file, makeWrapper }:
+{ stdenv, fetchurl, cups, dpkg, ghostscript, a2ps, coreutils, gnused, gawk, file, makeWrapper }:
 
 stdenv.mkDerivation rec {
   name = "mfcj470dw-cupswrapper-${version}";
diff --git a/pkgs/misc/cups/drivers/mfcj6510dwlpr/default.nix b/pkgs/misc/cups/drivers/mfcj6510dwlpr/default.nix
index 40e65136f1b..ff71df5dc1b 100644
--- a/pkgs/misc/cups/drivers/mfcj6510dwlpr/default.nix
+++ b/pkgs/misc/cups/drivers/mfcj6510dwlpr/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgsi686Linux, dpkg, makeWrapper, coreutils, gnused, gawk, file, cups, patchelf, utillinux, xxd
+{ stdenv, fetchurl, pkgsi686Linux, dpkg, makeWrapper, coreutils, gnused, gawk, file, cups, utillinux, xxd
 , ghostscript, a2ps }:
 
 # Why:
diff --git a/pkgs/misc/cups/drivers/samsung/default.nix b/pkgs/misc/cups/drivers/samsung/default.nix
index e8da0541f6c..48636e1f76a 100644
--- a/pkgs/misc/cups/drivers/samsung/default.nix
+++ b/pkgs/misc/cups/drivers/samsung/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, glibc, cups, libusb, libxml2, ghostscript }:
+{ stdenv, fetchurl, cups, libusb, libxml2 }:
 
 let
 
diff --git a/pkgs/misc/cups/drivers/splix/default.nix b/pkgs/misc/cups/drivers/splix/default.nix
index 2cdaca8d783..bde918a7c48 100644
--- a/pkgs/misc/cups/drivers/splix/default.nix
+++ b/pkgs/misc/cups/drivers/splix/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchsvn, fetchurl, cups, zlib }:
+{ stdenv, fetchsvn, cups, zlib }:
 let rev = "315"; in
 stdenv.mkDerivation rec {
   name = "splix-svn-${rev}";
diff --git a/pkgs/misc/cups/filters.nix b/pkgs/misc/cups/filters.nix
index d15680b6363..d85331e7882 100644
--- a/pkgs/misc/cups/filters.nix
+++ b/pkgs/misc/cups/filters.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, cups, poppler, poppler_utils, fontconfig
-, libjpeg, libpng, perl, ijs, qpdf, dbus, substituteAll, bash, avahi
+, libjpeg, libpng, perl, ijs, qpdf, dbus, avahi
 , makeWrapper, coreutils, gnused, bc, gawk, gnugrep, which, ghostscript
 , mupdf
 }:
diff --git a/pkgs/misc/drivers/epson-alc1100/default.nix b/pkgs/misc/drivers/epson-alc1100/default.nix
index 88b88f59afc..1dac6034fda 100644
--- a/pkgs/misc/drivers/epson-alc1100/default.nix
+++ b/pkgs/misc/drivers/epson-alc1100/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, stdenv_32bit, fetchurl, cups, pkgsi686Linux, dpkg, psutils, makeWrapper, ghostscript, bash }:
+{ stdenv, fetchurl, cups, pkgsi686Linux, dpkg, psutils, makeWrapper, ghostscript, bash }:
 
 let
   version = "1.2-0";
diff --git a/pkgs/misc/drivers/hplip/3.16.11.nix b/pkgs/misc/drivers/hplip/3.16.11.nix
index 37f2361b45e..91dce834a4b 100644
--- a/pkgs/misc/drivers/hplip/3.16.11.nix
+++ b/pkgs/misc/drivers/hplip/3.16.11.nix
@@ -1,8 +1,7 @@
 { stdenv, fetchurl, substituteAll
 , pkgconfig
-, makeWrapper
-, cups, zlib, libjpeg, libusb1, pythonPackages, sane-backends, dbus, usbutils
-, net_snmp, openssl, polkit, nettools
+, cups, libjpeg, libusb1, pythonPackages, sane-backends, dbus, usbutils
+, net_snmp, openssl, nettools
 , bash, coreutils, utillinux
 , qtSupport ? true
 , withPlugin ? false
diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix
index 4b88d4a96fa..59a75dab883 100644
--- a/pkgs/misc/drivers/hplip/default.nix
+++ b/pkgs/misc/drivers/hplip/default.nix
@@ -1,9 +1,8 @@
 { stdenv, fetchurl, substituteAll
 , pkgconfig
-, makeWrapper
 , cups, zlib, libjpeg, libusb1, pythonPackages, sane-backends
 , dbus, file, ghostscript, usbutils
-, net_snmp, openssl, perl, polkit, nettools
+, net_snmp, openssl, perl, nettools
 , bash, coreutils, utillinux
 , withQt5 ? true
 , withPlugin ? false
diff --git a/pkgs/misc/drivers/postscript-lexmark/default.nix b/pkgs/misc/drivers/postscript-lexmark/default.nix
index f4110458062..a7d5710a279 100644
--- a/pkgs/misc/drivers/postscript-lexmark/default.nix
+++ b/pkgs/misc/drivers/postscript-lexmark/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, rpmextract }:
+{ stdenv, fetchurl, rpmextract }:
 let
   version = "20160218";
 in
diff --git a/pkgs/misc/emulators/cdemu/analyzer.nix b/pkgs/misc/emulators/cdemu/analyzer.nix
index e0fe451ce24..64b485bea31 100644
--- a/pkgs/misc/emulators/cdemu/analyzer.nix
+++ b/pkgs/misc/emulators/cdemu/analyzer.nix
@@ -1,4 +1,4 @@
-{ callPackage, gtk3, glib, libxml2, gnuplot, makeWrapper, stdenv, gnome3, gdk_pixbuf, librsvg, intltool }:
+{ callPackage, gtk3, glib, libxml2, gnuplot, makeWrapper, gnome3, gdk_pixbuf, librsvg, intltool }:
 let pkg = import ./base.nix {
   version = "3.1.0";
   pkgName = "image-analyzer";
diff --git a/pkgs/misc/emulators/cdemu/gui.nix b/pkgs/misc/emulators/cdemu/gui.nix
index d6c85c53b42..9403a969e8f 100644
--- a/pkgs/misc/emulators/cdemu/gui.nix
+++ b/pkgs/misc/emulators/cdemu/gui.nix
@@ -1,4 +1,4 @@
-{ callPackage, pythonPackages, gtk3, glib, libnotify, intltool, makeWrapper, gobjectIntrospection, gnome3, gdk_pixbuf, librsvg }:
+{ callPackage, pythonPackages, gtk3, glib, libnotify, intltool, makeWrapper, gnome3, gdk_pixbuf, librsvg }:
 let
   pkg = import ./base.nix {
     version = "3.1.0";
diff --git a/pkgs/misc/emulators/cdemu/vhba.nix b/pkgs/misc/emulators/cdemu/vhba.nix
index 081846f78e3..73ef7bc6a18 100644
--- a/pkgs/misc/emulators/cdemu/vhba.nix
+++ b/pkgs/misc/emulators/cdemu/vhba.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, kernel, libelf }:
+{ stdenv, fetchurl, kernel }:
 
 stdenv.mkDerivation rec {
   name = "vhba-${version}";
diff --git a/pkgs/misc/emulators/dosbox/unstable.nix b/pkgs/misc/emulators/dosbox/unstable.nix
index 86dfd25d175..aecfd7698f0 100644
--- a/pkgs/misc/emulators/dosbox/unstable.nix
+++ b/pkgs/misc/emulators/dosbox/unstable.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchsvn, SDL, SDL_net, SDL_sound, libpng, makeDesktopItem, libGLU_combined, autoreconfHook }:
+{ stdenv, fetchsvn, SDL, SDL_net, SDL_sound, libpng, makeDesktopItem, libGLU_combined, autoreconfHook }:
 
 let revision = "4025";
     revisionDate = "2017-07-02";
diff --git a/pkgs/misc/emulators/epsxe/default.nix b/pkgs/misc/emulators/epsxe/default.nix
index a0999e6caf5..5de8ac46b90 100644
--- a/pkgs/misc/emulators/epsxe/default.nix
+++ b/pkgs/misc/emulators/epsxe/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, alsaLib, curl, gdk_pixbuf, gcc, glib, gtk3,
+{ stdenv, fetchurl, alsaLib, curl, gdk_pixbuf, glib, gtk3,
   libX11, openssl, ncurses5, SDL, SDL_ttf, unzip, zlib, wrapGAppsHook }:
 
 with stdenv.lib;
diff --git a/pkgs/misc/emulators/mupen64plus/default.nix b/pkgs/misc/emulators/mupen64plus/default.nix
index 7de9b576ef3..9ff99110ecc 100644
--- a/pkgs/misc/emulators/mupen64plus/default.nix
+++ b/pkgs/misc/emulators/mupen64plus/default.nix
@@ -1,4 +1,4 @@
-{stdenv, lib, fetchurl, boost, dash, freetype, libpng, pkgconfig, SDL, which, zlib }:
+{stdenv, fetchurl, boost, dash, freetype, libpng, pkgconfig, SDL, which, zlib }:
 
 stdenv.mkDerivation rec {
   name = "mupen64plus-${version}";
diff --git a/pkgs/misc/emulators/nestopia/default.nix b/pkgs/misc/emulators/nestopia/default.nix
index 8a366ba737f..9eb353ede58 100644
--- a/pkgs/misc/emulators/nestopia/default.nix
+++ b/pkgs/misc/emulators/nestopia/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig, SDL2, alsaLib, gtk3
-, makeWrapper, libGLU_combined, libarchive, libao, unzip, xdg_utils, gsettings-desktop-schemas
+{ stdenv, fetchFromGitHub, pkgconfig, SDL2, alsaLib, gtk3
+, makeWrapper, libGLU_combined, libarchive, libao, unzip, xdg_utils
 , epoxy, gdk_pixbuf, gnome3, wrapGAppsHook
 }:
 
diff --git a/pkgs/misc/emulators/qmc2/default.nix b/pkgs/misc/emulators/qmc2/default.nix
index 2e47cead8ec..65cc0bd9c05 100644
--- a/pkgs/misc/emulators/qmc2/default.nix
+++ b/pkgs/misc/emulators/qmc2/default.nix
@@ -1,5 +1,5 @@
 { stdenv
-, fetchurl, qmake, qttools, pkgconfig
+, fetchurl, qttools, pkgconfig
 , minizip, zlib
 , qtbase, qtsvg, qtmultimedia, qtwebkit, qttranslations, qtxmlpatterns
 , rsync, SDL2, xwininfo
diff --git a/pkgs/misc/emulators/retrofe/default.nix b/pkgs/misc/emulators/retrofe/default.nix
index ffc494dad4c..40c1fcc6fde 100644
--- a/pkgs/misc/emulators/retrofe/default.nix
+++ b/pkgs/misc/emulators/retrofe/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchhg, cmake, dos2unix, glib, gst_all_1, makeWrapper, pkgconfig
+{ stdenv, fetchhg, cmake, glib, gst_all_1, makeWrapper, pkgconfig
 , python, SDL2, SDL2_image, SDL2_mixer, SDL2_ttf, sqlite, zlib
 }:
 
diff --git a/pkgs/misc/emulators/vbam/default.nix b/pkgs/misc/emulators/vbam/default.nix
index 66ea5b12575..ac078f62251 100644
--- a/pkgs/misc/emulators/vbam/default.nix
+++ b/pkgs/misc/emulators/vbam/default.nix
@@ -5,10 +5,6 @@
 , ffmpeg
 , gettext
 , gtk2-x11
-, libpng
-, libpthreadstubs
-, libXdmcp
-, libxshmfence
 , libGLU_combined
 , openal
 , pkgconfig
diff --git a/pkgs/misc/emulators/vice/default.nix b/pkgs/misc/emulators/vice/default.nix
index 010c4721dc2..ae8fbe9e1f5 100644
--- a/pkgs/misc/emulators/vice/default.nix
+++ b/pkgs/misc/emulators/vice/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, bison, flex, perl, libpng, giflib, libjpeg, alsaLib, readline, libGLU_combined, libX11, libXaw
+{ stdenv, fetchurl, bison, flex, perl, libpng, giflib, libjpeg, alsaLib, readline, libGLU_combined, libXaw
 , pkgconfig, gtk2, SDL, autoreconfHook, makeDesktopItem
 }:
 
diff --git a/pkgs/misc/emulators/wine/default.nix b/pkgs/misc/emulators/wine/default.nix
index ca67ca836ba..a8eacbe234c 100644
--- a/pkgs/misc/emulators/wine/default.nix
+++ b/pkgs/misc/emulators/wine/default.nix
@@ -6,7 +6,7 @@
 # };
 # Make additional configurations on demand:
 # wine.override { wineBuild = "wine32"; wineRelease = "staging"; };
-{ lib, pkgs, system, callPackage,
+{ lib, system, callPackage,
   wineRelease ? "stable",
   wineBuild ? (if system == "x86_64-linux" then "wineWow" else "wine32"),
   libtxc_dxtn_Name ? "libtxc_dxtn_s2tc",
diff --git a/pkgs/misc/emulators/wine/packages.nix b/pkgs/misc/emulators/wine/packages.nix
index 156db148435..3ea60e62c66 100644
--- a/pkgs/misc/emulators/wine/packages.nix
+++ b/pkgs/misc/emulators/wine/packages.nix
@@ -1,4 +1,4 @@
-{ system, stdenv, stdenv_32bit, lib, pkgs, pkgsi686Linux, callPackage,
+{ stdenv_32bit, lib, pkgs, pkgsi686Linux, callPackage,
   wineRelease ? "stable",
   supportFlags
 }:
diff --git a/pkgs/misc/emulators/wine/staging.nix b/pkgs/misc/emulators/wine/staging.nix
index 4a7fe0ff55b..5264e66279f 100644
--- a/pkgs/misc/emulators/wine/staging.nix
+++ b/pkgs/misc/emulators/wine/staging.nix
@@ -1,4 +1,4 @@
-{ stdenv, callPackage, lib, wineUnstable, libtxc_dxtn_Name }:
+{ stdenv, callPackage, wineUnstable, libtxc_dxtn_Name }:
 
 with callPackage ./util.nix {};
 
diff --git a/pkgs/misc/ghostscript/default.nix b/pkgs/misc/ghostscript/default.nix
index 182e176cacb..5839b076c0d 100644
--- a/pkgs/misc/ghostscript/default.nix
+++ b/pkgs/misc/ghostscript/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, fetchpatch, pkgconfig, zlib, expat, openssl, autoconf
+{ stdenv, lib, fetchurl, pkgconfig, zlib, expat, openssl, autoconf
 , libjpeg, libpng, libtiff, freetype, fontconfig, lcms2, libpaper, jbig2dec
 , libiconv, ijs
 , x11Support ? false, xlibsWrapper ? null
diff --git a/pkgs/misc/jackaudio/default.nix b/pkgs/misc/jackaudio/default.nix
index 52b0abc48a7..391ac107ab7 100644
--- a/pkgs/misc/jackaudio/default.nix
+++ b/pkgs/misc/jackaudio/default.nix
@@ -6,7 +6,6 @@
 # Optional Dependencies
 , dbus ? null, libffado ? null, alsaLib ? null
 , libopus ? null
-, darwin
 
 # Extra options
 , prefix ? ""
diff --git a/pkgs/misc/lilypond/unstable.nix b/pkgs/misc/lilypond/unstable.nix
index 046416cd9df..df83502aa88 100644
--- a/pkgs/misc/lilypond/unstable.nix
+++ b/pkgs/misc/lilypond/unstable.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchgit, guile, rsync, lilypond, gyre-fonts }:
+{ stdenv, fetchurl, fetchgit, rsync, lilypond, gyre-fonts }:
 
 with stdenv.lib;
 
diff --git a/pkgs/misc/my-env/default.nix b/pkgs/misc/my-env/default.nix
index d0b7458bf57..fb8de9b6a71 100644
--- a/pkgs/misc/my-env/default.nix
+++ b/pkgs/misc/my-env/default.nix
@@ -59,7 +59,7 @@
 
 { mkDerivation, substituteAll, pkgs }:
     { stdenv ? pkgs.stdenv, name, buildInputs ? []
-    , propagatedBuildInputs ? [], gcc ? stdenv.cc, cTags ? [], extraCmds ? ""
+    , propagatedBuildInputs ? [], gcc ? stdenv.cc, extraCmds ? ""
     , cleanupCmds ? "", shell ? "${pkgs.bashInteractive}/bin/bash --norc"}:
 
 mkDerivation {
diff --git a/pkgs/misc/phabricator/default.nix b/pkgs/misc/phabricator/default.nix
index 435cf2e0c9a..367e4e53442 100644
--- a/pkgs/misc/phabricator/default.nix
+++ b/pkgs/misc/phabricator/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, pkgs, ...  }:
+{ stdenv, pkgs }:
 
 stdenv.mkDerivation rec {
   version = "2014-07-16";
diff --git a/pkgs/misc/screensavers/slock/default.nix b/pkgs/misc/screensavers/slock/default.nix
index 82ce4c20df8..5e658abff47 100644
--- a/pkgs/misc/screensavers/slock/default.nix
+++ b/pkgs/misc/screensavers/slock/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, writeText
+{ stdenv, fetchurl, writeText
 , xproto, libX11, libXext, libXrandr
 # default header can be obtained from
 # https://git.suckless.org/slock/tree/config.def.h
diff --git a/pkgs/misc/themes/vertex/default.nix b/pkgs/misc/themes/vertex/default.nix
index 86a6b4883ac..06d42da7936 100644
--- a/pkgs/misc/themes/vertex/default.nix
+++ b/pkgs/misc/themes/vertex/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gnome3, gtk-engine-murrine }:
+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gtk-engine-murrine }:
 
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix
index 2a628e0cdf4..2bf5274eeb4 100644
--- a/pkgs/misc/uboot/default.nix
+++ b/pkgs/misc/uboot/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, fetchpatch, bc, bison, dtc, flex, openssl, python2, swig
 , armTrustedFirmwareAllwinner
-, hostPlatform, buildPackages
+, buildPackages
 }:
 
 let
diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index 8428a3b7894..672e4640946 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -1,9 +1,9 @@
 # TODO check that no license information gets lost
-{ config, lib, fetchurl, stdenv, python, git, go, cmake, vim, vimUtils, perl, ruby
+{ config, lib, stdenv, python, cmake, vim, vimUtils, ruby
 , which, fetchgit, llvmPackages, rustPlatform
-, xkb_switch, rustracerd, fzf, skim
+, xkb_switch, fzf, skim
 , python3, boost, icu, ncurses
-, ycmd, makeWrapper, rake
+, ycmd, rake
 , pythonPackages, python3Packages
 , substituteAll
 , languagetool
diff --git a/pkgs/misc/vscode-extensions/cpptools/default.nix b/pkgs/misc/vscode-extensions/cpptools/default.nix
index 6cec206b73a..5bc1dddeab8 100644
--- a/pkgs/misc/vscode-extensions/cpptools/default.nix
+++ b/pkgs/misc/vscode-extensions/cpptools/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, fetchzip, vscode-utils, jq, mono46, clang-tools, writeScript
+{ stdenv, fetchzip, vscode-utils, jq, mono46, clang-tools, writeScript
 , gdbUseFixed ? true, gdb # The gdb default setting will be fixed to specified. Use version from `PATH` otherwise.
 }:
 
diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix
index 16ddb8fd405..68304d66224 100644
--- a/pkgs/misc/vscode-extensions/default.nix
+++ b/pkgs/misc/vscode-extensions/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, callPackage, vscode-utils }:
+{ stdenv, callPackage, vscode-utils }:
 
 let
   inherit (vscode-utils) buildVscodeExtension buildVscodeMarketplaceExtension
diff --git a/pkgs/misc/vscode-extensions/python/default.nix b/pkgs/misc/vscode-extensions/python/default.nix
index 41db2c1fcea..c33359ccbfc 100644
--- a/pkgs/misc/vscode-extensions/python/default.nix
+++ b/pkgs/misc/vscode-extensions/python/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, vscode-utils
+{ lib, vscode-utils
 
 , pythonUseFixed ? false, python  # When `true`, the python default setting will be fixed to specified.
                                   # Use version from `PATH` for default setting otherwise.
diff --git a/pkgs/misc/vscode-extensions/vscode-utils.nix b/pkgs/misc/vscode-extensions/vscode-utils.nix
index 4c095278f91..d7ec669204c 100644
--- a/pkgs/misc/vscode-extensions/vscode-utils.nix
+++ b/pkgs/misc/vscode-extensions/vscode-utils.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, runCommand, vscode, unzip }:
+{ stdenv, lib, fetchurl, vscode, unzip }:
 
 let
   extendedPkgVersion = lib.getVersion vscode;
diff --git a/pkgs/os-specific/darwin/apple-source-releases/ICU/default.nix b/pkgs/os-specific/darwin/apple-source-releases/ICU/default.nix
index 6cf7ee07b70..89ff68266a2 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/ICU/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/ICU/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, cctools, appleDerivation }:
+{ cctools, appleDerivation }:
 
 appleDerivation {
   nativeBuildInputs = [ cctools ];
diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libc/825_40_1.nix b/pkgs/os-specific/darwin/apple-source-releases/Libc/825_40_1.nix
index 302a657992a..29aa3d64cb0 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/Libc/825_40_1.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/Libc/825_40_1.nix
@@ -1,4 +1,4 @@
-{ stdenv, appleDerivation, ed, unifdef }:
+{ appleDerivation, ed, unifdef }:
 
 appleDerivation {
   nativeBuildInputs = [ ed unifdef ];
diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libc/default.nix b/pkgs/os-specific/darwin/apple-source-releases/Libc/default.nix
index d73dc8f3ec2..542ea20de11 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/Libc/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/Libc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, appleDerivation, ed, unifdef, Libc_old, Libc_10-9 }:
+{ appleDerivation, ed, unifdef, Libc_old, Libc_10-9 }:
 
 appleDerivation {
   nativeBuildInputs = [ ed unifdef ];
diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libinfo/default.nix b/pkgs/os-specific/darwin/apple-source-releases/Libinfo/default.nix
index d3ffa1fa283..add51a61d3d 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/Libinfo/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/Libinfo/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, appleDerivation }:
+{ appleDerivation }:
 
 appleDerivation {
   installPhase = ''
diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libm/default.nix b/pkgs/os-specific/darwin/apple-source-releases/Libm/default.nix
index 1a01d032191..df5f6b7b8fd 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/Libm/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/Libm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, appleDerivation }:
+{ appleDerivation }:
 
 appleDerivation {
   installPhase = ''
diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libnotify/default.nix b/pkgs/os-specific/darwin/apple-source-releases/Libnotify/default.nix
index de691a056f3..2ee80d70264 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/Libnotify/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/Libnotify/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, appleDerivation }:
+{ appleDerivation }:
 
 appleDerivation {
   installPhase = ''
diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix
index 386480d6290..1e27ead69f1 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, appleDerivation, cpio, bootstrap_cmds, xnu, Libc, Libm, libdispatch, cctools, Libinfo,
+{ stdenv, appleDerivation, cpio, xnu, Libc, Libm, libdispatch, cctools, Libinfo,
   dyld, Csu, architecture, libclosure, CarbonHeaders, ncurses, CommonCrypto, copyfile,
-  removefile, libresolv, Libnotify, libplatform, libpthread, mDNSResponder, launchd, libutil, version }:
+  removefile, libresolv, Libnotify, libplatform, libpthread, mDNSResponder, launchd, libutil }:
 
 appleDerivation rec {
   phases = [ "unpackPhase" "installPhase" ];
diff --git a/pkgs/os-specific/darwin/apple-source-releases/Security/default.nix b/pkgs/os-specific/darwin/apple-source-releases/Security/default.nix
index f09842630fd..e04142b8b11 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/Security/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/Security/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, appleDerivation }:
+{ appleDerivation }:
 
 appleDerivation {
   phases = [ "unpackPhase" "installPhase" ];
diff --git a/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/default.nix
index 35608587c56..318e2728fc2 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, appleDerivation, fetchzip, version, bsdmake, perl, flex, yacc, writeScriptBin
+{ stdenv, appleDerivation, fetchzip, bsdmake, perl, flex, yacc
 }:
 
 # this derivation sucks
diff --git a/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix b/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix
index fda7cd85e4f..7b1492799dd 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix
@@ -1,4 +1,4 @@
-{ stdenv, appleDerivation, fetchurl, xcbuild, ncurses, libutil-new }:
+{ stdenv, appleDerivation, xcbuild, ncurses, libutil-new }:
 
 appleDerivation {
   # We can't just run the root build, because https://github.com/facebook/xcbuild/issues/264
diff --git a/pkgs/os-specific/darwin/apple-source-releases/basic_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/basic_cmds/default.nix
index 596ca25d70a..5d9781f3aa4 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/basic_cmds/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/basic_cmds/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, appleDerivation, fetchurl, xcbuildHook }:
+{ stdenv, appleDerivation, xcbuildHook }:
 
 appleDerivation rec {
   nativeBuildInputs = [ xcbuildHook ];
diff --git a/pkgs/os-specific/darwin/apple-source-releases/bsdmake/default.nix b/pkgs/os-specific/darwin/apple-source-releases/bsdmake/default.nix
index baa3b11225d..043c7b0bc70 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/bsdmake/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/bsdmake/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, appleDerivation, fetchurl, fetchpatch, makeWrapper }:
+{ stdenv, appleDerivation, makeWrapper }:
 
 appleDerivation {
   nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/os-specific/darwin/apple-source-releases/copyfile/default.nix b/pkgs/os-specific/darwin/apple-source-releases/copyfile/default.nix
index 37dffaa9b20..7e1dc5309b1 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/copyfile/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/copyfile/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, appleDerivation }:
+{ appleDerivation }:
 
 appleDerivation {
   dontBuild = true;
diff --git a/pkgs/os-specific/darwin/apple-source-releases/developer_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/developer_cmds/default.nix
index a572d46ceab..4220c50d61c 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/developer_cmds/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/developer_cmds/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, appleDerivation, xcbuildHook }:
+{ stdenv, appleDerivation, xcbuildHook }:
 
 appleDerivation rec {
   nativeBuildInputs = [ xcbuildHook ];
diff --git a/pkgs/os-specific/darwin/apple-source-releases/diskdev_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/diskdev_cmds/default.nix
index b947267ab14..f27b5ae1302 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/diskdev_cmds/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/diskdev_cmds/default.nix
@@ -1,5 +1,5 @@
 { stdenv, appleDerivation, xcbuildHook
-, lib, hostPlatform, Libc, xnu, libutil-new }:
+, Libc, xnu, libutil-new }:
 
 appleDerivation {
   nativeBuildInputs = [ xcbuildHook ];
diff --git a/pkgs/os-specific/darwin/apple-source-releases/dtrace/default.nix b/pkgs/os-specific/darwin/apple-source-releases/dtrace/default.nix
index 5fcd04266d5..fd2c95563b4 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/dtrace/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/dtrace/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, appleDerivation, cctools, zlib }:
+{ appleDerivation, cctools, zlib }:
 
 appleDerivation {
   buildInputs = [ cctools zlib ];
diff --git a/pkgs/os-specific/darwin/apple-source-releases/eap8021x/default.nix b/pkgs/os-specific/darwin/apple-source-releases/eap8021x/default.nix
index 80d629dfa3e..b24d94b9d70 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/eap8021x/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/eap8021x/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, appleDerivation }:
+{ appleDerivation }:
 
 appleDerivation {
   dontBuild = true;
diff --git a/pkgs/os-specific/darwin/apple-source-releases/launchd/default.nix b/pkgs/os-specific/darwin/apple-source-releases/launchd/default.nix
index 86bc6e598f7..eed7982e9d8 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/launchd/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/launchd/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, appleDerivation }:
+{ appleDerivation }:
 
 appleDerivation {
   # No clue why the same file has two different names. Ask Apple!
diff --git a/pkgs/os-specific/darwin/apple-source-releases/libclosure/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libclosure/default.nix
index 826dbed1dfe..ac33a24a8b4 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/libclosure/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/libclosure/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, appleDerivation }:
+{ appleDerivation }:
 
 appleDerivation {
   installPhase = ''
diff --git a/pkgs/os-specific/darwin/apple-source-releases/libdispatch/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libdispatch/default.nix
index a43c00f7691..46e9e592ddc 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/libdispatch/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/libdispatch/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, appleDerivation }:
+{ appleDerivation }:
 
 appleDerivation {
   dontConfigure = true;
diff --git a/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix
index d325e38b272..3d62c396122 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, appleDerivation, lib, autoreconfHook, targetPlatform
+{ stdenv, appleDerivation, lib, targetPlatform
 , enableStatic ? targetPlatform.isiOS
 , enableShared ? !targetPlatform.isiOS
 }:
diff --git a/pkgs/os-specific/darwin/apple-source-releases/libplatform/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libplatform/default.nix
index 41b1bf74af9..4fd0ab8a7fb 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/libplatform/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/libplatform/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, appleDerivation }:
+{ appleDerivation }:
 
 appleDerivation {
   installPhase = ''
diff --git a/pkgs/os-specific/darwin/apple-source-releases/libresolv/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libresolv/default.nix
index 5a2cd33d8a0..f3c7558cfc6 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/libresolv/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/libresolv/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, appleDerivation, Libinfo, configd, mDNSResponder }:
+{ appleDerivation, Libinfo, configd, mDNSResponder }:
 
 appleDerivation {
   buildInputs = [ Libinfo configd mDNSResponder ];
diff --git a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_cdsa_utils/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_cdsa_utils/default.nix
index aa73c281cab..e5637d6db41 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_cdsa_utils/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_cdsa_utils/default.nix
@@ -1,4 +1,4 @@
-{ Security, appleDerivation, libsecurity_cdsa_utilities, libsecurity_utilities, m4 }:
+{ appleDerivation, libsecurity_cdsa_utilities, libsecurity_utilities, m4 }:
 appleDerivation {
   buildInputs = [
     libsecurity_utilities
diff --git a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_cssm/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_cssm/default.nix
index 053dea134c7..cf9fe411533 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_cssm/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_cssm/default.nix
@@ -1,4 +1,4 @@
-{ appleDerivation, libsecurity_cdsa_client, libsecurity_cdsa_plugin, libsecurity_cdsa_utilities, libsecurity_codesigning, libsecurity_utilities, perl }:
+{ appleDerivation, libsecurity_cdsa_client, libsecurity_cdsa_plugin, libsecurity_cdsa_utilities, libsecurity_utilities, perl }:
 appleDerivation {
   buildInputs = [
     libsecurity_utilities
diff --git a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_keychain/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_keychain/default.nix
index 07a3186caee..609d07fda10 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_keychain/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_keychain/default.nix
@@ -1,4 +1,4 @@
-{ CF, Security, appleDerivation, apple_sdk, libsecurity_asn1, libsecurity_cdsa_client, libsecurity_cdsa_utilities, libsecurity_cdsa_utils, libsecurity_ocspd, libsecurity_pkcs12, libsecurity_utilities, libsecurityd, openssl, osx_private_sdk, security_dotmac_tp, lib }:
+{ CF, appleDerivation, apple_sdk, libsecurity_asn1, libsecurity_cdsa_client, libsecurity_cdsa_utilities, libsecurity_cdsa_utils, libsecurity_ocspd, libsecurity_pkcs12, libsecurity_utilities, libsecurityd, openssl, osx_private_sdk, security_dotmac_tp, lib }:
 appleDerivation {
   buildInputs = [
     libsecurity_utilities
diff --git a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_utilities/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_utilities/default.nix
index e811c4c11a8..1ab950a9233 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_utilities/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_utilities/default.nix
@@ -1,4 +1,4 @@
-{ IOKit, appleDerivation, apple_sdk, libauto, libobjc, libsecurity_codesigning, sqlite, stdenv, osx_private_sdk }:
+{ IOKit, appleDerivation, apple_sdk, libauto, libobjc, sqlite, stdenv, osx_private_sdk }:
 appleDerivation {
   buildInputs = [
     libauto
diff --git a/pkgs/os-specific/darwin/apple-source-releases/mDNSResponder/default.nix b/pkgs/os-specific/darwin/apple-source-releases/mDNSResponder/default.nix
index 63674808d93..f17ed785360 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/mDNSResponder/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/mDNSResponder/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, appleDerivation }:
+{ appleDerivation }:
 
 appleDerivation {
   phases = [ "unpackPhase" "installPhase" ];
diff --git a/pkgs/os-specific/darwin/apple-source-releases/objc4/default.nix b/pkgs/os-specific/darwin/apple-source-releases/objc4/default.nix
index cea5fc9a4e2..5c78182085b 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/objc4/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/objc4/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, appleDerivation }:
+{ appleDerivation }:
 
 appleDerivation {
   phases = [ "unpackPhase" "installPhase" ];
diff --git a/pkgs/os-specific/darwin/apple-source-releases/ppp/default.nix b/pkgs/os-specific/darwin/apple-source-releases/ppp/default.nix
index 17c24bebfda..5668c376130 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/ppp/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/ppp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, appleDerivation }:
+{ appleDerivation }:
 
 appleDerivation {
   dontBuild = true;
diff --git a/pkgs/os-specific/darwin/apple-source-releases/removefile/default.nix b/pkgs/os-specific/darwin/apple-source-releases/removefile/default.nix
index 8baf62dba01..2b45fbdb45e 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/removefile/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/removefile/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, appleDerivation }:
+{ appleDerivation }:
 
 appleDerivation {
   installPhase = ''
diff --git a/pkgs/os-specific/darwin/apple-source-releases/system_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/system_cmds/default.nix
index 1bbda6ab7ad..39c903a2e7b 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/system_cmds/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/system_cmds/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, appleDerivation, xcbuild, lib, hostPlatform
+{ stdenv, appleDerivation, lib
 , Librpcsvc, apple_sdk, pam, CF, openbsm }:
 
 appleDerivation rec {
diff --git a/pkgs/os-specific/darwin/apple-source-releases/text_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/text_cmds/default.nix
index 08df235ed8c..91abb3ca07a 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/text_cmds/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/text_cmds/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, appleDerivation, fetchurl, xcbuildHook, ncurses, bzip2, zlib, lzma }:
+{ stdenv, appleDerivation, xcbuildHook, ncurses, bzip2, zlib, lzma }:
 
 appleDerivation {
   nativeBuildInputs = [ xcbuildHook ];
diff --git a/pkgs/os-specific/darwin/apple-source-releases/xnu/default.nix b/pkgs/os-specific/darwin/apple-source-releases/xnu/default.nix
index 2c7da5be6e4..74c9f254348 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/xnu/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/xnu/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, appleDerivation, fetchzip, bootstrap_cmds, bison, flex, gnum4, unifdef, perl, python }:
+{ appleDerivation, bootstrap_cmds, bison, flex, gnum4, unifdef, perl, python }:
 
 appleDerivation {
   phases = [ "unpackPhase" "patchPhase" "installPhase" ];
diff --git a/pkgs/os-specific/darwin/binutils/default.nix b/pkgs/os-specific/darwin/binutils/default.nix
index 21d64979d7e..bd10dde5572 100644
--- a/pkgs/os-specific/darwin/binutils/default.nix
+++ b/pkgs/os-specific/darwin/binutils/default.nix
@@ -1,5 +1,4 @@
 { stdenv, binutils-unwrapped, cctools
-, hostPlatform, targetPlatform
 }:
 
 # Make sure both underlying packages claim to have prepended their binaries
diff --git a/pkgs/os-specific/darwin/cctools/port.nix b/pkgs/os-specific/darwin/cctools/port.nix
index 0c908197acb..995e9af38cb 100644
--- a/pkgs/os-specific/darwin/cctools/port.nix
+++ b/pkgs/os-specific/darwin/cctools/port.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchFromGitHub, makeWrapper, autoconf, automake, libtool_2, autoreconfHook
-, libcxx, libcxxabi, libuuid
+{ stdenv, fetchFromGitHub, autoconf, automake, libtool_2, autoreconfHook
+, libcxxabi, libuuid
 , libobjc ? null, maloader ? null
 , hostPlatform, targetPlatform
 , enableDumpNormalizedLibArgs ? false
diff --git a/pkgs/os-specific/darwin/darling/default.nix b/pkgs/os-specific/darwin/darling/default.nix
index c1e29843147..6ed3b28eccc 100644
--- a/pkgs/os-specific/darwin/darling/default.nix
+++ b/pkgs/os-specific/darwin/darling/default.nix
@@ -1,4 +1,4 @@
-{stdenv, lib, fetchzip, cmake, bison, flex}:
+{stdenv, lib, fetchzip}:
 
 stdenv.mkDerivation rec {
   pname = "darling";
diff --git a/pkgs/os-specific/darwin/security-tool/default.nix b/pkgs/os-specific/darwin/security-tool/default.nix
index 4566d82835f..f161a7a88e1 100644
--- a/pkgs/os-specific/darwin/security-tool/default.nix
+++ b/pkgs/os-specific/darwin/security-tool/default.nix
@@ -1,4 +1,4 @@
-{ CoreServices, Foundation, PCSC, Security, GSS, Kerberos, makeWrapper, apple_sdk,
+{ Foundation, PCSC, Security, GSS, Kerberos, makeWrapper, apple_sdk,
 fetchurl, gnustep, libobjc, libsecurity_apple_csp, libsecurity_apple_cspdl,
 libsecurity_apple_file_dl, libsecurity_apple_x509_cl, libsecurity_apple_x509_tp,
 libsecurity_asn1, libsecurity_cdsa_client, libsecurity_cdsa_plugin,
diff --git a/pkgs/os-specific/darwin/swift-corelibs/default.nix b/pkgs/os-specific/darwin/swift-corelibs/default.nix
index fdc97304528..dd652dc5627 100644
--- a/pkgs/os-specific/darwin/swift-corelibs/default.nix
+++ b/pkgs/os-specific/darwin/swift-corelibs/default.nix
@@ -1,4 +1,4 @@
-{callPackage, stdenv, darwin, xcbuild}:
+{callPackage, darwin}:
 
 rec {
   corefoundation = callPackage ./corefoundation.nix {};
diff --git a/pkgs/os-specific/darwin/xcode/sdk-pkgs.nix b/pkgs/os-specific/darwin/xcode/sdk-pkgs.nix
index d5ed21cd9e2..b848265736e 100644
--- a/pkgs/os-specific/darwin/xcode/sdk-pkgs.nix
+++ b/pkgs/os-specific/darwin/xcode/sdk-pkgs.nix
@@ -1,4 +1,4 @@
-{ lib, hostPlatform, targetPlatform
+{ targetPlatform
 , clang-unwrapped
 , binutils-unwrapped
 , runCommand
diff --git a/pkgs/os-specific/linux/amdgpu-pro/default.nix b/pkgs/os-specific/linux/amdgpu-pro/default.nix
index df0ef80ff4d..97658c831eb 100644
--- a/pkgs/os-specific/linux/amdgpu-pro/default.nix
+++ b/pkgs/os-specific/linux/amdgpu-pro/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, elfutils
 , xorg, patchelf, openssl, libdrm, udev
 , libxcb, libxshmfence, epoxy, perl, zlib
-, fetchFromGitHub, ncurses
+, ncurses
 , libsOnly ? false, kernel ? null
 }:
 
diff --git a/pkgs/os-specific/linux/autofs/default.nix b/pkgs/os-specific/linux/autofs/default.nix
index 859593e4b9a..60ccad04eea 100644
--- a/pkgs/os-specific/linux/autofs/default.nix
+++ b/pkgs/os-specific/linux/autofs/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, flex, bison, linuxHeaders, libtirpc, mount, umount, nfs-utils, e2fsprogs
+{ stdenv, fetchurl, flex, bison, linuxHeaders, libtirpc, mount, umount, nfs-utils, e2fsprogs
 , libxml2, kerberos, kmod, openldap, sssd, cyrus_sasl, openssl }:
 
 let
diff --git a/pkgs/os-specific/linux/bcc/default.nix b/pkgs/os-specific/linux/bcc/default.nix
index 3104004b3d6..2796fed17dc 100644
--- a/pkgs/os-specific/linux/bcc/default.nix
+++ b/pkgs/os-specific/linux/bcc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchpatch, makeWrapper, cmake, llvmPackages, kernel
+{ stdenv, fetchFromGitHub, makeWrapper, cmake, llvmPackages, kernel
 , flex, bison, elfutils, python, luajit, netperf, iperf, libelf
 , systemtap
 }:
diff --git a/pkgs/os-specific/linux/blcr/default.nix b/pkgs/os-specific/linux/blcr/default.nix
index 275600d4278..626e978f1f1 100644
--- a/pkgs/os-specific/linux/blcr/default.nix
+++ b/pkgs/os-specific/linux/blcr/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, kernel, perl, makeWrapper }:
+{ stdenv, fetchurl, kernel, perl, makeWrapper }:
 
 # BLCR version 0.8.6 should works with linux kernel up to version 3.17.x
 
diff --git a/pkgs/os-specific/linux/broadcom-sta/default.nix b/pkgs/os-specific/linux/broadcom-sta/default.nix
index 9423e7a33f4..9848882f3b8 100644
--- a/pkgs/os-specific/linux/broadcom-sta/default.nix
+++ b/pkgs/os-specific/linux/broadcom-sta/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, kernel }:
+{ stdenv, fetchurl, kernel }:
 
 let
   version = "6.30.223.271";
diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/os-specific/linux/busybox/default.nix
index 06a2d430159..bfd79cb42dc 100644
--- a/pkgs/os-specific/linux/busybox/default.nix
+++ b/pkgs/os-specific/linux/busybox/default.nix
@@ -1,9 +1,8 @@
-{ stdenv, lib, buildPackages, fetchurl, fetchpatch
+{ stdenv, lib, buildPackages, fetchurl
 , enableStatic ? false
 , enableMinimal ? false
 , useMusl ? stdenv.hostPlatform.libc == "musl", musl
 , extraConfig ? ""
-, buildPlatform, hostPlatform
 }:
 
 assert stdenv.hostPlatform.libc == "musl" -> useMusl;
diff --git a/pkgs/os-specific/linux/checksec/default.nix b/pkgs/os-specific/linux/checksec/default.nix
index 9b7f69d4ab8..a8ffb133a90 100644
--- a/pkgs/os-specific/linux/checksec/default.nix
+++ b/pkgs/os-specific/linux/checksec/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, file, findutils, binutils, glibc, procps, coreutils, sysctl }:
+{ stdenv, fetchurl, file, findutils, binutils, glibc, coreutils, sysctl }:
 
 stdenv.mkDerivation rec {
   name = "checksec-${version}";
diff --git a/pkgs/os-specific/linux/conky/default.nix b/pkgs/os-specific/linux/conky/default.nix
index e4c45a9440a..eb4e6a16e38 100644
--- a/pkgs/os-specific/linux/conky/default.nix
+++ b/pkgs/os-specific/linux/conky/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig, cmake
+{ stdenv, fetchFromGitHub, pkgconfig, cmake
 
 # dependencies
 , glib, libXinerama
diff --git a/pkgs/os-specific/linux/cpupower/default.nix b/pkgs/os-specific/linux/cpupower/default.nix
index d10b789f3e4..2b8efe7e744 100644
--- a/pkgs/os-specific/linux/cpupower/default.nix
+++ b/pkgs/os-specific/linux/cpupower/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPackages, fetchurl, kernel, pciutils, gettext }:
+{ stdenv, buildPackages, kernel, pciutils, gettext }:
 
 stdenv.mkDerivation {
   name = "cpupower-${kernel.version}";
diff --git a/pkgs/os-specific/linux/criu/default.nix b/pkgs/os-specific/linux/criu/default.nix
index ad9b27f83fa..832167b6f26 100644
--- a/pkgs/os-specific/linux/criu/default.nix
+++ b/pkgs/os-specific/linux/criu/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, protobuf, protobufc, asciidoc
-, xmlto, utillinux, docbook_xsl, libpaper, libnl, libcap, libnet, pkgconfig
+, xmlto, docbook_xsl, libpaper, libnl, libcap, libnet, pkgconfig
 , python }:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/os-specific/linux/cryptodev/default.nix b/pkgs/os-specific/linux/cryptodev/default.nix
index d25692b6cdf..45a7fe177f2 100644
--- a/pkgs/os-specific/linux/cryptodev/default.nix
+++ b/pkgs/os-specific/linux/cryptodev/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, kernel, onlyHeaders ? false }:
+{ fetchurl, stdenv, kernel ? false }:
 
 stdenv.mkDerivation rec {
   pname = "cryptodev-linux-1.9";
diff --git a/pkgs/os-specific/linux/dbus-broker/default.nix b/pkgs/os-specific/linux/dbus-broker/default.nix
index c57650e0806..794ebd126fa 100644
--- a/pkgs/os-specific/linux/dbus-broker/default.nix
+++ b/pkgs/os-specific/linux/dbus-broker/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, fetchFromGitHub, docutils, meson, ninja, pkgconfig
+{ stdenv, fetchFromGitHub, docutils, meson, ninja, pkgconfig
 , dbus, glib, linuxHeaders, systemd }:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/os-specific/linux/displaylink/default.nix b/pkgs/os-specific/linux/displaylink/default.nix
index 55be85d33f0..ad42590ad19 100644
--- a/pkgs/os-specific/linux/displaylink/default.nix
+++ b/pkgs/os-specific/linux/displaylink/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, unzip, utillinux,
+{ stdenv, lib, unzip, utillinux,
   libusb1, evdi, systemd, makeWrapper, requireFile }:
 
 let
diff --git a/pkgs/os-specific/linux/ena/default.nix b/pkgs/os-specific/linux/ena/default.nix
index e3f382ababc..180957ac2ad 100644
--- a/pkgs/os-specific/linux/ena/default.nix
+++ b/pkgs/os-specific/linux/ena/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, kernel, kmod }:
+{ stdenv, fetchFromGitHub, kernel }:
 
 stdenv.mkDerivation rec {
   version = "1.5.2";
diff --git a/pkgs/os-specific/linux/fatrace/default.nix b/pkgs/os-specific/linux/fatrace/default.nix
index 6f6418edc3e..fb1a3e56388 100644
--- a/pkgs/os-specific/linux/fatrace/default.nix
+++ b/pkgs/os-specific/linux/fatrace/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, python3, which }:
+{ stdenv, fetchurl, python3, which }:
 
 stdenv.mkDerivation rec {
   name = "fatrace-${version}";
diff --git a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
index 724498b960c..47d56cbf796 100644
--- a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
+++ b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, runCommand, git, cacert, gnupg }:
+{ stdenv, fetchgit }:
 
 stdenv.mkDerivation rec {
   name = "firmware-linux-nonfree-${version}";
diff --git a/pkgs/os-specific/linux/fuse/common.nix b/pkgs/os-specific/linux/fuse/common.nix
index d813258f95a..7cc58c19c07 100644
--- a/pkgs/os-specific/linux/fuse/common.nix
+++ b/pkgs/os-specific/linux/fuse/common.nix
@@ -2,7 +2,6 @@
 
 { stdenv, fetchFromGitHub, fetchpatch
 , fusePackages, utillinux, gettext
-, autoconf, automake, libtool
 , meson, ninja, pkgconfig
 , autoreconfHook
 }:
diff --git a/pkgs/os-specific/linux/fuse/default.nix b/pkgs/os-specific/linux/fuse/default.nix
index cdbcca55d2f..594f966c2f4 100644
--- a/pkgs/os-specific/linux/fuse/default.nix
+++ b/pkgs/os-specific/linux/fuse/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, callPackage, utillinux }:
+{ callPackage, utillinux }:
 
 let
   mkFuse = args: callPackage (import ./common.nix args) {
diff --git a/pkgs/os-specific/linux/guvcview/default.nix b/pkgs/os-specific/linux/guvcview/default.nix
index 581d0f841b9..c8146c39cf5 100644
--- a/pkgs/os-specific/linux/guvcview/default.nix
+++ b/pkgs/os-specific/linux/guvcview/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, intltool, gettext, pkgconfig
-, gtk3, portaudio, libpng, SDL2, ffmpeg, udev, libusb1, libv4l, alsaLib, gsl
+{ stdenv, fetchurl, intltool, pkgconfig
+, gtk3, portaudio, SDL2, ffmpeg, udev, libusb1, libv4l, alsaLib, gsl
 , pulseaudioSupport ? true, libpulseaudio ? null }:
 
 assert pulseaudioSupport -> libpulseaudio != null;
diff --git a/pkgs/os-specific/linux/iproute/default.nix b/pkgs/os-specific/linux/iproute/default.nix
index 3f5ed788bb2..4204105bb60 100644
--- a/pkgs/os-specific/linux/iproute/default.nix
+++ b/pkgs/os-specific/linux/iproute/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, config, lib, flex, bash, bison, db, iptables, pkgconfig }:
+{ fetchurl, stdenv, config, flex, bash, bison, db, iptables, pkgconfig }:
 
 stdenv.mkDerivation rec {
   name = "iproute2-${version}";
diff --git a/pkgs/os-specific/linux/iputils/default.nix b/pkgs/os-specific/linux/iputils/default.nix
index d0a8950a508..4caa0acb4b6 100644
--- a/pkgs/os-specific/linux/iputils/default.nix
+++ b/pkgs/os-specific/linux/iputils/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl
-, sysfsutils, gnutls, openssl
+, sysfsutils, openssl
 , libcap, opensp, docbook_sgml_dtd_31
 , libidn, nettle
 , SGMLSpm, libgcrypt }:
diff --git a/pkgs/os-specific/linux/kernel-headers/default.nix b/pkgs/os-specific/linux/kernel-headers/default.nix
index 01cab57f719..677bb076b0c 100644
--- a/pkgs/os-specific/linux/kernel-headers/default.nix
+++ b/pkgs/os-specific/linux/kernel-headers/default.nix
@@ -1,5 +1,5 @@
 { stdenvNoCC, lib, buildPackages
-, buildPlatform, hostPlatform
+, hostPlatform
 , fetchurl, perl
 }:
 
diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix
index fe46b9eab40..b2171067307 100644
--- a/pkgs/os-specific/linux/kernel/manual-config.nix
+++ b/pkgs/os-specific/linux/kernel/manual-config.nix
@@ -1,8 +1,7 @@
 { buildPackages, runCommand, nettools, bc, bison, flex, perl, gmp, libmpc, mpfr, openssl
-, ncurses ? null
 , libelf
 , utillinux
-, writeTextFile, ubootTools
+, writeTextFile
 }:
 
 let
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index e0826aaa9d4..1a365046f5f 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, pkgs }:
+{ fetchpatch }:
 
 rec {
   bridge_stp_helper =
diff --git a/pkgs/os-specific/linux/keyutils/default.nix b/pkgs/os-specific/linux/keyutils/default.nix
index 201f170c258..6932afdf478 100644
--- a/pkgs/os-specific/linux/keyutils/default.nix
+++ b/pkgs/os-specific/linux/keyutils/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gnumake, file }:
+{ stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   name = "keyutils-${version}";
diff --git a/pkgs/os-specific/linux/lvm2/default.nix b/pkgs/os-specific/linux/lvm2/default.nix
index 0f542b9e382..a24024112c9 100644
--- a/pkgs/os-specific/linux/lvm2/default.nix
+++ b/pkgs/os-specific/linux/lvm2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, pkgconfig, systemd, udev, utillinux, coreutils, libuuid
+{ stdenv, fetchurl, fetchpatch, pkgconfig, systemd, udev, utillinux, libuuid
 , thin-provisioning-tools, enable_dmeventd ? false }:
 
 let
diff --git a/pkgs/os-specific/linux/lxc/default.nix b/pkgs/os-specific/linux/lxc/default.nix
index 491f89f3cb4..3c158e228f3 100644
--- a/pkgs/os-specific/linux/lxc/default.nix
+++ b/pkgs/os-specific/linux/lxc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, autoreconfHook, pkgconfig, perl, docbook2x
+{ stdenv, fetchurl, autoreconfHook, pkgconfig, perl, docbook2x
 , docbook_xml_dtd_45, python3Packages, pam
 
 # Optional Dependencies
diff --git a/pkgs/os-specific/linux/mbpfan/default.nix b/pkgs/os-specific/linux/mbpfan/default.nix
index a825314683e..77b0d915edb 100644
--- a/pkgs/os-specific/linux/mbpfan/default.nix
+++ b/pkgs/os-specific/linux/mbpfan/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, fetchpatch, gnugrep, kmod }:
+{ stdenv, lib, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
   name = "mbpfan-${version}";
diff --git a/pkgs/os-specific/linux/microcode/amd.nix b/pkgs/os-specific/linux/microcode/amd.nix
index 76a34052991..bd4b3d9377f 100644
--- a/pkgs/os-specific/linux/microcode/amd.nix
+++ b/pkgs/os-specific/linux/microcode/amd.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, firmwareLinuxNonfree, libarchive }:
+{ stdenv, firmwareLinuxNonfree, libarchive }:
 
 stdenv.mkDerivation rec {
   name = "amd-ucode-${firmwareLinuxNonfree.version}";
diff --git a/pkgs/os-specific/linux/mkinitcpio-nfs-utils/default.nix b/pkgs/os-specific/linux/mkinitcpio-nfs-utils/default.nix
index f4e7ad1f234..1b5925a5581 100644
--- a/pkgs/os-specific/linux/mkinitcpio-nfs-utils/default.nix
+++ b/pkgs/os-specific/linux/mkinitcpio-nfs-utils/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, xz }:
+{ stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   name = "mkinitcpio-nfs-utils-0.3";
diff --git a/pkgs/os-specific/linux/musl/default.nix b/pkgs/os-specific/linux/musl/default.nix
index 6bcd2ea692d..d6936ccd650 100644
--- a/pkgs/os-specific/linux/musl/default.nix
+++ b/pkgs/os-specific/linux/musl/default.nix
@@ -1,5 +1,4 @@
 { stdenv, lib, fetchurl
-, buildPackages
 , linuxHeaders ? null
 , useBSDCompatHeaders ? true
 }:
diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix
index 8eeaf502020..6fcb28a985c 100644
--- a/pkgs/os-specific/linux/nvidia-x11/default.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/default.nix
@@ -1,4 +1,4 @@
-{ lib, callPackage, fetchurl, fetchpatch }:
+{ lib, callPackage, fetchurl }:
 
 let
   generic = args: callPackage (import ./generic.nix args) { };
diff --git a/pkgs/os-specific/linux/nvidia-x11/generic.nix b/pkgs/os-specific/linux/nvidia-x11/generic.nix
index b5435f23e71..0ededc08050 100644
--- a/pkgs/os-specific/linux/nvidia-x11/generic.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/generic.nix
@@ -12,7 +12,7 @@
 , patches ? []
 }:
 
-{ stdenv, callPackage, pkgsi686Linux, fetchurl, fetchpatch
+{ stdenv, callPackage, pkgsi686Linux, fetchurl
 , 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
diff --git a/pkgs/os-specific/linux/nvidia-x11/persistenced.nix b/pkgs/os-specific/linux/nvidia-x11/persistenced.nix
index 21e6cb5d500..474d3a69119 100644
--- a/pkgs/os-specific/linux/nvidia-x11/persistenced.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/persistenced.nix
@@ -1,6 +1,6 @@
 nvidia_x11: sha256:
 
-{ stdenv, lib, fetchurl, m4 }:
+{ stdenv, fetchurl, m4 }:
 
 stdenv.mkDerivation rec {
   name = "nvidia-persistenced-${nvidia_x11.version}";
diff --git a/pkgs/os-specific/linux/openvswitch/default.nix b/pkgs/os-specific/linux/openvswitch/default.nix
index ac8a1c7de4a..a2a272f1b3a 100644
--- a/pkgs/os-specific/linux/openvswitch/default.nix
+++ b/pkgs/os-specific/linux/openvswitch/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, makeWrapper, pkgconfig, utillinux, which
-, procps, libcap_ng, openssl, python27, iproute , perl
+, procps, libcap_ng, openssl, python27 , perl
 , kernel ? null }:
 
 with stdenv.lib;
diff --git a/pkgs/os-specific/linux/ply/default.nix b/pkgs/os-specific/linux/ply/default.nix
index 8ae73189276..43f184f384d 100644
--- a/pkgs/os-specific/linux/ply/default.nix
+++ b/pkgs/os-specific/linux/ply/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, kernel, fetchFromGitHub, autoreconfHook, yacc, flex, bison, p7zip }:
+{ stdenv, kernel, fetchFromGitHub, autoreconfHook, yacc, flex, p7zip }:
 
 assert kernel != null -> stdenv.lib.versionAtLeast kernel.version "4.0";
 
diff --git a/pkgs/os-specific/linux/pmount/default.nix b/pkgs/os-specific/linux/pmount/default.nix
index 63d159e1884..1a7a31d978a 100644
--- a/pkgs/os-specific/linux/pmount/default.nix
+++ b/pkgs/os-specific/linux/pmount/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cryptsetup, dbus, dbus-glib, intltool, ntfs3g, utillinux
+{ stdenv, fetchurl, intltool, ntfs3g, utillinux
 , mediaDir ? "/media/"
 , lockDir ? "/var/lock/pmount"
 , whiteList ? "/etc/pmount.allow"
diff --git a/pkgs/os-specific/linux/prl-tools/default.nix b/pkgs/os-specific/linux/prl-tools/default.nix
index 000d11af87d..be93ff6f2eb 100644
--- a/pkgs/os-specific/linux/prl-tools/default.nix
+++ b/pkgs/os-specific/linux/prl-tools/default.nix
@@ -1,8 +1,7 @@
-{ stdenv, lib, requireFile, makeWrapper, substituteAll, p7zip
+{ stdenv, lib, makeWrapper, p7zip
 , gawk, utillinux, xorg, glib, dbus-glib, zlib
 , kernel ? null, libsOnly ? false
 , undmg, fetchurl
-, libelf
 }:
 
 assert (!libsOnly) -> kernel != null;
diff --git a/pkgs/os-specific/linux/rtl8812au/default.nix b/pkgs/os-specific/linux/rtl8812au/default.nix
index 96306a9d5c6..879c427b049 100644
--- a/pkgs/os-specific/linux/rtl8812au/default.nix
+++ b/pkgs/os-specific/linux/rtl8812au/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchpatch, kernel, bc }:
+{ stdenv, fetchFromGitHub, kernel, bc }:
 
 stdenv.mkDerivation rec {
   name = "rtl8812au-${kernel.version}-${version}";
diff --git a/pkgs/os-specific/linux/rtl8814au/default.nix b/pkgs/os-specific/linux/rtl8814au/default.nix
index 99b42fc7400..c54d4577342 100644
--- a/pkgs/os-specific/linux/rtl8814au/default.nix
+++ b/pkgs/os-specific/linux/rtl8814au/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchpatch, kernel }:
+{ stdenv, fetchFromGitHub, kernel }:
 
 stdenv.mkDerivation rec {
   name = "rtl8814au-${kernel.version}-${version}";
diff --git a/pkgs/os-specific/linux/service-wrapper/default.nix b/pkgs/os-specific/linux/service-wrapper/default.nix
index 07a9b06ae76..64e38b41a5f 100644
--- a/pkgs/os-specific/linux/service-wrapper/default.nix
+++ b/pkgs/os-specific/linux/service-wrapper/default.nix
@@ -1,4 +1,4 @@
-{ lib, runCommand, substituteAll, fetchurl, systemd, coreutils }:
+{ lib, runCommand, substituteAll, coreutils }:
 
 let
   name = "service-wrapper-${version}";
diff --git a/pkgs/os-specific/linux/seturgent/default.nix b/pkgs/os-specific/linux/seturgent/default.nix
index 4491bb7bf93..42b5317d556 100644
--- a/pkgs/os-specific/linux/seturgent/default.nix
+++ b/pkgs/os-specific/linux/seturgent/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libX11, xproto, xdotool, unzip }:
+{ stdenv, fetchurl, libX11, xproto, unzip }:
 
 stdenv.mkDerivation {
   name = "seturgent-2012-08-17";
diff --git a/pkgs/os-specific/linux/sssd/default.nix b/pkgs/os-specific/linux/sssd/default.nix
index 99e4b09f46d..0a55608af96 100644
--- a/pkgs/os-specific/linux/sssd/default.nix
+++ b/pkgs/os-specific/linux/sssd/default.nix
@@ -1,9 +1,9 @@
-{ stdenv, fetchurl, pkgs, lib, glibc, augeas, dnsutils, c-ares, curl,
+{ stdenv, fetchurl, pkgs, glibc, augeas, dnsutils, c-ares, curl,
   cyrus_sasl, ding-libs, libnl, libunistring, nss, samba, libnfsidmap, doxygen,
   python, python3, pam, popt, talloc, tdb, tevent, pkgconfig, ldb, openldap,
   pcre, kerberos, cifs-utils, glib, keyutils, dbus, fakeroot, libxslt, libxml2,
-  libuuid, docbook_xsl, ldap, systemd, nspr, check, cmocka, uid_wrapper,
-  nss_wrapper, docbook_xml_dtd_44, ncurses, Po4a, http-parser, jansson
+  libuuid, ldap, systemd, nspr, check, cmocka, uid_wrapper,
+  nss_wrapper, ncurses, Po4a, http-parser, jansson
   , withSudo ? false }:
 
 let
diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix
index 6223c967619..cdb1910d9c0 100644
--- a/pkgs/os-specific/linux/sysdig/default.nix
+++ b/pkgs/os-specific/linux/sysdig/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, fetchFromGitHub, cmake, luajit, kernel, zlib, ncurses, perl, jsoncpp, libb64, openssl, curl, jq, gcc, fetchpatch}:
+{stdenv, fetchFromGitHub, cmake, luajit, kernel, zlib, ncurses, perl, jsoncpp, libb64, openssl, curl, jq, gcc}:
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index 307ba9f43fa..abb6efa29bf 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchFromGitHub, fetchpatch, pkgconfig, intltool, gperf, libcap, kmod
-, zlib, xz, pam, acl, cryptsetup, libuuid, m4, utillinux, libffi
+, xz, pam, acl, libuuid, m4, utillinux, libffi
 , glib, kbd, libxslt, coreutils, libgcrypt, libgpgerror, libidn2, libapparmor
 , audit, lz4, bzip2, libmicrohttpd, pcre2
 , linuxHeaders ? stdenv.cc.libc.linuxHeaders
 , iptables, gnu-efi
-, autoreconfHook, gettext, docbook_xsl, docbook_xml_dtd_42, docbook_xml_dtd_45
+, gettext, docbook_xsl, docbook_xml_dtd_42, docbook_xml_dtd_45
 , ninja, meson, python3Packages, glibcLocales
 , patchelf
 , getent
diff --git a/pkgs/os-specific/linux/tbs/default.nix b/pkgs/os-specific/linux/tbs/default.nix
index 291666c0b45..fec70e8c485 100644
--- a/pkgs/os-specific/linux/tbs/default.nix
+++ b/pkgs/os-specific/linux/tbs/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, kernel, kmod, perl, patchutils, perlPackages, libelf }:
+{ stdenv, lib, fetchFromGitHub, kernel, kmod, perl, patchutils, perlPackages }:
 let
 
   media = fetchFromGitHub rec {
diff --git a/pkgs/os-specific/linux/thunderbolt/default.nix b/pkgs/os-specific/linux/thunderbolt/default.nix
index 9d919aaaa93..ac687de8c9a 100644
--- a/pkgs/os-specific/linux/thunderbolt/default.nix
+++ b/pkgs/os-specific/linux/thunderbolt/default.nix
@@ -4,7 +4,6 @@
 , fetchFromGitHub
 , pkgconfig
 , txt2tags
-, udev
 }:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/os-specific/linux/trinity/default.nix b/pkgs/os-specific/linux/trinity/default.nix
index 4c3a92cd87e..46b09dce437 100644
--- a/pkgs/os-specific/linux/trinity/default.nix
+++ b/pkgs/os-specific/linux/trinity/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchFromGitHub, linuxHeaders }:
+{ stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
   name = "trinity-${version}";
diff --git a/pkgs/os-specific/linux/udisks/2-default.nix b/pkgs/os-specific/linux/udisks/2-default.nix
index 9f65d0a0316..65c995558a4 100644
--- a/pkgs/os-specific/linux/udisks/2-default.nix
+++ b/pkgs/os-specific/linux/udisks/2-default.nix
@@ -2,7 +2,7 @@
 , gnome3, gtk-doc, acl, systemd, glib, libatasmart, polkit, coreutils, bash
 , expat, libxslt, docbook_xsl, utillinux, mdadm, libgudev, libblockdev, parted
 , gobjectIntrospection, docbook_xml_dtd_412, docbook_xml_dtd_43
-, libxfs, f2fs-tools, dosfstools, e2fsprogs, btrfs-progs, exfat, nilfs-utils, udftools, ntfs3g
+, libxfs, f2fs-tools, dosfstools, e2fsprogs, btrfs-progs, exfat, nilfs-utils, ntfs3g
 }:
 
 let
diff --git a/pkgs/os-specific/linux/upower/default.nix b/pkgs/os-specific/linux/upower/default.nix
index 1e9101b68af..c4af0bec9a2 100644
--- a/pkgs/os-specific/linux/upower/default.nix
+++ b/pkgs/os-specific/linux/upower/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, glib, dbus-glib
+{ stdenv, fetchurl, pkgconfig, dbus-glib
 , intltool, libxslt, docbook_xsl, udev, libgudev, libusb1
 , useSystemd ? true, systemd, gobjectIntrospection
 }:
diff --git a/pkgs/os-specific/linux/util-linux/default.nix b/pkgs/os-specific/linux/util-linux/default.nix
index 9ec6c22d32a..35f32b0afdd 100644
--- a/pkgs/os-specific/linux/util-linux/default.nix
+++ b/pkgs/os-specific/linux/util-linux/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, pkgconfig, zlib, fetchpatch, shadow
+{ lib, stdenv, fetchurl, pkgconfig, zlib, shadow
 , ncurses ? null, perl ? null, pam, systemd, minimal ? false }:
 
 let
diff --git a/pkgs/os-specific/linux/virtualbox/default.nix b/pkgs/os-specific/linux/virtualbox/default.nix
index 72d7690d2f8..9e2dee099ce 100644
--- a/pkgs/os-specific/linux/virtualbox/default.nix
+++ b/pkgs/os-specific/linux/virtualbox/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, virtualbox, kernel, strace }:
+{ stdenv, virtualbox, kernel }:
 
 stdenv.mkDerivation {
   name = "virtualbox-modules-${virtualbox.version}-${kernel.version}";
diff --git a/pkgs/os-specific/linux/wireguard/default.nix b/pkgs/os-specific/linux/wireguard/default.nix
index 42982d49ce8..8f9a565ecc7 100644
--- a/pkgs/os-specific/linux/wireguard/default.nix
+++ b/pkgs/os-specific/linux/wireguard/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip, kernel, wireguard-tools }:
+{ stdenv, kernel, wireguard-tools }:
 
 # module requires Linux >= 3.10 https://www.wireguard.io/install/#kernel-requirements
 assert stdenv.lib.versionAtLeast kernel.version "3.10";
diff --git a/pkgs/os-specific/linux/wpa_supplicant/default.nix b/pkgs/os-specific/linux/wpa_supplicant/default.nix
index 7b421aaff3d..add7c648856 100644
--- a/pkgs/os-specific/linux/wpa_supplicant/default.nix
+++ b/pkgs/os-specific/linux/wpa_supplicant/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchpatch, fetchurl, lib, openssl, pkgconfig, libnl
+{ stdenv, fetchurl, openssl, pkgconfig, libnl
 , dbus, readline ? null, pcsclite ? null
 }:
 
diff --git a/pkgs/os-specific/linux/wpa_supplicant/gui.nix b/pkgs/os-specific/linux/wpa_supplicant/gui.nix
index 06a38b29166..f4ef1b1498f 100644
--- a/pkgs/os-specific/linux/wpa_supplicant/gui.nix
+++ b/pkgs/os-specific/linux/wpa_supplicant/gui.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, qtbase, qmake, inkscape, imagemagick, wpa_supplicant }:
+{ stdenv, qtbase, qmake, inkscape, imagemagick, wpa_supplicant }:
 
 stdenv.mkDerivation {
   name = "wpa_gui-${wpa_supplicant.version}";
diff --git a/pkgs/os-specific/linux/xf86-input-wacom/default.nix b/pkgs/os-specific/linux/xf86-input-wacom/default.nix
index b5937dff375..e0e211642af 100644
--- a/pkgs/os-specific/linux/xf86-input-wacom/default.nix
+++ b/pkgs/os-specific/linux/xf86-input-wacom/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl
-, file, inputproto, libX11, libXext, libXi, libXrandr, libXrender
+, inputproto, libX11, libXext, libXi, libXrandr, libXrender
 , ncurses, pkgconfig, randrproto, xorgserver, xproto, udev, libXinerama, pixman }:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/os-specific/windows/pthread-w32/default.nix b/pkgs/os-specific/windows/pthread-w32/default.nix
index ef42dadc297..7cd414a97b0 100644
--- a/pkgs/os-specific/windows/pthread-w32/default.nix
+++ b/pkgs/os-specific/windows/pthread-w32/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, mingw_header, hostPlatform, buildPlatform }:
+{ fetchurl, stdenv, hostPlatform, buildPlatform }:
 
 # This file is tweaked for cross-compilation only.
 assert hostPlatform != buildPlatform;
diff --git a/pkgs/servers/amqp/rabbitmq-server/default.nix b/pkgs/servers/amqp/rabbitmq-server/default.nix
index 4cc187846d0..22a9aef8eda 100644
--- a/pkgs/servers/amqp/rabbitmq-server/default.nix
+++ b/pkgs/servers/amqp/rabbitmq-server/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, runCommand
+{ stdenv, fetchurl
 , erlang, python, libxml2, libxslt, xmlto
 , docbook_xml_dtd_45, docbook_xsl, zip, unzip, rsync
 , AppKit, Carbon, Cocoa
diff --git a/pkgs/servers/asterisk/default.nix b/pkgs/servers/asterisk/default.nix
index b1d60d8c145..b2b681bcc8b 100644
--- a/pkgs/servers/asterisk/default.nix
+++ b/pkgs/servers/asterisk/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, pkgs, lib, fetchurl, fetchgit, fetchsvn, fetchpatch,
+{ stdenv, lib, fetchurl, fetchsvn,
   jansson, libxml2, libxslt, ncurses, openssl, sqlite,
   utillinux, dmidecode, libuuid, newt,
   lua, speex,
diff --git a/pkgs/servers/caddy/default.nix b/pkgs/servers/caddy/default.nix
index 548d01c249d..ee403ab49f0 100644
--- a/pkgs/servers/caddy/default.nix
+++ b/pkgs/servers/caddy/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoPackage, fetchFromGitHub, fetchpatch }:
+{ stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "caddy-${version}";
diff --git a/pkgs/servers/computing/storm/default.nix b/pkgs/servers/computing/storm/default.nix
index 90c87f8019d..8335e40de98 100644
--- a/pkgs/servers/computing/storm/default.nix
+++ b/pkgs/servers/computing/storm/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, lib, fetchurl, zip, unzip, makeWrapper
+{ stdenv, lib, fetchurl, zip, unzip
 , jzmq, jdk, python
-, logsDir ? "", confFile ? "", extraLibraryPaths ? [], extraJars ? [] }:
+, confFile ? "", extraLibraryPaths ? [], extraJars ? [] }:
 
 stdenv.mkDerivation rec {
   name = "apache-storm-" + version;
diff --git a/pkgs/servers/consul/default.nix b/pkgs/servers/consul/default.nix
index d2ad5d0bd8e..5cf19279100 100644
--- a/pkgs/servers/consul/default.nix
+++ b/pkgs/servers/consul/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, consul-ui, fetchFromGitHub }:
+{ stdenv, buildGoPackage, consul-ui, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "consul-${version}";
diff --git a/pkgs/servers/dict/dictd-wordnet.nix b/pkgs/servers/dict/dictd-wordnet.nix
index 13a78d61098..8a1bb6313ad 100644
--- a/pkgs/servers/dict/dictd-wordnet.nix
+++ b/pkgs/servers/dict/dictd-wordnet.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchsvn, python, wordnet, writeScript}:
+{stdenv, python, wordnet, writeScript}:
 
 stdenv.mkDerivation rec {
   version = "542";
diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix
index bfa610b57d8..90cbc6cec55 100644
--- a/pkgs/servers/dns/knot-resolver/default.nix
+++ b/pkgs/servers/dns/knot-resolver/default.nix
@@ -2,7 +2,7 @@
 , knot-dns, luajit, libuv, lmdb, gnutls, nettle
 , cmocka, systemd, dns-root-data, makeWrapper
 , extraFeatures ? false /* catch-all if defaults aren't enough */
-, hiredis, libmemcached, luajitPackages
+, luajitPackages
 }:
 let # un-indented, over the whole file
 
diff --git a/pkgs/servers/dns/nsd/default.nix b/pkgs/servers/dns/nsd/default.nix
index 2c82b0bf33a..1ac1d394894 100644
--- a/pkgs/servers/dns/nsd/default.nix
+++ b/pkgs/servers/dns/nsd/default.nix
@@ -1,4 +1,4 @@
-{ config, stdenv, fetchurl, libevent, openssl
+{ stdenv, fetchurl, libevent, openssl
 , bind8Stats       ? false
 , checking         ? false
 , ipv6             ? true
diff --git a/pkgs/servers/etcd/default.nix b/pkgs/servers/etcd/default.nix
index 29cb8c2223c..d6b71f81608 100644
--- a/pkgs/servers/etcd/default.nix
+++ b/pkgs/servers/etcd/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, libpcap, buildGoPackage, fetchFromGitHub }:
+{ lib, libpcap, buildGoPackage, fetchFromGitHub }:
 
 with lib;
 
diff --git a/pkgs/servers/exhibitor/default.nix b/pkgs/servers/exhibitor/default.nix
index c1234606291..5e2381ada1d 100644
--- a/pkgs/servers/exhibitor/default.nix
+++ b/pkgs/servers/exhibitor/default.nix
@@ -1,4 +1,4 @@
-{ fetchFromGitHub, buildMaven, maven, jdk, makeWrapper, stdenv, ... }:
+{ fetchFromGitHub, maven, jdk, makeWrapper, stdenv, ... }:
 stdenv.mkDerivation rec {
   name = "exhibitor-${version}";
   version = "1.5.6";
diff --git a/pkgs/servers/firebird/default.nix b/pkgs/servers/firebird/default.nix
index 24ed1dffd4d..caf7d8360f0 100644
--- a/pkgs/servers/firebird/default.nix
+++ b/pkgs/servers/firebird/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, libedit, ncurses, automake, autoconf, libtool
+{stdenv, fetchurl, libedit, automake, autoconf, libtool
 ,
   # icu = null: use icu which comes with firebird
 
diff --git a/pkgs/servers/gotty/default.nix b/pkgs/servers/gotty/default.nix
index 89f1821981f..ebade244bdf 100644
--- a/pkgs/servers/gotty/default.nix
+++ b/pkgs/servers/gotty/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+{ stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "gotty-${version}";
diff --git a/pkgs/servers/h2/default.nix b/pkgs/servers/h2/default.nix
index fc9d4c0508e..c4be1f3c3b3 100644
--- a/pkgs/servers/h2/default.nix
+++ b/pkgs/servers/h2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip, jre, makeWrapper, unzip }:
+{ stdenv, fetchzip, jre, makeWrapper }:
 stdenv.mkDerivation rec {
   name = "h2-${version}";
 
diff --git a/pkgs/servers/hbase/default.nix b/pkgs/servers/hbase/default.nix
index dcd81fa44b0..6a33ac638d2 100644
--- a/pkgs/servers/hbase/default.nix
+++ b/pkgs/servers/hbase/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, jre, makeWrapper }:
+{ stdenv, fetchurl, makeWrapper }:
 stdenv.mkDerivation rec {
   name = "hbase-${version}";
   version = "0.98.24";
diff --git a/pkgs/servers/home-assistant/appdaemon.nix b/pkgs/servers/home-assistant/appdaemon.nix
index 49313179503..d921eee49cf 100644
--- a/pkgs/servers/home-assistant/appdaemon.nix
+++ b/pkgs/servers/home-assistant/appdaemon.nix
@@ -1,4 +1,4 @@
-{ lib, python3, fetchpatch }:
+{ lib, python3 }:
 
 let
   python = python3.override {
diff --git a/pkgs/servers/http/couchdb/default.nix b/pkgs/servers/http/couchdb/default.nix
index 43334819dc5..5a873c7e84b 100644
--- a/pkgs/servers/http/couchdb/default.nix
+++ b/pkgs/servers/http/couchdb/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, erlang, icu, openssl, spidermonkey, curl, help2man, python
+{ stdenv, fetchurl, erlang, icu, openssl, spidermonkey, curl, help2man
 , sphinx, which, file, pkgconfig, getopt }:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/servers/http/jboss/jdbc/mysql/default.nix b/pkgs/servers/http/jboss/jdbc/mysql/default.nix
index dbc5c73414c..fd2dec44c7f 100644
--- a/pkgs/servers/http/jboss/jdbc/mysql/default.nix
+++ b/pkgs/servers/http/jboss/jdbc/mysql/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, jboss, mysql_jdbc }:
+{ stdenv, mysql_jdbc }:
 
 stdenv.mkDerivation {
   name = "jboss-mysql-jdbc";
diff --git a/pkgs/servers/http/nginx/generic.nix b/pkgs/servers/http/nginx/generic.nix
index 44869593003..643e7ed719a 100644
--- a/pkgs/servers/http/nginx/generic.nix
+++ b/pkgs/servers/http/nginx/generic.nix
@@ -1,10 +1,9 @@
-{ stdenv, fetchurl, fetchFromGitHub, openssl, zlib, pcre, libxml2, libxslt, expat
+{ stdenv, fetchurl, openssl, zlib, pcre, libxml2, libxslt
 , gd, geoip
 , withDebug ? false
 , withStream ? true
 , withMail ? false
 , modules ? []
-, hardening ? true
 , version, sha256, ...
 }:
 
diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix
index 1f6fcc31943..0910a6d0584 100644
--- a/pkgs/servers/http/nginx/modules.nix
+++ b/pkgs/servers/http/nginx/modules.nix
@@ -1,4 +1,4 @@
-{ fetchFromGitHub, fetchurl, lib, pkgs }:
+{ fetchFromGitHub, lib, pkgs }:
 
 {
   brotli = {
diff --git a/pkgs/servers/http/nix-binary-cache/default.nix b/pkgs/servers/http/nix-binary-cache/default.nix
index 33801c8cd32..479c9e41aa9 100644
--- a/pkgs/servers/http/nix-binary-cache/default.nix
+++ b/pkgs/servers/http/nix-binary-cache/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl
+{stdenv
 , coreutils, findutils, nix, xz, bzip2, gnused, gnugrep, openssl
 , lighttpd, iproute }:
 stdenv.mkDerivation rec {
diff --git a/pkgs/servers/http/openresty/default.nix b/pkgs/servers/http/openresty/default.nix
index 1155bac7570..1fe48e84fac 100644
--- a/pkgs/servers/http/openresty/default.nix
+++ b/pkgs/servers/http/openresty/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchgit, openssl, zlib, pcre, postgresql, libxml2, libxslt,
+{ stdenv, fetchurl, openssl, zlib, pcre, postgresql, libxml2, libxslt,
 gd, geoip, perl }:
 
 with stdenv.lib;
diff --git a/pkgs/servers/interlock/default.nix b/pkgs/servers/interlock/default.nix
index 0df055f9690..f57c94cd108 100644
--- a/pkgs/servers/interlock/default.nix
+++ b/pkgs/servers/interlock/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, sudo, coreutils, systemd, cryptsetup
+{ sudo, coreutils, systemd, cryptsetup
 , mount, umount
 , buildGoPackage, fetchFromGitHub }:
 
diff --git a/pkgs/servers/isso/default.nix b/pkgs/servers/isso/default.nix
index 5aafe55512b..9e8a9dc9ec6 100644
--- a/pkgs/servers/isso/default.nix
+++ b/pkgs/servers/isso/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, python2, fetchurl, fetchFromGitHub }:
+{ stdenv, python2, fetchFromGitHub }:
 
 let python = python2.override {
   packageOverrides = self: super: {
diff --git a/pkgs/servers/ldap/389/default.nix b/pkgs/servers/ldap/389/default.nix
index 6826df5f6e8..4276a51715a 100644
--- a/pkgs/servers/ldap/389/default.nix
+++ b/pkgs/servers/ldap/389/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, pkgconfig, perl, pam, nspr, nss, openldap
+{ stdenv, fetchurl, pkgconfig, perl, pam, nspr, nss, openldap
 , db, cyrus_sasl, svrcore, icu, net_snmp, kerberos, pcre, perlPackages
 }:
 let
diff --git a/pkgs/servers/mail/dovecot/default.nix b/pkgs/servers/mail/dovecot/default.nix
index e676246a08e..5a9d8e61b1f 100644
--- a/pkgs/servers/mail/dovecot/default.nix
+++ b/pkgs/servers/mail/dovecot/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, fetchpatch, perl, pkgconfig, systemd, openssl
+{ stdenv, lib, fetchurl, perl, pkgconfig, systemd, openssl
 , bzip2, zlib, lz4, inotify-tools, pam, libcap
 , clucene_core_2, icu, openldap, libsodium, libstemmer
 # Auth modules
diff --git a/pkgs/servers/mail/mlmmj/default.nix b/pkgs/servers/mail/mlmmj/default.nix
index f11400c190a..98b270ad7d4 100644
--- a/pkgs/servers/mail/mlmmj/default.nix
+++ b/pkgs/servers/mail/mlmmj/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig }:
+{ stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
 
diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix
index 302aa8d5593..8c86cc6577a 100644
--- a/pkgs/servers/matrix-synapse/default.nix
+++ b/pkgs/servers/matrix-synapse/default.nix
@@ -1,4 +1,4 @@
-{ lib, pkgs, stdenv, pythonPackages, fetchurl, fetchFromGitHub, fetchpatch }:
+{ stdenv, pythonPackages, fetchurl, fetchFromGitHub }:
 let
   matrix-angular-sdk = pythonPackages.buildPythonPackage rec {
     name = "matrix-angular-sdk-${version}";
diff --git a/pkgs/servers/mesos-dns/default.nix b/pkgs/servers/mesos-dns/default.nix
index 53c87745e67..fe1f1c6760d 100644
--- a/pkgs/servers/mesos-dns/default.nix
+++ b/pkgs/servers/mesos-dns/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+{ buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "mesos-dns-${version}";
diff --git a/pkgs/servers/mirrorbits/default.nix b/pkgs/servers/mirrorbits/default.nix
index 98ac1534cf8..10c8811c548 100644
--- a/pkgs/servers/mirrorbits/default.nix
+++ b/pkgs/servers/mirrorbits/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub, fetchpatch
+{ lib, buildGoPackage, fetchFromGitHub, fetchpatch
 , pkgconfig, zlib, geoip }:
 
 buildGoPackage rec {
diff --git a/pkgs/servers/monitoring/cadvisor/default.nix b/pkgs/servers/monitoring/cadvisor/default.nix
index 0480d056c59..0e256d907dc 100644
--- a/pkgs/servers/monitoring/cadvisor/default.nix
+++ b/pkgs/servers/monitoring/cadvisor/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, go, fetchFromGitHub }:
+{ stdenv, go, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
   name = "cadvisor-${version}";
diff --git a/pkgs/servers/monitoring/consul-alerts/default.nix b/pkgs/servers/monitoring/consul-alerts/default.nix
index 646a7856788..a888549bb6a 100644
--- a/pkgs/servers/monitoring/consul-alerts/default.nix
+++ b/pkgs/servers/monitoring/consul-alerts/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+{ stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "consul-alerts-${version}";
diff --git a/pkgs/servers/monitoring/fusion-inventory/default.nix b/pkgs/servers/monitoring/fusion-inventory/default.nix
index 34b4e87bf65..96eaa5ef0cc 100644
--- a/pkgs/servers/monitoring/fusion-inventory/default.nix
+++ b/pkgs/servers/monitoring/fusion-inventory/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, buildPerlPackage, perlPackages, gnused, nix, dmidecode, pciutils, usbutils, iproute, nettools
+{ stdenv, lib, fetchurl, buildPerlPackage, perlPackages, nix, dmidecode, pciutils, usbutils, iproute, nettools
 , fetchFromGitHub, makeWrapper
 }:
 
diff --git a/pkgs/servers/monitoring/kapacitor/default.nix b/pkgs/servers/monitoring/kapacitor/default.nix
index 409801e8b7d..0e21069bbb0 100644
--- a/pkgs/servers/monitoring/kapacitor/default.nix
+++ b/pkgs/servers/monitoring/kapacitor/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, buildGoPackage }:
+{ lib, fetchFromGitHub, buildGoPackage }:
 
 buildGoPackage rec {
   name = "kapacitor-${version}";
diff --git a/pkgs/servers/monitoring/lcdproc/default.nix b/pkgs/servers/monitoring/lcdproc/default.nix
index 859849f7b2c..af5f2880a0f 100644
--- a/pkgs/servers/monitoring/lcdproc/default.nix
+++ b/pkgs/servers/monitoring/lcdproc/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, autoreconfHook, makeWrapper, pkgconfig
-, doxygen, freetype, libX11, libftdi, libftdi1, libusb, libusb1, ncurses, perl }:
+, doxygen, freetype, libX11, libftdi, libusb, libusb1, ncurses, perl }:
 
 stdenv.mkDerivation rec {
   name = "lcdproc-${version}";
diff --git a/pkgs/servers/monitoring/plugins/labs_consol_de.nix b/pkgs/servers/monitoring/plugins/labs_consol_de.nix
index 957aee43691..5d93f4c5349 100644
--- a/pkgs/servers/monitoring/plugins/labs_consol_de.nix
+++ b/pkgs/servers/monitoring/plugins/labs_consol_de.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchurl, buildPerlPackage, autoreconfHook, makeWrapper
+{ stdenv, fetchFromGitHub, fetchurl, autoreconfHook, makeWrapper
 , perl, DBDsybase, NetSNMP, coreutils, gnused, gnugrep }:
 
 let
diff --git a/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix b/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix
index 798f31c3458..1f342adebaa 100644
--- a/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+{ stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "blackbox_exporter-${version}";
diff --git a/pkgs/servers/monitoring/prometheus/collectd-exporter.nix b/pkgs/servers/monitoring/prometheus/collectd-exporter.nix
index 2bd9b6af074..0d6fbac60e5 100644
--- a/pkgs/servers/monitoring/prometheus/collectd-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/collectd-exporter.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+{ stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "collectd-exporter-${version}";
diff --git a/pkgs/servers/monitoring/prometheus/fritzbox-exporter.nix b/pkgs/servers/monitoring/prometheus/fritzbox-exporter.nix
index 2e7a4932de6..1271b3d40e1 100644
--- a/pkgs/servers/monitoring/prometheus/fritzbox-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/fritzbox-exporter.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+{ stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "fritzbox-exporter-${version}";
diff --git a/pkgs/servers/monitoring/prometheus/json-exporter.nix b/pkgs/servers/monitoring/prometheus/json-exporter.nix
index ea17c0b18b2..ffba472bdc3 100644
--- a/pkgs/servers/monitoring/prometheus/json-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/json-exporter.nix
@@ -1,5 +1,5 @@
 # This file was generated by go2nix.
-{ stdenv, buildGoPackage, fetchFromGitHub, lib }:
+{ buildGoPackage, fetchFromGitHub, lib }:
 
 buildGoPackage rec {
   name = "prometheus-json-exporter-${version}";
diff --git a/pkgs/servers/monitoring/prometheus/mesos-exporter.nix b/pkgs/servers/monitoring/prometheus/mesos-exporter.nix
index 42ff2496df1..ade9bb87d99 100644
--- a/pkgs/servers/monitoring/prometheus/mesos-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/mesos-exporter.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+{ stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "mesos_exporter-${version}";
diff --git a/pkgs/servers/monitoring/prometheus/minio-exporter/default.nix b/pkgs/servers/monitoring/prometheus/minio-exporter/default.nix
index 59314f1f282..8b6c54d41f9 100644
--- a/pkgs/servers/monitoring/prometheus/minio-exporter/default.nix
+++ b/pkgs/servers/monitoring/prometheus/minio-exporter/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub, fetchpatch }:
+{ stdenv, buildGoPackage, fetchFromGitHub, fetchpatch }:
 
 buildGoPackage rec {
   name = "minio-exporter-${version}";
diff --git a/pkgs/servers/monitoring/prometheus/prom2json.nix b/pkgs/servers/monitoring/prometheus/prom2json.nix
index 788fe863396..5e4ebb58140 100644
--- a/pkgs/servers/monitoring/prometheus/prom2json.nix
+++ b/pkgs/servers/monitoring/prometheus/prom2json.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+{ stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "prom2json-${version}";
diff --git a/pkgs/servers/monitoring/prometheus/snmp-exporter.nix b/pkgs/servers/monitoring/prometheus/snmp-exporter.nix
index 9692354ad8a..29454dd44d2 100644
--- a/pkgs/servers/monitoring/prometheus/snmp-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/snmp-exporter.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, go, buildGoPackage, fetchFromGitHub, net_snmp }:
+{ stdenv, buildGoPackage, fetchFromGitHub, net_snmp }:
 
 buildGoPackage rec {
   name = "snmp_exporter-${version}";
diff --git a/pkgs/servers/monitoring/prometheus/statsd-bridge.nix b/pkgs/servers/monitoring/prometheus/statsd-bridge.nix
index f4d9f5a8503..e5480e02037 100644
--- a/pkgs/servers/monitoring/prometheus/statsd-bridge.nix
+++ b/pkgs/servers/monitoring/prometheus/statsd-bridge.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+{ stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "statsd_exporter-${version}";
diff --git a/pkgs/servers/monitoring/prometheus/surfboard-exporter.nix b/pkgs/servers/monitoring/prometheus/surfboard-exporter.nix
index 13e17d0b019..0c5cc626765 100644
--- a/pkgs/servers/monitoring/prometheus/surfboard-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/surfboard-exporter.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+{ stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "surfboard_exporter-${version}";
diff --git a/pkgs/servers/monitoring/prometheus/unifi-exporter/default.nix b/pkgs/servers/monitoring/prometheus/unifi-exporter/default.nix
index 44a670b95ab..18fa3f98db2 100644
--- a/pkgs/servers/monitoring/prometheus/unifi-exporter/default.nix
+++ b/pkgs/servers/monitoring/prometheus/unifi-exporter/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+{ stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "unifi-exporter-${version}";
diff --git a/pkgs/servers/monitoring/prometheus/varnish-exporter.nix b/pkgs/servers/monitoring/prometheus/varnish-exporter.nix
index d83aa5b4665..b23270cd8c1 100644
--- a/pkgs/servers/monitoring/prometheus/varnish-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/varnish-exporter.nix
@@ -1,5 +1,5 @@
 # This file was generated by go2nix.
-{ stdenv, lib, buildGoPackage, fetchFromGitHub, makeWrapper, varnish }:
+{ lib, buildGoPackage, fetchFromGitHub, makeWrapper, varnish }:
 
 buildGoPackage rec {
   name = "prometheus_varnish_exporter-${version}";
diff --git a/pkgs/servers/monitoring/zabbix/2.0.nix b/pkgs/servers/monitoring/zabbix/2.0.nix
index d3816cf1ecd..9f1a2baeb9a 100644
--- a/pkgs/servers/monitoring/zabbix/2.0.nix
+++ b/pkgs/servers/monitoring/zabbix/2.0.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, postgresql, curl, openssl, zlib, gettext
+{ stdenv, fetchurl, pkgconfig, postgresql, curl, openssl, zlib
 , enableJabber ? false, minmay ? null }:
 
 assert enableJabber -> minmay != null;
diff --git a/pkgs/servers/monitoring/zabbix/2.2.nix b/pkgs/servers/monitoring/zabbix/2.2.nix
index bc5556d4bc0..bf3849e6524 100644
--- a/pkgs/servers/monitoring/zabbix/2.2.nix
+++ b/pkgs/servers/monitoring/zabbix/2.2.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, postgresql, curl, openssl, zlib, gettext
+{ stdenv, fetchurl, pkgconfig, postgresql, curl, openssl, zlib
 , net_snmp , libssh2, openldap
 , enableJabber ? false, minmay ? null
 , enableSnmp ? false
diff --git a/pkgs/servers/monitoring/zabbix/3.4.nix b/pkgs/servers/monitoring/zabbix/3.4.nix
index 69b3577720f..047ce0a5130 100644
--- a/pkgs/servers/monitoring/zabbix/3.4.nix
+++ b/pkgs/servers/monitoring/zabbix/3.4.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, postgresql, curl, openssl, zlib, pcre, libevent, libiconv }:
+{ stdenv, fetchurl, pcre, libiconv }:
 
 
 let
diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix
index 35637e7f73a..f8523e8607d 100644
--- a/pkgs/servers/mpd/default.nix
+++ b/pkgs/servers/mpd/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, pkgconfig, glib, systemd, boost, darwin
+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, glib, systemd, boost, darwin
 , alsaSupport ? true, alsaLib
 , avahiSupport ? true, avahi, dbus
 , flacSupport ? true, flac
diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix
index 0121d748129..3d6a1aa9c6f 100644
--- a/pkgs/servers/nextcloud/default.nix
+++ b/pkgs/servers/nextcloud/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch }:
+{ stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   name= "nextcloud-${version}";
diff --git a/pkgs/servers/nosql/arangodb/default.nix b/pkgs/servers/nosql/arangodb/default.nix
index 9b21deecf4b..f3d3fed23a4 100644
--- a/pkgs/servers/nosql/arangodb/default.nix
+++ b/pkgs/servers/nosql/arangodb/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub
-, openssl, zlib, python2Packages, readline, cmake, python }:
+, openssl, zlib, readline, cmake, python }:
 
 let
 in stdenv.mkDerivation rec {
diff --git a/pkgs/servers/nosql/eventstore/default.nix b/pkgs/servers/nosql/eventstore/default.nix
index f97a3a5c184..1d3240fae71 100644
--- a/pkgs/servers/nosql/eventstore/default.nix
+++ b/pkgs/servers/nosql/eventstore/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchpatch, git, mono, v8 }:
+{ stdenv, fetchFromGitHub, git, mono, v8 }:
 
 # There are some similarities with the pinta derivation. We should
 # have a helper to make it easy to package these Mono apps.
diff --git a/pkgs/servers/nosql/mongodb/default.nix b/pkgs/servers/nosql/mongodb/default.nix
index b9e850e8dfd..c62ade1a20b 100644
--- a/pkgs/servers/nosql/mongodb/default.nix
+++ b/pkgs/servers/nosql/mongodb/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, fetchpatch, scons, boost, gperftools, pcre-cpp, snappy
-, zlib, libyamlcpp, sasl, openssl, libpcap, wiredtiger, Security
+, zlib, libyamlcpp, sasl, openssl, libpcap, Security
 }:
 
 # Note:
diff --git a/pkgs/servers/nosql/rethinkdb/default.nix b/pkgs/servers/nosql/rethinkdb/default.nix
index e935b5d0987..d6ee407e341 100644
--- a/pkgs/servers/nosql/rethinkdb/default.nix
+++ b/pkgs/servers/nosql/rethinkdb/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, which, m4, python
+{ stdenv, fetchurl, which, m4
 , protobuf, boost, zlib, curl, openssl, icu, jemalloc, libtool
 , python2Packages, makeWrapper
 }:
diff --git a/pkgs/servers/nosql/riak-cs/2.1.1.nix b/pkgs/servers/nosql/riak-cs/2.1.1.nix
index 9075756c162..cf807e70596 100644
--- a/pkgs/servers/nosql/riak-cs/2.1.1.nix
+++ b/pkgs/servers/nosql/riak-cs/2.1.1.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, unzip, erlang, git, wget, which, pam, coreutils, riak
+{ stdenv, lib, fetchurl, unzip, erlang, git, wget, which, pam
 , Carbon ? null, Cocoa ? null }:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/servers/nosql/riak-cs/stanchion.nix b/pkgs/servers/nosql/riak-cs/stanchion.nix
index a064049072c..1524ca20700 100644
--- a/pkgs/servers/nosql/riak-cs/stanchion.nix
+++ b/pkgs/servers/nosql/riak-cs/stanchion.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, unzip, erlang, git, wget, which, pam, coreutils, riak 
+{ stdenv, lib, fetchurl, unzip, erlang, git, wget, which, pam 
 , Carbon ? null, Cocoa ? null }:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/servers/nosql/riak/2.2.0.nix b/pkgs/servers/nosql/riak/2.2.0.nix
index e4c9b90ab14..b041aa9f35f 100644
--- a/pkgs/servers/nosql/riak/2.2.0.nix
+++ b/pkgs/servers/nosql/riak/2.2.0.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, unzip, erlang, which, pam, coreutils }:
+{ stdenv, lib, fetchurl, unzip, erlang, which, pam }:
 
 let
   solrName = "solr-4.10.4-yz-2.tgz";
diff --git a/pkgs/servers/nsq/default.nix b/pkgs/servers/nsq/default.nix
index fa78c876c1e..d48587c924e 100644
--- a/pkgs/servers/nsq/default.nix
+++ b/pkgs/servers/nsq/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+{ buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "nsq-${version}";
diff --git a/pkgs/servers/openafs/1.6/default.nix b/pkgs/servers/openafs/1.6/default.nix
index 3f92299c2a0..22f09994ebf 100644
--- a/pkgs/servers/openafs/1.6/default.nix
+++ b/pkgs/servers/openafs/1.6/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchgit, which, autoconf, automake, flex, yacc
+{ stdenv, fetchurl, which, autoconf, automake, flex, yacc
 , glibc, perl, kerberos, libxslt, docbook_xsl, docbook_xml_dtd_43
 , ncurses # Extra ncurses utilities. Only needed for debugging.
 , tsmbac ? null # Tivoli Storage Manager Backup Client from IBM
diff --git a/pkgs/servers/openafs/1.8/default.nix b/pkgs/servers/openafs/1.8/default.nix
index 59c15839b39..fc6b1bc2426 100644
--- a/pkgs/servers/openafs/1.8/default.nix
+++ b/pkgs/servers/openafs/1.8/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchgit, which, autoconf, automake, flex, yacc
+{ stdenv, fetchurl, which, autoconf, automake, flex, yacc
 , glibc, perl, kerberos, libxslt, docbook_xsl, docbook_xml_dtd_43
 , libtool_2, removeReferencesTo
 , ncurses # Extra ncurses utilities. Only needed for debugging.
diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix
index ed4a8889c67..73af65ef256 100644
--- a/pkgs/servers/pulseaudio/default.nix
+++ b/pkgs/servers/pulseaudio/default.nix
@@ -5,9 +5,6 @@
 , sbc, bluez5, udev, openssl, fftwFloat
 , speexdsp, systemd, webrtc-audio-processing, gconf ? null
 
-# Database selection
-, tdb ? null, gdbm ? null
-
 , x11Support ? false
 
 , useSystemd ? true
diff --git a/pkgs/servers/rippled/data-api.nix b/pkgs/servers/rippled/data-api.nix
index 230e0aee218..04d520b412c 100644
--- a/pkgs/servers/rippled/data-api.nix
+++ b/pkgs/servers/rippled/data-api.nix
@@ -1,4 +1,4 @@
-{ lib, fetchgit, fetchurl, nodePackages }:
+{ lib, fetchgit, nodePackages }:
 
 with lib;
 
diff --git a/pkgs/servers/rippled/package.nix b/pkgs/servers/rippled/package.nix
index 6f5bb1d3a71..87f4326c48c 100644
--- a/pkgs/servers/rippled/package.nix
+++ b/pkgs/servers/rippled/package.nix
@@ -1,4 +1,4 @@
-{ self, fetchurl, fetchgit ? null, lib }:
+{ self, fetchurl ? null }:
 
 {
   by-spec."abbrev"."1" =
diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix
index 0ff7f88911f..eec80cb66bc 100644
--- a/pkgs/servers/samba/4.x.nix
+++ b/pkgs/servers/samba/4.x.nix
@@ -1,9 +1,9 @@
 { lib, stdenv, fetchurl, python, pkgconfig, perl, libxslt, docbook_xsl
 , fetchpatch
-, docbook_xml_dtd_42, docbook_xml_dtd_45, readline, talloc
+, docbook_xml_dtd_42, readline, talloc
 , popt, iniparser, libbsd, libarchive, libiconv, gettext
 , krb5Full, zlib, openldap, cups, pam, avahi, acl, libaio, fam, libceph, glusterfs
-, gnutls, libgcrypt, libgpgerror
+, gnutls
 , ncurses, libunwind, libibverbs, librdmacm, systemd
 
 , enableInfiniband ? false
diff --git a/pkgs/servers/samba/master.nix b/pkgs/servers/samba/master.nix
index df1f9feb4de..21038a0f218 100644
--- a/pkgs/servers/samba/master.nix
+++ b/pkgs/servers/samba/master.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub
+{ fetchFromGitHub
 , samba4
 , nettle
 } :
diff --git a/pkgs/servers/search/elasticsearch/plugins.nix b/pkgs/servers/search/elasticsearch/plugins.nix
index ade2ea94453..b93d8c2203d 100644
--- a/pkgs/servers/search/elasticsearch/plugins.nix
+++ b/pkgs/servers/search/elasticsearch/plugins.nix
@@ -1,4 +1,4 @@
-{ pkgs,  stdenv, fetchurl, fetchFromGitHub, unzip, elasticsearch }:
+{ pkgs,  stdenv, fetchurl, unzip, elasticsearch }:
 
 with pkgs.lib;
 
diff --git a/pkgs/servers/skydns/default.nix b/pkgs/servers/skydns/default.nix
index ccb174371e0..7bfea23c78b 100644
--- a/pkgs/servers/skydns/default.nix
+++ b/pkgs/servers/skydns/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+{ buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "skydns-${version}";
diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix
index 126a8cf0690..121e42f7a97 100644
--- a/pkgs/servers/sql/mariadb/default.nix
+++ b/pkgs/servers/sql/mariadb/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, cmake, pkgconfig, ncurses, zlib, xz, lzo, lz4, bzip2, snappy
 , libiconv, openssl, pcre, boost, judy, bison, libxml2
-, libaio, libevent, groff, jemalloc, cracklib, systemd, numactl, perl
+, libaio, libevent, jemalloc, cracklib, systemd, numactl, perl
 , fixDarwinDylibNames, cctools, CoreServices
 , asio, buildEnv, check, scons
 }:
diff --git a/pkgs/servers/x11/xquartz/default.nix b/pkgs/servers/x11/xquartz/default.nix
index 9c133f9d5d9..3fc7aaea9c9 100644
--- a/pkgs/servers/x11/xquartz/default.nix
+++ b/pkgs/servers/x11/xquartz/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, lib, buildEnv, makeFontsConf, gnused, writeScript, xorg, bashInteractive, substituteAll, xterm, makeWrapper, ruby
-, openssl, quartz-wm, fontconfig, xlsfonts, xfontsel
+{ stdenv, lib, buildEnv, makeFontsConf, gnused, writeScript, xorg, bashInteractive, xterm, makeWrapper, ruby
+, quartz-wm, fontconfig, xlsfonts, xfontsel
 , ttf_bitstream_vera, freefont_ttf, liberation_ttf
 , shell ? "${bashInteractive}/bin/bash"
 }:
diff --git a/pkgs/shells/bash/4.4.nix b/pkgs/shells/bash/4.4.nix
index 72ce29bf3f2..ab89dc28828 100644
--- a/pkgs/shells/bash/4.4.nix
+++ b/pkgs/shells/bash/4.4.nix
@@ -5,7 +5,6 @@
 # patch for cygwin requires readline support
 , interactive ? stdenv.isCygwin, readline70 ? null
 , withDocs ? false, texinfo ? null
-, self
 }:
 
 with stdenv.lib;
diff --git a/pkgs/shells/elvish/default.nix b/pkgs/shells/elvish/default.nix
index 086fca480bb..5a7128fa646 100644
--- a/pkgs/shells/elvish/default.nix
+++ b/pkgs/shells/elvish/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+{ stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "elvish-${version}";
diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix
index d6c107e9953..2ef0480942c 100644
--- a/pkgs/shells/fish/default.nix
+++ b/pkgs/shells/fish/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, coreutils, utillinux,
-  nettools, kbd, bc, which, gnused, gnugrep,
+  nettools, bc, which, gnused, gnugrep,
   groff, man-db, getent, libiconv, pcre2,
   gettext, ncurses, python3
 
diff --git a/pkgs/shells/oh/default.nix b/pkgs/shells/oh/default.nix
index c118cea1172..2e200a74f7b 100644
--- a/pkgs/shells/oh/default.nix
+++ b/pkgs/shells/oh/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+{ stdenv, buildGoPackage, fetchgit }:
 
 buildGoPackage rec {
   name = "oh-${version}";
diff --git a/pkgs/shells/oil/default.nix b/pkgs/shells/oil/default.nix
index ab475a63499..8d3452b912b 100644
--- a/pkgs/shells/oil/default.nix
+++ b/pkgs/shells/oil/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, coreutils }:
+{ stdenv, lib, fetchurl }:
 let
   version = "0.3.0";
 in
diff --git a/pkgs/shells/powershell/default.nix b/pkgs/shells/powershell/default.nix
index a053884bb88..93488d9e87f 100644
--- a/pkgs/shells/powershell/default.nix
+++ b/pkgs/shells/powershell/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, autoPatchelfHook, fetchzip, libunwind, libuuid, icu, curl,
+{ stdenv, autoPatchelfHook, fetchzip, libunwind, libuuid, icu, curl,
   makeWrapper, less, openssl, pam, lttng-ust }:
 
 let platformString = if stdenv.isDarwin then "osx"
diff --git a/pkgs/shells/zsh/antibody/default.nix b/pkgs/shells/zsh/antibody/default.nix
index 665f403047f..98ca9ce8f99 100644
--- a/pkgs/shells/zsh/antibody/default.nix
+++ b/pkgs/shells/zsh/antibody/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "antibody-${version}";
diff --git a/pkgs/shells/zsh/zsh-powerlevel9k/default.nix b/pkgs/shells/zsh/zsh-powerlevel9k/default.nix
index 2babf35f2b6..30c45ea3c9b 100644
--- a/pkgs/shells/zsh/zsh-powerlevel9k/default.nix
+++ b/pkgs/shells/zsh/zsh-powerlevel9k/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, zsh }:
+{ stdenv, fetchFromGitHub }:
 
 # To make use of this derivation, use
 # `programs.zsh.promptInit = "source ${pkgs.zsh-powerlevel9k}/share/zsh-powerlevel9k/powerlevel9k.zsh-theme";`
diff --git a/pkgs/shells/zsh/zsh-prezto/default.nix b/pkgs/shells/zsh/zsh-prezto/default.nix
index 7bef904081e..8acdd8bb516 100644
--- a/pkgs/shells/zsh/zsh-prezto/default.nix
+++ b/pkgs/shells/zsh/zsh-prezto/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchpatch, fetchgit, fetchFromGitHub }:
+{ stdenv, fetchgit }:
 
 stdenv.mkDerivation rec {
   name = "zsh-prezto-2017-12-03";
diff --git a/pkgs/tools/X11/bumblebee/default.nix b/pkgs/tools/X11/bumblebee/default.nix
index 7345528dad2..0d764a4cbd1 100644
--- a/pkgs/tools/X11/bumblebee/default.nix
+++ b/pkgs/tools/X11/bumblebee/default.nix
@@ -18,15 +18,14 @@
 
 { stdenv, lib, fetchurl, fetchpatch, pkgconfig, help2man, makeWrapper
 , glib, libbsd
-, libX11, libXext, xorgserver, xkbcomp, kmod, xf86videonouveau
-, nvidia_x11, virtualgl, libglvnd, primusLib
+, libX11, xorgserver, kmod, xf86videonouveau
+, nvidia_x11, virtualgl, libglvnd
 , automake111x, autoconf
 # The below should only be non-null in a x86_64 system. On a i686
 # system the above nvidia_x11 and virtualgl will be the i686 packages.
 # TODO: Confusing. Perhaps use "SubArch" instead of i686?
 , nvidia_x11_i686 ? null
 , libglvnd_i686 ? null
-, primusLib_i686 ? null
 , useDisplayDevice ? false
 , extraNvidiaDeviceOptions ? ""
 , extraNouveauDeviceOptions ? ""
diff --git a/pkgs/tools/X11/go-sct/default.nix b/pkgs/tools/X11/go-sct/default.nix
index aeb4546ff4d..189dc56975f 100644
--- a/pkgs/tools/X11/go-sct/default.nix
+++ b/pkgs/tools/X11/go-sct/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, xorg, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+{ stdenv, xorg, buildGoPackage, fetchgit }:
 
 buildGoPackage rec {
   name = "go-sct-${version}";
diff --git a/pkgs/tools/X11/primus/default.nix b/pkgs/tools/X11/primus/default.nix
index d130c9bac7c..669cb4b4844 100644
--- a/pkgs/tools/X11/primus/default.nix
+++ b/pkgs/tools/X11/primus/default.nix
@@ -6,7 +6,6 @@
 { stdenv
 , stdenv_i686
 , lib
-, bumblebee
 , primusLib
 , writeScriptBin
 , primusLib_i686 ? null
diff --git a/pkgs/tools/X11/setroot/default.nix b/pkgs/tools/X11/setroot/default.nix
index 669da86621f..45cb1966a4f 100644
--- a/pkgs/tools/X11/setroot/default.nix
+++ b/pkgs/tools/X11/setroot/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, libX11, imlib2
+{ stdenv, fetchFromGitHub, libX11, imlib2
 , enableXinerama ? true, libXinerama ? null
 }:
 
diff --git a/pkgs/tools/X11/vdpauinfo/default.nix b/pkgs/tools/X11/vdpauinfo/default.nix
index 21d7a50566d..153ff45d2a7 100644
--- a/pkgs/tools/X11/vdpauinfo/default.nix
+++ b/pkgs/tools/X11/vdpauinfo/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, xorg, libvdpau }:
+{ stdenv, fetchurl, pkgconfig, libvdpau }:
 
 stdenv.mkDerivation rec {
   name = "vdpauinfo-1.0";
diff --git a/pkgs/tools/X11/xbindkeys-config/default.nix b/pkgs/tools/X11/xbindkeys-config/default.nix
index e3d9ecd5953..987293878d8 100644
--- a/pkgs/tools/X11/xbindkeys-config/default.nix
+++ b/pkgs/tools/X11/xbindkeys-config/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libX11, gtk, pkgconfig, procps, makeWrapper, ... }:
+{ stdenv, fetchurl, gtk, pkgconfig, procps, makeWrapper, ... }:
 
 stdenv.mkDerivation rec {
   name = "xbindkeys-config-${version}";
diff --git a/pkgs/tools/X11/xdg-utils/default.nix b/pkgs/tools/X11/xdg-utils/default.nix
index 28839891aa5..d8ae32c6ee4 100644
--- a/pkgs/tools/X11/xdg-utils/default.nix
+++ b/pkgs/tools/X11/xdg-utils/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, fetchFromGitHub
 , file, libxslt, docbook_xml_dtd_412, docbook_xsl, xmlto
-, w3m, which, gnugrep, gnused, coreutils, xset
+, w3m, gnugrep, gnused, coreutils, xset
 , mimiSupport ? false, gawk ? null }:
 
 assert mimiSupport -> gawk != null;
diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix
index 8bff5a2e714..e3f815621e7 100644
--- a/pkgs/tools/X11/xpra/default.nix
+++ b/pkgs/tools/X11/xpra/default.nix
@@ -1,6 +1,6 @@
 { stdenv, lib, fetchurl, python2Packages, pkgconfig
 , xorg, gtk2, glib, pango, cairo, gdk_pixbuf, atk
-, makeWrapper, xkbcomp, xorgserver, getopt, xauth, utillinux, which, fontsConf
+, makeWrapper, xorgserver, getopt, xauth, utillinux, which
 , ffmpeg, x264, libvpx, libwebp
 , libfakeXinerama
 , gst_all_1, pulseaudio, gobjectIntrospection
diff --git a/pkgs/tools/X11/xpra/gtk3.nix b/pkgs/tools/X11/xpra/gtk3.nix
index a0c2ee8f995..16693b08e11 100644
--- a/pkgs/tools/X11/xpra/gtk3.nix
+++ b/pkgs/tools/X11/xpra/gtk3.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, buildPythonApplication
 , python, cython, pkgconfig
 , xorg, gtk3, glib, pango, cairo, gdk_pixbuf, atk, pygobject3, pycairo, gobjectIntrospection
-, makeWrapper, xkbcomp, xorgserver, getopt, xauth, utillinux, which, fontsConf
+, makeWrapper, xorgserver, getopt, xauth, utillinux, which, fontsConf
 , ffmpeg, x264, libvpx, libwebp
 , libfakeXinerama, pam }:
 
diff --git a/pkgs/tools/admin/ansible/default.nix b/pkgs/tools/admin/ansible/default.nix
index b942ae6a006..d18fe4eafd3 100644
--- a/pkgs/tools/admin/ansible/default.nix
+++ b/pkgs/tools/admin/ansible/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchFromGitHub, python2
+{ stdenv, fetchurl, python2
 , windowsSupport ? false
 }:
 
diff --git a/pkgs/tools/admin/dehydrated/default.nix b/pkgs/tools/admin/dehydrated/default.nix
index 38b70d1b5d0..c9c879becaa 100644
--- a/pkgs/tools/admin/dehydrated/default.nix
+++ b/pkgs/tools/admin/dehydrated/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, bash, coreutils, curl, diffutils, gawk, gnugrep, gnused, openssl, makeWrapper, fetchFromGitHub }:
+{ stdenv, coreutils, curl, diffutils, gawk, gnugrep, gnused, openssl, makeWrapper, fetchFromGitHub }:
 let
   pkgName = "dehydrated";
   version = "0.6.2";
diff --git a/pkgs/tools/admin/gtk-vnc/default.nix b/pkgs/tools/admin/gtk-vnc/default.nix
index 59a5ec8d4da..cd6cf90a5aa 100644
--- a/pkgs/tools/admin/gtk-vnc/default.nix
+++ b/pkgs/tools/admin/gtk-vnc/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, gobjectIntrospection
-, gnutls, cairo, libtool, glib, pkgconfig, libtasn1
+, gnutls, cairo, libtool, glib, pkgconfig
 , libffi, cyrus_sasl, intltool, perl, perlPackages, libpulseaudio
-, kbproto, libX11, libXext, xextproto, libgcrypt, gtk3, vala_0_32
+, libgcrypt, gtk3, vala_0_32
 , libogg, libgpgerror, pythonPackages }:
 
 let
diff --git a/pkgs/tools/admin/intecture/agent.nix b/pkgs/tools/admin/intecture/agent.nix
index 2b663cd3bce..780eb4e9aa5 100644
--- a/pkgs/tools/admin/intecture/agent.nix
+++ b/pkgs/tools/admin/intecture/agent.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, rustPlatform
+{ lib, fetchFromGitHub, rustPlatform
 , openssl, zeromq, czmq, pkgconfig, cmake, zlib }:
 
 with rustPlatform;
diff --git a/pkgs/tools/admin/intecture/auth.nix b/pkgs/tools/admin/intecture/auth.nix
index 759230c6a29..2a02873a8b5 100644
--- a/pkgs/tools/admin/intecture/auth.nix
+++ b/pkgs/tools/admin/intecture/auth.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, rustPlatform
+{ lib, fetchFromGitHub, rustPlatform
 , openssl, zeromq, czmq, pkgconfig, cmake, zlib }:
 
 with rustPlatform;
diff --git a/pkgs/tools/admin/intecture/cli.nix b/pkgs/tools/admin/intecture/cli.nix
index a4ac74e9f2d..fef0e50cd5b 100644
--- a/pkgs/tools/admin/intecture/cli.nix
+++ b/pkgs/tools/admin/intecture/cli.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, rustPlatform
+{ lib, fetchFromGitHub, rustPlatform
 , openssl, zeromq, czmq, pkgconfig, cmake, zlib }:
 
 with rustPlatform;
diff --git a/pkgs/tools/admin/lxd/default.nix b/pkgs/tools/admin/lxd/default.nix
index dfe4c099beb..2fbfff287cb 100644
--- a/pkgs/tools/admin/lxd/default.nix
+++ b/pkgs/tools/admin/lxd/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, pkgconfig, lxc, buildGoPackage, fetchurl
+{ stdenv, pkgconfig, lxc, buildGoPackage, fetchurl
 , makeWrapper, acl, rsync, gnutar, xz, btrfs-progs, gzip, dnsmasq
 , squashfsTools, iproute, iptables, ebtables
 }:
diff --git a/pkgs/tools/admin/simp_le/default.nix b/pkgs/tools/admin/simp_le/default.nix
index 47bf848578d..ca0e16c1185 100644
--- a/pkgs/tools/admin/simp_le/default.nix
+++ b/pkgs/tools/admin/simp_le/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchpatch, pythonPackages, bash }:
+{ stdenv, pythonPackages, bash }:
  
 pythonPackages.buildPythonApplication rec {
   pname = "simp_le-client";
diff --git a/pkgs/tools/admin/ssl-cert-check/default.nix b/pkgs/tools/admin/ssl-cert-check/default.nix
index 8d30307af2d..f8e89307815 100644
--- a/pkgs/tools/admin/ssl-cert-check/default.nix
+++ b/pkgs/tools/admin/ssl-cert-check/default.nix
@@ -1,5 +1,4 @@
 { stdenv
-, lib
 , fetchFromGitHub
 , makeWrapper
 , openssl
diff --git a/pkgs/tools/archivers/innoextract/default.nix b/pkgs/tools/archivers/innoextract/default.nix
index 14b128d15c7..dc9796cc9e3 100644
--- a/pkgs/tools/archivers/innoextract/default.nix
+++ b/pkgs/tools/archivers/innoextract/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, doxygen, makeWrapper, python
+{ stdenv, fetchurl, cmake, makeWrapper, python
 , boost, lzma
 , withGog ? false, unar ? null }:
 
diff --git a/pkgs/tools/archivers/rpmextract/default.nix b/pkgs/tools/archivers/rpmextract/default.nix
index c9ce6ac4d10..8d4d5fd8ddd 100644
--- a/pkgs/tools/archivers/rpmextract/default.nix
+++ b/pkgs/tools/archivers/rpmextract/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, rpm, cpio, substituteAll }:
+{ stdenv, rpm, cpio, substituteAll }:
 
 stdenv.mkDerivation rec {
   name = "rpmextract";
diff --git a/pkgs/tools/archivers/unp/default.nix b/pkgs/tools/archivers/unp/default.nix
index 7583663ebf0..79c8e2f20ec 100644
--- a/pkgs/tools/archivers/unp/default.nix
+++ b/pkgs/tools/archivers/unp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, pkgs, lib, fetchurl, makeWrapper, perl, unrar, unzip, gzip, file, extraBackends ? [] }:
+{ stdenv, lib, fetchurl, makeWrapper, perl, unrar, unzip, gzip, file, extraBackends ? [] }:
 
 stdenv.mkDerivation rec {
   name = "unp-${version}";
diff --git a/pkgs/tools/archivers/zpaq/zpaqd.nix b/pkgs/tools/archivers/zpaq/zpaqd.nix
index 3004c7e2132..0d60e796246 100644
--- a/pkgs/tools/archivers/zpaq/zpaqd.nix
+++ b/pkgs/tools/archivers/zpaq/zpaqd.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, unzip
-, buildPlatform, hostPlatform
+, hostPlatform
 }:
 
 let
diff --git a/pkgs/tools/backup/bareos/default.nix b/pkgs/tools/backup/bareos/default.nix
index 691568673df..e93b02e062e 100644
--- a/pkgs/tools/backup/bareos/default.nix
+++ b/pkgs/tools/backup/bareos/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, pkgconfig, nettools, gettext, libtool, flex
+{ stdenv, fetchFromGitHub, pkgconfig, nettools, gettext, flex
 , readline ? null, openssl ? null, python2 ? null, ncurses ? null, rocksdb
 , sqlite ? null, postgresql ? null, mysql ? null, zlib ? null, lzo ? null
 , jansson ? null, acl ? null, glusterfs ? null, libceph ? null, libcap ? null
diff --git a/pkgs/tools/backup/ddar/default.nix b/pkgs/tools/backup/ddar/default.nix
index eac589813f4..ce65ef4eb80 100644
--- a/pkgs/tools/backup/ddar/default.nix
+++ b/pkgs/tools/backup/ddar/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonApplication, fetchFromGitHub, python, protobuf, roundup }:
+{ lib, buildPythonApplication, fetchFromGitHub, protobuf, roundup }:
 
 buildPythonApplication rec {
   pname = "ddar";
diff --git a/pkgs/tools/backup/partimage/default.nix b/pkgs/tools/backup/partimage/default.nix
index c902802abce..8781c2d2cad 100644
--- a/pkgs/tools/backup/partimage/default.nix
+++ b/pkgs/tools/backup/partimage/default.nix
@@ -1,5 +1,4 @@
 {stdenv, fetchurl, fetchpatch, bzip2, zlib, newt, openssl, pkgconfig, slang
-, automake, autoconf, libtool, gettext
 }:
 stdenv.mkDerivation {
   name = "partimage-0.6.9";
diff --git a/pkgs/tools/backup/rsnapshot/default.nix b/pkgs/tools/backup/rsnapshot/default.nix
index 77f5951d39e..6abd7002f8d 100644
--- a/pkgs/tools/backup/rsnapshot/default.nix
+++ b/pkgs/tools/backup/rsnapshot/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, writeText, perl, openssh, rsync, logger }:
+{ fetchurl, stdenv, perl, openssh, rsync, logger }:
 
 stdenv.mkDerivation rec {
   name = "rsnapshot-1.4.2";
diff --git a/pkgs/tools/backup/ugarit-manifest-maker/default.nix b/pkgs/tools/backup/ugarit-manifest-maker/default.nix
index 00651806a10..8f93474f8f1 100644
--- a/pkgs/tools/backup/ugarit-manifest-maker/default.nix
+++ b/pkgs/tools/backup/ugarit-manifest-maker/default.nix
@@ -1,6 +1,6 @@
 { pkgs, stdenv, eggDerivation, fetchegg }:
 let
-  eggs = import ./eggs.nix { inherit pkgs stdenv eggDerivation fetchegg; };
+  eggs = import ./eggs.nix { inherit eggDerivation fetchegg; };
 in with pkgs; eggDerivation rec {
   pname = "ugarit-manifest-maker";
   version = "0.1";
diff --git a/pkgs/tools/backup/ugarit-manifest-maker/eggs.nix b/pkgs/tools/backup/ugarit-manifest-maker/eggs.nix
index 0af5dd5bfff..889d698188e 100644
--- a/pkgs/tools/backup/ugarit-manifest-maker/eggs.nix
+++ b/pkgs/tools/backup/ugarit-manifest-maker/eggs.nix
@@ -1,4 +1,4 @@
-{ pkgs, stdenv, eggDerivation, fetchegg }:
+{ eggDerivation, fetchegg }:
 rec {
   blob-utils = eggDerivation {
     name = "blob-utils-1.0.3";
diff --git a/pkgs/tools/backup/ugarit/default.nix b/pkgs/tools/backup/ugarit/default.nix
index 56da9a81020..e8f0ea22df1 100644
--- a/pkgs/tools/backup/ugarit/default.nix
+++ b/pkgs/tools/backup/ugarit/default.nix
@@ -1,6 +1,6 @@
 { pkgs, stdenv, eggDerivation, fetchegg }:
 let
-  eggs = import ./eggs.nix { inherit pkgs stdenv eggDerivation fetchegg; };
+  eggs = import ./eggs.nix { inherit eggDerivation fetchegg; };
 in with pkgs; eggDerivation rec {
   pname = "ugarit";
   version = "2.0";
diff --git a/pkgs/tools/backup/ugarit/eggs.nix b/pkgs/tools/backup/ugarit/eggs.nix
index 9329618887f..fe958cb55cc 100644
--- a/pkgs/tools/backup/ugarit/eggs.nix
+++ b/pkgs/tools/backup/ugarit/eggs.nix
@@ -1,4 +1,4 @@
-{ pkgs, stdenv, eggDerivation, fetchegg }:
+{ eggDerivation, fetchegg }:
 rec {
   aes = eggDerivation {
     name = "aes-1.5";
diff --git a/pkgs/tools/backup/znapzend/default.nix b/pkgs/tools/backup/znapzend/default.nix
index f78c300afd0..bc57215c0c4 100644
--- a/pkgs/tools/backup/znapzend/default.nix
+++ b/pkgs/tools/backup/znapzend/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchurl, zfs, mbuffer, perl, perlPackages, wget, autoconf, automake }:
+{ stdenv, fetchFromGitHub, fetchurl, perl, perlPackages, wget, autoconf, automake }:
 
 let
   # when upgrade znapzend, check versions of Perl libs here: https://github.com/oetiker/znapzend/blob/master/PERL_MODULES
diff --git a/pkgs/tools/bluetooth/blueman/default.nix b/pkgs/tools/bluetooth/blueman/default.nix
index 394f3fe5b98..da562fde160 100644
--- a/pkgs/tools/bluetooth/blueman/default.nix
+++ b/pkgs/tools/bluetooth/blueman/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, intltool, pkgconfig, pythonPackages, bluez, polkit, gtk3
+{ stdenv, lib, fetchurl, intltool, pkgconfig, pythonPackages, bluez, gtk3
 , obex_data_server, xdg_utils, libnotify, dnsmasq, dhcp
 , hicolor-icon-theme, librsvg, wrapGAppsHook, gobjectIntrospection
 , withPulseAudio ? true, libpulseaudio }:
diff --git a/pkgs/tools/bootloaders/refind/default.nix b/pkgs/tools/bootloaders/refind/default.nix
index 80add316094..674bb5b552b 100644
--- a/pkgs/tools/bootloaders/refind/default.nix
+++ b/pkgs/tools/bootloaders/refind/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, gnu-efi }:
+{ stdenv, fetchurl, gnu-efi }:
 
 let
   archids = {
diff --git a/pkgs/tools/cd-dvd/brasero/default.nix b/pkgs/tools/cd-dvd/brasero/default.nix
index 8223ba2be4b..9587416a96a 100644
--- a/pkgs/tools/cd-dvd/brasero/default.nix
+++ b/pkgs/tools/cd-dvd/brasero/default.nix
@@ -1,5 +1,5 @@
 { stdenv, lib, fetchurl, pkgconfig, gtk3, itstool, gst_all_1, libxml2, libnotify
-, libcanberra-gtk3, intltool, makeWrapper, dvdauthor, libburn, libisofs
+, libcanberra-gtk3, intltool, dvdauthor, libburn, libisofs
 , vcdimager, wrapGAppsHook, hicolor-icon-theme }:
 
 # libdvdcss is "too old" (in fast "too new"), see https://bugs.launchpad.net/ubuntu/+source/brasero/+bug/611590
diff --git a/pkgs/tools/compression/bzip2/default.nix b/pkgs/tools/compression/bzip2/default.nix
index 3a06a39dcad..0d2e63c7d59 100644
--- a/pkgs/tools/compression/bzip2/default.nix
+++ b/pkgs/tools/compression/bzip2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch
+{ stdenv, fetchurl
 , linkStatic ? (stdenv.system == "i686-cygwin")
 }:
 
diff --git a/pkgs/tools/compression/gzip/default.nix b/pkgs/tools/compression/gzip/default.nix
index c39216f1e0c..09065ede682 100644
--- a/pkgs/tools/compression/gzip/default.nix
+++ b/pkgs/tools/compression/gzip/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, hostPlatform, fetchurl, xz }:
+{ stdenv, fetchurl, xz }:
 
 stdenv.mkDerivation rec {
   name = "gzip-${version}";
diff --git a/pkgs/tools/compression/lzbench/default.nix b/pkgs/tools/compression/lzbench/default.nix
index a38e0a67b28..df7700d41cb 100644
--- a/pkgs/tools/compression/lzbench/default.nix
+++ b/pkgs/tools/compression/lzbench/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, glibc }:
+{ stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
   name = "lzbench-20170208";
diff --git a/pkgs/tools/compression/upx/default.nix b/pkgs/tools/compression/upx/default.nix
index 213d98a1ec1..ea363ae8cc2 100644
--- a/pkgs/tools/compression/upx/default.nix
+++ b/pkgs/tools/compression/upx/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchFromGitHub, ucl, zlib, perl }:
+{ stdenv, fetchurl, ucl, zlib, perl }:
 
 stdenv.mkDerivation rec {
   name = "upx-${version}";
diff --git a/pkgs/tools/filesystems/bcachefs-tools/default.nix b/pkgs/tools/filesystems/bcachefs-tools/default.nix
index c2e13b75daa..1fafe7412d8 100644
--- a/pkgs/tools/filesystems/bcachefs-tools/default.nix
+++ b/pkgs/tools/filesystems/bcachefs-tools/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, pkgs, fetchgit, pkgconfig, attr, libuuid, libscrypt, libsodium
+{ stdenv, fetchgit, pkgconfig, attr, libuuid, libscrypt, libsodium
 , keyutils, liburcu, zlib, libaio, zstd }:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/tools/filesystems/ceph/generic.nix b/pkgs/tools/filesystems/ceph/generic.nix
index 20eb363b227..14fedd6610e 100644
--- a/pkgs/tools/filesystems/ceph/generic.nix
+++ b/pkgs/tools/filesystems/ceph/generic.nix
@@ -9,7 +9,7 @@
 
 # Optional Dependencies
 , yasm ? null, fcgi ? null, expat ? null
-, curl ? null, fuse ? null, libibverbs ? null, librdmacm ? null
+, curl ? null, fuse ? null
 , libedit ? null, libatomic_ops ? null, kinetic-cpp-client ? null
 , libs3 ? null
 
@@ -25,7 +25,7 @@
 , zfs ? null
 
 # Version specific arguments
-, version, src, patches ? [], buildInputs ? []
+, version, src ? [], buildInputs ? []
 , ...
 }:
 
@@ -92,7 +92,7 @@ let
     ps.prettytable
     ps.webob
     ps.cherrypy
-	]);
+  ]);
 
 in
 stdenv.mkDerivation {
@@ -101,7 +101,7 @@ stdenv.mkDerivation {
   inherit src;
 
   patches = [
- #	 ./ceph-patch-cmake-path.patch
+ #   ./ceph-patch-cmake-path.patch
     ./0001-kv-RocksDBStore-API-break-additional.patch
   ] ++ optionals stdenv.isLinux [
     ./0002-fix-absolute-include-path.patch
diff --git a/pkgs/tools/filesystems/fatresize/default.nix b/pkgs/tools/filesystems/fatresize/default.nix
index f929f354766..9af14b05126 100644
--- a/pkgs/tools/filesystems/fatresize/default.nix
+++ b/pkgs/tools/filesystems/fatresize/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, parted, substituteAll, utillinux }:
+{ stdenv, fetchurl, parted, utillinux }:
 
 stdenv.mkDerivation rec {
   
diff --git a/pkgs/tools/filesystems/glusterfs/default.nix b/pkgs/tools/filesystems/glusterfs/default.nix
index 494fd7036e2..beb046cdbdb 100644
--- a/pkgs/tools/filesystems/glusterfs/default.nix
+++ b/pkgs/tools/filesystems/glusterfs/default.nix
@@ -1,6 +1,6 @@
 {stdenv, fetchurl, fuse, bison, flex_2_5_35, openssl, python2, ncurses, readline,
  autoconf, automake, libtool, pkgconfig, zlib, libaio, libxml2, acl, sqlite,
- liburcu, attr, makeWrapper, coreutils, gnused, gnugrep, which, python2Packages,
+ liburcu, attr, makeWrapper, coreutils, gnused, gnugrep, which,
  openssh, gawk, findutils, utillinux, lvm2, btrfs-progs, e2fsprogs, xfsprogs, systemd,
  rsync, glibc
 }:
diff --git a/pkgs/tools/filesystems/go-mtpfs/default.nix b/pkgs/tools/filesystems/go-mtpfs/default.nix
index 028aef6024b..0438b9c38e4 100644
--- a/pkgs/tools/filesystems/go-mtpfs/default.nix
+++ b/pkgs/tools/filesystems/go-mtpfs/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, pkgconfig, libusb1, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+{ stdenv, pkgconfig, libusb1, buildGoPackage, fetchgit }:
 
 buildGoPackage rec {
   name = "go-mtpfs-${version}";
diff --git a/pkgs/tools/filesystems/grive2/default.nix b/pkgs/tools/filesystems/grive2/default.nix
index f4bb5592abd..4f7c2248a8e 100644
--- a/pkgs/tools/filesystems/grive2/default.nix
+++ b/pkgs/tools/filesystems/grive2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, pkgconfig, fetchurl, yajl, cmake, libgcrypt, curl, expat, boost, libiberty }:
+{ stdenv, fetchFromGitHub, pkgconfig, yajl, cmake, libgcrypt, curl, expat, boost, libiberty }:
 
 stdenv.mkDerivation rec {
   version = "0.5.0";
diff --git a/pkgs/tools/filesystems/irods/default.nix b/pkgs/tools/filesystems/irods/default.nix
index c2066f95ef5..24a88349bf4 100644
--- a/pkgs/tools/filesystems/irods/default.nix
+++ b/pkgs/tools/filesystems/irods/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, python, bzip2, zlib, autoconf, automake, cmake, gnumake, help2man , texinfo, libtool , cppzmq , libarchive, avro-cpp_llvm, boost, jansson, zeromq, openssl , pam, libiodbc, kerberos, gcc, libcxx, which }:
+{ stdenv, fetchurl, bzip2, zlib, autoconf, automake, cmake, gnumake, help2man , texinfo, libtool , cppzmq , libarchive, avro-cpp_llvm, boost, jansson, zeromq, openssl , pam, libiodbc, kerberos, gcc, libcxx, which }:
 
 with stdenv;
 
diff --git a/pkgs/tools/filesystems/nixpart/0.4/default.nix b/pkgs/tools/filesystems/nixpart/0.4/default.nix
index 217056117ea..758e130e4ad 100644
--- a/pkgs/tools/filesystems/nixpart/0.4/default.nix
+++ b/pkgs/tools/filesystems/nixpart/0.4/default.nix
@@ -1,8 +1,6 @@
 { stdenv, fetchurl, python, buildPythonApplication
 # Propagated to blivet
 , useNixUdev ? true
-# No longer needed, but kept for backwards-compatibility with older NixOps.
-, udevSoMajor ? null
 # Propagated dependencies
 , pkgs, urlgrabber
 }:
diff --git a/pkgs/tools/filesystems/squashfuse/default.nix b/pkgs/tools/filesystems/squashfuse/default.nix
index 341b025b079..b3d8d70f0e2 100644
--- a/pkgs/tools/filesystems/squashfuse/default.nix
+++ b/pkgs/tools/filesystems/squashfuse/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchFromGitHub, fetchpatch, automake, autoreconfHook, libtool, fuse,
-  pkgconfig, pcre, lz4, xz, zlib, lzo, zstd }:
+{ stdenv, fetchFromGitHub, autoreconfHook, libtool, fuse,
+  pkgconfig, lz4, xz, zlib, lzo, zstd }:
 
 with stdenv.lib;
 
diff --git a/pkgs/tools/filesystems/xtreemfs/default.nix b/pkgs/tools/filesystems/xtreemfs/default.nix
index 2a85adb60b5..4c0c2343dd2 100644
--- a/pkgs/tools/filesystems/xtreemfs/default.nix
+++ b/pkgs/tools/filesystems/xtreemfs/default.nix
@@ -1,5 +1,5 @@
 { stdenv, boost, fuse, openssl, cmake, attr, jdk, ant, which, file, python
-, fetchurl, lib, valgrind, makeWrapper, fetchFromGitHub }:
+, lib, valgrind, makeWrapper, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
   src = fetchFromGitHub {
diff --git a/pkgs/tools/filesystems/zkfuse/default.nix b/pkgs/tools/filesystems/zkfuse/default.nix
index 9dfb2deeaee..66e6690bc6a 100644
--- a/pkgs/tools/filesystems/zkfuse/default.nix
+++ b/pkgs/tools/filesystems/zkfuse/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, zookeeper, zookeeper_mt, fuse, pkgconfig, autoreconfHook, log4cxx, boost, tree }:
+{ stdenv, lib, zookeeper, zookeeper_mt, fuse, autoreconfHook, log4cxx, boost }:
 
 stdenv.mkDerivation rec {
   name = "zkfuse-${version}";
diff --git a/pkgs/tools/graphics/argyllcms/default.nix b/pkgs/tools/graphics/argyllcms/default.nix
index 7a06d9f346b..a3b25970351 100644
--- a/pkgs/tools/graphics/argyllcms/default.nix
+++ b/pkgs/tools/graphics/argyllcms/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchzip, jam, unzip, libX11, libXxf86vm, libXrandr, libXinerama
 , libXrender, libXext, libtiff, libjpeg, libpng, libXScrnSaver, writeText
-, libXdmcp, libXau, lib, openssl, zlib }:
+, libXdmcp, libXau, lib, openssl }:
 let
   version = "2.0.0";
  in
diff --git a/pkgs/tools/graphics/cuneiform/default.nix b/pkgs/tools/graphics/cuneiform/default.nix
index 0a48e947a48..cc899ab104f 100644
--- a/pkgs/tools/graphics/cuneiform/default.nix
+++ b/pkgs/tools/graphics/cuneiform/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, patchelf, imagemagick }:
+{ stdenv, fetchurl, cmake, imagemagick }:
 
 stdenv.mkDerivation rec {
   name = "cuneiform-${version}";
diff --git a/pkgs/tools/graphics/gmic/default.nix b/pkgs/tools/graphics/gmic/default.nix
index 6c62e052838..c267695dd78 100644
--- a/pkgs/tools/graphics/gmic/default.nix
+++ b/pkgs/tools/graphics/gmic/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchFromGitHub, cmake, ninja, pkgconfig
+{ stdenv, fetchurl, cmake, ninja, pkgconfig
 , opencv, openexr, graphicsmagick, fftw, zlib, libjpeg, libtiff, libpng
 , withGimpPlugin ? true, gimp ? null}:
 
diff --git a/pkgs/tools/graphics/gnuplot/default.nix b/pkgs/tools/graphics/gnuplot/default.nix
index 0a4ebf495b2..d50adaa387f 100644
--- a/pkgs/tools/graphics/gnuplot/default.nix
+++ b/pkgs/tools/graphics/gnuplot/default.nix
@@ -2,7 +2,6 @@
 , cairo, gd, libcerf, pango, readline, zlib
 , withTeXLive ? false, texlive
 , withLua ? false, lua
-, emacs ? null
 , libX11 ? null
 , libXt ? null
 , libXpm ? null
diff --git a/pkgs/tools/graphics/jbig2enc/default.nix b/pkgs/tools/graphics/jbig2enc/default.nix
index 0bb0bb00efa..393c18d3852 100644
--- a/pkgs/tools/graphics/jbig2enc/default.nix
+++ b/pkgs/tools/graphics/jbig2enc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, leptonica, zlib, libwebp, giflib, libjpeg, libpng, libtiff }:
+{ stdenv, fetchurl, leptonica, zlib, libwebp, giflib, libjpeg, libpng, libtiff }:
 
 stdenv.mkDerivation {
   name = "jbig2enc-0.28";
diff --git a/pkgs/tools/graphics/pywal/default.nix b/pkgs/tools/graphics/pywal/default.nix
index 95f7c547b55..a83bc845eb9 100644
--- a/pkgs/tools/graphics/pywal/default.nix
+++ b/pkgs/tools/graphics/pywal/default.nix
@@ -1,4 +1,4 @@
-{ lib, python3Packages, fetchFromGitHub, imagemagick, feh }:
+{ lib, python3Packages, imagemagick, feh }:
 
 python3Packages.buildPythonApplication rec {
   pname = "pywal";
diff --git a/pkgs/tools/graphics/vips/default.nix b/pkgs/tools/graphics/vips/default.nix
index da63cb58a55..18699f41284 100644
--- a/pkgs/tools/graphics/vips/default.nix
+++ b/pkgs/tools/graphics/vips/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, pkgconfig, glib, libxml2, flex, bison, vips, expat,
+{ stdenv, fetchurl, pkgconfig, glib, libxml2, expat,
   fftw, orc, lcms, imagemagick, openexr, libtiff, libjpeg, libgsf, libexif,
-  python27, libpng, matio ? null, cfitsio ? null, libwebp ? null
+  python27, libpng ? null
 }:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-mozc/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-mozc/default.nix
index 170ac4c6a26..d74c7608bc9 100644
--- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-mozc/default.nix
+++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-mozc/default.nix
@@ -1,5 +1,5 @@
 { clangStdenv, fetchFromGitHub, fetchurl, fetchpatch, gyp, which, ninja,
-  python, pkgconfig, protobuf, gtk2, zinnia, qt5, libxcb, tegaki-zinnia-japanese,
+  python, pkgconfig, protobuf, gtk2, zinnia, qt5, libxcb,
   fcitx, gettext }:
 let
   japanese_usage_dictionary = fetchFromGitHub {
diff --git a/pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix b/pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix
index 50ab7d85c5a..166fd16811a 100644
--- a/pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix
+++ b/pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, cmake, fcitx, pkgconfig, qtbase, extra-cmake-modules
+{ stdenv, fetchurl, cmake, fcitx, pkgconfig, qtbase, extra-cmake-modules
 , fetchpatch
 }:
 
diff --git a/pkgs/tools/inputmethods/fcitx/unwrapped.nix b/pkgs/tools/inputmethods/fcitx/unwrapped.nix
index c7d0eecb763..ab8a7bdb34d 100644
--- a/pkgs/tools/inputmethods/fcitx/unwrapped.nix
+++ b/pkgs/tools/inputmethods/fcitx/unwrapped.nix
@@ -2,7 +2,7 @@
 , libxml2, enchant, isocodes, icu, libpthreadstubs
 , pango, cairo, libxkbfile, libXau, libXdmcp, libxkbcommon
 , dbus, gtk2, gtk3, qt4, extra-cmake-modules
-, xkeyboard_config, pcre, libuuid, curl, cacert
+, xkeyboard_config, pcre, libuuid
 , withPinyin ? true
 , fetchFromGitHub
 }:
diff --git a/pkgs/tools/inputmethods/fcitx/wrapper.nix b/pkgs/tools/inputmethods/fcitx/wrapper.nix
index 1dfe6b24506..28a08e39b22 100644
--- a/pkgs/tools/inputmethods/fcitx/wrapper.nix
+++ b/pkgs/tools/inputmethods/fcitx/wrapper.nix
@@ -1,4 +1,4 @@
-{ stdenv, symlinkJoin, fcitx, fcitx-configtool, makeWrapper, plugins, libsForQt5 }:
+{ symlinkJoin, fcitx, fcitx-configtool, makeWrapper, plugins, libsForQt5 }:
 
 symlinkJoin {
   name = "fcitx-with-plugins-${fcitx.version}";
diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix
index f70c7d02e9f..cb2076cd21c 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, intltool, pkgconfig
-, gtk3, ibus, libhangul, librsvg, python3
+, gtk3, ibus, libhangul, python3
 }:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix
index fd924cdd2a2..01b092ef2a6 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix
@@ -1,5 +1,5 @@
 { clangStdenv, fetchFromGitHub, which, ninja, python, gyp, pkgconfig, protobuf
-, ibus, gtk2, zinnia, qt5, libxcb, tegaki-zinnia-japanese }:
+, ibus, gtk2, zinnia, qt5, libxcb }:
 
 let
   japanese_usage_dictionary = fetchFromGitHub {
diff --git a/pkgs/tools/inputmethods/ibus/default.nix b/pkgs/tools/inputmethods/ibus/default.nix
index d3507b57cbd..540779477e3 100644
--- a/pkgs/tools/inputmethods/ibus/default.nix
+++ b/pkgs/tools/inputmethods/ibus/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, fetchFromGitHub, autoreconfHook, gconf, intltool, makeWrapper, pkgconfig
-, vala, wrapGAppsHook, atk, dbus, dconf ? null, glib, gdk_pixbuf, gobjectIntrospection, gtk2
+, vala, wrapGAppsHook, dbus, dconf ? null, glib, gdk_pixbuf, gobjectIntrospection, gtk2
 , gtk3, gtk-doc, isocodes, python3, json-glib, libnotify ? null, enablePythonLibrary ? true
 , enableUI ? true, withWayland ? false, libxkbcommon ? null, wayland ? null }:
 
diff --git a/pkgs/tools/inputmethods/interception-tools/default.nix b/pkgs/tools/inputmethods/interception-tools/default.nix
index 33c66fb7ff2..a6aed47d964 100644
--- a/pkgs/tools/inputmethods/interception-tools/default.nix
+++ b/pkgs/tools/inputmethods/interception-tools/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchFromGitHub, pkgconfig, cmake, libyamlcpp,
+{ stdenv, fetchurl, pkgconfig, cmake, libyamlcpp,
   libevdev, udev }:
 
 let
diff --git a/pkgs/tools/misc/apt-offline/default.nix b/pkgs/tools/misc/apt-offline/default.nix
index ff146e60923..1044c0acc0a 100644
--- a/pkgs/tools/misc/apt-offline/default.nix
+++ b/pkgs/tools/misc/apt-offline/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, bash, pythonPackages }:
+{ stdenv, fetchurl, pythonPackages }:
 
 pythonPackages.buildPythonApplication rec {
   version = "1.3";
diff --git a/pkgs/tools/misc/azure-vhd-utils/default.nix b/pkgs/tools/misc/azure-vhd-utils/default.nix
index fcdd9a81d72..5ead0e1020c 100644
--- a/pkgs/tools/misc/azure-vhd-utils/default.nix
+++ b/pkgs/tools/misc/azure-vhd-utils/default.nix
@@ -1,5 +1,5 @@
 # This file was generated by go2nix.
-{ stdenv, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+{ stdenv, buildGoPackage, fetchgit }:
 
 buildGoPackage rec {
   name = "azure-vhd-utils-${version}";
diff --git a/pkgs/tools/misc/bibutils/default.nix b/pkgs/tools/misc/bibutils/default.nix
index 41a50eecd84..d0434ebe28b 100644
--- a/pkgs/tools/misc/bibutils/default.nix
+++ b/pkgs/tools/misc/bibutils/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, perl }:
+{ stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   name = "bibutils-${version}";
diff --git a/pkgs/tools/misc/byobu/default.nix b/pkgs/tools/misc/byobu/default.nix
index c5ebe7cf32e..026c626ff77 100644
--- a/pkgs/tools/misc/byobu/default.nix
+++ b/pkgs/tools/misc/byobu/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ncurses, python, perl, textual-window-manager }:
+{ stdenv, fetchurl, python, perl, textual-window-manager }:
 
 stdenv.mkDerivation rec {
   version = "5.125";
diff --git a/pkgs/tools/misc/colord/default.nix b/pkgs/tools/misc/colord/default.nix
index 4461834cb74..a5d71a9487c 100644
--- a/pkgs/tools/misc/colord/default.nix
+++ b/pkgs/tools/misc/colord/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, bash-completion
 , glib, polkit, pkgconfig, gettext, gusb, lcms2, sqlite, systemd, dbus
 , gobjectIntrospection, argyllcms, meson, ninja, libxml2, vala_0_40
-, libgudev, sane-backends, udev, gnome3, makeWrapper }:
+, libgudev, sane-backends, gnome3, makeWrapper }:
 
 stdenv.mkDerivation rec {
   name = "colord-1.4.2";
diff --git a/pkgs/tools/misc/dashing/default.nix b/pkgs/tools/misc/dashing/default.nix
index 673e5c4c321..a8a878b1998 100644
--- a/pkgs/tools/misc/dashing/default.nix
+++ b/pkgs/tools/misc/dashing/default.nix
@@ -1,5 +1,5 @@
 # This file was generated by https://github.com/kamilchm/go2nix v1.2.1
-{ stdenv, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+{ stdenv, buildGoPackage, fetchgit }:
 
 buildGoPackage rec {
   name = "dashing-unstable-${version}";
diff --git a/pkgs/tools/misc/debootstrap/default.nix b/pkgs/tools/misc/debootstrap/default.nix
index 054822e6069..b3a654be04e 100644
--- a/pkgs/tools/misc/debootstrap/default.nix
+++ b/pkgs/tools/misc/debootstrap/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, dpkg, gettext, gawk, perl, wget, coreutils, fakeroot }:
+{ stdenv, fetchurl, dpkg, gettext, gawk, perl, wget, coreutils }:
 
 # USAGE like this: debootstrap sid /tmp/target-chroot-directory
 # There is also cdebootstrap now. Is that easier to maintain?
diff --git a/pkgs/tools/misc/direnv/default.nix b/pkgs/tools/misc/direnv/default.nix
index e22bce7c698..508fc77a9a0 100644
--- a/pkgs/tools/misc/direnv/default.nix
+++ b/pkgs/tools/misc/direnv/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, buildGoPackage, bash, writeText}:
+{ stdenv, fetchFromGitHub, buildGoPackage, bash}:
 
 buildGoPackage rec {
   name = "direnv-${version}";
diff --git a/pkgs/tools/misc/dust/default.nix b/pkgs/tools/misc/dust/default.nix
index f34d05758cf..aa23b51f4b8 100644
--- a/pkgs/tools/misc/dust/default.nix
+++ b/pkgs/tools/misc/dust/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cargo, rustPlatform }:
+{ stdenv, fetchFromGitHub, rustPlatform }:
 
 rustPlatform.buildRustPackage rec {
   name = "dust-${version}";
diff --git a/pkgs/tools/misc/fluentd/default.nix b/pkgs/tools/misc/fluentd/default.nix
index 8219d110f2e..c9ee511ff83 100644
--- a/pkgs/tools/misc/fluentd/default.nix
+++ b/pkgs/tools/misc/fluentd/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, bundlerEnv, ruby, curl }:
+{ lib, bundlerEnv, ruby }:
 
 bundlerEnv {
   inherit ruby;
diff --git a/pkgs/tools/misc/fontforge/default.nix b/pkgs/tools/misc/fontforge/default.nix
index 0f6fb38ef3b..04717974a8b 100644
--- a/pkgs/tools/misc/fontforge/default.nix
+++ b/pkgs/tools/misc/fontforge/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchpatch, lib
+{ stdenv, fetchFromGitHub, lib
 , autoconf, automake, gnum4, libtool, perl, gnulib, uthash, pkgconfig, gettext
 , python, freetype, zlib, glib, libungif, libpng, libjpeg, libtiff, libxml2, pango
 , withSpiro ? false, libspiro
diff --git a/pkgs/tools/misc/fzf/default.nix b/pkgs/tools/misc/fzf/default.nix
index ba85c5376db..e8e2152f711 100644
--- a/pkgs/tools/misc/fzf/default.nix
+++ b/pkgs/tools/misc/fzf/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, ncurses, buildGoPackage, fetchFromGitHub, writeText }:
+{ stdenv, ncurses, buildGoPackage, fetchFromGitHub, writeText }:
 
 buildGoPackage rec {
   name = "fzf-${version}";
diff --git a/pkgs/tools/misc/gams/default.nix b/pkgs/tools/misc/gams/default.nix
index 84d3239729f..990282b2d58 100644
--- a/pkgs/tools/misc/gams/default.nix
+++ b/pkgs/tools/misc/gams/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, unzip, lib, file, licenseFile, optgamsFile}:
+{ stdenv, fetchurl, unzip, file, licenseFile, optgamsFile}:
 
 assert licenseFile != null;
 
diff --git a/pkgs/tools/misc/gawp/default.nix b/pkgs/tools/misc/gawp/default.nix
index 7c944ceaab3..c187b09624a 100644
--- a/pkgs/tools/misc/gawp/default.nix
+++ b/pkgs/tools/misc/gawp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchgit }:
+{ stdenv, buildGoPackage, fetchgit }:
 
 with builtins;
 
diff --git a/pkgs/tools/misc/gh-ost/default.nix b/pkgs/tools/misc/gh-ost/default.nix
index 24841a2bac7..a5871d2bc33 100644
--- a/pkgs/tools/misc/gh-ost/default.nix
+++ b/pkgs/tools/misc/gh-ost/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+{ stdenv, buildGoPackage, fetchFromGitHub }:
 
 let
   goPackagePath = "github.com/github/gh-ost";
diff --git a/pkgs/tools/misc/gosu/default.nix b/pkgs/tools/misc/gosu/default.nix
index 1c1fb05050f..d7c10220f4b 100644
--- a/pkgs/tools/misc/gosu/default.nix
+++ b/pkgs/tools/misc/gosu/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+{ stdenv, buildGoPackage, fetchgit }:
 
 buildGoPackage rec {
   name = "gosu-${version}";
diff --git a/pkgs/tools/misc/graylog/plugins.nix b/pkgs/tools/misc/graylog/plugins.nix
index 21a624c9d25..3f476cfea94 100644
--- a/pkgs/tools/misc/graylog/plugins.nix
+++ b/pkgs/tools/misc/graylog/plugins.nix
@@ -1,4 +1,4 @@
-{ pkgs,  stdenv, fetchurl, fetchFromGitHub, unzip, graylog }:
+{ pkgs,  stdenv, fetchurl, unzip, graylog }:
 
 with pkgs.lib;
 
diff --git a/pkgs/tools/misc/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix
index 58c9f18ec5a..63511782f00 100644
--- a/pkgs/tools/misc/grub/2.0x.nix
+++ b/pkgs/tools/misc/grub/2.0x.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchFromSavannah, autogen, flex, bison, python, autoconf, automake
+{ stdenv, fetchurl, flex, bison, python
 , gettext, ncurses, libusb, freetype, qemu, lvm2, unifont, pkgconfig
 , fuse # only needed for grub-mount
 , zfs ? null
diff --git a/pkgs/tools/misc/hdf5/1_8.nix b/pkgs/tools/misc/hdf5/1_8.nix
index 14c8ca23433..17b48ad8741 100644
--- a/pkgs/tools/misc/hdf5/1_8.nix
+++ b/pkgs/tools/misc/hdf5/1_8.nix
@@ -1,6 +1,5 @@
 { stdenv
 , fetchurl
-, gcc
 , removeReferencesTo
 , cpp ? false
 , gfortran ? null
diff --git a/pkgs/tools/misc/hdf5/default.nix b/pkgs/tools/misc/hdf5/default.nix
index 494616d2b48..31813c0b880 100644
--- a/pkgs/tools/misc/hdf5/default.nix
+++ b/pkgs/tools/misc/hdf5/default.nix
@@ -1,6 +1,5 @@
 { stdenv
 , fetchurl
-, gcc
 , removeReferencesTo
 , cpp ? false
 , gfortran ? null
diff --git a/pkgs/tools/misc/hdfview/default.nix b/pkgs/tools/misc/hdfview/default.nix
index 03af224b4c0..82801da322c 100644
--- a/pkgs/tools/misc/hdfview/default.nix
+++ b/pkgs/tools/misc/hdfview/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, ant, javac, hdf_java }:
+{ stdenv, fetchurl, ant, javac, hdf_java }:
 
 stdenv.mkDerivation rec {
   name = "hdfview-${version}";
diff --git a/pkgs/tools/misc/i3cat/default.nix b/pkgs/tools/misc/i3cat/default.nix
index 52e7793d974..7035f2ecedf 100644
--- a/pkgs/tools/misc/i3cat/default.nix
+++ b/pkgs/tools/misc/i3cat/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+{ stdenv, buildGoPackage, fetchgit }:
 
 buildGoPackage rec {
   name = "i3cat-${version}";
diff --git a/pkgs/tools/misc/libbitcoin/libbitcoin-client.nix b/pkgs/tools/misc/libbitcoin/libbitcoin-client.nix
index 8d55b2cdc00..eb3b6aa11e6 100644
--- a/pkgs/tools/misc/libbitcoin/libbitcoin-client.nix
+++ b/pkgs/tools/misc/libbitcoin/libbitcoin-client.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, pkgconfig, autoreconfHook
+{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook
 , boost, libbitcoin, libbitcoin-protocol }:
 
 let
diff --git a/pkgs/tools/misc/libbitcoin/libbitcoin-explorer.nix b/pkgs/tools/misc/libbitcoin/libbitcoin-explorer.nix
index e49614834ae..d0395ecbd7f 100644
--- a/pkgs/tools/misc/libbitcoin/libbitcoin-explorer.nix
+++ b/pkgs/tools/misc/libbitcoin/libbitcoin-explorer.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, pkgconfig, autoreconfHook
+{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook
 , boost, libbitcoin-client, libbitcoin-network }:
 
 let
diff --git a/pkgs/tools/misc/libbitcoin/libbitcoin-network.nix b/pkgs/tools/misc/libbitcoin/libbitcoin-network.nix
index c17c99980a8..cb9e2cbf1e8 100644
--- a/pkgs/tools/misc/libbitcoin/libbitcoin-network.nix
+++ b/pkgs/tools/misc/libbitcoin/libbitcoin-network.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, pkgconfig, autoreconfHook
+{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook
 , boost, libbitcoin, zeromq }:
 
 let
diff --git a/pkgs/tools/misc/libbitcoin/libbitcoin-protocol.nix b/pkgs/tools/misc/libbitcoin/libbitcoin-protocol.nix
index fbfcfc10074..2c13927dfad 100644
--- a/pkgs/tools/misc/libbitcoin/libbitcoin-protocol.nix
+++ b/pkgs/tools/misc/libbitcoin/libbitcoin-protocol.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, pkgconfig, autoreconfHook
+{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook
 , boost, libbitcoin, secp256k1, zeromq }:
 
 let
diff --git a/pkgs/tools/misc/libbitcoin/libbitcoin.nix b/pkgs/tools/misc/libbitcoin/libbitcoin.nix
index f8910f83ec5..18177c0a7e3 100644
--- a/pkgs/tools/misc/libbitcoin/libbitcoin.nix
+++ b/pkgs/tools/misc/libbitcoin/libbitcoin.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, pkgconfig, autoreconfHook
+{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook
 , boost, secp256k1 }:
 
 let
diff --git a/pkgs/tools/misc/massren/default.nix b/pkgs/tools/misc/massren/default.nix
index 085e6f41a09..e2ff4868c9e 100644
--- a/pkgs/tools/misc/massren/default.nix
+++ b/pkgs/tools/misc/massren/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "massren-${version}";
diff --git a/pkgs/tools/misc/mmake/default.nix b/pkgs/tools/misc/mmake/default.nix
index c6f9f4749b3..1d3a355dd95 100644
--- a/pkgs/tools/misc/mmake/default.nix
+++ b/pkgs/tools/misc/mmake/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoPackage, fetchFromGitHub, fetchhg, fetchbzr, fetchsvn }:
+{ stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "mmake-${version}";
diff --git a/pkgs/tools/misc/neofetch/default.nix b/pkgs/tools/misc/neofetch/default.nix
index 7dbfc90fa12..a076a405ce7 100644
--- a/pkgs/tools/misc/neofetch/default.nix
+++ b/pkgs/tools/misc/neofetch/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchpatch }:
+{ stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
   name = "neofetch-${version}";
diff --git a/pkgs/tools/misc/pal/default.nix b/pkgs/tools/misc/pal/default.nix
index 267b458cccc..be96dd9d3d3 100644
--- a/pkgs/tools/misc/pal/default.nix
+++ b/pkgs/tools/misc/pal/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, ncurses, glib, gettext, readline, pkgconfig }:
+{stdenv, fetchurl, glib, gettext, readline, pkgconfig }:
 
 stdenv.mkDerivation rec {
   name = "pal-0.4.3";
diff --git a/pkgs/tools/misc/papis/default.nix b/pkgs/tools/misc/papis/default.nix
index 260d96a981f..52e704eb52e 100644
--- a/pkgs/tools/misc/papis/default.nix
+++ b/pkgs/tools/misc/papis/default.nix
@@ -1,4 +1,4 @@
-{ buildPythonApplication, lib, fetchFromGitHub, bashInteractive
+{ lib, fetchFromGitHub, bashInteractive
 , python3, vim
 }:
 
diff --git a/pkgs/tools/misc/peruse/default.nix b/pkgs/tools/misc/peruse/default.nix
index 38cab5cf862..69b60ae0997 100644
--- a/pkgs/tools/misc/peruse/default.nix
+++ b/pkgs/tools/misc/peruse/default.nix
@@ -1,5 +1,5 @@
 {
-  mkDerivation, fetchFromGitHub, fetchurl, lib,
+  mkDerivation, fetchFromGitHub, lib,
   extra-cmake-modules, kdoctools, wrapGAppsHook,
   baloo, karchive, kconfig, kcrash, kfilemetadata, kinit, kirigami2, knewstuff, plasma-framework
 }:
diff --git a/pkgs/tools/misc/pipelight/default.nix b/pkgs/tools/misc/pipelight/default.nix
index f39ee734d81..c320f8ef5f6 100644
--- a/pkgs/tools/misc/pipelight/default.nix
+++ b/pkgs/tools/misc/pipelight/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, bash, cabextract, curl, gnupg, libX11, libGLU_combined, perl, wineStaging
+{ stdenv, fetchurl, bash, cabextract, curl, gnupg, libX11, libGLU_combined, wineStaging
  }:
 
 let
diff --git a/pkgs/tools/misc/profile-sync-daemon/default.nix b/pkgs/tools/misc/profile-sync-daemon/default.nix
index 670f7067765..c1b99b31567 100644
--- a/pkgs/tools/misc/profile-sync-daemon/default.nix
+++ b/pkgs/tools/misc/profile-sync-daemon/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, rsync, glibc, gawk }:
+{ stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   version = "5.53";
diff --git a/pkgs/tools/misc/qt5ct/default.nix b/pkgs/tools/misc/qt5ct/default.nix
index c6fdf0a5120..a43335626ac 100644
--- a/pkgs/tools/misc/qt5ct/default.nix
+++ b/pkgs/tools/misc/qt5ct/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, qtbase, qtsvg, qttools, qmake }:
+{ stdenv, fetchurl, qtbase, qttools, qmake }:
 
 let inherit (stdenv.lib) getDev; in
 
diff --git a/pkgs/tools/misc/recutils/default.nix b/pkgs/tools/misc/recutils/default.nix
index f1712a43c3b..a1fa7dee083 100644
--- a/pkgs/tools/misc/recutils/default.nix
+++ b/pkgs/tools/misc/recutils/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, gettext, emacs, curl, check, bc }:
+{ fetchurl, stdenv, emacs, curl, check, bc }:
 
 stdenv.mkDerivation rec {
   name = "recutils-1.7";
diff --git a/pkgs/tools/misc/s6-portable-utils/default.nix b/pkgs/tools/misc/s6-portable-utils/default.nix
index 668a3fd5c99..082eb6879c4 100644
--- a/pkgs/tools/misc/s6-portable-utils/default.nix
+++ b/pkgs/tools/misc/s6-portable-utils/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, skalibs, gcc }:
+{ stdenv, fetchurl, skalibs }:
 
 with stdenv.lib;
 
diff --git a/pkgs/tools/misc/svtplay-dl/default.nix b/pkgs/tools/misc/svtplay-dl/default.nix
index f0abb38706b..9ba61221684 100644
--- a/pkgs/tools/misc/svtplay-dl/default.nix
+++ b/pkgs/tools/misc/svtplay-dl/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, makeWrapper, pythonPackages, perl, zip
-, rtmpdump, substituteAll }:
+, rtmpdump }:
 
 let
   inherit (pythonPackages) python nose pycrypto requests mock;
diff --git a/pkgs/tools/misc/system-config-printer/default.nix b/pkgs/tools/misc/system-config-printer/default.nix
index 9d12fa254d4..a58eb315638 100644
--- a/pkgs/tools/misc/system-config-printer/default.nix
+++ b/pkgs/tools/misc/system-config-printer/default.nix
@@ -1,10 +1,9 @@
 { stdenv, fetchurl, udev, intltool, pkgconfig, glib, xmlto, wrapGAppsHook
-, makeWrapper, gtk3, docbook_xml_dtd_412, docbook_xsl
+, docbook_xml_dtd_412, docbook_xsl
 , libxml2, desktop-file-utils, libusb1, cups, gdk_pixbuf, pango, atk, libnotify
 , gobjectIntrospection, libsecret
 , cups-filters
 , pythonPackages
-, withGUI ? true
 }:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/tools/misc/t/default.nix b/pkgs/tools/misc/t/default.nix
index b9c93c63954..0ad683bd652 100644
--- a/pkgs/tools/misc/t/default.nix
+++ b/pkgs/tools/misc/t/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, bundlerEnv, ruby }:
+{ lib, bundlerEnv, ruby }:
 
 bundlerEnv {
   name = "t-3.1.0";
diff --git a/pkgs/tools/misc/tmuxinator/default.nix b/pkgs/tools/misc/tmuxinator/default.nix
index 1f50eef0ed0..be6a5070d61 100644
--- a/pkgs/tools/misc/tmuxinator/default.nix
+++ b/pkgs/tools/misc/tmuxinator/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildRubyGem, makeWrapper, ruby }:
+{ lib, buildRubyGem, ruby }:
 
 # Cannot use bundleEnv because bundleEnv create stub with
 # BUNDLE_FROZEN='1' environment variable set, which broke everything
diff --git a/pkgs/tools/misc/tmuxp/default.nix b/pkgs/tools/misc/tmuxp/default.nix
index 3932e06192e..dd0fb4de702 100644
--- a/pkgs/tools/misc/tmuxp/default.nix
+++ b/pkgs/tools/misc/tmuxp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, python }:
+{ stdenv, python }:
 
 with python.pkgs;
 
diff --git a/pkgs/tools/misc/toilet/default.nix b/pkgs/tools/misc/toilet/default.nix
index 10e481b7664..2729f6f8859 100644
--- a/pkgs/tools/misc/toilet/default.nix
+++ b/pkgs/tools/misc/toilet/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, libcaca, figlet }:
+{ stdenv, fetchurl, pkgconfig, libcaca }:
 
 stdenv.mkDerivation rec {
   name = "toilet-${version}";
diff --git a/pkgs/tools/misc/trash-cli/default.nix b/pkgs/tools/misc/trash-cli/default.nix
index 113c7e127d4..7ae871afc78 100644
--- a/pkgs/tools/misc/trash-cli/default.nix
+++ b/pkgs/tools/misc/trash-cli/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, fetchpatch, coreutils
-, python3, python3Packages, substituteAll }:
+, python3Packages, substituteAll }:
 
 python3Packages.buildPythonApplication rec {
   name = "trash-cli-${version}";
diff --git a/pkgs/tools/misc/upower-notify/default.nix b/pkgs/tools/misc/upower-notify/default.nix
index ff8e7873839..7751e03df19 100644
--- a/pkgs/tools/misc/upower-notify/default.nix
+++ b/pkgs/tools/misc/upower-notify/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+{ stdenv, buildGoPackage, fetchgit }:
 
 # To use upower-notify, the maintainer suggests adding something like this to your configuration.nix:
 #
diff --git a/pkgs/tools/misc/urjtag/default.nix b/pkgs/tools/misc/urjtag/default.nix
index 25687a3dbe1..48edb601a43 100644
--- a/pkgs/tools/misc/urjtag/default.nix
+++ b/pkgs/tools/misc/urjtag/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, autoconf, automake, pkgconfig, gettext, intltool, libtool, bison
+{ stdenv, autoconf, automake, pkgconfig, gettext, libtool, bison
 , flex, which, subversion, fetchsvn, makeWrapper, libftdi, libusb, readline
 , python3
 , svfSupport ? false
diff --git a/pkgs/tools/misc/watchexec/default.nix b/pkgs/tools/misc/watchexec/default.nix
index 2b801bb74a4..b1704c3b46c 100644
--- a/pkgs/tools/misc/watchexec/default.nix
+++ b/pkgs/tools/misc/watchexec/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, rustPlatform, fetchFromGitHub }:
+{ stdenv, rustPlatform, fetchFromGitHub }:
 
 with rustPlatform;
 
diff --git a/pkgs/tools/misc/xfstests/default.nix b/pkgs/tools/misc/xfstests/default.nix
index 80a728747fe..e03f84355ca 100644
--- a/pkgs/tools/misc/xfstests/default.nix
+++ b/pkgs/tools/misc/xfstests/default.nix
@@ -1,6 +1,6 @@
 { stdenv, acl, attr, autoconf, automake, bash, bc, coreutils, e2fsprogs
 , fetchgit, fio, gawk, keyutils, killall, lib, libaio, libcap, libtool
-, libuuid, libxfs, lvm2, openssl, perl, procps, quota, su
+, libuuid, libxfs, lvm2, openssl, perl, procps, quota
 , time, utillinux, which, writeScript, xfsprogs }:
 
 stdenv.mkDerivation {
diff --git a/pkgs/tools/misc/xvfb-run/default.nix b/pkgs/tools/misc/xvfb-run/default.nix
index 80135f4ab44..c4cfc00308e 100644
--- a/pkgs/tools/misc/xvfb-run/default.nix
+++ b/pkgs/tools/misc/xvfb-run/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, makeWrapper, xkbcomp, xorgserver, getopt
+{ stdenv, fetchurl, makeWrapper, xorgserver, getopt
 , xauth, utillinux, which, fontsConf, gawk, coreutils }:
 let
   xvfb_run = fetchurl {
diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix
index 90489e126fa..be6bacd3b21 100644
--- a/pkgs/tools/misc/youtube-dl/default.nix
+++ b/pkgs/tools/misc/youtube-dl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, targetPlatform, fetchurl, buildPythonPackage
+{ lib, fetchurl, buildPythonPackage
 , zip, ffmpeg, rtmpdump, phantomjs2, atomicparsley, pycryptodome, pandoc
 # Pandoc is required to build the package's man page. Release tarballs contain a
 # formatted man page already, though, it will still be installed. We keep the
diff --git a/pkgs/tools/misc/yubikey-neo-manager/default.nix b/pkgs/tools/misc/yubikey-neo-manager/default.nix
index 528f9aecb54..acc0bac04ff 100644
--- a/pkgs/tools/misc/yubikey-neo-manager/default.nix
+++ b/pkgs/tools/misc/yubikey-neo-manager/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, makeWrapper, python27Packages
+{ stdenv, fetchurl, python27Packages
 , libykneomgr, yubikey-personalization, libu2f-host }:
 
 python27Packages.buildPythonPackage rec {
diff --git a/pkgs/tools/misc/zsh-autoenv/default.nix b/pkgs/tools/misc/zsh-autoenv/default.nix
index 492b72a176e..589e6717c7d 100644
--- a/pkgs/tools/misc/zsh-autoenv/default.nix
+++ b/pkgs/tools/misc/zsh-autoenv/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, bash }:
+{ stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
   name = "zsh-autoenv-${version}";
diff --git a/pkgs/tools/networking/airfield/default.nix b/pkgs/tools/networking/airfield/default.nix
index 93535e935dc..6f6009c107b 100644
--- a/pkgs/tools/networking/airfield/default.nix
+++ b/pkgs/tools/networking/airfield/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, callPackage, python, utillinux
+{ stdenv, fetchFromGitHub
 , pkgs, makeWrapper, buildEnv
 , nodejs
 }:
diff --git a/pkgs/tools/networking/argus/default.nix b/pkgs/tools/networking/argus/default.nix
index e5c2aace400..8b9d1e3b704 100644
--- a/pkgs/tools/networking/argus/default.nix
+++ b/pkgs/tools/networking/argus/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, libpcap, bison, flex, cyrus_sasl, tcp_wrappers,
-  pkgconfig, procps, which, wget, lsof, net_snmp, bash, perl }:
+  pkgconfig, procps, which, wget, lsof, net_snmp, perl }:
 
 stdenv.mkDerivation rec {
   pname = "argus";
diff --git a/pkgs/tools/networking/assh/default.nix b/pkgs/tools/networking/assh/default.nix
index 7af7a8f551d..7904ffb0d04 100644
--- a/pkgs/tools/networking/assh/default.nix
+++ b/pkgs/tools/networking/assh/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub, openssh, makeWrapper }:
+{ stdenv, buildGoPackage, fetchFromGitHub, openssh, makeWrapper }:
 
 buildGoPackage rec {
   name = "assh-${version}";
diff --git a/pkgs/tools/networking/cmst/default.nix b/pkgs/tools/networking/cmst/default.nix
index 1d9e2e1677f..e20d62d1f07 100644
--- a/pkgs/tools/networking/cmst/default.nix
+++ b/pkgs/tools/networking/cmst/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, qmake, qtbase, libX11 }:
+{ stdenv, fetchFromGitHub, qmake, qtbase }:
 
 stdenv.mkDerivation rec {
   name = "cmst-${version}";
diff --git a/pkgs/tools/networking/connman/default.nix b/pkgs/tools/networking/connman/default.nix
index f6e0608ca7f..e960f8c3a84 100644
--- a/pkgs/tools/networking/connman/default.nix
+++ b/pkgs/tools/networking/connman/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, pkgconfig, openconnect, file, gawk,
+{ stdenv, fetchurl, pkgconfig, openconnect, file, gawk,
   openvpn, vpnc, glib, dbus, iptables, gnutls, polkit,
   wpa_supplicant, readline6, pptp, ppp }:
 
diff --git a/pkgs/tools/networking/dd-agent/default.nix b/pkgs/tools/networking/dd-agent/default.nix
index 1038882573b..ff4a24fb781 100644
--- a/pkgs/tools/networking/dd-agent/default.nix
+++ b/pkgs/tools/networking/dd-agent/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, pythonPackages
-, sysstat, unzip, makeWrapper }:
+, unzip, makeWrapper }:
 let
   inherit (pythonPackages) python;
   docker_1_10 = pythonPackages.buildPythonPackage rec {
diff --git a/pkgs/tools/networking/dnsmasq/default.nix b/pkgs/tools/networking/dnsmasq/default.nix
index be14db79880..9adb95d1d3f 100644
--- a/pkgs/tools/networking/dnsmasq/default.nix
+++ b/pkgs/tools/networking/dnsmasq/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, dbus, nettle
-, libidn, libnetfilter_conntrack, fetchpatch }:
+, libidn, libnetfilter_conntrack }:
 
 with stdenv.lib;
 let
diff --git a/pkgs/tools/networking/flannel/default.nix b/pkgs/tools/networking/flannel/default.nix
index 732051d8ec7..e440d35e821 100644
--- a/pkgs/tools/networking/flannel/default.nix
+++ b/pkgs/tools/networking/flannel/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
 with lib;
 
diff --git a/pkgs/tools/networking/i2pd/default.nix b/pkgs/tools/networking/i2pd/default.nix
index c7d7b5ec6df..12f68af7d0a 100644
--- a/pkgs/tools/networking/i2pd/default.nix
+++ b/pkgs/tools/networking/i2pd/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchpatch
+{ stdenv, fetchFromGitHub
 , boost, zlib, openssl
 , upnpSupport ? true, miniupnpc ? null
 , aesniSupport ? false
diff --git a/pkgs/tools/networking/inadyn/default.nix b/pkgs/tools/networking/inadyn/default.nix
index 9d588f6fa5e..2bd76188a63 100644
--- a/pkgs/tools/networking/inadyn/default.nix
+++ b/pkgs/tools/networking/inadyn/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, pkgconfig
+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig
 , gnutls, libite, libconfuse }:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/tools/networking/ipv6calc/default.nix b/pkgs/tools/networking/ipv6calc/default.nix
index f28c75774db..c66218c4898 100644
--- a/pkgs/tools/networking/ipv6calc/default.nix
+++ b/pkgs/tools/networking/ipv6calc/default.nix
@@ -1,6 +1,5 @@
 { stdenv, fetchurl, getopt, ip2location-c, openssl, perl
-, geoip ? null, geolite-legacy ? null
-, ip2location-database ? null }:
+, geoip ? null, geolite-legacy ? null }:
 
 stdenv.mkDerivation rec {
   name = "ipv6calc-${version}";
diff --git a/pkgs/tools/networking/maxscale/default.nix b/pkgs/tools/networking/maxscale/default.nix
index 425e531419e..a7648fd59c3 100644
--- a/pkgs/tools/networking/maxscale/default.nix
+++ b/pkgs/tools/networking/maxscale/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, pkgconfig, gcc, glibc
+{ stdenv, fetchFromGitHub, cmake, pkgconfig, glibc
 , bison2, curl, flex, gperftools, jansson, jemalloc, kerberos, lua, mariadb
 , ncurses, openssl, pcre, pcre2, perl, rabbitmq-c, sqlite, tcl
 , libaio, libedit, libtool, libui, libuuid, zlib
diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix
index 85c285fd3ec..62c9e7b63d1 100644
--- a/pkgs/tools/networking/network-manager/default.nix
+++ b/pkgs/tools/networking/network-manager/default.nix
@@ -2,7 +2,7 @@
 , systemd, libuuid, polkit, gnutls, ppp, dhcp, iptables
 , libgcrypt, dnsmasq, bluez5, readline
 , gobjectIntrospection, modemmanager, openresolv, libndp, newt, libsoup
-, ethtool, iputils, gnused, coreutils, file, inetutils, kmod, jansson, libxslt
+, ethtool, gnused, coreutils, file, inetutils, kmod, jansson, libxslt
 , python3Packages, docbook_xsl, openconnect, curl, autoreconfHook }:
 
 let
diff --git a/pkgs/tools/networking/network-manager/dmenu.nix b/pkgs/tools/networking/network-manager/dmenu.nix
index 82810e714d5..93827eebb57 100644
--- a/pkgs/tools/networking/network-manager/dmenu.nix
+++ b/pkgs/tools/networking/network-manager/dmenu.nix
@@ -1,5 +1,5 @@
 { stdenv, glib, fetchFromGitHub, networkmanager, python3Packages
-, gobjectIntrospection, dmenu }:
+, gobjectIntrospection }:
 
 let inherit (python3Packages) python pygobject3;
 in stdenv.mkDerivation rec {
diff --git a/pkgs/tools/networking/network-manager/fortisslvpn.nix b/pkgs/tools/networking/network-manager/fortisslvpn.nix
index 73aaea06c91..54046a23b7d 100644
--- a/pkgs/tools/networking/network-manager/fortisslvpn.nix
+++ b/pkgs/tools/networking/network-manager/fortisslvpn.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, openfortivpn, automake, autoconf, libtool, intltool, pkgconfig,
-networkmanager, ppp, lib, libsecret, withGnome ? true, gnome3, procps, kmod }:
+networkmanager, ppp, libsecret, withGnome ? true, gnome3 }:
 
 let
   pname   = "NetworkManager-fortisslvpn";
diff --git a/pkgs/tools/networking/network-manager/openvpn/default.nix b/pkgs/tools/networking/network-manager/openvpn/default.nix
index 2eef7f31ab5..28b7c873d36 100644
--- a/pkgs/tools/networking/network-manager/openvpn/default.nix
+++ b/pkgs/tools/networking/network-manager/openvpn/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, substituteAll, openvpn, intltool, libxml2, pkgconfig, networkmanager, libsecret
-, withGnome ? true, gnome3, procps, kmod }:
+, withGnome ? true, gnome3, kmod }:
 
 let
   pname   = "NetworkManager-openvpn";
diff --git a/pkgs/tools/networking/ngrok-1/default.nix b/pkgs/tools/networking/ngrok-1/default.nix
index e354ad223b8..26bcc8f803f 100644
--- a/pkgs/tools/networking/ngrok-1/default.nix
+++ b/pkgs/tools/networking/ngrok-1/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, pkgconfig, buildGoPackage, go-bindata, fetchFromGitHub }:
+{ buildGoPackage, go-bindata, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "ngrok-${version}";
diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix
index 46c0ee0f276..04a77176682 100644
--- a/pkgs/tools/networking/openssh/default.nix
+++ b/pkgs/tools/networking/openssh/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, zlib, openssl, perl, libedit, pkgconfig, pam, autoreconfHook
+{ stdenv, fetchurl, fetchpatch, zlib, openssl, libedit, pkgconfig, pam, autoreconfHook
 , etcDir ? null
 , hpnSupport ? false
 , withKerberos ? true
diff --git a/pkgs/tools/networking/s3gof3r/default.nix b/pkgs/tools/networking/s3gof3r/default.nix
index a13d6599ffb..3814af60112 100644
--- a/pkgs/tools/networking/s3gof3r/default.nix
+++ b/pkgs/tools/networking/s3gof3r/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+{ stdenv, buildGoPackage, fetchgit }:
 
 buildGoPackage rec {
   name = "s3gof3r-${version}";
diff --git a/pkgs/tools/networking/shadowsocks-libev/default.nix b/pkgs/tools/networking/shadowsocks-libev/default.nix
index d2e8a9a3051..09fa69dd37c 100644
--- a/pkgs/tools/networking/shadowsocks-libev/default.nix
+++ b/pkgs/tools/networking/shadowsocks-libev/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchgit, cmake
+{ stdenv, fetchgit, cmake
 , libsodium, mbedtls, libev, c-ares, pcre
 , asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, libxslt
 }:
diff --git a/pkgs/tools/networking/skydive/default.nix b/pkgs/tools/networking/skydive/default.nix
index ce2a8cf6a7f..e7214793744 100644
--- a/pkgs/tools/networking/skydive/default.nix
+++ b/pkgs/tools/networking/skydive/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub, perl
+{ lib, buildGoPackage, fetchFromGitHub, perl
 , go-bindata, libxml2, protobuf3_1, libpcap, pkgconfig, go-protobuf }:
 
 buildGoPackage rec {
diff --git a/pkgs/tools/networking/srelay/default.nix b/pkgs/tools/networking/srelay/default.nix
index a3f08cb5a07..7d3f773b193 100644
--- a/pkgs/tools/networking/srelay/default.nix
+++ b/pkgs/tools/networking/srelay/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, openssl }:
+{ stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   name = "srelay-0.4.8";
diff --git a/pkgs/tools/networking/tcpdump/default.nix b/pkgs/tools/networking/tcpdump/default.nix
index 59cc89ac572..8b4850a6347 100644
--- a/pkgs/tools/networking/tcpdump/default.nix
+++ b/pkgs/tools/networking/tcpdump/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, libpcap }:
+{ stdenv, fetchurl, libpcap }:
 
 stdenv.mkDerivation rec {
   name = "tcpdump-${version}";
diff --git a/pkgs/tools/networking/tcptraceroute/default.nix b/pkgs/tools/networking/tcptraceroute/default.nix
index 9e13cfc59c1..cfb627e8b3b 100644
--- a/pkgs/tools/networking/tcptraceroute/default.nix
+++ b/pkgs/tools/networking/tcptraceroute/default.nix
@@ -1,4 +1,4 @@
-{ stdenv , pkgs , fetchurl, libpcap, libnet
+{ stdenv  , fetchurl, libpcap, libnet
 }:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/tools/networking/tftp-hpa/default.nix b/pkgs/tools/networking/tftp-hpa/default.nix
index b9abba2cd0d..bc97d5d8d6e 100644
--- a/pkgs/tools/networking/tftp-hpa/default.nix
+++ b/pkgs/tools/networking/tftp-hpa/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, tcp_wrappers }:
+{ stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   name = "tftp-hpa-${version}";
diff --git a/pkgs/tools/networking/tinc/pre.nix b/pkgs/tools/networking/tinc/pre.nix
index db4b6a2281d..09c737c048a 100644
--- a/pkgs/tools/networking/tinc/pre.nix
+++ b/pkgs/tools/networking/tinc/pre.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, fetchpatch, autoreconfHook, texinfo, ncurses, readline, zlib, lzo, openssl }:
+{ stdenv, fetchgit, autoreconfHook, texinfo, ncurses, readline, zlib, lzo, openssl }:
 
 stdenv.mkDerivation rec {
   name = "tinc-${version}";
diff --git a/pkgs/tools/networking/ua/default.nix b/pkgs/tools/networking/ua/default.nix
index 5fe69ede1a7..ea40a541a22 100644
--- a/pkgs/tools/networking/ua/default.nix
+++ b/pkgs/tools/networking/ua/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn
+{ stdenv, buildGoPackage, fetchgit
 , pkgconfig
 , glib, libxml2
 }:
diff --git a/pkgs/tools/networking/wicd/default.nix b/pkgs/tools/networking/wicd/default.nix
index fe315666a2e..9f67dd4e2c3 100644
--- a/pkgs/tools/networking/wicd/default.nix
+++ b/pkgs/tools/networking/wicd/default.nix
@@ -1,7 +1,6 @@
 { stdenv, fetchurl, python2Packages
 , wpa_supplicant, dhcp, dhcpcd, wirelesstools
-, nettools, openresolv, iproute, iputils
-, locale ? "C" }:
+, nettools, openresolv, iproute, iputils }:
 
 let
   inherit (python2Packages) python pygobject2 dbus-python pyGtkGlade pycairo;
diff --git a/pkgs/tools/networking/zap/default.nix b/pkgs/tools/networking/zap/default.nix
index 263a4461530..7dc0e07f945 100644
--- a/pkgs/tools/networking/zap/default.nix
+++ b/pkgs/tools/networking/zap/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, jre, jdk, ant }:
+{ stdenv, fetchFromGitHub, jdk, ant }:
 
 stdenv.mkDerivation rec {
   name = "zap-${version}";
diff --git a/pkgs/tools/package-management/nix-prefetch-scripts/default.nix b/pkgs/tools/package-management/nix-prefetch-scripts/default.nix
index a2ff38ab300..69e978d3439 100644
--- a/pkgs/tools/package-management/nix-prefetch-scripts/default.nix
+++ b/pkgs/tools/package-management/nix-prefetch-scripts/default.nix
@@ -1,5 +1,5 @@
 { stdenv, makeWrapper, buildEnv,
-  git, subversion, mercurial, bazaar, cvs, unzip, curl, gnused, coreutils, nix
+  git, subversion, mercurial, bazaar, cvs, gnused, coreutils, nix
 }:
 
 let mkPrefetchScript = tool: src: deps:
diff --git a/pkgs/tools/package-management/nix-repl/default.nix b/pkgs/tools/package-management/nix-repl/default.nix
index facf47ebca6..9fe6ec6e291 100644
--- a/pkgs/tools/package-management/nix-repl/default.nix
+++ b/pkgs/tools/package-management/nix-repl/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, nix, readline, boehmgc }:
+{ lib, stdenv, fetchFromGitHub, nix, readline }:
 
 let rev = "a1ea85e92b067a0a42354a28355c633eac7be65c"; in
 
diff --git a/pkgs/tools/package-management/nix-serve/default.nix b/pkgs/tools/package-management/nix-serve/default.nix
index d03e6f614e5..660dce347a5 100644
--- a/pkgs/tools/package-management/nix-serve/default.nix
+++ b/pkgs/tools/package-management/nix-serve/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchpatch,
+{ stdenv, fetchFromGitHub,
   bzip2, nix, perl, perlPackages,
 }:
 
diff --git a/pkgs/tools/package-management/nixops/generic.nix b/pkgs/tools/package-management/nixops/generic.nix
index da62eba63fd..105cb6d7ab0 100644
--- a/pkgs/tools/package-management/nixops/generic.nix
+++ b/pkgs/tools/package-management/nixops/generic.nix
@@ -1,4 +1,4 @@
-{ lib, python2Packages, fetchurl, libxslt, docbook_xsl_ns, openssh
+{ lib, python2Packages, libxslt, docbook_xsl_ns, openssh
 # version args
 , src, version
 }:
diff --git a/pkgs/tools/package-management/nixops/nixops-dns.nix b/pkgs/tools/package-management/nixops/nixops-dns.nix
index 27edfa890fc..ce31de9f65d 100644
--- a/pkgs/tools/package-management/nixops/nixops-dns.nix
+++ b/pkgs/tools/package-management/nixops/nixops-dns.nix
@@ -1,5 +1,4 @@
 { lib
-, stdenv
 , buildGoPackage
 , fetchFromGitHub }:
 
diff --git a/pkgs/tools/package-management/nixui/default.nix b/pkgs/tools/package-management/nixui/default.nix
index 2d1e1fb326a..6f46b39e65b 100644
--- a/pkgs/tools/package-management/nixui/default.nix
+++ b/pkgs/tools/package-management/nixui/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, pkgs, fetchgit, nix, node_webkit, config, makeDesktopItem
+{ stdenv, pkgs, fetchgit, nix, node_webkit, makeDesktopItem
 , writeScript }:
 let
   version = "0.2.1";
diff --git a/pkgs/tools/package-management/packagekit/qt.nix b/pkgs/tools/package-management/packagekit/qt.nix
index c38ef25f354..f0f05a4c858 100644
--- a/pkgs/tools/package-management/packagekit/qt.nix
+++ b/pkgs/tools/package-management/packagekit/qt.nix
@@ -1,5 +1,5 @@
-{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig
-, qtbase, qttools, packagekit }:
+{ stdenv, fetchFromGitHub, cmake, pkgconfig
+, qttools, packagekit }:
 
 stdenv.mkDerivation rec {
   name = "packagekit-qt-${version}";
diff --git a/pkgs/tools/security/afl/default.nix b/pkgs/tools/security/afl/default.nix
index 1ff0ad6f6b6..c61cbeb3268 100644
--- a/pkgs/tools/security/afl/default.nix
+++ b/pkgs/tools/security/afl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, bash, callPackage, makeWrapper
+{ stdenv, fetchurl, callPackage, makeWrapper
 , clang, llvm, which, libcgroup
 }:
 
diff --git a/pkgs/tools/security/afl/qemu.nix b/pkgs/tools/security/afl/qemu.nix
index d21500960fe..7637dcf246a 100644
--- a/pkgs/tools/security/afl/qemu.nix
+++ b/pkgs/tools/security/afl/qemu.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, python2, zlib, pkgconfig, glib, ncurses, perl
-, attr, libcap, vde2, alsaLib, texinfo, libuuid, flex, bison, lzo, snappy
+, attr, libcap, vde2, texinfo, libuuid, flex, bison, lzo, snappy
 , libaio, libcap_ng, gnutls, pixman, autoconf
 , writeText
 }:
diff --git a/pkgs/tools/security/cfssl/default.nix b/pkgs/tools/security/cfssl/default.nix
index 91a5fa4bdd2..b3c256ae59b 100644
--- a/pkgs/tools/security/cfssl/default.nix
+++ b/pkgs/tools/security/cfssl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub, pkgs }:
+{ stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "cfssl-${version}";
diff --git a/pkgs/tools/security/cipherscan/default.nix b/pkgs/tools/security/cipherscan/default.nix
index 859c1fdf49a..a4afa772d10 100644
--- a/pkgs/tools/security/cipherscan/default.nix
+++ b/pkgs/tools/security/cipherscan/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, pkgconfig, openssl, makeWrapper, python, coreutils }:
+{ stdenv, lib, fetchFromGitHub, openssl, makeWrapper, python, coreutils }:
 
 stdenv.mkDerivation rec {
   name = "cipherscan-${version}";
diff --git a/pkgs/tools/security/clamav/default.nix b/pkgs/tools/security/clamav/default.nix
index 79644d35774..82599393724 100644
--- a/pkgs/tools/security/clamav/default.nix
+++ b/pkgs/tools/security/clamav/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, pkgconfig
+{ stdenv, fetchurl, pkgconfig
 , zlib, bzip2, libiconv, libxml2, openssl, ncurses, curl, libmilter, pcre2
 , libmspack, systemd
 }:
diff --git a/pkgs/tools/security/diceware/default.nix b/pkgs/tools/security/diceware/default.nix
index 07061aa0d11..32819b603f9 100644
--- a/pkgs/tools/security/diceware/default.nix
+++ b/pkgs/tools/security/diceware/default.nix
@@ -1,6 +1,5 @@
 { lib
 , pythonPackages
-, fetchpatch
 }:
 
 with pythonPackages;
diff --git a/pkgs/tools/security/enpass/default.nix b/pkgs/tools/security/enpass/default.nix
index f27f9af59c6..b99087e475d 100644
--- a/pkgs/tools/security/enpass/default.nix
+++ b/pkgs/tools/security/enpass/default.nix
@@ -1,7 +1,7 @@
 {stdenv, system, fetchurl, dpkg, openssl, xorg
 , glib, libGLU_combined, libpulseaudio, zlib, dbus, fontconfig, freetype
 , gtk2, pango, atk, cairo, gdk_pixbuf, jasper, xkeyboardconfig
-, makeWrapper , makeDesktopItem, python, pythonPackages, lib
+, makeWrapper , python, pythonPackages, lib
 , libredirect, lsof}:
 
 let
diff --git a/pkgs/tools/security/gnupg/22.nix b/pkgs/tools/security/gnupg/22.nix
index b0381b32bcf..fd773da4ade 100644
--- a/pkgs/tools/security/gnupg/22.nix
+++ b/pkgs/tools/security/gnupg/22.nix
@@ -1,4 +1,4 @@
-{ fetchurl, fetchpatch, stdenv, pkgconfig, libgcrypt, libassuan, libksba
+{ fetchurl, stdenv, pkgconfig, libgcrypt, libassuan, libksba
 , libiconv, npth, gettext, texinfo, pcsclite, sqlite
 
 # Each of the dependencies below are optional.
diff --git a/pkgs/tools/security/gorilla-bin/default.nix b/pkgs/tools/security/gorilla-bin/default.nix
index cbd260455d8..df9d42211f6 100644
--- a/pkgs/tools/security/gorilla-bin/default.nix
+++ b/pkgs/tools/security/gorilla-bin/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, makeWrapper, patchelf, pkgs, stdenv, libXft, libX11, freetype, fontconfig, libXrender, libXScrnSaver, libXext }:
+{ fetchurl, makeWrapper, patchelf, stdenv, libXft, libX11, freetype, fontconfig, libXrender, libXScrnSaver, libXext }:
 
 stdenv.mkDerivation rec {
   name = "gorilla-bin-${version}";
diff --git a/pkgs/tools/security/hash-slinger/default.nix b/pkgs/tools/security/hash-slinger/default.nix
index fd78d9b2efb..385a201d88b 100644
--- a/pkgs/tools/security/hash-slinger/default.nix
+++ b/pkgs/tools/security/hash-slinger/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, pythonPackages, openssh, gnupg, unbound, libreswan }:
+{ stdenv, fetchFromGitHub, pythonPackages, unbound, libreswan }:
 
 let
   inherit (pythonPackages) python;
diff --git a/pkgs/tools/security/hologram/default.nix b/pkgs/tools/security/hologram/default.nix
index 5d873885b1f..e6c375599a9 100644
--- a/pkgs/tools/security/hologram/default.nix
+++ b/pkgs/tools/security/hologram/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+{ stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "hologram-2018-03-19";
diff --git a/pkgs/tools/security/jd-gui/default.nix b/pkgs/tools/security/jd-gui/default.nix
index d9617e3eb2b..62b92b7d0bd 100644
--- a/pkgs/tools/security/jd-gui/default.nix
+++ b/pkgs/tools/security/jd-gui/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gradle_2_5, perl, makeWrapper, jre, makeDesktopItem, writeShellScriptBin, writeText }:
+{ stdenv, fetchurl, gradle_2_5, perl, makeWrapper, jre, makeDesktopItem, writeText }:
 
 let
   version = "1.4.0";
diff --git a/pkgs/tools/security/john/default.nix b/pkgs/tools/security/john/default.nix
index e55e97656f6..862b4a0df6e 100644
--- a/pkgs/tools/security/john/default.nix
+++ b/pkgs/tools/security/john/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, openssl, nss, nspr, kerberos, gmp, zlib, libpcap, re2
-, writeText, gcc, pythonPackages, perl, perlPackages, makeWrapper
+, gcc, pythonPackages, perl, perlPackages, makeWrapper
 }:
 
 with stdenv.lib;
diff --git a/pkgs/tools/security/keybase/gui.nix b/pkgs/tools/security/keybase/gui.nix
index 1a7cf30b952..549794b7831 100644
--- a/pkgs/tools/security/keybase/gui.nix
+++ b/pkgs/tools/security/keybase/gui.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, buildFHSUserEnv, writeTextFile, alsaLib, atk, cairo, cups
+{ stdenv, fetchurl, alsaLib, atk, cairo, cups
 , dbus, expat, fontconfig, freetype, gcc, gdk_pixbuf, glib, gnome2, gtk3
-, libnotify, nspr, nss, pango, systemd, xorg, utillinuxMinimal }:
+, libnotify, nspr, nss, pango, systemd, xorg }:
 
 let
   libPath = stdenv.lib.makeLibraryPath [
diff --git a/pkgs/tools/security/pass/default.nix b/pkgs/tools/security/pass/default.nix
index c7e9267dde7..007414d68a5 100644
--- a/pkgs/tools/security/pass/default.nix
+++ b/pkgs/tools/security/pass/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, pkgs, fetchurl, fetchFromGitHub, buildEnv
+{ stdenv, lib, pkgs, fetchurl, buildEnv
 , coreutils, gnused, getopt, git, tree, gnupg, which, procps, qrencode
 , makeWrapper
 
diff --git a/pkgs/tools/security/pinentry/mac.nix b/pkgs/tools/security/pinentry/mac.nix
index b198d7446a9..4acdd6cb897 100644
--- a/pkgs/tools/security/pinentry/mac.nix
+++ b/pkgs/tools/security/pinentry/mac.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, fetchFromGitHub, xcbuildHook, libiconv, Cocoa, ncurses }:
+{ stdenv, fetchFromGitHub, xcbuildHook, libiconv, Cocoa, ncurses }:
 
 stdenv.mkDerivation rec {
   name = "pinentry-mac-0.9.4";
diff --git a/pkgs/tools/security/qesteidutil/default.nix b/pkgs/tools/security/qesteidutil/default.nix
index 0c6d15e7d77..016017205ab 100644
--- a/pkgs/tools/security/qesteidutil/default.nix
+++ b/pkgs/tools/security/qesteidutil/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchpatch
+{ stdenv, fetchFromGitHub
 , cmake, ccid, qttools, qttranslations
 , pkgconfig, pcsclite, hicolor-icon-theme 
 }:
diff --git a/pkgs/tools/security/saml2aws/default.nix b/pkgs/tools/security/saml2aws/default.nix
index bf5f9116f08..047706cd8a6 100644
--- a/pkgs/tools/security/saml2aws/default.nix
+++ b/pkgs/tools/security/saml2aws/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+{ stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "saml2aws-${version}";
diff --git a/pkgs/tools/security/sops/default.nix b/pkgs/tools/security/sops/default.nix
index 26faf2c730c..bbcfc4c7890 100644
--- a/pkgs/tools/security/sops/default.nix
+++ b/pkgs/tools/security/sops/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+{ stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "sops-${version}";
diff --git a/pkgs/tools/security/ssdeep/default.nix b/pkgs/tools/security/ssdeep/default.nix
index 0a9804a743b..50b16ad5839 100644
--- a/pkgs/tools/security/ssdeep/default.nix
+++ b/pkgs/tools/security/ssdeep/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, patchelf }:
+{ stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   name    = "ssdeep-${version}";
diff --git a/pkgs/tools/security/theharvester/default.nix b/pkgs/tools/security/theharvester/default.nix
index f1bac7adba1..0c0cf29f977 100644
--- a/pkgs/tools/security/theharvester/default.nix
+++ b/pkgs/tools/security/theharvester/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, makeWrapper, python2Packages, fetchFromGitHub, python2 }:
+{ stdenv, makeWrapper, python2Packages, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
   pname = "theHarvester";
diff --git a/pkgs/tools/security/tor/update.nix b/pkgs/tools/security/tor/update.nix
index 6a7682a8f57..c944883d417 100644
--- a/pkgs/tools/security/tor/update.nix
+++ b/pkgs/tools/security/tor/update.nix
@@ -1,6 +1,5 @@
 { lib
 , writeScript
-, runCommand
 , common-updater-scripts
 , bash
 , coreutils
diff --git a/pkgs/tools/security/vulnix/default.nix b/pkgs/tools/security/vulnix/default.nix
index 6e099e5d786..4f2671aeacb 100644
--- a/pkgs/tools/security/vulnix/default.nix
+++ b/pkgs/tools/security/vulnix/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, pythonPackages, fetchurl, callPackage, nix, ronn }:
+{ stdenv, pythonPackages, nix, ronn }:
 
 pythonPackages.buildPythonApplication rec {
   pname = "vulnix";
diff --git a/pkgs/tools/system/bootchart/default.nix b/pkgs/tools/system/bootchart/default.nix
index f99d22becdb..9cba7df21b7 100644
--- a/pkgs/tools/system/bootchart/default.nix
+++ b/pkgs/tools/system/bootchart/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, lib, pkgconfig, glib, gtk2, python27, python2Packages }:
+{stdenv, fetchurl, pkgconfig, glib, gtk2, python2Packages }:
 
 stdenv.mkDerivation rec {
   version = "0.14.7";
diff --git a/pkgs/tools/system/confd/default.nix b/pkgs/tools/system/confd/default.nix
index ebe654d946e..3dc2a5caeb9 100644
--- a/pkgs/tools/system/confd/default.nix
+++ b/pkgs/tools/system/confd/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+{ buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "confd-${version}";
diff --git a/pkgs/tools/system/consul-template/default.nix b/pkgs/tools/system/consul-template/default.nix
index e664c0ef8e2..35c57dd8ea9 100644
--- a/pkgs/tools/system/consul-template/default.nix
+++ b/pkgs/tools/system/consul-template/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+{ stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "consul-template-${version}";
diff --git a/pkgs/tools/system/ddrescue/default.nix b/pkgs/tools/system/ddrescue/default.nix
index fc42c3b856f..2f507de9c22 100644
--- a/pkgs/tools/system/ddrescue/default.nix
+++ b/pkgs/tools/system/ddrescue/default.nix
@@ -1,6 +1,5 @@
 { stdenv
 , fetchurl, lzip
-, hostPlatform, buildPlatform
 }:
 
 let inherit (stdenv.lib) optionals; in
diff --git a/pkgs/tools/system/evemu/default.nix b/pkgs/tools/system/evemu/default.nix
index b6f1af7b23f..5a902914b37 100644
--- a/pkgs/tools/system/evemu/default.nix
+++ b/pkgs/tools/system/evemu/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchgit, autoreconfHook, pkgconfig, pythonPackages
-, libevdev, linuxHeaders
+, libevdev
 }:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/tools/system/gohai/default.nix b/pkgs/tools/system/gohai/default.nix
index 77f65de9a8d..9eef3b064a0 100644
--- a/pkgs/tools/system/gohai/default.nix
+++ b/pkgs/tools/system/gohai/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+{ lib, buildGoPackage, fetchgit }:
 
 buildGoPackage rec {
   name = "gohai-${version}";
diff --git a/pkgs/tools/system/journalwatch/default.nix b/pkgs/tools/system/journalwatch/default.nix
index 316b94befde..473d245618f 100644
--- a/pkgs/tools/system/journalwatch/default.nix
+++ b/pkgs/tools/system/journalwatch/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchurl, fetchgit, pythonOlder, systemd, pytest }:
+{ stdenv, buildPythonPackage, fetchurl, pythonOlder, systemd, pytest }:
 
 buildPythonPackage rec {
   pname = "journalwatch";
diff --git a/pkgs/tools/system/osquery/default.nix b/pkgs/tools/system/osquery/default.nix
index 7bbf42b1132..5b2be75e452 100644
--- a/pkgs/tools/system/osquery/default.nix
+++ b/pkgs/tools/system/osquery/default.nix
@@ -4,7 +4,7 @@
 , beecrypt, augeas, libxml2, sleuthkit, yara, lldpd, google-gflags
 , thrift, boost, rocksdb_lite, glog, gbenchmark, snappy
 , openssl, file, doxygen
-, gtest, sqlite, fpm, zstd, rdkafka, rapidjson, path
+, gtest, sqlite, fpm, zstd, rdkafka, rapidjson
 }:
 
 let
diff --git a/pkgs/tools/system/pcstat/default.nix b/pkgs/tools/system/pcstat/default.nix
index cd3c815934f..b673c0f929a 100644
--- a/pkgs/tools/system/pcstat/default.nix
+++ b/pkgs/tools/system/pcstat/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+{ stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "pcstat-unstable-${version}";
diff --git a/pkgs/tools/system/procodile/default.nix b/pkgs/tools/system/procodile/default.nix
index 3a5cb1b4965..5414d670423 100644
--- a/pkgs/tools/system/procodile/default.nix
+++ b/pkgs/tools/system/procodile/default.nix
@@ -1,4 +1,4 @@
-{ lib, bundlerEnv, ruby, stdenv }:
+{ lib, bundlerEnv, ruby }:
 
 bundlerEnv rec {
   name = "procodile-${version}";
diff --git a/pkgs/tools/text/codesearch/default.nix b/pkgs/tools/text/codesearch/default.nix
index 62be30319cf..56a8133bd3a 100644
--- a/pkgs/tools/text/codesearch/default.nix
+++ b/pkgs/tools/text/codesearch/default.nix
@@ -1,5 +1,5 @@
 # This file was generated by go2nix.
-{ stdenv, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+{ stdenv, buildGoPackage, fetchgit }:
 
 buildGoPackage rec {
   name = "codesearch-${version}";
diff --git a/pkgs/tools/text/groff/default.nix b/pkgs/tools/text/groff/default.nix
index 27581134ca3..ab0f8893bfd 100644
--- a/pkgs/tools/text/groff/default.nix
+++ b/pkgs/tools/text/groff/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, perl, groff
+{ stdenv, fetchurl, perl
 , ghostscript #for postscript and html output
 , psutils, netpbm #for html output
 , buildPackages
diff --git a/pkgs/tools/text/platinum-searcher/default.nix b/pkgs/tools/text/platinum-searcher/default.nix
index c76ba8ea88d..829d734a8f7 100644
--- a/pkgs/tools/text/platinum-searcher/default.nix
+++ b/pkgs/tools/text/platinum-searcher/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+{ stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "the_platinum_searcher-${version}";
diff --git a/pkgs/tools/text/ripgrep/default.nix b/pkgs/tools/text/ripgrep/default.nix
index 11355bb6df1..aa41e7b7f60 100644
--- a/pkgs/tools/text/ripgrep/default.nix
+++ b/pkgs/tools/text/ripgrep/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, rustPlatform, makeWrapper, asciidoc, docbook_xsl, libxslt  }:
+{ stdenv, fetchFromGitHub, rustPlatform, asciidoc, docbook_xsl, libxslt  }:
 
 rustPlatform.buildRustPackage rec {
   name = "ripgrep-${version}";
diff --git a/pkgs/tools/text/sgml/jade/default.nix b/pkgs/tools/text/sgml/jade/default.nix
index e87a8bc0275..b7f8bd6df38 100644
--- a/pkgs/tools/text/sgml/jade/default.nix
+++ b/pkgs/tools/text/sgml/jade/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgs, gnum4 }:
+{ stdenv, fetchurl, gnum4 }:
 
 stdenv.mkDerivation rec {
   name = "jade-${version}-${debpatch}";
diff --git a/pkgs/tools/text/shfmt/default.nix b/pkgs/tools/text/shfmt/default.nix
index 7328cd3878a..fe699b35590 100644
--- a/pkgs/tools/text/shfmt/default.nix
+++ b/pkgs/tools/text/shfmt/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+{ stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "shfmt-${version}";
diff --git a/pkgs/tools/text/sift/default.nix b/pkgs/tools/text/sift/default.nix
index efa5e539bd1..421715f7c33 100644
--- a/pkgs/tools/text/sift/default.nix
+++ b/pkgs/tools/text/sift/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "sift-${version}";
diff --git a/pkgs/tools/text/wgetpaste/default.nix b/pkgs/tools/text/wgetpaste/default.nix
index 81b90e4925d..c3db482d271 100644
--- a/pkgs/tools/text/wgetpaste/default.nix
+++ b/pkgs/tools/text/wgetpaste/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, wget, bash, coreutils }:
+{ stdenv, fetchurl, wget, bash }:
 
 stdenv.mkDerivation rec {
   version = "2.28";
diff --git a/pkgs/tools/text/zimreader/default.nix b/pkgs/tools/text/zimreader/default.nix
index f9debaaf061..4271bf095a1 100644
--- a/pkgs/tools/text/zimreader/default.nix
+++ b/pkgs/tools/text/zimreader/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, fetchpatch, automake, autoconf, libtool
-, zlib, openssl, zip, zimlib, cxxtools, tntnet
+, zimlib, cxxtools, tntnet
 }:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/tools/typesetting/tectonic/default.nix b/pkgs/tools/typesetting/tectonic/default.nix
index 8ce2a6b0aa3..fa8af008955 100644
--- a/pkgs/tools/typesetting/tectonic/default.nix
+++ b/pkgs/tools/typesetting/tectonic/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, rustPlatform, makeWrapper
+{ stdenv, fetchFromGitHub, rustPlatform
 , darwin, fontconfig, harfbuzz-icu, openssl, pkgconfig }:
 
 rustPlatform.buildRustPackage rec {
diff --git a/pkgs/tools/typesetting/tex/nix/default.nix b/pkgs/tools/typesetting/tex/nix/default.nix
index 0566e511870..4ee45bf4bc8 100644
--- a/pkgs/tools/typesetting/tex/nix/default.nix
+++ b/pkgs/tools/typesetting/tex/nix/default.nix
@@ -207,7 +207,6 @@ rec {
   simpleTeXToPNG =
     { preamble ? null
     , body
-    , name ? baseNameOf (toString body)
     , packages ? []
     }:
 
@@ -227,7 +226,6 @@ rec {
   simpleTeXToPDF =
     { preamble ? null
     , body
-    , name ? baseNameOf (toString body)
     , packages ? []
     }:
 
diff --git a/pkgs/tools/typesetting/tex/texlive/bin.nix b/pkgs/tools/typesetting/tex/texlive/bin.nix
index 32894748ac4..9bc5a9b273b 100644
--- a/pkgs/tools/typesetting/tex/texlive/bin.nix
+++ b/pkgs/tools/typesetting/tex/texlive/bin.nix
@@ -1,10 +1,10 @@
-{ stdenv, lib, fetchurl
+{ stdenv, fetchurl
 , texlive
-, zlib, bzip2, ncurses, libiconv, libpng, flex, bison, libX11, libICE, xproto
-, freetype, t1lib, gd, libXaw, icu, ghostscript, ed, libXt, libXpm, libXmu, libXext
-, xextproto, perl, libSM, ruby, expat, curl, libjpeg, python, fontconfig, pkgconfig
-, poppler, libpaper, graphite2, zziplib, harfbuzz, texinfo, potrace, gmp, mpfr
-, xpdf, cairo, pixman, xorg, clisp, biber
+, zlib, libiconv, libpng, libX11
+, freetype, gd, libXaw, icu, ghostscript, libXpm, libXmu, libXext
+, perl, pkgconfig
+, poppler, libpaper, graphite2, zziplib, harfbuzz, potrace, gmp, mpfr
+, cairo, pixman, xorg, clisp, biber
 , makeWrapper
 }:
 
diff --git a/pkgs/tools/typesetting/xmlto/default.nix b/pkgs/tools/typesetting/xmlto/default.nix
index ed3dad64f16..939615f5797 100644
--- a/pkgs/tools/typesetting/xmlto/default.nix
+++ b/pkgs/tools/typesetting/xmlto/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, flex, libxml2, libxslt
+{ fetchurl, stdenv, libxml2, libxslt
 , docbook_xml_dtd_45, docbook_xsl, w3m
 , bash, getopt, makeWrapper }:
 
diff --git a/pkgs/tools/video/flvtool2/default.nix b/pkgs/tools/video/flvtool2/default.nix
index dab4bf44a6f..975e13b65da 100644
--- a/pkgs/tools/video/flvtool2/default.nix
+++ b/pkgs/tools/video/flvtool2/default.nix
@@ -1,4 +1,4 @@
-{ buildRubyGem, lib, ruby }:
+{ buildRubyGem, ruby }:
 
 buildRubyGem rec {
   inherit ruby;
diff --git a/pkgs/tools/video/vnc2flv/default.nix b/pkgs/tools/video/vnc2flv/default.nix
index bb72fd2911f..32cf2771b51 100644
--- a/pkgs/tools/video/vnc2flv/default.nix
+++ b/pkgs/tools/video/vnc2flv/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pythonPackages }:
+{ fetchurl, pythonPackages }:
 
 pythonPackages.buildPythonApplication rec {
   name = "vnc2flv-20100207";
diff --git a/pkgs/tools/virtualization/awless/default.nix b/pkgs/tools/virtualization/awless/default.nix
index 549c830e887..ff9a13c500b 100644
--- a/pkgs/tools/virtualization/awless/default.nix
+++ b/pkgs/tools/virtualization/awless/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+{ stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "awless-${version}";
diff --git a/pkgs/tools/virtualization/cloud-init/default.nix b/pkgs/tools/virtualization/cloud-init/default.nix
index 60ccc0f4724..5e2f84dee1d 100644
--- a/pkgs/tools/virtualization/cloud-init/default.nix
+++ b/pkgs/tools/virtualization/cloud-init/default.nix
@@ -1,4 +1,4 @@
-{ lib, pythonPackages, fetchurl, kmod, systemd, cloud-utils }:
+{ lib, pythonPackages, fetchurl, cloud-utils }:
 
 let version = "0.7.9";
 
diff --git a/pkgs/tools/virtualization/distrobuilder/default.nix b/pkgs/tools/virtualization/distrobuilder/default.nix
index 83a340348c8..2286faf4d1b 100644
--- a/pkgs/tools/virtualization/distrobuilder/default.nix
+++ b/pkgs/tools/virtualization/distrobuilder/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, pkgconfig, buildGoPackage, fetchFromGitHub
+{ stdenv, pkgconfig, buildGoPackage, fetchFromGitHub
 , makeWrapper, coreutils, gnupg, gnutar, squashfsTools, debootstrap
 }:
 
diff --git a/pkgs/tools/virtualization/euca2ools/default.nix b/pkgs/tools/virtualization/euca2ools/default.nix
index dce806cf6e3..ce628ff84b5 100644
--- a/pkgs/tools/virtualization/euca2ools/default.nix
+++ b/pkgs/tools/virtualization/euca2ools/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, which, python2Packages }:
+{ stdenv, fetchgit, python2Packages }:
 
 let
   inherit (python2Packages) buildPythonApplication boto m2crypto;
diff --git a/pkgs/tools/virtualization/google-compute-engine/default.nix b/pkgs/tools/virtualization/google-compute-engine/default.nix
index 3645de88bf8..e987bc7986b 100644
--- a/pkgs/tools/virtualization/google-compute-engine/default.nix
+++ b/pkgs/tools/virtualization/google-compute-engine/default.nix
@@ -2,7 +2,6 @@
 , fetchFromGitHub
 , buildPythonApplication
 , bash
-, shadow
 , systemd
 , utillinux
 , boto
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 91d2d5aaa56..598f3c009ef 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -700,9 +700,7 @@ with pkgs;
 
   xcodeenv = callPackage ../development/mobile/xcodeenv { };
 
-  titaniumenv = callPackage ../development/mobile/titaniumenv {
-    pkgs_i686 = pkgsi686Linux;
-  };
+  titaniumenv = callPackage ../development/mobile/titaniumenv { };
 
   abootimg = callPackage ../development/mobile/abootimg {};
 
@@ -5167,7 +5165,7 @@ with pkgs;
 
   sourceHighlight = callPackage ../tools/text/source-highlight { };
 
-  spaceFM = callPackage ../applications/misc/spacefm { adwaita-icon-theme = gnome3.adwaita-icon-theme; };
+  spaceFM = callPackage ../applications/misc/spacefm { };
 
   squashfsTools = callPackage ../tools/filesystems/squashfs { };
 
@@ -6756,9 +6754,8 @@ with pkgs;
     (if pluginSupport then appendToName "with-plugin" else x: x)
       (callPackage ../development/compilers/oraclejdk/jdk8psu-linux.nix { inherit installjdk pluginSupport; });
 
-  oraclejdk10distro = packageType: pluginSupport:
-    (if pluginSupport then appendToName "with-plugin" else x: x)
-      (callPackage ../development/compilers/oraclejdk/jdk10-linux.nix { inherit packageType pluginSupport; });
+  oraclejdk10distro = packageType: _:
+      (callPackage ../development/compilers/oraclejdk/jdk10-linux.nix { inherit packageType; });
 
   jikes = callPackage ../development/compilers/jikes { };
 
@@ -8639,7 +8636,6 @@ with pkgs;
 
   xcodebuild = callPackage ../development/tools/xcbuild/wrapper.nix {
     inherit (darwin.apple_sdk.frameworks) CoreServices CoreGraphics ImageIO;
-    stdenv = buildPackages.clangStdenv;
   };
   xcbuild = xcodebuild;
   xcbuildHook = makeSetupHook {
@@ -11417,7 +11413,6 @@ with pkgs;
     # XXX: mariadb doesn't built on fbsd as of nov 2015
     mysql = if (!stdenv.isFreeBSD) then mysql else null;
 
-    inherit libGL;
     inherit (pkgs.darwin) cf-private libobjc;
     inherit (pkgs.darwin.apple_sdk.frameworks) ApplicationServices OpenGL Cocoa AGL;
   };
@@ -11438,7 +11433,7 @@ with pkgs;
   qt56 = recurseIntoAttrs (makeOverridable
     (import ../development/libraries/qt-5/5.6) {
       inherit newScope;
-      inherit stdenv fetchurl makeSetupHook makeWrapper;
+      inherit stdenv fetchurl makeSetupHook;
       bison = bison2; # error: too few arguments to function 'int yylex(...
       inherit cups;
       harfbuzz = harfbuzz-icu;
@@ -11452,7 +11447,7 @@ with pkgs;
   qt59 = recurseIntoAttrs (makeOverridable
     (import ../development/libraries/qt-5/5.9) {
       inherit newScope;
-      inherit stdenv fetchurl makeSetupHook makeWrapper;
+      inherit stdenv fetchurl makeSetupHook;
       bison = bison2; # error: too few arguments to function 'int yylex(...
       inherit cups;
       harfbuzz = harfbuzz-icu;
@@ -11467,7 +11462,7 @@ with pkgs;
   qt511 = recurseIntoAttrs (makeOverridable
     (import ../development/libraries/qt-5/5.11) {
       inherit newScope;
-      inherit stdenv fetchurl fetchFromGitHub makeSetupHook makeWrapper;
+      inherit stdenv fetchurl fetchFromGitHub makeSetupHook;
       bison = bison2; # error: too few arguments to function 'int yylex(...
       inherit cups;
       harfbuzz = harfbuzz-icu;
@@ -12167,13 +12162,9 @@ with pkgs;
 
   wavpack = callPackage ../development/libraries/wavpack { };
 
-  wayland = callPackage ../development/libraries/wayland {
-    graphviz = graphviz-nox;
-  };
+  wayland = callPackage ../development/libraries/wayland { };
 
-  wayland_1_9 = callPackage ../development/libraries/wayland/1.9.nix {
-    graphviz = graphviz-nox;
-  };
+  wayland_1_9 = callPackage ../development/libraries/wayland/1.9.nix { };
 
   wayland-protocols = callPackage ../development/libraries/wayland/protocols.nix { };
 
@@ -12560,7 +12551,7 @@ with pkgs;
     openblas = openblasCompat;
     withRecommendedPackages = false;
     inherit (darwin.apple_sdk.frameworks) Cocoa Foundation;
-    inherit (darwin) cf-private libobjc;
+    inherit (darwin) libobjc;
   };
 
   rWrapper = callPackage ../development/r-modules/wrapper.nix {
@@ -12677,7 +12668,6 @@ with pkgs;
 
   couchdb = callPackage ../servers/http/couchdb {
     spidermonkey = spidermonkey_1_8_5;
-    python = python27;
     sphinx = python27Packages.sphinx;
     erlang = erlangR19;
   };
@@ -15751,7 +15741,7 @@ with pkgs;
     imagemagick = null;
     acl = null;
     gpm = null;
-    inherit (darwin.apple_sdk.frameworks) AppKit CoreWLAN GSS Kerberos ImageIO;
+    inherit (darwin.apple_sdk.frameworks) AppKit GSS ImageIO;
   };
 
   emacs26-nox = lowPrio (appendToName "nox" (emacs26.override {
@@ -15769,7 +15759,7 @@ with pkgs;
     imagemagick = null;
     acl = null;
     gpm = null;
-    inherit (darwin.apple_sdk.frameworks) AppKit CoreWLAN GSS Kerberos ImageIO;
+    inherit (darwin.apple_sdk.frameworks) AppKit GSS ImageIO;
   };
 
   emacs25-nox = lowPrio (appendToName "nox" (emacs25.override {
@@ -16369,9 +16359,7 @@ with pkgs;
     python = python27;
   };
 
-  git-review = callPackage ../applications/version-management/git-review {
-    python = python27;
-  };
+  git-review = callPackage ../applications/version-management/git-review { };
 
   gitolite = callPackage ../applications/version-management/gitolite { };
 
@@ -16414,7 +16402,6 @@ with pkgs;
 
   jetbrains = (recurseIntoAttrs (callPackages ../applications/editors/jetbrains {
     jdk = jetbrains.jdk;
-    androidsdk = androidsdk_extras;
   }) // {
     jdk = callPackage ../development/compilers/jetbrains-jdk {  };
   });
@@ -16869,9 +16856,7 @@ with pkgs;
     let
       mkApplications = import ../applications/kde;
       attrs = {
-        inherit stdenv lib libsForQt5 fetchurl recurseIntoAttrs;
-        inherit plasma5;
-        inherit attica phonon;
+        inherit lib libsForQt5 fetchurl;
         inherit okteta;
       };
     in
@@ -17183,7 +17168,6 @@ with pkgs;
 
   mercurial = callPackage ../applications/version-management/mercurial {
     inherit (darwin.apple_sdk.frameworks) ApplicationServices;
-    inherit (darwin) cf-private;
     guiSupport = false; # use mercurialFull to get hgk GUI
   };
 
@@ -17502,7 +17486,6 @@ with pkgs;
   };
 
   synfigstudio = callPackage ../applications/graphics/synfigstudio {
-    fontsConf = makeFontsConf { fontDirectories = [ freefont_ttf ]; };
     inherit (gnome3) defaultIconTheme;
     mlt-qt5 = libsForQt5.mlt;
   };
@@ -18816,9 +18799,6 @@ with pkgs;
     nvidia_x11_i686 = if system == "x86_64-linux"
       then pkgsi686Linux.linuxPackages.nvidia_x11.override { libsOnly = true; }
       else null;
-    primusLib_i686 = if system == "x86_64-linux"
-      then pkgsi686Linux.primusLib
-      else null;
     libglvnd_i686 = if system == "x86_64-linux"
       then pkgsi686Linux.libglvnd
       else null;
@@ -19234,7 +19214,7 @@ with pkgs;
 
   libxpdf = callPackage ../applications/misc/xpdf/libxpdf.nix { };
 
-  xpra = callPackage ../tools/X11/xpra { inherit (texFunctions) fontsConf; };
+  xpra = callPackage ../tools/X11/xpra { };
   libfakeXinerama = callPackage ../tools/X11/xpra/libfakeXinerama.nix { };
   #TODO: 'pil' is not available for python3, yet
   xpraGtk3 = callPackage ../tools/X11/xpra/gtk3.nix { inherit (texFunctions) fontsConf; inherit (python3Packages) buildPythonApplication python cython pygobject3 pycairo; };
@@ -19268,7 +19248,6 @@ with pkgs;
   finalterm = callPackage ../applications/misc/finalterm { };
 
   roxterm = callPackage ../applications/misc/roxterm {
-    inherit (pythonPackages) lockfile;
     inherit (gnome3) gsettings-desktop-schemas vte;
   };
 
@@ -20176,7 +20155,7 @@ with pkgs;
   lumina = libsForQt5.callPackage ../desktops/lumina { };
 
   lxqt = recurseIntoAttrs (import ../desktops/lxqt {
-    inherit pkgs libsForQt5 fetchFromGitHub;
+    inherit pkgs libsForQt5;
     inherit (lib) makeScope;
   });
 
@@ -21245,7 +21224,7 @@ with pkgs;
   kops = callPackage ../applications/networking/cluster/kops { };
 
   lilypond = callPackage ../misc/lilypond { guile = guile_1_8; };
-  lilypond-unstable = callPackage ../misc/lilypond/unstable.nix { guile = guile_1_8; };
+  lilypond-unstable = callPackage ../misc/lilypond/unstable.nix { };
   lilypond-with-fonts = callPackage ../misc/lilypond/with-fonts.nix {
     lilypond = lilypond-unstable;
   };
@@ -21684,7 +21663,6 @@ with pkgs;
   };
 
   vice = callPackage ../misc/emulators/vice {
-    libX11 = xorg.libX11;
     giflib = giflib_4_1;
   };
 
diff --git a/pkgs/top-level/beam-packages.nix b/pkgs/top-level/beam-packages.nix
index 8f8caf755ed..3440bfafb11 100644
--- a/pkgs/top-level/beam-packages.nix
+++ b/pkgs/top-level/beam-packages.nix
@@ -1,4 +1,4 @@
-{ pkgs, stdenv, callPackage, wxGTK30, darwin }:
+{ callPackage, wxGTK30 }:
 
 rec {
   lib = callPackage ../development/beam-modules/lib.nix {};
diff --git a/pkgs/top-level/dotnet-packages.nix b/pkgs/top-level/dotnet-packages.nix
index 4527451d71a..3782fc33d6a 100644
--- a/pkgs/top-level/dotnet-packages.nix
+++ b/pkgs/top-level/dotnet-packages.nix
@@ -6,7 +6,6 @@
 , fetchNuGet
 , pkgconfig
 , mono
-, monodevelop
 , fsharp
 , unzip
 , overrides ? {}
diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix
index f6c992d5bd5..f1b0aa997ec 100644
--- a/pkgs/top-level/emacs-packages.nix
+++ b/pkgs/top-level/emacs-packages.nix
@@ -50,16 +50,14 @@ let
   };
 
   melpaStablePackages = import ../applications/editors/emacs-modes/melpa-stable-packages.nix {
-    inherit external lib;
+    inherit external;
   };
 
   melpaPackages = import ../applications/editors/emacs-modes/melpa-packages.nix {
     inherit external lib;
   };
 
-  orgPackages = import ../applications/editors/emacs-modes/org-packages.nix {
-    inherit fetchurl lib stdenv texinfo;
-  };
+  orgPackages = import ../applications/editors/emacs-modes/org-packages.nix { };
 
   emacsWithPackages = import ../build-support/emacs/wrapper.nix {
     inherit lib lndir makeWrapper stdenv runCommand;
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 5fef4872db2..bef3c2d0a21 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1,5 +1,5 @@
 { buildPackages, pkgs
-, newScope, stdenv
+, newScope
 , buildPlatform, targetPlatform
 }:
 
diff --git a/pkgs/top-level/haxe-packages.nix b/pkgs/top-level/haxe-packages.nix
index 3ac8d5f164d..35b0b42da3f 100644
--- a/pkgs/top-level/haxe-packages.nix
+++ b/pkgs/top-level/haxe-packages.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip, fetchFromGitHub, newScope, haxe, neko, nodejs, wine, php, python3, jdk, mono, haskellPackages, fetchpatch }:
+{ stdenv, fetchzip, fetchFromGitHub, haxe, neko, jdk, mono }:
 
 let
   self = haxePackages;
diff --git a/pkgs/top-level/java-packages.nix b/pkgs/top-level/java-packages.nix
index 77cd5b0eba5..73ed6bf9162 100644
--- a/pkgs/top-level/java-packages.nix
+++ b/pkgs/top-level/java-packages.nix
@@ -1,4 +1,4 @@
-{ pkgs, stdenv, maven }:
+{ pkgs }:
 
 with pkgs;
 
diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix
index 520db16d366..cb9df438246 100644
--- a/pkgs/top-level/lua-packages.nix
+++ b/pkgs/top-level/lua-packages.nix
@@ -5,9 +5,9 @@
    for each package in a separate file: the call to the function would
    be almost as must code as the function itself. */
 
-{ fetchurl, fetchzip, stdenv, lua, callPackage, unzip, zziplib, pkgconfig, libtool
-, pcre, oniguruma, gnulib, tre, glibc, sqlite, openssl, expat, cairo
-, perl, gtk2, python, glib, gobjectIntrospection, libevent, zlib, autoreconfHook
+{ fetchurl, stdenv, lua, callPackage, unzip, zziplib, pkgconfig
+, pcre, oniguruma, gnulib, tre, glibc, sqlite, openssl, expat
+, glib, gobjectIntrospection, libevent, zlib, autoreconfHook
 , mysql, postgresql, cyrus_sasl
 , fetchFromGitHub, libmpack, which, fetchpatch, writeText
 }:
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index a49d638dc47..eb76c323dde 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -748,14 +748,14 @@ let
     # Jane Street
 
     janePackage = callPackage ../development/ocaml-modules/janestreet/janePackage.nix {};
-    
+
     janeStreet = import ../development/ocaml-modules/janestreet {
-      inherit lib janePackage ocaml ocamlbuild angstrom ctypes cryptokit;
+      inherit janePackage ocamlbuild angstrom ctypes cryptokit;
       inherit magic-mime num ocaml-migrate-parsetree octavius ounit;
       inherit ppx_deriving re zarith ppxlib;
       inherit (pkgs) stdenv openssl;
     };
-    
+
     janeStreet_0_9_0 = import ../development/ocaml-modules/janestreet/old.nix {
       janePackage = callPackage ../development/ocaml-modules/janestreet/janePackage.nix { defaultVersion = "0.9.0"; };
       inherit lib ocaml ocamlbuild ctypes cryptokit;
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index b5df07148d9..255ea6d4ffd 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -5,7 +5,7 @@
    for each package in a separate file: the call to the function would
    be almost as much code as the function itself. */
 
-{config, pkgs, fetchurl, fetchFromGitHub, stdenv, fetchsvn, gnused, perl, overrides}:
+{config, pkgs, fetchurl, fetchFromGitHub, stdenv, gnused, perl, overrides}:
 
 let self = _self // overrides; _self = with self; {
 
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 81d38de4f38..d1c0ac37489 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9650,7 +9650,7 @@ in {
   fixtures = callPackage ../development/python-modules/fixtures { };
 
   pelican = callPackage ../development/python-modules/pelican {
-    inherit (pkgs) glibcLocales pandoc git;
+    inherit (pkgs) glibcLocales git;
   };
 
   pep8 = buildPythonPackage rec {
diff --git a/pkgs/top-level/release-python.nix b/pkgs/top-level/release-python.nix
index 3bc252e440f..8b7240e21a3 100644
--- a/pkgs/top-level/release-python.nix
+++ b/pkgs/top-level/release-python.nix
@@ -3,9 +3,7 @@
    $ hydra-eval-jobs pkgs/top-level/release-python.nix
 */
 
-{ nixpkgs ? { outPath = (import ../../lib).cleanSource ../..; revCount = 1234; shortRev = "abcdef"; }
-, officialRelease ? false
-, # The platforms for which we build Nixpkgs.
+{ # The platforms for which we build Nixpkgs.
   supportedSystems ? [ "x86_64-linux" ]
 }:
 
diff --git a/pkgs/top-level/unix-tools.nix b/pkgs/top-level/unix-tools.nix
index cc6a8e0592a..1dface338a3 100644
--- a/pkgs/top-level/unix-tools.nix
+++ b/pkgs/top-level/unix-tools.nix
@@ -1,5 +1,4 @@
-{ pkgs, buildEnv, runCommand, hostPlatform, lib
-, stdenv }:
+{ pkgs, buildEnv, runCommand, hostPlatform, lib }:
 
 # These are some unix tools that are commonly included in the /usr/bin
 # and /usr/sbin directory under more normal distributions. Along with
-- 
GitLab


From cd6e2c9642b8e608c905f350cece21141435deef Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Sat, 21 Jul 2018 02:47:54 +0000
Subject: [PATCH 226/297] undo: try for zero rebuild on ofborg

---
 pkgs/development/ruby-modules/solargraph/default.nix | 2 +-
 pkgs/tools/admin/oxidized/default.nix                | 2 +-
 pkgs/tools/typesetting/asciidoctor/default.nix       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/ruby-modules/solargraph/default.nix b/pkgs/development/ruby-modules/solargraph/default.nix
index 83f1dddeeb6..39520fdb0ba 100644
--- a/pkgs/development/ruby-modules/solargraph/default.nix
+++ b/pkgs/development/ruby-modules/solargraph/default.nix
@@ -1,4 +1,4 @@
-{ lib, bundlerApp, ruby }:
+{ lib, bundlerApp }:
 
 bundlerApp rec {
   pname = "solargraph";
diff --git a/pkgs/tools/admin/oxidized/default.nix b/pkgs/tools/admin/oxidized/default.nix
index 590f6ea55ca..25b8bdb6585 100644
--- a/pkgs/tools/admin/oxidized/default.nix
+++ b/pkgs/tools/admin/oxidized/default.nix
@@ -1,4 +1,4 @@
-{ lib, fetchFromGitHub, ruby, git, bundlerApp }:
+{ lib, ruby, bundlerApp }:
 
 bundlerApp rec {
   pname = "oxidized";
diff --git a/pkgs/tools/typesetting/asciidoctor/default.nix b/pkgs/tools/typesetting/asciidoctor/default.nix
index b1fe301775c..1f6a7054b9e 100644
--- a/pkgs/tools/typesetting/asciidoctor/default.nix
+++ b/pkgs/tools/typesetting/asciidoctor/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, bundlerApp, ruby, curl
+{ stdenv, lib, bundlerApp, ruby
   # Dependencies of the 'mathematical' package
 , cmake, bison, flex, glib, pkgconfig, cairo
 , pango, gdk_pixbuf, libxml2, python3, patchelf
-- 
GitLab


From 6e878df4513d117f078d04657b4048718570af51 Mon Sep 17 00:00:00 2001
From: hcmensch <hcmensch@umich.edu>
Date: Fri, 20 Jul 2018 23:00:54 -0400
Subject: [PATCH 227/297] added info for vim-ledger plugin in default.nix

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

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index 8428a3b7894..4e7817c6f7e 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -1657,6 +1657,17 @@ let
 
   };
 
+  vim-ledger = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-ledger-2017-12-12";
+    src = fetchgit {
+      url = "https://github.com/ledger/vim-ledger";
+      rev = "6eb3bb21aa979cc295d0480b2179938c12b33d0d";
+      sha256 = "0rbwyaanvl2bqk8xm4kq8fkv8y92lpf9xx5n8gw54iij7xxhnj01";
+    };
+    dependencies = [];
+
+  };
+
   vim-jinja = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-jinja-2016-11-16";
     src = fetchgit {
-- 
GitLab


From 9991a755ed7b402651ba0457a33b7b19ff1abb5e Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Sat, 21 Jul 2018 00:15:50 -0500
Subject: [PATCH 228/297] google-fonts: 2017-06-28 -> 2018-07-13

---
 pkgs/data/fonts/google-fonts/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/data/fonts/google-fonts/default.nix b/pkgs/data/fonts/google-fonts/default.nix
index de281c278e6..0be58d06fa4 100644
--- a/pkgs/data/fonts/google-fonts/default.nix
+++ b/pkgs/data/fonts/google-fonts/default.nix
@@ -2,18 +2,18 @@
 
 stdenv.mkDerivation rec {
   name = "google-fonts-${version}";
-  version = "2017-06-28";
+  version = "2018-07-13";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "fonts";
-    rev = "b1cb16c0ce2402242e0106d15b0429d1b8075ecc";
-    sha256 = "18kyclwipkdv4zxfws87x2l91jwn34vrizw8rmv8lqznnfsjh2lg";
+    rev = "3ca591dae7372a26e254ec6d22e7b453813b9530";
+    sha256 = "01ak3dzw2kihwa0dy27x8vvpiscd66mnkf61vj1xn29m4g48y0lr";
   };
 
   outputHashAlgo = "sha256";
   outputHashMode = "recursive";
-  outputHash = "0n0j2hi1qb2sc6p3v6lpaqb2aq0m9xjmi7apz3hf2nx97rrsam22";
+  outputHash = "1pzm26794nwdbsvjnczpfchxiqa1n1zhp517g6g39wfm1nfszz83";
 
   phases = [ "unpackPhase" "patchPhase" "installPhase" ];
 
-- 
GitLab


From 6cc783ee29dc5f62787cd311c4544e866e63cbb4 Mon Sep 17 00:00:00 2001
From: Meghea Iulian <iulian.meghea@gmail.com>
Date: Sat, 21 Jul 2018 09:45:38 +0300
Subject: [PATCH 229/297] avocode: 3.1.1 -> 3.2.0

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

diff --git a/pkgs/applications/graphics/avocode/default.nix b/pkgs/applications/graphics/avocode/default.nix
index fbf6443b91f..8d6e6c71366 100644
--- a/pkgs/applications/graphics/avocode/default.nix
+++ b/pkgs/applications/graphics/avocode/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   name = "avocode-${version}";
-  version = "3.1.1";
+  version = "3.2.0";
 
   src = fetchurl {
     url = "https://media.avocode.com/download/avocode-app/${version}/avocode-${version}-linux.zip";
-    sha256 = "1qvyc08i3b4rr43ssz78xndm4bx8lz2vigh6w9gd7w367xjf4f5b";
+    sha256 = "111kcjqm8j2v941m2ly4ahhxalylnsvy5zmclj1f490japz2h1xy";
   };
 
   libPath = stdenv.lib.makeLibraryPath (with xorg; with gnome2; [
-- 
GitLab


From d3295790520e6687c9306f2cb8d111459d263eba Mon Sep 17 00:00:00 2001
From: Meghea Iulian <iulian.meghea@gmail.com>
Date: Sat, 21 Jul 2018 09:52:33 +0300
Subject: [PATCH 230/297] gitkraken: 3.6.4 -> 3.6.6

---
 pkgs/applications/version-management/gitkraken/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix
index db2fdf0199e..0ea4a5235fd 100644
--- a/pkgs/applications/version-management/gitkraken/default.nix
+++ b/pkgs/applications/version-management/gitkraken/default.nix
@@ -12,11 +12,11 @@ let
 in
 stdenv.mkDerivation rec {
   name = "gitkraken-${version}";
-  version = "3.6.4";
+  version = "3.6.6";
 
   src = fetchurl {
     url = "https://release.gitkraken.com/linux/v${version}.deb";
-    sha256 = "0n14lwmga0hhi4m4pwgpzpxmsmfy6an7b2pk59afsydhxjj88z4x";
+    sha256 = "01ir325ls1fb6ml79c02c7dyi910lxw0avlwc0nzv8fy4aqavl6p";
   };
 
   libPath = makeLibraryPath [
-- 
GitLab


From 501beb69f2f2b1679567c3436cf68ee3af66a49c Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Jul 2018 02:48:59 -0500
Subject: [PATCH 231/297] dejagnu: 1.6 -> 1.6.1

---
 pkgs/development/tools/misc/dejagnu/default.nix   |  6 ++----
 .../dejagnu/wrapped-runtest-program-name.patch    | 15 ---------------
 2 files changed, 2 insertions(+), 19 deletions(-)
 delete mode 100644 pkgs/development/tools/misc/dejagnu/wrapped-runtest-program-name.patch

diff --git a/pkgs/development/tools/misc/dejagnu/default.nix b/pkgs/development/tools/misc/dejagnu/default.nix
index b734eadae90..d9fab774b76 100644
--- a/pkgs/development/tools/misc/dejagnu/default.nix
+++ b/pkgs/development/tools/misc/dejagnu/default.nix
@@ -1,15 +1,13 @@
 { fetchurl, stdenv, expect, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "dejagnu-1.6";
+  name = "dejagnu-1.6.1";
 
   src = fetchurl {
     url = "mirror://gnu/dejagnu/${name}.tar.gz";
-    sha256 = "0qypaakd2065jgpcv84zcsibl8gph3p334gb2qdmhsrbirhlmdh0";
+    sha256 = "14hnq1mh91vqprc43xdy4f15sycw6fbajrh7zi6cw2kyg6xjhnxz";
   };
 
-  patches = [ ./wrapped-runtest-program-name.patch ];
-
   buildInputs = [ expect makeWrapper ];
 
   doCheck = true;
diff --git a/pkgs/development/tools/misc/dejagnu/wrapped-runtest-program-name.patch b/pkgs/development/tools/misc/dejagnu/wrapped-runtest-program-name.patch
deleted file mode 100644
index d745bc65cbb..00000000000
--- a/pkgs/development/tools/misc/dejagnu/wrapped-runtest-program-name.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-This patch gives `runtest' a `$0' that contains `runtest' instead
-of `.runtest-wrapped'.  This is required because `runtest' checks
-what `$0' looks like to determine the target.
-
---- dejagnu-1.4.4/runtest	2003-08-17 03:27:59.000000000 +0200
-+++ dejagnu-1.4.4/runtest	2010-03-18 15:57:58.000000000 +0100
-@@ -10,6 +10,7 @@
- # Get the execution path to this script and the current directory.
- #
- mypath=${0-.}
-+mypath="`echo $mypath | sed -'es|\.runtest-wrapped|runtest|g'`"
- if expr ${mypath} : '.*/.*' > /dev/null
- then
-     :
-
-- 
GitLab


From acd100e4b6b86ea7d80554b83879160059a66462 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sat, 21 Jul 2018 07:53:23 +0000
Subject: [PATCH 232/297] ocamlPackages.ppx_blob: 0.2 -> 0.4.0

---
 .../ocaml-modules/ppx_blob/default.nix        | 25 +++++++++++++------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/ocaml-modules/ppx_blob/default.nix b/pkgs/development/ocaml-modules/ppx_blob/default.nix
index 9d5f4f4e669..45dd73d4a32 100644
--- a/pkgs/development/ocaml-modules/ppx_blob/default.nix
+++ b/pkgs/development/ocaml-modules/ppx_blob/default.nix
@@ -1,15 +1,26 @@
-{ stdenv, buildOcaml, fetchurl, ppx_tools }:
+{ stdenv, fetchurl, ocaml, findlib, jbuilder, alcotest
+, ocaml-migrate-parsetree
+}:
 
-buildOcaml rec {
-  name = "ppx_blob";
-  version = "0.2";
+stdenv.mkDerivation rec {
+  name = "ocaml${ocaml.version}-ppx_blob-${version}";
+  version = "0.4.0";
 
   src = fetchurl {
-    url = "https://github.com/johnwhitington/ppx_blob/archive/v${version}.tar.gz";
-    sha256 = "0kvqfm47f4xbgz0cl7ayz29myyb24xskm35svqrgakjq12nkpsss";
+    url = "https://github.com/johnwhitington/ppx_blob/releases/download/${version}/ppx_blob-${version}.tbz";
+    sha256 = "1xmslk1mwdzhy1bydgsjlcb7h544c39hvxa8lywp8w72gaggjl16";
   };
 
-  buildInputs = [ ppx_tools ];
+  unpackCmd = "tar xjf $curSrc";
+
+  buildInputs = [ ocaml findlib jbuilder alcotest ocaml-migrate-parsetree ];
+
+  buildPhase = "dune build -p ppx_blob";
+
+  doCheck = true;
+  checkPhase = "dune runtest -p ppx_blob";
+
+  inherit (jbuilder) installPhase;
 
   meta = with stdenv.lib; {
     homepage = https://github.com/johnwhitington/ppx_blob;
-- 
GitLab


From 1493a45f4bd6a2d113030391a7c97152fcf39647 Mon Sep 17 00:00:00 2001
From: Kevin Rauscher <kevin.rauscher@tomahna.fr>
Date: Sat, 21 Jul 2018 10:39:41 +0200
Subject: [PATCH 233/297] bloop: 1.0.0-M11 -> 1.0.0

---
 pkgs/development/tools/build-managers/bloop/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/build-managers/bloop/default.nix b/pkgs/development/tools/build-managers/bloop/default.nix
index 96e9d0f9a43..50b1d09ef93 100644
--- a/pkgs/development/tools/build-managers/bloop/default.nix
+++ b/pkgs/development/tools/build-managers/bloop/default.nix
@@ -2,7 +2,7 @@
 
 let
   baseName = "bloop";
-  version = "1.0.0-M11";
+  version = "1.0.0";
   deps = stdenv.mkDerivation {
     name = "${baseName}-deps-${version}";
     buildCommand = ''
@@ -16,12 +16,12 @@ let
     '';
     outputHashMode = "recursive";
     outputHashAlgo = "sha256";
-    outputHash     = "00p9mrwcms3skzicyj8frqs0r0a2rfvk5fbh58rk5yvcvkwl4fy1";
+    outputHash     = "0dgllwv9rjvpzvlbwwiynmfp15j2x48al7cb5rlmhq0an3q81hbh";
   };
 in
 stdenv.mkDerivation rec {
   name = "${baseName}-${version}";
-  nailgunCommit = "60c2d130";
+  nailgunCommit = "0c8b937b";
 
   buildInputs = [ jdk makeWrapper deps ];
 
-- 
GitLab


From 027d52ff34fad3eb03e7a392681f3dca86e956f1 Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <infinisil@icloud.com>
Date: Sat, 21 Jul 2018 10:50:30 +0200
Subject: [PATCH 234/297] cuter: Fix build

---
 pkgs/development/tools/erlang/cuter/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/erlang/cuter/default.nix b/pkgs/development/tools/erlang/cuter/default.nix
index 3dc0d3fca88..a89861faebb 100644
--- a/pkgs/development/tools/erlang/cuter/default.nix
+++ b/pkgs/development/tools/erlang/cuter/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   '';
 
   nativeBuildInputs = [ autoreconfHook ];
-  buildInputs = with beamPackages; [ python27.pkgs.setuptools erlang z3 python27 makeWrapper which ];
+  buildInputs = with beamPackages; [ python27.pkgs.setuptools erlang z3.python python27 makeWrapper which ];
 
   buildFlags = "PWD=$(out)/lib/erlang/lib/cuter-${version} cuter_target";
   configurePhase = ''
-- 
GitLab


From effbf001b9913f9f12393f290b780296da4c66e0 Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <infinisil@icloud.com>
Date: Sat, 21 Jul 2018 11:15:44 +0200
Subject: [PATCH 235/297] dxx-rebirth: Fix build

See also https://github.com/NixOS/nixpkgs/commit/8414fa2d6bb1249ed77565ff6b9f312fd52917da
---
 pkgs/games/dxx-rebirth/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/games/dxx-rebirth/default.nix b/pkgs/games/dxx-rebirth/default.nix
index 9dde1da868d..e48ac612b32 100644
--- a/pkgs/games/dxx-rebirth/default.nix
+++ b/pkgs/games/dxx-rebirth/default.nix
@@ -37,7 +37,7 @@ in stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  hardeningDisable = [ "format" ];
+  NIX_CFLAGS_COMPILE = "-Wno-format-nonliteral";
 
   buildPhase = ''
     runHook preBuild
-- 
GitLab


From 05bc5fed288666126fd5394657c5ef065cbd9710 Mon Sep 17 00:00:00 2001
From: Izorkin <Izorkin@gmail.com>
Date: Thu, 17 May 2018 18:03:11 +0300
Subject: [PATCH 236/297] ssh: custom config key types

---
 nixos/modules/programs/ssh.nix | 28 +++++++++++++++++++++++++---
 1 file changed, 25 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/programs/ssh.nix b/nixos/modules/programs/ssh.nix
index 36289080a82..7a48624fd2a 100644
--- a/nixos/modules/programs/ssh.nix
+++ b/nixos/modules/programs/ssh.nix
@@ -62,6 +62,29 @@ in
         '';
       };
 
+      # Allow DSA keys for now. (These were deprecated in OpenSSH 7.0.)
+      pubkeyAcceptedKeyTypes = mkOption {
+        type = types.listOf types.str;
+        default = [
+          "+ssh-dss"
+        ];
+        example = [ "ssh-ed25519" "ssh-rsa" ];
+        description = ''
+          Specifies the key types that will be used for public key authentication.
+        '';
+      };
+
+      hostKeyAlgorithms = mkOption {
+        type = types.listOf types.str;
+        default = [
+          "+ssh-dss"
+        ];
+        example = [ "ssh-ed25519" "ssh-rsa" ];
+        description = ''
+          Specifies the host key algorithms that the client wants to use in order of preference.
+        '';
+      };
+
       extraConfig = mkOption {
         type = types.lines;
         default = "";
@@ -189,9 +212,8 @@ in
 
         ForwardX11 ${if cfg.forwardX11 then "yes" else "no"}
 
-        # Allow DSA keys for now. (These were deprecated in OpenSSH 7.0.)
-        PubkeyAcceptedKeyTypes +ssh-dss
-        HostKeyAlgorithms +ssh-dss
+        PubkeyAcceptedKeyTypes ${concatStringsSep "," cfg.pubkeyAcceptedKeyTypes}
+        HostKeyAlgorithms ${concatStringsSep "," cfg.hostKeyAlgorithms}
 
         ${cfg.extraConfig}
       '';
-- 
GitLab


From c89bdf970430eac9b62ea604593f9af5136d9d69 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Sat, 21 Jul 2018 11:26:45 +0200
Subject: [PATCH 237/297] signal-desktop: 1.14.3 -> 1.14.4

---
 .../networking/instant-messengers/signal-desktop/default.nix  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
index a8574680186..f38d0d53c6f 100644
--- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
@@ -40,11 +40,11 @@ let
 
 in stdenv.mkDerivation rec {
   name = "signal-desktop-${version}";
-  version = "1.14.3";
+  version = "1.14.4";
 
   src = fetchurl {
     url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
-    sha256 = "1z8z32d7ic28zg4mgk3cjmzb6kpism7xzym2ng25b0ndf72g1vfi";
+    sha256 = "0590r7748kv6g7zygq95v8qxf7vi2n5ypj6734x9yshrn8z6p8lr";
   };
 
   phases = [ "unpackPhase" "installPhase" ];
-- 
GitLab


From 3572f89bbe154087d8ad83c36674d0c2499c0967 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Sat, 21 Jul 2018 12:26:53 +0200
Subject: [PATCH 238/297] ssh: don't add empty
 PubkeyAcceptedKeyTypes/HostKeyAlgorithms

The options introduced in e2444a433fb would generate a broken
ssh config when set to an empty list.

/etc/ssh/ssh_config line 7: Missing argument.
---
 nixos/modules/programs/ssh.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/programs/ssh.nix b/nixos/modules/programs/ssh.nix
index db44f9040dd..0f7f0515f0e 100644
--- a/nixos/modules/programs/ssh.nix
+++ b/nixos/modules/programs/ssh.nix
@@ -211,8 +211,8 @@ in
 
         ForwardX11 ${if cfg.forwardX11 then "yes" else "no"}
 
-        PubkeyAcceptedKeyTypes ${concatStringsSep "," cfg.pubkeyAcceptedKeyTypes}
-        HostKeyAlgorithms ${concatStringsSep "," cfg.hostKeyAlgorithms}
+        ${optionalString (cfg.pubkeyAcceptedKeyTypes != []) PubkeyAcceptedKeyTypes "${concatStringsSep "," cfg.pubkeyAcceptedKeyTypes}"}
+        ${optionalString (cfg.hostKeyAlgorithms != []) HostKeyAlgorithms "${concatStringsSep "," cfg.hostKeyAlgorithms}"}
 
         ${cfg.extraConfig}
       '';
-- 
GitLab


From 07eb9736f0958582411d1c866c34f24f55827801 Mon Sep 17 00:00:00 2001
From: Michael Fellinger <michael.fellinger@xing.com>
Date: Sat, 21 Jul 2018 12:30:02 +0200
Subject: [PATCH 239/297] gotools: 2017-08-08 -> 2018-07-20

---
 pkgs/development/tools/gotools/default.nix | 10 +++++-----
 pkgs/development/tools/gotools/deps.nix    |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/tools/gotools/default.nix b/pkgs/development/tools/gotools/default.nix
index e9a7e7ac891..4c4efa83d6b 100644
--- a/pkgs/development/tools/gotools/default.nix
+++ b/pkgs/development/tools/gotools/default.nix
@@ -1,9 +1,9 @@
-{ stdenv, lib, go, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+{ stdenv, lib, go, buildGoPackage, fetchgit }:
 
 buildGoPackage rec {
-  name = "gotools-${version}";
-  version = "20170807-${stdenv.lib.strings.substring 0 7 rev}";
-  rev = "5d2fd3ccab986d52112bf301d47a819783339d0e";
+  name = "gotools-unstable-${version}";
+  version = "2018-07-20";
+  rev = "be728107ea8275e6f58ba07e246b94181acaab24";
 
   goPackagePath = "golang.org/x/tools";
   goPackageAliases = [ "code.google.com/p/go.tools" ];
@@ -11,7 +11,7 @@ buildGoPackage rec {
   src = fetchgit {
     inherit rev;
     url = "https://go.googlesource.com/tools";
-    sha256 = "0r3fp7na6pg0bc5xfycjvv951f0vma1qfnpw5zy6l75yxm5r47kn";
+    sha256 = "1vkc87qcnfybfcgq9kbwbwzvvzrwm6ar25q5i8z3q26b8dpaxmlw";
   };
 
   goDeps = ./deps.nix;
diff --git a/pkgs/development/tools/gotools/deps.nix b/pkgs/development/tools/gotools/deps.nix
index d4be771e8d6..e85fb120101 100644
--- a/pkgs/development/tools/gotools/deps.nix
+++ b/pkgs/development/tools/gotools/deps.nix
@@ -4,8 +4,8 @@
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/net";
-      rev = "62ac18b461605b4be188bbc7300e9aa2bc836cd4";
-      sha256 = "0lwwvbbwbf3yshxkfhn6z20gd45dkvnmw2ms36diiy34krgy402p";
+      rev = "0ed95abb35c445290478a5348a7b38bb154135fd";
+      sha256 = "1v7yhcgqj0fy7rsliijw2iwmvyd85hqshrhh2n083x62kw9n9nsl";
     };
   }
 ]
-- 
GitLab


From 9d724038141f0ff649ae5089d9692939376b4853 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Sat, 21 Jul 2018 13:06:16 +0200
Subject: [PATCH 240/297] ssh: fix 3572f89bbe154087d8ad83c36674d0c2499c0967

---
 nixos/modules/programs/ssh.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/programs/ssh.nix b/nixos/modules/programs/ssh.nix
index 0f7f0515f0e..cc398174e6c 100644
--- a/nixos/modules/programs/ssh.nix
+++ b/nixos/modules/programs/ssh.nix
@@ -211,8 +211,8 @@ in
 
         ForwardX11 ${if cfg.forwardX11 then "yes" else "no"}
 
-        ${optionalString (cfg.pubkeyAcceptedKeyTypes != []) PubkeyAcceptedKeyTypes "${concatStringsSep "," cfg.pubkeyAcceptedKeyTypes}"}
-        ${optionalString (cfg.hostKeyAlgorithms != []) HostKeyAlgorithms "${concatStringsSep "," cfg.hostKeyAlgorithms}"}
+        ${optionalString (cfg.pubkeyAcceptedKeyTypes != []) "PubkeyAcceptedKeyTypes ${concatStringsSep "," cfg.pubkeyAcceptedKeyTypes}"}
+        ${optionalString (cfg.hostKeyAlgorithms != []) "HostKeyAlgorithms ${concatStringsSep "," cfg.hostKeyAlgorithms}"}
 
         ${cfg.extraConfig}
       '';
-- 
GitLab


From 8cf22dea82dbd1aaed625a3d6b6b9aab19341c5c Mon Sep 17 00:00:00 2001
From: Michishige Kaito <me@mkaito.com>
Date: Sat, 21 Jul 2018 12:49:06 +0100
Subject: [PATCH 241/297] gopass: 1.8.1 -> 1.8.2

---
 pkgs/tools/security/gopass/default.nix | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/security/gopass/default.nix b/pkgs/tools/security/gopass/default.nix
index 25102fd0730..88b15ebf43f 100644
--- a/pkgs/tools/security/gopass/default.nix
+++ b/pkgs/tools/security/gopass/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub, git, gnupg, xclip, makeWrapper }:
 
 buildGoPackage rec {
-  version = "1.8.1";
+  version = "1.8.2";
   name = "gopass-${version}";
 
   goPackagePath = "github.com/gopasspw/gopass";
@@ -12,7 +12,7 @@ buildGoPackage rec {
     owner = "gopasspw";
     repo = "gopass";
     rev = "v${version}";
-    sha256 = "1b3caydxz3zf1ky6qvkx0dgidlalvpmga6cjh3gqc269n00lwh6w";
+    sha256 = "0a2nnm3liilp2jcsvgyp87cjw92gspcc3azaszfvx125l63r4c9f";
   };
 
   wrapperPath = with stdenv.lib; makeBinPath ([
@@ -26,9 +26,6 @@ buildGoPackage rec {
       $bin/share/bash-completion/completions \
       $bin/share/zsh/site-functions \
       $bin/share/fish/vendor_completions.d
-    # by default, gopass tries to write configuration to /homeless-shelter
-    # during startup, which lands in stdout
-    export GOPASS_CONFIG=/dev/null
     $bin/bin/gopass completion bash > $bin/share/bash-completion/completions/_gopass
     $bin/bin/gopass completion zsh  > $bin/share/zsh/site-functions/_gopass
     $bin/bin/gopass completion fish > $bin/share/fish/vendor_completions.d/gopass.fish
-- 
GitLab


From d7cce082b09f0a740d867e6ea34ba7b330e94f0c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Sat, 21 Jul 2018 15:34:08 +0200
Subject: [PATCH 242/297] remove unused file

---
 .../python-modules/dateutil/1_5.nix           | 20 -------------------
 1 file changed, 20 deletions(-)
 delete mode 100644 pkgs/development/python-modules/dateutil/1_5.nix

diff --git a/pkgs/development/python-modules/dateutil/1_5.nix b/pkgs/development/python-modules/dateutil/1_5.nix
deleted file mode 100644
index 0808cf4f201..00000000000
--- a/pkgs/development/python-modules/dateutil/1_5.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ stdenv, buildPythonPackage, fetchPypi, isPy3k, six }:
-
-buildPythonPackage rec {
-  pname = "python-dateutil";
-  version = "2.7.3";
-  disabled = isPy3k;
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "e27001de32f627c22380a688bcc43ce83504a7bc5da472209b4c70f02829f0b8";
-  };
-
-  propagatedBuildInputs = [ six ];
-
-  meta = with stdenv.lib; {
-    description = "Powerful extensions to the standard datetime module";
-    homepage = https://pypi.python.org/pypi/python-dateutil;
-    license = "BSD-style";
-  };
-}
-- 
GitLab


From 1e41fc8ded01e5b6c6281df1f3aa400f91ae92ad Mon Sep 17 00:00:00 2001
From: Matthew Bauer <matthew.bauer@obsidian.systems>
Date: Fri, 20 Jul 2018 13:55:21 -0400
Subject: [PATCH 243/297] dejavu-fonts: supports everything

the .ttf file is cross platform.
---
 pkgs/data/fonts/dejavu-fonts/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/data/fonts/dejavu-fonts/default.nix b/pkgs/data/fonts/dejavu-fonts/default.nix
index 251654e2d58..fa877ea6ed5 100644
--- a/pkgs/data/fonts/dejavu-fonts/default.nix
+++ b/pkgs/data/fonts/dejavu-fonts/default.nix
@@ -20,7 +20,7 @@ let
     # See http://dejavu-fonts.org/wiki/License for details
     license = stdenv.lib.licenses.free;
 
-    platforms = stdenv.lib.platforms.unix;
+    platforms = stdenv.lib.platforms.all;
   };
 
   full-ttf = stdenv.mkDerivation {
-- 
GitLab


From 92daacc9b041cf8aff5c03857b9d9d9f46052df5 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <matthew.bauer@obsidian.systems>
Date: Fri, 20 Jul 2018 13:56:15 -0400
Subject: [PATCH 244/297] libxml2: support all platforms

Mingw/Windows support works out of the box.
---
 pkgs/development/libraries/libxml2/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix
index 8a3d7abdfa5..ce696bca11b 100644
--- a/pkgs/development/libraries/libxml2/default.nix
+++ b/pkgs/development/libraries/libxml2/default.nix
@@ -70,7 +70,7 @@ in stdenv.mkDerivation rec {
     homepage = http://xmlsoft.org/;
     description = "An XML parsing library for C";
     license = lib.licenses.mit;
-    platforms = lib.platforms.unix;
+    platforms = lib.platforms.all;
     maintainers = [ lib.maintainers.eelco ];
   };
 }
-- 
GitLab


From ef087554d0fad9f8e20d9c071976ce0fd273d37a Mon Sep 17 00:00:00 2001
From: Matthew Bauer <matthew.bauer@obsidian.systems>
Date: Fri, 20 Jul 2018 13:57:16 -0400
Subject: [PATCH 245/297] libxslt: runs on all platforms

Mingw/Windows support works out of the box.
---
 pkgs/development/libraries/libxslt/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/libxslt/default.nix b/pkgs/development/libraries/libxslt/default.nix
index 1bb90ee195d..a6cba986769 100644
--- a/pkgs/development/libraries/libxslt/default.nix
+++ b/pkgs/development/libraries/libxslt/default.nix
@@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
     homepage = http://xmlsoft.org/XSLT/;
     description = "A C library and tools to do XSL transformations";
     license = licenses.mit;
-    platforms = platforms.unix;
+    platforms = platforms.all;
     maintainers = [ maintainers.eelco ];
   };
 }
-- 
GitLab


From 02f7053629753efa9b59b9bc52c044d3e9d28d48 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 21 Jul 2018 10:01:50 +0200
Subject: [PATCH 246/297] hackage2nix: disable
 reflex-dom-fragment-shader-canvas

The package depends on broken webkit and doesn't evaluate.
---
 pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index f50b02a7a95..e16ef73734b 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -2581,6 +2581,7 @@ dont-distribute-packages:
   passman-core:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   reflex-dom-colonnade:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   reflex-dom-contrib:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  reflex-dom-fragment-shader-canvas:            [ i686-linux, x86_64-linux, x86_64-darwin ]
   reflex-dom-helpers:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   reflex-dom:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   reflex-jsx:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-- 
GitLab


From aa9b50ccf33cb6ff69f8335fd6fb4d34253bef50 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 20 Jul 2018 09:25:07 +0200
Subject: [PATCH 247/297] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.10.1-5-gfad2fe7 from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/43ea4ff82a7c664ea817667f7d21caaa504fbfdb.
---
 .../haskell-modules/hackage-packages.nix      | 1001 +++++++++++++----
 1 file changed, 774 insertions(+), 227 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 5816f295e0d..1587e1df690 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -758,6 +758,50 @@ self: {
        maintainers = with stdenv.lib.maintainers; [ abbradar ];
      }) {inherit (pkgs) emacs;};
 
+  "Agda_2_5_4_1" = callPackage
+    ({ mkDerivation, alex, array, async, base, binary, blaze-html
+     , boxes, bytestring, Cabal, containers, cpphs, data-hash, deepseq
+     , directory, EdisonCore, edit-distance, emacs, equivalence
+     , filemanip, filepath, geniplate-mirror, gitrev, happy, hashable
+     , hashtables, haskeline, ieee754, mtl, murmur-hash, pretty, process
+     , regex-tdfa, stm, strict, template-haskell, text, time
+     , transformers, unordered-containers, uri-encode, zlib
+     }:
+     mkDerivation {
+       pname = "Agda";
+       version = "2.5.4.1";
+       sha256 = "0bxpibsk98n9xp42d92ma5vj2fam8rsnl61fbhr3askfjdvalnbp";
+       isLibrary = true;
+       isExecutable = true;
+       enableSeparateDataOutput = true;
+       setupHaskellDepends = [ base Cabal filemanip filepath process ];
+       libraryHaskellDepends = [
+         array async base binary blaze-html boxes bytestring containers
+         data-hash deepseq directory EdisonCore edit-distance equivalence
+         filepath geniplate-mirror gitrev hashable hashtables haskeline
+         ieee754 mtl murmur-hash pretty process regex-tdfa stm strict
+         template-haskell text time transformers unordered-containers
+         uri-encode zlib
+       ];
+       libraryToolDepends = [ alex cpphs happy ];
+       executableHaskellDepends = [ base directory filepath process ];
+       executableToolDepends = [ emacs ];
+       postInstall = ''
+         files=("$data/share/ghc-"*"/"*"-ghc-"*"/Agda-"*"/lib/prim/Agda/"{Primitive.agda,Builtin"/"*.agda})
+         for f in "''${files[@]}" ; do
+           $out/bin/agda $f
+         done
+         for f in "''${files[@]}" ; do
+           $out/bin/agda -c --no-main $f
+         done
+         $out/bin/agda-mode compile
+       '';
+       description = "A dependently typed functional programming language and proof assistant";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       maintainers = with stdenv.lib.maintainers; [ abbradar ];
+     }) {inherit (pkgs) emacs;};
+
   "Agda-executable" = callPackage
     ({ mkDerivation, Agda, base }:
      mkDerivation {
@@ -10626,6 +10670,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "JuicyPixels-extra_0_4_0" = callPackage
+    ({ mkDerivation, base, criterion, hspec, hspec-discover
+     , JuicyPixels
+     }:
+     mkDerivation {
+       pname = "JuicyPixels-extra";
+       version = "0.4.0";
+       sha256 = "19lc2s80ww1pw2dy2vidrl14lhdvs3ji855l893p7p0sa23gkgqc";
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [ base JuicyPixels ];
+       testHaskellDepends = [ base hspec JuicyPixels ];
+       testToolDepends = [ hspec-discover ];
+       benchmarkHaskellDepends = [ base criterion JuicyPixels ];
+       description = "Efficiently scale, crop, flip images with JuicyPixels";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "JuicyPixels-repa" = callPackage
     ({ mkDerivation, base, bytestring, JuicyPixels, repa, vector }:
      mkDerivation {
@@ -18744,12 +18806,15 @@ self: {
      }) {};
 
   "Win32-errors" = callPackage
-    ({ mkDerivation, base, template-haskell, text, Win32 }:
+    ({ mkDerivation, base, hspec, QuickCheck, template-haskell, text
+     , Win32
+     }:
      mkDerivation {
        pname = "Win32-errors";
-       version = "0.2.2.1";
-       sha256 = "1v7gm7vll1lq6d7d0y8vza7ilcw6i95jkprhy906awhqlhv3z031";
+       version = "0.2.2.3";
+       sha256 = "1glcaykk6ylmmsqxw4jfhrdnw5dg4syxc4v77q13wxsbzzrz3yn6";
        libraryHaskellDepends = [ base template-haskell text Win32 ];
+       testHaskellDepends = [ base hspec QuickCheck Win32 ];
        description = "Alternative error handling for Win32 foreign calls";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -22025,6 +22090,29 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "aeson-typescript_0_1_1_0" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, containers, directory
+     , filepath, hspec, interpolate, mtl, process, template-haskell
+     , temporary, text, th-abstraction, unordered-containers
+     }:
+     mkDerivation {
+       pname = "aeson-typescript";
+       version = "0.1.1.0";
+       sha256 = "0sx4gavp0pvnxlxwix1di34vm2bfi5d02mzgzs402grqhh1v38vp";
+       libraryHaskellDepends = [
+         aeson base containers interpolate mtl template-haskell text
+         th-abstraction unordered-containers
+       ];
+       testHaskellDepends = [
+         aeson base bytestring containers directory filepath hspec
+         interpolate mtl process template-haskell temporary text
+         th-abstraction unordered-containers
+       ];
+       description = "Generate TypeScript definition files from your ADTs";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "aeson-utils" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, scientific
      , text
@@ -29613,8 +29701,8 @@ self: {
      }:
      mkDerivation {
        pname = "ats-pkg";
-       version = "3.0.0.2";
-       sha256 = "0sv7xgmipb9cqyiry5mp0fr6abr7r45167ifq7sa518gz7a2a7ax";
+       version = "3.0.0.4";
+       sha256 = "0ynh8f0fn7fhpvslb5y5hl6kwcdycm15b3qfcr4x98yz71hk373s";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -40604,10 +40692,8 @@ self: {
      }:
      mkDerivation {
        pname = "cabal-plan";
-       version = "0.3.0.0";
-       sha256 = "1axi3a60zq08d760w2x6akmszad599kij0r8zmlq8pin9mmmggls";
-       revision = "1";
-       editedCabalFile = "1xdmji5y2ssj8pgp0d78m8a5hd3swy2flhiaf1v9qb69502j8lwq";
+       version = "0.4.0.0";
+       sha256 = "0cbk0xhv189jv656x6a2s0bcnhkks4rlpkhvxbb215v5ldmrkpb1";
        configureFlags = [ "-fexe" ];
        isLibrary = true;
        isExecutable = true;
@@ -40616,7 +40702,7 @@ self: {
          containers directory filepath text vector
        ];
        executableHaskellDepends = [
-         ansi-terminal base base-compat bytestring containers mtl
+         ansi-terminal base base-compat bytestring containers directory mtl
          optparse-applicative parsec text vector
        ];
        doHaddock = false;
@@ -40983,14 +41069,14 @@ self: {
        maintainers = with stdenv.lib.maintainers; [ peti ];
      }) {};
 
-  "cabal2spec_2_2_0" = callPackage
+  "cabal2spec_2_2_1" = callPackage
     ({ mkDerivation, base, Cabal, filepath, optparse-applicative, tasty
      , tasty-golden, time
      }:
      mkDerivation {
        pname = "cabal2spec";
-       version = "2.2.0";
-       sha256 = "0pcai2ikp6gna1h60dihclq7apj9jczwz4n0lnfc9fr176gzsprp";
+       version = "2.2.1";
+       sha256 = "1j4y942r2v1s9cvvgnpjckl7s9bmpby1w4z4gffpbfirrc2h1nq6";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base Cabal filepath time ];
@@ -43076,6 +43162,8 @@ self: {
        pname = "cborg";
        version = "0.2.0.0";
        sha256 = "1dvzqzk68ym1v1gxrx8kc59hj4jd2l0c8f2bqf67jgm5ld0bv340";
+       revision = "2";
+       editedCabalFile = "1fim6qbzimff8hpzv6bw558pzkh65cql8gdjinghc7w9c5my6y7l";
        libraryHaskellDepends = [
          array base bytestring containers ghc-prim half integer-gmp
          primitive text
@@ -47342,15 +47430,16 @@ self: {
 
   "codeworld-api" = callPackage
     ({ mkDerivation, base, blank-canvas, cereal, cereal-text
-     , containers, hashable, mtl, random, random-shuffle, text, time
+     , containers, ghc-prim, hashable, mtl, random, random-shuffle, text
+     , time
      }:
      mkDerivation {
        pname = "codeworld-api";
-       version = "0.2.4";
-       sha256 = "17rpm9414fbwzxnpdvp67zlv6sl7ymkflgbbb50nhq7vv9z69dbc";
+       version = "0.2.5";
+       sha256 = "0gc1c0hc2sssiksii927kcg5rhalrw1fv3sr4zf4xvzj3nrd0k3m";
        libraryHaskellDepends = [
-         base blank-canvas cereal cereal-text containers hashable mtl random
-         random-shuffle text time
+         base blank-canvas cereal cereal-text containers ghc-prim hashable
+         mtl random random-shuffle text time
        ];
        description = "Graphics library for CodeWorld";
        license = stdenv.lib.licenses.asl20;
@@ -50048,6 +50137,8 @@ self: {
        pname = "conduit-parse";
        version = "0.2.1.0";
        sha256 = "1qfs61qhbr5gc0ch0mmqcqdm4wvs5pkx2z6rki588fhy1kfdp1dm";
+       revision = "1";
+       editedCabalFile = "1bgxjn9lbx67584xpwl2k9jrwvlgyqf4vkv0s7vs1nnc1h6qk7qw";
        libraryHaskellDepends = [
          base conduit dlist mtl parsers safe safe-exceptions text
          transformers
@@ -50163,10 +50254,8 @@ self: {
      }:
      mkDerivation {
        pname = "conf-json";
-       version = "1.1";
-       sha256 = "0jgyl56fgs506x4s28g14s08lcfnn6k4wh39j73cl576mlghr1rx";
-       revision = "6";
-       editedCabalFile = "1dyvz8jczzhr62s5cqr7gc4qd826nwgxkij0k41pfipw6jz0sc4f";
+       version = "1.2";
+       sha256 = "1j0m0zl1a7rkwczz58322kwsd9dzgwz2ia2q8l9h42ln239q0fbs";
        libraryHaskellDepends = [ aeson base bytestring directory ];
        testHaskellDepends = [
          aeson base binary bytestring directory hspec QuickCheck
@@ -52714,8 +52803,8 @@ self: {
     ({ mkDerivation, base, data-binary-ieee754, FloatingHex, ieee754 }:
      mkDerivation {
        pname = "crackNum";
-       version = "2.0";
-       sha256 = "1wi2k7yrm9z3n1b6vnw5zc3yj4k8drhap7fm2hk1z98wih4qppzp";
+       version = "2.1";
+       sha256 = "10z192nd9ik4ry0bjmkdpyvys75h3xz106588z8m1ix7caf1208a";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -56829,6 +56918,33 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "data-msgpack_0_0_12" = callPackage
+    ({ mkDerivation, base, binary, bytestring, containers, criterion
+     , data-binary-ieee754, data-msgpack-types, deepseq, groom, hashable
+     , hspec, QuickCheck, text, unordered-containers, vector, void
+     }:
+     mkDerivation {
+       pname = "data-msgpack";
+       version = "0.0.12";
+       sha256 = "11zlw465lpa371y7cpz9r4gn1c4cw0rjrpl5l3h6h0y3zc28p7sw";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base binary bytestring data-binary-ieee754 data-msgpack-types text
+       ];
+       executableHaskellDepends = [ base bytestring groom ];
+       testHaskellDepends = [
+         base bytestring containers data-msgpack-types hashable hspec
+         QuickCheck text unordered-containers vector void
+       ];
+       benchmarkHaskellDepends = [
+         base bytestring criterion deepseq QuickCheck
+       ];
+       description = "A Haskell implementation of MessagePack";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "data-msgpack-types" = callPackage
     ({ mkDerivation, base, bytestring, containers, deepseq, hashable
      , QuickCheck, text, unordered-containers, vector, void
@@ -56845,6 +56961,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "data-msgpack-types_0_0_2" = callPackage
+    ({ mkDerivation, base, bytestring, containers, deepseq, hashable
+     , hspec, QuickCheck, text, unordered-containers, vector, void
+     }:
+     mkDerivation {
+       pname = "data-msgpack-types";
+       version = "0.0.2";
+       sha256 = "19c7285mrs9d1afgpdq4cprv44fif76ahahg3xpzijc5lhgxmzal";
+       libraryHaskellDepends = [
+         base bytestring containers deepseq hashable QuickCheck text
+         unordered-containers vector void
+       ];
+       testHaskellDepends = [ base hspec QuickCheck ];
+       description = "A Haskell implementation of MessagePack";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "data-named" = callPackage
     ({ mkDerivation, attoparsec, base, binary, containers, text }:
      mkDerivation {
@@ -58926,8 +59060,8 @@ self: {
     ({ mkDerivation, base, containers, foldl }:
      mkDerivation {
        pname = "deferred-folds";
-       version = "0.6";
-       sha256 = "1qp99fbx14y49lsh269jdc5mazz30rqwr1if3gc1qn4m5d8dsqir";
+       version = "0.6.3";
+       sha256 = "1b020879qdbh08pzgxwj5y7fk31n071crbcs9601j7fxj4a1i0hq";
        libraryHaskellDepends = [ base containers foldl ];
        description = "Abstractions over deferred folds";
        license = stdenv.lib.licenses.mit;
@@ -62830,8 +62964,8 @@ self: {
      }:
      mkDerivation {
        pname = "distribution-opensuse";
-       version = "1.0.0";
-       sha256 = "0zy0whx8badksaqqkswslrgrz57mpx3pfjjhrqrvn7088anwb7rr";
+       version = "1.1.0";
+       sha256 = "1spqr4ygxhdgmy17cmwx1z4r1czlf85hd6yk9zpwpj9py9v5b0g2";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -62839,6 +62973,7 @@ self: {
          hashable hsemail mtl parsec-class pretty text time turtle
        ];
        executableHaskellDepends = [ base containers text turtle ];
+       testHaskellDepends = [ base ];
        description = "Types, functions, and tools to manipulate the openSUSE distribution";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -64344,18 +64479,12 @@ self: {
      }) {};
 
   "drinkery" = callPackage
-    ({ mkDerivation, base, conduit, conduit-combinators, exceptions
-     , gauge, list-t, ListT, machines, mtl, pipes, transformers
-     }:
+    ({ mkDerivation, base, exceptions, mtl, transformers }:
      mkDerivation {
        pname = "drinkery";
-       version = "0.3";
-       sha256 = "10iiffxnmc5hgsa4c5m59zxbz80b3cpddv6293jiw2vxpfq2f7w4";
+       version = "0.4";
+       sha256 = "1c5mv0klhdavbsaa1mng0q15vy0cz6x8ijfzgaf1f18yyxvb0q1q";
        libraryHaskellDepends = [ base exceptions mtl transformers ];
-       benchmarkHaskellDepends = [
-         base conduit conduit-combinators exceptions gauge list-t ListT
-         machines mtl pipes transformers
-       ];
        description = "Boozy streaming library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -64724,6 +64853,8 @@ self: {
        pname = "dublincore-xml-conduit";
        version = "0.1.0.2";
        sha256 = "17jzyj49j88xwsz54higi81a6v8kvb8i338n5416z1ni475qsynl";
+       revision = "1";
+       editedCabalFile = "1rljgmi4jb6yhigfy394jb64q5f5qx7i1g68pw6zgq9ziz91p321";
        libraryHaskellDepends = [
          base conduit conduit-combinators safe-exceptions text time timerep
          uri-bytestring xml-conduit xml-types
@@ -65893,9 +66024,11 @@ self: {
      }:
      mkDerivation {
        pname = "edit";
-       version = "0.0.1.1";
-       sha256 = "0smxb6v4n83b09dyaj388hhi7kx1ca6axg60q3adnixy13a284lz";
-       libraryHaskellDepends = [ base deepseq transformers ];
+       version = "1.0.0.0";
+       sha256 = "0p93j90f40ckg5n9d8hnsbd5qsi00c28cpdrczgihk81hjgflnkd";
+       libraryHaskellDepends = [
+         base comonad deepseq QuickCheck transformers
+       ];
        testHaskellDepends = [
          base comonad doctest QuickCheck tasty tasty-discover
          tasty-quickcheck uniplate
@@ -67194,8 +67327,8 @@ self: {
      }:
      mkDerivation {
        pname = "email-header";
-       version = "0.4.0";
-       sha256 = "0lmdb8s29w5wbrwsfcn43z354ms3xblffprgvg22rb16ny1410hn";
+       version = "0.4.1";
+       sha256 = "14xs001ab0p2y6f9hl9lw8bwd4fcg23y5ia3wfcafn6893pbb5f6";
        libraryHaskellDepends = [
          attoparsec base base64-bytestring bytestring case-insensitive
          containers exceptions text text-icu time
@@ -69120,6 +69253,8 @@ self: {
        pname = "euler-tour-tree";
        version = "0.1.0.1";
        sha256 = "12fxs5992rlfg91xxh2sahm2vykcjcjc30iwzkfm894qrk4flbz4";
+       revision = "1";
+       editedCabalFile = "033v38mr81pr81gb5wksi7bgpm1wrvcgck893dk1ymq4w6ifa2m6";
        libraryHaskellDepends = [
          base containers fingertree mtl parser-combinators transformers
          Unique
@@ -71856,6 +71991,39 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "fcm-client" = callPackage
+    ({ mkDerivation, aeson, aeson-casing, async, base, bytestring
+     , conduit, conduit-extra, containers, data-default-class
+     , http-client, http-conduit, http-types, HUnit, lens
+     , optparse-applicative, QuickCheck, resourcet, retry, scientific
+     , stm-conduit, test-framework, test-framework-hunit
+     , test-framework-quickcheck2, text, time, utf8-string
+     }:
+     mkDerivation {
+       pname = "fcm-client";
+       version = "0.1.0.0";
+       sha256 = "1qv43pfwgi7d7bx445z3q3zr7szv6y7ky9gb6g7f1chxs4q6mcdl";
+       revision = "1";
+       editedCabalFile = "1rvb99gh2m1j2bd9x6vc58kvkwdcxl5wwypvnj3c62zcqmdln03l";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson aeson-casing base bytestring containers data-default-class
+         http-client http-conduit http-types lens scientific text time
+       ];
+       executableHaskellDepends = [
+         aeson async base bytestring conduit conduit-extra
+         data-default-class http-client http-types lens optparse-applicative
+         resourcet retry stm-conduit text utf8-string
+       ];
+       testHaskellDepends = [
+         aeson base containers data-default-class HUnit lens QuickCheck
+         test-framework test-framework-hunit test-framework-quickcheck2 text
+       ];
+       description = "Admin API for Firebase Cloud Messaging";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "fdo-notify" = callPackage
     ({ mkDerivation, base, containers, dbus }:
      mkDerivation {
@@ -75943,20 +76111,19 @@ self: {
 
   "fraxl" = callPackage
     ({ mkDerivation, async, base, dependent-map, dependent-sum
-     , exceptions, free, mtl, time, transformers, type-aligned
-     , vinyl-plus
+     , exceptions, free, mtl, time, transformers, type-aligned, vinyl
      }:
      mkDerivation {
        pname = "fraxl";
-       version = "0.1.0.0";
-       sha256 = "0q21g7ggdfrl7afkx9g2apx2nzh7fs7fpy63zhjylav16xhycc56";
-       revision = "1";
-       editedCabalFile = "1fjwfiydrw1dga0dy6cwwji4kjzichr6nx7hazkx11r08lqncxzi";
+       version = "0.2.0.1";
+       sha256 = "1k5fcl6d9yxc2773x0vv7z8q1pq3mf6l29icr4yc4wxsxw4l3r7k";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          async base dependent-map dependent-sum exceptions free mtl
-         transformers type-aligned vinyl-plus
+         transformers type-aligned vinyl
        ];
-       testHaskellDepends = [ base mtl time transformers ];
+       benchmarkHaskellDepends = [ base time ];
        description = "Cached and parallel data fetching";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -76639,8 +76806,8 @@ self: {
     ({ mkDerivation, base, bytestring, process, text }:
      mkDerivation {
        pname = "fromhtml";
-       version = "0.1.0.3";
-       sha256 = "1zj811728g1hwpagq7jl1qxppn164vn4b27pxn20151iljipq1va";
+       version = "0.1.0.4";
+       sha256 = "1p1qkidh5wgfgrqqa59zi77rvgphh2wh8ldql4plxq5flh2zszkx";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base bytestring process text ];
@@ -82374,8 +82541,8 @@ self: {
      }:
      mkDerivation {
        pname = "git-annex";
-       version = "6.20180626";
-       sha256 = "0vq3x9p4h3m266pcm2r3m9p51pz5z9zskh7z5nk0adh33j30xf7q";
+       version = "6.20180719";
+       sha256 = "13fbkdf461z4wqvjlzfjp3h17xyy8jb1av4s6jmlg1jl7656q96k";
        configureFlags = [
          "-fassistant" "-fcryptonite" "-fdbus" "-fdesktopnotify" "-fdns"
          "-ffeed" "-finotify" "-fpairing" "-fproduction" "-fquvi" "-f-s3"
@@ -82386,7 +82553,7 @@ self: {
        isExecutable = true;
        setupHaskellDepends = [
          base bytestring Cabal data-default directory exceptions filepath
-         hslogger IfElse process split unix-compat utf8-string
+         hslogger IfElse process split transformers unix-compat utf8-string
        ];
        executableHaskellDepends = [
          aeson async base bloomfilter byteable bytestring case-insensitive
@@ -83445,6 +83612,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "glabrous_0_4_0" = callPackage
+    ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring
+     , cereal, cereal-text, directory, either, hspec, text
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "glabrous";
+       version = "0.4.0";
+       sha256 = "0qja5mdnbgrsdiwqjfwrzzynbybwg5yksvnwgazak0wv2p86i5yh";
+       libraryHaskellDepends = [
+         aeson aeson-pretty attoparsec base bytestring cereal cereal-text
+         either text unordered-containers
+       ];
+       testHaskellDepends = [
+         base directory either hspec text unordered-containers
+       ];
+       description = "A template DSL library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "glade" = callPackage
     ({ mkDerivation, base, Cabal, glib, gtk, gtk2hs-buildtools
      , libglade
@@ -87491,23 +87679,26 @@ self: {
      }) {};
 
   "greenclip" = callPackage
-    ({ mkDerivation, base, binary, classy-prelude, directory, microlens
-     , microlens-mtl, text, unix, utf8-string, vector, X11
+    ({ mkDerivation, base, binary, bytestring, directory, exceptions
+     , hashable, libXau, microlens, microlens-mtl, protolude, text, unix
+     , vector, wordexp, X11, x11, xcb, xdmcp
      }:
      mkDerivation {
        pname = "greenclip";
-       version = "2.0.1";
-       sha256 = "05f146ff9ff4kyaxx92jwb5g0nj0bb2j41hx12b4vjk28vik1x5y";
+       version = "3.0.2";
+       sha256 = "1b1nx2jnwal1fhwh7cq0hv1nrwc2hzzh96yab6cpv0r8bm34qxs7";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
-         base binary classy-prelude directory microlens microlens-mtl text
-         unix utf8-string vector X11
+         base binary bytestring directory exceptions hashable microlens
+         microlens-mtl protolude text unix vector wordexp X11
        ];
+       executablePkgconfigDepends = [ libXau x11 xcb xdmcp ];
        description = "Simple clipboard manager to be integrated with rofi";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
+     }) {inherit (pkgs.xorg) libXau; inherit (pkgs) x11; xcb = null; 
+         xdmcp = null;};
 
   "greg-client" = callPackage
     ({ mkDerivation, base, binary, bytestring, clock, hostname, network
@@ -90640,8 +90831,8 @@ self: {
      }:
      mkDerivation {
        pname = "hadolint";
-       version = "1.10.3";
-       sha256 = "00khz032sy78z5rr36d20zj4grbbqkf1rk1x8m0nf05ca6gfwjbj";
+       version = "1.10.4";
+       sha256 = "09sczm8l93lmkjz0c5l9al9jp8jpqcmk2zbxbbbq4g2jrsb3v30y";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -96656,8 +96847,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskus-binary";
-       version = "0.6.0.0";
-       sha256 = "0r0np4kdvyfslgjqs983dzv4xi5s62splahn2ra55qjbm8lpmps0";
+       version = "1.0";
+       sha256 = "1gw08zx7mqhi6n0wx6s6n4fvw5ambbdxnahr3r3p22yfqnqcp4y2";
        libraryHaskellDepends = [
          base bytestring cereal haskus-utils mtl
        ];
@@ -96671,19 +96862,19 @@ self: {
      }) {};
 
   "haskus-system-build" = callPackage
-    ({ mkDerivation, base, directory, filepath, hashable, haskus-utils
-     , optparse-applicative, optparse-simple, process, simple-download
-     , temporary, text, yaml
+    ({ mkDerivation, base, conduit, directory, filepath, hashable
+     , haskus-utils, http-conduit, optparse-applicative, optparse-simple
+     , process, temporary, text, yaml
      }:
      mkDerivation {
        pname = "haskus-system-build";
-       version = "0.7.0.0";
-       sha256 = "1wfl4n7manfwgwjccvrsfwjb3la7sjg1zpzgj8v6r5sv2zdyl86g";
+       version = "1.0";
+       sha256 = "1xzl5f8wilmdq9bg37zzdcv59cqp8kxnhbm6fd8pzqnj8w1pkwdk";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
-         base directory filepath hashable haskus-utils optparse-applicative
-         optparse-simple process simple-download temporary text yaml
+         base conduit directory filepath hashable haskus-utils http-conduit
+         optparse-applicative optparse-simple process temporary text yaml
        ];
        description = "Haskus system build tool";
        license = stdenv.lib.licenses.bsd3;
@@ -96691,17 +96882,20 @@ self: {
      }) {};
 
   "haskus-utils" = callPackage
-    ({ mkDerivation, base, containers, extra, file-embed, list-t, mtl
-     , stm, stm-containers, tasty, tasty-quickcheck, template-haskell
-     , transformers, vector
+    ({ mkDerivation, base, containers, extra, file-embed
+     , haskus-utils-data, haskus-utils-types, haskus-utils-variant
+     , list-t, mtl, recursion-schemes, stm, stm-containers, tasty
+     , tasty-quickcheck, template-haskell, transformers, vector
      }:
      mkDerivation {
        pname = "haskus-utils";
-       version = "0.8.0.0";
-       sha256 = "1r2r1198hhv75f4yqcy5crr764dvvj766bgp3v3b5sdl603q8cl3";
+       version = "1.0";
+       sha256 = "1pfjarir86c2sxjh8l0jc7z5acsz8slcwb7imjdxf3dsdiy8swwd";
        libraryHaskellDepends = [
-         base containers extra file-embed list-t mtl stm stm-containers
-         template-haskell transformers vector
+         base containers extra file-embed haskus-utils-data
+         haskus-utils-types haskus-utils-variant list-t mtl
+         recursion-schemes stm stm-containers template-haskell transformers
+         vector
        ];
        testHaskellDepends = [ base tasty tasty-quickcheck ];
        description = "Haskus utility modules";
@@ -96709,6 +96903,46 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "haskus-utils-data" = callPackage
+    ({ mkDerivation, base, containers, extra, haskus-utils-types, mtl
+     , recursion-schemes, transformers
+     }:
+     mkDerivation {
+       pname = "haskus-utils-data";
+       version = "1.0";
+       sha256 = "007ykjinkxr9kdrk7hl81zndpan60b5l51m32nlj2xv2pjm326z4";
+       libraryHaskellDepends = [
+         base containers extra haskus-utils-types mtl recursion-schemes
+         transformers
+       ];
+       description = "Haskus utility modules";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "haskus-utils-types" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "haskus-utils-types";
+       version = "1.0";
+       sha256 = "1rxnaw53vfmi3gv8h7j6vw4y4xxnqzwaaasd6x22fm7fzc5q64vf";
+       libraryHaskellDepends = [ base ];
+       description = "Haskus utility modules";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "haskus-utils-variant" = callPackage
+    ({ mkDerivation, base, haskus-utils-data, haskus-utils-types }:
+     mkDerivation {
+       pname = "haskus-utils-variant";
+       version = "1.0";
+       sha256 = "1kkqngvzifxps0hhp49syh2w4an3y4s4nvp3qbh3p00h9dw3hmsn";
+       libraryHaskellDepends = [
+         base haskus-utils-data haskus-utils-types
+       ];
+       description = "Haskus utility modules";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "haskyapi" = callPackage
     ({ mkDerivation, aeson, base, blaze-html, bytestring, containers
      , directory, http-conduit, markdown, mtl, network, parsec
@@ -97917,6 +98151,8 @@ self: {
        pname = "hbro";
        version = "1.7.0.0";
        sha256 = "0vx3097g9q0bxyv1bwa4mc6aw152zkj3mawk5nrn5mh0zr60c3zh";
+       revision = "1";
+       editedCabalFile = "0slsd0f0qvlh4l6777b8iaskd4ij04193mcjwnq8p7szslxx40q1";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -97946,6 +98182,8 @@ self: {
        pname = "hbro-contrib";
        version = "1.7.0.0";
        sha256 = "024mclr0hrvxdbsw9d051v9dfls2n3amyxlqfzakf11vrkgqqfam";
+       revision = "1";
+       editedCabalFile = "1vfkwzd5rsv0065bldkd90fprp1qspfqg44ip5i4ihnbj4vawv9b";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -100605,34 +100843,38 @@ self: {
      }) {};
 
   "hgeometry" = callPackage
-    ({ mkDerivation, array, base, bifunctors, bytestring, containers
-     , contravariant, criterion, data-clist, deepseq, deepseq-generics
-     , directory, doctest, fixed-vector, Frames, hexpat, hspec, lens
-     , linear, mtl, optparse-applicative, parsec, QuickCheck, random
-     , semigroupoids, semigroups, singletons, template-haskell, text
-     , time, vector, vinyl
+    ({ mkDerivation, aeson, approximate-equality, array, base
+     , bifunctors, bytestring, colour, containers, contravariant
+     , criterion, data-clist, deepseq, deepseq-generics, dlist, doctest
+     , fingertree, fixed-vector, hexpat, hspec, hspec-discover, lens
+     , linear, mtl, optparse-applicative, parsec, QuickCheck
+     , quickcheck-instances, random, reflection, semigroupoids
+     , semigroups, singletons, template-haskell, text, vector, vinyl
+     , yaml
      }:
      mkDerivation {
        pname = "hgeometry";
-       version = "0.6.0.0";
-       sha256 = "1pphbdl5sn6gvm4crshpnfjmf0c8kwfz68hv615hhadp7120x3ij";
-       revision = "1";
-       editedCabalFile = "19j3n0kf7n2n0spyr83gdjngxnfxvyr1sryvhq8jflsxq44d8rdg";
+       version = "0.7.0.0";
+       sha256 = "0c91n42l6pqkdw46snhplvzm8f05x0x5g3b7mgx13ndskcf9vmyz";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
-         base bifunctors bytestring containers contravariant data-clist
-         deepseq directory fixed-vector Frames hexpat lens linear mtl
-         optparse-applicative parsec random semigroupoids semigroups
-         singletons template-haskell text time vector vinyl
+         aeson base bifunctors bytestring colour containers contravariant
+         data-clist deepseq dlist fingertree fixed-vector hexpat lens linear
+         mtl parsec QuickCheck quickcheck-instances random reflection
+         semigroupoids semigroups singletons template-haskell text vector
+         vinyl yaml
        ];
        testHaskellDepends = [
-         array base bytestring containers data-clist doctest Frames hspec
-         lens linear QuickCheck random semigroups vector vinyl
+         approximate-equality array base bytestring colour containers
+         data-clist doctest hspec lens linear QuickCheck
+         quickcheck-instances random semigroups singletons vector vinyl
        ];
+       testToolDepends = [ hspec-discover ];
        benchmarkHaskellDepends = [
-         base criterion deepseq deepseq-generics Frames lens QuickCheck
-         semigroups
+         base bytestring containers criterion deepseq deepseq-generics
+         fixed-vector lens linear optparse-applicative QuickCheck semigroups
        ];
        description = "Geometric Algorithms, Data structures, and Data types";
        license = stdenv.lib.licenses.bsd3;
@@ -103500,21 +103742,19 @@ self: {
      , cryptohash-md5, cryptohash-sha1, cryptohash-sha256
      , cryptohash-sha512, data-fix, deepseq, deriving-compat, Diff
      , directory, exceptions, filepath, generic-random, Glob, hashable
-     , hashing, haskeline, http-client, http-client-tls, http-types
-     , interpolate, lens-family, lens-family-core, lens-family-th
-     , logict, megaparsec, monadlist, mtl, optparse-applicative
-     , pretty-show, process, QuickCheck, quickcheck-instances
-     , regex-tdfa, regex-tdfa-text, repline, scientific, semigroups
-     , serialise, split, syb, tasty, tasty-hunit, tasty-quickcheck
+     , hashing, haskeline, hedgehog, hspec-discover, http-client
+     , http-client-tls, http-types, interpolate, lens-family
+     , lens-family-core, lens-family-th, logict, megaparsec, monadlist
+     , mtl, optparse-applicative, pretty-show, process, regex-tdfa
+     , regex-tdfa-text, repline, scientific, semigroups, serialise
+     , split, syb, tasty, tasty-hedgehog, tasty-hunit, tasty-quickcheck
      , tasty-th, template-haskell, text, these, time, transformers, unix
      , unordered-containers, vector, xml
      }:
      mkDerivation {
        pname = "hnix";
-       version = "0.5.1";
-       sha256 = "1rhbx7ixzg4147j3pcqvfzn1k2b1xcn8428z98cq6ghnrmgss9al";
-       revision = "1";
-       editedCabalFile = "1l8h9zc9mrqvp8hvkfz1g2inq2b95x42gscyfn6qv0jcxwn4sbpr";
+       version = "0.5.2";
+       sha256 = "059l2zqbqi5826qq1dq00vl7f1kfyr0wrs9imsx36yfbr9ac9wqk";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -103522,7 +103762,7 @@ self: {
          containers cryptohash-md5 cryptohash-sha1 cryptohash-sha256
          cryptohash-sha512 data-fix deepseq deriving-compat directory
          exceptions filepath hashable hashing haskeline http-client
-         http-client-tls http-types lens-family lens-family-core
+         http-client-tls http-types interpolate lens-family lens-family-core
          lens-family-th logict megaparsec monadlist mtl optparse-applicative
          pretty-show process regex-tdfa regex-tdfa-text scientific
          semigroups serialise split syb template-haskell text these time
@@ -103539,11 +103779,12 @@ self: {
          ansi-wl-pprint base base16-bytestring bytestring containers
          cryptohash-md5 cryptohash-sha1 cryptohash-sha256 cryptohash-sha512
          data-fix deepseq Diff directory exceptions filepath generic-random
-         Glob hashing interpolate megaparsec mtl optparse-applicative
-         pretty-show process QuickCheck quickcheck-instances serialise split
-         tasty tasty-hunit tasty-quickcheck tasty-th template-haskell text
-         time transformers unix unordered-containers
+         Glob hashing hedgehog interpolate megaparsec mtl
+         optparse-applicative pretty-show process serialise split tasty
+         tasty-hedgehog tasty-hunit tasty-quickcheck tasty-th
+         template-haskell text time transformers unix unordered-containers
        ];
+       testToolDepends = [ hspec-discover ];
        benchmarkHaskellDepends = [
          ansi-wl-pprint base base16-bytestring bytestring containers
          criterion cryptohash-md5 cryptohash-sha1 cryptohash-sha256
@@ -109124,6 +109365,20 @@ self: {
        license = stdenv.lib.licenses.publicDomain;
      }) {};
 
+  "hspec-need-env" = callPackage
+    ({ mkDerivation, base, hspec, hspec-core, hspec-expectations
+     , setenv, transformers
+     }:
+     mkDerivation {
+       pname = "hspec-need-env";
+       version = "0.1.0.0";
+       sha256 = "0ny2qbj5ipa8nsigx70x4mhdv5611fis0dm4j9i82zkxc2l92b9d";
+       libraryHaskellDepends = [ base hspec-core hspec-expectations ];
+       testHaskellDepends = [ base hspec hspec-core setenv transformers ];
+       description = "Read environment variables for hspec tests";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "hspec-pg-transact" = callPackage
     ({ mkDerivation, base, bytestring, hspec, pg-transact
      , postgresql-simple, resource-pool, text, tmp-postgres
@@ -110531,8 +110786,8 @@ self: {
      }:
      mkDerivation {
        pname = "html-parse";
-       version = "0.2.0.1";
-       sha256 = "1v6i9g4l0j8mvi12lqv40k30lpn8bv28pvf6ps0zgjgpb2khfxsw";
+       version = "0.2.0.2";
+       sha256 = "0dm771lrrqc87ygbr3dzyl1vsyi30jgr7l0isvsbqyah7s4zyg38";
        libraryHaskellDepends = [
          attoparsec base containers deepseq text
        ];
@@ -112548,6 +112803,8 @@ self: {
        pname = "hw-dsv";
        version = "0.2.1";
        sha256 = "1kb8dc05dfslpqnjw42qnnxg16xfd2jz17ag9vgmci88rnsanaxv";
+       revision = "1";
+       editedCabalFile = "1di1vdj6c0s0n2zjhjhy8iszlgk29gbh7a46pc4q0hp587avff04";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -112652,10 +112909,25 @@ self: {
        pname = "hw-hedgehog";
        version = "0.1.0.1";
        sha256 = "0fngvmx60a3z1sl798ghvfzya5dgi1mfln8p1vkqapcgfjh7w5r6";
+       revision = "1";
+       editedCabalFile = "0a5qlh5dwsnv14ngimbsvpgxx4hf0c0wdi5yfv7afwj9h2afdpfz";
+       libraryHaskellDepends = [ base hedgehog vector ];
+       testHaskellDepends = [ base ];
+       description = "Extra hedgehog functionality";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "hw-hedgehog_0_1_0_2" = callPackage
+    ({ mkDerivation, base, hedgehog, vector }:
+     mkDerivation {
+       pname = "hw-hedgehog";
+       version = "0.1.0.2";
+       sha256 = "0fk5qgn011j7cb75xi434vk0vq4bl8w9lrs6hpf45c8mv4c48vby";
        libraryHaskellDepends = [ base hedgehog vector ];
        testHaskellDepends = [ base ];
        description = "Extra hedgehog functionality";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hw-hspec-hedgehog" = callPackage
@@ -112666,6 +112938,8 @@ self: {
        pname = "hw-hspec-hedgehog";
        version = "0.1.0.5";
        sha256 = "0kznqpliqnahyayi1q08mfz4qwhqvz54hb8cv6r2ps3lyjnpmlfk";
+       revision = "1";
+       editedCabalFile = "05fg0d89652yhsji35ckh9qiiy4y7c04i6zya9hrkgwl2jaq55fv";
        libraryHaskellDepends = [
          base call-stack hedgehog hspec HUnit transformers
        ];
@@ -115727,6 +116001,8 @@ self: {
        pname = "imm";
        version = "1.3.0.0";
        sha256 = "1rkndzm0mmc0qpg4i08jkmp00w5jhh4az02y3vzwaaqjfd32jxar";
+       revision = "1";
+       editedCabalFile = "02g2cpwqp9fqggzjv5y2gyvxayqbrfjai133jn7y2laa9bxia3x4";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -118178,6 +118454,32 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "ip_1_4_0" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, bytestring, criterion
+     , doctest, hashable, hspec, HUnit, primitive, QuickCheck
+     , quickcheck-classes, test-framework, test-framework-hunit
+     , test-framework-quickcheck2, text, vector
+     }:
+     mkDerivation {
+       pname = "ip";
+       version = "1.4.0";
+       sha256 = "12y9ym7gjdwlixp727z4hf0hmi8x021shvrv6vhg4s4bgn3rvch5";
+       libraryHaskellDepends = [
+         aeson attoparsec base bytestring hashable primitive text vector
+       ];
+       testHaskellDepends = [
+         attoparsec base bytestring doctest hspec HUnit QuickCheck
+         quickcheck-classes test-framework test-framework-hunit
+         test-framework-quickcheck2 text
+       ];
+       benchmarkHaskellDepends = [
+         attoparsec base bytestring criterion text
+       ];
+       description = "Library for IP and MAC addresses";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ip-quoter" = callPackage
     ({ mkDerivation, base, cpu, network, tasty, tasty-hunit
      , template-haskell
@@ -119344,10 +119646,8 @@ self: {
      }:
      mkDerivation {
        pname = "ivory-opts";
-       version = "0.1.0.5";
-       sha256 = "0h4k2fy8w2hcyglfgl1jzxr6as04lc4ks8wk4id8h4gpn6bgdfrn";
-       revision = "1";
-       editedCabalFile = "1mn1jrpwzm1pcmw942i0kg0na56zagxsqcqs9y32j1xnlkgljkpn";
+       version = "0.1.0.6";
+       sha256 = "014dnfflf09gfn6c47jjg25lq95bx9sl6nkj18zylyzy0f1qszrq";
        libraryHaskellDepends = [
          base base-compat containers data-reify dlist fgl filepath ivory
          monadLib pretty
@@ -122658,15 +122958,15 @@ self: {
     ({ mkDerivation, base, base16-bytestring, bytestring, cryptonite
      , gauge, HUnit, memory, parsec, QuickCheck, quickcheck-instances
      , test-framework, test-framework-hunit, test-framework-quickcheck2
-     , text
+     , text, vector
      }:
      mkDerivation {
        pname = "keccak";
-       version = "0.1.2";
-       sha256 = "0jrnx5w2nxxc47lmw71c57cqja3mynx8j3fr89rjwby6mym5yw4g";
+       version = "0.2.0";
+       sha256 = "1hkp6zn86bvn817vvxd2yqjgfh76n0ynvyqq2942frl1i0v19ymw";
        isLibrary = true;
        isExecutable = true;
-       libraryHaskellDepends = [ base bytestring ];
+       libraryHaskellDepends = [ base bytestring vector ];
        executableHaskellDepends = [ base base16-bytestring bytestring ];
        testHaskellDepends = [
          base base16-bytestring bytestring cryptonite HUnit memory parsec
@@ -122676,7 +122976,7 @@ self: {
        benchmarkHaskellDepends = [
          base bytestring cryptonite gauge memory
        ];
-       description = "haskell keccak functions";
+       description = "cryptographic functions based on the sponge construction";
        license = stdenv.lib.licenses.mit;
      }) {};
 
@@ -124795,8 +125095,8 @@ self: {
      }:
      mkDerivation {
        pname = "language-ats";
-       version = "1.2.0.14";
-       sha256 = "13nafbk4h8z3vx12i6zs250795c3ipsgxq83bhgha2w0wjr49d18";
+       version = "1.2.0.15";
+       sha256 = "0ldjbsnspn55xbkwcjbyswiqlpf885si5xl2z0n5kvvwmlrgmfkx";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          ansi-wl-pprint array base composition-prelude containers deepseq
@@ -124819,8 +125119,8 @@ self: {
      }:
      mkDerivation {
        pname = "language-bash";
-       version = "0.7.0";
-       sha256 = "0w7r5ngpz3ifahjfccz6ma9m2jdmn5nqimk5154hk35skcjwrswx";
+       version = "0.7.1";
+       sha256 = "1p8ikx9iq9ssvm8b99hly7pqqw09588xjkgf5397kg5xpv8ga4gp";
        libraryHaskellDepends = [ base parsec pretty transformers ];
        testHaskellDepends = [
          base parsec process QuickCheck tasty tasty-expected-failure
@@ -127125,6 +127425,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "lens-labels_0_1_0_2" = callPackage
+    ({ mkDerivation, base, ghc-prim }:
+     mkDerivation {
+       pname = "lens-labels";
+       version = "0.1.0.2";
+       sha256 = "11pwdqnjd0gybjrfz79fbd9vdwcimkzqqr91zy6hswlylp42dvq1";
+       libraryHaskellDepends = [ base ghc-prim ];
+       description = "Integration of lenses with OverloadedLabels";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "lens-labels" = callPackage
     ({ mkDerivation, base, ghc-prim, profunctors, tagged }:
      mkDerivation {
@@ -145137,10 +145449,8 @@ self: {
      }:
      mkDerivation {
        pname = "network-msgpack-rpc";
-       version = "0.0.4";
-       sha256 = "0b9llxfgl2lcjlcz9ai6k6yhrlip6shd0wd56mfgbvv3lbd5n62r";
-       revision = "2";
-       editedCabalFile = "0nw2pgyw077ncbmiij99xyy414635vvdmb2das7dkzppsfx47rn3";
+       version = "0.0.5";
+       sha256 = "0lrlq5amcgg84ja2wjxkqm9llsbpsj6n0zrk7vvfjcra144b39rq";
        libraryHaskellDepends = [
          base binary binary-conduit bytestring conduit conduit-extra
          data-default-class data-default-instances-base data-msgpack
@@ -146649,11 +146959,28 @@ self: {
        pname = "non-empty";
        version = "0.3";
        sha256 = "1q2vplh7pddf8cpjzs3yvy1dn7lqlg32ianr6j5qwwwl9hfnr43p";
+       revision = "1";
+       editedCabalFile = "0ivvxcfm3qhv7ynb3ql89wrybbda1s2p5nr0viw7nqrybjz5hfzh";
+       libraryHaskellDepends = [
+         base containers deepseq QuickCheck utility-ht
+       ];
+       description = "List-like structures with static restrictions on the number of elements";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "non-empty_0_3_0_1" = callPackage
+    ({ mkDerivation, base, containers, deepseq, QuickCheck, utility-ht
+     }:
+     mkDerivation {
+       pname = "non-empty";
+       version = "0.3.0.1";
+       sha256 = "00zbnpcnmchbbdgyw19m1bl3bdhmw89pp9k0mq3z75nz0i40gg9z";
        libraryHaskellDepends = [
          base containers deepseq QuickCheck utility-ht
        ];
        description = "List-like structures with static restrictions on the number of elements";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "non-empty-containers" = callPackage
@@ -149804,6 +150131,8 @@ self: {
        pname = "opml-conduit";
        version = "0.6.0.4";
        sha256 = "07axacfa0wik2cnpzcnjjp9w6ws8sjhinzxdc4vrxdxaj1v5a2s8";
+       revision = "1";
+       editedCabalFile = "160sazqsrmm2755642c5y5i38miiglqb66cy5k0hy4k2jkdmjfbi";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base case-insensitive conduit conduit-combinators containers
@@ -151204,7 +151533,7 @@ self: {
        maintainers = with stdenv.lib.maintainers; [ peti ];
      }) {};
 
-  "pandoc_2_2_2" = callPackage
+  "pandoc_2_2_2_1" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, base64-bytestring
      , binary, blaze-html, blaze-markup, bytestring, Cabal
      , case-insensitive, cmark-gfm, containers, criterion, data-default
@@ -151219,8 +151548,8 @@ self: {
      }:
      mkDerivation {
        pname = "pandoc";
-       version = "2.2.2";
-       sha256 = "0rbr6mjm7kfzxrjbglqj6bgz1l1zlbiiff3pi59nhqava3nindqc";
+       version = "2.2.2.1";
+       sha256 = "19d6cd8ry735ziazfkk6xhrjbvx5ywpbqmhxr3wbmp8kyp6c7x7m";
        configureFlags = [ "-fhttps" "-f-trypandoc" ];
        isLibrary = true;
        isExecutable = true;
@@ -161477,8 +161806,8 @@ self: {
      }:
      mkDerivation {
        pname = "primitive-extras";
-       version = "0.3";
-       sha256 = "1az9933jkf3891l6svzvg1fhprmcnjj1bklr0rglrljlj8m01laz";
+       version = "0.3.0.1";
+       sha256 = "0qipddb5065z6c7klbaz75d8jbx39k8qppv8d7xb6hnj28v62ab7";
        libraryHaskellDepends = [
          base cereal deferred-folds foldl primitive profunctors vector
        ];
@@ -162889,6 +163218,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) libpulseaudio;};
 
+  "proto-lens_0_2_2_0" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, containers
+     , data-default-class, lens-family, parsec, pretty, text
+     , transformers, void
+     }:
+     mkDerivation {
+       pname = "proto-lens";
+       version = "0.2.2.0";
+       sha256 = "173sz83pw237qp037j6spy055ghayinfjg5m4p4mvgmjnnzpw1cj";
+       libraryHaskellDepends = [
+         attoparsec base bytestring containers data-default-class
+         lens-family parsec pretty text transformers void
+       ];
+       description = "A lens-based implementation of protocol buffers in Haskell";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "proto-lens" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, containers
      , data-default-class, deepseq, lens-family, lens-labels, parsec
@@ -162974,9 +163321,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "proto-lens-protobuf-types_0_2_2_0" = callPackage
+    ({ mkDerivation, base, Cabal, lens-family, proto-lens
+     , proto-lens-protoc, protobuf, text
+     }:
+     mkDerivation {
+       pname = "proto-lens-protobuf-types";
+       version = "0.2.2.0";
+       sha256 = "0b6n7qwyxql7966accdg0ms5mmxygjy1jx31j5bgdpkdayz4hf72";
+       setupHaskellDepends = [ base Cabal proto-lens-protoc ];
+       libraryHaskellDepends = [
+         base lens-family proto-lens proto-lens-protoc text
+       ];
+       libraryToolDepends = [ protobuf ];
+       description = "Basic protocol buffer message types";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) protobuf;};
+
   "proto-lens-protobuf-types" = callPackage
     ({ mkDerivation, base, Cabal, lens-family, proto-lens
-     , proto-lens-protoc, text
+     , proto-lens-protoc, protobuf, text
      }:
      mkDerivation {
        pname = "proto-lens-protobuf-types";
@@ -162986,16 +163351,44 @@ self: {
        libraryHaskellDepends = [
          base lens-family proto-lens proto-lens-protoc text
        ];
+       libraryToolDepends = [ protobuf ];
        description = "Basic protocol buffer message types";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
+     }) {inherit (pkgs) protobuf;};
+
+  "proto-lens-protoc_0_2_2_3" = callPackage
+    ({ mkDerivation, base, bytestring, Cabal, containers
+     , data-default-class, directory, filepath, haskell-src-exts
+     , lens-family, lens-labels, process, proto-lens
+     , proto-lens-descriptors, protobuf, text
+     }:
+     mkDerivation {
+       pname = "proto-lens-protoc";
+       version = "0.2.2.3";
+       sha256 = "08s93h25l66z7w45jmy632lhhkddqarj94bpwn3wmv5kdpsp33pq";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bytestring Cabal containers data-default-class directory
+         filepath haskell-src-exts lens-family lens-labels process
+         proto-lens proto-lens-descriptors text
+       ];
+       libraryToolDepends = [ protobuf ];
+       executableHaskellDepends = [
+         base bytestring containers data-default-class filepath
+         haskell-src-exts lens-family proto-lens proto-lens-descriptors text
+       ];
+       description = "Protocol buffer compiler for the proto-lens library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) protobuf;};
 
   "proto-lens-protoc" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers
      , data-default-class, deepseq, directory, filepath
      , haskell-src-exts, lens-family, lens-labels, pretty, process
-     , proto-lens, text
+     , proto-lens, protobuf, text
      }:
      mkDerivation {
        pname = "proto-lens-protoc";
@@ -163008,13 +163401,14 @@ self: {
          directory filepath haskell-src-exts lens-family lens-labels pretty
          process proto-lens text
        ];
+       libraryToolDepends = [ protobuf ];
        executableHaskellDepends = [
          base bytestring containers data-default-class deepseq filepath
          haskell-src-exts lens-family proto-lens text
        ];
        description = "Protocol buffer compiler for the proto-lens library";
        license = stdenv.lib.licenses.bsd3;
-     }) {};
+     }) {inherit (pkgs) protobuf;};
 
   "protobuf" = callPackage
     ({ mkDerivation, base, base-orphans, bytestring, cereal, containers
@@ -164319,30 +164713,30 @@ self: {
 
   "puzzle-draw" = callPackage
     ({ mkDerivation, aeson, base, blaze-svg, bytestring, containers
-     , deepseq, diagrams-lib, diagrams-svg, filepath, hashable, hspec
-     , linear, mtl, optparse-applicative, parsec, process, SVGFonts
-     , tasty, tasty-golden, tasty-hspec, tasty-hunit, text
-     , unordered-containers, vector-space, yaml
+     , deepseq, diagrams-lib, diagrams-rasterific, filepath, hashable
+     , hspec, linear, mtl, optparse-applicative, parsec, SVGFonts, tasty
+     , tasty-hspec, tasty-hunit, text, unordered-containers
+     , vector-space, yaml
      }:
      mkDerivation {
        pname = "puzzle-draw";
-       version = "0.2.0.0";
-       sha256 = "04sibf7rpr2dyxn943nbl8jzzy7zcf5ic0najgy1kmrl5n4v7p02";
+       version = "0.3.0.0";
+       sha256 = "0vnmq65khi1lcrf3rz4ym7lnv3178rvnb884rln0jspil6bs4cs7";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
-         aeson base containers diagrams-lib diagrams-svg filepath hashable
-         linear mtl optparse-applicative parsec SVGFonts text
+         aeson base containers diagrams-lib diagrams-rasterific filepath
+         hashable linear mtl optparse-applicative parsec SVGFonts text
          unordered-containers vector-space yaml
        ];
        executableHaskellDepends = [
-         aeson base diagrams-lib diagrams-svg filepath optparse-applicative
-         process tasty tasty-golden yaml
+         aeson base containers diagrams-lib diagrams-rasterific filepath
+         optparse-applicative yaml
        ];
        testHaskellDepends = [
-         base blaze-svg bytestring containers deepseq diagrams-lib
-         diagrams-svg hspec tasty tasty-hspec tasty-hunit text yaml
+         base blaze-svg bytestring containers deepseq diagrams-lib hspec
+         tasty tasty-hspec tasty-hunit text yaml
        ];
        description = "Creating graphics for pencil puzzles";
        license = stdenv.lib.licenses.mit;
@@ -165328,14 +165722,15 @@ self: {
      }:
      mkDerivation {
        pname = "quickcheck-classes";
-       version = "0.4.12";
-       sha256 = "1gnzaw5vvn5xk6h9zjvdjicxq35ppwvrs87fys1lk51c402npvz7";
+       version = "0.4.13";
+       sha256 = "19kndmc019dhz0b8iajplpiifl1x3ph39zwp2c2n3rp5v41syxrs";
        libraryHaskellDepends = [
          aeson base bifunctors containers primitive QuickCheck semigroupoids
          semigroups semirings tagged transformers
        ];
        testHaskellDepends = [
-         aeson base primitive QuickCheck tagged transformers vector
+         aeson base containers primitive QuickCheck semigroupoids tagged
+         transformers vector
        ];
        description = "QuickCheck common typeclasses";
        license = stdenv.lib.licenses.bsd3;
@@ -165589,8 +165984,8 @@ self: {
      }:
      mkDerivation {
        pname = "quickcheck-string-random";
-       version = "0.1.0.1";
-       sha256 = "1yx1kyd6p58b7s10v0lkq1v162vnz90p6m9jlwbr4s6qxa0sm31r";
+       version = "0.1.1.0";
+       sha256 = "1dxazyn5h2njhjs41x2cb5nwydf87a29yxgy7wv40s6fq6ajj084";
        libraryHaskellDepends = [ base QuickCheck string-random text ];
        testHaskellDepends = [
          base QuickCheck tasty tasty-quickcheck text
@@ -168758,7 +169153,7 @@ self: {
        libraryPkgconfigDepends = [ raptor2 redland ];
        description = "Redland RDF library bindings";
        license = stdenv.lib.licenses.bsd3;
-     }) {raptor2 = null; inherit (pkgs) redland;};
+     }) {raptor2 = null; redland = null;};
 
   "redo" = callPackage
     ({ mkDerivation, base, bytestring, containers, directory, filepath
@@ -169163,6 +169558,27 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "reflex-dom-fragment-shader-canvas" = callPackage
+    ({ mkDerivation, base, containers, ghcjs-dom, jsaddle, lens
+     , reflex-dom, text, transformers
+     }:
+     mkDerivation {
+       pname = "reflex-dom-fragment-shader-canvas";
+       version = "0.1";
+       sha256 = "1zc8kgny3d467lxpwg5mm1amg6924m5ifkkafyh18nfzqffvc3bl";
+       revision = "1";
+       editedCabalFile = "1s08vdpwyyfrfw7hfbn2i2m9b3dszcdd7dmfyd0z1pbxy6wj1xmz";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base containers ghcjs-dom jsaddle lens reflex-dom text transformers
+       ];
+       executableHaskellDepends = [ base reflex-dom text ];
+       description = "A reflex-dom widget to draw on a canvas with a fragment shader program";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "reflex-dom-helpers" = callPackage
     ({ mkDerivation, base, reflex, reflex-dom, template-haskell }:
      mkDerivation {
@@ -171363,8 +171779,8 @@ self: {
      }:
      mkDerivation {
        pname = "reqcatcher";
-       version = "0.1.0.1";
-       sha256 = "1ywh83ydy48mlix7mglnkhsjj3b13jqs2gs52by6q1g438nb31in";
+       version = "0.1.1.0";
+       sha256 = "15qpd11ijbip88pf7sn1cmms369cv963l2xdp3wxg7qvlf362ns8";
        libraryHaskellDepends = [ base http-types network text wai warp ];
        testHaskellDepends = [
          base http-client http-types HUnit lens tasty tasty-hunit wai wreq
@@ -174100,6 +174516,37 @@ self: {
        license = stdenv.lib.licenses.publicDomain;
      }) {};
 
+  "rss-conduit_0_4_2_2" = callPackage
+    ({ mkDerivation, atom-conduit, base, blaze-builder, bytestring
+     , conduit, conduit-combinators, containers, data-default
+     , dublincore-xml-conduit, lens-simple, mono-traversable, QuickCheck
+     , quickcheck-instances, resourcet, safe, safe-exceptions
+     , singletons, tasty, tasty-hunit, tasty-quickcheck, text, time
+     , timerep, uri-bytestring, vinyl, xml-conduit, xml-types
+     }:
+     mkDerivation {
+       pname = "rss-conduit";
+       version = "0.4.2.2";
+       sha256 = "1qaz3a9fjq5dqky6jvnnk68xbarrqng7bas9r10qzdpy7g1v17ps";
+       revision = "1";
+       editedCabalFile = "1y5f1fvjjljk0rl8payxm9dsazzh2057nq9m9bi4gxwa8lkfz21d";
+       libraryHaskellDepends = [
+         atom-conduit base conduit conduit-combinators containers
+         dublincore-xml-conduit lens-simple safe safe-exceptions singletons
+         text time timerep uri-bytestring vinyl xml-conduit xml-types
+       ];
+       testHaskellDepends = [
+         atom-conduit base blaze-builder bytestring conduit
+         conduit-combinators data-default dublincore-xml-conduit lens-simple
+         mono-traversable QuickCheck quickcheck-instances resourcet
+         safe-exceptions singletons tasty tasty-hunit tasty-quickcheck text
+         time uri-bytestring vinyl xml-conduit xml-types
+       ];
+       description = "Streaming parser/renderer for the RSS standard";
+       license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "rss2irc" = callPackage
     ({ mkDerivation, base, bytestring, cmdargs, containers, deepseq
      , feed, http-client, http-conduit, http-types, io-storage, irc
@@ -175657,8 +176104,8 @@ self: {
      }:
      mkDerivation {
        pname = "sbv";
-       version = "7.9";
-       sha256 = "0x57ppvlzvaqsd3aazx8gqcrqgjiqs06ch5rkkjsd0c9nifpb04m";
+       version = "7.10";
+       sha256 = "0bq3h0aidjdh7a9gp97mxfpng4x36mxyb4bgmj4pyjqdnbdgr05p";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array async base containers crackNum data-binary-ieee754 deepseq
@@ -177591,8 +178038,8 @@ self: {
      }:
      mkDerivation {
        pname = "self-extract";
-       version = "0.3.2";
-       sha256 = "0w4pqh9bcdnkyjmy24am2b894627x9is33vbyw03r0br9pd7q82q";
+       version = "0.3.3";
+       sha256 = "0i2b4mxwa2m2p9xks18wna0p84732kbjvjiz3cy0pd9jfmc92vbm";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -178363,6 +178810,8 @@ self: {
        pname = "serialise";
        version = "0.2.0.0";
        sha256 = "1iqkawxy946dhldam30cc1k9h4g2w4cp34fg57ln9k7507mvcns0";
+       revision = "2";
+       editedCabalFile = "1wvqzrbf80ry5xc2s9va24024gfgwi6xj1yvm7578f7mq0k1zqvf";
        libraryHaskellDepends = [
          array base bytestring cborg containers ghc-prim half hashable
          primitive text time unordered-containers vector
@@ -180436,7 +180885,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "serverless-haskell_0_7_0" = callPackage
+  "serverless-haskell_0_7_1" = callPackage
     ({ mkDerivation, aeson, aeson-casing, aeson-extra, amazonka-core
      , amazonka-kinesis, amazonka-s3, base, bytestring, case-insensitive
      , hspec, hspec-discover, http-types, iproute, lens, raw-strings-qq
@@ -180444,8 +180893,8 @@ self: {
      }:
      mkDerivation {
        pname = "serverless-haskell";
-       version = "0.7.0";
-       sha256 = "04z67q8g8qkksivvqw8dk8m883f3kicc98m16v17hpdv5kni8qcj";
+       version = "0.7.1";
+       sha256 = "1vjiv56w591vparjw3372fz2vsa5hcm5j3p90j00x882gm23wf22";
        libraryHaskellDepends = [
          aeson aeson-casing aeson-extra amazonka-core amazonka-kinesis
          amazonka-s3 base bytestring case-insensitive http-types iproute
@@ -183950,8 +184399,8 @@ self: {
      }:
      mkDerivation {
        pname = "sitepipe";
-       version = "0.3.0.0";
-       sha256 = "0h1qcc9d721yczd1szylxpxc1nzi2np6xa5b1rlsck6yjr238bwz";
+       version = "0.3.0.1";
+       sha256 = "1iv0ndllixwn9vj7gqavv1ymfxfxqm4xqqzxqf1y8qiq240b3j6l";
        libraryHaskellDepends = [
          aeson base bytestring containers directory exceptions filepath Glob
          lens lens-aeson megaparsec MissingH mtl mustache
@@ -184568,8 +185017,8 @@ self: {
      }:
      mkDerivation {
        pname = "slick";
-       version = "0.1.0.0";
-       sha256 = "0irp1d9z5l8jr33qgbnkq05lpkpll6dw84qyl0cd2xnqs1iklyds";
+       version = "0.1.0.2";
+       sha256 = "1s5ya5h253h599m3hkcilq7fya9ghgz4b5mlk8v1ywpdm1jab3dm";
        libraryHaskellDepends = [
          aeson base binary bytestring containers lens lens-aeson mustache
          pandoc shake text time
@@ -185583,6 +186032,8 @@ self: {
        pname = "snap-templates";
        version = "1.0.0.1";
        sha256 = "1l6gc2ppsvbaf783namglpyzghhynlg97q3ajc2ralibs21vsn7c";
+       revision = "1";
+       editedCabalFile = "0m54p36hvwn3zaixalb5jiy9siq1ksf5da5d0407rys87wfy711b";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -185774,8 +186225,8 @@ self: {
      }:
      mkDerivation {
        pname = "snaplet-customauth";
-       version = "0.1.0";
-       sha256 = "1xc45lvhr3psqhv87n75f5968q129fgz3cz6362qvcnbnyyiznz3";
+       version = "0.1.1";
+       sha256 = "0alh5jaygcxnjpm5r3qx2c6al1x73shzwqi67820rzqxix2np8pc";
        libraryHaskellDepends = [
          aeson base base64-bytestring binary binary-orphans bytestring
          configurator containers errors heist hoauth2 http-client
@@ -189470,6 +189921,8 @@ self: {
        pname = "stack-prism";
        version = "0.1.7";
        sha256 = "0a09x8b78j08cn0l492hj6yx15fhs6bipaiwgjqsax37ynnrxhqz";
+       revision = "1";
+       editedCabalFile = "1xd0hcp003ijakpcjgcmllsa65i0924has9wllvsj8i0mnapcni3";
        libraryHaskellDepends = [
          base profunctors tagged template-haskell transformers
        ];
@@ -191676,6 +192129,8 @@ self: {
        pname = "streaming-base64";
        version = "0.1.0.0";
        sha256 = "0w6xj80z1z21pgxadwc48w15a08g94i4g7qkgv5gvq46kpl44bq6";
+       revision = "1";
+       editedCabalFile = "0mc71ncw2mw3yfryk0g2iq86wba7i3khy8fbsjaz5dr22hkkzh9r";
        libraryHaskellDepends = [
          base safe-exceptions streaming streaming-bytestring transformers
        ];
@@ -192482,16 +192937,19 @@ self: {
 
   "string-random" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, containers
-     , pcre-heavy, QuickCheck, random, tasty, tasty-hunit
-     , tasty-quickcheck, text, transformers
+     , optparse-applicative, pcre-heavy, QuickCheck, random, tasty
+     , tasty-hunit, tasty-quickcheck, text, transformers
      }:
      mkDerivation {
        pname = "string-random";
-       version = "0.1.0.0";
-       sha256 = "090lin4b0y7xccwpnw8q33kfdljjw6annbl2d1jldird7db086ah";
+       version = "0.1.1.0";
+       sha256 = "0gypx0lg9kz8s2aksj2qg238m41cnl49k4bxwz7sgf94h12nhil2";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          attoparsec base containers random text transformers
        ];
+       executableHaskellDepends = [ base optparse-applicative text ];
        testHaskellDepends = [
          base bytestring pcre-heavy QuickCheck tasty tasty-hunit
          tasty-quickcheck text
@@ -193859,24 +194317,22 @@ self: {
      }) {};
 
   "sv" = callPackage
-    ({ mkDerivation, ansi-wl-pprint, attoparsec, base, bifunctors
-     , bytestring, charset, containers, contravariant, deepseq, hedgehog
-     , lens, mtl, parsec, parsers, profunctors, readable, semigroupoids
-     , semigroups, tasty, tasty-hedgehog, tasty-hunit, text
-     , transformers, trifecta, utf8-string, validation, vector, void
+    ({ mkDerivation, attoparsec, base, bifunctors, bytestring, cassava
+     , contravariant, hedgehog, hw-dsv, lens, Only, parsers
+     , semigroupoids, semigroups, sv-core, tasty, tasty-hedgehog
+     , tasty-hunit, text, transformers, trifecta, utf8-string
+     , validation, vector
      }:
      mkDerivation {
        pname = "sv";
-       version = "0.1";
-       sha256 = "0rd4jf4qqfc66xxddvaa37fjmpmmjzb7n928gclds0xibzm9ls7s";
+       version = "1.0";
+       sha256 = "1sgyly9b6nrij5hpj3ffvwj6m3ygm43wbi8xkd2gxs2jh5zjzvw3";
        libraryHaskellDepends = [
-         ansi-wl-pprint attoparsec base bifunctors bytestring charset
-         containers contravariant deepseq lens mtl parsec parsers
-         profunctors readable semigroupoids semigroups text transformers
-         trifecta utf8-string validation vector void
+         attoparsec base bifunctors bytestring contravariant hw-dsv
+         semigroupoids sv-core transformers utf8-string validation
        ];
        testHaskellDepends = [
-         ansi-wl-pprint base bytestring contravariant hedgehog lens parsers
+         base bytestring cassava contravariant hedgehog lens Only parsers
          semigroupoids semigroups tasty tasty-hedgehog tasty-hunit text
          trifecta utf8-string validation vector
        ];
@@ -193886,24 +194342,88 @@ self: {
      }) {};
 
   "sv-cassava" = callPackage
-    ({ mkDerivation, attoparsec, base, bytestring, cassava, HUnit, sv
-     , text, utf8-string, validation, vector
+    ({ mkDerivation, attoparsec, base, bytestring, cassava, HUnit
+     , sv-core, text, utf8-string, validation, vector
      }:
      mkDerivation {
        pname = "sv-cassava";
-       version = "0.1";
-       sha256 = "050f2ji5zhispjqm66n6jbdq4x20dijzrkl20vpgx4i42z7fmn15";
+       version = "0.2";
+       sha256 = "01bhh3b85gsbgm3fb0ppb1ihcm2p0rkv6bsmw16l3b2jgj806zin";
        libraryHaskellDepends = [
-         attoparsec base bytestring cassava sv utf8-string vector
+         attoparsec base bytestring cassava sv-core utf8-string validation
+         vector
        ];
        testHaskellDepends = [
-         base bytestring cassava HUnit sv text validation vector
+         base bytestring cassava HUnit sv-core text validation vector
        ];
        description = "Integration to use sv with cassava's parser";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "sv-core" = callPackage
+    ({ mkDerivation, attoparsec, base, bifunctors, bytestring
+     , containers, contravariant, deepseq, lens, mtl, parsec
+     , profunctors, QuickCheck, readable, semigroupoids, semigroups
+     , tasty, tasty-quickcheck, text, transformers, trifecta
+     , utf8-string, validation, vector, void
+     }:
+     mkDerivation {
+       pname = "sv-core";
+       version = "0.1";
+       sha256 = "0zqzj6i4xbw7bjzn40mimn4rw1g88jndrdxzdmrbdigfdncxhyl3";
+       libraryHaskellDepends = [
+         attoparsec base bifunctors bytestring containers contravariant
+         deepseq lens mtl parsec profunctors readable semigroupoids
+         semigroups text transformers trifecta utf8-string validation vector
+         void
+       ];
+       testHaskellDepends = [
+         base bytestring profunctors QuickCheck semigroupoids semigroups
+         tasty tasty-quickcheck text validation vector
+       ];
+       description = "Encode and decode separated values (CSV, PSV, ...)";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "sv-svfactor" = callPackage
+    ({ mkDerivation, base, bytestring, lens, profunctors, sv-core
+     , svfactor, validation
+     }:
+     mkDerivation {
+       pname = "sv-svfactor";
+       version = "0.1";
+       sha256 = "0j97va25p30x3q07084mbv4lsls6p2yky8y7zmf9w6i7i42r3bi0";
+       libraryHaskellDepends = [
+         base bytestring lens profunctors sv-core svfactor validation
+       ];
+       description = "sv-core + svfactor";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "svfactor" = callPackage
+    ({ mkDerivation, attoparsec, base, bifunctors, bytestring, charset
+     , deepseq, hedgehog, lens, parsec, parsers, semigroupoids
+     , semigroups, tasty, tasty-hedgehog, tasty-hunit, text
+     , transformers, trifecta, utf8-string, vector
+     }:
+     mkDerivation {
+       pname = "svfactor";
+       version = "0.1";
+       sha256 = "1vjdv7xgd33z3iwwlh8xwp9za06jvqxpbssc4m5bmcx1wihsnn35";
+       libraryHaskellDepends = [
+         attoparsec base bifunctors bytestring charset deepseq lens parsec
+         parsers semigroupoids semigroups text transformers trifecta
+         utf8-string vector
+       ];
+       testHaskellDepends = [
+         base bytestring hedgehog lens parsers semigroups tasty
+         tasty-hedgehog tasty-hunit text trifecta utf8-string vector
+       ];
+       description = "Syntax-preserving CSV manipulation";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "svg-builder" = callPackage
     ({ mkDerivation, base, blaze-builder, bytestring, hashable, text
      , unordered-containers
@@ -198024,7 +198544,6 @@ self: {
        ];
        description = "TensorFlow bindings";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {tensorflow = null;};
 
   "tensorflow-core-ops" = callPackage
@@ -198045,7 +198564,6 @@ self: {
        ];
        description = "Haskell wrappers for Core Tensorflow Ops";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tensorflow-logging" = callPackage
@@ -198073,7 +198591,6 @@ self: {
        ];
        description = "TensorBoard related functionality";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tensorflow-opgen" = callPackage
@@ -198091,7 +198608,6 @@ self: {
        ];
        description = "Code generation for TensorFlow operations";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tensorflow-ops" = callPackage
@@ -198121,21 +198637,22 @@ self: {
        ];
        description = "Friendly layer around TensorFlow bindings";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tensorflow-proto" = callPackage
-    ({ mkDerivation, base, Cabal, proto-lens, proto-lens-protoc }:
+    ({ mkDerivation, base, Cabal, proto-lens, proto-lens-protoc
+     , protobuf
+     }:
      mkDerivation {
        pname = "tensorflow-proto";
        version = "0.1.0.0";
        sha256 = "06k87dvpsf8pnbb1qq5gjxpjc2sra95y1bwmsnpmlg1qn0ppi5mn";
        setupHaskellDepends = [ base Cabal proto-lens-protoc ];
        libraryHaskellDepends = [ base proto-lens proto-lens-protoc ];
+       libraryToolDepends = [ protobuf ];
        description = "TensorFlow protocol buffers";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
+     }) {inherit (pkgs) protobuf;};
 
   "tensorflow-records" = callPackage
     ({ mkDerivation, base, bytestring, cereal, snappy-framing
@@ -198151,7 +198668,6 @@ self: {
        ];
        description = "Encoder and decoder for the TensorFlow \"TFRecords\" format";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tensorflow-records-conduit" = callPackage
@@ -198168,7 +198684,6 @@ self: {
        ];
        description = "Conduit wrappers for TensorFlow.Records.";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tensorflow-test" = callPackage
@@ -198200,6 +198715,21 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "termbox" = callPackage
+    ({ mkDerivation, array, base, c2hs }:
+     mkDerivation {
+       pname = "termbox";
+       version = "0.1.0";
+       sha256 = "1wylp818y65rwdrzmh596sn8csiwjma6gh6wm4fn9m9zb1nvzbsa";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ array base ];
+       libraryToolDepends = [ c2hs ];
+       executableHaskellDepends = [ base ];
+       description = "termbox bindings";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "termbox-bindings" = callPackage
     ({ mkDerivation, base, c2hs }:
      mkDerivation {
@@ -202049,6 +202579,21 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "timer-wheel" = callPackage
+    ({ mkDerivation, atomic-primops, base, ghc-prim, primitive
+     , psqueues
+     }:
+     mkDerivation {
+       pname = "timer-wheel";
+       version = "0.1.0";
+       sha256 = "0wjm767yxf3hg3p80nd0hi0bfvdssq0f3lj9pzkmrsnsqafngs2j";
+       libraryHaskellDepends = [
+         atomic-primops base ghc-prim primitive psqueues
+       ];
+       description = "A timer wheel";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "timerep" = callPackage
     ({ mkDerivation, attoparsec, base, monoid-subclasses, QuickCheck
      , tasty, tasty-hunit, tasty-quickcheck, text, time
@@ -214798,8 +215343,8 @@ self: {
      }:
      mkDerivation {
        pname = "web-inv-route";
-       version = "0.1.2";
-       sha256 = "1qhs2gi1591bphdr1wxbn2za7kfskywndz4bcr741q825m2bakhd";
+       version = "0.1.2.1";
+       sha256 = "0pdbcc9mg2wrc3jm7g2dcsqgqv89dgjcnxs810gzw3d3rh418i5m";
        libraryHaskellDepends = [
          base bytestring case-insensitive containers happstack-server
          hashable http-types invertible network-uri snap-core text
@@ -216257,35 +216802,35 @@ self: {
 
   "winery" = callPackage
     ({ mkDerivation, base, binary, bytestring, cassava, containers, cpu
-     , deepseq, fingertree, gauge, hashable, mtl, prettyprinter
-     , prettyprinter-ansi-terminal, serialise, text, transformers
-     , unordered-containers, vector
+     , deepseq, gauge, hashable, megaparsec, mtl, prettyprinter
+     , prettyprinter-ansi-terminal, scientific, serialise, text
+     , transformers, unordered-containers, vector
      }:
      mkDerivation {
        pname = "winery";
-       version = "0.1.1";
-       sha256 = "10f6il6vf7p6613xg9jk1s8rd0hppmirpazhibplsqscr6nnjaar";
+       version = "0.1.2";
+       sha256 = "0g18xgby2k5cgb1ymyv92ii9rqj07ng12v2qfsp8yk15fcrx0ky9";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base bytestring containers cpu fingertree hashable mtl
-         prettyprinter prettyprinter-ansi-terminal text transformers
-         unordered-containers vector
+         base bytestring containers cpu hashable megaparsec mtl
+         prettyprinter prettyprinter-ansi-terminal scientific text
+         transformers unordered-containers vector
        ];
        executableHaskellDepends = [
-         base bytestring containers cpu fingertree hashable mtl
-         prettyprinter prettyprinter-ansi-terminal text transformers
-         unordered-containers vector
+         base bytestring containers cpu hashable megaparsec mtl
+         prettyprinter prettyprinter-ansi-terminal scientific text
+         transformers unordered-containers vector
        ];
        testHaskellDepends = [
-         base bytestring containers cpu fingertree hashable mtl
-         prettyprinter prettyprinter-ansi-terminal text transformers
-         unordered-containers vector
+         base bytestring containers cpu hashable megaparsec mtl
+         prettyprinter prettyprinter-ansi-terminal scientific text
+         transformers unordered-containers vector
        ];
        benchmarkHaskellDepends = [
-         base binary bytestring cassava containers cpu deepseq fingertree
-         gauge hashable mtl prettyprinter prettyprinter-ansi-terminal
-         serialise text transformers unordered-containers vector
+         base binary bytestring cassava containers cpu deepseq gauge
+         hashable megaparsec mtl prettyprinter prettyprinter-ansi-terminal
+         scientific serialise text transformers unordered-containers vector
        ];
        description = "Sustainable serialisation library";
        license = stdenv.lib.licenses.bsd3;
@@ -218774,6 +219319,8 @@ self: {
        pname = "xml-conduit-parse";
        version = "0.3.1.2";
        sha256 = "0233jcpv7lzan2hh6siw2rrjkjp4f5i1kkpjpdfija01f8by3an1";
+       revision = "1";
+       editedCabalFile = "0jnnr4z3c6rq2dz0ldiic5zwkrp36igf6gip11qrm9ss2pk9khbl";
        libraryHaskellDepends = [
          base conduit conduit-parse containers exceptions parsers text
          xml-conduit xml-types
@@ -225120,8 +225667,8 @@ self: {
      }:
      mkDerivation {
        pname = "ztar";
-       version = "0.1.3";
-       sha256 = "12pzskr90a724x3wh1dsbpbszh6a58lbp4sxl7sd7s1bk3m2kgq1";
+       version = "0.2.0";
+       sha256 = "1y6kkfwx3aw2fi46r7dg4q84mbhl54f2x4vpvwvzd9alz1nvv90i";
        libraryHaskellDepends = [
          base bytestring deepseq directory filepath path process text
          unix-compat zip zlib
-- 
GitLab


From 1c48e89eb138c75ca8ebf95a6aa13078c03be9d5 Mon Sep 17 00:00:00 2001
From: Bas van Dijk <v.dijk.bas@gmail.com>
Date: Sat, 21 Jul 2018 02:21:30 +0200
Subject: [PATCH 248/297] libtensorflow: init at 1.8.0

Required for haskell.packages.ghc822.tensorflow
---
 .../libraries/libtensorflow/default.nix       | 32 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 34 insertions(+)
 create mode 100644 pkgs/development/libraries/libtensorflow/default.nix

diff --git a/pkgs/development/libraries/libtensorflow/default.nix b/pkgs/development/libraries/libtensorflow/default.nix
new file mode 100644
index 00000000000..fce15b121b4
--- /dev/null
+++ b/pkgs/development/libraries/libtensorflow/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchurl, patchelf }:
+stdenv.mkDerivation rec {
+  pname = "libtensorflow";
+  version = "1.8.0";
+  name = "${pname}-${version}";
+  src = fetchurl {
+    url = "https://storage.googleapis.com/tensorflow/${pname}/${pname}-cpu-linux-x86_64-${version}.tar.gz";
+    sha256 = "0qzy15rc3x961cyi3bqnygrcnw4x69r28xkwhpwrv1r0gi6k73ha";
+  };
+
+  # Patch library to use our libc, libstdc++ and others
+  buildCommand = ''
+    . $stdenv/setup
+    mkdir -pv $out
+    tar -C $out -xzf $src
+    chmod +w $out/lib/libtensorflow.so
+    chmod +w $out/lib/libtensorflow_framework.so
+    ${patchelf}/bin/patchelf --set-rpath "${stdenv.cc.libc}/lib:${stdenv.cc.cc.lib}/lib:$out/lib" $out/lib/libtensorflow.so
+    ${patchelf}/bin/patchelf --set-rpath "${stdenv.cc.libc}/lib:${stdenv.cc.cc.lib}/lib" $out/lib/libtensorflow_framework.so
+    chmod -w $out/lib/libtensorflow.so
+    chmod -w $out/lib/libtensorflow_framework.so
+  '';
+
+  meta = with stdenv.lib; {
+    inherit version;
+    description = "C API for TensorFlow";
+    license = licenses.asl20;
+    maintainers = [maintainers.basvandijk];
+    platforms = platforms.linux;
+    homepage = https://www.tensorflow.org/versions/master/install/install_c;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bc4caf5988f..3174dc66ca9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -860,6 +860,8 @@ with pkgs;
 
   tensor = libsForQt5.callPackage ../applications/networking/instant-messengers/tensor { };
 
+  libtensorflow = callPackage ../development/libraries/libtensorflow { };
+
   blink1-tool = callPackage ../tools/misc/blink1-tool { };
 
   bliss = callPackage ../applications/science/math/bliss { };
-- 
GitLab


From 7b510c47e1de4dd9bd95ba41c7cc428b1ce7bbb7 Mon Sep 17 00:00:00 2001
From: Bas van Dijk <v.dijk.bas@gmail.com>
Date: Sat, 21 Jul 2018 02:23:53 +0200
Subject: [PATCH 249/297] haskell: add extra dependencies of tensorflow-proto

---
 .../haskell-modules/configuration-hackage2nix.yaml            | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index e16ef73734b..06508c2b7b8 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -2392,6 +2392,7 @@ extra-packages:
   - http-conduit ^>= 2.2                # pre-lts-11.x versions neeed by git-annex 6.20180227
   - inline-c < 0.6                      # required on GHC 8.0.x
   - inline-c-cpp < 0.2                  # required on GHC 8.0.x
+  - lens-labels == 0.1.*                # required for proto-lens-descriptors
   - mtl < 2.2                           # newer versions require transformers > 0.4.x, which we cannot provide in GHC 7.8.x
   - mtl-prelude < 2                     # required for to build postgrest on mtl 2.1.x platforms
   - network == 2.6.3.1                  # newer versions don't compile with GHC 7.4.x and below
@@ -2399,6 +2400,9 @@ extra-packages:
   - persistent >=2.5 && <2.8            # pre-lts-11.x versions neeed by git-annex 6.20180227
   - persistent-sqlite < 2.7             # pre-lts-11.x versions neeed by git-annex 6.20180227
   - primitive == 0.5.1.*                # required to build alex with GHC 6.12.3
+  - proto-lens == 0.2.*                 # required for tensorflow-proto-0.1.x on GHC 8.2.x
+  - proto-lens-protoc == 0.2.*          # required for tensorflow-proto-0.1.x on GHC 8.2.x
+  - proto-lens-protobuf-types == 0.2.*  # required for tensorflow-proto-0.1.x on GHC 8.2.x
   - QuickCheck < 2                      # required by test-framework-quickcheck and its users
   - resourcet ==1.1.*                   # pre-lts-11.x versions neeed by git-annex 6.20180227
   - seqid < 0.2                         # newer versions depend on transformers 0.4.x which we cannot provide in GHC 7.8.x
-- 
GitLab


From ab4bff2b7711aa0af882ae90930840546338b3ef Mon Sep 17 00:00:00 2001
From: Bas van Dijk <v.dijk.bas@gmail.com>
Date: Sat, 21 Jul 2018 02:25:13 +0200
Subject: [PATCH 250/297] haskell: fix build of tensorflow on GHC-8.2

---
 .../configuration-ghc-8.2.x.nix               | 79 +++++++++++++++++++
 1 file changed, 79 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
index f73172e02d3..825b4f349f0 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
@@ -96,4 +96,83 @@ self: super: {
     haddock-library = dontHaddock (dontCheck self.haddock-library_1_5_0_1);
   }));
 
+} // # All the following is needed to build tensorflow.
+(
+let
+  tensorflow-haskell = pkgs.fetchFromGitHub {
+    owner = "tensorflow";
+    repo = "haskell";
+    rev = "e40d2c44f0a861701cc90ec73c2bcee669ab5ba7";
+    sha256 = "05pda34jfrlqmb8y9l8g87n4iq87v1z820vnd3cy41v5c5nrdpa8";
+    fetchSubmodules = true;
+  };
+in
+{
+  proto-lens-descriptors = super.proto-lens-descriptors.override {
+    proto-lens = self.proto-lens_0_2_2_0;
+    lens-labels = self.lens-labels_0_1_0_2;
+  };
+  proto-lens-protoc_0_2_2_3 = super.proto-lens-protoc_0_2_2_3.override {
+    haskell-src-exts = self.haskell-src-exts_1_19_1;
+  };
+  proto-lens-protobuf-types_0_2_2_0 = super.proto-lens-protobuf-types_0_2_2_0.override {
+    proto-lens = self.proto-lens_0_2_2_0;
+    proto-lens-protoc = self.proto-lens-protoc_0_2_2_3;
+  };
+  tensorflow-proto = (super.callPackage (
+    { mkDerivation, base, Cabal, proto-lens, proto-lens-protobuf-types
+    , proto-lens-protoc, stdenv
+    }:
+    mkDerivation {
+      pname = "tensorflow-proto";
+      version = "0.1.0.0";
+      src = tensorflow-haskell;
+      setupHaskellDepends = [ base Cabal proto-lens-protoc ];
+      libraryHaskellDepends = [
+        base proto-lens proto-lens-protobuf-types proto-lens-protoc
+      ];
+      libraryToolDepends = [ pkgs.protobuf ];
+      homepage = "https://github.com/tensorflow/haskell#readme";
+      description = "TensorFlow protocol buffers";
+      license = stdenv.lib.licenses.asl20;
+    }
+  ) {
+    proto-lens = self.proto-lens_0_2_2_0;
+    proto-lens-protoc = self.proto-lens-protoc_0_2_2_3;
+    proto-lens-protobuf-types = self.proto-lens-protobuf-types_0_2_2_0;
+  }).overrideAttrs (_oldAttrs: {
+    sourceRoot = "source/tensorflow-proto";
+  });
+  tensorflow = (super.callPackage (
+    { mkDerivation, async, attoparsec, base, bytestring, c2hs
+    , containers, data-default, exceptions, fgl, HUnit, lens-family
+    , mainland-pretty, mtl, proto-lens, semigroups, split, stdenv
+    , temporary, libtensorflow, tensorflow-proto, test-framework
+    , test-framework-hunit, test-framework-quickcheck2, text
+    , transformers, vector
+    }:
+    mkDerivation {
+      pname = "tensorflow";
+      version = "0.1.0.2";
+      src = tensorflow-haskell;
+      libraryHaskellDepends = [
+        async attoparsec base bytestring containers data-default exceptions
+        fgl lens-family mainland-pretty mtl proto-lens semigroups split
+        temporary tensorflow-proto text transformers vector
+      ];
+      librarySystemDepends = [ libtensorflow ];
+      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;
+    }
+  ) {}).overrideAttrs (_oldAttrs: {
+    sourceRoot = "source/tensorflow";
+  });
 }
+)
-- 
GitLab


From 26b313accf38faf64bb974542f93013b98da091f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 21 Jul 2018 16:10:57 +0200
Subject: [PATCH 251/297] git-annex: update sha256 hash for the new version

---
 pkgs/development/haskell-modules/configuration-common.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index c8d4000f234..0d9fb43be25 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -86,7 +86,7 @@ self: super: {
       name = "git-annex-${super.git-annex.version}-src";
       url = "git://git-annex.branchable.com/";
       rev = "refs/tags/" + super.git-annex.version;
-      sha256 = "0q9z5q7vrcqa831wni972kchcdivqp55x1z2fgmdp8jfq4pidvyb";
+      sha256 = "1l6xgvn3l0kkly5jvg57msx09bf1jwdff7m61w8yf2pxsrh5ybxl";
     };
   }).override {
     dbus = if pkgs.stdenv.isLinux then self.dbus else null;
-- 
GitLab


From f7d201ea4d62ee493a06dfa1485b9a8e759b7e50 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 21 Jul 2018 16:21:17 +0200
Subject: [PATCH 252/297] all-cabal-hashes: update snapshot to Hackage at
 2018-07-20T06:34:51Z

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

diff --git a/pkgs/data/misc/hackage/default.nix b/pkgs/data/misc/hackage/default.nix
index 8d9ba54c950..a8af8f791a9 100644
--- a/pkgs/data/misc/hackage/default.nix
+++ b/pkgs/data/misc/hackage/default.nix
@@ -1,6 +1,6 @@
 { fetchurl }:
 
 fetchurl {
-  url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/e6e8a920e43237ccd2f66d6a349b5932a5eba1f5.tar.gz";
-  sha256 = "0xyw1a5fp6swyxsj79hihivq9fpzzvl4apv34399a1n4ch6qhbf3";
+  url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/92b4fe519b988dee70e2ef8f2f1d05edf610ba8a.tar.gz";
+  sha256 = "15sh85v57k635q5ir8pwa605cchj12h4sflss8zd1xshy7ywi673";
 }
-- 
GitLab


From dcd5d7af05eb7db180270af3953ab4498029a24f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sat, 21 Jul 2018 15:27:53 +0100
Subject: [PATCH 253/297] coursier: patch shebang to make it work in the nix
 sandboxes

Before `/usr/bin/env sh` was in the script.
---
 pkgs/development/tools/coursier/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/tools/coursier/default.nix b/pkgs/development/tools/coursier/default.nix
index e3c8d7ed014..7e660f3fcd9 100644
--- a/pkgs/development/tools/coursier/default.nix
+++ b/pkgs/development/tools/coursier/default.nix
@@ -13,6 +13,7 @@ stdenv.mkDerivation rec {
 
   buildCommand = ''
     install -Dm555 $src $out/bin/coursier
+    patchShebangs $out/bin/coursier
     wrapProgram $out/bin/coursier --prefix PATH ":" ${jre}/bin
   '';
 
-- 
GitLab


From 8aaaf98045ec1ab72d897afba3eb92bf08fbd312 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 21 Jul 2018 16:51:55 +0200
Subject: [PATCH 254/297] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.10.1-7-ga1690c5 from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/412c0df40472ebd7e8d740b5454f36a4340857cd.
---
 .../haskell-modules/hackage-packages.nix      | 155 ++++++++++++++++--
 1 file changed, 139 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 1587e1df690..85355782171 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -35148,16 +35148,16 @@ self: {
      }) {};
 
   "bindings-sane" = callPackage
-    ({ mkDerivation, base, bindings-DSL, saneBackends }:
+    ({ mkDerivation, base, bindings-DSL, sane-backends }:
      mkDerivation {
        pname = "bindings-sane";
        version = "0.0.1";
        sha256 = "0jxhc0x5hq6y7iznqlxbgnl37a7k8yki2ri475gyc158d47b0zm2";
        libraryHaskellDepends = [ base bindings-DSL ];
-       libraryPkgconfigDepends = [ saneBackends ];
+       libraryPkgconfigDepends = [ sane-backends ];
        description = "FFI bindings to libsane";
        license = stdenv.lib.licenses.lgpl3;
-     }) {inherit (pkgs) saneBackends;};
+     }) {inherit (pkgs) sane-backends;};
 
   "bindings-sc3" = callPackage
     ({ mkDerivation, base, bindings-DSL, scsynth }:
@@ -81595,7 +81595,7 @@ self: {
   "gi-dbusmenu" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib
      , gi-gobject, haskell-gi, haskell-gi-base, haskell-gi-overloading
-     , libdbusmenu-glib, text, transformers
+     , libdbusmenu, text, transformers
      }:
      mkDerivation {
        pname = "gi-dbusmenu";
@@ -81606,11 +81606,11 @@ self: {
          base bytestring containers gi-glib gi-gobject haskell-gi
          haskell-gi-base haskell-gi-overloading text transformers
        ];
-       libraryPkgconfigDepends = [ libdbusmenu-glib ];
+       libraryPkgconfigDepends = [ libdbusmenu ];
        doHaddock = false;
        description = "Dbusmenu bindings";
        license = stdenv.lib.licenses.lgpl21;
-     }) {inherit (pkgs) libdbusmenu-glib;};
+     }) {inherit (pkgs) libdbusmenu;};
 
   "gi-dbusmenugtk3" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk
@@ -82291,7 +82291,8 @@ self: {
 
   "gi-xlib" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, haskell-gi
-     , haskell-gi-base, haskell-gi-overloading, text, transformers, x11
+     , haskell-gi-base, haskell-gi-overloading, text, transformers
+     , xlibsWrapper
      }:
      mkDerivation {
        pname = "gi-xlib";
@@ -82302,11 +82303,11 @@ self: {
          base bytestring containers haskell-gi haskell-gi-base
          haskell-gi-overloading text transformers
        ];
-       libraryPkgconfigDepends = [ x11 ];
+       libraryPkgconfigDepends = [ xlibsWrapper ];
        doHaddock = false;
        description = "xlib bindings";
        license = stdenv.lib.licenses.lgpl21;
-     }) {inherit (pkgs) x11;};
+     }) {inherit (pkgs) xlibsWrapper;};
 
   "giak" = callPackage
     ({ mkDerivation, async, base, bytestring, Cabal, containers
@@ -87681,7 +87682,7 @@ self: {
   "greenclip" = callPackage
     ({ mkDerivation, base, binary, bytestring, directory, exceptions
      , hashable, libXau, microlens, microlens-mtl, protolude, text, unix
-     , vector, wordexp, X11, x11, xcb, xdmcp
+     , vector, wordexp, X11, xcb, xdmcp, xlibsWrapper
      }:
      mkDerivation {
        pname = "greenclip";
@@ -87693,12 +87694,12 @@ self: {
          base binary bytestring directory exceptions hashable microlens
          microlens-mtl protolude text unix vector wordexp X11
        ];
-       executablePkgconfigDepends = [ libXau x11 xcb xdmcp ];
+       executablePkgconfigDepends = [ libXau xcb xdmcp xlibsWrapper ];
        description = "Simple clipboard manager to be integrated with rofi";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {inherit (pkgs.xorg) libXau; inherit (pkgs) x11; xcb = null; 
-         xdmcp = null;};
+     }) {inherit (pkgs.xorg) libXau; xcb = null; xdmcp = null; 
+         inherit (pkgs) xlibsWrapper;};
 
   "greg-client" = callPackage
     ({ mkDerivation, base, binary, bytestring, clock, hostname, network
@@ -88665,16 +88666,16 @@ self: {
      }) {};
 
   "gtk-traymanager" = callPackage
-    ({ mkDerivation, base, glib, gtk3, x11 }:
+    ({ mkDerivation, base, glib, gtk3, xlibsWrapper }:
      mkDerivation {
        pname = "gtk-traymanager";
        version = "1.0.1";
        sha256 = "0vc1gwhg5l7l5iqb1i3zwd1bsy8fxsiwkwzza7j15zi07f97k7di";
        libraryHaskellDepends = [ base glib gtk3 ];
-       libraryPkgconfigDepends = [ x11 ];
+       libraryPkgconfigDepends = [ xlibsWrapper ];
        description = "A wrapper around the eggtraymanager library for Linux system trays";
        license = stdenv.lib.licenses.lgpl21;
-     }) {inherit (pkgs) x11;};
+     }) {inherit (pkgs) xlibsWrapper;};
 
   "gtk2hs-buildtools" = callPackage
     ({ mkDerivation, alex, array, base, Cabal, containers, directory
@@ -100856,6 +100857,8 @@ self: {
        pname = "hgeometry";
        version = "0.7.0.0";
        sha256 = "0c91n42l6pqkdw46snhplvzm8f05x0x5g3b7mgx13ndskcf9vmyz";
+       revision = "1";
+       editedCabalFile = "1wjwpfiic3jbhg77qm2nzgvybnpk0h3wwpywkpfxz8sv1yhb8pa2";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -115424,6 +115427,42 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "ihaskell_0_9_1_0" = callPackage
+    ({ mkDerivation, aeson, base, base64-bytestring, bytestring, cereal
+     , cmdargs, containers, directory, filepath, ghc, ghc-boot
+     , ghc-parser, ghc-paths, haskeline, haskell-src-exts, here, hlint
+     , hspec, hspec-contrib, http-client, http-client-tls, HUnit
+     , ipython-kernel, mtl, parsec, process, random, setenv, shelly
+     , split, stm, strict, system-argv0, text, transformers, unix
+     , unordered-containers, utf8-string, uuid, vector
+     }:
+     mkDerivation {
+       pname = "ihaskell";
+       version = "0.9.1.0";
+       sha256 = "1r71bijgfcsgsymg9aqjkgplg8c9g65zddr7dqf7d3mv2bpb5ain";
+       isLibrary = true;
+       isExecutable = true;
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         aeson base base64-bytestring bytestring cereal cmdargs containers
+         directory filepath ghc ghc-boot ghc-parser ghc-paths haskeline
+         haskell-src-exts hlint http-client http-client-tls ipython-kernel
+         mtl parsec process random shelly split stm strict system-argv0 text
+         transformers unix unordered-containers utf8-string uuid vector
+       ];
+       executableHaskellDepends = [
+         aeson base bytestring containers directory ghc ipython-kernel
+         process strict text transformers unix
+       ];
+       testHaskellDepends = [
+         base directory ghc ghc-paths here hspec hspec-contrib HUnit setenv
+         shelly text transformers
+       ];
+       description = "A Haskell backend kernel for the IPython project";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ihaskell-aeson" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, bytestring, here
      , ihaskell, text
@@ -118687,6 +118726,28 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "ipython-kernel_0_9_1_0" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, cereal, containers
+     , cryptonite, directory, filepath, memory, mtl, process, temporary
+     , text, transformers, unordered-containers, uuid, zeromq4-haskell
+     }:
+     mkDerivation {
+       pname = "ipython-kernel";
+       version = "0.9.1.0";
+       sha256 = "0944riw00i3m8n3cab0g9c14b24xryf9w8ddlddnmxgys4sn8qak";
+       isLibrary = true;
+       isExecutable = true;
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         aeson base bytestring cereal containers cryptonite directory
+         filepath memory mtl process temporary text transformers
+         unordered-containers uuid zeromq4-haskell
+       ];
+       description = "A library for creating kernels for IPython frontends";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "irc" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, HUnit, QuickCheck
      , test-framework, test-framework-hunit, test-framework-quickcheck2
@@ -170931,6 +170992,31 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "relude" = callPackage
+    ({ mkDerivation, base, bytestring, containers, deepseq, doctest
+     , gauge, ghc-prim, Glob, hashable, hedgehog, mtl, stm, tasty
+     , tasty-hedgehog, text, transformers, unordered-containers
+     , utf8-string
+     }:
+     mkDerivation {
+       pname = "relude";
+       version = "0.1.0";
+       sha256 = "16q9mh35c989pmy4xz602svfz57x2kbl8v82mjsapigmnxa41r8x";
+       libraryHaskellDepends = [
+         base bytestring containers deepseq ghc-prim hashable mtl stm text
+         transformers unordered-containers utf8-string
+       ];
+       testHaskellDepends = [
+         base bytestring doctest Glob hedgehog tasty tasty-hedgehog text
+         utf8-string
+       ];
+       benchmarkHaskellDepends = [
+         base containers gauge unordered-containers
+       ];
+       description = "Custom prelude from Kowainik";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "remark" = callPackage
     ({ mkDerivation, base, GenericPretty, tasty, tasty-golden
      , tasty-hunit
@@ -183939,6 +184025,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "simple-vec3_0_4_0_8" = callPackage
+    ({ mkDerivation, base, criterion, doctest, doctest-driver-gen
+     , QuickCheck, tasty, tasty-quickcheck, vector
+     }:
+     mkDerivation {
+       pname = "simple-vec3";
+       version = "0.4.0.8";
+       sha256 = "0jikq60ixk21gb7j3rayxqha73m9vn4n8kz4799rcw5qiii7rr4a";
+       libraryHaskellDepends = [ base QuickCheck vector ];
+       testHaskellDepends = [
+         base doctest doctest-driver-gen tasty tasty-quickcheck
+       ];
+       benchmarkHaskellDepends = [ base criterion vector ];
+       description = "Three-dimensional vectors of doubles with basic operations";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "simple-zipper" = callPackage
     ({ mkDerivation, base, hspec, lens }:
      mkDerivation {
@@ -198544,6 +198648,7 @@ self: {
        ];
        description = "TensorFlow bindings";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {tensorflow = null;};
 
   "tensorflow-core-ops" = callPackage
@@ -198564,6 +198669,7 @@ self: {
        ];
        description = "Haskell wrappers for Core Tensorflow Ops";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tensorflow-logging" = callPackage
@@ -198591,6 +198697,7 @@ self: {
        ];
        description = "TensorBoard related functionality";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tensorflow-opgen" = callPackage
@@ -198608,6 +198715,7 @@ self: {
        ];
        description = "Code generation for TensorFlow operations";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tensorflow-ops" = callPackage
@@ -198637,6 +198745,7 @@ self: {
        ];
        description = "Friendly layer around TensorFlow bindings";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tensorflow-proto" = callPackage
@@ -198652,6 +198761,7 @@ self: {
        libraryToolDepends = [ protobuf ];
        description = "TensorFlow protocol buffers";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) protobuf;};
 
   "tensorflow-records" = callPackage
@@ -198668,6 +198778,7 @@ self: {
        ];
        description = "Encoder and decoder for the TensorFlow \"TFRecords\" format";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tensorflow-records-conduit" = callPackage
@@ -198684,6 +198795,7 @@ self: {
        ];
        description = "Conduit wrappers for TensorFlow.Records.";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tensorflow-test" = callPackage
@@ -209694,6 +209806,17 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "uploadtest" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "uploadtest";
+       version = "0.0.0";
+       sha256 = "17hi7ibasy0lhvzhv52k0dynvhxlsmywliymyygwk1jv740z1bdz";
+       libraryHaskellDepends = [ base ];
+       description = "Upload test";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "upskirt" = callPackage
     ({ mkDerivation, base, bytestring }:
      mkDerivation {
-- 
GitLab


From a09d16229e214e6dbb4c03b0b1130192612aa011 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Sat, 21 Jul 2018 08:05:27 -0700
Subject: [PATCH 255/297] xmr-stak: 2.4.5 -> 2.4.7

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/xmr-stak/versions.
---
 pkgs/applications/misc/xmr-stak/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/xmr-stak/default.nix b/pkgs/applications/misc/xmr-stak/default.nix
index 05530af1254..f90173f3528 100644
--- a/pkgs/applications/misc/xmr-stak/default.nix
+++ b/pkgs/applications/misc/xmr-stak/default.nix
@@ -12,13 +12,13 @@ in
 
 stdenv'.mkDerivation rec {
   name = "xmr-stak-${version}";
-  version = "2.4.5";
+  version = "2.4.7";
 
   src = fetchFromGitHub {
     owner = "fireice-uk";
     repo = "xmr-stak";
     rev = "${version}";
-    sha256 = "0ix4vqhcm4x9j5p6pwdfwkm2ml6wmwsyn3ppzvxllhp4dj8blzwf";
+    sha256 = "072gapchmd05ir5ygrvbgdhpjhm7pdjyl61n1ykxzvnvi81z6817";
   };
 
   NIX_CFLAGS_COMPILE = "-O3";
-- 
GitLab


From 932d2e4f94338b71fd5994e86919ba0295638571 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Sat, 21 Jul 2018 08:09:01 -0700
Subject: [PATCH 256/297] znc: 1.7.0 -> 1.7.1

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/znc/versions.
---
 pkgs/applications/networking/znc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/znc/default.nix b/pkgs/applications/networking/znc/default.nix
index b78c0ad09c3..80b1e9caeaa 100644
--- a/pkgs/applications/networking/znc/default.nix
+++ b/pkgs/applications/networking/znc/default.nix
@@ -9,11 +9,11 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "znc-${version}";
-  version = "1.7.0";
+  version = "1.7.1";
 
   src = fetchurl {
     url = "https://znc.in/releases/archive/${name}.tar.gz";
-    sha256 = "0vxra50418bsjfdpf8vl70fijv8syvasjqdxfyjliff6k91k2zn0";
+    sha256 = "1i1r1lh9q2mr1bg520zrvrlwhrhy6wibrin78wjxq1gab1qymks4";
   };
 
   nativeBuildInputs = [ pkgconfig ];
-- 
GitLab


From 1061ab1ccfd3b943885f88cf8f49b95be3a744c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9o=20Gaspard?= <leo@gaspard.io>
Date: Sun, 22 Jul 2018 00:12:54 +0900
Subject: [PATCH 257/297] todiff: 0.5.0 -> 0.6.1

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

diff --git a/pkgs/applications/misc/todiff/default.nix b/pkgs/applications/misc/todiff/default.nix
index 6af7fae3497..148d6b042f7 100644
--- a/pkgs/applications/misc/todiff/default.nix
+++ b/pkgs/applications/misc/todiff/default.nix
@@ -2,16 +2,18 @@
 
 rustPlatform.buildRustPackage rec {
   name = "todiff-${version}";
-  version = "0.5.0";
+  version = "0.6.1";
 
   src = fetchFromGitHub {
     owner = "Ekleog";
     repo = "todiff";
     rev = version;
-    sha256 = "0xnqw98nccnkqfdmbkblm897v981rw1fagbi5q895bpwfg0p71lk";
+    sha256 = "1y0v8nkaqb8kn61xwarpbyrq019gxx1f5f5p1hzw73nqxadc1rcm";
   };
 
-  cargoSha256 = "0ih7lw5hbayvc66fjqwga0i7l3sb9qn0m26vnham5li39f5i3rqp";
+  cargoSha256 = "1r7l9zbw6kq8yb5cv6h0qgl2gp71bkn9xv7b2n49a5r7by98jjqr";
+
+  checkPhase = "cargo test --features=integration_tests";
 
   meta = with stdenv.lib; {
     description = "Human-readable diff for todo.txt files";
-- 
GitLab


From 9882d5635c77353cda6e569e1b97a778dcc50c48 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Sat, 21 Jul 2018 08:39:53 -0700
Subject: [PATCH 258/297] tlaplusToolbox: 1.5.6 -> 1.5.7

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/tla-toolbox/versions.
---
 pkgs/applications/science/logic/tlaplus/toolbox.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/logic/tlaplus/toolbox.nix b/pkgs/applications/science/logic/tlaplus/toolbox.nix
index 5ce359dea0e..342d91cf582 100644
--- a/pkgs/applications/science/logic/tlaplus/toolbox.nix
+++ b/pkgs/applications/science/logic/tlaplus/toolbox.nix
@@ -3,7 +3,7 @@
 }:
 
 let
-  version = "1.5.6";
+  version = "1.5.7";
   arch = "x86_64";
 
   desktopItem = makeDesktopItem rec {
@@ -24,7 +24,7 @@ in stdenv.mkDerivation {
   name = "tla-toolbox-${version}";
   src = fetchzip {
     url = "https://tla.msr-inria.inria.fr/tlatoolbox/products/TLAToolbox-${version}-linux.gtk.${arch}.zip";
-    sha256 = "1h63mcbrkf4jcg6qncpqffdi0x665z0wlfdq43d67p411xcqmbw9";
+    sha256 = "0lg9sizpw5mkcnwwvmgqigkizjyz2lf1wrg48h7mg7wcv3macy4q";
   };
 
   buildInputs = [ makeWrapper  ];
-- 
GitLab


From 2bf47aa2b8f8afb3e1a9dda71bbaea1d05202627 Mon Sep 17 00:00:00 2001
From: Periklis Tsirakidis <periklis.tsirakidis@holidaycheck.com>
Date: Sat, 21 Jul 2018 17:45:08 +0200
Subject: [PATCH 259/297] orgit: add git to native build inputs

---
 pkgs/applications/editors/emacs-modes/melpa-packages.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
index 3d432158651..e8e69dcfbb3 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
@@ -151,6 +151,13 @@ self:
       # missing OCaml
       ocp-indent = markBroken super.ocp-indent;
 
+      orgit =
+        (super.orgit.overrideAttrs (attrs: {
+          # searches for Git at build time
+          nativeBuildInputs =
+            (attrs.nativeBuildInputs or []) ++ [ external.git ];
+         }));
+
       # upstream issue: missing dependency
       org-readme = markBroken super.org-readme;
 
-- 
GitLab


From 83cfb086547b6152387f64bb3cacad99fe882135 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Sat, 21 Jul 2018 08:55:50 -0700
Subject: [PATCH 260/297] tiled: 1.1.5 -> 1.1.6

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/tiled/versions.
---
 pkgs/applications/editors/tiled/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/tiled/default.nix b/pkgs/applications/editors/tiled/default.nix
index b23db38e0f4..982e189583e 100644
--- a/pkgs/applications/editors/tiled/default.nix
+++ b/pkgs/applications/editors/tiled/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   name = "tiled-${version}";
-  version = "1.1.5";
+  version = "1.1.6";
 
   src = fetchFromGitHub {
     owner = "bjorn";
     repo = "tiled";
     rev = "v${version}";
-    sha256 = "1l8sx0qfkm7n2ag0ns01vrs8mzcxzva00in4xqz4zgd505qx5q9v";
+    sha256 = "09qnlinm3q9xwp6b6cajs49fx8y6pkpixhji68bhs53m5hpvfg4s";
   };
 
   nativeBuildInputs = [ pkgconfig qmake ];
-- 
GitLab


From 564e733a520f81ccdeccf7ceb2113594df532772 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Sat, 21 Jul 2018 09:12:39 -0700
Subject: [PATCH 261/297] wireshark-gtk: 2.6.1 -> 2.6.2

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/wireshark-gtk/versions.
---
 pkgs/applications/networking/sniffers/wireshark/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix
index ef1dade4ddd..dbd6a93d68f 100644
--- a/pkgs/applications/networking/sniffers/wireshark/default.nix
+++ b/pkgs/applications/networking/sniffers/wireshark/default.nix
@@ -12,7 +12,7 @@ assert withQt  -> !withGtk && qt5  != null;
 with stdenv.lib;
 
 let
-  version = "2.6.1";
+  version = "2.6.2";
   variant = if withGtk then "gtk" else if withQt then "qt" else "cli";
 
 in stdenv.mkDerivation {
@@ -20,7 +20,7 @@ in stdenv.mkDerivation {
 
   src = fetchurl {
     url = "https://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.xz";
-    sha256 = "126dvd6myjbxjr69dy9vzzdda2lmjy1wwwc6gcs5djb46jy5nvmb";
+    sha256 = "153h6prxamv5a62f3pfadkry0y57696xrgxfy2gfy5xswdg8kcj9";
   };
 
   cmakeFlags = [
-- 
GitLab


From b657f663ac631d85594006baead1e2cd7196e393 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Sat, 21 Jul 2018 09:56:00 -0700
Subject: [PATCH 262/297] subversion_1_10: 1.10.0 -> 1.10.2

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/subversion/versions.
---
 pkgs/applications/version-management/subversion/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix
index 8cbfe1ec161..fc98b398213 100644
--- a/pkgs/applications/version-management/subversion/default.nix
+++ b/pkgs/applications/version-management/subversion/default.nix
@@ -117,8 +117,8 @@ in {
   };
 
   subversion_1_10 = common {
-    version = "1.10.0";
-    sha256 = "115mlvmf663w16mc3xyypnaizq401vbypc56hl2ylzc3pcx3zwic";
+    version = "1.10.2";
+    sha256 = "127dysfc31q4dhbbxaznh9kqixy9jd44kgwji2gdwj6rb2lf6dav";
     extraBuildInputs = [ lz4 utf8proc ];
   };
 }
-- 
GitLab


From dddac8b684b9113666b2c6eee845c59ce4a867df Mon Sep 17 00:00:00 2001
From: Aneesh Agrawal <aneeshusa@gmail.com>
Date: Thu, 19 Jul 2018 00:34:32 -0700
Subject: [PATCH 263/297] gtk-doc: support python3

---
 pkgs/development/tools/documentation/gtk-doc/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/documentation/gtk-doc/default.nix b/pkgs/development/tools/documentation/gtk-doc/default.nix
index 32025edb306..8ec6aec9918 100644
--- a/pkgs/development/tools/documentation/gtk-doc/default.nix
+++ b/pkgs/development/tools/documentation/gtk-doc/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   # Make six available for binaries, python.withPackages creates a wrapper
   # but scripts are not allowed in shebangs so we link it into sys.path.
   postInstall = ''
-    ln -s ${python.pkgs.six}/lib/python2.7/site-packages/* $out/share/gtk-doc/python/
+    ln -s ${python.pkgs.six}/${python.sitePackages}/* $out/share/gtk-doc/python/
   '';
 
   doCheck = false; # requires a lot of stuff
-- 
GitLab


From 6c7e93c54ace3a7c6b6e8b53d2b9060e7fa38d42 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Sat, 21 Jul 2018 10:14:49 -0700
Subject: [PATCH 264/297] sidplayfp: 1.4.3 -> 1.4.4

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/sidplayfp/versions.
---
 pkgs/applications/audio/sidplayfp/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/sidplayfp/default.nix b/pkgs/applications/audio/sidplayfp/default.nix
index 2495759593c..b857c5b6835 100644
--- a/pkgs/applications/audio/sidplayfp/default.nix
+++ b/pkgs/applications/audio/sidplayfp/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, pkgconfig, libsidplayfp }:
 
 stdenv.mkDerivation rec {
-  version = "1.4.3";
+  version = "1.4.4";
   name = "sidplayfp-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/sidplay-residfp/sidplayfp/1.4/${name}.tar.gz";
-    sha256 = "04gqhxs4w0riabp1svgcs6gsxdmbfmrs4kaqr5lifvxjvv03vzsn";
+    sha256 = "0arsrg3f0fsinal22qjmj3r6500bcbgqnx26fsz049ldl716kz1m";
   };
 
   nativeBuildInputs = [ pkgconfig ];
-- 
GitLab


From c04fb0a9c55aca2b4b24c252dbe62909e8036f87 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Sat, 21 Jul 2018 16:31:05 +0000
Subject: [PATCH 265/297] far2l: 2018-02-27 -> 2018-07-19

---
 .../far2l/add-nix-syntax-highlighting.patch   | 158 ------------------
 pkgs/applications/misc/far2l/default.nix      |  22 ++-
 2 files changed, 14 insertions(+), 166 deletions(-)
 delete mode 100644 pkgs/applications/misc/far2l/add-nix-syntax-highlighting.patch

diff --git a/pkgs/applications/misc/far2l/add-nix-syntax-highlighting.patch b/pkgs/applications/misc/far2l/add-nix-syntax-highlighting.patch
deleted file mode 100644
index a50070c4ead..00000000000
--- a/pkgs/applications/misc/far2l/add-nix-syntax-highlighting.patch
+++ /dev/null
@@ -1,158 +0,0 @@
-diff --git a/colorer/configs/base/hrc/nix.hrc b/colorer/configs/base/hrc/nix.hrc
-new file mode 100644
-index 0000000..1bd9bb5
---- /dev/null
-+++ b/colorer/configs/base/hrc/nix.hrc
-@@ -0,0 +1,132 @@
-+<?xml version="1.0" encoding="windows-1251"?>
-+<!DOCTYPE hrc PUBLIC "-//Cail Lomecb//DTD Colorer HRC take5//EN"
-+  "http://colorer.sf.net/2003/hrc.dtd">
-+<hrc version="take5" xmlns="http://colorer.sf.net/2003/hrc"
-+     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+     xsi:schemaLocation="http://colorer.sf.net/2003/hrc http://colorer.sf.net/2003/hrc.xsd">
-+
-+  <type name="nix">
-+
-+    <annotation><documentation>
-+        Nix
-+    </documentation></annotation>
-+
-+    <import type="def"/>
-+
-+    <region name="Code" parent="def:Text"/>
-+    <region name="StringEscape" parent="def:StringContent"/>
-+    <region name='Import' parent='def:Directive'/>
-+    <region name='ImportOutline' parent='def:Outlined'/>
-+    <region name="Path"     parent="def:Path"/>
-+    <region name="URL"      parent="def:String"/>
-+    <region name="LiteralKeyword" parent="def:Keyword"/>
-+    <region name='Interpolation' parent='def:StringEdge'/>
-+    <region name="Ident" parent="def:Identifier"/> <!-- Label  -->
-+
-+    <scheme name="TabsAsErrors" if="tabs-as-errors">
-+      <regexp match="/\t+/" region='def:Error'/>
-+    </scheme>
-+
-+    <scheme name="SpacesAsErrors" if="spaces-as-errors">
-+      <regexp match="/\x20+$/" region='def:Error'/>
-+    </scheme>
-+
-+    <scheme name="NotNestedComment">
-+      <inherit scheme="TabsAsErrors"/>
-+      <inherit scheme="SpacesAsErrors"/>
-+      <inherit scheme="Comment"/>
-+    </scheme>
-+
-+    <scheme name="String">
-+      <inherit scheme="TabsAsErrors"/>
-+      <inherit scheme="SpacesAsErrors"/>
-+<!--  <regexp match="/\\[xX]0*[\da-fA-F]{1,2}/"                   region0="StringEscape"/> -->
-+      <regexp match="/\\./"                                       region0="StringEscape"/>
-+      <block start="/(\$\{)/" end="/(\})/" scheme="NixExpression" region="Code" region00="Interpolation" region01="PairStart" region10="Interpolation" region11="PairEnd"/>
-+    </scheme>
-+
-+    <scheme name="BlockString">
-+      <inherit scheme="TabsAsErrors"/>
-+      <inherit scheme="SpacesAsErrors"/>
-+
-+      <regexp match="/&apos;&apos;\$/"                                          region0="StringEscape"/>
-+      <regexp match="/&apos;&apos;&apos;/"                                      region0="StringEscape"/>
-+      <block start="/(\$\{)/" end="/(\})/" scheme="NixExpression" region="Code" region00="Interpolation" region01="PairStart" region10="Interpolation" region11="PairEnd"/>
-+    </scheme>
-+
-+    <scheme name="NixIdent">
-+      <regexp match="/\w[\w\d-]*'*/"           region0="Ident"/>
-+    </scheme>
-+
-+    <scheme name="NixExpression">
-+      <inherit scheme="TabsAsErrors"/>
-+      <inherit scheme="SpacesAsErrors"/>
-+
-+      <inherit scheme="def:unixCommentDirective"/>
-+      <block start="/#/"    end="/\s*$/"            scheme="Comment"          region="LineComment" region10="def:Error"/>
-+      <block start="/\/\*/" end="/\*\//"            scheme="NotNestedComment" region="Comment"     region00="PairStart" region10="PairEnd"/>
-+
-+      <block start="/(\$\{)/" end="/(\})/" scheme="NixExpression" region00="Interpolation" region01="PairStart" region10="Interpolation" region11="PairEnd"/>
-+      <block start="/(\{)/"   end="/(\})/" scheme="NixExpression" region00="Symbol"        region01="PairStart" region10="Symbol"        region11="PairEnd"/>
-+      <block start="/(\()/"   end="/(\))/" scheme="NixExpression" region00="Symbol"        region01="PairStart" region10="Symbol"        region11="PairEnd"/>
-+      <block start="/(\[)/"   end="/(\])/" scheme="NixExpression" region00="Symbol"        region01="PairStart" region10="Symbol"        region11="PairEnd"/>
-+
-+      <regexp match="/[\w\d.+=?~-]*(\/[\w\d.+?~-]+)+/"                          region0="Path"/>
-+      <regexp match="/&lt;[\w\d\/.+?~-]+&gt;/"                                  region0="Path"/>
-+      <regexp match="/(ftp|mirror|http|https|git):\/\/[\w\d\/:?=&amp;.~+-]+/"   region0="URL"/>
-+      <block start="/(&quot;)/"       end="/(&quot;)/"       scheme="String"      region="String" region00="def:StringEdge" region01="def:PairStart" region10="def:StringEdge" region11="def:PairEnd"/>
-+      <block start="/(&apos;&apos;)/" end="/(&apos;&apos;)/" scheme="BlockString" region="String" region00="def:StringEdge" region01="def:PairStart" region10="def:StringEdge" region11="def:PairEnd"/>
-+
-+      <keywords region="Keyword">
-+        <word name="assert"/>
-+        <word name="else"/>
-+        <word name="if"/>
-+        <word name="in"/>
-+        <word name="inherit"/>
-+        <word name="import"/>
-+        <word name="let"/>
-+        <word name="or"/>
-+        <word name="rec"/>
-+        <word name="then"/>
-+        <word name="throw"/>
-+        <word name="with"/>
-+      </keywords>
-+      <keywords region="LiteralKeyword">
-+        <word name="true"/>
-+        <word name="false"/>
-+        <word name="null"/>
-+      </keywords>
-+      <keywords region="Symbol">
-+        <symb name="."/>
-+        <symb name=":"/>
-+        <symb name=","/>
-+        <symb name=";"/>
-+
-+        <symb name="*"/>
-+        <symb name="/"/>
-+        <symb name="%"/>
-+        <symb name="+"/>
-+        <symb name="-"/>
-+        <symb name="!"/>
-+        <symb name="?"/>
-+        <symb name="@"/>
-+        <symb name="&lt;"/>
-+        <symb name="&gt;"/>
-+        <symb name="&amp;"/>
-+        <symb name="|"/>
-+        <symb name="="/>
-+        <symb name="..."/>
-+      </keywords>
-+
-+      <inherit scheme="def:Number"/>
-+      <inherit scheme="NixIdent"/>
-+
-+      <regexp match="/[^\)\}\]\s]/" region='def:Error'/>
-+
-+    </scheme>
-+
-+    <scheme name="nix">
-+      <inherit scheme="NixExpression"/>
-+    </scheme>
-+
-+  </type>
-+</hrc>
-diff --git a/colorer/configs/base/hrc/proto.hrc b/colorer/configs/base/hrc/proto.hrc
-index 11e493b..2a67263 100644
---- a/colorer/configs/base/hrc/proto.hrc
-+++ b/colorer/configs/base/hrc/proto.hrc
-@@ -156,6 +156,14 @@
-     <location link="jar:common.jar!base/lua.hrc"/>
-     <filename>/\.(w?lua)$/i</filename>
-   </prototype>
-+  <prototype name="nix" group="main" description="Nix">
-+    <location link="nix.hrc"/>
-+    <filename>/\.(nix)$/i</filename>
-+    <parameters>
-+      <param name="tabs-as-errors" value="true" description="Shows tabulation symbol as error"/>
-+      <param name="spaces-as-errors" value="true" description="Shows trailing spaces as error"/>
-+    </parameters>
-+  </prototype>
-   <prototype name="ruby" group="main" description="Ruby">
-     <location link="jar:common.jar!base/ruby.hrc"/>
-     <filename>/\.(rb|rbw|ruby|rake)$/i</filename>
diff --git a/pkgs/applications/misc/far2l/default.nix b/pkgs/applications/misc/far2l/default.nix
index d8a0c53d9e1..3cdd4fb0bfe 100644
--- a/pkgs/applications/misc/far2l/default.nix
+++ b/pkgs/applications/misc/far2l/default.nix
@@ -1,17 +1,16 @@
-{ stdenv, fetchFromGitHub, makeWrapper, cmake, pkgconfig, wxGTK30, glib, pcre, m4, bash,
+{ stdenv, fetchFromGitHub, fetchpatch, makeWrapper, cmake, pkgconfig, wxGTK30, glib, pcre, m4, bash,
   xdg_utils, gvfs, zip, unzip, gzip, bzip2, gnutar, p7zip, xz, imagemagick, darwin }:
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  rev = "819d131110a9fedfc14f3b3bea8f1f56e68b077a";
-  build = "unstable-2018-02-27.git${builtins.substring 0 7 rev}";
+  build = "unstable-2018-07-19.git${builtins.substring 0 7 src.rev}";
   name = "far2l-2.1.${build}";
 
   src = fetchFromGitHub {
     owner = "elfmz";
     repo = "far2l";
-    rev = rev;
-    sha256 = "1xjy2ricd68pm9j758pb2axc2269ns2xh86443x5llfcaxrjja4b";
+    rev = "dceaa3918ea2c5e43600bad3fc63f861b8d26fc4";
+    sha256 = "1ssd3hwz4b7vl4r858d9whl61cn23pgcamcjmvfa6ysf4x2b7sgi";
   };
 
   nativeBuildInputs = [ cmake pkgconfig m4 makeWrapper imagemagick ];
@@ -19,10 +18,8 @@ stdenv.mkDerivation rec {
   buildInputs = [ wxGTK30 glib pcre ]
     ++ optional stdenv.isDarwin darwin.apple_sdk.frameworks.Cocoa;
 
-  patches = [ ./add-nix-syntax-highlighting.patch ];
-
   postPatch = optionalString stdenv.isLinux ''
-    substituteInPlace far2l/bootstrap/open.sh \
+    substituteInPlace far2l/bootstrap/trash.sh \
       --replace 'gvfs-trash'  '${gvfs}/bin/gvfs-trash'
   '' + optionalString stdenv.isDarwin ''
     substituteInPlace far2l/CMakeLists.txt \
@@ -44,6 +41,15 @@ stdenv.mkDerivation rec {
       --replace '"gzip '      '"${gzip}/bin/gzip '         \
       --replace '"bzip2 '     '"${bzip2}/bin/bzip2 '       \
       --replace '"tar '       '"${gnutar}/bin/tar '
+
+    ( cd colorer/configs/base
+      patch -p2 <  ${ fetchpatch {
+                        name   = "nix-language-highlighting.patch";
+                        url    = https://github.com/colorer/Colorer-schemes/commit/64bd06de0a63224b431cd8fc42cd9fa84b8ba7c0.patch;
+                        sha256 = "1mrj1wyxmk7sll9j1jzw6miwi0sfavf654klms24wngnh6hadsch";
+                      }
+                    }
+    )
   '';
 
   installPhase = ''
-- 
GitLab


From 7ffed91faf7ae50573e08690d3f1963d827575a5 Mon Sep 17 00:00:00 2001
From: Oyren <m.scheuren@oyra.eu>
Date: Sat, 21 Jul 2018 20:20:12 +0200
Subject: [PATCH 266/297] write_stylus: add desktop icon (#43864)

---
 .../applications/graphics/write_stylus/default.nix | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/graphics/write_stylus/default.nix b/pkgs/applications/graphics/write_stylus/default.nix
index 231a9799b59..9fd464f4620 100644
--- a/pkgs/applications/graphics/write_stylus/default.nix
+++ b/pkgs/applications/graphics/write_stylus/default.nix
@@ -6,7 +6,8 @@ stdenv.mkDerivation rec {
   desktopItem = makeDesktopItem {
     name = "Write";
     exec = "Write";
-    comment = "a word processor for hadwriting";
+    comment = "A word processor for handwriting";
+    icon = "write_stylus";
     desktopName = "Write";
     genericName = "Write";
     categories = "Office;Graphics";
@@ -16,6 +17,14 @@ stdenv.mkDerivation rec {
     url = "http://www.styluslabs.com/write/write${version}.tar.gz";
     sha256 = "1p6glp4vdpwl8hmhypayc4cvs3j9jfmjfhhrgqm2xkgl5bfbv2qd";
   };
+
+  # taken from: https://www.iconfinder.com/icons/50835/edit_pencil_write_icon
+  # license: Free for commercial use
+  icon = fetchurl {
+    url = "https://oyra.eu/write/icon.tar.gz";
+    sha256 = "1zd98g63apwi17qc1hm1g14maain5d18g4afadxm30qjz2s0mvs8";
+  };
+
   sourceRoot = ".";
 
   dontBuild = true;
@@ -26,6 +35,9 @@ stdenv.mkDerivation rec {
     # symlink the binary to bin/
     ln -s $out/Write/Write $out/bin/Write
 
+    # untar icons
+    tar -xzf ${icon} *.tar.gz -C $out/
+
     mkdir -p $out/share/applications
     ln -s ${desktopItem}/share/applications/* $out/share/applications/
   '';
-- 
GitLab


From 452017032ac8af0c5e09d5abbf7a562ae524fea7 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sat, 21 Jul 2018 20:17:47 +0200
Subject: [PATCH 267/297] fix Merge 8213ff161c461655aaff7d43984384dbca64b312

cc @FRidh
---
 pkgs/applications/misc/terminus/default.nix      | 5 ++---
 pkgs/desktops/gnome-2/platform/GConf/default.nix | 6 ++----
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/misc/terminus/default.nix b/pkgs/applications/misc/terminus/default.nix
index 2f7f90e580d..c12a4c9f8da 100644
--- a/pkgs/applications/misc/terminus/default.nix
+++ b/pkgs/applications/misc/terminus/default.nix
@@ -1,15 +1,14 @@
-{ stdenv, lib, fetchurl, dpkg, gnome3, gtk2, atk, glib, pango, gdk_pixbuf, cairo
+{ stdenv, lib, fetchurl, dpkg, gnome2, gtk2, atk, glib, pango, gdk_pixbuf, cairo
 , freetype, fontconfig, dbus, libXi, libXcursor, libXdamage, libXrandr
 , libXcomposite, libXext, libXfixes, libXrender, libX11, libXtst, libXScrnSaver
 , libxcb, makeWrapper, nodejs
 , nss, nspr, alsaLib, cups, expat, systemd, libpulseaudio }:
 
-# FIXME: gnome3.gconf was unavailable when merging master into staging-next
 let
   libPath = stdenv.lib.makeLibraryPath [
     stdenv.cc.cc gtk2 atk glib pango gdk_pixbuf cairo freetype fontconfig dbus
     libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes libxcb
-    libXrender libX11 libXtst libXScrnSaver nss nspr alsaLib cups expat systemd libpulseaudio
+    libXrender libX11 libXtst libXScrnSaver gnome2.GConf nss nspr alsaLib cups expat systemd libpulseaudio
   ];
 in
 stdenv.mkDerivation rec {
diff --git a/pkgs/desktops/gnome-2/platform/GConf/default.nix b/pkgs/desktops/gnome-2/platform/GConf/default.nix
index b37436e250b..afba6e15ebd 100644
--- a/pkgs/desktops/gnome-2/platform/GConf/default.nix
+++ b/pkgs/desktops/gnome-2/platform/GConf/default.nix
@@ -1,6 +1,5 @@
 { stdenv, fetchurl, pkgconfig, dbus-glib, glib, ORBit2, libxml2
-, polkit, intltool, dbus, gtk2 ? null, withGtk ? false }:
-
+, polkit, intltool }:
 
 stdenv.mkDerivation rec {
   name = "gconf-${version}";
@@ -13,8 +12,7 @@ stdenv.mkDerivation rec {
 
   outputs = [ "out" "dev" "man" ];
 
-  buildInputs = [ ORBit2 dbus dbus-glib libxml2 ]
-
+  buildInputs = [ ORBit2 libxml2 ]
     # polkit requires pam, which requires shadow.h, which is not available on
     # darwin
     ++ stdenv.lib.optional (!stdenv.isDarwin) polkit;
-- 
GitLab


From ec67dfb40aac25ac813fec0867f879394c849f9a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Sat, 21 Jul 2018 12:23:19 -0700
Subject: [PATCH 268/297] powershell: 6.0.2 -> 6.0.3

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/powershell/versions.
---
 pkgs/shells/powershell/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/shells/powershell/default.nix b/pkgs/shells/powershell/default.nix
index a053884bb88..3b711f6d863 100644
--- a/pkgs/shells/powershell/default.nix
+++ b/pkgs/shells/powershell/default.nix
@@ -5,7 +5,7 @@ let platformString = if stdenv.isDarwin then "osx"
                      else if stdenv.isLinux then "linux"
                      else throw "unsupported platform";
     platformSha = if stdenv.isDarwin then "1ga4p8xmrxa54v2s6i0q1q7lx2idcmp1jwm0g4jxr54fyn5ay3lf"
-                     else if stdenv.isLinux then "000mmv5iblnmwydfdvg5izli3vpb6l14xy4qy3smcikpf0h87fhl"
+                     else if stdenv.isLinux then "1bv1yjk3rm1czibqagmh719m4r1x8j8bmh3nw40x7izm2sx0qg7v"
                      else throw "unsupported platform";
     platformLdLibraryPath = if stdenv.isDarwin then "DYLD_FALLBACK_LIBRARY_PATH"
                      else if stdenv.isLinux then "LD_LIBRARY_PATH"
@@ -14,7 +14,7 @@ let platformString = if stdenv.isDarwin then "osx"
 in
 stdenv.mkDerivation rec {
   name = "powershell-${version}";
-  version = "6.0.2";
+  version = "6.0.3";
 
   src = fetchzip {
     url = "https://github.com/PowerShell/PowerShell/releases/download/v${version}/powershell-${version}-${platformString}-x64.tar.gz";
-- 
GitLab


From 668047ca55f17dd932e815e73bb567346e412e5c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Sat, 21 Jul 2018 12:28:41 -0700
Subject: [PATCH 269/297] picard-tools: 2.18.9 -> 2.18.10

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/picard-tools/versions.
---
 pkgs/applications/science/biology/picard-tools/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/biology/picard-tools/default.nix b/pkgs/applications/science/biology/picard-tools/default.nix
index eea889cb4ab..a08a54c94ec 100644
--- a/pkgs/applications/science/biology/picard-tools/default.nix
+++ b/pkgs/applications/science/biology/picard-tools/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "picard-tools-${version}";
-  version = "2.18.9";
+  version = "2.18.10";
 
   src = fetchurl {
     url = "https://github.com/broadinstitute/picard/releases/download/${version}/picard.jar";
-    sha256 = "0mmyzw75szjycncrgilj1kly3ldawqndxy59059qc8ddbiwn1zky";
+    sha256 = "1px5ar6iizm4czpc66hyyafandw6g9x9s1abj8klc78alvihciw4";
   };
 
   buildInputs = [ jre makeWrapper ];
-- 
GitLab


From f1349908a60a5684457b6c3a729900386d342a74 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Sat, 21 Jul 2018 12:33:09 -0700
Subject: [PATCH 270/297] peru: 1.1.3 -> 1.1.4

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/peru/versions.
---
 pkgs/applications/version-management/peru/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/peru/default.nix b/pkgs/applications/version-management/peru/default.nix
index 3ac52a5c440..225dd367609 100644
--- a/pkgs/applications/version-management/peru/default.nix
+++ b/pkgs/applications/version-management/peru/default.nix
@@ -2,13 +2,13 @@
 
 python3Packages.buildPythonApplication rec {
   name = "peru-${version}";
-  version = "1.1.3";
+  version = "1.1.4";
 
   src = fetchFromGitHub {
     owner = "buildinspace";
     repo = "peru";
     rev = "${version}";
-    sha256 = "02kr3ib3ppbmcsjy8i8z41vp9gw9gdivy2l5aps12lmaa3rc6727";
+    sha256 = "0mzmi797f2h2wy36q4ab701ixl5zy4m0pp1wp9abwdfg2y6qhmnk";
   };
 
   propagatedBuildInputs = with python3Packages; [ pyyaml docopt ];
-- 
GitLab


From 420a813b93e1af08229def08688a0d61e3ed8448 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Sat, 21 Jul 2018 13:02:09 -0700
Subject: [PATCH 271/297] passExtensions.pass-import: 2.2 -> 2.3

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/pass-import/versions.
---
 pkgs/tools/security/pass/extensions/import.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/pass/extensions/import.nix b/pkgs/tools/security/pass/extensions/import.nix
index 9e69cf37621..0ee775bfbe8 100644
--- a/pkgs/tools/security/pass/extensions/import.nix
+++ b/pkgs/tools/security/pass/extensions/import.nix
@@ -5,13 +5,13 @@ let
 
 in stdenv.mkDerivation rec {
   name = "pass-import-${version}";
-  version = "2.2";
+  version = "2.3";
 
   src = fetchFromGitHub {
     owner = "roddhjav";
     repo = "pass-import";
     rev = "v${version}";
-    sha256 = "189wf2jz2j43k27930cnl53sm2drh1s0nq1nmh4is3rzn8cna6wq";
+    sha256 = "1209aqkiqqbir5yzwk5jvyk8c1fyrsj9igr3n4banf347rlwmzfv";
   };
 
   nativeBuildInputs = [ makeWrapper ];
-- 
GitLab


From e975814b19ba8cb8052a60f18de2ee4aebe1190b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Sat, 21 Jul 2018 13:12:12 -0700
Subject: [PATCH 272/297] ocamlPackages.utop: 2.1.0 -> 2.2.0

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/utop/versions.
---
 pkgs/development/tools/ocaml/utop/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/ocaml/utop/default.nix b/pkgs/development/tools/ocaml/utop/default.nix
index 74f450a9e3a..1341e071842 100644
--- a/pkgs/development/tools/ocaml/utop/default.nix
+++ b/pkgs/development/tools/ocaml/utop/default.nix
@@ -7,12 +7,12 @@ then throw "utop is not available for OCaml ${ocaml.version}"
 else
 
 stdenv.mkDerivation rec {
-  version = "2.1.0";
+  version = "2.2.0";
   name = "utop-${version}";
 
   src = fetchurl {
     url = "https://github.com/diml/utop/archive/${version}.tar.gz";
-    sha256 = "0lpfyhnm4v3xmcpac76g1px3x7na4p29w6xj2q8chqxhcw131n2y";
+    sha256 = "1414snwmqaxs1x8wbpjf6fn3jsl01hq0phrr7639xmb5vh15mgd4";
   };
 
   nativeBuildInputs = [ makeWrapper ];
-- 
GitLab


From 8ef4bf669caf56fb9139bb4c7aaef2336a5c8472 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Sat, 21 Jul 2018 13:24:45 -0700
Subject: [PATCH 273/297] ola: 0.10.6 -> 0.10.7

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/ola/versions.
---
 pkgs/applications/misc/ola/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/ola/default.nix b/pkgs/applications/misc/ola/default.nix
index 9e460bf2611..792cff81865 100644
--- a/pkgs/applications/misc/ola/default.nix
+++ b/pkgs/applications/misc/ola/default.nix
@@ -5,13 +5,13 @@
 
 stdenv.mkDerivation rec {
   name = "ola-${version}";
-  version = "0.10.6";
+  version = "0.10.7";
 
   src = fetchFromGitHub {
     owner = "OpenLightingProject";
     repo = "ola";
     rev = version;
-    sha256 = "1qazhkcakvzkf1dvav0alk33aaklawf8vckgwpf6fvwf7g2kyh63";
+    sha256 = "18krwrw7w1qzwih8gnmv7r4sah5ppvq7ax65r7l5yjxn3ihwp2kf";
   };
 
   nativeBuildInputs = [ autoreconfHook bison flex pkgconfig perl ];
-- 
GitLab


From 7f6ebfe84d17498cddca146a28c46df3a91cdfeb Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Sat, 21 Jul 2018 13:32:42 -0700
Subject: [PATCH 274/297] opencollada: 1.6.62 -> 1.6.63

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/opencollada/versions.
---
 pkgs/development/libraries/opencollada/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/opencollada/default.nix b/pkgs/development/libraries/opencollada/default.nix
index fb119936703..a0a39980d45 100644
--- a/pkgs/development/libraries/opencollada/default.nix
+++ b/pkgs/development/libraries/opencollada/default.nix
@@ -4,13 +4,13 @@
 stdenv.mkDerivation rec {
   name = "opencollada-${version}";
 
-  version = "1.6.62";
+  version = "1.6.63";
 
   src = fetchFromGitHub {
     owner = "KhronosGroup";
     repo = "OpenCOLLADA";
     rev = "v${version}";
-    sha256 = "0bqki6sdvxsp9drzj87ma6n7m98az9pr0vyxhgw8b8b9knk8c48r";
+    sha256 = "1x8hz5nkz4lxsf17jv8sdl92dmbbpkqck8jkkc6g32d8gbs3gha1";
   };
 
   nativeBuildInputs = [ pkgconfig ];
-- 
GitLab


From 0e0f49438e8fd40e3f0d03517ea5edaa144e69f1 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Sat, 21 Jul 2018 13:44:41 -0700
Subject: [PATCH 275/297] owncloud-client: 2.4.1 -> 2.4.2

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/owncloud-client/versions.
---
 pkgs/applications/networking/owncloud-client/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/owncloud-client/default.nix b/pkgs/applications/networking/owncloud-client/default.nix
index 17c5cc86fa6..d5966845a0b 100644
--- a/pkgs/applications/networking/owncloud-client/default.nix
+++ b/pkgs/applications/networking/owncloud-client/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "owncloud-client-${version}";
-  version = "2.4.1";
+  version = "2.4.2";
 
   src = fetchurl {
     url = "https://download.owncloud.com/desktop/stable/owncloudclient-${version}.tar.xz";
-    sha256 = "4462ae581c281123dc62f3604f1aa54c8f4a60cd8157b982e2d76faac0f7aa23";
+    sha256 = "0pxga45fi7iyayy278hgl8x099isz6d7x1jq57p2m9qlsvfx8ap5";
   };
 
   patches = [ ./find-sql.patch ];
-- 
GitLab


From 3530c39b97ac4b587279933c404b64b7d69014f9 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <matthew.bauer@obsidian.systems>
Date: Fri, 20 Jul 2018 21:14:28 -0400
Subject: [PATCH 276/297] ncurses: add windows configure flags

these two flags are needed for windows support to work

- sp-funcs
- term-driver
---
 pkgs/development/libraries/ncurses/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix
index cf478837b86..042c09fd864 100644
--- a/pkgs/development/libraries/ncurses/default.nix
+++ b/pkgs/development/libraries/ncurses/default.nix
@@ -34,7 +34,11 @@ stdenv.mkDerivation rec {
   ] ++ lib.optional unicode "--enable-widec"
     ++ lib.optional enableStatic "--enable-static"
     ++ lib.optional (!withCxx) "--without-cxx"
-    ++ lib.optional (abiVersion == "5") "--with-abi-version=5";
+    ++ lib.optional (abiVersion == "5") "--with-abi-version=5"
+    ++ lib.optionals hostPlatform.isWindows [
+      "--enable-sp-funcs"
+      "--enable-term-driver"
+    ];
 
   # Only the C compiler, and explicitly not C++ compiler needs this flag on solaris:
   CFLAGS = lib.optionalString stdenv.isSunOS "-D_XOPEN_SOURCE_EXTENDED";
-- 
GitLab


From 522b61a069b1a856df23c558f780216b38aa5ed9 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <matthew.bauer@obsidian.systems>
Date: Fri, 20 Jul 2018 21:49:53 -0400
Subject: [PATCH 277/297] openssl: work with mingw32

---
 pkgs/development/libraries/openssl/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix
index 0251de77d03..47467ce4ede 100644
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -45,7 +45,9 @@ let
         if hostPlatform == buildPlatform
           then "./config"
         else if hostPlatform.isMinGW
-          then "./Configure mingw${toString hostPlatform.parsed.cpu.bits}"
+          then "./Configure mingw${optionalString
+                                     (hostPlatform.parsed.cpu.bits != 32)
+                                     (toString hostPlatform.parsed.cpu.bits)}"
         else if hostPlatform.isLinux
           then "./Configure linux-generic${toString hostPlatform.parsed.cpu.bits}"
         else if hostPlatform.isiOS
-- 
GitLab


From 53cb8dc09e56591fba8db76d3187a99e492f8d56 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <matthew.bauer@obsidian.systems>
Date: Fri, 20 Jul 2018 22:00:58 -0400
Subject: [PATCH 278/297] windows.libgnurx: init

---
 pkgs/os-specific/windows/libgnurx/default.nix | 11 +++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 13 insertions(+)
 create mode 100644 pkgs/os-specific/windows/libgnurx/default.nix

diff --git a/pkgs/os-specific/windows/libgnurx/default.nix b/pkgs/os-specific/windows/libgnurx/default.nix
new file mode 100644
index 00000000000..f50a0d9f503
--- /dev/null
+++ b/pkgs/os-specific/windows/libgnurx/default.nix
@@ -0,0 +1,11 @@
+{ stdenv, fetchurl }:
+
+let
+  version = "2.5.1";
+in stdenv.mkDerivation rec {
+  name = "libgnurx-${version}";
+  src = fetchurl {
+    url = "mirror://sourceforge/mingw/Other/UserContributed/regex/mingw-regex-${version}/mingw-${name}-src.tar.gz";
+    sha256 = "0xjxcxgws3bblybw5zsp9a4naz2v5bs1k3mk8dw00ggc0vwbfivi";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 91d2d5aaa56..de255678ca2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14546,6 +14546,8 @@ with pkgs;
     };
 
     wxMSW = callPackage ../os-specific/windows/wxMSW-2.8 { };
+
+    libgnurx = callPackage ../os-specific/windows/libgnurx { };
   };
 
   wirelesstools = callPackage ../os-specific/linux/wireless-tools { };
-- 
GitLab


From 09fed91ec8e084c4cdfd9e2363d65e8bb7c48091 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <matthew.bauer@obsidian.systems>
Date: Fri, 20 Jul 2018 22:02:00 -0400
Subject: [PATCH 279/297] file: build on windows

---
 pkgs/tools/misc/file/default.nix | 7 +++++--
 pkgs/top-level/all-packages.nix  | 4 +++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/file/default.nix b/pkgs/tools/misc/file/default.nix
index aeb43d7c115..485f46d0314 100644
--- a/pkgs/tools/misc/file/default.nix
+++ b/pkgs/tools/misc/file/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, file, zlib }:
+{ stdenv, fetchurl, file, zlib, libgnurx }:
 
 stdenv.mkDerivation rec {
   name = "file-${version}";
@@ -13,10 +13,13 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) file;
-  buildInputs = [ zlib ];
+  buildInputs = [ zlib ]
+              ++ stdenv.lib.optional stdenv.hostPlatform.isWindows libgnurx;
 
   doCheck = true;
 
+  makeFlags = if stdenv.hostPlatform.isWindows then "FILE_COMPILE=file"
+              else null;
 
   meta = with stdenv.lib; {
     homepage = http://darwinsys.com/file;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index de255678ca2..5c0e1ddb26e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2387,7 +2387,9 @@ with pkgs;
 
   figlet = callPackage ../tools/misc/figlet { };
 
-  file = callPackage ../tools/misc/file { };
+  file = callPackage ../tools/misc/file {
+    inherit (windows) libgnurx;
+  };
 
   filegive = callPackage ../tools/networking/filegive { };
 
-- 
GitLab


From b98b4eac71cfb0ccedc6d909fd58058bc1cb85e7 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <matthew.bauer@obsidian.systems>
Date: Fri, 20 Jul 2018 22:43:55 -0400
Subject: [PATCH 280/297] tests: add some cross tests

---
 pkgs/test/cross/default.nix | 80 +++++++++++++++++++++++++++++++++++++
 pkgs/test/default.nix       |  2 +
 2 files changed, 82 insertions(+)
 create mode 100644 pkgs/test/cross/default.nix

diff --git a/pkgs/test/cross/default.nix b/pkgs/test/cross/default.nix
new file mode 100644
index 00000000000..6f41447ca76
--- /dev/null
+++ b/pkgs/test/cross/default.nix
@@ -0,0 +1,80 @@
+{ pkgs, pkgsCross, lib }:
+
+let
+
+  emulators = {
+    mingw32 = "WINEDEBUG=-all ${pkgs.winePackages.minimal}/bin/wine";
+    mingwW64 = "WINEDEBUG=-all ${pkgs.wineWowPackages.minimal}/bin/wine";
+    # TODO: add some qemu-based emulaltors here
+  };
+
+  getExecutable = pkgs: pkgFun: exec:
+    "${pkgFun pkgs}${exec}${pkgs.hostPlatform.extensions.executable}";
+
+  compareTest = { emulator, pkgFun, hostPkgs, crossPkgs, exec, args ? [] }: let
+    pkgName = (pkgFun hostPkgs).name;
+    args' = lib.concatStringsSep " " args;
+  in pkgs.runCommand "test-${pkgName}-${crossPkgs.hostPlatform.config}" {
+    nativeBuildInputs = [ pkgs.dos2unix ];
+  } ''
+    HOME=$(pwd)
+    mkdir -p $out
+
+    # We need to remove whitespace, unfortunately
+    # Windows programs use \r but Unix programs use \n
+
+    # find expected value natively
+    ${getExecutable hostPkgs pkgFun exec} ${args'} \
+      | dos2unix > $out/expected
+
+    # run emulator to get actual value
+    ${emulator} ${getExecutable crossPkgs pkgFun exec} ${args'} \
+      | dos2unix > $out/actual
+
+    if [ "$(cat $out/actual)" != "$(cat $out/expected)" ]; then
+      echo "${pkgName} did not output expected value:"
+      cat $out/expected
+      echo "instead it output:"
+      cat $out/actual
+      exit 1
+    else
+      echo "${pkgName} test passed"
+      echo "both produced output:"
+      cat $out/actual
+    fi
+  '';
+
+in
+
+lib.mapAttrs (name: emulator: let
+  crossPkgs = pkgsCross.${name};
+
+  # Apply some transformation on windows to get dlls in the right
+  # place. Unfortunately mingw doesn’t seem to be able to do linking
+  # properly.
+  platformFun = pkg: if crossPkgs.hostPlatform.isWindows then
+    pkgs.buildEnv {
+      name = "${pkg.name}-winlinks";
+      paths = [pkg] ++ pkg.buildInputs;
+    } else pkg;
+in {
+
+  hello = compareTest {
+    inherit emulator crossPkgs;
+    hostPkgs = pkgs;
+    exec = "/bin/hello";
+    pkgFun = pkgs: pkgs.hello;
+  };
+
+  file = compareTest {
+    inherit emulator crossPkgs;
+    hostPkgs = pkgs;
+    exec = "/bin/file";
+    args = [
+      "${pkgs.file}/share/man/man1/file.1.gz"
+      "${pkgs.dejavu_fonts}/share/fonts/truetype/DejaVuMathTeXGyre.ttf"
+    ];
+    pkgFun = pkgs: platformFun pkgs.file;
+  };
+
+}) emulators
diff --git a/pkgs/test/default.nix b/pkgs/test/default.nix
index 38f6cb8e564..d2e8e1c7314 100644
--- a/pkgs/test/default.nix
+++ b/pkgs/test/default.nix
@@ -23,4 +23,6 @@ with pkgs;
   cc-multilib-clang = callPackage ./cc-wrapper/multilib.nix { stdenv = clangMultiStdenv; };
 
   macOSSierraShared = callPackage ./macos-sierra-shared {};
+
+  cross = callPackage ./cross {};
 }
-- 
GitLab


From bc4c0c4f4d5e6ec52a8001443c3fe6ce00220697 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sat, 21 Jul 2018 17:09:21 -0400
Subject: [PATCH 281/297] pythonPackages.plaid-python: 2.3.0 -> 2.3.3 (#43905)

---
 pkgs/development/python-modules/plaid-python/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/plaid-python/default.nix b/pkgs/development/python-modules/plaid-python/default.nix
index 3676c676cc6..afbb5e2b567 100644
--- a/pkgs/development/python-modules/plaid-python/default.nix
+++ b/pkgs/development/python-modules/plaid-python/default.nix
@@ -1,12 +1,12 @@
 { lib, buildPythonPackage, fetchPypi, requests, pytest }:
 
 buildPythonPackage rec {
-  version = "2.3.0";
+  version = "2.3.3";
   pname = "plaid-python";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0kp0crzjginmga6qvwwppar5b2pbdvwryf6vdpxgx7kkwzv33w97";
+    sha256 = "0jblc0bvzcns1dmsax6n0cvdg8867hm7snvdxa2l7v305h6gssjw";
   };
 
   checkInputs = [ pytest ];
-- 
GitLab


From 4c1eb7fbe6cc2275b7aaa5091ace442115ae8602 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Sat, 21 Jul 2018 14:18:00 -0700
Subject: [PATCH 282/297] neovim-unwrapped: 0.3.0 -> 0.3.1

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/neovim-unwrapped/versions.
---
 pkgs/applications/editors/neovim/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix
index f47688b8280..3d9822a92a7 100644
--- a/pkgs/applications/editors/neovim/default.nix
+++ b/pkgs/applications/editors/neovim/default.nix
@@ -11,13 +11,13 @@ let
 
   neovim = stdenv.mkDerivation rec {
     name = "neovim-unwrapped-${version}";
-    version = "0.3.0";
+    version = "0.3.1";
 
     src = fetchFromGitHub {
       owner = "neovim";
       repo = "neovim";
       rev = "v${version}";
-      sha256 = "10c8y309fdwvr3d9n6vm1f2c0k6pzicnhc64l2dvbw1lnabp04vv";
+      sha256 = "19jy9nr2ffscli6wsysqkdvqvh7sgkkwhzkw3yypfrvg4pj9rl56";
     };
 
     enableParallelBuilding = true;
-- 
GitLab


From 0cf09556ebdfe5f393ee1f2033aacd9169853894 Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Wed, 18 Jul 2018 02:57:55 +0200
Subject: [PATCH 283/297] why3: 0.88.3 -> 1.0.0

---
 pkgs/applications/science/logic/why3/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/science/logic/why3/default.nix b/pkgs/applications/science/logic/why3/default.nix
index 202d52f0cc0..1ccc365498c 100644
--- a/pkgs/applications/science/logic/why3/default.nix
+++ b/pkgs/applications/science/logic/why3/default.nix
@@ -2,15 +2,15 @@
 
 stdenv.mkDerivation rec {
   name    = "why3-${version}";
-  version = "0.88.3";
+  version = "1.0.0";
 
   src = fetchurl {
-    url    = https://gforge.inria.fr/frs/download.php/file/37313/why3-0.88.3.tar.gz;
-    sha256 = "0limdqy9l5bjzwhdalcfdyh0b6laxgiphhvr4bby9p0030agssiy";
+    url    = https://gforge.inria.fr/frs/download.php/file/37604/why3-1.0.0.tar.gz;
+    sha256 = "18h00diw1c051v7ya0lv09ns5630qi9savwffx0652mcc4b4qpxn";
   };
 
   buildInputs = (with ocamlPackages; [
-      ocaml findlib lablgtk ocamlgraph zarith menhir ]) ++
+      ocaml findlib num lablgtk ocamlgraph zarith menhir ]) ++
     stdenv.lib.optionals (ocamlPackages.ocaml == coq.ocaml ) [
       coq coq.camlp5
     ];
-- 
GitLab


From a651155e4956c056a4a0da4cc4bd553dda025e93 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Sat, 21 Jul 2018 17:47:11 -0700
Subject: [PATCH 284/297] graylog: 2.4.5 -> 2.4.6

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/graylog/versions.
---
 pkgs/tools/misc/graylog/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/graylog/default.nix b/pkgs/tools/misc/graylog/default.nix
index 60e7f273a33..bcc4674ac0f 100644
--- a/pkgs/tools/misc/graylog/default.nix
+++ b/pkgs/tools/misc/graylog/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, makeWrapper, jre_headless }:
 
 stdenv.mkDerivation rec {
-  version = "2.4.5";
+  version = "2.4.6";
   name = "graylog-${version}";
 
   src = fetchurl {
     url = "https://packages.graylog2.org/releases/graylog/graylog-${version}.tgz";
-    sha256 = "0yb8r7f64s1m83dqw64yakxmlyn7d3kdi2rd9mpw3rnz4kqcarly";
+    sha256 = "07bm5zz6b58ig082l6rwvvryh7svkv8nxp0d6izjka5f7x6g9ypw";
   };
 
   dontBuild = true;
-- 
GitLab


From a7a3526f71e8e8f44258213f186d7d51557ec4f8 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Sat, 21 Jul 2018 17:57:51 -0700
Subject: [PATCH 285/297] gtkwave: 3.3.91 -> 3.3.92

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/gtkwave/versions.
---
 pkgs/applications/science/electronics/gtkwave/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/electronics/gtkwave/default.nix b/pkgs/applications/science/electronics/gtkwave/default.nix
index 3583c3dbd19..d4cf7f5ea90 100644
--- a/pkgs/applications/science/electronics/gtkwave/default.nix
+++ b/pkgs/applications/science/electronics/gtkwave/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "gtkwave-${version}";
-  version = "3.3.91";
+  version = "3.3.92";
 
   src = fetchurl {
     url    = "mirror://sourceforge/gtkwave/${name}.tar.gz";
-    sha256 = "1vp9qj3wyfwm36jk3pajvi09xvc1m1crf3d4gphfbs6nkyx2z942";
+    sha256 = "08916gv5vl7dgvlsq098mxljbciby9miyh8jqwn1q8sfdhzvmxak";
   };
 
   nativeBuildInputs = [ pkgconfig ];
-- 
GitLab


From b49dada76c24bdd44f0593e80c3e8466c0ceab8f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Sat, 21 Jul 2018 18:31:47 -0700
Subject: [PATCH 286/297] feh: 2.27 -> 2.27.1

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/feh/versions.
---
 pkgs/applications/graphics/feh/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix
index 4ec4b76ac04..91d5d2f1467 100644
--- a/pkgs/applications/graphics/feh/default.nix
+++ b/pkgs/applications/graphics/feh/default.nix
@@ -6,11 +6,11 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "feh-${version}";
-  version = "2.27";
+  version = "2.27.1";
 
   src = fetchurl {
     url = "https://feh.finalrewind.org/${name}.tar.bz2";
-    sha256 = "0kn6cka9m76697i495npd60ad64jnfnzv5z6znzyr0vlxx2nhcmg";
+    sha256 = "10zk76l491s22qrv86rax6cvpgwyl3qq0izl2pbk0k1z1kw3ihvf";
   };
 
   outputs = [ "out" "man" "doc" ];
-- 
GitLab


From 7968bf49352807ead99c1d6e568767a4e2855c3d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Sat, 21 Jul 2018 18:56:13 -0700
Subject: [PATCH 287/297] focuswriter: 1.6.14 -> 1.6.15

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/focuswriter/versions.
---
 pkgs/applications/editors/focuswriter/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/focuswriter/default.nix b/pkgs/applications/editors/focuswriter/default.nix
index 997a4bd253c..706f2f015b1 100644
--- a/pkgs/applications/editors/focuswriter/default.nix
+++ b/pkgs/applications/editors/focuswriter/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "focuswriter-${version}";
-  version = "1.6.14";
+  version = "1.6.15";
 
   src = fetchurl {
     url = "https://gottcode.org/focuswriter/focuswriter-${version}-src.tar.bz2";
-    sha256 = "1n8ni4bnw5vs7jx28v8r1vk69g2m1q5h9s6xpf8c0bxbcwwg2m5i";
+    sha256 = "0afs9cm5q7zxag28m427ycwwxkbn47zw7v111x7963ydqyn9gr9q";
   };
 
   nativeBuildInputs = [ pkgconfig qmake qttools ];
-- 
GitLab


From cc55a3ebcbf7ae1afb77dcf6b1c7f6c0deb68e16 Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Sun, 22 Jul 2018 02:03:24 +0000
Subject: [PATCH 288/297] treewide: fix build with disallowed aliases (#43872)

fixes build with disallowed aliases
---
 lib/strings.nix                                |  2 +-
 maintainers/scripts/nix-generate-from-cpan.nix |  2 +-
 .../display-managers/lightdm-greeters/gtk.nix  |  4 ++--
 pkgs/applications/audio/abcde/default.nix      |  4 ++--
 pkgs/applications/audio/lollypop/default.nix   |  4 ++--
 pkgs/applications/graphics/shutter/default.nix |  4 ++--
 pkgs/applications/misc/yarssr/default.nix      |  2 +-
 .../networking/browsers/eolie/default.nix      |  2 +-
 .../feedreaders/feedreader/default.nix         |  4 ++--
 .../remote/citrix-receiver/default.nix         |  2 +-
 .../networking/transporter/default.nix         |  4 ++--
 .../office/libreoffice/default.nix             |  4 ++--
 pkgs/applications/office/libreoffice/still.nix |  4 ++--
 .../git-and-tools/default.nix                  |  5 ++---
 .../window-managers/i3/default.nix             |  2 +-
 .../gnome-3/games/gnome-mines/default.nix      |  4 ++--
 .../gnome-3/games/gnome-nibbles/default.nix    |  4 ++--
 .../gnome-3/games/gnome-robots/default.nix     |  4 ++--
 .../xfce/thunar-plugins/archive/default.nix    |  4 ++--
 .../xfce/thunar-plugins/dropbox/default.nix    |  4 ++--
 pkgs/desktops/xfce4-13/orage/default.nix       |  6 +++---
 .../haskell-modules/hackage-packages.nix       |  6 +++---
 pkgs/development/libraries/flatpak/default.nix |  2 +-
 .../libraries/libguestfs/default.nix           |  4 ++--
 pkgs/development/tools/misc/hydra/default.nix  |  3 +--
 pkgs/development/web/postman/default.nix       |  2 +-
 pkgs/games/steam/runtime-wrapped.nix           |  2 +-
 pkgs/servers/foswiki/default.nix               |  2 +-
 pkgs/servers/mail/dkimproxy/default.nix        |  4 ++--
 pkgs/servers/mail/dspam/default.nix            |  4 ++--
 .../monitoring/fusion-inventory/default.nix    |  2 +-
 pkgs/servers/monitoring/longview/default.nix   |  2 +-
 pkgs/servers/monitoring/munin/default.nix      | 10 +++++-----
 pkgs/servers/openxpki/default.nix              | 12 ++++++------
 pkgs/servers/slimserver/default.nix            |  4 ++--
 pkgs/tools/misc/arp-scan/default.nix           |  2 +-
 pkgs/tools/misc/lbdb/default.nix               |  4 ++--
 pkgs/tools/misc/pipelight/default.nix          |  5 ++---
 pkgs/tools/networking/smbldaptools/default.nix |  4 ++--
 pkgs/tools/networking/smokeping/default.nix    |  4 ++--
 .../appimage-run/default.nix                   |  2 +-
 pkgs/tools/security/john/default.nix           |  4 ++--
 pkgs/tools/security/signing-party/default.nix  |  2 +-
 pkgs/tools/text/popfile/default.nix            |  2 --
 pkgs/tools/typesetting/biber/default.nix       |  4 ++--
 .../virtualization/linode-cli/default.nix      |  2 +-
 pkgs/top-level/all-packages.nix                | 18 +++++++++---------
 pkgs/top-level/perl-packages.nix               |  1 -
 48 files changed, 91 insertions(+), 97 deletions(-)

diff --git a/lib/strings.nix b/lib/strings.nix
index e09ec42bfea..7cd09a10939 100644
--- a/lib/strings.nix
+++ b/lib/strings.nix
@@ -121,7 +121,7 @@ rec {
 
      Example:
        pkgs = import <nixpkgs> { }
-       makePerlPath [ pkgs.perlPackages.NetSMTP ]
+       makePerlPath [ pkgs.perlPackages.libnet ]
        => "/nix/store/n0m1fk9c960d8wlrs62sncnadygqqc6y-perl-Net-SMTP-1.25/lib/perl5/site_perl"
   */
   makePerlPath = makeSearchPathOutput "lib" "lib/perl5/site_perl";
diff --git a/maintainers/scripts/nix-generate-from-cpan.nix b/maintainers/scripts/nix-generate-from-cpan.nix
index 82d9ad6077a..ec406ac1a70 100644
--- a/maintainers/scripts/nix-generate-from-cpan.nix
+++ b/maintainers/scripts/nix-generate-from-cpan.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "nix-generate-from-cpan-3";
 
   buildInputs = with perlPackages; [
-    makeWrapper perl CPANMeta GetoptLongDescriptive CPANPLUS Readonly Log4Perl
+    makeWrapper perl CPANMeta GetoptLongDescriptive CPANPLUS Readonly LogLog4perl
   ];
 
   phases = [ "installPhase" ];
diff --git a/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix b/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix
index 385f20b7e06..cfa38f175dd 100644
--- a/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix
+++ b/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix
@@ -68,8 +68,8 @@ in
 
         package = mkOption {
           type = types.package;
-          default = pkgs.gnome3.gnome-themes-standard;
-          defaultText = "pkgs.gnome3.gnome-themes-standard";
+          default = pkgs.gnome3.gnome-themes-extra;
+          defaultText = "pkgs.gnome3.gnome-themes-extra";
           description = ''
             The package path that contains the theme given in the name option.
           '';
diff --git a/pkgs/applications/audio/abcde/default.nix b/pkgs/applications/audio/abcde/default.nix
index 04ee72edc36..7f2080c6fd6 100644
--- a/pkgs/applications/audio/abcde/default.nix
+++ b/pkgs/applications/audio/abcde/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, libcdio-paranoia, cddiscid, wget, which, vorbis-tools, id3v2, eyeD3
 , lame, flac, glyr
-, perl, DigestSHA, MusicBrainz, MusicBrainzDiscID
+, perl, MusicBrainz, MusicBrainzDiscID
 , makeWrapper }:
 
 let version = "2.8.1";
@@ -35,7 +35,7 @@ in
 
     buildInputs = [ makeWrapper ];
 
-    propagatedBuildInputs = [ perl DigestSHA MusicBrainz MusicBrainzDiscID ];
+    propagatedBuildInputs = [ perl MusicBrainz MusicBrainzDiscID ];
 
     installFlags = [ "sysconfdir=$(out)/etc" ];
 
diff --git a/pkgs/applications/audio/lollypop/default.nix b/pkgs/applications/audio/lollypop/default.nix
index 1c58f4f79cd..dc59ba6e01a 100644
--- a/pkgs/applications/audio/lollypop/default.nix
+++ b/pkgs/applications/audio/lollypop/default.nix
@@ -2,7 +2,7 @@
 , appstream-glib, desktop-file-utils, gobjectIntrospection
 , python36Packages, gnome3, glib, gst_all_1 }:
 
-stdenv.mkDerivation rec  {  
+stdenv.mkDerivation rec  {
   version = "0.9.521";
   name = "lollypop-${version}";
 
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec  {
   ];
 
   buildInputs = [ glib ] ++ (with gnome3; [
-    gsettings_desktop_schemas gtk3 libsecret libsoup totem-pl-parser
+    gsettings-desktop-schemas gtk3 libsecret libsoup totem-pl-parser
   ]) ++ (with gst_all_1; [
     gst-libav gst-plugins-bad gst-plugins-base gst-plugins-good gst-plugins-ugly
     gstreamer
diff --git a/pkgs/applications/graphics/shutter/default.nix b/pkgs/applications/graphics/shutter/default.nix
index 1f41253b699..a409060afdc 100644
--- a/pkgs/applications/graphics/shutter/default.nix
+++ b/pkgs/applications/graphics/shutter/default.nix
@@ -7,9 +7,9 @@ let
     [ Gnome2 Gnome2Canvas Gtk2 Glib Pango Gnome2VFS Gnome2Wnck Gtk2ImageView
       Gtk2Unique FileWhich FileCopyRecursive XMLSimple NetDBus XMLTwig
       XMLParser HTTPMessage ProcSimple SortNaturally LocaleGettext
-      ProcProcessTable URI ImageExifTool Gtk2AppIndicator LWPUserAgent JSON
+      ProcProcessTable URI ImageExifTool Gtk2AppIndicator LWP JSON
       PerlMagick WWWMechanize HTTPDate HTMLForm HTMLParser HTMLTagset JSONXS
-      CommonSense HTTPCookies NetOAuth PathClass GooCanvas X11Protocol Cairo
+      commonsense HTTPCookies NetOAuth PathClass GooCanvas X11Protocol Cairo
       EncodeLocale TryTiny TypesSerialiser LWPMediaTypes
     ];
 in
diff --git a/pkgs/applications/misc/yarssr/default.nix b/pkgs/applications/misc/yarssr/default.nix
index 2c569b7d681..a8ff981400a 100644
--- a/pkgs/applications/misc/yarssr/default.nix
+++ b/pkgs/applications/misc/yarssr/default.nix
@@ -16,7 +16,7 @@ let
     ClassSingleton
     URI
     AnyEvent AnyEventHTTP
-    CommonSense
+    commonsense
     FileSlurp
     JSON
     Guard
diff --git a/pkgs/applications/networking/browsers/eolie/default.nix b/pkgs/applications/networking/browsers/eolie/default.nix
index 5de6c0d882a..8d7f4e6cc70 100644
--- a/pkgs/applications/networking/browsers/eolie/default.nix
+++ b/pkgs/applications/networking/browsers/eolie/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [ gtkspell3 hunspell python36Packages.pygobject3 ] ++ (with gnome3; [
-    glib glib-networking gsettings_desktop_schemas gtk3 webkitgtk libsecret
+    glib glib-networking gsettings-desktop-schemas gtk3 webkitgtk libsecret
   ]) ++ (with gst_all_1; [
     gst-libav gst-plugins-base gst-plugins-ugly gstreamer
   ]);
diff --git a/pkgs/applications/networking/feedreaders/feedreader/default.nix b/pkgs/applications/networking/feedreaders/feedreader/default.nix
index 505afd25d04..d2991c3ba1c 100644
--- a/pkgs/applications/networking/feedreaders/feedreader/default.nix
+++ b/pkgs/applications/networking/feedreaders/feedreader/default.nix
@@ -24,8 +24,8 @@ in stdenv.mkDerivation {
   buildInputs = [
     curl glib json-glib libnotify libsecret sqlite
   ] ++ (with gnome3; [
-    gtk libgee libpeas libsoup rest webkitgtk gnome_online_accounts
-    gsettings_desktop_schemas
+    gtk libgee libpeas libsoup rest webkitgtk gnome-online-accounts
+    gsettings-desktop-schemas
   ]) ++ (with gst_all_1; [
     gstreamer gst-plugins-base gst-plugins-good
   ]);
diff --git a/pkgs/applications/networking/remote/citrix-receiver/default.nix b/pkgs/applications/networking/remote/citrix-receiver/default.nix
index 489de974aaa..c4e73f3f2fa 100644
--- a/pkgs/applications/networking/remote/citrix-receiver/default.nix
+++ b/pkgs/applications/networking/remote/citrix-receiver/default.nix
@@ -247,7 +247,7 @@ let
         makeWrapper "$ICAInstDir/wfica" "$out/bin/wfica" \
           --add-flags "-icaroot $ICAInstDir" \
           --set ICAROOT "$ICAInstDir" \
-          --set GTK_PATH "${gtk2.out}/lib/gtk-2.0:${gnome3.gnome-themes-standard}/lib/gtk-2.0" \
+          --set GTK_PATH "${gtk2.out}/lib/gtk-2.0:${gnome3.gnome-themes-extra}/lib/gtk-2.0" \
           --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
           --set LD_PRELOAD "${libredirect}/lib/libredirect.so" \
           --set LD_LIBRARY_PATH "$libPath" \
diff --git a/pkgs/applications/networking/transporter/default.nix b/pkgs/applications/networking/transporter/default.nix
index 141c40f3b84..d084461a9b2 100644
--- a/pkgs/applications/networking/transporter/default.nix
+++ b/pkgs/applications/networking/transporter/default.nix
@@ -44,7 +44,7 @@ in stdenv.mkDerivation rec {
     defaultIconTheme # If I omit this there's no icons in KDE
     glib
     granite
-    gsettings_desktop_schemas
+    gsettings-desktop-schemas
     gtk3
     libgee
     magic-wormhole
@@ -55,7 +55,7 @@ in stdenv.mkDerivation rec {
   substituteInPlace ./src/WormholeInterface.vala \
     --replace /bin/wormhole ${magic-wormhole}/bin/wormhole
   '';
-  
+
   postPatch = ''
     chmod +x ./meson/post_install.py
     patchShebangs ./meson/post_install.py
diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix
index 43258282ac0..7125343dee6 100644
--- a/pkgs/applications/office/libreoffice/default.nix
+++ b/pkgs/applications/office/libreoffice/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pam, python3, libxslt, perl, ArchiveZip, gettext
-, CompressZlib, zlib, libjpeg, expat, freetype, libwpd
+, IOCompress, zlib, libjpeg, expat, freetype, libwpd
 , libxml2, db, sablotron, curl, fontconfig, libsndfile, neon
 , bison, flex, zip, unzip, gtk3, gtk2, libmspack, getopt, file, cairo, which
 , icu, boost, jdk, ant, cups, xorg, libcmis
@@ -251,7 +251,7 @@ in stdenv.mkDerivation rec {
 
   buildInputs = with xorg;
     [ ant ArchiveZip autoconf automake bison boost cairo clucene_core
-      CompressZlib cppunit cups curl db dbus-glib expat file flex fontconfig
+      IOCompress cppunit cups curl db dbus-glib expat file flex fontconfig
       freetype GConf getopt gnome_vfs gperf gtk3 gtk2
       hunspell icu jdk lcms libcdr libexttextcat unixODBC libjpeg
       libmspack librdf_redland librsvg libsndfile libvisio libwpd libwpg libX11
diff --git a/pkgs/applications/office/libreoffice/still.nix b/pkgs/applications/office/libreoffice/still.nix
index 7a2538e4bcd..5958a5aa79e 100644
--- a/pkgs/applications/office/libreoffice/still.nix
+++ b/pkgs/applications/office/libreoffice/still.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pam, python3, libxslt, perl, ArchiveZip
-, CompressZlib, zlib, libjpeg, expat, freetype, libwpd
+, IOCompress, zlib, libjpeg, expat, freetype, libwpd
 , libxml2, db, sablotron, curl, fontconfig, libsndfile, neon
 , bison, flex, zip, unzip, gtk3, gtk2, libmspack, getopt, file, cairo, which
 , icu, boost, jdk, ant, cups, xorg, libcmis, carlito
@@ -248,7 +248,7 @@ in stdenv.mkDerivation rec {
 
   buildInputs = with xorg;
     [ ant ArchiveZip autoconf automake bison boost cairo clucene_core
-      CompressZlib cppunit cups curl db dbus-glib expat file flex fontconfig
+      IOCompress cppunit cups curl db dbus-glib expat file flex fontconfig
       freetype GConf getopt gnome_vfs gperf gtk3 gtk2
       hunspell icu jdk lcms libcdr libexttextcat unixODBC libjpeg
       libmspack librdf_redland librsvg libsndfile libvisio libwpd libwpg libX11
diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix
index ba5486dc015..c82a8d8ecc5 100644
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@@ -10,10 +10,9 @@ let
     sendEmailSupport = false;   # requires plenty of perl libraries
     perlLibs = [perlPackages.LWP perlPackages.URI perlPackages.TermReadKey];
     smtpPerlLibs = [
-      perlPackages.NetSMTP perlPackages.NetSMTPSSL
+      perlPackages.libnet perlPackages.NetSMTPSSL
       perlPackages.IOSocketSSL perlPackages.NetSSLeay
-      perlPackages.MIMEBase64 perlPackages.AuthenSASL
-      perlPackages.DigestHMAC
+      perlPackages.AuthenSASL perlPackages.DigestHMAC
     ];
   };
 
diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix
index 74c3c71dbf7..513fe06df8f 100644
--- a/pkgs/applications/window-managers/i3/default.nix
+++ b/pkgs/applications/window-managers/i3/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
     libxcb xcbutilkeysyms xcbutil xcbutilwm xcbutilxrm libxkbcommon
     libstartup_notification libX11 pcre libev yajl xcb-util-cursor perl pango
     perlPackages.AnyEventI3 perlPackages.X11XCB perlPackages.IPCRun
-    perlPackages.ExtUtilsPkgConfig perlPackages.TestMore perlPackages.InlineC
+    perlPackages.ExtUtilsPkgConfig perlPackages.InlineC
     xorgserver xvfb_run
   ];
 
diff --git a/pkgs/desktops/gnome-3/games/gnome-mines/default.nix b/pkgs/desktops/gnome-3/games/gnome-mines/default.nix
index 55dad369c10..33672054a37 100644
--- a/pkgs/desktops/gnome-3/games/gnome-mines/default.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-mines/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, meson, ninja, vala, gobjectIntrospection, pkgconfig, gnome3, gtk3, wrapGAppsHook
-, librsvg, gettext, itstool, libxml2, libgames-support, libgee }:
+, librsvg, gettext, itstool, libxml2, libgnome-games-support, libgee }:
 
 stdenv.mkDerivation rec {
   name = "gnome-mines-${version}";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   # gobjectIntrospection for finding vapi files
   nativeBuildInputs = [ meson ninja vala gobjectIntrospection pkgconfig gettext itstool libxml2 wrapGAppsHook ];
-  buildInputs = [ gtk3 librsvg gnome3.defaultIconTheme libgames-support libgee ];
+  buildInputs = [ gtk3 librsvg gnome3.defaultIconTheme libgnome-games-support libgee ];
 
   postPatch = ''
     chmod +x data/meson_compile_gschema.py # patchShebangs requires executable file
diff --git a/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix b/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix
index 302d8fb2101..7390108953f 100644
--- a/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
 , librsvg, libcanberra-gtk3, clutter-gtk, intltool, itstool
-, libxml2, libgee, libgames-support }:
+, libxml2, libgee, libgnome-games-support }:
 
 stdenv.mkDerivation rec {
   name = "gnome-nibbles-${version}";
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     gtk3 wrapGAppsHook intltool itstool libxml2
     librsvg libcanberra-gtk3 clutter-gtk gnome3.defaultIconTheme
-    libgee libgames-support
+    libgee libgnome-games-support
   ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/desktops/gnome-3/games/gnome-robots/default.nix b/pkgs/desktops/gnome-3/games/gnome-robots/default.nix
index e07e3c14152..9a81c88206d 100644
--- a/pkgs/desktops/gnome-3/games/gnome-robots/default.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-robots/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
-, librsvg, libcanberra-gtk3, intltool, itstool, libxml2, libgames-support
+, librsvg, libcanberra-gtk3, intltool, itstool, libxml2, libgnome-games-support
 , libgee}:
 
 stdenv.mkDerivation rec {
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [
     gtk3 wrapGAppsHook intltool itstool librsvg libcanberra-gtk3
-    libxml2 gnome3.defaultIconTheme libgames-support libgee
+    libxml2 gnome3.defaultIconTheme libgnome-games-support libgee
   ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/desktops/xfce/thunar-plugins/archive/default.nix b/pkgs/desktops/xfce/thunar-plugins/archive/default.nix
index 9783e6c9228..e9c55618c60 100644
--- a/pkgs/desktops/xfce/thunar-plugins/archive/default.nix
+++ b/pkgs/desktops/xfce/thunar-plugins/archive/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, pkgconfig, xfce4-dev-tools
 , gtk
-, thunarx-2-dev
+, thunar-bare
 , exo, libxfce4util, libxfce4ui
 , xfconf, udev, libnotify
 }:
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [
     xfce4-dev-tools
-    thunarx-2-dev
+    thunar-bare
     exo gtk libxfce4util libxfce4ui
     xfconf udev libnotify
   ];
diff --git a/pkgs/desktops/xfce/thunar-plugins/dropbox/default.nix b/pkgs/desktops/xfce/thunar-plugins/dropbox/default.nix
index d44281d052d..6b9aac4a8cc 100644
--- a/pkgs/desktops/xfce/thunar-plugins/dropbox/default.nix
+++ b/pkgs/desktops/xfce/thunar-plugins/dropbox/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, pkgconfig
 , gtk
-, thunarx-2-dev, python2
+, thunar-bare, python2
 }:
 
 stdenv.mkDerivation rec {
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [
     gtk
-    thunarx-2-dev python2
+    thunar-bare python2
   ];
 
   configurePhase = "python2 waf configure --prefix=$out";
diff --git a/pkgs/desktops/xfce4-13/orage/default.nix b/pkgs/desktops/xfce4-13/orage/default.nix
index 3857846ea82..c44b32c2edd 100644
--- a/pkgs/desktops/xfce4-13/orage/default.nix
+++ b/pkgs/desktops/xfce4-13/orage/default.nix
@@ -1,5 +1,5 @@
-{ lib, fetchpatch, mkXfceDerivation, dbus_glib ? null, gtk2, libical, libnotify ? null
-, popt ? null, libxfce4ui ? null, xfce4-panel ? null, withPanelPlugin ? true }:
+{ lib, fetchpatch, mkXfceDerivation, dbus-glib, gtk2, libical, libnotify
+, popt, libxfce4ui ? null, xfce4-panel ? null, withPanelPlugin ? true }:
 
 assert withPanelPlugin -> libxfce4ui != null && xfce4-panel != null;
 
@@ -13,7 +13,7 @@ mkXfceDerivation rec {
   version = "4.12.1";
 
   sha256 = "04z6y1vfaz1im1zq1zr7cf8pjibjhj9zkyanbp7vn30q520yxa0m";
-  buildInputs = [ dbus_glib gtk2 libical libnotify popt ]
+  buildInputs = [ dbus-glib gtk2 libical libnotify popt ]
     ++ optionals withPanelPlugin [ libxfce4ui xfce4-panel ];
 
   patches = [
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 85355782171..ff62e2eba3b 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -207831,7 +207831,7 @@ self: {
      }) {};
 
   "udev" = callPackage
-    ({ mkDerivation, base, bytestring, libudev, posix-paths, unix }:
+    ({ mkDerivation, base, bytestring, udev, posix-paths, unix }:
      mkDerivation {
        pname = "udev";
        version = "0.1.0.0";
@@ -207839,12 +207839,12 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base bytestring posix-paths unix ];
-       libraryPkgconfigDepends = [ libudev ];
+       libraryPkgconfigDepends = [ udev ];
        description = "libudev bindings";
        license = stdenv.lib.licenses.bsd3;
        platforms = [ "i686-linux" "x86_64-linux" ];
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {inherit (pkgs) libudev;};
+     }) {inherit (pkgs) udev;};
 
   "udp-conduit" = callPackage
     ({ mkDerivation, base, chunked-data, conduit-combinators
diff --git a/pkgs/development/libraries/flatpak/default.nix b/pkgs/development/libraries/flatpak/default.nix
index b8b55d6a874..e769cb50513 100644
--- a/pkgs/development/libraries/flatpak/default.nix
+++ b/pkgs/development/libraries/flatpak/default.nix
@@ -5,7 +5,7 @@
 
 let
   version = "0.99.3";
-  desktop_schemas = gnome3.gsettings_desktop_schemas;
+  desktop_schemas = gnome3.gsettings-desktop-schemas;
 in stdenv.mkDerivation rec {
   name = "flatpak-${version}";
 
diff --git a/pkgs/development/libraries/libguestfs/default.nix b/pkgs/development/libraries/libguestfs/default.nix
index 7569f2613bb..555828bfaf6 100644
--- a/pkgs/development/libraries/libguestfs/default.nix
+++ b/pkgs/development/libraries/libguestfs/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pkgconfig, autoreconfHook, makeWrapper
 , ncurses, cpio, gperf, perl, cdrkit, flex, bison, qemu, pcre, augeas, libxml2
 , acl, libcap, libcap_ng, libconfig, systemd, fuse, yajl, libvirt, hivex
-, gmp, readline, file, libintlperl, GetoptLong, SysVirt, numactl, xen, libapparmor
+, gmp, readline, file, libintl_perl, GetoptLong, SysVirt, numactl, xen, libapparmor
 , getopt, perlPackages, ocamlPackages
 , appliance ? null
 , javaSupport ? false, jdk ? null }:
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     makeWrapper autoreconfHook ncurses cpio gperf perl
     cdrkit flex bison qemu pcre augeas libxml2 acl libcap libcap_ng libconfig
-    systemd fuse yajl libvirt gmp readline file hivex libintlperl GetoptLong
+    systemd fuse yajl libvirt gmp readline file hivex libintl_perl GetoptLong
     SysVirt numactl xen libapparmor getopt perlPackages.ModuleBuild
   ] ++ (with ocamlPackages; [ ocaml findlib ocamlbuild ocaml_libvirt ocaml_gettext ounit ])
     ++ stdenv.lib.optional javaSupport jdk;
diff --git a/pkgs/development/tools/misc/hydra/default.nix b/pkgs/development/tools/misc/hydra/default.nix
index cf516b16f4b..f4f72491970 100644
--- a/pkgs/development/tools/misc/hydra/default.nix
+++ b/pkgs/development/tools/misc/hydra/default.nix
@@ -22,7 +22,7 @@ let
         CatalystPluginSessionStateCookie
         CatalystPluginSessionStoreFastMmap
         CatalystPluginStackTrace
-        CatalystPluginUnicodeEncoding
+        CatalystRuntime
         CatalystTraitForRequestProxyBase
         CatalystViewDownload
         CatalystViewJSON
@@ -52,7 +52,6 @@ let
         SetScalar
         Starman
         SysHostnameLong
-        TestMore
         TextDiff
         TextTable
         XMLSimple
diff --git a/pkgs/development/web/postman/default.nix b/pkgs/development/web/postman/default.nix
index cbe7d3da8aa..6c3509d632f 100644
--- a/pkgs/development/web/postman/default.nix
+++ b/pkgs/development/web/postman/default.nix
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
       pkgs.alsaLib
       pkgs.cairo
       pkgs.cups
-      pkgs.dbus_daemon.lib
+      pkgs.dbus.daemon.lib
       pkgs.expat
       pkgs.gdk_pixbuf
       pkgs.glib
diff --git a/pkgs/games/steam/runtime-wrapped.nix b/pkgs/games/steam/runtime-wrapped.nix
index b3746a50c77..a0ed5aaf210 100644
--- a/pkgs/games/steam/runtime-wrapped.nix
+++ b/pkgs/games/steam/runtime-wrapped.nix
@@ -8,7 +8,7 @@ let
     libpulseaudio
     alsaLib
     openalSoft
-    libva1-full
+    libva1
     libvdpau
     vulkan-loader
     gcc.cc
diff --git a/pkgs/servers/foswiki/default.nix b/pkgs/servers/foswiki/default.nix
index 5bfeef6f1fc..542322d0e62 100644
--- a/pkgs/servers/foswiki/default.nix
+++ b/pkgs/servers/foswiki/default.nix
@@ -14,7 +14,7 @@ perlPackages.buildPerlPackage rec {
   buildInputs = with perlPackages; [
     # minimum requirements from INSTALL.html#System_Requirements
     AlgorithmDiff ArchiveTar AuthenSASL CGI CGISession CryptPasswdMD5
-    DigestSHA EmailMIME Encode Error FileCopyRecursive HTMLParser HTMLTree
+    EmailMIME Encode Error FileCopyRecursive HTMLParser HTMLTree
     IOSocketIP IOSocketSSL JSON
     LocaleMaketext LocaleMaketextLexicon LocaleMsgfmt
     LWP URI perlPackages.version
diff --git a/pkgs/servers/mail/dkimproxy/default.nix b/pkgs/servers/mail/dkimproxy/default.nix
index 9abf95fb6d6..2912ce4cfca 100644
--- a/pkgs/servers/mail/dkimproxy/default.nix
+++ b/pkgs/servers/mail/dkimproxy/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, perl, fetchurl, Error, MailDKIM, MIMEtools, NetServer }:
+{ stdenv, perl, fetchurl, Error, MailDKIM, MIMETools, NetServer }:
 
 let
   pkg = "dkimproxy";
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   '';
 
   buildInputs = [ perl ];
-  propagatedBuildInputs = [ Error MailDKIM MIMEtools NetServer ];
+  propagatedBuildInputs = [ Error MailDKIM MIMETools NetServer ];
 
   meta = with stdenv.lib; {
     description = "SMTP-proxy that signs and/or verifies emails";
diff --git a/pkgs/servers/mail/dspam/default.nix b/pkgs/servers/mail/dspam/default.nix
index b63390bb247..8fa7719a722 100644
--- a/pkgs/servers/mail/dspam/default.nix
+++ b/pkgs/servers/mail/dspam/default.nix
@@ -1,6 +1,6 @@
 { stdenv, lib, fetchurl, makeWrapper
 , gawk, gnused, gnugrep, coreutils, which
-, perl, NetSMTP
+, perl, libnet
 , withMySQL ? false, zlib, mysql57
 , withPgSQL ? false, postgresql
 , withSQLite ? false, sqlite
@@ -62,7 +62,7 @@ in stdenv.mkDerivation rec {
     rm -rf $out/var
 
     wrapProgram $out/bin/dspam_notify \
-      --set PERL5LIB "${lib.makePerlPath [ NetSMTP ]}"
+      --set PERL5LIB "${lib.makePerlPath [ libnet ]}"
 
     # Install SQL scripts
     mkdir -p $out/share/dspam/sql
diff --git a/pkgs/servers/monitoring/fusion-inventory/default.nix b/pkgs/servers/monitoring/fusion-inventory/default.nix
index 96eaa5ef0cc..d9e8ccf1454 100644
--- a/pkgs/servers/monitoring/fusion-inventory/default.nix
+++ b/pkgs/servers/monitoring/fusion-inventory/default.nix
@@ -49,7 +49,7 @@ buildPerlPackage rec {
     IOSocketSSL
     IPCRun
     JSON
-    LWPProtocolhttps
+    LWPProtocolHttps
     ModuleInstall
     NetSNMP
     TestCompile
diff --git a/pkgs/servers/monitoring/longview/default.nix b/pkgs/servers/monitoring/longview/default.nix
index dcc6f6f16b7..45e380379d2 100644
--- a/pkgs/servers/monitoring/longview/default.nix
+++ b/pkgs/servers/monitoring/longview/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ perl makeWrapper glibc ]
     ++ (with perlPackages; [
-      LWPUserAgent
+      LWP
       LWPProtocolHttps
       MozillaCA
       CryptSSLeay
diff --git a/pkgs/servers/monitoring/munin/default.nix b/pkgs/servers/monitoring/munin/default.nix
index 62fc3c6f8f5..8bf9da22e72 100644
--- a/pkgs/servers/monitoring/munin/default.nix
+++ b/pkgs/servers/monitoring/munin/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
     sha256 = "10niyzckx90dwdr4d7vj07d1qjy3nk7xzp30nqnlxzbaww7n5v78";
   };
 
-  buildInputs = [ 
+  buildInputs = [
     makeWrapper
     which
     coreutils
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
     perlPackages.NetCIDR
     perlPackages.NetSSLeay
     perlPackages.NetServer
-    perlPackages.Log4Perl
+    perlPackages.LogLog4perl
     perlPackages.IOSocketInet6
     perlPackages.Socket6
     perlPackages.URI
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
     perlPackages.NetServer
     perlPackages.ListMoreUtils
     perlPackages.TimeHiRes
-    perlPackages.LWPUserAgent
+    perlPackages.LWP
     perlPackages.DBDPg
     python
     ruby
@@ -116,9 +116,9 @@ stdenv.mkDerivation rec {
         esac
         wrapProgram "$file" \
           --set PERL5LIB "$out/lib/perl5/site_perl:${with perlPackages; stdenv.lib.makePerlPath [
-                Log4Perl IOSocketInet6 Socket6 URI DBFile DateManip
+                LogLog4perl IOSocketInet6 Socket6 URI DBFile DateManip
                 HTMLTemplate FileCopyRecursive FCGI NetCIDR NetSNMP NetServer
-                ListMoreUtils TimeHiRes DBDPg LWPUserAgent rrdtool
+                ListMoreUtils TimeHiRes DBDPg LWP rrdtool
                 ]}"
     done
   '';
diff --git a/pkgs/servers/openxpki/default.nix b/pkgs/servers/openxpki/default.nix
index 111c2f02b99..1a41cd97aaf 100644
--- a/pkgs/servers/openxpki/default.nix
+++ b/pkgs/servers/openxpki/default.nix
@@ -14,19 +14,19 @@ buildPerlPackage {
   buildInputs = [ perl openssl gettext python34Packages.sphinx ];
   propagatedBuildInputs = with perlPackages;
     [ # dependencies from Makefile.PL
-      libintlperl ConfigVersioned LWP TestSimple ClassAccessorChained IOSocketSSL ClassStd
+      libintl_perl ConfigVersioned LWP ClassAccessorChained IOSocketSSL ClassStd
       CGISession ConfigStd ConfigMerge Connector CryptCBC CryptOpenSSLAES CryptPKCS10
       DBDMock DataPassword DataSerializer DateTimeFormatDateParse IOPrompt
-      IPCShareLite JSON Log4Perl LWPProtocolconnect LWPProtocolhttps MailRFC822Address
-      Moose NetAddrIP NetDNS NetIP NetLDAP NetHTTP NetServer NetSSLeay ParamsValidate PathClass
+      IPCShareLite JSON LogLog4perl LWPProtocolConnect LWPProtocolHttps MailRFC822Address
+      Moose NetAddrIP NetDNS NetIP perlldap NetHTTP NetServer NetSSLeay ParamsValidate PathClass
       ProcProcessTable ProcSafeExec RegexpCommon SOAPLite Switch SysSigAction TemplateToolkit
       TestPod TestPodCoverage TextCSV_XS TimeHiRes Workflow XMLFilterXInclude XMLParser
       XMLSAX XMLSAXWriter XMLSimple XMLValidatorSchema ]
     ++ stdenv.lib.optionals extraDependencies1
     [ # dependencies from parsing through core/server
       ClassAccessor Carp PathTools DataDumper DateTime DateTimeFormatStrptime DBI DigestMD5
-      DigestSHA Encode ExceptionClass Exporter FilePath FileTemp Filter GetoptLong HTMLParser
-      ScalarListUtils MathBigInt Memoize MIMEBase64 NetSMTP PodUsage RTClientREST Socket
+      Encode ExceptionClass Exporter FilePath FileTemp Filter GetoptLong HTMLParser
+      ScalarListUtils MathBigInt Memoize libnet PodUsage RTClientREST Socket
       Storable XSLoader ]
     ++ stdenv.lib.optionals extraDependencies2
     [ # dependencies taken from Debian
@@ -38,7 +38,7 @@ buildPerlPackage {
       AttributeHandlers AttributeParamsValidate AutoLoader BC CGI CPAN CacheCache ClassClassgenclassgen
       ClassContainer ClassDataInheritable ClassSingleton ConvertASN1 DBDSQLite DBIxHTMLViewLATEST
       DBFile DataPage DataSpreadPagination DateTimeLocale DateTimeTimeZone DevelPPPort DevelSelfStubber
-      DevelSymdump Digest DigestSHA1 Env Error ExtUtilsCommand ExtUtilsConstant ExtUtilsInstall
+      DevelSymdump DigestSHA1 Env Error ExtUtilsCommand ExtUtilsConstant ExtUtilsInstall
       ExtUtilsMakeMaker FileCheckTree FilterSimple GoferTransporthttp HTMLMason HTMLTagset
       HTTPServerSimpleMason I18NCollate IO IPCSysV LocaleCodes LocaleMaketext LogDispatch MathBigRat
       MathComplex MathRound ModuleBuild ModuleBuildDeprecated NetPing PerlIOviaQuotedPrint PodChecker
diff --git a/pkgs/servers/slimserver/default.nix b/pkgs/servers/slimserver/default.nix
index c9bf8393afc..523292f6b0f 100644
--- a/pkgs/servers/slimserver/default.nix
+++ b/pkgs/servers/slimserver/default.nix
@@ -45,8 +45,8 @@ buildPerlPackage rec {
     perlPackages.IOSocketSSL
     perlPackages.IOString
     perlPackages.JSONXSVersionOneAndTwo
-    perlPackages.Log4Perl
-    perlPackages.LWPUserAgent
+    perlPackages.LogLog4perl
+    perlPackages.LWP
     perlPackages.NetHTTP
     perlPackages.ProcBackground
     perlPackages.SubName
diff --git a/pkgs/tools/misc/arp-scan/default.nix b/pkgs/tools/misc/arp-scan/default.nix
index e1068c248b3..4f683beb06f 100644
--- a/pkgs/tools/misc/arp-scan/default.nix
+++ b/pkgs/tools/misc/arp-scan/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   perlModules = with perlPackages; [
     HTTPDate
     HTTPMessage
-    LWPUserAgent
+    LWP
     URI
   ];
 
diff --git a/pkgs/tools/misc/lbdb/default.nix b/pkgs/tools/misc/lbdb/default.nix
index 1f52d83f120..d5194f42d0b 100644
--- a/pkgs/tools/misc/lbdb/default.nix
+++ b/pkgs/tools/misc/lbdb/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
     sha256 = "16fx02xk98k3friigq2lcgk535xagp3kfnmngni5kw61f7yj6gxi";
   };
 
-  buildInputs = [ goobook makeWrapper perl ConvertASN1 NetLDAP AuthenSASL ]
+  buildInputs = [ goobook makeWrapper perl ConvertASN1 perlldap AuthenSASL ]
     ++ optional (!stdenv.isDarwin) finger_bsd
     ++ optional   (abook != null) abook
     ++ optional   (gnupg != null) gnupg
@@ -36,7 +36,7 @@ stdenv.mkDerivation {
   postFixup = "wrapProgram $out/lib/mutt_ldap_query --prefix PERL5LIB : "
     + "${AuthenSASL}/${perl.libPrefix}"
     + ":${ConvertASN1}/${perl.libPrefix}"
-    + ":${NetLDAP}/${perl.libPrefix}";
+    + ":${perlldap}/${perl.libPrefix}";
 
   meta = {
     homepage = http://www.spinnaker.de/lbdb/;
diff --git a/pkgs/tools/misc/pipelight/default.nix b/pkgs/tools/misc/pipelight/default.nix
index c320f8ef5f6..abbd64cb62f 100644
--- a/pkgs/tools/misc/pipelight/default.nix
+++ b/pkgs/tools/misc/pipelight/default.nix
@@ -1,8 +1,7 @@
-{ stdenv, fetchurl, bash, cabextract, curl, gnupg, libX11, libGLU_combined, wineStaging
- }:
+{ stdenv, fetchurl, bash, cabextract, curl, gnupg, libX11, libGLU_combined, wine-staging }:
 
 let
-  wine_custom = wineStaging;
+  wine_custom = wine-staging;
 
   mozillaPluginPath = "/lib/mozilla/plugins";
 
diff --git a/pkgs/tools/networking/smbldaptools/default.nix b/pkgs/tools/networking/smbldaptools/default.nix
index be7b8f5824e..81f8361fa2a 100644
--- a/pkgs/tools/networking/smbldaptools/default.nix
+++ b/pkgs/tools/networking/smbldaptools/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, perl, NetLDAP, makeWrapper, CryptSmbHash, DigestSHA1}:
+{stdenv, fetchurl, perl, perlldap, makeWrapper, CryptSmbHash, DigestSHA1}:
 
 let
   version = "0.9.11";
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
     sha256 = "1xcxmpz74r82vjp731axyac3cyksfiarz9jk5g5m2bzfdixkq9mz";
   };
 
-  buildInputs = [ perl NetLDAP makeWrapper CryptSmbHash DigestSHA1 ];
+  buildInputs = [ perl perlldap makeWrapper CryptSmbHash DigestSHA1 ];
 
   preConfigure = ''
     export configureFlags="$configureFlags --with-perl-libdir=$out/lib/perl5/site_perl"
diff --git a/pkgs/tools/networking/smokeping/default.nix b/pkgs/tools/networking/smokeping/default.nix
index cca6d630fc1..87e0a788383 100644
--- a/pkgs/tools/networking/smokeping/default.nix
+++ b/pkgs/tools/networking/smokeping/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, fping, rrdtool, FCGI, CGI
 , CGIFast, ConfigGrammar, DigestHMAC, NetTelnet
 , NetOpenSSH, NetSNMP, LWP, IOTty, perl, NetDNS
-, NetLDAP
+, perlldap
 }:
 
 stdenv.mkDerivation rec {
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   };
   propagatedBuildInputs = [
     rrdtool FCGI CGI CGIFast ConfigGrammar DigestHMAC NetTelnet NetOpenSSH
-      NetSNMP LWP IOTty fping perl NetDNS NetLDAP ];
+      NetSNMP LWP IOTty fping perl NetDNS perlldap ];
   postInstall = ''
     mv $out/htdocs/smokeping.fcgi.dist $out/htdocs/smokeping.fcgi
   '';
diff --git a/pkgs/tools/package-management/appimage-run/default.nix b/pkgs/tools/package-management/appimage-run/default.nix
index f673ba5f2d6..a7fb8da9966 100644
--- a/pkgs/tools/package-management/appimage-run/default.nix
+++ b/pkgs/tools/package-management/appimage-run/default.nix
@@ -62,7 +62,7 @@ buildFHSUserEnv {
     libcap
     SDL2
     libusb1
-    libudev
+    udev
     dbus-glib
     libav
     atk
diff --git a/pkgs/tools/security/john/default.nix b/pkgs/tools/security/john/default.nix
index 862b4a0df6e..cb545570f51 100644
--- a/pkgs/tools/security/john/default.nix
+++ b/pkgs/tools/security/john/default.nix
@@ -37,8 +37,8 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ openssl nss nspr kerberos gmp zlib libpcap re2 gcc pythonPackages.wrapPython perl makeWrapper ];
   propagatedBuildInputs = (with pythonPackages; [ dpkt scapy lxml ]) ++ # For pcap2john.py
-                          (with perlPackages; [ DigestMD4 DigestMD5 DigestSHA1 GetoptLong MIMEBase64 # For pass_gen.pl
-                                                NetLDAP ]); # For sha-dump.pl
+                          (with perlPackages; [ DigestMD4 DigestMD5 DigestSHA1 GetoptLong # For pass_gen.pl
+                                                perlldap ]); # For sha-dump.pl
                           # TODO: Get dependencies for radius2john.pl and lion2john-alt.pl
 
   # gcc -DAC_BUILT -Wall vncpcap2john.o memdbg.o -g    -lpcap -fopenmp -o ../run/vncpcap2john
diff --git a/pkgs/tools/security/signing-party/default.nix b/pkgs/tools/security/signing-party/default.nix
index fc7639b1d5a..14848df3f3a 100644
--- a/pkgs/tools/security/signing-party/default.nix
+++ b/pkgs/tools/security/signing-party/default.nix
@@ -123,7 +123,7 @@ in stdenv.mkDerivation rec {
 
     wrapProgram $out/bin/caff --set PERL5LIB \
       ${with perlPackages; stdenv.lib.makePerlPath ([
-        TextTemplate MIMEtools MailTools TimeDate NetIDNEncode ]
+        TextTemplate MIMETools MailTools TimeDate NetIDNEncode ]
         ++ GnuPGInterfaceRuntimeDependencies)} \
       --prefix PATH ":" \
       "${stdenv.lib.makeBinPath [ nettools gnupg1 ]}"
diff --git a/pkgs/tools/text/popfile/default.nix b/pkgs/tools/text/popfile/default.nix
index 42befa2ce26..dbc16cf7a45 100644
--- a/pkgs/tools/text/popfile/default.nix
+++ b/pkgs/tools/text/popfile/default.nix
@@ -18,10 +18,8 @@ stdenv.mkDerivation rec {
     perl
     DBI
     DBDSQLite
-    Digest
     DigestMD5
     HTMLTagset
-    MIMEBase64 # == MIMEQuotedPrint
     TimeDate # == DateParse
     HTMLTemplate
     # IO::Socket::Socks is not in nixpkgs
diff --git a/pkgs/tools/typesetting/biber/default.nix b/pkgs/tools/typesetting/biber/default.nix
index 8fd04194124..c9280c102b7 100644
--- a/pkgs/tools/typesetting/biber/default.nix
+++ b/pkgs/tools/typesetting/biber/default.nix
@@ -2,7 +2,7 @@
 , BusinessISMN, BusinessISSN, ConfigAutoConf, DataCompare, DataDump, DateSimple
 , DateTime, DateTimeFormatBuilder, DateTimeCalendarJulian
 , EncodeEUCJPASCII, EncodeHanExtra, EncodeJIS2K, ExtUtilsLibBuilder
-, FileSlurp, FileWhich, IPCRun3, Log4Perl, LWPProtocolHttps, ListAllUtils, ListMoreUtils
+, FileSlurp, FileWhich, IPCRun3, LogLog4perl, LWPProtocolHttps, ListAllUtils, ListMoreUtils
 , MozillaCA, ReadonlyXS, RegexpCommon, TextBibTeX, UnicodeCollate
 , UnicodeLineBreak, URI, XMLLibXMLSimple, XMLLibXSLT, XMLWriter, ClassAccessor
 , TextCSV, TextCSV_XS, TextRoman, DataUniqid, LinguaTranslit, UnicodeNormalize, SortKey
@@ -22,7 +22,7 @@ buildPerlModule rec {
     autovivification BusinessISBN BusinessISMN BusinessISSN ConfigAutoConf
     DataCompare DataDump DateSimple EncodeEUCJPASCII EncodeHanExtra EncodeJIS2K
     DateTime DateTimeFormatBuilder DateTimeCalendarJulian
-    ExtUtilsLibBuilder FileSlurp FileWhich IPCRun3 Log4Perl LWPProtocolHttps ListAllUtils
+    ExtUtilsLibBuilder FileSlurp FileWhich IPCRun3 LogLog4perl LWPProtocolHttps ListAllUtils
     ListMoreUtils MozillaCA ReadonlyXS RegexpCommon TextBibTeX
     UnicodeCollate UnicodeLineBreak URI XMLLibXMLSimple XMLLibXSLT XMLWriter
     ClassAccessor TextCSV TextCSV_XS TextRoman DataUniqid LinguaTranslit UnicodeNormalize SortKey
diff --git a/pkgs/tools/virtualization/linode-cli/default.nix b/pkgs/tools/virtualization/linode-cli/default.nix
index 63b79cbc8d6..12852265c40 100644
--- a/pkgs/tools/virtualization/linode-cli/default.nix
+++ b/pkgs/tools/virtualization/linode-cli/default.nix
@@ -14,7 +14,7 @@ buildPerlPackage rec {
   buildInputs = [ makeWrapper ];
   propagatedBuildInputs = with perlPackages; [
     JSON
-    LWPUserAgent
+    LWP
     MozillaCA
     TryTiny
     WebServiceLinode
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2912dada4e9..9853c6f9caf 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1567,7 +1567,7 @@ with pkgs;
       autovivification BusinessISBN BusinessISMN BusinessISSN ConfigAutoConf
       DataCompare DataDump DateSimple EncodeEUCJPASCII EncodeHanExtra EncodeJIS2K
       DateTime DateTimeFormatBuilder DateTimeCalendarJulian
-      ExtUtilsLibBuilder FileSlurp FileWhich IPCRun3 Log4Perl LWPProtocolHttps ListAllUtils
+      ExtUtilsLibBuilder FileSlurp FileWhich IPCRun3 LogLog4perl LWPProtocolHttps ListAllUtils
       ListMoreUtils MozillaCA ReadonlyXS RegexpCommon TextBibTeX
       UnicodeCollate UnicodeLineBreak URI XMLLibXMLSimple XMLLibXSLT XMLWriter
       ClassAccessor TextCSV TextCSV_XS TextRoman DataUniqid LinguaTranslit UnicodeNormalize SortKey
@@ -5103,7 +5103,7 @@ with pkgs;
   };
 
   smbldaptools = callPackage ../tools/networking/smbldaptools {
-    inherit (perlPackages) NetLDAP CryptSmbHash DigestSHA1;
+    inherit (perlPackages) perlldap CryptSmbHash DigestSHA1;
   };
 
   smbnetfs = callPackage ../tools/filesystems/smbnetfs {};
@@ -10265,7 +10265,7 @@ with pkgs;
 
   libguestfs-appliance = callPackage ../development/libraries/libguestfs/appliance.nix {};
   libguestfs = callPackage ../development/libraries/libguestfs {
-    inherit (perlPackages) libintlperl GetoptLong SysVirt;
+    inherit (perlPackages) libintl_perl GetoptLong SysVirt;
     appliance = libguestfs-appliance;
   };
 
@@ -11308,7 +11308,7 @@ with pkgs;
 
   pipelight = callPackage ../tools/misc/pipelight {
     stdenv = stdenv_32bit;
-    wineStaging = pkgsi686Linux.wineStaging;
+    wine-staging = pkgsi686Linux.wine-staging;
   };
 
   pkcs11helper = callPackage ../development/libraries/pkcs11helper { };
@@ -12698,14 +12698,14 @@ with pkgs;
   diod = callPackage ../servers/diod { lua = lua5_1; };
 
   dkimproxy = callPackage ../servers/mail/dkimproxy {
-    inherit (perlPackages) Error MailDKIM MIMEtools NetServer;
+    inherit (perlPackages) Error MailDKIM MIMETools NetServer;
   };
 
   dovecot = callPackage ../servers/mail/dovecot { };
   dovecot_pigeonhole = callPackage ../servers/mail/dovecot/plugins/pigeonhole { };
 
   dspam = callPackage ../servers/mail/dspam {
-    inherit (perlPackages) NetSMTP;
+    inherit (perlPackages) libnet;
   };
 
   etcd = callPackage ../servers/etcd { };
@@ -15081,7 +15081,7 @@ with pkgs;
   aacgain = callPackage ../applications/audio/aacgain { };
 
   abcde = callPackage ../applications/audio/abcde {
-    inherit (perlPackages) DigestSHA MusicBrainz MusicBrainzDiscID;
+    inherit (perlPackages) MusicBrainz MusicBrainzDiscID;
     inherit (pythonPackages) eyeD3;
   };
 
@@ -16999,7 +16999,7 @@ with pkgs;
   libreoffice = hiPrio libreoffice-still;
 
   libreoffice-args = {
-    inherit (perlPackages) ArchiveZip CompressZlib;
+    inherit (perlPackages) ArchiveZip IOCompress;
     inherit (gnome2) GConf ORBit2 gnome_vfs;
     inherit (gnome3) defaultIconTheme;
     zip = zip.override { enableNLS = false; };
@@ -21564,7 +21564,7 @@ with pkgs;
     inherit fping rrdtool;
     inherit (perlPackages)
       FCGI CGI CGIFast ConfigGrammar DigestHMAC NetTelnet
-      NetOpenSSH NetSNMP LWP IOTty perl NetDNS NetLDAP;
+      NetOpenSSH NetSNMP LWP IOTty perl NetDNS perlldap;
   };
 
   snapraid = callPackage ../tools/filesystems/snapraid { };
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 255ea6d4ffd..be1da88caae 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -10983,7 +10983,6 @@ let self = _self // overrides; _self = with self; {
     patchPhase = ''sed -ie 's/`which pkg-config`/"pkg-config"/' Build.PL'';
     doCheck = false; # The main test performs network access
     nativeBuildInputs = [ pkgs.pkgconfig ];
-    #buildInputs = [ TestMore TestPod ];
     propagatedBuildInputs = [ pkgs.libdiscid ];
   };
 
-- 
GitLab


From 0d8076b99cce5c6638abeb28153c42f698e1bc18 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <matthew.bauer@obsidian.systems>
Date: Sat, 21 Jul 2018 22:08:53 -0400
Subject: [PATCH 289/297] Revert "Revert "release: disallow aliases""

This reverts commit d68322504a53d72eae29dca959936f544f54672a.
---
 pkgs/top-level/release.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index 5553c4d5265..f1b487d98c1 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -16,7 +16,7 @@
   # Strip most of attributes when evaluating to spare memory usage
 ,  scrubJobs ? true
   # Attributes passed to nixpkgs. Don't build packages marked as unfree.
-,  nixpkgsArgs ? { config = { allowUnfree = false; inHydra = true; }; }
+,  nixpkgsArgs ? { config = { allowUnfree = false; inHydra = true; allowAliases = false; }; }
 }:
 
 with import ./release-lib.nix { inherit supportedSystems scrubJobs nixpkgsArgs; };
-- 
GitLab


From bead12c2f639e917a99ca810e9fc0288d7ee7331 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Sat, 21 Jul 2018 19:22:50 -0700
Subject: [PATCH 290/297] facter: 3.11.2 -> 3.11.3

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/facter/versions.
---
 pkgs/tools/system/facter/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/system/facter/default.nix b/pkgs/tools/system/facter/default.nix
index a88cca41fa6..c603d7c1c95 100644
--- a/pkgs/tools/system/facter/default.nix
+++ b/pkgs/tools/system/facter/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   name = "facter-${version}";
-  version = "3.11.2";
+  version = "3.11.3";
 
   src = fetchFromGitHub {
-    sha256 = "0sxxd05r7ika2m4p76kld1xclyi8yf4b79gb86084m1rcv692ap1";
+    sha256 = "1lkbcg6vlyrahgqhyp2a9jb91az1w4wgxiirfnyr9wzk2bbmmz7n";
     rev = version;
     repo = "facter";
     owner = "puppetlabs";
-- 
GitLab


From 979f10f70474af32e62ea807ae077333a139267d Mon Sep 17 00:00:00 2001
From: Jonathan Curran <joncfoo@gmail.com>
Date: Sat, 21 Jul 2018 20:47:30 -0600
Subject: [PATCH 291/297] rustracer: 2.0.12 -> 2.0.14

---
 pkgs/development/tools/rust/racer/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/rust/racer/default.nix b/pkgs/development/tools/rust/racer/default.nix
index 77ab75d1446..7be1a9777c0 100644
--- a/pkgs/development/tools/rust/racer/default.nix
+++ b/pkgs/development/tools/rust/racer/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   name = "racer-${version}";
-  version = "2.0.12";
+  version = "2.0.14";
 
   src = fetchFromGitHub {
     owner = "racer-rust";
     repo = "racer";
     rev = version;
-    sha256 = "0y1xlpjr8y8gsmmrjlykx4vwzf8akk42g35kg3kc419ry4fli945";
+    sha256 = "0kgax74qa09axq7b175ph3psprgidwgsml83wm1qwdq16gpxiaif";
   };
 
-  cargoSha256 = "1h3jv4hajdv6k309kjr6b6298kxmd0faw081i3788sl794k9mp0j";
+  cargoSha256 = "1j3fviimdxn6xa75z0l9wkgdnznp8q20jjs42mql6ql782dga5lk";
 
   # rustup is required for test
   buildInputs = [ makeWrapper rustup ];
-- 
GitLab


From 35425daec26094990384ff8dba959e6f8125c279 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Sat, 21 Jul 2018 19:48:12 -0700
Subject: [PATCH 292/297] cutemaze: 1.2.3 -> 1.2.4

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/cutemaze/versions.
---
 pkgs/games/cutemaze/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/cutemaze/default.nix b/pkgs/games/cutemaze/default.nix
index 2570ccb51dc..c77e0c8b485 100644
--- a/pkgs/games/cutemaze/default.nix
+++ b/pkgs/games/cutemaze/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "cutemaze-${version}";
-  version = "1.2.3";
+  version = "1.2.4";
 
   src = fetchurl {
     url = "https://gottcode.org/cutemaze/${name}-src.tar.bz2";
-    sha256 = "1gczg8bki9d2kkkkrac5wi4vnjdynv8xjw2qxn9lx1jfkm8fk1qk";
+    sha256 = "0l727j28igs7cx6gvxs43vvzhp3hk0z61df7sprp1vdxzpzzfifl";
   };
 
   nativeBuildInputs = [ qmake qttools ];
-- 
GitLab


From d0ad9db017082367e5c919054c8e8f80d8e59581 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Sat, 21 Jul 2018 20:12:45 -0700
Subject: [PATCH 293/297] capstone: 3.0.4 -> 3.0.5

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/capstone/versions.
---
 pkgs/development/libraries/capstone/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/capstone/default.nix b/pkgs/development/libraries/capstone/default.nix
index 64e3690eb3e..3014041133f 100644
--- a/pkgs/development/libraries/capstone/default.nix
+++ b/pkgs/development/libraries/capstone/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name    = "capstone-${version}";
-  version = "3.0.4";
+  version = "3.0.5";
 
   src = fetchurl {
     url    = "https://github.com/aquynh/capstone/archive/${version}.tar.gz";
-    sha256 = "1whl5c8j6vqvz2j6ay2pyszx0jg8d3x8hq66cvgghmjchvsssvax";
+    sha256 = "1wbd1g3r32ni6zd9vwrq3kn7fdp9y8qwn9zllrrbk8n5wyaxcgci";
   };
 
   configurePhase = '' patchShebangs make.sh '';
-- 
GitLab


From 7225c2acd063709c85a9a5e9924a5ddea6cc4b65 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Sat, 21 Jul 2018 20:25:39 -0700
Subject: [PATCH 294/297] acpid: 2.0.29 -> 2.0.30

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/acpid/versions.
---
 pkgs/os-specific/linux/acpid/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/acpid/default.nix b/pkgs/os-specific/linux/acpid/default.nix
index ad763d2ee29..7f62b0463a8 100644
--- a/pkgs/os-specific/linux/acpid/default.nix
+++ b/pkgs/os-specific/linux/acpid/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, autoreconfHook }:
 
 stdenv.mkDerivation rec {
-  name = "acpid-2.0.29";
+  name = "acpid-2.0.30";
 
   src = fetchurl {
     url = "mirror://sourceforge/acpid2/${name}.tar.xz";
-    sha256 = "1zq38al07z92r2md18zivrzgjqnn7m2wahdpgri6wijwjwkknl2q";
+    sha256 = "1jzl7hiaspr5xkmsrbl69bib8cs3dp6bq5ix58fbskpnsdi7pdr8";
   };
 
   nativeBuildInputs = [ autoreconfHook ];
-- 
GitLab


From 3380369f41e92030880edeebbfbf672da5d888f5 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Sat, 21 Jul 2018 20:51:27 -0700
Subject: [PATCH 295/297] acme-sh: 2.7.8 -> 2.7.9

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/acme.sh/versions.
---
 pkgs/tools/admin/acme.sh/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/admin/acme.sh/default.nix b/pkgs/tools/admin/acme.sh/default.nix
index 00d8bdd3ef4..4bdc9f096cf 100644
--- a/pkgs/tools/admin/acme.sh/default.nix
+++ b/pkgs/tools/admin/acme.sh/default.nix
@@ -1,13 +1,13 @@
 { stdenv, lib, fetchFromGitHub, makeWrapper, curl, openssl, socat, iproute }:
 stdenv.mkDerivation rec {
   name = "acme.sh-${version}";
-  version = "2.7.8";
+  version = "2.7.9";
 
   src = fetchFromGitHub {
     owner = "Neilpang";
     repo = "acme.sh";
     rev = version;
-    sha256 = "0zm64z7av63xi7yjhljab2i8q1vx4q1mpcmcm58jm6k4babalxrf";
+    sha256 = "1fp1sifhm4in0cqmc8i0zms7fqxw0rgfi1rkkm496d3068a4a51x";
   };
 
   nativeBuildInputs = [ makeWrapper ];
-- 
GitLab


From 58e4b0e545fd6c762bd8e75084b789011fda3f2f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Sat, 21 Jul 2018 20:53:21 -0700
Subject: [PATCH 296/297] batctl: 2018.1 -> 2018.2

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/batctl/versions.
---
 pkgs/os-specific/linux/batman-adv/batctl.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/batman-adv/batctl.nix b/pkgs/os-specific/linux/batman-adv/batctl.nix
index 61d0eb9bdb0..3b95907a789 100644
--- a/pkgs/os-specific/linux/batman-adv/batctl.nix
+++ b/pkgs/os-specific/linux/batman-adv/batctl.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, pkgconfig, libnl }:
 
 let
-  ver = "2018.1";
+  ver = "2018.2";
 in
 stdenv.mkDerivation rec {
   name = "batctl-${ver}";
 
   src = fetchurl {
     url = "https://downloads.open-mesh.org/batman/releases/batman-adv-${ver}/${name}.tar.gz";
-    sha256 = "0lxm0vb0w1gxyi5k553jgkpmhifc4cykzfybrsk8hvwilq6pv1r7";
+    sha256 = "09bxh4yifqiphn0ljc3msbxid62ynd9kk3vn82h13gcpfnyckw6z";
   };
 
   nativeBuildInputs = [ pkgconfig ];
-- 
GitLab


From b21994d4ac9c2c8d372bf011668401ee31972c0b Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 22 Jul 2018 09:17:36 +0200
Subject: [PATCH 297/297] python.pkgs.z3: provide bindings for z3 package,
 fixes #42603

---
 pkgs/top-level/python-packages.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d1c0ac37489..efa6c20be70 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -17943,6 +17943,10 @@ EOF
   qasm2image = callPackage ../development/python-modules/qasm2image { };
 
   simpy = callPackage ../development/python-modules/simpy { };
+
+  z3 = (toPythonModule (pkgs.z3.override {
+    inherit python;
+  })).python;
 });
 
 in fix' (extends overrides packages)
-- 
GitLab